eventespresso / event-espresso-core

core/libraries/messages/validators/email/EE_Messages_Email_Registration_Summary_Validator.class.php

Braces +5 added lines, -3 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -49,8 +50,9 @@ 
 			);
 		$this->_MSGR->set_validator_config( $new_config );
 
-		if ( $this->_context != 'admin' )
-			$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		if ( $this->_context != 'admin' ) {
+					$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		}
 
 		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
 	}

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -30,11 +30,11 @@ 
 class EE_Messages_Email_Cancelled_Registration_Validator extends EE_Messages_Validator {
 
 
-	public function __construct( $fields, $context ) {
+	public function __construct($fields, $context) {
 		$this->_m_name = 'email';
 		$this->_mt_name = 'cancelled_registration';
 
-		parent::__construct( $fields, $context );
+		parent::__construct($fields, $context);
 	}
 
 	/**
@@ -46,9 +46,9 @@ 
 			'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list'),
 			'required' => array('[EVENT_LIST]')
 			);
-		$this->_messenger->set_validator_config( $new_config );
+		$this->_messenger->set_validator_config($new_config);
 
-		if ( $this->_context != 'admin' )
+		if ($this->_context != 'admin')
 			$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
 
 		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');

core/libraries/messages/validators/html/EE_Messages_Html_Invoice_Validator.class.php

Spacing +3 added lines, -3 removed lines

@@ -6,7 +6,7 @@ 
  * @package Event Espresso
  * @subpackage messages
  */
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -24,11 +24,11 @@ 
  */
 class EE_Messages_Html_Receipt_Validator extends EE_Messages_Validator {
 
-	public function __construct( $fields, $context ) {
+	public function __construct($fields, $context) {
 		$this->_m_name = 'html';
 		$this->_mt_name = 'receipt';
 
-		parent::__construct( $fields, $context );
+		parent::__construct($fields, $context);
 	}
 
 	/**

Braces +2 added lines, -1 removed lines

@@ -6,8 +6,9 @@
  * @package Event Espresso
  * @subpackage messages
  */
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  *

core/libraries/payment_methods/EE_Gateway.lib.php

Braces +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 		//so in case teh IPN is arriving later, let's try to process an IPN!
 		if($_SERVER['REQUEST_METHOD'] == 'POST'){
 			return $this->handle_ipn($_POST, $transaction );
-		}else{
+		} else{
 			return parent::finalize_payment_for( $transaction );
 		}
 	}

Doc Comments +1 added lines, -1 removed lines

@@ -282,7 +282,7 @@
 	/**
 	 * Gets the first event for this payment (it's possible that it could be for multiple)
 	 * @param EEI_Payment $payment
-	 * @return EEI_Event|null
+	 * @return EE_Event|null
 	 */
 	protected function _get_first_event_for_payment( EEI_Payment $payment ) {
 		$transaction = $payment->transaction();

Spacing +46 added lines, -46 removed lines

@@ -15,7 +15,7 @@ 
  * @subpackage		core/libraries/payment_methods
  * @author			Mike Nelson
  */
-abstract class EE_Gateway{
+abstract class EE_Gateway {
 	/**
 	 * a constant used as a possible value for $_currencies_supported to indicate
 	 * that ALL currencies are supported by this gateway
@@ -93,7 +93,7 @@ 
 	/**
 	 * @return EE_Gateway
 	 */
-	public function __construct(){
+	public function __construct() {
 	}
 
 	/**
@@ -105,9 +105,9 @@ 
 	 * beginning again)
 	 * @return array
 	 */
-	public function __sleep(){
+	public function __sleep() {
 		$properties = get_object_vars($this);
-		unset( $properties[ '_pay_model' ], $properties[ '_pay_log' ] );
+		unset($properties['_pay_model'], $properties['_pay_log']);
 		return array_keys($properties);
 	}
 	/**
@@ -115,7 +115,7 @@ 
 	 * see $_supports_sending_refunds
 	 * @return boolean
 	 */
-	public function supports_sending_refunds(){
+	public function supports_sending_refunds() {
 		return $this->_supports_sending_refunds;
 	}
 	/**
@@ -123,7 +123,7 @@ 
 	 * see $_supports_receiving_refunds
 	 * @return boolean
 	 */
-	public function supports_receiving_refunds(){
+	public function supports_receiving_refunds() {
 		return $this->_supports_receiving_refunds;
 	}
 
@@ -138,7 +138,7 @@ 
 	 * @return EE_Payment for the refund
 	 * @throws EE_Error
 	 */
-	public function do_direct_refund( EE_Payment $payment, $refund_info = null ) {
+	public function do_direct_refund(EE_Payment $payment, $refund_info = null) {
 		return NULL;
 	}
 
@@ -149,8 +149,8 @@ 
 	 * etc
 	 * @param array $settings_array
 	 */
-	public function set_settings($settings_array){
-		foreach($settings_array as $name => $value){
+	public function set_settings($settings_array) {
+		foreach ($settings_array as $name => $value) {
 			$property_name = "_".$name;
 			$this->{$property_name} = $value;
 		}
@@ -159,14 +159,14 @@ 
 	 * See this class description
 	 * @param EEMI_Payment $payment_model
 	 */
-	public function set_payment_model($payment_model){
+	public function set_payment_model($payment_model) {
 		$this->_pay_model = $payment_model;
 	}
 	/**
 	 * See this class description
 	 * @param EEMI_Payment_Log $payment_log_model
 	 */
-	public function set_payment_log($payment_log_model){
+	public function set_payment_log($payment_log_model) {
 		$this->_pay_log = $payment_log_model;
 	}
 
@@ -174,7 +174,7 @@ 
 	 * See this class description
 	 * @param EEHI_Template $template_helper
 	 */
-	public function set_template_helper($template_helper){
+	public function set_template_helper($template_helper) {
 		$this->_template = $template_helper;
 	}
 
@@ -182,7 +182,7 @@ 
 	 * See this class description
 	 * @param EEHI_Line_Item $line_item_helper
 	 */
-	public function set_line_item_helper( $line_item_helper ){
+	public function set_line_item_helper($line_item_helper) {
 		$this->_line_item = $line_item_helper;
 	}
 
@@ -190,7 +190,7 @@ 
 	 * See this class description
 	 * @param EEHI_Money $money_helper
 	 */
-	public function set_money_helper( $money_helper ){
+	public function set_money_helper($money_helper) {
 		$this->_money = $money_helper;
 	}
 
@@ -199,23 +199,23 @@ 
 	 * @param $message
 	 * @param $payment
 	 */
-	public function log($message,$payment){
-		if($payment instanceof EEI_Payment){
-			$type='Payment';
+	public function log($message, $payment) {
+		if ($payment instanceof EEI_Payment) {
+			$type = 'Payment';
 			$id = $payment->ID();
-		}else{
+		} else {
 			$type = 'Payment_Method';
 			$id = $this->_ID;
 		}
-		$this->_pay_log->gateway_log($message,$id,$type);
+		$this->_pay_log->gateway_log($message, $id, $type);
 	}
 	/**
 	 * Formats the amount so it can generally be sent to gateways
 	 * @param float $amount
 	 * @return string
 	 */
-	public function format_currency($amount){
-		return number_format( $amount, 2, '.', '' );
+	public function format_currency($amount) {
+		return number_format($amount, 2, '.', '');
 //		return $this->_template->format_currency($amount, true);
 	}
 
@@ -224,7 +224,7 @@ 
 	 * or a string indicating they're all supported (EE_gateway::all_currencies_supported)
 	 * @return mixed array or string
 	 */
-	public function currencies_supported(){
+	public function currencies_supported() {
 		return $this->_currencies_supported;
 	}
 
@@ -236,14 +236,14 @@ 
 	 * @param EE_Transaction  $transaction
 	 * @return float
 	 */
-	protected function _sum_items_and_taxes( EE_Transaction  $transaction){
+	protected function _sum_items_and_taxes(EE_Transaction  $transaction) {
 		$total_line_item = $transaction->total_line_item();
 		$total = 0;
-		foreach($total_line_item->get_items() as $item_line_item ){
-			$total += max( $item_line_item->total(), 0 );
+		foreach ($total_line_item->get_items() as $item_line_item) {
+			$total += max($item_line_item->total(), 0);
 		}
-		foreach($total_line_item->tax_descendants() as $tax_line_item ){
-			$total += max( $tax_line_item->total(), 0 );
+		foreach ($total_line_item->tax_descendants() as $tax_line_item) {
+			$total += max($tax_line_item->total(), 0);
 		}
 		return $total;
 	}
@@ -254,9 +254,9 @@ 
 	 * @param EEI_Payment $payment
 	 * @return boolean
 	 */
-	protected function _can_easily_itemize_transaction_for( EEI_Payment $payment ){
+	protected function _can_easily_itemize_transaction_for(EEI_Payment $payment) {
 		return  $this->_money->compare_floats(
-					$this->_sum_items_and_taxes( $payment->transaction() ),
+					$this->_sum_items_and_taxes($payment->transaction()),
 					$payment->transaction()->total() ) &&
 				$this->_money->compare_floats(
 					$payment->amount(),
@@ -274,7 +274,7 @@ 
 	 * @param EE_Payment $payment
 	 * @return void
 	 */
-	public function update_txn_based_on_payment( $payment ){
+	public function update_txn_based_on_payment($payment) {
 		//maybe update the transaction or line items or registrations
 		//but most gateways don't need to do this, because they only update the payment
 	}
@@ -284,11 +284,11 @@ 
 	 * @param EEI_Payment $payment
 	 * @return EEI_Event|null
 	 */
-	protected function _get_first_event_for_payment( EEI_Payment $payment ) {
+	protected function _get_first_event_for_payment(EEI_Payment $payment) {
 		$transaction = $payment->transaction();
-		if( $transaction instanceof EEI_Transaction ) {
+		if ($transaction instanceof EEI_Transaction) {
 			$primary_registrant = $transaction->primary_registration();
-			if( $primary_registrant instanceof EE_Registration ) {
+			if ($primary_registrant instanceof EE_Registration) {
 				return $primary_registrant->event_obj();
 			}
 		}
@@ -300,19 +300,19 @@ 
 	 * @param EEI_Payment $payment
 	 * @return string
 	 */
-	protected function _get_first_event_name_for_payment( EEI_Payment $payment ) {
-		$event = $this->_get_first_event_for_payment( $payment );
-		return $event instanceof EEI_Event ? $event->name() : __( 'Event', 'event_espresso' );
+	protected function _get_first_event_name_for_payment(EEI_Payment $payment) {
+		$event = $this->_get_first_event_for_payment($payment);
+		return $event instanceof EEI_Event ? $event->name() : __('Event', 'event_espresso');
 	}
 	/**
 	 * Gets the text to use for a gateway's line item name when this is a partial payment
 	 * @param EE_Payment $payment
 	 * @return string
 	 */
-	protected function _format_partial_payment_line_item_name( EEI_Payment $payment ){
+	protected function _format_partial_payment_line_item_name(EEI_Payment $payment) {
 		return apply_filters( 
 			'EEG_Paypal_Pro__do_direct_payment__partial_amount_line_item_name', 
-			$this->_get_first_event_name_for_payment( $payment ), 
+			$this->_get_first_event_name_for_payment($payment), 
 			$this,
 			$payment
 		);
@@ -322,13 +322,13 @@ 
 	 * @param EEI_Payment $payment
 	 * @return string
 	 */
-	protected function _format_partial_payment_line_item_desc( EEI_Payment $payment ) {
+	protected function _format_partial_payment_line_item_desc(EEI_Payment $payment) {
 		return apply_filters(
 			'FHEE__EE_Gateway___partial_payment_desc',
 			sprintf(
 				__("Payment of %s for %s", "event_espresso"), 
-				$payment->get_pretty( 'PAY_amount', 'no_currency_code' ), 
-				$this->_get_first_event_name_for_payment( $payment ) ),
+				$payment->get_pretty('PAY_amount', 'no_currency_code'), 
+				$this->_get_first_event_name_for_payment($payment) ),
 			$this,
 			$payment
 		);
@@ -340,10 +340,10 @@ 
 	 * @param EEI_Payment $payment
 	 * @return string
 	 */
-	protected function _format_line_item_name( EEI_Line_Item $line_item, EEI_Payment $payment ) {
+	protected function _format_line_item_name(EEI_Line_Item $line_item, EEI_Payment $payment) {
 		return apply_filters( 
 			'FHEE__EE_gateway___line_item_name', 
-			sprintf( _x( '%1$s for %2$s', 'Ticket for Event', 'event_espresso' ), $line_item->name(), $line_item->ticket_event_name() ), 
+			sprintf(_x('%1$s for %2$s', 'Ticket for Event', 'event_espresso'), $line_item->name(), $line_item->ticket_event_name()), 
 			$this,
 			$line_item, 
 			$payment 
@@ -356,7 +356,7 @@ 
 	 * @param EEI_Payment $payment
 	 * @return string
 	 */
-	protected function _format_line_item_desc( EEI_Line_Item $line_item, EEI_Payment $payment ) {
+	protected function _format_line_item_desc(EEI_Line_Item $line_item, EEI_Payment $payment) {
 		return apply_filters( 
 			'FHEE__EE_Gateway___line_item_desc', 
 			$line_item->desc(), 
@@ -371,13 +371,13 @@ 
 	 * @param EEI_Payment $payment
 	 * @return type
 	 */
-	protected function _format_order_description( EEI_Payment $payment ) {
+	protected function _format_order_description(EEI_Payment $payment) {
 		return apply_filters( 
 			'FHEE__EE_Gateway___order_description',
 			sprintf(
 				__('Event Registrations from %1$s for %2$s', "event_espresso"),
 				get_bloginfo('name'),
-				$this->_get_first_event_name_for_payment( $payment ) ),
+				$this->_get_first_event_name_for_payment($payment) ),
 			$this,
 			$payment
 		);

core/libraries/shortcodes/EE_Attendee_Shortcodes.lib.php

Braces +2 added lines, -1 removed lines

@@ -6,8 +6,9 @@
  * @package Event Espresso
  * @subpackage messages
  */
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  *

Indentation +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 
 	/**
 	 * EE_Attendee_Shortcodes constructor.
-	*/
+	 */
 	public function __construct() {
 		parent::__construct();
 	}

Spacing +36 added lines, -36 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -49,26 +49,26 @@ 
 
 
 	protected function _init_props() {
-		$this->label = esc_html__( 'Attendee Shortcodes', 'event_espresso' );
-		$this->description = esc_html__( 'All shortcodes specific to attendee related data', 'event_espresso' );
+		$this->label = esc_html__('Attendee Shortcodes', 'event_espresso');
+		$this->description = esc_html__('All shortcodes specific to attendee related data', 'event_espresso');
 		$this->_shortcodes = array(
-			'[FNAME]' => esc_html__( 'First Name of an attendee.', 'event_espresso' ),
-			'[LNAME]' => esc_html__( 'Last Name of an attendee.', 'event_espresso' ),
-			'[ATTENDEE_EMAIL]' => esc_html__( 'Email address for the attendee.', 'event_espresso' ),
-			'[EDIT_ATTENDEE_LINK]' => esc_html__( 'Edit Registration Link (typically you\'d only use this for messages going to event administrators)', 'event_espresso' ),
-			'[REGISTRATION_ID]' => esc_html__( 'Unique Registration ID for the registration', 'event_espresso' ),
-			'[REGISTRATION_CODE]' => esc_html__( 'Unique Registration Code for the registration', 'event_espresso' ),
-			'[REGISTRATION_STATUS_ID]' => esc_html__( 'Parses to the registration status for the attendee', 'event_espresso' ),
-			'[REGISTRATION_STATUS_LABEL]' => esc_html__( 'Parses to the status label for the registrant', 'event_espresso' ),
-			'[REGISTRATION_TOTAL_AMOUNT_PAID]' => esc_html__( 'Parses to the total amount paid for this registration.', 'event_espresso' ),
-			'[FRONTEND_EDIT_REG_LINK]' => esc_html__( 'Generates a link for the given registration to edit this registration details on the frontend.', 'event_espresso' ),
-			'[PHONE_NUMBER]' => esc_html__( 'The Phone Number for the Registration.', 'event_espresso' ),
-			'[ADDRESS]' => esc_html__( 'The Address for the Registration', 'event_espresso' ),
-			'[ADDRESS2]' => esc_html__( 'Whatever was in the address 2 field for the registration.', 'event_espresso' ),
-			'[CITY]' => esc_html__( 'The city for the registration.', 'event_espresso' ),
-			'[ZIP_PC]' => esc_html__( 'The ZIP (or Postal) Code for the Registration.', 'event_espresso' ),
-			'[ADDRESS_STATE]' => esc_html__( 'The state/province for the registration.', 'event_espresso' ),
-			'[COUNTRY]' => esc_html__( 'The country for the registration.', 'event_espresso' )
+			'[FNAME]' => esc_html__('First Name of an attendee.', 'event_espresso'),
+			'[LNAME]' => esc_html__('Last Name of an attendee.', 'event_espresso'),
+			'[ATTENDEE_EMAIL]' => esc_html__('Email address for the attendee.', 'event_espresso'),
+			'[EDIT_ATTENDEE_LINK]' => esc_html__('Edit Registration Link (typically you\'d only use this for messages going to event administrators)', 'event_espresso'),
+			'[REGISTRATION_ID]' => esc_html__('Unique Registration ID for the registration', 'event_espresso'),
+			'[REGISTRATION_CODE]' => esc_html__('Unique Registration Code for the registration', 'event_espresso'),
+			'[REGISTRATION_STATUS_ID]' => esc_html__('Parses to the registration status for the attendee', 'event_espresso'),
+			'[REGISTRATION_STATUS_LABEL]' => esc_html__('Parses to the status label for the registrant', 'event_espresso'),
+			'[REGISTRATION_TOTAL_AMOUNT_PAID]' => esc_html__('Parses to the total amount paid for this registration.', 'event_espresso'),
+			'[FRONTEND_EDIT_REG_LINK]' => esc_html__('Generates a link for the given registration to edit this registration details on the frontend.', 'event_espresso'),
+			'[PHONE_NUMBER]' => esc_html__('The Phone Number for the Registration.', 'event_espresso'),
+			'[ADDRESS]' => esc_html__('The Address for the Registration', 'event_espresso'),
+			'[ADDRESS2]' => esc_html__('Whatever was in the address 2 field for the registration.', 'event_espresso'),
+			'[CITY]' => esc_html__('The city for the registration.', 'event_espresso'),
+			'[ZIP_PC]' => esc_html__('The ZIP (or Postal) Code for the Registration.', 'event_espresso'),
+			'[ADDRESS_STATE]' => esc_html__('The state/province for the registration.', 'event_espresso'),
+			'[COUNTRY]' => esc_html__('The country for the registration.', 'event_espresso')
 			);
 	}
 
@@ -82,10 +82,10 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 
 
-		$this->_xtra = ! empty( $this->_extra_data ) && $this->_extra_data['data'] instanceof EE_Messages_Addressee
+		$this->_xtra = ! empty($this->_extra_data) && $this->_extra_data['data'] instanceof EE_Messages_Addressee
 			? $this->_extra_data['data']
 			: null;
 
@@ -94,34 +94,34 @@ 
 			? null
 			: $this->_data;
 
-		if ( ! $registration instanceof EE_Registration ) {
+		if ( ! $registration instanceof EE_Registration) {
 			//let's attempt to get the txn_id for the error message.
-			$txn_id = isset( $this->_xtra->txn ) && $this->_xtra->txn instanceof EE_Transaction
+			$txn_id = isset($this->_xtra->txn) && $this->_xtra->txn instanceof EE_Transaction
 				? $this->_xtra->txn->ID()
-				: esc_html__( 'Unknown', 'event_espresso' );
-			$msg = esc_html__( 'There is no EE_Registration object in the data sent to the EE_Attendee Shortcode Parser for the messages system.', 'event_espresso' );
+				: esc_html__('Unknown', 'event_espresso');
+			$msg = esc_html__('There is no EE_Registration object in the data sent to the EE_Attendee Shortcode Parser for the messages system.', 'event_espresso');
 			$dev_msg = sprintf(
-				esc_html__( 'The transaction ID for this request is: %s', 'event_espresso' ),
+				esc_html__('The transaction ID for this request is: %s', 'event_espresso'),
 				$txn_id
 			);
-			throw new EE_Error( "{$msg}||{$msg} {$dev_msg}" );
+			throw new EE_Error("{$msg}||{$msg} {$dev_msg}");
 		}
 
 		//attendee obj for this registration
-		$attendee = isset( $this->_xtra->registrations[ $registration->ID() ]['att_obj'] )
-			?  $this->_xtra->registrations[ $registration->ID() ]['att_obj']
-			: null ;
+		$attendee = isset($this->_xtra->registrations[$registration->ID()]['att_obj'])
+			? $this->_xtra->registrations[$registration->ID()]['att_obj']
+			: null;
 
-		if ( ! $attendee instanceof EE_Attendee ) {
-			$msg = esc_html__( 'There is no EE_Attendee object in the data sent to the EE_Attendee_Shortcode parser for the messages system.', 'event_espresso' );
+		if ( ! $attendee instanceof EE_Attendee) {
+			$msg = esc_html__('There is no EE_Attendee object in the data sent to the EE_Attendee_Shortcode parser for the messages system.', 'event_espresso');
 			$dev_msg = sprintf(
-				esc_html__( 'The registration ID for this request is: %s', 'event_espresso' ),
+				esc_html__('The registration ID for this request is: %s', 'event_espresso'),
 				$registration->ID()
 			);
-			throw new EE_Error( "{$msg}||{$msg} {$dev_msg}" );
+			throw new EE_Error("{$msg}||{$msg} {$dev_msg}");
 		}
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 
 			case '[FNAME]' :
 				return $attendee->fname();

core/libraries/shortcodes/EE_Datetime_Shortcodes.lib.php

Braces +2 added lines, -1 removed lines

@@ -6,8 +6,9 @@
  * @package Event Espresso
  * @subpackage messages
  */
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  *

Spacing +13 added lines, -13 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -61,13 +61,13 @@ 
 	 * @param string $shortcode
 	 * @return string
 	 */
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 
-		if ( ! $this->_data instanceof EE_Datetime ) {
+		if ( ! $this->_data instanceof EE_Datetime) {
 			return ''; //get out cause we can only parse with the datetime object.
 		}
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 
 			case '[DATETIME_START]' :
 				return $this->_data->get_i18n_datetime('DTT_EVT_start');
@@ -81,27 +81,27 @@ 
 				return $this->_data->get_timezone();
 				break;
 			case '[DATE_START]' :
-				return $this->_data->get_i18n_datetime( 'DTT_EVT_start', get_option( 'date_format' ) );
+				return $this->_data->get_i18n_datetime('DTT_EVT_start', get_option('date_format'));
 				break;
 			case '[DATE_END]' :
-				return $this->_data->get_i18n_datetime( 'DTT_EVT_end', get_option( 'date_format' ) );
+				return $this->_data->get_i18n_datetime('DTT_EVT_end', get_option('date_format'));
 				break;
 			case '[TIME_START]' :
-				return $this->_data->get_i18n_datetime( 'DTT_EVT_start', get_option( 'time_format' ) );
+				return $this->_data->get_i18n_datetime('DTT_EVT_start', get_option('time_format'));
 				break;
 			case '[TIME_END]' :
-				return $this->_data->get_i18n_datetime( 'DTT_EVT_end', get_option( 'time_format' ) );
+				return $this->_data->get_i18n_datetime('DTT_EVT_end', get_option('time_format'));
 				break;
 		}
 
-		if ( strpos( $shortcode, '[ICAL_LINK_*') !== FALSE  ) {
-			$attrs = $this->_get_shortcode_attrs( $shortcode );
+		if (strpos($shortcode, '[ICAL_LINK_*') !== FALSE) {
+			$attrs = $this->_get_shortcode_attrs($shortcode);
 			
-			$link_text = empty( $attrs['link_text'] ) ?  __( 'Add to iCal Calendar', 'event_espresso' ) : $attrs['link_text'];
+			$link_text = empty($attrs['link_text']) ? __('Add to iCal Calendar', 'event_espresso') : $attrs['link_text'];
 			
-			$URL = add_query_arg( array( 'ee' => 'download_ics_file', 'ics_id' => $this->_data->ID() ), site_url() );
+			$URL = add_query_arg(array('ee' => 'download_ics_file', 'ics_id' => $this->_data->ID()), site_url());
 		
-			return '<a class="ee-ical" href="' . $URL . '">' . $link_text . '</a>';
+			return '<a class="ee-ical" href="'.$URL.'">'.$link_text.'</a>';
 			
 		}
 

core/libraries/shortcodes/EE_Organization_Shortcodes.lib.php

Braces +2 added lines, -1 removed lines

@@ -6,8 +6,9 @@
  * @package Event Espresso
  * @subpackage messages
  */
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  *

Spacing +25 added lines, -25 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -58,96 +58,96 @@ 
 			'[CO_GOOGLE_URL]' => esc_html__('Link to organization Google page', 'event_espresso'),
 			'[CO_LINKEDIN_URL]' => esc_html__('Link to organization LinkedIn page', 'event_espresso'),
 			'[CO_INSTAGRAM_URL]' => esc_html__('Link to organization Instagram page', 'event_espresso'),
-			'[CO_TAX_NUMBER_*]' => sprintf( esc_html__('This is the shortcode used for displaying any tax number for the company.  %1$sNote: This is a special dynamic shortcode.%2$s You can use the "prefix" parameter to indicate what the prefix for this tax number is.  It defaults to "VAT/Tax Number:".  To change this prefix you do the following format for this shortcode:  [CO_TAX_NUMBER_* prefix="GST: "] and that will output: GST: 12345t56.  Also take note that if you have NO number in your settings, the prefix is not output either.', 'event_espresso' ),'<strong>','</strong>')
+			'[CO_TAX_NUMBER_*]' => sprintf(esc_html__('This is the shortcode used for displaying any tax number for the company.  %1$sNote: This is a special dynamic shortcode.%2$s You can use the "prefix" parameter to indicate what the prefix for this tax number is.  It defaults to "VAT/Tax Number:".  To change this prefix you do the following format for this shortcode:  [CO_TAX_NUMBER_* prefix="GST: "] and that will output: GST: 12345t56.  Also take note that if you have NO number in your settings, the prefix is not output either.', 'event_espresso'), '<strong>', '</strong>')
 			);
 	}
 
 
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 
 			case '[COMPANY]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'name' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('name');
 				break;
 
 			case '[CO_ADD1]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'address_1' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('address_1');
 				break;
 
 			case '[CO_ADD2]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'address_2' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('address_2');
 				break;
 
 			case '[CO_CITY]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'city' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('city');
 				break;
 
 			case '[CO_STATE]' :
-				$state = EE_Registry::instance()->load_model( 'State' )->get_one_by_ID( EE_Registry::instance()->CFG->organization->STA_ID );
+				$state = EE_Registry::instance()->load_model('State')->get_one_by_ID(EE_Registry::instance()->CFG->organization->STA_ID);
 				return $state->name();
 				break;
 
 			case '[CO_ZIP]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'zip' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('zip');
 				break;
 
 			case '[CO_EMAIL]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'email' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('email');
 				break;
 
 			case '[CO_PHONE]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'phone' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('phone');
 				break;
 
 			case '[CO_LOGO]' :
-				return '<img src="' . EE_Registry::instance()->CFG->organization->get_pretty( 'logo_url' ) . '" id="headerImage" />';
+				return '<img src="'.EE_Registry::instance()->CFG->organization->get_pretty('logo_url').'" id="headerImage" />';
 				break;
 
 			case '[CO_LOGO_URL]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'logo_url' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('logo_url');
 				break;
 
 			case '[CO_FACEBOOK_URL]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'facebook' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('facebook');
 				break;
 
 			case '[CO_TWITTER_URL]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'twitter' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('twitter');
 				break;
 
 			case '[CO_PINTEREST_URL]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'pinterest' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('pinterest');
 				break;
 
 			case '[CO_LINKEDIN_URL]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'linkedin' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('linkedin');
 				break;
 
 			case '[CO_GOOGLE_URL]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'google' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('google');
 				break;
 
 			case '[CO_INSTAGRAM_URL]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'instagram' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('instagram');
 				break;
 
 		}
 
 		//also allow for parameter shortcode
-		if ( strpos( $shortcode, '[CO_TAX_NUMBER_*' ) !== FALSE ) {
+		if (strpos($shortcode, '[CO_TAX_NUMBER_*') !== FALSE) {
 			//first see if there is any company tax number set and bail early if not
 			$tax_number = EE_Registry::instance()->CFG->organization->vat;
-			if ( empty( $tax_number ) ) {
+			if (empty($tax_number)) {
 				return '';
 			}
 
 			//see if there are any attributes.
-			$attrs = $this->_get_shortcode_attrs( $shortcode );
+			$attrs = $this->_get_shortcode_attrs($shortcode);
 
 			//set custom attrs if present (or default)
-			$prefix = isset( $attrs['prefix'] ) ? $attrs['prefix'] : esc_html__('VAT/Tax Number: ', 'event_espresso');
-			return $prefix . $tax_number;
+			$prefix = isset($attrs['prefix']) ? $attrs['prefix'] : esc_html__('VAT/Tax Number: ', 'event_espresso');
+			return $prefix.$tax_number;
 		}
 
 		return '';

modules/event_single/EED_Event_Single.module.php

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 +75 added lines, -75 removed lines

@@ -40,7 +40,7 @@ 
 	 * @return EED_Event_Single
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -52,9 +52,9 @@ 
 	 *  @return 	void
 	 */
 	public static function set_hooks() {
-		add_filter( 'FHEE_run_EE_wp', '__return_true' );
-		add_action( 'wp_loaded', array( 'EED_Event_Single', 'set_definitions' ), 2 );
-		EE_Config::register_route( __( 'event', 'event_espresso' ), 'Event_Single', 'run' );
+		add_filter('FHEE_run_EE_wp', '__return_true');
+		add_action('wp_loaded', array('EED_Event_Single', 'set_definitions'), 2);
+		EE_Config::register_route(__('event', 'event_espresso'), 'Event_Single', 'run');
 	}
 
 	/**
@@ -64,7 +64,7 @@ 
 	 *  @return 	void
 	 */
 	public static function set_hooks_admin() {
-		add_action( 'wp_loaded', array( 'EED_Event_Single', 'set_definitions' ), 2 );
+		add_action('wp_loaded', array('EED_Event_Single', 'set_definitions'), 2);
 	}
 
 
@@ -78,8 +78,8 @@ 
 	 * @return void
 	 */
 	public static function set_definitions() {
-		define( 'EVENT_SINGLE_ASSETS_URL', plugin_dir_url( __FILE__ ) . 'assets' . DS );
-		define( 'EVENT_SINGLE_TEMPLATES_PATH', plugin_dir_path( __FILE__ ) . 'templates' . DS );
+		define('EVENT_SINGLE_ASSETS_URL', plugin_dir_url(__FILE__).'assets'.DS);
+		define('EVENT_SINGLE_TEMPLATES_PATH', plugin_dir_path(__FILE__).'templates'.DS);
 	}
 
 
@@ -89,10 +89,10 @@ 
 	 *
 	 * @void
 	 */
-	protected function set_config(){
-		$this->set_config_section( 'template_settings' );
-		$this->set_config_class( 'EE_Event_Single_Config' );
-		$this->set_config_name( 'EED_Event_Single' );
+	protected function set_config() {
+		$this->set_config_section('template_settings');
+		$this->set_config_class('EE_Event_Single_Config');
+		$this->set_config_name('EED_Event_Single');
 	}
 
 
@@ -105,35 +105,35 @@ 
 	 * @param \EE_Event_Single_Config $config
 	 * @return \EE_Template_Part_Manager
 	 */
-	public function initialize_template_parts( EE_Event_Single_Config $config = null ) {
+	public function initialize_template_parts(EE_Event_Single_Config $config = null) {
 		$config = $config instanceof EE_Event_Single_Config ? $config : $this->config();
 		EEH_Autoloader::instance()->register_template_part_autoloaders();
 		$template_parts = new EE_Template_Part_Manager();
 		$template_parts->add_template_part(
 			'tickets',
-			__( 'Ticket Selector', 'event_espresso' ),
+			__('Ticket Selector', 'event_espresso'),
 			'content-espresso_events-tickets.php',
 			$config->display_order_tickets
 		);
 		$template_parts->add_template_part(
 			'datetimes',
-			__( 'Dates and Times', 'event_espresso' ),
+			__('Dates and Times', 'event_espresso'),
 			'content-espresso_events-datetimes.php',
 			$config->display_order_datetimes
 		);
 		$template_parts->add_template_part(
 			'event',
-			__( 'Event Description', 'event_espresso' ),
+			__('Event Description', 'event_espresso'),
 			'content-espresso_events-details.php',
 			$config->display_order_event
 		);
 		$template_parts->add_template_part(
 			'venue',
-			__( 'Venue Information', 'event_espresso' ),
+			__('Venue Information', 'event_espresso'),
 			'content-espresso_events-venues.php',
 			$config->display_order_venue
 		);
-		do_action( 'AHEE__EED_Event_Single__initialize_template_parts', $template_parts );
+		do_action('AHEE__EED_Event_Single__initialize_template_parts', $template_parts);
 		return $template_parts;
 	}
 
@@ -147,14 +147,14 @@ 
 	 * @param WP $WP
 	 * @return    void
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
 		// ensure valid EE_Events_Single_Config() object exists
 		$this->set_config();
 		// check what template is loaded
-		add_filter( 'template_include',  array( $this, 'template_include' ), 999, 1 );
-		add_filter( 'FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', '__return_true' );
+		add_filter('template_include', array($this, 'template_include'), 999, 1);
+		add_filter('FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', '__return_true');
 		// load css
-		add_action('wp_enqueue_scripts', array( $this, 'wp_enqueue_scripts' ), 10 );
+		add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 10);
 	}
 
 
@@ -166,27 +166,27 @@ 
 	 * @param 	string $template
 	 * @return 	string
 	 */
-	public function template_include( $template ) {
+	public function template_include($template) {
 		global $post;
 		/** @type EE_Event_Single_Config $config */
 		$config = $this->config();
-		if ( $config->display_status_banner_single ) {
-			add_filter( 'the_title', array( 'EED_Event_Single', 'the_title' ), 100, 2 );
+		if ($config->display_status_banner_single) {
+			add_filter('the_title', array('EED_Event_Single', 'the_title'), 100, 2);
 		}
 		// not a custom template?
 		if (
-			EE_Registry::instance()->load_core( 'Front_Controller', array(), false, true )->get_selected_template() != 'single-espresso_events.php'
-			|| apply_filters( 'FHEE__EED_Event_Single__template_include__allow_custom_selected_template', FALSE )
-			&& ! post_password_required( $post )
+			EE_Registry::instance()->load_core('Front_Controller', array(), false, true)->get_selected_template() != 'single-espresso_events.php'
+			|| apply_filters('FHEE__EED_Event_Single__template_include__allow_custom_selected_template', FALSE)
+			&& ! post_password_required($post)
 		) {
 			EEH_Template::load_espresso_theme_functions();
 			// then add extra event data via hooks
-			add_action( 'loop_start', array( 'EED_Event_Single', 'loop_start' ));
-			add_filter( 'get_the_excerpt', array( 'EED_Event_Single', 'get_the_excerpt' ), 1, 1 );
-			add_filter( 'the_content', array( 'EED_Event_Single', 'event_details' ), 100 );
-			add_action( 'loop_end', array( 'EED_Event_Single', 'loop_end' ));
+			add_action('loop_start', array('EED_Event_Single', 'loop_start'));
+			add_filter('get_the_excerpt', array('EED_Event_Single', 'get_the_excerpt'), 1, 1);
+			add_filter('the_content', array('EED_Event_Single', 'event_details'), 100);
+			add_action('loop_end', array('EED_Event_Single', 'loop_end'));
 			// don't display entry meta because the existing theme will take car of that
-			add_filter( 'FHEE__content_espresso_events_details_template__display_entry_meta', '__return_false' );
+			add_filter('FHEE__content_espresso_events_details_template__display_entry_meta', '__return_false');
 		}
 		return $template;
 	}
@@ -200,9 +200,9 @@ 
 	 * @param 	array $wp_query_array an array containing the WP_Query object
 	 * @return 	void
 	 */
-	public static function loop_start( $wp_query_array ) {
+	public static function loop_start($wp_query_array) {
 		global $post;
-		do_action( 'AHEE_event_details_before_post', $post, $wp_query_array );
+		do_action('AHEE_event_details_before_post', $post, $wp_query_array);
 	}
 
 
@@ -215,9 +215,9 @@ 
 	 * @param 	int 	$id
 	 * @return 	string
 	 */
-	public static function the_title( $title = '', $id = 0 ) {
+	public static function the_title($title = '', $id = 0) {
 		global $post;
-		return in_the_loop() && $post->ID == $id ? espresso_event_status_banner( $post->ID ) . $title :  $title;
+		return in_the_loop() && $post->ID == $id ? espresso_event_status_banner($post->ID).$title : $title;
 	}
 
 
@@ -229,9 +229,9 @@ 
 	 * @param        string $excerpt
 	 * @return        string
 	 */
-	public static function get_the_excerpt( $excerpt = '' ) {
+	public static function get_the_excerpt($excerpt = '') {
 		EED_Event_Single::$using_get_the_excerpt = true;
-		add_filter( 'wp_trim_excerpt', array( 'EED_Event_Single', 'end_get_the_excerpt' ), 999, 1 );
+		add_filter('wp_trim_excerpt', array('EED_Event_Single', 'end_get_the_excerpt'), 999, 1);
 		return $excerpt;
 	}
 
@@ -244,7 +244,7 @@ 
 	 * @param  string $text
 	 * @return string
 	 */
-	public static function end_get_the_excerpt( $text = '' ) {
+	public static function end_get_the_excerpt($text = '') {
 		EED_Event_Single::$using_get_the_excerpt = false;
 		return $text;
 	}
@@ -258,7 +258,7 @@ 
 	 * @param 	string 	$content
 	 * @return 	string
 	 */
-	public static function event_details( $content ) {
+	public static function event_details($content) {
 		global $post;
 		static $current_post_ID = 0;
 		if (
@@ -273,15 +273,15 @@ 
 			// We want to allow those plugins to still do their thing and have access to our content, but depending on
 			// how your event content is being displayed (shortcode, CPT route, etc), this filter can get applied twice,
 			// so the following allows this filter to be applied multiple times, but only once for real
-			$current_post_ID = did_action( 'loop_start' ) ? $post->ID : 0;
-			if ( EE_Registry::instance()->CFG->template_settings->EED_Event_Single->use_sortable_display_order ) {
+			$current_post_ID = did_action('loop_start') ? $post->ID : 0;
+			if (EE_Registry::instance()->CFG->template_settings->EED_Event_Single->use_sortable_display_order) {
 				// 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_content', array( 'EED_Event_Single', 'event_details' ), 100 );
+				remove_filter('the_content', array('EED_Event_Single', 'event_details'), 100);
 				EED_Event_Single::instance()->template_parts = EED_Event_Single::instance()->initialize_template_parts();
-				$content = EEH_Template::locate_template( 'content-espresso_events-details.php' );
-				$content = EED_Event_Single::instance()->template_parts->apply_template_part_filters( $content );
-				add_filter( 'the_content', array( 'EED_Event_Single', 'event_details' ), 100 );
+				$content = EEH_Template::locate_template('content-espresso_events-details.php');
+				$content = EED_Event_Single::instance()->template_parts->apply_template_part_filters($content);
+				add_filter('the_content', array('EED_Event_Single', 'event_details'), 100);
 			} else {
 				$content = EED_Event_Single::use_filterable_display_order();
 			}
@@ -302,19 +302,19 @@ 
 		// 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_content', array( 'EED_Event_Single', 'event_details' ), 100 );
+		remove_filter('the_content', array('EED_Event_Single', 'event_details'), 100);
 		//now add additional content
-		add_filter( 'the_content', array( 'EED_Event_Single', 'event_datetimes' ), 110, 1 );
-		add_filter( 'the_content', array( 'EED_Event_Single', 'event_tickets' ), 120, 1 );
-		add_filter( 'the_content', array( 'EED_Event_Single', 'event_venues' ), 130, 1 );
-		do_action( 'AHEE__EED_Event_Single__use_filterable_display_order__after_add_filters' );
+		add_filter('the_content', array('EED_Event_Single', 'event_datetimes'), 110, 1);
+		add_filter('the_content', array('EED_Event_Single', 'event_tickets'), 120, 1);
+		add_filter('the_content', array('EED_Event_Single', 'event_venues'), 130, 1);
+		do_action('AHEE__EED_Event_Single__use_filterable_display_order__after_add_filters');
 		// now load our template
-		$content = EEH_Template::locate_template( 'content-espresso_events-details.php' );
+		$content = EEH_Template::locate_template('content-espresso_events-details.php');
 		//now add our filter back in, plus some others
-		add_filter( 'the_content', array( 'EED_Event_Single', 'event_details' ), 100 );
-		remove_filter( 'the_content', array( 'EED_Event_Single', 'event_datetimes' ), 110 );
-		remove_filter( 'the_content', array( 'EED_Event_Single', 'event_tickets' ), 120 );
-		remove_filter( 'the_content', array( 'EED_Event_Single', 'event_venues' ), 130 );
+		add_filter('the_content', array('EED_Event_Single', 'event_details'), 100);
+		remove_filter('the_content', array('EED_Event_Single', 'event_datetimes'), 110);
+		remove_filter('the_content', array('EED_Event_Single', 'event_tickets'), 120);
+		remove_filter('the_content', array('EED_Event_Single', 'event_venues'), 130);
 		// we're not returning the $content directly because the template we are loading uses the_content (or the_excerpt)
 		return $content;
 	}
@@ -328,8 +328,8 @@ 
 	 * @param        string $content
 	 * @return        string
 	 */
-	public static function event_datetimes( $content ) {
-		return EEH_Template::locate_template( 'content-espresso_events-datetimes.php' ) . $content;
+	public static function event_datetimes($content) {
+		return EEH_Template::locate_template('content-espresso_events-datetimes.php').$content;
 	}
 
 
@@ -341,8 +341,8 @@ 
 	 * @param        string $content
 	 * @return        string
 	 */
-	public static function event_tickets( $content ) {
-		return EEH_Template::locate_template( 'content-espresso_events-tickets.php' ) . $content;
+	public static function event_tickets($content) {
+		return EEH_Template::locate_template('content-espresso_events-tickets.php').$content;
 	}
 
 
@@ -354,8 +354,8 @@ 
 	 * @param 	string $content
 	 * @return 	string
 	 */
-	public static function event_venue( $content ) {
-		return EED_Event_Single::event_venues( $content );
+	public static function event_venue($content) {
+		return EED_Event_Single::event_venues($content);
 	}
 
 
@@ -367,8 +367,8 @@ 
 	 * @param        string $content
 	 * @return        string
 	 */
-	public static function event_venues( $content ) {
-		return $content . EEH_Template::locate_template( 'content-espresso_events-venues.php' );
+	public static function event_venues($content) {
+		return $content.EEH_Template::locate_template('content-espresso_events-venues.php');
 	}
 
 
@@ -380,9 +380,9 @@ 
 	 * 	@param		array 	$wp_query_array an array containing the WP_Query object
 	 *  	@return 		void
 	 */
-	public static function loop_end( $wp_query_array ) {
+	public static function loop_end($wp_query_array) {
 		global $post;
-		do_action( 'AHEE_event_details_after_post', $post, $wp_query_array );
+		do_action('AHEE_event_details_after_post', $post, $wp_query_array);
 	}
 
 
@@ -395,16 +395,16 @@ 
 	 */
 	public function wp_enqueue_scripts() {
 		// get some style
-		if ( apply_filters( 'FHEE_enable_default_espresso_css', TRUE ) && apply_filters( 'FHEE__EED_Event_Single__wp_enqueue_scripts__enable_css', TRUE )) {
+		if (apply_filters('FHEE_enable_default_espresso_css', TRUE) && apply_filters('FHEE__EED_Event_Single__wp_enqueue_scripts__enable_css', TRUE)) {
 			// first check uploads 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' ));
+			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 {
-				wp_register_style( $this->theme, EE_TEMPLATES_URL . $this->theme . DS . 'style.css', array( 'dashicons', 'espresso_default' ));
+				wp_register_style($this->theme, EE_TEMPLATES_URL.$this->theme.DS.'style.css', array('dashicons', 'espresso_default'));
 			}
-			wp_enqueue_script( $this->theme );
-			if ( EE_Registry::instance()->CFG->map_settings->use_google_maps ) {
-				add_action('wp_enqueue_scripts', array( 'EEH_Maps', 'espresso_google_map_js' ), 11 );
+			wp_enqueue_script($this->theme);
+			if (EE_Registry::instance()->CFG->map_settings->use_google_maps) {
+				add_action('wp_enqueue_scripts', array('EEH_Maps', 'espresso_google_map_js'), 11);
 			}
 		}
 	}
@@ -425,9 +425,9 @@ 
 	public static function display_venue() {
 		/** @type EE_Event_Single_Config $config */
 		$config = EED_Event_Single::instance()->config();
-		$display_venue= isset( $config->display_venue ) ? $config->display_venue : TRUE;
+		$display_venue = isset($config->display_venue) ? $config->display_venue : TRUE;
 		$venue_name = EEH_Venue_View::venue_name();
-		return $display_venue && ! empty( $venue_name ) ? TRUE : FALSE;
+		return $display_venue && ! empty($venue_name) ? TRUE : FALSE;
 	}
 
 

modules/ical/EED_Ical.module.php

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
  *

Indentation +2 added lines, -2 removed lines

@@ -220,8 +220,8 @@
 			//Escape spcial chars within the decription
 			$description = EED_Ical::_escape_ICal_data( $description );
 
-		    //Remove line breaks and output in iCal format
-		    $description = str_replace( array( "\r\n", "\n"), '\n', $description );
+			//Remove line breaks and output in iCal format
+			$description = str_replace( array( "\r\n", "\n"), '\n', $description );
 
 		return $description;
 	}

Spacing +69 added lines, -69 removed lines

@@ -32,7 +32,7 @@ 
 	 * @return EED_Ical
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -45,9 +45,9 @@ 
 	 */
 	public static function set_hooks() {
 		// create download buttons
-		add_filter( 'FHEE__espresso_list_of_event_dates__datetime_html', array( 'EED_Ical', 'generate_add_to_iCal_button' ), 10, 2 );
+		add_filter('FHEE__espresso_list_of_event_dates__datetime_html', array('EED_Ical', 'generate_add_to_iCal_button'), 10, 2);
 		 // process ics download request
-		EE_Config::register_route( 'download_ics_file', 'EED_Ical', 'download_ics_file' );
+		EE_Config::register_route('download_ics_file', 'EED_Ical', 'download_ics_file');
 	}
 
 
@@ -70,7 +70,7 @@ 
 	 * @param    WP $WP
 	 * @return    void
 	 */
-	public function run( $WP ) {}
+	public function run($WP) {}
 
 
 
@@ -82,30 +82,30 @@ 
 	 * @param $datetime
 	 * @return    string
 	 */
-	public static function generate_add_to_iCal_button( $html, $datetime ) {
+	public static function generate_add_to_iCal_button($html, $datetime) {
 		// first verify a proper datetime object has been received
-		if ( $datetime instanceof EE_Datetime ) {
+		if ($datetime instanceof EE_Datetime) {
 			// set whether a link or submit button is shown
-			$iCal_type = apply_filters( 'FHEE__EED_Ical__generate_add_to_iCal_button__iCal_type', 'submit' );
+			$iCal_type = apply_filters('FHEE__EED_Ical__generate_add_to_iCal_button__iCal_type', 'submit');
 			// generate a link to the route we registered in set_hooks()
-			$URL = add_query_arg( array( 'ee' => 'download_ics_file', 'ics_id' => $datetime->ID() ), site_url() );
+			$URL = add_query_arg(array('ee' => 'download_ics_file', 'ics_id' => $datetime->ID()), site_url());
 			// what type ?
-			switch ( $iCal_type ) {
+			switch ($iCal_type) {
 				// submit buttons appear as buttons and are very compatible with a theme's style
 				case 'submit' :
-					$html .= '<form id="download-iCal-frm-' . $datetime->ID() . '" class="download-iCal-frm" action="' . $URL . '" method="post" >';
-					$html .= '<input type="submit" class="ee-ical-sbmt" value="&#xf145;" title="' . __( 'Add to iCal Calendar', 'event_espresso' ) . '"/>';
+					$html .= '<form id="download-iCal-frm-'.$datetime->ID().'" class="download-iCal-frm" action="'.$URL.'" method="post" >';
+					$html .= '<input type="submit" class="ee-ical-sbmt" value="&#xf145;" title="'.__('Add to iCal Calendar', 'event_espresso').'"/>';
 					$html .= '</form>';
 					break;
 				// buttons are just links that have been styled to appear as buttons, but may not be blend with a theme as well as submit buttons
 				case 'button' :
-					$html .= '<a class="ee-ical-btn small ee-button ee-roundish" href="' . $URL . '" title="' . __( 'Add to iCal Calendar', 'event_espresso' ) . '">';
+					$html .= '<a class="ee-ical-btn small ee-button ee-roundish" href="'.$URL.'" title="'.__('Add to iCal Calendar', 'event_espresso').'">';
 					$html .= ' <span class="dashicons dashicons-calendar"></span>';
 					$html .= '</a>';
 					break;
 				// links are just links that use the calendar dashicon
 				case 'icon' :
-					$html .= '<a class="ee-ical-lnk" href="' . $URL . '" title="' . __( 'Add to iCal Calendar', 'event_espresso' ) . '">';
+					$html .= '<a class="ee-ical-lnk" href="'.$URL.'" title="'.__('Add to iCal Calendar', 'event_espresso').'">';
 					$html .= ' <span class="dashicons dashicons-calendar"></span>';
 					$html .= '</a>';
 					break;
@@ -123,72 +123,72 @@ 
 	 *  @return 	void
 	 */
 	public static function download_ics_file() {
-		if ( EE_Registry::instance()->REQ->is_set( 'ics_id' )) {
-			$DTT_ID = absint( EE_Registry::instance()->REQ->get( 'ics_id' ));
-			$datetime = EE_Registry::instance()->load_model( 'Datetime' )->get_one_by_ID( $DTT_ID );
-			if ( $datetime instanceof EE_Datetime ) {
+		if (EE_Registry::instance()->REQ->is_set('ics_id')) {
+			$DTT_ID = absint(EE_Registry::instance()->REQ->get('ics_id'));
+			$datetime = EE_Registry::instance()->load_model('Datetime')->get_one_by_ID($DTT_ID);
+			if ($datetime instanceof EE_Datetime) {
 				// get related event, venues, and event categories
 				$event = $datetime->event();
 				// get related category Term object and it's name
 				$category = $event->first_event_category();
-				if ( $category instanceof EE_Term ) {
+				if ($category instanceof EE_Term) {
 					$category = $category->name();
 				}
 				$location = '';
 				// get first related venue and convert to CSV string
-				$venue = $event->venues(array( 'limit'=>1 ));
-				if ( is_array( $venue ) && ! empty( $venue )) {
-					$venue = array_shift( $venue );
-					if ( $venue instanceof EE_Venue ) {
-						$location = espresso_venue_raw_address( 'inline', $venue->ID(), FALSE );
+				$venue = $event->venues(array('limit'=>1));
+				if (is_array($venue) && ! empty($venue)) {
+					$venue = array_shift($venue);
+					if ($venue instanceof EE_Venue) {
+						$location = espresso_venue_raw_address('inline', $venue->ID(), FALSE);
 					}
 				}
 				// set variables, escape strings, convert timestamps to ics format, etc
-				$filename = $event->slug() . '-' . $datetime->start_date( 'Y-m-d' ) . '.ics';
-				$organizer = EED_Ical::_escape_ICal_data( EE_Registry::instance()->CFG->organization->name );
-				$UID = EED_Ical::_escape_ICal_data( md5( $event->name() . $event->ID() . $datetime->ID() ));
-				$org_email = EED_Ical::_escape_ICal_data( $datetime->ID() );
-				$timestamp = date( EED_Ical::iCal_datetime_format );
-				$location = EED_Ical::_escape_ICal_data( $location );
-				$summary = EED_Ical::_escape_ICal_data( $event->name() );
-				$description = EED_Ical::_escape_ICal_description( wp_strip_all_tags( $event->description() ));
+				$filename = $event->slug().'-'.$datetime->start_date('Y-m-d').'.ics';
+				$organizer = EED_Ical::_escape_ICal_data(EE_Registry::instance()->CFG->organization->name);
+				$UID = EED_Ical::_escape_ICal_data(md5($event->name().$event->ID().$datetime->ID()));
+				$org_email = EED_Ical::_escape_ICal_data($datetime->ID());
+				$timestamp = date(EED_Ical::iCal_datetime_format);
+				$location = EED_Ical::_escape_ICal_data($location);
+				$summary = EED_Ical::_escape_ICal_data($event->name());
+				$description = EED_Ical::_escape_ICal_description(wp_strip_all_tags($event->description()));
 				$status = $datetime->get_active_status();
 				$status = $status == EE_Datetime::cancelled ? 'Cancelled' : 'Confirmed';
-				$status = EED_Ical::_escape_ICal_data( $status );
-				$categories = EED_Ical::_escape_ICal_data( $category );
-				$url = EED_Ical::_escape_ICal_data( get_permalink( $event->ID() ));
-				$dtt_start = EED_Ical::_escape_ICal_data( date( EED_Ical::iCal_datetime_format, $datetime->start() ));
-				$dtt_end = EED_Ical::_escape_ICal_data( date( EED_Ical::iCal_datetime_format, $datetime->end() ));
+				$status = EED_Ical::_escape_ICal_data($status);
+				$categories = EED_Ical::_escape_ICal_data($category);
+				$url = EED_Ical::_escape_ICal_data(get_permalink($event->ID()));
+				$dtt_start = EED_Ical::_escape_ICal_data(date(EED_Ical::iCal_datetime_format, $datetime->start()));
+				$dtt_end = EED_Ical::_escape_ICal_data(date(EED_Ical::iCal_datetime_format, $datetime->end()));
 				// set headers
-				header( 'Content-type: text/calendar; charset=utf-8' );
-				header( 'Content-Disposition: attachment; filename="' . $filename . '"' );
-				header( 'Cache-Control: private, max-age=0, must-revalidate' );
-				header( 'Pragma: public' );
-				header( 'Content-Type: application/octet-stream' );
-				header( 'Content-Type: application/force-download' );
-				header( 'Cache-Control: no-cache, must-revalidate' );
-				header( 'Content-Transfer-Encoding: binary' );
-				header( 'Expires: Sat, 26 Jul 1997 05:00:00 GMT' ); // past date
-				ini_set( 'zlib.output_compression', '0' );
+				header('Content-type: text/calendar; charset=utf-8');
+				header('Content-Disposition: attachment; filename="'.$filename.'"');
+				header('Cache-Control: private, max-age=0, must-revalidate');
+				header('Pragma: public');
+				header('Content-Type: application/octet-stream');
+				header('Content-Type: application/force-download');
+				header('Cache-Control: no-cache, must-revalidate');
+				header('Content-Transfer-Encoding: binary');
+				header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); // past date
+				ini_set('zlib.output_compression', '0');
 				// echo the output
-				echo "BEGIN:VCALENDAR" . PHP_EOL;
-				echo "VERSION:2.0" . PHP_EOL;
-				echo "PRODID:-//{$organizer}//NONSGML PDA Calendar Version 1.0//EN" . PHP_EOL;
-				echo "CALSCALE:GREGORIAN" . PHP_EOL;
-				echo "BEGIN:VEVENT" . PHP_EOL;
-				echo "UID:{$UID}" . PHP_EOL;
-				echo "ORGANIZER:MAILTO:{$org_email}" . PHP_EOL;
-				echo "DTSTAMP:{$timestamp}" . PHP_EOL;
-				echo "LOCATION:{$location}" . PHP_EOL;
-				echo "SUMMARY:{$summary}" . PHP_EOL;
-				echo "DESCRIPTION:{$description}" . PHP_EOL;
-				echo "STATUS:{$status}" . PHP_EOL;
-				echo "CATEGORIES:{$categories}" . PHP_EOL;
-				echo "URL;VALUE=URI:{$url}" . PHP_EOL;
-				echo "DTSTART:{$dtt_start}" . PHP_EOL;
-				echo "DTEND:{$dtt_end}" . PHP_EOL;
-				echo "END:VEVENT" . PHP_EOL;
-				echo "END:VCALENDAR" . PHP_EOL;
+				echo "BEGIN:VCALENDAR".PHP_EOL;
+				echo "VERSION:2.0".PHP_EOL;
+				echo "PRODID:-//{$organizer}//NONSGML PDA Calendar Version 1.0//EN".PHP_EOL;
+				echo "CALSCALE:GREGORIAN".PHP_EOL;
+				echo "BEGIN:VEVENT".PHP_EOL;
+				echo "UID:{$UID}".PHP_EOL;
+				echo "ORGANIZER:MAILTO:{$org_email}".PHP_EOL;
+				echo "DTSTAMP:{$timestamp}".PHP_EOL;
+				echo "LOCATION:{$location}".PHP_EOL;
+				echo "SUMMARY:{$summary}".PHP_EOL;
+				echo "DESCRIPTION:{$description}".PHP_EOL;
+				echo "STATUS:{$status}".PHP_EOL;
+				echo "CATEGORIES:{$categories}".PHP_EOL;
+				echo "URL;VALUE=URI:{$url}".PHP_EOL;
+				echo "DTSTART:{$dtt_start}".PHP_EOL;
+				echo "DTEND:{$dtt_end}".PHP_EOL;
+				echo "END:VEVENT".PHP_EOL;
+				echo "END:VCALENDAR".PHP_EOL;
 			}
 		}
 		die();
@@ -203,8 +203,8 @@ 
 	 *  	@param	string $string
 	 *  	@return	string
 	 */
-	private static function _escape_ICal_data( $string = '' ) {
-		return preg_replace( '/([\,;])/', '\\\$1', $string );
+	private static function _escape_ICal_data($string = '') {
+		return preg_replace('/([\,;])/', '\\\$1', $string);
 	}
 
 	/**
@@ -214,13 +214,13 @@ 
 	 *  	@param	string $description
 	 *  	@return	string
 	 */
-	private static function _escape_ICal_description( $description = '' ) {
+	private static function _escape_ICal_description($description = '') {
 			
 			//Escape spcial chars within the decription
-			$description = EED_Ical::_escape_ICal_data( $description );
+			$description = EED_Ical::_escape_ICal_data($description);
 
 		    //Remove line breaks and output in iCal format
-		    $description = str_replace( array( "\r\n", "\n"), '\n', $description );
+		    $description = str_replace(array("\r\n", "\n"), '\n', $description);
 
 		return $description;
 	}

modules/single_page_checkout/reg_steps/attendee_information/EE_SPCO_Reg_Step_Attendee_Information.class.php

Braces +1 added lines, -1 removed lines

@@ -808,7 +808,7 @@
 
 				} // end of if ( ! $this->checkout->revisit || $this->checkout->primary_revisit || ( $this->checkout->revisit && $this->checkout->reg_url_link == $reg_url_link )) {
 
-			}  else {
+			} else {
 				EE_Error::add_error( __( 'An invalid or missing line item ID was encountered while attempting to process the registration form.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
 				// remove malformed data
 				unset( $valid_data[ $reg_url_link ] );

Indentation +15 added lines, -15 removed lines

@@ -1,16 +1,16 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
  /**
- *
- * Class EE_SPCO_Reg_Step_Attendee_Information
- *
- * Description
- *
- * @package 			Event Espresso
- * @subpackage 	core
- * @author 				Brent Christensen
- * @since 				4.5.0
- *
- */
+  *
+  * Class EE_SPCO_Reg_Step_Attendee_Information
+  *
+  * Description
+  *
+  * @package 			Event Espresso
+  * @subpackage 	core
+  * @author 				Brent Christensen
+  * @since 				4.5.0
+  *
+  */
 class EE_SPCO_Reg_Step_Attendee_Information extends EE_SPCO_Reg_Step {
 
 	/**
@@ -171,7 +171,7 @@ 
 				// generate hidden input
 				if (
 					isset( $subsections[ $primary_registrant ] )
-				     && $subsections[ $primary_registrant ] instanceof EE_Form_Section_Proper
+					 && $subsections[ $primary_registrant ] instanceof EE_Form_Section_Proper
 				) {
 					$subsections[ $primary_registrant ]->add_subsections( $copy_options, 'primary_registrant', false );
 				}
@@ -902,7 +902,7 @@ 
 					if ( isset( $valid_data[ $reg_url_link ] ) ) {
 						// do we need to copy basic info from primary attendee ?
 						$copy_primary = isset( $valid_data[ $reg_url_link ]['additional_attendee_reg_info'] )
-						                && absint( $valid_data[ $reg_url_link ]['additional_attendee_reg_info'] ) === 0
+										&& absint( $valid_data[ $reg_url_link ]['additional_attendee_reg_info'] ) === 0
 							? true
 							: false;
 						// filter form input data for this registration
@@ -1079,7 +1079,7 @@ 
 			? $form_input
 			: $form_input . '-' . $registration->reg_url_link();
 		$answer_is_obj = isset( $this->_registration_answers[ $answer_cache_id ] )
-		                 && $this->_registration_answers[ $answer_cache_id ] instanceof EE_Answer
+						 && $this->_registration_answers[ $answer_cache_id ] instanceof EE_Answer
 			? true
 			: false;
 		//rename form_inputs if they are EE_Attendee properties
@@ -1319,7 +1319,7 @@ 
 		}
 		foreach ( $critical_attendee_details as $critical_attendee_detail ) {
 			if ( ! isset( $attendee_data[ $critical_attendee_detail ] )
-			     || empty( $attendee_data[ $critical_attendee_detail ] )
+				 || empty( $attendee_data[ $critical_attendee_detail ] )
 			) {
 				$attendee_data[ $critical_attendee_detail ] = $this->checkout->primary_attendee_obj->get(
 					$critical_attendee_detail

Doc Comments +2 added lines, -1 removed lines

@@ -588,6 +588,7 @@ 
 	 * @param EE_Registration $registration
 	 * @param EE_Question     $question
 	 * @param                 mixed EE_Answer|NULL      $answer
+	 * @param EE_Answer $answer
 	 * @return EE_Form_Input_Base
 	 * @throws \EE_Error
 	 */
@@ -1190,7 +1191,7 @@ 
 	 *
 	 * @param EE_Registration $registration
 	 * @param array           $attendee_data
-	 * @return boolean|EE_Attendee
+	 * @return EE_Attendee
 	 * @throws \EE_Error
 	 */
 	private function _find_existing_attendee( EE_Registration $registration, $attendee_data = array() ) {

Spacing +230 added lines, -231 removed lines

@@ -41,21 +41,21 @@ 
 	 * @access    public
 	 * @param    EE_Checkout $checkout
 	 */
-	public function __construct( EE_Checkout $checkout ) {
+	public function __construct(EE_Checkout $checkout) {
 		$this->_slug = 'attendee_information';
 		$this->_name = __('Attendee Information', 'event_espresso');
-		$this->_template = SPCO_REG_STEPS_PATH . $this->_slug . DS . 'attendee_info_main.template.php';
+		$this->_template = SPCO_REG_STEPS_PATH.$this->_slug.DS.'attendee_info_main.template.php';
 		$this->checkout = $checkout;
 		$this->_reset_success_message();
 		$this->set_instructions(
-			__( 'Please answer the following registration questions before proceeding.', 'event_espresso' )
+			__('Please answer the following registration questions before proceeding.', 'event_espresso')
 		);
 	}
 
 
 
 	public function translate_js_strings() {
-		EE_Registry::$i18n_js_strings['required_field'] = __( ' is a required question.', 'event_espresso' );
+		EE_Registry::$i18n_js_strings['required_field'] = __(' is a required question.', 'event_espresso');
 		EE_Registry::$i18n_js_strings['required_multi_field'] = __(
 			' is a required question. Please enter a value for at least one of the options.',
 			'event_espresso'
@@ -115,7 +115,7 @@ 
 		// calculate taxes
 		$Line_Item_Display->display_line_item(
 			$this->checkout->cart->get_grand_total(),
-			array( 'set_tax_rate' => true )
+			array('set_tax_rate' => true)
 		);
 		/** @var $subsections EE_Form_Section_Proper[] */
 		$subsections = array(
@@ -127,51 +127,51 @@ 
 			'ticket_count' 	=> array()
 		);
 		// grab the saved registrations from the transaction
-		$registrations = $this->checkout->transaction->registrations( $this->checkout->reg_cache_where_params );
-		if ( $registrations ) {
-			foreach ( $registrations as $registration ) {
+		$registrations = $this->checkout->transaction->registrations($this->checkout->reg_cache_where_params);
+		if ($registrations) {
+			foreach ($registrations as $registration) {
 				// can this registration be processed during this visit ?
 				if (
 					$registration instanceof EE_Registration
-					&& $this->checkout->visit_allows_processing_of_this_registration( $registration )
+					&& $this->checkout->visit_allows_processing_of_this_registration($registration)
 				) {
-					$subsections[ $registration->reg_url_link() ] = $this->_registrations_reg_form( $registration );
-					if ( ! $this->checkout->admin_request ) {
-						$template_args['registrations'][ $registration->reg_url_link() ] = $registration;
-						$template_args['ticket_count'][ $registration->ticket()->ID() ] = isset(
-							$template_args['ticket_count'][ $registration->ticket()->ID() ]
+					$subsections[$registration->reg_url_link()] = $this->_registrations_reg_form($registration);
+					if ( ! $this->checkout->admin_request) {
+						$template_args['registrations'][$registration->reg_url_link()] = $registration;
+						$template_args['ticket_count'][$registration->ticket()->ID()] = isset(
+							$template_args['ticket_count'][$registration->ticket()->ID()]
 						)
-							? $template_args['ticket_count'][ $registration->ticket()->ID() ] + 1
+							? $template_args['ticket_count'][$registration->ticket()->ID()] + 1
 							: 1;
 						$ticket_line_item = EEH_Line_Item::get_line_items_by_object_type_and_IDs(
 							$this->checkout->cart->get_grand_total(),
 							'Ticket',
-							array( $registration->ticket()->ID() )
+							array($registration->ticket()->ID())
 						);
-						$ticket_line_item = is_array( $ticket_line_item )
-							? reset( $ticket_line_item )
+						$ticket_line_item = is_array($ticket_line_item)
+							? reset($ticket_line_item)
 							: $ticket_line_item;
-						$template_args['ticket_line_item'][ $registration->ticket()->ID() ] = $Line_Item_Display->display_line_item(
+						$template_args['ticket_line_item'][$registration->ticket()->ID()] = $Line_Item_Display->display_line_item(
 							$ticket_line_item
 						);
 					}
-					if ( $registration->is_primary_registrant() ) {
+					if ($registration->is_primary_registrant()) {
 						$primary_registrant = $registration->reg_url_link();
 					}
 				}
 			}
 			// print_copy_info ?
-			if ( $primary_registrant && ! $this->checkout->admin_request && count( $registrations ) > 1 ) {
+			if ($primary_registrant && ! $this->checkout->admin_request && count($registrations) > 1) {
 				// TODO: add admin option for toggling copy attendee info, then use that value to change $this->_print_copy_info
 				$copy_options['spco_copy_attendee_chk'] = $this->_print_copy_info
 					? $this->_copy_attendee_info_form()
 					: $this->_auto_copy_attendee_info();
 				// generate hidden input
 				if (
-					isset( $subsections[ $primary_registrant ] )
-				     && $subsections[ $primary_registrant ] instanceof EE_Form_Section_Proper
+					isset($subsections[$primary_registrant])
+				     && $subsections[$primary_registrant] instanceof EE_Form_Section_Proper
 				) {
-					$subsections[ $primary_registrant ]->add_subsections( $copy_options, 'primary_registrant', false );
+					$subsections[$primary_registrant]->add_subsections($copy_options, 'primary_registrant', false);
 				}
 			}
 
@@ -183,8 +183,7 @@ 
 				'html_id' 					=> $this->reg_form_name(),
 				'subsections' 			=> $subsections,
 				'layout_strategy'		=> $this->checkout->admin_request ?
-					new EE_Div_Per_Section_Layout() :
-					new EE_Template_Layout(
+					new EE_Div_Per_Section_Layout() : new EE_Template_Layout(
 						array(
 							'layout_template_file' 	=> $this->_template, // layout_template
 							'template_args' 				=> $template_args
@@ -202,11 +201,11 @@ 
 	 * @return EE_Form_Section_Proper
 	 * @throws \EE_Error
 	 */
-	private function _registrations_reg_form( EE_Registration $registration ) {
+	private function _registrations_reg_form(EE_Registration $registration) {
 		static $attendee_nmbr = 1;
 		// array of params to pass to parent constructor
 		$form_args = array(
-			'html_id'         => 'ee-registration-' . $registration->reg_url_link(),
+			'html_id'         => 'ee-registration-'.$registration->reg_url_link(),
 			'html_class'      => 'ee-reg-form-attendee-dv',
 			'html_style'      => $this->checkout->admin_request
 				? 'padding:0em 2em 1em; margin:3em 0 0; border:1px solid #ddd;'
@@ -215,24 +214,24 @@ 
 			'layout_strategy' => new EE_Fieldset_Section_Layout(
 				array(
 					'legend_class' => 'spco-attendee-lgnd smaller-text lt-grey-text',
-					'legend_text'  => sprintf( __( 'Attendee %d', 'event_espresso' ), $attendee_nmbr )
+					'legend_text'  => sprintf(__('Attendee %d', 'event_espresso'), $attendee_nmbr)
 				)
 			)
 		);
 		// verify that registration has valid event
-		if ( $registration->event() instanceof EE_Event ) {
+		if ($registration->event() instanceof EE_Event) {
 			$query_params = array(
 				array(
 					'Event.EVT_ID' => $registration->event()->ID(),
 					'Event_Question_Group.EQG_primary' => $registration->count() === 1 ? true : false
 				),
-				'order_by'=>array( 'QSG_order'=>'ASC' )
+				'order_by'=>array('QSG_order'=>'ASC')
 			);
-			$question_groups = $registration->event()->question_groups( $query_params );
-			if ( $question_groups ) {
-				foreach ( $question_groups as $question_group ) {
-					if ( $question_group instanceof EE_Question_Group ) {
-						$form_args['subsections'][ $question_group->identifier() ] = $this->_question_group_reg_form(
+			$question_groups = $registration->event()->question_groups($query_params);
+			if ($question_groups) {
+				foreach ($question_groups as $question_group) {
+					if ($question_group instanceof EE_Question_Group) {
+						$form_args['subsections'][$question_group->identifier()] = $this->_question_group_reg_form(
 							$registration,
 							$question_group
 						);
@@ -245,10 +244,10 @@ 
 				// if we have question groups for additional attendees, then display the copy options
 				$this->_print_copy_info = $attendee_nmbr > 1 ? true : $this->_print_copy_info;
 			} else {
-				$form_args['subsections'][ 'attendee_info_not_required_' . $registration->reg_url_link(
-				) ] = new EE_Form_Section_HTML(
+				$form_args['subsections']['attendee_info_not_required_'.$registration->reg_url_link(
+				)] = new EE_Form_Section_HTML(
 					EEH_Template::locate_template(
-						SPCO_REG_STEPS_PATH . $this->_slug . DS . 'attendee_info_not_required.template.php',
+						SPCO_REG_STEPS_PATH.$this->_slug.DS.'attendee_info_not_required.template.php',
 						apply_filters(
 							'FHEE__EE_SPCO_Reg_Step_Attendee_Information___registrations_reg_form__attendee_info_not_required_template_args',
 							array()
@@ -267,12 +266,12 @@ 
 
 			}
 		}
-		if ( $registration->is_primary_registrant() ) {
+		if ($registration->is_primary_registrant()) {
 			// generate hidden input
-			$form_args['subsections']['primary_registrant'] = $this->_additional_primary_registrant_inputs( $registration );
+			$form_args['subsections']['primary_registrant'] = $this->_additional_primary_registrant_inputs($registration);
 		}
 		$attendee_nmbr++;
-		return new EE_Form_Section_Proper( $form_args );
+		return new EE_Form_Section_Proper($form_args);
 	}
 
 
@@ -293,7 +292,7 @@ 
 		// generate hidden input
 		return new EE_Hidden_Input(
 			array(
-				'html_id' => 'additional-attendee-reg-info-' . $registration->reg_url_link(),
+				'html_id' => 'additional-attendee-reg-info-'.$registration->reg_url_link(),
 				'default' => $additional_attendee_reg_info
 			)
 		);
@@ -307,26 +306,26 @@ 
 	 * @return EE_Form_Section_Proper
 	 * @throws \EE_Error
 	 */
-	private function _question_group_reg_form( EE_Registration $registration, EE_Question_Group $question_group ){
+	private function _question_group_reg_form(EE_Registration $registration, EE_Question_Group $question_group) {
 		// array of params to pass to parent constructor
 		$form_args = array(
-			'html_id'         => 'ee-reg-form-qstn-grp-' . $question_group->identifier(),
+			'html_id'         => 'ee-reg-form-qstn-grp-'.$question_group->identifier(),
 			'html_class'      => $this->checkout->admin_request
 				? 'form-table ee-reg-form-qstn-grp-dv'
 				: 'ee-reg-form-qstn-grp-dv',
-			'html_label_id'   => 'ee-reg-form-qstn-grp-' . $question_group->identifier() . '-lbl',
+			'html_label_id'   => 'ee-reg-form-qstn-grp-'.$question_group->identifier().'-lbl',
 			'subsections'     => array(
-				'reg_form_qstn_grp_hdr' => $this->_question_group_header( $question_group )
+				'reg_form_qstn_grp_hdr' => $this->_question_group_header($question_group)
 			),
 			'layout_strategy' => $this->checkout->admin_request
 				? new EE_Admin_Two_Column_Layout()
 				: new EE_Div_Per_Section_Layout()
 		);
 		// where params
-		$query_params = array( 'QST_deleted' => 0 );
+		$query_params = array('QST_deleted' => 0);
 		// don't load admin only questions on the frontend
-		if ( ! $this->checkout->admin_request ) {
-			$query_params['QST_admin_only'] = array( '!=', true );
+		if ( ! $this->checkout->admin_request) {
+			$query_params['QST_admin_only'] = array('!=', true);
 		}
 		$questions = $question_group->get_many_related(
 			'Question',
@@ -348,10 +347,10 @@ 
 			)
 		);
 		// loop thru questions
-		foreach ( $questions as $question ) {
-			if( $question instanceof EE_Question ){
+		foreach ($questions as $question) {
+			if ($question instanceof EE_Question) {
 				$identifier = $question->is_system_question() ? $question->system_ID() : $question->ID();
-				$form_args['subsections'][ $identifier ] = $this->reg_form_question( $registration, $question );
+				$form_args['subsections'][$identifier] = $this->reg_form_question($registration, $question);
 			}
 		}
 		$form_args['subsections'] = apply_filters(
@@ -372,7 +371,7 @@ 
 			)
 		);
 //		d( $form_args );
-		$question_group_reg_form = new EE_Form_Section_Proper( $form_args );
+		$question_group_reg_form = new EE_Form_Section_Proper($form_args);
 		return apply_filters(
 			'FHEE__EE_SPCO_Reg_Step_Attendee_Information___question_group_reg_form__question_group_reg_form',
 			$question_group_reg_form,
@@ -389,11 +388,11 @@ 
 	 * @param EE_Question_Group $question_group
 	 * @return 	EE_Form_Section_HTML
 	 */
-	private function _question_group_header( EE_Question_Group $question_group ){
+	private function _question_group_header(EE_Question_Group $question_group) {
 		$html = '';
 		// group_name
-		if ( $question_group->show_group_name() && $question_group->name() !== '' ) {
-			if ( $this->checkout->admin_request ) {
+		if ($question_group->show_group_name() && $question_group->name() !== '') {
+			if ($this->checkout->admin_request) {
 				$html .= EEH_HTML::br();
 				$html .= EEH_HTML::h3(
 					$question_group->name(),
@@ -407,7 +406,7 @@ 
 			}
 		}
 		// group_desc
-		if ( $question_group->show_group_desc() && $question_group->desc() !== '' ) {
+		if ($question_group->show_group_desc() && $question_group->desc() !== '') {
 			$html .= EEH_HTML::p(
 				$question_group->desc(),
 				'',
@@ -417,7 +416,7 @@ 
 			);
 
 		}
-		return new EE_Form_Section_HTML( $html );
+		return new EE_Form_Section_HTML($html);
 	}
 
 
@@ -427,7 +426,7 @@ 
 	 * @return    EE_Form_Section_Proper
 	 * @throws \EE_Error
 	 */
-	private function _copy_attendee_info_form(){
+	private function _copy_attendee_info_form() {
 		// array of params to pass to parent constructor
 		return new EE_Form_Section_Proper(
 			array(
@@ -456,7 +455,7 @@ 
 	private function _auto_copy_attendee_info() {
 		return new EE_Form_Section_HTML(
 			EEH_Template::locate_template(
-				SPCO_REG_STEPS_PATH . $this->_slug . DS . '_auto_copy_attendee_info.template.php',
+				SPCO_REG_STEPS_PATH.$this->_slug.DS.'_auto_copy_attendee_info.template.php',
 				apply_filters(
 					'FHEE__EE_SPCO_Reg_Step_Attendee_Information__auto_copy_attendee_info__template_args',
 					array()
@@ -480,32 +479,32 @@ 
 		$copy_attendee_info_inputs = array();
 		$prev_ticket = NULL;
 		// grab the saved registrations from the transaction
-		$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) {
 			// for all  attendees other than the primary attendee
-			if ( $registration instanceof EE_Registration && ! $registration->is_primary_registrant() ) {
+			if ($registration instanceof EE_Registration && ! $registration->is_primary_registrant()) {
 				// if this is a new ticket OR if this is the very first additional attendee after the primary attendee
-				if ( $registration->ticket()->ID() !== $prev_ticket ) {
+				if ($registration->ticket()->ID() !== $prev_ticket) {
 					$item_name = $registration->ticket()->name();
 					$item_name .= $registration->ticket()->description() !== ''
-						? ' - ' . $registration->ticket()->description()
+						? ' - '.$registration->ticket()->description()
 						: '';
-					$copy_attendee_info_inputs[ 'spco_copy_attendee_chk[ticket-' . $registration->ticket()->ID() . ']' ] = new EE_Form_Section_HTML(
-						'<h6 class="spco-copy-attendee-event-hdr">' . $item_name . '</h6>'
+					$copy_attendee_info_inputs['spco_copy_attendee_chk[ticket-'.$registration->ticket()->ID().']'] = new EE_Form_Section_HTML(
+						'<h6 class="spco-copy-attendee-event-hdr">'.$item_name.'</h6>'
 					);
 					$prev_ticket = $registration->ticket()->ID();
 				}
 
-				$copy_attendee_info_inputs[ 'spco_copy_attendee_chk[' . $registration->ID() . ']' ] = new
+				$copy_attendee_info_inputs['spco_copy_attendee_chk['.$registration->ID().']'] = new
 				EE_Checkbox_Multi_Input(
 					array(
 						$registration->ID() => sprintf(
-							__( 'Attendee #%s', 'event_espresso' ),
+							__('Attendee #%s', 'event_espresso'),
 							$registration->count()
 						)
 					),
 					array(
-						'html_id'                 => 'spco-copy-attendee-chk-' . $registration->reg_url_link(),
+						'html_id'                 => 'spco-copy-attendee-chk-'.$registration->reg_url_link(),
 						'html_class'              => 'spco-copy-attendee-chk ee-do-not-validate',
 						'display_html_label_text' => false
 					)
@@ -525,7 +524,7 @@ 
 	 * @return    EE_Form_Input_Base
 	 * @throws \EE_Error
 	 */
-	private function _additional_primary_registrant_inputs( EE_Registration $registration ){
+	private function _additional_primary_registrant_inputs(EE_Registration $registration) {
 		// generate hidden input
 		return new EE_Hidden_Input(
 			array(
@@ -544,7 +543,7 @@ 
 	 * @return    EE_Form_Input_Base
 	 * @throws \EE_Error
 	 */
-	public function reg_form_question( EE_Registration $registration, EE_Question $question ){
+	public function reg_form_question(EE_Registration $registration, EE_Question $question) {
 
 		// if this question was for an attendee detail, then check for that answer
 		$answer_value = EEM_Answer::instance()->get_attendee_property_answer_value(
@@ -553,32 +552,32 @@ 
 		);
 		$answer = $answer_value === null
 			? EEM_Answer::instance()->get_one(
-				array( array( 'QST_ID' => $question->ID(), 'REG_ID' => $registration->ID() ) )
+				array(array('QST_ID' => $question->ID(), 'REG_ID' => $registration->ID()))
 			)
 			: null;
 		// if NOT returning to edit an existing registration
 		// OR if this question is for an attendee property
 		// OR we still don't have an EE_Answer object
-		if( $answer_value || ! $answer instanceof EE_Answer || ! $registration->reg_url_link() ) {
+		if ($answer_value || ! $answer instanceof EE_Answer || ! $registration->reg_url_link()) {
 			// create an EE_Answer object for storing everything in
-			$answer = EE_Answer::new_instance ( array(
+			$answer = EE_Answer::new_instance(array(
 				'QST_ID'=> $question->ID(),
 				'REG_ID'=> $registration->ID()
 			));
 		}
 		// verify instance
-		if( $answer instanceof EE_Answer ){
-			if ( ! empty( $answer_value )) {
-				$answer->set( 'ANS_value', $answer_value );
+		if ($answer instanceof EE_Answer) {
+			if ( ! empty($answer_value)) {
+				$answer->set('ANS_value', $answer_value);
 			}
-			$answer->cache( 'Question', $question );
+			$answer->cache('Question', $question);
 			//remember system ID had a bug where sometimes it could be null
-			$answer_cache_id =$question->is_system_question()
-				? $question->system_ID() . '-' . $registration->reg_url_link()
-				: $question->ID() . '-' . $registration->reg_url_link();
-			$registration->cache( 'Answer', $answer, $answer_cache_id );
+			$answer_cache_id = $question->is_system_question()
+				? $question->system_ID().'-'.$registration->reg_url_link()
+				: $question->ID().'-'.$registration->reg_url_link();
+			$registration->cache('Answer', $answer, $answer_cache_id);
 		}
-		return $this->_generate_question_input( $registration, $question, $answer );
+		return $this->_generate_question_input($registration, $question, $answer);
 
 	}
 
@@ -591,46 +590,46 @@ 
 	 * @return EE_Form_Input_Base
 	 * @throws \EE_Error
 	 */
-	private function _generate_question_input( EE_Registration $registration, EE_Question $question, $answer ){
+	private function _generate_question_input(EE_Registration $registration, EE_Question $question, $answer) {
 		$identifier = $question->is_system_question() ? $question->system_ID() : $question->ID();
-		$this->_required_questions[ $identifier ] = $question->required() ? true : false;
+		$this->_required_questions[$identifier] = $question->required() ? true : false;
 		add_filter(
 			'FHEE__EE_Question__generate_form_input__country_options',
-			array( $this, 'use_cached_countries_for_form_input' ),
+			array($this, 'use_cached_countries_for_form_input'),
 			10,
 			4
 		);
 		add_filter(
 			'FHEE__EE_Question__generate_form_input__state_options',
-			array( $this, 'use_cached_states_for_form_input' ),
+			array($this, 'use_cached_states_for_form_input'),
 			10,
 			4
 		);
 		$input_constructor_args = array(
-			'html_name'     => 'ee_reg_qstn[' . $registration->ID() . '][' . $identifier . ']',
-			'html_id'       => 'ee_reg_qstn-' . $registration->ID() . '-' . $identifier,
-			'html_class'    => 'ee-reg-qstn ee-reg-qstn-' . $identifier,
-			'html_label_id' => 'ee_reg_qstn-' . $registration->ID() . '-' . $identifier,
+			'html_name'     => 'ee_reg_qstn['.$registration->ID().']['.$identifier.']',
+			'html_id'       => 'ee_reg_qstn-'.$registration->ID().'-'.$identifier,
+			'html_class'    => 'ee-reg-qstn ee-reg-qstn-'.$identifier,
+			'html_label_id' => 'ee_reg_qstn-'.$registration->ID().'-'.$identifier,
 			'html_label_class'	=> 'ee-reg-qstn',
 		);
-		$input_constructor_args['html_label_id'] 	.= '-lbl';
-		if ( $answer instanceof EE_Answer && $answer->ID() ) {
-			$input_constructor_args[ 'html_name' ] .= '[' . $answer->ID() . ']';
-			$input_constructor_args[ 'html_id' ] .= '-' . $answer->ID();
-			$input_constructor_args[ 'html_label_id' ] .= '-' . $answer->ID();
+		$input_constructor_args['html_label_id'] .= '-lbl';
+		if ($answer instanceof EE_Answer && $answer->ID()) {
+			$input_constructor_args['html_name'] .= '['.$answer->ID().']';
+			$input_constructor_args['html_id'] .= '-'.$answer->ID();
+			$input_constructor_args['html_label_id'] .= '-'.$answer->ID();
 		}
-		$form_input =  $question->generate_form_input(
+		$form_input = $question->generate_form_input(
 			$registration,
 			$answer,
 			$input_constructor_args
 		);
 		remove_filter(
 			'FHEE__EE_Question__generate_form_input__country_options',
-			array( $this, 'use_cached_countries_for_form_input' )
+			array($this, 'use_cached_countries_for_form_input')
 		);
 		remove_filter(
 			'FHEE__EE_Question__generate_form_input__state_options',
-			array( $this, 'use_cached_states_for_form_input' )
+			array($this, 'use_cached_states_for_form_input')
 		);
 		return $form_input;
 	}
@@ -652,22 +651,22 @@ 
 		\EE_Registration $registration = null,
 		\EE_Answer $answer = null
 	) {
-		$country_options = array( '' => '' );
+		$country_options = array('' => '');
 		// get possibly cached list of countries
 		$countries = $this->checkout->action === 'process_reg_step'
 			? EEM_Country::instance()->get_all_countries()
 			: EEM_Country::instance()->get_all_active_countries();
-		if ( ! empty( $countries )) {
-			foreach( $countries as $country ){
-				if ( $country instanceof EE_Country ) {
-					$country_options[ $country->ID() ] = $country->name();
+		if ( ! empty($countries)) {
+			foreach ($countries as $country) {
+				if ($country instanceof EE_Country) {
+					$country_options[$country->ID()] = $country->name();
 				}
 			}
 		}
-		if( $question instanceof EE_Question
-			&& $registration instanceof EE_Registration ) {
+		if ($question instanceof EE_Question
+			&& $registration instanceof EE_Registration) {
 			$answer = EEM_Answer::instance()->get_one(
-				array( array( 'QST_ID' => $question->ID(), 'REG_ID' => $registration->ID() ) )
+				array(array('QST_ID' => $question->ID(), 'REG_ID' => $registration->ID()))
 			);
 		} else {
 			$answer = EE_Answer::new_instance();
@@ -700,14 +699,14 @@ 
 		\EE_Registration $registration = null,
 		\EE_Answer $answer = null
 	) {
-		$state_options = array( '' => array( '' => ''));
+		$state_options = array('' => array('' => ''));
 		$states = $this->checkout->action === 'process_reg_step'
 			? EEM_State::instance()->get_all_states()
 			: EEM_State::instance()->get_all_active_states();
-		if ( ! empty( $states )) {
-			foreach( $states as $state ){
-				if ( $state instanceof EE_State ) {
-					$state_options[ $state->country()->name() ][ $state->ID() ] = $state->name();
+		if ( ! empty($states)) {
+			foreach ($states as $state) {
+				if ($state instanceof EE_State) {
+					$state_options[$state->country()->name()][$state->ID()] = $state->name();
 				}
 			}
 		}
@@ -735,24 +734,24 @@ 
 	 * @throws \EE_Error
 	 */
 	public function process_reg_step() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		// grab validated data from form
 		$valid_data = $this->checkout->current_step->valid_data();
 		// EEH_Debug_Tools::printr( $_REQUEST, '$_REQUEST', __FILE__, __LINE__ );
 		// EEH_Debug_Tools::printr( $valid_data, '$valid_data', __FILE__, __LINE__ );
 		// if we don't have any $valid_data then something went TERRIBLY WRONG !!!
-		if ( empty( $valid_data ))  {
+		if (empty($valid_data)) {
 			EE_Error::add_error(
-				__( 'No valid question responses were received.', 'event_espresso' ),
+				__('No valid question responses were received.', 'event_espresso'),
 				__FILE__,
 				__FUNCTION__,
 				__LINE__
 			);
 			return false;
 		}
-		if ( ! $this->checkout->transaction instanceof EE_Transaction || ! $this->checkout->continue_reg ) {
+		if ( ! $this->checkout->transaction instanceof EE_Transaction || ! $this->checkout->continue_reg) {
 			EE_Error::add_error(
-				__( 'A valid transaction could not be initiated for processing your registrations.', 'event_espresso' ),
+				__('A valid transaction could not be initiated for processing your registrations.', 'event_espresso'),
 				__FILE__,
 				__FUNCTION__,
 				__LINE__
@@ -760,11 +759,11 @@ 
 			return false;
 		}
 		// get cached registrations
-		$registrations = $this->checkout->transaction->registrations( $this->checkout->reg_cache_where_params );
+		$registrations = $this->checkout->transaction->registrations($this->checkout->reg_cache_where_params);
 		// verify we got the goods
-		if ( empty( $registrations )) {
+		if (empty($registrations)) {
 			EE_Error::add_error(
-				__( 'Your form data could not be applied to any valid registrations.', 'event_espresso' ),
+				__('Your form data could not be applied to any valid registrations.', 'event_espresso'),
 				__FILE__,
 				__FUNCTION__,
 				__LINE__
@@ -772,15 +771,15 @@ 
 			return false;
 		}
 		// extract attendee info from form data and save to model objects
-		$registrations_processed = $this->_process_registrations( $registrations, $valid_data );
+		$registrations_processed = $this->_process_registrations($registrations, $valid_data);
 		// if first pass thru SPCO,
 		// then let's check processed registrations against the total number of tickets in the cart
-		if ( $registrations_processed === false ) {
+		if ($registrations_processed === false) {
 			// but return immediately if the previous step exited early due to errors
 			return false;
-		} else if ( ! $this->checkout->revisit && $registrations_processed !== $this->checkout->total_ticket_count ) {
+		} else if ( ! $this->checkout->revisit && $registrations_processed !== $this->checkout->total_ticket_count) {
 			// generate a correctly translated string for all possible singular/plural combinations
-			if ( $this->checkout->total_ticket_count === 1 && $registrations_processed !== 1 ) {
+			if ($this->checkout->total_ticket_count === 1 && $registrations_processed !== 1) {
 				$error_msg = sprintf(
 					__(
 						'There was %1$d ticket in the Event Queue, but %2$ds registrations were processed',
@@ -789,7 +788,7 @@ 
 					$this->checkout->total_ticket_count,
 					$registrations_processed
 				);
-			} else if ( $this->checkout->total_ticket_count !== 1 && $registrations_processed === 1 ) {
+			} else if ($this->checkout->total_ticket_count !== 1 && $registrations_processed === 1) {
 				$error_msg = sprintf(
 					__(
 						'There was a total of %1$d tickets in the Event Queue, but only %2$ds registration was processed',
@@ -808,17 +807,17 @@ 
 					$registrations_processed
 				);
 			}
-			EE_Error::add_error( $error_msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($error_msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		// mark this reg step as completed
 		$this->set_completed();
 		$this->_set_success_message(
-			__( 'The Attendee Information Step has been successfully completed.', 'event_espresso' )
+			__('The Attendee Information Step has been successfully completed.', 'event_espresso')
 		);
 		//do action in case a plugin wants to do something with the data submitted in step 1.
 		//passes EE_Single_Page_Checkout, and it's posted data
-		do_action( 'AHEE__EE_Single_Page_Checkout__process_attendee_information__end', $this, $valid_data );
+		do_action('AHEE__EE_Single_Page_Checkout__process_attendee_information__end', $this, $valid_data);
 		return true;
 	}
 
@@ -832,9 +831,9 @@ 
 	 * @return boolean | int
 	 * @throws \EE_Error
 	 */
-	private function _process_registrations( $registrations = array(), $valid_data = array() ) {
+	private function _process_registrations($registrations = array(), $valid_data = array()) {
 		// load resources and set some defaults
-		EE_Registry::instance()->load_model( 'Attendee' );
+		EE_Registry::instance()->load_model('Attendee');
 		// holder for primary registrant attendee object
 		$this->checkout->primary_attendee_obj = NULL;
 		// array for tracking reg form data for the primary registrant
@@ -851,9 +850,9 @@ 
 		// attendee counter
 		$att_nmbr = 0;
 		// grab the saved registrations from the transaction
-		foreach ( $registrations  as $registration ) {
+		foreach ($registrations  as $registration) {
 			// verify EE_Registration object
-			if ( ! $registration instanceof EE_Registration ) {
+			if ( ! $registration instanceof EE_Registration) {
 				EE_Error::add_error(
 					__(
 						'An invalid Registration object was discovered when attempting to process your registration information.',
@@ -868,12 +867,12 @@ 
 			/** @var string $reg_url_link */
 			$reg_url_link = $registration->reg_url_link();
 			// reg_url_link exists ?
-			if ( ! empty( $reg_url_link ) ) {
+			if ( ! empty($reg_url_link)) {
 				// should this registration be processed during this visit ?
-				if ( $this->checkout->visit_allows_processing_of_this_registration( $registration ) ) {
+				if ($this->checkout->visit_allows_processing_of_this_registration($registration)) {
 					// if NOT revisiting, then let's save the registration now,
 					// so that we have a REG_ID to use when generating other objects
-					if ( ! $this->checkout->revisit ) {
+					if ( ! $this->checkout->revisit) {
 						$registration->save();
 					}
 					/**
@@ -883,7 +882,7 @@ 
 					 * @var bool   if true is returned by the plugin then the
 					 *      		registration processing is halted.
 					 */
-					if ( apply_filters(
+					if (apply_filters(
 						'FHEE__EE_SPCO_Reg_Step_Attendee_Information___process_registrations__pre_registration_process',
 						false,
 						$att_nmbr,
@@ -891,38 +890,38 @@ 
 						$registrations,
 						$valid_data,
 						$this
-					) ) {
+					)) {
 						return false;
 					}
 
 					// Houston, we have a registration!
 					$att_nmbr++;
-					$this->_attendee_data[ $reg_url_link ] = array();
+					$this->_attendee_data[$reg_url_link] = array();
 					// grab any existing related answer objects
 					$this->_registration_answers = $registration->answers();
 					// unset( $valid_data[ $reg_url_link ]['additional_attendee_reg_info'] );
-					if ( isset( $valid_data[ $reg_url_link ] ) ) {
+					if (isset($valid_data[$reg_url_link])) {
 						// do we need to copy basic info from primary attendee ?
-						$copy_primary = isset( $valid_data[ $reg_url_link ]['additional_attendee_reg_info'] )
-						                && absint( $valid_data[ $reg_url_link ]['additional_attendee_reg_info'] ) === 0
+						$copy_primary = isset($valid_data[$reg_url_link]['additional_attendee_reg_info'])
+						                && absint($valid_data[$reg_url_link]['additional_attendee_reg_info']) === 0
 							? true
 							: false;
 						// filter form input data for this registration
-						$valid_data[ $reg_url_link ] = (array)apply_filters(
+						$valid_data[$reg_url_link] = (array) apply_filters(
 							'FHEE__EE_Single_Page_Checkout__process_attendee_information__valid_data_line_item',
-							$valid_data[ $reg_url_link ]
+							$valid_data[$reg_url_link]
 						);
 						// EEH_Debug_Tools::printr( $valid_data[ $reg_url_link ], '$valid_data[ $reg_url_link ]', __FILE__, __LINE__ );
-						if ( isset( $valid_data['primary_attendee'] )) {
-							$primary_registrant['line_item_id'] =  ! empty( $valid_data['primary_attendee'] )
+						if (isset($valid_data['primary_attendee'])) {
+							$primary_registrant['line_item_id'] = ! empty($valid_data['primary_attendee'])
 								? $valid_data['primary_attendee']
 								: false;
-							unset( $valid_data['primary_attendee'] );
+							unset($valid_data['primary_attendee']);
 						}
 						// now loop through our array of valid post data && process attendee reg forms
-						foreach ( $valid_data[ $reg_url_link ] as $form_section => $form_inputs ) {
-							if ( ! in_array( $form_section, $non_input_form_sections )) {
-								foreach ( $form_inputs as $form_input => $input_value ) {
+						foreach ($valid_data[$reg_url_link] as $form_section => $form_inputs) {
+							if ( ! in_array($form_section, $non_input_form_sections)) {
+								foreach ($form_inputs as $form_input => $input_value) {
 									// \EEH_Debug_Tools::printr( $input_value, $form_input, __FILE__, __LINE__ );
 									// check for critical inputs
 									if (
@@ -936,16 +935,16 @@ 
 									// store a bit of data about the primary attendee
 									if (
 										$att_nmbr === 1
-										&& ! empty( $input_value )
+										&& ! empty($input_value)
 										&& $reg_url_link === $primary_registrant['line_item_id']
 									) {
-										$primary_registrant[ $form_input ] = $input_value;
+										$primary_registrant[$form_input] = $input_value;
 									} else if (
 										$copy_primary
 										&& $input_value === null
-										&& isset( $primary_registrant[ $form_input ] )
+										&& isset($primary_registrant[$form_input])
 									) {
-										$input_value = $primary_registrant[ $form_input ];
+										$input_value = $primary_registrant[$form_input];
 									}
 									// now attempt to save the input data
 									if (
@@ -987,55 +986,55 @@ 
 						// have we met before?
 						$attendee = $this->_find_existing_attendee(
 							$registration,
-							$this->_attendee_data[ $reg_url_link ]
+							$this->_attendee_data[$reg_url_link]
 						);
 						// did we find an already existing record for this attendee ?
-						if ( $attendee instanceof EE_Attendee ) {
+						if ($attendee instanceof EE_Attendee) {
 							$attendee = $this->_update_existing_attendee_data(
 								$attendee,
-								$this->_attendee_data[ $reg_url_link ]
+								$this->_attendee_data[$reg_url_link]
 							);
 						} else {
 							// ensure critical details are set for additional attendees
-							$this->_attendee_data[ $reg_url_link ] = $att_nmbr > 1
+							$this->_attendee_data[$reg_url_link] = $att_nmbr > 1
 								? $this->_copy_critical_attendee_details_from_primary_registrant(
-									$this->_attendee_data[ $reg_url_link ]
+									$this->_attendee_data[$reg_url_link]
 								)
-								: $this->_attendee_data[ $reg_url_link ];
+								: $this->_attendee_data[$reg_url_link];
 							$attendee = $this->_create_new_attendee(
 								$registration,
-								$this->_attendee_data[ $reg_url_link ]
+								$this->_attendee_data[$reg_url_link]
 							);
 						}
 						// who's #1 ?
-						if ( $att_nmbr === 1 ) {
+						if ($att_nmbr === 1) {
 							$this->checkout->primary_attendee_obj = $attendee;
 						}
 					}
 					// EEH_Debug_Tools::printr( $attendee, '$attendee', __FILE__, __LINE__ );
 					// add relation to registration, set attendee ID, and cache attendee
-					$this->_associate_attendee_with_registration( $registration, $attendee );
+					$this->_associate_attendee_with_registration($registration, $attendee);
 					// \EEH_Debug_Tools::printr( $registration, '$registration', __FILE__, __LINE__ );
-					if ( ! $registration->attendee() instanceof EE_Attendee ) {
-						EE_Error::add_error( sprintf( __( 'Registration %s has an invalid or missing Attendee object.', 'event_espresso' ), $reg_url_link ), __FILE__, __FUNCTION__, __LINE__ );
+					if ( ! $registration->attendee() instanceof EE_Attendee) {
+						EE_Error::add_error(sprintf(__('Registration %s has an invalid or missing Attendee object.', 'event_espresso'), $reg_url_link), __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( $registration, false );
+					$registration_processor->toggle_incomplete_registration_status_to_default($registration, false);
 					// we can also consider the TXN to not have been failed, so temporarily upgrade it's status to abandoned
 					$this->checkout->transaction->toggle_failed_transaction_status();
 					// if we've gotten this far, then let's save what we have
 					$registration->save();
 					// add relation between TXN and registration
-					$this->_associate_registration_with_transaction( $registration );
+					$this->_associate_registration_with_transaction($registration);
 				} // end of if ( ! $this->checkout->revisit || $this->checkout->primary_revisit || ( $this->checkout->revisit && $this->checkout->reg_url_link == $reg_url_link )) {
 
-			}  else {
-				EE_Error::add_error( __( 'An invalid or missing line item ID was encountered while attempting to process the registration form.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+			} else {
+				EE_Error::add_error(__('An invalid or missing line item ID was encountered while attempting to process the registration form.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				// remove malformed data
-				unset( $valid_data[ $reg_url_link ] );
+				unset($valid_data[$reg_url_link]);
 				return false;
 			}
 
@@ -1064,26 +1063,26 @@ 
 		// \EEH_Debug_Tools::printr( $input_value, '$input_value', __FILE__, __LINE__ );
 		// allow for plugins to hook in and do their own processing of the form input.
 		// For plugins to bypass normal processing here, they just need to return a boolean value.
-		if ( apply_filters(
+		if (apply_filters(
 			'FHEE__EE_SPCO_Reg_Step_Attendee_Information___save_registration_form_input',
 			false,
 			$registration,
 			$form_input,
 			$input_value,
 			$this
-		) ) {
+		)) {
 			return true;
 		}
 		// $answer_cache_id is the key used to find the EE_Answer we want
 		$answer_cache_id = $this->checkout->reg_url_link
 			? $form_input
-			: $form_input . '-' . $registration->reg_url_link();
-		$answer_is_obj = isset( $this->_registration_answers[ $answer_cache_id ] )
-		                 && $this->_registration_answers[ $answer_cache_id ] instanceof EE_Answer
+			: $form_input.'-'.$registration->reg_url_link();
+		$answer_is_obj = isset($this->_registration_answers[$answer_cache_id])
+		                 && $this->_registration_answers[$answer_cache_id] instanceof EE_Answer
 			? true
 			: false;
 		//rename form_inputs if they are EE_Attendee properties
-		switch( (string)$form_input ) {
+		switch ((string) $form_input) {
 
 			case 'state' :
 			case 'STA_ID' :
@@ -1098,32 +1097,32 @@ 
 				break;
 
 			default :
-				$ATT_input = 'ATT_' . $form_input;
+				$ATT_input = 'ATT_'.$form_input;
 				//EEH_Debug_Tools::printr( $ATT_input, '$ATT_input', __FILE__, __LINE__ );
-				$attendee_property = EEM_Attendee::instance()->has_field( $ATT_input ) ? true : false;
-				$form_input = $attendee_property ? 'ATT_' . $form_input : $form_input;
+				$attendee_property = EEM_Attendee::instance()->has_field($ATT_input) ? true : false;
+				$form_input = $attendee_property ? 'ATT_'.$form_input : $form_input;
 		}
 		// EEH_Debug_Tools::printr( $answer_cache_id, '$answer_cache_id', __FILE__, __LINE__ );
 		// EEH_Debug_Tools::printr( $attendee_property, '$attendee_property', __FILE__, __LINE__ );
 		// EEH_Debug_Tools::printr( $answer_is_obj, '$answer_is_obj', __FILE__, __LINE__ );
 		// if this form input has a corresponding attendee property
-		if ( $attendee_property ) {
-			$this->_attendee_data[ $registration->reg_url_link() ][ $form_input ] = $input_value;
-			if ( $answer_is_obj ) {
+		if ($attendee_property) {
+			$this->_attendee_data[$registration->reg_url_link()][$form_input] = $input_value;
+			if ($answer_is_obj) {
 				// and delete the corresponding answer since we won't be storing this data in that object
-				$registration->_remove_relation_to( $this->_registration_answers[ $answer_cache_id ], 'Answer' );
-				$this->_registration_answers[ $answer_cache_id ]->delete_permanently();
+				$registration->_remove_relation_to($this->_registration_answers[$answer_cache_id], 'Answer');
+				$this->_registration_answers[$answer_cache_id]->delete_permanently();
 			}
 			return true;
-		} elseif ( $answer_is_obj ) {
+		} elseif ($answer_is_obj) {
 			// save this data to the answer object
-			$this->_registration_answers[ $answer_cache_id ]->set_value( $input_value );
-			$result = $this->_registration_answers[ $answer_cache_id ]->save();
+			$this->_registration_answers[$answer_cache_id]->set_value($input_value);
+			$result = $this->_registration_answers[$answer_cache_id]->save();
 			return $result !== false ? true : false;
 		} else {
-			foreach ( $this->_registration_answers as $answer ) {
-				if ( $answer instanceof EE_Answer && $answer->question_ID() === $answer_cache_id ) {
-					$answer->set_value( $input_value );
+			foreach ($this->_registration_answers as $answer) {
+				if ($answer instanceof EE_Answer && $answer->question_ID() === $answer_cache_id) {
+					$answer->set_value($input_value);
 					$result = $answer->save();
 					return $result !== false ? true : false;
 				}
@@ -1145,15 +1144,15 @@ 
 		$form_input = '',
 		$input_value = ''
 	) {
-		if ( empty( $input_value ) ) {
+		if (empty($input_value)) {
 			// if the form input isn't marked as being required, then just return
-			if ( ! isset( $this->_required_questions[ $form_input ] ) || ! $this->_required_questions[ $form_input ] ) {
+			if ( ! isset($this->_required_questions[$form_input]) || ! $this->_required_questions[$form_input]) {
 				return true;
 			}
-			switch ( $form_input ) {
+			switch ($form_input) {
 				case 'fname' :
 					EE_Error::add_error(
-						__( 'First Name is a required value.', 'event_espresso' ),
+						__('First Name is a required value.', 'event_espresso'),
 						__FILE__,
 						__FUNCTION__,
 						__LINE__
@@ -1162,7 +1161,7 @@ 
 					break;
 				case 'lname' :
 					EE_Error::add_error(
-						__( 'Last Name is a required value.', 'event_espresso' ),
+						__('Last Name is a required value.', 'event_espresso'),
 						__FILE__,
 						__FUNCTION__,
 						__LINE__
@@ -1171,7 +1170,7 @@ 
 					break;
 				case 'email' :
 					EE_Error::add_error(
-						__( 'Please enter a valid email address.', 'event_espresso' ),
+						__('Please enter a valid email address.', 'event_espresso'),
 						__FILE__,
 						__FUNCTION__,
 						__LINE__
@@ -1193,30 +1192,30 @@ 
 	 * @return boolean|EE_Attendee
 	 * @throws \EE_Error
 	 */
-	private function _find_existing_attendee( EE_Registration $registration, $attendee_data = array() ) {
+	private function _find_existing_attendee(EE_Registration $registration, $attendee_data = array()) {
 		$existing_attendee = null;
 		// if none of the critical properties are set in the incoming attendee data...
 		// then attempt to copy them from the primary attendee
 		if (
-			! isset( $attendee_data['ATT_fname'], $attendee_data['ATT_lname'], $attendee_data['ATT_email'] )
+			! isset($attendee_data['ATT_fname'], $attendee_data['ATT_lname'], $attendee_data['ATT_email'])
 			&& $this->checkout->primary_attendee_obj instanceof EE_Attendee
 		) {
 			return $this->checkout->primary_attendee_obj;
 		}
 		// does this attendee already exist in the db ?
 		// we're searching using a combination of first name, last name, AND email address
-		$ATT_fname = isset( $attendee_data['ATT_fname'] ) && ! empty( $attendee_data['ATT_fname'] )
+		$ATT_fname = isset($attendee_data['ATT_fname']) && ! empty($attendee_data['ATT_fname'])
 			? $attendee_data['ATT_fname']
 			: '';
-		$ATT_lname = isset( $attendee_data['ATT_lname'] ) && ! empty( $attendee_data['ATT_lname'] )
+		$ATT_lname = isset($attendee_data['ATT_lname']) && ! empty($attendee_data['ATT_lname'])
 			? $attendee_data['ATT_lname']
 			: '';
-		$ATT_email = isset( $attendee_data['ATT_email'] ) && ! empty( $attendee_data['ATT_email'] )
+		$ATT_email = isset($attendee_data['ATT_email']) && ! empty($attendee_data['ATT_email'])
 			? $attendee_data['ATT_email']
 			: '';
 		// but only if those have values
-		if ( $ATT_fname && $ATT_lname && $ATT_email ) {
-			$existing_attendee = EEM_Attendee::instance()->find_existing_attendee( array(
+		if ($ATT_fname && $ATT_lname && $ATT_email) {
+			$existing_attendee = EEM_Attendee::instance()->find_existing_attendee(array(
 				'ATT_fname' => $ATT_fname,
 				'ATT_lname' => $ATT_lname,
 				'ATT_email' => $ATT_email
@@ -1240,13 +1239,13 @@ 
 	 * @return \EE_Attendee
 	 * @throws \EE_Error
 	 */
-	private function _update_existing_attendee_data( EE_Attendee $existing_attendee, $attendee_data = array() ) {
+	private function _update_existing_attendee_data(EE_Attendee $existing_attendee, $attendee_data = array()) {
 		// first remove fname, lname, and email from attendee data
-		$dont_set = array( 'ATT_fname', 'ATT_lname', 'ATT_email' );
+		$dont_set = array('ATT_fname', 'ATT_lname', 'ATT_email');
 		// now loop thru what's left and add to attendee CPT
-		foreach ( $attendee_data as $property_name => $property_value ) {
-			if ( ! in_array( $property_name, $dont_set ) && EEM_Attendee::instance()->has_field( $property_name )) {
-				$existing_attendee->set( $property_name, $property_value );
+		foreach ($attendee_data as $property_name => $property_value) {
+			if ( ! in_array($property_name, $dont_set) && EEM_Attendee::instance()->has_field($property_name)) {
+				$existing_attendee->set($property_name, $property_value);
 			}
 		}
 		// better save that now
@@ -1264,11 +1263,11 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	private function _associate_attendee_with_registration( EE_Registration $registration, EE_Attendee $attendee ) {
+	private function _associate_attendee_with_registration(EE_Registration $registration, EE_Attendee $attendee) {
 		// add relation to 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);
 	}
 
 
@@ -1280,10 +1279,10 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	private function _associate_registration_with_transaction( EE_Registration $registration ) {
+	private function _associate_registration_with_transaction(EE_Registration $registration) {
 		// add relation to attendee
-		$this->checkout->transaction->_add_relation_to( $registration, 'Registration' );
-		$this->checkout->transaction->update_cache_after_object_save( 'Registration', $registration );
+		$this->checkout->transaction->_add_relation_to($registration, 'Registration');
+		$this->checkout->transaction->update_cache_after_object_save('Registration', $registration);
 	}
 
 
@@ -1296,14 +1295,14 @@ 
 	 * @return array
 	 * @throws \EE_Error
 	 */
-	private function _copy_critical_attendee_details_from_primary_registrant( $attendee_data = array() ) {
+	private function _copy_critical_attendee_details_from_primary_registrant($attendee_data = array()) {
 		// bare minimum critical details include first name, last name, email address
-		$critical_attendee_details = array( 'ATT_fname', 'ATT_lname', 'ATT_email' );
+		$critical_attendee_details = array('ATT_fname', 'ATT_lname', 'ATT_email');
 		// add address info to critical details?
-		if ( apply_filters(
+		if (apply_filters(
 			'FHEE__EE_SPCO_Reg_Step_Attendee_Information__merge_address_details_with_critical_attendee_details',
 			false
-		) ) {
+		)) {
 			$address_details = array(
 				'ATT_address',
 				'ATT_address2',
@@ -1313,13 +1312,13 @@ 
 				'ATT_zip',
 				'ATT_phone'
 			);
-			$critical_attendee_details = array_merge( $critical_attendee_details, $address_details );
+			$critical_attendee_details = array_merge($critical_attendee_details, $address_details);
 		}
-		foreach ( $critical_attendee_details as $critical_attendee_detail ) {
-			if ( ! isset( $attendee_data[ $critical_attendee_detail ] )
-			     || empty( $attendee_data[ $critical_attendee_detail ] )
+		foreach ($critical_attendee_details as $critical_attendee_detail) {
+			if ( ! isset($attendee_data[$critical_attendee_detail])
+			     || empty($attendee_data[$critical_attendee_detail])
 			) {
-				$attendee_data[ $critical_attendee_detail ] = $this->checkout->primary_attendee_obj->get(
+				$attendee_data[$critical_attendee_detail] = $this->checkout->primary_attendee_obj->get(
 					$critical_attendee_detail
 				);
 			}
@@ -1337,11 +1336,11 @@ 
 	 * @return \EE_Attendee
 	 * @throws \EE_Error
 	 */
-	private function _create_new_attendee( EE_Registration $registration, $attendee_data = array() ) {
+	private function _create_new_attendee(EE_Registration $registration, $attendee_data = array()) {
 		// create new attendee object
-		$new_attendee = EE_Attendee::new_instance( $attendee_data );
+		$new_attendee = EE_Attendee::new_instance($attendee_data);
 		// set author to event creator
-		$new_attendee->set( 'ATT_author', $registration->event()->wp_user() );
+		$new_attendee->set('ATT_author', $registration->event()->wp_user());
 		$new_attendee->save();
 		return $new_attendee;
 	}
@@ -1358,7 +1357,7 @@ 
 	 */
 	public function update_reg_step() {
 		// save everything
-		if ( $this->process_reg_step() ) {
+		if ($this->process_reg_step()) {
 			$this->checkout->redirect = true;
 			$this->checkout->redirect_url = add_query_arg(
 				array(
@@ -1367,7 +1366,7 @@ 
 				),
 				$this->checkout->thank_you_page_url
 			);
-			$this->checkout->json_response->set_redirect_url( $this->checkout->redirect_url );
+			$this->checkout->json_response->set_redirect_url($this->checkout->redirect_url);
 			return true;
 		}
 		return false;