eventespresso / event-espresso-core

core/libraries/shortcodes/EE_Datetime_Shortcodes.lib.php

Braces +2 added lines, -1 removed lines

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

Spacing +13 added lines, -13 removed lines

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

modules/event_single/EED_Event_Single.module.php

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *

Spacing +78 added lines, -78 removed lines

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

modules/ical/EED_Ical.module.php

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *

Spacing +70 added lines, -70 removed lines

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

Indentation +2 added lines, -2 removed lines

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

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

@@ -38,8 +38,8 @@ 
 	 * @return EED_Single_Page_Checkout
 	 */
 	public static function instance() {
-		add_filter( 'EED_Single_Page_Checkout__SPCO_active', '__return_true' );
-		return parent::get_instance( __CLASS__ );
+		add_filter('EED_Single_Page_Checkout__SPCO_active', '__return_true');
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -84,22 +84,22 @@ 
 	 */
 	public static function set_hooks_admin() {
 		EED_Single_Page_Checkout::set_definitions();
-		if ( defined( 'DOING_AJAX' )) {
+		if (defined('DOING_AJAX')) {
 			// going to start an output buffer in case anything gets accidentally output that might disrupt our JSON response
 			ob_start();
 			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'));
 	}
 
 
@@ -108,8 +108,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();
 	}
 
@@ -119,7 +119,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');
 	}
 
 
@@ -128,7 +128,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');
 	}
 
 
@@ -137,7 +137,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');
 	}
 
 
@@ -149,7 +149,7 @@ 
 	 * @return void
 	 */
 	public static function update_checkout() {
-		EED_Single_Page_Checkout::process_ajax_request( 'update_checkout' );
+		EED_Single_Page_Checkout::process_ajax_request('update_checkout');
 	}
 
 
@@ -162,8 +162,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');
 		}
 	}
 
@@ -176,14 +176,14 @@ 
 	 *  @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_REG_STEPS_PATH', SPCO_BASE_PATH . 'reg_steps' . 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_REG_STEPS_PATH', SPCO_BASE_PATH.'reg_steps'.DS);
+		define('SPCO_TEMPLATES_PATH', SPCO_BASE_PATH.'templates'.DS);
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(SPCO_BASE_PATH, TRUE);
 	}
 
 
@@ -198,7 +198,7 @@ 
 	 */
 	public static function load_reg_steps() {
 		static $reg_steps_loaded = FALSE;
-		if ( $reg_steps_loaded ) {
+		if ($reg_steps_loaded) {
 			return;
 		}
 		// filter list of reg_steps
@@ -207,24 +207,24 @@ 
 			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'));
 					}
 				}
 			}
@@ -243,28 +243,28 @@ 
 	 */
 	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_REG_STEPS_PATH . 'attendee_information',
