eventespresso / event-espresso-core

modules/single_page_checkout/reg_steps/payment_options/EE_SPCO_Reg_Step_Payment_Options.class.php

Doc Comments +12 added lines, -11 removed lines

@@ -103,7 +103,7 @@ 
 
 
 	/**
-	 * @return null
+	 * @return EE_Line_Item_Display
 	 */
 	public function line_item_display() {
 		return $this->line_item_display;
@@ -112,7 +112,7 @@ 
 
 
 	/**
-	 * @param null $line_item_display
+	 * @param EE_Line_Item_Display $line_item_display
 	 */
 	public function set_line_item_display( $line_item_display ) {
 		$this->line_item_display = $line_item_display;
@@ -178,7 +178,7 @@ 
 
 
 	/**
-	 * @return bool
+	 * @return EE_Form_Section_Proper
 	 */
 	public function generate_reg_form() {
 		EE_Registry::instance()->load_helper( 'HTML' );
@@ -730,7 +730,7 @@ 
 	 * get_billing_form_html_for_payment_method
 	 *
 	 * @access public
-	 * @return string
+	 * @return boolean
 	 */
 	public function get_billing_form_html_for_payment_method() {
 		// how have they chosen to pay?
@@ -850,7 +850,7 @@ 
 	 * switch_payment_method
 	 *
 	 * @access public
-	 * @return string
+	 * @return boolean
 	 */
 	public function switch_payment_method() {
 		if ( ! $this->_verify_payment_method_is_set() ) {
@@ -1015,7 +1015,7 @@ 
 
 	/**
 	 * process_reg_step
-	 * @return boolean
+	 * @return null|boolean
 	 */
 	public function process_reg_step() {
 		// how have they chosen to pay?
@@ -1091,7 +1091,7 @@ 
 	 *    update_reg_step
 	 *    this is the final step after a user  revisits the site to retry a payment
 	 *
-	 * @return boolean
+	 * @return null|boolean
 	 */
 	public function update_reg_step() {
 		$success = TRUE;
@@ -1373,7 +1373,7 @@ 
 	 *
 	 * 	@access 	private
 	 * 	@type 	EE_Payment_Method $payment_method
-	 * 	@return 	mixed	EE_Payment | boolean
+	 * 	@return 	EE_Payment|null	EE_Payment | boolean
 	 */
 	private function _attempt_payment( EE_Payment_Method $payment_method ) {
 		$payment =NULL;
@@ -1570,6 +1570,7 @@ 
 	 * @access private
 	 * @type    EE_Payment $payment
 	 * @param string $payment_occurs
+	 * @param EE_Payment|null $payment
 	 * @return bool
 	 * @throws \EE_Error
 	 */
@@ -1675,7 +1676,7 @@ 
 	 * 		or present the payment options again
 	 *
 	 * @access private
-	 * @return EE_Payment | FALSE
+	 * @return boolean | FALSE
 	 */
 	public function process_gateway_response() {
 		$payment = null;
@@ -1733,7 +1734,7 @@ 
 	 * _validate_return
 	 *
 	 * @access private
-	 * @return bool
+	 * @return boolean|null
 	 */
 	private function _validate_offsite_return() {
 		$TXN_ID = (int)EE_Registry::instance()->REQ->get( 'spco_txn', 0 );
@@ -1800,7 +1801,7 @@ 
 	 *
 	 * @access private
 	 * @param \EE_Registration $primary_registrant
-	 * @return bool
+	 * @return false|null
 	 */
 	private function _redirect_wayward_request( EE_Registration $primary_registrant ) {
 		if ( ! $primary_registrant instanceof EE_Registration ) {

Indentation +26 added lines, -26 removed lines

@@ -1,16 +1,16 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
  /**
- *
- * Class EE_SPCO_Reg_Step_Payment_Options
- *
- * Description
- *
- * @package 			Event Espresso
- * @subpackage 	core
- * @author 				Brent Christensen
- * @since 				4.5.0
- *
- */
+  *
+  * Class EE_SPCO_Reg_Step_Payment_Options
+  *
+  * Description
+  *
+  * @package 			Event Espresso
+  * @subpackage 	core
+  * @author 				Brent Christensen
+  * @since 				4.5.0
+  *
+  */
 class EE_SPCO_Reg_Step_Payment_Options extends EE_SPCO_Reg_Step {
 
 	/**
@@ -740,13 +740,13 @@ 
 			return FALSE;
 		}
 		if ( apply_filters( 'FHEE__EE_SPCO_Reg_Step_Payment_Options__registration_checkout__selected_payment_method__display_success', false ) ) {
-            EE_Error::add_success(
-                apply_filters(
-                    'FHEE__Single_Page_Checkout__registration_checkout__selected_payment_method',
-                    sprintf(__('You have selected "%s" as your method of payment. Please note the important payment information below.', 'event_espresso'), $this->checkout->payment_method->name())
-                )
-            );
-        }
+			EE_Error::add_success(
+				apply_filters(
+					'FHEE__Single_Page_Checkout__registration_checkout__selected_payment_method',
+					sprintf(__('You have selected "%s" as your method of payment. Please note the important payment information below.', 'event_espresso'), $this->checkout->payment_method->name())
+				)
+			);
+		}
 		// now generate billing form for selected method of payment
 		$payment_method_billing_form = $this->_get_billing_form_for_payment_method( $this->checkout->payment_method, FALSE );
 		// fill form with attendee info if applicable
@@ -778,14 +778,14 @@ 
 		$billing_form = $payment_method->type_obj()->billing_form( $this->checkout->transaction, array( 'amount_owing' => $this->checkout->amount_owing ) );
 		if ( $billing_form instanceof EE_Billing_Info_Form ) {
 			if ( EE_Registry::instance()->REQ->is_set( 'payment_method' )) {
-                if ( apply_filters('FHEE__EE_SPCO_Reg_Step_Payment_Options__registration_checkout__selected_payment_method__display_success', false )) {
-                    EE_Error::add_success(
-                        apply_filters(
-                            'FHEE__Single_Page_Checkout__registration_checkout__selected_payment_method',
-                            sprintf( __( 'You have selected "%s" as your method of payment. Please note the important payment information below.', 'event_espresso' ), $payment_method->name() )
-                        )
-                    );
-                }
+				if ( apply_filters('FHEE__EE_SPCO_Reg_Step_Payment_Options__registration_checkout__selected_payment_method__display_success', false )) {
+					EE_Error::add_success(
+						apply_filters(
+							'FHEE__Single_Page_Checkout__registration_checkout__selected_payment_method',
+							sprintf( __( 'You have selected "%s" as your method of payment. Please note the important payment information below.', 'event_espresso' ), $payment_method->name() )
+						)
+					);
+				}
 			}
 			return apply_filters(
 				'FHEE__EE_SPCO_Reg_Step_Payment_Options___get_billing_form_for_payment_method__billing_form',

Braces +2 added lines, -2 removed lines

@@ -1214,9 +1214,9 @@
 						$form_section = $validation_error->get_form_section();
 						if( $form_section instanceof EE_Form_Input_Base ){
 							$label = $form_section->html_label_text();
-						}elseif( $form_section instanceof EE_Form_Section_Base ){
+						} elseif( $form_section instanceof EE_Form_Section_Base ){
 							$label = $form_section->name();
-						}else{
+						} else{
 							$label = __( 'Validation Error', 'event_espresso' );
 						}
 						$error_strings[] = sprintf('%1$s: %2$s', $label, $validation_error->getMessage() );

Spacing +365 added lines, -365 removed lines

@@ -28,15 +28,15 @@ 
 	 *  @return 	void
 	 */
 	public static function set_hooks() {
-		add_filter( 'FHEE__SPCO__EE_Line_Item_Filter_Collection', array( 'EE_SPCO_Reg_Step_Payment_Options', 'add_spco_line_item_filters' ) );
-		add_action( 'wp_ajax_switch_spco_billing_form', array( 'EE_SPCO_Reg_Step_Payment_Options', 'switch_spco_billing_form' ));
-		add_action( 'wp_ajax_nopriv_switch_spco_billing_form', array( 'EE_SPCO_Reg_Step_Payment_Options', 'switch_spco_billing_form' ));
-		add_action( 'wp_ajax_save_payer_details', array( 'EE_SPCO_Reg_Step_Payment_Options', 'save_payer_details' ));
-		add_action( 'wp_ajax_nopriv_save_payer_details', array( 'EE_SPCO_Reg_Step_Payment_Options', 'save_payer_details' ));
-		add_action( 'wp_ajax_get_transaction_details_for_gateways', array( 'EE_SPCO_Reg_Step_Payment_Options', 'get_transaction_details' ) );
-		add_action( 'wp_ajax_nopriv_get_transaction_details_for_gateways', array( 'EE_SPCO_Reg_Step_Payment_Options', 'get_transaction_details' )
+		add_filter('FHEE__SPCO__EE_Line_Item_Filter_Collection', array('EE_SPCO_Reg_Step_Payment_Options', 'add_spco_line_item_filters'));
+		add_action('wp_ajax_switch_spco_billing_form', array('EE_SPCO_Reg_Step_Payment_Options', 'switch_spco_billing_form'));
+		add_action('wp_ajax_nopriv_switch_spco_billing_form', array('EE_SPCO_Reg_Step_Payment_Options', 'switch_spco_billing_form'));
+		add_action('wp_ajax_save_payer_details', array('EE_SPCO_Reg_Step_Payment_Options', 'save_payer_details'));
+		add_action('wp_ajax_nopriv_save_payer_details', array('EE_SPCO_Reg_Step_Payment_Options', 'save_payer_details'));
+		add_action('wp_ajax_get_transaction_details_for_gateways', array('EE_SPCO_Reg_Step_Payment_Options', 'get_transaction_details'));
+		add_action('wp_ajax_nopriv_get_transaction_details_for_gateways', array('EE_SPCO_Reg_Step_Payment_Options', 'get_transaction_details')
 		);
-		add_filter( 'FHEE__EED_Recaptcha___bypass_recaptcha__bypass_request_params_array', array( 'EE_SPCO_Reg_Step_Payment_Options', 'bypass_recaptcha_for_load_payment_method' ), 10, 1 );
+		add_filter('FHEE__EED_Recaptcha___bypass_recaptcha__bypass_request_params_array', array('EE_SPCO_Reg_Step_Payment_Options', 'bypass_recaptcha_for_load_payment_method'), 10, 1);
 	}
 
 
@@ -45,7 +45,7 @@ 
 	 * 	ajax switch_spco_billing_form
 	 */
 	public static function switch_spco_billing_form() {
-		EED_Single_Page_Checkout::process_ajax_request( 'switch_payment_method' );
+		EED_Single_Page_Checkout::process_ajax_request('switch_payment_method');
 	}
 
 
@@ -54,7 +54,7 @@ 
 	 * 	ajax save_payer_details
 	 */
 	public static function save_payer_details() {
-		EED_Single_Page_Checkout::process_ajax_request( 'save_payer_details_via_ajax' );
+		EED_Single_Page_Checkout::process_ajax_request('save_payer_details_via_ajax');
 	}
 
 
@@ -63,7 +63,7 @@ 
 	 * 	ajax get_transaction_details
 	 */
 	public static function get_transaction_details() {
-		EED_Single_Page_Checkout::process_ajax_request( 'get_transaction_details_for_gateways' );
+		EED_Single_Page_Checkout::process_ajax_request('get_transaction_details_for_gateways');
 	}
 
 
@@ -91,13 +91,13 @@ 
 	 * @param    EE_Checkout $checkout
 	 * @return    \EE_SPCO_Reg_Step_Payment_Options
 	 */
-	public function __construct( EE_Checkout $checkout ) {
+	public function __construct(EE_Checkout $checkout) {
 		$this->_slug = 'payment_options';
 		$this->_name = __('Payment Options', 'event_espresso');
-		$this->_template = SPCO_REG_STEPS_PATH . $this->_slug . DS . 'payment_options_main.template.php';
+		$this->_template = SPCO_REG_STEPS_PATH.$this->_slug.DS.'payment_options_main.template.php';
 		$this->checkout = $checkout;
 		$this->_reset_success_message();
-		$this->set_instructions( __('Please select a method of payment and provide any necessary billing information before proceeding.', 'event_espresso'));
+		$this->set_instructions(__('Please select a method of payment and provide any necessary billing information before proceeding.', 'event_espresso'));
 	}
 
 
@@ -114,7 +114,7 @@ 
 	/**
 	 * @param null $line_item_display
 	 */
-	public function set_line_item_display( $line_item_display ) {
+	public function set_line_item_display($line_item_display) {
 		$this->line_item_display = $line_item_display;
 	}
 
@@ -125,9 +125,9 @@ 
 	 * @return void
 	 */
 	public function translate_js_strings() {
-		EE_Registry::$i18n_js_strings['no_payment_method'] = __( 'Please select a method of payment in order to continue.', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['invalid_payment_method'] = __( 'A valid method of payment could not be determined. Please refresh the page and try again.', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['forwarding_to_offsite'] = __( 'Forwarding to Secure Payment Provider.', 'event_espresso' );
+		EE_Registry::$i18n_js_strings['no_payment_method'] = __('Please select a method of payment in order to continue.', 'event_espresso');
+		EE_Registry::$i18n_js_strings['invalid_payment_method'] = __('A valid method of payment could not be determined. Please refresh the page and try again.', 'event_espresso');
+		EE_Registry::$i18n_js_strings['forwarding_to_offsite'] = __('Forwarding to Secure Payment Provider.', 'event_espresso');
 	}
 
 
@@ -156,20 +156,20 @@ 
 			// 	$ 0.00 transactions (no payment required)
 			! $this->checkout->payment_required()
 			// but do NOT remove if current action being called belongs to this reg step
-			&& ! is_callable( array( $this, $this->checkout->action ) )
+			&& ! is_callable(array($this, $this->checkout->action))
 			&& ! $this->completed()
 		) {
 			// and if so, then we no longer need the Payment Options step
-			if ( $this->is_current_step() ) {
+			if ($this->is_current_step()) {
 				$this->checkout->generate_reg_form = false;
 			}
-			$this->checkout->remove_reg_step( $this->_slug );
+			$this->checkout->remove_reg_step($this->_slug);
 			// DEBUG LOG
 			//$this->checkout->log( __CLASS__, __FUNCTION__, __LINE__ );
 			return false;
 		}
 		// load EEM_Payment_Method
-		EE_Registry::instance()->load_model( 'Payment_Method' );
+		EE_Registry::instance()->load_model('Payment_Method');
 		// get all active payment methods
 		$this->checkout->available_payment_methods = EEM_Payment_Method::instance()->get_all_for_transaction(
 			$this->checkout->transaction, EEM_Payment_Method::scope_cart
@@ -183,7 +183,7 @@ 
 	 * @return bool
 	 */
 	public function generate_reg_form() {
-		EE_Registry::instance()->load_helper( 'HTML' );
+		EE_Registry::instance()->load_helper('HTML');
 		// reset in case someone changes their mind
 		$this->_reset_selected_method_of_payment();
 		// set some defaults
@@ -194,16 +194,16 @@ 
 		$sold_out_events = array();
 		$reg_count = 0;
 		// loop thru registrations to gather info
-		$registrations = $this->checkout->transaction->registrations( $this->checkout->reg_cache_where_params );
-		foreach ( $registrations as $registration ) {
+		$registrations = $this->checkout->transaction->registrations($this->checkout->reg_cache_where_params);
+		foreach ($registrations as $registration) {
 			//echo '<h3 style="color:#E76700;line-height:1em;">' . $registration->ID() . '<br/><span style="font-size:9px;font-weight:normal;color:#666">' . __FILE__ . '</span>    <b style="font-size:10px;color:#333">  ' . __LINE__ . ' </b></h3>';
 			/** @var $registration EE_Registration */
 			$reg_count++;
 			// if returning registrant is Approved then do NOT do this
-			if ( ! ( $this->checkout->revisit && $registration->status_ID() == EEM_Registration::status_id_approved )) {
-				if ( $registration->event()->is_sold_out() || $registration->event()->is_sold_out( true )) {
+			if ( ! ($this->checkout->revisit && $registration->status_ID() == EEM_Registration::status_id_approved)) {
+				if ($registration->event()->is_sold_out() || $registration->event()->is_sold_out(true)) {
 					// add event to list of events that are sold out
-					$sold_out_events[ $registration->event()->ID() ] = $registration->event();
+					$sold_out_events[$registration->event()->ID()] = $registration->event();
 					do_action(
 						'AHEE__EE_SPCO_Reg_Step_Payment_Options__generate_reg_form__sold_out_event',
 						$registration->event(),
@@ -211,9 +211,9 @@ 
 					);
 				}
 				// event requires admin approval
-				if ( $registration->status_ID() == EEM_Registration::status_id_not_approved ) {
+				if ($registration->status_ID() == EEM_Registration::status_id_not_approved) {
 					// add event to list of events with pre-approval reg status
-					$registrations_requiring_pre_approval[ $registration->ID() ] = $registration;
+					$registrations_requiring_pre_approval[$registration->ID()] = $registration;
 					do_action(
 						'AHEE__EE_SPCO_Reg_Step_Payment_Options__generate_reg_form__event_requires_pre_approval',
 						$registration->event(),
@@ -222,29 +222,29 @@ 
 				}
 			}
 			// are they allowed to pay now and is there monies owing?
-			if ( $registration->owes_monies_and_can_pay() ) {
-				$registrations_requiring_payment[ $registration->ID() ] = $registration;
+			if ($registration->owes_monies_and_can_pay()) {
+				$registrations_requiring_payment[$registration->ID()] = $registration;
 				do_action(
 					'AHEE__EE_SPCO_Reg_Step_Payment_Options__generate_reg_form__event_requires_payment',
 					$registration->event(),
 					$this
 				);
-			} else if ( ! $this->checkout->revisit && $registration->status_ID() != EEM_Registration::status_id_not_approved && $registration->ticket()->is_free()  ) {
-				$registrations_for_free_events[ $registration->event()->ID() ] = $registration;
+			} else if ( ! $this->checkout->revisit && $registration->status_ID() != EEM_Registration::status_id_not_approved && $registration->ticket()->is_free()) {
+				$registrations_for_free_events[$registration->event()->ID()] = $registration;
 			}
 		}
 		$subsections = array();
 		// now decide which template to load
-		if ( ! empty( $sold_out_events )) {
-			$subsections['sold_out_events'] = $this->_sold_out_events( $sold_out_events );
+		if ( ! empty($sold_out_events)) {
+			$subsections['sold_out_events'] = $this->_sold_out_events($sold_out_events);
 		}
-		if ( ! empty( $registrations_requiring_pre_approval )) {
-			$subsections['registrations_requiring_pre_approval'] = $this->_registrations_requiring_pre_approval( $registrations_requiring_pre_approval );
+		if ( ! empty($registrations_requiring_pre_approval)) {
+			$subsections['registrations_requiring_pre_approval'] = $this->_registrations_requiring_pre_approval($registrations_requiring_pre_approval);
 		}
-		if ( ! empty( $registrations_for_free_events ) ) {
-			$subsections[ 'no_payment_required' ] = $this->_no_payment_required( $registrations_for_free_events );
+		if ( ! empty($registrations_for_free_events)) {
+			$subsections['no_payment_required'] = $this->_no_payment_required($registrations_for_free_events);
 		}
-		if ( ! empty( $registrations_requiring_payment ) ) {
+		if ( ! empty($registrations_requiring_payment)) {
 			//EEH_Debug_Tools::printr( $registrations_requiring_payment, '$registrations_requiring_payment', __FILE__, __LINE__ );
 			// autoload Line_Item_Display classes
 			EEH_Autoloader::register_line_item_filter_autoloaders();
@@ -261,11 +261,11 @@ 
 			//EEH_Debug_Tools::printr( $filtered_line_item_tree->total(), '$filtered_line_item_tree->total()', __FILE__, __LINE__ );
 			$this->checkout->amount_owing = $filtered_line_item_tree->total();
 
-			if ( $this->checkout->amount_owing > 0 ) {
+			if ($this->checkout->amount_owing > 0) {
 				EEH_Autoloader::register_line_item_display_autoloaders();
-				$this->set_line_item_display( new EE_Line_Item_Display( 'spco' ) );
-				$subsections[ 'payment_options' ] = $this->_display_payment_options(
-					$this->line_item_display->display_line_item( $filtered_line_item_tree )
+				$this->set_line_item_display(new EE_Line_Item_Display('spco'));
+				$subsections['payment_options'] = $this->_display_payment_options(
+					$this->line_item_display->display_line_item($filtered_line_item_tree)
 				);
 				$this->_apply_transaction_payments_to_amount_owing();
 			}
@@ -300,7 +300,7 @@ 
 	 * @param \EE_Line_Item_Filter_Collection $line_item_filter_collection
 	 * @return \EE_Line_Item_Filter_Collection
 	 */
-	public static function add_spco_line_item_filters( EE_Line_Item_Filter_Collection $line_item_filter_collection ) {
+	public static function add_spco_line_item_filters(EE_Line_Item_Filter_Collection $line_item_filter_collection) {
 		$line_item_filter_collection->add(
 			new EE_Billable_Line_Item_Filter(
 				EE_Registry::instance()->SSN->checkout()->transaction->registrations(
@@ -308,7 +308,7 @@ 
 				)
 			)
 		);
-		$line_item_filter_collection->add( new EE_Non_Zero_Line_Item_Filter() );
+		$line_item_filter_collection->add(new EE_Non_Zero_Line_Item_Filter());
 		return $line_item_filter_collection;
 	}
 
@@ -322,8 +322,8 @@ 
 	 * @return void
 	 */
 	protected function _hide_reg_step_submit_button_if_revisit() {
-		if ( $this->checkout->revisit ) {
-			add_filter( 'FHEE__EE_SPCO_Reg_Step__reg_step_submit_button__sbmt_btn_html', '__return_empty_string' );
+		if ($this->checkout->revisit) {
+			add_filter('FHEE__EE_SPCO_Reg_Step__reg_step_submit_button__sbmt_btn_html', '__return_empty_string');
 		}
 	}
 
@@ -334,12 +334,12 @@ 
 	 * @param \EE_Event[] $sold_out_events_array
 	 * @return \EE_Form_Section_Proper
 	 */
-	private function _sold_out_events( $sold_out_events_array = array() ) {
+	private function _sold_out_events($sold_out_events_array = array()) {
 		// set some defaults
 		$this->checkout->selected_method_of_payment = 'events_sold_out';
 		$sold_out_events = '';
-		foreach ( $sold_out_events_array as $sold_out_event ) {
-			$sold_out_events .= EEH_HTML::li( EEH_HTML::span( $sold_out_event->name(), '', 'dashicons dashicons-marker ee-icon-size-16 pink-text' ));
+		foreach ($sold_out_events_array as $sold_out_event) {
+			$sold_out_events .= EEH_HTML::li(EEH_HTML::span($sold_out_event->name(), '', 'dashicons dashicons-marker ee-icon-size-16 pink-text'));
 		}
 		return new EE_Form_Section_Proper(
 			array(
@@ -351,14 +351,14 @@ 
 				),
 				'layout_strategy'		=> new EE_Template_Layout(
 					array(
-						'layout_template_file' 	=> SPCO_REG_STEPS_PATH . $this->_slug . DS . 'sold_out_events.template.php', // layout_template
+						'layout_template_file' 	=> SPCO_REG_STEPS_PATH.$this->_slug.DS.'sold_out_events.template.php', // layout_template
 						'template_args'  				=> apply_filters(
 							'FHEE__EE_SPCO_Reg_Step_Payment_Options___sold_out_events__template_args',
 							array(
 								'sold_out_events' 			=> $sold_out_events,
 								'sold_out_events_msg' 	=> apply_filters(
 									'FHEE__EE_SPCO_Reg_Step_Payment_Options___sold_out_events__sold_out_events_msg',
-									__( 'It appears that the event you were about to make a payment for has sold out since you first registered. If you have already made a partial payment towards this event, please contact the event administrator for a refund.', 'event_espresso' )
+									__('It appears that the event you were about to make a payment for has sold out since you first registered. If you have already made a partial payment towards this event, please contact the event administrator for a refund.', 'event_espresso')
 								)
 							)
 						)
@@ -375,14 +375,14 @@ 
 	 * @param array $registrations_requiring_pre_approval
 	 * @return \EE_Form_Section_Proper
 	 */
-	private function _registrations_requiring_pre_approval( $registrations_requiring_pre_approval = array()) {
+	private function _registrations_requiring_pre_approval($registrations_requiring_pre_approval = array()) {
 		$events_requiring_pre_approval = '';
-		foreach ( $registrations_requiring_pre_approval as $registration ) {
-			if ( $registration instanceof EE_Registration && $registration->event() instanceof EE_Event ) {
-				$events_requiring_pre_approval[ $registration->event()->ID() ] = EEH_HTML::li(
-					EEH_HTML::span( '', '', 'dashicons dashicons-marker ee-icon-size-16 orange-text'
+		foreach ($registrations_requiring_pre_approval as $registration) {
+			if ($registration instanceof EE_Registration && $registration->event() instanceof EE_Event) {
+				$events_requiring_pre_approval[$registration->event()->ID()] = EEH_HTML::li(
+					EEH_HTML::span('', '', 'dashicons dashicons-marker ee-icon-size-16 orange-text'
 					)
-					. EEH_HTML::span( $registration->event()->name(), '', 'orange-text' )
+					. EEH_HTML::span($registration->event()->name(), '', 'orange-text')
 				);
 			}
 		}
@@ -394,14 +394,14 @@ 
 				),
 				'layout_strategy'		=> new EE_Template_Layout(
 					array(
-						'layout_template_file' 	=> SPCO_REG_STEPS_PATH . $this->_slug . DS . 'events_requiring_pre_approval.template.php', // layout_template
+						'layout_template_file' 	=> SPCO_REG_STEPS_PATH.$this->_slug.DS.'events_requiring_pre_approval.template.php', // layout_template
 						'template_args'  				=> apply_filters(
 							'FHEE__EE_SPCO_Reg_Step_Payment_Options___sold_out_events__template_args',
 							array(
-								'events_requiring_pre_approval' 			=> implode( '', $events_requiring_pre_approval ),
+								'events_requiring_pre_approval' 			=> implode('', $events_requiring_pre_approval),
 								'events_requiring_pre_approval_msg' 	=> apply_filters(
 									'FHEE__EE_SPCO_Reg_Step_Payment_Options___events_requiring_pre_approval__events_requiring_pre_approval_msg',
-									__( 'The following events do not require payment at this time and will not be billed during this transaction. Billing will only occur after the attendee has been approved by the event organizer. You will be notified when your registration has been processed. If this is a free event, then no billing will occur.', 'event_espresso' )
+									__('The following events do not require payment at this time and will not be billed during this transaction. Billing will only occur after the attendee has been approved by the event organizer. You will be notified when your registration has been processed. If this is a free event, then no billing will occur.', 'event_espresso')
 								)
 							)
 						),
@@ -419,7 +419,7 @@ 
 	 * @param \EE_Event[] $registrations_for_free_events
 	 * @return \EE_Form_Section_Proper
 	 */
-	private function _no_payment_required( $registrations_for_free_events = array() ) {
+	private function _no_payment_required($registrations_for_free_events = array()) {
 		// set some defaults
 		$this->checkout->selected_method_of_payment = 'no_payment_required';
 		// generate no_payment_required form
@@ -431,7 +431,7 @@ 
 				),
 				'layout_strategy' 	=> new EE_Template_Layout(
 					array(
-						'layout_template_file' 	=> SPCO_REG_STEPS_PATH . $this->_slug . DS . 'no_payment_required.template.php', // layout_template
+						'layout_template_file' 	=> SPCO_REG_STEPS_PATH.$this->_slug.DS.'no_payment_required.template.php', // layout_template
 						'template_args'  				=> apply_filters(
 							'FHEE__EE_SPCO_Reg_Step_Payment_Options___no_payment_required__template_args',
 							array(
@@ -439,7 +439,7 @@ 
 								'registrations' => array(),
 								'ticket_count' 	=> array(),
 								'registrations_for_free_events' 	=> $registrations_for_free_events,
-								'no_payment_required_msg' => EEH_HTML::p( __( 'This is a free event, so no billing will occur.', 'event_espresso' ))
+								'no_payment_required_msg' => EEH_HTML::p(__('This is a free event, so no billing will occur.', 'event_espresso'))
 							)
 						),
 					)
@@ -456,7 +456,7 @@ 
 	 * @param string $transaction_details
 	 * @return \EE_Form_Section_Proper
 	 */
-	private function _display_payment_options( $transaction_details = '' ) {
+	private function _display_payment_options($transaction_details = '') {
 		// has method_of_payment been set by no-js user?
 		$this->checkout->selected_method_of_payment = $this->_get_selected_method_of_payment();
 		// build payment options form
@@ -468,20 +468,20 @@ 
 						'before_payment_options' => apply_filters(
 							'FHEE__EE_SPCO_Reg_Step_Payment_Options___display_payment_options__before_payment_options',
 							new EE_Form_Section_Proper(
-								array( 'layout_strategy'	=> new EE_Div_Per_Section_Layout() )
+								array('layout_strategy'	=> new EE_Div_Per_Section_Layout())
 							)
 						),
 						'payment_options' => $this->_setup_payment_options(),
 						'after_payment_options' => apply_filters(
 							'FHEE__EE_SPCO_Reg_Step_Payment_Options___display_payment_options__after_payment_options',
 							new EE_Form_Section_Proper(
-								array( 'layout_strategy'	=> new EE_Div_Per_Section_Layout() )
+								array('layout_strategy'	=> new EE_Div_Per_Section_Layout())
 							)
 						),
 						'default_hidden_inputs' => $this->reg_step_hidden_inputs(),
-						'extra_hidden_inputs' 	=> $this->_extra_hidden_inputs( FALSE )
+						'extra_hidden_inputs' 	=> $this->_extra_hidden_inputs(FALSE)
 					),
-					'layout_strategy'	=> new EE_Template_Layout( array(
+					'layout_strategy'	=> new EE_Template_Layout(array(
 							'layout_template_file' 	=> $this->_template,
 							'template_args'  				=> apply_filters(
 								'FHEE__EE_SPCO_Reg_Step_Payment_Options___display_payment_options__template_args',
@@ -505,11 +505,11 @@ 
 	 * @param bool $no_payment_required
 	 * @return \EE_Form_Section_Proper
 	 */
-	private function _extra_hidden_inputs( $no_payment_required = TRUE ) {
+	private function _extra_hidden_inputs($no_payment_required = TRUE) {
 
 		return new EE_Form_Section_Proper(
 			array(
-				'html_id' 				=> 'ee-' . $this->slug() . '-extra-hidden-inputs',
+				'html_id' 				=> 'ee-'.$this->slug().'-extra-hidden-inputs',
 				'layout_strategy'	=> new EE_Div_Per_Section_Layout(),
 				'subsections' 		=> array(
 					'spco_no_payment_required' => new EE_Hidden_Input(
@@ -544,9 +544,9 @@ 
 	 */
 	protected function _apply_transaction_payments_to_amount_owing() {
 		$payments = $this->checkout->transaction->approved_payments();
-		if ( ! empty( $payments ) ) {
-			foreach ( $payments as $payment ) {
-				if ( $payment instanceof EE_Payment ) {
+		if ( ! empty($payments)) {
+			foreach ($payments as $payment) {
+				if ($payment instanceof EE_Payment) {
 					$this->checkout->amount_owing -= $payment->amount();
 				}
 			}
@@ -562,9 +562,9 @@ 
 	 * @param 	bool $force_reset
 	 * @return 	void
 	 */
-	private function _reset_selected_method_of_payment( $force_reset = FALSE ) {
-		$reset_payment_method = $force_reset ? TRUE : sanitize_text_field( EE_Registry::instance()->REQ->get( 'reset_payment_method', FALSE ));
-		if ( $reset_payment_method ) {
+	private function _reset_selected_method_of_payment($force_reset = FALSE) {
+		$reset_payment_method = $force_reset ? TRUE : sanitize_text_field(EE_Registry::instance()->REQ->get('reset_payment_method', FALSE));
+		if ($reset_payment_method) {
 			$this->checkout->selected_method_of_payment = NULL;
 			$this->checkout->payment_method = NULL;
 			$this->checkout->billing_form = NULL;
@@ -583,9 +583,9 @@ 
 	 * @param string $selected_method_of_payment
 	 * 	@return 		EE_Billing_Info_Form
 	 */
-	private function _save_selected_method_of_payment( $selected_method_of_payment = '' ) {
-		$selected_method_of_payment = ! empty( $selected_method_of_payment ) ? $selected_method_of_payment : $this->checkout->selected_method_of_payment;
-		EE_Registry::instance()->SSN->set_session_data( array( 'selected_method_of_payment' => $selected_method_of_payment ));
+	private function _save_selected_method_of_payment($selected_method_of_payment = '') {
+		$selected_method_of_payment = ! empty($selected_method_of_payment) ? $selected_method_of_payment : $this->checkout->selected_method_of_payment;
+		EE_Registry::instance()->SSN->set_session_data(array('selected_method_of_payment' => $selected_method_of_payment));
 	}
 
 
@@ -598,40 +598,40 @@ 
 		// load payment method classes
 		$this->checkout->available_payment_methods = $this->_get_available_payment_methods();
 		// switch up header depending on number of available payment methods
-		$payment_method_header = count( $this->checkout->available_payment_methods ) > 1
-			? apply_filters( 'FHEE__registration_page_payment_options__method_of_payment_hdr', __( 'Please Select Your Method of Payment', 'event_espresso' ))
-			: apply_filters( 'FHEE__registration_page_payment_options__method_of_payment_hdr', __( 'Method of Payment', 'event_espresso' ));
+		$payment_method_header = count($this->checkout->available_payment_methods) > 1
+			? apply_filters('FHEE__registration_page_payment_options__method_of_payment_hdr', __('Please Select Your Method of Payment', 'event_espresso'))
+			: apply_filters('FHEE__registration_page_payment_options__method_of_payment_hdr', __('Method of Payment', 'event_espresso'));
 		$available_payment_methods = array(
 			// display the "Payment Method" header
 			'payment_method_header' => new EE_Form_Section_HTML(
-				EEH_HTML::h4 ( $payment_method_header, 'method-of-payment-hdr' )
+				EEH_HTML::h4($payment_method_header, 'method-of-payment-hdr')
 			)
 		);
 		// the list of actual payment methods ( invoice, paypal, etc ) in a  ( slug => HTML )  format
 		$available_payment_method_options = array();
 		$default_payment_method_option = array();
 		// additional instructions to be displayed and hidden below payment methods (adding a clearing div to start)
-		$payment_methods_billing_info = array( new EE_Form_Section_HTML( EEH_HTML::div ( '<br />', '', '', 'clear:both;' )));
+		$payment_methods_billing_info = array(new EE_Form_Section_HTML(EEH_HTML::div('<br />', '', '', 'clear:both;')));
 		// loop through payment methods
-		foreach( $this->checkout->available_payment_methods as $payment_method ) {
-			if ( $payment_method instanceof EE_Payment_Method ) {
-				$payment_method_button = EEH_HTML::img( $payment_method->button_url(), $payment_method->name(), 'spco-payment-method-' . $payment_method->slug() . '-btn-img', 'spco-payment-method-btn-img' );
+		foreach ($this->checkout->available_payment_methods as $payment_method) {
+			if ($payment_method instanceof EE_Payment_Method) {
+				$payment_method_button = EEH_HTML::img($payment_method->button_url(), $payment_method->name(), 'spco-payment-method-'.$payment_method->slug().'-btn-img', 'spco-payment-method-btn-img');
 				// check if any payment methods are set as default
 				// if payment method is already selected OR nothing is selected and this payment method should be open_by_default
-				if (( $this->checkout->selected_method_of_payment == $payment_method->slug() ) || ( ! $this->checkout->selected_method_of_payment && $payment_method->open_by_default() )) {
+				if (($this->checkout->selected_method_of_payment == $payment_method->slug()) || ( ! $this->checkout->selected_method_of_payment && $payment_method->open_by_default())) {
 					$this->checkout->selected_method_of_payment = $payment_method->slug();
 					$this->_save_selected_method_of_payment();
-					$default_payment_method_option[ $payment_method->slug() ] =  $payment_method_button;
+					$default_payment_method_option[$payment_method->slug()] = $payment_method_button;
 				} else {
-					$available_payment_method_options[ $payment_method->slug() ] =  $payment_method_button;
+					$available_payment_method_options[$payment_method->slug()] = $payment_method_button;
 				}
-				$payment_methods_billing_info[ $payment_method->slug() . '-info' ] = $this->_payment_method_billing_info( $payment_method );
+				$payment_methods_billing_info[$payment_method->slug().'-info'] = $this->_payment_method_billing_info($payment_method);
 			}
 		}
 		// prepend available_payment_method_options with default_payment_method_option so that it appears first in list of PMs
 		$available_payment_method_options = $default_payment_method_option + $available_payment_method_options;
 		// now generate the actual form  inputs
-		$available_payment_methods['available_payment_methods'] = $this->_available_payment_method_inputs( $available_payment_method_options );
+		$available_payment_methods['available_payment_methods'] = $this->_available_payment_method_inputs($available_payment_method_options);
 		$available_payment_methods = $available_payment_methods + $payment_methods_billing_info;
 
 		// build the available payment methods form
@@ -651,19 +651,19 @@ 
 	 * @return EE_Payment_Method[]
 	 */
 	protected function _get_available_payment_methods() {
-		if ( ! empty( $this->checkout->available_payment_methods )) {
+		if ( ! empty($this->checkout->available_payment_methods)) {
 			return $this->checkout->available_payment_methods;
 		}
 		$available_payment_methods = array();
 		// load EEM_Payment_Method
-		EE_Registry::instance()->load_model( 'Payment_Method' );
+		EE_Registry::instance()->load_model('Payment_Method');
 		/** @type EEM_Payment_Method $EEM_Payment_Method */
 		$EEM_Payment_Method = EE_Registry::instance()->LIB->EEM_Payment_Method;
 		// get all active payment methods
-		$payment_methods = $EEM_Payment_Method->get_all_for_transaction( $this->checkout->transaction, EEM_Payment_Method::scope_cart );
-		foreach ( $payment_methods as $payment_method ) {
-			if ( $payment_method instanceof EE_Payment_Method ) {
-				$available_payment_methods[ $payment_method->slug() ] = $payment_method;
+		$payment_methods = $EEM_Payment_Method->get_all_for_transaction($this->checkout->transaction, EEM_Payment_Method::scope_cart);
+		foreach ($payment_methods as $payment_method) {
+			if ($payment_method instanceof EE_Payment_Method) {
+				$available_payment_methods[$payment_method->slug()] = $payment_method;
 			}
 		}
 		return $available_payment_methods;
@@ -679,14 +679,14 @@ 
 	 * @param 	array $available_payment_method_options
 	 * @return 	\EE_Form_Section_Proper
 	 */
-	private function _available_payment_method_inputs( $available_payment_method_options = array() ) {
+	private function _available_payment_method_inputs($available_payment_method_options = array()) {
 		// generate inputs
 		return new EE_Form_Section_Proper(
 			array(
 				'html_id' 				=> 'ee-available-payment-method-inputs',
 				'layout_strategy'	=> new EE_Div_Per_Section_Layout(),
 				'subsections' 		=> array(
-					'' => new EE_Radio_Button_Input (
+					'' => new EE_Radio_Button_Input(
 						$available_payment_method_options,
 						array(
 							'html_name' 				=> 'selected_method_of_payment',
@@ -710,36 +710,36 @@ 
 	 * @param 	EE_Payment_Method $payment_method
 	 * @return 	\EE_Form_Section_Proper
 	 */
-	private function _payment_method_billing_info( EE_Payment_Method $payment_method ) {
+	private function _payment_method_billing_info(EE_Payment_Method $payment_method) {
 		$currently_selected = $this->checkout->selected_method_of_payment == $payment_method->slug() ? TRUE : FALSE;
 		// generate the billing form for payment method
-		$billing_form = $currently_selected ? $this->_get_billing_form_for_payment_method( $payment_method ) : new EE_Form_Section_HTML();
+		$billing_form = $currently_selected ? $this->_get_billing_form_for_payment_method($payment_method) : new EE_Form_Section_HTML();
 		$this->checkout->billing_form = $currently_selected ? $billing_form : $this->checkout->billing_form;
 		// it's all in the details
-		$info_html = EEH_HTML::h3 ( __( 'Important information regarding your payment', 'event_espresso' ), '', 'spco-payment-method-hdr' );
+		$info_html = EEH_HTML::h3(__('Important information regarding your payment', 'event_espresso'), '', 'spco-payment-method-hdr');
 		// add some info regarding the step, either from what's saved in the admin, or a default string depending on whether the PM has a billing form or not
-		if ( $payment_method->description() ) {
+		if ($payment_method->description()) {
 			$payment_method_info = $payment_method->description();
-		} elseif ( $billing_form instanceof EE_Billing_Info_Form ) {
-			$payment_method_info = sprintf( __( 'Please provide the following billing information, then click the "%1$s" button below in order to proceed.', 'event_espresso' ), $this->submit_button_text() );
+		} elseif ($billing_form instanceof EE_Billing_Info_Form) {
+			$payment_method_info = sprintf(__('Please provide the following billing information, then click the "%1$s" button below in order to proceed.', 'event_espresso'), $this->submit_button_text());
 		} else {
-			$payment_method_info = sprintf( __( 'Please click the "%1$s" button below in order to proceed.', 'event_espresso' ), $this->submit_button_text() );
+			$payment_method_info = sprintf(__('Please click the "%1$s" button below in order to proceed.', 'event_espresso'), $this->submit_button_text());
 		}
-		$info_html .= EEH_HTML::p (
-			apply_filters( 'FHEE__EE_SPCO_Reg_Step_Payment_Options___payment_method_billing_info__payment_method_info', $payment_method_info ),
+		$info_html .= EEH_HTML::p(
+			apply_filters('FHEE__EE_SPCO_Reg_Step_Payment_Options___payment_method_billing_info__payment_method_info', $payment_method_info),
 			'',
 			'spco-payment-method-desc ee-attention'
 		);
 
 		return new EE_Form_Section_Proper(
 			array(
-				'html_id' 					=> 'spco-payment-method-info-' . $payment_method->slug(),
+				'html_id' 					=> 'spco-payment-method-info-'.$payment_method->slug(),
 				'html_class' 			=> 'spco-payment-method-info-dv',
 				// only display the selected or default PM
 				'html_style' 			=> $currently_selected ? '' : 'display:none;',
 				'layout_strategy'		=> new EE_Div_Per_Section_Layout(),
 				'subsections' 			=> array(
-					'info' 					=> new EE_Form_Section_HTML( $info_html ),
+					'info' 					=> new EE_Form_Section_HTML($info_html),
 					'billing_form' 		=> $currently_selected ? $billing_form : new EE_Form_Section_HTML()
 				)
 			)
@@ -757,12 +757,12 @@ 
 	 */
 	public function get_billing_form_html_for_payment_method() {
 		// how have they chosen to pay?
-		$this->checkout->selected_method_of_payment = $this->_get_selected_method_of_payment( TRUE );
+		$this->checkout->selected_method_of_payment = $this->_get_selected_method_of_payment(TRUE);
 		$this->checkout->payment_method = $this->_get_payment_method_for_selected_method_of_payment();
-		if ( ! $this->checkout->payment_method instanceof EE_Payment_Method ) {
+		if ( ! $this->checkout->payment_method instanceof EE_Payment_Method) {
 			return FALSE;
 		}
-		if ( apply_filters( 'FHEE__EE_SPCO_Reg_Step_Payment_Options__registration_checkout__selected_payment_method__display_success', false ) ) {
+		if (apply_filters('FHEE__EE_SPCO_Reg_Step_Payment_Options__registration_checkout__selected_payment_method__display_success', false)) {
             EE_Error::add_success(
                 apply_filters(
                     'FHEE__Single_Page_Checkout__registration_checkout__selected_payment_method',
@@ -771,20 +771,20 @@ 
             );
         }
 		// now generate billing form for selected method of payment
-		$payment_method_billing_form = $this->_get_billing_form_for_payment_method( $this->checkout->payment_method );
+		$payment_method_billing_form = $this->_get_billing_form_for_payment_method($this->checkout->payment_method);
 		// fill form with attendee info if applicable
-		if ( $payment_method_billing_form instanceof EE_Billing_Attendee_Info_Form && $this->checkout->transaction_has_primary_registrant() ) {
-			$payment_method_billing_form->populate_from_attendee( $this->checkout->transaction->primary_registration()->attendee() );
+		if ($payment_method_billing_form instanceof EE_Billing_Attendee_Info_Form && $this->checkout->transaction_has_primary_registrant()) {
+			$payment_method_billing_form->populate_from_attendee($this->checkout->transaction->primary_registration()->attendee());
 		}
 		// and debug content
-		if ( $payment_method_billing_form instanceof EE_Billing_Info_Form && $this->checkout->payment_method->type_obj() instanceof EE_PMT_Base ) {
-			$payment_method_billing_form = $this->checkout->payment_method->type_obj()->apply_billing_form_debug_settings( $payment_method_billing_form );
+		if ($payment_method_billing_form instanceof EE_Billing_Info_Form && $this->checkout->payment_method->type_obj() instanceof EE_PMT_Base) {
+			$payment_method_billing_form = $this->checkout->payment_method->type_obj()->apply_billing_form_debug_settings($payment_method_billing_form);
 		}
 		$billing_info = $payment_method_billing_form instanceof EE_Form_Section_Proper ? $payment_method_billing_form->get_html() : '';
-		$this->checkout->json_response->set_return_data( array( 'payment_method_info' => $billing_info ));
+		$this->checkout->json_response->set_return_data(array('payment_method_info' => $billing_info));
 		// localize validation rules for main form
 		$this->checkout->current_step->reg_form->localize_validation_rules();
-		$this->checkout->json_response->add_validation_rules( EE_Form_Section_Proper::js_localization() );
+		$this->checkout->json_response->add_validation_rules(EE_Form_Section_Proper::js_localization());
 		return TRUE;
 	}
 
@@ -797,15 +797,15 @@ 
 	 * @param EE_Payment_Method $payment_method
 	 * @return \EE_Billing_Info_Form
 	 */
-	private function _get_billing_form_for_payment_method( EE_Payment_Method $payment_method ) {
-		$billing_form = $payment_method->type_obj()->billing_form( $this->checkout->transaction, array( 'amount_owing' => $this->checkout->amount_owing ) );
-		if ( $billing_form instanceof EE_Billing_Info_Form ) {
-			if ( EE_Registry::instance()->REQ->is_set( 'payment_method' )) {
-                if ( apply_filters('FHEE__EE_SPCO_Reg_Step_Payment_Options__registration_checkout__selected_payment_method__display_success', false )) {
+	private function _get_billing_form_for_payment_method(EE_Payment_Method $payment_method) {
+		$billing_form = $payment_method->type_obj()->billing_form($this->checkout->transaction, array('amount_owing' => $this->checkout->amount_owing));
+		if ($billing_form instanceof EE_Billing_Info_Form) {
+			if (EE_Registry::instance()->REQ->is_set('payment_method')) {
+                if (apply_filters('FHEE__EE_SPCO_Reg_Step_Payment_Options__registration_checkout__selected_payment_method__display_success', false)) {
                     EE_Error::add_success(
                         apply_filters(
                             'FHEE__Single_Page_Checkout__registration_checkout__selected_payment_method',
-                            sprintf( __( 'You have selected "%s" as your method of payment. Please note the important payment information below.', 'event_espresso' ), $payment_method->name() )
+                            sprintf(__('You have selected "%s" as your method of payment. Please note the important payment information below.', 'event_espresso'), $payment_method->name())
                         )
                     );
                 }
@@ -830,27 +830,27 @@ 
 	 * @param string 		$request_param
 	 * @return NULL|string
 	 */
-	private function _get_selected_method_of_payment( $required = FALSE, $request_param = 'selected_method_of_payment' ) {
+	private function _get_selected_method_of_payment($required = FALSE, $request_param = 'selected_method_of_payment') {
 		// is selected_method_of_payment set in the request ?
-		$selected_method_of_payment = EE_Registry::instance()->REQ->get( $request_param, FALSE );
-		if ( $selected_method_of_payment ) {
+		$selected_method_of_payment = EE_Registry::instance()->REQ->get($request_param, FALSE);
+		if ($selected_method_of_payment) {
 			// sanitize it
-			$selected_method_of_payment = is_array( $selected_method_of_payment ) ? array_shift( $selected_method_of_payment ) : $selected_method_of_payment;
-			$selected_method_of_payment = sanitize_text_field( $selected_method_of_payment );
+			$selected_method_of_payment = is_array($selected_method_of_payment) ? array_shift($selected_method_of_payment) : $selected_method_of_payment;
+			$selected_method_of_payment = sanitize_text_field($selected_method_of_payment);
 			// store it in the session so that it's available for all subsequent requests including AJAX
-			$this->_save_selected_method_of_payment( $selected_method_of_payment );
+			$this->_save_selected_method_of_payment($selected_method_of_payment);
 		} else {
 			// or is is set in the session ?
-			$selected_method_of_payment = EE_Registry::instance()->SSN->get_session_data( 'selected_method_of_payment' );
+			$selected_method_of_payment = EE_Registry::instance()->SSN->get_session_data('selected_method_of_payment');
 		}
 		// do ya really really gotta have it?
-		if ( empty( $selected_method_of_payment ) && $required ) {
+		if (empty($selected_method_of_payment) && $required) {
 			EE_Error::add_error(
 				sprintf(
-					__( 'The selected method of payment could not be determined.%sPlease ensure that you have selected one before proceeding.%sIf you continue to experience difficulties, then refresh your browser and try again, or contact %s for assistance.', 'event_espresso' ),
+					__('The selected method of payment could not be determined.%sPlease ensure that you have selected one before proceeding.%sIf you continue to experience difficulties, then refresh your browser and try again, or contact %s for assistance.', 'event_espresso'),
 					'<br/>',
 					'<br/>',
-					EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+					EE_Registry::instance()->CFG->organization->get_pretty('email')
 				),
 				__FILE__, __FUNCTION__, __LINE__
 			);
@@ -876,37 +876,37 @@ 
 	 * @return string
 	 */
 	public function switch_payment_method() {
-		if ( ! $this->_verify_payment_method_is_set() ) {
+		if ( ! $this->_verify_payment_method_is_set()) {
 			return FALSE;
 		}
-		if ( apply_filters( 'FHEE__EE_SPCO_Reg_Step_Payment_Options__registration_checkout__selected_payment_method__display_success', false ) ) {
+		if (apply_filters('FHEE__EE_SPCO_Reg_Step_Payment_Options__registration_checkout__selected_payment_method__display_success', false)) {
 			EE_Error::add_success(
 				apply_filters(
 					'FHEE__Single_Page_Checkout__registration_checkout__selected_payment_method',
-					sprintf( __( 'You have selected "%s" as your method of payment. Please note the important payment information below.', 'event_espresso' ), $this->checkout->payment_method->name() )
+					sprintf(__('You have selected "%s" as your method of payment. Please note the important payment information below.', 'event_espresso'), $this->checkout->payment_method->name())
 				)
 			);
 		}
 		// generate billing form for selected method of payment if it hasn't been done already
-		if ( $this->checkout->payment_method->type_obj()->has_billing_form() ) {
-			$this->checkout->billing_form = $this->_get_billing_form_for_payment_method( $this->checkout->payment_method );
+		if ($this->checkout->payment_method->type_obj()->has_billing_form()) {
+			$this->checkout->billing_form = $this->_get_billing_form_for_payment_method($this->checkout->payment_method);
 		}
 		// fill form with attendee info if applicable
-		if ( $this->checkout->billing_form instanceof EE_Billing_Attendee_Info_Form && $this->checkout->transaction_has_primary_registrant() ) {
-			$this->checkout->billing_form->populate_from_attendee( $this->checkout->transaction->primary_registration()->attendee() );
+		if ($this->checkout->billing_form instanceof EE_Billing_Attendee_Info_Form && $this->checkout->transaction_has_primary_registrant()) {
+			$this->checkout->billing_form->populate_from_attendee($this->checkout->transaction->primary_registration()->attendee());
 		}
 		// and debug content
-		if ( $this->checkout->billing_form instanceof EE_Billing_Info_Form && $this->checkout->payment_method->type_obj() instanceof EE_PMT_Base ) {
-			$this->checkout->billing_form = $this->checkout->payment_method->type_obj()->apply_billing_form_debug_settings( $this->checkout->billing_form );
+		if ($this->checkout->billing_form instanceof EE_Billing_Info_Form && $this->checkout->payment_method->type_obj() instanceof EE_PMT_Base) {
+			$this->checkout->billing_form = $this->checkout->payment_method->type_obj()->apply_billing_form_debug_settings($this->checkout->billing_form);
 		}
 		// get html and validation rules for form
-		if ( $this->checkout->billing_form instanceof EE_Form_Section_Proper ) {
-			$this->checkout->json_response->set_return_data( array( 'payment_method_info' => $this->checkout->billing_form->get_html() ));
+		if ($this->checkout->billing_form instanceof EE_Form_Section_Proper) {
+			$this->checkout->json_response->set_return_data(array('payment_method_info' => $this->checkout->billing_form->get_html()));
 			// localize validation rules for main form
-			$this->checkout->billing_form->localize_validation_rules( TRUE );
-			$this->checkout->json_response->add_validation_rules( EE_Form_Section_Proper::js_localization() );
+			$this->checkout->billing_form->localize_validation_rules(TRUE);
+			$this->checkout->json_response->add_validation_rules(EE_Form_Section_Proper::js_localization());
 		} else {
-			$this->checkout->json_response->set_return_data( array( 'payment_method_info' => '' ));
+			$this->checkout->json_response->set_return_data(array('payment_method_info' => ''));
 		}
 		//prevents advancement to next step
 		$this->checkout->continue_reg = FALSE;
@@ -921,12 +921,12 @@ 
 	 */
 	protected function _verify_payment_method_is_set() {
 		// generate billing form for selected method of payment if it hasn't been done already
-		if ( empty( $this->checkout->selected_method_of_payment )) {
+		if (empty($this->checkout->selected_method_of_payment)) {
 			// how have they chosen to pay?
-			$this->checkout->selected_method_of_payment = $this->_get_selected_method_of_payment( TRUE );
+			$this->checkout->selected_method_of_payment = $this->_get_selected_method_of_payment(TRUE);
 		}
 		// verify payment method
-		if ( ! $this->checkout->payment_method instanceof EE_Payment_Method ) {
+		if ( ! $this->checkout->payment_method instanceof EE_Payment_Method) {
 			// get payment method for selected method of payment
 			$this->checkout->payment_method = $this->_get_payment_method_for_selected_method_of_payment();
 		}
@@ -946,23 +946,23 @@ 
 	 * @return void
 	 */
 	public function save_payer_details_via_ajax() {
-		if ( ! $this->_verify_payment_method_is_set() ) {
+		if ( ! $this->_verify_payment_method_is_set()) {
 			return;
 		}
 		// generate billing form for selected method of payment if it hasn't been done already
-		if ( $this->checkout->payment_method->type_obj()->has_billing_form() ) {
-			$this->checkout->billing_form = $this->_get_billing_form_for_payment_method( $this->checkout->payment_method );
+		if ($this->checkout->payment_method->type_obj()->has_billing_form()) {
+			$this->checkout->billing_form = $this->_get_billing_form_for_payment_method($this->checkout->payment_method);
 		}
 		// generate primary attendee from payer info if applicable
 		if ( ! $this->checkout->transaction_has_primary_registrant()) {
 			$attendee = $this->_create_attendee_from_request_data();
-			if ( $attendee instanceof EE_Attendee ) {
-				foreach ( $this->checkout->transaction->registrations() as $registration ) {
-					if ( $registration->is_primary_registrant() ) {
+			if ($attendee instanceof EE_Attendee) {
+				foreach ($this->checkout->transaction->registrations() as $registration) {
+					if ($registration->is_primary_registrant()) {
 						$this->checkout->primary_attendee_obj = $attendee;
-						$registration->_add_relation_to( $attendee, 'Attendee' );
-						$registration->set_attendee_id( $attendee->ID() );
-						$registration->update_cache_after_object_save( 'Attendee', $attendee );
+						$registration->_add_relation_to($attendee, 'Attendee');
+						$registration->set_attendee_id($attendee->ID());
+						$registration->update_cache_after_object_save('Attendee', $attendee);
 					}
 				}
 			}
@@ -975,56 +975,56 @@ 
 	 * uses info from alternate GET or POST data (such as AJAX) to create a new attendee
 	 * @return \EE_Attendee
 	 */
-	protected function _create_attendee_from_request_data(){
+	protected function _create_attendee_from_request_data() {
 		// get State ID
-		$STA_ID = ! empty( $_REQUEST['state'] ) ? sanitize_text_field( $_REQUEST['state'] ) : '';
-		if ( ! empty( $STA_ID )) {
+		$STA_ID = ! empty($_REQUEST['state']) ? sanitize_text_field($_REQUEST['state']) : '';
+		if ( ! empty($STA_ID)) {
 			// can we get state object from name ?
-			EE_Registry::instance()->load_model( 'State' );
-			$state = EEM_State::instance()->get_col( array( array( 'STA_name' => $STA_ID ), 'limit' => 1), 'STA_ID' );
-			$STA_ID = is_array( $state ) && ! empty( $state ) ? reset( $state ) : $STA_ID;
+			EE_Registry::instance()->load_model('State');
+			$state = EEM_State::instance()->get_col(array(array('STA_name' => $STA_ID), 'limit' => 1), 'STA_ID');
+			$STA_ID = is_array($state) && ! empty($state) ? reset($state) : $STA_ID;
 		}
 		// get Country ISO
-		$CNT_ISO = ! empty( $_REQUEST['country'] ) ? sanitize_text_field( $_REQUEST['country'] ) : '';
-		if ( ! empty( $CNT_ISO )) {
+		$CNT_ISO = ! empty($_REQUEST['country']) ? sanitize_text_field($_REQUEST['country']) : '';
+		if ( ! empty($CNT_ISO)) {
 			// can we get country object from name ?
-			EE_Registry::instance()->load_model( 'Country' );
-			$country = EEM_Country::instance()->get_col( array( array( 'CNT_name' => $CNT_ISO ), 'limit' => 1), 'CNT_ISO' );
-			$CNT_ISO = is_array( $country ) && ! empty( $country ) ? reset( $country ) : $CNT_ISO;
+			EE_Registry::instance()->load_model('Country');
+			$country = EEM_Country::instance()->get_col(array(array('CNT_name' => $CNT_ISO), 'limit' => 1), 'CNT_ISO');
+			$CNT_ISO = is_array($country) && ! empty($country) ? reset($country) : $CNT_ISO;
 		}
 		// grab attendee data
 		$attendee_data = array(
-			'ATT_fname' 		=> ! empty( $_REQUEST['first_name'] ) ? sanitize_text_field( $_REQUEST['first_name'] ) : '',
-			'ATT_lname' 		=> ! empty( $_REQUEST['last_name'] ) ? sanitize_text_field( $_REQUEST['last_name'] ) : '',
-			'ATT_email' 		=> ! empty( $_REQUEST['email'] ) ? sanitize_email( $_REQUEST['email'] ) : '',
-			'ATT_address' 		=> ! empty( $_REQUEST['address'] ) ? sanitize_text_field( $_REQUEST['address'] ) : '',
-			'ATT_address2' 	=> ! empty( $_REQUEST['address2'] ) ? sanitize_text_field( $_REQUEST['address2'] ) : '',
-			'ATT_city' 			=> ! empty( $_REQUEST['city'] ) ? sanitize_text_field( $_REQUEST['city'] ) : '',
+			'ATT_fname' 		=> ! empty($_REQUEST['first_name']) ? sanitize_text_field($_REQUEST['first_name']) : '',
+			'ATT_lname' 		=> ! empty($_REQUEST['last_name']) ? sanitize_text_field($_REQUEST['last_name']) : '',
+			'ATT_email' 		=> ! empty($_REQUEST['email']) ? sanitize_email($_REQUEST['email']) : '',
+			'ATT_address' 		=> ! empty($_REQUEST['address']) ? sanitize_text_field($_REQUEST['address']) : '',
+			'ATT_address2' 	=> ! empty($_REQUEST['address2']) ? sanitize_text_field($_REQUEST['address2']) : '',
+			'ATT_city' 			=> ! empty($_REQUEST['city']) ? sanitize_text_field($_REQUEST['city']) : '',
 			'STA_ID' 				=> $STA_ID,
 			'CNT_ISO' 			=> $CNT_ISO,
-			'ATT_zip' 				=> ! empty( $_REQUEST['zip'] ) ? sanitize_text_field( $_REQUEST['zip'] ) : '',
-			'ATT_phone' 		=> ! empty( $_REQUEST['phone'] ) ? sanitize_text_field( $_REQUEST['phone'] ) : '',
+			'ATT_zip' 				=> ! empty($_REQUEST['zip']) ? sanitize_text_field($_REQUEST['zip']) : '',
+			'ATT_phone' 		=> ! empty($_REQUEST['phone']) ? sanitize_text_field($_REQUEST['phone']) : '',
 		);
 		// validate the email address since it is the most important piece of info
-		if ( empty( $attendee_data['ATT_email'] ) || $attendee_data['ATT_email'] != $_REQUEST['email'] ) {
-			EE_Error::add_error( __( 'An invalid email address was submitted.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($attendee_data['ATT_email']) || $attendee_data['ATT_email'] != $_REQUEST['email']) {
+			EE_Error::add_error(__('An invalid email address was submitted.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
 		// does this attendee already exist in the db ? we're searching using a combination of first name, last name, AND email address
-		if ( ! empty( $attendee_data['ATT_fname'] ) && ! empty( $attendee_data['ATT_lname'] ) && ! empty( $attendee_data['ATT_email'] ) ) {
-			$existing_attendee = EE_Registry::instance()->LIB->EEM_Attendee->find_existing_attendee( array(
+		if ( ! empty($attendee_data['ATT_fname']) && ! empty($attendee_data['ATT_lname']) && ! empty($attendee_data['ATT_email'])) {
+			$existing_attendee = EE_Registry::instance()->LIB->EEM_Attendee->find_existing_attendee(array(
 				'ATT_fname' => $attendee_data['ATT_fname'],
 				'ATT_lname' => $attendee_data['ATT_lname'],
 				'ATT_email' => $attendee_data['ATT_email']
 			));
-			if ( $existing_attendee instanceof EE_Attendee ) {
+			if ($existing_attendee instanceof EE_Attendee) {
 				return $existing_attendee;
 			}
 		}
 		// no existing attendee? kk let's create a new one
 		// kinda lame, but we need a first and last name to create an attendee, so use the email address if those don't exist
-		$attendee_data['ATT_fname'] = ! empty( $attendee_data['ATT_fname'] ) ? $attendee_data['ATT_fname'] : $attendee_data['ATT_email'];
-		$attendee_data['ATT_lname'] = ! empty( $attendee_data['ATT_lname'] ) ? $attendee_data['ATT_lname'] : $attendee_data['ATT_email'];
-		return EE_Attendee::new_instance( $attendee_data );
+		$attendee_data['ATT_fname'] = ! empty($attendee_data['ATT_fname']) ? $attendee_data['ATT_fname'] : $attendee_data['ATT_email'];
+		$attendee_data['ATT_lname'] = ! empty($attendee_data['ATT_lname']) ? $attendee_data['ATT_lname'] : $attendee_data['ATT_email'];
+		return EE_Attendee::new_instance($attendee_data);
 	}
 
 
@@ -1044,22 +1044,22 @@ 
 	 */
 	public function process_reg_step() {
 		// how have they chosen to pay?
-		$this->checkout->selected_method_of_payment = $this->checkout->transaction->is_free() ? 'no_payment_required' : $this->_get_selected_method_of_payment( TRUE );
+		$this->checkout->selected_method_of_payment = $this->checkout->transaction->is_free() ? 'no_payment_required' : $this->_get_selected_method_of_payment(TRUE);
 		// choose your own adventure based on method_of_payment
-		switch(  $this->checkout->selected_method_of_payment ) {
+		switch ($this->checkout->selected_method_of_payment) {
 
 			case 'events_sold_out' :
 				$this->checkout->redirect = TRUE;
 				$this->checkout->redirect_url = $this->checkout->cancel_page_url;
-				$this->checkout->json_response->set_redirect_url( $this->checkout->redirect_url );
+				$this->checkout->json_response->set_redirect_url($this->checkout->redirect_url);
 				// mark this reg step as completed
 				$this->set_completed();
 				return FALSE;
 				break;
 
 			case 'payments_closed' :
-				if ( apply_filters( 'FHEE__EE_SPCO_Reg_Step_Payment_Options__process_reg_step__payments_closed__display_success', false ) ) {
-					EE_Error::add_success( __( 'no payment required at this time.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+				if (apply_filters('FHEE__EE_SPCO_Reg_Step_Payment_Options__process_reg_step__payments_closed__display_success', false)) {
+					EE_Error::add_success(__('no payment required at this time.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				}
 				// mark this reg step as completed
 				$this->set_completed();
@@ -1067,8 +1067,8 @@ 
 				break;
 
 			case 'no_payment_required' :
-				if ( apply_filters( 'FHEE__EE_SPCO_Reg_Step_Payment_Options__process_reg_step__no_payment_required__display_success', false ) ) {
-					EE_Error::add_success( __( 'no payment required.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+				if (apply_filters('FHEE__EE_SPCO_Reg_Step_Payment_Options__process_reg_step__no_payment_required__display_success', false)) {
+					EE_Error::add_success(__('no payment required.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				}
 				// mark this reg step as completed
 				$this->set_completed();
@@ -1077,9 +1077,9 @@ 
 
 			default:
 				$payment_successful = $this->_process_payment();
-				if ( $payment_successful ) {
+				if ($payment_successful) {
 					$this->checkout->continue_reg = true;
-					$this->_maybe_set_completed( $this->checkout->payment_method );
+					$this->_maybe_set_completed($this->checkout->payment_method);
 				} else {
 					$this->checkout->continue_reg = false;
 				}
@@ -1097,8 +1097,8 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return void
 	 */
-	protected function _maybe_set_completed( EE_Payment_Method $payment_method ) {
-		switch ( $payment_method->type_obj()->payment_occurs() ) {
+	protected function _maybe_set_completed(EE_Payment_Method $payment_method) {
+		switch ($payment_method->type_obj()->payment_occurs()) {
 			case EE_PMT_Base::offsite :
 				break;
 			case EE_PMT_Base::onsite :
@@ -1121,15 +1121,15 @@ 
 	public function update_reg_step() {
 		$success = TRUE;
 		// if payment required
-		if ( $this->checkout->transaction->total() > 0 ) {
-			do_action ('AHEE__EE_Single_Page_Checkout__process_finalize_registration__before_gateway', $this->checkout->transaction );
+		if ($this->checkout->transaction->total() > 0) {
+			do_action('AHEE__EE_Single_Page_Checkout__process_finalize_registration__before_gateway', $this->checkout->transaction);
 			// attempt payment via payment method
 			$success = $this->process_reg_step();
 		}
-		if ( $success && ! $this->checkout->redirect ) {
-			$this->checkout->cart->get_grand_total()->save_this_and_descendants_to_txn( $this->checkout->transaction->ID() );
+		if ($success && ! $this->checkout->redirect) {
+			$this->checkout->cart->get_grand_total()->save_this_and_descendants_to_txn($this->checkout->transaction->ID());
 			 // set return URL
-			$this->checkout->redirect_url = add_query_arg( array( 'e_reg_url_link' => $this->checkout->reg_url_link ), $this->checkout->thank_you_page_url );
+			$this->checkout->redirect_url = add_query_arg(array('e_reg_url_link' => $this->checkout->reg_url_link), $this->checkout->thank_you_page_url);
 		}
 		return $success;
 	}
@@ -1149,24 +1149,24 @@ 
 		// clear any previous errors related to not selecting a payment method
 //		EE_Error::overwrite_errors();
 		// ya gotta make a choice man
-		if ( empty( $this->checkout->selected_method_of_payment )) {
-			$this->checkout->json_response->set_plz_select_method_of_payment( __( 'Please select a method of payment before proceeding.', 'event_espresso' ));
+		if (empty($this->checkout->selected_method_of_payment)) {
+			$this->checkout->json_response->set_plz_select_method_of_payment(__('Please select a method of payment before proceeding.', 'event_espresso'));
 			return FALSE;
 		}
 		// get EE_Payment_Method object
-		if ( ! $this->checkout->payment_method = $this->_get_payment_method_for_selected_method_of_payment() ) {
+		if ( ! $this->checkout->payment_method = $this->_get_payment_method_for_selected_method_of_payment()) {
 			return FALSE;
 		}
 		// setup billing form
-		if ( $this->checkout->payment_method->is_on_site() ) {
-			$this->checkout->billing_form = $this->_get_billing_form_for_payment_method( $this->checkout->payment_method );
+		if ($this->checkout->payment_method->is_on_site()) {
+			$this->checkout->billing_form = $this->_get_billing_form_for_payment_method($this->checkout->payment_method);
 			// bad billing form ?
-			if ( ! $this->_billing_form_is_valid() ) {
+			if ( ! $this->_billing_form_is_valid()) {
 				return FALSE;
 			}
 		}
 		// ensure primary registrant has been fully processed
-		if ( ! $this->_setup_primary_registrant_prior_to_payment() ) {
+		if ( ! $this->_setup_primary_registrant_prior_to_payment()) {
 			return FALSE;
 		}
 		/** @type EE_Transaction_Processor $transaction_processor */
@@ -1174,24 +1174,24 @@ 
 		// in case a registrant leaves to an Off-Site Gateway and never returns, we want to approve any registrations for events with a default reg status of Approved
 		//$transaction_processor->toggle_registration_statuses_for_default_approved_events( $this->checkout->transaction, $this->checkout->reg_cache_where_params );
 		// attempt payment
-		$payment = $this->_attempt_payment( $this->checkout->payment_method );
+		$payment = $this->_attempt_payment($this->checkout->payment_method);
 		// process results
-		$payment = $this->_validate_payment( $payment );
-		$payment = $this->_post_payment_processing( $payment );
+		$payment = $this->_validate_payment($payment);
+		$payment = $this->_post_payment_processing($payment);
 		// verify payment
-		if ( $payment instanceof EE_Payment ) {
+		if ($payment instanceof EE_Payment) {
 			// store that for later
 			$this->checkout->payment = $payment;
 			/** @type EE_Transaction_Processor $transaction_processor */
-			$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+			$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 			// we can also consider the TXN to not have been failed, so temporarily upgrade it's status to abandoned
-			$transaction_processor->toggle_failed_transaction_status( $this->checkout->transaction );
-			if ( $payment->status() == EEM_Payment::status_id_approved || $payment->status() == EEM_Payment::status_id_pending ) {
+			$transaction_processor->toggle_failed_transaction_status($this->checkout->transaction);
+			if ($payment->status() == EEM_Payment::status_id_approved || $payment->status() == EEM_Payment::status_id_pending) {
 				return true;
 			} else {
 				return false;
 			}
-		} else if ( $payment === true ) {
+		} else if ($payment === true) {
 			// please note that offline payment methods will NOT make a payment,
 			// but instead just mark themselves as the PMD_ID on the transaction, and return true
 			$this->checkout->payment = $payment;
@@ -1210,10 +1210,10 @@ 
 	 * @return bool
 	 */
 	public function redirect_form() {
-		$payment_method_billing_info = $this->_payment_method_billing_info( $this->_get_payment_method_for_selected_method_of_payment() );
+		$payment_method_billing_info = $this->_payment_method_billing_info($this->_get_payment_method_for_selected_method_of_payment());
 		$html = $payment_method_billing_info->get_html_and_js();
 		$html .= $this->checkout->redirect_form;
-		EE_Registry::instance()->REQ->add_output( $html );
+		EE_Registry::instance()->REQ->add_output($html);
 		return TRUE;
 	}
 
@@ -1226,33 +1226,33 @@ 
 	 * @return bool
 	 */
 	private function _billing_form_is_valid() {
-		if ( $this->checkout->billing_form instanceof EE_Billing_Info_Form ) {
-			if ( $this->checkout->billing_form->was_submitted() ) {
+		if ($this->checkout->billing_form instanceof EE_Billing_Info_Form) {
+			if ($this->checkout->billing_form->was_submitted()) {
 				$this->checkout->billing_form->receive_form_submission();
-				if ( $this->checkout->billing_form->is_valid() ) {
+				if ($this->checkout->billing_form->is_valid()) {
 					return TRUE;
 				}
 				$validation_errors = $this->checkout->billing_form->get_validation_errors_accumulated();
 				$error_strings = array();
-				foreach( $validation_errors as $validation_error ){
-					if( $validation_error instanceof EE_Validation_Error ){
+				foreach ($validation_errors as $validation_error) {
+					if ($validation_error instanceof EE_Validation_Error) {
 						$form_section = $validation_error->get_form_section();
-						if( $form_section instanceof EE_Form_Input_Base ){
+						if ($form_section instanceof EE_Form_Input_Base) {
 							$label = $form_section->html_label_text();
-						}elseif( $form_section instanceof EE_Form_Section_Base ){
+						}elseif ($form_section instanceof EE_Form_Section_Base) {
 							$label = $form_section->name();
-						}else{
-							$label = __( 'Validation Error', 'event_espresso' );
+						} else {
+							$label = __('Validation Error', 'event_espresso');
 						}
-						$error_strings[] = sprintf('%1$s: %2$s', $label, $validation_error->getMessage() );
+						$error_strings[] = sprintf('%1$s: %2$s', $label, $validation_error->getMessage());
 					}
 				}
-				EE_Error::add_error( sprintf( __( 'One or more billing form inputs are invalid and require correction before proceeding. %1$s %2$s', 'event_espresso' ), '<br/>', implode( '<br/>', $error_strings )  ), __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error(sprintf(__('One or more billing form inputs are invalid and require correction before proceeding. %1$s %2$s', 'event_espresso'), '<br/>', implode('<br/>', $error_strings)), __FILE__, __FUNCTION__, __LINE__);
 			} else {
-				EE_Error::add_error( __( 'The billing form was not submitted or something prevented it\'s submission.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error(__('The billing form was not submitted or something prevented it\'s submission.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			}
 		} else {
-			EE_Error::add_error( __( 'The submitted billing form is invalid possibly due to a technical reason.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error(__('The submitted billing form is invalid possibly due to a technical reason.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
 		return FALSE;
 	}
@@ -1270,9 +1270,9 @@ 
 	 */
 		private function _setup_primary_registrant_prior_to_payment() {
 			// check if transaction has a primary registrant and that it has a related Attendee object
-			if ( ! $this->checkout->transaction_has_primary_registrant() ) {
+			if ( ! $this->checkout->transaction_has_primary_registrant()) {
 				// need to at least gather some primary registrant data before attempting payment
-				if ( $this->checkout->billing_form instanceof EE_Billing_Attendee_Info_Form && ! $this->_capture_primary_registration_data_from_billing_form() ) {
+				if ($this->checkout->billing_form instanceof EE_Billing_Attendee_Info_Form && ! $this->_capture_primary_registration_data_from_billing_form()) {
 					return FALSE;
 				}
 			}
@@ -1280,13 +1280,13 @@ 
 			// grab the primary_registration object
 			$primary_registration = $this->checkout->transaction->primary_registration();
 			/** @type EE_Transaction_Processor $transaction_processor */
-			$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+			$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 			// at this point we'll consider a TXN to not have been failed
-			$transaction_processor->toggle_failed_transaction_status( $this->checkout->transaction );
+			$transaction_processor->toggle_failed_transaction_status($this->checkout->transaction);
 			// save the TXN ( which clears cached copy of primary_registration)
 			$this->checkout->transaction->save();
 			// grab TXN ID and save it to the primary_registration
-			$primary_registration->set_transaction_id( $this->checkout->transaction->ID() );
+			$primary_registration->set_transaction_id($this->checkout->transaction->ID());
 			// save what we have so far
 			$primary_registration->save();
 			return TRUE;
@@ -1303,41 +1303,41 @@ 
 		private function _capture_primary_registration_data_from_billing_form() {
 			// convert billing form data into an attendee
 			$this->checkout->primary_attendee_obj = $this->checkout->billing_form->create_attendee_from_billing_form_data();
-			if ( ! $this->checkout->primary_attendee_obj instanceof EE_Attendee ) {
+			if ( ! $this->checkout->primary_attendee_obj instanceof EE_Attendee) {
 				EE_Error::add_error(
 					sprintf(
-						__( 'The billing form details could not be used for attendee details due to a technical issue.%sPlease try again or contact %s for assistance.', 'event_espresso' ),
+						__('The billing form details could not be used for attendee details 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 FALSE;
 			}
 			$primary_registration = $this->checkout->transaction->primary_registration();
-			if ( ! $primary_registration instanceof EE_Registration ) {
+			if ( ! $primary_registration instanceof EE_Registration) {
 				EE_Error::add_error(
 					sprintf(
-						__( 'The primary registrant for this transaction could not be determined due to a technical issue.%sPlease try again or contact %s for assistance.', 'event_espresso' ),
+						__('The primary registrant for this transaction 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 FALSE;
 			}
-			if ( ! $primary_registration->_add_relation_to( $this->checkout->primary_attendee_obj, 'Attendee' ) instanceof EE_Attendee ) {
+			if ( ! $primary_registration->_add_relation_to($this->checkout->primary_attendee_obj, 'Attendee') instanceof EE_Attendee) {
 				EE_Error::add_error(
 					sprintf(
-						__( 'The primary registrant could not be associated with this transaction due to a technical issue.%sPlease try again or contact %s for assistance.', 'event_espresso' ),
+						__('The primary registrant could not be associated with this transaction 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 FALSE;
 			}
 			/** @type EE_Registration_Processor $registration_processor */
-			$registration_processor = EE_Registry::instance()->load_class( 'Registration_Processor' );
+			$registration_processor = EE_Registry::instance()->load_class('Registration_Processor');
 			// at this point, we should have enough details about the registrant to consider the registration NOT incomplete
-			$registration_processor->toggle_incomplete_registration_status_to_default( $primary_registration );
+			$registration_processor->toggle_incomplete_registration_status_to_default($primary_registration);
 
 			return TRUE;
 		}
@@ -1353,35 +1353,35 @@ 
 	 */
 		private function _get_payment_method_for_selected_method_of_payment() {
 			// get EE_Payment_Method object
-			if ( isset( $this->checkout->available_payment_methods[ $this->checkout->selected_method_of_payment ] )) {
-				$payment_method = $this->checkout->available_payment_methods[ $this->checkout->selected_method_of_payment ];
+			if (isset($this->checkout->available_payment_methods[$this->checkout->selected_method_of_payment])) {
+				$payment_method = $this->checkout->available_payment_methods[$this->checkout->selected_method_of_payment];
 			} else {
 				// load EEM_Payment_Method
-				EE_Registry::instance()->load_model( 'Payment_Method' );
+				EE_Registry::instance()->load_model('Payment_Method');
 				/** @type EEM_Payment_Method $EEM_Payment_Method */
 				$EEM_Payment_Method = EE_Registry::instance()->LIB->EEM_Payment_Method;
-				$payment_method = $EEM_Payment_Method->get_one_by_slug( $this->checkout->selected_method_of_payment );
+				$payment_method = $EEM_Payment_Method->get_one_by_slug($this->checkout->selected_method_of_payment);
 			}
 			// verify $payment_method
-			if ( ! $payment_method instanceof EE_Payment_Method ) {
+			if ( ! $payment_method instanceof EE_Payment_Method) {
 				// not a payment
 				EE_Error::add_error(
 					sprintf(
-						__( 'The selected method of payment could not be determined due to a technical issue.%sPlease try again or contact %s for assistance.', 'event_espresso' ),
+						__('The selected method of payment 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;
 			}
 			// and verify it has a valid Payment_Method Type object
-			if ( ! $payment_method->type_obj() instanceof EE_PMT_Base ) {
+			if ( ! $payment_method->type_obj() instanceof EE_PMT_Base) {
 				// not a payment
 				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;
@@ -1400,30 +1400,30 @@ 
 	 * 	@type 	EE_Payment_Method $payment_method
 	 * 	@return 	mixed	EE_Payment | boolean
 	 */
-	private function _attempt_payment( EE_Payment_Method $payment_method ) {
-		$payment =NULL;
+	private function _attempt_payment(EE_Payment_Method $payment_method) {
+		$payment = NULL;
 		$this->checkout->transaction->save();
-		$payment_processor = EE_Registry::instance()->load_core( 'Payment_Processor' );
-		if ( ! $payment_processor instanceof EE_Payment_Processor ) {
+		$payment_processor = EE_Registry::instance()->load_core('Payment_Processor');
+		if ( ! $payment_processor instanceof EE_Payment_Processor) {
 			return FALSE;
 		}
 		try {
-			$payment_processor->set_revisit( $this->checkout->revisit );
+			$payment_processor->set_revisit($this->checkout->revisit);
 			// generate payment object
 			$payment = $payment_processor->process_payment(
 				$payment_method,
 				$this->checkout->transaction,
 				$this->checkout->amount_owing,
 				$this->checkout->billing_form,
-				$this->_get_return_url( $payment_method ),
+				$this->_get_return_url($payment_method),
 				'CART',
 				$this->checkout->admin_request,
 				TRUE,
 				$this->reg_step_url()
 			);
 
-		} catch( Exception $e ) {
-			$this->_handle_payment_processor_exception( $e );
+		} catch (Exception $e) {
+			$this->_handle_payment_processor_exception($e);
 		}
 		return $payment;
 	}
@@ -1437,12 +1437,12 @@ 
 	 * @param \Exception $e
 	 * @return void
 	 */
-	protected function _handle_payment_processor_exception( Exception $e ) {
+	protected function _handle_payment_processor_exception(Exception $e) {
 		EE_Error::add_error(
 			sprintf(
-				__( 'The payment could not br processed due to a technical issue.%1$sPlease try again or contact %2$s for assistance.||The following Exception was thrown in %4$s on line %5$s:%1$s%3$s', 'event_espresso' ),
+				__('The payment could not br processed due to a technical issue.%1$sPlease try again or contact %2$s for assistance.||The following Exception was thrown in %4$s on line %5$s:%1$s%3$s', 'event_espresso'),
 				'<br/>',
-				EE_Registry::instance()->CFG->organization->get_pretty( 'email' ),
+				EE_Registry::instance()->CFG->organization->get_pretty('email'),
 				$e->getMessage(),
 				$e->getFile(),
 				$e->getLine()
@@ -1459,9 +1459,9 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return string
 	 */
-	protected function _get_return_url( EE_Payment_Method $payment_method ) {
+	protected function _get_return_url(EE_Payment_Method $payment_method) {
 		$return_url = '';
-		switch ( $payment_method->type_obj()->payment_occurs() ) {
+		switch ($payment_method->type_obj()->payment_occurs()) {
 
 			case EE_PMT_Base::offsite :
 				$return_url = add_query_arg(
@@ -1492,27 +1492,27 @@ 
 	 * @param EE_Payment $payment
 	 * @return EE_Payment | FALSE
 	 */
-	private function _validate_payment( $payment = NULL ) {
-		if (  $this->checkout->payment_method->is_off_line() ) {
+	private function _validate_payment($payment = NULL) {
+		if ($this->checkout->payment_method->is_off_line()) {
 			return TRUE;
 		}
 		// verify payment object
-		if ( $payment instanceof EE_Payment ) {
+		if ($payment instanceof EE_Payment) {
 			if (
 				$payment->status() != EEM_Payment::status_id_approved
 				&& $payment->status() != EEM_Payment::status_id_pending
 				&& $payment->status() != EEM_Payment::status_id_cancelled
 				&& $payment->gateway_response() != ''
 			) {
-				EE_Error::add_error( $payment->gateway_response(), __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error($payment->gateway_response(), __FILE__, __FUNCTION__, __LINE__);
 			}
 		} else {
 			// not a payment
 			EE_Error::add_error(
 				sprintf(
-					__( 'A valid payment was not generated due to a technical issue.%1$sPlease try again or contact %2$s for assistance.', 'event_espresso' ),
+					__('A valid payment was not generated due to a technical issue.%1$sPlease try again or contact %2$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 FALSE;
@@ -1529,23 +1529,23 @@ 
 	 * @param EE_Payment $payment
 	 * @return bool
 	 */
-	private function _post_payment_processing( $payment = NULL ) {
+	private function _post_payment_processing($payment = NULL) {
 		// On-Site payment?
-		if ( $this->checkout->payment_method->is_on_site() ) {
-			if ( ! $this->_process_payment_status( $payment, EE_PMT_Base::onsite )) {
+		if ($this->checkout->payment_method->is_on_site()) {
+			if ( ! $this->_process_payment_status($payment, EE_PMT_Base::onsite)) {
 				//$this->_setup_redirect_for_next_step();
 				$this->checkout->continue_reg = false;
 			}
 			// Off-Site payment?
-		} else if ( $this->checkout->payment_method->is_off_site() ) {
+		} else if ($this->checkout->payment_method->is_off_site()) {
 			// if a payment object was made and it specifies a redirect url, then we'll setup that redirect info
-			if ( $payment instanceof EE_Payment && $payment->redirect_url() ){
-				do_action( 'AHEE_log', __CLASS__, __FUNCTION__, $payment->redirect_url(), '$payment->redirect_url()' );
+			if ($payment instanceof EE_Payment && $payment->redirect_url()) {
+				do_action('AHEE_log', __CLASS__, __FUNCTION__, $payment->redirect_url(), '$payment->redirect_url()');
 				$this->checkout->redirect = TRUE;
 				$this->checkout->redirect_form = $payment->redirect_form();
-				$this->checkout->redirect_url = $this->reg_step_url( 'redirect_form' );
+				$this->checkout->redirect_url = $this->reg_step_url('redirect_form');
 				// set JSON response
-				$this->checkout->json_response->set_redirect_form( $this->checkout->redirect_form );
+				$this->checkout->json_response->set_redirect_form($this->checkout->redirect_form);
 				// set cron job for finalizing the TXN
 				// in case the user does not return from the off-site gateway
 				EE_Cron_Tasks::schedule_finalize_abandoned_transactions_check(
@@ -1553,21 +1553,21 @@ 
 					$this->checkout->transaction->ID()
 				);
 				// and lastly, let's bump the payment status to pending
-				$payment->set_status( EEM_Payment::status_id_pending );
+				$payment->set_status(EEM_Payment::status_id_pending);
 				$payment->save();
 			} else {
 				// not a payment
 				$this->checkout->continue_reg = false;
 				EE_Error::add_error(
 					sprintf(
-						__( 'It appears the Off Site Payment Method was not configured properly.%sPlease try again or contact %s for assistance.', 'event_espresso' ),
+						__('It appears the Off Site Payment Method was not configured properly.%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__
 				);
 			}
 			// Off-Line payment?
-		} else if ( $payment === TRUE ) {
+		} else if ($payment === TRUE) {
 			//$this->_setup_redirect_for_next_step();
 			return TRUE;
 		} else {
@@ -1603,65 +1603,65 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	private function _process_payment_status( $payment, $payment_occurs = EE_PMT_Base::offline ) {
+	private function _process_payment_status($payment, $payment_occurs = EE_PMT_Base::offline) {
 		// off-line payment? carry on
-		if ( $payment_occurs == EE_PMT_Base::offline ) {
+		if ($payment_occurs == EE_PMT_Base::offline) {
 			return true;
 		}
 		// verify payment validity
-		if ( $payment instanceof EE_Payment ) {
-			do_action( 'AHEE_log', __CLASS__, __FUNCTION__, $payment->status(), '$payment->status()' );
+		if ($payment instanceof EE_Payment) {
+			do_action('AHEE_log', __CLASS__, __FUNCTION__, $payment->status(), '$payment->status()');
 			$msg = $payment->gateway_response();
 			// check results
-			switch ( $payment->status() ) {
+			switch ($payment->status()) {
 
 				// good payment
 				case EEM_Payment::status_id_approved :
-					EE_Error::add_success( __( 'Your payment was processed successfully.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_success(__('Your payment was processed successfully.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 					return TRUE;
 					break;
 
 				// slow payment
 				case EEM_Payment::status_id_pending :
-					if ( empty( $msg )) {
-						$msg = __( 'Your payment appears to have been processed successfully, but the Instant Payment Notification has not yet been received. It should arrive shortly.', 'event_espresso' );
+					if (empty($msg)) {
+						$msg = __('Your payment appears to have been processed successfully, but the Instant Payment Notification has not yet been received. It should arrive shortly.', 'event_espresso');
 					}
-					EE_Error::add_success( $msg, __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_success($msg, __FILE__, __FUNCTION__, __LINE__);
 					return TRUE;
 					break;
 
 				// don't wanna payment
 				case EEM_Payment::status_id_cancelled :
-					if ( empty( $msg )) {
+					if (empty($msg)) {
 						$msg = _n(
 							'Payment cancelled. Please try again.',
 							'Payment cancelled. Please try again or select another method of payment.',
-							count( $this->checkout->available_payment_methods ),
+							count($this->checkout->available_payment_methods),
 							'event_espresso'
 						);
 					}
-					EE_Error::add_attention( $msg, __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_attention($msg, __FILE__, __FUNCTION__, __LINE__);
 					return FALSE;
 					break;
 
 				// not enough payment
 				case EEM_Payment::status_id_declined :
-					if ( empty( $msg )) {
+					if (empty($msg)) {
 						$msg = _n(
 							'We\'re sorry but your payment was declined. Please try again.',
 							'We\'re sorry but your payment was declined. Please try again or select another method of payment.',
-							count( $this->checkout->available_payment_methods ),
+							count($this->checkout->available_payment_methods),
 							'event_espresso'
 						);
 					}
-					EE_Error::add_attention( $msg, __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_attention($msg, __FILE__, __FUNCTION__, __LINE__);
 					return FALSE;
 					break;
 
 				// bad payment
 				case EEM_Payment::status_id_failed :
-					if ( ! empty( $msg ) ) {
-						EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+					if ( ! empty($msg)) {
+						EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 						return false;
 					}
 					// default to error below
@@ -1671,14 +1671,14 @@ 
 		}
 		// off-site payment gateway responses are too unreliable, so let's just assume that
 		// the payment processing is just running slower than the registrant's request
-		if ( $payment_occurs == EE_PMT_Base::offsite ) {
+		if ($payment_occurs == EE_PMT_Base::offsite) {
 			return true;
 		}
 		EE_Error::add_error(
 				sprintf(
-					__( 'Your payment could not be processed successfully due to a technical issue.%sPlease try again or contact %s for assistance.', 'event_espresso' ),
+					__('Your payment could not be processed successfully 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__
 			);
@@ -1711,13 +1711,13 @@ 
 	public function process_gateway_response() {
 		$payment = null;
 		// how have they chosen to pay?
-		$this->checkout->selected_method_of_payment = $this->_get_selected_method_of_payment( true );
+		$this->checkout->selected_method_of_payment = $this->_get_selected_method_of_payment(true);
 		// get EE_Payment_Method object
-		if ( ! $this->checkout->payment_method = $this->_get_payment_method_for_selected_method_of_payment() ) {
+		if ( ! $this->checkout->payment_method = $this->_get_payment_method_for_selected_method_of_payment()) {
 			$this->checkout->continue_reg = false;
 			return false;
 		}
-		if ( ! $this->checkout->payment_method->is_off_site() ) {
+		if ( ! $this->checkout->payment_method->is_off_site()) {
 			return false;
 		}
 		$this->_validate_offsite_return();
@@ -1731,23 +1731,23 @@ 
 		//	true
 		//);
 		// verify TXN
-		if ( $this->checkout->transaction instanceof EE_Transaction ) {
+		if ($this->checkout->transaction instanceof EE_Transaction) {
 			$gateway = $this->checkout->payment_method->type_obj()->get_gateway();
-			if ( ! $gateway instanceof EE_Offsite_Gateway ) {
+			if ( ! $gateway instanceof EE_Offsite_Gateway) {
 				$this->checkout->continue_reg = false;
 				return false;
 			}
-			$payment = $this->_process_off_site_payment( $gateway );
-			$payment = $this->_process_cancelled_payments( $payment );
-			$payment = $this->_validate_payment( $payment );
+			$payment = $this->_process_off_site_payment($gateway);
+			$payment = $this->_process_cancelled_payments($payment);
+			$payment = $this->_validate_payment($payment);
 			// if payment was not declined by the payment gateway or cancelled by the registrant
-			if ( $this->_process_payment_status( $payment, EE_PMT_Base::offsite ) ) {
+			if ($this->_process_payment_status($payment, EE_PMT_Base::offsite)) {
 				//$this->_setup_redirect_for_next_step();
 				// store that for later
 				$this->checkout->payment = $payment;
 				// mark this reg step as completed, as long as gateway doesn't use a separate IPN request,
 				// because we will complete this step during the IPN processing then
-				if ( $gateway instanceof EE_Offsite_Gateway && ! $gateway->uses_separate_IPN_request() ) {
+				if ($gateway instanceof EE_Offsite_Gateway && ! $gateway->uses_separate_IPN_request()) {
 					$this->set_completed();
 				}
 				return true;
@@ -1770,19 +1770,19 @@ 
 	 * @return bool
 	 */
 	private function _validate_offsite_return() {
-		$TXN_ID = (int)EE_Registry::instance()->REQ->get( 'spco_txn', 0 );
-		if ( $TXN_ID != $this->checkout->transaction->ID() ) {
+		$TXN_ID = (int) EE_Registry::instance()->REQ->get('spco_txn', 0);
+		if ($TXN_ID != $this->checkout->transaction->ID()) {
 			// Houston... we might have a problem
 			$invalid_TXN = false;
 			// first gather some info
-			$valid_TXN = EEM_Transaction::instance()->get_one_by_ID( $TXN_ID );
+			$valid_TXN = EEM_Transaction::instance()->get_one_by_ID($TXN_ID);
 			$primary_registrant = $valid_TXN instanceof EE_Transaction ? $valid_TXN->primary_registration() : null;
 			// let's start by retrieving the cart for this TXN
-			$cart = EE_Cart::get_cart_from_txn( $this->checkout->transaction );
-			if ( $cart instanceof EE_Cart ) {
+			$cart = EE_Cart::get_cart_from_txn($this->checkout->transaction);
+			if ($cart instanceof EE_Cart) {
 				// verify that the current cart has tickets
 				$tickets = $cart->get_tickets();
-				if ( empty( $tickets ) ) {
+				if (empty($tickets)) {
 					$invalid_TXN = true;
 				}
 			} else {
@@ -1790,39 +1790,39 @@ 
 			}
 			$valid_TXN_SID = $primary_registrant instanceof EE_Registration ? $primary_registrant->session_ID() : null;
 			// validate current Session ID and compare against valid TXN session ID
-			if ( EE_Session::instance()->id() === null ) {
+			if (EE_Session::instance()->id() === null) {
 				$invalid_TXN = true;
-			} else if ( EE_Session::instance()->id() === $valid_TXN_SID ) {
+			} else if (EE_Session::instance()->id() === $valid_TXN_SID) {
 				// WARNING !!!
 				// this could be PayPal sending back duplicate requests (ya they do that)
 				// or it **could** mean someone is simply registering AGAIN after having just done so
 				// so now we need to determine if this current TXN looks valid or not
 				/** @type EE_Transaction_Processor $transaction_processor */
-				$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+				$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 				// has this step even been started ?
-				if ( $transaction_processor->reg_step_completed( $this->checkout->transaction, $this->slug() === false )
+				if ($transaction_processor->reg_step_completed($this->checkout->transaction, $this->slug() === false)
 				) {
 					// really? you're half way through this reg step, but you never started it ?
 					$invalid_TXN = true;
 				}
 			}
-			if ( $invalid_TXN ) {
+			if ($invalid_TXN) {
 				// is the valid TXN completed ?
-				if ( $valid_TXN instanceof EE_Transaction ) {
+				if ($valid_TXN instanceof EE_Transaction) {
 					/** @type EE_Transaction_Processor $transaction_processor */
-					$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+					$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 					// has this step even been started ?
-					$reg_step_completed = $transaction_processor->reg_step_completed( $valid_TXN, $this->slug() );
-					if ( $reg_step_completed !== false && $reg_step_completed !== true ) {
+					$reg_step_completed = $transaction_processor->reg_step_completed($valid_TXN, $this->slug());
+					if ($reg_step_completed !== false && $reg_step_completed !== true) {
 						// so it **looks** like this is a double request from PayPal
 						// so let's try to pick up where we left off
 						$this->checkout->transaction = $valid_TXN;
-						$this->checkout->refresh_all_entities( true );
+						$this->checkout->refresh_all_entities(true);
 						return;
 					}
 				}
 				// you appear to be lost?
-				$this->_redirect_wayward_request( $primary_registrant );
+				$this->_redirect_wayward_request($primary_registrant);
 			}
 		}
 	}
@@ -1836,16 +1836,16 @@ 
 	 * @param \EE_Registration $primary_registrant
 	 * @return bool
 	 */
-	private function _redirect_wayward_request( EE_Registration $primary_registrant ) {
-		if ( ! $primary_registrant instanceof EE_Registration ) {
+	private function _redirect_wayward_request(EE_Registration $primary_registrant) {
+		if ( ! $primary_registrant instanceof EE_Registration) {
 			// try redirecting based on the current TXN
 			$primary_registrant = $this->checkout->transaction instanceof EE_Transaction ? $this->checkout->transaction->primary_registration() : null;
-			if ( ! $primary_registrant instanceof EE_Registration ) {
+			if ( ! $primary_registrant instanceof EE_Registration) {
 				EE_Error::add_error(
 					sprintf(
-						__( 'Invalid information was received from the Off-Site Payment Processor and your Transaction details could not be retrieved from the database.%1$sPlease try again or contact %2$s for assistance.', 'event_espresso' ),
+						__('Invalid information was received from the Off-Site Payment Processor and your Transaction details could not be retrieved from the database.%1$sPlease try again or contact %2$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__
 				);
@@ -1873,16 +1873,16 @@ 
 	 * @param \EE_Offsite_Gateway $gateway
 	 * @return \EE_Payment
 	 */
-	private function _process_off_site_payment( EE_Offsite_Gateway $gateway ) {
+	private function _process_off_site_payment(EE_Offsite_Gateway $gateway) {
 		try {
 			// if gateway uses_separate_IPN_request, then we don't have to process the IPN manually
-			if ( $gateway instanceof EE_Offsite_Gateway && $gateway->uses_separate_IPN_request() ) {
+			if ($gateway instanceof EE_Offsite_Gateway && $gateway->uses_separate_IPN_request()) {
 				$payment = $this->checkout->transaction->last_payment();
 				//$payment_source = 'last_payment';
 			} else {
 				// get payment details and process results
 				/** @type EE_Payment_Processor $payment_processor */
-				$payment_processor = EE_Registry::instance()->load_core( 'Payment_Processor' );
+				$payment_processor = EE_Registry::instance()->load_core('Payment_Processor');
 				$payment = $payment_processor->process_ipn(
 					$_REQUEST,
 					$this->checkout->transaction,
@@ -1892,14 +1892,14 @@ 
 				);
 				//$payment_source = 'process_ipn';
 			}
-		} catch ( Exception $e ) {
+		} catch (Exception $e) {
 			// let's just eat the exception and try to move on using any previously set payment info
 			$payment = $this->checkout->transaction->last_payment();
 			//$payment_source = 'last_payment after Exception';
 			// but if we STILL don't have a payment object
-			if ( ! $payment instanceof EE_Payment ) {
+			if ( ! $payment instanceof EE_Payment) {
 				// then we'll object ! ( not object like a thing... but object like what a lawyer says ! )
-				$this->_handle_payment_processor_exception( $e );
+				$this->_handle_payment_processor_exception($e);
 			}
 		}
 		// DEBUG LOG
@@ -1923,13 +1923,13 @@ 
 	 * @param EE_Payment $payment
 	 * @return EE_Payment | FALSE
 	 */
-	private function _process_cancelled_payments( $payment = NULL ) {
+	private function _process_cancelled_payments($payment = NULL) {
 		if (
-			isset( $_REQUEST[ 'ee_cancel_payment' ] )
+			isset($_REQUEST['ee_cancel_payment'])
 			&& $payment instanceof EE_Payment
 			&& $payment->status() == EEM_Payment::status_id_failed
 		) {
-			$payment->set_status( EEM_Payment::status_id_cancelled );
+			$payment->set_status(EEM_Payment::status_id_cancelled);
 		}
 		return $payment;
 	}
@@ -1946,23 +1946,23 @@ 
 	public function get_transaction_details_for_gateways() {
 		$txn_details = array();
 		// ya gotta make a choice man
-		if ( empty( $this->checkout->selected_method_of_payment ) ) {
+		if (empty($this->checkout->selected_method_of_payment)) {
 			$txn_details = array(
-				'error' => __( 'Please select a method of payment before proceeding.', 'event_espresso' )
+				'error' => __('Please select a method of payment before proceeding.', 'event_espresso')
 			);
 		}
 		// get EE_Payment_Method object
 		if (
-			empty( $txn_details ) &&
+			empty($txn_details) &&
 			! $this->checkout->payment_method = $this->_get_payment_method_for_selected_method_of_payment()
 		) {
 			$txn_details = array(
 				'selected_method_of_payment' => $this->checkout->selected_method_of_payment,
-				'error' => __( 'A valid Payment Method could not be determined.', 'event_espresso' )
+				'error' => __('A valid Payment Method could not be determined.', 'event_espresso')
 			);
 		}
-		if ( empty( $txn_details ) && $this->checkout->transaction instanceof EE_Transaction ) {
-			$return_url = $this->_get_return_url( $this->checkout->payment_method );
+		if (empty($txn_details) && $this->checkout->transaction instanceof EE_Transaction) {
+			$return_url = $this->_get_return_url($this->checkout->payment_method);
 			$txn_details = array(
 				'TXN_ID'        			=> $this->checkout->transaction->ID(),
 				'TXN_timestamp' 	=> $this->checkout->transaction->datetime(),
@@ -1973,7 +1973,7 @@ 
 				'PMD_ID'        			=> $this->checkout->transaction->payment_method_ID(),
 				'payment_amount' => $this->checkout->amount_owing,
 				'return_url' 				=> $return_url,
-				'cancel_url' 				=> add_query_arg( array( 'ee_cancel_payment' => true ), $return_url ),
+				'cancel_url' 				=> add_query_arg(array('ee_cancel_payment' => true), $return_url),
 				'notify_url' 				=> EE_Config::instance()->core->txn_page_url(
 					array(
 						'e_reg_url_link'    			=> $this->checkout->transaction->primary_registration()->reg_url_link(),
@@ -1982,7 +1982,7 @@ 
 				)
 			);
 		}
-		echo json_encode( $txn_details );
+		echo json_encode($txn_details);
 		exit();
 	}
 

modules/ticket_selector/EED_Ticket_Selector.module.php

Doc Comments +2 added lines, -2 removed lines

@@ -461,7 +461,7 @@ 
 	 *
 	 *	@access public
 	 * 	@access 		public
-	 * 	@return		array  or FALSE
+	 * 	@return		boolean|null  or FALSE
 	 */
 	public function process_ticket_selections() {
 		do_action( 'EED_Ticket_Selector__process_ticket_selections__before' );
@@ -720,7 +720,7 @@ 
 	 * @access   private
 	 * @param EE_Ticket $ticket
 	 * @param int       $qty
-	 * @return TRUE on success, FALSE on fail
+	 * @return boolean on success, FALSE on fail
 	 */
 	private static function _add_ticket_to_cart( EE_Ticket $ticket = NULL, $qty = 1 ) {
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );

Indentation +10 added lines, -10 removed lines

@@ -35,11 +35,11 @@ 
 	protected static $_event = NULL;
 
 	/**
-	* array of datetimes and the spaces available for them
-	*
-	* @access private
-	* @var array
-	*/
+	 * array of datetimes and the spaces available for them
+	 *
+	 * @access private
+	 * @var array
+	 */
 	private static $_available_spaces = array();
 
 
@@ -855,11 +855,11 @@ 
 
 
 	/**
-	* 	load js
-	*
-	* 	@access 		public
-	* 	@return 		void
-	*/
+	 * 	load js
+	 *
+	 * 	@access 		public
+	 * 	@return 		void
+	 */
 	public static function load_tckt_slctr_assets() {
 		// add some style
 		if ( apply_filters( 'FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', FALSE ) ) {

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?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
  *

Spacing +212 added lines, -212 removed lines

@@ -57,15 +57,15 @@ 
 	 * @return EED_Ticket_Selector
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
 
-	protected function set_config(){
-		$this->set_config_section( 'template_settings' );
-		$this->set_config_class( 'EE_Ticket_Selector_Config' );
-		$this->set_config_name( 'EED_Ticket_Selector' );
+	protected function set_config() {
+		$this->set_config_section('template_settings');
+		$this->set_config_class('EE_Ticket_Selector_Config');
+		$this->set_config_name('EED_Ticket_Selector');
 	}
 
 
@@ -80,14 +80,14 @@ 
 	 */
 	public static function set_hooks() {
 		// routing
-		EE_Config::register_route( 'iframe', 'EED_Ticket_Selector', 'ticket_selector_iframe', 'ticket_selector' );
-		EE_Config::register_route( 'process_ticket_selections', 'EED_Ticket_Selector', 'process_ticket_selections' );
-		add_action( 'wp_loaded', array( 'EED_Ticket_Selector', 'set_definitions' ), 2 );
-		add_action( 'AHEE_event_details_before_post', array( 'EED_Ticket_Selector', 'ticket_selector_form_open' ), 10, 1 );
-		add_action( 'AHEE_event_details_header_bottom', array( 'EED_Ticket_Selector', 'display_ticket_selector' ), 10, 1 );
-		add_action( 'AHEE__ticket_selector_chart__template__after_ticket_selector', array( 'EED_Ticket_Selector', 'display_ticket_selector_submit' ), 10, 1 );
-		add_action( 'AHEE_event_details_after_post', array( 'EED_Ticket_Selector', 'ticket_selector_form_close' ), 10 );
-		add_action( 'wp_enqueue_scripts', array( 'EED_Ticket_Selector', 'load_tckt_slctr_assets' ), 10 );
+		EE_Config::register_route('iframe', 'EED_Ticket_Selector', 'ticket_selector_iframe', 'ticket_selector');
+		EE_Config::register_route('process_ticket_selections', 'EED_Ticket_Selector', 'process_ticket_selections');
+		add_action('wp_loaded', array('EED_Ticket_Selector', 'set_definitions'), 2);
+		add_action('AHEE_event_details_before_post', array('EED_Ticket_Selector', 'ticket_selector_form_open'), 10, 1);
+		add_action('AHEE_event_details_header_bottom', array('EED_Ticket_Selector', 'display_ticket_selector'), 10, 1);
+		add_action('AHEE__ticket_selector_chart__template__after_ticket_selector', array('EED_Ticket_Selector', 'display_ticket_selector_submit'), 10, 1);
+		add_action('AHEE_event_details_after_post', array('EED_Ticket_Selector', 'ticket_selector_form_close'), 10);
+		add_action('wp_enqueue_scripts', array('EED_Ticket_Selector', 'load_tckt_slctr_assets'), 10);
 	}
 
 
@@ -99,10 +99,10 @@ 
 	 *  @return 	void
 	 */
 	public static function set_hooks_admin() {
-		add_action( 'wp_loaded', array( 'EED_Ticket_Selector', 'set_definitions' ), 2 );
+		add_action('wp_loaded', array('EED_Ticket_Selector', 'set_definitions'), 2);
 		//add button for iframe code to event editor.
-		add_filter( 'get_sample_permalink_html', array( 'EED_Ticket_Selector', 'iframe_code_button' ), 10, 4 );
-		add_action( 'admin_enqueue_scripts', array( 'EED_Ticket_Selector', 'load_tckt_slctr_assets_admin' ), 10 );
+		add_filter('get_sample_permalink_html', array('EED_Ticket_Selector', 'iframe_code_button'), 10, 4);
+		add_action('admin_enqueue_scripts', array('EED_Ticket_Selector', 'load_tckt_slctr_assets_admin'), 10);
 	}
 
 
@@ -114,15 +114,15 @@ 
 	 *  @return 	void
 	 */
 	public static function set_definitions() {
-		define( 'TICKET_SELECTOR_ASSETS_URL', plugin_dir_url( __FILE__ ) . 'assets' . DS );
-		define( 'TICKET_SELECTOR_TEMPLATES_PATH', str_replace( '\\', DS, plugin_dir_path( __FILE__ )) . 'templates' . DS );
+		define('TICKET_SELECTOR_ASSETS_URL', plugin_dir_url(__FILE__).'assets'.DS);
+		define('TICKET_SELECTOR_TEMPLATES_PATH', str_replace('\\', DS, plugin_dir_path(__FILE__)).'templates'.DS);
 
 		//if config is not set, initialize
 		//If config is not set, set it.
-		if ( ! isset( EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector ) ) {
+		if ( ! isset(EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector)) {
 			EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector = new EE_Ticket_Selector_Config();
 		}
-		EE_Registry::$i18n_js_strings[ 'ts_embed_iframe_title' ] = __( 'Copy and Paste the following:', 'event_espresso' );
+		EE_Registry::$i18n_js_strings['ts_embed_iframe_title'] = __('Copy and Paste the following:', 'event_espresso');
 	}
 
 
@@ -133,7 +133,7 @@ 
 	 * 	@param	object 			$WP
 	 * 	@return 	void
 	 */
-	public function run( $WP ) {}
+	public function run($WP) {}
 
 
 	/**
@@ -145,23 +145,23 @@ 
 	public function ticket_selector_iframe() {
 		self::$_in_iframe = true;
 		/** @type EEM_Event $EEM_Event */
-		$EEM_Event = EE_Registry::instance()->load_model( 'Event' );
+		$EEM_Event = EE_Registry::instance()->load_model('Event');
 		$event = $EEM_Event->get_one_by_ID(
-			EE_Registry::instance()->REQ->get( 'event', 0 )
+			EE_Registry::instance()->REQ->get('event', 0)
 		);
-		EE_Registry::instance()->REQ->set_espresso_page( true );
-		$template_args['ticket_selector'] = EED_Ticket_Selector::display_ticket_selector( $event );
+		EE_Registry::instance()->REQ->set_espresso_page(true);
+		$template_args['ticket_selector'] = EED_Ticket_Selector::display_ticket_selector($event);
 		$template_args['css'] = apply_filters(
 			'FHEE__EED_Ticket_Selector__ticket_selector_iframe__css',
 			array(
-				TICKET_SELECTOR_ASSETS_URL . 'ticket_selector_embed.css?ver=' . EVENT_ESPRESSO_VERSION,
-				TICKET_SELECTOR_ASSETS_URL . 'ticket_selector.css?ver=' . EVENT_ESPRESSO_VERSION,
-				includes_url( 'css/dashicons.min.css?ver=' . $GLOBALS['wp_version'] ),
-				EE_GLOBAL_ASSETS_URL . 'css/espresso_default.css?ver=' . EVENT_ESPRESSO_VERSION
+				TICKET_SELECTOR_ASSETS_URL.'ticket_selector_embed.css?ver='.EVENT_ESPRESSO_VERSION,
+				TICKET_SELECTOR_ASSETS_URL.'ticket_selector.css?ver='.EVENT_ESPRESSO_VERSION,
+				includes_url('css/dashicons.min.css?ver='.$GLOBALS['wp_version']),
+				EE_GLOBAL_ASSETS_URL.'css/espresso_default.css?ver='.EVENT_ESPRESSO_VERSION
 			)
 		);
-		EE_Registry::$i18n_js_strings[ 'ticket_selector_iframe' ] = true;
-		EE_Registry::$i18n_js_strings[ 'EEDTicketSelectorMsg' ] = __( 'Please choose at least one ticket before continuing.', 'event_espresso' );
+		EE_Registry::$i18n_js_strings['ticket_selector_iframe'] = true;
+		EE_Registry::$i18n_js_strings['EEDTicketSelectorMsg'] = __('Please choose at least one ticket before continuing.', 'event_espresso');
 		$template_args['eei18n'] = apply_filters(
 			'FHEE__EED_Ticket_Selector__ticket_selector_iframe__eei18n_js_strings',
 			EE_Registry::localize_i18n_js_strings()
@@ -169,19 +169,19 @@ 
 		$template_args['js'] = apply_filters(
 			'FHEE__EED_Ticket_Selector__ticket_selector_iframe__js',
 			array(
-				includes_url( 'js/jquery/jquery.js?ver=' . $GLOBALS['wp_version'] ),
-				EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js?ver=' . EVENT_ESPRESSO_VERSION,
-				TICKET_SELECTOR_ASSETS_URL . 'ticket_selector_iframe_embed.js?ver=' . EVENT_ESPRESSO_VERSION
+				includes_url('js/jquery/jquery.js?ver='.$GLOBALS['wp_version']),
+				EE_GLOBAL_ASSETS_URL.'scripts/espresso_core.js?ver='.EVENT_ESPRESSO_VERSION,
+				TICKET_SELECTOR_ASSETS_URL.'ticket_selector_iframe_embed.js?ver='.EVENT_ESPRESSO_VERSION
 			)
 		);
 		EE_Registry::instance()->load_helper('Template');
-		$template_args[ 'notices' ] = EEH_Template::display_template(
-			EE_TEMPLATES . 'espresso-ajax-notices.template.php',
+		$template_args['notices'] = EEH_Template::display_template(
+			EE_TEMPLATES.'espresso-ajax-notices.template.php',
 			array(),
 			true
 		);
 		EEH_Template::display_template(
-			TICKET_SELECTOR_TEMPLATES_PATH . 'ticket_selector_chart_iframe.template.php',
+			TICKET_SELECTOR_TEMPLATES_PATH.'ticket_selector_chart_iframe.template.php',
 			$template_args
 		);
 		exit;
@@ -200,23 +200,23 @@ 
 	 *
 	 * @return string The new html string for the permalink area.
 	 */
-	public static function iframe_code_button( $permalink_string, $id, $new_title, $new_slug ) {
+	public static function iframe_code_button($permalink_string, $id, $new_title, $new_slug) {
 		//make sure this is ONLY when editing and the event id has been set.
-		if ( ! empty( $id ) )  {
-			$post = get_post( $id );
+		if ( ! empty($id)) {
+			$post = get_post($id);
 
 			//if NOT event then let's get out.
-			if ( $post->post_type !== 'espresso_events' ) {
+			if ($post->post_type !== 'espresso_events') {
 				return $permalink_string;
 			}
 
-			$ticket_selector_url = add_query_arg( array( 'ticket_selector' => 'iframe', 'event' => $id ), site_url() );
+			$ticket_selector_url = add_query_arg(array('ticket_selector' => 'iframe', 'event' => $id), site_url());
 
-			$permalink_string .= '<a id="js-ticket-selector-embed-trigger" class="button button-small" href="#"  tabindex="-1">' . __('Embed', 'event_espresso') . '</a> ';
+			$permalink_string .= '<a id="js-ticket-selector-embed-trigger" class="button button-small" href="#"  tabindex="-1">'.__('Embed', 'event_espresso').'</a> ';
 			$permalink_string .= '
 <div id="js-ts-iframe" style="display:none">
 	<div style="width:100%; height: 500px;">
-		<iframe src="' . $ticket_selector_url . '" width="100%" height="100%"></iframe>
+		<iframe src="' . $ticket_selector_url.'" width="100%" height="100%"></iframe>
 	</div>
 </div>';
 		}
@@ -235,23 +235,23 @@ 
 	 * @param 	mixed $event
 	 * @return 	bool
 	 */
-	protected static function set_event( $event = null ) {
-		if( $event === null ) {
+	protected static function set_event($event = null) {
+		if ($event === null) {
 			global $post;
 			$event = $post;
 		}
 		//		d( $event );
-		if ( $event instanceof EE_Event ) {
+		if ($event instanceof EE_Event) {
 			self::$_event = $event;
-		} else if ( $event instanceof WP_Post && isset( $event->EE_Event ) && $event->EE_Event instanceof EE_Event ) {
+		} else if ($event instanceof WP_Post && isset($event->EE_Event) && $event->EE_Event instanceof EE_Event) {
 			self::$_event = $event->EE_Event;
-		} else if ( $event instanceof WP_Post && ( ! isset( $event->EE_Event ) || ! $event->EE_Event instanceof EE_Event ) ) {
-			$event->EE_Event = EEM_Event::instance()->instantiate_class_from_post_object( $event );
+		} else if ($event instanceof WP_Post && ( ! isset($event->EE_Event) || ! $event->EE_Event instanceof EE_Event)) {
+			$event->EE_Event = EEM_Event::instance()->instantiate_class_from_post_object($event);
 			self::$_event = $event->EE_Event;
 		} else {
-			$user_msg = __( 'No Event object or an invalid Event object was supplied.', 'event_espresso' );
-			$dev_msg = $user_msg . __( 'In order to generate a ticket selector, please ensure you are passing either an EE_Event object or a WP_Post object of the post type "espresso_event" to the EE_Ticket_Selector class constructor.', 'event_espresso' );
-			EE_Error::add_error( $user_msg . '||' . $dev_msg, __FILE__, __FUNCTION__, __LINE__ );
+			$user_msg = __('No Event object or an invalid Event object was supplied.', 'event_espresso');
+			$dev_msg = $user_msg.__('In order to generate a ticket selector, please ensure you are passing either an EE_Event object or a WP_Post object of the post type "espresso_event" to the EE_Ticket_Selector class constructor.', 'event_espresso');
+			EE_Error::add_error($user_msg.'||'.$dev_msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		return true;
@@ -270,11 +270,11 @@ 
 	 * @param 	bool 	$view_details
 	 * @return 	string
 	 */
-	public static function display_ticket_selector( $event = NULL, $view_details = FALSE ) {
+	public static function display_ticket_selector($event = NULL, $view_details = FALSE) {
 		// reset filter for displaying submit button
-		remove_filter( 'FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true' );
+		remove_filter('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true');
 		// poke and prod incoming event till it tells us what it is
-		if ( ! EED_Ticket_Selector::set_event( $event )) {
+		if ( ! EED_Ticket_Selector::set_event($event)) {
 			return false;
 		}
 		$event_post = self::$_event instanceof EE_Event ? self::$_event->ID() : $event;
@@ -285,7 +285,7 @@ 
 			&& (
 				! self::$_event->display_ticket_selector()
 				|| $view_details
-				|| post_password_required( $event_post )
+				|| post_password_required($event_post)
 				|| (
 					$_event_active_status != EE_Datetime::active
 					&& $_event_active_status != EE_Datetime::upcoming
@@ -303,70 +303,70 @@ 
 		$template_args = array();
 		$template_args['event_status'] = $_event_active_status;
 
-		$template_args['date_format'] = apply_filters( 'FHEE__EED_Ticket_Selector__display_ticket_selector__date_format', get_option( 'date_format' ) );
-		$template_args['time_format'] = apply_filters( 'FHEE__EED_Ticket_Selector__display_ticket_selector__time_format', get_option( 'time_format' ) );
+		$template_args['date_format'] = apply_filters('FHEE__EED_Ticket_Selector__display_ticket_selector__date_format', get_option('date_format'));
+		$template_args['time_format'] = apply_filters('FHEE__EED_Ticket_Selector__display_ticket_selector__time_format', get_option('time_format'));
 
 		$template_args['EVT_ID'] = self::$_event->ID();
 		$template_args['event'] = self::$_event;
 
 		// is the event expired ?
 		$template_args['event_is_expired'] = self::$_event->is_expired();
-		if ( $template_args['event_is_expired'] ) {
-			return '<div class="ee-event-expired-notice"><span class="important-notice">' . __( 'We\'re sorry, but all tickets sales have ended because the event is expired.', 'event_espresso' ) . '</span></div>';
+		if ($template_args['event_is_expired']) {
+			return '<div class="ee-event-expired-notice"><span class="important-notice">'.__('We\'re sorry, but all tickets sales have ended because the event is expired.', 'event_espresso').'</span></div>';
 		}
 
 		$ticket_query_args = array(
-			array( 'Datetime.EVT_ID' => self::$_event->ID() ),
-			'order_by' => array( 'TKT_order' => 'ASC', 'TKT_required' => 'DESC', 'TKT_start_date' => 'ASC', 'TKT_end_date' => 'ASC' , 'Datetime.DTT_EVT_start' => 'DESC' )
+			array('Datetime.EVT_ID' => self::$_event->ID()),
+			'order_by' => array('TKT_order' => 'ASC', 'TKT_required' => 'DESC', 'TKT_start_date' => 'ASC', 'TKT_end_date' => 'ASC', 'Datetime.DTT_EVT_start' => 'DESC')
 		);
 
-		if ( ! EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_expired_tickets ) {
+		if ( ! EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_expired_tickets) {
 			//use the correct applicable time query depending on what version of core is being run.
-			$current_time = method_exists( 'EEM_Datetime', 'current_time_for_query' ) ? time() : current_time('timestamp');
-			$ticket_query_args[0]['TKT_end_date'] = array( '>', $current_time );
+			$current_time = method_exists('EEM_Datetime', 'current_time_for_query') ? time() : current_time('timestamp');
+			$ticket_query_args[0]['TKT_end_date'] = array('>', $current_time);
 		}
 
 		// get all tickets for this event ordered by the datetime
-		$template_args['tickets'] = EEM_Ticket::instance()->get_all( $ticket_query_args );
+		$template_args['tickets'] = EEM_Ticket::instance()->get_all($ticket_query_args);
 
-		if ( count( $template_args['tickets'] ) < 1 ) {
-			return '<div class="ee-event-expired-notice"><span class="important-notice">' . __( 'We\'re sorry, but all ticket sales have ended.', 'event_espresso' ) . '</span></div>';
+		if (count($template_args['tickets']) < 1) {
+			return '<div class="ee-event-expired-notice"><span class="important-notice">'.__('We\'re sorry, but all ticket sales have ended.', 'event_espresso').'</span></div>';
 		}
 
 		// filter the maximum qty that can appear in the Ticket Selector qty dropdowns
-		$template_args['max_atndz'] = apply_filters('FHEE__EE_Ticket_Selector__display_ticket_selector__max_tickets', self::$_event->additional_limit() );
-		if ( $template_args['max_atndz'] < 1 ) {
-			$sales_closed_msg = __( 'We\'re sorry, but ticket sales have been closed at this time. Please check back again later.', 'event_espresso' );
-			if ( current_user_can( 'edit_post', self::$_event->ID() )) {
-				$sales_closed_msg .=  sprintf(
-					__( '%sNote to Event Admin:%sThe "Maximum number of tickets allowed per order for this event" in the Event Registration Options has been set to "0". This effectively turns off ticket sales. %s(click to edit this event)%s', 'event_espresso' ),
+		$template_args['max_atndz'] = apply_filters('FHEE__EE_Ticket_Selector__display_ticket_selector__max_tickets', self::$_event->additional_limit());
+		if ($template_args['max_atndz'] < 1) {
+			$sales_closed_msg = __('We\'re sorry, but ticket sales have been closed at this time. Please check back again later.', 'event_espresso');
+			if (current_user_can('edit_post', self::$_event->ID())) {
+				$sales_closed_msg .= sprintf(
+					__('%sNote to Event Admin:%sThe "Maximum number of tickets allowed per order for this event" in the Event Registration Options has been set to "0". This effectively turns off ticket sales. %s(click to edit this event)%s', 'event_espresso'),
 					'<div class="ee-attention" style="text-align: left;"><b>',
 					'</b><br />',
-					$link = '<span class="edit-link"><a class="post-edit-link" href="' . get_edit_post_link( self::$_event->ID() ) . '">',
+					$link = '<span class="edit-link"><a class="post-edit-link" href="'.get_edit_post_link(self::$_event->ID()).'">',
 					'</a></span></div>'
 				);
 			}
-			return '<p><span class="important-notice">' . $sales_closed_msg . '</span></p>';
+			return '<p><span class="important-notice">'.$sales_closed_msg.'</span></p>';
 		}
 
-		$templates['ticket_selector'] = TICKET_SELECTOR_TEMPLATES_PATH . 'ticket_selector_chart.template.php';
-		$templates['ticket_selector'] = apply_filters( 'FHEE__EE_Ticket_Selector__display_ticket_selector__template_path', $templates['ticket_selector'], self::$_event );
+		$templates['ticket_selector'] = TICKET_SELECTOR_TEMPLATES_PATH.'ticket_selector_chart.template.php';
+		$templates['ticket_selector'] = apply_filters('FHEE__EE_Ticket_Selector__display_ticket_selector__template_path', $templates['ticket_selector'], self::$_event);
 
 		// redirecting to another site for registration ??
 		$external_url = self::$_event->external_url() !== NULL || self::$_event->external_url() !== '' ? self::$_event->external_url() : FALSE;
 		// set up the form (but not for the admin)
-		$ticket_selector = ! is_admin() ? EED_Ticket_Selector::ticket_selector_form_open( self::$_event->ID(), $external_url ) : '';
+		$ticket_selector = ! is_admin() ? EED_Ticket_Selector::ticket_selector_form_open(self::$_event->ID(), $external_url) : '';
 		// if not redirecting to another site for registration
-		if ( ! $external_url ) {
-			EE_Registry::instance()->load_helper( 'Template' );
-			EE_Registry::instance()->load_helper( 'URL' );
+		if ( ! $external_url) {
+			EE_Registry::instance()->load_helper('Template');
+			EE_Registry::instance()->load_helper('URL');
 			// then display the ticket selector
-			$ticket_selector .= EEH_Template::locate_template( $templates['ticket_selector'], $template_args );
+			$ticket_selector .= EEH_Template::locate_template($templates['ticket_selector'], $template_args);
 		} else {
 			// if not we still need to trigger the display of the submit button
-			add_filter( 'FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true' );
+			add_filter('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true');
 			//display notice to admin that registration is external
-			$ticket_selector .= ! is_admin() ? '' : __( 'Registration is at an external URL for this event.', 'event_espresso' );
+			$ticket_selector .= ! is_admin() ? '' : __('Registration is at an external URL for this event.', 'event_espresso');
 		}
 		// submit button and form close tag
 		$ticket_selector .= ! is_admin() ? EED_Ticket_Selector::display_ticket_selector_submit() : '';
@@ -386,28 +386,28 @@ 
 	 * @param 		string $external_url
 	 * @return 		string
 	 */
-	public static function ticket_selector_form_open( $ID = 0, $external_url = '' ) {
+	public static function ticket_selector_form_open($ID = 0, $external_url = '') {
 		// if redirecting, we don't need any anything else
-		if ( $external_url ) {
-			EE_Registry::instance()->load_helper( 'URL' );
-			$html = '<form method="GET" action="' . EEH_URL::refactor_url( $external_url ) . '">';
-			$query_args = EEH_URL::get_query_string( $external_url );
-			foreach ( $query_args as $query_arg => $value ) {
-				$html .= '<input type="hidden" name="' . $query_arg . '" value="' . $value . '">';
+		if ($external_url) {
+			EE_Registry::instance()->load_helper('URL');
+			$html = '<form method="GET" action="'.EEH_URL::refactor_url($external_url).'">';
+			$query_args = EEH_URL::get_query_string($external_url);
+			foreach ($query_args as $query_arg => $value) {
+				$html .= '<input type="hidden" name="'.$query_arg.'" value="'.$value.'">';
 			}
 			return $html;
 		}
-		EE_Registry::instance()->load_helper( 'Event_View' );
-		$checkout_url = EEH_Event_View::event_link_url( $ID );
-		if ( ! $checkout_url ) {
-			EE_Error::add_error( __('The URL for the Event Details page could not be retrieved.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		EE_Registry::instance()->load_helper('Event_View');
+		$checkout_url = EEH_Event_View::event_link_url($ID);
+		if ( ! $checkout_url) {
+			EE_Error::add_error(__('The URL for the Event Details page could not be retrieved.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
 		EED_Ticket_Selector::set_event();
 		$extra_params = self::$_in_iframe ? ' target="_blank"' : '';
-		$html = '<form method="POST" action="' . $checkout_url . '"' . $extra_params . '>';
-		$html .= wp_nonce_field( 	'process_ticket_selections', 'process_ticket_selections_nonce', TRUE, FALSE );
+		$html = '<form method="POST" action="'.$checkout_url.'"'.$extra_params.'>';
+		$html .= wp_nonce_field('process_ticket_selections', 'process_ticket_selections_nonce', TRUE, FALSE);
 		$html .= '<input type="hidden" name="ee" value="process_ticket_selections">';
-		$html = apply_filters( 'FHEE__EE_Ticket_Selector__ticket_selector_form_open__html', $html, self::$_event );
+		$html = apply_filters('FHEE__EE_Ticket_Selector__ticket_selector_form_open__html', $html, self::$_event);
 		return $html;
 	}
 
@@ -422,21 +422,21 @@ 
 	 * 	@return		string
 	 */
 	public static function display_ticket_selector_submit() {
-		if ( ! is_admin() ) {
-			if ( apply_filters( 'FHEE__EE_Ticket_Selector__display_ticket_selector_submit', FALSE ) ) {
+		if ( ! is_admin()) {
+			if (apply_filters('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', FALSE)) {
 				$btn_text = apply_filters(
 					'FHEE__EE_Ticket_Selector__display_ticket_selector_submit__btn_text',
-					__('Register Now', 'event_espresso' ),
+					__('Register Now', 'event_espresso'),
 					self::$_event
 				);
-				$html = '<input id="ticket-selector-submit-'. self::$_event->ID() .'-btn"';
+				$html = '<input id="ticket-selector-submit-'.self::$_event->ID().'-btn"';
 				$html .= ' class="ticket-selector-submit-btn ticket-selector-submit-ajax"';
-				$html .= ' type="submit" value="' . $btn_text . '" />';
-				$html .= apply_filters( 'FHEE__EE_Ticket_Selector__after_ticket_selector_submit', '', self::$_event );
+				$html .= ' type="submit" value="'.$btn_text.'" />';
+				$html .= apply_filters('FHEE__EE_Ticket_Selector__after_ticket_selector_submit', '', self::$_event);
 				$html .= '<div class="clear"><br/></div></form>';
 				return $html;
-			} else if ( is_archive() ) {
-				return EED_Ticket_Selector::ticket_selector_form_close() . EED_Ticket_Selector::display_view_details_btn();
+			} else if (is_archive()) {
+				return EED_Ticket_Selector::ticket_selector_form_close().EED_Ticket_Selector::display_view_details_btn();
 			}
 		}
 		return '';
@@ -468,13 +468,13 @@ 
 	 * 	@return		string
 	 */
 	public static function display_view_details_btn() {
-		if ( ! self::$_event->get_permalink() ) {
-			EE_Error::add_error( __('The URL for the Event Details page could not be retrieved.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! self::$_event->get_permalink()) {
+			EE_Error::add_error(__('The URL for the Event Details page could not be retrieved.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
-		$view_details_btn = '<form method="POST" action="' . self::$_event->get_permalink() . '">';
-		$btn_text = apply_filters( 'FHEE__EE_Ticket_Selector__display_view_details_btn__btn_text', __( 'View Details', 'event_espresso' ), self::$_event );
-		$view_details_btn .= '<input id="ticket-selector-submit-'. self::$_event->ID() .'-btn" class="ticket-selector-submit-btn view-details-btn" type="submit" value="' . $btn_text . '" />';
-		$view_details_btn .= apply_filters( 'FHEE__EE_Ticket_Selector__after_view_details_btn', '', self::$_event );
+		$view_details_btn = '<form method="POST" action="'.self::$_event->get_permalink().'">';
+		$btn_text = apply_filters('FHEE__EE_Ticket_Selector__display_view_details_btn__btn_text', __('View Details', 'event_espresso'), self::$_event);
+		$view_details_btn .= '<input id="ticket-selector-submit-'.self::$_event->ID().'-btn" class="ticket-selector-submit-btn view-details-btn" type="submit" value="'.$btn_text.'" />';
+		$view_details_btn .= apply_filters('FHEE__EE_Ticket_Selector__after_view_details_btn', '', self::$_event);
 		$view_details_btn .= '<div class="clear"><br/></div>';
 		$view_details_btn .= '</form>';
 		return $view_details_btn;
@@ -493,11 +493,11 @@ 
 	 * 	@return		array  or FALSE
 	 */
 	public function process_ticket_selections() {
-		do_action( 'EED_Ticket_Selector__process_ticket_selections__before' );
+		do_action('EED_Ticket_Selector__process_ticket_selections__before');
 		// check nonce
-		if ( ! is_admin() && ( ! EE_Registry::instance()->REQ->is_set( 'process_ticket_selections_nonce' ) || ! wp_verify_nonce( EE_Registry::instance()->REQ->get( 'process_ticket_selections_nonce' ), 'process_ticket_selections' ))) {
+		if ( ! is_admin() && ( ! EE_Registry::instance()->REQ->is_set('process_ticket_selections_nonce') || ! wp_verify_nonce(EE_Registry::instance()->REQ->get('process_ticket_selections_nonce'), 'process_ticket_selections'))) {
 			EE_Error::add_error(
-				sprintf( __( 'We\'re sorry but your request failed to pass a security check.%sPlease click the back button on your browser and try again.', 'event_espresso' ), '<br/>' ),
+				sprintf(__('We\'re sorry but your request failed to pass a security check.%sPlease click the back button on your browser and try again.', 'event_espresso'), '<br/>'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 			return FALSE;
@@ -511,16 +511,16 @@ 
 
 		//we should really only have 1 registration in the works now (ie, no MER) so clear any previous items in the cart.
 		// When MER happens this will probably need to be tweaked, possibly wrapped in a conditional checking for some constant defined in MER etc.
-		EE_Registry::instance()->load_core( 'Session' );
+		EE_Registry::instance()->load_core('Session');
 		// unless otherwise requested, clear the session
-		if ( apply_filters( 'FHEE__EE_Ticket_Selector__process_ticket_selections__clear_session', TRUE )) {
-			EE_Registry::instance()->SSN->clear_session( __CLASS__, __FUNCTION__ );
+		if (apply_filters('FHEE__EE_Ticket_Selector__process_ticket_selections__clear_session', TRUE)) {
+			EE_Registry::instance()->SSN->clear_session(__CLASS__, __FUNCTION__);
 		}
 		//d( EE_Registry::instance()->SSN );
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		// do we have an event id?
-		if ( EE_Registry::instance()->REQ->is_set( 'tkt-slctr-event-id' ) ) {
+		if (EE_Registry::instance()->REQ->is_set('tkt-slctr-event-id')) {
 			// validate/sanitize data
 			$valid = self::_validate_post_data();
 
@@ -530,43 +530,43 @@ 
 			//EEH_Debug_Tools::printr( $valid[ 'max_atndz' ], 'max_atndz', __FILE__, __LINE__ );
 
 			//check total tickets ordered vs max number of attendees that can register
-			if ( $valid['total_tickets'] > $valid['max_atndz'] ) {
+			if ($valid['total_tickets'] > $valid['max_atndz']) {
 
 				// ordering too many tickets !!!
 				$singular = 'You have attempted to purchase %s ticket.';
 				$plural = 'You have attempted to purchase %s tickets.';
-				$limit_error_1 = sprintf( _n( $singular, $plural, $valid['total_tickets'], 'event_espresso' ), $valid['total_tickets'], $valid['total_tickets'] );
+				$limit_error_1 = sprintf(_n($singular, $plural, $valid['total_tickets'], 'event_espresso'), $valid['total_tickets'], $valid['total_tickets']);
 				// dev only message
 				$singular = 'The registration limit for this event is %s ticket per registration, therefore the total number of tickets you may purchase at a time can not exceed %s.';
 				$plural = 'The registration limit for this event is %s tickets per registration, therefore the total number of tickets you may purchase at a time can not exceed %s.';
-				$limit_error_2 = sprintf( _n( $singular, $plural, $valid['max_atndz'], 'event_espresso' ), $valid['max_atndz'], $valid['max_atndz'] );
-				EE_Error::add_error( $limit_error_1 . '<br/>' . $limit_error_2, __FILE__, __FUNCTION__, __LINE__ );
+				$limit_error_2 = sprintf(_n($singular, $plural, $valid['max_atndz'], 'event_espresso'), $valid['max_atndz'], $valid['max_atndz']);
+				EE_Error::add_error($limit_error_1.'<br/>'.$limit_error_2, __FILE__, __FUNCTION__, __LINE__);
 			} else {
 
 				// all data appears to be valid
 				$tckts_slctd = FALSE;
 				$success = TRUE;
 				// load cart
-				EE_Registry::instance()->load_core( 'Cart' );
+				EE_Registry::instance()->load_core('Cart');
 
 				// cycle thru the number of data rows sent from the event listing
-				for ( $x = 0; $x < $valid['rows']; $x++ ) {
+				for ($x = 0; $x < $valid['rows']; $x++) {
 					// does this row actually contain a ticket quantity?
-					if ( isset( $valid['qty'][$x] ) && $valid['qty'][$x] > 0 ) {
+					if (isset($valid['qty'][$x]) && $valid['qty'][$x] > 0) {
 						// YES we have a ticket quantity
 						$tckts_slctd = TRUE;
 						//						d( $valid['ticket_obj'][$x] );
-						if ( $valid['ticket_obj'][$x] instanceof EE_Ticket ) {
+						if ($valid['ticket_obj'][$x] instanceof EE_Ticket) {
 							// then add ticket to cart
-							$ticket_added = self::_add_ticket_to_cart( $valid['ticket_obj'][$x], $valid['qty'][$x] );
+							$ticket_added = self::_add_ticket_to_cart($valid['ticket_obj'][$x], $valid['qty'][$x]);
 							$success = ! $ticket_added ? FALSE : $success;
-							if ( EE_Error::has_error() ) {
+							if (EE_Error::has_error()) {
 								break;
 							}
 						} else {
 							// nothing added to cart retrieved
 							EE_Error::add_error(
-								sprintf( __( 'A valid ticket could not be retrieved for the event.%sPlease click the back button on your browser and try again.', 'event_espresso' ), '<br/>' ),
+								sprintf(__('A valid ticket could not be retrieved for the event.%sPlease click the back button on your browser and try again.', 'event_espresso'), '<br/>'),
 								__FILE__, __FUNCTION__, __LINE__
 							);
 						}
@@ -575,45 +575,45 @@ 
 				//d( EE_Registry::instance()->CART );
 				//die(); // <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< KILL REDIRECT HERE BEFORE CART UPDATE
 
-				if ( $tckts_slctd ) {
-					if ( $success ) {
-						do_action( 'FHEE__EE_Ticket_Selector__process_ticket_selections__before_redirecting_to_checkout', EE_Registry::instance()->CART, $this );
+				if ($tckts_slctd) {
+					if ($success) {
+						do_action('FHEE__EE_Ticket_Selector__process_ticket_selections__before_redirecting_to_checkout', EE_Registry::instance()->CART, $this);
 						EE_Registry::instance()->CART->recalculate_all_cart_totals();
-						EE_Registry::instance()->CART->save_cart( FALSE );
+						EE_Registry::instance()->CART->save_cart(FALSE);
 						EE_Registry::instance()->SSN->update();
 						//d( EE_Registry::instance()->CART );
 						//die(); // <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< OR HERE TO KILL REDIRECT AFTER CART UPDATE
 						// just return TRUE for registrations being made from admin
-						if ( is_admin() ) {
+						if (is_admin()) {
 							return TRUE;
 						}
-						wp_safe_redirect( apply_filters( 'FHEE__EE_Ticket_Selector__process_ticket_selections__success_redirect_url', EE_Registry::instance()->CFG->core->reg_page_url() ));
+						wp_safe_redirect(apply_filters('FHEE__EE_Ticket_Selector__process_ticket_selections__success_redirect_url', EE_Registry::instance()->CFG->core->reg_page_url()));
 						exit();
 
 					} else {
-						if ( ! EE_Error::has_error() ) {
+						if ( ! EE_Error::has_error()) {
 							// nothing added to cart
-							EE_Error::add_attention( __( 'No tickets were added for the event', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+							EE_Error::add_attention(__('No tickets were added for the event', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 						}
 					}
 
 				} else {
 					// no ticket quantities were selected
-					EE_Error::add_error( __( 'You need to select a ticket quantity before you can proceed.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_error(__('You need to select a ticket quantity before you can proceed.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				}
 			}
 			//die(); // <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< KILL BEFORE REDIRECT
 			// at this point, just return if registration is being made from admin
-			if ( is_admin() ) {
+			if (is_admin()) {
 				return FALSE;
 			}
-			if ( $valid['return_url'] ) {
-				EE_Error::get_notices( FALSE, TRUE );
-				wp_safe_redirect( $valid['return_url'] );
+			if ($valid['return_url']) {
+				EE_Error::get_notices(FALSE, TRUE);
+				wp_safe_redirect($valid['return_url']);
 				exit();
-			} elseif ( isset( $event_to_add['id'] )) {
-				EE_Error::get_notices( FALSE, TRUE );
-				wp_safe_redirect( get_permalink( $event_to_add['id'] ));
+			} elseif (isset($event_to_add['id'])) {
+				EE_Error::get_notices(FALSE, TRUE);
+				wp_safe_redirect(get_permalink($event_to_add['id']));
 				exit();
 			} else {
 				echo EE_Error::get_notices();
@@ -622,7 +622,7 @@ 
 		} else {
 			// $_POST['tkt-slctr-event-id'] was not set ?!?!?!?
 			EE_Error::add_error(
-				sprintf( __( 'An event id was not provided or was not received.%sPlease click the back button on your browser and try again.', 'event_espresso' ), '<br/>' ),
+				sprintf(__('An event id was not provided or was not received.%sPlease click the back button on your browser and try again.', 'event_espresso'), '<br/>'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 		}
@@ -640,18 +640,18 @@ 
 	 * @return        array  or FALSE
 	 */
 	private static function _validate_post_data() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		// start with an empty array()
 		$valid_data = array();
 		//		d( $_POST );
 		//if event id is valid
-		$id = absint( EE_Registry::instance()->REQ->get( 'tkt-slctr-event-id' ));
-		if ( $id ) {
+		$id = absint(EE_Registry::instance()->REQ->get('tkt-slctr-event-id'));
+		if ($id) {
 			// grab valid id
 			$valid_data['id'] = $id;
 			// grab and sanitize return-url
-			$valid_data['return_url'] = esc_url_raw( EE_Registry::instance()->REQ->get( 'tkt-slctr-return-url-' . $id ));
+			$valid_data['return_url'] = esc_url_raw(EE_Registry::instance()->REQ->get('tkt-slctr-return-url-'.$id));
 			// array of other form names
 			$inputs_to_clean = array(
 				'event_id' => 'tkt-slctr-event-id',
@@ -664,22 +664,22 @@ 
 			// let's track the total number of tickets ordered.'
 			$valid_data['total_tickets'] = 0;
 			// cycle through $inputs_to_clean array
-			foreach ( $inputs_to_clean as $what => $input_to_clean ) {
+			foreach ($inputs_to_clean as $what => $input_to_clean) {
 				// check for POST data
-				if ( EE_Registry::instance()->REQ->is_set( $input_to_clean . $id )) {
+				if (EE_Registry::instance()->REQ->is_set($input_to_clean.$id)) {
 					// grab value
-					$input_value = EE_Registry::instance()->REQ->get( $input_to_clean . $id );
+					$input_value = EE_Registry::instance()->REQ->get($input_to_clean.$id);
 					switch ($what) {
 
 						// integers
 						case 'event_id':
-							$valid_data[$what] = absint( $input_value );
+							$valid_data[$what] = absint($input_value);
 							// get event via the event id we put in the form
-							$valid_data['event'] = EE_Registry::instance()->load_model( 'Event' )->get_one_by_ID( $valid_data['event_id'] );
+							$valid_data['event'] = EE_Registry::instance()->load_model('Event')->get_one_by_ID($valid_data['event_id']);
 							break;
 						case 'rows':
 						case 'max_atndz':
-							$valid_data[$what] = absint( $input_value );
+							$valid_data[$what] = absint($input_value);
 							break;
 
 						// arrays of integers
@@ -687,27 +687,27 @@ 
 							//							d( $input_value );
 							$row_qty = $input_value;
 							// if qty is coming from a radio button input, then we need to assemble an array of rows
-							if( ! is_array( $row_qty )) {
+							if ( ! is_array($row_qty)) {
 								// get number of rows
-								$rows = EE_Registry::instance()->REQ->is_set( 'tkt-slctr-rows-' . $id ) ? absint( EE_Registry::instance()->REQ->get( 'tkt-slctr-rows-' . $id )) : 1;
+								$rows = EE_Registry::instance()->REQ->is_set('tkt-slctr-rows-'.$id) ? absint(EE_Registry::instance()->REQ->get('tkt-slctr-rows-'.$id)) : 1;
 								//								d( $rows );
 								// explode ints by the dash
-								$row_qty = explode( '-', $row_qty );
-								$row = isset( $row_qty[0] ) ? ( absint( $row_qty[0] )) : 1;
-								$qty = isset( $row_qty[1] ) ? absint( $row_qty[1] ) : 0;
-								$row_qty = array( $row => $qty );
+								$row_qty = explode('-', $row_qty);
+								$row = isset($row_qty[0]) ? (absint($row_qty[0])) : 1;
+								$qty = isset($row_qty[1]) ? absint($row_qty[1]) : 0;
+								$row_qty = array($row => $qty);
 								//								 d( $row_qty );
-								for( $x = 1; $x <= $rows; $x++ ) {
-									if ( ! isset( $row_qty[$x] )) {
+								for ($x = 1; $x <= $rows; $x++) {
+									if ( ! isset($row_qty[$x])) {
 										$row_qty[$x] = 0;
 									}
 								}
 							}
-							ksort( $row_qty );
+							ksort($row_qty);
 							//							 d( $row_qty );
 							// cycle thru values
-							foreach ( $row_qty as $qty ) {
-								$qty = absint( $qty );
+							foreach ($row_qty as $qty) {
+								$qty = absint($qty);
 								// sanitize as integers
 								$valid_data[$what][] = $qty;
 								$valid_data['total_tickets'] += $qty;
@@ -718,19 +718,19 @@ 
 						case 'ticket_id':
 							$value_array = array();
 							// cycle thru values
-							foreach ( $input_value as $key=>$value ) {
+							foreach ($input_value as $key=>$value) {
 								// allow only numbers, letters,  spaces, commas and dashes
-								$value_array[ $key ] = wp_strip_all_tags( $value );
+								$value_array[$key] = wp_strip_all_tags($value);
 								// get ticket via the ticket id we put in the form
-								$ticket_obj = EE_Registry::instance()->load_model( 'Ticket' )->get_one_by_ID( $value );
-								$valid_data['ticket_obj'][ $key ] = $ticket_obj;
+								$ticket_obj = EE_Registry::instance()->load_model('Ticket')->get_one_by_ID($value);
+								$valid_data['ticket_obj'][$key] = $ticket_obj;
 							}
-							$valid_data[ $what ] = $value_array;
+							$valid_data[$what] = $value_array;
 							break;
 
 						case 'return_url' :
 							// grab and sanitize return-url
-							$valid_data[$what] = esc_url_raw( $input_value );
+							$valid_data[$what] = esc_url_raw($input_value);
 							break;
 
 					} 	// end switch $what
@@ -738,7 +738,7 @@ 
 			} 	// end foreach $inputs_to_clean
 
 		} else {
-			EE_Error::add_error( __('The event id provided was not valid.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error(__('The event id provided was not valid.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 
@@ -756,28 +756,28 @@ 
 	 * @param int       $qty
 	 * @return TRUE on success, FALSE on fail
 	 */
-	private static function _add_ticket_to_cart( EE_Ticket $ticket = NULL, $qty = 1 ) {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+	private static function _add_ticket_to_cart(EE_Ticket $ticket = NULL, $qty = 1) {
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		// get the number of spaces left for this datetime ticket
-		$available_spaces = self::_ticket_datetime_availability( $ticket );
+		$available_spaces = self::_ticket_datetime_availability($ticket);
 		// compare available spaces against the number of tickets being purchased
-		if ( $available_spaces >= $qty ) {
+		if ($available_spaces >= $qty) {
 			// allow addons to prevent a ticket from being added to cart
-			if ( ! apply_filters( 'FHEE__EE_Ticket_Selector___add_ticket_to_cart__allow_add_to_cart', true, $ticket, $qty, $available_spaces ) ) {
+			if ( ! apply_filters('FHEE__EE_Ticket_Selector___add_ticket_to_cart__allow_add_to_cart', true, $ticket, $qty, $available_spaces)) {
 				return false;
 			}
 			// add event to cart
-			if( EE_Registry::instance()->CART->add_ticket_to_cart( $ticket, $qty )) {
-				self::_recalculate_ticket_datetime_availability( $ticket, $qty );
+			if (EE_Registry::instance()->CART->add_ticket_to_cart($ticket, $qty)) {
+				self::_recalculate_ticket_datetime_availability($ticket, $qty);
 				return true;
 			} else {
 				return false;
 			}
 		} else {
 			// tickets can not be purchased but let's find the exact number left for the last ticket selected PRIOR to subtracting tickets
-			$available_spaces = self::_ticket_datetime_availability( $ticket, true );
+			$available_spaces = self::_ticket_datetime_availability($ticket, true);
 			// greedy greedy greedy eh?
-			if ( $available_spaces > 0 ) {
+			if ($available_spaces > 0) {
 				// add error messaging - we're using the _n function that will generate the appropriate singular or plural message based on the number of $available_spaces
 				EE_Error::add_error(
 					sprintf(
@@ -793,7 +793,7 @@ 
 					__FILE__, __FUNCTION__, __LINE__
 				);
 			} else {
-				EE_Error::add_error( __('We\'re sorry, but there are no available spaces left for this event at this particular date and time.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error(__('We\'re sorry, but there are no available spaces left for this event at this particular date and time.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			}
 			return false;
 		}
@@ -811,22 +811,22 @@ 
 	 * @param 	bool         $get_original_ticket_spaces
 	 * @return 	int
 	 */
-	private static function _ticket_datetime_availability( EE_Ticket $ticket, $get_original_ticket_spaces = FALSE ) {
+	private static function _ticket_datetime_availability(EE_Ticket $ticket, $get_original_ticket_spaces = FALSE) {
 		// if the $_available_spaces array has not been set up yet...
-		if ( ! isset( self::$_available_spaces['tickets'][ $ticket->ID() ] )) {
-				self::_set_initial_ticket_datetime_availability( $ticket );
+		if ( ! isset(self::$_available_spaces['tickets'][$ticket->ID()])) {
+				self::_set_initial_ticket_datetime_availability($ticket);
 		}
 		$available_spaces = $ticket->qty() - $ticket->sold();
-		if ( isset( self::$_available_spaces['tickets'][ $ticket->ID() ] )) {
+		if (isset(self::$_available_spaces['tickets'][$ticket->ID()])) {
 			// loop thru tickets, which will ALSO include individual ticket records AND a total
-			foreach ( self::$_available_spaces['tickets'][ $ticket->ID() ] as $DTD_ID => $spaces  ) {
+			foreach (self::$_available_spaces['tickets'][$ticket->ID()] as $DTD_ID => $spaces) {
 				// if we want the original datetime availability BEFORE we started subtracting tickets ?
-				if ( $get_original_ticket_spaces ) {
+				if ($get_original_ticket_spaces) {
 					// then grab the available spaces from the "tickets" array and compare with the above to get the lowest number
-					$available_spaces = min( $available_spaces, self::$_available_spaces['tickets'][ $ticket->ID() ][ $DTD_ID ] );
+					$available_spaces = min($available_spaces, self::$_available_spaces['tickets'][$ticket->ID()][$DTD_ID]);
 				} else {
 					// we want the updated ticket availability as stored in the "datetimes" array
-					$available_spaces = min( $available_spaces, self::$_available_spaces['datetimes'][ $DTD_ID ] );
+					$available_spaces = min($available_spaces, self::$_available_spaces['datetimes'][$DTD_ID]);
 				}
 			}
 		}
@@ -842,23 +842,23 @@ 
 	 * @param 	EE_Ticket $ticket
 	 * @return 	int
 	 */
-	private static function _set_initial_ticket_datetime_availability( EE_Ticket $ticket ) {
+	private static function _set_initial_ticket_datetime_availability(EE_Ticket $ticket) {
 		// first, get all of the datetimes that are available to this ticket
 		$datetimes = $ticket->get_many_related(
 			'Datetime',
-			array( array( 'DTT_EVT_end' => array( '>=', EEM_Datetime::instance()->current_time_for_query( 'DTT_EVT_end' ) ) ), 'order_by' => array( 'DTT_EVT_start' => 'ASC' ))
+			array(array('DTT_EVT_end' => array('>=', EEM_Datetime::instance()->current_time_for_query('DTT_EVT_end'))), 'order_by' => array('DTT_EVT_start' => 'ASC'))
 		);
-		if ( ! empty( $datetimes )) {
+		if ( ! empty($datetimes)) {
 			// now loop thru all of the datetimes
-			foreach ( $datetimes as $datetime  ) {
-				if ( $datetime instanceof EE_Datetime ) {
+			foreach ($datetimes as $datetime) {
+				if ($datetime instanceof EE_Datetime) {
 					// the number of spaces available for the datetime without considering individual ticket quantities
 					$spaces_remaining = $datetime->spaces_remaining();
 					// save the total available spaces ( the lesser of the ticket qty minus the number of tickets sold or the datetime spaces remaining) to this ticket using the datetime ID as the key
-					self::$_available_spaces['tickets'][ $ticket->ID() ][ $datetime->ID() ] = min(( $ticket->qty() - $ticket->sold() ), $spaces_remaining );
+					self::$_available_spaces['tickets'][$ticket->ID()][$datetime->ID()] = min(($ticket->qty() - $ticket->sold()), $spaces_remaining);
 					// if the remaining spaces for this datetime is already set, then compare that against the datetime spaces remaining, and take the lowest number,
 					// else just take the datetime spaces remaining, and assign to the datetimes array
-					self::$_available_spaces['datetimes'][ $datetime->ID() ] = isset( self::$_available_spaces['datetimes'][ $datetime->ID() ] ) ? min( self::$_available_spaces['datetimes'][ $datetime->ID() ], $spaces_remaining ) : $spaces_remaining;
+					self::$_available_spaces['datetimes'][$datetime->ID()] = isset(self::$_available_spaces['datetimes'][$datetime->ID()]) ? min(self::$_available_spaces['datetimes'][$datetime->ID()], $spaces_remaining) : $spaces_remaining;
 				}
 			}
 		}
@@ -874,12 +874,12 @@ 
 	 * @param 	int   $qty
 	 * @return 	int
 	 */
-	private static function _recalculate_ticket_datetime_availability( EE_Ticket $ticket, $qty = 0 ) {
-		if ( isset( self::$_available_spaces['tickets'][ $ticket->ID() ] )) {
+	private static function _recalculate_ticket_datetime_availability(EE_Ticket $ticket, $qty = 0) {
+		if (isset(self::$_available_spaces['tickets'][$ticket->ID()])) {
 			// loop thru tickets, which will ALSO include individual ticket records AND a total
-			foreach ( self::$_available_spaces['tickets'][ $ticket->ID() ] as $DTD_ID => $spaces  ) {
+			foreach (self::$_available_spaces['tickets'][$ticket->ID()] as $DTD_ID => $spaces) {
 				// subtract the qty of selected tickets from each datetime's available spaces this ticket has access to,
-				self::$_available_spaces['datetimes'][ $DTD_ID ] = self::$_available_spaces['datetimes'][ $DTD_ID ] - $qty;
+				self::$_available_spaces['datetimes'][$DTD_ID] = self::$_available_spaces['datetimes'][$DTD_ID] - $qty;
 			}
 		}
 	}
@@ -896,8 +896,8 @@ 
 	*/
 	public static function load_tckt_slctr_assets() {
 		// add some style
-		if ( apply_filters( 'FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', FALSE ) ) {
-			wp_register_style('ticket_selector', TICKET_SELECTOR_ASSETS_URL . 'ticket_selector.css');
+		if (apply_filters('FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', FALSE)) {
+			wp_register_style('ticket_selector', TICKET_SELECTOR_ASSETS_URL.'ticket_selector.css');
 			wp_enqueue_style('ticket_selector');
 			// make it dance
 			//			wp_register_script('ticket_selector', TICKET_SELECTOR_ASSETS_URL . 'ticket_selector.js', array('espresso_core'), '', TRUE);
@@ -911,9 +911,9 @@ 
 
 	public static function load_tckt_slctr_assets_admin() {
 		//iframe button js on admin event editor page
-		if ( EE_Registry::instance()->REQ->get('page') == 'espresso_events' && EE_Registry::instance()->REQ->get('action') == 'edit' ) {
-			wp_register_script( 'ticket_selector_embed', TICKET_SELECTOR_ASSETS_URL . 'ticket-selector-embed.js', array( 'ee-dialog' ), EVENT_ESPRESSO_VERSION, true );
-			wp_enqueue_script( 'ticket_selector_embed' );
+		if (EE_Registry::instance()->REQ->get('page') == 'espresso_events' && EE_Registry::instance()->REQ->get('action') == 'edit') {
+			wp_register_script('ticket_selector_embed', TICKET_SELECTOR_ASSETS_URL.'ticket-selector-embed.js', array('ee-dialog'), EVENT_ESPRESSO_VERSION, true);
+			wp_enqueue_script('ticket_selector_embed');
 		}
 	}
 

modules/venues_archive/EED_Venues_Archive.module.php

Doc Comments +2 added lines, -2 removed lines

@@ -97,7 +97,7 @@ 
 	 *
 	 *  	@access 	public
 	 * 	@param		string 	$title
-	 *  	@return 		void
+	 *  	@return 		string
 	 */
 	public function the_title( $title = '', $id = '' ) {
 		return $title;
@@ -137,7 +137,7 @@ 
 	 *
 	 *  	@access 	public
 	 * 	@param		string 	$content
-	 *  	@return 		void
+	 *  	@return 		string
 	 */
 	public function venue_location( $content ) {
 		return $content . EEH_Template::locate_template( 'content-espresso_venues-location.php' );

Spacing +29 added lines, -29 removed lines

@@ -27,7 +27,7 @@ 
 	 * @return EED_Venues_Archive
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 	/**
@@ -37,7 +37,7 @@ 
 	 *  @return 	void
 	 */
 	public static function set_hooks() {
-		EE_Config::register_route( 'venues', 'Venues_Archive', 'run' );
+		EE_Config::register_route('venues', 'Venues_Archive', 'run');
 //		EE_Config::register_view( 'venues', 0, EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_venues.php' );
 	}
 
@@ -58,10 +58,10 @@ 
 	 *  @access 	public
 	 *  @return 	void
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
 		// check what template is loaded
-		add_filter( 'template_include',  array( $this, 'template_include' ), 999, 1 );
-		add_action('wp_enqueue_scripts', array( $this, 'wp_enqueue_scripts' ), 10 );
+		add_filter('template_include', array($this, 'template_include'), 999, 1);
+		add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 10);
 	}
 
 
@@ -72,20 +72,20 @@ 
 	 *  	@access 	public
 	 *  	@return 	void
 	 */
-	public function template_include( $template ) {
+	public function template_include($template) {
 		// not a custom template?
-		if ( EE_Front_Controller::instance()->get_selected_template() != 'archive-espresso_venues.php' ) {
+		if (EE_Front_Controller::instance()->get_selected_template() != 'archive-espresso_venues.php') {
 			EEH_Template::load_espresso_theme_functions();
 			// then add extra event data via hooks
-			add_filter( 'the_title', array( $this, 'the_title' ), 100, 2 );
+			add_filter('the_title', array($this, 'the_title'), 100, 2);
 			// don't know if theme uses the_excerpt
-			add_filter( 'the_excerpt', array( $this, 'venue_details' ), 100 );
-			add_filter( 'the_excerpt', array( $this, 'venue_location' ), 110 );
+			add_filter('the_excerpt', array($this, 'venue_details'), 100);
+			add_filter('the_excerpt', array($this, 'venue_location'), 110);
 			// or the_content
-			add_filter( 'the_content', array( $this, 'venue_details' ), 100 );
-			add_filter( 'the_content', array( $this, 'venue_location' ), 110 );
+			add_filter('the_content', array($this, 'venue_details'), 100);
+			add_filter('the_content', array($this, 'venue_location'), 110);
 			// don't diplay entry meta because the existing theme will take car of that
-			add_filter( 'FHEE__content_espresso_venues_details_template__display_entry_meta', '__return_false' );
+			add_filter('FHEE__content_espresso_venues_details_template__display_entry_meta', '__return_false');
 		}
 		return $template;
 	}
@@ -99,7 +99,7 @@ 
 	 * 	@param		string 	$title
 	 *  	@return 		void
 	 */
-	public function the_title( $title = '', $id = '' ) {
+	public function the_title($title = '', $id = '') {
 		return $title;
 //		global $post;
 //		return in_the_loop() && $post->ID == $id ? espresso_event_status_banner( $post->ID ) . $title :  $title;
@@ -113,21 +113,21 @@ 
 	 * 	@param		string 	$content
 	 *  	@return 		void
 	 */
-	public function venue_details( $content ) {
+	public function venue_details($content) {
 		global $post;
 		// since the 'content-espresso_venues-details.php' template might be used directly from within a theme,
 		// it uses the_content() for displaying the $post->post_content
 		// so in order to load a template that uses the_content() from within a callback being used to filter the_content(),
 		// we need to first remove this callback from being applied to the_content() (otherwise it will recurse and blow up the interweb)
-		remove_filter( 'the_excerpt', array( $this, 'venue_details' ), 100 );
-		remove_filter( 'the_content', array( $this, 'venue_details' ), 100 );
+		remove_filter('the_excerpt', array($this, 'venue_details'), 100);
+		remove_filter('the_content', array($this, 'venue_details'), 100);
 		// now load our template
-		$template = EEH_Template::locate_template( 'content-espresso_venues-details.php' );
+		$template = EEH_Template::locate_template('content-espresso_venues-details.php');
 		//now add our filter back in, plus some others
-		add_filter( 'the_excerpt', array( $this, 'venue_details' ), 100 );
-		add_filter( 'the_content', array( $this, 'venue_details' ), 100 );
+		add_filter('the_excerpt', array($this, 'venue_details'), 100);
+		add_filter('the_content', array($this, 'venue_details'), 100);
 		// we're not returning the $content directly because the template we are loading uses the_content (or the_excerpt)
-		return ! empty( $template ) ? $template : $content;
+		return ! empty($template) ? $template : $content;
 	}
 
 
@@ -139,8 +139,8 @@ 
 	 * 	@param		string 	$content
 	 *  	@return 		void
 	 */
-	public function venue_location( $content ) {
-		return $content . EEH_Template::locate_template( 'content-espresso_venues-location.php' );
+	public function venue_location($content) {
+		return $content.EEH_Template::locate_template('content-espresso_venues-location.php');
 	}
 
 
@@ -154,19 +154,19 @@ 
 	 */
 	public function wp_enqueue_scripts() {
 		// get some style
-		if ( apply_filters( 'FHEE_enable_default_espresso_css', TRUE ) && is_archive() ) {
+		if (apply_filters('FHEE_enable_default_espresso_css', TRUE) && is_archive()) {
 			// first check theme folder
-			if ( is_readable( get_stylesheet_directory() . $this->theme . DS . 'style.css' )) {
-				wp_register_style( $this->theme, get_stylesheet_directory_uri() . $this->theme . DS . 'style.css', array( 'dashicons', 'espresso_default' ) );
-			} else if ( is_readable( EE_TEMPLATES . $this->theme . DS . 'style.css' )) {
-				wp_register_style( $this->theme, EE_TEMPLATES_URL . $this->theme . DS . 'style.css', array( 'dashicons', 'espresso_default' ) );
+			if (is_readable(get_stylesheet_directory().$this->theme.DS.'style.css')) {
+				wp_register_style($this->theme, get_stylesheet_directory_uri().$this->theme.DS.'style.css', array('dashicons', 'espresso_default'));
+			} else if (is_readable(EE_TEMPLATES.$this->theme.DS.'style.css')) {
+				wp_register_style($this->theme, EE_TEMPLATES_URL.$this->theme.DS.'style.css', array('dashicons', 'espresso_default'));
 			}
 //			if ( is_readable( get_stylesheet_directory() . EE_Config::get_current_theme() . DS . 'archive-espresso_venues.js' )) {
 //				wp_register_script( 'archive-espresso_venues', get_stylesheet_directory_uri() . EE_Config::get_current_theme() . DS . 'archive-espresso_venues.js', array('espresso_core'), '1.0', TRUE  );
 //			} else if ( is_readable( EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_venues.js' )) {
 //				wp_register_script( 'archive-espresso_venues', EE_TEMPLATES_URL . EE_Config::get_current_theme() . DS . 'archive-espresso_venues.js', array('espresso_core'), '1.0', TRUE );
 //			}
-			wp_enqueue_style( $this->theme );
+			wp_enqueue_style($this->theme);
 //			wp_enqueue_script( 'archive-espresso_venues' );
 
 		}

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?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
  *

public/template_tags.php

Doc Comments +3 added lines, -3 removed lines

@@ -147,7 +147,7 @@ 
  * can_use_espresso_conditionals
  * tests whether the Espresso Conditional tags like is_espresso_event_single() can be called
  *
- * @param $conditional_tag
+ * @param string $conditional_tag
  * @return bool
  */
 function can_use_espresso_conditionals( $conditional_tag ) {
@@ -875,7 +875,7 @@ 
 	/**
 	 * espresso_event_venues
 	 *
-	 * @return array  all venues related to an event
+	 * @return EE_Venue[]  all venues related to an event
 	 */
 	function espresso_event_venues() {
 		EE_Registry::instance()->load_helper( 'Venue_View' );
@@ -910,7 +910,7 @@ 
 	 *
 	 * @param int     $VNU_ID optional, the venue id to check.
 	 *
-	 * @return bool | null
+	 * @return null|boolean | null
 	 */
 	function espresso_is_venue_private( $VNU_ID = 0 ) {
 		EE_Registry::instance()->load_helper( 'Venue_View' );

Spacing +303 added lines, -303 removed lines

@@ -27,14 +27,14 @@ 
  * @param int | \EE_Event $event
  * @return bool
  */
-function is_espresso_event( $event = NULL ) {
-	if ( can_use_espresso_conditionals( __FUNCTION__ )) {
+function is_espresso_event($event = NULL) {
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
 		// load event view helper
-		EE_Registry::instance()->load_helper( 'Event_View' );
+		EE_Registry::instance()->load_helper('Event_View');
 		// extract EE_Event object from passed param regardless of what it is (within reason of course)
-		$event = EEH_Event_View::get_event( $event );
+		$event = EEH_Event_View::get_event($event);
 		// do we have a valid event ?
-		return $event instanceof EE_Event  ? TRUE : FALSE;
+		return $event instanceof EE_Event ? TRUE : FALSE;
 	}
 	return FALSE;
 }
@@ -46,7 +46,7 @@ 
  * @return bool
  */
 function is_espresso_event_single() {
-	if ( can_use_espresso_conditionals( __FUNCTION__ )) {
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
 		global $wp_query;
 		// return conditionals set by CPTs
 		return $wp_query instanceof WP_Query ? $wp_query->is_espresso_event_single : FALSE;
@@ -61,7 +61,7 @@ 
  * @return bool
  */
 function is_espresso_event_archive() {
-	if ( can_use_espresso_conditionals( __FUNCTION__ )) {
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
 		global $wp_query;
 		return $wp_query instanceof WP_Query ? $wp_query->is_espresso_event_archive : FALSE;
 	}
@@ -75,7 +75,7 @@ 
  * @return bool
  */
 function is_espresso_event_taxonomy() {
-	if ( can_use_espresso_conditionals( __FUNCTION__ )) {
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
 		global $wp_query;
 		return $wp_query instanceof WP_Query ? $wp_query->is_espresso_event_taxonomy : FALSE;
 	}
@@ -89,12 +89,12 @@ 
  * @param int | \EE_Venue $venue
  * @return bool
  */
-function is_espresso_venue( $venue = NULL ) {
-	if ( can_use_espresso_conditionals( __FUNCTION__ )) {
+function is_espresso_venue($venue = NULL) {
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
 		// load event view helper
-		EE_Registry::instance()->load_helper( 'Venue_View' );
+		EE_Registry::instance()->load_helper('Venue_View');
 		// extract EE_Venue object from passed param regardless of what it is (within reason of course)
-		$venue = EEH_Venue_View::get_venue( $venue, FALSE );
+		$venue = EEH_Venue_View::get_venue($venue, FALSE);
 		// do we have a valid event ?
 		return $venue instanceof EE_Venue ? TRUE : FALSE;
 	}
@@ -108,7 +108,7 @@ 
  * @return bool
  */
 function is_espresso_venue_single() {
-	if ( can_use_espresso_conditionals( __FUNCTION__ )) {
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
 		global $wp_query;
 		return $wp_query instanceof WP_Query ? $wp_query->is_espresso_venue_single : FALSE;
 	}
@@ -122,7 +122,7 @@ 
  * @return bool
  */
 function is_espresso_venue_archive() {
-	if ( can_use_espresso_conditionals( __FUNCTION__ )) {
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
 		global $wp_query;
 		return $wp_query instanceof WP_Query ? $wp_query->is_espresso_venue_archive : FALSE;
 	}
@@ -136,7 +136,7 @@ 
  * @return bool
  */
 function is_espresso_venue_taxonomy() {
-	if ( can_use_espresso_conditionals( __FUNCTION__ )) {
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
 		global $wp_query;
 		return $wp_query instanceof WP_Query ? $wp_query->is_espresso_venue_taxonomy : FALSE;
 	}
@@ -150,12 +150,12 @@ 
  * @param $conditional_tag
  * @return bool
  */
-function can_use_espresso_conditionals( $conditional_tag ) {
-	if ( ! did_action( 'AHEE__EE_System__initialize' )) {
+function can_use_espresso_conditionals($conditional_tag) {
+	if ( ! did_action('AHEE__EE_System__initialize')) {
 		EE_Error::doing_it_wrong(
 			__FUNCTION__,
 			sprintf(
-				__( 'The "%s" conditional tag can not be used until after the "init" hook has run, but works best when used within a theme\'s template files.','event_espresso'),
+				__('The "%s" conditional tag can not be used until after the "init" hook has run, but works best when used within a theme\'s template files.', 'event_espresso'),
 				$conditional_tag
 			),
 			'4.4.0'
@@ -170,13 +170,13 @@ 
 
 /*************************** Event Queries ***************************/
 
-if ( ! function_exists( 'espresso_get_events' )) {
+if ( ! function_exists('espresso_get_events')) {
 	/**
 	 * 	espresso_get_events
 	 * @param array $params
 	 * @return array
 	 */
-	function espresso_get_events( $params = array() ) {
+	function espresso_get_events($params = array()) {
 		//set default params
 		$default_espresso_events_params = array(
 			'limit' => 10,
@@ -187,18 +187,18 @@ 
 			'sort' => 'ASC'
 		);
 		// allow the defaults to be filtered
-		$default_espresso_events_params = apply_filters( 'espresso_get_events__default_espresso_events_params', $default_espresso_events_params );
+		$default_espresso_events_params = apply_filters('espresso_get_events__default_espresso_events_params', $default_espresso_events_params);
 		// grab params and merge with defaults, then extract
-		$params = array_merge( $default_espresso_events_params, $params );
+		$params = array_merge($default_espresso_events_params, $params);
 		// run the query
-		$events_query = new EE_Event_List_Query( $params );
+		$events_query = new EE_Event_List_Query($params);
 		// assign results to a variable so we can return it
 		$events = $events_query->have_posts() ? $events_query->posts : array();
 		// but first reset the query and postdata
 		wp_reset_query();
 		wp_reset_postdata();
 		EED_Events_Archive::remove_all_events_archive_filters();
-		unset( $events_query );
+		unset($events_query);
 		return $events;
 	}
 }
@@ -212,32 +212,32 @@ 
  * espresso_load_ticket_selector
  */
 function espresso_load_ticket_selector() {
-	EE_Registry::instance()->load_file( EE_MODULES . 'ticket_selector', 'EED_Ticket_Selector', 'module' );
+	EE_Registry::instance()->load_file(EE_MODULES.'ticket_selector', 'EED_Ticket_Selector', 'module');
 }
 
-if ( ! function_exists( 'espresso_ticket_selector' )) {
+if ( ! function_exists('espresso_ticket_selector')) {
 	/**
 	 * espresso_ticket_selector
 	 * @param null $event
 	 */
-	function espresso_ticket_selector( $event = NULL ) {
-		if (  ! apply_filters( 'FHEE_disable_espresso_ticket_selector', FALSE ) ) {
+	function espresso_ticket_selector($event = NULL) {
+		if ( ! apply_filters('FHEE_disable_espresso_ticket_selector', FALSE)) {
 			espresso_load_ticket_selector();
-			echo EED_Ticket_Selector::display_ticket_selector( $event );
+			echo EED_Ticket_Selector::display_ticket_selector($event);
 		}
 	}
 }
 
 
-	if ( ! function_exists( 'espresso_view_details_btn' )) {
+	if ( ! function_exists('espresso_view_details_btn')) {
 	/**
 	 * espresso_view_details_btn
 	 * @param null $event
 	 */
-	function espresso_view_details_btn( $event = NULL ) {
-		if (  ! apply_filters( 'FHEE_disable_espresso_view_details_btn', FALSE ) ) {
+	function espresso_view_details_btn($event = NULL) {
+		if ( ! apply_filters('FHEE_disable_espresso_view_details_btn', FALSE)) {
 			espresso_load_ticket_selector();
-			echo EED_Ticket_Selector::display_ticket_selector( $event, TRUE );
+			echo EED_Ticket_Selector::display_ticket_selector($event, TRUE);
 		}
 	}
 }
@@ -247,7 +247,7 @@ 
 
 /*************************** EEH_Event_View ***************************/
 
-if ( ! function_exists( 'espresso_load_event_list_assets' )) {
+if ( ! function_exists('espresso_load_event_list_assets')) {
 	/**
 	 * espresso_load_event_list_assets
 	 * ensures that event list styles and scripts are loaded
@@ -256,13 +256,13 @@ 
 	 */
 	function espresso_load_event_list_assets() {
 		$event_list = EED_Events_Archive::instance();
-		add_action( 'AHEE__EE_System__initialize_last', array( $event_list, 'load_event_list_assets' ), 10 );
-		add_filter( 'FHEE_enable_default_espresso_css', '__return_true' );
+		add_action('AHEE__EE_System__initialize_last', array($event_list, 'load_event_list_assets'), 10);
+		add_filter('FHEE_enable_default_espresso_css', '__return_true');
 	}
 }
 
 
-if ( ! function_exists( 'espresso_event_reg_button' )) {
+if ( ! function_exists('espresso_event_reg_button')) {
 	/**
 	 * espresso_event_reg_button
 	 * returns the "Register Now" button if event is active,
@@ -274,10 +274,10 @@ 
 	 * @param bool $EVT_ID
 	 * @return string
 	 */
-	function espresso_event_reg_button( $btn_text_if_active = NULL, $btn_text_if_inactive = FALSE, $EVT_ID = FALSE ) {
-		EE_Registry::instance()->load_helper( 'Event_View' );
-		$event_status = EEH_Event_View::event_active_status( $EVT_ID );
-		switch ( $event_status ) {
+	function espresso_event_reg_button($btn_text_if_active = NULL, $btn_text_if_inactive = FALSE, $EVT_ID = FALSE) {
+		EE_Registry::instance()->load_helper('Event_View');
+		$event_status = EEH_Event_View::event_active_status($EVT_ID);
+		switch ($event_status) {
 			case EE_Datetime::sold_out :
 				$btn_text = __('Sold Out', 'event_espresso');
 				$class = 'ee-pink';
@@ -293,10 +293,10 @@ 
 			case EE_Datetime::upcoming :
 			case EE_Datetime::active :
 			default :
-				$btn_text =! empty( $btn_text_if_active ) ? $btn_text_if_active : __( 'Register Now', 'event_espresso' );
+				$btn_text = ! empty($btn_text_if_active) ? $btn_text_if_active : __('Register Now', 'event_espresso');
 				$class = 'ee-green';
 		}
-		if ( $event_status < 1 && ! empty( $btn_text_if_inactive )) {
+		if ($event_status < 1 && ! empty($btn_text_if_inactive)) {
 			$btn_text = $btn_text_if_inactive;
 			$class = 'ee-grey';
 		}
@@ -310,7 +310,7 @@ 
 
 
 
-if ( ! function_exists( 'espresso_display_ticket_selector' )) {
+if ( ! function_exists('espresso_display_ticket_selector')) {
 	/**
 	 * espresso_display_ticket_selector
 	 * whether or not to display the Ticket Selector for an event
@@ -318,15 +318,15 @@ 
 	 * @param bool $EVT_ID
 	 * @return boolean
 	 */
-	function espresso_display_ticket_selector( $EVT_ID = FALSE ) {
-		EE_Registry::instance()->load_helper( 'Event_View' );
-		return EEH_Event_View::display_ticket_selector( $EVT_ID );
+	function espresso_display_ticket_selector($EVT_ID = FALSE) {
+		EE_Registry::instance()->load_helper('Event_View');
+		return EEH_Event_View::display_ticket_selector($EVT_ID);
 	}
 }
 
 
 
-if ( ! function_exists( 'espresso_event_status_banner' )) {
+if ( ! function_exists('espresso_event_status_banner')) {
 	/**
 	 * espresso_event_status
 	 * returns a banner showing the event status if it is sold out, expired, or inactive
@@ -334,14 +334,14 @@ 
 	 * @param bool $EVT_ID
 	 * @return string
 	 */
-	function espresso_event_status_banner( $EVT_ID = FALSE ) {
-		EE_Registry::instance()->load_helper( 'Event_View' );
-		return EEH_Event_View::event_status( $EVT_ID );
+	function espresso_event_status_banner($EVT_ID = FALSE) {
+		EE_Registry::instance()->load_helper('Event_View');
+		return EEH_Event_View::event_status($EVT_ID);
 	}
 }
 
 
-if ( ! function_exists( 'espresso_event_status' )) {
+if ( ! function_exists('espresso_event_status')) {
 	/**
 	 * espresso_event_status
 	 * returns the event status if it is sold out, expired, or inactive
@@ -350,18 +350,18 @@ 
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_event_status( $EVT_ID = 0, $echo = TRUE ) {
-		EE_Registry::instance()->load_helper( 'Event_View' );
-		if ( $echo ) {
-			echo EEH_Event_View::event_active_status( $EVT_ID );
+	function espresso_event_status($EVT_ID = 0, $echo = TRUE) {
+		EE_Registry::instance()->load_helper('Event_View');
+		if ($echo) {
+			echo EEH_Event_View::event_active_status($EVT_ID);
 			return '';
 		}
-		return EEH_Event_View::event_active_status( $EVT_ID );
+		return EEH_Event_View::event_active_status($EVT_ID);
 	}
 }
 
 
-if ( ! function_exists( 'espresso_event_categories' )) {
+if ( ! function_exists('espresso_event_categories')) {
 	/**
 	 * espresso_event_categories
 	 * returns the terms associated with an event
@@ -371,18 +371,18 @@ 
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_event_categories( $EVT_ID = 0, $hide_uncategorized = TRUE, $echo = TRUE ) {
-		EE_Registry::instance()->load_helper( 'Event_View' );
-		if ( $echo ) {
-			echo EEH_Event_View::event_categories( $EVT_ID, $hide_uncategorized );
+	function espresso_event_categories($EVT_ID = 0, $hide_uncategorized = TRUE, $echo = TRUE) {
+		EE_Registry::instance()->load_helper('Event_View');
+		if ($echo) {
+			echo EEH_Event_View::event_categories($EVT_ID, $hide_uncategorized);
 			return '';
 		}
-		return EEH_Event_View::event_categories( $EVT_ID, $hide_uncategorized );
+		return EEH_Event_View::event_categories($EVT_ID, $hide_uncategorized);
 	}
 }
 
 
-if ( ! function_exists( 'espresso_event_tickets_available' )) {
+if ( ! function_exists('espresso_event_tickets_available')) {
 	/**
 	 * espresso_event_tickets_available
 	 * returns the ticket types available for purchase for an event
@@ -392,27 +392,27 @@ 
 	 * @param bool $format
 	 * @return string
 	 */
-	function espresso_event_tickets_available( $EVT_ID = 0, $echo = TRUE, $format = TRUE ) {
-		EE_Registry::instance()->load_helper( 'Event_View' );
-		$tickets = EEH_Event_View::event_tickets_available( $EVT_ID );
-		if ( is_array( $tickets ) && ! empty( $tickets )) {
+	function espresso_event_tickets_available($EVT_ID = 0, $echo = TRUE, $format = TRUE) {
+		EE_Registry::instance()->load_helper('Event_View');
+		$tickets = EEH_Event_View::event_tickets_available($EVT_ID);
+		if (is_array($tickets) && ! empty($tickets)) {
 			// if formatting then $html will be a string, else it will be an array of ticket objects
-			$html = $format ? '<ul id="ee-event-tickets-ul-' . $EVT_ID . '" class="ee-event-tickets-ul">' : array();
-			foreach ( $tickets as $ticket ) {
-				if ( $ticket instanceof EE_Ticket ) {
-					if ( $format ) {
-						$html .= '<li id="ee-event-tickets-li-' . $ticket->ID() . '" class="ee-event-tickets-li">';
-						$html .= $ticket->name() . ' ' . EEH_Template::format_currency( $ticket->get_ticket_total_with_taxes() );
+			$html = $format ? '<ul id="ee-event-tickets-ul-'.$EVT_ID.'" class="ee-event-tickets-ul">' : array();
+			foreach ($tickets as $ticket) {
+				if ($ticket instanceof EE_Ticket) {
+					if ($format) {
+						$html .= '<li id="ee-event-tickets-li-'.$ticket->ID().'" class="ee-event-tickets-li">';
+						$html .= $ticket->name().' '.EEH_Template::format_currency($ticket->get_ticket_total_with_taxes());
 						$html .= '</li>';
 					} else {
 						$html[] = $ticket;
 					}
 				}
 			}
-			if ( $format ) {
+			if ($format) {
 				$html .= '</ul>';
 			}
-			if ( $echo && ! $format ) {
+			if ($echo && ! $format) {
 				echo $html;
 				return '';
 			}
@@ -422,7 +422,7 @@ 
 	}
 }
 
-if ( ! function_exists( 'espresso_event_date_obj' )) {
+if ( ! function_exists('espresso_event_date_obj')) {
 	/**
 	 * espresso_event_date_obj
 	 * returns the primary date object for an event
@@ -430,14 +430,14 @@ 
 	 * @param bool $EVT_ID
 	 * @return object
 	 */
-	function espresso_event_date_obj( $EVT_ID = FALSE ) {
-		EE_Registry::instance()->load_helper( 'Event_View' );
-		return EEH_Event_View::get_primary_date_obj( $EVT_ID );
+	function espresso_event_date_obj($EVT_ID = FALSE) {
+		EE_Registry::instance()->load_helper('Event_View');
+		return EEH_Event_View::get_primary_date_obj($EVT_ID);
 	}
 }
 
 
-if ( ! function_exists( 'espresso_event_date' )) {
+if ( ! function_exists('espresso_event_date')) {
 	/**
 	 * espresso_event_date
 	 * returns the primary date for an event
@@ -448,23 +448,23 @@ 
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_event_date( $date_format = '', $time_format = '', $EVT_ID = FALSE, $echo = TRUE ) {
-		$date_format = ! empty( $date_format ) ? $date_format : get_option( 'date_format' );
-		$time_format = ! empty( $time_format ) ? $time_format : get_option( 'time_format' );
-		$date_format = apply_filters( 'FHEE__espresso_event_date__date_format', $date_format );
-		$time_format = apply_filters( 'FHEE__espresso_event_date__time_format', $time_format );
-		EE_Registry::instance()->load_helper( 'Event_View' );
-		if($echo){
-			echo EEH_Event_View::the_event_date( $date_format, $time_format, $EVT_ID );
+	function espresso_event_date($date_format = '', $time_format = '', $EVT_ID = FALSE, $echo = TRUE) {
+		$date_format = ! empty($date_format) ? $date_format : get_option('date_format');
+		$time_format = ! empty($time_format) ? $time_format : get_option('time_format');
+		$date_format = apply_filters('FHEE__espresso_event_date__date_format', $date_format);
+		$time_format = apply_filters('FHEE__espresso_event_date__time_format', $time_format);
+		EE_Registry::instance()->load_helper('Event_View');
+		if ($echo) {
+			echo EEH_Event_View::the_event_date($date_format, $time_format, $EVT_ID);
 			return '';
 		}
-		return EEH_Event_View::the_event_date( $date_format, $time_format, $EVT_ID );
+		return EEH_Event_View::the_event_date($date_format, $time_format, $EVT_ID);
 
 	}
 }
 
 
-if ( ! function_exists( 'espresso_list_of_event_dates' )) {
+if ( ! function_exists('espresso_list_of_event_dates')) {
 	/**
 	 * espresso_list_of_event_dates
 	 * returns a unordered list of dates for an event
@@ -479,41 +479,41 @@ 
 	 * @param null   $limit
 	 * @return string
 	 */
-	function espresso_list_of_event_dates( $EVT_ID = 0, $date_format = '', $time_format = '', $echo = TRUE, $show_expired = NULL, $format = TRUE, $add_breaks = TRUE, $limit = NULL ) {
-		$date_format = ! empty( $date_format ) ? $date_format : get_option( 'date_format' );
-		$time_format = ! empty( $time_format ) ? $time_format : get_option( 'time_format' );
-		$date_format = apply_filters( 'FHEE__espresso_list_of_event_dates__date_format', $date_format );
-		$time_format = apply_filters( 'FHEE__espresso_list_of_event_dates__time_format', $time_format );
-		EE_Registry::instance()->load_helper( 'Event_View' );
-		$datetimes = EEH_Event_View::get_all_date_obj( $EVT_ID, $show_expired, FALSE, $limit );
-		if ( ! $format ) {
-			return apply_filters( 'FHEE__espresso_list_of_event_dates__datetimes', $datetimes );
+	function espresso_list_of_event_dates($EVT_ID = 0, $date_format = '', $time_format = '', $echo = TRUE, $show_expired = NULL, $format = TRUE, $add_breaks = TRUE, $limit = NULL) {
+		$date_format = ! empty($date_format) ? $date_format : get_option('date_format');
+		$time_format = ! empty($time_format) ? $time_format : get_option('time_format');
+		$date_format = apply_filters('FHEE__espresso_list_of_event_dates__date_format', $date_format);
+		$time_format = apply_filters('FHEE__espresso_list_of_event_dates__time_format', $time_format);
+		EE_Registry::instance()->load_helper('Event_View');
+		$datetimes = EEH_Event_View::get_all_date_obj($EVT_ID, $show_expired, FALSE, $limit);
+		if ( ! $format) {
+			return apply_filters('FHEE__espresso_list_of_event_dates__datetimes', $datetimes);
 		}
 		//d( $datetimes );
-		if ( is_array( $datetimes ) && ! empty( $datetimes )) {
+		if (is_array($datetimes) && ! empty($datetimes)) {
 			global $post;
-			$html = $format ? '<ul id="ee-event-datetimes-ul-' . $post->ID . '" class="ee-event-datetimes-ul">' : '';
-			foreach ( $datetimes as $datetime ) {
-				if ( $datetime instanceof EE_Datetime ) {
-					$html .= '<li id="ee-event-datetimes-li-' . $datetime->ID();
-					$html .= '" class="ee-event-datetimes-li ee-event-datetimes-li-' . $datetime->get_active_status() . '">';
+			$html = $format ? '<ul id="ee-event-datetimes-ul-'.$post->ID.'" class="ee-event-datetimes-ul">' : '';
+			foreach ($datetimes as $datetime) {
+				if ($datetime instanceof EE_Datetime) {
+					$html .= '<li id="ee-event-datetimes-li-'.$datetime->ID();
+					$html .= '" class="ee-event-datetimes-li ee-event-datetimes-li-'.$datetime->get_active_status().'">';
 					$datetime_name = $datetime->name();
-					$html .= ! empty( $datetime_name ) ? '<strong>' . $datetime_name . '</strong>' : '';
-					$html .= ! empty( $datetime_name )  && $add_breaks ? '<br />' : '';
-					$html .= '<span class="dashicons dashicons-calendar"></span>' . $datetime->date_range( $date_format ) . '<br/>';
-					$html .= '<span class="dashicons dashicons-clock"></span>' . $datetime->time_range( $time_format );
+					$html .= ! empty($datetime_name) ? '<strong>'.$datetime_name.'</strong>' : '';
+					$html .= ! empty($datetime_name) && $add_breaks ? '<br />' : '';
+					$html .= '<span class="dashicons dashicons-calendar"></span>'.$datetime->date_range($date_format).'<br/>';
+					$html .= '<span class="dashicons dashicons-clock"></span>'.$datetime->time_range($time_format);
 					$datetime_description = $datetime->description();
-					$html .= ! empty( $datetime_description )  && $add_breaks ? '<br />' : '';
-					$html .= ! empty( $datetime_description ) ? ' - ' . $datetime_description : '';
-					$html = apply_filters( 'FHEE__espresso_list_of_event_dates__datetime_html', $html, $datetime );
+					$html .= ! empty($datetime_description) && $add_breaks ? '<br />' : '';
+					$html .= ! empty($datetime_description) ? ' - '.$datetime_description : '';
+					$html = apply_filters('FHEE__espresso_list_of_event_dates__datetime_html', $html, $datetime);
 					$html .= '</li>';
 				}
 			}
 			$html .= $format ? '</ul>' : '';
 		} else {
-			$html = $format ?  '<p><span class="dashicons dashicons-marker pink-text"></span>' . __( 'There are no upcoming dates for this event.', 'event_espresso' ) . '</p><br/>' : '';
+			$html = $format ? '<p><span class="dashicons dashicons-marker pink-text"></span>'.__('There are no upcoming dates for this event.', 'event_espresso').'</p><br/>' : '';
 		}
-		if ( $echo ) {
+		if ($echo) {
 			echo $html;
 			return '';
 		}
@@ -522,7 +522,7 @@ 
 }
 
 
-if ( ! function_exists( 'espresso_event_end_date' )) {
+if ( ! function_exists('espresso_event_end_date')) {
 	/**
 	 * espresso_event_end_date
 	 * returns the last date for an event
@@ -533,21 +533,21 @@ 
 	 * @param bool   $echo
 	 * @return string
 	 */
-	function espresso_event_end_date( $date_format = '', $time_format = '', $EVT_ID = FALSE, $echo = TRUE ) {
-		$date_format = ! empty( $date_format ) ? $date_format : get_option( 'date_format' );
-		$time_format = ! empty( $time_format ) ? $time_format : get_option( 'time_format' );
-		$date_format = apply_filters( 'FHEE__espresso_event_end_date__date_format', $date_format );
-		$time_format = apply_filters( 'FHEE__espresso_event_end_date__time_format', $time_format );
-		EE_Registry::instance()->load_helper( 'Event_View' );
-		if($echo){
-			echo EEH_Event_View::the_event_end_date( $date_format, $time_format, $EVT_ID );
+	function espresso_event_end_date($date_format = '', $time_format = '', $EVT_ID = FALSE, $echo = TRUE) {
+		$date_format = ! empty($date_format) ? $date_format : get_option('date_format');
+		$time_format = ! empty($time_format) ? $time_format : get_option('time_format');
+		$date_format = apply_filters('FHEE__espresso_event_end_date__date_format', $date_format);
+		$time_format = apply_filters('FHEE__espresso_event_end_date__time_format', $time_format);
+		EE_Registry::instance()->load_helper('Event_View');
+		if ($echo) {
+			echo EEH_Event_View::the_event_end_date($date_format, $time_format, $EVT_ID);
 			return '';
 		}
-		return EEH_Event_View::the_event_end_date( $date_format, $time_format, $EVT_ID );
+		return EEH_Event_View::the_event_end_date($date_format, $time_format, $EVT_ID);
 	}
 }
 
-if ( ! function_exists( 'espresso_event_date_range' )) {
+if ( ! function_exists('espresso_event_date_range')) {
 	/**
 	 * espresso_event_date_range
 	 * returns the first and last chronologically ordered dates for an event (if different)
@@ -559,32 +559,32 @@ 
 	 * @param bool   $EVT_ID
 	 * @return string
 	 */
-	function espresso_event_date_range( $date_format = '', $time_format = '', $single_date_format = '', $single_time_format = '', $EVT_ID = FALSE, $echo = TRUE ) {
-		EE_Registry::instance()->load_helper( 'Event_View' );
+	function espresso_event_date_range($date_format = '', $time_format = '', $single_date_format = '', $single_time_format = '', $EVT_ID = FALSE, $echo = TRUE) {
+		EE_Registry::instance()->load_helper('Event_View');
 		// set and filter date and time formats when a range is returned
-		$date_format = ! empty( $date_format ) ? $date_format : get_option( 'date_format' );
-		$date_format = apply_filters( 'FHEE__espresso_event_date_range__date_format', $date_format );
+		$date_format = ! empty($date_format) ? $date_format : get_option('date_format');
+		$date_format = apply_filters('FHEE__espresso_event_date_range__date_format', $date_format);
 		// get the start and end date with NO time portion
-		$the_event_date = EEH_Event_View::the_earliest_event_date( $date_format, '', $EVT_ID );
-		$the_event_end_date = EEH_Event_View::the_latest_event_date( $date_format, '', $EVT_ID );
+		$the_event_date = EEH_Event_View::the_earliest_event_date($date_format, '', $EVT_ID);
+		$the_event_end_date = EEH_Event_View::the_latest_event_date($date_format, '', $EVT_ID);
 		// now we can determine if date range spans more than one day
-		if ( $the_event_date != $the_event_end_date ) {
-			$time_format = ! empty( $time_format ) ? $time_format : get_option( 'time_format' );
-			$time_format = apply_filters( 'FHEE__espresso_event_date_range__time_format', $time_format );
+		if ($the_event_date != $the_event_end_date) {
+			$time_format = ! empty($time_format) ? $time_format : get_option('time_format');
+			$time_format = apply_filters('FHEE__espresso_event_date_range__time_format', $time_format);
 			$html = sprintf(
-				__( '%1$s - %2$s', 'event_espresso' ),
-				EEH_Event_View::the_earliest_event_date( $date_format, $time_format, $EVT_ID ),
-				EEH_Event_View::the_latest_event_date( $date_format, $time_format, $EVT_ID )
+				__('%1$s - %2$s', 'event_espresso'),
+				EEH_Event_View::the_earliest_event_date($date_format, $time_format, $EVT_ID),
+				EEH_Event_View::the_latest_event_date($date_format, $time_format, $EVT_ID)
 			);
 		} else {
 			// set and filter date and time formats when only a single datetime is returned
-			$single_date_format = ! empty( $single_date_format ) ? $single_date_format : get_option( 'date_format' );
-			$single_time_format = ! empty( $single_time_format ) ? $single_time_format : get_option( 'time_format' );
-			$single_date_format = apply_filters( 'FHEE__espresso_event_date_range__single_date_format', $single_date_format );
-			$single_time_format = apply_filters( 'FHEE__espresso_event_date_range__single_time_format', $single_time_format );
-			$html = EEH_Event_View::the_earliest_event_date( $single_date_format, $single_time_format, $EVT_ID );
+			$single_date_format = ! empty($single_date_format) ? $single_date_format : get_option('date_format');
+			$single_time_format = ! empty($single_time_format) ? $single_time_format : get_option('time_format');
+			$single_date_format = apply_filters('FHEE__espresso_event_date_range__single_date_format', $single_date_format);
+			$single_time_format = apply_filters('FHEE__espresso_event_date_range__single_time_format', $single_time_format);
+			$html = EEH_Event_View::the_earliest_event_date($single_date_format, $single_time_format, $EVT_ID);
 		}
-		if ( $echo ) {
+		if ($echo) {
 			echo $html;
 			return '';
 		}
@@ -593,7 +593,7 @@ 
 }
 
 
-if ( ! function_exists( 'espresso_event_date_as_calendar_page' )) {
+if ( ! function_exists('espresso_event_date_as_calendar_page')) {
 	/**
 	 * espresso_event_date_as_calendar_page
 	 * returns the primary date for an event, stylized to appear as the page of a calendar
@@ -601,16 +601,16 @@ 
 	 * @param bool $EVT_ID
 	 * @return string
 	 */
-	function espresso_event_date_as_calendar_page( $EVT_ID = FALSE ) {
-		EE_Registry::instance()->load_helper( 'Event_View' );
-		EEH_Event_View::event_date_as_calendar_page( $EVT_ID );
+	function espresso_event_date_as_calendar_page($EVT_ID = FALSE) {
+		EE_Registry::instance()->load_helper('Event_View');
+		EEH_Event_View::event_date_as_calendar_page($EVT_ID);
 	}
 }
 
 
 
 
-if ( ! function_exists( 'espresso_event_link_url' )) {
+if ( ! function_exists('espresso_event_link_url')) {
 	/**
 	 * espresso_event_link_url
 	 *
@@ -618,19 +618,19 @@ 
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_event_link_url( $EVT_ID = 0, $echo = TRUE ) {
-		EE_Registry::instance()->load_helper( 'Event_View' );
-		if ( $echo ) {
-			echo EEH_Event_View::event_link_url( $EVT_ID );
+	function espresso_event_link_url($EVT_ID = 0, $echo = TRUE) {
+		EE_Registry::instance()->load_helper('Event_View');
+		if ($echo) {
+			echo EEH_Event_View::event_link_url($EVT_ID);
 			return '';
 		}
-		return EEH_Event_View::event_link_url( $EVT_ID );
+		return EEH_Event_View::event_link_url($EVT_ID);
 	}
 }
 
 
 
-if ( ! function_exists( 'espresso_event_has_content_or_excerpt' )) {
+if ( ! function_exists('espresso_event_has_content_or_excerpt')) {
 	/**
 	 *    espresso_event_has_content_or_excerpt
 	 *
@@ -638,16 +638,16 @@ 
 	 * @param bool $EVT_ID
 	 * @return    boolean
 	 */
-	function espresso_event_has_content_or_excerpt( $EVT_ID = FALSE ) {
-		EE_Registry::instance()->load_helper( 'Event_View' );
-		return EEH_Event_View::event_has_content_or_excerpt( $EVT_ID );
+	function espresso_event_has_content_or_excerpt($EVT_ID = FALSE) {
+		EE_Registry::instance()->load_helper('Event_View');
+		return EEH_Event_View::event_has_content_or_excerpt($EVT_ID);
 	}
 }
 
 
 
 
-if ( ! function_exists( 'espresso_event_content_or_excerpt' )) {
+if ( ! function_exists('espresso_event_content_or_excerpt')) {
 	/**
 	 * espresso_event_content_or_excerpt
 	 *
@@ -656,19 +656,19 @@ 
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_event_content_or_excerpt( $num_words = 55, $more = NULL, $echo = TRUE ) {
-		EE_Registry::instance()->load_helper( 'Event_View' );
-		if ( $echo ) {
-			echo EEH_Event_View::event_content_or_excerpt( $num_words, $more );
+	function espresso_event_content_or_excerpt($num_words = 55, $more = NULL, $echo = TRUE) {
+		EE_Registry::instance()->load_helper('Event_View');
+		if ($echo) {
+			echo EEH_Event_View::event_content_or_excerpt($num_words, $more);
 			return '';
 		}
-		return EEH_Event_View::event_content_or_excerpt( $num_words, $more );
+		return EEH_Event_View::event_content_or_excerpt($num_words, $more);
 	}
 }
 
 
 
-if ( ! function_exists( 'espresso_event_phone' )) {
+if ( ! function_exists('espresso_event_phone')) {
 	/**
 	 * espresso_event_phone
 	 *
@@ -676,19 +676,19 @@ 
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_event_phone( $EVT_ID = 0, $echo = TRUE ) {
-		EE_Registry::instance()->load_helper( 'Event_View' );
-		if ( $echo ) {
-			echo EEH_Event_View::event_phone( $EVT_ID );
+	function espresso_event_phone($EVT_ID = 0, $echo = TRUE) {
+		EE_Registry::instance()->load_helper('Event_View');
+		if ($echo) {
+			echo EEH_Event_View::event_phone($EVT_ID);
 			return '';
 		}
-		return EEH_Event_View::event_phone( $EVT_ID );
+		return EEH_Event_View::event_phone($EVT_ID);
 	}
 }
 
 
 
-if ( ! function_exists( 'espresso_edit_event_link' )) {
+if ( ! function_exists('espresso_edit_event_link')) {
 	/**
 	 * espresso_edit_event_link
 	 * returns a link to edit an event
@@ -697,41 +697,41 @@ 
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_edit_event_link( $EVT_ID = 0, $echo = TRUE ) {
-		EE_Registry::instance()->load_helper( 'Event_View' );
-		if ( $echo ) {
-			echo EEH_Event_View::edit_event_link( $EVT_ID );
+	function espresso_edit_event_link($EVT_ID = 0, $echo = TRUE) {
+		EE_Registry::instance()->load_helper('Event_View');
+		if ($echo) {
+			echo EEH_Event_View::edit_event_link($EVT_ID);
 			return '';
 		}
-		return EEH_Event_View::edit_event_link( $EVT_ID );
+		return EEH_Event_View::edit_event_link($EVT_ID);
 	}
 }
 
 
-if ( ! function_exists( 'espresso_organization_name' )) {
+if ( ! function_exists('espresso_organization_name')) {
 	/**
 	 * espresso_organization_name
 	 * @param bool $echo
 	 * @return string
 	 */
 	function espresso_organization_name($echo = TRUE) {
-		if($echo){
-			echo EE_Registry::instance()->CFG->organization->get_pretty( 'name' );
+		if ($echo) {
+			echo EE_Registry::instance()->CFG->organization->get_pretty('name');
 			return '';
 		}
-		return EE_Registry::instance()->CFG->organization->get_pretty( 'name' );
+		return EE_Registry::instance()->CFG->organization->get_pretty('name');
 	}
 }
 
-if ( ! function_exists( 'espresso_organization_address' )) {
+if ( ! function_exists('espresso_organization_address')) {
 	/**
 	 * espresso_organization_address
 	 * @param string $type
 	 * @return string
 	 */
-	function espresso_organization_address( $type = 'inline' ) {
-		if ( EE_Registry::instance()->CFG->organization instanceof EE_Organization_Config ) {
-			EE_Registry::instance()->load_helper( 'Formatter' );
+	function espresso_organization_address($type = 'inline') {
+		if (EE_Registry::instance()->CFG->organization instanceof EE_Organization_Config) {
+			EE_Registry::instance()->load_helper('Formatter');
 			$address = new EE_Generic_Address(
 				EE_Registry::instance()->CFG->organization->address_1,
 				EE_Registry::instance()->CFG->organization->address_2,
@@ -740,129 +740,129 @@ 
 				EE_Registry::instance()->CFG->organization->zip,
 				EE_Registry::instance()->CFG->organization->CNT_ISO
 			);
-			return EEH_Address::format( $address, $type );
+			return EEH_Address::format($address, $type);
 		}
 		return '';
 	}
 }
 
-if ( ! function_exists( 'espresso_organization_email' )) {
+if ( ! function_exists('espresso_organization_email')) {
 	/**
 	 * espresso_organization_email
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_organization_email( $echo = TRUE ) {
-		if($echo){
-			echo EE_Registry::instance()->CFG->organization->get_pretty( 'email' );
+	function espresso_organization_email($echo = TRUE) {
+		if ($echo) {
+			echo EE_Registry::instance()->CFG->organization->get_pretty('email');
 			return '';
 		}
-		return EE_Registry::instance()->CFG->organization->get_pretty( 'email' );
+		return EE_Registry::instance()->CFG->organization->get_pretty('email');
 	}
 }
 
-if ( ! function_exists( 'espresso_organization_logo_url' )) {
+if ( ! function_exists('espresso_organization_logo_url')) {
 	/**
 	 * espresso_organization_logo_url
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_organization_logo_url( $echo = TRUE ) {
-		if($echo){
-			echo EE_Registry::instance()->CFG->organization->get_pretty( 'logo_url' );
+	function espresso_organization_logo_url($echo = TRUE) {
+		if ($echo) {
+			echo EE_Registry::instance()->CFG->organization->get_pretty('logo_url');
 			return '';
 		}
-		return EE_Registry::instance()->CFG->organization->get_pretty( 'logo_url' );
+		return EE_Registry::instance()->CFG->organization->get_pretty('logo_url');
 	}
 }
 
-if ( ! function_exists( 'espresso_organization_facebook' )) {
+if ( ! function_exists('espresso_organization_facebook')) {
 	/**
 	 * espresso_organization_facebook
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_organization_facebook( $echo = TRUE ) {
-		if($echo){
-			echo EE_Registry::instance()->CFG->organization->get_pretty( 'facebook' );
+	function espresso_organization_facebook($echo = TRUE) {
+		if ($echo) {
+			echo EE_Registry::instance()->CFG->organization->get_pretty('facebook');
 			return '';
 		}
-		return EE_Registry::instance()->CFG->organization->get_pretty( 'facebook' );
+		return EE_Registry::instance()->CFG->organization->get_pretty('facebook');
 	}
 }
 
-if ( ! function_exists( 'espresso_organization_twitter' )) {
+if ( ! function_exists('espresso_organization_twitter')) {
 	/**
 	 * espresso_organization_twitter
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_organization_twitter( $echo = TRUE ) {
-		if($echo){
-			echo EE_Registry::instance()->CFG->organization->get_pretty( 'twitter' );
+	function espresso_organization_twitter($echo = TRUE) {
+		if ($echo) {
+			echo EE_Registry::instance()->CFG->organization->get_pretty('twitter');
 			return '';
 		}
-		return EE_Registry::instance()->CFG->organization->get_pretty( 'twitter' );
+		return EE_Registry::instance()->CFG->organization->get_pretty('twitter');
 	}
 }
 
-if ( ! function_exists( 'espresso_organization_linkedin' )) {
+if ( ! function_exists('espresso_organization_linkedin')) {
 	/**
 	 * espresso_organization_linkedin
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_organization_linkedin( $echo = TRUE ) {
-		if($echo){
-			echo EE_Registry::instance()->CFG->organization->get_pretty( 'linkedin' );
+	function espresso_organization_linkedin($echo = TRUE) {
+		if ($echo) {
+			echo EE_Registry::instance()->CFG->organization->get_pretty('linkedin');
 			return '';
 		}
-		return EE_Registry::instance()->CFG->organization->get_pretty( 'linkedin' );
+		return EE_Registry::instance()->CFG->organization->get_pretty('linkedin');
 	}
 }
 
-if ( ! function_exists( 'espresso_organization_pinterest' )) {
+if ( ! function_exists('espresso_organization_pinterest')) {
 	/**
 	 * espresso_organization_pinterest
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_organization_pinterest( $echo = TRUE ) {
-		if($echo){
-			echo EE_Registry::instance()->CFG->organization->get_pretty( 'pinterest' );
+	function espresso_organization_pinterest($echo = TRUE) {
+		if ($echo) {
+			echo EE_Registry::instance()->CFG->organization->get_pretty('pinterest');
 			return '';
 		}
-		return EE_Registry::instance()->CFG->organization->get_pretty( 'pinterest' );
+		return EE_Registry::instance()->CFG->organization->get_pretty('pinterest');
 	}
 }
 
-if ( ! function_exists( 'espresso_organization_google' )) {
+if ( ! function_exists('espresso_organization_google')) {
 	/**
 	 * espresso_organization_google
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_organization_google( $echo = TRUE ) {
-		if($echo){
-			echo EE_Registry::instance()->CFG->organization->get_pretty( 'google' );
+	function espresso_organization_google($echo = TRUE) {
+		if ($echo) {
+			echo EE_Registry::instance()->CFG->organization->get_pretty('google');
 			return '';
 		}
-		return EE_Registry::instance()->CFG->organization->get_pretty( 'google' );
+		return EE_Registry::instance()->CFG->organization->get_pretty('google');
 	}
 }
 
-if ( ! function_exists( 'espresso_organization_instagram' )) {
+if ( ! function_exists('espresso_organization_instagram')) {
 	/**
 	 * espresso_organization_instagram
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_organization_instagram( $echo = TRUE ) {
-		if($echo){
-			echo EE_Registry::instance()->CFG->organization->get_pretty( 'instagram' );
+	function espresso_organization_instagram($echo = TRUE) {
+		if ($echo) {
+			echo EE_Registry::instance()->CFG->organization->get_pretty('instagram');
 			return '';
 		}
-		return EE_Registry::instance()->CFG->organization->get_pretty( 'instagram' );
+		return EE_Registry::instance()->CFG->organization->get_pretty('instagram');
 	}
 }
 
@@ -872,14 +872,14 @@ 
 
 
 
-if ( ! function_exists( 'espresso_event_venues' )) {
+if ( ! function_exists('espresso_event_venues')) {
 	/**
 	 * espresso_event_venues
 	 *
 	 * @return array  all venues related to an event
 	 */
 	function espresso_event_venues() {
-		EE_Registry::instance()->load_helper( 'Venue_View' );
+		EE_Registry::instance()->load_helper('Venue_View');
 		return EEH_Venue_View::get_event_venues();
 	}
 }
@@ -887,7 +887,7 @@ 
 
 
 
-if ( ! function_exists( 'espresso_venue_id' )) {
+if ( ! function_exists('espresso_venue_id')) {
 	/**
 	 *    espresso_venue_name
 	 *
@@ -895,16 +895,16 @@ 
 	 * @param     int $EVT_ID
 	 * @return    string
 	 */
-	function espresso_venue_id( $EVT_ID = 0 ) {
-		EE_Registry::instance()->load_helper( 'Venue_View' );
-		$venue = EEH_Venue_View::get_venue( $EVT_ID );
+	function espresso_venue_id($EVT_ID = 0) {
+		EE_Registry::instance()->load_helper('Venue_View');
+		$venue = EEH_Venue_View::get_venue($EVT_ID);
 		return $venue instanceof EE_Venue ? $venue->ID() : 0;
 	}
 }
 
 
 
-if ( ! function_exists( 'espresso_is_venue_private' ) ) {
+if ( ! function_exists('espresso_is_venue_private')) {
 	/**
 	 * Return whether a venue is private or not.
 	 * @see EEH_Venue_View::get_venue() for more info on expected return results.
@@ -913,16 +913,16 @@ 
 	 *
 	 * @return bool | null
 	 */
-	function espresso_is_venue_private( $VNU_ID = 0 ) {
-		EE_Registry::instance()->load_helper( 'Venue_View' );
-		return EEH_Venue_View::is_venue_private( $VNU_ID );
+	function espresso_is_venue_private($VNU_ID = 0) {
+		EE_Registry::instance()->load_helper('Venue_View');
+		return EEH_Venue_View::is_venue_private($VNU_ID);
 	}
 }
 
 
 
 
-if ( ! function_exists( 'espresso_venue_name' )) {
+if ( ! function_exists('espresso_venue_name')) {
 	/**
 	 *    espresso_venue_name
 	 *
@@ -932,20 +932,20 @@ 
 	 * @param bool   $echo
 	 * @return    string
 	 */
-	function espresso_venue_name( $VNU_ID = 0, $link_to = 'details', $echo = TRUE ) {
-		EE_Registry::instance()->load_helper( 'Venue_View' );
-		if($echo){
-			echo EEH_Venue_View::venue_name( $link_to, $VNU_ID );
+	function espresso_venue_name($VNU_ID = 0, $link_to = 'details', $echo = TRUE) {
+		EE_Registry::instance()->load_helper('Venue_View');
+		if ($echo) {
+			echo EEH_Venue_View::venue_name($link_to, $VNU_ID);
 			return '';
 		}
-		return EEH_Venue_View::venue_name( $link_to, $VNU_ID );
+		return EEH_Venue_View::venue_name($link_to, $VNU_ID);
 	}
 }
 
 
 
 
-if ( ! function_exists( 'espresso_venue_link' )) {
+if ( ! function_exists('espresso_venue_link')) {
 	/**
 	 * 	espresso_venue_link
 	 *
@@ -954,15 +954,15 @@ 
 	 *  @param 	string 	$text
 	 *  @return 	string
 	 */
-	function espresso_venue_link( $VNU_ID = 0, $text = '' ) {
-		EE_Registry::instance()->load_helper( 'Venue_View' );
-		return EEH_Venue_View::venue_details_link( $VNU_ID, $text );
+	function espresso_venue_link($VNU_ID = 0, $text = '') {
+		EE_Registry::instance()->load_helper('Venue_View');
+		return EEH_Venue_View::venue_details_link($VNU_ID, $text);
 	}
 }
 
 
 
-if ( ! function_exists( 'espresso_venue_description' )) {
+if ( ! function_exists('espresso_venue_description')) {
 	/**
 	 *    espresso_venue_description
 	 *
@@ -971,18 +971,18 @@ 
 	 * @param bool $echo
 	 * @return    string
 	 */
-	function espresso_venue_description( $VNU_ID = FALSE, $echo = TRUE ) {
-		EE_Registry::instance()->load_helper( 'Venue_View' );
-		if($echo){
-			echo EEH_Venue_View::venue_description( $VNU_ID );
+	function espresso_venue_description($VNU_ID = FALSE, $echo = TRUE) {
+		EE_Registry::instance()->load_helper('Venue_View');
+		if ($echo) {
+			echo EEH_Venue_View::venue_description($VNU_ID);
 			return '';
 		}
-		return EEH_Venue_View::venue_description( $VNU_ID );
+		return EEH_Venue_View::venue_description($VNU_ID);
 	}
 }
 
 
-if ( ! function_exists( 'espresso_venue_excerpt' )) {
+if ( ! function_exists('espresso_venue_excerpt')) {
 	/**
 	 *    espresso_venue_excerpt
 	 *
@@ -991,19 +991,19 @@ 
 	 * @param bool $echo
 	 * @return    string
 	 */
-	function espresso_venue_excerpt( $VNU_ID = 0,  $echo = TRUE ) {
-		EE_Registry::instance()->load_helper( 'Venue_View' );
-		if ( $echo ) {
-			echo EEH_Venue_View::venue_excerpt( $VNU_ID,  $echo );
+	function espresso_venue_excerpt($VNU_ID = 0, $echo = TRUE) {
+		EE_Registry::instance()->load_helper('Venue_View');
+		if ($echo) {
+			echo EEH_Venue_View::venue_excerpt($VNU_ID, $echo);
 			return '';
 		}
-		return EEH_Venue_View::venue_excerpt( $VNU_ID,  $echo );
+		return EEH_Venue_View::venue_excerpt($VNU_ID, $echo);
 	}
 }
 
 
 
-if ( ! function_exists( 'espresso_venue_categories' )) {
+if ( ! function_exists('espresso_venue_categories')) {
 	/**
 	 * espresso_venue_categories
 	 * returns the terms associated with a venue
@@ -1013,18 +1013,18 @@ 
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_venue_categories( $VNU_ID = 0, $hide_uncategorized = TRUE,  $echo = TRUE ) {
-		EE_Registry::instance()->load_helper( 'Venue_View' );
-		if ( $echo ) {
-			echo EEH_Venue_View::venue_categories( $VNU_ID, $hide_uncategorized );
+	function espresso_venue_categories($VNU_ID = 0, $hide_uncategorized = TRUE, $echo = TRUE) {
+		EE_Registry::instance()->load_helper('Venue_View');
+		if ($echo) {
+			echo EEH_Venue_View::venue_categories($VNU_ID, $hide_uncategorized);
 			return '';
 		}
-		return EEH_Venue_View::venue_categories( $VNU_ID, $hide_uncategorized );
+		return EEH_Venue_View::venue_categories($VNU_ID, $hide_uncategorized);
 	}
 }
 
 
-if ( ! function_exists( 'espresso_venue_address' )) {
+if ( ! function_exists('espresso_venue_address')) {
 	/**
 	 * espresso_venue_address
 	 * returns a formatted block of html  for displaying a venue's address
@@ -1034,18 +1034,18 @@ 
 	 * @param bool   $echo
 	 * @return string
 	 */
-	function espresso_venue_address( $type = 'multiline', $VNU_ID = 0, $echo = TRUE ) {
-		EE_Registry::instance()->load_helper( 'Venue_View' );
-		if ( $echo ) {
-			echo EEH_Venue_View::venue_address( $type, $VNU_ID );
+	function espresso_venue_address($type = 'multiline', $VNU_ID = 0, $echo = TRUE) {
+		EE_Registry::instance()->load_helper('Venue_View');
+		if ($echo) {
+			echo EEH_Venue_View::venue_address($type, $VNU_ID);
 			return '';
 		}
-		return EEH_Venue_View::venue_address( $type, $VNU_ID );
+		return EEH_Venue_View::venue_address($type, $VNU_ID);
 	}
 }
 
 
-if ( ! function_exists( 'espresso_venue_raw_address' )) {
+if ( ! function_exists('espresso_venue_raw_address')) {
 	/**
 	 * espresso_venue_address
 	 * returns an UN-formatted string containing a venue's address
@@ -1055,18 +1055,18 @@ 
 	 * @param bool     $echo
 	 * @return string
 	 */
-	function espresso_venue_raw_address( $type = 'multiline', $VNU_ID = 0, $echo = TRUE ) {
-		EE_Registry::instance()->load_helper( 'Venue_View' );
-		if ( $echo ) {
-			echo EEH_Venue_View::venue_address( $type, $VNU_ID, FALSE, FALSE );
+	function espresso_venue_raw_address($type = 'multiline', $VNU_ID = 0, $echo = TRUE) {
+		EE_Registry::instance()->load_helper('Venue_View');
+		if ($echo) {
+			echo EEH_Venue_View::venue_address($type, $VNU_ID, FALSE, FALSE);
 			return '';
 		}
-		return EEH_Venue_View::venue_address( $type, $VNU_ID, FALSE, FALSE );
+		return EEH_Venue_View::venue_address($type, $VNU_ID, FALSE, FALSE);
 	}
 }
 
 
-if ( ! function_exists( 'espresso_venue_has_address' )) {
+if ( ! function_exists('espresso_venue_has_address')) {
 	/**
 	 * espresso_venue_has_address
 	 * returns TRUE or FALSE if a Venue has address information
@@ -1074,14 +1074,14 @@ 
 	 * @param int $VNU_ID
 	 * @return bool
 	 */
-	function espresso_venue_has_address( $VNU_ID = 0 ) {
-		EE_Registry::instance()->load_helper( 'Venue_View' );
-		return EEH_Venue_View::venue_has_address( $VNU_ID );
+	function espresso_venue_has_address($VNU_ID = 0) {
+		EE_Registry::instance()->load_helper('Venue_View');
+		return EEH_Venue_View::venue_has_address($VNU_ID);
 	}
 }
 
 
-if ( ! function_exists( 'espresso_venue_gmap' )) {
+if ( ! function_exists('espresso_venue_gmap')) {
 	/**
 	 * espresso_venue_gmap
 	 * returns a google map for the venue address
@@ -1092,18 +1092,18 @@ 
 	 * @param bool     $echo
 	 * @return string
 	 */
-	function espresso_venue_gmap( $VNU_ID = 0, $map_ID = FALSE, $gmap = array(), $echo = TRUE  ) {
-		EE_Registry::instance()->load_helper( 'Venue_View' );
-		if ( $echo ) {
-			echo EEH_Venue_View::venue_gmap( $VNU_ID, $map_ID, $gmap );
+	function espresso_venue_gmap($VNU_ID = 0, $map_ID = FALSE, $gmap = array(), $echo = TRUE) {
+		EE_Registry::instance()->load_helper('Venue_View');
+		if ($echo) {
+			echo EEH_Venue_View::venue_gmap($VNU_ID, $map_ID, $gmap);
 			return '';
 		}
-		return EEH_Venue_View::venue_gmap( $VNU_ID, $map_ID, $gmap );
+		return EEH_Venue_View::venue_gmap($VNU_ID, $map_ID, $gmap);
 	}
 }
 
 
-if ( ! function_exists( 'espresso_venue_phone' )) {
+if ( ! function_exists('espresso_venue_phone')) {
 	/**
 	 * espresso_venue_phone
 	 *
@@ -1111,19 +1111,19 @@ 
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_venue_phone( $VNU_ID = 0, $echo = TRUE ) {
-		EE_Registry::instance()->load_helper( 'Venue_View' );
-		if ( $echo ) {
-			echo EEH_Venue_View::venue_phone( $VNU_ID );
+	function espresso_venue_phone($VNU_ID = 0, $echo = TRUE) {
+		EE_Registry::instance()->load_helper('Venue_View');
+		if ($echo) {
+			echo EEH_Venue_View::venue_phone($VNU_ID);
 			return '';
 		}
-		return EEH_Venue_View::venue_phone( $VNU_ID );
+		return EEH_Venue_View::venue_phone($VNU_ID);
 	}
 }
 
 
 
-if ( ! function_exists( 'espresso_venue_website' )) {
+if ( ! function_exists('espresso_venue_website')) {
 	/**
 	 * espresso_venue_website
 	 *
@@ -1131,19 +1131,19 @@ 
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_venue_website( $VNU_ID = 0, $echo = TRUE ) {
-		EE_Registry::instance()->load_helper( 'Venue_View' );
-		if ( $echo ) {
-			echo EEH_Venue_View::venue_website_link( $VNU_ID );
+	function espresso_venue_website($VNU_ID = 0, $echo = TRUE) {
+		EE_Registry::instance()->load_helper('Venue_View');
+		if ($echo) {
+			echo EEH_Venue_View::venue_website_link($VNU_ID);
 			return '';
 		}
-		return EEH_Venue_View::venue_website_link( $VNU_ID );
+		return EEH_Venue_View::venue_website_link($VNU_ID);
 	}
 }
 
 
 
-if ( ! function_exists( 'espresso_edit_venue_link' )) {
+if ( ! function_exists('espresso_edit_venue_link')) {
 	/**
 	 * espresso_edit_venue_link
 	 *
@@ -1151,13 +1151,13 @@ 
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_edit_venue_link( $VNU_ID = 0, $echo = TRUE ) {
-		EE_Registry::instance()->load_helper( 'Venue_View' );
-		if($echo){
-			echo EEH_Venue_View::edit_venue_link( $VNU_ID );
+	function espresso_edit_venue_link($VNU_ID = 0, $echo = TRUE) {
+		EE_Registry::instance()->load_helper('Venue_View');
+		if ($echo) {
+			echo EEH_Venue_View::edit_venue_link($VNU_ID);
 			return '';
 		}
-		return EEH_Venue_View::edit_venue_link( $VNU_ID );
+		return EEH_Venue_View::edit_venue_link($VNU_ID);
 	}
 }
 

shortcodes/espresso_events/EES_Espresso_Events.shortcode.php

Doc Comments +1 added lines, -1 removed lines

@@ -229,7 +229,7 @@
 	 *
 	 * @access    public
 	 * @param string $event_list_css
-	 * @return    array
+	 * @return    string
 	 */
 	public function event_list_css( $event_list_css = '' ) {
 		$event_list_css .=  ! empty( $event_list_css ) ? ' ' : '';

Spacing +36 added lines, -36 removed lines

@@ -50,12 +50,12 @@ 
 	 * @param WP $WP
 	 * @return    void
 	 */
-	public function run( WP $WP ) {
-		if ( ! did_action( 'pre_get_posts' )) {
+	public function run(WP $WP) {
+		if ( ! did_action('pre_get_posts')) {
 			// this will trigger the EED_Events_Archive module's event_list() method during the pre_get_posts hook point,
 			// this allows us to initialize things, enqueue assets, etc,
 			// as well, this saves an instantiation of the module in an array using 'espresso_events' as the key, so that we can retrieve it
-			add_action( 'pre_get_posts', array( EED_Events_Archive::instance(), 'event_list' ));
+			add_action('pre_get_posts', array(EED_Events_Archive::instance(), 'event_list'));
 		} else {
 			EED_Events_Archive::instance()->event_list();
 		}
@@ -79,13 +79,13 @@ 
 	 *  @param 	array 	$attributes
 	 *  @return 	string
 	 */
-	public function process_shortcode( $attributes = array() ) {
+	public function process_shortcode($attributes = array()) {
 		// make sure EED_Events_Archive is setup properly
-		if ( apply_filters( 'FHEE__fallback_shortcode_processor__EES_Espresso_Events', FALSE )) {
+		if (apply_filters('FHEE__fallback_shortcode_processor__EES_Espresso_Events', FALSE)) {
 			EED_Events_Archive::instance()->event_list();
 		}
 		// merge in any attributes passed via fallback shortcode processor
-		$attributes = array_merge( (array)$attributes, (array)$this->_attributes );
+		$attributes = array_merge((array) $attributes, (array) $this->_attributes);
 		//set default attributes
 		$default_espresso_events_shortcode_atts = array(
 			'title' => NULL,
@@ -99,26 +99,26 @@ 
 			'fallback_shortcode_processor' => FALSE
 		);
 		// allow the defaults to be filtered
-		$default_espresso_events_shortcode_atts = apply_filters( 'EES_Espresso_Events__process_shortcode__default_espresso_events_shortcode_atts', $default_espresso_events_shortcode_atts );
+		$default_espresso_events_shortcode_atts = apply_filters('EES_Espresso_Events__process_shortcode__default_espresso_events_shortcode_atts', $default_espresso_events_shortcode_atts);
 		// grab attributes and merge with defaults, then extract
-		$attributes = array_merge( $default_espresso_events_shortcode_atts, $attributes );
+		$attributes = array_merge($default_espresso_events_shortcode_atts, $attributes);
 		// make sure we use the_excerpt()
-		add_filter( 'FHEE__EES_Espresso_Events__process_shortcode__true', '__return_true' );
+		add_filter('FHEE__EES_Espresso_Events__process_shortcode__true', '__return_true');
 		// apply query filters
-		add_filter( 'FHEE__EEH_Event_Query__apply_query_filters', '__return_true' );
+		add_filter('FHEE__EEH_Event_Query__apply_query_filters', '__return_true');
 		// run the query
 		global $wp_query;
-		$wp_query = new EE_Event_List_Query( $attributes );
+		$wp_query = new EE_Event_List_Query($attributes);
 		// check what template is loaded and load filters accordingly
-		EED_Events_Archive::instance()->template_include( 'loop-espresso_events.php' );
+		EED_Events_Archive::instance()->template_include('loop-espresso_events.php');
 		// load our template
-		$event_list = EEH_Template::locate_template( 'loop-espresso_events.php', array(), TRUE, TRUE );
+		$event_list = EEH_Template::locate_template('loop-espresso_events.php', array(), TRUE, TRUE);
 		// now reset the query and postdata
 		wp_reset_query();
 		wp_reset_postdata();
 		EED_Events_Archive::remove_all_events_archive_filters();
 		// remove query filters
-		remove_filter( 'FHEE__EEH_Event_Query__apply_query_filters', '__return_true' );
+		remove_filter('FHEE__EEH_Event_Query__apply_query_filters', '__return_true');
 		// pull our content from the output buffer and return it
 		return $event_list;
 	}
@@ -163,46 +163,46 @@ 
 	 * @param array $args
 	 * @return \EE_Event_List_Query
 	 */
-	function __construct( $args = array() ) {
+	function __construct($args = array()) {
 //		EEH_Debug_Tools::printr( $args, '$args  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 		// incoming args could be a mix of WP query args + EE shortcode args
-		foreach ( $args as $key =>$value ) {
-			$property = '_' . $key;
+		foreach ($args as $key =>$value) {
+			$property = '_'.$key;
 			// if the arg is a property of this class, then it's an EE shortcode arg
-			if ( property_exists( $this, $property )) {
+			if (property_exists($this, $property)) {
 				// set the property value
 				$this->$property = $value;
 				// then remove it from the array of args that will later be passed to WP_Query()
-				unset( $args[ $key ] );
+				unset($args[$key]);
 			}
 		}
 		// setup the events list query
-		EE_Registry::instance()->load_helper( 'Event_Query' );
+		EE_Registry::instance()->load_helper('Event_Query');
 		//add query filters
 		EEH_Event_Query::add_query_filters();
 		// set params that will get used by the filters
-		EEH_Event_Query::set_query_params( $this->_month, $this->_category_slug, $this->_show_expired, $this->_order_by, $this->_sort );
+		EEH_Event_Query::set_query_params($this->_month, $this->_category_slug, $this->_show_expired, $this->_order_by, $this->_sort);
 		// first off, let's remove any filters from previous queries
-		remove_filter( 'FHEE__archive_espresso_events_template__upcoming_events_h1', array( $this, 'event_list_title' ));
-		remove_all_filters( 'FHEE__content_espresso_events__event_class' );
+		remove_filter('FHEE__archive_espresso_events_template__upcoming_events_h1', array($this, 'event_list_title'));
+		remove_all_filters('FHEE__content_espresso_events__event_class');
 		// Event List Title ?
-		add_filter( 'FHEE__archive_espresso_events_template__upcoming_events_h1', array( $this, 'event_list_title' ), 10, 1 );
+		add_filter('FHEE__archive_espresso_events_template__upcoming_events_h1', array($this, 'event_list_title'), 10, 1);
 		// add the css class
-		add_filter( 'FHEE__content_espresso_events__event_class', array( $this, 'event_list_css' ), 10, 1 );
+		add_filter('FHEE__content_espresso_events__event_class', array($this, 'event_list_css'), 10, 1);
 		// the current "page" we are viewing
-		$paged = max( 1, get_query_var( 'paged' ));
+		$paged = max(1, get_query_var('paged'));
 		// Force these args
-		$args = array_merge( $args, array(
+		$args = array_merge($args, array(
 			'post_type' => 'espresso_events',
 			'posts_per_page' => $this->_limit,
 			'update_post_term_cache' => FALSE,
 			'update_post_meta_cache' => FALSE,
 			'paged' => $paged,
-			'offset' => ( $paged - 1 ) * $this->_limit
+			'offset' => ($paged - 1) * $this->_limit
 		));
 
 		// run the query
-		parent::__construct( $args );
+		parent::__construct($args);
 	}
 
 
@@ -215,8 +215,8 @@ 
 	 * @param string $event_list_title
 	 * @return    string
 	 */
-	public function event_list_title( $event_list_title = '' ) {
-		if ( ! empty( $this->_title )) {
+	public function event_list_title($event_list_title = '') {
+		if ( ! empty($this->_title)) {
 			return $this->_title;
 		}
 		return $event_list_title;
@@ -231,11 +231,11 @@ 
 	 * @param string $event_list_css
 	 * @return    array
 	 */
-	public function event_list_css( $event_list_css = '' ) {
-		$event_list_css .=  ! empty( $event_list_css ) ? ' ' : '';
-		$event_list_css .=  ! empty( $this->_css_class ) ? $this->_css_class : '';
-		$event_list_css .=  ! empty( $event_list_css ) ? ' ' : '';
-		$event_list_css .=  ! empty( $this->_category_slug ) ? $this->_category_slug : '';
+	public function event_list_css($event_list_css = '') {
+		$event_list_css .= ! empty($event_list_css) ? ' ' : '';
+		$event_list_css .= ! empty($this->_css_class) ? $this->_css_class : '';
+		$event_list_css .= ! empty($event_list_css) ? ' ' : '';
+		$event_list_css .= ! empty($this->_category_slug) ? $this->_category_slug : '';
 		return $event_list_css;
 	}
 

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?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
  *

shortcodes/espresso_ticket_selector/EES_Espresso_Ticket_Selector.shortcode.php

Doc Comments +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
 	 * 
 	 *  @access 	public
 	 *  @param		array 	$attributes
-	 *  @return 	void
+	 *  @return 	string
 	 */
 	public function process_shortcode( $attributes = array() ) {
 		extract( $attributes );

Spacing +7 added lines, -7 removed lines

@@ -48,7 +48,7 @@ 
 	 *  @access 	public
 	 *  @return 	void
 	 */
-	public function run( WP $WP ) {
+	public function run(WP $WP) {
 	}
 
 	/**
@@ -58,13 +58,13 @@ 
 	 *  @param		array 	$attributes
 	 *  @return 	void
 	 */
-	public function process_shortcode( $attributes = array() ) {
-		extract( $attributes );
-		$event = EE_Registry::instance()->load_model( 'Event' )->get_one_by_ID( $event_id );
+	public function process_shortcode($attributes = array()) {
+		extract($attributes);
+		$event = EE_Registry::instance()->load_model('Event')->get_one_by_ID($event_id);
 		ob_start();
-		do_action( 'AHEE_event_details_before_post', $event_id );
-		espresso_ticket_selector( $event );	
-		do_action( 'AHEE_event_details_after_post' );
+		do_action('AHEE_event_details_before_post', $event_id);
+		espresso_ticket_selector($event);	
+		do_action('AHEE_event_details_after_post');
 		return ob_get_clean();
 	}
 

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?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
  *

admin_pages/about/About_Admin_Page.core.php

Spacing +25 added lines, -25 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -117,11 +117,11 @@ 
 		//Copied from _whats_new()
 		$steps = EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance ? $this->_get_started_steps() : FALSE;
 		$steps = $steps !== FALSE ? $steps : '';
-		$this->_admin_page_title = sprintf( __('Welcome to Event Espresso %s', 'event_espresso'), EVENT_ESPRESSO_VERSION );
+		$this->_admin_page_title = sprintf(__('Welcome to Event Espresso %s', 'event_espresso'), EVENT_ESPRESSO_VERSION);
 		$settings_message = $steps;
-		$this->_template_args['admin_page_subtitle'] = __('Thank you for choosing Event Espresso, the most powerful, and free, Event Management plugin for WordPress.', 'event_espresso' ) . $settings_message;
-		$template = EE_ABOUT_TEMPLATE_PATH . 'ee4-overview.template.php';
-		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template( $template, $this->_template_args, TRUE );
+		$this->_template_args['admin_page_subtitle'] = __('Thank you for choosing Event Espresso, the most powerful, and free, Event Management plugin for WordPress.', 'event_espresso').$settings_message;
+		$template = EE_ABOUT_TEMPLATE_PATH.'ee4-overview.template.php';
+		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template($template, $this->_template_args, TRUE);
 		$this->display_about_admin_page();
 	}
 
@@ -129,36 +129,36 @@ 
 
 	protected function _get_started_steps() {
 		$steps = '<h3>'.__('Getting Started').'</h3>';
-		$step_one = '<p>'.sprintf( __('%sStep 1%s: Visit your %sOrganization Settings%s and add/update your details.', 'event_espresso'), '<strong>', '</strong>', '<a href="admin.php?page=espresso_general_settings">', '</a>') .'</strong></p>';
-		$step_two = '<p>'.sprintf( __('%sStep 2%s: Setup your %sPayment Methods%s.', 'event_espresso'), '<strong>', '</strong>', '<a href="admin.php?page=espresso_payment_settings">', '</a>') .'</strong></p>';
-		$step_three = '<p>'.sprintf( __('%sStep 3%s: Create your %sFirst Event%s.', 'event_espresso'), '<strong>', '</strong>', '<a href="admin.php?page=espresso_events&action=create_new">', '</a>') .'</strong></p>';
+		$step_one = '<p>'.sprintf(__('%sStep 1%s: Visit your %sOrganization Settings%s and add/update your details.', 'event_espresso'), '<strong>', '</strong>', '<a href="admin.php?page=espresso_general_settings">', '</a>').'</strong></p>';
+		$step_two = '<p>'.sprintf(__('%sStep 2%s: Setup your %sPayment Methods%s.', 'event_espresso'), '<strong>', '</strong>', '<a href="admin.php?page=espresso_payment_settings">', '</a>').'</strong></p>';
+		$step_three = '<p>'.sprintf(__('%sStep 3%s: Create your %sFirst Event%s.', 'event_espresso'), '<strong>', '</strong>', '<a href="admin.php?page=espresso_events&action=create_new">', '</a>').'</strong></p>';
 
 		//done?
 		$done_step_one = EE_Registry::instance()->CFG->organization->address_1 == '123 Onna Road' ? FALSE : TRUE;
-		$active_invoice_pm = EEM_Payment_Method::instance()->get_one_active( EEM_Payment_Method::scope_cart, array( array( 'PMD_type' => 'Invoice' ) ) );
-		$active_pms_count = EEM_Payment_Method::instance()->count_active( EEM_Payment_Method::scope_cart );
+		$active_invoice_pm = EEM_Payment_Method::instance()->get_one_active(EEM_Payment_Method::scope_cart, array(array('PMD_type' => 'Invoice')));
+		$active_pms_count = EEM_Payment_Method::instance()->count_active(EEM_Payment_Method::scope_cart);
 		//done step two if a non-invoice paymetn method is active; or there is more than one PM active, or
 		//if only teh invoice is active but it's clearly been updated
-		$done_step_two = $active_pms_count > 1  ||
-						 ( $active_pms_count === 1 && ! $active_invoice_pm )	||
-						 ( $active_invoice_pm instanceof EE_Payment_Method && (
-								 $active_invoice_pm->get_extra_meta( 'pdf_payee_name', TRUE, '' ) ||
-								 $active_invoice_pm->get_extra_meta( 'pdf_payee_email', TRUE, '' ) ||
-								 $active_invoice_pm->get_extra_meta( 'pdf_payee_tax_number', TRUE, '' ) ||
-								 $active_invoice_pm->get_extra_meta( 'pdf_payee_address', TRUE, '' ) ||
-								 $active_invoice_pm->get_extra_meta( 'page_extra_info', TRUE, '' )
+		$done_step_two = $active_pms_count > 1 ||
+						 ($active_pms_count === 1 && ! $active_invoice_pm) ||
+						 ($active_invoice_pm instanceof EE_Payment_Method && (
+								 $active_invoice_pm->get_extra_meta('pdf_payee_name', TRUE, '') ||
+								 $active_invoice_pm->get_extra_meta('pdf_payee_email', TRUE, '') ||
+								 $active_invoice_pm->get_extra_meta('pdf_payee_tax_number', TRUE, '') ||
+								 $active_invoice_pm->get_extra_meta('pdf_payee_address', TRUE, '') ||
+								 $active_invoice_pm->get_extra_meta('page_extra_info', TRUE, '')
 								)
 				);
 		$done_step_three = EE_Registry::instance()->load_model('Event')->count() > 0 ? TRUE : FALSE;
 
 		//if ALL steps are done, let's just return FALSE so we don't display anything
-		if ( $done_step_one && $done_step_two && $done_step_three )
+		if ($done_step_one && $done_step_two && $done_step_three)
 			return FALSE;
 
 		//now let's put it together
-		$steps .= sprintf( '%s' . $step_one . '%s', $done_step_one ? '<strike>' : '', $done_step_one ? '</strike>': '' );
-		$steps .= sprintf( '%s' . $step_two . '%s', $done_step_two ? '<strike>' : '', $done_step_two ? '</strike>': '' );
-		$steps .= sprintf( '%s' . $step_three . '%s', $done_step_three ? '<strike>' : '', $done_step_three ? '</strike>': '' );
+		$steps .= sprintf('%s'.$step_one.'%s', $done_step_one ? '<strike>' : '', $done_step_one ? '</strike>' : '');
+		$steps .= sprintf('%s'.$step_two.'%s', $done_step_two ? '<strike>' : '', $done_step_two ? '</strike>' : '');
+		$steps .= sprintf('%s'.$step_three.'%s', $done_step_three ? '<strike>' : '', $done_step_three ? '</strike>' : '');
 
 		return $steps;
 	}
@@ -166,10 +166,10 @@ 
 
 
 	protected function _credits() {
-		$this->_template_args['admin_page_title'] = sprintf( __('Welcome to Event Espresso %s', 'event_espresso'), EVENT_ESPRESSO_VERSION );
+		$this->_template_args['admin_page_title'] = sprintf(__('Welcome to Event Espresso %s', 'event_espresso'), EVENT_ESPRESSO_VERSION);
 		$this->_template_args['admin_page_subtitle'] = __('Thank you for choosing Event Espresso Decaf, the most powerful, and free, Event Management plugin for WordPress.', 'event_espresso');
-		$template = EE_ABOUT_TEMPLATE_PATH . 'credits.template.php';
-		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template( $template, $this->_template_args, TRUE );
+		$template = EE_ABOUT_TEMPLATE_PATH.'credits.template.php';
+		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template($template, $this->_template_args, TRUE);
 		$this->display_about_admin_page();
 	}
 

Braces +5 added lines, -3 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  *
@@ -152,8 +153,9 @@ 
 		$done_step_three = EE_Registry::instance()->load_model('Event')->count() > 0 ? TRUE : FALSE;
 
 		//if ALL steps are done, let's just return FALSE so we don't display anything
-		if ( $done_step_one && $done_step_two && $done_step_three )
-			return FALSE;
+		if ( $done_step_one && $done_step_two && $done_step_three ) {
+					return FALSE;
+		}
 
 		//now let's put it together
 		$steps .= sprintf( '%s' . $step_one . '%s', $done_step_one ? '<strike>' : '', $done_step_one ? '</strike>': '' );

admin_pages/about/About_Admin_Page_Init.core.php

Spacing +7 added lines, -7 removed lines

@@ -30,12 +30,12 @@ 
 
 	public function __construct() {
 		//define some events related constants
-		define( 'EE_ABOUT_PG_SLUG', 'espresso_about' );
-		define( 'EE_ABOUT_LABEL', __('About', 'event_espresso'));
-		define( 'EE_ABOUT_ADMIN', EE_ADMIN_PAGES . 'about' . DS );
-		define( 'EE_ABOUT_ADMIN_URL', admin_url( 'admin.php?page=' . EE_ABOUT_PG_SLUG ));
-		define( 'EE_ABOUT_TEMPLATE_PATH', EE_ABOUT_ADMIN . 'templates' . DS );
-		define( 'EE_ABOUT_ASSETS_URL', EE_ADMIN_PAGES_URL . 'about/assets/' );
+		define('EE_ABOUT_PG_SLUG', 'espresso_about');
+		define('EE_ABOUT_LABEL', __('About', 'event_espresso'));
+		define('EE_ABOUT_ADMIN', EE_ADMIN_PAGES.'about'.DS);
+		define('EE_ABOUT_ADMIN_URL', admin_url('admin.php?page='.EE_ABOUT_PG_SLUG));
+		define('EE_ABOUT_TEMPLATE_PATH', EE_ABOUT_ADMIN.'templates'.DS);
+		define('EE_ABOUT_ASSETS_URL', EE_ADMIN_PAGES_URL.'about/assets/');
 		parent::__construct();
 	}
 
@@ -44,7 +44,7 @@ 
 	}
 
 	protected function _set_menu_map() {
-		$this->_menu_map = new EE_Admin_Page_Sub_Menu( array(
+		$this->_menu_map = new EE_Admin_Page_Sub_Menu(array(
 			'menu_group' => 'extras',
 			'menu_order' => 40,
 			'show_on_menu' => EE_Admin_Page_Menu_Map::BLOG_AND_NETWORK_ADMIN,

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?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
  *

admin_pages/about/templates/credits.template.php

Spacing +15 added lines, -15 removed lines

@@ -3,7 +3,7 @@ 
 <ul class="wp-people-group" id="ee-people-group-owners">
 	<li class="wp-person" id="ee-person-sshoultes">
 		<a href="<?php esp_gravatar_profile('seth@eventespresso.com'); ?>">
-			<?php echo esp_gravatar_image( 'seth@eventespresso.com', 'Seth Shoultes' ); ?>
+			<?php echo esp_gravatar_image('seth@eventespresso.com', 'Seth Shoultes'); ?>
 		</a>
 		<a class="web" href="<?php esp_gravatar_profile('seth@eventespresso.com'); ?>">
 			Seth Shoultes
@@ -12,7 +12,7 @@ 
 	</li>
 	<li class="wp-person" id="ee-person-gkoyle">
 		<a href="<?php esp_gravatar_profile('garth@eventespresso.com'); ?>">
-			<?php echo esp_gravatar_image( 'garth@eventespresso.com', 'Garth Koyle' ); ?>
+			<?php echo esp_gravatar_image('garth@eventespresso.com', 'Garth Koyle'); ?>
 		</a>
 		<a class="web" href="<?php esp_gravatar_profile('garth@eventespresso.com'); ?>">
 			Garth Koyle
@@ -24,7 +24,7 @@ 
 <ul class="wp-people-group" id="ee-people-group-core-developers">
 	<li class="wp-person" id="ee-person-bchristensen">
 		<a href="<?php esp_gravatar_profile('brent@eventespresso.com'); ?>">
-			<?php echo esp_gravatar_image( 'brent@eventespresso.com', 'Brent Christensen' ); ?>
+			<?php echo esp_gravatar_image('brent@eventespresso.com', 'Brent Christensen'); ?>
 		</a>
 		<a class="web" href="<?php esp_gravatar_profile('brent@eventespresso.com'); ?>">
 			Brent Christensen
@@ -33,7 +33,7 @@ 
 	</li>
 	<li class="wp-person" id="ee-person-dethier">
 		<a href="<?php esp_gravatar_profile('darren@roughsmootheng.in'); ?>">
-			<?php echo esp_gravatar_image( 'darren@roughsmootheng.in', 'Darren Ethier' ); ?>
+			<?php echo esp_gravatar_image('darren@roughsmootheng.in', 'Darren Ethier'); ?>
 		</a>
 		<a class="web" href="<?php esp_gravatar_profile('darren@roughsmootheng.in'); ?>">
 			Darren Ethier
@@ -42,7 +42,7 @@ 
 	</li>
 	<li class="wp-person" id="ee-person-mnelson">
 		<a href="<?php esp_gravatar_profile('michael@eventespresso.com'); ?>">
-			<?php echo esp_gravatar_image( 'michael@eventespresso.com', 'Michael Nelson' ); ?>
+			<?php echo esp_gravatar_image('michael@eventespresso.com', 'Michael Nelson'); ?>
 		</a>
 		<a class="web" href="<?php esp_gravatar_profile('michael@eventespresso.com'); ?>">
 			Michael Nelson
@@ -51,7 +51,7 @@ 
 	</li>
 	<li class="wp-person" id="ee-person-nkolivoshka">
 		<a href="<?php esp_gravatar_profile('nazar@eventespresso.com'); ?>">
-			<?php echo esp_gravatar_image( 'nazar@eventespresso.com', 'Nazar Kolivoshka' ); ?>
+			<?php echo esp_gravatar_image('nazar@eventespresso.com', 'Nazar Kolivoshka'); ?>
 		</a>
 		<a class="web" href="<?php esp_gravatar_profile('nazar@eventespresso.com'); ?>">
 			Nazar Kolivoshka
@@ -63,7 +63,7 @@ 
 <ul class="wp-people-group" id="ee-people-group-support-staff">
 	<li class="wp-person" id="ee-person-jfeck">
 		<a href="<?php esp_gravatar_profile('josh@eventespresso.com'); ?>">
-			<?php echo esp_gravatar_image( 'josh@eventespresso.com', 'Josh Feck' ); ?>
+			<?php echo esp_gravatar_image('josh@eventespresso.com', 'Josh Feck'); ?>
 		</a>
 		<a class="web" href="<?php esp_gravatar_profile('josh@eventespresso.com'); ?>">
 			Josh Feck
@@ -71,7 +71,7 @@ 
 	</li>
 	<li class="wp-person" id="ee-person-drobinson">
 		<a href="<?php esp_gravatar_profile('dean@eventespresso.com'); ?>">
-			<?php echo esp_gravatar_image( 'dean@eventespresso.com', 'Dean Robinson' ); ?>
+			<?php echo esp_gravatar_image('dean@eventespresso.com', 'Dean Robinson'); ?>
 		</a>
 		<a class="web" href="<?php esp_gravatar_profile('dean@eventespresso.com'); ?>">
 			Dean Robinson
@@ -79,7 +79,7 @@ 
 	</li>
 	<li class="wp-person" id="ee-person-jwilson">
 		<a href="<?php esp_gravatar_profile('jonathan@eventespresso.com'); ?>">
-			<?php echo esp_gravatar_image( 'jonathan@eventespresso.com', 'Jonathan Wilson' ); ?>
+			<?php echo esp_gravatar_image('jonathan@eventespresso.com', 'Jonathan Wilson'); ?>
 		</a>
 		<a class="web" href="<?php esp_gravatar_profile('jonathan@eventespresso.com'); ?>">
 			Jonathan Wilson
@@ -87,7 +87,7 @@ 
 	</li>
 	<li class="wp-person" id="ee-person-twarwick">
 		<a href="<?php esp_gravatar_profile('tony@eventespresso.com'); ?>">
-			<?php echo esp_gravatar_image( 'tony@eventespresso.com', 'Tony Warwick' ); ?>
+			<?php echo esp_gravatar_image('tony@eventespresso.com', 'Tony Warwick'); ?>
 		</a>
 		<a class="web" href="<?php esp_gravatar_profile('tony@eventespresso.com'); ?>">
 			Tony Warwick
@@ -95,7 +95,7 @@ 
 	</li>
 	<li class="wp-person" id="ee-person-lcaum">
 		<a href="<?php esp_gravatar_profile('lorenzo@eventespresso.com'); ?>">
-			<?php echo esp_gravatar_image( 'lorenzo@eventespresso.com', 'Lorenzo Caum' ); ?>
+			<?php echo esp_gravatar_image('lorenzo@eventespresso.com', 'Lorenzo Caum'); ?>
 		</a>
 		<a class="web" href="<?php esp_gravatar_profile('lorenzo@eventespresso.com'); ?>">
 			Lorenzo Caum
@@ -105,7 +105,7 @@ 
 </ul>
 <h4 class="wp-people-group"><?php _e('Contributor Recognition', 'event_espresso'); ?></h4>
 <p class="description">
-	<?php printf( __('For every major release we want to recognize the people who contributed to the release via a GitHub pull request. Want to see your name listed here? %sWhen you submit a pull request that gets included in a major release%s, we\'ll add your name here linked to your GitHub profile.', 'event_espresso'), '<a href="https://github.com/eventespresso/event-espresso-core" title="Contribute to Event Espresso by making a pull request via GitHub">', '</a>' ); ?>
+	<?php printf(__('For every major release we want to recognize the people who contributed to the release via a GitHub pull request. Want to see your name listed here? %sWhen you submit a pull request that gets included in a major release%s, we\'ll add your name here linked to your GitHub profile.', 'event_espresso'), '<a href="https://github.com/eventespresso/event-espresso-core" title="Contribute to Event Espresso by making a pull request via GitHub">', '</a>'); ?>
 </p>
 <p class="wp-credits-list">
 	<ul>
@@ -119,7 +119,7 @@ 
 </p>
 <h4 class="wp-people-group"><?php _e('External Libraries', 'event_espresso'); ?></h4>
 <p class="description">
-	<?php printf( __('Along with the libraries %sincluded with WordPress%s, Event Espresso utilizes the following third party libraries:', 'event_espresso'), '<a href="credits.php">', '</a>' ); ?>
+	<?php printf(__('Along with the libraries %sincluded with WordPress%s, Event Espresso utilizes the following third party libraries:', 'event_espresso'), '<a href="credits.php">', '</a>'); ?>
 </p>
 <p class="wp-credits-list">
 	<a href="http://josscrowcroft.github.io/accounting.js/"><?php _e('accounting.js', 'event_espresso'); ?></a>,
@@ -135,10 +135,10 @@ 
 
 <?php
 	function esp_gravatar_profile($email) {
-		echo 'http://www.gravatar.com/' . md5($email);
+		echo 'http://www.gravatar.com/'.md5($email);
 	}
 
 	function esp_gravatar_image($email, $name) {
-		echo '<img src="http://0.gravatar.com/avatar/' . md5($email) . '?s=60" class="gravatar" alt="' . $name . '"/>';
+		echo '<img src="http://0.gravatar.com/avatar/'.md5($email).'?s=60" class="gravatar" alt="'.$name.'"/>';
 	}
 ?>