eventespresso / event-espresso-core

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();
 	}
 

modules/single_page_checkout/EED_Single_Page_Checkout.module.php

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

@@ -1,6 +1,6 @@ 
 <?php use EventEspresso\core\exceptions\InvalidEntityException;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION')) {exit('No direct script access allowed');}
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {exit('No direct script access allowed'); }
 /**
  * Single Page Checkout (SPCO)
  *
@@ -49,8 +49,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__);
 	}
 
 
@@ -95,22 +95,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'));
 	}
 
 
@@ -121,8 +121,8 @@ 
 	 * @param string $ajax_action
 	 * @throws \EE_Error
 	 */
-	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();
 	}
 
@@ -134,7 +134,7 @@ 
 	 * @throws \EE_Error
 	 */
 	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');
 	}
 
 
@@ -145,7 +145,7 @@ 
 	 * @throws \EE_Error
 	 */
 	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');
 	}
 
 
@@ -156,7 +156,7 @@ 
 	 * @throws \EE_Error
 	 */
 	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');
 	}
 
 
@@ -169,7 +169,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public static function update_checkout() {
-		EED_Single_Page_Checkout::process_ajax_request( 'update_checkout' );
+		EED_Single_Page_Checkout::process_ajax_request('update_checkout');
 	}
 
 
@@ -182,8 +182,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');
 		}
 	}
 
@@ -197,14 +197,14 @@ 
 	 * @throws \EE_Error
 	 */
 	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);
 	}
 
 
@@ -219,7 +219,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
@@ -228,24 +228,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'));
 					}
 				}
 			}
@@ -264,28 +264,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
@@ -306,9 +306,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();
@@ -325,15 +325,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;
@@ -353,11 +353,11 @@ 
 	 * @return    void
 	 * @throws \EE_Error
 	 */
-	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();
 		}
@@ -373,8 +373,8 @@ 
 	 * @return    void
 	 * @throws \EE_Error
 	 */
-	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);
 	}
 
 
@@ -388,34 +388,34 @@ 
 	 */
 	private function _initialize() {
 		// ensure SPCO doesn't run twice
-		if ( EED_Single_Page_Checkout::$_initialized ) {
+		if (EED_Single_Page_Checkout::$_initialized) {
 			return;
 		}
 		try {
 			// 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) {
 					// add some style and make it dance
 					$this->checkout->transaction = EE_Transaction::new_instance();
 					$this->add_styles_and_scripts();
@@ -423,10 +423,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;
 			}
@@ -451,9 +451,9 @@ 
 			// set no cache headers and constants
 			EE_System::do_not_cache();
 			// add anchor
-			add_action( 'loop_start', array( $this, 'set_checkout_anchor' ), 1 );
-		} catch ( Exception $e ) {
-			EE_Error::add_error( $e->getMessage(), __FILE__, __FUNCTION__, __LINE__ );
+			add_action('loop_start', array($this, 'set_checkout_anchor'), 1);
+		} catch (Exception $e) {
+			EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 
@@ -471,20 +471,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);
 		} else {
-			if ( $checkout->current_step->is_final_step() && $checkout->exit_spco() === true )  {
+			if ($checkout->current_step->is_final_step() && $checkout->exit_spco() === true) {
 				$this->unlock_transaction();
-				wp_safe_redirect( $checkout->redirect_url );
+				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);
 		// 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'));
 		}
 		// reset anything that needs a clean slate for each request
 		$checkout->reset_for_current_request();
@@ -504,24 +504,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();
 	}
 
@@ -534,17 +534,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__);
 	}
 
 
@@ -558,8 +558,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';
 	}
 
 
@@ -575,27 +575,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 (
-				isset( $this->checkout->reg_steps['registration_confirmation'] )
+				isset($this->checkout->reg_steps['registration_confirmation'])
 				&& EE_Registry::instance()->CFG->registration->reg_confirmation_last
 			) {
 				// 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(
@@ -605,13 +605,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
@@ -629,10 +629,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
@@ -650,26 +650,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>',
@@ -693,16 +693,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;
 		}
 	}
@@ -716,8 +716,8 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return EE_Cart
 	 */
-	private function _get_cart_for_transaction( $transaction ) {
-		return $this->checkout->get_cart_for_transaction( $transaction );
+	private function _get_cart_for_transaction($transaction) {
+		return $this->checkout->get_cart_for_transaction($transaction);
 	}
 
 
@@ -729,8 +729,8 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return EE_Cart
 	 */
-	public function get_cart_for_transaction( EE_Transaction $transaction ) {
-		return $this->checkout->get_cart_for_transaction( $transaction );
+	public function get_cart_for_transaction(EE_Transaction $transaction) {
+		return $this->checkout->get_cart_for_transaction($transaction);
 	}
 
 
@@ -746,17 +746,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;
 	}
@@ -776,15 +776,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;
 	}
@@ -799,38 +799,38 @@ 
 	 * @return EE_Cart
 	 * @throws \EE_Error
 	 */
-	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()
+				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
+				} 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);
 			}
 		}
 	}
@@ -845,17 +845,17 @@ 
 	 * @return    array
 	 * @throws \EE_Error
 	 */
-	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++;
 					$CreateRegistrationCommand = EE_Registry::instance()
                        ->create(
@@ -867,17 +867,17 @@ 
 	                           $this->checkout->total_ticket_count
                            )
                        );
-					$registration = EE_Registry::instance()->BUS->execute( $CreateRegistrationCommand );
-					if ( ! $registration instanceof EE_Registration ) {
+					$registration = EE_Registry::instance()->BUS->execute($CreateRegistrationCommand);
+					if ( ! $registration instanceof EE_Registration) {
 						throw new InvalidEntityException(
-							is_object( $registration ) ? get_class( $registration ) : gettype( $registration ),
+							is_object($registration) ? get_class($registration) : gettype($registration),
 							'EE_Registration'
 						);
 					}
-					$registrations[ $registration->ID() ] = $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;
 	}
@@ -892,12 +892,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;
 	}
 
 
@@ -912,21 +912,21 @@ 
 	 */
 	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 ) {
+			foreach ($this->checkout->transaction->registrations($this->checkout->reg_cache_where_params) as $registration) {
 				if (
 					$registration instanceof EE_Registration
 					&& $registration->reg_url_link() === $this->checkout->reg_url_link
@@ -934,9 +934,9 @@ 
 					$valid_registrant = $registration;
 				}
 			}
-			if ( ! $valid_registrant instanceof EE_Registration ) {
+			if ( ! $valid_registrant instanceof EE_Registration) {
 				// hmmm... maybe we have the wrong session because the user is opening multiple tabs ?
-				if ( EED_Single_Page_Checkout::$_checkout_verified ) {
+				if (EED_Single_Page_Checkout::$_checkout_verified) {
 					// clear the session, mark the checkout as unverified, and try again
 					EE_Registry::instance()->SSN->clear_session();
 					EED_Single_Page_Checkout::$_initialized = false;
@@ -945,13 +945,13 @@ 
 					EE_Error::reset_notices();
 					return false;
 				}
-				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__ );
+				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;
 	}
 
@@ -966,15 +966,15 @@ 
 	 * @param bool $reinitializing
 	 * @throws \EE_Error
 	 */
-	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 ( ! $reinitializing && $reg_step->is_current_step() ) {
+				if ( ! $reinitializing && $reg_step->is_current_step()) {
 					// 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;
@@ -983,13 +983,13 @@ 
 			$reg_step->enqueue_styles_and_scripts();
 			// 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);
 	}
 
 
@@ -1002,43 +1002,43 @@ 
 	 */
 	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->continue_reg && ! $this->checkout->current_step->reg_form->is_valid() ) {
+					if ( ! $this->checkout->continue_reg && ! $this->checkout->current_step->reg_form->is_valid()) {
 						// 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 ) {
+							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' ),
+										__('%s : %s', 'event_espresso'),
 										$validation_error->get_form_section()->html_label_text(),
 										$validation_error->getMessage()
 									);
 								}
 							}
-							EE_Error::add_error( implode( '<br />', $submission_error_messages ), __FILE__, __FUNCTION__, __LINE__ );
+							EE_Error::add_error(implode('<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();
 			}
 		}
@@ -1055,22 +1055,22 @@ 
 	 */
 	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() !== ''
@@ -1081,7 +1081,7 @@ 
 						) {
 								EE_Error::add_success(
 									$this->checkout->current_step->success_message()
-									. '<br />' . $this->checkout->next_step->_instructions()
+									. '<br />'.$this->checkout->next_step->_instructions()
 								);
 
 						}
@@ -1089,12 +1089,12 @@ 
 						$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()
 						),
@@ -1120,10 +1120,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);
 		}
 	}
 
@@ -1139,42 +1139,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);
 	}
 
 
@@ -1187,25 +1187,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);
 
 	}
 