+					'file_path' => SPCO_REG_STEPS_PATH.'attendee_information',
 					'class_name' => 'EE_SPCO_Reg_Step_Attendee_Information',
 					'slug' => 'attendee_information',
 					'has_hooks' => FALSE
 				),
 				20 => array(
-					'file_path' => SPCO_REG_STEPS_PATH . 'registration_confirmation',
+					'file_path' => SPCO_REG_STEPS_PATH.'registration_confirmation',
 					'class_name' => 'EE_SPCO_Reg_Step_Registration_Confirmation',
 					'slug' => 'registration_confirmation',
 					'has_hooks' => FALSE
 				),
 				30 => array(
-					'file_path' => SPCO_REG_STEPS_PATH . 'payment_options',
+					'file_path' => SPCO_REG_STEPS_PATH.'payment_options',
 					'class_name' => 'EE_SPCO_Reg_Step_Payment_Options',
 					'slug' => 'payment_options',
 					'has_hooks' => TRUE
 				),
 				999 => array(
-					'file_path' => SPCO_REG_STEPS_PATH . 'finalize_registration',
+					'file_path' => SPCO_REG_STEPS_PATH.'finalize_registration',
 					'class_name' => 'EE_SPCO_Reg_Step_Finalize_Registration',
 					'slug' => 'finalize_registration',
 					'has_hooks' => FALSE
@@ -284,9 +284,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();
@@ -302,15 +302,15 @@ 
 	 */
 	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 ) {
-				EED_Single_Page_Checkout::instance()->checkout->set_reg_step_initiated( $final_reg_step );
-				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) {
+				EED_Single_Page_Checkout::instance()->checkout->set_reg_step_initiated($final_reg_step);
+				if ($final_reg_step->process_reg_step()) {
 					$final_reg_step->set_completed();
 					EED_Single_Page_Checkout::instance()->checkout->update_txn_reg_steps_array();
 					return EED_Single_Page_Checkout::instance()->checkout->transaction;
@@ -329,11 +329,11 @@ 
 	 * @param WP_Query $WP_Query
 	 * @return    void
 	 */
-	public function run( $WP_Query ) {
+	public function run($WP_Query) {
 		if (
 			$WP_Query instanceof WP_Query
 			&& $WP_Query->is_main_query()
-			&& apply_filters( 'FHEE__EED_Single_Page_Checkout__run', true )
+			&& apply_filters('FHEE__EED_Single_Page_Checkout__run', true)
 		) {
 			$this->_initialize();
 		}
@@ -349,8 +349,8 @@ 
 	 * @param WP_Query $WP_Query
 	 * @return    void
 	 */
-	public static function init( $WP_Query ) {
-		EED_Single_Page_Checkout::instance()->run( $WP_Query );
+	public static function init($WP_Query) {
+		EED_Single_Page_Checkout::instance()->run($WP_Query);
 	}
 
 
@@ -364,35 +364,35 @@ 
 	 */
 	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
 		$this->checkout = $this->_initialize_checkout();
 		// filter checkout
-		$this->checkout = apply_filters( 'FHEE__EED_Single_Page_Checkout___initialize__checkout', $this->checkout );
+		$this->checkout = apply_filters('FHEE__EED_Single_Page_Checkout___initialize__checkout', $this->checkout);
 		// 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 ) {
+			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' ),
+					__('Your Registration and Transaction information could not be retrieved from the db.', 'event_espresso'),
 					__FILE__, __FUNCTION__, __LINE__
 				);
 				// add some style and make it dance
@@ -402,10 +402,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;
 		}
@@ -430,9 +430,9 @@ 
 		// set no cache headers and constants
 		EE_System::do_not_cache();
 		// add anchor
-		add_action( 'loop_start', array( $this, 'set_checkout_anchor' ), 1 );
+		add_action('loop_start', array($this, 'set_checkout_anchor'), 1);
 		// remove transaction lock
-		add_action( 'shutdown', array( $this, 'unlock_transaction' ), 1 );
+		add_action('shutdown', array($this, 'unlock_transaction'), 1);
 	}
 
 
@@ -449,20 +449,20 @@ 
 		// 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();
 			}
 		}
-		$checkout = apply_filters( 'FHEE__EED_Single_Page_Checkout___initialize_checkout__checkout', $checkout );
+		$checkout = apply_filters('FHEE__EED_Single_Page_Checkout___initialize_checkout__checkout', $checkout);
 		// reset anything that needs a clean slate for each request
 		$checkout->reset_for_current_request();
 		return $checkout;
@@ -480,24 +480,24 @@ 
 		// 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 = 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
+			: FALSE; // TRUE 	FALSE
 		//$this->_display_request_vars();
 	}
 
@@ -510,17 +510,17 @@ 
 	 * @return    void
 	 */
 	protected function _display_request_vars() {
-		if ( ! WP_DEBUG ) {
+		if ( ! WP_DEBUG) {
 			return;
 		}
-		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__);
 	}
 
 
@@ -534,8 +534,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';
 	}
 
 
