eventespresso / event-espresso-core

caffeinated/payment_methods/Aim/EE_PMT_Aim.pm.php

Spacing +47 added lines, -47 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -25,7 +25,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EE_PMT_Aim extends EE_PMT_Base{
+class EE_PMT_Aim extends EE_PMT_Base {
 
 
 	/**
@@ -37,7 +37,7 @@ 
 		require_once($this->file_folder().'EEG_Aim.gateway.php');
 		$this->_gateway = new EEG_AIM();
 		$this->_pretty_name = __("Authorize.net AIM", 'event_espresso');
-		$this->_default_description = __( 'Please provide the following billing information.', 'event_espresso' );
+		$this->_default_description = __('Please provide the following billing information.', 'event_espresso');
 		$this->_requires_https = true;
 		parent::__construct($pm_instance);
 	}
@@ -47,60 +47,60 @@ 
 	 * @param \EE_Transaction $transaction
 	 * @return EE_Billing_Info_Form
 	 */
-	public function generate_new_billing_form( EE_Transaction $transaction = NULL ) {
-		$billing_form = new EE_Billing_Attendee_Info_Form($this->_pm_instance,array(
+	public function generate_new_billing_form(EE_Transaction $transaction = NULL) {
+		$billing_form = new EE_Billing_Attendee_Info_Form($this->_pm_instance, array(
 			'name'=>'AIM_Form',
 			'subsections'=>array(
 				'credit_card'=>new EE_Credit_Card_Input(array(
 					'required'=>true,
-					'html_label_text' => __( 'Card Number', 'event_espresso' )
+					'html_label_text' => __('Card Number', 'event_espresso')
 				)),
 				'exp_month'=>new EE_Credit_Card_Month_Input(true, array(
 					'required'=>true,
-					'html_label_text' => __( 'Expiry Month', 'event_espresso' )
+					'html_label_text' => __('Expiry Month', 'event_espresso')
 				)),
-				'exp_year'=>new EE_Credit_Card_Year_Input( array( 
+				'exp_year'=>new EE_Credit_Card_Year_Input(array( 
 					'required'=>true,
-					'html_label_text' => __( 'Expiry Year', 'event_espresso' ) 
+					'html_label_text' => __('Expiry Year', 'event_espresso') 
 				)),
-				'cvv'=>new EE_CVV_Input( array(
+				'cvv'=>new EE_CVV_Input(array(
 					'required'=>true,
-					'html_label_text' => __( 'CVV', 'event_espresso' ) ) ),
+					'html_label_text' => __('CVV', 'event_espresso') )),
 			)
 		));
-		$billing_form->add_subsections( array(
-			'company' => new EE_Text_Input( array(
+		$billing_form->add_subsections(array(
+			'company' => new EE_Text_Input(array(
 				'html_label_text' => __('Company', 'event_espresso')
 			))
-		), 'email', false );
+		), 'email', false);
 		$billing_form->add_subsections( 
 				array(
-					'fax' => new EE_Text_Input( array(
+					'fax' => new EE_Text_Input(array(
 						'html_label_text' => __('Fax', 'event_espresso')
 					))
 				), 
 				'phone', 
 				false );
 		$settings_form = $this->settings_form();
-		if( $settings_form->get_input( 'excluded_billing_inputs' ) instanceof EE_Checkbox_Multi_Input ) {
-				$billing_form->exclude( $settings_form->get_input( 'excluded_billing_inputs' )->normalized_value() );
+		if ($settings_form->get_input('excluded_billing_inputs') instanceof EE_Checkbox_Multi_Input) {
+				$billing_form->exclude($settings_form->get_input('excluded_billing_inputs')->normalized_value());
 		}
-		if( $settings_form->get_input( 'required_billing_inputs' ) instanceof EE_Checkbox_Multi_Input ) {
+		if ($settings_form->get_input('required_billing_inputs') instanceof EE_Checkbox_Multi_Input) {
 			$required_inputs = array_merge( 
 					array(
 						'credit_card',
 						'exp_month',
 						'exp_year' ),
-					$settings_form->get_input( 'required_billing_inputs' )->normalized_value() );
-			foreach( $billing_form->inputs() as $input_name => $input ) {
-				if( in_array( $input_name, $required_inputs ) ) {
-					$input->set_required( true );
+					$settings_form->get_input('required_billing_inputs')->normalized_value() );
+			foreach ($billing_form->inputs() as $input_name => $input) {
+				if (in_array($input_name, $required_inputs)) {
+					$input->set_required(true);
 				} else {
-					$input->set_required( false );
+					$input->set_required(false);
 				}
 			}
 		}
-		return $this->apply_billing_form_debug_settings( $billing_form );
+		return $this->apply_billing_form_debug_settings($billing_form);
 	}
 
 
@@ -112,19 +112,19 @@ 
 	 * @param \EE_Billing_Info_Form $billing_form
 	 * @return \EE_Billing_Info_Form
 	 */
-	public function apply_billing_form_debug_settings( EE_Billing_Info_Form $billing_form ) {
-		if ( $this->_pm_instance->debug_mode() || $this->_pm_instance->get_extra_meta( 'test_transactions', TRUE, FALSE )) {
-			$billing_form->get_input( 'credit_card' )->set_default( '4007000000027' );
-			$billing_form->get_input( 'exp_year' )->set_default( '2020' );
-			if( $billing_form->get_subsection( 'cvv' ) instanceof EE_Form_Input_Base ) {
-				$billing_form->get_input( 'cvv' )->set_default(( '123' ));
+	public function apply_billing_form_debug_settings(EE_Billing_Info_Form $billing_form) {
+		if ($this->_pm_instance->debug_mode() || $this->_pm_instance->get_extra_meta('test_transactions', TRUE, FALSE)) {
+			$billing_form->get_input('credit_card')->set_default('4007000000027');
+			$billing_form->get_input('exp_year')->set_default('2020');
+			if ($billing_form->get_subsection('cvv') instanceof EE_Form_Input_Base) {
+				$billing_form->get_input('cvv')->set_default(('123'));
 			}
 			$billing_form->add_subsections(
-				array( 'fyi_about_autofill' => $billing_form->payment_fields_autofilled_notice_html() ),
+				array('fyi_about_autofill' => $billing_form->payment_fields_autofilled_notice_html()),
 				'credit_card'
 			);
 			$billing_form->add_subsections(
-				array( 'debug_content' => new EE_Form_Section_HTML_From_Template( dirname(__FILE__).DS.'templates'.DS.'authorize_net_aim_debug_info.template.php' )),
+				array('debug_content' => new EE_Form_Section_HTML_From_Template(dirname(__FILE__).DS.'templates'.DS.'authorize_net_aim_debug_info.template.php')),
 				'first_name'
 			);
 		}
@@ -144,17 +144,17 @@ 
 				'extra_meta_inputs'=>array(
 					'login_id'=>new EE_Text_Input(
 						array(
-							'html_label_text'=>  sprintf( __("Authorize.net API Login ID %s", "event_espresso"),  $this->get_help_tab_link() ),
+							'html_label_text'=>  sprintf(__("Authorize.net API Login ID %s", "event_espresso"), $this->get_help_tab_link()),
 							'required' => true )
 					),
 					'transaction_key'=>new EE_Text_Input(
 						array(
-							'html_label_text'=> sprintf( __("Authorize.net Transaction Key %s", "event_espresso"), $this->get_help_tab_link() ),
+							'html_label_text'=> sprintf(__("Authorize.net Transaction Key %s", "event_espresso"), $this->get_help_tab_link()),
 							'required' => true )
 					),
 					'test_transactions'=>new EE_Yes_No_Input(
 						array(
-							'html_label_text'=>  sprintf( __("Send test transactions? %s", 'event_espresso'),  $this->get_help_tab_link() ),
+							'html_label_text'=>  sprintf(__("Send test transactions? %s", 'event_espresso'), $this->get_help_tab_link()),
 							'html_help_text'=>  __("Send test transactions, even to live server", 'event_espresso'),
 							'default' => false,
 							'required' => true
@@ -163,7 +163,7 @@ 
 					'excluded_billing_inputs' => new EE_Checkbox_Multi_Input( 
 							$billing_input_names,
 					array( 
-						'html_label_text' => sprintf( __("Excluded Payment Form Fields %s", 'event_espresso'),  $this->get_help_tab_link() ),
+						'html_label_text' => sprintf(__("Excluded Payment Form Fields %s", 'event_espresso'), $this->get_help_tab_link()),
 						'default' => array(
 							'company',
 							'fax',
@@ -172,10 +172,10 @@ 
 					'required_billing_inputs' => new EE_Checkbox_Multi_Input( 
 							$billing_input_names,
 							array(
-								'html_label_text' => sprintf( __("Required Payment Form Fields %s", 'event_espresso'),  $this->get_help_tab_link() ),
+								'html_label_text' => sprintf(__("Required Payment Form Fields %s", 'event_espresso'), $this->get_help_tab_link()),
 								'default' => array_diff(
-											array_keys( $billing_input_names ),
-											array( 'address2', 'phone', 'company', 'fax' )
+											array_keys($billing_input_names),
+											array('address2', 'phone', 'company', 'fax')
 								),
 								'html_help_text' => __('Note: if fields are excluded they cannot be required.', 'event_espresso')
 							)),
@@ -191,10 +191,10 @@ 
 	 */
 	public function billing_input_names() {
 		return array(
-			'first_name' => __( 'First Name', 'event_espresso' ),
+			'first_name' => __('First Name', 'event_espresso'),
 			'last_name' => __('Last Name', 'event_espresso'),
-			'email' => __( 'Email', 'event_espresso' ),
-			'company' => __( 'Company', 'event_espresso' ),
+			'email' => __('Email', 'event_espresso'),
+			'company' => __('Company', 'event_espresso'),
 			'address' => __('Address', 'event_espresso'),
 			'address2' => __('Address2', 'event_espresso'),
 			'city' => __('City', 'event_espresso'),
@@ -202,7 +202,7 @@ 
 			'country' => __('Country', 'event_espresso'),
 			'zip' =>  __('Zip', 'event_espresso'),
 			'phone' => __('Phone', 'event_espresso'),
-			'fax' => __( 'Fax', 'event_espresso' ),
+			'fax' => __('Fax', 'event_espresso'),
 			'cvv' => __('CVV', 'event_espresso')
 		);
 	}
@@ -213,10 +213,10 @@ 
 	 * @param type $billing_form
 	 * @return array
 	 */
-	protected function _get_billing_values_from_form( $billing_form ){
+	protected function _get_billing_values_from_form($billing_form) {
 		$all_billing_values_empty = array();
-		foreach( array_keys( $this->billing_input_names() ) as $input_name ) {
-			$all_billing_values_empty[ $input_name ] = '';
+		foreach (array_keys($this->billing_input_names()) as $input_name) {
+			$all_billing_values_empty[$input_name] = '';
 		}
 		return array_merge(
 				$all_billing_values_empty,
@@ -231,7 +231,7 @@ 
 	 * @see EE_PMT_Base::help_tabs_config()
 	 * @return array
 	 */
-	public function help_tabs_config(){
+	public function help_tabs_config() {
 		return array(
 			$this->get_help_tab_name() => array(
 				'title' => __('Authorize.net AIM Settings', 'event_espresso'),

core/EE_Payment_Processor.core.php

Spacing +136 added lines, -136 removed lines

@@ -1,5 +1,5 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
-EE_Registry::instance()->load_class( 'Processor_Base' );
+EE_Registry::instance()->load_class('Processor_Base');
 /**
  *
  * EE_Payment_Processor
@@ -27,7 +27,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated
-		if ( ! self::$_instance instanceof EE_Payment_Processor ) {
+		if ( ! self::$_instance instanceof EE_Payment_Processor) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -42,7 +42,7 @@ 
 	 *@return EE_Payment_Processor
 	 */
 	private function __construct() {
-		do_action( 'AHEE__EE_Payment_Processor__construct' );
+		do_action('AHEE__EE_Payment_Processor__construct');
 	}
 
 
@@ -64,42 +64,42 @@ 
 	 * @param string 	       						$cancel_url 	URL to return to if off-site payments are cancelled
 	 * @return EE_Payment
 	 */
-	public function process_payment( EE_Payment_Method $payment_method, EE_Transaction $transaction, $amount = NULL, $billing_form = NULL, $return_url = NULL, $method = 'CART', $by_admin = FALSE, $update_txn = TRUE, $cancel_url = '' ) {
-		if( $amount < 0 ) {
+	public function process_payment(EE_Payment_Method $payment_method, EE_Transaction $transaction, $amount = NULL, $billing_form = NULL, $return_url = NULL, $method = 'CART', $by_admin = FALSE, $update_txn = TRUE, $cancel_url = '') {
+		if ($amount < 0) {
 			throw new EE_Error( 
 					sprintf(
-							__( 'Attempting to make a payment for a negative amount of %1$d for transaction %2$d. That should be a refund', 'event_espresso' ),
+							__('Attempting to make a payment for a negative amount of %1$d for transaction %2$d. That should be a refund', 'event_espresso'),
 							$amount,
 							$transaction->ID() ) );
 		}
 		// verify payment method
-		$payment_method = EEM_Payment_Method::instance()->ensure_is_obj( $payment_method, TRUE );
+		$payment_method = EEM_Payment_Method::instance()->ensure_is_obj($payment_method, TRUE);
 		// verify transaction
-		EEM_Transaction::instance()->ensure_is_obj( $transaction );
-		$transaction->set_payment_method_ID( $payment_method->ID() );
+		EEM_Transaction::instance()->ensure_is_obj($transaction);
+		$transaction->set_payment_method_ID($payment_method->ID());
 		// verify payment method type
-		if ( $payment_method->type_obj() instanceof EE_PMT_Base ){
+		if ($payment_method->type_obj() instanceof EE_PMT_Base) {
 			$payment = $payment_method->type_obj()->process_payment(
 				$transaction,
-				min( $amount, $transaction->remaining() ),//make sure we don't overcharge
+				min($amount, $transaction->remaining()), //make sure we don't overcharge
 				$billing_form,
 				$return_url,
-				add_query_arg( array( 'ee_cancel_payment' => true ), $return_url ),
+				add_query_arg(array('ee_cancel_payment' => true), $return_url),
 				$method,
 				$by_admin
 			);
 			// check if payment method uses an off-site gateway
-			if ( $payment_method->type_obj()->payment_occurs() != EE_PMT_Base::offsite ) {
+			if ($payment_method->type_obj()->payment_occurs() != EE_PMT_Base::offsite) {
 				// don't process payments for off-site gateways yet because no payment has occurred yet
-				$this->update_txn_based_on_payment( $transaction, $payment, $update_txn );
+				$this->update_txn_based_on_payment($transaction, $payment, $update_txn);
 			}
 			return $payment;
 		} else {
 			EE_Error::add_error(
 				sprintf(
-					__( 'A valid payment method could not be determined due to a technical issue.%sPlease try again or contact %s for assistance.', 'event_espresso' ),
+					__('A valid payment method could not be determined due to a technical issue.%sPlease try again or contact %s for assistance.', 'event_espresso'),
 					'<br/>',
-					EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+					EE_Registry::instance()->CFG->organization->get_pretty('email')
 				), __FILE__, __FUNCTION__, __LINE__
 			);
 			return NULL;
@@ -115,14 +115,14 @@ 
 	 * @throws EE_Error
 	 * @return string
 	 */
-	public function get_ipn_url_for_payment_method( $transaction, $payment_method ){
+	public function get_ipn_url_for_payment_method($transaction, $payment_method) {
 		/** @type EE_Transaction $transaction */
-		$transaction = EEM_Transaction::instance()->ensure_is_obj( $transaction );
+		$transaction = EEM_Transaction::instance()->ensure_is_obj($transaction);
 		$primary_reg = $transaction->primary_registration();
-		if( ! $primary_reg instanceof EE_Registration ){
-			throw new EE_Error(sprintf(__("Cannot get IPN URL for transaction with ID %d because it has no primary registration", "event_espresso"),$transaction->ID()));
+		if ( ! $primary_reg instanceof EE_Registration) {
+			throw new EE_Error(sprintf(__("Cannot get IPN URL for transaction with ID %d because it has no primary registration", "event_espresso"), $transaction->ID()));
 		}
-		$payment_method = EEM_Payment_Method::instance()->ensure_is_obj($payment_method,true);
+		$payment_method = EEM_Payment_Method::instance()->ensure_is_obj($payment_method, true);
 		$url = add_query_arg(
 			array(
 				'e_reg_url_link'=>$primary_reg->reg_url_link(),
@@ -149,81 +149,81 @@ 
 	 * @throws Exception
 	 * @return EE_Payment
 	 */
-	public function process_ipn( $_req_data, $transaction = NULL, $payment_method = NULL, $update_txn = true, $separate_IPN_request = true ){
-		$_req_data = $this->_remove_unusable_characters( $_req_data );
-		EE_Registry::instance()->load_model( 'Change_Log' );
-		EE_Processor_Base::set_IPN( $separate_IPN_request );
-		if( $transaction instanceof EE_Transaction && $payment_method instanceof EE_Payment_Method ){
-			$obj_for_log = EEM_Payment::instance()->get_one( array( array( 'TXN_ID' => $transaction->ID(), 'PMD_ID' => $payment_method->ID() ), 'order_by' => array( 'PAY_timestamp' => 'desc' ) ) );
-		}elseif( $payment_method instanceof EE_Payment ){
+	public function process_ipn($_req_data, $transaction = NULL, $payment_method = NULL, $update_txn = true, $separate_IPN_request = true) {
+		$_req_data = $this->_remove_unusable_characters($_req_data);
+		EE_Registry::instance()->load_model('Change_Log');
+		EE_Processor_Base::set_IPN($separate_IPN_request);
+		if ($transaction instanceof EE_Transaction && $payment_method instanceof EE_Payment_Method) {
+			$obj_for_log = EEM_Payment::instance()->get_one(array(array('TXN_ID' => $transaction->ID(), 'PMD_ID' => $payment_method->ID()), 'order_by' => array('PAY_timestamp' => 'desc')));
+		}elseif ($payment_method instanceof EE_Payment) {
 			$obj_for_log = $payment_method;
-		}elseif( $transaction instanceof EE_Transaction ){
+		}elseif ($transaction instanceof EE_Transaction) {
 			$obj_for_log = $transaction;
-		}else{
+		} else {
 			$obj_for_log = null;
 		}
 		$log = EEM_Change_Log::instance()->log(EEM_Change_Log::type_gateway, array('IPN data received'=>$_req_data), $obj_for_log);
-		try{
+		try {
 			/**
 			 * @var EE_Payment $payment
 			 */
 			$payment = NULL;
-			if($transaction && $payment_method){
+			if ($transaction && $payment_method) {
 				/** @type EE_Transaction $transaction */
 				$transaction = EEM_Transaction::instance()->ensure_is_obj($transaction);
 				/** @type EE_Payment_Method $payment_method */
 				$payment_method = EEM_Payment_Method::instance()->ensure_is_obj($payment_method);
-				if ( $payment_method->type_obj() instanceof EE_PMT_Base ) {
-						$payment = $payment_method->type_obj()->handle_ipn( $_req_data, $transaction );
+				if ($payment_method->type_obj() instanceof EE_PMT_Base) {
+						$payment = $payment_method->type_obj()->handle_ipn($_req_data, $transaction);
 						$log->set_object($payment);
 				} else {
 					// not a payment
 					EE_Error::add_error(
 						sprintf(
-							__( 'A valid payment method could not be determined due to a technical issue.%sPlease refresh your browser and try again or contact %s for assistance.', 'event_espresso' ),
+							__('A valid payment method could not be determined due to a technical issue.%sPlease refresh your browser and try again or contact %s for assistance.', 'event_espresso'),
 							'<br/>',
-							EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+							EE_Registry::instance()->CFG->organization->get_pretty('email')
 						),
 						__FILE__, __FUNCTION__, __LINE__
 					);
 				}
-			}else{
+			} else {
 				//that's actually pretty ok. The IPN just wasn't able
 				//to identify which transaction or payment method this was for
 				// give all active payment methods a chance to claim it
 				$active_pms = EEM_Payment_Method::instance()->get_all_active();
-				foreach( $active_pms as $payment_method ){
-					try{
-						$payment = $payment_method->type_obj()->handle_unclaimed_ipn( $_req_data );
+				foreach ($active_pms as $payment_method) {
+					try {
+						$payment = $payment_method->type_obj()->handle_unclaimed_ipn($_req_data);
 						EEM_Change_Log::instance()->log(EEM_Change_Log::type_gateway, array('IPN data'=>$_req_data), $payment);
 						break;
-					} catch( EE_Error $e ) {
+					} catch (EE_Error $e) {
 						//that's fine- it apparently couldn't handle the IPN
 					}
 				}
 
 			}
 // 			EEM_Payment_Log::instance()->log("got to 7",$transaction,$payment_method);
-			if( $payment instanceof EE_Payment){
+			if ($payment instanceof EE_Payment) {
 				$payment->save();
 				//  update the TXN
-				$this->update_txn_based_on_payment( $transaction, $payment, $update_txn, $separate_IPN_request );
-			}else{
+				$this->update_txn_based_on_payment($transaction, $payment, $update_txn, $separate_IPN_request);
+			} else {
 				//we couldn't find the payment for this IPN... let's try and log at least SOMETHING
-				if($payment_method){
+				if ($payment_method) {
 					EEM_Change_Log::instance()->log(EEM_Change_Log::type_gateway, array('IPN data'=>$_req_data), $payment_method);
-				}elseif($transaction){
+				}elseif ($transaction) {
 					EEM_Change_Log::instance()->log(EEM_Change_Log::type_gateway, array('IPN data'=>$_req_data), $transaction);
 				}
 			}
 			return $payment;
 
-		} catch( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			do_action(
 				'AHEE__log', __FILE__, __FUNCTION__, sprintf(
-					__( 'Error occurred while receiving IPN. Transaction: %1$s, req data: %2$s. The error was "%3$s"', 'event_espresso' ),
-					print_r( $transaction, TRUE ),
-					print_r( $_req_data, TRUE ),
+					__('Error occurred while receiving IPN. Transaction: %1$s, req data: %2$s. The error was "%3$s"', 'event_espresso'),
+					print_r($transaction, TRUE),
+					print_r($_req_data, TRUE),
 					$e->getMessage()
 				)
 			);
@@ -237,14 +237,14 @@ 
 	 * @param array $request_data
 	 * @return array|string
 	 */
-	protected function _remove_unusable_characters( $request_data ) {
-		if( is_array( $request_data ) ) {
+	protected function _remove_unusable_characters($request_data) {
+		if (is_array($request_data)) {
 			$return_data = array();
-			foreach( $request_data as $key => $value ) {
-				$return_data[ $this->_remove_unusable_characters( $key ) ] = $this->_remove_unusable_characters( $value );
+			foreach ($request_data as $key => $value) {
+				$return_data[$this->_remove_unusable_characters($key)] = $this->_remove_unusable_characters($value);
 			}
-		}else{
-			$return_data =  preg_replace('/[^[:print:]]/', '', $request_data);
+		} else {
+			$return_data = preg_replace('/[^[:print:]]/', '', $request_data);
 		}
 		return $return_data;
 	}
@@ -266,13 +266,13 @@ 
 	 * @return EE_Payment
 	 * @deprecated 4.6.24 method is no longer used. Instead it is up to client code, like SPCO, to call handle_ipn() for offsite gateways that don't receive separate IPNs
 	 */
-	public function finalize_payment_for( $transaction, $update_txn = TRUE ){
+	public function finalize_payment_for($transaction, $update_txn = TRUE) {
 		/** @var $transaction EE_Transaction */
-		$transaction = EEM_Transaction::instance()->ensure_is_obj( $transaction );
+		$transaction = EEM_Transaction::instance()->ensure_is_obj($transaction);
 		$last_payment_method = $transaction->payment_method();
-		if ( $last_payment_method instanceof EE_Payment_Method ) {
-			$payment = $last_payment_method->type_obj()->finalize_payment_for( $transaction );
-			$this->update_txn_based_on_payment( $transaction, $payment, $update_txn );
+		if ($last_payment_method instanceof EE_Payment_Method) {
+			$payment = $last_payment_method->type_obj()->finalize_payment_for($transaction);
+			$this->update_txn_based_on_payment($transaction, $payment, $update_txn);
 			return $payment;
 		} else {
 			return NULL;
@@ -289,10 +289,10 @@ 
 	 * @internal param float $amount
 	 * @return EE_Payment
 	 */
-	public function process_refund( EE_Payment_Method $payment_method, EE_Payment $payment_to_refund, $refund_info = array() ){
-		if ( $payment_method instanceof EE_Payment_Method && $payment_method->type_obj()->supports_sending_refunds() ) {
-			$payment_method->type_obj()->process_refund( $payment_to_refund, $refund_info );
-			$this->update_txn_based_on_payment( $payment_to_refund->transaction(), $payment_to_refund );
+	public function process_refund(EE_Payment_Method $payment_method, EE_Payment $payment_to_refund, $refund_info = array()) {
+		if ($payment_method instanceof EE_Payment_Method && $payment_method->type_obj()->supports_sending_refunds()) {
+			$payment_method->type_obj()->process_refund($payment_to_refund, $refund_info);
+			$this->update_txn_based_on_payment($payment_to_refund->transaction(), $payment_to_refund);
 		}
 		return $payment_to_refund;
 	}
@@ -334,12 +334,12 @@ 
 	 *                        TXN is locked before updating
 	 * @throws \EE_Error
 	 */
-	public function update_txn_based_on_payment( $transaction, $payment, $update_txn = true, $IPN = false ){
+	public function update_txn_based_on_payment($transaction, $payment, $update_txn = true, $IPN = false) {
 		$do_action = 'AHEE__EE_Payment_Processor__update_txn_based_on_payment__not_successful';
 		/** @type EE_Transaction $transaction */
-		$transaction = EEM_Transaction::instance()->ensure_is_obj( $transaction );
+		$transaction = EEM_Transaction::instance()->ensure_is_obj($transaction);
 		// can we freely update the TXN at this moment?
-		if ( $IPN && $transaction->is_locked() ) {
+		if ($IPN && $transaction->is_locked()) {
 			// don't update the transaction at this exact moment
 			// because the TXN is active in another request
 			EE_Cron_Tasks::schedule_update_transaction_with_payment(
@@ -349,40 +349,40 @@ 
 			);
 		} else {
 			// verify payment and that it has been saved
-			if ( $payment instanceof EE_Payment && $payment->ID() ) {
-				if( $payment->payment_method() instanceof EE_Payment_Method && $payment->payment_method()->type_obj() instanceof EE_PMT_Base ){
-					$payment->payment_method()->type_obj()->update_txn_based_on_payment( $payment );
+			if ($payment instanceof EE_Payment && $payment->ID()) {
+				if ($payment->payment_method() instanceof EE_Payment_Method && $payment->payment_method()->type_obj() instanceof EE_PMT_Base) {
+					$payment->payment_method()->type_obj()->update_txn_based_on_payment($payment);
 					// update TXN registrations with payment info
-					$this->process_registration_payments( $transaction, $payment );
+					$this->process_registration_payments($transaction, $payment);
 				}
 				$do_action = $payment->just_approved() ? 'AHEE__EE_Payment_Processor__update_txn_based_on_payment__successful' : $do_action;
 			} else {
 				// send out notifications
-				add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true' );
+				add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true');
 				$do_action = 'AHEE__EE_Payment_Processor__update_txn_based_on_payment__no_payment_made';
 			}
 			// if this is an IPN, then we want to know the initial TXN status prior to updating the TXN
 			// so that we know whether the status has changed and notifications should be triggered
-			if ( $IPN ) {
+			if ($IPN) {
 				/** @type EE_Transaction_Processor $transaction_processor */
-				$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
-				$transaction_processor->set_old_txn_status( $transaction->status_ID() );
+				$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
+				$transaction_processor->set_old_txn_status($transaction->status_ID());
 			}
-			if ( $payment->status() !== EEM_Payment::status_id_failed ) {
+			if ($payment->status() !== EEM_Payment::status_id_failed) {
 				/** @type EE_Transaction_Payments $transaction_payments */
-				$transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' );
+				$transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments');
 				// set new value for total paid
-				$transaction_payments->calculate_total_payments_and_update_status( $transaction );
+				$transaction_payments->calculate_total_payments_and_update_status($transaction);
 				// call EE_Transaction_Processor::update_transaction_and_registrations_after_checkout_or_payment() ???
-				if ( $update_txn ) {
-					$this->_post_payment_processing( $transaction, $payment, $IPN );
+				if ($update_txn) {
+					$this->_post_payment_processing($transaction, $payment, $IPN);
 				}
 			}
 			// granular hook for others to use.
-			do_action( $do_action, $transaction, $payment );
-			do_action( 'AHEE_log', __CLASS__, __FUNCTION__, $do_action, '$do_action' );
+			do_action($do_action, $transaction, $payment);
+			do_action('AHEE_log', __CLASS__, __FUNCTION__, $do_action, '$do_action');
 			//global hook for others to use.
-			do_action( 'AHEE__EE_Payment_Processor__update_txn_based_on_payment', $transaction, $payment );
+			do_action('AHEE__EE_Payment_Processor__update_txn_based_on_payment', $transaction, $payment);
 		}
 	}
 
@@ -396,25 +396,25 @@ 
 	 * @param EE_Registration[] $registrations
 	 * @throws \EE_Error
 	 */
-	public function process_registration_payments( EE_Transaction $transaction, EE_Payment $payment, $registrations = array() ) {
+	public function process_registration_payments(EE_Transaction $transaction, EE_Payment $payment, $registrations = array()) {
 		// only process if payment was successful
-		if ( $payment->status() !== EEM_Payment::status_id_approved ) {
+		if ($payment->status() !== EEM_Payment::status_id_approved) {
 			return;
 		}
 		//EEM_Registration::instance()->show_next_x_db_queries();
-		if ( empty( $registrations )) {
+		if (empty($registrations)) {
 			// find registrations with monies owing that can receive a payment
-			$registrations = $transaction->registrations( array(
+			$registrations = $transaction->registrations(array(
 				array(
 					// only these reg statuses can receive payments
-					'STS_ID'  => array( 'IN', EEM_Registration::reg_statuses_that_allow_payment() ),
-					'REG_final_price'  => array( '!=', 0 ),
-					'REG_final_price*' => array( '!=', 'REG_paid', true ),
+					'STS_ID'  => array('IN', EEM_Registration::reg_statuses_that_allow_payment()),
+					'REG_final_price'  => array('!=', 0),
+					'REG_final_price*' => array('!=', 'REG_paid', true),
 				)
-			) );
+			));
 		}
 		// still nothing ??!??
-		if ( empty( $registrations )) {
+		if (empty($registrations)) {
 			return;
 		}
 		// todo: break out the following logic into a separate strategy class
@@ -426,28 +426,28 @@ 
 
 		$refund = $payment->is_a_refund();
 		// how much is available to apply to registrations?
-		$available_payment_amount = abs( $payment->amount() );
-		foreach ( $registrations as $registration ) {
-			if ( $registration instanceof EE_Registration ) {
+		$available_payment_amount = abs($payment->amount());
+		foreach ($registrations as $registration) {
+			if ($registration instanceof EE_Registration) {
 				// nothing left?
-				if ( $available_payment_amount <= 0 ) {
+				if ($available_payment_amount <= 0) {
 					break;
 				}
-				if ( $refund ) {
-					$available_payment_amount = $this->process_registration_refund( $registration, $payment, $available_payment_amount );
+				if ($refund) {
+					$available_payment_amount = $this->process_registration_refund($registration, $payment, $available_payment_amount);
 				} else {
-					$available_payment_amount = $this->process_registration_payment( $registration, $payment, $available_payment_amount );
+					$available_payment_amount = $this->process_registration_payment($registration, $payment, $available_payment_amount);
 				}
 			}
 		}
-		if ( $available_payment_amount > 0 && apply_filters( 'FHEE__EE_Payment_Processor__process_registration_payments__display_notifications', false ) ) {
+		if ($available_payment_amount > 0 && apply_filters('FHEE__EE_Payment_Processor__process_registration_payments__display_notifications', false)) {
 			EE_Error::add_attention(
 				sprintf(
-					__( 'A remainder of %1$s exists after applying this payment to Registration(s) %2$s.%3$sPlease verify that the original payment amount of %4$s is correct. If so, you should edit this payment and select at least one additional registration in the "Registrations to Apply Payment to" section, so that the remainder of this payment can be applied to the additional registration(s).', 'event_espresso' ),
-					EEH_Template::format_currency( $available_payment_amount ),
-					implode( ', ',  array_keys( $registrations ) ),
+					__('A remainder of %1$s exists after applying this payment to Registration(s) %2$s.%3$sPlease verify that the original payment amount of %4$s is correct. If so, you should edit this payment and select at least one additional registration in the "Registrations to Apply Payment to" section, so that the remainder of this payment can be applied to the additional registration(s).', 'event_espresso'),
+					EEH_Template::format_currency($available_payment_amount),
+					implode(', ', array_keys($registrations)),
 					'<br/>',
-					EEH_Template::format_currency( $payment->amount() )
+					EEH_Template::format_currency($payment->amount())
 				),
 				__FILE__, __FUNCTION__, __LINE__
 			);
@@ -464,17 +464,17 @@ 
 	 * @param float $available_payment_amount
 	 * @return float
 	 */
-	public function process_registration_payment( EE_Registration $registration, EE_Payment $payment, $available_payment_amount = 0.00 ) {
+	public function process_registration_payment(EE_Registration $registration, EE_Payment $payment, $available_payment_amount = 0.00) {
 		$owing = $registration->final_price() - $registration->paid();
-		if ( $owing > 0 ) {
+		if ($owing > 0) {
 			// don't allow payment amount to exceed the available payment amount, OR the amount owing
-			$payment_amount = min( $available_payment_amount, $owing );
+			$payment_amount = min($available_payment_amount, $owing);
 			// update $available_payment_amount
 			$available_payment_amount = $available_payment_amount - $payment_amount;
 			//calculate and set new REG_paid
-			$registration->set_paid( $registration->paid() + $payment_amount );
+			$registration->set_paid($registration->paid() + $payment_amount);
 			// now save it
-			$this->_apply_registration_payment( $registration, $payment, $payment_amount );
+			$this->_apply_registration_payment($registration, $payment, $payment_amount);
 		}
 		return $available_payment_amount;
 	}
@@ -489,19 +489,19 @@ 
 	 * @param float $payment_amount
 	 * @return float
 	 */
-	protected function _apply_registration_payment( EE_Registration $registration, EE_Payment $payment, $payment_amount = 0.00 ) {
+	protected function _apply_registration_payment(EE_Registration $registration, EE_Payment $payment, $payment_amount = 0.00) {
 		// find any existing reg payment records for this registration and payment
 		$existing_reg_payment = EEM_Registration_Payment::instance()->get_one(
-			array( array( 'REG_ID' => $registration->ID(), 'PAY_ID' => $payment->ID() ) )
+			array(array('REG_ID' => $registration->ID(), 'PAY_ID' => $payment->ID()))
 		);
 		// if existing registration payment exists
-		if ( $existing_reg_payment instanceof EE_Registration_Payment ) {
+		if ($existing_reg_payment instanceof EE_Registration_Payment) {
 			// then update that record
-			$existing_reg_payment->set_amount( $payment_amount );
+			$existing_reg_payment->set_amount($payment_amount);
 			$existing_reg_payment->save();
 		} else {
 			// or add new relation between registration and payment and set amount
-			$registration->_add_relation_to( $payment, 'Payment', array( 'RPY_amount' => $payment_amount ) );
+			$registration->_add_relation_to($payment, 'Payment', array('RPY_amount' => $payment_amount));
 			// make it stick
 			$registration->save();
 		}
@@ -517,21 +517,21 @@ 
 	 * @param float $available_refund_amount - IMPORTANT !!! SEND AVAILABLE REFUND AMOUNT AS A POSITIVE NUMBER
 	 * @return float
 	 */
-	public function process_registration_refund( EE_Registration $registration, EE_Payment $payment, $available_refund_amount = 0.00 ) {
+	public function process_registration_refund(EE_Registration $registration, EE_Payment $payment, $available_refund_amount = 0.00) {
 		//EEH_Debug_Tools::printr( $payment->amount(), '$payment->amount()', __FILE__, __LINE__ );
-		if ( $registration->paid() > 0 ) {
+		if ($registration->paid() > 0) {
 			// ensure $available_refund_amount is NOT negative
-			$available_refund_amount = abs( $available_refund_amount );
+			$available_refund_amount = abs($available_refund_amount);
 			// don't allow refund amount to exceed the available payment amount, OR the amount paid
-			$refund_amount = min( $available_refund_amount, $registration->paid() );
+			$refund_amount = min($available_refund_amount, $registration->paid());
 			// update $available_payment_amount
 			$available_refund_amount = $available_refund_amount - $refund_amount;
 			//calculate and set new REG_paid
-			$registration->set_paid( $registration->paid() - $refund_amount );
+			$registration->set_paid($registration->paid() - $refund_amount);
 			// convert payment amount back to a negative value for storage in the db
-			$refund_amount = abs( $refund_amount ) * -1;
+			$refund_amount = abs($refund_amount) * -1;
 			// now save it
-			$this->_apply_registration_payment( $registration, $payment, $refund_amount );
+			$this->_apply_registration_payment($registration, $payment, $refund_amount);
 		}
 		return $available_refund_amount;
 	}
@@ -549,12 +549,12 @@ 
 	 * @param EE_Payment     $payment
 	 * @param bool           $IPN
 	 */
-	protected function _post_payment_processing( EE_Transaction $transaction, EE_Payment $payment, $IPN = false ) {
+	protected function _post_payment_processing(EE_Transaction $transaction, EE_Payment $payment, $IPN = false) {
 
 		/** @type EE_Transaction_Processor $transaction_processor */
-		$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+		$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 		// is the Payment Options Reg Step completed ?
-		$payment_options_step_completed = $transaction_processor->reg_step_completed( $transaction, 'payment_options' );
+		$payment_options_step_completed = $transaction_processor->reg_step_completed($transaction, 'payment_options');
 		// DEBUG LOG
 		//$this->log(
 		//	__CLASS__, __FUNCTION__, __LINE__,
@@ -567,14 +567,14 @@ 
 		// if the Payment Options Reg Step is completed...
 		$revisit = $payment_options_step_completed === true ? true : false;
 		// then this is kinda sorta a revisit with regards to payments at least
-		$transaction_processor->set_revisit( $revisit );
+		$transaction_processor->set_revisit($revisit);
 		// if this is an IPN, let's consider the Payment Options Reg Step completed if not already
 		if (
 			$IPN &&
 			$payment_options_step_completed !== true &&
-			( $payment->is_approved() || $payment->is_pending() )
+			($payment->is_approved() || $payment->is_pending())
 		) {
-			$payment_options_step_completed = $transaction_processor->set_reg_step_completed( $transaction, 'payment_options' );
+			$payment_options_step_completed = $transaction_processor->set_reg_step_completed($transaction, 'payment_options');
 		}
 		// DEBUG LOG
 		//$this->log(
@@ -586,11 +586,11 @@ 
 		//	)
 		//);
 		/** @type EE_Transaction_Payments $transaction_payments */
-		$transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' );
+		$transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments');
 		// maybe update status, but don't save transaction just yet
-		$transaction_payments->update_transaction_status_based_on_total_paid( $transaction, false );
+		$transaction_payments->update_transaction_status_based_on_total_paid($transaction, false);
 		// check if 'finalize_registration' step has been completed...
-		$finalized = $transaction_processor->reg_step_completed( $transaction, 'finalize_registration' );
+		$finalized = $transaction_processor->reg_step_completed($transaction, 'finalize_registration');
 		// DEBUG LOG
 		//$this->log(
 		//	__CLASS__, __FUNCTION__, __LINE__,
@@ -601,9 +601,9 @@ 
 		//	)
 		//);
 		//  if this is an IPN and the final step has not been initiated
-		if ( $IPN && $payment_options_step_completed && $finalized === false ) {
+		if ($IPN && $payment_options_step_completed && $finalized === false) {
 			// and if it hasn't already been set as being started...
-			$finalized = $transaction_processor->set_reg_step_initiated( $transaction, 'finalize_registration' );
+			$finalized = $transaction_processor->set_reg_step_initiated($transaction, 'finalize_registration');
 			// DEBUG LOG
 			//$this->log(
 			//	__CLASS__, __FUNCTION__, __LINE__,
@@ -616,13 +616,13 @@ 
 		}
 		$transaction->save();
 		// because the above will return false if the final step was not fully completed, we need to check again...
-		if ( $IPN && $finalized !== false ) {
+		if ($IPN && $finalized !== false) {
 			// and if we are all good to go, then send out notifications
-			add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true' );
+			add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true');
 			// DEBUG LOG
 			//$this->log( __CLASS__, __FUNCTION__, __LINE__, $transaction );
 			//ok, now process the transaction according to the payment
-			$transaction_processor->update_transaction_and_registrations_after_checkout_or_payment( $transaction, $payment );
+			$transaction_processor->update_transaction_and_registrations_after_checkout_or_payment($transaction, $payment);
 		}
 		// DEBUG LOG
 		//$this->log(

core/EE_Psr4AutoloaderInit.core.php

Spacing +3 added lines, -3 removed lines

@@ -24,14 +24,14 @@
 	 */
 	public function __construct() {
 		static $initialized = false;
-		if ( ! $initialized ) {
+		if ( ! $initialized) {
 			// instantiate PSR4 autoloader
-			espresso_load_required( 'Psr4Autoloader', EE_CORE . 'Psr4Autoloader.php' );
+			espresso_load_required('Psr4Autoloader', EE_CORE.'Psr4Autoloader.php');
 			EE_Psr4AutoloaderInit::$psr4_loader = new \EventEspresso\Core\Psr4Autoloader();
 			// register the autoloader
 			EE_Psr4AutoloaderInit::$psr4_loader->register();
 			// register the base directories for the namespace prefix
-			EE_Psr4AutoloaderInit::$psr4_loader->addNamespace( 'EventEspresso', EE_PLUGIN_DIR_PATH );
+			EE_Psr4AutoloaderInit::$psr4_loader->addNamespace('EventEspresso', EE_PLUGIN_DIR_PATH);
 			$initialized = true;
 		}
 	}

core/EE_System.core.php

Indentation +81 added lines, -81 removed lines

@@ -1,26 +1,26 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
 /**
- * Event Espresso
- *
- * Event Registration and Management Plugin for WordPress
- *
- * @ package		Event Espresso
- * @ author		Event Espresso
- * @ copyright	(c) 2008-2011 Event Espresso  All Rights Reserved.
- * @ license		http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
- * @ link			http://www.eventespresso.com
- * @ version		4.0
- *
- * ------------------------------------------------------------------------
- *
- * EE_System
- *
- * @package		Event Espresso
- * @subpackage	core/
- * @author		Brent Christensen, Michael Nelson
- *
- * ------------------------------------------------------------------------
- */
+  * Event Espresso
+  *
+  * Event Registration and Management Plugin for WordPress
+  *
+  * @ package		Event Espresso
+  * @ author		Event Espresso
+  * @ copyright	(c) 2008-2011 Event Espresso  All Rights Reserved.
+  * @ license		http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
+  * @ link			http://www.eventespresso.com
+  * @ version		4.0
+  *
+  * ------------------------------------------------------------------------
+  *
+  * EE_System
+  *
+  * @package		Event Espresso
+  * @subpackage	core/
+  * @author		Brent Christensen, Michael Nelson
+  *
+  * ------------------------------------------------------------------------
+  */
 final class EE_System {
 
 
@@ -203,14 +203,14 @@ 
 
 
 	/**
-	* detect_if_activation_or_upgrade
-	*
-	* Takes care of detecting whether this is a brand new install or code upgrade,
-	* and either setting up the DB or setting up maintenance mode etc.
-	*
-	* @access public
-	* @return void
-	*/
+	 * detect_if_activation_or_upgrade
+	 *
+	 * Takes care of detecting whether this is a brand new install or code upgrade,
+	 * and either setting up the DB or setting up maintenance mode etc.
+	 *
+	 * @access public
+	 * @return void
+	 */
 	public function detect_if_activation_or_upgrade() {
 		do_action('AHEE__EE_System___detect_if_activation_or_upgrade__begin');
 
@@ -514,11 +514,11 @@ 
 			$query_params =  array( 'page' => 'espresso_about' );
 
 			if ( EE_System::instance()->detect_req_type() == EE_System::req_type_new_activation ) {
-			    $query_params['new_activation'] = TRUE;
+				$query_params['new_activation'] = TRUE;
 			}
 
 			if ( EE_System::instance()->detect_req_type() == EE_System::req_type_reactivation ) {
-			    $query_params['reactivation'] = TRUE;
+				$query_params['reactivation'] = TRUE;
 			}
 			$url = add_query_arg( $query_params, admin_url( 'admin.php' ) );
 			wp_safe_redirect( $url );
@@ -621,11 +621,11 @@ 
 
 
 	/**
-	* _incompatible_addon_error
-	*
-	* @access public
-	* @return void
-	*/
+	 * _incompatible_addon_error
+	 *
+	 * @access public
+	 * @return void
+	 */
 	private function _incompatible_addon_error() {
 		// get array of classes hooking into here
 		$class_names = EEH_Class_Tools::get_class_names_for_all_callbacks_on_hook( 'AHEE__EE_System__register_shortcodes_modules_and_addons' );
@@ -747,14 +747,14 @@ 
 
 
 	/**
-	* load_controllers
-	*
-	* this is the best place to load any additional controllers that needs access to EE core.
-	* it is expected that all basic core EE systems, that are not dependant on the current request are loaded at this time
-	*
-	* @access public
-	* @return void
-	*/
+	 * load_controllers
+	 *
+	 * this is the best place to load any additional controllers that needs access to EE core.
+	 * it is expected that all basic core EE systems, that are not dependant on the current request are loaded at this time
+	 *
+	 * @access public
+	 * @return void
+	 */
 	public function load_controllers() {
 		do_action( 'AHEE__EE_System__load_controllers__start' );
 		// let's get it started
@@ -771,13 +771,13 @@ 
 
 
 	/**
-	* core_loaded_and_ready
-	*
-	* all of the basic EE core should be loaded at this point and available regardless of M-Mode
-	*
-	* @access public
-	* @return void
-	*/
+	 * core_loaded_and_ready
+	 *
+	 * all of the basic EE core should be loaded at this point and available regardless of M-Mode
+	 *
+	 * @access public
+	 * @return void
+	 */
 	public function core_loaded_and_ready() {
 		do_action( 'AHEE__EE_System__core_loaded_and_ready' );
 		do_action( 'AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons' );
@@ -788,13 +788,13 @@ 
 
 
 	/**
-	* initialize
-	*
-	* this is the best place to begin initializing client code
-	*
-	* @access public
-	* @return void
-	*/
+	 * initialize
+	 *
+	 * this is the best place to begin initializing client code
+	 *
+	 * @access public
+	 * @return void
+	 */
 	public function initialize() {
 		do_action( 'AHEE__EE_System__initialize' );
 	}
@@ -802,13 +802,13 @@ 
 
 
 	/**
-	* initialize_last
-	*
-	* this is run really late during the WP init hookpoint, and ensures that mostly everything else that needs to initialize has done so
-	*
-	* @access public
-	* @return void
-	*/
+	 * initialize_last
+	 *
+	 * this is run really late during the WP init hookpoint, and ensures that mostly everything else that needs to initialize has done so
+	 *
+	 * @access public
+	 * @return void
+	 */
 	public function initialize_last() {
 		do_action( 'AHEE__EE_System__initialize_last' );
 	}
@@ -817,14 +817,14 @@ 
 
 
 	/**
-	* set_hooks_for_shortcodes_modules_and_addons
-	*
-	* this is the best place for other systems to set callbacks for hooking into other parts of EE
-	* this happens at the very beginning of the wp_loaded hookpoint
-	*
-	* @access public
-	* @return void
-	*/
+	 * set_hooks_for_shortcodes_modules_and_addons
+	 *
+	 * this is the best place for other systems to set callbacks for hooking into other parts of EE
+	 * this happens at the very beginning of the wp_loaded hookpoint
+	 *
+	 * @access public
+	 * @return void
+	 */
 	public function set_hooks_for_shortcodes_modules_and_addons() {
 //		do_action( 'AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons' );
 	}
@@ -833,13 +833,13 @@ 
 
 
 	/**
-	* do_not_cache
-	*
-	* sets no cache headers and defines no cache constants for WP plugins
-	*
-	* @access public
-	* @return void
-	*/
+	 * do_not_cache
+	 *
+	 * sets no cache headers and defines no cache constants for WP plugins
+	 *
+	 * @access public
+	 * @return void
+	 */
 	public static function do_not_cache() {
 		// set no cache constants
 		if ( ! defined( 'DONOTCACHEPAGE' ) ) {
@@ -958,7 +958,7 @@ 
 			//Current post
 			global $post;		
     	
-	    	if ( EE_Registry::instance()->CAP->current_user_can( 'ee_edit_event', 'ee_admin_bar_menu_espresso-toolbar-events-edit', $post->ID ) ) {
+			if ( EE_Registry::instance()->CAP->current_user_can( 'ee_edit_event', 'ee_admin_bar_menu_espresso-toolbar-events-edit', $post->ID ) ) {
 				//Events Edit Current Event
 				$admin_bar->add_menu(array(
 						'id' => 'espresso-toolbar-events-edit',

Spacing +255 added lines, -255 removed lines

@@ -102,7 +102,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated
-		if ( ! self::$_instance instanceof EE_System ) {
+		if ( ! self::$_instance instanceof EE_System) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -113,12 +113,12 @@ 
 	 * resets the instance and returns it
 	 * @return EE_System
 	 */
-	public static function reset(){
+	public static function reset() {
 		self::$_instance->_req_type = NULL;
 		//we need to reset the migration manager in order for it to detect DMSs properly
 		EE_Data_Migration_Manager::reset();
 		//make sure none of the old hooks are left hanging around
-		remove_all_actions( 'AHEE__EE_System__perform_activations_upgrades_and_migrations');
+		remove_all_actions('AHEE__EE_System__perform_activations_upgrades_and_migrations');
 		self::instance()->detect_activations_or_upgrades();
 		self::instance()->perform_activations_upgrades_and_migrations();
 		return self::instance();
@@ -134,26 +134,26 @@ 
 	 * @access    private
 	 */
 	private function __construct() {
-		do_action( 'AHEE__EE_System__construct__begin', $this );
+		do_action('AHEE__EE_System__construct__begin', $this);
 		// allow addons to load first so that they can register autoloaders, set hooks for running DMS's, etc
-		add_action( 'AHEE__EE_Bootstrap__load_espresso_addons', array( $this, 'load_espresso_addons' ) );
+		add_action('AHEE__EE_Bootstrap__load_espresso_addons', array($this, 'load_espresso_addons'));
 		// when an ee addon is activated, we want to call the core hook(s) again
 		// because the newly-activated addon didn't get a chance to run at all
-		add_action( 'activate_plugin', array( $this, 'load_espresso_addons' ), 1 );
+		add_action('activate_plugin', array($this, 'load_espresso_addons'), 1);
 		// detect whether install or upgrade
-		add_action( 'AHEE__EE_Bootstrap__detect_activations_or_upgrades', array( $this, 'detect_activations_or_upgrades' ), 3 );
+		add_action('AHEE__EE_Bootstrap__detect_activations_or_upgrades', array($this, 'detect_activations_or_upgrades'), 3);
 		// load EE_Config, EE_Textdomain, etc
-		add_action( 'AHEE__EE_Bootstrap__load_core_configuration', array( $this, 'load_core_configuration' ), 5 );
+		add_action('AHEE__EE_Bootstrap__load_core_configuration', array($this, 'load_core_configuration'), 5);
 		// load EE_Config, EE_Textdomain, etc
-		add_action( 'AHEE__EE_Bootstrap__register_shortcodes_modules_and_widgets', array( $this, 'register_shortcodes_modules_and_widgets' ), 7 );
+		add_action('AHEE__EE_Bootstrap__register_shortcodes_modules_and_widgets', array($this, 'register_shortcodes_modules_and_widgets'), 7);
 		// you wanna get going? I wanna get going... let's get going!
-		add_action( 'AHEE__EE_Bootstrap__brew_espresso', array( $this, 'brew_espresso' ), 9 );
+		add_action('AHEE__EE_Bootstrap__brew_espresso', array($this, 'brew_espresso'), 9);
 		//other housekeeping
 		//exclude EE critical pages from wp_list_pages
-		add_filter( 'wp_list_pages_excludes', array( $this, 'remove_pages_from_wp_list_pages' ), 10 );
+		add_filter('wp_list_pages_excludes', array($this, 'remove_pages_from_wp_list_pages'), 10);
 		// ALL EE Addons should use the following hook point to attach their initial setup too
 		// it's extremely important for EE Addons to register any class autoloaders so that they can be available when the EE_Config loads
-		do_action( 'AHEE__EE_System__construct__complete', $this );
+		do_action('AHEE__EE_System__construct__complete', $this);
 	}
 
 
@@ -173,10 +173,10 @@ 
 	public function load_espresso_addons() {
 		// set autoloaders for all of the classes implementing EEI_Plugin_API
 		// which provide helpers for EE plugin authors to more easily register certain components with EE.
-		EEH_Autoloader::instance()->register_autoloaders_for_each_file_in_folder( EE_LIBRARIES . 'plugin_api' );
+		EEH_Autoloader::instance()->register_autoloaders_for_each_file_in_folder(EE_LIBRARIES.'plugin_api');
 		//load and setup EE_Capabilities
-		EE_Registry::instance()->load_core( 'Capabilities' );
-		do_action( 'AHEE__EE_System__load_espresso_addons' );
+		EE_Registry::instance()->load_core('Capabilities');
+		do_action('AHEE__EE_System__load_espresso_addons');
 	}
 
 
@@ -191,10 +191,10 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public function detect_activations_or_upgrades(){
+	public function detect_activations_or_upgrades() {
 		//first off: let's make sure to handle core
 		$this->detect_if_activation_or_upgrade();
-		foreach(EE_Registry::instance()->addons as $addon){
+		foreach (EE_Registry::instance()->addons as $addon) {
 			//detect teh request type for that addon
 			$addon->detect_activation_or_upgrade();
 		}
@@ -215,44 +215,44 @@ 
 		do_action('AHEE__EE_System___detect_if_activation_or_upgrade__begin');
 
 		// load M-Mode class
-		EE_Registry::instance()->load_core( 'Maintenance_Mode' );
+		EE_Registry::instance()->load_core('Maintenance_Mode');
 		// check if db has been updated, or if its a brand-new installation
 
 		$espresso_db_update = $this->fix_espresso_db_upgrade_option();
-		$request_type =  $this->detect_req_type($espresso_db_update);
+		$request_type = $this->detect_req_type($espresso_db_update);
 		//EEH_Debug_Tools::printr( $request_type, '$request_type', __FILE__, __LINE__ );
-		if( $request_type != EE_System::req_type_normal){
+		if ($request_type != EE_System::req_type_normal) {
 			EE_Registry::instance()->load_helper('Activation');
 		}
 
-		switch($request_type){
+		switch ($request_type) {
 			case EE_System::req_type_new_activation:
-				do_action( 'AHEE__EE_System__detect_if_activation_or_upgrade__new_activation' );
-				$this->_handle_core_version_change( $espresso_db_update );
+				do_action('AHEE__EE_System__detect_if_activation_or_upgrade__new_activation');
+				$this->_handle_core_version_change($espresso_db_update);
 				break;
 			case EE_System::req_type_reactivation:
-				do_action( 'AHEE__EE_System__detect_if_activation_or_upgrade__reactivation' );
-				$this->_handle_core_version_change( $espresso_db_update );
+				do_action('AHEE__EE_System__detect_if_activation_or_upgrade__reactivation');
+				$this->_handle_core_version_change($espresso_db_update);
 				break;
 			case EE_System::req_type_upgrade:
-				do_action( 'AHEE__EE_System__detect_if_activation_or_upgrade__upgrade' );
+				do_action('AHEE__EE_System__detect_if_activation_or_upgrade__upgrade');
 				//migrations may be required now that we've upgraded
 				EE_Maintenance_Mode::instance()->set_maintenance_mode_if_db_old();
-				$this->_handle_core_version_change( $espresso_db_update );
+				$this->_handle_core_version_change($espresso_db_update);
 //				echo "done upgrade";die;
 				break;
 			case EE_System::req_type_downgrade:
-				do_action( 'AHEE__EE_System__detect_if_activation_or_upgrade__downgrade' );
+				do_action('AHEE__EE_System__detect_if_activation_or_upgrade__downgrade');
 				//its possible migrations are no longer required
 				EE_Maintenance_Mode::instance()->set_maintenance_mode_if_db_old();
-				$this->_handle_core_version_change( $espresso_db_update );
+				$this->_handle_core_version_change($espresso_db_update);
 				break;
 			case EE_System::req_type_normal:
 			default:
 //				$this->_maybe_redirect_to_ee_about();
 				break;
 		}
-		do_action( 'AHEE__EE_System__detect_if_activation_or_upgrade__complete' );
+		do_action('AHEE__EE_System__detect_if_activation_or_upgrade__complete');
 	}
 
 	/**
@@ -260,10 +260,10 @@ 
 	 * initializing the database later during the request
 	 * @param array $espresso_db_update
 	 */
-	protected function _handle_core_version_change( $espresso_db_update ){
-		$this->update_list_of_installed_versions( $espresso_db_update );
+	protected function _handle_core_version_change($espresso_db_update) {
+		$this->update_list_of_installed_versions($espresso_db_update);
 		//get ready to verify the DB is ok (provided we aren't in maintenance mode, of course)
-		add_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations', array( $this, 'initialize_db_if_no_migrations_required' ));
+		add_action('AHEE__EE_System__perform_activations_upgrades_and_migrations', array($this, 'initialize_db_if_no_migrations_required'));
 	}
 
 
@@ -278,44 +278,44 @@ 
 	 * @internal param array $espresso_db_update_value the value of the WordPress option. If not supplied, fetches it from the options table
 	 * @return array the correct value of 'espresso_db_upgrade', after saving it, if it needed correction
 	 */
-	private function fix_espresso_db_upgrade_option($espresso_db_update = null){
-		do_action( 'FHEE__EE_System__manage_fix_espresso_db_upgrade_option__begin', $espresso_db_update );
-		if( ! $espresso_db_update){
-			$espresso_db_update = get_option( 'espresso_db_update' );
+	private function fix_espresso_db_upgrade_option($espresso_db_update = null) {
+		do_action('FHEE__EE_System__manage_fix_espresso_db_upgrade_option__begin', $espresso_db_update);
+		if ( ! $espresso_db_update) {
+			$espresso_db_update = get_option('espresso_db_update');
 		}
 		// check that option is an array
-		if( ! is_array( $espresso_db_update )) {
+		if ( ! is_array($espresso_db_update)) {
 			// if option is FALSE, then it never existed
-			if ( $espresso_db_update === FALSE ) {
+			if ($espresso_db_update === FALSE) {
 				// make $espresso_db_update an array and save option with autoload OFF
-				$espresso_db_update =  array();
-				add_option( 'espresso_db_update', $espresso_db_update, '', 'no' );
+				$espresso_db_update = array();
+				add_option('espresso_db_update', $espresso_db_update, '', 'no');
 			} else {
 				// option is NOT FALSE but also is NOT an array, so make it an array and save it
-				$espresso_db_update =  array( $espresso_db_update=>array() );
-				update_option( 'espresso_db_update', $espresso_db_update );
+				$espresso_db_update = array($espresso_db_update=>array());
+				update_option('espresso_db_update', $espresso_db_update);
 			}
-		}else{
+		} else {
 			$corrected_db_update = array();
 			//if IS an array, but is it an array where KEYS are version numbers, and values are arrays?
-			foreach($espresso_db_update as $should_be_version_string => $should_be_array){
-				if(is_int($should_be_version_string) && ! is_array($should_be_array)){
+			foreach ($espresso_db_update as $should_be_version_string => $should_be_array) {
+				if (is_int($should_be_version_string) && ! is_array($should_be_array)) {
 					//the key is an int, and the value IS NOT an array
 					//so it must be numerically-indexed, where values are versions installed...
 					//fix it!
 					$version_string = $should_be_array;
 					$corrected_db_update[$version_string] = array('unknown-date');
-				}else{
+				} else {
 					//ok it checks out
 					$corrected_db_update[$should_be_version_string] = $should_be_array;
 				}
 			}
 			$espresso_db_update = $corrected_db_update;
-			update_option( 'espresso_db_update', $espresso_db_update );
+			update_option('espresso_db_update', $espresso_db_update);
 
 		}
 
-		do_action( 'FHEE__EE_System__manage_fix_espresso_db_upgrade_option__complete', $espresso_db_update );
+		do_action('FHEE__EE_System__manage_fix_espresso_db_upgrade_option__complete', $espresso_db_update);
 		return $espresso_db_update;
 	}
 
@@ -334,33 +334,33 @@ 
 	 * so we prefer to only do it when necessary
 	 * @return void
 	 */
-	public function initialize_db_if_no_migrations_required( $initialize_addons_too = FALSE, $verify_schema = true ){
+	public function initialize_db_if_no_migrations_required($initialize_addons_too = FALSE, $verify_schema = true) {
 		$request_type = $this->detect_req_type();
 		//only initialize system if we're not in maintenance mode.
-		if( EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance ){
-			update_option( 'ee_flush_rewrite_rules', TRUE );
+		if (EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance) {
+			update_option('ee_flush_rewrite_rules', TRUE);
 			EEH_Activation::system_initialization();
-			if( $verify_schema ) {
+			if ($verify_schema) {
 				EEH_Activation::initialize_db_and_folders();
 			}
 			EEH_Activation::initialize_db_content();
-			if( $initialize_addons_too ) {
+			if ($initialize_addons_too) {
 				$this->initialize_addons();
 			}
-		}else{
-			EE_Data_Migration_Manager::instance()->enqueue_db_initialization_for( 'Core' );
+		} else {
+			EE_Data_Migration_Manager::instance()->enqueue_db_initialization_for('Core');
 		}
-		if ( $request_type == EE_System::req_type_new_activation || $request_type == EE_System::req_type_reactivation || $request_type == EE_System::req_type_upgrade ) {
-			add_action( 'AHEE__EE_System__load_CPTs_and_session__start', array( $this, 'redirect_to_about_ee' ), 9 );
+		if ($request_type == EE_System::req_type_new_activation || $request_type == EE_System::req_type_reactivation || $request_type == EE_System::req_type_upgrade) {
+			add_action('AHEE__EE_System__load_CPTs_and_session__start', array($this, 'redirect_to_about_ee'), 9);
 		}
 	}
 
 	/**
 	 * Initializes the db for all registered addons
 	 */
-	public function initialize_addons(){
+	public function initialize_addons() {
 		//foreach registered addon, make sure its db is up-to-date too
-		foreach(EE_Registry::instance()->addons as $addon){
+		foreach (EE_Registry::instance()->addons as $addon) {
 			$addon->initialize_db_if_no_migrations_required();
 		}
 	}
@@ -372,16 +372,16 @@ 
 	 * @param 	string 	$current_version_to_add 	version to be added to the version history
 	 * @return 	boolean success as to whether or not this option was changed
 	 */
-	public function update_list_of_installed_versions($version_history = NULL,$current_version_to_add = NULL) {
-		if( ! $version_history ) {
+	public function update_list_of_installed_versions($version_history = NULL, $current_version_to_add = NULL) {
+		if ( ! $version_history) {
 			$version_history = $this->fix_espresso_db_upgrade_option($version_history);
 		}
-		if( $current_version_to_add == NULL){
+		if ($current_version_to_add == NULL) {
 			$current_version_to_add = espresso_version();
 		}
-		$version_history[ $current_version_to_add ][] = date( 'Y-m-d H:i:s',time() );
+		$version_history[$current_version_to_add][] = date('Y-m-d H:i:s', time());
 		// re-save
-		return update_option( 'espresso_db_update', $version_history );
+		return update_option('espresso_db_update', $version_history);
 	}
 
 
@@ -398,10 +398,10 @@ 
 	 *                            but still know if this is a new install or not
 	 * @return int one of the constants on EE_System::req_type_
 	 */
-	public function detect_req_type( $espresso_db_update = NULL ){
-		if ( $this->_req_type === NULL ){
-			$espresso_db_update = ! empty( $espresso_db_update ) ? $espresso_db_update : $this->fix_espresso_db_upgrade_option();
-			$this->_req_type = $this->detect_req_type_given_activation_history( $espresso_db_update, 'ee_espresso_activation', espresso_version() );
+	public function detect_req_type($espresso_db_update = NULL) {
+		if ($this->_req_type === NULL) {
+			$espresso_db_update = ! empty($espresso_db_update) ? $espresso_db_update : $this->fix_espresso_db_upgrade_option();
+			$this->_req_type = $this->detect_req_type_given_activation_history($espresso_db_update, 'ee_espresso_activation', espresso_version());
 		}
 		return $this->_req_type;
 	}
@@ -417,39 +417,39 @@ 
 	 * @param string $version_to_upgrade_to the version that was just upgraded to (for core that will be espresso_version())
 	 * @return int one of the constants on EE_System::req_type_*
 	 */
-	public static function detect_req_type_given_activation_history( $activation_history_for_addon, $activation_indicator_option_name, $version_to_upgrade_to ){
-		$version_is_higher = self::_new_version_is_higher( $activation_history_for_addon, $version_to_upgrade_to );
-		if( $activation_history_for_addon ){
+	public static function detect_req_type_given_activation_history($activation_history_for_addon, $activation_indicator_option_name, $version_to_upgrade_to) {
+		$version_is_higher = self::_new_version_is_higher($activation_history_for_addon, $version_to_upgrade_to);
+		if ($activation_history_for_addon) {
 			//it exists, so this isn't a completely new install
 			//check if this version already in that list of previously installed versions
-			if ( ! isset( $activation_history_for_addon[ $version_to_upgrade_to ] )) {
+			if ( ! isset($activation_history_for_addon[$version_to_upgrade_to])) {
 				//it a version we haven't seen before
-				if( $version_is_higher === 1 ){
+				if ($version_is_higher === 1) {
 					$req_type = EE_System::req_type_upgrade;
-				}else{
+				} else {
 					$req_type = EE_System::req_type_downgrade;
 				}
-				delete_option( $activation_indicator_option_name );
+				delete_option($activation_indicator_option_name);
 			} else {
 				// its not an update. maybe a reactivation?
-				if( get_option( $activation_indicator_option_name, FALSE ) ){
-					if ( $version_is_higher === -1 ){
+				if (get_option($activation_indicator_option_name, FALSE)) {
+					if ($version_is_higher === -1) {
 						$req_type = EE_System::req_type_downgrade;
-					}elseif( $version_is_higher === 0 ){
+					}elseif ($version_is_higher === 0) {
 						//we've seen this version before, but it's an activation. must be a reactivation
 						$req_type = EE_System::req_type_reactivation;
-					}else{//$version_is_higher === 1
+					} else {//$version_is_higher === 1
 						$req_type = EE_System::req_type_upgrade;
 					}
-					delete_option( $activation_indicator_option_name );
+					delete_option($activation_indicator_option_name);
 				} else {
 					//we've seen this version before and the activation indicate doesn't show it was just activated
-					if ( $version_is_higher === -1 ){
+					if ($version_is_higher === -1) {
 						$req_type = EE_System::req_type_downgrade;
-					}elseif( $version_is_higher === 0 ){
+					}elseif ($version_is_higher === 0) {
 						//we've seen this version before and it's not an activation. its normal request
 						$req_type = EE_System::req_type_normal;
-					}else{//$version_is_higher === 1
+					} else {//$version_is_higher === 1
 						$req_type = EE_System::req_type_upgrade;
 					}
 				}
@@ -457,7 +457,7 @@ 
 		} else {
 			//brand new install
 			$req_type = EE_System::req_type_new_activation;
-			delete_option( $activation_indicator_option_name );
+			delete_option($activation_indicator_option_name);
 		}
 		return $req_type;
 	}
@@ -475,30 +475,30 @@ 
 	 *		0 if $version_to_upgrade_to MATCHES (reactivation or normal request);
 	 *		1 if $version_to_upgrade_to is HIGHER (upgrade) ;
 	 */
-	protected static function _new_version_is_higher( $activation_history_for_addon, $version_to_upgrade_to ){
+	protected static function _new_version_is_higher($activation_history_for_addon, $version_to_upgrade_to) {
 		//find the most recently-activated version
 		$most_recently_active_version_activation = '1970-01-01 00:00:00';
 		$most_recently_active_version = '0.0.0.dev.000';
-		if( is_array( $activation_history_for_addon ) ){
-			foreach( $activation_history_for_addon as $version => $times_activated ){
+		if (is_array($activation_history_for_addon)) {
+			foreach ($activation_history_for_addon as $version => $times_activated) {
 				//check there is a record of when this version was activated. Otherwise,
 				//mark it as unknown
-				if( ! $times_activated ){
-					$times_activated = array( 'unknown-date');
+				if ( ! $times_activated) {
+					$times_activated = array('unknown-date');
 				}
-				if( is_string( $times_activated ) ){
-					$times_activated = array( $times_activated );
+				if (is_string($times_activated)) {
+					$times_activated = array($times_activated);
 				}
-				foreach( $times_activated as $an_activation ){
-					if( $an_activation != 'unknown-date' &&
-							$an_activation > $most_recently_active_version_activation  ){
+				foreach ($times_activated as $an_activation) {
+					if ($an_activation != 'unknown-date' &&
+							$an_activation > $most_recently_active_version_activation) {
 						$most_recently_active_version = $version;
 						$most_recently_active_version_activation = $an_activation == 'unknown-date' ? '1970-01-01 00:00:00' : $an_activation;
 					}
 				}
 			}
 		}
-		return version_compare( $version_to_upgrade_to, $most_recently_active_version );
+		return version_compare($version_to_upgrade_to, $most_recently_active_version);
 	}
 
 
@@ -508,20 +508,20 @@ 
 	 * @return void
 	 */
 	public function redirect_to_about_ee() {
-		$notices = EE_Error::get_notices( FALSE );
+		$notices = EE_Error::get_notices(FALSE);
 		//if current user is an admin and it's not an ajax request
-		if(EE_Registry::instance()->CAP->current_user_can( 'manage_options', 'espresso_about_default' ) && ! ( defined('DOING_AJAX') && DOING_AJAX  ) && ! isset( $notices[ 'errors' ] ) ){
-			$query_params =  array( 'page' => 'espresso_about' );
+		if (EE_Registry::instance()->CAP->current_user_can('manage_options', 'espresso_about_default') && ! (defined('DOING_AJAX') && DOING_AJAX) && ! isset($notices['errors'])) {
+			$query_params = array('page' => 'espresso_about');
 
-			if ( EE_System::instance()->detect_req_type() == EE_System::req_type_new_activation ) {
+			if (EE_System::instance()->detect_req_type() == EE_System::req_type_new_activation) {
 			    $query_params['new_activation'] = TRUE;
 			}
 
-			if ( EE_System::instance()->detect_req_type() == EE_System::req_type_reactivation ) {
+			if (EE_System::instance()->detect_req_type() == EE_System::req_type_reactivation) {
 			    $query_params['reactivation'] = TRUE;
 			}
-			$url = add_query_arg( $query_params, admin_url( 'admin.php' ) );
-			wp_safe_redirect( $url );
+			$url = add_query_arg($query_params, admin_url('admin.php'));
+			wp_safe_redirect($url);
 			exit();
 		}
 	}
@@ -535,31 +535,31 @@ 
 	 *
 	 * @return void
 	 */
-	public function load_core_configuration(){
-		do_action( 'AHEE__EE_System__load_core_configuration__begin', $this );
-		EE_Registry::instance()->load_core( 'EE_Load_Textdomain' );
+	public function load_core_configuration() {
+		do_action('AHEE__EE_System__load_core_configuration__begin', $this);
+		EE_Registry::instance()->load_core('EE_Load_Textdomain');
 		//load textdomain
 		EE_Load_Textdomain::load_textdomain();
 		// load and setup EE_Config and EE_Network_Config
-		EE_Registry::instance()->load_core( 'Config' );
-		EE_Registry::instance()->load_core( 'Network_Config' );
+		EE_Registry::instance()->load_core('Config');
+		EE_Registry::instance()->load_core('Network_Config');
 		// setup autoloaders
 		// enable logging?
-		if ( EE_Registry::instance()->CFG->admin->use_full_logging ) {
-			EE_Registry::instance()->load_core( 'Log' );
+		if (EE_Registry::instance()->CFG->admin->use_full_logging) {
+			EE_Registry::instance()->load_core('Log');
 		}
 		// check for activation errors
-		$activation_errors = get_option( 'ee_plugin_activation_errors', FALSE );
-		if ( $activation_errors ) {
-			EE_Error::add_error( $activation_errors, __FILE__, __FUNCTION__, __LINE__ );
-			update_option( 'ee_plugin_activation_errors', FALSE );
+		$activation_errors = get_option('ee_plugin_activation_errors', FALSE);
+		if ($activation_errors) {
+			EE_Error::add_error($activation_errors, __FILE__, __FUNCTION__, __LINE__);
+			update_option('ee_plugin_activation_errors', FALSE);
 		}
 		// get model names
 		$this->_parse_model_names();
 
 		//load caf stuff a chance to play during the activation process too.
 		$this->_maybe_brew_regular();
-		do_action( 'AHEE__EE_System__load_core_configuration__complete', $this );
+		do_action('AHEE__EE_System__load_core_configuration__complete', $this);
 	}
 
 
@@ -568,23 +568,23 @@ 
 	 *
 	 * @return void
 	 */
-	private function _parse_model_names(){
+	private function _parse_model_names() {
 		//get all the files in the EE_MODELS folder that end in .model.php
-		$models = glob( EE_MODELS.'*.model.php');
+		$models = glob(EE_MODELS.'*.model.php');
 		$model_names = array();
 		$non_abstract_db_models = array();
-		foreach( $models as $model ){
+		foreach ($models as $model) {
 			// get model classname
-			$classname = EEH_File::get_classname_from_filepath_with_standard_filename( $model );
-			$shortname = str_replace( 'EEM_', '', $classname );
+			$classname = EEH_File::get_classname_from_filepath_with_standard_filename($model);
+			$shortname = str_replace('EEM_', '', $classname);
 			$reflectionClass = new ReflectionClass($classname);
-			if( $reflectionClass->isSubclassOf('EEM_Base') && ! $reflectionClass->isAbstract()){
+			if ($reflectionClass->isSubclassOf('EEM_Base') && ! $reflectionClass->isAbstract()) {
 				$non_abstract_db_models[$shortname] = $classname;
 			}
-			$model_names[ $shortname ] = $classname;
+			$model_names[$shortname] = $classname;
 		}
-		EE_Registry::instance()->models = apply_filters( 'FHEE__EE_System__parse_model_names', $model_names );
-		EE_Registry::instance()->non_abstract_db_models = apply_filters( 'FHEE__EE_System__parse_implemented_model_names', $non_abstract_db_models );
+		EE_Registry::instance()->models = apply_filters('FHEE__EE_System__parse_model_names', $model_names);
+		EE_Registry::instance()->non_abstract_db_models = apply_filters('FHEE__EE_System__parse_implemented_model_names', $non_abstract_db_models);
 	}
 
 
@@ -594,8 +594,8 @@ 
 	 * @return void
 	 */
 	private function _maybe_brew_regular() {
-		if (( ! defined( 'EE_DECAF' ) ||  EE_DECAF !== TRUE ) && is_readable( EE_CAFF_PATH . 'brewing_regular.php' )) {
-			require_once EE_CAFF_PATH . 'brewing_regular.php';
+		if (( ! defined('EE_DECAF') || EE_DECAF !== TRUE) && is_readable(EE_CAFF_PATH.'brewing_regular.php')) {
+			require_once EE_CAFF_PATH.'brewing_regular.php';
 		}
 	}
 
@@ -612,9 +612,9 @@ 
 	 * @return void
 	 */
 	public function register_shortcodes_modules_and_widgets() {
-		do_action( 'AHEE__EE_System__register_shortcodes_modules_and_widgets' );
+		do_action('AHEE__EE_System__register_shortcodes_modules_and_widgets');
 		// check for addons using old hookpoint
-		if ( has_action( 'AHEE__EE_System__register_shortcodes_modules_and_addons' )) {
+		if (has_action('AHEE__EE_System__register_shortcodes_modules_and_addons')) {
 			$this->_incompatible_addon_error();
 		}
 	}
@@ -628,19 +628,19 @@ 
 	*/
 	private function _incompatible_addon_error() {
 		// get array of classes hooking into here
-		$class_names = EEH_Class_Tools::get_class_names_for_all_callbacks_on_hook( 'AHEE__EE_System__register_shortcodes_modules_and_addons' );
-		if ( ! empty( $class_names )) {
-			$msg = __( 'The following plugins, addons, or modules appear to be incompatible with this version of Event Espresso and were automatically deactivated to avoid fatal errors:', 'event_espresso' );
+		$class_names = EEH_Class_Tools::get_class_names_for_all_callbacks_on_hook('AHEE__EE_System__register_shortcodes_modules_and_addons');
+		if ( ! empty($class_names)) {
+			$msg = __('The following plugins, addons, or modules appear to be incompatible with this version of Event Espresso and were automatically deactivated to avoid fatal errors:', 'event_espresso');
 			$msg .= '<ul>';
-			foreach ( $class_names as $class_name ) {
-				$msg .= '<li><b>Event Espresso - ' . str_replace( array( 'EE_', 'EEM_', 'EED_', 'EES_', 'EEW_' ), '', $class_name ) . '</b></li>';
+			foreach ($class_names as $class_name) {
+				$msg .= '<li><b>Event Espresso - '.str_replace(array('EE_', 'EEM_', 'EED_', 'EES_', 'EEW_'), '', $class_name).'</b></li>';
 			}
 			$msg .= '</ul>';
-			$msg .= __( 'Compatibility issues can be avoided and/or resolved by keeping addons and plugins updated to the latest version.', 'event_espresso' );
+			$msg .= __('Compatibility issues can be avoided and/or resolved by keeping addons and plugins updated to the latest version.', 'event_espresso');
 			// save list of incompatible addons to wp-options for later use
-			add_option( 'ee_incompatible_addons', $class_names, '', 'no' );
-			if ( is_admin() ) {
-				EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			add_option('ee_incompatible_addons', $class_names, '', 'no');
+			if (is_admin()) {
+				EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			}
 		}
 	}
@@ -657,25 +657,25 @@ 
 	 *
 	 * @return void
 	 */
-	public function brew_espresso(){
-		do_action( 'AHEE__EE_System__brew_espresso__begin', $this );
+	public function brew_espresso() {
+		do_action('AHEE__EE_System__brew_espresso__begin', $this);
 		// load some final core systems
-		add_action( 'init', array( $this, 'set_hooks_for_core' ), 1 );
-		add_action( 'init', array( $this, 'perform_activations_upgrades_and_migrations' ), 3 );
-		add_action( 'init', array( $this, 'load_CPTs_and_session' ), 5 );
-		add_action( 'init', array( $this, 'load_controllers' ), 7 );
-		add_action( 'init', array( $this, 'core_loaded_and_ready' ), 9 );
-		add_action( 'init', array( $this, 'initialize' ), 10 );
-		add_action( 'init', array( $this, 'initialize_last' ), 100 );
-		add_action('wp_enqueue_scripts', array( $this, 'wp_enqueue_scripts' ), 25 );
-		add_action( 'admin_bar_menu', array( $this, 'espresso_toolbar_items' ), 100 );
-
-		if ( is_admin() && apply_filters( 'FHEE__EE_System__brew_espresso__load_pue', TRUE )  ) {
+		add_action('init', array($this, 'set_hooks_for_core'), 1);
+		add_action('init', array($this, 'perform_activations_upgrades_and_migrations'), 3);
+		add_action('init', array($this, 'load_CPTs_and_session'), 5);
+		add_action('init', array($this, 'load_controllers'), 7);
+		add_action('init', array($this, 'core_loaded_and_ready'), 9);
+		add_action('init', array($this, 'initialize'), 10);
+		add_action('init', array($this, 'initialize_last'), 100);
+		add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 25);
+		add_action('admin_bar_menu', array($this, 'espresso_toolbar_items'), 100);
+
+		if (is_admin() && apply_filters('FHEE__EE_System__brew_espresso__load_pue', TRUE)) {
 			// pew pew pew
-			EE_Registry::instance()->load_core( 'PUE' );
-			do_action( 'AHEE__EE_System__brew_espresso__after_pue_init' );
+			EE_Registry::instance()->load_core('PUE');
+			do_action('AHEE__EE_System__brew_espresso__after_pue_init');
 		}
-		do_action( 'AHEE__EE_System__brew_espresso__complete', $this );
+		do_action('AHEE__EE_System__brew_espresso__complete', $this);
 	}
 
 
@@ -689,7 +689,7 @@ 
 	 */
 	public function set_hooks_for_core() {
 		$this->_deactivate_incompatible_addons();
-		do_action( 'AHEE__EE_System__set_hooks_for_core' );
+		do_action('AHEE__EE_System__set_hooks_for_core');
 	}
 
 
@@ -698,15 +698,15 @@ 
 	 * Using the information gathered in EE_System::_incompatible_addon_error,
 	 * deactivates any addons considered incompatible with the current version of EE
 	 */
-	private function _deactivate_incompatible_addons(){
-		$incompatible_addons = get_option( 'ee_incompatible_addons', array() );
-		if ( ! empty( $incompatible_addons )) {
-			$active_plugins = get_option( 'active_plugins', array() );
-			foreach ( $active_plugins as $active_plugin ) {
-				foreach ( $incompatible_addons as $incompatible_addon ) {
-					if ( strpos( $active_plugin,  $incompatible_addon ) !== FALSE ) {
-						unset( $_GET['activate'] );
-						espresso_deactivate_plugin( $active_plugin );
+	private function _deactivate_incompatible_addons() {
+		$incompatible_addons = get_option('ee_incompatible_addons', array());
+		if ( ! empty($incompatible_addons)) {
+			$active_plugins = get_option('active_plugins', array());
+			foreach ($active_plugins as $active_plugin) {
+				foreach ($incompatible_addons as $incompatible_addon) {
+					if (strpos($active_plugin, $incompatible_addon) !== FALSE) {
+						unset($_GET['activate']);
+						espresso_deactivate_plugin($active_plugin);
 					}
 				}
 			}
@@ -723,10 +723,10 @@ 
 	 */
 	public function perform_activations_upgrades_and_migrations() {
 		//first check if we had previously attempted to setup EE's directories but failed
-		if( EEH_Activation::upload_directories_incomplete() ) {
+		if (EEH_Activation::upload_directories_incomplete()) {
 			EEH_Activation::create_upload_directories();
 		}
-		do_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations' );
+		do_action('AHEE__EE_System__perform_activations_upgrades_and_migrations');
 	}
 
 
@@ -738,10 +738,10 @@ 
 	 *  	@return 	void
 	 */
 	public function load_CPTs_and_session() {
-		do_action( 'AHEE__EE_System__load_CPTs_and_session__start' );
+		do_action('AHEE__EE_System__load_CPTs_and_session__start');
 		// register Custom Post Types
-		EE_Registry::instance()->load_core( 'Register_CPTs' );
-		do_action( 'AHEE__EE_System__load_CPTs_and_session__complete' );
+		EE_Registry::instance()->load_core('Register_CPTs');
+		do_action('AHEE__EE_System__load_CPTs_and_session__complete');
 	}
 
 
@@ -756,16 +756,16 @@ 
 	* @return void
 	*/
 	public function load_controllers() {
-		do_action( 'AHEE__EE_System__load_controllers__start' );
+		do_action('AHEE__EE_System__load_controllers__start');
 		// let's get it started
-		if ( ! is_admin() && !  EE_Maintenance_Mode::instance()->level() ) {
-			do_action( 'AHEE__EE_System__load_controllers__load_front_controllers' );
-			EE_Registry::instance()->load_core( 'Front_Controller' );
-		} else if ( ! EE_FRONT_AJAX ) {
-			do_action( 'AHEE__EE_System__load_controllers__load_admin_controllers' );
-			EE_Registry::instance()->load_core( 'Admin' );
+		if ( ! is_admin() && ! EE_Maintenance_Mode::instance()->level()) {
+			do_action('AHEE__EE_System__load_controllers__load_front_controllers');
+			EE_Registry::instance()->load_core('Front_Controller');
+		} else if ( ! EE_FRONT_AJAX) {
+			do_action('AHEE__EE_System__load_controllers__load_admin_controllers');
+			EE_Registry::instance()->load_core('Admin');
 		}
-		do_action( 'AHEE__EE_System__load_controllers__complete' );
+		do_action('AHEE__EE_System__load_controllers__complete');
 	}
 
 
@@ -779,10 +779,10 @@ 
 	* @return void
 	*/
 	public function core_loaded_and_ready() {
-		do_action( 'AHEE__EE_System__core_loaded_and_ready' );
-		do_action( 'AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons' );
+		do_action('AHEE__EE_System__core_loaded_and_ready');
+		do_action('AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons');
 //		add_action( 'wp_loaded', array( $this, 'set_hooks_for_shortcodes_modules_and_addons' ), 1 );
-		EE_Registry::instance()->load_core( 'Session' );
+		EE_Registry::instance()->load_core('Session');
 	}
 
 
@@ -796,7 +796,7 @@ 
 	* @return void
 	*/
 	public function initialize() {
-		do_action( 'AHEE__EE_System__initialize' );
+		do_action('AHEE__EE_System__initialize');
 	}
 
 
@@ -810,7 +810,7 @@ 
 	* @return void
 	*/
 	public function initialize_last() {
-		do_action( 'AHEE__EE_System__initialize_last' );
+		do_action('AHEE__EE_System__initialize_last');
 	}
 
 
@@ -842,21 +842,21 @@ 
 	*/
 	public static function do_not_cache() {
 		// set no cache constants
-		if ( ! defined( 'DONOTCACHEPAGE' ) ) {
-			define( 'DONOTCACHEPAGE', true );
+		if ( ! defined('DONOTCACHEPAGE')) {
+			define('DONOTCACHEPAGE', true);
 		}
-		if ( ! defined( 'DONOTCACHCEOBJECT' ) ) {
-			define( 'DONOTCACHCEOBJECT', true );
+		if ( ! defined('DONOTCACHCEOBJECT')) {
+			define('DONOTCACHCEOBJECT', true);
 		}
-		if ( ! defined( 'DONOTCACHEDB' ) ) {
-			define( 'DONOTCACHEDB', true );
+		if ( ! defined('DONOTCACHEDB')) {
+			define('DONOTCACHEDB', true);
 		}
 		// add no cache headers
-		add_action( 'send_headers' , array( 'EE_System', 'nocache_headers' ), 10 );
+		add_action('send_headers', array('EE_System', 'nocache_headers'), 10);
 		// plus a little extra for nginx
-		add_filter( 'nocache_headers', array( 'EE_System', 'nocache_headers_nginx' ), 10, 1 );
+		add_filter('nocache_headers', array('EE_System', 'nocache_headers_nginx'), 10, 1);
 		// prevent browsers from prefetching of the rel='next' link, because it may contain content that interferes with the registration process
-		remove_action( 'wp_head', 'adjacent_posts_rel_link_wp_head' );
+		remove_action('wp_head', 'adjacent_posts_rel_link_wp_head');
 	}
 
 
@@ -868,7 +868,7 @@ 
 	 * @param $headers
 	 * @return    array
 	 */
-	public static function nocache_headers_nginx ( $headers ) {
+	public static function nocache_headers_nginx($headers) {
 		$headers['X-Accel-Expires'] = 0;
 		return $headers;
 	}
@@ -894,15 +894,15 @@ 
 	 * @param $admin_bar
 	 * @return    void
 	 */
-	public function espresso_toolbar_items( $admin_bar ) {
+	public function espresso_toolbar_items($admin_bar) {
 
 		// if in full M-Mode, or its an AJAX request, or user is NOT an admin
-		if ( EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance || defined( 'DOING_AJAX' ) || ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_ee', 'ee_admin_bar_menu_top_level' )) {
+		if (EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance || defined('DOING_AJAX') || ! EE_Registry::instance()->CAP->current_user_can('ee_read_ee', 'ee_admin_bar_menu_top_level')) {
 			return;
 		}
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		EE_Registry::instance()->load_helper( 'URL' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		EE_Registry::instance()->load_helper('URL');
 		$menu_class = 'espresso_menu_item_class';
 		//we don't use the constants EVENTS_ADMIN_URL or REG_ADMIN_URL
 		//because they're only defined in each of their respective constructors
@@ -914,20 +914,20 @@ 
 		//Top Level
 		$admin_bar->add_menu(array(
 				'id' => 'espresso-toolbar',
-				'title' => '<span class="ee-icon ee-icon-ee-cup-thick ee-icon-size-20"></span><span class="ab-label">' . _x('Event Espresso', 'admin bar menu group label', 'event_espresso') . '</span>',
+				'title' => '<span class="ee-icon ee-icon-ee-cup-thick ee-icon-size-20"></span><span class="ab-label">'._x('Event Espresso', 'admin bar menu group label', 'event_espresso').'</span>',
 				'href' => $events_admin_url,
 				'meta' => array(
 						'title' => __('Event Espresso', 'event_espresso'),
-						'class' => $menu_class . 'first'
+						'class' => $menu_class.'first'
 				),
 		));
 
 		//Events
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-events',
 					'parent' => 'espresso-toolbar',
-					'title' => __( 'Events', 'event_espresso' ),
+					'title' => __('Events', 'event_espresso'),
 					'href' => $events_admin_url,
 					'meta' => array(
 							'title' => __('Events', 'event_espresso'),
@@ -938,13 +938,13 @@ 
 		}
 
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_edit_events', 'ee_admin_bar_menu_espresso-toolbar-events-new' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_edit_events', 'ee_admin_bar_menu_espresso-toolbar-events-new')) {
 			//Events Add New
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-events-new',
 					'parent' => 'espresso-toolbar-events',
 					'title' => __('Add New', 'event_espresso'),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'create_new' ), $events_admin_url ),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'create_new'), $events_admin_url),
 					'meta' => array(
 							'title' => __('Add New', 'event_espresso'),
 							'target' => '',
@@ -953,18 +953,18 @@ 
 			));
 		}
 
-		if ( is_single() && ( get_post_type() == 'espresso_events' ) ) {
+		if (is_single() && (get_post_type() == 'espresso_events')) {
 
 			//Current post
 			global $post;		
     	
-	    	if ( EE_Registry::instance()->CAP->current_user_can( 'ee_edit_event', 'ee_admin_bar_menu_espresso-toolbar-events-edit', $post->ID ) ) {
+	    	if (EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'ee_admin_bar_menu_espresso-toolbar-events-edit', $post->ID)) {
 				//Events Edit Current Event
 				$admin_bar->add_menu(array(
 						'id' => 'espresso-toolbar-events-edit',
 						'parent' => 'espresso-toolbar-events',
 						'title' => __('Edit Event', 'event_espresso'),
-						'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'edit', 'post'=>$post->ID ), $events_admin_url ),
+						'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'edit', 'post'=>$post->ID), $events_admin_url),
 						'meta' => array(
 								'title' => __('Edit Event', 'event_espresso'),
 								'target' => '',
@@ -976,11 +976,11 @@ 
 		}
 
 		//Events View
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-view' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-view')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-events-view',
 					'parent' => 'espresso-toolbar-events',
-					'title' => __( 'View', 'event_espresso' ),
+					'title' => __('View', 'event_espresso'),
 					'href' => $events_admin_url,
 					'meta' => array(
 							'title' => __('View', 'event_espresso'),
@@ -990,12 +990,12 @@ 
 			));
 		}
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-all' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-all')) {
 			//Events View All
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-events-all',
 					'parent' => 'espresso-toolbar-events-view',
-					'title' => __( 'All', 'event_espresso' ),
+					'title' => __('All', 'event_espresso'),
 					'href' => $events_admin_url,
 					'meta' => array(
 							'title' => __('All', 'event_espresso'),
@@ -1006,13 +1006,13 @@ 
 		}
 
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-today' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-today')) {
 			//Events View Today
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-events-today',
 					'parent' => 'espresso-toolbar-events-view',
 					'title' => __('Today', 'event_espresso'),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'today' ), $events_admin_url ),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'today'), $events_admin_url),
 					'meta' => array(
 							'title' => __('Today', 'event_espresso'),
 							'target' => '',
@@ -1022,13 +1022,13 @@ 
 		}
 
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-month' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-month')) {
 			//Events View This Month
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-events-month',
 					'parent' => 'espresso-toolbar-events-view',
-					'title' => __( 'This Month', 'event_espresso'),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'month' ), $events_admin_url ),
+					'title' => __('This Month', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'month'), $events_admin_url),
 					'meta' => array(
 							'title' => __('This Month', 'event_espresso'),
 							'target' => '',
@@ -1038,11 +1038,11 @@ 
 		}
 
 		//Registration Overview
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations',
 					'parent' => 'espresso-toolbar',
-					'title' => __( 'Registrations', 'event_espresso' ),
+					'title' => __('Registrations', 'event_espresso'),
 					'href' => $reg_admin_url,
 					'meta' => array(
 							'title' => __('Registrations', 'event_espresso'),
@@ -1053,12 +1053,12 @@ 
 		}
 
 		//Registration Overview Today
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-today',
 					'parent' => 'espresso-toolbar-registrations',
-					'title' => __( 'Today', 'event_espresso'),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'today' ), $reg_admin_url ),
+					'title' => __('Today', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'today'), $reg_admin_url),
 					'meta' => array(
 							'title' => __('Today', 'event_espresso'),
 							'target' => '',
@@ -1068,14 +1068,14 @@ 
 		}
 
 		//Registration Overview Today Completed
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-approved' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-approved')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-today-approved',
 					'parent' => 'espresso-toolbar-registrations-today',
-					'title' => __( 'Approved', 'event_espresso' ),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'today', '_reg_status'=>EEM_Registration::status_id_approved ), $reg_admin_url ),
+					'title' => __('Approved', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'today', '_reg_status'=>EEM_Registration::status_id_approved), $reg_admin_url),
 					'meta' => array(
-							'title' => __('Approved', 'event_espresso' ),
+							'title' => __('Approved', 'event_espresso'),
 							'target' => '',
 							'class' => $menu_class
 					),
@@ -1083,14 +1083,14 @@ 
 		}
 
 		//Registration Overview Today Pending\
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-pending' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-pending')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-today-pending',
 					'parent' => 'espresso-toolbar-registrations-today',
-					'title' => __( 'Pending', 'event_espresso' ),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'today', 'reg_status'=>EEM_Registration::status_id_pending_payment ), $reg_admin_url ),
+					'title' => __('Pending', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'today', 'reg_status'=>EEM_Registration::status_id_pending_payment), $reg_admin_url),
 					'meta' => array(
-							'title' => __('Pending Payment', 'event_espresso' ),
+							'title' => __('Pending Payment', 'event_espresso'),
 							'target' => '',
 							'class' => $menu_class
 					),
@@ -1098,14 +1098,14 @@ 
 		}
 
 		//Registration Overview Today Incomplete
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-not-approved' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-not-approved')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-today-not-approved',
 					'parent' => 'espresso-toolbar-registrations-today',
-					'title' => __( 'Not Approved', 'event_espresso' ),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'today', '_reg_status'=>EEM_Registration::status_id_not_approved ), $reg_admin_url ),
+					'title' => __('Not Approved', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'today', '_reg_status'=>EEM_Registration::status_id_not_approved), $reg_admin_url),
 					'meta' => array(
-							'title' => __('Not Approved', 'event_espresso' ),
+							'title' => __('Not Approved', 'event_espresso'),
 							'target' => '',
 							'class' => $menu_class
 					),
@@ -1113,12 +1113,12 @@ 
 		}
 
 		//Registration Overview Today Incomplete
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-cancelled' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-cancelled')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-today-cancelled',
 					'parent' => 'espresso-toolbar-registrations-today',
-					'title' => __( 'Cancelled', 'event_espresso'),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'today', '_reg_status'=>EEM_Registration::status_id_cancelled ), $reg_admin_url ),
+					'title' => __('Cancelled', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'today', '_reg_status'=>EEM_Registration::status_id_cancelled), $reg_admin_url),
 					'meta' => array(
 							'title' => __('Cancelled', 'event_espresso'),
 							'target' => '',
@@ -1128,12 +1128,12 @@ 
 		}
 
 		//Registration Overview This Month
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-month',
 					'parent' => 'espresso-toolbar-registrations',
-					'title' => __( 'This Month', 'event_espresso' ),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'month' ), $reg_admin_url ),
+					'title' => __('This Month', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'month'), $reg_admin_url),
 					'meta' => array(
 							'title' => __('This Month', 'event_espresso'),
 							'target' => '',
@@ -1143,12 +1143,12 @@ 
 		}
 
 		//Registration Overview This Month Approved
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-approved' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-approved')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-month-approved',
 					'parent' => 'espresso-toolbar-registrations-month',
-					'title' => __( 'Approved', 'event_espresso' ),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_approved ), $reg_admin_url ),
+					'title' => __('Approved', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_approved), $reg_admin_url),
 					'meta' => array(
 							'title' => __('Approved', 'event_espresso'),
 							'target' => '',
@@ -1158,12 +1158,12 @@ 
 		}
 
 		//Registration Overview This Month Pending
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-pending' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-pending')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-month-pending',
 					'parent' => 'espresso-toolbar-registrations-month',
-					'title' => __( 'Pending', 'event_espresso'),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_pending_payment ), $reg_admin_url ),
+					'title' => __('Pending', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_pending_payment), $reg_admin_url),
 					'meta' => array(
 							'title' => __('Pending', 'event_espresso'),
 							'target' => '',
@@ -1173,14 +1173,14 @@ 
 		}
 
 		//Registration Overview This Month Not Approved
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-not-approved' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-not-approved')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-month-not-approved',
 					'parent' => 'espresso-toolbar-registrations-month',
-					'title' => __( 'Not Approved', 'event_espresso'),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_not_approved ), $reg_admin_url ),
+					'title' => __('Not Approved', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_not_approved), $reg_admin_url),
 					'meta' => array(
-							'title' => __('Not Approved', 'event_espresso' ),
+							'title' => __('Not Approved', 'event_espresso'),
 							'target' => '',
 							'class' => $menu_class
 					),
@@ -1189,12 +1189,12 @@ 
 
 
 		//Registration Overview This Month Cancelled
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-cancelled' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-cancelled')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-month-cancelled',
 					'parent' => 'espresso-toolbar-registrations-month',
 					'title' => __('Cancelled', 'event_espresso'),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_cancelled ), $reg_admin_url ),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_cancelled), $reg_admin_url),
 					'meta' => array(
 							'title' => __('Cancelled', 'event_espresso'),
 							'target' => '',
@@ -1204,11 +1204,11 @@ 
 		}
 
 		//Extensions & Services
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_ee', 'ee_admin_bar_menu_espresso-toolbar-extensions-and-services' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_ee', 'ee_admin_bar_menu_espresso-toolbar-extensions-and-services')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-extensions-and-services',
 					'parent' => 'espresso-toolbar',
-					'title' => __( 'Extensions & Services', 'event_espresso' ),
+					'title' => __('Extensions & Services', 'event_espresso'),
 					'href' => $extensions_admin_url,
 					'meta' => array(
 							'title' => __('Extensions & Services', 'event_espresso'),
@@ -1230,8 +1230,8 @@ 
 	 * @param  array  $exclude_array any existing pages being excluded are in this array.
 	 * @return array
 	 */
-	public function remove_pages_from_wp_list_pages( $exclude_array ) {
-		return  array_merge( $exclude_array, EE_Registry::instance()->CFG->core->get_critical_pages_array() );
+	public function remove_pages_from_wp_list_pages($exclude_array) {
+		return  array_merge($exclude_array, EE_Registry::instance()->CFG->core->get_critical_pages_array());
 	}
 
 
@@ -1251,11 +1251,11 @@ 
 	 */
 	public function wp_enqueue_scripts() {
 		// unlike other systems, EE_System_scripts loading is turned ON by default, but prior to the init hook, can be turned off via: add_filter( 'FHEE_load_EE_System_scripts', '__return_false' );
-		if ( apply_filters( 'FHEE_load_EE_System_scripts', TRUE ) ) {
+		if (apply_filters('FHEE_load_EE_System_scripts', TRUE)) {
 			// jquery_validate loading is turned OFF by default, but prior to the wp_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.11.1', TRUE );
+				wp_register_script('jquery-validate', EE_GLOBAL_ASSETS_URL.'scripts/jquery.validate.min.js', array('jquery'), '1.11.1', TRUE);
 			}
 		}
 	}

core/db_classes/EE_Datetime.class.php

Spacing +126 added lines, -126 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -74,9 +74,9 @@ 
 	 *                             		    date_format and the second value is the time format
 	 * @return EE_Datetime
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
 	}
 
 
@@ -87,8 +87,8 @@ 
 	 *                          		the website will be used.
 	 * @return EE_Datetime
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 
 
@@ -96,8 +96,8 @@ 
 	/**
 	 * @param $name
 	 */
-	public function set_name( $name ) {
-		$this->set( 'DTT_name', $name );
+	public function set_name($name) {
+		$this->set('DTT_name', $name);
 	}
 
 
@@ -105,8 +105,8 @@ 
 	/**
 	 * @param $description
 	 */
-	public function set_description( $description ) {
-		$this->set( 'DTT_description', $description );
+	public function set_description($description) {
+		$this->set('DTT_description', $description);
 	}
 
 
@@ -119,8 +119,8 @@ 
 	 * @access        public
 	 * @param        string $date a string representation of the event's date ex:  Dec. 25, 2025 or 12-25-2025
 	 */
-	public function set_start_date( $date ) {
-		$this->_set_date_for( $date, 'DTT_EVT_start' );
+	public function set_start_date($date) {
+		$this->_set_date_for($date, 'DTT_EVT_start');
 	}
 
 
@@ -133,8 +133,8 @@ 
 	 * @access        public
 	 * @param        string $time a string representation of the event time ex:  9am  or  7:30 PM
 	 */
-	public function set_start_time( $time ) {
-		$this->_set_time_for( $time, 'DTT_EVT_start' );
+	public function set_start_time($time) {
+		$this->_set_time_for($time, 'DTT_EVT_start');
 	}
 
 
@@ -147,8 +147,8 @@ 
 	 * @access        public
 	 * @param        string $date a string representation of the event's date ex:  Dec. 25, 2025 or 12-25-2025
 	 */
-	public function set_end_date( $date ) {
-		$this->_set_date_for( $date, 'DTT_EVT_end' );
+	public function set_end_date($date) {
+		$this->_set_date_for($date, 'DTT_EVT_end');
 	}
 
 
@@ -161,8 +161,8 @@ 
 	 * @access        public
 	 * @param        string $time a string representation of the event time ex:  9am  or  7:30 PM
 	 */
-	public function set_end_time( $time ) {
-		$this->_set_time_for( $time, 'DTT_EVT_end' );
+	public function set_end_time($time) {
+		$this->_set_time_for($time, 'DTT_EVT_end');
 	}
 
 
@@ -175,8 +175,8 @@ 
 	 * @access        public
 	 * @param        int $reg_limit
 	 */
-	public function set_reg_limit( $reg_limit ) {
-		$this->set( 'DTT_reg_limit', $reg_limit );
+	public function set_reg_limit($reg_limit) {
+		$this->set('DTT_reg_limit', $reg_limit);
 	}
 
 
@@ -187,10 +187,10 @@ 
 	 * @access        public
 	 * @param        int $sold
 	 */
-	public function set_sold( $sold ) {
+	public function set_sold($sold) {
 		// sold can not go below zero
-		$sold = max( 0, $sold );
-		$this->set( 'DTT_sold', $sold );
+		$sold = max(0, $sold);
+		$this->set('DTT_sold', $sold);
 	}
 
 
@@ -199,9 +199,9 @@ 
 	 * increments sold by amount passed by $qty
 	 * @param int $qty
 	 */
-	function increase_sold( $qty = 1 ) {
+	function increase_sold($qty = 1) {
 		$sold = $this->sold() + $qty;
-		$this->set_sold( $sold );
+		$this->set_sold($sold);
 	}
 
 
@@ -210,9 +210,9 @@ 
 	 * decrements (subtracts) sold amount passed by $qty
 	 * @param int $qty
 	 */
-	function decrease_sold( $qty = 1 ) {
+	function decrease_sold($qty = 1) {
 		$sold = $this->sold() - $qty;
-		$this->set_sold( $sold );
+		$this->set_sold($sold);
 	}
 
 
@@ -222,7 +222,7 @@ 
 	 * @return string
 	 */
 	public function name() {
-		return $this->get( 'DTT_name' );
+		return $this->get('DTT_name');
 	}
 
 
@@ -232,7 +232,7 @@ 
 	 * @return string
 	 */
 	public function description() {
-		return $this->get( 'DTT_description' );
+		return $this->get('DTT_description');
 	}
 
 
@@ -242,7 +242,7 @@ 
 	 * @return boolean          TRUE if is primary, FALSE if not.
 	 */
 	public function is_primary() {
-		return $this->get( 'DTT_is_primary' );
+		return $this->get('DTT_is_primary');
 	}
 
 
@@ -252,7 +252,7 @@ 
 	 * @return int         The order of the datetime for this event.
 	 */
 	public function order() {
-		return $this->get( 'DTT_order' );
+		return $this->get('DTT_order');
 	}
 
 
@@ -262,7 +262,7 @@ 
 	 * @return int
 	 */
 	public function parent() {
-		return $this->get( 'DTT_parent' );
+		return $this->get('DTT_parent');
 	}
 
 
@@ -278,10 +278,10 @@ 
 	 * @param    bool   $echo         - whether we echo or return (note echoing uses "pretty" formats, otherwise we use the standard formats)
 	 * @return    string|bool|void  string on success, FALSE on fail
 	 */
-	private function _show_datetime( $date_or_time = NULL, $start_or_end = 'start', $dt_frmt = '', $tm_frmt = '', $echo = FALSE ) {
+	private function _show_datetime($date_or_time = NULL, $start_or_end = 'start', $dt_frmt = '', $tm_frmt = '', $echo = FALSE) {
 		$field_name = "DTT_EVT_{$start_or_end}";
-		$dtt = $this->_get_datetime( $field_name, $dt_frmt, $tm_frmt, $date_or_time, $echo );
-		if ( ! $echo ) {
+		$dtt = $this->_get_datetime($field_name, $dt_frmt, $tm_frmt, $date_or_time, $echo);
+		if ( ! $echo) {
 			return $dtt;
 		}
 		return '';
@@ -297,8 +297,8 @@ 
 	 * @param null $dt_frmt - string representation of date format defaults to 'F j, Y'
 	 * @return        mixed        string on success, FALSE on fail
 	 */
-	public function start_date( $dt_frmt = NULL ) {
-		return $this->_show_datetime( 'D', 'start', $dt_frmt );
+	public function start_date($dt_frmt = NULL) {
+		return $this->_show_datetime('D', 'start', $dt_frmt);
 	}
 
 
@@ -307,8 +307,8 @@ 
 	 * Echoes start_date()
 	 * @param string $dt_frmt
 	 */
-	public function e_start_date( $dt_frmt = NULL ) {
-		$this->_show_datetime( 'D', 'start', $dt_frmt, NULL, TRUE );
+	public function e_start_date($dt_frmt = NULL) {
+		$this->_show_datetime('D', 'start', $dt_frmt, NULL, TRUE);
 	}
 
 
@@ -321,8 +321,8 @@ 
 	 * @param null $dt_frmt - string representation of date format defaults to 'F j, Y'
 	 * @return        mixed        string on success, FALSE on fail
 	 */
-	public function end_date( $dt_frmt = NULL ) {
-		return $this->_show_datetime( 'D', 'end', $dt_frmt );
+	public function end_date($dt_frmt = NULL) {
+		return $this->_show_datetime('D', 'end', $dt_frmt);
 	}
 
 
@@ -331,8 +331,8 @@ 
 	 * Echoes the end date. See end_date()
 	 * @param string $dt_frmt
 	 */
-	public function e_end_date( $dt_frmt = NULL ) {
-		$this->_show_datetime( 'D', 'end', $dt_frmt, NULL, TRUE );
+	public function e_end_date($dt_frmt = NULL) {
+		$this->_show_datetime('D', 'end', $dt_frmt, NULL, TRUE);
 	}
 
 
@@ -345,11 +345,11 @@ 
 	 * @param        string $conjunction - conjunction junction what's your function ? this string joins the start date with the end date ie: Jan 01 "to" Dec 31
 	 * @return        mixed        string on success, FALSE on fail
 	 */
-	public function date_range( $dt_frmt = NULL, $conjunction = ' - ' ) {
-		$dt_frmt = ! empty( $dt_frmt ) ? $dt_frmt : $this->_dt_frmt;
-		$start = str_replace( ' ', '&nbsp;', $this->get_i18n_datetime( 'DTT_EVT_start', $dt_frmt ) );
-		$end = str_replace( ' ', '&nbsp;', $this->get_i18n_datetime( 'DTT_EVT_end', $dt_frmt ) );
-		return $start != $end ? $start . $conjunction . $end : $start;
+	public function date_range($dt_frmt = NULL, $conjunction = ' - ') {
+		$dt_frmt = ! empty($dt_frmt) ? $dt_frmt : $this->_dt_frmt;
+		$start = str_replace(' ', '&nbsp;', $this->get_i18n_datetime('DTT_EVT_start', $dt_frmt));
+		$end = str_replace(' ', '&nbsp;', $this->get_i18n_datetime('DTT_EVT_end', $dt_frmt));
+		return $start != $end ? $start.$conjunction.$end : $start;
 	}
 
 
@@ -358,8 +358,8 @@ 
 	 * @param null   $dt_frmt
 	 * @param string $conjunction
 	 */
-	public function e_date_range( $dt_frmt = NULL, $conjunction = ' - ' ) {
-		echo $this->date_range( $dt_frmt, $conjunction );
+	public function e_date_range($dt_frmt = NULL, $conjunction = ' - ') {
+		echo $this->date_range($dt_frmt, $conjunction);
 	}
 
 
@@ -371,8 +371,8 @@ 
 	 * @param        string $tm_format - string representation of time format defaults to 'g:i a'
 	 * @return        mixed        string on success, FALSE on fail
 	 */
-	public function start_time( $tm_format = NULL ) {
-		return $this->_show_datetime( 'T', 'start', NULL, $tm_format );
+	public function start_time($tm_format = NULL) {
+		return $this->_show_datetime('T', 'start', NULL, $tm_format);
 	}
 
 
@@ -380,8 +380,8 @@ 
 	/**
 	 * @param null $tm_format
 	 */
-	public function e_start_time( $tm_format = NULL ) {
-		$this->_show_datetime( 'T', 'start', NULL, $tm_format, TRUE );
+	public function e_start_time($tm_format = NULL) {
+		$this->_show_datetime('T', 'start', NULL, $tm_format, TRUE);
 	}
 
 
@@ -393,8 +393,8 @@ 
 	 * @param        string $tm_format - string representation of time format defaults to 'g:i a'
 	 * @return        mixed        string on success, FALSE on fail
 	 */
-	public function end_time( $tm_format = NULL ) {
-		return $this->_show_datetime( 'T', 'end', NULL, $tm_format );
+	public function end_time($tm_format = NULL) {
+		return $this->_show_datetime('T', 'end', NULL, $tm_format);
 	}
 
 
@@ -402,8 +402,8 @@ 
 	/**
 	 * @param null $tm_format
 	 */
-	public function e_end_time( $tm_format = NULL ) {
-		$this->_show_datetime( 'T', 'end', NULL, $tm_format, TRUE );
+	public function e_end_time($tm_format = NULL) {
+		$this->_show_datetime('T', 'end', NULL, $tm_format, TRUE);
 	}
 
 
@@ -416,12 +416,12 @@ 
 	 * @param        string $conjunction - conjunction junction what's your function ? this string joins the start date with the end date ie: Jan 01 "to" Dec 31
 	 * @return        mixed        string on success, FALSE on fail
 	 */
-	public function time_range( $tm_format = NULL, $conjunction = ' - ' ) {
-		$tm_format = !empty( $tm_format ) ? $tm_format : $this->_tm_frmt;
+	public function time_range($tm_format = NULL, $conjunction = ' - ') {
+		$tm_format = ! empty($tm_format) ? $tm_format : $this->_tm_frmt;
 
-		$start = str_replace( ' ', '&nbsp;', $this->get_i18n_datetime( 'DTT_EVT_start', $tm_format ) );
-		$end = str_replace( ' ', '&nbsp;', $this->get_i18n_datetime( 'DTT_EVT_end',  $tm_format ) );
-		return $start != $end ? $start . $conjunction . $end : $start;
+		$start = str_replace(' ', '&nbsp;', $this->get_i18n_datetime('DTT_EVT_start', $tm_format));
+		$end = str_replace(' ', '&nbsp;', $this->get_i18n_datetime('DTT_EVT_end', $tm_format));
+		return $start != $end ? $start.$conjunction.$end : $start;
 	}
 
 
@@ -430,8 +430,8 @@ 
 	 * @param null   $tm_format
 	 * @param string $conjunction
 	 */
-	public function e_time_range( $tm_format = NULL, $conjunction = ' - ' ) {
-		echo $this->time_range( $tm_format, $conjunction );
+	public function e_time_range($tm_format = NULL, $conjunction = ' - ') {
+		echo $this->time_range($tm_format, $conjunction);
 	}
 
 
@@ -444,8 +444,8 @@ 
 	 * @param 	string 	$tm_format - string representation of time format defaults to 'g:i a'
 	 * @return 	mixed 	string on success, FALSE on fail
 	 */
-	public function start_date_and_time( $dt_format = NULL, $tm_format = NULL ) {
-		return $this->_show_datetime( '', 'start', $dt_format, $tm_format );
+	public function start_date_and_time($dt_format = NULL, $tm_format = NULL) {
+		return $this->_show_datetime('', 'start', $dt_format, $tm_format);
 	}
 
 
@@ -454,8 +454,8 @@ 
 	 * @param null $dt_frmt
 	 * @param null $tm_format
 	 */
-	public function e_start_date_and_time( $dt_frmt = NULL, $tm_format = NULL ) {
-		$this->_show_datetime( '', 'start', $dt_frmt, $tm_format, TRUE );
+	public function e_start_date_and_time($dt_frmt = NULL, $tm_format = NULL) {
+		$this->_show_datetime('', 'start', $dt_frmt, $tm_format, TRUE);
 	}
 
 
@@ -469,11 +469,11 @@ 
 	 * @param bool   $round_up
 	 * @return float|int|mixed
 	 */
-	public function length( $units = 'seconds', $round_up = FALSE ) {
-		$start = $this->get_raw( 'DTT_EVT_start' );
-		$end = $this->get_raw( 'DTT_EVT_end' );
+	public function length($units = 'seconds', $round_up = FALSE) {
+		$start = $this->get_raw('DTT_EVT_start');
+		$end = $this->get_raw('DTT_EVT_end');
 		$length_in_units = $end - $start;
-		switch ( $units ) {
+		switch ($units) {
 			//NOTE: We purposefully don't use "break;" in order to chain the divisions
 			/** @noinspection PhpMissingBreakStatementInspection */
 			case 'days':
@@ -486,10 +486,10 @@ 
 				$length_in_units /= 60;
 			case 'seconds':
 			default:
-				$length_in_units = ceil( $length_in_units );
+				$length_in_units = ceil($length_in_units);
 		}
-		if ( $round_up ) {
-			$length_in_units = max( $length_in_units, 1 );
+		if ($round_up) {
+			$length_in_units = max($length_in_units, 1);
 		}
 		return $length_in_units;
 	}
@@ -504,8 +504,8 @@ 
 	 * @param bool | string 	$tm_format - string representation of time format defaults to 'g:i a'
 	 * @return 	mixed        		string on success, FALSE on fail
 	 */
-	public function end_date_and_time( $dt_frmt = FALSE, $tm_format = FALSE ) {
-		return $this->_show_datetime( '', 'end', $dt_frmt, $tm_format );
+	public function end_date_and_time($dt_frmt = FALSE, $tm_format = FALSE) {
+		return $this->_show_datetime('', 'end', $dt_frmt, $tm_format);
 	}
 
 
@@ -514,8 +514,8 @@ 
 	 * @param bool $dt_frmt
 	 * @param bool $tm_format
 	 */
-	public function e_end_date_and_time( $dt_frmt = FALSE, $tm_format = FALSE ) {
-		$this->_show_datetime( '', 'end', $dt_frmt, $tm_format, TRUE );
+	public function e_end_date_and_time($dt_frmt = FALSE, $tm_format = FALSE) {
+		$this->_show_datetime('', 'end', $dt_frmt, $tm_format, TRUE);
 	}
 
 
@@ -527,7 +527,7 @@ 
 	 * @return        int
 	 */
 	public function start() {
-		return $this->get_raw( 'DTT_EVT_start' );
+		return $this->get_raw('DTT_EVT_start');
 	}
 
 
@@ -539,7 +539,7 @@ 
 	 * @return        int
 	 */
 	public function end() {
-		return $this->get_raw( 'DTT_EVT_end' );
+		return $this->get_raw('DTT_EVT_end');
 	}
 
 
@@ -551,7 +551,7 @@ 
 	 * @return        mixed        int on success, FALSE on fail
 	 */
 	public function reg_limit() {
-		return $this->get_raw( 'DTT_reg_limit' );
+		return $this->get_raw('DTT_reg_limit');
 	}
 
 
@@ -563,7 +563,7 @@ 
 	 * @return        mixed        int on success, FALSE on fail
 	 */
 	public function sold() {
-		return $this->get_raw( 'DTT_sold' );
+		return $this->get_raw('DTT_sold');
 	}
 
 
@@ -592,15 +592,15 @@ 
 	 * 																	the spaces remaining for this particular datetime, hence the flag.
 	 * @return 	int
 	 */
-	public function spaces_remaining( $consider_tickets = FALSE ) {
+	public function spaces_remaining($consider_tickets = FALSE) {
 		// tickets remaining available for purchase
 		//no need for special checks for infinite, because if DTT_reg_limit == EE_INF, then EE_INF - x = EE_INF
 		$dtt_remaining = $this->reg_limit() - $this->sold();
-		if ( ! $consider_tickets ) {
+		if ( ! $consider_tickets) {
 			return $dtt_remaining;
 		}
 		$tickets_remaining = $this->tickets_remaining();
-		return min( $dtt_remaining, $tickets_remaining );
+		return min($dtt_remaining, $tickets_remaining);
 	}
 
 
@@ -611,19 +611,19 @@ 
 	 * @param array $query_params like EEM_Base::get_all's
 	 * @return int
 	 */
-	public function tickets_remaining( $query_params = array() ) {
+	public function tickets_remaining($query_params = array()) {
 		$sum = 0;
-		$tickets = $this->tickets( $query_params );
-		if ( ! empty( $tickets ) ) {
-			foreach ( $tickets as $ticket ) {
-				if ( $ticket instanceof EE_Ticket ) {
+		$tickets = $this->tickets($query_params);
+		if ( ! empty($tickets)) {
+			foreach ($tickets as $ticket) {
+				if ($ticket instanceof EE_Ticket) {
 					// get the actual amount of tickets that can be sold
-					$qty = $ticket->qty( 'saleable' );
-					if ( $qty === EE_INF ) {
+					$qty = $ticket->qty('saleable');
+					if ($qty === EE_INF) {
 						return EE_INF;
 					}
 					// no negative ticket quantities plz
-					if ( $qty > 0 ) {
+					if ($qty > 0) {
 						$sum += $qty;
 					}
 				}
@@ -640,8 +640,8 @@ 
 	 * @param array $query_params like EEM_Base::get_all's
 	 * @return int
 	 */
-	public function sum_tickets_initially_available( $query_params = array() ) {
-		return $this->sum_related( 'Ticket', $query_params, 'TKT_qty' );
+	public function sum_tickets_initially_available($query_params = array()) {
+		return $this->sum_related('Ticket', $query_params, 'TKT_qty');
 	}
 
 
@@ -653,7 +653,7 @@ 
 	 * @return int
 	 */
 	public function total_tickets_available_at_this_datetime() {
-		return $this->spaces_remaining( true );
+		return $this->spaces_remaining(true);
 	}
 
 
@@ -664,7 +664,7 @@ 
 	 * @return boolean
 	 */
 	public function is_upcoming() {
-		return ( $this->get_raw( 'DTT_EVT_start' ) > time() );
+		return ($this->get_raw('DTT_EVT_start') > time());
 	}
 
 
@@ -674,7 +674,7 @@ 
 	 * @return boolean
 	 */
 	public function is_active() {
-		return ( $this->get_raw( 'DTT_EVT_start' ) < time() && $this->get_raw( 'DTT_EVT_end' ) > time() );
+		return ($this->get_raw('DTT_EVT_start') < time() && $this->get_raw('DTT_EVT_end') > time());
 	}
 
 
@@ -684,7 +684,7 @@ 
 	 * @return boolean
 	 */
 	public function is_expired() {
-		return ( $this->get_raw( 'DTT_EVT_end' ) < time() );
+		return ($this->get_raw('DTT_EVT_end') < time());
 	}
 
 
@@ -695,16 +695,16 @@ 
 	 */
 	public function get_active_status() {
 		$total_tickets_for_this_dtt = $this->total_tickets_available_at_this_datetime();
-		if ( $total_tickets_for_this_dtt !== FALSE && $total_tickets_for_this_dtt < 1 ) {
+		if ($total_tickets_for_this_dtt !== FALSE && $total_tickets_for_this_dtt < 1) {
 			return EE_Datetime::sold_out;
 		}
-		if ( $this->is_expired() ) {
+		if ($this->is_expired()) {
 			return EE_Datetime::expired;
 		}
-		if ( $this->is_upcoming() ) {
+		if ($this->is_upcoming()) {
 			return EE_Datetime::upcoming;
 		}
-		if ( $this->is_active() ) {
+		if ($this->is_active()) {
 			return EE_Datetime::active;
 		}
 		return NULL;
@@ -718,24 +718,24 @@ 
 	 * @param  boolean $use_dtt_name if TRUE then we'll use DTT->name() if its not empty.
 	 * @return string
 	 */
-	public function get_dtt_display_name( $use_dtt_name = FALSE ) {
-		if ( $use_dtt_name ) {
+	public function get_dtt_display_name($use_dtt_name = FALSE) {
+		if ($use_dtt_name) {
 			$dtt_name = $this->name();
-			if ( !empty( $dtt_name ) ) {
+			if ( ! empty($dtt_name)) {
 				return $dtt_name;
 			}
 		}
 		//first condition is to see if the months are different
-		if ( date( 'm', $this->get_raw( 'DTT_EVT_start' ) ) != date( 'm', $this->get_raw( 'DTT_EVT_end' ) ) ) {
-			$display_date = $this->start_date( 'M j\, Y g:i a' ) . ' - ' . $this->end_date( 'M j\, Y g:i a' );
+		if (date('m', $this->get_raw('DTT_EVT_start')) != date('m', $this->get_raw('DTT_EVT_end'))) {
+			$display_date = $this->start_date('M j\, Y g:i a').' - '.$this->end_date('M j\, Y g:i a');
 			//next condition is if its the same month but different day
 		}
 		else {
-			if ( date( 'm', $this->get_raw( 'DTT_EVT_start' ) ) == date( 'm', $this->get_raw( 'DTT_EVT_end' ) ) && date( 'd', $this->get_raw( 'DTT_EVT_start' ) ) != date( 'd', $this->get_raw( 'DTT_EVT_end' ) ) ) {
-				$display_date = $this->start_date( 'M j\, g:i a' ) . ' - ' . $this->end_date( 'M j\, g:i a Y' );
+			if (date('m', $this->get_raw('DTT_EVT_start')) == date('m', $this->get_raw('DTT_EVT_end')) && date('d', $this->get_raw('DTT_EVT_start')) != date('d', $this->get_raw('DTT_EVT_end'))) {
+				$display_date = $this->start_date('M j\, g:i a').' - '.$this->end_date('M j\, g:i a Y');
 			}
 			else {
-				$display_date = $this->start_date( 'F j\, Y' ) . ' @ ' . $this->start_date( 'g:i a' ) . ' - ' . $this->end_date( 'g:i a' );
+				$display_date = $this->start_date('F j\, Y').' @ '.$this->start_date('g:i a').' - '.$this->end_date('g:i a');
 			}
 		}
 		return $display_date;
@@ -749,8 +749,8 @@ 
 *@param array $query_params see EEM_Base::get_all()
 	 * @return EE_Ticket[]
 	 */
-	public function tickets( $query_params = array() ) {
-		return $this->get_many_related( 'Ticket', $query_params );
+	public function tickets($query_params = array()) {
+		return $this->get_many_related('Ticket', $query_params);
 	}
 
 
@@ -760,21 +760,21 @@ 
 	 * @param array $query_params like EEM_Base::get_all's
 	 * @return EE_Ticket[]
 	 */
-	public function ticket_types_available_for_purchase( $query_params = array() ) {
+	public function ticket_types_available_for_purchase($query_params = array()) {
 		// first check if datetime is valid
-		if ( !( $this->is_upcoming() || $this->is_active() ) || $this->sold_out() ) {
+		if ( ! ($this->is_upcoming() || $this->is_active()) || $this->sold_out()) {
 			return array();
 		}
-		if ( empty( $query_params ) ) {
+		if (empty($query_params)) {
 			$query_params = array(
 				array(
-					'TKT_start_date' => array( '<=', EEM_Ticket::instance()->current_time_for_query( 'TKT_start_date' ) ),
-					'TKT_end_date'   => array( '>=', EEM_Ticket::instance()->current_time_for_query( 'TKT_end_date' ) ),
+					'TKT_start_date' => array('<=', EEM_Ticket::instance()->current_time_for_query('TKT_start_date')),
+					'TKT_end_date'   => array('>=', EEM_Ticket::instance()->current_time_for_query('TKT_end_date')),
 					'TKT_deleted'    => false
 				)
 			);
 		}
-		return $this->tickets( $query_params );
+		return $this->tickets($query_params);
 	}
 
 
@@ -784,7 +784,7 @@ 
 	 * @return EE_Event
 	 */
 	public function event() {
-		return $this->get_first_related( 'Event' );
+		return $this->get_first_related('Event');
 	}
 
 
@@ -796,13 +796,13 @@ 
 	 */
 	public function update_sold() {
 		$count_regs_for_this_datetime = EEM_Registration::instance()->count(
-			array( array(
+			array(array(
 				'STS_ID' 					=> EEM_Registration::status_id_approved,
 				'REG_deleted' 				=> 0,
 				'Ticket.Datetime.DTT_ID' 	=> $this->ID(),
-			) )
+			))
 		);
-		$this->set( 'DTT_sold', $count_regs_for_this_datetime );
+		$this->set('DTT_sold', $count_regs_for_this_datetime);
 		$this->save();
 		return $count_regs_for_this_datetime;
 	}

core/db_classes/EE_Ticket.class.php

Spacing +181 added lines, -181 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -66,9 +66,9 @@ 
 	 *                             		    date_format and the second value is the time format
 	 * @return EE_Ticket
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
 	}
 
 
@@ -79,8 +79,8 @@ 
 	 *                          		the website will be used.
 	 * @return EE_Ticket
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 
 
@@ -89,7 +89,7 @@ 
 	 * @return bool
 	 */
 	public function parent() {
-		return $this->get( 'TKT_parent' );
+		return $this->get('TKT_parent');
 	}
 
 
@@ -99,13 +99,13 @@ 
 	 * @param  int $DTT_ID the primary key for a particular datetime
 	 * @return boolean
 	 */
-	public function available( $DTT_ID = 0 ) {
+	public function available($DTT_ID = 0) {
 		// are we checking availability for a particular datetime ?
-		if ( $DTT_ID ) {
+		if ($DTT_ID) {
 			// get that datetime object
-			$datetime = $this->get_first_related( 'Datetime', array( array( 'DTT_ID' => $DTT_ID ) ) );
+			$datetime = $this->get_first_related('Datetime', array(array('DTT_ID' => $DTT_ID)));
 			// if  ticket sales for this datetime have exceeded the reg limit...
-			if ( $datetime instanceof EE_Datetime && $datetime->sold_out() ) {
+			if ($datetime instanceof EE_Datetime && $datetime->sold_out()) {
 				return FALSE;
 			}
 		}
@@ -120,21 +120,21 @@ 
 	 * @param bool $display true = we'll return a localized string, otherwise we just return the value of the relevant status const
 	 * @return mixed(int|string) status int if the display string isn't requested
 	 */
-	public function ticket_status( $display = FALSE ) {
-		if ( ! $this->is_remaining() ) {
-			return $display ? EEH_Template::pretty_status( EE_Ticket::sold_out, FALSE, 'sentence' ) : EE_Ticket::sold_out;
+	public function ticket_status($display = FALSE) {
+		if ( ! $this->is_remaining()) {
+			return $display ? EEH_Template::pretty_status(EE_Ticket::sold_out, FALSE, 'sentence') : EE_Ticket::sold_out;
 		}
-		if ( $this->get( 'TKT_deleted' ) ) {
-			return $display ? EEH_Template::pretty_status( EE_Ticket::archived, FALSE, 'sentence' ) : EE_Ticket::archived;
+		if ($this->get('TKT_deleted')) {
+			return $display ? EEH_Template::pretty_status(EE_Ticket::archived, FALSE, 'sentence') : EE_Ticket::archived;
 		}
-		if ( $this->is_expired() ) {
-			return $display ? EEH_Template::pretty_status( EE_Ticket::expired, FALSE, 'sentence' ) : EE_Ticket::expired;
+		if ($this->is_expired()) {
+			return $display ? EEH_Template::pretty_status(EE_Ticket::expired, FALSE, 'sentence') : EE_Ticket::expired;
 		}
-		if ( $this->is_pending() ) {
-			return $display ? EEH_Template::pretty_status( EE_Ticket::pending, FALSE, 'sentence' ) : EE_Ticket::pending;
+		if ($this->is_pending()) {
+			return $display ? EEH_Template::pretty_status(EE_Ticket::pending, FALSE, 'sentence') : EE_Ticket::pending;
 		}
-		if ( $this->is_on_sale() ) {
-			return $display ? EEH_Template::pretty_status( EE_Ticket::onsale, FALSE, 'sentence' ) : EE_Ticket::onsale;
+		if ($this->is_on_sale()) {
+			return $display ? EEH_Template::pretty_status(EE_Ticket::onsale, FALSE, 'sentence') : EE_Ticket::onsale;
 		}
 		return '';
 	}
@@ -148,12 +148,12 @@ 
 	 * @param  int $DTT_ID if an int above 0 is included here then we get a specific dtt.
 	 * @return boolean         true = tickets remaining, false not.
 	 */
-	public function is_remaining( $DTT_ID = 0 ) {
-		$num_remaining = $this->remaining( $DTT_ID );
-		if ( $num_remaining === 0 ) {
+	public function is_remaining($DTT_ID = 0) {
+		$num_remaining = $this->remaining($DTT_ID);
+		if ($num_remaining === 0) {
 			return FALSE;
 		}
-		if ( $num_remaining > 0 && $num_remaining < $this->min() ) {
+		if ($num_remaining > 0 && $num_remaining < $this->min()) {
 			return FALSE;
 		}
 		return TRUE;
@@ -167,25 +167,25 @@ 
 	 *                     all related datetimes
 	 * @return int
 	 */
-	public function remaining( $DTT_ID = 0 ) {
+	public function remaining($DTT_ID = 0) {
 		// are we checking availability for a particular datetime ?
-		if ( $DTT_ID ) {
+		if ($DTT_ID) {
 			// get array with the one requested datetime
-			$datetimes = $this->get_many_related( 'Datetime', array( array( 'DTT_ID' => $DTT_ID ) ) );
+			$datetimes = $this->get_many_related('Datetime', array(array('DTT_ID' => $DTT_ID)));
 		} else {
 			// we need to check availability of ALL datetimes
-			$datetimes = $this->get_many_related( 'Datetime', array( 'order_by' => array( 'DTT_EVT_start' => 'ASC' ) ) );
+			$datetimes = $this->get_many_related('Datetime', array('order_by' => array('DTT_EVT_start' => 'ASC')));
 		}
 		//		d( $datetimes );
 		// if datetime reg limit is not unlimited
-		if ( ! empty( $datetimes ) ) {
+		if ( ! empty($datetimes)) {
 			// although TKT_qty and $datetime->spaces_remaining() could both be EE_INF
 			// we only need to check for EE_INF explicitly if we want to optimize.
 			// because EE_INF - x = EE_INF; and min(x,EE_INF) = x;
 			$tickets_remaining = $this->qty() - $this->sold();
-			foreach ( $datetimes as $datetime ) {
-				if ( $datetime instanceof EE_Datetime ) {
-					$tickets_remaining = min( $tickets_remaining, $datetime->spaces_remaining() );
+			foreach ($datetimes as $datetime) {
+				if ($datetime instanceof EE_Datetime) {
+					$tickets_remaining = min($tickets_remaining, $datetime->spaces_remaining());
 				}
 			}
 			return $tickets_remaining;
@@ -200,7 +200,7 @@ 
 	 * @return int
 	 */
 	function min() {
-		return $this->get( 'TKT_min' );
+		return $this->get('TKT_min');
 	}
 
 
@@ -210,7 +210,7 @@ 
 	 * @return boolean
 	 */
 	public function is_expired() {
-		return ( $this->get_raw( 'TKT_end_date' ) < time() );
+		return ($this->get_raw('TKT_end_date') < time());
 	}
 
 
@@ -220,7 +220,7 @@ 
 	 * @return boolean
 	 */
 	public function is_pending() {
-		return ( $this->get_raw( 'TKT_start_date' ) > time() );
+		return ($this->get_raw('TKT_start_date') > time());
 	}
 
 
@@ -230,7 +230,7 @@ 
 	 * @return boolean
 	 */
 	public function is_on_sale() {
-		return ( $this->get_raw( 'TKT_start_date' ) < time() && $this->get_raw( 'TKT_end_date' ) > time() );
+		return ($this->get_raw('TKT_start_date') < time() && $this->get_raw('TKT_end_date') > time());
 	}
 
 
@@ -241,11 +241,11 @@ 
 	 * @param string 	$conjunction - conjunction junction what's your function ? this string joins the start date with the end date ie: Jan 01 "to" Dec 31
 	 * @return array
 	 */
-	public function date_range( $dt_frmt = '', $conjunction = ' - ' ) {
-		$first_date = $this->first_datetime() instanceof EE_Datetime ? $this->first_datetime()->start_date( $dt_frmt ) : '';
-		$last_date = $this->last_datetime() instanceof EE_Datetime ? $this->last_datetime()->end_date( $dt_frmt ) : '';
+	public function date_range($dt_frmt = '', $conjunction = ' - ') {
+		$first_date = $this->first_datetime() instanceof EE_Datetime ? $this->first_datetime()->start_date($dt_frmt) : '';
+		$last_date = $this->last_datetime() instanceof EE_Datetime ? $this->last_datetime()->end_date($dt_frmt) : '';
 
-		return $first_date && $last_date ? $first_date . $conjunction  . $last_date : '';
+		return $first_date && $last_date ? $first_date.$conjunction.$last_date : '';
 	}
 
 
@@ -255,8 +255,8 @@ 
 	 * @return EE_Datetime
 	 */
 	public function first_datetime() {
-		$datetimes = $this->datetimes( array( 'limit' => 1 ) );
-		return reset( $datetimes );
+		$datetimes = $this->datetimes(array('limit' => 1));
+		return reset($datetimes);
 	}
 
 
@@ -267,11 +267,11 @@ 
 	 * @param array $query_params see EEM_Base::get_all()
 	 * @return EE_Datetime[]
 	 */
-	public function datetimes( $query_params = array() ) {
-		if ( ! isset( $query_params[ 'order_by' ] ) ) {
-			$query_params[ 'order_by' ][ 'DTT_order' ] = 'ASC';
+	public function datetimes($query_params = array()) {
+		if ( ! isset($query_params['order_by'])) {
+			$query_params['order_by']['DTT_order'] = 'ASC';
 		}
-		return $this->get_many_related( 'Datetime', $query_params );
+		return $this->get_many_related('Datetime', $query_params);
 	}
 
 
@@ -281,8 +281,8 @@ 
 	 * @return EE_Datetime
 	 */
 	public function last_datetime() {
-		$datetimes = $this->datetimes( array( 'limit' => 1, 'order_by' => array( 'DTT_EVT_start' => 'DESC' ) ) );
-		return end( $datetimes );
+		$datetimes = $this->datetimes(array('limit' => 1, 'order_by' => array('DTT_EVT_start' => 'DESC')));
+		return end($datetimes);
 	}
 
 
@@ -296,22 +296,22 @@ 
 	 * @param  int    $dtt_id [optional] include the dtt_id with $what = 'datetime'.
 	 * @return mixed (array|int)          how many tickets have sold
 	 */
-	public function tickets_sold( $what = 'ticket', $dtt_id = NULL ) {
+	public function tickets_sold($what = 'ticket', $dtt_id = NULL) {
 		$total = 0;
 		$tickets_sold = $this->_all_tickets_sold();
-		switch ( $what ) {
+		switch ($what) {
 			case 'ticket' :
-				return $tickets_sold[ 'ticket' ];
+				return $tickets_sold['ticket'];
 				break;
 			case 'datetime' :
-				if ( empty( $tickets_sold[ 'datetime' ] ) ) {
+				if (empty($tickets_sold['datetime'])) {
 					return $total;
 				}
-				if ( ! empty( $dtt_id ) && ! isset( $tickets_sold[ 'datetime' ][ $dtt_id ] ) ) {
-					EE_Error::add_error( __( "You've requested the amount of tickets sold for a given ticket and datetime, however there are no records for the datetime id you included.  Are you SURE that is a datetime related to this ticket?", "event_espresso" ), __FILE__, __FUNCTION__, __LINE__ );
+				if ( ! empty($dtt_id) && ! isset($tickets_sold['datetime'][$dtt_id])) {
+					EE_Error::add_error(__("You've requested the amount of tickets sold for a given ticket and datetime, however there are no records for the datetime id you included.  Are you SURE that is a datetime related to this ticket?", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
 					return $total;
 				}
-				return empty( $dtt_id ) ? $tickets_sold[ 'datetime' ] : $tickets_sold[ 'datetime' ][ $dtt_id ];
+				return empty($dtt_id) ? $tickets_sold['datetime'] : $tickets_sold['datetime'][$dtt_id];
 				break;
 			default:
 				return $total;
@@ -325,15 +325,15 @@ 
 	 * @return EE_Ticket[]
 	 */
 	protected function _all_tickets_sold() {
-		$datetimes = $this->get_many_related( 'Datetime' );
+		$datetimes = $this->get_many_related('Datetime');
 		$tickets_sold = array();
-		if ( ! empty( $datetimes ) ) {
-			foreach ( $datetimes as $datetime ) {
-				$tickets_sold[ 'datetime' ][ $datetime->ID() ] = $datetime->get( 'DTT_sold' );
+		if ( ! empty($datetimes)) {
+			foreach ($datetimes as $datetime) {
+				$tickets_sold['datetime'][$datetime->ID()] = $datetime->get('DTT_sold');
 			}
 		}
 		//Tickets sold
-		$tickets_sold[ 'ticket' ] = $this->sold();
+		$tickets_sold['ticket'] = $this->sold();
 		return $tickets_sold;
 	}
 
@@ -346,9 +346,9 @@ 
 	 * @param  bool $return_array whether to return as an array indexed by price id or just the object.
 	 * @return EE_Price
 	 */
-	public function base_price( $return_array = FALSE ) {
-		$_where = array( 'Price_Type.PBT_ID' => EEM_Price_Type::base_type_base_price );
-		return $return_array ? $this->get_many_related( 'Price', array( $_where ) ) : $this->get_first_related( 'Price', array( $_where ) );
+	public function base_price($return_array = FALSE) {
+		$_where = array('Price_Type.PBT_ID' => EEM_Price_Type::base_type_base_price);
+		return $return_array ? $this->get_many_related('Price', array($_where)) : $this->get_first_related('Price', array($_where));
 	}
 
 
@@ -360,8 +360,8 @@ 
 	 * @return EE_Price[]
 	 */
 	public function price_modifiers() {
-		$query_params = array( 0 => array( 'Price_Type.PBT_ID' => array( 'NOT IN', array( EEM_Price_Type::base_type_base_price, EEM_Price_Type::base_type_tax ) ) ) );
-		return $this->prices( $query_params );
+		$query_params = array(0 => array('Price_Type.PBT_ID' => array('NOT IN', array(EEM_Price_Type::base_type_base_price, EEM_Price_Type::base_type_tax))));
+		return $this->prices($query_params);
 	}
 
 
@@ -371,8 +371,8 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return EE_Price[]
 	 */
-	public function prices( $query_params = array() ) {
-		return $this->get_many_related( 'Price', $query_params );
+	public function prices($query_params = array()) {
+		return $this->get_many_related('Price', $query_params);
 	}
 
 
@@ -382,8 +382,8 @@ 
 	 * @param array $query_params see EEM_Base::get_all()
 	 * @return EE_Datetime_Ticket
 	 */
-	public function datetime_tickets( $query_params = array() ) {
-		return $this->get_many_related( 'Datetime_Ticket', $query_params );
+	public function datetime_tickets($query_params = array()) {
+		return $this->get_many_related('Datetime_Ticket', $query_params);
 	}
 
 
@@ -394,8 +394,8 @@ 
 	 * @param boolean $show_deleted
 	 * @return EE_Datetime[]
 	 */
-	public function datetimes_ordered( $show_expired = TRUE, $show_deleted = FALSE ) {
-		return EEM_Datetime::instance( $this->_timezone )->get_datetimes_for_ticket_ordered_by_DTT_order( $this->ID(), $show_expired, $show_deleted );
+	public function datetimes_ordered($show_expired = TRUE, $show_deleted = FALSE) {
+		return EEM_Datetime::instance($this->_timezone)->get_datetimes_for_ticket_ordered_by_DTT_order($this->ID(), $show_expired, $show_deleted);
 	}
 
 
@@ -405,7 +405,7 @@ 
 	 * @return string
 	 */
 	function ID() {
-		return $this->get( 'TKT_ID' );
+		return $this->get('TKT_ID');
 	}
 
 
@@ -429,7 +429,7 @@ 
 	 * @return EE_Ticket_Template
 	 */
 	public function template() {
-		return $this->get_first_related( 'Ticket_Template' );
+		return $this->get_first_related('Ticket_Template');
 	}
 
 
@@ -448,7 +448,7 @@ 
 	 * @return bool
 	 */
 	public function ticket_price() {
-		return $this->get( 'TKT_price' );
+		return $this->get('TKT_price');
 	}
 
 
@@ -457,7 +457,7 @@ 
 	 * @return mixed
 	 */
 	public function pretty_price() {
-		return $this->get_pretty( 'TKT_price' );
+		return $this->get_pretty('TKT_price');
 	}
 
 
@@ -476,17 +476,17 @@ 
 	 * @param bool $no_cache
 	 * @return float
 	 */
-	public function get_ticket_total_with_taxes( $no_cache = FALSE ) {
-		if ( ! isset( $this->_ticket_total_with_taxes ) || $no_cache ) {
+	public function get_ticket_total_with_taxes($no_cache = FALSE) {
+		if ( ! isset($this->_ticket_total_with_taxes) || $no_cache) {
 			$this->_ticket_total_with_taxes = $this->get_ticket_subtotal() + $this->get_ticket_taxes_total_for_admin();
 		}
-		return (float)$this->_ticket_total_with_taxes;
+		return (float) $this->_ticket_total_with_taxes;
 	}
 
 
 
 	public function ensure_TKT_Price_correct() {
-		$this->set( 'TKT_price', EE_Taxes::get_subtotal_for_admin( $this ) );
+		$this->set('TKT_price', EE_Taxes::get_subtotal_for_admin($this));
 		$this->save();
 	}
 
@@ -496,7 +496,7 @@ 
 	 * @return float
 	 */
 	public function get_ticket_subtotal() {
-		return EE_Taxes::get_subtotal_for_admin( $this );
+		return EE_Taxes::get_subtotal_for_admin($this);
 	}
 
 
@@ -506,7 +506,7 @@ 
 	 * @return float
 	 */
 	public function get_ticket_taxes_total_for_admin() {
-		return EE_Taxes::get_total_taxes_for_admin( $this );
+		return EE_Taxes::get_total_taxes_for_admin($this);
 	}
 
 
@@ -516,8 +516,8 @@ 
 	 * @param string $name
 	 * @return boolean
 	 */
-	function set_name( $name ) {
-		$this->set( 'TKT_name', $name );
+	function set_name($name) {
+		$this->set('TKT_name', $name);
 	}
 
 
@@ -527,7 +527,7 @@ 
 	 * @return string
 	 */
 	function description() {
-		return $this->get( 'TKT_description' );
+		return $this->get('TKT_description');
 	}
 
 
@@ -537,8 +537,8 @@ 
 	 * @param string $description
 	 * @return boolean
 	 */
-	function set_description( $description ) {
-		$this->set( 'TKT_description', $description );
+	function set_description($description) {
+		$this->set('TKT_description', $description);
 	}
 
 
@@ -549,8 +549,8 @@ 
 	 * @param string $tm_frmt
 	 * @return string
 	 */
-	function start_date( $dt_frmt = '', $tm_frmt = '' ) {
-		return $this->_get_datetime( 'TKT_start_date', $dt_frmt, $tm_frmt );
+	function start_date($dt_frmt = '', $tm_frmt = '') {
+		return $this->_get_datetime('TKT_start_date', $dt_frmt, $tm_frmt);
 	}
 
 
@@ -560,8 +560,8 @@ 
 	 * @param string $start_date
 	 * @return void
 	 */
-	function set_start_date( $start_date ) {
-		$this->_set_date_time( 'B', $start_date, 'TKT_start_date' );
+	function set_start_date($start_date) {
+		$this->_set_date_time('B', $start_date, 'TKT_start_date');
 	}
 
 
@@ -572,8 +572,8 @@ 
 	 * @param string $tm_frmt
 	 * @return string
 	 */
-	function end_date( $dt_frmt = '', $tm_frmt = '' ) {
-		return $this->_get_datetime( 'TKT_end_date', $dt_frmt, $tm_frmt );
+	function end_date($dt_frmt = '', $tm_frmt = '') {
+		return $this->_get_datetime('TKT_end_date', $dt_frmt, $tm_frmt);
 	}
 
 
@@ -583,8 +583,8 @@ 
 	 * @param string $end_date
 	 * @return void
 	 */
-	function set_end_date( $end_date ) {
-		$this->_set_date_time( 'B', $end_date, 'TKT_end_date' );
+	function set_end_date($end_date) {
+		$this->_set_date_time('B', $end_date, 'TKT_end_date');
 	}
 
 
@@ -596,8 +596,8 @@ 
 	 *
 	 * @param string $time a string representation of the sell until time (ex 9am or 7:30pm)
 	 */
-	function set_end_time( $time ) {
-		$this->_set_time_for( $time, 'TKT_end_date' );
+	function set_end_time($time) {
+		$this->_set_time_for($time, 'TKT_end_date');
 	}
 
 
@@ -607,8 +607,8 @@ 
 	 * @param int $min
 	 * @return boolean
 	 */
-	function set_min( $min ) {
-		$this->set( 'TKT_min', $min );
+	function set_min($min) {
+		$this->set('TKT_min', $min);
 	}
 
 
@@ -618,7 +618,7 @@ 
 	 * @return int
 	 */
 	function max() {
-		return $this->get( 'TKT_max' );
+		return $this->get('TKT_max');
 	}
 
 
@@ -628,8 +628,8 @@ 
 	 * @param int $max
 	 * @return boolean
 	 */
-	function set_max( $max ) {
-		$this->set( 'TKT_max', $max );
+	function set_max($max) {
+		$this->set('TKT_max', $max);
 	}
 
 
@@ -639,8 +639,8 @@ 
 	 * @param float $price
 	 * @return boolean
 	 */
-	function set_price( $price ) {
-		$this->set( 'TKT_price', $price );
+	function set_price($price) {
+		$this->set('TKT_price', $price);
 	}
 
 
@@ -650,7 +650,7 @@ 
 	 * @return int
 	 */
 	function sold() {
-		return $this->get_raw( 'TKT_sold' );
+		return $this->get_raw('TKT_sold');
 	}
 
 
@@ -660,10 +660,10 @@ 
 	 * @param int $qty
 	 * @return boolean
 	 */
-	function increase_sold( $qty = 1 ) {
+	function increase_sold($qty = 1) {
 		$sold = $this->sold() + $qty;
-		$this->_increase_sold_for_datetimes( $qty );
-		return $this->set_sold( $sold );
+		$this->_increase_sold_for_datetimes($qty);
+		return $this->set_sold($sold);
 	}
 
 
@@ -673,12 +673,12 @@ 
 	 * @param int $qty
 	 * @return boolean
 	 */
-	protected function _increase_sold_for_datetimes( $qty = 1 ) {
+	protected function _increase_sold_for_datetimes($qty = 1) {
 		$datetimes = $this->datetimes();
-		if ( is_array( $datetimes ) ) {
-			foreach ( $datetimes as $datetime ) {
-				if ( $datetime instanceof EE_Datetime ) {
-					$datetime->increase_sold( $qty );
+		if (is_array($datetimes)) {
+			foreach ($datetimes as $datetime) {
+				if ($datetime instanceof EE_Datetime) {
+					$datetime->increase_sold($qty);
 					$datetime->save();
 				}
 			}
@@ -692,10 +692,10 @@ 
 	 * @param int $sold
 	 * @return boolean
 	 */
-	function set_sold( $sold ) {
+	function set_sold($sold) {
 		// sold can not go below zero
-		$sold = max( 0, $sold );
-		$this->set( 'TKT_sold', $sold );
+		$sold = max(0, $sold);
+		$this->set('TKT_sold', $sold);
 	}
 
 
@@ -705,10 +705,10 @@ 
 	 * @param int $qty
 	 * @return boolean
 	 */
-	function decrease_sold( $qty = 1 ) {
+	function decrease_sold($qty = 1) {
 		$sold = $this->sold() - $qty;
-		$this->_decrease_sold_for_datetimes( $qty );
-		return $this->set_sold( $sold );
+		$this->_decrease_sold_for_datetimes($qty);
+		return $this->set_sold($sold);
 	}
 
 
@@ -719,12 +719,12 @@ 
 	* @param int $qty
 	* @return boolean
 	*/
-	protected function _decrease_sold_for_datetimes( $qty = 1 ) {
+	protected function _decrease_sold_for_datetimes($qty = 1) {
 		$datetimes = $this->datetimes();
-		if ( is_array( $datetimes ) ) {
-			foreach ( $datetimes as $datetime ) {
-				if ( $datetime instanceof EE_Datetime ) {
-					$datetime->decrease_sold( $qty );
+		if (is_array($datetimes)) {
+			foreach ($datetimes as $datetime) {
+				if ($datetime instanceof EE_Datetime) {
+					$datetime->decrease_sold($qty);
 					$datetime->save();
 				}
 			}
@@ -745,14 +745,14 @@ 
 	 *
 	 * @return int
 	 */
-	function qty( $context = '' ) {
-		switch ( $context ) {
+	function qty($context = '') {
+		switch ($context) {
 			case 'reg_limit' :
 				return $this->real_quantity_on_ticket();
 			case 'saleable' :
-				return $this->real_quantity_on_ticket( 'saleable' );
+				return $this->real_quantity_on_ticket('saleable');
 			default:
-				return $this->get_raw( 'TKT_qty' );
+				return $this->get_raw('TKT_qty');
 		}
 	}
 
@@ -769,38 +769,38 @@ 
 	 *
 	 * @return int
 	 */
-	function real_quantity_on_ticket( $context = 'reg_limit' ) {
+	function real_quantity_on_ticket($context = 'reg_limit') {
 		// start with the original db value for ticket quantity
-		$raw = $this->get_raw( 'TKT_qty' );
+		$raw = $this->get_raw('TKT_qty');
 		// return immediately if it's zero
-		if ( $raw === 0 ) {
+		if ($raw === 0) {
 			return $raw;
 		}
 		// ensure qty doesn't exceed raw value for THIS ticket
-		$qty = min( EE_INF, $raw );
+		$qty = min(EE_INF, $raw);
 		// NOW that we know the  maximum number of tickets available for the ticket
 		// we need to calculate the maximum number of tickets available for the datetime
 		// without really factoring this ticket into the calculations
 		$datetimes = $this->datetimes();
-		foreach ( $datetimes as $datetime ) {
-			if ( $datetime instanceof EE_Datetime ) {
+		foreach ($datetimes as $datetime) {
+			if ($datetime instanceof EE_Datetime) {
 				// initialize with no restrictions for each datetime
 				// but adjust datetime qty based on datetime reg limit
-				$datetime_qty = min( EE_INF, $datetime->reg_limit() );
+				$datetime_qty = min(EE_INF, $datetime->reg_limit());
 				// if we want the actual saleable amount, then we need to consider OTHER ticket sales
 				// for this datetime, that do NOT include sales for this ticket (so we add THIS ticket's sales back in)
-				if ( $context == 'saleable' ) {
-					$datetime_qty = max( $datetime_qty - $datetime->sold() + $this->sold(), 0 );
+				if ($context == 'saleable') {
+					$datetime_qty = max($datetime_qty - $datetime->sold() + $this->sold(), 0);
 					$datetime_qty = ! $datetime->sold_out() ? $datetime_qty : 0;
 				}
-				$qty = min( $datetime_qty, $qty );
+				$qty = min($datetime_qty, $qty);
 			}
 
 		}
 		// we need to factor in the details for this specific ticket
-		if ( $qty > 0 && $context == 'saleable' ) {
+		if ($qty > 0 && $context == 'saleable') {
 			// and subtract the sales for THIS ticket
-			$qty = max( $qty - $this->sold(), 0 );
+			$qty = max($qty - $this->sold(), 0);
 			//echo '&nbsp; $qty: ' . $qty . "<br />";
 		}
 		//echo '$qty: ' . $qty . "<br />";
@@ -816,14 +816,14 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	function set_qty( $qty ) {
+	function set_qty($qty) {
 		$datetimes = $this->datetimes();
-		foreach ( $datetimes as $datetime ) {
-			if ( $datetime instanceof EE_Datetime ) {
-				$qty = min( $qty, $datetime->reg_limit() );
+		foreach ($datetimes as $datetime) {
+			if ($datetime instanceof EE_Datetime) {
+				$qty = min($qty, $datetime->reg_limit());
 			}
 		}
-		$this->set( 'TKT_qty', $qty );
+		$this->set('TKT_qty', $qty);
 	}
 
 
@@ -833,7 +833,7 @@ 
 	 * @return int
 	 */
 	function uses() {
-		return $this->get( 'TKT_uses' );
+		return $this->get('TKT_uses');
 	}
 
 
@@ -843,8 +843,8 @@ 
 	 * @param int $uses
 	 * @return boolean
 	 */
-	function set_uses( $uses ) {
-		$this->set( 'TKT_uses', $uses );
+	function set_uses($uses) {
+		$this->set('TKT_uses', $uses);
 	}
 
 
@@ -854,7 +854,7 @@ 
 	 * @return boolean
 	 */
 	public function required() {
-		return $this->get( 'TKT_required' );
+		return $this->get('TKT_required');
 	}
 
 
@@ -864,8 +864,8 @@ 
 	 * @param boolean $required
 	 * @return boolean
 	 */
-	public function set_required( $required ) {
-		$this->set( 'TKT_required', $required );
+	public function set_required($required) {
+		$this->set('TKT_required', $required);
 	}
 
 
@@ -875,7 +875,7 @@ 
 	 * @return boolean
 	 */
 	function taxable() {
-		return $this->get( 'TKT_taxable' );
+		return $this->get('TKT_taxable');
 	}
 
 
@@ -885,8 +885,8 @@ 
 	 * @param boolean $taxable
 	 * @return boolean
 	 */
-	function set_taxable( $taxable ) {
-		$this->set( 'TKT_taxable', $taxable );
+	function set_taxable($taxable) {
+		$this->set('TKT_taxable', $taxable);
 	}
 
 
@@ -896,7 +896,7 @@ 
 	 * @return boolean
 	 */
 	function is_default() {
-		return $this->get( 'TKT_is_default' );
+		return $this->get('TKT_is_default');
 	}
 
 
@@ -906,8 +906,8 @@ 
 	 * @param boolean $is_default
 	 * @return boolean
 	 */
-	function set_is_default( $is_default ) {
-		$this->set( 'TKT_is_default', $is_default );
+	function set_is_default($is_default) {
+		$this->set('TKT_is_default', $is_default);
 	}
 
 
@@ -917,7 +917,7 @@ 
 	 * @return int
 	 */
 	function order() {
-		return $this->get( 'TKT_order' );
+		return $this->get('TKT_order');
 	}
 
 
@@ -927,8 +927,8 @@ 
 	 * @param int $order
 	 * @return boolean
 	 */
-	function set_order( $order ) {
-		$this->set( 'TKT_order', $order );
+	function set_order($order) {
+		$this->set('TKT_order', $order);
 	}
 
 
@@ -938,7 +938,7 @@ 
 	 * @return int
 	 */
 	function row() {
-		return $this->get( 'TKT_row' );
+		return $this->get('TKT_row');
 	}
 
 
@@ -948,8 +948,8 @@ 
 	 * @param int $row
 	 * @return boolean
 	 */
-	function set_row( $row ) {
-		$this->set( 'TKT_row', $row );
+	function set_row($row) {
+		$this->set('TKT_row', $row);
 	}
 
 
@@ -959,7 +959,7 @@ 
 	 * @return boolean
 	 */
 	function deleted() {
-		return $this->get( 'TKT_deleted' );
+		return $this->get('TKT_deleted');
 	}
 
 
@@ -969,8 +969,8 @@ 
 	 * @param boolean $deleted
 	 * @return boolean
 	 */
-	function set_deleted( $deleted ) {
-		$this->set( 'TKT_deleted', $deleted );
+	function set_deleted($deleted) {
+		$this->set('TKT_deleted', $deleted);
 	}
 
 
@@ -980,7 +980,7 @@ 
 	 * @return int
 	 */
 	function parent_ID() {
-		return $this->get( 'TKT_parent' );
+		return $this->get('TKT_parent');
 	}
 
 
@@ -990,8 +990,8 @@ 
 	 * @param int $parent
 	 * @return boolean
 	 */
-	function set_parent_ID( $parent ) {
-		$this->set( 'TKT_parent', $parent );
+	function set_parent_ID($parent) {
+		$this->set('TKT_parent', $parent);
 	}
 
 
@@ -1002,10 +1002,10 @@ 
 	 */
 	function name_and_info() {
 		$times = array();
-		foreach ( $this->datetimes() as $datetime ) {
+		foreach ($this->datetimes() as $datetime) {
 			$times[] = $datetime->start_date_and_time();
 		}
-		return $this->name() . " @ " . implode( ", ", $times ) . " for " . $this->price();
+		return $this->name()." @ ".implode(", ", $times)." for ".$this->price();
 	}
 
 
@@ -1015,7 +1015,7 @@ 
 	 * @return string
 	 */
 	function name() {
-		return $this->get( 'TKT_name' );
+		return $this->get('TKT_name');
 	}
 
 
@@ -1025,7 +1025,7 @@ 
 	 * @return float
 	 */
 	function price() {
-		return $this->get( 'TKT_price' );
+		return $this->get('TKT_price');
 	}
 
 
@@ -1035,8 +1035,8 @@ 
 	 * @param array $query_params like EEM_Base::get_all's
 	 * @return EE_Registration[]
 	 */
-	public function registrations( $query_params = array() ) {
-		return $this->get_many_related( 'Registration', $query_params );
+	public function registrations($query_params = array()) {
+		return $this->get_many_related('Registration', $query_params);
 	}
 
 
@@ -1047,8 +1047,8 @@ 
 	 * @return int
 	 */
 	public function update_tickets_sold() {
-		$count_regs_for_this_ticket = $this->count_registrations( array( array( 'STS_ID' => EEM_Registration::status_id_approved, 'REG_deleted' => 0 ) ) );
-		$this->set_sold( $count_regs_for_this_ticket );
+		$count_regs_for_this_ticket = $this->count_registrations(array(array('STS_ID' => EEM_Registration::status_id_approved, 'REG_deleted' => 0)));
+		$this->set_sold($count_regs_for_this_ticket);
 		$this->save();
 		return $count_regs_for_this_ticket;
 	}
@@ -1060,7 +1060,7 @@ 
 	 * @param array $query_params like EEM_Base::get_all's
 	 * @return int
 	 */
-	public function count_registrations( $query_params = array() ) {
+	public function count_registrations($query_params = array()) {
 		return $this->count_related('Registration', $query_params);
 	}
 
@@ -1085,7 +1085,7 @@ 
 	public function get_related_event() {
 		//get one datetime to use for getting the event
 		$datetime = $this->first_datetime();
-		if ( $datetime instanceof EE_Datetime ) {
+		if ($datetime instanceof EE_Datetime) {
 			return $datetime->event();
 		}
 		return null;

core/db_models/EEM_Ticket.model.php

Spacing +36 added lines, -36 removed lines

@@ -21,8 +21,8 @@ 
  *
  * ------------------------------------------------------------------------
  */
-require_once ( EE_MODELS . 'EEM_Soft_Delete_Base.model.php' );
-require_once ( EE_CLASSES . 'EE_Ticket.class.php' );
+require_once (EE_MODELS.'EEM_Soft_Delete_Base.model.php');
+require_once (EE_CLASSES.'EE_Ticket.class.php');
 
 class EEM_Ticket extends EEM_Soft_Delete_Base {
 
@@ -35,35 +35,35 @@ 
 	 *		@access private
 	 *		@param string $timezone string representing the timezone we want to set for returned Date Time Strings (and any incoming timezone data that gets saved).  Note this just sends the timezone info to the date time model field objects.  Default is NULL (and will be assumed using the set timezone in the 'timezone_string' wp option)
 	 */
-	protected function __construct( $timezone ) {
-		$this->singular_item = __('Ticket','event_espresso');
-		$this->plural_item = __('Tickets','event_espresso');
+	protected function __construct($timezone) {
+		$this->singular_item = __('Ticket', 'event_espresso');
+		$this->plural_item = __('Tickets', 'event_espresso');
 
 		$this->_tables = array(
 			'Ticket'=> new EE_Primary_Table('esp_ticket', 'TKT_ID')
 		);
 		$this->_fields = array(
 			'Ticket'=>array(
-				'TKT_ID'=> new EE_Primary_Key_Int_Field('TKT_ID', __('Ticket ID','event_espresso')),
-				'TTM_ID'=>new EE_Foreign_Key_Int_Field('TTM_ID', __('Ticket Template ID','event_espresso'), false, 0, 'Ticket_Template'),
+				'TKT_ID'=> new EE_Primary_Key_Int_Field('TKT_ID', __('Ticket ID', 'event_espresso')),
+				'TTM_ID'=>new EE_Foreign_Key_Int_Field('TTM_ID', __('Ticket Template ID', 'event_espresso'), false, 0, 'Ticket_Template'),
 				'TKT_name'=>new EE_Plain_Text_Field('TKT_name', __('Ticket Name', 'event_espresso'), false, ''),
-				'TKT_description'=>new EE_Full_HTML_Field('TKT_description', __('Description of Ticket', 'event_espresso'), false, '' ),
-				'TKT_start_date'=>new EE_Datetime_Field('TKT_start_date', __('Start time/date of Ticket','event_espresso'), false, time(), $timezone ),
-				'TKT_end_date'=>new EE_Datetime_Field('TKT_end_date', __('End time/date of Ticket','event_espresso'), false, time(), $timezone ),
-				'TKT_min'=>new EE_Integer_Field('TKT_min', __('Minimum quantity of this ticket that must be purchased', 'event_espresso'), false, 0 ),
-				'TKT_max'=>new EE_Infinite_Integer_Field('TKT_max', __('Maximum quantity of this ticket that can be purchased in one transaction', 'event_espresso'), false, EE_INF ),
+				'TKT_description'=>new EE_Full_HTML_Field('TKT_description', __('Description of Ticket', 'event_espresso'), false, ''),
+				'TKT_start_date'=>new EE_Datetime_Field('TKT_start_date', __('Start time/date of Ticket', 'event_espresso'), false, time(), $timezone),
+				'TKT_end_date'=>new EE_Datetime_Field('TKT_end_date', __('End time/date of Ticket', 'event_espresso'), false, time(), $timezone),
+				'TKT_min'=>new EE_Integer_Field('TKT_min', __('Minimum quantity of this ticket that must be purchased', 'event_espresso'), false, 0),
+				'TKT_max'=>new EE_Infinite_Integer_Field('TKT_max', __('Maximum quantity of this ticket that can be purchased in one transaction', 'event_espresso'), false, EE_INF),
 				'TKT_price'=> new EE_Money_Field('TKT_price', 'Final calculated price for ticket', false, 0),
 				'TKT_sold' => new EE_Integer_Field('TKT_sold', __('Number of this ticket sold', 'event_espresso'), false, 0),
-				'TKT_qty'=>new EE_Infinite_Integer_Field('TKT_qty', __('Quantity of this ticket that is available','event_espresso'), false, EE_INF),
-				'TKT_uses'=>new EE_Infinite_Integer_Field('TKT_uses', __('Number of datetimes this ticket can be used at', 'event_espresso'), false, EE_INF ),
-				'TKT_required'=>new EE_Boolean_Field('TKT_required', __("Flag indicating whether this ticket must be purchased with a transaction", "event_espresso"), false, false ),
-				'TKT_taxable'=>new EE_Boolean_Field('TKT_taxable', __("Flag indicating whether there is tax applied on this ticket", "event_espresso"), false,false),
-				'TKT_is_default'=>new EE_Boolean_Field('TKT_is_default', __('Flag indicating that this ticket is a default ticket', 'event_espresso'), false, false ),
+				'TKT_qty'=>new EE_Infinite_Integer_Field('TKT_qty', __('Quantity of this ticket that is available', 'event_espresso'), false, EE_INF),
+				'TKT_uses'=>new EE_Infinite_Integer_Field('TKT_uses', __('Number of datetimes this ticket can be used at', 'event_espresso'), false, EE_INF),
+				'TKT_required'=>new EE_Boolean_Field('TKT_required', __("Flag indicating whether this ticket must be purchased with a transaction", "event_espresso"), false, false),
+				'TKT_taxable'=>new EE_Boolean_Field('TKT_taxable', __("Flag indicating whether there is tax applied on this ticket", "event_espresso"), false, false),
+				'TKT_is_default'=>new EE_Boolean_Field('TKT_is_default', __('Flag indicating that this ticket is a default ticket', 'event_espresso'), false, false),
 				'TKT_order' => new EE_Integer_Field('TKT_order', __('The order in which the Ticket is displayed in the editor (used for autosaves when the form doesn\'t have the ticket ID yet)', 'event_espresso'), false, 0),
-				'TKT_row' => new EE_Integer_Field('TKT_row', __('How tickets are displayed in the ui', 'event_espresso'), false, 0 ),
+				'TKT_row' => new EE_Integer_Field('TKT_row', __('How tickets are displayed in the ui', 'event_espresso'), false, 0),
 				'TKT_deleted' => new EE_Trashed_Flag_Field('TKT_deleted', __('Flag indicating if this has been archived or not', 'event_espresso'), false, false),
-				'TKT_wp_user' => new EE_WP_User_Field('TKT_wp_user', __('Ticket Creator ID', 'event_espresso'), FALSE ),
-				'TKT_parent' => new EE_Integer_Field('TKT_parent', __('Indicates what TKT_ID is the parent of this TKT_ID (used in autosaves/revisions)'), true, 0 )
+				'TKT_wp_user' => new EE_WP_User_Field('TKT_wp_user', __('Ticket Creator ID', 'event_espresso'), FALSE),
+				'TKT_parent' => new EE_Integer_Field('TKT_parent', __('Indicates what TKT_ID is the parent of this TKT_ID (used in autosaves/revisions)'), true, 0)
 			));
 		$this->_model_relations = array(
 			'Datetime'=>new EE_HABTM_Relation('Datetime_Ticket'),
@@ -75,12 +75,12 @@ 
 		);
 
 		//this model is generally available for reading
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Default_Public('TKT_is_default', 'Datetime.Event');
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Default_Public('TKT_is_default', 'Datetime.Event');
 		//account for default tickets in the caps
-		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Default_Protected( 'TKT_is_default', 'Datetime.Event' );
-		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Default_Protected( 'TKT_is_default', 'Datetime.Event' );
-		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Default_Protected( 'TKT_is_default', 'Datetime.Event' );
-		parent::__construct( $timezone );
+		$this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Default_Protected('TKT_is_default', 'Datetime.Event');
+		$this->_cap_restriction_generators[EEM_Base::caps_edit] = new EE_Restriction_Generator_Default_Protected('TKT_is_default', 'Datetime.Event');
+		$this->_cap_restriction_generators[EEM_Base::caps_delete] = new EE_Restriction_Generator_Default_Protected('TKT_is_default', 'Datetime.Event');
+		parent::__construct($timezone);
 	}
 
 
@@ -91,9 +91,9 @@ 
 	 */
 	public function get_all_default_tickets() {
 		/** @type EE_Ticket[] $tickets */
-		$tickets = $this->get_all( array( array('TKT_is_default' => 1), 'order_by' => array('TKT_order' => 'ASC')) );
+		$tickets = $this->get_all(array(array('TKT_is_default' => 1), 'order_by' => array('TKT_order' => 'ASC')));
 		//we need to set the start date and end date to today's date and the start of the default dtt
-		return $this->_set_default_dates( $tickets );
+		return $this->_set_default_dates($tickets);
 	}
 
 
@@ -103,11 +103,11 @@ 
 	 * @param EE_Ticket[] $tickets
 	 * @return EE_Ticket[]
 	 */
-	private function _set_default_dates( $tickets ) {
-		foreach ( $tickets as $ticket ) {
-			$ticket->set('TKT_start_date', $this->current_time_for_query('TKT_start_date', true) );
-			$ticket->set('TKT_end_date', $this->current_time_for_query( 'TKT_end_date', true ) + (60 * 60 * 24 * 30 ) );
-			$ticket->set_end_time( $this->convert_datetime_for_query( 'TKT_end_date', '11:59 pm', 'g:i a', $this->_timezone ) );
+	private function _set_default_dates($tickets) {
+		foreach ($tickets as $ticket) {
+			$ticket->set('TKT_start_date', $this->current_time_for_query('TKT_start_date', true));
+			$ticket->set('TKT_end_date', $this->current_time_for_query('TKT_end_date', true) + (60 * 60 * 24 * 30));
+			$ticket->set_end_time($this->convert_datetime_for_query('TKT_end_date', '11:59 pm', 'g:i a', $this->_timezone));
 		}
 
 		return $tickets;
@@ -122,8 +122,8 @@ 
 	 * @param array $query_params
 	 * @return int
 	 */
-	public function sum_tickets_currently_available_at_datetime($DTT_ID, $query_params = array()){
-		return EEM_Datetime::instance()->sum_tickets_currently_available_at_datetime( $DTT_ID, $query_params );
+	public function sum_tickets_currently_available_at_datetime($DTT_ID, $query_params = array()) {
+		return EEM_Datetime::instance()->sum_tickets_currently_available_at_datetime($DTT_ID, $query_params);
 	}
 
 
@@ -133,8 +133,8 @@ 
 	 * @param EE_Ticket[] $tickets
 	 * @return void
 	 */
-	public function update_tickets_sold($tickets){
-		foreach($tickets as $ticket){
+	public function update_tickets_sold($tickets) {
+		foreach ($tickets as $ticket) {
 			/* @var  $ticket EE_Ticket */
 			$ticket->update_tickets_sold();
 		}

modules/ticket_selector/templates/ticket_selector_chart.template.php

Spacing +145 added lines, -145 removed lines

@@ -8,32 +8,32 @@ 
 
 $row = 1;
 $max = 1;
-$ticket_count = count( $tickets );
+$ticket_count = count($tickets);
 
-if ( ! $ticket_count ) {
+if ( ! $ticket_count) {
 	return;
 }
 
 $required_ticket_sold_out = FALSE;
-$template_settings = isset ( EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector ) ? EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector : new EE_Ticket_Selector_Config();
+$template_settings = isset (EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector) ? EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector : new EE_Ticket_Selector_Config();
 ob_start();
 
-foreach ( $tickets as $TKT_ID => $ticket ) {
-	if ( $ticket instanceof EE_Ticket ) {
+foreach ($tickets as $TKT_ID => $ticket) {
+	if ($ticket instanceof EE_Ticket) {
 		//	d( $ticket );
-		$max =$ticket->max();
+		$max = $ticket->max();
 		$min = 0;
 		$remaining = $ticket->remaining();
-		if ( $ticket->is_on_sale() && $ticket->is_remaining() ) {
+		if ($ticket->is_on_sale() && $ticket->is_remaining()) {
 			// offer the number of $tickets_remaining or $max_atndz, whichever is smaller
-			$max = min( $remaining, $max_atndz );
+			$max = min($remaining, $max_atndz);
 			// but... we also want to restrict the number of tickets by the ticket max setting,
 			// however, the max still can't be higher than what was just set above
-			$max = $ticket->max() > 0 ? min( $ticket->max(), $max ) : $max;
+			$max = $ticket->max() > 0 ? min($ticket->max(), $max) : $max;
 			// and we also want to restrict the minimum number of tickets by the ticket min setting
 			$min = $ticket->min() > 0 ? $ticket->min() : 0;
 			// and if the ticket is required, then make sure that min qty is at least 1
-			$min = $ticket->required() ? max( $min, 1 ) : $min;
+			$min = $ticket->required() ? max($min, 1) : $min;
 		} else {
 			// set flag if ticket is required (flag is set to start date so that future tickets are not blocked)
 			$required_ticket_sold_out = $ticket->required() && ! $remaining ? $ticket->start_date() : $required_ticket_sold_out;
@@ -42,40 +42,40 @@ 
 		$ticket_price = $ticket->get_ticket_total_with_taxes();
 		$ticket_bundle = FALSE;
 		// for ticket bundles, set min and max qty the same
-		if ( $ticket->min() != 0 && $ticket->min() == $ticket->max() ) {
+		if ($ticket->min() != 0 && $ticket->min() == $ticket->max()) {
 			$ticket_price = $ticket_price * $ticket->min();
 			$ticket_bundle = TRUE;
 		}
-		$ticket_price = apply_filters( 'FHEE__ticket_selector_chart_template__ticket_price', $ticket_price, $ticket );
+		$ticket_price = apply_filters('FHEE__ticket_selector_chart_template__ticket_price', $ticket_price, $ticket);
 		// if a previous required ticket with the same sale start date is sold out, then mark this ticket as sold out as well.
 		// tickets that go on sale at a later date than the required ticket  will NOT be affected
 		$tkt_status = $required_ticket_sold_out !== FALSE && $required_ticket_sold_out === $ticket->start_date() ? EE_Ticket::sold_out : $ticket->ticket_status();
 		$tkt_status = $event_status === EE_Datetime::sold_out ? EE_Ticket::sold_out : $tkt_status;
 		// check ticket status
-		switch ( $tkt_status ) {
+		switch ($tkt_status) {
 			// sold_out
 			case EE_Ticket::sold_out :
-				$ticket_status = '<span class="ticket-sales-sold-out">' . $ticket->ticket_status( TRUE ) . '</span>';
+				$ticket_status = '<span class="ticket-sales-sold-out">'.$ticket->ticket_status(TRUE).'</span>';
 				$status_class = 'ticket-sales-sold-out lt-grey-text';
 			break;
 			// expired
 			case EE_Ticket::expired :
-				$ticket_status = '<span class="ticket-sales-expired">' . $ticket->ticket_status( TRUE ) . '</span>';
+				$ticket_status = '<span class="ticket-sales-expired">'.$ticket->ticket_status(TRUE).'</span>';
 				$status_class = 'ticket-sales-expired lt-grey-text';
 			break;
 			// archived
 			case EE_Ticket::archived :
-				$ticket_status = '<span class="archived-ticket">' . $ticket->ticket_status( TRUE ) . '</span>';
+				$ticket_status = '<span class="archived-ticket">'.$ticket->ticket_status(TRUE).'</span>';
 				$status_class = 'archived-ticket hidden';
 			break;
 			// pending
 			case EE_Ticket::pending :
-				$ticket_status = '<span class="ticket-pending">' . $ticket->ticket_status( TRUE ) . '</span>';
+				$ticket_status = '<span class="ticket-pending">'.$ticket->ticket_status(TRUE).'</span>';
 				$status_class = 'ticket-pending';
 			break;
 			// onsale
 			case EE_Ticket::onsale :
-				$ticket_status = '<span class="ticket-on-sale">' . $ticket->ticket_status( TRUE ) . '</span>';
+				$ticket_status = '<span class="ticket-on-sale">'.$ticket->ticket_status(TRUE).'</span>';
 				$status_class = 'ticket-on-sale';
 			break;
 		}
@@ -90,12 +90,12 @@ 
 		 *
 		 * @var string|bool
 		 */
-		if ( false !== ( $new_row_content = apply_filters( 'FHEE__ticket_selector_chart_template__do_ticket_entire_row', false, $ticket, $max, $min, $required_ticket_sold_out, $ticket_price, $ticket_bundle, $ticket_status, $status_class ) ) ) {
+		if (false !== ($new_row_content = apply_filters('FHEE__ticket_selector_chart_template__do_ticket_entire_row', false, $ticket, $max, $min, $required_ticket_sold_out, $ticket_price, $ticket_bundle, $ticket_status, $status_class))) {
 			echo $new_row_content;
 			continue;
 		}
 	?>
-				<tr class="tckt-slctr-tbl-tr <?php echo $status_class . ' ' . espresso_get_object_css_class( $ticket ); ?>">
+				<tr class="tckt-slctr-tbl-tr <?php echo $status_class.' '.espresso_get_object_css_class($ticket); ?>">
 		<?php
 		/**
 		 * Allow plugins to hook in and abort the generation and display of the contents of this
@@ -107,24 +107,24 @@ 
 		 *
 		 * @var string|bool
 		 */
-		if ( false !== ( $new_row_cells_content = apply_filters( 'FHEE__ticket_selector_chart_template__do_ticket_inside_row', false, $ticket, $max, $min, $required_ticket_sold_out, $ticket_price, $ticket_bundle, $ticket_status, $status_class ) ) ) {
+		if (false !== ($new_row_cells_content = apply_filters('FHEE__ticket_selector_chart_template__do_ticket_inside_row', false, $ticket, $max, $min, $required_ticket_sold_out, $ticket_price, $ticket_bundle, $ticket_status, $status_class))) {
 			echo $new_row_cells_content;
 			echo '</tr>';
 			continue;
 		}
 		?>
 					<td class="tckt-slctr-tbl-td-name">
-						<b><?php echo $ticket->get_pretty('TKT_name');?></b>
-						<?php if ( $template_settings->show_ticket_details ) : ?>
-							<a id="display-tckt-slctr-tkt-details-<?php echo $EVT_ID . '-' . $TKT_ID; ?>" class="display-tckt-slctr-tkt-details display-the-hidden lt-grey-text smaller-text hide-if-no-js" rel="tckt-slctr-tkt-details-<?php echo $EVT_ID . '-' . $TKT_ID; ?>" title="<?php echo esc_attr( apply_filters( 'FHEE__ticket_selector_chart_template__show_ticket_details_link_title', __( 'click to show additional ticket details', 'event_espresso' )) ); ?>">
-								<?php echo sprintf( __( 'show%1$sdetails%1$s+', 'event_espresso' ), '&nbsp;' ); ?>
+						<b><?php echo $ticket->get_pretty('TKT_name'); ?></b>
+						<?php if ($template_settings->show_ticket_details) : ?>
+							<a id="display-tckt-slctr-tkt-details-<?php echo $EVT_ID.'-'.$TKT_ID; ?>" class="display-tckt-slctr-tkt-details display-the-hidden lt-grey-text smaller-text hide-if-no-js" rel="tckt-slctr-tkt-details-<?php echo $EVT_ID.'-'.$TKT_ID; ?>" title="<?php echo esc_attr(apply_filters('FHEE__ticket_selector_chart_template__show_ticket_details_link_title', __('click to show additional ticket details', 'event_espresso'))); ?>">
+								<?php echo sprintf(__('show%1$sdetails%1$s+', 'event_espresso'), '&nbsp;'); ?>
 							</a>
-							<a id="hide-tckt-slctr-tkt-details-<?php echo $EVT_ID . '-' . $TKT_ID; ?>" class="hide-tckt-slctr-tkt-details hide-the-displayed lt-grey-text smaller-text hide-if-no-js" rel="tckt-slctr-tkt-details-<?php echo $EVT_ID . '-' . $TKT_ID; ?>" title="<?php echo esc_attr( apply_filters( 'FHEE__ticket_selector_chart_template__hide_ticket_details_link_title', __( 'click to hide additional ticket details', 'event_espresso' )) ); ?>" style="display:none;">
-								<?php echo sprintf( __( 'hide%1$sdetails%1$s-', 'event_espresso' ), '&nbsp;' ); ?>
+							<a id="hide-tckt-slctr-tkt-details-<?php echo $EVT_ID.'-'.$TKT_ID; ?>" class="hide-tckt-slctr-tkt-details hide-the-displayed lt-grey-text smaller-text hide-if-no-js" rel="tckt-slctr-tkt-details-<?php echo $EVT_ID.'-'.$TKT_ID; ?>" title="<?php echo esc_attr(apply_filters('FHEE__ticket_selector_chart_template__hide_ticket_details_link_title', __('click to hide additional ticket details', 'event_espresso'))); ?>" style="display:none;">
+								<?php echo sprintf(__('hide%1$sdetails%1$s-', 'event_espresso'), '&nbsp;'); ?>
 							</a>
 						<?php endif; //end show details check ?>
-					<?php if ( $ticket->required() ) { ?>
-						<p class="ticket-required-pg"><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_required_message', __( 'This ticket is required and must be purchased.', 'event_espresso' )); ?></p>
+					<?php if ($ticket->required()) { ?>
+						<p class="ticket-required-pg"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_required_message', __('This ticket is required and must be purchased.', 'event_espresso')); ?></p>
 					<?php } ?>
 					<?php
 //	echo '<br/><b>$max_atndz : ' . $max_atndz . '</b>';
@@ -138,63 +138,63 @@ 
 //	echo '<br/><b> $ticket->required() : ' .  $ticket->uses() . '</b>';
 					?>
 					</td>
-					<?php if ( apply_filters( 'FHEE__ticket_selector_chart_template__display_ticket_price_details', TRUE )) { ?>
-					<td class="tckt-slctr-tbl-td-price jst-rght"><?php echo EEH_Template::format_currency( $ticket_price ); ?>&nbsp;<span class="smaller-text no-bold"><?php
-						if ( $ticket_bundle ) {
-							echo apply_filters( 'FHEE__ticket_selector_chart_template__per_ticket_bundle_text', __( ' / bundle', 'event_espresso' ));
+					<?php if (apply_filters('FHEE__ticket_selector_chart_template__display_ticket_price_details', TRUE)) { ?>
+					<td class="tckt-slctr-tbl-td-price jst-rght"><?php echo EEH_Template::format_currency($ticket_price); ?>&nbsp;<span class="smaller-text no-bold"><?php
+						if ($ticket_bundle) {
+							echo apply_filters('FHEE__ticket_selector_chart_template__per_ticket_bundle_text', __(' / bundle', 'event_espresso'));
 						} else {
-							echo apply_filters( 'FHEE__ticket_selector_chart_template__per_ticket_text', __( '', 'event_espresso' ));
+							echo apply_filters('FHEE__ticket_selector_chart_template__per_ticket_text', __('', 'event_espresso'));
 						}?></span>&nbsp;</td>
 					<?php } ?>
 					<td class="tckt-slctr-tbl-td-qty cntr">
 					<?php
 					$hidden_input_qty = $max_atndz > 1 ? TRUE : FALSE;
 					// sold out or other status ?
-					if ( $tkt_status == EE_Ticket::sold_out || $remaining == 0 ) {
+					if ($tkt_status == EE_Ticket::sold_out || $remaining == 0) {
 					?>
-						<span class="sold-out"><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_sold_out_msg', __( 'Sold&nbsp;Out', 'event_espresso' ));?></span>
+						<span class="sold-out"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_sold_out_msg', __('Sold&nbsp;Out', 'event_espresso')); ?></span>
 					<?php
-					} else if ( $tkt_status == EE_Ticket::expired || $tkt_status == EE_Ticket::archived ) {
+					} else if ($tkt_status == EE_Ticket::expired || $tkt_status == EE_Ticket::archived) {
 						echo $ticket_status;
-					} else if ( $tkt_status == EE_Ticket::pending ) {
+					} else if ($tkt_status == EE_Ticket::pending) {
 					?>
 					<div class="ticket-pending-pg">
-						<span class="ticket-pending"><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_goes_on_sale_msg', __( 'Goes&nbsp;On&nbsp;Sale', 'event_espresso' )); ?></span><br/>
-						<span class="small-text"><?php echo $ticket->get_i18n_datetime( 'TKT_start_date', apply_filters( 'FHEE__EED_Ticket_Selector__display_goes_on_sale__date_format', $date_format ) ); ?></span>
+						<span class="ticket-pending"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_goes_on_sale_msg', __('Goes&nbsp;On&nbsp;Sale', 'event_espresso')); ?></span><br/>
+						<span class="small-text"><?php echo $ticket->get_i18n_datetime('TKT_start_date', apply_filters('FHEE__EED_Ticket_Selector__display_goes_on_sale__date_format', $date_format)); ?></span>
 					</div>
 					<?php
 					// min qty purchasable is less than tickets available
-					} else if ( $ticket->min() > $remaining ) {
+					} else if ($ticket->min() > $remaining) {
 					?>
 					<div class="archived-ticket-pg">
-						<span class="archived-ticket small-text"><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_not_available_msg', __( 'Not Available', 'event_espresso' )); ?></span><br/>
+						<span class="archived-ticket small-text"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_not_available_msg', __('Not Available', 'event_espresso')); ?></span><br/>
 					</div>
 					<?php
 					// if only one attendee is allowed to register at a time
-					} else if ( $max_atndz  == 1 ) {
+					} else if ($max_atndz == 1) {
 						// display submit button since we have tickets available
-						add_filter( 'FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true' );
+						add_filter('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true');
 				?>
-					<input type="radio" name="tkt-slctr-qty-<?php echo $EVT_ID; ?>" id="ticket-selector-tbl-qty-slct-<?php echo $EVT_ID . '-' . $row; ?>" class="ticket-selector-tbl-qty-slct" value="<?php echo $row . '-'; ?>1" <?php echo $row == 1 ? ' checked="checked"' : ''; ?>  title=""/>
+					<input type="radio" name="tkt-slctr-qty-<?php echo $EVT_ID; ?>" id="ticket-selector-tbl-qty-slct-<?php echo $EVT_ID.'-'.$row; ?>" class="ticket-selector-tbl-qty-slct" value="<?php echo $row.'-'; ?>1" <?php echo $row == 1 ? ' checked="checked"' : ''; ?>  title=""/>
 			<?php
 						$hidden_input_qty = FALSE;
 
-					} else if ( $max_atndz  == 0 ) {
-						echo '<span class="sold-out">' . apply_filters( 'FHEE__ticket_selector_chart_template__ticket_closed_msg', __( 'Closed', 'event_espresso' )) . '</span>';
-					} elseif ( $max > 0 ) {
+					} else if ($max_atndz == 0) {
+						echo '<span class="sold-out">'.apply_filters('FHEE__ticket_selector_chart_template__ticket_closed_msg', __('Closed', 'event_espresso')).'</span>';
+					} elseif ($max > 0) {
 						// display submit button since we have tickets available
-						add_filter( 'FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true' );
+						add_filter('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true');
 
 				?>
-					<select name="tkt-slctr-qty-<?php echo $EVT_ID; ?>[]" id="ticket-selector-tbl-qty-slct-<?php echo $EVT_ID . '-' . $row; ?>" class="ticket-selector-tbl-qty-slct" title="">
+					<select name="tkt-slctr-qty-<?php echo $EVT_ID; ?>[]" id="ticket-selector-tbl-qty-slct-<?php echo $EVT_ID.'-'.$row; ?>" class="ticket-selector-tbl-qty-slct" title="">
 					<?php
 						// this ensures that non-required tickets with non-zero MIN QTYs don't HAVE to be purchased
-						if ( ! $ticket->required() && $min !== 0 ) {
+						if ( ! $ticket->required() && $min !== 0) {
 					?>
 						<option value="0">&nbsp;0&nbsp;</option>
 					<?php }
 						// offer ticket quantities from the min to the max
-						for ( $i = $min; $i <= $max; $i++) {
+						for ($i = $min; $i <= $max; $i++) {
 					?>
 						<option value="<?php echo $i; ?>">&nbsp;<?php echo $i; ?>&nbsp;</option>
 					<?php } ?>
@@ -204,7 +204,7 @@ 
 
 					}
 					// depending on group reg we need to change the format for qty
-					if ( $hidden_input_qty ) {
+					if ($hidden_input_qty) {
 					?>
 					<input type="hidden" name="tkt-slctr-qty-<?php echo $EVT_ID; ?>[]" value="0" />
 					<?php
@@ -214,33 +214,33 @@ 
 
 					</td>
 				</tr>
-				<?php if ( $template_settings->show_ticket_details ) : ?>
-					<tr class="tckt-slctr-tkt-details-tr <?php echo espresso_get_object_css_class( $ticket, '', 'details' );?>">
+				<?php if ($template_settings->show_ticket_details) : ?>
+					<tr class="tckt-slctr-tkt-details-tr <?php echo espresso_get_object_css_class($ticket, '', 'details'); ?>">
 						<td class="tckt-slctr-tkt-details-td" colspan="3" >
-							<div id="tckt-slctr-tkt-details-<?php echo $EVT_ID . '-' . $TKT_ID; ?>-dv" class="tckt-slctr-tkt-details-dv" style="display: none;">
+							<div id="tckt-slctr-tkt-details-<?php echo $EVT_ID.'-'.$TKT_ID; ?>-dv" class="tckt-slctr-tkt-details-dv" style="display: none;">
 
 								<section class="tckt-slctr-tkt-details-sctn">
-									<h3><?php _e( 'Details', 'event_espresso' ); ?></h3>
+									<h3><?php _e('Details', 'event_espresso'); ?></h3>
 									<p><?php echo $ticket->description(); ?></p>
 
-									<?php if ( $ticket_price != 0 && apply_filters( 'FHEE__ticket_selector_chart_template__display_ticket_price_details', TRUE )) { ?>
+									<?php if ($ticket_price != 0 && apply_filters('FHEE__ticket_selector_chart_template__display_ticket_price_details', TRUE)) { ?>
 									<section class="tckt-slctr-tkt-price-sctn">
-										<h5><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_price_breakdown_heading', __( 'Price', 'event_espresso' )); ?></h5>
+										<h5><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_price_breakdown_heading', __('Price', 'event_espresso')); ?></h5>
 										<div class="tckt-slctr-tkt-details-tbl-wrap-dv">
 											<table class="tckt-slctr-tkt-details-tbl">
 												<thead>
 													<tr>
-														<th class="ee-third-width"><span class="small-text"><?php _e( 'Name', 'event_espresso' ); ?></span></th>
-														<th class="jst-cntr"><span class="small-text"><?php _e( 'Description', 'event_espresso' ); ?></span></th>
-														<th class="ee-fourth-width jst-rght"><span class="small-text"><?php _e( 'Amount', 'event_espresso' ); ?></span></th>
+														<th class="ee-third-width"><span class="small-text"><?php _e('Name', 'event_espresso'); ?></span></th>
+														<th class="jst-cntr"><span class="small-text"><?php _e('Description', 'event_espresso'); ?></span></th>
+														<th class="ee-fourth-width jst-rght"><span class="small-text"><?php _e('Amount', 'event_espresso'); ?></span></th>
 													</tr>
 												</thead>
 												<tbody>
-										<?php if ( $ticket->base_price() instanceof EE_Price ) { ?>
+										<?php if ($ticket->base_price() instanceof EE_Price) { ?>
 													<tr>
-														<td data-th="<?php _e( 'Name', 'event_espresso' ); ?>" class="small-text"><b><?php echo $ticket->base_price()->name(); ?></b></td>
-														<td data-th="<?php _e( 'Description', 'event_espresso' ); ?>" class="small-text"><?php echo $ticket->base_price()->desc(); ?></td>
-														<td data-th="<?php _e( 'Amount', 'event_espresso' ); ?>" class="jst-rght small-text"><?php echo $ticket->base_price()->pretty_price(); ?></td>
+														<td data-th="<?php _e('Name', 'event_espresso'); ?>" class="small-text"><b><?php echo $ticket->base_price()->name(); ?></b></td>
+														<td data-th="<?php _e('Description', 'event_espresso'); ?>" class="small-text"><?php echo $ticket->base_price()->desc(); ?></td>
+														<td data-th="<?php _e('Amount', 'event_espresso'); ?>" class="jst-rght small-text"><?php echo $ticket->base_price()->pretty_price(); ?></td>
 													</tr>
 													<?php
 															$running_total = $ticket->base_price()->amount();
@@ -248,44 +248,44 @@ 
 															$running_total = 0;
 														}
 														// now add price modifiers
-														foreach ( $ticket->price_modifiers() as $price_mod ) { ?>
+														foreach ($ticket->price_modifiers() as $price_mod) { ?>
 													<tr>
-														<td data-th="<?php _e( 'Name', 'event_espresso' ); ?>" class="jst-rght small-text"><?php echo $price_mod->name(); ?></td>
-													<?php if ( $price_mod->is_percent() ) { ?>
-														<td data-th="<?php _e( 'Description', 'event_espresso' ); ?>" class="small-text"><?php echo $price_mod->desc(); ?> <?php echo $price_mod->amount(); ?>%</td>
+														<td data-th="<?php _e('Name', 'event_espresso'); ?>" class="jst-rght small-text"><?php echo $price_mod->name(); ?></td>
+													<?php if ($price_mod->is_percent()) { ?>
+														<td data-th="<?php _e('Description', 'event_espresso'); ?>" class="small-text"><?php echo $price_mod->desc(); ?> <?php echo $price_mod->amount(); ?>%</td>
 														<?php
-															$new_sub_total = $running_total * ( $price_mod->amount() / 100 );
+															$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(); ?>
-														<td data-th="<?php _e( 'Description', 'event_espresso' ); ?>" class="small-text"><?php echo $price_mod->desc(); ?></td>
+														<td data-th="<?php _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(); ?>
 													<?php } ?>
-														<td data-th="<?php _e( 'Amount', 'event_espresso' ); ?>" class="jst-rght small-text"><?php echo EEH_Template::format_currency( $new_sub_total ); ?></td>
+														<td data-th="<?php _e('Amount', 'event_espresso'); ?>" class="jst-rght small-text"><?php echo EEH_Template::format_currency($new_sub_total); ?></td>
 														<?php $running_total += $new_sub_total; ?>
 													</tr>
 												<?php } ?>
-												<?php if ( $ticket->taxable() ) { ?>
+												<?php if ($ticket->taxable()) { ?>
 													<?php //$ticket_subtotal =$ticket->get_ticket_subtotal(); ?>
 													<tr>
-														<td colspan="2" class="jst-rght small-text sbttl"><b><?php _e( 'subtotal', 'event_espresso' ); ?></b></td>
-														<td data-th="<?php _e( 'subtotal', 'event_espresso' ); ?>" class="jst-rght small-text"><b><?php echo  EEH_Template::format_currency( $running_total ); ?></b></td>
+														<td colspan="2" class="jst-rght small-text sbttl"><b><?php _e('subtotal', 'event_espresso'); ?></b></td>
+														<td data-th="<?php _e('subtotal', 'event_espresso'); ?>" class="jst-rght small-text"><b><?php echo  EEH_Template::format_currency($running_total); ?></b></td>
 													</tr>
 
-													<?php foreach ( $ticket->get_ticket_taxes_for_admin() as $tax ) { ?>
+													<?php foreach ($ticket->get_ticket_taxes_for_admin() as $tax) { ?>
 													<tr>
-														<td data-th="<?php _e( 'Name', 'event_espresso' ); ?>" class="jst-rght small-text"><?php echo $tax->name(); ?></td>
-														<td data-th="<?php _e( 'Description', 'event_espresso' ); ?>" class="jst-rght small-text"><?php echo $tax->amount(); ?>%</td>
-														<?php $tax_amount = $running_total * ( $tax->amount() / 100 ); ?>
-														<td data-th="<?php _e( 'Amount', 'event_espresso' ); ?>" class="jst-rght small-text"><?php echo EEH_Template::format_currency( $tax_amount ); ?></td>
+														<td data-th="<?php _e('Name', 'event_espresso'); ?>" class="jst-rght small-text"><?php echo $tax->name(); ?></td>
+														<td data-th="<?php _e('Description', 'event_espresso'); ?>" class="jst-rght small-text"><?php echo $tax->amount(); ?>%</td>
+														<?php $tax_amount = $running_total * ($tax->amount() / 100); ?>
+														<td data-th="<?php _e('Amount', 'event_espresso'); ?>" class="jst-rght small-text"><?php echo EEH_Template::format_currency($tax_amount); ?></td>
 														<?php $running_total += $tax_amount; ?>
 													</tr>
 													<?php } ?>
 												<?php } ?>
 													<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', __( 'Total', 'event_espresso' )); ?></b></td>
-														<td data-th="<?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_total_price', __( 'Total', 'event_espresso' )); ?>" class="jst-rght small-text"><b><?php echo EEH_Template::format_currency( $running_total ); ?></b></td>
+														<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', __('Total', 'event_espresso')); ?></b></td>
+														<td data-th="<?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_total_price', __('Total', 'event_espresso')); ?>" class="jst-rght small-text"><b><?php echo EEH_Template::format_currency($running_total); ?></b></td>
 													</tr>
 												</tbody>
 											</table>
@@ -295,106 +295,106 @@ 
 									<?php } ?>
 
 									<section class="tckt-slctr-tkt-sale-dates-sctn">
-										<h5><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_sales_date_heading', __( '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', __( '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', __( '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', __( '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><?php echo $ticket->get_i18n_datetime( 'TKT_end_date', $time_format ) ; ?><br/>
+										<h5><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_sales_date_heading', __('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', __('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', __('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', __('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><?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', __( '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', __( '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', __( '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', __( 'The Minimum Quantity purchasable for this ticket exceeds the number of spaces remaining', 'event_espresso' )); ?></span><?php } ?><br/>
+										<h5><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_heading', __('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', __('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', __('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', __('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', __( 'Maximum Qty:', 'event_espresso' )); ?></span><?php echo $ticket->max() === EE_INF ? __( 'no limit', 'event_espresso' ) : max( $ticket->max(), 1 ); ?><br/>
+										<span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_max_qty', __('Maximum Qty:', 'event_espresso')); ?></span><?php echo $ticket->max() === EE_INF ? __('no limit', 'event_espresso') : max($ticket->max(), 1); ?><br/>
 									</section>
 									<br/>
 									<?php } ?>
 
-									<?php if ( $ticket->uses() !== EE_INF && ( ! defined( 'EE_DECAF' ) || EE_DECAF !== TRUE )) { ?>
+									<?php if ($ticket->uses() !== EE_INF && ( ! defined('EE_DECAF') || EE_DECAF !== TRUE)) { ?>
 									<section class="tckt-slctr-tkt-uses-sctn">
-										<h5><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_event_date_ticket_uses_heading', __( 'Event Date Ticket Uses', 'event_espresso' )); ?></h5>
+										<h5><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_date_ticket_uses_heading', __('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(
-													__( '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' ),
+													__('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', __( '# Datetimes:', 'event_espresso' )); ?></span><?php  echo $ticket->uses();?><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', __('# 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 = $template_settings->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', __( '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', __( 'This option allows access to the following dates and times.', 'event_espresso' )); ?></span>
+										<h5><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_access_heading', __('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', __('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>
 													<tr>
 														<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', __( 'Date ', 'event_espresso' )); ?></span>
+															<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', __('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 _e( 'Time ', 'event_espresso' ); ?></span>
+															<span class="dashicons dashicons-clock"></span><span class="small-text"><?php _e('Time ', 'event_espresso'); ?></span>
 														</th>
-														<?php if ( $template_settings->show_ticket_sale_columns ) : ?>
+														<?php if ($template_settings->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( __( 'Sold', 'event_espresso' ), '<br/>' )); ?></span>
+																<span class="smaller-text"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_sold', sprintf(__('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( __( 'Remaining', 'event_espresso' ), '<br/>' )); ?></span>
+																<span class="smaller-text"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_left', sprintf(__('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( __( 'Total%sSold', 'event_espresso' ), '<br/>' )); ?></span>
+																<span class="smaller-text"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_sold', sprintf(__('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( __( 'Total Spaces%sLeft', 'event_espresso' ), '<br/>' )); ?></span>
+																<span class="smaller-text"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_left', sprintf(__('Total Spaces%sLeft', 'event_espresso'), '<br/>')); ?></span>
 															</th>
 														<?php endif; //end $template_settings->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', __( 'Event Date ', 'event_espresso' )); ?>" class="small-text">
+													<td data-th="<?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_access_table_event_date', __('Event Date ', 'event_espresso')); ?>" class="small-text">
 														<?php $datetime_name = $datetime->name(); ?>
-														<?php echo ! empty( $datetime_name ) ? '<b>' . $datetime_name . '</b><br/>' : ''; ?>
-														<?php echo $datetime->date_range( $date_format, __( ' to  ', 'event_espresso' )); ?>
+														<?php echo ! empty($datetime_name) ? '<b>'.$datetime_name.'</b><br/>' : ''; ?>
+														<?php echo $datetime->date_range($date_format, __(' to  ', 'event_espresso')); ?>
 													</td>
-													<td data-th="<?php _e( 'Time ', 'event_espresso' ); ?>" class="cntr small-text">
-														<?php echo $datetime->time_range( $time_format, __( ' to  ', 'event_espresso' )); ?>
+													<td data-th="<?php _e('Time ', 'event_espresso'); ?>" class="cntr small-text">
+														<?php echo $datetime->time_range($time_format, __(' to  ', 'event_espresso')); ?>
 													</td>
-													<?php if ( $template_settings->show_ticket_sale_columns ) : ?>
-														<td data-th="<?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_sold', __( 'Sold', 'event_espresso' )); ?>" class="cntr small-text">
+													<?php if ($template_settings->show_ticket_sale_columns) : ?>
+														<td data-th="<?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_sold', __('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', __( 'Remaining', 'event_espresso' )); ?>" class="cntr small-text">
-															<?php echo $ticket->qty() === EE_INF ? '<span class="smaller-text">' .  __( 'unlimited ', 'event_espresso' ) . '</span>' : $ticket->qty() - $ticket->sold(); ?>
+														<td data-th="<?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_left', __('Remaining', 'event_espresso')); ?>" class="cntr small-text">
+															<?php echo $ticket->qty() === EE_INF ? '<span class="smaller-text">'.__('unlimited ', 'event_espresso').'</span>' : $ticket->qty() - $ticket->sold(); ?>
 														</td>
-														<td data-th="<?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_sold', __( 'Total Sold', 'event_espresso' )); ?>" class="cntr small-text">
+														<td data-th="<?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_sold', __('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">' . __( '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', __( 'Total Spaces Left', 'event_espresso' )); ?>" class="cntr small-text">
-															<?php echo $tkts_left === EE_INF ? '<span class="smaller-text">' .  __( 'unlimited ', 'event_espresso' ) . '</span>' : $tkts_left; ?>
+												<?php $tkts_left = $datetime->sold_out() ? '<span class="sold-out smaller-text">'.__('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', __('Total Spaces Left', 'event_espresso')); ?>" class="cntr small-text">
+															<?php echo $tkts_left === EE_INF ? '<span class="smaller-text">'.__('unlimited ', 'event_espresso').'</span>' : $tkts_left; ?>
 														</td>
 													<?php endif; //end $template_settings->show_ticket_sale_columns conditional ?>
 												</tr>
@@ -412,7 +412,7 @@ 
 							</div>
 						</td>
 					</tr>
-				<?php endif;  //end template_settings->show_ticket_details check?>
+				<?php endif; //end template_settings->show_ticket_details check?>
 	<?php
 			$row++;
 		}
@@ -421,32 +421,32 @@ 
 $ticket_row_html = ob_get_clean();
 // if there is only ONE ticket with a max qty of ONE, and it is free... then not much need for the ticket selector
 $hide_ticket_selector = $ticket_count == 1 && $max == 1 && $ticket->is_free() ? true : false;
-$hide_ticket_selector = apply_filters( 'FHEE__ticket_selector_chart_template__hide_ticket_selector', $hide_ticket_selector, $EVT_ID );
+$hide_ticket_selector = apply_filters('FHEE__ticket_selector_chart_template__hide_ticket_selector', $hide_ticket_selector, $EVT_ID);
 //EEH_Debug_Tools::printr( $ticket_count, '$ticket_count', __FILE__, __LINE__ );
 //EEH_Debug_Tools::printr( $max, '$max', __FILE__, __LINE__ );
 //EEH_Debug_Tools::printr( $hide_ticket_selector, '$hide_ticket_selector', __FILE__, __LINE__ );
 //EEH_Debug_Tools::printr( $table_style, '$table_style', __FILE__, __LINE__ );
 remove_filter(
 	'FHEE__EE_Ticket_Selector__after_ticket_selector_submit',
-	array( 'EED_Ticket_Selector', 'no_tkt_slctr_end_dv' )
+	array('EED_Ticket_Selector', 'no_tkt_slctr_end_dv')
 );
 remove_filter(
 	'FHEE__EE_Ticket_Selector__after_view_details_btn',
-	array( 'EED_Ticket_Selector', 'no_tkt_slctr_end_dv' )
+	array('EED_Ticket_Selector', 'no_tkt_slctr_end_dv')
 );
-if ( ! $hide_ticket_selector ) {
+if ( ! $hide_ticket_selector) {
 ?>
 <div id="tkt-slctr-tbl-wrap-dv-<?php echo $EVT_ID; ?>" class="tkt-slctr-tbl-wrap-dv">
 
-	<?php do_action( 'AHEE__ticket_selector_chart__template__before_ticket_selector', $event ); ?>
+	<?php do_action('AHEE__ticket_selector_chart__template__before_ticket_selector', $event); ?>
 
 	<table id="tkt-slctr-tbl-<?php echo $EVT_ID; ?>" class="tkt-slctr-tbl">
 		<thead>
 			<tr>
 				<th scope="col" class="ee-ticket-selector-ticket-details-th">
-					<?php echo esc_html( apply_filters( 'FHEE__ticket_selector_chart_template__table_header_available_tickets', '', $EVT_ID ) ); ?>
+					<?php echo esc_html(apply_filters('FHEE__ticket_selector_chart_template__table_header_available_tickets', '', $EVT_ID)); ?>
 				</th>
-				<?php if ( apply_filters( 'FHEE__ticket_selector_chart_template__display_ticket_price_details', TRUE )) { ?>
+				<?php if (apply_filters('FHEE__ticket_selector_chart_template__display_ticket_price_details', TRUE)) { ?>
 				<th scope="col" class="ee-ticket-selector-ticket-price-th cntr">
 					<?php
 						/**
@@ -457,7 +457,7 @@ 
 						 * @param string 'Price' The translatable text to display in the table header for price
 						 * @param int $EVT_ID The Event ID
 						 */
-						echo esc_html( apply_filters( 'FHEE__ticket_selector_chart_template__table_header_price', __( 'Price', 'event_espresso' ), $EVT_ID ) );
+						echo esc_html(apply_filters('FHEE__ticket_selector_chart_template__table_header_price', __('Price', 'event_espresso'), $EVT_ID));
 					?>
 				</th>
 				<?php } ?>
@@ -471,24 +471,24 @@ 
 						* @param string 'Qty*' The translatable text to display in the table header for the Quantity of tickets
 						* @param int $EVT_ID The Event ID
 						*/
-						echo esc_html( apply_filters( 'FHEE__ticket_selector_chart_template__table_header_qty', __( 'Qty*', 'event_espresso' ), $EVT_ID ) );
+						echo esc_html(apply_filters('FHEE__ticket_selector_chart_template__table_header_qty', __('Qty*', 'event_espresso'), $EVT_ID));
 					?>
 				</th>
 			</tr>
 		</thead>
 		<tbody>
-			<?php echo $ticket_row_html;?>
+			<?php echo $ticket_row_html; ?>
 		</tbody>
 	</table>
 
 	<input type="hidden" name="noheader" value="true" />
-	<input type="hidden" name="tkt-slctr-return-url-<?php echo $EVT_ID ?>" value="<?php echo EEH_URL::filter_input_server_url();?>" />
+	<input type="hidden" name="tkt-slctr-return-url-<?php echo $EVT_ID ?>" value="<?php echo EEH_URL::filter_input_server_url(); ?>" />
 	<input type="hidden" name="tkt-slctr-rows-<?php echo $EVT_ID; ?>" value="<?php echo $row - 1; ?>" />
 	<input type="hidden" name="tkt-slctr-max-atndz-<?php echo $EVT_ID; ?>" value="<?php echo $max_atndz; ?>" />
 	<input type="hidden" name="tkt-slctr-event-id" value="<?php echo $EVT_ID; ?>" />
 
 <?php
-if ( $max_atndz > 0 && ! $hide_ticket_selector ) {
+if ($max_atndz > 0 && ! $hide_ticket_selector) {
 	echo apply_filters(
 		'FHEE__ticket_selector_chart_template__maximum_tickets_purchased_footnote',
 		''
@@ -496,10 +496,10 @@ 
 }
 ?>
 
-	<?php do_action( 'AHEE__ticket_selector_chart__template__after_ticket_selector', $EVT_ID, $event ); ?>
+	<?php do_action('AHEE__ticket_selector_chart__template__after_ticket_selector', $EVT_ID, $event); ?>
 
 </div>
-<?php } else if ( isset( $TKT_ID ) ) { ?>
+<?php } else if (isset($TKT_ID)) { ?>
 <input type="hidden" name="tkt-slctr-qty-<?php echo $EVT_ID; ?>[]" value="1"/>
 <input type="hidden" name="tkt-slctr-ticket-id-<?php echo $EVT_ID; ?>[]" value="<?php echo $TKT_ID; ?>"/>
 <input type="hidden" name="noheader" value="true"/>
@@ -508,27 +508,27 @@ 
 <input type="hidden" name="tkt-slctr-max-atndz-<?php echo $EVT_ID; ?>" value="<?php echo $max_atndz; ?>"/>
 <input type="hidden" name="tkt-slctr-event-id" value="<?php echo $EVT_ID; ?>"/>
 <?php
-	if ( $ticket instanceof EE_Ticket ) {
-		do_action( 'AHEE__ticket_selector_chart__template__before_ticket_selector', $event );
+	if ($ticket instanceof EE_Ticket) {
+		do_action('AHEE__ticket_selector_chart__template__before_ticket_selector', $event);
 		$ticket_description = $ticket->description();
 ?>
 <div id="no-tkt-slctr-ticket-dv-<?php echo $EVT_ID; ?>" class="no-tkt-slctr-ticket-dv">
 	<div class="no-tkt-slctr-ticket-content-dv">
 		<h5><?php echo $ticket->name(); ?></h5>
-		<?php if ( ! empty( $ticket_description ) ) { ?>
+		<?php if ( ! empty($ticket_description)) { ?>
 		<p><?php echo $ticket_description; ?></p>
 		<?php } ?>
 	</div>
 <?php
 		add_filter(
 			'FHEE__EE_Ticket_Selector__after_ticket_selector_submit',
-			array( 'EED_Ticket_Selector', 'no_tkt_slctr_end_dv' )
+			array('EED_Ticket_Selector', 'no_tkt_slctr_end_dv')
 		);
 		add_filter(
 			'FHEE__EE_Ticket_Selector__after_view_details_btn',
-			array( 'EED_Ticket_Selector', 'no_tkt_slctr_end_dv' )
+			array('EED_Ticket_Selector', 'no_tkt_slctr_end_dv')
 		);
-		do_action( 'AHEE__ticket_selector_chart__template__after_ticket_selector', $EVT_ID, $event );
+		do_action('AHEE__ticket_selector_chart__template__after_ticket_selector', $EVT_ID, $event);
 	}
 }
 ?>