@@ -1220,19 +1220,19 @@ 
 	 */
 	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 && ! isset( $_COOKIE[ 'ee_cookie_test' ] ) ) {
+			if ($empty_cart && ! 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">',
@@ -1252,7 +1252,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,
@@ -1261,8 +1261,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>'
 										)
@@ -1270,14 +1270,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());
 		}
 	}
 
@@ -1291,8 +1291,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>';
 		}
 	}
@@ -1306,18 +1306,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>'
 				)
@@ -1335,7 +1335,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function unlock_transaction() {
-		if ( $this->checkout->transaction instanceof EE_Transaction ) {
+		if ($this->checkout->transaction instanceof EE_Transaction) {
 			$this->checkout->transaction->unlock();
 		}
 	}
@@ -1350,12 +1350,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);
 		}
 	}
 
@@ -1369,9 +1369,9 @@ 
 	 * @throws \EE_Error
 	 */
 	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());
 		}
 		$this->unlock_transaction();
 		// just return for these conditions
@@ -1400,7 +1400,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__,
@@ -1413,7 +1413,7 @@ 
 			$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_payment_amount($this->checkout->amount_owing);
 			// just send the ajax (
 			$json_response = apply_filters(
 				'FHEE__EE_Single_Page_Checkout__JSON_response',
@@ -1434,9 +1434,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);
 			// DEBUG LOG
 			//$this->checkout->log(
 			//	__CLASS__, __FUNCTION__, __LINE__,
@@ -1446,7 +1446,7 @@ 
 			//		'headers_list'    => headers_list(),
 			//	)
 			//);
-			wp_safe_redirect( $this->checkout->redirect_url );
+			wp_safe_redirect($this->checkout->redirect_url);
 			exit();
 		}
 	}

Indentation +20 added lines, -20 removed lines

@@ -820,12 +820,12 @@ 
 			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()