@@ -551,27 +551,27 @@ 
 	private function _load_and_instantiate_reg_steps() {
 		// have reg_steps already been instantiated ?
 		if (
-			empty( $this->checkout->reg_steps ) ||
-			apply_filters( 'FHEE__Single_Page_Checkout__load_reg_steps__reload_reg_steps', false, $this->checkout )
+			empty($this->checkout->reg_steps) ||
+			apply_filters('FHEE__Single_Page_Checkout__load_reg_steps__reload_reg_steps', false, $this->checkout)
 		) {
 			// 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', false );
+				$this->checkout->remove_reg_step('registration_confirmation', false);
 			} else if (
 				EE_Registry::instance()->CFG->registration->reg_confirmation_last
-				&& isset( $this->checkout->reg_steps['registration_confirmation'] )
+				&& 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(
@@ -581,13 +581,13 @@ 
 			// 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
@@ -605,10 +605,10 @@ 
 	 * @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
@@ -626,26 +626,26 @@ 
 				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' ),
+					__('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>',
@@ -669,16 +669,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;
 		}
 	}
@@ -692,11 +692,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;
 	}
@@ -711,8 +711,8 @@ 
 	 * @param EE_Transaction $transaction
 	 * 	@return EE_Cart
 	 */
-	public function get_cart_for_transaction( EE_Transaction $transaction ) {
-		return EE_Cart::get_cart_from_txn( $transaction );
+	public function get_cart_for_transaction(EE_Transaction $transaction) {
+		return EE_Cart::get_cart_from_txn($transaction);
 	}
 
 
@@ -727,17 +727,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;
 	}
@@ -757,15 +757,15 @@ 
 			// grab the cart grand total
 			$cart_total = $this->checkout->cart->get_cart_grand_total();
 			// create new TXN
-			return EE_Transaction::new_instance( array(
+			return EE_Transaction::new_instance(array(
 				'TXN_timestamp' 	=> time(),
 				'TXN_reg_steps' 		=> $this->checkout->initialize_txn_reg_steps_array(),
 				'TXN_total' 				=> $cart_total > 0 ? $cart_total : 0,
 				'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;
 	}
@@ -779,34 +779,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, true );
+		$registrations = $transaction->registrations($this->checkout->reg_cache_where_params, true);
 		// 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, false );
+			$registrations = $transaction->registrations($this->checkout->reg_cache_where_params, false);
 			// 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);
 			}
 		}
 	}
@@ -820,17 +820,17 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return    array
 	 */
-	private function _initialize_registrations( EE_Transaction $transaction ) {
+	private function _initialize_registrations(EE_Transaction $transaction) {
 		$att_nmbr = 0;
 		$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');
 			$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 $line_item ) {
+			foreach ($this->checkout->cart->get_tickets() as $line_item) {
 				//do the following for each ticket of this type they selected
-				for ( $x = 1; $x <= $line_item->quantity(); $x++ ) {
+				for ($x = 1; $x <= $line_item->quantity(); $x++) {
 					$att_nmbr++;
 					$registration = $registration_processor->generate_ONE_registration_from_line_item(
 						$line_item,
@@ -838,12 +838,12 @@ 
 						$att_nmbr,
 						$this->checkout->total_ticket_count
 					);
-					if ( $registration instanceof EE_Registration ) {
-						$registrations[ $registration->ID() ] = $registration;
+					if ($registration instanceof EE_Registration) {
+						$registrations[$registration->ID()] = $registration;
 					}
 				}
 			}
-			$registration_processor->fix_reg_final_price_rounding_issue( $transaction );
+			$registration_processor->fix_reg_final_price_rounding_issue($transaction);
 		}
 		return $registrations;
 	}
@@ -858,12 +858,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;
 	}
 
 
@@ -878,35 +878,35 @@ 
 	 */
 	private function _final_verifications() {
 		// filter checkout
-		$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);
 		//verify that current step is still set correctly
-		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 returning to SPCO, then verify that primary registrant is set
-		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;
 			}
 		}
 		// now that things have been kinda sufficiently verified,
 		// let's add the checkout to the session so that's available other systems
