eventespresso / event-espresso-core

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/shortcodes/EE_Line_Item_List_Shortcodes.lib.php

Spacing +21 added lines, -21 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');
 
 /**
@@ -34,16 +34,16 @@ 
 		$this->_shortcodes = array(
 			'[TICKET_LINE_ITEM_LIST]' => __('Outputs a list of ticket line items.', 'event_espresso'),
 			'[TAX_LINE_ITEM_LIST]' => __('Outputs a list of tax line items.', 'event_espresso'),
-			'[ADDITIONAL_LINE_ITEM_LIST]' => __( 'Outputs a list of additional line items (other charges or discounts)', 'event_espresso' ),
+			'[ADDITIONAL_LINE_ITEM_LIST]' => __('Outputs a list of additional line items (other charges or discounts)', 'event_espresso'),
 			'[PRICE_MODIFIER_LINE_ITEM_LIST]' => __('Outputs a list of price modifier line items', 'event_espresso')
 			);
 	}
 
 
 
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 			case '[TICKET_LINE_ITEM_LIST]' :
 				return $this->_get_ticket_line_item_list();
 				break;
@@ -80,11 +80,11 @@ 
 		$this->_validate_list_requirements();
 		$this->_set_shortcode_helper();
 
-		if ( ! $this->_data['data'] instanceof EE_Ticket ) {
+		if ( ! $this->_data['data'] instanceof EE_Ticket) {
 			return '';
 		}
 
-		$valid_shortcodes = array( 'line_item', 'line_item_list', 'ticket' );
+		$valid_shortcodes = array('line_item', 'line_item_list', 'ticket');
 
 		$ticket = $this->_data['data'];
 		$templates = $this->_extra_data['template'];
@@ -94,10 +94,10 @@ 
 		$ticket_line_item = $addressee_obj->tickets[$ticket->ID()]['line_item'];
 		$sub_line_items = $addressee_obj->tickets[$ticket->ID()]['sub_line_items'];
 
-		$template = count( $sub_line_items ) < 2 ? $templates['ticket_line_item_no_pms'] : $templates['ticket_line_item_pms'];
+		$template = count($sub_line_items) < 2 ? $templates['ticket_line_item_no_pms'] : $templates['ticket_line_item_pms'];
 
 		//now we just return the appropriate template parsed for each ticket.
-		return $this->_shortcode_helper->parse_line_item_list_template( $template, $ticket_line_item, $valid_shortcodes, $this->_extra_data );
+		return $this->_shortcode_helper->parse_line_item_list_template($template, $ticket_line_item, $valid_shortcodes, $this->_extra_data);
 	}
 
 
@@ -115,18 +115,18 @@ 
 		$this->_validate_list_requirements();
 		$this->_set_shortcode_helper();
 
-		if ( ! $this->_data['data'] instanceof EE_Messages_Addressee ) {
+		if ( ! $this->_data['data'] instanceof EE_Messages_Addressee) {
 			return '';
 		}
 
 		//made it here so we're good to go.
-		$valid_shortcodes = array( 'line_item' );
+		$valid_shortcodes = array('line_item');
 		$templates = $this->_data['template'];
 
 		$tax_line_items = $this->_data['data']->tax_line_items;
 		$line_item_list = '';
-		foreach ( $tax_line_items as $line_item ) {
-			$line_item_list .= $this->_shortcode_helper->parse_line_item_list_template( $templates['tax_line_item_list'], $line_item, $valid_shortcodes, $this->_extra_data );
+		foreach ($tax_line_items as $line_item) {
+			$line_item_list .= $this->_shortcode_helper->parse_line_item_list_template($templates['tax_line_item_list'], $line_item, $valid_shortcodes, $this->_extra_data);
 		}
 
 		return $line_item_list;
@@ -144,18 +144,18 @@ 
 		$this->_validate_list_requirements();
 		$this->_set_shortcode_helper();
 
-		if ( ! $this->_data['data'] instanceof EE_Messages_Addressee ) {
+		if ( ! $this->_data['data'] instanceof EE_Messages_Addressee) {
 			return '';
 		}
 
 		//made it here so we're good to go.
-		$valid_shortcodes = array( 'line_item' );
+		$valid_shortcodes = array('line_item');
 		$templates = $this->_data['template'];
 
 		$additional_line_items = $this->_data['data']->additional_line_items;
 		$line_item_list = '';
-		foreach ( $additional_line_items as $line_item ) {
-			$line_item_list .= $this->_shortcode_helper->parse_line_item_list_template( $templates['additional_line_item_list'], $line_item, $valid_shortcodes, $this->_extra_data );
+		foreach ($additional_line_items as $line_item) {
+			$line_item_list .= $this->_shortcode_helper->parse_line_item_list_template($templates['additional_line_item_list'], $line_item, $valid_shortcodes, $this->_extra_data);
 		}
 
 
@@ -178,7 +178,7 @@ 
 		$this->_validate_list_requirements();
 		$this->_set_shortcode_helper();
 
-		if ( ! $this->_data['data'] instanceof EE_Line_Item ) {
+		if ( ! $this->_data['data'] instanceof EE_Line_Item) {
 			return '';
 		}
 
@@ -187,16 +187,16 @@ 
 		$templates = $this->_extra_data['template'];
 		$addressee_obj = $this->_extra_data['data'];
 
-		$valid_shortcodes = array( 'line_item' );
+		$valid_shortcodes = array('line_item');
 
 		$main_line_item_id = $main_line_item->ID();
 
-		$price_mod_line_items = ! empty( $addressee_obj->line_items_with_children[$main_line_item_id]['children'] ) ? $addressee_obj->line_items_with_children[$main_line_item_id]['children'] : array();
+		$price_mod_line_items = ! empty($addressee_obj->line_items_with_children[$main_line_item_id]['children']) ? $addressee_obj->line_items_with_children[$main_line_item_id]['children'] : array();
 
 		$line_item_list = '';
 
-		foreach( $price_mod_line_items as $line_item ) {
-			$line_item_list .= $this->_shortcode_helper->parse_line_item_list_template( $templates['price_modifier_line_item_list'], $line_item, $valid_shortcodes, $this->_extra_data  );
+		foreach ($price_mod_line_items as $line_item) {
+			$line_item_list .= $this->_shortcode_helper->parse_line_item_list_template($templates['price_modifier_line_item_list'], $line_item, $valid_shortcodes, $this->_extra_data);
 		}
 
 		return $line_item_list;

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');
+}
 
 /**
  *

modules/single_page_checkout/EED_Single_Page_Checkout.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
  *

Doc Comments +3 added lines, -3 removed lines

@@ -280,7 +280,7 @@ 
 	 *    process_registration_from_admin
 	 *
 	 * @access    public
-	 * @return    int
+	 * @return    EE_Transaction
 	 */
 	public static function process_registration_from_admin() {
 		EED_Single_Page_Checkout::load_reg_steps();
@@ -608,7 +608,7 @@ 
 	 * _get_transaction_and_cart_for_previous_visit
 	 *
 	 * @access private
-	 * 	@return mixed EE_Transaction|NULL
+	 * 	@return EE_Transaction|null EE_Transaction|NULL
 	 */
 	private function _get_transaction_and_cart_for_previous_visit() {
 		/** @var $TXN_model EEM_Transaction */
@@ -677,7 +677,7 @@ 
 	 * 	generates a new EE_Transaction object and adds it to the $_transaction property.
 	 *
 	 * 	@access private
-	 * 	@return mixed EE_Transaction|NULL
+	 * 	@return EE_Transaction|null EE_Transaction|NULL
 	 */
 	private function _initialize_transaction() {
 		try {

Spacing +268 added lines, -268 removed lines

@@ -38,7 +38,7 @@ 
 	 * @return EED_Single_Page_Checkout
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -83,20 +83,20 @@ 
 	 */
 	public static function set_hooks_admin() {
 		EED_Single_Page_Checkout::set_definitions();
-		if ( defined( 'DOING_AJAX' )) {
+		if (defined('DOING_AJAX')) {
 			EED_Single_Page_Checkout::load_request_handler();
 			EED_Single_Page_Checkout::load_reg_steps();
 		} else {
 			// hook into the top of pre_get_posts to set the reg step routing, which gives other modules or plugins a chance to modify the reg steps, but just before the routes get called
-			add_action( 'pre_get_posts', array( 'EED_Single_Page_Checkout', 'load_reg_steps' ), 1 );
+			add_action('pre_get_posts', array('EED_Single_Page_Checkout', 'load_reg_steps'), 1);
 		}
 		// set ajax hooks
-		add_action( 'wp_ajax_process_reg_step', array( 'EED_Single_Page_Checkout', 'process_reg_step' ));
-		add_action( 'wp_ajax_nopriv_process_reg_step', array( 'EED_Single_Page_Checkout', 'process_reg_step' ));
-		add_action( 'wp_ajax_display_spco_reg_step', array( 'EED_Single_Page_Checkout', 'display_reg_step' ));
-		add_action( 'wp_ajax_nopriv_display_spco_reg_step', array( 'EED_Single_Page_Checkout', 'display_reg_step' ));
-		add_action( 'wp_ajax_update_reg_step', array( 'EED_Single_Page_Checkout', 'update_reg_step' ));
-		add_action( 'wp_ajax_nopriv_update_reg_step', array( 'EED_Single_Page_Checkout', 'update_reg_step' ));
+		add_action('wp_ajax_process_reg_step', array('EED_Single_Page_Checkout', 'process_reg_step'));
+		add_action('wp_ajax_nopriv_process_reg_step', array('EED_Single_Page_Checkout', 'process_reg_step'));
+		add_action('wp_ajax_display_spco_reg_step', array('EED_Single_Page_Checkout', 'display_reg_step'));
+		add_action('wp_ajax_nopriv_display_spco_reg_step', array('EED_Single_Page_Checkout', 'display_reg_step'));
+		add_action('wp_ajax_update_reg_step', array('EED_Single_Page_Checkout', 'update_reg_step'));
+		add_action('wp_ajax_nopriv_update_reg_step', array('EED_Single_Page_Checkout', 'update_reg_step'));
 	}
 
 
@@ -105,8 +105,8 @@ 
 	 * 	process ajax request
 	 * @param string $ajax_action
 	 */
-	public static function process_ajax_request( $ajax_action ) {
-		EE_Registry::instance()->REQ->set( 'action', $ajax_action );
+	public static function process_ajax_request($ajax_action) {
+		EE_Registry::instance()->REQ->set('action', $ajax_action);
 		EED_Single_Page_Checkout::instance()->_initialize();
 	}
 
@@ -116,7 +116,7 @@ 
 	 * 	ajax display registration step
 	 */
 	public static function display_reg_step() {
-		EED_Single_Page_Checkout::process_ajax_request( 'display_spco_reg_step' );
+		EED_Single_Page_Checkout::process_ajax_request('display_spco_reg_step');
 	}
 
 
@@ -125,7 +125,7 @@ 
 	 * 	ajax process registration step
 	 */
 	public static function process_reg_step() {
-		EED_Single_Page_Checkout::process_ajax_request( 'process_reg_step' );
+		EED_Single_Page_Checkout::process_ajax_request('process_reg_step');
 	}
 
 
@@ -134,7 +134,7 @@ 
 	 * 	ajax process registration step
 	 */
 	public static function update_reg_step() {
-		EED_Single_Page_Checkout::process_ajax_request( 'update_reg_step' );
+		EED_Single_Page_Checkout::process_ajax_request('update_reg_step');
 	}
 
 
@@ -147,8 +147,8 @@ 
 	 */
 	public static function load_request_handler() {
 		// load core Request_Handler class
-		if ( ! isset( EE_Registry::instance()->REQ )) {
-			EE_Registry::instance()->load_core( 'Request_Handler' );
+		if ( ! isset(EE_Registry::instance()->REQ)) {
+			EE_Registry::instance()->load_core('Request_Handler');
 		}
 	}
 
@@ -161,13 +161,13 @@ 
 	 *  @return 	void
 	 */
 	public static function set_definitions() {
-		define( 'SPCO_BASE_PATH', rtrim( str_replace( array( '\\', '/' ), DS, plugin_dir_path( __FILE__ )), DS ) . DS );
-		define( 'SPCO_CSS_URL', plugin_dir_url( __FILE__ ) . 'css' . DS );
-		define( 'SPCO_IMG_URL', plugin_dir_url( __FILE__ ) . 'img' . DS );
-		define( 'SPCO_JS_URL', plugin_dir_url( __FILE__ ) . 'js' . DS );
-		define( 'SPCO_INC_PATH', SPCO_BASE_PATH . 'inc' . DS );
-		define( 'SPCO_TEMPLATES_PATH', SPCO_BASE_PATH . 'templates' . DS );
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder( SPCO_BASE_PATH, TRUE );
+		define('SPCO_BASE_PATH', rtrim(str_replace(array('\\', '/'), DS, plugin_dir_path(__FILE__)), DS).DS);
+		define('SPCO_CSS_URL', plugin_dir_url(__FILE__).'css'.DS);
+		define('SPCO_IMG_URL', plugin_dir_url(__FILE__).'img'.DS);
+		define('SPCO_JS_URL', plugin_dir_url(__FILE__).'js'.DS);
+		define('SPCO_INC_PATH', SPCO_BASE_PATH.'inc'.DS);
+		define('SPCO_TEMPLATES_PATH', SPCO_BASE_PATH.'templates'.DS);
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(SPCO_BASE_PATH, TRUE);
 	}
 
 
@@ -182,31 +182,31 @@ 
 	 */
 	public static function load_reg_steps() {
 		static $reg_steps_loaded = FALSE;
-		if ( $reg_steps_loaded ) {
+		if ($reg_steps_loaded) {
 			return;
 		}
 		// load EE_SPCO_Reg_Step base class
-		EE_Registry::instance()->load_file( SPCO_INC_PATH, 'EE_SPCO_Reg_Step', 'class'  );
+		EE_Registry::instance()->load_file(SPCO_INC_PATH, 'EE_SPCO_Reg_Step', 'class');
 		// filter list of reg_steps
-		$reg_steps_to_load = apply_filters( 'AHEE__SPCO__load_reg_steps__reg_steps_to_load', EED_Single_Page_Checkout::get_reg_steps() );
+		$reg_steps_to_load = apply_filters('AHEE__SPCO__load_reg_steps__reg_steps_to_load', EED_Single_Page_Checkout::get_reg_steps());
 		// sort by key (order)
-		ksort( $reg_steps_to_load );
+		ksort($reg_steps_to_load);
 		// loop through folders
-		foreach ( $reg_steps_to_load as $order => $reg_step ) {
+		foreach ($reg_steps_to_load as $order => $reg_step) {
 			// we need a
-			if ( isset( $reg_step['file_path'], $reg_step['class_name'], $reg_step['slug'] )) {
+			if (isset($reg_step['file_path'], $reg_step['class_name'], $reg_step['slug'])) {
 				// copy over to the reg_steps_array
-				EED_Single_Page_Checkout::$_reg_steps_array[ $order ] = $reg_step;
+				EED_Single_Page_Checkout::$_reg_steps_array[$order] = $reg_step;
 				// register custom key route for each reg step ( ie: step=>"slug" - this is the entire reason we load the reg steps array now )
-				EE_Config::register_route( $reg_step['slug'], 'EED_Single_Page_Checkout', 'run', 'step' );
+				EE_Config::register_route($reg_step['slug'], 'EED_Single_Page_Checkout', 'run', 'step');
 				// add AJAX or other hooks
-				if ( isset( $reg_step['has_hooks'] ) && $reg_step['has_hooks'] ) {
+				if (isset($reg_step['has_hooks']) && $reg_step['has_hooks']) {
 					// setup autoloaders if necessary
-					if ( ! class_exists( $reg_step['class_name'] )) {
-						EEH_Autoloader::register_autoloaders_for_each_file_in_folder( $reg_step['file_path'], TRUE );
+					if ( ! class_exists($reg_step['class_name'])) {
+						EEH_Autoloader::register_autoloaders_for_each_file_in_folder($reg_step['file_path'], TRUE);
 					}
-					if ( is_callable( $reg_step['class_name'], 'set_hooks' )) {
-						call_user_func( array( $reg_step['class_name'], 'set_hooks' ));
+					if (is_callable($reg_step['class_name'], 'set_hooks')) {
+						call_user_func(array($reg_step['class_name'], 'set_hooks'));
 					}
 				}
 			}
@@ -225,7 +225,7 @@ 
 	 */
 	public static function get_reg_steps() {
 		$reg_steps = EE_Registry::instance()->CFG->registration->reg_steps;
-		if ( empty( $reg_steps )) {
+		if (empty($reg_steps)) {
 			$reg_steps = array(
 				10 => array(
 					'file_path' => SPCO_INC_PATH,
@@ -266,9 +266,9 @@ 
 	 */
 	public static function registration_checkout_for_admin() {
 		EED_Single_Page_Checkout::load_reg_steps();
-		EE_Registry::instance()->REQ->set( 'step', 'attendee_information' );
-		EE_Registry::instance()->REQ->set( 'action', 'display_spco_reg_step' );
-		EE_Registry::instance()->REQ->set( 'process_form_submission', false );
+		EE_Registry::instance()->REQ->set('step', 'attendee_information');
+		EE_Registry::instance()->REQ->set('action', 'display_spco_reg_step');
+		EE_Registry::instance()->REQ->set('process_form_submission', false);
 		EED_Single_Page_Checkout::instance()->_initialize();
 		EED_Single_Page_Checkout::instance()->_display_spco_reg_form();
 		return EE_Registry::instance()->REQ->get_output();
@@ -284,14 +284,14 @@ 
 	 */
 	public static function process_registration_from_admin() {
 		EED_Single_Page_Checkout::load_reg_steps();
-		EE_Registry::instance()->REQ->set( 'step', 'attendee_information' );
-		EE_Registry::instance()->REQ->set( 'action', 'process_reg_step' );
-		EE_Registry::instance()->REQ->set( 'process_form_submission', true );
+		EE_Registry::instance()->REQ->set('step', 'attendee_information');
+		EE_Registry::instance()->REQ->set('action', 'process_reg_step');
+		EE_Registry::instance()->REQ->set('process_form_submission', true);
 		EED_Single_Page_Checkout::instance()->_initialize();
-		if ( EED_Single_Page_Checkout::instance()->checkout->current_step->completed() ) {
-			$final_reg_step = end( EED_Single_Page_Checkout::instance()->checkout->reg_steps );
-			if ( $final_reg_step instanceof EE_SPCO_Reg_Step_Finalize_Registration ) {
-				if ( $final_reg_step->process_reg_step() ) {
+		if (EED_Single_Page_Checkout::instance()->checkout->current_step->completed()) {
+			$final_reg_step = end(EED_Single_Page_Checkout::instance()->checkout->reg_steps);
+			if ($final_reg_step instanceof EE_SPCO_Reg_Step_Finalize_Registration) {
+				if ($final_reg_step->process_reg_step()) {
 					return EED_Single_Page_Checkout::instance()->checkout->transaction;
 				}
 			}
@@ -308,8 +308,8 @@ 
 	 * @param WP_Query $WP_Query
 	 * @return    void
 	 */
-	public function run( $WP_Query ) {
-		if ( $WP_Query instanceof WP_Query && $WP_Query->is_main_query() ) {
+	public function run($WP_Query) {
+		if ($WP_Query instanceof WP_Query && $WP_Query->is_main_query()) {
 			$this->_initialize();
 		}
 	}
@@ -324,8 +324,8 @@ 
 	 * @param WP_Query $WP_Query
 	 * @return    void
 	 */
-	public static function init( $WP_Query ) {
-		if ( $WP_Query instanceof WP_Query && $WP_Query->is_main_query() ) {
+	public static function init($WP_Query) {
+		if ($WP_Query instanceof WP_Query && $WP_Query->is_main_query()) {
 			EED_Single_Page_Checkout::instance()->_initialize();
 		}
 	}
@@ -341,7 +341,7 @@ 
 	 */
 	private function _initialize() {
 		// ensure SPCO doesn't run twice
-		if ( EED_Single_Page_Checkout::$_initialized ) {
+		if (EED_Single_Page_Checkout::$_initialized) {
 			return;
 		}
 		// setup the EE_Checkout object
@@ -349,22 +349,22 @@ 
 		// get the $_GET
 		$this->_get_request_vars();
 		// filter continue_reg
-		$this->checkout->continue_reg = apply_filters( 'FHEE__EED_Single_Page_Checkout__init___continue_reg', TRUE, $this->checkout );
+		$this->checkout->continue_reg = apply_filters('FHEE__EED_Single_Page_Checkout__init___continue_reg', TRUE, $this->checkout);
 		// load the reg steps array
-		if ( ! $this->_load_and_instantiate_reg_steps() ) {
+		if ( ! $this->_load_and_instantiate_reg_steps()) {
 			EED_Single_Page_Checkout::$_initialized = true;
 			return;
 		}
 		// set the current step
-		$this->checkout->set_current_step( $this->checkout->step );
+		$this->checkout->set_current_step($this->checkout->step);
 		// and the next step
 		$this->checkout->set_next_step();
 		// was there already a valid transaction in the checkout from the session ?
-		if ( ! $this->checkout->transaction instanceof EE_Transaction ) {
+		if ( ! $this->checkout->transaction instanceof EE_Transaction) {
 			// get transaction from db or session
 			$this->checkout->transaction = $this->checkout->reg_url_link && ! is_admin() ? $this->_get_transaction_and_cart_for_previous_visit() : $this->_get_cart_for_current_session_and_setup_new_transaction();
-			if ( ! $this->checkout->transaction instanceof EE_Transaction ) {
-				EE_Error::add_error( __( 'Your Registration and Transaction information could not be retrieved from the db.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__);
+			if ( ! $this->checkout->transaction instanceof EE_Transaction) {
+				EE_Error::add_error(__('Your Registration and Transaction information could not be retrieved from the db.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				// add some style and make it dance
 				$this->checkout->transaction = EE_Transaction::new_instance();
 				$this->add_styles_and_scripts();
@@ -372,10 +372,10 @@ 
 				return;
 			}
 			// and the registrations for the transaction
-			$this->_get_registrations( $this->checkout->transaction );
+			$this->_get_registrations($this->checkout->transaction);
 		}
 		// verify that everything has been setup correctly
-		if ( ! $this->_final_verifications() ) {
+		if ( ! $this->_final_verifications()) {
 			EED_Single_Page_Checkout::$_initialized = true;
 			return;
 		}
@@ -400,7 +400,7 @@ 
 		// set no cache headers and constants
 		EE_System::do_not_cache();
 		// remove transaction lock
-		add_action( 'shutdown', array( $this, 'unlock_transaction' ), 1 );
+		add_action('shutdown', array($this, 'unlock_transaction'), 1);
 	}
 
 
@@ -417,16 +417,16 @@ 
 		// look in session for existing checkout
 		$checkout = EE_Registry::instance()->SSN->checkout();
 		// verify
-		if ( ! $checkout instanceof EE_Checkout ) {
+		if ( ! $checkout instanceof EE_Checkout) {
 			// instantiate EE_Checkout object for handling the properties of the current checkout process
-			$checkout = EE_Registry::instance()->load_file( SPCO_INC_PATH, 'EE_Checkout', 'class', array(), FALSE  );
+			$checkout = EE_Registry::instance()->load_file(SPCO_INC_PATH, 'EE_Checkout', 'class', array(), FALSE);
 			// verify again
-			if ( ! $checkout instanceof EE_Checkout ) {
-				throw new EE_Error( __( 'The EE_Checkout class could not be loaded.', 'event_espresso' ) );
+			if ( ! $checkout instanceof EE_Checkout) {
+				throw new EE_Error(__('The EE_Checkout class could not be loaded.', 'event_espresso'));
 			}
 		} else {
-			if ( $checkout->current_step->is_final_step() && $checkout->exit_spco() === true )  {
-				wp_safe_redirect( $checkout->redirect_url );
+			if ($checkout->current_step->is_final_step() && $checkout->exit_spco() === true) {
+				wp_safe_redirect($checkout->redirect_url);
 				exit();
 			}
 		}
@@ -447,22 +447,22 @@ 
 		// load classes
 		EED_Single_Page_Checkout::load_request_handler();
 		//make sure this request is marked as belonging to EE
-		EE_Registry::instance()->REQ->set_espresso_page( TRUE );
+		EE_Registry::instance()->REQ->set_espresso_page(TRUE);
 		// which step is being requested ?
-		$this->checkout->step = EE_Registry::instance()->REQ->get( 'step', $this->_get_first_step() );
+		$this->checkout->step = EE_Registry::instance()->REQ->get('step', $this->_get_first_step());
 		// which step is being edited ?
-		$this->checkout->edit_step = EE_Registry::instance()->REQ->get( 'edit_step', '' );
+		$this->checkout->edit_step = EE_Registry::instance()->REQ->get('edit_step', '');
 		// and what we're doing on the current step
-		$this->checkout->action = EE_Registry::instance()->REQ->get( 'action', 'display_spco_reg_step' );
+		$this->checkout->action = EE_Registry::instance()->REQ->get('action', 'display_spco_reg_step');
 		// returning to edit ?
-		$this->checkout->reg_url_link = EE_Registry::instance()->REQ->get( 'e_reg_url_link', '' );
+		$this->checkout->reg_url_link = EE_Registry::instance()->REQ->get('e_reg_url_link', '');
 		// or some other kind of revisit ?
-		$this->checkout->revisit = EE_Registry::instance()->REQ->get( 'revisit', FALSE );
+		$this->checkout->revisit = EE_Registry::instance()->REQ->get('revisit', FALSE);
 		// and whether or not to generate a reg form for this request
-		$this->checkout->generate_reg_form = EE_Registry::instance()->REQ->get( 'generate_reg_form', TRUE ); 		// TRUE 	FALSE
+		$this->checkout->generate_reg_form = EE_Registry::instance()->REQ->get('generate_reg_form', TRUE); // TRUE 	FALSE
 		// and whether or not to process a reg form submission for this request
-		$this->checkout->process_form_submission = EE_Registry::instance()->REQ->get( 'process_form_submission', FALSE ); 		// TRUE 	FALSE
-		$this->checkout->process_form_submission = $this->checkout->action !== 'display_spco_reg_step' ? $this->checkout->process_form_submission : FALSE; 		// TRUE 	FALSE
+		$this->checkout->process_form_submission = EE_Registry::instance()->REQ->get('process_form_submission', FALSE); // TRUE 	FALSE
+		$this->checkout->process_form_submission = $this->checkout->action !== 'display_spco_reg_step' ? $this->checkout->process_form_submission : FALSE; // TRUE 	FALSE
 		//$this->_display_request_vars();
 	}
 
@@ -477,14 +477,14 @@ 
 	 * @return    array
 	 */
 	protected function _display_request_vars() {
-		EEH_Debug_Tools::printr( $_REQUEST, '$_REQUEST', __FILE__, __LINE__ );
-		EEH_Debug_Tools::printr( $this->checkout->step, '$this->checkout->step', __FILE__, __LINE__ );
-		EEH_Debug_Tools::printr( $this->checkout->edit_step, '$this->checkout->edit_step', __FILE__, __LINE__ );
-		EEH_Debug_Tools::printr( $this->checkout->action, '$this->checkout->action', __FILE__, __LINE__ );
-		EEH_Debug_Tools::printr( $this->checkout->reg_url_link, '$this->checkout->reg_url_link', __FILE__, __LINE__ );
-		EEH_Debug_Tools::printr( $this->checkout->revisit, '$this->checkout->revisit', __FILE__, __LINE__ );
-		EEH_Debug_Tools::printr( $this->checkout->generate_reg_form, '$this->checkout->generate_reg_form', __FILE__, __LINE__ );
-		EEH_Debug_Tools::printr( $this->checkout->process_form_submission, '$this->checkout->process_form_submission', __FILE__, __LINE__ );
+		EEH_Debug_Tools::printr($_REQUEST, '$_REQUEST', __FILE__, __LINE__);
+		EEH_Debug_Tools::printr($this->checkout->step, '$this->checkout->step', __FILE__, __LINE__);
+		EEH_Debug_Tools::printr($this->checkout->edit_step, '$this->checkout->edit_step', __FILE__, __LINE__);
+		EEH_Debug_Tools::printr($this->checkout->action, '$this->checkout->action', __FILE__, __LINE__);
+		EEH_Debug_Tools::printr($this->checkout->reg_url_link, '$this->checkout->reg_url_link', __FILE__, __LINE__);
+		EEH_Debug_Tools::printr($this->checkout->revisit, '$this->checkout->revisit', __FILE__, __LINE__);
+		EEH_Debug_Tools::printr($this->checkout->generate_reg_form, '$this->checkout->generate_reg_form', __FILE__, __LINE__);
+		EEH_Debug_Tools::printr($this->checkout->process_form_submission, '$this->checkout->process_form_submission', __FILE__, __LINE__);
 	}
 
 
@@ -498,8 +498,8 @@ 
 	 * @return    array
 	 */
 	private function _get_first_step() {
-		$first_step = reset( EED_Single_Page_Checkout::$_reg_steps_array );
-		return isset( $first_step['slug'] ) ? $first_step['slug'] : 'attendee_information';
+		$first_step = reset(EED_Single_Page_Checkout::$_reg_steps_array);
+		return isset($first_step['slug']) ? $first_step['slug'] : 'attendee_information';
 	}
 
 
@@ -514,35 +514,35 @@ 
 	 */
 	private function _load_and_instantiate_reg_steps() {
 		// have reg_steps already been instantiated ?
-		if ( empty( $this->checkout->reg_steps )) {
+		if (empty($this->checkout->reg_steps)) {
 			// if not, then loop through raw reg steps array
-			foreach ( EED_Single_Page_Checkout::$_reg_steps_array as $order => $reg_step ) {
-				if ( ! $this->_load_and_instantiate_reg_step( $reg_step, $order )) {
+			foreach (EED_Single_Page_Checkout::$_reg_steps_array as $order => $reg_step) {
+				if ( ! $this->_load_and_instantiate_reg_step($reg_step, $order)) {
 					return false;
 				}
 			}
 			EE_Registry::instance()->CFG->registration->skip_reg_confirmation = TRUE;
 			EE_Registry::instance()->CFG->registration->reg_confirmation_last = TRUE;
 			// skip the registration_confirmation page ?
-			if ( EE_Registry::instance()->CFG->registration->skip_reg_confirmation ) {
+			if (EE_Registry::instance()->CFG->registration->skip_reg_confirmation) {
 				// just remove it from the reg steps array
-				$this->checkout->remove_reg_step( 'registration_confirmation' );
-			} else if ( EE_Registry::instance()->CFG->registration->reg_confirmation_last && isset( 	$this->checkout->reg_steps['registration_confirmation'] )) {
+				$this->checkout->remove_reg_step('registration_confirmation');
+			} else if (EE_Registry::instance()->CFG->registration->reg_confirmation_last && isset($this->checkout->reg_steps['registration_confirmation'])) {
 				// set the order to something big like 100
-				$this->checkout->set_reg_step_order( 'registration_confirmation', 100 );
+				$this->checkout->set_reg_step_order('registration_confirmation', 100);
 			}
 			// filter the array for good luck
-			$this->checkout->reg_steps = apply_filters( 'FHEE__Single_Page_Checkout__load_reg_steps__reg_steps', $this->checkout->reg_steps );
+			$this->checkout->reg_steps = apply_filters('FHEE__Single_Page_Checkout__load_reg_steps__reg_steps', $this->checkout->reg_steps);
 			// finally re-sort based on the reg step class order properties
 			$this->checkout->sort_reg_steps();
 		} else {
-			foreach ( $this->checkout->reg_steps as $reg_step ) {
+			foreach ($this->checkout->reg_steps as $reg_step) {
 				// set all current step stati to FALSE
-				$reg_step->set_is_current_step( FALSE );
+				$reg_step->set_is_current_step(FALSE);
 			}
 		}
-		if ( empty( $this->checkout->reg_steps )) {
-			EE_Error::add_error( __( 'No Reg Steps were loaded..', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__);
+		if (empty($this->checkout->reg_steps)) {
+			EE_Error::add_error(__('No Reg Steps were loaded..', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 			// make reg step details available to JS
@@ -560,34 +560,34 @@ 
 	 * @param int   $order
 	 * @return bool
 	 */
-	private function _load_and_instantiate_reg_step( $reg_step = array(), $order = 0 ) {
+	private function _load_and_instantiate_reg_step($reg_step = array(), $order = 0) {
 
 		// we need a file_path, class_name, and slug to add a reg step
-		if ( isset( $reg_step['file_path'], $reg_step['class_name'], $reg_step['slug'] )) {
+		if (isset($reg_step['file_path'], $reg_step['class_name'], $reg_step['slug'])) {
 			// if editing a specific step, but this is NOT that step... (and it's not the 'finalize_registration' step)
-			if ( $this->checkout->reg_url_link && $this->checkout->step !== $reg_step['slug'] && $reg_step['slug'] !== 'finalize_registration' ) {
+			if ($this->checkout->reg_url_link && $this->checkout->step !== $reg_step['slug'] && $reg_step['slug'] !== 'finalize_registration') {
 				return true;
 			}
 			// instantiate step class using file path and class name
-			$reg_step_obj = EE_Registry::instance()->load_file( $reg_step['file_path'], $reg_step['class_name'], 'class', $this->checkout, FALSE  );
+			$reg_step_obj = EE_Registry::instance()->load_file($reg_step['file_path'], $reg_step['class_name'], 'class', $this->checkout, FALSE);
 			// did we gets the goods ?
-			if ( $reg_step_obj instanceof EE_SPCO_Reg_Step ) {
+			if ($reg_step_obj instanceof EE_SPCO_Reg_Step) {
 				// set reg step order based on config
-				$reg_step_obj->set_order( $order );
+				$reg_step_obj->set_order($order);
 				// add instantiated reg step object to the master reg steps array
-				$this->checkout->add_reg_step( $reg_step_obj );
+				$this->checkout->add_reg_step($reg_step_obj);
 			} else {
-				EE_Error::add_error( __( 'The current step could not be set.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error(__('The current step could not be set.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				return false;
 			}
 		} else {
-			if ( WP_DEBUG ) {
+			if (WP_DEBUG) {
 				EE_Error::add_error(
 					sprintf(
-						__( 'A registration step could not be loaded. One or more of the following data points is invalid:%4$s%5$sFile Path: %1$s%6$s%5$sClass Name: %2$s%6$s%5$sSlug: %3$s%6$s%7$s', 'event_espresso' ),
-						isset( $reg_step['file_path'] ) ? $reg_step['file_path'] : '',
-						isset( $reg_step['class_name'] ) ? $reg_step['class_name'] : '',
-						isset( $reg_step['slug'] ) ? $reg_step['slug'] : '',
+						__('A registration step could not be loaded. One or more of the following data points is invalid:%4$s%5$sFile Path: %1$s%6$s%5$sClass Name: %2$s%6$s%5$sSlug: %3$s%6$s%7$s', 'event_espresso'),
+						isset($reg_step['file_path']) ? $reg_step['file_path'] : '',
+						isset($reg_step['class_name']) ? $reg_step['class_name'] : '',
+						isset($reg_step['slug']) ? $reg_step['slug'] : '',
 						'<ul>',
 						'<li>',
 						'</li>',
@@ -611,16 +611,16 @@ 
 	 */
 	private function _get_transaction_and_cart_for_previous_visit() {
 		/** @var $TXN_model EEM_Transaction */
-		$TXN_model = EE_Registry::instance()->load_model( 'Transaction' );
+		$TXN_model = EE_Registry::instance()->load_model('Transaction');
 		// because the reg_url_link is present in the request, this is a return visit to SPCO, so we'll get the transaction data from the db
-		$transaction = $TXN_model->get_transaction_from_reg_url_link( $this->checkout->reg_url_link );
+		$transaction = $TXN_model->get_transaction_from_reg_url_link($this->checkout->reg_url_link);
 		// verify transaction
-		if ( $transaction instanceof EE_Transaction ) {
+		if ($transaction instanceof EE_Transaction) {
 			// and get the cart that was used for that transaction
-			$this->checkout->cart = $this->_get_cart_for_transaction( $transaction );
+			$this->checkout->cart = $this->_get_cart_for_transaction($transaction);
 			return $transaction;
 		} else {
-			EE_Error::add_error( __( 'Your Registration and Transaction information could not be retrieved from the db.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__);
+			EE_Error::add_error(__('Your Registration and Transaction information could not be retrieved from the db.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return NULL;
 		}
 	}
@@ -634,11 +634,11 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return EE_Cart
 	 */
-	private function _get_cart_for_transaction( $transaction ) {
-		$cart = $transaction instanceof EE_Transaction ? EE_Cart::get_cart_from_txn( $transaction ) : NULL;
+	private function _get_cart_for_transaction($transaction) {
+		$cart = $transaction instanceof EE_Transaction ? EE_Cart::get_cart_from_txn($transaction) : NULL;
 		// verify cart
-		if ( ! $cart instanceof EE_Cart ) {
-			$cart = EE_Registry::instance()->load_core( 'Cart' );
+		if ( ! $cart instanceof EE_Cart) {
+			$cart = EE_Registry::instance()->load_core('Cart');
 		}
 		return $cart;
 	}
@@ -655,17 +655,17 @@ 
 	private function _get_cart_for_current_session_and_setup_new_transaction() {
 		//  if there's no transaction, then this is the FIRST visit to SPCO
 		// so load up the cart ( passing nothing for the TXN because it doesn't exist yet )
-		$this->checkout->cart = $this->_get_cart_for_transaction( NULL );
+		$this->checkout->cart = $this->_get_cart_for_transaction(NULL);
 		// and then create a new transaction
 		$transaction = $this->_initialize_transaction();
 		// verify transaction
-		if ( $transaction instanceof EE_Transaction ) {
+		if ($transaction instanceof EE_Transaction) {
 			// save it so that we have an ID for other objects to use
 			$transaction->save();
 			// and save TXN data to the cart
-			$this->checkout->cart->get_grand_total()->save_this_and_descendants_to_txn( $transaction->ID() );
+			$this->checkout->cart->get_grand_total()->save_this_and_descendants_to_txn($transaction->ID());
 		} else {
-			EE_Error::add_error( __( 'A Valid Transaction could not be initialized.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error(__('A Valid Transaction could not be initialized.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
 		return $transaction;
 	}
@@ -681,15 +681,15 @@ 
 	private function _initialize_transaction() {
 		try {
 			// create new TXN
-			return EE_Transaction::new_instance( array(
-				'TXN_timestamp' 	=> current_time( 'timestamp' ),
+			return EE_Transaction::new_instance(array(
+				'TXN_timestamp' 	=> current_time('timestamp'),
 				'TXN_reg_steps' 		=> $this->checkout->initialize_txn_reg_steps_array(),
 				'TXN_total' 				=> $this->checkout->cart->get_cart_grand_total(),
 				'TXN_paid' 				=> 0,
 				'STS_ID' 					=> EEM_Transaction::failed_status_code,
 			));
-		} catch( Exception $e ) {
-			EE_Error::add_error( $e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
+		} catch (Exception $e) {
+			EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
 		}
 		return NULL;
 	}
@@ -703,34 +703,34 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return EE_Cart
 	 */
-	private function _get_registrations( EE_Transaction $transaction ) {
+	private function _get_registrations(EE_Transaction $transaction) {
 		// first step: grab the registrants  { : o
-		$registrations = $transaction->registrations( $this->checkout->reg_cache_where_params );
+		$registrations = $transaction->registrations($this->checkout->reg_cache_where_params);
 		// verify registrations have been set
-		if ( empty( $registrations )) {
+		if (empty($registrations)) {
 			// if no cached registrations, then check the db
-			$registrations = $transaction->registrations( $this->checkout->reg_cache_where_params );
+			$registrations = $transaction->registrations($this->checkout->reg_cache_where_params);
 			// still nothing ? well as long as this isn't a revisit
-			if ( empty( $registrations ) && ! $this->checkout->revisit ) {
+			if (empty($registrations) && ! $this->checkout->revisit) {
 				// generate new registrations from scratch
-				$registrations = $this->_initialize_registrations( $transaction );
+				$registrations = $this->_initialize_registrations($transaction);
 			}
 		}
 		// sort by their original registration order
-		usort( $registrations, array( 'EED_Single_Page_Checkout', 'sort_registrations_by_REG_count' ));
+		usort($registrations, array('EED_Single_Page_Checkout', 'sort_registrations_by_REG_count'));
 		// then loop thru the array
-		foreach ( $registrations as $registration ) {
+		foreach ($registrations as $registration) {
 			// verify each registration
-			if ( $registration instanceof EE_Registration ) {
+			if ($registration instanceof EE_Registration) {
 				// we display all attendee info for the primary registrant
-				if ( $this->checkout->reg_url_link == $registration->reg_url_link() && $registration->is_primary_registrant() ) {
+				if ($this->checkout->reg_url_link == $registration->reg_url_link() && $registration->is_primary_registrant()) {
 					$this->checkout->primary_revisit = TRUE;
 					break;
-				} else if ( $this->checkout->revisit && $this->checkout->reg_url_link != $registration->reg_url_link() ) {
+				} else if ($this->checkout->revisit && $this->checkout->reg_url_link != $registration->reg_url_link()) {
 					// but hide info if it doesn't belong to you
-					$transaction->clear_cache( 'Registration', $registration->ID() );
+					$transaction->clear_cache('Registration', $registration->ID());
 				}
-				$this->checkout->set_reg_status_updated( $registration->ID(), false );
+				$this->checkout->set_reg_status_updated($registration->ID(), false);
 			}
 		}
 	}
@@ -744,37 +744,37 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return    array
 	 */
-	private function _initialize_registrations( EE_Transaction $transaction ) {
+	private function _initialize_registrations(EE_Transaction $transaction) {
 		$registrations = array();
-		if ( $transaction instanceof EE_Transaction ) {
+		if ($transaction instanceof EE_Transaction) {
 			/** @type EE_Registration_Processor $registration_processor */
-			$registration_processor = EE_Registry::instance()->load_class( 'Registration_Processor' );
+			$registration_processor = EE_Registry::instance()->load_class('Registration_Processor');
 			$att_nmbr = 0;
 			$this->checkout->total_ticket_count = $this->checkout->cart->all_ticket_quantity_count();
 			// now let's add the cart items to the $transaction
-			foreach ( $this->checkout->cart->get_tickets() as $item ) {
+			foreach ($this->checkout->cart->get_tickets() as $item) {
 				// grab the related ticket object for this line_item
 				$ticket = $item->ticket();
-				if ( ! $ticket instanceof EE_Ticket ){
-					EE_Error::add_error(sprintf(__("Line item %s did not contain a valid ticket", "event_espresso"),$item->ID()), __FILE__, __FUNCTION__, __LINE__);
+				if ( ! $ticket instanceof EE_Ticket) {
+					EE_Error::add_error(sprintf(__("Line item %s did not contain a valid ticket", "event_espresso"), $item->ID()), __FILE__, __FUNCTION__, __LINE__);
 					break;
 				}
-				$first_datetime = $ticket->get_first_related( 'Datetime' );
-				if ( ! $first_datetime instanceof EE_Datetime ){
-					EE_Error::add_error(sprintf(__("The ticket (%s) is not associated with any valid datetimes.", "event_espresso"),$ticket->name()), __FILE__, __FUNCTION__, __LINE__ );
+				$first_datetime = $ticket->get_first_related('Datetime');
+				if ( ! $first_datetime instanceof EE_Datetime) {
+					EE_Error::add_error(sprintf(__("The ticket (%s) is not associated with any valid datetimes.", "event_espresso"), $ticket->name()), __FILE__, __FUNCTION__, __LINE__);
 					continue;
 				}
-				$event = $first_datetime->get_first_related( 'Event' );
-				if ( ! $event instanceof EE_Event ){
-					EE_Error::add_error(sprintf(__("The ticket (%s) is not associated with a valid event.", "event_espresso"),$ticket->name()),__FILE__,__FUNCTION__,__LINE__);
+				$event = $first_datetime->get_first_related('Event');
+				if ( ! $event instanceof EE_Event) {
+					EE_Error::add_error(sprintf(__("The ticket (%s) is not associated with a valid event.", "event_espresso"), $ticket->name()), __FILE__, __FUNCTION__, __LINE__);
 					continue;
 				}
 				//do the following for each ticket of this type they selected
-				for ( $x = 1; $x <= $item->quantity(); $x++ ) {
+				for ($x = 1; $x <= $item->quantity(); $x++) {
 					$att_nmbr++;
-					$reg_url_link = $registration_processor->generate_reg_url_link( $att_nmbr, $item );
+					$reg_url_link = $registration_processor->generate_reg_url_link($att_nmbr, $item);
 					// now create a new registration for the ticket
-					$registration = EE_Registration::new_instance( array(
+					$registration = EE_Registration::new_instance(array(
 						'EVT_ID' 					=> $event->ID(),
 						'TXN_ID' 					=> $transaction->ID(),
 						'TKT_ID' 					=> $ticket->ID(),
@@ -786,12 +786,12 @@ 
 						'REG_group_size' 	=> $this->checkout->total_ticket_count,
 						'REG_url_link'			=> $reg_url_link
 					));
-					$registration->set_reg_code( $registration_processor->generate_reg_code( $registration ));
+					$registration->set_reg_code($registration_processor->generate_reg_code($registration));
 					$registration->save();
-					$registration->_add_relation_to( $event, 'Event', array(), $event->ID() );
-					$registration->_add_relation_to( $item->ticket(), 'Ticket', array(), $item->ticket()->ID() );
-					$transaction->_add_relation_to( $registration, 'Registration' );
-					$registrations[ $registration->ID() ] = $registration;
+					$registration->_add_relation_to($event, 'Event', array(), $event->ID());
+					$registration->_add_relation_to($item->ticket(), 'Ticket', array(), $item->ticket()->ID());
+					$transaction->_add_relation_to($registration, 'Registration');
+					$registrations[$registration->ID()] = $registration;
 				}
 			}
 		}
@@ -808,12 +808,12 @@ 
 	 * @param EE_Registration $reg_B
 	 * @return array()
 	 */
-	public static function sort_registrations_by_REG_count( EE_Registration $reg_A, EE_Registration $reg_B ) {
+	public static function sort_registrations_by_REG_count(EE_Registration $reg_A, EE_Registration $reg_B) {
 		// this shouldn't ever happen within the same TXN, but oh well
-		if ( $reg_A->count() == $reg_B->count() ) {
+		if ($reg_A->count() == $reg_B->count()) {
 			return 0;
 		}
-		return ( $reg_A->count() > $reg_B->count() ) ? 1 : -1;
+		return ($reg_A->count() > $reg_B->count()) ? 1 : -1;
 	}
 
 
@@ -827,30 +827,30 @@ 
 	 *  @return 	bool
 	 */
 	private function _final_verifications() {
-		if ( ! $this->checkout->current_step instanceof EE_SPCO_Reg_Step ) {
-			EE_Error::add_error( __( 'We\'re sorry but the registration process can not proceed because one or more registration steps were not setup correctly. Please refresh the page and try again or contact support.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $this->checkout->current_step instanceof EE_SPCO_Reg_Step) {
+			EE_Error::add_error(__('We\'re sorry but the registration process can not proceed because one or more registration steps were not setup correctly. Please refresh the page and try again or contact support.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
-		if ( ! empty( $this->checkout->reg_url_link )) {
+		if ( ! empty($this->checkout->reg_url_link)) {
 			$valid_registrant = $this->checkout->transaction->primary_registration();
-			if ( ! $valid_registrant instanceof EE_Registration ) {
-				EE_Error::add_error( __( 'We\'re sorry but there appears to be an error with the "reg_url_link" or the primary registrant for this transaction. Please refresh the page and try again or contact support.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+			if ( ! $valid_registrant instanceof EE_Registration) {
+				EE_Error::add_error(__('We\'re sorry but there appears to be an error with the "reg_url_link" or the primary registrant for this transaction. Please refresh the page and try again or contact support.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				return false;
 			}
 			$valid_registrant = null;
-			foreach ( $this->checkout->transaction->registrations( $this->checkout->reg_cache_where_params ) as $registration ) {
-				if ( $registration instanceof EE_Registration ) {
-					if ( $registration->reg_url_link() == $this->checkout->reg_url_link ) {
+			foreach ($this->checkout->transaction->registrations($this->checkout->reg_cache_where_params) as $registration) {
+				if ($registration instanceof EE_Registration) {
+					if ($registration->reg_url_link() == $this->checkout->reg_url_link) {
 						$valid_registrant = $registration;
 					}
 				}
 			}
-			if ( ! $valid_registrant instanceof EE_Registration ) {
-				EE_Error::add_error( __( 'We\'re sorry but there appears to be an error with the "reg_url_link" or the transaction itself. Please refresh the page and try again or contact support.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+			if ( ! $valid_registrant instanceof EE_Registration) {
+				EE_Error::add_error(__('We\'re sorry but there appears to be an error with the "reg_url_link" or the transaction itself. Please refresh the page and try again or contact support.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				return false;
 			}
 		}
-		$this->checkout = apply_filters( 'FHEE__EED_Single_Page_Checkout___final_verifications__checkout', $this->checkout );
+		$this->checkout = apply_filters('FHEE__EED_Single_Page_Checkout___final_verifications__checkout', $this->checkout);
 		return true;
 	}
 
@@ -867,7 +867,7 @@ 
 	 */
 	private function _initialize_reg_steps() {
 		/** @type EE_Transaction_Processor $transaction_processor */
-		$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+		$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 		// call set_reg_step_initiated ???
 		if (
 			// first time visiting SPCO ?
@@ -876,24 +876,24 @@ 
 			&& $this->checkout->action === 'display_spco_reg_step'
 		) {
 			// set the start time for this reg step
-			if ( ! $transaction_processor->set_reg_step_initiated( $this->checkout->transaction, $this->checkout->current_step->slug() ) ) {
-				if ( WP_DEBUG ) {
-					EE_Error::add_error( sprintf(__( 'The "%1$s" registration step was not initialized properly.', 'event_espresso' ), $this->checkout->current_step->name() ), __FILE__, __FUNCTION__, __LINE__ );
+			if ( ! $transaction_processor->set_reg_step_initiated($this->checkout->transaction, $this->checkout->current_step->slug())) {
+				if (WP_DEBUG) {
+					EE_Error::add_error(sprintf(__('The "%1$s" registration step was not initialized properly.', 'event_espresso'), $this->checkout->current_step->name()), __FILE__, __FUNCTION__, __LINE__);
 				}
 			};
 		}
 		// loop thru all steps to call their individual "initialize" methods and set i18n strings for JS
-		foreach ( $this->checkout->reg_steps as $reg_step ) {
+		foreach ($this->checkout->reg_steps as $reg_step) {
 			$reg_step->initialize_reg_step();
 			// i18n
 			$reg_step->translate_js_strings();
-			if ( $reg_step->is_current_step() ) {
+			if ($reg_step->is_current_step()) {
 				// the text that appears on the reg step form submit button
 				$reg_step->set_submit_button_text();
 			}
 		}
 		// dynamically creates hook point like: AHEE__Single_Page_Checkout___initialize_reg_step__attendee_information
-		do_action( "AHEE__Single_Page_Checkout___initialize_reg_step__{$this->checkout->current_step->slug()}", $this->checkout->current_step );
+		do_action("AHEE__Single_Page_Checkout___initialize_reg_step__{$this->checkout->current_step->slug()}", $this->checkout->current_step);
 	}
 
 
@@ -906,38 +906,38 @@ 
 	 */
 	private function _check_form_submission() {
 		//does this request require the reg form to be generated ?
-		if ( $this->checkout->generate_reg_form ) {
+		if ($this->checkout->generate_reg_form) {
 			// ever heard that song by Blue Rodeo ?
 			try {
 				$this->checkout->current_step->reg_form = $this->checkout->current_step->generate_reg_form();
 				// if not displaying a form, then check for form submission
-				if ( $this->checkout->process_form_submission && $this->checkout->current_step->reg_form->was_submitted() ) {
+				if ($this->checkout->process_form_submission && $this->checkout->current_step->reg_form->was_submitted()) {
 					// clear out any old data in case this step is being run again
-					$this->checkout->current_step->set_valid_data( array() );
+					$this->checkout->current_step->set_valid_data(array());
 					// capture submitted form data
 					$this->checkout->current_step->reg_form->receive_form_submission(
-						apply_filters( 'FHEE__Single_Page_Checkout___check_form_submission__request_params', EE_Registry::instance()->REQ->params(), $this->checkout )
+						apply_filters('FHEE__Single_Page_Checkout___check_form_submission__request_params', EE_Registry::instance()->REQ->params(), $this->checkout)
 					);
 					// validate submitted form data
-					if ( ! $this->checkout->current_step->reg_form->is_valid() || ! $this->checkout->continue_reg ) {
+					if ( ! $this->checkout->current_step->reg_form->is_valid() || ! $this->checkout->continue_reg) {
 						// thou shall not pass !!!
 						$this->checkout->continue_reg = FALSE;
 						// any form validation errors?
-						if ( $this->checkout->current_step->reg_form->submission_error_message() != '' ) {
+						if ($this->checkout->current_step->reg_form->submission_error_message() != '') {
 							$submission_error_messages = array();
 							// bad, bad, bad registrant
-							foreach( $this->checkout->current_step->reg_form->get_validation_errors_accumulated() as $validation_error ){
-								if ( $validation_error instanceof EE_Validation_Error ) {
-									$submission_error_messages[] = sprintf( __( '%s : %s', 'event_espresso' ), $validation_error->get_form_section()->html_label_text(), $validation_error->getMessage() );
+							foreach ($this->checkout->current_step->reg_form->get_validation_errors_accumulated() as $validation_error) {
+								if ($validation_error instanceof EE_Validation_Error) {
+									$submission_error_messages[] = sprintf(__('%s : %s', 'event_espresso'), $validation_error->get_form_section()->html_label_text(), $validation_error->getMessage());
 								}
 							}
-							EE_Error::add_error( join( '<br />', $submission_error_messages ), __FILE__, __FUNCTION__, __LINE__ );
+							EE_Error::add_error(join('<br />', $submission_error_messages), __FILE__, __FUNCTION__, __LINE__);
 						}
 						// well not really... what will happen is we'll just get redirected back to redo the current step
 						$this->go_to_next_step();
 					}
 				}
-			} catch( EE_Error $e ) {
+			} catch (EE_Error $e) {
 				$e->get_error();
 			}
 		}
@@ -953,38 +953,38 @@ 
 	 */
 	private function _process_form_action() {
 		// what cha wanna do?
-		switch( $this->checkout->action ) {
+		switch ($this->checkout->action) {
 			// AJAX next step reg form
 			case 'display_spco_reg_step' :
 				$this->checkout->redirect = FALSE;
-				if ( EE_Registry::instance()->REQ->ajax ) {
-					$this->checkout->json_response->set_reg_step_html( $this->checkout->current_step->display_reg_form() );
+				if (EE_Registry::instance()->REQ->ajax) {
+					$this->checkout->json_response->set_reg_step_html($this->checkout->current_step->display_reg_form());
 				}
 				break;
 
 			default :
 				// meh... do one of those other steps first
-				if ( ! empty( $this->checkout->action ) && is_callable( array( $this->checkout->current_step, $this->checkout->action ))) {
+				if ( ! empty($this->checkout->action) && is_callable(array($this->checkout->current_step, $this->checkout->action))) {
 					// dynamically creates hook point like: AHEE__Single_Page_Checkout__before_attendee_information__process_reg_step
-					do_action( "AHEE__Single_Page_Checkout__before_{$this->checkout->current_step->slug()}__{$this->checkout->action}", $this->checkout->current_step );
+					do_action("AHEE__Single_Page_Checkout__before_{$this->checkout->current_step->slug()}__{$this->checkout->action}", $this->checkout->current_step);
 					// call action on current step
-					if ( call_user_func( array( $this->checkout->current_step, $this->checkout->action )) ) {
+					if (call_user_func(array($this->checkout->current_step, $this->checkout->action))) {
 						// good registrant, you get to proceed
-						if ( $this->checkout->current_step->success_message() != '' ) {
-							if ( apply_filters( 'FHEE__Single_Page_Checkout___process_form_action__display_success', false ) ) {
-								EE_Error::add_success( $this->checkout->current_step->success_message() . '<br />' . $this->checkout->next_step->_instructions() );
+						if ($this->checkout->current_step->success_message() != '') {
+							if (apply_filters('FHEE__Single_Page_Checkout___process_form_action__display_success', false)) {
+								EE_Error::add_success($this->checkout->current_step->success_message().'<br />'.$this->checkout->next_step->_instructions());
 							}
 						}
 						// pack it up, pack it in...
 						$this->_setup_redirect();
 					}
 					// dynamically creates hook point like: AHEE__Single_Page_Checkout__after_payment_options__process_reg_step
-					do_action( "AHEE__Single_Page_Checkout__after_{$this->checkout->current_step->slug()}__{$this->checkout->action}", $this->checkout->current_step );
+					do_action("AHEE__Single_Page_Checkout__after_{$this->checkout->current_step->slug()}__{$this->checkout->action}", $this->checkout->current_step);
 
 				} else {
 					EE_Error::add_error(
 						sprintf(
-							__( 'The requested form action "%s" does not exist for the current "%s" registration step.', 'event_espresso' ),
+							__('The requested form action "%s" does not exist for the current "%s" registration step.', 'event_espresso'),
 							$this->checkout->action,
 							$this->checkout->current_step->name()
 						),
@@ -1008,10 +1008,10 @@ 
 	 * 		@return 		void
 	 */
 	public function add_styles_and_scripts() {
-		if ( $this->checkout->admin_request ) {
-			add_action('admin_enqueue_scripts', array($this, 'enqueue_styles_and_scripts'), 10 );
+		if ($this->checkout->admin_request) {
+			add_action('admin_enqueue_scripts', array($this, 'enqueue_styles_and_scripts'), 10);
 		} else {
-			add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles_and_scripts' ), 10 );
+			add_action('wp_enqueue_scripts', array($this, 'enqueue_styles_and_scripts'), 10);
 		}
 	}
 
@@ -1027,45 +1027,45 @@ 
 		EE_Registry::$i18n_js_strings['revisit'] = $this->checkout->revisit;
 		EE_Registry::$i18n_js_strings['e_reg_url_link'] = $this->checkout->reg_url_link;
 		EE_Registry::$i18n_js_strings['server_error'] = __('An unknown error occurred on the server while attempting to process your request. Please refresh the page and try again or contact support.', 'event_espresso');
-		EE_Registry::$i18n_js_strings['invalid_json_response'] = __( 'An invalid response was returned from the server while attempting to process your request. Please refresh the page and try again or contact support.', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['validation_error'] = __( 'There appears to be a problem with the form validation configuration! Please check the admin settings or contact support.', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['invalid_payment_method'] = __( 'There appears to be a problem with the payment method configuration! Please refresh the page and try again or contact support.', 'event_espresso' );
+		EE_Registry::$i18n_js_strings['invalid_json_response'] = __('An invalid response was returned from the server while attempting to process your request. Please refresh the page and try again or contact support.', 'event_espresso');
+		EE_Registry::$i18n_js_strings['validation_error'] = __('There appears to be a problem with the form validation configuration! Please check the admin settings or contact support.', 'event_espresso');
+		EE_Registry::$i18n_js_strings['invalid_payment_method'] = __('There appears to be a problem with the payment method configuration! Please refresh the page and try again or contact support.', 'event_espresso');
 		EE_Registry::$i18n_js_strings['reg_step_error'] = __('This registration step could not be completed. Please refresh the page and try again.', 'event_espresso');
 		EE_Registry::$i18n_js_strings['invalid_coupon'] = __('We\'re sorry but that coupon code does not appear to be valid. If this is incorrect, please contact the site administrator.', 'event_espresso');
-		EE_Registry::$i18n_js_strings['process_registration'] = sprintf( __( 'Please wait while we process your registration.%sDo not refresh the page or navigate away while this is happening.%sThank you for your patience.', 'event_espresso' ), '<br/>', '<br/>' );
-		EE_Registry::$i18n_js_strings['language'] = get_bloginfo( 'language' );
+		EE_Registry::$i18n_js_strings['process_registration'] = sprintf(__('Please wait while we process your registration.%sDo not refresh the page or navigate away while this is happening.%sThank you for your patience.', 'event_espresso'), '<br/>', '<br/>');
+		EE_Registry::$i18n_js_strings['language'] = get_bloginfo('language');
 		EE_Registry::$i18n_js_strings['EESID'] = EE_Registry::instance()->SSN->id();
 		EE_Registry::$i18n_js_strings['datepicker_yearRange'] = '-150:+20';
-		EE_Registry::$i18n_js_strings['timer_years'] = __( 'years', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_months'] = __( 'months', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_weeks'] = __( 'weeks', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_days'] = __( 'days', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_hours'] = __( 'hours', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_minutes'] = __( 'minutes', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_seconds'] = __( 'seconds', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_year'] = __( 'year', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_month'] = __( 'month', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_week'] = __( 'week', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_day'] = __( 'day', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_hour'] = __( 'hour', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_minute'] = __( 'minute', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_second'] = __( 'second', 'event_espresso' );
+		EE_Registry::$i18n_js_strings['timer_years'] = __('years', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_months'] = __('months', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_weeks'] = __('weeks', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_days'] = __('days', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_hours'] = __('hours', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_minutes'] = __('minutes', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_seconds'] = __('seconds', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_year'] = __('year', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_month'] = __('month', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_week'] = __('week', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_day'] = __('day', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_hour'] = __('hour', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_minute'] = __('minute', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_second'] = __('second', 'event_espresso');
 		EE_Registry::$i18n_js_strings['registration_expiration_notice'] = sprintf(
-			__( '%1$sWe\'re sorry, but you\'re registration time has expired
+			__('%1$sWe\'re sorry, but you\'re registration time has expired
 			.%2$s%3$s%4$sIf you still wish to complete your registration, please
 			return to the %5$sEvent List%6$sEvent List%7$s and reselect your
 			tickets if available. Please except our apologies for any inconvenience this
-			may have caused.%8$s', 'event_espresso' ),
+			may have caused.%8$s', 'event_espresso'),
 			'<h4 class="important-notice">',
 			'</h4>',
 			'<br />',
 			'<p>',
-			'<a href="'. get_post_type_archive_link( 'espresso_events' ) . '" title="',
+			'<a href="'.get_post_type_archive_link('espresso_events').'" title="',
 			'">',
 			'</a>',
 			'</p>'
 		);
-		EE_Registry::$i18n_js_strings[ 'ajax_submit' ] = apply_filters( 'FHEE__Single_Page_Checkout__translate_js_strings__ajax_submit', true );
+		EE_Registry::$i18n_js_strings['ajax_submit'] = apply_filters('FHEE__Single_Page_Checkout__translate_js_strings__ajax_submit', true);
 	}
 
 
@@ -1078,28 +1078,28 @@ 
 	 */
 	public function enqueue_styles_and_scripts() {
 		// load css
-		wp_register_style( 'single_page_checkout', SPCO_CSS_URL . 'single_page_checkout.css', array(), EVENT_ESPRESSO_VERSION );
-		wp_enqueue_style( 'single_page_checkout' );
+		wp_register_style('single_page_checkout', SPCO_CSS_URL.'single_page_checkout.css', array(), EVENT_ESPRESSO_VERSION);
+		wp_enqueue_style('single_page_checkout');
 		// i18n
 		$this->translate_js_strings();
 		// load JS
-		wp_register_script( 'jquery_plugin', EE_THIRD_PARTY_URL . 'jquery	.plugin.min.js', array( 'jquery' ), '1.0.1', TRUE );
-		wp_register_script( 'jquery_countdown', EE_THIRD_PARTY_URL . 'jquery	.countdown.min.js', array( 'jquery_plugin' ), '2.0.2', TRUE );
-		wp_register_script( 'single_page_checkout', SPCO_JS_URL . 'single_page_checkout.js', array( 'espresso_core', 'underscore', 'ee_form_section_validation', 'jquery_countdown' ), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_enqueue_script( 'single_page_checkout' );
-		wp_localize_script( 'single_page_checkout', 'eei18n', EE_Registry::$i18n_js_strings );
+		wp_register_script('jquery_plugin', EE_THIRD_PARTY_URL.'jquery	.plugin.min.js', array('jquery'), '1.0.1', TRUE);
+		wp_register_script('jquery_countdown', EE_THIRD_PARTY_URL.'jquery	.countdown.min.js', array('jquery_plugin'), '2.0.2', TRUE);
+		wp_register_script('single_page_checkout', SPCO_JS_URL.'single_page_checkout.js', array('espresso_core', 'underscore', 'ee_form_section_validation', 'jquery_countdown'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_enqueue_script('single_page_checkout');
+		wp_localize_script('single_page_checkout', 'eei18n', EE_Registry::$i18n_js_strings);
 
 		/**
 		 * global action hook for enqueueing styles and scripts with
 		 * spco calls.
 		 */
-		do_action( 'AHEE__EED_Single_Page_Checkout__enqueue_styles_and_scripts', $this );
+		do_action('AHEE__EED_Single_Page_Checkout__enqueue_styles_and_scripts', $this);
 
 		/**
 		 * dynamic action hook for enqueueing styles and scripts with spco calls.
 		 * The hook will end up being something like AHEE__EED_Single_Page_Checkout__enqueue_styles_and_scripts__attendee_information
 		 */
-		do_action( 'AHEE__EED_Single_Page_Checkout__enqueue_styles_and_scripts__' . $this->checkout->current_step->slug(), $this );
+		do_action('AHEE__EED_Single_Page_Checkout__enqueue_styles_and_scripts__'.$this->checkout->current_step->slug(), $this);
 
 		// add css and JS for current step
 		$this->checkout->current_step->enqueue_styles_and_scripts();
@@ -1115,11 +1115,11 @@ 
 	 */
 	private function _display_spco_reg_form() {
 		// if registering via the admin, just display the reg form for the current step
-		if ( $this->checkout->admin_request ) {
-			EE_Registry::instance()->REQ->add_output( $this->checkout->current_step->display_reg_form() );
+		if ($this->checkout->admin_request) {
+			EE_Registry::instance()->REQ->add_output($this->checkout->current_step->display_reg_form());
 		} else {
 			// add powered by EE msg
-			add_action( 'AHEE__SPCO__reg_form_footer', array( 'EED_Single_Page_Checkout', 'display_registration_footer' ));
+			add_action('AHEE__SPCO__reg_form_footer', array('EED_Single_Page_Checkout', 'display_registration_footer'));
 			$this->checkout->registration_form = new EE_Form_Section_Proper(
 				array(
 					'name' 	=> 'single-page-checkout',
@@ -1127,17 +1127,17 @@ 
 					'layout_strategy' =>
 						new EE_Template_Layout(
 							array(
-								'layout_template_file' 			=> SPCO_TEMPLATES_PATH . 'registration_page_wrapper.template.php',
+								'layout_template_file' 			=> SPCO_TEMPLATES_PATH.'registration_page_wrapper.template.php',
 								'template_args' => array(
-									'empty_cart' 		=> count( $this->checkout->transaction->registrations( $this->checkout->reg_cache_where_params )) < 1 ? TRUE : FALSE,
+									'empty_cart' 		=> count($this->checkout->transaction->registrations($this->checkout->reg_cache_where_params)) < 1 ? TRUE : FALSE,
 									'revisit' 				=> $this->checkout->revisit,
 									'reg_steps' 			=> $this->checkout->reg_steps,
 									'next_step' 			=>  $this->checkout->next_step instanceof EE_SPCO_Reg_Step ? $this->checkout->next_step->slug() : '',
 									'empty_msg' 		=> apply_filters(
 										'FHEE__Single_Page_Checkout__display_spco_reg_form__empty_msg',
 										sprintf(
-											__( 'You need to %1$sReturn to Events list%2$sselect at least one event%3$s before you can proceed with the registration process.', 'event_espresso' ),
-											'<a href="'. get_post_type_archive_link( 'espresso_events' ) . '" title="',
+											__('You need to %1$sReturn to Events list%2$sselect at least one event%3$s before you can proceed with the registration process.', 'event_espresso'),
+											'<a href="'.get_post_type_archive_link('espresso_events').'" title="',
 											'">',
 											'</a>'
 										)
@@ -1145,16 +1145,16 @@ 
 									'registration_time_limit' =>
 										$this->checkout->get_registration_time_limit(),
 									'session_expiration' =>
-										gmdate( 'M d, Y H:i:s',
+										gmdate('M d, Y H:i:s',
 											EE_Registry::instance()
-											->SSN->expiration() + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS ) )
+											->SSN->expiration() + (get_option('gmt_offset') * HOUR_IN_SECONDS))
 								)
 							)
 						)
 				)
 			);
 			// load template and add to output sent that gets filtered into the_content()
-			EE_Registry::instance()->REQ->add_output( $this->checkout->registration_form->get_html_and_js() );
+			EE_Registry::instance()->REQ->add_output($this->checkout->registration_form->get_html_and_js());
 		}
 	}
 
@@ -1168,8 +1168,8 @@ 
 	 * @internal  param string $label
 	 * @return        string
 	 */
-	public function add_extra_finalize_registration_inputs( $next_step ) {
-		if ( $next_step == 'finalize_registration' ) {
+	public function add_extra_finalize_registration_inputs($next_step) {
+		if ($next_step == 'finalize_registration') {
 			echo '<div id="spco-extra-finalize_registration-inputs-dv"></div>';
 		}
 	}
@@ -1183,18 +1183,18 @@ 
 	 *  @return 	string
 	 */
 	public static function display_registration_footer() {
-		if ( apply_filters( 'FHEE__EE_Front__Controller__show_reg_footer', EE_Registry::instance()->CFG->admin->show_reg_footer ) ) {
-			EE_Registry::instance()->CFG->admin->affiliate_id = ! empty( EE_Registry::instance()->CFG->admin->affiliate_id ) ? EE_Registry::instance()->CFG->admin->affiliate_id : 'default';
-			$url = add_query_arg( array( 'ap_id' => EE_Registry::instance()->CFG->admin->affiliate_id ), 'http://eventespresso.com/' );
-			$url = apply_filters( 'FHEE__EE_Front_Controller__registration_footer__url', $url );
+		if (apply_filters('FHEE__EE_Front__Controller__show_reg_footer', EE_Registry::instance()->CFG->admin->show_reg_footer)) {
+			EE_Registry::instance()->CFG->admin->affiliate_id = ! empty(EE_Registry::instance()->CFG->admin->affiliate_id) ? EE_Registry::instance()->CFG->admin->affiliate_id : 'default';
+			$url = add_query_arg(array('ap_id' => EE_Registry::instance()->CFG->admin->affiliate_id), 'http://eventespresso.com/');
+			$url = apply_filters('FHEE__EE_Front_Controller__registration_footer__url', $url);
 			echo apply_filters(
 				'FHEE__EE_Front_Controller__display_registration_footer',
 				sprintf(
-					__( '%1$sEvent Registration Powered by Event Espresso%2$sEvent Registration and Ticketing%3$s Powered by %4$sEvent Espresso - Event Registration and Management System for WordPress%5$sEvent Espresso%6$s', 'event_espresso' ),
-					'<div id="espresso-registration-footer-dv"><a href="' . $url . '" title="',
+					__('%1$sEvent Registration Powered by Event Espresso%2$sEvent Registration and Ticketing%3$s Powered by %4$sEvent Espresso - Event Registration and Management System for WordPress%5$sEvent Espresso%6$s', 'event_espresso'),
+					'<div id="espresso-registration-footer-dv"><a href="'.$url.'" title="',
 					'" target="_blank">',
 					'</a>',
-					'<a href="' . $url . '" title="',
+					'<a href="'.$url.'" title="',
 					'" target="_blank">',
 					'</a></div>'
 				)
@@ -1225,12 +1225,12 @@ 
 	 * @return 	array
 	 */
 	private function _setup_redirect() {
-		if ( $this->checkout->continue_reg && $this->checkout->next_step instanceof EE_SPCO_Reg_Step ) {
+		if ($this->checkout->continue_reg && $this->checkout->next_step instanceof EE_SPCO_Reg_Step) {
 			$this->checkout->redirect = TRUE;
-			if ( empty( $this->checkout->redirect_url )) {
+			if (empty($this->checkout->redirect_url)) {
 				$this->checkout->redirect_url = $this->checkout->next_step->reg_step_url();
 			}
-			$this->checkout->redirect_url = apply_filters( 'FHEE__EED_Single_Page_Checkout___setup_redirect__checkout_redirect_url', $this->checkout->redirect_url, $this->checkout );
+			$this->checkout->redirect_url = apply_filters('FHEE__EED_Single_Page_Checkout___setup_redirect__checkout_redirect_url', $this->checkout->redirect_url, $this->checkout);
 		}
 	}
 
@@ -1243,7 +1243,7 @@ 
 	 * @return void
 	 */
 	public function go_to_next_step() {
-		if ( $this->checkout->admin_request || $this->checkout->action == 'redirect_form' ) {
+		if ($this->checkout->admin_request || $this->checkout->action == 'redirect_form') {
 			return;
 		}
 		// AJAX response
@@ -1264,7 +1264,7 @@ 
 	 */
 	protected function _handle_json_response() {
 		// if this is an ajax request
-		if ( EE_Registry::instance()->REQ->ajax ) {
+		if (EE_Registry::instance()->REQ->ajax) {
 			// DEBUG LOG
 			//$this->checkout->log(
 			//	__CLASS__, __FUNCTION__, __LINE__,
@@ -1274,9 +1274,9 @@ 
 			//		'continue_reg'               => $this->checkout->continue_reg,
 			//	)
 			//);
-			$this->checkout->json_response->set_registration_time_limit( $this->checkout->get_registration_time_limit() );
+			$this->checkout->json_response->set_registration_time_limit($this->checkout->get_registration_time_limit());
 			// just send the ajax (
-			$json_response = apply_filters( 'FHEE__EE_Single_Page_Checkout__JSON_response', $this->checkout->json_response );
+			$json_response = apply_filters('FHEE__EE_Single_Page_Checkout__JSON_response', $this->checkout->json_response);
 			$this->unlock_transaction();
 			echo $json_response;
 			exit();
@@ -1293,9 +1293,9 @@ 
 	 */
 	protected function _handle_html_redirects() {
 		// going somewhere ?
-		if ( $this->checkout->redirect && ! empty( $this->checkout->redirect_url ) ) {
+		if ($this->checkout->redirect && ! empty($this->checkout->redirect_url)) {
 			// store notices in a transient
-			EE_Error::get_notices( false, true, true );
+			EE_Error::get_notices(false, true, true);
 			$this->unlock_transaction();
 			// DEBUG LOG
 			//$this->checkout->log(
@@ -1306,7 +1306,7 @@ 
 			//		'headers_list'    => headers_list(),
 			//	)
 			//);
-			wp_safe_redirect( $this->checkout->redirect_url );
+			wp_safe_redirect($this->checkout->redirect_url);
 			exit();
 		}
 	}

payment_methods/Bank/EE_PMT_Bank.pm.php

Spacing +9 added lines, -9 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -25,7 +25,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EE_PMT_Bank extends EE_PMT_Base{
+class EE_PMT_Bank extends EE_PMT_Base {
 
 
 
@@ -38,7 +38,7 @@ 
 		$this->_pretty_name = __("Bank", 'event_espresso');
 		parent::__construct($pm_instance);
 		$this->_default_button_url = $this->file_url().'lib'.DS.'bank-logo.png';
-		$this->_default_description = __( 'Make payment using an electronic funds transfer from your bank.', 'event_espresso' );
+		$this->_default_description = __('Make payment using an electronic funds transfer from your bank.', 'event_espresso');
 	}
 
 
@@ -48,7 +48,7 @@ 
 	 * @param \EE_Transaction $transaction
 	 * @return NULL
 	 */
-	public function generate_new_billing_form( EE_Transaction $transaction = NULL ) {
+	public function generate_new_billing_form(EE_Transaction $transaction = NULL) {
 		return NULL;
 	}
 
@@ -62,12 +62,12 @@ 
 		return new EE_Payment_Method_Form(array(
 			'extra_meta_inputs'=>array(
 				'page_title'=>new EE_Text_Input(array(
-					'html_label_text'=>  sprintf(__("Title %s", "event_espresso"),  $this->get_help_tab_link()),
+					'html_label_text'=>  sprintf(__("Title %s", "event_espresso"), $this->get_help_tab_link()),
 					'default'=>  __("Electronic Funds Transfers", 'event_espresso')
 				)),
 				'payment_instructions'=>new EE_Text_Area_Input(array(
-					'html_label_text'=>  sprintf(__("Payment Instructions %s", "event_espresso"),  $this->get_help_tab_link()),
-					'html_help_text' => __( 'Provide instructions on how registrants can send the bank draft payment. Eg, mention your account name, bank account number, bank name, bank routing code, and bank address, etc.', 'event_espresso' ),
+					'html_label_text'=>  sprintf(__("Payment Instructions %s", "event_espresso"), $this->get_help_tab_link()),
+					'html_help_text' => __('Provide instructions on how registrants can send the bank draft payment. Eg, mention your account name, bank account number, bank name, bank routing code, and bank address, etc.', 'event_espresso'),
 					'default'=>  __('Please initiate an electronic payment using the following bank information: <br/> Account Owner: Luke Skywalker <br/>Bank Account # 1234567890 <br/>Bank Name: Rebellion Bank <br/>Routing Number: 12345 <br/>Bank Address: 12345 Wookie Rd., Planet Corellian. <br/>  Payment must be received within 48 hours of event date.', 'event_espresso')
 				)),
 			),
@@ -82,7 +82,7 @@ 
 	 * @see EE_PMT_Base::help_tabs_config()
 	 * @return array
 	 */
-	public function help_tabs_config(){
+	public function help_tabs_config() {
 		return array(
 			$this->get_help_tab_name() => array(
 						'title' => __('Bank Draft Settings', 'event_espresso'),
@@ -99,7 +99,7 @@ 
 	 * Other gateways may want to override this, such as offline gateways.
 	 * @return string
 	 */
-	public function payment_overview_content(EE_Payment $payment){
+	public function payment_overview_content(EE_Payment $payment) {
 		EE_Registry::instance()->load_helper('Template');
 		$extra_meta_for_payment_method = $this->_pm_instance->all_extra_meta_array();
 		$template_vars = array_merge(

Braces +2 added lines, -1 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
  *

payment_methods/Invoice/EE_PMT_Invoice.pm.php

Braces +2 added lines, -1 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
  *

Spacing +20 added lines, -20 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -25,7 +25,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EE_PMT_Invoice extends EE_PMT_Base{
+class EE_PMT_Invoice extends EE_PMT_Base {
 
 
 
@@ -36,7 +36,7 @@ 
 	 */
 	public function __construct($pm_instance = NULL) {
 		$this->_pretty_name = __("Invoice", 'event_espresso');
-		$this->_default_description = __( 'After clicking "Finalize Registration", you will be given instructions on how to access your invoice and complete your payment.', 'event_espresso' );
+		$this->_default_description = __('After clicking "Finalize Registration", you will be given instructions on how to access your invoice and complete your payment.', 'event_espresso');
 		parent::__construct($pm_instance);
 		$this->_default_button_url = $this->file_url().'lib'.DS.'invoice-logo.png';
 	}
@@ -48,7 +48,7 @@ 
 	 * @param \EE_Transaction $transaction
 	 * @return NULL
 	 */
-	public function generate_new_billing_form( EE_Transaction $transaction = NULL ) {
+	public function generate_new_billing_form(EE_Transaction $transaction = NULL) {
 		return NULL;
 	}
 
@@ -61,49 +61,49 @@ 
 	public function generate_new_settings_form() {
 		$pdf_payee_input_name = 'pdf_payee_name';
 		$confirmation_text_input_name = 'page_confirmation_text';
-		$form =  new EE_Payment_Method_Form(array(
+		$form = new EE_Payment_Method_Form(array(
 //				'payment_method_type' => $this,
 				'extra_meta_inputs'=>array(
 					$pdf_payee_input_name => new EE_Text_Input(array(
-						'html_label_text' => sprintf( __( 'Payee Name %s', 'event_espresso' ), $this->get_help_tab_link())
+						'html_label_text' => sprintf(__('Payee Name %s', 'event_espresso'), $this->get_help_tab_link())
 					)),
 					'pdf_payee_email' => new EE_Text_Input(array(
-						'html_label_text' => sprintf( __( 'Payee Email %s', 'event_espresso' ), $this->get_help_tab_link()),
+						'html_label_text' => sprintf(__('Payee Email %s', 'event_espresso'), $this->get_help_tab_link()),
 					)),
 					'pdf_payee_tax_number' => new EE_Text_Input(array(
-						'html_label_text' => sprintf( __( 'Payee Tax Number %s', 'event_espresso' ), $this->get_help_tab_link()),
+						'html_label_text' => sprintf(__('Payee Tax Number %s', 'event_espresso'), $this->get_help_tab_link()),
 						)),
 					'pdf_payee_address' => new EE_Text_Area_Input(array(
-						'html_label_text' => sprintf( __( 'Payee Address %s', 'event_espresso' ), $this->get_help_tab_link()),
+						'html_label_text' => sprintf(__('Payee Address %s', 'event_espresso'), $this->get_help_tab_link()),
 					)),
 					'pdf_instructions'=>new EE_Text_Area_Input(array(
-						'html_label_text'=>  sprintf(__("Instructions %s", "event_espresso"),  $this->get_help_tab_link()),
+						'html_label_text'=>  sprintf(__("Instructions %s", "event_espresso"), $this->get_help_tab_link()),
 						'default'=>  __("Please send this invoice with payment attached to the address above, or use the payment link below. Payment must be received within 48 hours of event date.", 'event_espresso')
 					)),
 					'pdf_logo_image'=>new EE_Admin_File_Uploader_Input(array(
-						'html_label_text'=>  sprintf(__("Logo Image %s", "event_espresso"),  $this->get_help_tab_link()),
+						'html_label_text'=>  sprintf(__("Logo Image %s", "event_espresso"), $this->get_help_tab_link()),
 						'default'=>  EE_Config::instance()->organization->logo_url,
 						'html_help_text'=>  __("(Logo for the top left of the invoice)", 'event_espresso'),
 					)),
 					$confirmation_text_input_name =>new EE_Text_Area_Input(array(
-						'html_label_text'=>  sprintf(__("Confirmation Text %s", "event_espresso"),  $this->get_help_tab_link()),
+						'html_label_text'=>  sprintf(__("Confirmation Text %s", "event_espresso"), $this->get_help_tab_link()),
 						'default'=>  __("Payment must be received within 48 hours of event date.  Details about where to send payment is included on the invoice.", 'event_espresso')
 					)),
 					'page_extra_info'=>new EE_Text_Area_Input(array(
-						'html_label_text'=>  sprintf(__("Extra Info %s", "event_espresso"),  $this->get_help_tab_link()),
+						'html_label_text'=>  sprintf(__("Extra Info %s", "event_espresso"), $this->get_help_tab_link()),
 					)),
 				),
 				'include'=>array(
-					'PMD_ID', 'PMD_name','PMD_desc','PMD_admin_name','PMD_admin_desc', 'PMD_type','PMD_slug', 'PMD_open_by_default','PMD_button_url','PMD_scope','Currency',
-					$pdf_payee_input_name, 'pdf_payee_email', 'pdf_payee_tax_number', 'pdf_payee_address', 'pdf_instructions','pdf_logo_image',
+					'PMD_ID', 'PMD_name', 'PMD_desc', 'PMD_admin_name', 'PMD_admin_desc', 'PMD_type', 'PMD_slug', 'PMD_open_by_default', 'PMD_button_url', 'PMD_scope', 'Currency',
+					$pdf_payee_input_name, 'pdf_payee_email', 'pdf_payee_tax_number', 'pdf_payee_address', 'pdf_instructions', 'pdf_logo_image',
 					$confirmation_text_input_name, 'page_extra_info'),
 			));
 		$form->add_subsections(
-			array( 'header1' => new EE_Form_Section_HTML_From_Template( 'payment_methods/Invoice/templates/invoice_settings_header_display.template.php' )),
+			array('header1' => new EE_Form_Section_HTML_From_Template('payment_methods/Invoice/templates/invoice_settings_header_display.template.php')),
 			$pdf_payee_input_name
 		);
 		$form->add_subsections(
-			array( 'header2'=>new EE_Form_Section_HTML_From_Template( 'payment_methods/Invoice/templates/invoice_settings_header_gateway.template.php' )),
+			array('header2'=>new EE_Form_Section_HTML_From_Template('payment_methods/Invoice/templates/invoice_settings_header_gateway.template.php')),
 			$confirmation_text_input_name
 		);
 		return $form;
@@ -116,7 +116,7 @@ 
 	 * @see EE_PMT_Base::help_tabs_config()
 	 * @return array
 	 */
-	public function help_tabs_config(){
+	public function help_tabs_config() {
 		return array(
 			$this->get_help_tab_name() => array(
 				'title' => __('Invoice Settings', 'event_espresso'),
@@ -134,7 +134,7 @@ 
 	 * @param \EE_Payment $payment
 	 * @return string
 	 */
-	public function payment_overview_content( EE_Payment $payment ){
+	public function payment_overview_content(EE_Payment $payment) {
 		EE_Registry::instance()->load_helper('Template');
 		return EEH_Template::display_template(
 			$this->_file_folder.'templates'.DS.'invoice_payment_details_content.template.php',
@@ -144,7 +144,7 @@ 
 					'payment'						=> $payment,
 					'page_confirmation_text'					=> '',
 					'page_extra_info'	=> '',
-					'invoice_url' 					=> $payment->transaction()->primary_registration()->invoice_url( 'html' )
+					'invoice_url' 					=> $payment->transaction()->primary_registration()->invoice_url('html')
 				),
 				$this->_pm_instance->all_extra_meta_array()
 			),

shortcodes/espresso_cancelled/EES_Espresso_Cancelled.shortcode.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 +10 added lines, -10 removed lines

@@ -51,7 +51,7 @@ 
 	 * @param WP $WP
 	 * @return    void
 	 */
-	public function run( WP $WP ) {
+	public function run(WP $WP) {
 	}
 
 	/**
@@ -61,19 +61,19 @@ 
 	 *  @param		array 	$attributes
 	 *  @return 	string
 	 */
-	public function process_shortcode( $attributes = array() ) {
-		EE_Registry::instance()->load_core( 'Session' );
-		$transaction = EE_Registry::instance()->SSN->get_session_data( 'transaction' );
-		if ( $transaction instanceof EE_Transaction ) {
-			do_action( 'AHEE__EES_Espresso_Cancelled__process_shortcode__transaction', $transaction );
+	public function process_shortcode($attributes = array()) {
+		EE_Registry::instance()->load_core('Session');
+		$transaction = EE_Registry::instance()->SSN->get_session_data('transaction');
+		if ($transaction instanceof EE_Transaction) {
+			do_action('AHEE__EES_Espresso_Cancelled__process_shortcode__transaction', $transaction);
 			$registrations = $transaction->registrations();
-			foreach( $registrations as $registration ) {
-				if ( $registration instanceof EE_Registration ) {
-					do_action( 'AHEE__EES_Espresso_Cancelled__process_shortcode__registration', $registration );
+			foreach ($registrations as $registration) {
+				if ($registration instanceof EE_Registration) {
+					do_action('AHEE__EES_Espresso_Cancelled__process_shortcode__registration', $registration);
 				}
 			}
 		}
-		EE_Registry::instance()->SSN->clear_session( __CLASS__, __FUNCTION__ );
+		EE_Registry::instance()->SSN->clear_session(__CLASS__, __FUNCTION__);
 		return EE_Registry::instance()->REQ->get_output();
 	}
 

shortcodes/espresso_thank_you/EES_Espresso_Thank_You.shortcode.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 +140 added lines, -140 removed lines

@@ -91,7 +91,7 @@ 
 	 *  @return 	void
 	 */
 	public static function set_hooks() {
-		add_action( 'wp_loaded', array( 'EES_Espresso_Thank_You', 'set_definitions' ), 2 );
+		add_action('wp_loaded', array('EES_Espresso_Thank_You', 'set_definitions'), 2);
 	}
 
 	/**
@@ -102,10 +102,10 @@ 
 	 */
 	public static function set_hooks_admin() {
 		// AJAX for IPN monitoring
-		add_filter( 'heartbeat_received', array( 'EES_Espresso_Thank_You', 'thank_you_page_IPN_monitor' ), 10, 3 );
-		add_filter( 'heartbeat_nopriv_received', array( 'EES_Espresso_Thank_You', 'thank_you_page_IPN_monitor' ), 10, 3 );
-		add_action( 'wp_ajax_espresso_resend_reg_confirmation_email', array( 'EES_Espresso_Thank_You', 'resend_reg_confirmation_email' ), 10, 2 );
-		add_action( 'wp_ajax_nopriv_espresso_resend_reg_confirmation_email', array( 'EES_Espresso_Thank_You', 'resend_reg_confirmation_email' ), 10, 2 );
+		add_filter('heartbeat_received', array('EES_Espresso_Thank_You', 'thank_you_page_IPN_monitor'), 10, 3);
+		add_filter('heartbeat_nopriv_received', array('EES_Espresso_Thank_You', 'thank_you_page_IPN_monitor'), 10, 3);
+		add_action('wp_ajax_espresso_resend_reg_confirmation_email', array('EES_Espresso_Thank_You', 'resend_reg_confirmation_email'), 10, 2);
+		add_action('wp_ajax_nopriv_espresso_resend_reg_confirmation_email', array('EES_Espresso_Thank_You', 'resend_reg_confirmation_email'), 10, 2);
 	}
 
 
@@ -117,8 +117,8 @@ 
 	 *  @return 	void
 	 */
 	public static function set_definitions() {
-		define( 'THANK_YOU_ASSETS_URL', plugin_dir_url( __FILE__ ) . 'assets' . DS );
-		define( 'THANK_YOU_TEMPLATES_PATH', str_replace( '\\', DS, plugin_dir_path( __FILE__ )) . 'templates' . DS );
+		define('THANK_YOU_ASSETS_URL', plugin_dir_url(__FILE__).'assets'.DS);
+		define('THANK_YOU_TEMPLATES_PATH', str_replace('\\', DS, plugin_dir_path(__FILE__)).'templates'.DS);
 	}
 
 
@@ -130,23 +130,23 @@ 
 	 *  @return 	EE_Transaction
 	 */
 	public function get_txn() {
-		if ( $this->_current_txn instanceof EE_Transaction ) {
+		if ($this->_current_txn instanceof EE_Transaction) {
 			return $this->_current_txn;
 		}
-		$TXN_model = EE_Registry::instance()->load_model( 'Transaction' );
-		if ( ! $TXN_model instanceof EEM_Transaction ) {
+		$TXN_model = EE_Registry::instance()->load_model('Transaction');
+		if ( ! $TXN_model instanceof EEM_Transaction) {
 			EE_Error::add_error(
-				__( 'The transaction model could not be established.', 'event_espresso' ),
+				__('The transaction model could not be established.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 			return NULL;
 		}
 		//get the transaction. yes, we may have just loaded it, but it may have been updated, or this may be via an ajax request
-		$this->_current_txn = $TXN_model->get_transaction_from_reg_url_link( $this->_reg_url_link );
+		$this->_current_txn = $TXN_model->get_transaction_from_reg_url_link($this->_reg_url_link);
 		// verify TXN
-		if ( ! $this->_current_txn instanceof EE_Transaction ) {
+		if ( ! $this->_current_txn instanceof EE_Transaction) {
 			EE_Error::add_error(
-				__( 'No transaction information could be retrieved or the transaction data is not of the correct type.', 'event_espresso' ),
+				__('No transaction information could be retrieved or the transaction data is not of the correct type.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 			return NULL;
@@ -163,16 +163,16 @@ 
 	 * @param int $since
 	 * @return    mixed array of EE_Payment || FALSE
 	 */
-	public function get_txn_payments( $since = 0 ) {
-		if ( ! $this->get_txn() ) {
+	public function get_txn_payments($since = 0) {
+		if ( ! $this->get_txn()) {
 			return FALSE;
 		}
-		$args = array( 'order_by' => array( 'PAY_timestamp' => 'ASC' ));
-		if ( $since > 0 ) {
-			$args[0] = array( 'PAY_timestamp' => array( '>', $since ));
+		$args = array('order_by' => array('PAY_timestamp' => 'ASC'));
+		if ($since > 0) {
+			$args[0] = array('PAY_timestamp' => array('>', $since));
 		}
 		// get array of payments with most recent first
-		$payments = $this->_current_txn->payments( $args );
+		$payments = $this->_current_txn->payments($args);
 //		global $wpdb;
 //		echo $wpdb->last_query;
 //		EEH_Debug_Tools::printr( $payments, '$payments  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
@@ -188,19 +188,19 @@ 
 	 *  @return 	void
 	 */
 	private function _get_reg_url_link() {
-		if ( ! empty( $this->_reg_url_link )) {
+		if ( ! empty($this->_reg_url_link)) {
 			return;
 		}
 		// only do thank you page stuff if we have a REG_url_link in the url
-		if ( ! EE_Registry::instance()->REQ->is_set( 'e_reg_url_link' )) {
+		if ( ! EE_Registry::instance()->REQ->is_set('e_reg_url_link')) {
 			EE_Error::add_error(
-				__( 'No transaction information could be retrieved because the registration URL link is missing or invalid.', 'event_espresso' ),
+				__('No transaction information could be retrieved because the registration URL link is missing or invalid.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 			return;
 		}
 		// check for reg_url_link
-		$this->_reg_url_link = EE_Registry::instance()->REQ->get( 'e_reg_url_link' );
+		$this->_reg_url_link = EE_Registry::instance()->REQ->get('e_reg_url_link');
 	}
 
 
@@ -212,8 +212,8 @@ 
 	 *  @param  	string $reg_url_link
 	 *  @return 	string
 	 */
-	public function set_reg_url_link( $reg_url_link = NULL ) {
-		$this->_reg_url_link = ! empty( $reg_url_link ) ? $reg_url_link : $this->_reg_url_link;
+	public function set_reg_url_link($reg_url_link = NULL) {
+		$this->_reg_url_link = ! empty($reg_url_link) ? $reg_url_link : $this->_reg_url_link;
 	}
 
 
@@ -226,21 +226,21 @@ 
 	 *  @param  	WP $WP
 	 *  @return 	void
 	 */
-	public function run( WP $WP ) {
+	public function run(WP $WP) {
 		// ensure this shortcode doesn't trigger on anything BUT the thank you page
-		if ( isset( $WP->request ) && basename( $WP->request ) != basename( EE_Registry::instance()->CFG->core->thank_you_page_url() )) {
+		if (isset($WP->request) && basename($WP->request) != basename(EE_Registry::instance()->CFG->core->thank_you_page_url())) {
 			return;
-		} else if ( isset( $WP->query_vars['page_id'] ) && $WP->query_vars['page_id'] != EE_Registry::instance()->CFG->core->thank_you_page_id ) {
+		} else if (isset($WP->query_vars['page_id']) && $WP->query_vars['page_id'] != EE_Registry::instance()->CFG->core->thank_you_page_id) {
 			return;
 		}
 		$this->_get_reg_url_link();
 		// resend_reg_confirmation_email ?
-		if ( EE_Registry::instance()->REQ->is_set( 'resend' )) {
+		if (EE_Registry::instance()->REQ->is_set('resend')) {
 			EES_Espresso_Thank_You::resend_reg_confirmation_email();
 		}
 		// load assets
-		add_action( 'wp_enqueue_scripts', array( $this, 'load_js' ), 10 );
-		add_action( 'shutdown', array( EE_Session::instance(), 'clear_session' ));
+		add_action('wp_enqueue_scripts', array($this, 'load_js'), 10);
+		add_action('shutdown', array(EE_Session::instance(), 'clear_session'));
 	}
 
 
@@ -251,25 +251,25 @@ 
 	 * 	@return 		void
 	 */
 	public function load_js() {
-		wp_register_script( 'thank_you_page', THANK_YOU_ASSETS_URL . 'thank_you_page.js', array( 'espresso_core', 'heartbeat' ), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_enqueue_script( 'thank_you_page' );
+		wp_register_script('thank_you_page', THANK_YOU_ASSETS_URL.'thank_you_page.js', array('espresso_core', 'heartbeat'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_enqueue_script('thank_you_page');
 		EE_Registry::$i18n_js_strings['e_reg_url_link'] = $this->_reg_url_link;
 		EE_Registry::$i18n_js_strings['initial_access'] = current_time('timestamp');
 		EE_Registry::$i18n_js_strings['IPN_wait_time'] = EES_Espresso_Thank_You::IPN_wait_time;
 		EE_Registry::$i18n_js_strings['TXN_complete'] = EEM_Transaction::complete_status_code;
 		EE_Registry::$i18n_js_strings['TXN_incomplete'] = EEM_Transaction::incomplete_status_code;
-		EE_Registry::$i18n_js_strings['checking_for_new_payments'] = __( 'checking for new payments...', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['loading_payment_info'] = __( 'loading payment information...', 'event_espresso' );
+		EE_Registry::$i18n_js_strings['checking_for_new_payments'] = __('checking for new payments...', 'event_espresso');
+		EE_Registry::$i18n_js_strings['loading_payment_info'] = __('loading payment information...', 'event_espresso');
 		EE_Registry::$i18n_js_strings['server_error'] = __('An unknown error occurred on the server while attempting to process your request. Please refresh the page and try again.', 'event_espresso');
 		EE_Registry::$i18n_js_strings['slow_IPN'] = apply_filters(
 			'EES_Espresso_Thank_You__load_js__slow_IPN',
 			sprintf(
-				__( '%sThe Payment Notification appears to be taking longer than usual to arrive. Maybe check back later or just wait for your payment and registration confirmation results to be sent to you via email. We apologize for any inconvenience this may have caused.%s', 'event_espresso' ),
+				__('%sThe Payment Notification appears to be taking longer than usual to arrive. Maybe check back later or just wait for your payment and registration confirmation results to be sent to you via email. We apologize for any inconvenience this may have caused.%s', 'event_espresso'),
 				'<div id="espresso-thank-you-page-slow-IPN-dv" class="ee-attention jst-left">',
 				'</div>'
 			)
 		);
-		wp_localize_script( 'thank_you_page', 'eei18n', EE_Registry::$i18n_js_strings );
+		wp_localize_script('thank_you_page', 'eei18n', EE_Registry::$i18n_js_strings);
 	}
 
 
@@ -283,26 +283,26 @@ 
 	 */
 	public function init() {
 		$this->_get_reg_url_link();
-		if ( ! $this->get_txn() ) {
+		if ( ! $this->get_txn()) {
 			return NULL;
 		}
 		// if we've made it to the Thank You page, then let's toggle any "Failed" transactions to "Incomplete"
-		if ( $this->_current_txn->status_ID() == EEM_Transaction::failed_status_code ) {
-			$this->_current_txn->set_status( EEM_Transaction::incomplete_status_code );
+		if ($this->_current_txn->status_ID() == EEM_Transaction::failed_status_code) {
+			$this->_current_txn->set_status(EEM_Transaction::incomplete_status_code);
 			$this->_current_txn->save();
 		}
 		$this->_primary_registrant = $this->_current_txn->primary_registration() instanceof EE_Registration ? $this->_current_txn->primary_registration() : NULL;
 		$this->_is_primary = $this->_primary_registrant->reg_url_link() == $this->_reg_url_link ? TRUE : FALSE;
 
-		$show_try_pay_again_link_default =  do_action( 'AHEE__EES_Espresso_Thank_You__init__show_try_pay_again_link_default', TRUE );
+		$show_try_pay_again_link_default = do_action('AHEE__EES_Espresso_Thank_You__init__show_try_pay_again_link_default', TRUE);
 		// txn status ?
-		if( $this->_current_txn->is_completed() ){
+		if ($this->_current_txn->is_completed()) {
 			$this->_show_try_pay_again_link = $show_try_pay_again_link_default;
-		} else if ( $this->_current_txn->is_incomplete() && ( $this->_primary_registrant->is_approved() || $this->_primary_registrant->is_pending_payment() )){
+		} else if ($this->_current_txn->is_incomplete() && ($this->_primary_registrant->is_approved() || $this->_primary_registrant->is_pending_payment())) {
 			$this->_show_try_pay_again_link = TRUE;
-		} else if ( $this->_primary_registrant->is_approved() || $this->_primary_registrant->is_pending_payment() ) {
+		} else if ($this->_primary_registrant->is_approved() || $this->_primary_registrant->is_pending_payment()) {
 			// its pending
-			$this->_show_try_pay_again_link = isset( EE_Registry::instance()->CFG->registration->show_pending_payment_options ) && EE_Registry::instance()->CFG->registration->show_pending_payment_options ? TRUE : $show_try_pay_again_link_default;
+			$this->_show_try_pay_again_link = isset(EE_Registry::instance()->CFG->registration->show_pending_payment_options) && EE_Registry::instance()->CFG->registration->show_pending_payment_options ? TRUE : $show_try_pay_again_link_default;
 		} else {
 			$this->_show_try_pay_again_link = $show_try_pay_again_link_default;
 		}
@@ -310,18 +310,18 @@ 
 		$this->_is_offline_payment_method = $this->_current_txn->payment_method() instanceof EE_Payment_Method && $this->_current_txn->payment_method()->is_off_line() ? TRUE : FALSE;
 		// link to SPCO
 		$revisit_spco_url = add_query_arg(
-			array( 'ee'=>'_register', 'revisit'=>TRUE, 'e_reg_url_link'=>$this->_reg_url_link ),
+			array('ee'=>'_register', 'revisit'=>TRUE, 'e_reg_url_link'=>$this->_reg_url_link),
 			EE_Registry::instance()->CFG->core->reg_page_url()
 		);
 		// link to SPCO payment_options
-		$this->_SPCO_payment_options_url = $this->_primary_registrant instanceof EE_Registration ? $this->_primary_registrant->payment_overview_url() : add_query_arg( array('step'=>'payment_options' ), $revisit_spco_url );
+		$this->_SPCO_payment_options_url = $this->_primary_registrant instanceof EE_Registration ? $this->_primary_registrant->payment_overview_url() : add_query_arg(array('step'=>'payment_options'), $revisit_spco_url);
 		// link to SPCO attendee_information
 		$this->_SPCO_attendee_information_url = $this->_primary_registrant instanceof EE_Registration ? $this->_primary_registrant->edit_attendee_information_url() : FALSE;
 
-		EE_Registry::instance()->load_helper( 'Template' );
-		EE_Registry::instance()->load_helper( 'Template_Validator' );
+		EE_Registry::instance()->load_helper('Template');
+		EE_Registry::instance()->load_helper('Template_Validator');
 
-		do_action( 'AHEE__EES_Espresso_Thank_You__init_end', $this->_current_txn );
+		do_action('AHEE__EES_Espresso_Thank_You__init_end', $this->_current_txn);
 		// set no cache headers and constants
 		EE_System::do_not_cache();
 
@@ -337,32 +337,32 @@ 
 	 *  @param	array 	$attributes
 	 *  @return 	string
 	 */
-	public function process_shortcode( $attributes = array() ) {
+	public function process_shortcode($attributes = array()) {
 
 		$this->init();
 
-		if ( ! $this->_current_txn instanceof EE_Transaction ) {
+		if ( ! $this->_current_txn instanceof EE_Transaction) {
 			return EE_Error::get_notices();
 		}
-		EE_Registry::instance()->load_helper( 'Debug_Tools' );
-		EEH_Debug_Tools::log( __CLASS__, __FUNCTION__, __LINE__, array( $this->_current_txn ), true,
-			'EE_Transaction: ' . $this->_current_txn->ID() );
+		EE_Registry::instance()->load_helper('Debug_Tools');
+		EEH_Debug_Tools::log(__CLASS__, __FUNCTION__, __LINE__, array($this->_current_txn), true,
+			'EE_Transaction: '.$this->_current_txn->ID());
 		// link to receipt
-		$template_args['TXN_receipt_url'] = $this->_current_txn->receipt_url( 'html' );
-		if ( ! empty( $template_args['TXN_receipt_url'] )) {
-			$template_args['order_conf_desc'] = __( '%1$sCongratulations%2$sYour registration has been successfully processed.%3$sCheck your email for your registration confirmation or click the button below to view / download / print a full description of your purchases and registration information.', 'event_espresso' );
+		$template_args['TXN_receipt_url'] = $this->_current_txn->receipt_url('html');
+		if ( ! empty($template_args['TXN_receipt_url'])) {
+			$template_args['order_conf_desc'] = __('%1$sCongratulations%2$sYour registration has been successfully processed.%3$sCheck your email for your registration confirmation or click the button below to view / download / print a full description of your purchases and registration information.', 'event_espresso');
 		} else {
-			$template_args['order_conf_desc'] = __( '%1$sCongratulations%2$sYour registration has been successfully processed.%3$sCheck your email for your registration confirmation.', 'event_espresso' );
+			$template_args['order_conf_desc'] = __('%1$sCongratulations%2$sYour registration has been successfully processed.%3$sCheck your email for your registration confirmation.', 'event_espresso');
 		}
 		$template_args['transaction'] = $this->_current_txn;
-		$template_args['revisit'] = EE_Registry::instance()->REQ->get( 'revisit', FALSE );
+		$template_args['revisit'] = EE_Registry::instance()->REQ->get('revisit', FALSE);
 
- 		add_action( 'AHEE__thank_you_page_overview_template__content', array( $this, 'get_registration_details' ));
- 		if ( $this->_is_primary && $this->_payments_closed && ! $this->_current_txn->is_free() ) {
-			add_action( 'AHEE__thank_you_page_overview_template__content', array( $this, 'get_ajax_content' ));
+ 		add_action('AHEE__thank_you_page_overview_template__content', array($this, 'get_registration_details'));
+ 		if ($this->_is_primary && $this->_payments_closed && ! $this->_current_txn->is_free()) {
+			add_action('AHEE__thank_you_page_overview_template__content', array($this, 'get_ajax_content'));
 		}
 
-		return EEH_Template::locate_template( THANK_YOU_TEMPLATES_PATH . 'thank-you-page-overview.template.php', $template_args, TRUE, TRUE );
+		return EEH_Template::locate_template(THANK_YOU_TEMPLATES_PATH.'thank-you-page-overview.template.php', $template_args, TRUE, TRUE);
 
 	}
 
@@ -379,15 +379,15 @@ 
 	 * @param array $data
 	 * @return    array
 	 */
-	public static function thank_you_page_IPN_monitor( $response = array(), $data = array() ) {
+	public static function thank_you_page_IPN_monitor($response = array(), $data = array()) {
 		// does this heartbeat contain our data ?
-		if ( ! isset( $data['espresso_thank_you_page'] )) {
+		if ( ! isset($data['espresso_thank_you_page'])) {
 			return $response;
 		}
 		// check for reg_url_link in the incoming heartbeat data
-		if ( ! isset( $data['espresso_thank_you_page']['e_reg_url_link'] )) {
-			$response['espresso_thank_you_page'] = array (
-				'errors' => ! empty( $notices['errors'] ) ? $notices['errors'] : __( 'No transaction information could be retrieved because the registration URL link is missing or invalid.', 'event_espresso' )
+		if ( ! isset($data['espresso_thank_you_page']['e_reg_url_link'])) {
+			$response['espresso_thank_you_page'] = array(
+				'errors' => ! empty($notices['errors']) ? $notices['errors'] : __('No transaction information could be retrieved because the registration URL link is missing or invalid.', 'event_espresso')
 			);
 			return $response;
 		}
@@ -397,24 +397,24 @@ 
 		EES_Espresso_Thank_You::set_definitions();
 		/** @var $espresso_thank_you_page EES_Espresso_Thank_You */
 		$espresso_thank_you_page = EES_Espresso_Thank_You::instance();
-		$espresso_thank_you_page->set_reg_url_link( $data['espresso_thank_you_page']['e_reg_url_link'] );
+		$espresso_thank_you_page->set_reg_url_link($data['espresso_thank_you_page']['e_reg_url_link']);
 		$espresso_thank_you_page->init();
 		//get TXN
 		$TXN = $espresso_thank_you_page->get_txn();
 		// no TXN? then get out
-		if ( ! $TXN instanceof EE_Transaction ) {
+		if ( ! $TXN instanceof EE_Transaction) {
 			$notices = EE_Error::get_notices();
-			$response['espresso_thank_you_page'] = array (
-				'errors' => ! empty( $notices['errors'] ) ? $notices['errors'] : sprintf( __( 'The information for your transaction could not be retrieved from the server or the transaction data received was invalid because of a technical reason. (%s)', 'event_espresso' ), __LINE__ )
+			$response['espresso_thank_you_page'] = array(
+				'errors' => ! empty($notices['errors']) ? $notices['errors'] : sprintf(__('The information for your transaction could not be retrieved from the server or the transaction data received was invalid because of a technical reason. (%s)', 'event_espresso'), __LINE__)
 			);
 			return $response;
 		}
 		// grab transient of TXN's status
-		$txn_status = isset( $data['espresso_thank_you_page']['txn_status'] ) ? $data['espresso_thank_you_page']['txn_status'] : NULL;
+		$txn_status = isset($data['espresso_thank_you_page']['txn_status']) ? $data['espresso_thank_you_page']['txn_status'] : NULL;
 		// has the TXN status changed since we last checked (or empty because this is the first time running through this code)?
-		if ( $txn_status !== $TXN->status_ID() ) {
+		if ($txn_status !== $TXN->status_ID()) {
 			// switch between two possible basic outcomes
-			switch( $TXN->status_ID()) {
+			switch ($TXN->status_ID()) {
 				// TXN has been updated in some way
 				case EEM_Transaction::overpaid_status_code:
 				case EEM_Transaction::complete_status_code:
@@ -429,29 +429,29 @@ 
 				case EEM_Transaction::failed_status_code:
 				default:
 					// keep on waiting...
-					return $espresso_thank_you_page->_update_server_wait_time( $data['espresso_thank_you_page'] );
+					return $espresso_thank_you_page->_update_server_wait_time($data['espresso_thank_you_page']);
 			}
 
 		// or is the TXN still failed (never been updated) ???
-		} else if ( $TXN->failed() ) {
+		} else if ($TXN->failed()) {
 			// keep on waiting...
-			return $espresso_thank_you_page->_update_server_wait_time( $data['espresso_thank_you_page'] );
+			return $espresso_thank_you_page->_update_server_wait_time($data['espresso_thank_you_page']);
 		}
 		// TXN is happening so let's get the payments now
 		// if we've already gotten payments then the heartbeat data will contain the timestamp of the last time we checked
-		$since = isset( $data['espresso_thank_you_page']['get_payments_since'] ) ? $data['espresso_thank_you_page']['get_payments_since'] : 0;
+		$since = isset($data['espresso_thank_you_page']['get_payments_since']) ? $data['espresso_thank_you_page']['get_payments_since'] : 0;
 		// then check for payments
-		$payments = $espresso_thank_you_page->get_txn_payments( $since );
+		$payments = $espresso_thank_you_page->get_txn_payments($since);
 		// has a payment been processed ?
-		if ( ! empty( $payments ) || $espresso_thank_you_page->_is_offline_payment_method ) {
-			if ( $since ) {
+		if ( ! empty($payments) || $espresso_thank_you_page->_is_offline_payment_method) {
+			if ($since) {
 				$response['espresso_thank_you_page'] = array(
-					'new_payments' => $espresso_thank_you_page->get_new_payments( $payments ),
+					'new_payments' => $espresso_thank_you_page->get_new_payments($payments),
 					'transaction_details' => $espresso_thank_you_page->get_transaction_details(),
 					'txn_status' => $TXN->status_ID()
 				);
 			} else {
-				$response['espresso_thank_you_page']['payment_details'] = $espresso_thank_you_page->get_payment_details( $payments );
+				$response['espresso_thank_you_page']['payment_details'] = $espresso_thank_you_page->get_payment_details($payments);
 			}
 			// reset time to check for payments
 			$response['espresso_thank_you_page']['get_payments_since'] = current_time('timestamp');
@@ -471,9 +471,9 @@ 
 	 *  @param 	array $thank_you_page_data thank you page portion of the incoming JSON array from the WP heartbeat data
 	 *  @return 	array
 	 */
-	private function _update_server_wait_time( $thank_you_page_data = array() ) {
-		$response['espresso_thank_you_page'] = array (
-			'still_waiting' => isset( $thank_you_page_data['initial_access'] ) ? current_time('timestamp') - $thank_you_page_data['initial_access'] : 0,
+	private function _update_server_wait_time($thank_you_page_data = array()) {
+		$response['espresso_thank_you_page'] = array(
+			'still_waiting' => isset($thank_you_page_data['initial_access']) ? current_time('timestamp') - $thank_you_page_data['initial_access'] : 0,
 			'txn_status' => $this->_current_txn->status_ID()
 		);
 		return $response;
@@ -496,13 +496,13 @@ 
 		$template_args['SPCO_attendee_information_url'] = $this->_SPCO_attendee_information_url;
 
 		$template_args['resend_reg_confirmation_url'] = add_query_arg(
-			array( 'token'=>$this->_reg_url_link, 'resend_reg_confirmation' => 'true' ),
+			array('token'=>$this->_reg_url_link, 'resend_reg_confirmation' => 'true'),
 			EE_Registry::instance()->CFG->core->thank_you_page_url()
 		);
 		// verify template arguments
-		EEH_Template_Validator::verify_instanceof( $template_args['transaction'], '$transaction', 'EE_Transaction' );
-		EEH_Template_Validator::verify_isnt_null( $template_args['SPCO_attendee_information_url'], '$SPCO_attendee_information_url');
-		echo EEH_Template::locate_template( THANK_YOU_TEMPLATES_PATH . 'thank-you-page-registration-details.template.php', $template_args, TRUE, TRUE );
+		EEH_Template_Validator::verify_instanceof($template_args['transaction'], '$transaction', 'EE_Transaction');
+		EEH_Template_Validator::verify_isnt_null($template_args['SPCO_attendee_information_url'], '$SPCO_attendee_information_url');
+		echo EEH_Template::locate_template(THANK_YOU_TEMPLATES_PATH.'thank-you-page-registration-details.template.php', $template_args, TRUE, TRUE);
 	}
 
 
@@ -511,38 +511,38 @@ 
 	 * 	resend_reg_confirmation_email
 	 */
 	public static function resend_reg_confirmation_email() {
-		EE_Registry::instance()->load_core( 'Request_Handler' );
-		$reg_url_link = EE_Registry::instance()->REQ->get( 'token' );
+		EE_Registry::instance()->load_core('Request_Handler');
+		$reg_url_link = EE_Registry::instance()->REQ->get('token');
 
 		// was a REG_ID passed ?
-		if ( $reg_url_link ) {
-			$registration = EE_Registry::instance()->load_model( 'Registration' )->get_one( array( array( 'REG_url_link' => $reg_url_link )));
-			if ( $registration instanceof EE_Registration ) {
+		if ($reg_url_link) {
+			$registration = EE_Registry::instance()->load_model('Registration')->get_one(array(array('REG_url_link' => $reg_url_link)));
+			if ($registration instanceof EE_Registration) {
 				// resend email
-				EED_Messages::process_resend( array( '_REG_ID' => $registration->ID() ));
+				EED_Messages::process_resend(array('_REG_ID' => $registration->ID()));
 			} else {
 				EE_Error::add_error(
-					__( 'The Registration Confirmation email could not be sent because a valid Registration could not be retrieved from the database.', 'event_espresso' ),
+					__('The Registration Confirmation email could not be sent because a valid Registration could not be retrieved from the database.', 'event_espresso'),
 					__FILE__, __FUNCTION__, __LINE__
 				);
 			}
 		} else {
 			EE_Error::add_error(
-				__( 'The Registration Confirmation email could not be sent because a registration token is missing or invalid.', 'event_espresso' ),
+				__('The Registration Confirmation email could not be sent because a registration token is missing or invalid.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 		}
 		// request sent via AJAX ?
-		if ( EE_FRONT_AJAX ) {
-			echo json_encode( EE_Error::get_notices( FALSE ));
+		if (EE_FRONT_AJAX) {
+			echo json_encode(EE_Error::get_notices(FALSE));
 			die();
 		// or was JS disabled ?
 		} else {
 			// save errors so that they get picked up on the next request
-			EE_Error::get_notices( TRUE, TRUE );
+			EE_Error::get_notices(TRUE, TRUE);
 			wp_safe_redirect(
 				add_query_arg(
-					array( 'e_reg_url_link'=> $reg_url_link ),
+					array('e_reg_url_link'=> $reg_url_link),
 					EE_Registry::instance()->CFG->core->thank_you_page_url()
 				)
 			);
@@ -558,19 +558,19 @@ 
 	 *  @return 	string
 	 */
 	public function get_ajax_content() {
-		if ( ! $this->_primary_registrant->is_not_approved() ) {
+		if ( ! $this->_primary_registrant->is_not_approved()) {
 ?>
 	<div id="espresso-thank-you-page-ajax-content-dv">
 		<div id="espresso-thank-you-page-ajax-transaction-dv"></div>
 		<div id="espresso-thank-you-page-ajax-payment-dv"></div>
 		<div id="espresso-thank-you-page-ajax-loading-dv">
 			<div id="ee-ajax-loading-dv" class="left lt-blue-text">
-				<span class="dashicons dashicons-upload"></span><span id="ee-ajax-loading-msg-spn"><?php _e( 'loading transaction and payment information...', 'event_espresso' );?></span>
+				<span class="dashicons dashicons-upload"></span><span id="ee-ajax-loading-msg-spn"><?php _e('loading transaction and payment information...', 'event_espresso'); ?></span>
 			</div>
-			<?php if ( ! $this->_is_offline_payment_method ) : ?>
+			<?php if ( ! $this->_is_offline_payment_method) : ?>
 			<p id="ee-ajax-loading-pg" class="highlight-bg small-text clear">
-				<?php echo apply_filters( 'EES_Espresso_Thank_You__get_ajax_content__waiting_for_IPN_msg', __( 'Some payment gateways can take 15 minutes or more to return their payment notification, so please be patient if you require payment confirmation as soon as possible. Please note that as soon as everything is finalized, we will send your full payment and registration confirmation results to you via email.', 'event_espresso' ));?><br/>
-				<span class="jst-rght ee-block small-text lt-grey-text"><?php _e( 'current wait time ', 'event_espresso' );?><span id="espresso-thank-you-page-ajax-time-dv">00:00:00</span></span>
+				<?php echo apply_filters('EES_Espresso_Thank_You__get_ajax_content__waiting_for_IPN_msg', __('Some payment gateways can take 15 minutes or more to return their payment notification, so please be patient if you require payment confirmation as soon as possible. Please note that as soon as everything is finalized, we will send your full payment and registration confirmation results to you via email.', 'event_espresso')); ?><br/>
+				<span class="jst-rght ee-block small-text lt-grey-text"><?php _e('current wait time ', 'event_espresso'); ?><span id="espresso-thank-you-page-ajax-time-dv">00:00:00</span></span>
 			</p>
 			<?php endif; ?>
 		</div>
@@ -580,9 +580,9 @@ 
 		} else {
 ?>
 	<div id="espresso-thank-you-page-not-approved-message-dv">
-		<h4 class="orange-text"><?php _e('Important Notice:', 'event_espresso');?></h4>
+		<h4 class="orange-text"><?php _e('Important Notice:', 'event_espresso'); ?></h4>
 		<p id="events-requiring-pre-approval-pg" class="small-text">
-			<?php echo apply_filters( 'AHEE__EES_Espresso_Thank_You__get_ajax_content__not_approved_message', __('The Event you have registered for does not require payment at this time and was not billed for during this transaction. Billing will only occur after all attendees have been approved by the event organizer. You will be notified when your registration has been processed. If this is a free event, then no billing will occur.', 'event_espresso') ); ?>
+			<?php echo apply_filters('AHEE__EES_Espresso_Thank_You__get_ajax_content__not_approved_message', __('The Event you have registered for does not require payment at this time and was not billed for during this transaction. Billing will only occur after all attendees have been approved by the event organizer. You will be notified when your registration has been processed. If this is a free event, then no billing will occur.', 'event_espresso')); ?>
 		</p>
 		<div class="clear"></div>
 	</div>
@@ -603,15 +603,15 @@ 
 		$template_args = array();
 		$template_args['transaction'] = $this->_current_txn;
 		$template_args['reg_url_link'] = $this->_reg_url_link;
-		$template_args['primary_registrant_name'] = $this->_primary_registrant->attendee()->full_name( TRUE );
+		$template_args['primary_registrant_name'] = $this->_primary_registrant->attendee()->full_name(TRUE);
 		// link to SPCO payment_options
 		$template_args['show_try_pay_again_link'] = $this->_show_try_pay_again_link;
 		$template_args['SPCO_payment_options_url'] = $this->_SPCO_payment_options_url;
 		// verify template arguments
-		EEH_Template_Validator::verify_instanceof( $template_args['transaction'], '$transaction', 'EE_Transaction' );
-		EEH_Template_Validator::verify_isnt_null( $template_args['show_try_pay_again_link'], '$show_try_pay_again_link' );
-		EEH_Template_Validator::verify_isnt_null( $template_args['SPCO_payment_options_url'], '$SPCO_payment_options_url' );
-		return EEH_Template::locate_template( THANK_YOU_TEMPLATES_PATH . 'thank-you-page-transaction-details.template.php', $template_args, TRUE, TRUE );
+		EEH_Template_Validator::verify_instanceof($template_args['transaction'], '$transaction', 'EE_Transaction');
+		EEH_Template_Validator::verify_isnt_null($template_args['show_try_pay_again_link'], '$show_try_pay_again_link');
+		EEH_Template_Validator::verify_isnt_null($template_args['SPCO_payment_options_url'], '$SPCO_payment_options_url');
+		return EEH_Template::locate_template(THANK_YOU_TEMPLATES_PATH.'thank-you-page-transaction-details.template.php', $template_args, TRUE, TRUE);
 	}
 
 
@@ -623,9 +623,9 @@ 
 	 *  @param 	EE_Payment	$payment
 	 *  @return 	string
 	 */
-	public function get_payment_row_html( $payment = NULL ) {
+	public function get_payment_row_html($payment = NULL) {
 		$html = '';
-		if ( $payment instanceof EE_Payment ) {
+		if ($payment instanceof EE_Payment) {
 			if (
 				$payment->payment_method() instanceof EE_Payment_Method
 				&& $payment->payment_method()->is_off_site()
@@ -634,25 +634,25 @@ 
 				// considering the registrant has made it to the Thank You page,
 				// any failed payments may actually be pending and the IPN is just slow
 				// so let's
-				$payment->set_status( EEM_Payment::status_id_pending );
+				$payment->set_status(EEM_Payment::status_id_pending);
 			}
-			$payment_declined_msg = $payment->STS_ID() === EEM_Payment::status_id_declined ? '<br /><span class="small-text">' . $payment->gateway_response() . '</span>' : '';
+			$payment_declined_msg = $payment->STS_ID() === EEM_Payment::status_id_declined ? '<br /><span class="small-text">'.$payment->gateway_response().'</span>' : '';
 			$html .= '
 				<tr>
 					<td>
-						' . $payment->timestamp() . '
+						' . $payment->timestamp().'
 					</td>
 					<td>
-						' . ( $payment->payment_method() instanceof EE_Payment_Method ? $payment->payment_method()->name() : __( 'Unknown', 'event_espresso' ) ) . '
+						' . ($payment->payment_method() instanceof EE_Payment_Method ? $payment->payment_method()->name() : __('Unknown', 'event_espresso')).'
 					</td>
 					<td class="jst-rght">
-						' . EEH_Template::format_currency( $payment->amount() ) . '
+						' . EEH_Template::format_currency($payment->amount()).'
 					</td>
 					<td class="jst-rght" style="line-height:1;">
-						' . $payment->pretty_status( TRUE ) . $payment_declined_msg . '
+						' . $payment->pretty_status(TRUE).$payment_declined_msg.'
 					</td>
 				</tr>';
-				do_action( 'AHEE__thank_you_page_payment_details_template__after_each_payment', $payment );
+				do_action('AHEE__thank_you_page_payment_details_template__after_each_payment', $payment);
 		}
 		return $html;
 	}
@@ -666,34 +666,34 @@ 
 	 * @param    array $payments
 	 * @return    string
 	 */
-	public function get_payment_details( $payments = array() ) {
+	public function get_payment_details($payments = array()) {
 		//prepare variables for displaying
 		$template_args = array();
 		$template_args['transaction'] = $this->_current_txn;
 		$template_args['reg_url_link'] = $this->_reg_url_link;
 		$template_args['payments'] = array();
-		foreach ( $payments as $payment ) {
-			$template_args['payments'][] = $this->get_payment_row_html( $payment );
+		foreach ($payments as $payment) {
+			$template_args['payments'][] = $this->get_payment_row_html($payment);
 		}
 		//create a hacky payment object, but dont save it
-		$payment = EE_Payment::new_instance( array(
+		$payment = EE_Payment::new_instance(array(
 			'TXN_ID'=>$this->_current_txn->ID(),
 			'STS_ID'=>EEM_Payment::status_id_pending,
 			'PAY_timestamp'=>current_time('timestamp'),
 			'PAY_amount'=>$this->_current_txn->total(),
 			'PMD_ID'=>$this->_current_txn->payment_method_ID()
 		));
-		$template_args['gateway_content'] = $this->_current_txn->payment_method()->type_obj()->payment_overview_content($payment);//EEM_Gateways::instance()->get_payment_overview_content( $gateway_name, $payment );
+		$template_args['gateway_content'] = $this->_current_txn->payment_method()->type_obj()->payment_overview_content($payment); //EEM_Gateways::instance()->get_payment_overview_content( $gateway_name, $payment );
 		// link to SPCO payment_options
 		$template_args['show_try_pay_again_link'] = $this->_show_try_pay_again_link;
 		$template_args['SPCO_payment_options_url'] = $this->_SPCO_payment_options_url;
 		// verify template arguments
-		EEH_Template_Validator::verify_instanceof( $template_args['transaction'], '$transaction', 'EE_Transaction' );
-		EEH_Template_Validator::verify_isnt_null( $template_args['payments'], '$payments' );
-		EEH_Template_Validator::verify_isnt_null( $template_args['show_try_pay_again_link'], '$show_try_pay_again_link' );
-		EEH_Template_Validator::verify_isnt_null( $template_args['gateway_content'], '$gateway_content');
-		EEH_Template_Validator::verify_isnt_null( $template_args['SPCO_payment_options_url'], '$SPCO_payment_options_url');
-		return EEH_Template::locate_template( THANK_YOU_TEMPLATES_PATH . 'thank-you-page-payment-details.template.php', $template_args, TRUE, TRUE );
+		EEH_Template_Validator::verify_instanceof($template_args['transaction'], '$transaction', 'EE_Transaction');
+		EEH_Template_Validator::verify_isnt_null($template_args['payments'], '$payments');
+		EEH_Template_Validator::verify_isnt_null($template_args['show_try_pay_again_link'], '$show_try_pay_again_link');
+		EEH_Template_Validator::verify_isnt_null($template_args['gateway_content'], '$gateway_content');
+		EEH_Template_Validator::verify_isnt_null($template_args['SPCO_payment_options_url'], '$SPCO_payment_options_url');
+		return EEH_Template::locate_template(THANK_YOU_TEMPLATES_PATH.'thank-you-page-payment-details.template.php', $template_args, TRUE, TRUE);
 	}
 
 
@@ -705,11 +705,11 @@ 
 	 * @param array $payments
 	 * @return    string
 	 */
-	public function get_new_payments( $payments = array() ) {
+	public function get_new_payments($payments = array()) {
 		$payments_html = '';
 		//prepare variables for displaying
-		foreach ( $payments as $payment ) {
-			$payments_html .= $this->get_payment_row_html( $payment );
+		foreach ($payments as $payment) {
+			$payments_html .= $this->get_payment_row_html($payment);
 		}
 		return $payments_html;
 	}

core/db_classes/EE_Price.class.php

Doc Comments +7 added lines, -7 removed lines

@@ -113,7 +113,7 @@ 
 	/**
 	 *    get Price type
 	 * @access        public
-	 * @return        int
+	 * @return        boolean
 	 */
 	public function type() {
 		return $this->get( 'PRT_ID' );
@@ -124,7 +124,7 @@ 
 	/**
 	 *    get Price Amount
 	 * @access        public
-	 * @return        float
+	 * @return        boolean
 	 */
 	public function amount() {
 		return $this->get( 'PRC_amount' );
@@ -135,7 +135,7 @@ 
 	/**
 	 *    get Price Name
 	 * @access        public
-	 * @return        string
+	 * @return        boolean
 	 */
 	public function name() {
 		return $this->get( 'PRC_name' );
@@ -146,7 +146,7 @@ 
 	/**
 	 *    get Price description
 	 * @access        public
-	 * @return        string
+	 * @return        boolean
 	 */
 	public function desc() {
 		return $this->get( 'PRC_desc' );
@@ -157,7 +157,7 @@ 
 	/**
 	 *    get overrides
 	 * @access        public
-	 * @return        int
+	 * @return        boolean
 	 */
 	public function overrides() {
 		return $this->get( 'PRC_overrides' );
@@ -168,7 +168,7 @@ 
 	/**
 	 *    get order
 	 * @access        public
-	 * @return        int
+	 * @return        boolean
 	 */
 	public function order() {
 		return $this->get( 'PRC_order' );
@@ -181,7 +181,7 @@ 
 	 *
 	 * @since 4.5.0
 	 *
-	 * @return int
+	 * @return boolean
 	 */
 	public function wp_user() {
 		return $this->get('PRC_wp_user');

Spacing +29 added lines, -29 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -32,9 +32,9 @@ 
 	 * @param string $timezone
 	 * @return EE_Price
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = '' ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values, FALSE, $timezone );
+	public static function new_instance($props_n_values = array(), $timezone = '') {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values, FALSE, $timezone);
 	}
 
 
@@ -44,8 +44,8 @@ 
 	 * @param string $timezone
 	 * @return EE_Price
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = '' ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = '') {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 
 
@@ -56,8 +56,8 @@ 
 	 * @access        public
 	 * @param        int $PRT_ID
 	 */
-	public function set_type( $PRT_ID = 0 ) {
-		$this->set( 'PRT_ID', $PRT_ID );
+	public function set_type($PRT_ID = 0) {
+		$this->set('PRT_ID', $PRT_ID);
 	}
 
 
@@ -68,8 +68,8 @@ 
 	 * @access        public
 	 * @param        float $PRC_amount
 	 */
-	public function set_amount( $PRC_amount = 0.00 ) {
-		$this->set( 'PRC_amount', $PRC_amount );
+	public function set_amount($PRC_amount = 0.00) {
+		$this->set('PRC_amount', $PRC_amount);
 	}
 
 
@@ -80,8 +80,8 @@ 
 	 * @access        public
 	 * @param        string $PRC_name
 	 */
-	public function set_name( $PRC_name = '' ) {
-		$this->set( 'PRC_name', $PRC_name );
+	public function set_name($PRC_name = '') {
+		$this->set('PRC_name', $PRC_name);
 	}
 
 
@@ -92,8 +92,8 @@ 
 	 * @access        public
 	 * @param        string $PRC_desc
 	 */
-	public function set_description( $PRC_desc = '' ) {
-		$this->Set( 'PRC_desc', $PRC_desc );
+	public function set_description($PRC_desc = '') {
+		$this->Set('PRC_desc', $PRC_desc);
 	}
 
 
@@ -104,8 +104,8 @@ 
 	* 		@access		public
 	*		@param		bool		$PRC_deleted
 	*/
-	public function set_deleted( $PRC_deleted = NULL ) {
-		$this->set( 'PRC_deleted', $PRC_deleted );
+	public function set_deleted($PRC_deleted = NULL) {
+		$this->set('PRC_deleted', $PRC_deleted);
 	}
 
 
@@ -116,7 +116,7 @@ 
 	 * @return        int
 	 */
 	public function type() {
-		return $this->get( 'PRT_ID' );
+		return $this->get('PRT_ID');
 	}
 
 
@@ -127,7 +127,7 @@ 
 	 * @return        float
 	 */
 	public function amount() {
-		return $this->get( 'PRC_amount' );
+		return $this->get('PRC_amount');
 	}
 
 
@@ -138,7 +138,7 @@ 
 	 * @return        string
 	 */
 	public function name() {
-		return $this->get( 'PRC_name' );
+		return $this->get('PRC_name');
 	}
 
 
@@ -149,7 +149,7 @@ 
 	 * @return        string
 	 */
 	public function desc() {
-		return $this->get( 'PRC_desc' );
+		return $this->get('PRC_desc');
 	}
 
 
@@ -160,7 +160,7 @@ 
 	 * @return        int
 	 */
 	public function overrides() {
-		return $this->get( 'PRC_overrides' );
+		return $this->get('PRC_overrides');
 	}
 
 
@@ -171,7 +171,7 @@ 
 	 * @return        int
 	 */
 	public function order() {
-		return $this->get( 'PRC_order' );
+		return $this->get('PRC_order');
 	}
 
 
@@ -195,7 +195,7 @@ 
 	 * @return        bool
 	 */
 	public function deleted() {
-		return $this->get( 'PRC_deleted' );
+		return $this->get('PRC_deleted');
 	}
 
 
@@ -204,7 +204,7 @@ 
 	 * @return bool
 	 */
 	public function parent() {
-		return $this->get( 'PRC_parent' );
+		return $this->get('PRC_parent');
 	}
 
 
@@ -226,7 +226,7 @@ 
 	 * @return EE_Price_Type
 	 */
 	public function type_obj() {
-		return $this->get_first_related( 'Price_Type' );
+		return $this->get_first_related('Price_Type');
 	}
 
 
@@ -248,7 +248,7 @@ 
 	 */
 	public function is_percent() {
 		$price_type = $this->type_obj();
-		return $price_type->get( 'PRT_is_percent' );
+		return $price_type->get('PRT_is_percent');
 	}
 
 
@@ -260,7 +260,7 @@ 
 	 * @return string
 	 */
 	public function pretty_price() {
-		return ! $this->is_percent() ? $this->get_pretty('PRC_amount') : $this->get('PRC_amount') . '%';
+		return ! $this->is_percent() ? $this->get_pretty('PRC_amount') : $this->get('PRC_amount').'%';
 	}
 
 
@@ -269,7 +269,7 @@ 
 	 * @return mixed
 	 */
 	public function get_price_without_currency_symbol() {
-		return str_replace( EE_Registry::instance()->CFG->currency->sign, '', $this->get_pretty( 'PRC_amount' ) );
+		return str_replace(EE_Registry::instance()->CFG->currency->sign, '', $this->get_pretty('PRC_amount'));
 	}
 }
 

Indentation +5 added lines, -5 removed lines

@@ -99,11 +99,11 @@
 
 
 	/**
-	*		set deleted
-	*
-	* 		@access		public
-	*		@param		bool		$PRC_deleted
-	*/
+	 *		set deleted
+	 *
+	 * 		@access		public
+	 *		@param		bool		$PRC_deleted
+	 */
 	public function set_deleted( $PRC_deleted = NULL ) {
 		$this->set( 'PRC_deleted', $PRC_deleted );
 	}

core/db_classes/EE_Question.class.php

Doc Comments +10 added lines, -10 removed lines

@@ -30,7 +30,7 @@ 
 
 	/**
 	 * @param array $props_n_values
-	 * @return EE_Question|mixed
+	 * @return null|EE_Question
 	 */
 	public static function new_instance( $props_n_values = array() ) {
 		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
@@ -177,7 +177,7 @@ 
 	/**
 	 * returns the text for displaying the question to users
 	 * @access public
-	 * @return string
+	 * @return boolean
 	 */
 	public function display_text() {
 		return $this->get( 'QST_display_text' );
@@ -188,7 +188,7 @@ 
 	/**
 	 * returns the text for the administrative label
 	 * @access public
-	 * @return string
+	 * @return boolean
 	 */
 	public function admin_label() {
 		return $this->get( 'QST_admin_label' );
@@ -199,7 +199,7 @@ 
 	/**
 	 * returns the attendee column name for this question
 	 * @access public
-	 * @return string
+	 * @return boolean
 	 */
 	public function system_ID() {
 		return $this->get( 'QST_system' );
@@ -222,7 +222,7 @@ 
 	 * returns the text which should be displayed when a user
 	 * doesn't answer this question in a form
 	 * @access public
-	 * @return string
+	 * @return boolean
 	 */
 	public function required_text() {
 		return $this->get( 'QST_required_text' );
@@ -233,7 +233,7 @@ 
 	/**
 	 * returns the type of this question
 	 * @access public
-	 * @return string
+	 * @return boolean
 	 */
 	public function type() {
 		return $this->get( 'QST_type' );
@@ -245,7 +245,7 @@ 
 	 * returns an integer showing where this question should
 	 * be placed in a sequence of questions
 	 * @access public
-	 * @return int
+	 * @return boolean
 	 */
 	public function order() {
 		return $this->get( 'QST_order' );
@@ -268,7 +268,7 @@ 
 	/**
 	 * returns the id the wordpress user who created this question
 	 * @access public
-	 * @return int
+	 * @return boolean
 	 */
 	public function wp_user() {
 		return $this->get( 'QST_wp_user' );
@@ -362,7 +362,7 @@ 
 	 * Adds an option for this question. Note: if the option were previously associated with a different
 	 * Question, that relationship will be overwritten.
 	 * @param EE_Question_Option $option
-	 * @return boolean success
+	 * @return EE_Base_Class success
 	 */
 	public function add_option( EE_Question_Option $option ) {
 		return $this->_add_relation_to( $option, 'Question_Option' );
@@ -385,7 +385,7 @@ 
 	/**
 	 * Marks the option as deleted.
 	 * @param EE_Question_Option $option
-	 * @return boolean success
+	 * @return EE_Base_Class success
 	 */
 	public function remove_option( EE_Question_Option $option ) {
 		return $this->_remove_relation_to( $option, 'Question_Option' );

Spacing +61 added lines, -61 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -32,9 +32,9 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Question|mixed
 	 */
-	public static function new_instance( $props_n_values = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values );
+	public static function new_instance($props_n_values = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values);
 	}
 
 
@@ -43,8 +43,8 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Question
 	 */
-	public static function new_instance_from_db( $props_n_values = array() ) {
-		return new self( $props_n_values, TRUE );
+	public static function new_instance_from_db($props_n_values = array()) {
+		return new self($props_n_values, TRUE);
 	}
 
 
@@ -55,8 +55,8 @@ 
 	 * @access        public
 	 * @param string $QST_display_text
 	 */
-	public function set_display_text( $QST_display_text = '' ) {
-		$this->set( 'QST_display_text', $QST_display_text );
+	public function set_display_text($QST_display_text = '') {
+		$this->set('QST_display_text', $QST_display_text);
 	}
 
 
@@ -67,8 +67,8 @@ 
 	 * @access        public
 	 * @param        string $QST_admin_label
 	 */
-	public function set_admin_label( $QST_admin_label = '' ) {
-		$this->set( 'QST_admin_label', $QST_admin_label );
+	public function set_admin_label($QST_admin_label = '') {
+		$this->set('QST_admin_label', $QST_admin_label);
 	}
 
 
@@ -79,8 +79,8 @@ 
 	 * @access        public
 	 * @param        mixed $QST_system
 	 */
-	public function set_system_ID( $QST_system = '' ) {
-		$this->set( 'QST_system', $QST_system );
+	public function set_system_ID($QST_system = '') {
+		$this->set('QST_system', $QST_system);
 	}
 
 
@@ -91,8 +91,8 @@ 
 	 * @access        public
 	 * @param        string $QST_type
 	 */
-	public function set_question_type( $QST_type = '' ) {
-		$this->set( 'QST_type', $QST_type );
+	public function set_question_type($QST_type = '') {
+		$this->set('QST_type', $QST_type);
 	}
 
 
@@ -103,8 +103,8 @@ 
 	 * @access        public
 	 * @param        bool $QST_required
 	 */
-	public function set_required( $QST_required = FALSE ) {
-		$this->set( 'QST_required', $QST_required );
+	public function set_required($QST_required = FALSE) {
+		$this->set('QST_required', $QST_required);
 	}
 
 
@@ -115,8 +115,8 @@ 
 	 * @access        public
 	 * @param        string $QST_required_text
 	 */
-	public function set_required_text( $QST_required_text = '' ) {
-		$this->set( 'QST_required_text', $QST_required_text );
+	public function set_required_text($QST_required_text = '') {
+		$this->set('QST_required_text', $QST_required_text);
 	}
 
 
@@ -127,8 +127,8 @@ 
 	 * @access        public
 	 * @param        int $QST_order
 	 */
-	public function set_order( $QST_order = 0 ) {
-		$this->set( 'QST_order', $QST_order );
+	public function set_order($QST_order = 0) {
+		$this->set('QST_order', $QST_order);
 	}
 
 
@@ -139,8 +139,8 @@ 
 	 * @access        public
 	 * @param        bool $QST_admin_only
 	 */
-	public function set_admin_only( $QST_admin_only = FALSE ) {
-		$this->set( 'QST_admin_only', $QST_admin_only );
+	public function set_admin_only($QST_admin_only = FALSE) {
+		$this->set('QST_admin_only', $QST_admin_only);
 	}
 
 
@@ -151,8 +151,8 @@ 
 	 * @access        public
 	 * @param        int $QST_wp_user
 	 */
-	public function set_wp_user( $QST_wp_user = 1 ) {
-		$this->set( 'QST_wp_user', $QST_wp_user );
+	public function set_wp_user($QST_wp_user = 1) {
+		$this->set('QST_wp_user', $QST_wp_user);
 	}
 
 
@@ -168,8 +168,8 @@ 
 	 * @access        public
 	 * @param 	bool $QST_deleted
 	 */
-	public function set_deleted( $QST_deleted = FALSE ) {
-		$this->set( 'QST_deleted', $QST_deleted );
+	public function set_deleted($QST_deleted = FALSE) {
+		$this->set('QST_deleted', $QST_deleted);
 	}
 
 
@@ -180,7 +180,7 @@ 
 	 * @return string
 	 */
 	public function display_text() {
-		return $this->get( 'QST_display_text' );
+		return $this->get('QST_display_text');
 	}
 
 
@@ -191,7 +191,7 @@ 
 	 * @return string
 	 */
 	public function admin_label() {
-		return $this->get( 'QST_admin_label' );
+		return $this->get('QST_admin_label');
 	}
 
 
@@ -202,7 +202,7 @@ 
 	 * @return string
 	 */
 	public function system_ID() {
-		return $this->get( 'QST_system' );
+		return $this->get('QST_system');
 	}
 
 
@@ -213,7 +213,7 @@ 
 	 * @return boolean
 	 */
 	public function required() {
-		return $this->get( 'QST_required' );
+		return $this->get('QST_required');
 	}
 
 
@@ -225,7 +225,7 @@ 
 	 * @return string
 	 */
 	public function required_text() {
-		return $this->get( 'QST_required_text' );
+		return $this->get('QST_required_text');
 	}
 
 
@@ -236,7 +236,7 @@ 
 	 * @return string
 	 */
 	public function type() {
-		return $this->get( 'QST_type' );
+		return $this->get('QST_type');
 	}
 
 
@@ -248,7 +248,7 @@ 
 	 * @return int
 	 */
 	public function order() {
-		return $this->get( 'QST_order' );
+		return $this->get('QST_order');
 	}
 
 
@@ -260,7 +260,7 @@ 
 	 * @return boolean
 	 */
 	public function admin_only() {
-		return $this->get( 'QST_admin_only' );
+		return $this->get('QST_admin_only');
 	}
 
 
@@ -271,7 +271,7 @@ 
 	 * @return int
 	 */
 	public function wp_user() {
-		return $this->get( 'QST_wp_user' );
+		return $this->get('QST_wp_user');
 	}
 
 
@@ -282,7 +282,7 @@ 
 	 * @return boolean
 	 */
 	public function deleted() {
-		return $this->get( 'QST_deleted' );
+		return $this->get('QST_deleted');
 	}
 
 
@@ -292,7 +292,7 @@ 
 	 * @return EE_Answer[]
 	 */
 	public function answers() {
-		return $this->get_many_related( 'Answer' );
+		return $this->get_many_related('Answer');
 	}
 
 
@@ -302,7 +302,7 @@ 
 	 * @return boolean true = has answers, false = no answers.
 	 */
 	public function has_answers() {
-		return $this->count_related( 'Answer' ) > 0 ? TRUE : FALSE;
+		return $this->count_related('Answer') > 0 ? TRUE : FALSE;
 	}
 
 
@@ -312,7 +312,7 @@ 
 	 * @return EE_Question_Group[]
 	 */
 	public function question_groups() {
-		return $this->get_many_related( 'Question_Group' );
+		return $this->get_many_related('Question_Group');
 	}
 
 
@@ -326,24 +326,24 @@ 
 	 *                                                       whether it was trashed or not.
 	 * @return EE_Question_Option[]
 	 */
-	public function options( $notDeletedOptionsOnly = TRUE, $selected_value_to_always_include = NULL ) {
-		if ( ! $this->ID() ) {
+	public function options($notDeletedOptionsOnly = TRUE, $selected_value_to_always_include = NULL) {
+		if ( ! $this->ID()) {
 			return array();
 		}
 		$query_params = array();
-		if ( $selected_value_to_always_include ) {
-			if ( is_array( $selected_value_to_always_include ) ) {
-				$query_params[ 0 ][ 'OR*options-query' ][ 'QSO_value' ] = array( 'IN', $selected_value_to_always_include );
+		if ($selected_value_to_always_include) {
+			if (is_array($selected_value_to_always_include)) {
+				$query_params[0]['OR*options-query']['QSO_value'] = array('IN', $selected_value_to_always_include);
 			} else {
-				$query_params[ 0 ][ 'OR*options-query' ][ 'QSO_value' ] = $selected_value_to_always_include;
+				$query_params[0]['OR*options-query']['QSO_value'] = $selected_value_to_always_include;
 			}
 		}
-		if ( $notDeletedOptionsOnly ) {
-			$query_params[ 0 ][ 'OR*options-query' ][ 'QSO_deleted' ] = FALSE;
+		if ($notDeletedOptionsOnly) {
+			$query_params[0]['OR*options-query']['QSO_deleted'] = FALSE;
 		}
 		//order by QSO_order
-		$query_params[ 'order_by' ] = array( 'QSO_order' => 'ASC' );
-		return $this->get_many_related( 'Question_Option', $query_params );
+		$query_params['order_by'] = array('QSO_order' => 'ASC');
+		return $this->get_many_related('Question_Option', $query_params);
 	}
 
 
@@ -353,7 +353,7 @@ 
 	 * @return \EE_Question_Option[]
 	 */
 	public function temp_options() {
-		return $this->_model_relations[ 'Question_Option' ];
+		return $this->_model_relations['Question_Option'];
 	}
 
 
@@ -364,8 +364,8 @@ 
 	 * @param EE_Question_Option $option
 	 * @return boolean success
 	 */
-	public function add_option( EE_Question_Option $option ) {
-		return $this->_add_relation_to( $option, 'Question_Option' );
+	public function add_option(EE_Question_Option $option) {
+		return $this->_add_relation_to($option, 'Question_Option');
 	}
 
 
@@ -375,8 +375,8 @@ 
 	 * @param EE_Question_Option $option
 	 * @return boolean success
 	 */
-	public function add_temp_option( EE_Question_Option $option ) {
-		$this->_model_relations[ 'Question_Option' ][ ] = $option;
+	public function add_temp_option(EE_Question_Option $option) {
+		$this->_model_relations['Question_Option'][] = $option;
 		return TRUE;
 	}
 
@@ -387,8 +387,8 @@ 
 	 * @param EE_Question_Option $option
 	 * @return boolean success
 	 */
-	public function remove_option( EE_Question_Option $option ) {
-		return $this->_remove_relation_to( $option, 'Question_Option' );
+	public function remove_option(EE_Question_Option $option) {
+		return $this->_remove_relation_to($option, 'Question_Option');
 	}
 
 
@@ -397,8 +397,8 @@ 
 	 * @return bool
 	 */
 	public function is_system_question() {
-		$system_ID = $this->get( 'QST_system' );
-		return ! empty( $system_ID ) ? TRUE : FALSE;
+		$system_ID = $this->get('QST_system');
+		return ! empty($system_ID) ? TRUE : FALSE;
 	}
 
 
@@ -411,8 +411,8 @@ 
 	 */
 	public function set_order_to_latest() {
 		$latest_order = $this->get_model()->get_latest_question_order();
-		$latest_order ++;
-		$this->set( 'QST_order', $latest_order );
+		$latest_order++;
+		$this->set('QST_order', $latest_order);
 	}