+					 && $registration->is_primary_registrant()
 				) {
 					$this->checkout->primary_revisit = true;
 					break;
 				} else if ( $this->checkout->revisit
-				            && $this->checkout->reg_url_link !== $registration->reg_url_link()
+							&& $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() );
@@ -857,24 +857,24 @@ 
 				//do the following for each ticket of this type they selected
 				for ( $x = 1; $x <= $line_item->quantity(); $x++ ) {
 					$att_nmbr++;
-                    /** @var EventEspresso\core\services\commands\registration\CreateRegistrationCommand $CreateRegistrationCommand */
-                    $CreateRegistrationCommand = EE_Registry::instance()
-                        ->create(
-                           'EventEspresso\core\services\commands\registration\CreateRegistrationCommand',
-                           array(
-	                           $transaction,
-	                           $line_item,
-	                           $att_nmbr,
-	                           $this->checkout->total_ticket_count
-                           )
-                        );
-                    // override capabilities for frontend registrations
-                    if ( ! is_admin()) {
-                        $CreateRegistrationCommand->setCapCheck(
-                            new \EventEspresso\core\domain\services\capabilities\PublicCapabilities('',
-                                'create_new_registration')
-                        );
-                    }
+					/** @var EventEspresso\core\services\commands\registration\CreateRegistrationCommand $CreateRegistrationCommand */
+					$CreateRegistrationCommand = EE_Registry::instance()
+						->create(
+						   'EventEspresso\core\services\commands\registration\CreateRegistrationCommand',
+						   array(
+							   $transaction,
+							   $line_item,
+							   $att_nmbr,
+							   $this->checkout->total_ticket_count
+						   )
+						);
+					// override capabilities for frontend registrations
+					if ( ! is_admin()) {
+						$CreateRegistrationCommand->setCapCheck(
+							new \EventEspresso\core\domain\services\capabilities\PublicCapabilities('',
+								'create_new_registration')
+						);
+					}
 					$registration = EE_Registry::instance()->BUS->execute( $CreateRegistrationCommand );
 					if ( ! $registration instanceof EE_Registration ) {
 						throw new InvalidEntityException(

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

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>

core/libraries/line_item_display/EE_Admin_Table_Line_Item_Display_Strategy.strategy.php

Doc Comments +6 added lines, -6 removed lines

@@ -16,7 +16,7 @@ 
 	/**
 	 * @param EE_Line_Item $line_item
 	 * @param array        $options
-	 * @return mixed
+	 * @return string
 	 */
 	public function display_line_item( EE_Line_Item $line_item, $options = array() ) {
 
@@ -94,7 +94,7 @@ 
 	 *
 	 * @param EE_Line_Item $line_item
 	 * @param array        $options
-	 * @return mixed
+	 * @return string
 	 */
 	private function _item_row( EE_Line_Item $line_item, $options = array() ) {
 		// start of row
@@ -123,7 +123,7 @@ 
 	 *
 	 * @param EE_Line_Item $line_item
 	 * @param array        $options
-	 * @return mixed
+	 * @return string
 	 */
 	private function _sub_item_row( EE_Line_Item $line_item, $options = array() ) {
 		// start of row
@@ -153,7 +153,7 @@ 
 	 *
 	 * @param EE_Line_Item $line_item
 	 * @param array        $options
-	 * @return mixed
+	 * @return string
 	 */
 	private function _tax_row( EE_Line_Item $line_item, $options = array() ) {
 		// start of row
@@ -179,7 +179,7 @@ 
 	 * @param EE_Line_Item $line_item
 	 * @param string       $text
 	 * @param array        $options
-	 * @return mixed
+	 * @return string
 	 */
 	private function _total_row( EE_Line_Item $line_item, $text = '', $options = array() ) {
 		// colspan
@@ -203,7 +203,7 @@ 
 	 * 	_separator_row
 	 *
 	 * @param array        $options
-	 * @return mixed
+	 * @return string
 	 */
 	private function _separator_row( $options = array() ) {
 		// colspan

Spacing +57 added lines, -57 removed lines

@@ -49,7 +49,7 @@ 
 	 * @param array        $options
 	 * @return mixed
 	 */
-	public function display_line_item( EE_Line_Item $line_item, $options = array() ) {
+	public function display_line_item(EE_Line_Item $line_item, $options = array()) {
 
 		$html = '';
 		// set some default options and merge with incoming
@@ -60,40 +60,40 @@ 
 			'taxes_tr_css_class' => 'admin-primary-mbox-taxes-tr',
 			'total_tr_css_class' => 'admin-primary-mbox-total-tr'
 		);
-		$options = array_merge( $default_options, (array)$options );
+		$options = array_merge($default_options, (array) $options);
 
-		switch( $line_item->type() ) {
+		switch ($line_item->type()) {
 
 			case EEM_Line_Item::type_line_item:
 				// item row
-				$html .= $this->_item_row( $line_item, $options );
+				$html .= $this->_item_row($line_item, $options);
 				break;
 
 			case EEM_Line_Item::type_sub_line_item:
-				$html .= $this->_sub_item_row( $line_item, $options );
+				$html .= $this->_sub_item_row($line_item, $options);
 				break;
 
 			case EEM_Line_Item::type_sub_total:
 				//loop through children
 				$child_line_items = $line_item->children();
 				//loop through children
-				foreach ( $child_line_items as $child_line_item ) {
+				foreach ($child_line_items as $child_line_item) {
 					//recursively feed children back into this method
-					$html .= $this->display_line_item( $child_line_item, $options );
+					$html .= $this->display_line_item($child_line_item, $options);
 				}
-				$html .= $this->_sub_total_row( $line_item, $options );
+				$html .= $this->_sub_total_row($line_item, $options);
 				break;
 
 			case EEM_Line_Item::type_tax:
-				if ( $this->_show_taxes ) {
-					$this->_taxes_html .= $this->_tax_row( $line_item, $options );
+				if ($this->_show_taxes) {
+					$this->_taxes_html .= $this->_tax_row($line_item, $options);
 				}
 				break;
 
 			case EEM_Line_Item::type_tax_sub_total:
-				foreach( $line_item->children() as $child_line_item ) {
-					if ( $child_line_item->type() == EEM_Line_Item::type_tax ) {
-						$this->display_line_item( $child_line_item, $options );
+				foreach ($line_item->children() as $child_line_item) {
+					if ($child_line_item->type() == EEM_Line_Item::type_tax) {
+						$this->display_line_item($child_line_item, $options);
 					}
 				}
 				break;
@@ -105,14 +105,14 @@ 
 				$children = $line_item->children();
 
 				// loop thru all non-tax child line items
-				foreach( $children as $child_line_item ) {
-						$html .= $this->display_line_item( $child_line_item, $options );
+				foreach ($children as $child_line_item) {
+						$html .= $this->display_line_item($child_line_item, $options);
 				}
 
 				$html .= $this->_taxes_html;
-				$html .= $this->_total_row( $line_item, $options );
-				if ( $options['use_table_wrapper'] ) {
-					$html = $this->_table_header( $options ) . $html . $this->_table_footer( $options );
+				$html .= $this->_total_row($line_item, $options);
+				if ($options['use_table_wrapper']) {
+					$html = $this->_table_header($options).$html.$this->_table_footer($options);
 				}
 				break;
 
@@ -129,15 +129,15 @@ 
 	 * @param array $options
 	 * @return string
 	 */
-	protected function _table_header( $options ) {
-		$html = EEH_HTML::table( '','', $options['table_css_class'] );
+	protected function _table_header($options) {
+		$html = EEH_HTML::table('', '', $options['table_css_class']);
 		$html .= EEH_HTML::thead();
 		$html .= EEH_HTML::tr();
-		$html .= EEH_HTML::th( __( 'Name', 'event_espresso' ), '', 'jst-left' );
-		$html .= EEH_HTML::th( __( 'Type', 'event_espresso'), '', 'jst-left' );
-		$html .= EEH_HTML::th( __( 'Amount', 'event_espresso' ), '', 'jst-cntr' );
-		$html .= EEH_HTML::th( __( 'Qty', 'event_espresso' ), '', 'jst-cntr' );
-		$html .= EEH_HTML::th( __( 'Line Total', 'event_espresso'), '', 'jst-cntr' );
+		$html .= EEH_HTML::th(__('Name', 'event_espresso'), '', 'jst-left');
+		$html .= EEH_HTML::th(__('Type', 'event_espresso'), '', 'jst-left');
+		$html .= EEH_HTML::th(__('Amount', 'event_espresso'), '', 'jst-cntr');
+		$html .= EEH_HTML::th(__('Qty', 'event_espresso'), '', 'jst-cntr');
+		$html .= EEH_HTML::th(__('Line Total', 'event_espresso'), '', 'jst-cntr');
 		$html .= EEH_HTML::tbody();
 		return $html;
 	}
@@ -149,8 +149,8 @@ 
 	 * @param array $options array of options for the table.
 	 * @return string
 	 */
-	protected function _table_footer( $options ) {
-		return EEH_HTML::tbodyx() .  EEH_HTML::tablex();
+	protected function _table_footer($options) {
+		return EEH_HTML::tbodyx().EEH_HTML::tablex();
 	}
 
 
@@ -162,12 +162,12 @@ 
 	 * @param array        $options
 	 * @return mixed
 	 */
-	protected function _item_row( EE_Line_Item $line_item, $options = array() ) {
+	protected function _item_row(EE_Line_Item $line_item, $options = array()) {
 		$line_item_related_object = $line_item->get_object();
 		$parent_line_item_related_object = $line_item->parent() instanceof EE_Line_Item ? $line_item->parent()->get_object() : null;
 		// start of row
 		$row_class = $options['odd'] ? 'item odd' : 'item';
-		$html = EEH_HTML::tr( '', '', $row_class );
+		$html = EEH_HTML::tr('', '', $row_class);
 
 
 		//Name Column
@@ -175,44 +175,44 @@ 
 
 		//related object scope.
 		$parent_related_object_name = $parent_line_item_related_object instanceof EEI_Line_Item_Object ? $parent_line_item_related_object->name() : '';
-		$parent_related_object_name = empty( $parent_related_object_name ) && $line_item->parent() instanceof EE_Line_Item ? $line_item->parent()->name() : $parent_related_object_name;
+		$parent_related_object_name = empty($parent_related_object_name) && $line_item->parent() instanceof EE_Line_Item ? $line_item->parent()->name() : $parent_related_object_name;
 		$parent_related_object_link = $parent_line_item_related_object instanceof EEI_Admin_Links ? $parent_line_item_related_object->get_admin_details_link() : '';
 
 
 		$name_html = $line_item_related_object instanceof EEI_Line_Item_Object ? $line_item_related_object->name() : $line_item->name();
-		$name_html = $name_link ? '<a href="' . $name_link . '">' . $name_html . '</a>' : $name_html;
+		$name_html = $name_link ? '<a href="'.$name_link.'">'.$name_html.'</a>' : $name_html;
 		$name_html .= $line_item->is_taxable() ? ' *' : '';
 		//maybe preface with icon?
-		$name_html = $line_item_related_object instanceof EEI_Has_Icon ? $line_item_related_object->get_icon() . $name_html : $name_html;
-		$name_html = '<span class="ee-line-item-name linked">' . $name_html . '</span><br>';
-		$name_html .=  sprintf(
-			_x( '%1$sfor the %2$s: %3$s%4$s', 'eg. "for the Event: My Cool Event"', 'event_espresso'),
+		$name_html = $line_item_related_object instanceof EEI_Has_Icon ? $line_item_related_object->get_icon().$name_html : $name_html;
+		$name_html = '<span class="ee-line-item-name linked">'.$name_html.'</span><br>';
+		$name_html .= sprintf(
+			_x('%1$sfor the %2$s: %3$s%4$s', 'eg. "for the Event: My Cool Event"', 'event_espresso'),
 			'<span class="ee-line-item-related-parent-object">',
-			$line_item->parent() instanceof EE_Line_Item ? $line_item->parent()->OBJ_type_i18n() : __( 'Item:', 'event_espresso' ),
-			$parent_related_object_link ? '<a href="' . $parent_related_object_link . '">' . $parent_related_object_name . '</a>' : $parent_related_object_name,
+			$line_item->parent() instanceof EE_Line_Item ? $line_item->parent()->OBJ_type_i18n() : __('Item:', 'event_espresso'),
+			$parent_related_object_link ? '<a href="'.$parent_related_object_link.'">'.$parent_related_object_name.'</a>' : $parent_related_object_name,
 			'</span>'
 		);
-		$html .= EEH_HTML::td( $name_html, '', 'jst-left' );
+		$html .= EEH_HTML::td($name_html, '', 'jst-left');
 
 		//Type Column
-		$type_html = $line_item->OBJ_type() ? $line_item->OBJ_type_i18n() . '<br />' : '';
+		$type_html = $line_item->OBJ_type() ? $line_item->OBJ_type_i18n().'<br />' : '';
 		$code = $line_item_related_object instanceof EEI_Has_Code ? $line_item_related_object->code() : '';
-		$type_html .= ! empty( $code ) ? '<span class="ee-line-item-id">' . sprintf( __( 'Code: %s', 'event_espresso' ), $code ) . '</span>' : '';
-		$html .= EEH_HTML::td( $type_html, '', 'jst-left' );
+		$type_html .= ! empty($code) ? '<span class="ee-line-item-id">'.sprintf(__('Code: %s', 'event_espresso'), $code).'</span>' : '';
+		$html .= EEH_HTML::td($type_html, '', 'jst-left');
 
 
 		//Amount Column
-		if ( $line_item->is_percent() ) {
-			$html .= EEH_HTML::td( $line_item->percent() . '%', '', 'jst-rght' );
+		if ($line_item->is_percent()) {
+			$html .= EEH_HTML::td($line_item->percent().'%', '', 'jst-rght');
 		} else {
-			$html .= EEH_HTML::td( $line_item->unit_price_no_code(), '', 'jst-rght' );
+			$html .= EEH_HTML::td($line_item->unit_price_no_code(), '', 'jst-rght');
 		}
 
 		//QTY column
-		$html .= EEH_HTML::td( $line_item->quantity(), '', 'jst-rght' );
+		$html .= EEH_HTML::td($line_item->quantity(), '', 'jst-rght');
 
 		//total column
-		$html .= EEH_HTML::td( EEH_Template::format_currency( $line_item->total(), false, false ), '', 'jst-rght' );
+		$html .= EEH_HTML::td(EEH_Template::format_currency($line_item->total(), false, false), '', 'jst-rght');
 
 		//finish things off and return
 		$html .= EEH_HTML::trx();
@@ -228,7 +228,7 @@ 
 	 * @param array        $options
 	 * @return mixed
 	 */
-	protected function _sub_item_row( EE_Line_Item $line_item, $options = array() ) {
+	protected function _sub_item_row(EE_Line_Item $line_item, $options = array()) {
 		//for now we're not showing sub-items
 		return '';
 	}
@@ -242,13 +242,13 @@ 
 	 * @param array        $options
 	 * @return mixed
 	 */
-	protected function _tax_row( EE_Line_Item $line_item, $options = array() ) {
+	protected function _tax_row(EE_Line_Item $line_item, $options = array()) {
 		// start of row
-		$html = EEH_HTML::tr( '', 'admin-primary-mbox-taxes-tr' );
+		$html = EEH_HTML::tr('', 'admin-primary-mbox-taxes-tr');
 		// name th
-		$html .= EEH_HTML::th(  $line_item->name() . '(' . $line_item->get_pretty( 'LIN_percent' ) . '%)', '',  'jst-rght', '', ' colspan="4"' );
+		$html .= EEH_HTML::th($line_item->name().'('.$line_item->get_pretty('LIN_percent').'%)', '', 'jst-rght', '', ' colspan="4"');
 		// total th
-		$html .= EEH_HTML::th( EEH_Template::format_currency( $line_item->total(), false, false ), '', 'jst-rght' );
+		$html .= EEH_HTML::th(EEH_Template::format_currency($line_item->total(), false, false), '', 'jst-rght');
 		// end of row
 		$html .= EEH_HTML::trx();
 		return $html;
@@ -265,7 +265,7 @@ 
 	 * @param array        $options
 	 * @return mixed
 	 */
-	protected function _sub_total_row( EE_Line_Item $line_item, $text = '', $options = array() ) {
+	protected function _sub_total_row(EE_Line_Item $line_item, $text = '', $options = array()) {
 		//currently not showing subtotal row
 		return '';
 	}
@@ -279,15 +279,15 @@ 
 	 * @param array        $options
 	 * @return mixed
 	 */
-	protected function _total_row( EE_Line_Item $line_item, $options = array() ) {
+	protected function _total_row(EE_Line_Item $line_item, $options = array()) {
 		// start of row
-		$html = EEH_HTML::tr( '', '', 'admin-primary-mbox-total-tr' );
+		$html = EEH_HTML::tr('', '', 'admin-primary-mbox-total-tr');
 		// Total th label
-		$total_label = sprintf( __( 'Transaction Total %s', 'event_espresso' ),  '(' . EE_Registry::instance()->CFG->currency->code . ')' );
-		$html .= EEH_HTML::th( $total_label, '',  'jst-rght',  '',  ' colspan="4"' );
+		$total_label = sprintf(__('Transaction Total %s', 'event_espresso'), '('.EE_Registry::instance()->CFG->currency->code.')');
+		$html .= EEH_HTML::th($total_label, '', 'jst-rght', '', ' colspan="4"');
 		// total th
 
-		$html .= EEH_HTML::th( EEH_Template::format_currency( $line_item->total(), false, false ), '',  'jst-rght' );
+		$html .= EEH_HTML::th(EEH_Template::format_currency($line_item->total(), false, false), '', 'jst-rght');
 		// end of row
 		$html .= EEH_HTML::trx();
 		return $html;

core/libraries/messages/EE_message_type.lib.php

Doc Comments +1 added lines, -1 removed lines

@@ -767,7 +767,7 @@
 	 * Takes care of setting up the addressee object(s) for the primary attendee.
 	 *
 	 * @access protected
-	 * @return array of EE_Addressee objects
+	 * @return EE_Messages_Addressee[] of EE_Addressee objects
 	 */
 	protected function _primary_attendee_addressees() {
 		$aee = $this->_default_addressee_data;

Indentation +2 added lines, -2 removed lines

@@ -864,8 +864,8 @@
 			//set the attendee array to blank on each loop;
 			$aee = array();
 			if ( isset( $this->_data->reg_obj )
-			     && ( $this->_data->reg_obj->attendee_ID() != $att_id )
-			     && $this->_single_message
+				 && ( $this->_data->reg_obj->attendee_ID() != $att_id )
+				 && $this->_single_message
 			) {
 				continue;
 			}

Spacing +80 added lines, -80 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'NO direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('NO direct script access allowed');
 }
 
 
@@ -274,7 +274,7 @@ 
 	 *                                      EE_Base_Class_Object
 	 * @return mixed ( EE_Base_Class||EE_Base_Class[] )
 	 */
-	abstract protected function _get_data_for_context( $context, EE_Registration $registration, $id );
+	abstract protected function _get_data_for_context($context, EE_Registration $registration, $id);
 
 
 
@@ -301,7 +301,7 @@ 
 	 * @deprecated 4.9.0
 	 * @return int
 	 */
-	protected function _get_id_for_msg_url( $context, EE_Registration $registration ) {
+	protected function _get_id_for_msg_url($context, EE_Registration $registration) {
 		return 0;
 	}
 
@@ -330,7 +330,7 @@ 
 	 *                                  sending.
 	 * @since 4.9.0
 	 */
-	public function do_messenger_hooks( $messenger = null ) {
+	public function do_messenger_hooks($messenger = null) {
 		$this->_active_messenger = $messenger;
 		$this->_do_messenger_hooks();
 	}
@@ -379,10 +379,10 @@ 
 	 * @param mixed $data This sets the data property for the message type with the incoming data used for generating.
 	 * @return string (the reference for the data handler) (will be an empty string if could not be determined).
 	 */
-	public function get_data_handler( $data ) {
+	public function get_data_handler($data) {
 		$this->_data = $data;
 		$this->_set_data_handler();
-		return apply_filters( 'FHEE__EE_message_type__get_data_handler', $this->_data_handler, $this );
+		return apply_filters('FHEE__EE_message_type__get_data_handler', $this->_data_handler, $this);
 	}
 
 
@@ -419,26 +419,26 @@ 
 	 * @deprecated  4.9.0  Likely 4.9.10 or 4.10.0 will remove this method completely
 	 * @return string          generated url
 	 */
-	public function get_url_trigger( $context, $sending_messenger, EE_Registration $registration ) {
+	public function get_url_trigger($context, $sending_messenger, EE_Registration $registration) {
 		//validate context
 		//valid context?
-		if ( ! isset( $this->_contexts[ $context ] ) ) {
+		if ( ! isset($this->_contexts[$context])) {
 			throw new EE_Error(
 				sprintf(
-					__( 'The context %s is not a valid context for %s.', 'event_espresso' ),
+					__('The context %s is not a valid context for %s.', 'event_espresso'),
 					$context,
-					get_class( $this )
+					get_class($this)
 				)
 			);
 		}
 		//valid sending_messenger?
 		$not_valid_msgr = false;
-		foreach ( $this->_with_messengers as $generating => $sendings ) {
-			if ( empty( $sendings ) || array_search( $sending_messenger, $sendings ) === false ) {
+		foreach ($this->_with_messengers as $generating => $sendings) {
+			if (empty($sendings) || array_search($sending_messenger, $sendings) === false) {
 				$not_valid_msgr = true;
 			}
 		}
-		if ( $not_valid_msgr ) {
+		if ($not_valid_msgr) {
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -446,7 +446,7 @@ 
 						'event_espresso'
 					),
 					$sending_messenger,
-					get_class( $this )
+					get_class($this)
 				)
 			);
 		}
@@ -457,7 +457,7 @@ 
 			$this->name,
 			$registration,
 			$this->_GRP_ID,
-			$this->_get_id_for_msg_url( $context, $registration )
+			$this->_get_id_for_msg_url($context, $registration)
 		);
 	}
 
@@ -476,26 +476,26 @@ 
 	 *                                      EE_Base_Class_Object
 	 * @return mixed (EE_Base_Class||EE_Base_Class[])
 	 */
-	public function get_data_for_context( $context, EE_Registration $registration, $id = 0 ) {
+	public function get_data_for_context($context, EE_Registration $registration, $id = 0) {
 		//valid context?
-		if ( ! isset( $this->_contexts[ $context ] ) ) {
+		if ( ! isset($this->_contexts[$context])) {
 			throw new EE_Error(
 				sprintf(
-					__( 'The context %s is not a valid context for %s.', 'event_espresso' ),
+					__('The context %s is not a valid context for %s.', 'event_espresso'),
 					$context,
-					get_class( $this )
+					get_class($this)
 				)
 			);
 		}
 		//get data and apply global and class specific filters on it.
 		$data = apply_filters(
 			'FHEE__EE_message_type__get_data_for_context__data',
-			$this->_get_data_for_context( $context, $registration, $id ),
+			$this->_get_data_for_context($context, $registration, $id),
 			$this
 		);
-		$data = apply_filters( 'FHEE__' . get_class( $this ) . '__get_data_for_context__data', $data, $this );
+		$data = apply_filters('FHEE__'.get_class($this).'__get_data_for_context__data', $data, $this);
 		//if empty then something went wrong!
-		if ( empty( $data ) ) {
+		if (empty($data)) {
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -539,7 +539,7 @@ 
 	 */
 	protected function _set_with_messengers() {
 		$this->_with_messengers = array(
-			'email' => array( 'html' ),
+			'email' => array('html'),
 		);
 	}
 
@@ -553,7 +553,7 @@ 
 	 */
 	public function with_messengers() {
 		return apply_filters(
-			'FHEE__EE_message_type__get_with_messengers__with_messengers__' . get_class( $this ),
+			'FHEE__EE_message_type__get_with_messengers__with_messengers__'.get_class($this),
 			$this->_with_messengers
 		);
 	}
@@ -580,7 +580,7 @@ 
 		$messengers = array()
 	) {
 		//we can also further refine the context by action (if present).
-		return $this->_get_admin_page_content( $page, $action, $extra, $messengers );
+		return $this->_get_admin_page_content($page, $action, $extra, $messengers);
 	}
 
 
@@ -615,10 +615,10 @@ 
 	public function get_master_templates() {
 		//first class specific filter then filter that by the global filter.
 		$master_templates = apply_filters(
-			'FHEE__' . get_class( $this ) . '__get_master_templates',
+			'FHEE__'.get_class($this).'__get_master_templates',
 			$this->_master_templates
 		);
-		return apply_filters( 'FHEE__EE_message_type__get_master_templates', $master_templates, $this );
+		return apply_filters('FHEE__EE_message_type__get_master_templates', $master_templates, $this);
 	}
 
 
@@ -632,20 +632,20 @@ 
 	 * @return array   An array indexed by context where each context is an array of EE_Messages_Addressee objects for
 	 *                                           that context
 	 */
-	public function get_addressees( EE_Messages_incoming_data $data, $context = '' ) {
+	public function get_addressees(EE_Messages_incoming_data $data, $context = '') {
 		//override _data
 		$this->_data = $data;
 		$addressees = array();
 		//if incoming context then limit to that context
-		if ( ! empty( $context ) ) {
-			$cntxt = ! empty( $this->_contexts[ $context ] ) ? $this->_contexts[ $context ] : '';
-			if ( ! empty( $cntxt ) ) {
+		if ( ! empty($context)) {
+			$cntxt = ! empty($this->_contexts[$context]) ? $this->_contexts[$context] : '';
+			if ( ! empty($cntxt)) {
 				$this->_contexts = array();
-				$this->_contexts[ $context ] = $cntxt;
+				$this->_contexts[$context] = $cntxt;
 			}
 		}
 		$this->_set_default_addressee_data();
-		if ( $this->_process_data() ) {
+		if ($this->_process_data()) {
 			$addressees = $this->_addressees;
 		}
 		return $addressees;
@@ -661,14 +661,14 @@ 
 	 */
 	protected function _process_data() {
 		//at a minimum, we NEED EE_Attendee objects.
-		if ( empty( $this->_data->attendees ) ) {
-			return false;  //there's no data to process!
+		if (empty($this->_data->attendees)) {
+			return false; //there's no data to process!
 		}
 		// process addressees for each context.  Child classes will have to have methods for
 		// each context defined to handle the processing of the data object within them
-		foreach ( $this->_contexts as $context => $details ) {
-			$xpctd_method = '_' . $context . '_addressees';
-			if ( ! method_exists( $this, $xpctd_method ) ) {
+		foreach ($this->_contexts as $context => $details) {
+			$xpctd_method = '_'.$context.'_addressees';
+			if ( ! method_exists($this, $xpctd_method)) {
 				throw new EE_Error(
 					sprintf(
 						__(
@@ -680,7 +680,7 @@ 
 					)
 				);
 			}
-			$this->_addressees[ $context ] = call_user_func( array( $this, $xpctd_method ) );
+			$this->_addressees[$context] = call_user_func(array($this, $xpctd_method));
 		}
 		return true; //data was processed successfully.
 	}
@@ -702,7 +702,7 @@ 
 			'grand_total_line_item'    => $this->_data->grand_total_line_item,
 			'txn'                      => $this->_data->txn,
 			'payments'                 => $this->_data->payments,
-			'payment'                  => isset( $this->_data->payment ) && $this->_data->payment instanceof EE_Payment
+			'payment'                  => isset($this->_data->payment) && $this->_data->payment instanceof EE_Payment
 				? $this->_data->payment
 				: null,
 			'reg_objs'                 => $this->_data->reg_objs,
@@ -715,7 +715,7 @@ 
 			'txn_status'               => $this->_data->txn_status,
 			'total_ticket_count'       => $this->_data->total_ticket_count,
 		);
-		if ( is_array( $this->_data->primary_attendee_data ) ) {
+		if (is_array($this->_data->primary_attendee_data)) {
 			$this->_default_addressee_data = array_merge(
 				$this->_default_addressee_data,
 				$this->_data->primary_attendee_data
@@ -759,24 +759,24 @@ 
 			'messenger',
 		);
 		$contexts = $this->get_contexts();
-		foreach ( $contexts as $context => $details ) {
-			$this->_valid_shortcodes[ $context ] = $all_shortcodes;
+		foreach ($contexts as $context => $details) {
+			$this->_valid_shortcodes[$context] = $all_shortcodes;
 			//make sure non admin context does not include the event_author shortcodes
-			if ( $context != 'admin' ) {
-				if ( ( $key = array_search( 'event_author', $this->_valid_shortcodes[ $context ] ) ) !== false ) {
-					unset( $this->_valid_shortcodes[ $context ][ $key ] );
+			if ($context != 'admin') {
+				if (($key = array_search('event_author', $this->_valid_shortcodes[$context])) !== false) {
+					unset($this->_valid_shortcodes[$context][$key]);
 				}
 			}
 		}
 		// make sure admin context does not include the recipient_details shortcodes
 		// IF we have admin context hooked in message types might not have that context.
-		if ( ! empty( $this->_valid_shortcodes['admin'] ) ) {
-			if ( ( $key = array_search( 'recipient_details', $this->_valid_shortcodes['admin'] ) ) !== false ) {
-				unset( $this->_valid_shortcodes['admin'][ $key ] );
+		if ( ! empty($this->_valid_shortcodes['admin'])) {
+			if (($key = array_search('recipient_details', $this->_valid_shortcodes['admin'])) !== false) {
+				unset($this->_valid_shortcodes['admin'][$key]);
 			}
 			//make sure admin context does not include the recipient_details shortcodes
-			if ( ( $key = array_search( 'recipient_list', $this->_valid_shortcodes['admin'] ) ) !== false ) {
-				unset( $this->_valid_shortcodes['admin'][ $key ] );
+			if (($key = array_search('recipient_list', $this->_valid_shortcodes['admin'])) !== false) {
+				unset($this->_valid_shortcodes['admin'][$key]);
 			}
 		}
 	}
@@ -789,9 +789,9 @@ 
 	 * @param  array $new_config array of valid shortcodes (by context)
 	 * @return void               sets valid_shortcodes property
 	 */
-	public function reset_valid_shortcodes_config( $new_config ) {
-		foreach ( $new_config as $context => $shortcodes ) {
-			$this->_valid_shortcodes[ $context ] = $shortcodes;
+	public function reset_valid_shortcodes_config($new_config) {
+		foreach ($new_config as $context => $shortcodes) {
+			$this->_valid_shortcodes[$context] = $shortcodes;
 		}
 	}
 
@@ -808,13 +808,13 @@ 
 		$addressees = array();
 		// first we need to get the event admin user id for all the events
 		// and setup an addressee object for each unique admin user.
-		foreach ( $this->_data->events as $line_ref => $event ) {
-			$admin_id = $this->_get_event_admin_id( $event['ID'] );
+		foreach ($this->_data->events as $line_ref => $event) {
+			$admin_id = $this->_get_event_admin_id($event['ID']);
 			//make sure we are just including the events that belong to this admin!
-			$admin_events[ $admin_id ][ $line_ref ] = $event;
+			$admin_events[$admin_id][$line_ref] = $event;
 		}
 		//k now we can loop through the event_admins and setup the addressee data.
-		foreach ( $admin_events as $admin_id => $event_details ) {
+		foreach ($admin_events as $admin_id => $event_details) {
 			$aee = array(
 				'user_id'        => $admin_id,
 				'events'         => $event_details,
@@ -822,8 +822,8 @@ 
 				'recipient_id'   => $admin_id,
 				'recipient_type' => 'WP_User',
 			);
-			$aee = array_merge( $this->_default_addressee_data, $aee );
-			$addressees[] = new EE_Messages_Addressee( $aee );
+			$aee = array_merge($this->_default_addressee_data, $aee);
+			$addressees[] = new EE_Messages_Addressee($aee);
 		}
 		return $addressees;
 	}
@@ -843,7 +843,7 @@ 
 		$aee['recipient_id'] = $aee['primary_att_obj'] instanceof EE_Attendee ? $aee['primary_att_obj']->ID() : 0;
 		$aee['recipient_type'] = 'Attendee';
 		//great now we can instantiate the $addressee object and return (as an array);
-		$add[] = new EE_Messages_Addressee( $aee );
+		$add[] = new EE_Messages_Addressee($aee);
 		return $add;
 	}
 
@@ -860,25 +860,25 @@ 
 		//we just have to loop through the attendees.  We'll also set the attached events for each attendee.
 		//use to verify unique attendee emails... we don't want to sent multiple copies to the same attendee do we?
 		$already_processed = array();
-		foreach ( $this->_data->attendees as $att_id => $details ) {
+		foreach ($this->_data->attendees as $att_id => $details) {
 			//set the attendee array to blank on each loop;
 			$aee = array();
-			if ( isset( $this->_data->reg_obj )
-			     && ( $this->_data->reg_obj->attendee_ID() != $att_id )
+			if (isset($this->_data->reg_obj)
+			     && ($this->_data->reg_obj->attendee_ID() != $att_id)
 			     && $this->_single_message
 			) {
 				continue;
 			}
 			// is $this->_regs_for_sending present?
 			// If so, let's make sure we ONLY generate addressee for registrations in that array.
-			if ( ! empty( $this->_regs_for_sending ) && is_array( $this->_regs_for_sending ) ) {
-				$regs_allowed = array_intersect_key( array_flip( $this->_regs_for_sending ), $details['reg_objs'] );
-				if ( empty( $regs_allowed ) ) {
+			if ( ! empty($this->_regs_for_sending) && is_array($this->_regs_for_sending)) {
+				$regs_allowed = array_intersect_key(array_flip($this->_regs_for_sending), $details['reg_objs']);
+				if (empty($regs_allowed)) {
 					continue;
 				}
 			}
 			if (
-				in_array( $details['attendee_email'], $already_processed )
+				in_array($details['attendee_email'], $already_processed)
 				&& apply_filters(
 					'FHEE__EE_message_type___attendee_addressees__prevent_duplicate_email_sends',
 					true,
@@ -889,14 +889,14 @@ 
 				continue;
 			}
 			$already_processed[] = $details['attendee_email'];
-			foreach ( $details as $item => $value ) {
-				$aee[ $item ] = $value;
-				if ( $item == 'line_ref' ) {
-					foreach ( $value as $event_id ) {
-						$aee['events'][ $event_id ] = $this->_data->events[ $event_id ];
+			foreach ($details as $item => $value) {
+				$aee[$item] = $value;
+				if ($item == 'line_ref') {
+					foreach ($value as $event_id) {
+						$aee['events'][$event_id] = $this->_data->events[$event_id];
 					}
 				}
-				if ( $item == 'attendee_email' ) {
+				if ($item == 'attendee_email') {
 					$aee['attendee_email'] = $value;
 				}
 				/*if ( $item == 'registration_id' ) {
@@ -905,13 +905,13 @@ 
 			}
 			// note the FIRST reg object in this array is the one
 			// we'll use for this attendee as the primary registration for this attendee.
-			$aee['reg_obj'] = reset( $this->_data->attendees[ $att_id ]['reg_objs'] );
+			$aee['reg_obj'] = reset($this->_data->attendees[$att_id]['reg_objs']);
 			$aee['attendees'] = $this->_data->attendees;
 			$aee['recipient_id'] = $att_id;
 			$aee['recipient_type'] = 'Attendee';
 			//merge in the primary attendee data
-			$aee = array_merge( $this->_default_addressee_data, $aee );
-			$add[] = new EE_Messages_Addressee( $aee );
+			$aee = array_merge($this->_default_addressee_data, $aee);
+			$add[] = new EE_Messages_Addressee($aee);
 		}
 		return $add;
 	}
@@ -922,8 +922,8 @@ 
 	 * @param $event_id
 	 * @return int
 	 */
-	protected function _get_event_admin_id( $event_id ) {
-		$event = EEM_Event::instance()->get_one_by_ID( $event_id );
+	protected function _get_event_admin_id($event_id) {
+		$event = EEM_Event::instance()->get_one_by_ID($event_id);
 		return $event instanceof EE_Event ? $event->wp_user() : 0;
 	}
 

core/libraries/messages/EE_Messages_Processor.lib.php

Doc Comments +1 added lines, -1 removed lines

@@ -410,7 +410,7 @@
 	/**
 	 * This simply loops through all active messengers and takes care of setting up the
 	 * EE_Message_To_Generate objects.
-	 * @param $message_type
+	 * @param string $message_type
 	 * @param $data
 	 *
 	 * @return EE_Message_To_Generate[]

Spacing +108 added lines, -108 removed lines

@@ -35,7 +35,7 @@ 
 	 *
 	 * @param EE_Message_Resource_Manager $message_resource_manager
 	 */
-	public function __construct( EE_Message_Resource_Manager $message_resource_manager ) {
+	public function __construct(EE_Message_Resource_Manager $message_resource_manager) {
 		$this->_message_resource_manager = $message_resource_manager;
 		$this->_init_queue_and_generator();
 	}
@@ -50,7 +50,7 @@ 
 	 * - $_generator = holds the messages generator
 	 */
 	protected function _init_queue_and_generator() {
-		$this->_generator = EE_Registry::factory( 'EE_Messages_Generator' );
+		$this->_generator = EE_Registry::factory('EE_Messages_Generator');
 		$this->_queue = $this->_generator->generation_queue();
 	}
 
@@ -75,31 +75,31 @@ 
 	 * @param EE_Messages_Queue $queue_to_process
 	 * @return bool  true for success false for error.
 	 */
-	public function process_immediately_from_queue( EE_Messages_Queue $queue_to_process ) {
+	public function process_immediately_from_queue(EE_Messages_Queue $queue_to_process) {
 		$success = false;
 		$messages_to_send = array();
 		$messages_to_generate = array();
 		//loop through and setup the various messages from the queue so we know what is being processed
 		$queue_to_process->get_message_repository()->rewind();
-		foreach ( $queue_to_process->get_message_repository() as $message ) {
-			if ( $message->STS_ID() === EEM_Message::status_incomplete ) {
+		foreach ($queue_to_process->get_message_repository() as $message) {
+			if ($message->STS_ID() === EEM_Message::status_incomplete) {
 				$messages_to_generate[] = $message;
 				continue;
 			}
 
-			if ( in_array( $message->STS_ID(), EEM_Message::instance()->stati_indicating_to_send() ) ) {
+			if (in_array($message->STS_ID(), EEM_Message::instance()->stati_indicating_to_send())) {
 				$messages_to_send[] = $message;
 				continue;
 			}
 		}
 
 		//do generation/sends
-		if ( $messages_to_generate ) {
-			$success = $this->batch_generate_from_queue( $messages_to_generate, true );
+		if ($messages_to_generate) {
+			$success = $this->batch_generate_from_queue($messages_to_generate, true);
 		}
 
-		if ( $messages_to_send ) {
-			$sent = $this->batch_send_from_queue( $messages_to_send, true );
+		if ($messages_to_send) {
+			$sent = $this->batch_send_from_queue($messages_to_send, true);
 			//if there was messages to generate and it failed, then we override any success value for the sending process
 			//otherwise we just use the return from batch send.  The intent is that there is a simple response for success/fail.
 			//Either everything was successful or we consider it a fail.  To be clear, this is a limitation of doing
@@ -119,13 +119,13 @@ 
 	 * @return bool|EE_Messages_Queue return false if nothing generated.  This returns a new EE_Message_Queue with
 	 *                                   generated messages.
 	 */
-	public function batch_generate_from_queue( $messages = array(), $clear_queue = false ) {
-		if ( $this->_build_queue_for_generation( $messages, $clear_queue ) ) {
+	public function batch_generate_from_queue($messages = array(), $clear_queue = false) {
+		if ($this->_build_queue_for_generation($messages, $clear_queue)) {
 			$new_queue = $this->_generator->generate();
-			if ( $new_queue instanceof EE_Messages_Queue ) {
+			if ($new_queue instanceof EE_Messages_Queue) {
 				//unlock queue
 				$this->_queue->unlock_queue();
-				$new_queue->initiate_request_by_priority( 'send' );
+				$new_queue->initiate_request_by_priority('send');
 				return $new_queue;
 			}
 		}
@@ -146,24 +146,24 @@ 
 	 *
 	 * @return bool true means queue prepped, false means there was a lock so no generation please.
 	 */
-	protected function _build_queue_for_generation( $messages = array(), $clear_queue = false ) {
+	protected function _build_queue_for_generation($messages = array(), $clear_queue = false) {
 
-		if ( $clear_queue ) {
+		if ($clear_queue) {
 			$this->_init_queue_and_generator();
 		}
 
-		if ( $messages ) {
+		if ($messages) {
 			//if generation is locked then get out now because that means processing is already happening.
-			if ( $this->_queue->is_locked() ) {
+			if ($this->_queue->is_locked()) {
 				return false;
 			}
 
 			$this->_queue->lock_queue();
-			$messages = is_array( $messages ) ? $messages : array( $messages );
-			foreach ( $messages as $message ) {
-				if ( $message instanceof EE_Message ) {
+			$messages = is_array($messages) ? $messages : array($messages);
+			foreach ($messages as $message) {
+				if ($message instanceof EE_Message) {
 					$data = $message->all_extra_meta_array();
-					$this->_queue->add( $message, $data );
+					$this->_queue->add($message, $data);
 				}
 			}
 			return true;
@@ -181,22 +181,22 @@ 
 	 *
 	 * @return bool true means queue prepped, false means there was a lock so no queue prepped.
 	 */
-	protected function _build_queue_for_sending( $messages, $clear_queue = false ) {
+	protected function _build_queue_for_sending($messages, $clear_queue = false) {
 		//if sending is locked then get out now because that means processing is already happening.
-		if ( $this->_queue->is_locked( EE_Messages_Queue::action_sending ) ) {
+		if ($this->_queue->is_locked(EE_Messages_Queue::action_sending)) {
 			return false;
 		}
 
-		$this->_queue->lock_queue( EE_Messages_Queue::action_sending );
+		$this->_queue->lock_queue(EE_Messages_Queue::action_sending);
 
-		if ( $clear_queue ) {
+		if ($clear_queue) {
 			$this->_init_queue_and_generator();
 		}
 
-		$messages = is_array( $messages ) ? $messages : array( $messages );
+		$messages = is_array($messages) ? $messages : array($messages);
 
-		foreach ( $messages as $message ) {
-			$this->_queue->add( $message );
+		foreach ($messages as $message) {
+			$this->_queue->add($message);
 		}
 		return true;
 	}
@@ -212,11 +212,11 @@ 
 	 *
 	 * @return EE_Messages_Queue
 	 */
-	public function batch_send_from_queue( $messages = array(), $clear_queue = false ) {
+	public function batch_send_from_queue($messages = array(), $clear_queue = false) {
 
-		if ( $messages && $this->_build_queue_for_sending( $messages, $clear_queue ) ) {
+		if ($messages && $this->_build_queue_for_sending($messages, $clear_queue)) {
 			$this->_queue->execute();
-			$this->_queue->unlock_queue( EE_Messages_Queue::action_sending );
+			$this->_queue->unlock_queue(EE_Messages_Queue::action_sending);
 		} else {
 			//get messages to send and execute.
 			$this->_queue->get_to_send_batch_and_send();
@@ -239,10 +239,10 @@ 
 	 * @param EE_Message_To_Generate[] $messages_to_generate
 	 * @return EE_Messages_Queue
 	 */
-	public function generate_and_return(  $messages_to_generate ) {
+	public function generate_and_return($messages_to_generate) {
 		$this->_init_queue_and_generator();
-		$this->_queue_for_generation_loop( $messages_to_generate );
-		return $this->_generator->generate( false );
+		$this->_queue_for_generation_loop($messages_to_generate);
+		return $this->_generator->generate(false);
 	}
 
 
@@ -253,8 +253,8 @@ 
 	 * @param  bool     $persist    Indicate whether to instruct the generator to persist the generated queue (true) or not (false).
 	 * @return EE_Messages_Queue
 	 */
-	public function generate_queue( $persist = true ) {
-		return $this->_generator->generate( $persist );
+	public function generate_queue($persist = true) {
+		return $this->_generator->generate($persist);
 	}
 
 
@@ -267,9 +267,9 @@ 
 	 * @param bool                   $test_send             Whether this item is for a test send or not.
 	 * @return  EE_Messages_Queue
 	 */
-	public function queue_for_generation( EE_Message_To_Generate $message_to_generate, $test_send = false ) {
-		if ( $message_to_generate->valid() ) {
-			$this->_generator->create_and_add_message_to_queue( $message_to_generate, $test_send );
+	public function queue_for_generation(EE_Message_To_Generate $message_to_generate, $test_send = false) {
+		if ($message_to_generate->valid()) {
+			$this->_generator->create_and_add_message_to_queue($message_to_generate, $test_send);
 		}
 	}
 
@@ -285,9 +285,9 @@ 
 	 *
 	 * @param EE_Message_To_Generate[] $messages_to_generate
 	 */
-	public function batch_queue_for_generation_and_persist( $messages_to_generate ) {
+	public function batch_queue_for_generation_and_persist($messages_to_generate) {
 		$this->_init_queue_and_generator();
-		$this->_queue_for_generation_loop( $messages_to_generate );
+		$this->_queue_for_generation_loop($messages_to_generate);
 		$this->_queue->save();
 	}
 
@@ -303,9 +303,9 @@ 
 	 *
 	 * @param EE_Message_To_Generate[]  $messages_to_generate
 	 */
-	public function batch_queue_for_generation_no_persist( $messages_to_generate ) {
+	public function batch_queue_for_generation_no_persist($messages_to_generate) {
 		$this->_init_queue_and_generator();
-		$this->_queue_for_generation_loop( $messages_to_generate );
+		$this->_queue_for_generation_loop($messages_to_generate);
 	}
 
 
@@ -317,15 +317,15 @@ 
 	 *
 	 * @param EE_Message_To_Generate[] $messages_to_generate
 	 */
-	protected function _queue_for_generation_loop( $messages_to_generate ) {
+	protected function _queue_for_generation_loop($messages_to_generate) {
 		//make sure is in an array.
-		if ( ! is_array( $messages_to_generate ) ) {
-			$messages_to_generate = array( $messages_to_generate );
+		if ( ! is_array($messages_to_generate)) {
+			$messages_to_generate = array($messages_to_generate);
 		}
 
-		foreach ( $messages_to_generate as $message_to_generate ) {
-			if ( $message_to_generate instanceof EE_Message_To_Generate && $message_to_generate->valid() ) {
-				$this->queue_for_generation( $message_to_generate );
+		foreach ($messages_to_generate as $message_to_generate) {
+			if ($message_to_generate instanceof EE_Message_To_Generate && $message_to_generate->valid()) {
+				$this->queue_for_generation($message_to_generate);
 			}
 		}
 	}
@@ -340,10 +340,10 @@ 
 	 * @param  EE_Message_To_Generate[]
 	 * @return EE_Messages_Queue
 	 */
-	public function generate_and_queue_for_sending( $messages_to_generate ) {
+	public function generate_and_queue_for_sending($messages_to_generate) {
 		$this->_init_queue_and_generator();
-		$this->_queue_for_generation_loop( $messages_to_generate );
-		return $this->_generator->generate( true );
+		$this->_queue_for_generation_loop($messages_to_generate);
+		return $this->_generator->generate(true);
 	}
 
 
@@ -357,10 +357,10 @@ 
 	 * @param   bool                   $test_send                Whether this is a test send or not.
 	 * @return  EE_Messages_Queue | bool   false if unable to generate otherwise the generated queue.
 	 */
-	public function generate_for_preview( EE_Message_To_Generate $message_to_generate, $test_send = false ) {
-		if ( ! $message_to_generate->valid() ) {
+	public function generate_for_preview(EE_Message_To_Generate $message_to_generate, $test_send = false) {
+		if ( ! $message_to_generate->valid()) {
 			EE_Error::add_error(
-				__( 'Unable to generate preview because of invalid data', 'event_espresso' ),
+				__('Unable to generate preview because of invalid data', 'event_espresso'),
 				__FILE__,
 				__FUNCTION__,
 				__LINE__
@@ -368,14 +368,14 @@ 
 			return false;
 		}
 		//just make sure preview is set on the $message_to_generate (in case client forgot)
-		$message_to_generate->set_preview( true );
+		$message_to_generate->set_preview(true);
 		$this->_init_queue_and_generator();
-		$this->queue_for_generation( $message_to_generate, $test_send );
-		$generated_queue = $this->_generator->generate( false );
-		if ( $generated_queue->execute( false ) ) {
+		$this->queue_for_generation($message_to_generate, $test_send);
+		$generated_queue = $this->_generator->generate(false);
+		if ($generated_queue->execute(false)) {
 			//the first queue item should be the preview
 			$generated_queue->get_message_repository()->rewind();
-			if ( ! $generated_queue->get_message_repository()->valid() ) {
+			if ( ! $generated_queue->get_message_repository()->valid()) {
 				return $generated_queue;
 			}
 			return $generated_queue->get_message_repository()->is_test_send() ? true : $generated_queue;
@@ -392,15 +392,15 @@ 
 	 * @param EE_Message_To_Generate $message_to_generate
 	 * @return bool true or false for success.
 	 */
-	public function queue_for_sending( EE_Message_To_Generate $message_to_generate ) {
-		if ( ! $message_to_generate->valid() ) {
+	public function queue_for_sending(EE_Message_To_Generate $message_to_generate) {
+		if ( ! $message_to_generate->valid()) {
 			return false;
 		}
 		$this->_init_queue_and_generator();
 		$message = $message_to_generate->get_EE_Message();
-		$this->_queue->add( $message );
-		if ( $message->send_now() ) {
-			$this->_queue->execute( false );
+		$this->_queue->add($message);
+		if ($message->send_now()) {
+			$this->_queue->execute(false);
 		} else {
 			$this->_queue->save();
 		}
@@ -413,12 +413,12 @@ 
 	 * @param EE_Message_To_Generate $message_to_generate
 	 * @return EE_Messages_Queue | null
 	 */
-	public function generate_and_send_now( EE_Message_To_Generate $message_to_generate ) {
-		if ( ! $message_to_generate->valid() ) {
+	public function generate_and_send_now(EE_Message_To_Generate $message_to_generate) {
+		if ( ! $message_to_generate->valid()) {
 			return null;
 		}
 		// is there supposed to be a sending messenger for this message?
-		if ( $message_to_generate instanceof EEI_Has_Sending_Messenger ) {
+		if ($message_to_generate instanceof EEI_Has_Sending_Messenger) {
 			// make sure it's valid, but if it's not,
 			// then set the value of $sending_messenger to an EE_Error object
 			// so that downstream code can easily see that things went wrong.
@@ -434,14 +434,14 @@ 
 			$sending_messenger = null;
 		}
 
-		if ( $message_to_generate->get_EE_Message()->STS_ID() === EEM_Message::status_idle ) {
+		if ($message_to_generate->get_EE_Message()->STS_ID() === EEM_Message::status_idle) {
 			$this->_init_queue_and_generator();
-			$this->_queue->add( $message_to_generate->get_EE_Message() );
-			$this->_queue->execute( false, $sending_messenger );
+			$this->_queue->add($message_to_generate->get_EE_Message());
+			$this->_queue->execute(false, $sending_messenger);
 			return $this->_queue;
-		} elseif ( $message_to_generate->get_EE_Message()->STS_ID() === EEM_Message::status_incomplete ) {
-			$generated_queue = $this->generate_and_return( array( $message_to_generate ) );
-			$generated_queue->execute( false, $sending_messenger );
+		} elseif ($message_to_generate->get_EE_Message()->STS_ID() === EEM_Message::status_incomplete) {
+			$generated_queue = $this->generate_and_return(array($message_to_generate));
+			$generated_queue->execute(false, $sending_messenger);
 			return $generated_queue;
 		}
 		return null;
@@ -458,13 +458,13 @@ 
 	 * @param mixed  $data   The data being used for generation.
 	 * @param bool   $persist   Whether to persist the queued messages to the db or not.
 	 */
-	public function generate_for_all_active_messengers( $message_type, $data, $persist = true ) {
-		$messages_to_generate = $this->setup_mtgs_for_all_active_messengers( $message_type, $data );
-		if ( $persist ) {
-			$this->batch_queue_for_generation_and_persist( $messages_to_generate );
+	public function generate_for_all_active_messengers($message_type, $data, $persist = true) {
+		$messages_to_generate = $this->setup_mtgs_for_all_active_messengers($message_type, $data);
+		if ($persist) {
+			$this->batch_queue_for_generation_and_persist($messages_to_generate);
 			$this->_queue->initiate_request_by_priority();
 		} else {
-			$this->batch_queue_for_generation_no_persist( $messages_to_generate );
+			$this->batch_queue_for_generation_no_persist($messages_to_generate);
 		}
 	}
 
@@ -479,11 +479,11 @@ 
 	 *
 	 * @return EE_Message_To_Generate[]
 	 */
-	public function setup_mtgs_for_all_active_messengers( $message_type, $data ) {
+	public function setup_mtgs_for_all_active_messengers($message_type, $data) {
 		$messages_to_generate = array();
-		foreach ( $this->_message_resource_manager->active_messengers() as $messenger_slug => $messenger_object  ) {
-			$message_to_generate = new EE_Message_To_Generate( $messenger_slug, $message_type, $data );
-			if ( $message_to_generate->valid() ) {
+		foreach ($this->_message_resource_manager->active_messengers() as $messenger_slug => $messenger_object) {
+			$message_to_generate = new EE_Message_To_Generate($messenger_slug, $message_type, $data);
+			if ($message_to_generate->valid()) {
 				$messages_to_generate[] = $message_to_generate;
 			}
 		}
@@ -498,29 +498,29 @@ 
 	 * and send.
 	 * @param array $message_ids
 	 */
-	public function setup_messages_from_ids_and_send( $message_ids ) {
+	public function setup_messages_from_ids_and_send($message_ids) {
 		$this->_init_queue_and_generator();
-		$messages = EEM_Message::instance()->get_all( array(
+		$messages = EEM_Message::instance()->get_all(array(
 			array(
-				'MSG_ID' => array( 'IN', $message_ids ),
+				'MSG_ID' => array('IN', $message_ids),
 				'STS_ID' => array(
 					'IN',
 					array_merge(
 						EEM_Message::instance()->stati_indicating_sent(),
-						array( EEM_Message::status_retry )
+						array(EEM_Message::status_retry)
 					),
 				),
 			),
 		));
 		//set the Messages to resend.
-		foreach ( $messages as $message ) {
-			if ( $message instanceof EE_Message ) {
-				$message->set_STS_ID( EEM_Message::status_resend );
-				$this->_queue->add( $message );
+		foreach ($messages as $message) {
+			if ($message instanceof EE_Message) {
+				$message->set_STS_ID(EEM_Message::status_resend);
+				$this->_queue->add($message);
 			}
 		}
 
-		$this->_queue->initiate_request_by_priority( 'send' );
+		$this->_queue->initiate_request_by_priority('send');
 	}
 
 
@@ -534,23 +534,23 @@ 
 	 *
 	 * @return EE_Message_To_Generate[]
 	 */
-	public function setup_messages_to_generate_from_registration_ids_in_request( $registration_ids_key = '_REG_ID' ) {
-		EE_Registry::instance()->load_core( 'Request_Handler' );
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
+	public function setup_messages_to_generate_from_registration_ids_in_request($registration_ids_key = '_REG_ID') {
+		EE_Registry::instance()->load_core('Request_Handler');
+		EE_Registry::instance()->load_helper('MSG_Template');
 		$regs_to_send = array();
-		$regIDs = EE_Registry::instance()->REQ->get( $registration_ids_key );
-		if ( empty( $regIDs ) ) {
-			EE_Error::add_error( __('Something went wrong because we\'re missing the registration ID', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		$regIDs = EE_Registry::instance()->REQ->get($registration_ids_key);
+		if (empty($regIDs)) {
+			EE_Error::add_error(__('Something went wrong because we\'re missing the registration ID', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 
 		//make sure is an array
-		$regIDs = is_array( $regIDs ) ? $regIDs : array( $regIDs );
+		$regIDs = is_array($regIDs) ? $regIDs : array($regIDs);
 
-		foreach( $regIDs as $regID ) {
-			$reg = EEM_Registration::instance()->get_one_by_ID( $regID );
-			if ( ! $reg instanceof EE_Registration ) {
-				EE_Error::add_error( sprintf( __('Unable to retrieve a registration object for the given reg id (%s)', 'event_espresso'), $regID ) );
+		foreach ($regIDs as $regID) {
+			$reg = EEM_Registration::instance()->get_one_by_ID($regID);
+			if ( ! $reg instanceof EE_Registration) {
+				EE_Error::add_error(sprintf(__('Unable to retrieve a registration object for the given reg id (%s)', 'event_espresso'), $regID));
 				return false;
 			}
 			$regs_to_send[$reg->transaction_ID()][$reg->status_ID()][] = $reg;
@@ -558,13 +558,13 @@ 
 
 		$messages_to_generate = array();
 
-		foreach ( $regs_to_send as $status_group ) {
-			foreach ( $status_group as $status_id => $registrations ) {
+		foreach ($regs_to_send as $status_group) {
+			foreach ($status_group as $status_id => $registrations) {
 				$messages_to_generate = array_merge(
 					$messages_to_generate,
 					$this->setup_mtgs_for_all_active_messengers(
-						EEH_MSG_Template::convert_reg_status_to_message_type( $status_id ),
-						array( $registrations, $status_id )
+						EEH_MSG_Template::convert_reg_status_to_message_type($status_id),
+						array($registrations, $status_id)
 					)
 				);
 			}

admin_pages/events/qtips/EE_Event_List_Table_Tips.lib.php

Spacing +3 added lines, -3 removed lines

@@ -33,7 +33,7 @@ 
 			0 => array(
 				'content_id' => 'attendee-column-tip',
 				'target' => '.column-attendees .dashicons-groups',
-				'content' => sprintf( __('%s Registrations', 'event_espresso'), EEH_Template::pretty_status(EEM_Registration::status_id_approved, FALSE, 'sentence') ),
+				'content' => sprintf(__('%s Registrations', 'event_espresso'), EEH_Template::pretty_status(EEM_Registration::status_id_approved, FALSE, 'sentence')),
 				'options' => array( 
 					'position' => array(
 						'my' => 'bottom left',
@@ -124,7 +124,7 @@ 
 	 * @param  EE_Datetime constant $status What status is set (by class)
 	 * @return string         The status legend with the related status highlighted
 	 */
-	private function _event_status_legend( $status ) {
+	private function _event_status_legend($status) {
 
 		$status_array = array(
 			'active_status' => EE_Datetime::active,
@@ -136,7 +136,7 @@ 
 			'inactive_status' => EE_Datetime::inactive
 		);
 
-		return EEH_Template::status_legend( $status_array, $status );
+		return EEH_Template::status_legend($status_array, $status);
 	}
 
 }
\ No newline at end of file