-		EE_Registry::instance()->SSN->set_checkout( $this->checkout );
+		EE_Registry::instance()->SSN->set_checkout($this->checkout);
 		return true;
 	}
 
@@ -922,28 +922,28 @@ 
 	 * @access    private
 	 * @param bool $reinitializing
 	 */
-	private function _initialize_reg_steps( $reinitializing = false ) {
-		$this->checkout->set_reg_step_initiated( $this->checkout->current_step );
+	private function _initialize_reg_steps($reinitializing = false) {
+		$this->checkout->set_reg_step_initiated($this->checkout->current_step);
 		// loop thru all steps to call their individual "initialize" methods and set i18n strings for JS
-		foreach ( $this->checkout->reg_steps as $reg_step ) {
-			if ( ! $reg_step->initialize_reg_step() ) {
+		foreach ($this->checkout->reg_steps as $reg_step) {
+			if ( ! $reg_step->initialize_reg_step()) {
 				// if not initialized then maybe this step is being removed...
-				if ( $reg_step->is_current_step() && ! $reinitializing ) {
+				if ($reg_step->is_current_step() && ! $reinitializing) {
 					// if it was the current step, then we need to start over here
-					$this->_initialize_reg_steps( true );
+					$this->_initialize_reg_steps(true);
 					return;
 				}
 				continue;
 			}
 			// 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);
 	}
 
 
@@ -956,39 +956,39 @@ 
 	 */
 	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();
 						return;
 					}
 				}
-			} catch( EE_Error $e ) {
+			} catch (EE_Error $e) {
 				$e->get_error();
 			}
 		}
@@ -1004,38 +1004,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()
 						),
@@ -1061,10 +1061,10 @@ 
 	public function add_styles_and_scripts() {
 		// i18n
 		$this->translate_js_strings();
-		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);
 		}
 	}
 
@@ -1080,42 +1080,42 @@ 
 		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['currency'] = EE_Registry::instance()->CFG->currency;
 		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 your 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' ),
+			__('%1$sWe\'re sorry, but your 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'),
 			'<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);
 	}
 
 
@@ -1128,25 +1128,25 @@ 
 	 */
 	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');
 		// 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_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');
 
 		/**
 		 * 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();
@@ -1162,20 +1162,20 @@ 
 	 */
 	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'));
 
-			$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;
 			$cookies_not_set_msg = '';
-			if ( $empty_cart ) {
-				if ( ! isset( $_COOKIE[ 'ee_cookie_test' ] ) ) {
+			if ($empty_cart) {
+				if ( ! isset($_COOKIE['ee_cookie_test'])) {
 					$cookies_not_set_msg = apply_filters(
 						'FHEE__Single_Page_Checkout__display_spco_reg_form__cookies_not_set_msg',
 						sprintf(
-							__( '%1$s%3$sIt appears your browser is not currently set to accept Cookies%4$s%5$sIn order to register for events, you need to enable cookies.%7$sIf you require assistance, then click the following link to learn how to %8$senable cookies%9$s%6$s%2$s', 'event_espresso' ),
+							__('%1$s%3$sIt appears your browser is not currently set to accept Cookies%4$s%5$sIn order to register for events, you need to enable cookies.%7$sIf you require assistance, then click the following link to learn how to %8$senable cookies%9$s%6$s%2$s', 'event_espresso'),
 							'<div class="ee-attention">',
 							'</div>',
 							'<h6 class="important-notice">',
@@ -1196,7 +1196,7 @@ 
 					'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' 		=> $empty_cart,
 									'revisit' 				=> $this->checkout->revisit,
@@ -1205,8 +1205,8 @@ 
 									'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>'
 										)
@@ -1214,14 +1214,14 @@ 
 									'cookies_not_set_msg' 		=> $cookies_not_set_msg,
 									'registration_time_limit' 	=> $this->checkout->get_registration_time_limit(),
 									'session_expiration' 			=>
-										gmdate( 'M d, Y H:i:s', EE_Registry::instance()->SSN->expiration() + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS ) )
+										gmdate('M d, Y H:i:s', EE_Registry::instance()->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());
 		}
 	}
 
@@ -1235,8 +1235,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>';
 		}
 	}
@@ -1250,18 +1250,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 ), 'https://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), 'https://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>'
 				)
@@ -1292,12 +1292,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);
 		}
 	}
 
@@ -1310,12 +1310,12 @@ 
 	 * @return void
 	 */
 	public function go_to_next_step() {
-		if ( EE_Registry::instance()->REQ->ajax ) {
+		if (EE_Registry::instance()->REQ->ajax) {
 			// capture contents of output buffer we started earlier in the request, and insert into JSON response
-			$this->checkout->json_response->set_unexpected_errors( ob_get_clean() );
+			$this->checkout->json_response->set_unexpected_errors(ob_get_clean());
 		}
 		// just return for these conditions
-		if ( $this->checkout->admin_request || $this->checkout->action == 'redirect_form' || $this->checkout->action == 'update_checkout' ) {
+		if ($this->checkout->admin_request || $this->checkout->action == 'redirect_form' || $this->checkout->action == 'update_checkout') {
 			return;
 		}
 		// AJAX response
@@ -1336,7 +1336,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__,
@@ -1346,10 +1346,10 @@ 
 			//		'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_payment_amount( $this->checkout->amount_owing );
+			$this->checkout->json_response->set_registration_time_limit($this->checkout->get_registration_time_limit());
+			$this->checkout->json_response->set_payment_amount($this->checkout->amount_owing);
 			// 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();
@@ -1366,9 +1366,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(
@@ -1379,7 +1379,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

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 +12 added lines, -12 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,17 +62,17 @@ 
 		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' ),
+				'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'),
 					'default'=> sprintf(
 						__('Please initiate an electronic payment using the following bank information: %1$sAccount Owner: Luke Skywalker%1$sBank Account # 1234567890%1$sBank Name: Rebellion Bank%1$sRouting Number: 12345%1$sBank Address: 12345 Wookie Rd., Planet Corellian.%1$sPayment must be received within 48 hours of event date.', 'event_espresso'),
 						"\n"
 					),
-					'validation_strategies' => array( new EE_Full_HTML_Validation_Strategy() ),
+					'validation_strategies' => array(new EE_Full_HTML_Validation_Strategy()),
 				)),
 			),
 			'exclude'=>array('PMD_debug_mode')
@@ -86,7 +86,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'),
@@ -103,7 +103,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(
@@ -115,7 +115,7 @@ 
 							),
 						$extra_meta_for_payment_method);
 		return EEH_Template::locate_template(
-				'payment_methods' . DS . 'Bank'. DS . 'templates' . DS . 'bank_payment_details_content.template.php',
+				'payment_methods'.DS.'Bank'.DS.'templates'.DS.'bank_payment_details_content.template.php',
 				$template_vars);
 	}
 

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 +26 added lines, -26 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,53 +61,53 @@ 
 	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_Email_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() ),
-						'validation_strategies' => array( new EE_Full_HTML_Validation_Strategy() ),
+					'pdf_payee_address' => new EE_Text_Area_Input(array(
+						'html_label_text' => sprintf(__('Payee Address %s', 'event_espresso'), $this->get_help_tab_link()),
+						'validation_strategies' => array(new EE_Full_HTML_Validation_Strategy()),
 					)),
 					'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'),
-						'validation_strategies' => array( new EE_Full_HTML_Validation_Strategy() ),
+						'validation_strategies' => array(new EE_Full_HTML_Validation_Strategy()),
 					)),
 					'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'),
-						'validation_strategies' => array( new EE_Full_HTML_Validation_Strategy() ),
+						'validation_strategies' => array(new EE_Full_HTML_Validation_Strategy()),
 					)),
 					'page_extra_info'=>new EE_Text_Area_Input(array(
-						'html_label_text'=>  sprintf(__("Extra Info %s", "event_espresso"),  $this->get_help_tab_link()),
-						'validation_strategies' => array( new EE_Full_HTML_Validation_Strategy() ),
+						'html_label_text'=>  sprintf(__("Extra Info %s", "event_espresso"), $this->get_help_tab_link()),
+						'validation_strategies' => array(new EE_Full_HTML_Validation_Strategy()),
 					)),
 				),
 				'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','PMD_order',
-					$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', 'PMD_order',
+					$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;
@@ -120,7 +120,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'),
@@ -138,17 +138,17 @@ 
 	 * @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::locate_template(
-			'payment_methods' . DS . 'Invoice'. DS . 'templates'.DS.'invoice_payment_details_content.template.php',
+			'payment_methods'.DS.'Invoice'.DS.'templates'.DS.'invoice_payment_details_content.template.php',
 			array_merge(
 				array(
 					'payment_method'			=> $this->_pm_instance,
 					'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_checkout/EES_Espresso_Checkout.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 +6 added lines, -6 removed lines

@@ -51,17 +51,17 @@ 
 	 * @param WP $WP
 	 * @return    void
 	 */
-	public function run( WP $WP ) {
-		if ( did_action( 'pre_get_posts' ) && did_action( 'send_headers' ) ) {
+	public function run(WP $WP) {
+		if (did_action('pre_get_posts') && did_action('send_headers')) {
 			global $wp_query;
 			EED_Single_Page_Checkout::load_reg_steps();
-			EED_Single_Page_Checkout::init( $wp_query );
+			EED_Single_Page_Checkout::init($wp_query);
 		} 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);
 			// this will trigger the EED_Single_Page_Checkout module's run() method during the pre_get_posts hook point,
 			// this allows us to initialize things, enqueue assets, etc,
-			add_action( 'pre_get_posts', array( 'EED_Single_Page_Checkout', 'init' ), 10, 1 );
+			add_action('pre_get_posts', array('EED_Single_Page_Checkout', 'init'), 10, 1);
 		}
 	}
 
@@ -74,7 +74,7 @@ 
 	 *  @param		array 	$attributes
 	 *  @return 	string
 	 */
-	public function process_shortcode( $attributes = array() ) {
+	public function process_shortcode($attributes = array()) {
 		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 +164 added lines, -164 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 ( WP_DEBUG && ! $this->_current_txn instanceof EE_Transaction ) {
+		if (WP_DEBUG && ! $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 ( WP_DEBUG && ! EE_Registry::instance()->REQ->is_set( 'e_reg_url_link' )) {
+		if (WP_DEBUG && ! 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,25 +226,25 @@ 
 	 *  @param  	WP $WP
 	 *  @return 	void
 	 */
-	public function run( WP $WP ) {
+	public function run(WP $WP) {
 		// remove site_url() from thank you page URL
-		$thank_you_page_URL = substr( EE_Registry::instance()->CFG->core->thank_you_page_url(), strlen( home_url() ) );
+		$thank_you_page_URL = substr(EE_Registry::instance()->CFG->core->thank_you_page_url(), strlen(home_url()));
 		// remove other non-essential details from URL
-		$thank_you_page_URL = trim( parse_url( $thank_you_page_URL, PHP_URL_PATH ), '/' );
+		$thank_you_page_URL = trim(parse_url($thank_you_page_URL, PHP_URL_PATH), '/');
 		// ensure this shortcode doesn't trigger on anything BUT the thank you page
-		if ( isset( $WP->request ) && trim( $WP->request, '/' ) != $thank_you_page_URL ) {
+		if (isset($WP->request) && trim($WP->request, '/') != $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 );
-		EE_Registry::instance()->SSN->clear_session( __CLASS__, __FUNCTION__ );
+		add_action('wp_enqueue_scripts', array($this, 'load_js'), 10);
+		EE_Registry::instance()->SSN->clear_session(__CLASS__, __FUNCTION__);
 		$this->_translate_strings();
 	}
 
@@ -257,18 +257,18 @@ 
 	 * 	@return 		void
 	 */
 	protected function _translate_strings() {
-		EE_Registry::$i18n_js_strings[ 'e_reg_url_link' ] = $this->_reg_url_link;
-		EE_Registry::$i18n_js_strings[ 'initial_access' ] = time();
-		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[ '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(
+		EE_Registry::$i18n_js_strings['e_reg_url_link'] = $this->_reg_url_link;
+		EE_Registry::$i18n_js_strings['initial_access'] = time();
+		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['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>'
 			)
@@ -285,8 +285,8 @@ 
 	 * 	@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');
 	}
 
 
@@ -299,13 +299,13 @@ 
 	 */
 	public function init() {
 		$this->_get_reg_url_link();
-		if ( ! $this->get_txn() ) {
-			EE_Registry::instance()->load_helper( 'HTML' );
+		if ( ! $this->get_txn()) {
+			EE_Registry::instance()->load_helper('HTML');
 
 			echo EEH_HTML::div(
-				EEH_HTML::h4( __( 'We\'re sorry...', 'event_espresso' ), '', '' ) .
+				EEH_HTML::h4(__('We\'re sorry...', 'event_espresso'), '', '').
 				sprintf(
-					__( 'This is a system page for displaying transaction information after a purchase.%1$sYou are most likely seeing this notice because you have navigated to this page%1$sthrough some means other than completing a transaction.%1$sSorry for the disappointment, but you will most likely find nothing of interest here.%1$s%1$s', 'event_espresso' ),
+					__('This is a system page for displaying transaction information after a purchase.%1$sYou are most likely seeing this notice because you have navigated to this page%1$sthrough some means other than completing a transaction.%1$sSorry for the disappointment, but you will most likely find nothing of interest here.%1$s%1$s', 'event_espresso'),
 					'<br/>'
 				),
 				'', 'ee-attention'
@@ -313,22 +313,22 @@ 
 			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 =  apply_filters( 'AFEE__EES_Espresso_Thank_You__init__show_try_pay_again_link_default',	TRUE );
+		$show_try_pay_again_link_default = apply_filters('AFEE__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;
 		}
@@ -350,18 +350,18 @@ 
 		}
 		// 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();
 
@@ -377,31 +377,31 @@ 
 	 *  @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() );
 		// 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->_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->_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);
 
 	}
 
@@ -418,15 +418,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;
 		}
@@ -436,24 +436,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:
@@ -468,29 +468,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'] = time();
@@ -510,9 +510,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'] ) ? time() - $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']) ? time() - $thank_you_page_data['initial_access'] : 0,
 			'txn_status' => $this->_current_txn->status_ID()
 		);
 		return $response;
@@ -535,13 +535,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);
 	}
 
 
@@ -550,38 +550,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()
 				)
 			);
@@ -597,26 +597,26 @@ 
 	 *  @return 	void
 	 */
 	public function get_ajax_content() {
-		if ( ! $this->get_txn() ) {
+		if ( ! $this->get_txn()) {
 			return;
 		}
 		// first determine which event(s) require pre-approval or not
 		$events = array();
 		$events_requiring_pre_approval = array();
-		foreach ( $this->_current_txn->registrations() as $registration ) {
-			if ( $registration instanceof EE_Registration ) {
+		foreach ($this->_current_txn->registrations() as $registration) {
+			if ($registration instanceof EE_Registration) {
 				$event = $registration->event();
-				if ( $event instanceof EE_Event ) {
-					if ( $registration->is_not_approved() && $registration->event() instanceof EE_Event ) {
-						$events_requiring_pre_approval[ $event->ID() ] = $event;
+				if ($event instanceof EE_Event) {
+					if ($registration->is_not_approved() && $registration->event() instanceof EE_Event) {
+						$events_requiring_pre_approval[$event->ID()] = $event;
 					} else {
-						$events[ $event->ID() ] = $event;
+						$events[$event->ID()] = $event;
 					}
 				}
 			}
 		}
-		$this->display_details_for_events_requiring_pre_approval( $events_requiring_pre_approval );
-		$this->display_details_for_events( $events );
+		$this->display_details_for_events_requiring_pre_approval($events_requiring_pre_approval);
+		$this->display_details_for_events($events);
 	}
 
 
@@ -628,21 +628,21 @@ 
 	 * @param EE_Event[] $events
 	 * @return string
 	 */
-	public function display_details_for_events( $events = array() ) {
-		if ( ! empty( $events ) ) {
+	public function display_details_for_events($events = array()) {
+		if ( ! empty($events)) {
 			?>
 			<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 && ! $this->_payments_closed ) : ?>
+					<?php if ( ! $this->_is_offline_payment_method && ! $this->_payments_closed) : ?>
 						<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' ) ); ?>
+							<?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 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; ?>
@@ -662,20 +662,20 @@ 
 	 * @param EE_Event[] $events
 	 * @return string
 	 */
-	public function display_details_for_events_requiring_pre_approval( $events = array() ) {
-		if ( ! empty( $events ) ) {
+	public function display_details_for_events_requiring_pre_approval($events = array()) {
+		if ( ! empty($events)) {
 ?>
 	<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 following Event(s) you have registered for do not require payment at this time and will not be 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' )
+				__('The following Event(s) you have registered for do not require payment at this time and will not be 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>
 		<ul class="events-requiring-pre-approval-ul">
-			<?php foreach ( $events as $event ) {
-				if ( $event instanceof EE_Event ) {
+			<?php foreach ($events as $event) {
+				if ($event instanceof EE_Event) {
 					echo '<li><span class="dashicons dashicons-marker ee-icon-size-16 orange-text"></span>', $event->name(), '</li>';
 				}
 			} ?>
@@ -699,15 +699,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);
 	}
 
 
@@ -719,9 +719,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()
@@ -730,25 +730,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;
 	}
@@ -762,17 +762,17 @@ 
 	 * @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'=>time(),
@@ -780,21 +780,21 @@ 
 			'PMD_ID'=>$this->_current_txn->payment_method_ID()
 		));
 		$payment_method = $this->_current_txn->payment_method();
-		if ( $payment_method instanceof EE_Payment_Method && $payment_method->type_obj() instanceof EE_PMT_Base ) {
-			$template_args[ 'gateway_content' ] = $payment_method->type_obj()->payment_overview_content( $payment );
+		if ($payment_method instanceof EE_Payment_Method && $payment_method->type_obj() instanceof EE_PMT_Base) {
+			$template_args['gateway_content'] = $payment_method->type_obj()->payment_overview_content($payment);
 		} else {
-			$template_args[ 'gateway_content' ] = '';
+			$template_args['gateway_content'] = '';
 		}
 		// 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);
 	}
 
 
@@ -806,11 +806,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;
 	}

caffeinated/core/libraries/messages/defaults/default/html_receipt_attendee_list.template.php

Indentation +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@
 <?php
 /**
- * This is the template for the html messenger and receipt message type attendee_list field.
- */
+	 * This is the template for the html messenger and receipt message type attendee_list field.
+	 */
 ?>
 <li class="ticket-registration">
 	<table class="registration-details">

Spacing +2 added lines, -2 removed lines

@@ -6,11 +6,11 @@
 <li class="ticket-registration">
 	<table class="registration-details">
 		<tr class="odd">
-			<th><?php	_e('Attendee', 'event_espresso');?></th>
+			<th><?php	_e('Attendee', 'event_espresso'); ?></th>
 			<td>[FNAME] [LNAME] ([ATTENDEE_EMAIL])</td>
 		</tr>
 		<tr>
-			<th><?php _e("Registration Code:", "event_espresso");?></th>
+			<th><?php _e("Registration Code:", "event_espresso"); ?></th>
 			<td>[REGISTRATION_CODE] - <span class="[REGISTRATION_STATUS_ID]">[REGISTRATION_STATUS_LABEL]</span></td>
 		</tr>
 	</table>