eventespresso / event-espresso-core

core/helpers/EEH_Debug_Tools.helper.php

Spacing +115 added lines, -115 removed lines

@@ -8,7 +8,7 @@ 
  * @since 				4.0
  *
  */
-class EEH_Debug_Tools{
+class EEH_Debug_Tools {
 
 	/**
 	 * 	instance of the EEH_Autoloader object
@@ -41,7 +41,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated, and instantiated properly
-		if ( ! self::$_instance instanceof EEH_Debug_Tools ) {
+		if ( ! self::$_instance instanceof EEH_Debug_Tools) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -57,21 +57,21 @@ 
 	 */
 	private function __construct() {
 		// load Kint PHP debugging library
-		if ( ! class_exists( 'Kint' ) &&  file_exists( EE_PLUGIN_DIR_PATH . 'tests' . DS . 'kint' . DS . 'Kint.class.php' )){
+		if ( ! class_exists('Kint') && file_exists(EE_PLUGIN_DIR_PATH.'tests'.DS.'kint'.DS.'Kint.class.php')) {
 			// despite EE4 having a check for an existing copy of the Kint debugging class,
 			// if another plugin was loaded AFTER EE4 and they did NOT perform a similar check,
 			// then hilarity would ensue as PHP throws a "Cannot redeclare class Kint" error
 			// so we've moved it to our test folder so that it is not included with production releases
 			// plz use https://wordpress.org/plugins/kint-debugger/  if testing production versions of EE
-			require_once( EE_PLUGIN_DIR_PATH . 'tests' . DS . 'kint' . DS . 'Kint.class.php' );
+			require_once(EE_PLUGIN_DIR_PATH.'tests'.DS.'kint'.DS.'Kint.class.php');
 		}
-		if ( ! defined('DOING_AJAX') || ! isset( $_REQUEST['noheader'] ) || $_REQUEST['noheader'] != 'true' || ! isset( $_REQUEST['TB_iframe'] )) {
+		if ( ! defined('DOING_AJAX') || ! isset($_REQUEST['noheader']) || $_REQUEST['noheader'] != 'true' || ! isset($_REQUEST['TB_iframe'])) {
 			//add_action( 'shutdown', array($this,'espresso_session_footer_dump') );
 		}
-		$plugin = basename( EE_PLUGIN_DIR_PATH );
-		add_action( "activate_{$plugin}", array( 'EEH_Debug_Tools', 'ee_plugin_activation_errors' ));
-		add_action( 'activated_plugin', array( 'EEH_Debug_Tools', 'ee_plugin_activation_errors' ));
-		add_action( 'shutdown', array( 'EEH_Debug_Tools', 'show_db_name' ));
+		$plugin = basename(EE_PLUGIN_DIR_PATH);
+		add_action("activate_{$plugin}", array('EEH_Debug_Tools', 'ee_plugin_activation_errors'));
+		add_action('activated_plugin', array('EEH_Debug_Tools', 'ee_plugin_activation_errors'));
+		add_action('shutdown', array('EEH_Debug_Tools', 'show_db_name'));
 	}
 
 
@@ -82,8 +82,8 @@ 
 	 * 	@return void
 	 */
 	public static function show_db_name() {
-		if ( ! defined( 'DOING_AJAX' ) && ( defined( 'EE_ERROR_EMAILS' ) && EE_ERROR_EMAILS )) {
-			echo '<p style="font-size:10px;font-weight:normal;color:#E76700;margin: 1em 2em; text-align: right;">DB_NAME: '. DB_NAME .'</p>';
+		if ( ! defined('DOING_AJAX') && (defined('EE_ERROR_EMAILS') && EE_ERROR_EMAILS)) {
+			echo '<p style="font-size:10px;font-weight:normal;color:#E76700;margin: 1em 2em; text-align: right;">DB_NAME: '.DB_NAME.'</p>';
 		}
 	}
 
@@ -95,9 +95,9 @@ 
 	 * 	@return void
 	 */
 	public function espresso_session_footer_dump() {
-		if ( class_exists('Kint') && function_exists( 'wp_get_current_user' ) && current_user_can('update_core') && ( defined('WP_DEBUG') && WP_DEBUG ) &&  ! defined('DOING_AJAX') && class_exists( 'EE_Registry' )) {
-			Kint::dump(  EE_Registry::instance()->SSN->id() );
-			Kint::dump( EE_Registry::instance()->SSN );
+		if (class_exists('Kint') && function_exists('wp_get_current_user') && current_user_can('update_core') && (defined('WP_DEBUG') && WP_DEBUG) && ! defined('DOING_AJAX') && class_exists('EE_Registry')) {
+			Kint::dump(EE_Registry::instance()->SSN->id());
+			Kint::dump(EE_Registry::instance()->SSN);
 //			Kint::dump( EE_Registry::instance()->SSN->get_session_data('cart')->get_tickets() );
 			$this->espresso_list_hooked_functions();
 			$this->show_times();
@@ -114,27 +114,27 @@ 
 	 * @param bool $tag
 	 * @return void
 	 */
-	public function espresso_list_hooked_functions( $tag=FALSE ){
+	public function espresso_list_hooked_functions($tag = FALSE) {
 		global $wp_filter;
 		echo '<br/><br/><br/><h3>Hooked Functions</h3>';
-		if ( $tag ) {
-			$hook[$tag]=$wp_filter[$tag];
-			if ( ! is_array( $hook[$tag] )) {
-				trigger_error( "Nothing found for '$tag' hook", E_USER_WARNING );
+		if ($tag) {
+			$hook[$tag] = $wp_filter[$tag];
+			if ( ! is_array($hook[$tag])) {
+				trigger_error("Nothing found for '$tag' hook", E_USER_WARNING);
 				return;
 			}
-			echo '<h5>For Tag: '. $tag .'</h5>';
+			echo '<h5>For Tag: '.$tag.'</h5>';
 		}
 		else {
-			$hook=$wp_filter;
-			ksort( $hook );
+			$hook = $wp_filter;
+			ksort($hook);
 		}
-		foreach( $hook as $tag => $priorities ) {
+		foreach ($hook as $tag => $priorities) {
 			echo "<br />&gt;&gt;&gt;&gt;&gt;\t<strong>$tag</strong><br />";
-			ksort( $priorities );
-			foreach( $priorities as $priority => $function ){
+			ksort($priorities);
+			foreach ($priorities as $priority => $function) {
 				echo $priority;
-				foreach( $function as $name => $properties ) {
+				foreach ($function as $name => $properties) {
 					echo "\t$name<br />";
 				}
 			}
@@ -150,15 +150,15 @@ 
 	 * @param string $hook_name
 	 * @return array
 	 */
-	public static function registered_filter_callbacks( $hook_name = '' ) {
+	public static function registered_filter_callbacks($hook_name = '') {
 		$filters = array();
 		global $wp_filter;
-		if ( isset( $wp_filter[ $hook_name ] ) ) {
-			$filters[ $hook_name ] = array();
-			foreach ( $wp_filter[ $hook_name ] as $priority => $callbacks ) {
-				$filters[ $hook_name ][ $priority ] = array();
-				foreach ( $callbacks as $callback ) {
-					$filters[ $hook_name ][ $priority ][] = $callback['function'];
+		if (isset($wp_filter[$hook_name])) {
+			$filters[$hook_name] = array();
+			foreach ($wp_filter[$hook_name] as $priority => $callbacks) {
+				$filters[$hook_name][$priority] = array();
+				foreach ($callbacks as $callback) {
+					$filters[$hook_name][$priority][] = $callback['function'];
 				}
 			}
 		}
@@ -171,8 +171,8 @@ 
 	 * 	start_timer
 	 * @param null $timer_name
 	 */
-	public function start_timer( $timer_name = NULL ){
-		$this->_start_times[$timer_name] = microtime( TRUE );
+	public function start_timer($timer_name = NULL) {
+		$this->_start_times[$timer_name] = microtime(TRUE);
 	}
 
 
@@ -181,15 +181,15 @@ 
 	 * stop_timer
 	 * @param string $timer_name
 	 */
-	public function stop_timer($timer_name = 'default'){
-		if( isset( $this->_start_times[ $timer_name ] ) ){
-			$start_time = $this->_start_times[ $timer_name ];
-			unset( $this->_start_times[ $timer_name ] );
-		}else{
-			$start_time = array_pop( $this->_start_times );
+	public function stop_timer($timer_name = 'default') {
+		if (isset($this->_start_times[$timer_name])) {
+			$start_time = $this->_start_times[$timer_name];
+			unset($this->_start_times[$timer_name]);
+		} else {
+			$start_time = array_pop($this->_start_times);
 		}
-		$total_time = microtime( TRUE ) - $start_time;
-		switch ( $total_time ) {
+		$total_time = microtime(TRUE) - $start_time;
+		switch ($total_time) {
 			case $total_time < 0.00001 :
 				$color = '#8A549A';
 				$bold = 'normal';
@@ -215,7 +215,7 @@ 
 				$bold = 'bold';
 				break;
 		}
-		$this->_times[] = '<hr /><div style="display: inline-block; min-width: 10px; margin:0 1em; color:'.$color.'; font-weight:'.$bold.'; font-size:1.2em;">' . number_format( $total_time, 8 ) . '</div> ' . $timer_name;
+		$this->_times[] = '<hr /><div style="display: inline-block; min-width: 10px; margin:0 1em; color:'.$color.'; font-weight:'.$bold.'; font-size:1.2em;">'.number_format($total_time, 8).'</div> '.$timer_name;
 	 }
 	 /**
 	  * Measure the memory usage by PHP so far.
@@ -223,10 +223,10 @@ 
 	  * @param boolean $output_now whether to echo now, or wait until EEH_Debug_Tools::show_times() is called
 	  * @return void
 	  */
-	 public function measure_memory( $label, $output_now = false ) {
-		 $memory_used = $this->convert( memory_get_peak_usage( true ) );
-		 $this->_memory_usage_points[ $label ] = $memory_used;
-		 if( $output_now ) {
+	 public function measure_memory($label, $output_now = false) {
+		 $memory_used = $this->convert(memory_get_peak_usage(true));
+		 $this->_memory_usage_points[$label] = $memory_used;
+		 if ($output_now) {
 			 echo "\r\n<br>$label : $memory_used";
 		 }
 	 }
@@ -236,9 +236,9 @@ 
 	  * @param int $size
 	  * @return string
 	  */
-	 public function convert( $size ) {
-		$unit=array('b','kb','mb','gb','tb','pb');
-		return @round($size/pow(1024,($i=floor(log($size,1024)))),2).' '.$unit[ absint( $i ) ];
+	 public function convert($size) {
+		$unit = array('b', 'kb', 'mb', 'gb', 'tb', 'pb');
+		return @round($size / pow(1024, ($i = floor(log($size, 1024)))), 2).' '.$unit[absint($i)];
 	 }
 
 
@@ -248,9 +248,9 @@ 
 	 * @param bool $output_now
 	 * @return string
 	 */
-	public function show_times($output_now=true){
-		$output = '<h2>Times:</h2>' . implode("<br>",$this->_times) . '<h2>Memory</h2>' . implode('<br>', $this->_memory_usage_points );
-		 if($output_now){
+	public function show_times($output_now = true) {
+		$output = '<h2>Times:</h2>'.implode("<br>", $this->_times).'<h2>Memory</h2>'.implode('<br>', $this->_memory_usage_points);
+		 if ($output_now) {
 			 echo $output;
 			 return '';
 		 }
@@ -265,25 +265,25 @@ 
 	 * 	@return void
 	 */
 	public static function ee_plugin_activation_errors() {
-		if ( WP_DEBUG ) {
+		if (WP_DEBUG) {
 			$activation_errors = ob_get_contents();
-			if ( ! empty( $activation_errors ) ) {
-				$activation_errors = date( 'Y-m-d H:i:s' ) . "\n" . $activation_errors;
+			if ( ! empty($activation_errors)) {
+				$activation_errors = date('Y-m-d H:i:s')."\n".$activation_errors;
 			}
-			espresso_load_required( 'EEH_File', EE_HELPERS . 'EEH_File.helper.php' );
-			if ( class_exists( 'EEH_File' )) {
+			espresso_load_required('EEH_File', EE_HELPERS.'EEH_File.helper.php');
+			if (class_exists('EEH_File')) {
 				try {
-					EEH_File::ensure_file_exists_and_is_writable( EVENT_ESPRESSO_UPLOAD_DIR . 'logs' . DS . 'espresso_plugin_activation_errors.html' );
-					EEH_File::write_to_file( EVENT_ESPRESSO_UPLOAD_DIR . 'logs' . DS . 'espresso_plugin_activation_errors.html', $activation_errors );
-				} catch( EE_Error $e ){
-					EE_Error::add_error( sprintf( __(  'The Event Espresso activation errors file could not be setup because: %s', 'event_espresso' ), $e->getMessage() ), __FILE__, __FUNCTION__, __LINE__ );
+					EEH_File::ensure_file_exists_and_is_writable(EVENT_ESPRESSO_UPLOAD_DIR.'logs'.DS.'espresso_plugin_activation_errors.html');
+					EEH_File::write_to_file(EVENT_ESPRESSO_UPLOAD_DIR.'logs'.DS.'espresso_plugin_activation_errors.html', $activation_errors);
+				} catch (EE_Error $e) {
+					EE_Error::add_error(sprintf(__('The Event Espresso activation errors file could not be setup because: %s', 'event_espresso'), $e->getMessage()), __FILE__, __FUNCTION__, __LINE__);
 				}
 			} else {
 				// old school attempt
-				file_put_contents( EVENT_ESPRESSO_UPLOAD_DIR . 'logs' . DS . 'espresso_plugin_activation_errors.html', $activation_errors );
+				file_put_contents(EVENT_ESPRESSO_UPLOAD_DIR.'logs'.DS.'espresso_plugin_activation_errors.html', $activation_errors);
 			}
-			$activation_errors = get_option( 'ee_plugin_activation_errors', '' ) . $activation_errors;
-			update_option( 'ee_plugin_activation_errors', $activation_errors );
+			$activation_errors = get_option('ee_plugin_activation_errors', '').$activation_errors;
+			update_option('ee_plugin_activation_errors', $activation_errors);
 		}
 	}
 
@@ -299,10 +299,10 @@ 
 	 * @param int     $error_type
 	 * @uses trigger_error()
 	 */
-	public function doing_it_wrong( $function, $message, $version, $error_type = E_USER_NOTICE ) {
-		do_action( 'AHEE__EEH_Debug_Tools__doing_it_wrong_run', $function, $message, $version);
-		$version = is_null( $version ) ? '' : sprintf( __('(This message was added in version %s of Event Espresso.', 'event_espresso' ), $version );
-		trigger_error( sprintf( __('%1$s was called <strong>incorrectly</strong>. %2$s %3$s','event_espresso' ), $function, $message, $version ), $error_type );
+	public function doing_it_wrong($function, $message, $version, $error_type = E_USER_NOTICE) {
+		do_action('AHEE__EEH_Debug_Tools__doing_it_wrong_run', $function, $message, $version);
+		$version = is_null($version) ? '' : sprintf(__('(This message was added in version %s of Event Espresso.', 'event_espresso'), $version);
+		trigger_error(sprintf(__('%1$s was called <strong>incorrectly</strong>. %2$s %3$s', 'event_espresso'), $function, $message, $version), $error_type);
 	}
 
 
@@ -323,22 +323,22 @@ 
 	 * @param string $debug_index
 	 * @param string $debug_key
 	 */
-	public static function log( $class='', $func = '', $line = '', $info = array(), $display_request = false,  $debug_index = '', $debug_key = 'EE_DEBUG_SPCO' ) {
-		if ( WP_DEBUG && false ) {
-			$debug_key = $debug_key . '_' . EE_Session::instance()->id();
-			$debug_data = get_option( $debug_key, array() );
+	public static function log($class = '', $func = '', $line = '', $info = array(), $display_request = false, $debug_index = '', $debug_key = 'EE_DEBUG_SPCO') {
+		if (WP_DEBUG && false) {
+			$debug_key = $debug_key.'_'.EE_Session::instance()->id();
+			$debug_data = get_option($debug_key, array());
 			$default_data = array(
-				$class => $func . '() : ' . $line,
+				$class => $func.'() : '.$line,
 				'REQ'  => $display_request ? $_REQUEST : '',
 			);
 			// don't serialize objects
-			$info = self::strip_objects( $info );
-			$index = ! empty( $debug_index ) ? $debug_index : 0;
-			if ( ! isset( $debug_data[$index] ) ) {
+			$info = self::strip_objects($info);
+			$index = ! empty($debug_index) ? $debug_index : 0;
+			if ( ! isset($debug_data[$index])) {
 				$debug_data[$index] = array();
 			}
-			$debug_data[$index][microtime()] = array_merge( $default_data, $info );
-			update_option( $debug_key, $debug_data );
+			$debug_data[$index][microtime()] = array_merge($default_data, $info);
+			update_option($debug_key, $debug_data);
 		}
 	}
 
@@ -350,26 +350,26 @@ 
 	 * @param array $info
 	 * @return array
 	 */
-	public static function strip_objects( $info = array() ) {
-		foreach ( $info as $key => $value ) {
-			if ( is_array( $value ) ) {
-				$info[ $key ] = self::strip_objects( $value );
-			} else if ( is_object( $value ) ) {
-				$object_class = get_class( $value );
-				$info[ $object_class ] = array();
-				$info[ $object_class ][ 'ID' ] = method_exists( $value, 'ID' ) ? $value->ID() : spl_object_hash( $value );
-				if ( method_exists( $value, 'ID' ) ) {
-					$info[ $object_class ][ 'ID' ] = $value->ID();
+	public static function strip_objects($info = array()) {
+		foreach ($info as $key => $value) {
+			if (is_array($value)) {
+				$info[$key] = self::strip_objects($value);
+			} else if (is_object($value)) {
+				$object_class = get_class($value);
+				$info[$object_class] = array();
+				$info[$object_class]['ID'] = method_exists($value, 'ID') ? $value->ID() : spl_object_hash($value);
+				if (method_exists($value, 'ID')) {
+					$info[$object_class]['ID'] = $value->ID();
 				}
-				if ( method_exists( $value, 'status' ) ) {
-					$info[ $object_class ][ 'status' ] = $value->status();
-				} else if ( method_exists( $value, 'status_ID' ) ) {
-					$info[ $object_class ][ 'status' ] = $value->status_ID();
+				if (method_exists($value, 'status')) {
+					$info[$object_class]['status'] = $value->status();
+				} else if (method_exists($value, 'status_ID')) {
+					$info[$object_class]['status'] = $value->status_ID();
 				}
-				unset( $info[ $key ] );
+				unset($info[$key]);
 			}
 		}
-		return (array)$info;
+		return (array) $info;
 	}
 
 
@@ -386,31 +386,31 @@ 
 	 * @param string $height
 	 * @param bool $die
 	 */
-	public static function printr( $var, $var_name = false, $file = __FILE__, $line = __LINE__, $height = 'auto', $die = false ) {
+	public static function printr($var, $var_name = false, $file = __FILE__, $line = __LINE__, $height = 'auto', $die = false) {
 		//$print_r = false;
-		if ( is_object( $var ) ) {
+		if (is_object($var)) {
 			$var_name = ! $var_name ? 'object' : $var_name;
 			//$print_r = true;
-		} else if ( is_array( $var ) ) {
+		} else if (is_array($var)) {
 			$var_name = ! $var_name ? 'array' : $var_name;
 			//$print_r = true;
-		} else if ( is_numeric( $var ) ) {
+		} else if (is_numeric($var)) {
 			$var_name = ! $var_name ? 'numeric' : $var_name;
-		} else if ( is_string( $var ) ) {
+		} else if (is_string($var)) {
 			$var_name = ! $var_name ? 'string' : $var_name;
-		} else if ( is_null( $var ) ) {
+		} else if (is_null($var)) {
 			$var_name = ! $var_name ? 'null' : $var_name;
 		}
-		$var_name = ucwords( str_replace( array( '$', '_' ), array( '', ' ' ), $var_name ) );
+		$var_name = ucwords(str_replace(array('$', '_'), array('', ' '), $var_name));
 		ob_start();
-		echo '<pre style="display:block; width:100%; height:' . $height . '; border:2px solid light-blue;">';
-		echo '<h5 style="color:#2EA2CC;"><b>' . $var_name . '</b></h5><span style="color:#E76700">';
+		echo '<pre style="display:block; width:100%; height:'.$height.'; border:2px solid light-blue;">';
+		echo '<h5 style="color:#2EA2CC;"><b>'.$var_name.'</b></h5><span style="color:#E76700">';
 		//$print_r ? print_r( $var ) : var_dump( $var );
-		var_dump( $var );
-		echo '</span><br /><span style="font-size:10px;font-weight:normal;">' . $file . '<br />line no: ' . $line . '</span></pre>';
+		var_dump($var);
+		echo '</span><br /><span style="font-size:10px;font-weight:normal;">'.$file.'<br />line no: '.$line.'</span></pre>';
 		$result = ob_get_clean();
-		if ( $die ) {
-			die( $result );
+		if ($die) {
+			die($result);
 		} else {
 			echo $result;
 		}
@@ -427,8 +427,8 @@ 
  * borrowed from Kint Debugger
  * Plugin URI: http://upthemes.com/plugins/kint-debugger/
  */
-if ( class_exists('Kint') && ! function_exists( 'dump_wp_query' ) ) {
-	function dump_wp_query(){
+if (class_exists('Kint') && ! function_exists('dump_wp_query')) {
+	function dump_wp_query() {
 		global $wp_query;
 		d($wp_query);
 	}
@@ -438,8 +438,8 @@ 
  * borrowed from Kint Debugger
  * Plugin URI: http://upthemes.com/plugins/kint-debugger/
  */
-if ( class_exists('Kint') && ! function_exists( 'dump_wp' ) ) {
-	function dump_wp(){
+if (class_exists('Kint') && ! function_exists('dump_wp')) {
+	function dump_wp() {
 		global $wp;
 		d($wp);
 	}
@@ -449,8 +449,8 @@ 
  * borrowed from Kint Debugger
  * Plugin URI: http://upthemes.com/plugins/kint-debugger/
  */
-if ( class_exists('Kint') && ! function_exists( 'dump_post' ) ) {
-	function dump_post(){
+if (class_exists('Kint') && ! function_exists('dump_post')) {
+	function dump_post() {
 		global $post;
 		d($post);
 	}

caffeinated/admin/extend/events/Extend_Events_Admin_Page.core.php

Spacing +213 added lines, -213 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -30,25 +30,25 @@ 
 class Extend_Events_Admin_Page extends Events_Admin_Page {
 
 
-	public function __construct( $routing = TRUE ) {
-		parent::__construct( $routing );
-		define( 'EVENTS_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'events/templates/');
-		define( 'EVENTS_CAF_ASSETS', EE_CORE_CAF_ADMIN_EXTEND . 'events/assets/');
-		define( 'EVENTS_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'events/assets/');
+	public function __construct($routing = TRUE) {
+		parent::__construct($routing);
+		define('EVENTS_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND.'events/templates/');
+		define('EVENTS_CAF_ASSETS', EE_CORE_CAF_ADMIN_EXTEND.'events/assets/');
+		define('EVENTS_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL.'events/assets/');
 	}
 
 
 	protected function _extend_page_config() {
 
-		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'events';
+		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND.'events';
 		$default_espresso_boxes = $this->_default_espresso_metaboxes;
 
 		//is there a evt_id in the request?
-		$evt_id = ! empty( $this->_req_data['EVT_ID'] ) && ! is_array( $this->_req_data['EVT_ID'] ) ? $this->_req_data['EVT_ID'] : 0;
-		$evt_id = ! empty( $this->_req_data['post'] ) ? $this->_req_data['post'] : $evt_id;
+		$evt_id = ! empty($this->_req_data['EVT_ID']) && ! is_array($this->_req_data['EVT_ID']) ? $this->_req_data['EVT_ID'] : 0;
+		$evt_id = ! empty($this->_req_data['post']) ? $this->_req_data['post'] : $evt_id;
 
 		//tkt_id?
-		$tkt_id = !empty( $this->_req_data['TKT_ID'] ) && ! is_array( $this->_req_data['TKT_ID'] ) ? $this->_req_data['TKT_ID'] : 0;
+		$tkt_id = ! empty($this->_req_data['TKT_ID']) && ! is_array($this->_req_data['TKT_ID']) ? $this->_req_data['TKT_ID'] : 0;
 
 		$new_page_routes = array(
 			'duplicate_event' => array(
@@ -66,13 +66,13 @@ 
 				'capability' => 'ee_delete_default_ticket',
 				'obj_id' => $tkt_id,
 				'noheader' => TRUE,
-				'args' => array( 'trash' => TRUE )
+				'args' => array('trash' => TRUE)
 				),
 			'trash_tickets' => array(
 				'func' => '_trash_or_restore_ticket',
 				'capability' => 'ee_delete_default_tickets',
 				'noheader' => TRUE,
-				'args' => array( 'trash' => TRUE )
+				'args' => array('trash' => TRUE)
 				),
 			'restore_ticket' => array(
 				'func' => '_trash_or_restore_ticket',
@@ -132,7 +132,7 @@ 
 				)
 			);
 
-		$this->_page_routes = array_merge( $this->_page_routes, $new_page_routes );
+		$this->_page_routes = array_merge($this->_page_routes, $new_page_routes);
 
 
 		//partial route/config override
@@ -144,8 +144,8 @@ 
 		$this->_page_config['default']['list_table'] = 'Extend_Events_Admin_List_Table';
 
 		//add tickets tab but only if there are more than one default ticket!
-		$tkt_count = EEM_Ticket::instance()->count_deleted_and_undeleted(array( array('TKT_is_default' => 1 ) ), 'TKT_ID', TRUE );
-		if ( $tkt_count > 1 ) {
+		$tkt_count = EEM_Ticket::instance()->count_deleted_and_undeleted(array(array('TKT_is_default' => 1)), 'TKT_ID', TRUE);
+		if ($tkt_count > 1) {
 			$new_page_config = array(
 				'ticket_list_table' => array(
 					'nav' => array(
@@ -164,14 +164,14 @@ 
 				'label' => __('Templates'),
 				'order' => 30
 			),
-			'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array( '_publish_post_box' ) ),
+			'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
 			'help_tabs' => array(
 				'general_settings_templates_help_tab' => array(
 					'title' => __('Templates', 'event_espresso'),
 					'filename' => 'general_settings_templates'
 				)
 			),
-			'help_tour' => array( 'Templates_Help_Tour' ),
+			'help_tour' => array('Templates_Help_Tour'),
 			'require_nonce' => FALSE
 		);
 
@@ -190,26 +190,26 @@ 
 //				'metaboxes' => $default_espresso_boxes,
 //				'require_nonce' => FALSE
 //		);
-		$this->_page_config = array_merge( $this->_page_config, $new_page_config );
+		$this->_page_config = array_merge($this->_page_config, $new_page_config);
 
 		//add filters and actions
 		//modifying _views
-		add_filter('FHEE_event_datetime_metabox_add_additional_date_time_template', array( $this, 'add_additional_datetime_button' ), 10, 2 );
-		add_filter('FHEE_event_datetime_metabox_clone_button_template', array( $this, 'add_datetime_clone_button' ), 10, 2 );
-		add_filter('FHEE_event_datetime_metabox_timezones_template', array( $this, 'datetime_timezones_template'), 10, 2 );
+		add_filter('FHEE_event_datetime_metabox_add_additional_date_time_template', array($this, 'add_additional_datetime_button'), 10, 2);
+		add_filter('FHEE_event_datetime_metabox_clone_button_template', array($this, 'add_datetime_clone_button'), 10, 2);
+		add_filter('FHEE_event_datetime_metabox_timezones_template', array($this, 'datetime_timezones_template'), 10, 2);
 
 
 		//filters for event list table
-		add_filter('FHEE__Extend_Events_Admin_List_Table__filters', array( $this, 'list_table_filters'), 10, 2);
-		add_filter('FHEE__Extend_Events_Admin_List_Table__column_actions__action_links', array( $this, 'extra_list_table_actions'), 10, 2 );
+		add_filter('FHEE__Extend_Events_Admin_List_Table__filters', array($this, 'list_table_filters'), 10, 2);
+		add_filter('FHEE__Extend_Events_Admin_List_Table__column_actions__action_links', array($this, 'extra_list_table_actions'), 10, 2);
 
 		//legend item
-		add_filter('FHEE__Events_Admin_Page___event_legend_items__items', array( $this, 'additional_legend_items') );
+		add_filter('FHEE__Events_Admin_Page___event_legend_items__items', array($this, 'additional_legend_items'));
 
-		add_action('admin_init', array( $this, 'admin_init') );
+		add_action('admin_init', array($this, 'admin_init'));
 
 		//heartbeat stuff
-		add_filter( 'heartbeat_received', array( $this, 'heartbeat_response' ), 10, 2 );
+		add_filter('heartbeat_received', array($this, 'heartbeat_response'), 10, 2);
 
 	}
 
@@ -222,12 +222,12 @@ 
 		EE_Registry::$i18n_js_strings = array_merge(
 			EE_Registry::$i18n_js_strings,
 			array(
-				'image_confirm'          => __( 'Do you really want to delete this image? Please remember to update your event to complete the removal.', 'event_espresso' ),
-				'event_starts_on'        => __( 'Event Starts on', 'event_espresso' ),
-				'event_ends_on'          => __( 'Event Ends on', 'event_espresso' ),
-				'event_datetime_actions' => __( 'Actions', 'event_espresso' ),
-				'event_clone_dt_msg'     => __( 'Clone this Event Date and Time', 'event_espresso' ),
-				'remove_event_dt_msg'    => __( 'Remove this Event Time', 'event_espresso' )
+				'image_confirm'          => __('Do you really want to delete this image? Please remember to update your event to complete the removal.', 'event_espresso'),
+				'event_starts_on'        => __('Event Starts on', 'event_espresso'),
+				'event_ends_on'          => __('Event Ends on', 'event_espresso'),
+				'event_datetime_actions' => __('Actions', 'event_espresso'),
+				'event_clone_dt_msg'     => __('Clone this Event Date and Time', 'event_espresso'),
+				'remove_event_dt_msg'    => __('Remove this Event Time', 'event_espresso')
 			)
 		);
 	}
@@ -242,12 +242,12 @@ 
 	 *
 	 * @return array  possibly appended response.
 	 */
-	public function heartbeat_response( $response, $data ) {
+	public function heartbeat_response($response, $data) {
 		/**
 		 * check whether count of tickets is approaching the potential
 		 * limits for the server.
 		 */
-		if ( ! empty( $data['input_count'] ) ) {
+		if ( ! empty($data['input_count'])) {
 			$response['max_input_vars_check'] = EE_Registry::instance()->CFG->environment->max_input_vars_limit_check($data['input_count']);
 		}
 
@@ -262,13 +262,13 @@ 
 
 
 
-	public function extra_permalink_field_buttons( $return, $id, $new_title, $new_slug ) {
-		$return = parent::extra_permalink_field_buttons( $return, $id, $new_title, $new_slug );
+	public function extra_permalink_field_buttons($return, $id, $new_title, $new_slug) {
+		$return = parent::extra_permalink_field_buttons($return, $id, $new_title, $new_slug);
 		//make sure this is only when editing
-		if ( !empty( $id ) ) {
-			$href = EE_Admin_Page::add_query_args_and_nonce( array('action' => 'duplicate_event', 'EVT_ID' => $id), $this->_admin_base_url );
+		if ( ! empty($id)) {
+			$href = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'duplicate_event', 'EVT_ID' => $id), $this->_admin_base_url);
 			$title = esc_attr__('Duplicate Event', 'event_espresso');
-			$return .= '<a href="' . $href . '" title="' . $title . '" id="ee-duplicate-event-button" class="button button-small"  value="duplicate_event">' . $title  . '</button>';
+			$return .= '<a href="'.$href.'" title="'.$title.'" id="ee-duplicate-event-button" class="button button-small"  value="duplicate_event">'.$title.'</button>';
 		}
 		return $return;
 	}
@@ -291,7 +291,7 @@ 
 				'label' => __('Trash', 'event_espresso'),
 				'count' => 0,
 				'bulk_action' => array(
-					'restore_tickets' => __('Restore from Trash' , 'event_espresso'),
+					'restore_tickets' => __('Restore from Trash', 'event_espresso'),
 					'delete_tickets' => __('Delete Permanently', 'event_espresso')
 					)
 				)
@@ -301,7 +301,7 @@ 
 
 
 	public function load_scripts_styles_edit() {
-		wp_register_script( 'ee-event-editor-heartbeat', EVENTS_CAF_ASSETS_URL . 'event-editor-heartbeat.js', array( 'ee_admin_js', 'heartbeat' ), EVENT_ESPRESSO_VERSION, TRUE );
+		wp_register_script('ee-event-editor-heartbeat', EVENTS_CAF_ASSETS_URL.'event-editor-heartbeat.js', array('ee_admin_js', 'heartbeat'), EVENT_ESPRESSO_VERSION, TRUE);
 
 		/**
 		 * load accounting js.
@@ -320,20 +320,20 @@ 
 
 
 
-	public function add_additional_datetime_button( $template, $template_args ) {
-		return EEH_Template::display_template( EVENTS_CAF_TEMPLATE_PATH . 'event_datetime_add_additional_time.template.php', $template_args, TRUE);
+	public function add_additional_datetime_button($template, $template_args) {
+		return EEH_Template::display_template(EVENTS_CAF_TEMPLATE_PATH.'event_datetime_add_additional_time.template.php', $template_args, TRUE);
 	}
 
 
 
-	public function add_datetime_clone_button( $template, $template_args ) {
-		return EEH_Template::display_template( EVENTS_CAF_TEMPLATE_PATH . 'event_datetime_metabox_clone_button.template.php', $template_args, TRUE );
+	public function add_datetime_clone_button($template, $template_args) {
+		return EEH_Template::display_template(EVENTS_CAF_TEMPLATE_PATH.'event_datetime_metabox_clone_button.template.php', $template_args, TRUE);
 	}
 
 
 
-	public function datetime_timezones_template( $template, $template_args ) {
-		return EEH_Template::display_template( EVENTS_CAF_TEMPLATE_PATH . 'event_datetime_timezones.template.php', $template_args, TRUE );
+	public function datetime_timezones_template($template, $template_args) {
+		return EEH_Template::display_template(EVENTS_CAF_TEMPLATE_PATH.'event_datetime_timezones.template.php', $template_args, TRUE);
 	}
 
 
@@ -342,11 +342,11 @@ 
 	protected function _set_list_table_views_default() {
 		parent::_set_list_table_views_default();
 		$export_label = __('Export Events', 'event_espresso');
-		if ( EE_Registry::instance()->CAP->current_user_can( 'export', 'espresso_events_export' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('export', 'espresso_events_export')) {
 //			$this->_views['all']['bulk_action']['export_events'] = $export_label;
 //			$this->_views['draft']['bulk_action']['export_events'] = $export_label;
 
-			if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_events', 'espresso_events_trash_events' ) ) {
+			if (EE_Registry::instance()->CAP->current_user_can('ee_delete_events', 'espresso_events_trash_events')) {
 //				$this->_views['trash']['bulk_action']['export_events'] = $export_label;
 			}
 		}
@@ -372,7 +372,7 @@ 
 			)
 		);
 
-		$this->_views = array_merge( $this->_views, $new_views);
+		$this->_views = array_merge($this->_views, $new_views);
 	}
 
 
@@ -386,14 +386,14 @@ 
 
 
 
-	public function extra_list_table_actions( $actionlinks, $event ) {
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'espresso_registrations_reports', $event->ID() ) ) {
+	public function extra_list_table_actions($actionlinks, $event) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'espresso_registrations_reports', $event->ID())) {
 			$reports_query_args = array(
 					'action' => 'reports',
 					'EVT_ID' => $event->ID()
 				);
-			$reports_link = EE_Admin_Page::add_query_args_and_nonce( $reports_query_args, REG_ADMIN_URL );
-			$actionlinks[] = '<a href="' . $reports_link . '" title="' .  esc_attr__('View Report', 'event_espresso') . '"><div class="dashicons dashicons-chart-bar"></div></a>' . "\n\t";
+			$reports_link = EE_Admin_Page::add_query_args_and_nonce($reports_query_args, REG_ADMIN_URL);
+			$actionlinks[] = '<a href="'.$reports_link.'" title="'.esc_attr__('View Report', 'event_espresso').'"><div class="dashicons dashicons-chart-bar"></div></a>'."\n\t";
 		}
 		return $actionlinks;
 	}
@@ -401,7 +401,7 @@ 
 
 
 	public function additional_legend_items($items) {
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'espresso_registrations_reports' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'espresso_registrations_reports')) {
 			$items['reports'] = array(
 					'class' => 'dashicons dashicons-chart-bar',
 					'desc' => __('Event Reports', 'event_espresso')
@@ -426,17 +426,17 @@ 
 	 */
 	protected function _duplicate_event() {
 		//first make sure the ID for the event is in the request.  If it isnt' then we need to bail and redirect back to overview list table (cause how did we get here?)
-		if ( !isset( $this->_req_data['EVT_ID'] ) ) {
-			EE_Error::add_error( __('In order to duplicate an event an Event ID is required.  None was given.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
-			$this->_redirect_after_action( FALSE, '', '', array(), TRUE );
+		if ( ! isset($this->_req_data['EVT_ID'])) {
+			EE_Error::add_error(__('In order to duplicate an event an Event ID is required.  None was given.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
+			$this->_redirect_after_action(FALSE, '', '', array(), TRUE);
 			return;
 		}
 
 		//k we've got EVT_ID so let's use that to get the event we'll duplicate
-		$orig_event = EEM_Event::instance()->get_one_by_ID( $this->_req_data['EVT_ID'] );
+		$orig_event = EEM_Event::instance()->get_one_by_ID($this->_req_data['EVT_ID']);
 
-		if ( ! $orig_event instanceof EE_Event )
-			throw new EE_Error( sprintf( __('An EE_Event object could not be retrieved for the given ID (%s)', 'event_espresso '), $this->_req_data['EVT_ID'] ) );
+		if ( ! $orig_event instanceof EE_Event)
+			throw new EE_Error(sprintf(__('An EE_Event object could not be retrieved for the given ID (%s)', 'event_espresso '), $this->_req_data['EVT_ID']));
 
 		//k now let's clone the $orig_event before getting relations
 		$new_event = clone $orig_event;
@@ -449,43 +449,43 @@ 
 
 
 		//reset the ID and modify other details to make it clear this is a dupe
-		$new_event->set( 'EVT_ID', 0 );
-		$new_name = $new_event->name() . ' ' . __('**DUPLICATE**', 'event_espresso');
-		$new_event->set( 'EVT_name',  $new_name );
-		$new_event->set( 'EVT_slug',  wp_unique_post_slug( sanitize_title( $orig_event->name() ), 0, 'publish', 'espresso_events', 0 ) );
-		$new_event->set( 'status', 'draft' );
+		$new_event->set('EVT_ID', 0);
+		$new_name = $new_event->name().' '.__('**DUPLICATE**', 'event_espresso');
+		$new_event->set('EVT_name', $new_name);
+		$new_event->set('EVT_slug', wp_unique_post_slug(sanitize_title($orig_event->name()), 0, 'publish', 'espresso_events', 0));
+		$new_event->set('status', 'draft');
 
 		//duplicate discussion settings
-		$new_event->set( 'comment_status', $orig_event->get('comment_status') );
-		$new_event->set( 'ping_status', $orig_event->get( 'ping_status' ) );
+		$new_event->set('comment_status', $orig_event->get('comment_status'));
+		$new_event->set('ping_status', $orig_event->get('ping_status'));
 
 		//save the new event
 		$new_event->save();
 
 		//venues
-		foreach( $orig_ven as $ven ) {
-			$new_event->_add_relation_to( $ven, 'Venue' );
+		foreach ($orig_ven as $ven) {
+			$new_event->_add_relation_to($ven, 'Venue');
 		}
 		$new_event->save();
 
 
 		//now we need to get the question group relations and handle that
 		//first primary question groups
-		$orig_primary_qgs = $orig_event->get_many_related('Question_Group', array( array('Event_Question_Group.EQG_primary' => 1 ) ) );
-		if ( !empty( $orig_primary_qgs ) ) {
-			foreach ( $orig_primary_qgs as $id => $obj ) {
-				if ( $obj instanceof EE_Question_Group ) {
-					$new_event->_add_relation_to( $obj, 'Question_Group', array( 'EQG_primary' => 1 ) );
+		$orig_primary_qgs = $orig_event->get_many_related('Question_Group', array(array('Event_Question_Group.EQG_primary' => 1)));
+		if ( ! empty($orig_primary_qgs)) {
+			foreach ($orig_primary_qgs as $id => $obj) {
+				if ($obj instanceof EE_Question_Group) {
+					$new_event->_add_relation_to($obj, 'Question_Group', array('EQG_primary' => 1));
 				}
 			}
 		}
 
 		//next additional attendee question groups
-		$orig_additional_qgs = $orig_event->get_many_related('Question_Group', array( array('Event_Question_Group.EQG_primary' => 0 ) ) );
-		if ( !empty( $orig_additional_qgs ) ) {
-			foreach ( $orig_additional_qgs as $id => $obj ) {
-				if ( $obj instanceof EE_Question_Group ) {
-					$new_event->_add_relation_to( $obj, 'Question_Group', array( 'EQG_primary' => 0 ) );
+		$orig_additional_qgs = $orig_event->get_many_related('Question_Group', array(array('Event_Question_Group.EQG_primary' => 0)));
+		if ( ! empty($orig_additional_qgs)) {
+			foreach ($orig_additional_qgs as $id => $obj) {
+				if ($obj instanceof EE_Question_Group) {
+					$new_event->_add_relation_to($obj, 'Question_Group', array('EQG_primary' => 0));
 				}
 			}
 		}
@@ -496,7 +496,7 @@ 
 
 		//k now that we have the new event saved we can loop through the datetimes and start adding relations.
 		$cloned_tickets = array();
-		foreach ( $orig_datetimes as $orig_dtt ) {
+		foreach ($orig_datetimes as $orig_dtt) {
 			$new_dtt = clone $orig_dtt;
 			$orig_tkts = $orig_dtt->tickets();
 
@@ -504,22 +504,22 @@ 
 			$new_dtt->set('DTT_ID', 0);
 			$new_dtt->set('DTT_sold', 0);
 			$new_dtt->save();
-			$new_event->_add_relation_to( $new_dtt, 'Datetime');
+			$new_event->_add_relation_to($new_dtt, 'Datetime');
 			$new_event->save();
 
 			//now let's get the ticket relations setup.
-			foreach ( (array) $orig_tkts as $orig_tkt ) {
+			foreach ((array) $orig_tkts as $orig_tkt) {
 				//it's possible a datetime will have no tickets so let's verify we HAVE a ticket first.
-				if ( ! $orig_tkt instanceof EE_Ticket )
+				if ( ! $orig_tkt instanceof EE_Ticket)
 					continue;
 
 				//is this ticket archived?  If it is then let's skip
-				if ( $orig_tkt->get( 'TKT_deleted' ) ) {
+				if ($orig_tkt->get('TKT_deleted')) {
 					continue;
 				}
 
 				//does this original ticket already exist in the clone_tickets cache?  If so we'll just use the new ticket from it.
-				if ( isset( $cloned_tickets[$orig_tkt->ID()] ) ) {
+				if (isset($cloned_tickets[$orig_tkt->ID()])) {
 					$new_tkt = $cloned_tickets[$orig_tkt->ID()];
 				} else {
 					$new_tkt = clone $orig_tkt;
@@ -531,7 +531,7 @@ 
 					$new_tkt->save(); //make sure new ticket has ID.
 
 					//price relations on new ticket need to be setup.
-					foreach ( $orig_prices as $orig_price ) {
+					foreach ($orig_prices as $orig_price) {
 						$new_price = clone $orig_price;
 						$new_price->set('PRC_ID', 0);
 						$new_price->save();
@@ -548,39 +548,39 @@ 
 		}
 
 		//clone taxonomy information
-		$taxonomies_to_clone_with = apply_filters( 'FHEE__Extend_Events_Admin_Page___duplicate_event__taxonomies_to_clone', array( 'espresso_event_categories', 'espresso_event_type', 'post_tag' ) );
+		$taxonomies_to_clone_with = apply_filters('FHEE__Extend_Events_Admin_Page___duplicate_event__taxonomies_to_clone', array('espresso_event_categories', 'espresso_event_type', 'post_tag'));
 
 		//get terms for original event (notice)
-		$orig_terms = wp_get_object_terms( $orig_event->ID(), $taxonomies_to_clone_with );
+		$orig_terms = wp_get_object_terms($orig_event->ID(), $taxonomies_to_clone_with);
 
 		//loop through terms and add them to new event.
-		foreach ( $orig_terms as $term ) {
-			wp_set_object_terms( $new_event->ID(), $term->term_id, $term->taxonomy, true );
+		foreach ($orig_terms as $term) {
+			wp_set_object_terms($new_event->ID(), $term->term_id, $term->taxonomy, true);
 		}
 
 
-		do_action( 'AHEE__Extend_Events_Admin_Page___duplicate_event__after', $new_event, $orig_event );
+		do_action('AHEE__Extend_Events_Admin_Page___duplicate_event__after', $new_event, $orig_event);
 
 		//now let's redirect to the edit page for this duplicated event if we have a new event id.
-		if ( $new_event->ID() ) {
+		if ($new_event->ID()) {
 			$redirect_args = array(
 				'post' => $new_event->ID(),
 				'action' => 'edit'
 			);
-			EE_Error::add_success( __('Event successfully duplicated.  Please review the details below and make any necessary edits', 'event_espresso') );
+			EE_Error::add_success(__('Event successfully duplicated.  Please review the details below and make any necessary edits', 'event_espresso'));
 		} else {
 			$redirect_args = array(
 				'action' => 'default'
 				);
-			EE_Error::add_error( __('Not able to duplicate event.  Something went wrong.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error(__('Not able to duplicate event.  Something went wrong.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
 
-		$this->_redirect_after_action(FALSE, '', '', $redirect_args, TRUE );
+		$this->_redirect_after_action(FALSE, '', '', $redirect_args, TRUE);
 	}
 
 
 
-	protected function _import_page(){
+	protected function _import_page() {
 
 		$title = __('Import', 'event_espresso');
 		$intro = __('If you have a previously exported Event Espresso 4 information in a Comma Separated Value (CSV) file format, you can upload the file here: ', 'event_espresso');
@@ -588,8 +588,8 @@ 
 		$action = 'import_events';
 		$type = 'csv';
 		$this->_template_args['form'] = EE_Import::instance()->upload_form($title, $intro, $form_url, $action, $type);
-		$this->_template_args['sample_file_link'] = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'sample_export_file'),$this->_admin_base_url);
-		$content = EEH_Template::display_template(EVENTS_CAF_TEMPLATE_PATH . 'import_page.template.php',$this->_template_args,true);
+		$this->_template_args['sample_file_link'] = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'sample_export_file'), $this->_admin_base_url);
+		$content = EEH_Template::display_template(EVENTS_CAF_TEMPLATE_PATH.'import_page.template.php', $this->_template_args, true);
 
 
 		$this->_template_args['admin_page_content'] = $content;
@@ -602,9 +602,9 @@ 
 	 * @return string html
 	 */
 	protected function _import_events() {
-		require_once(EE_CLASSES . 'EE_Import.class.php');
+		require_once(EE_CLASSES.'EE_Import.class.php');
 		$success = EE_Import::instance()->import();
-		$this->_redirect_after_action($success, 'Import File', 'ran', array('action' => 'import_page'),true);
+		$this->_redirect_after_action($success, 'Import File', 'ran', array('action' => 'import_page'), true);
 
 	}
 
@@ -618,24 +618,24 @@ 
 	 * @return file
 	 */
 	protected function _events_export() {
-		if(isset($this->_req_data['EVT_ID'])){
+		if (isset($this->_req_data['EVT_ID'])) {
 			$event_ids = $this->_req_data['EVT_ID'];
-		}elseif(isset($this->_req_data['EVT_IDs'])){
+		}elseif (isset($this->_req_data['EVT_IDs'])) {
 			$event_ids = $this->_req_data['EVT_IDs'];
-		}else{
+		} else {
 			$event_ids = NULL;
 		}
 		//todo: I don't like doing this but it'll do until we modify EE_Export Class.
 		$new_request_args = array(
 			'export' => 'report',
 			'action' => 'all_event_data',
-			'EVT_ID' => $event_ids ,
+			'EVT_ID' => $event_ids,
 		);
 		$this->_req_data = array_merge($this->_req_data, $new_request_args);
 
-		EE_Registry::instance()->load_helper( 'File' );
-		if ( is_readable(EE_CLASSES . 'EE_Export.class.php')) {
-			require_once(EE_CLASSES . 'EE_Export.class.php');
+		EE_Registry::instance()->load_helper('File');
+		if (is_readable(EE_CLASSES.'EE_Export.class.php')) {
+			require_once(EE_CLASSES.'EE_Export.class.php');
 			$EE_Export = EE_Export::instance($this->_req_data);
 			$EE_Export->export();
 		}
@@ -657,12 +657,12 @@ 
 			'category_ids' => $this->_req_data['EVT_CAT_ID']
 			);
 
-		$this->_req_data = array_merge( $this->_req_data, $new_request_args );
+		$this->_req_data = array_merge($this->_req_data, $new_request_args);
 
-		EE_Registry::instance()->load_helper( 'File' );
-		if ( is_readable( EE_CLASSES . 'EE_Export.class.php') ) {
-			require_once( EE_CLASSES . 'EE_Export.class.php');
-			$EE_Export = EE_Export::instance( $this->_req_data );
+		EE_Registry::instance()->load_helper('File');
+		if (is_readable(EE_CLASSES.'EE_Export.class.php')) {
+			require_once(EE_CLASSES.'EE_Export.class.php');
+			$EE_Export = EE_Export::instance($this->_req_data);
 			$EE_Export->export();
 		}
 
@@ -673,7 +673,7 @@ 
 	/**
 	 * Creates a sample CSV file for importing
 	 */
-	protected function _sample_export_file(){
+	protected function _sample_export_file() {
 //		require_once(EE_CLASSES . 'EE_Export.class.php');
 		EE_Export::instance()->export_sample();
 	}
@@ -690,10 +690,10 @@ 
 		 * Note leaving this filter in for backward compatibility this was moved in 4.6.x
 		 * from General_Settings_Admin_Page to here.
 		 */
-		$this->_template_args = apply_filters( 'FHEE__General_Settings_Admin_Page__template_settings__template_args', $this->_template_args );
-		$this->_set_add_edit_form_tags( 'update_template_settings' );
-		$this->_set_publish_post_box_vars( NULL, FALSE, FALSE, NULL, FALSE );
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( EVENTS_CAF_TEMPLATE_PATH . 'template_settings.template.php', $this->_template_args, TRUE );
+		$this->_template_args = apply_filters('FHEE__General_Settings_Admin_Page__template_settings__template_args', $this->_template_args);
+		$this->_set_add_edit_form_tags('update_template_settings');
+		$this->_set_publish_post_box_vars(NULL, FALSE, FALSE, NULL, FALSE);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(EVENTS_CAF_TEMPLATE_PATH.'template_settings.template.php', $this->_template_args, TRUE);
 		$this->display_admin_page_with_sidebar();
 	}
 
@@ -705,24 +705,24 @@ 
 		 * Note leaving this filter in for backward compatibility this was moved in 4.6.x
 		 * from General_Settings_Admin_Page to here.
 		 */
-		EE_Registry::instance()->CFG->template_settings = apply_filters( 'FHEE__General_Settings_Admin_Page__update_template_settings__data', EE_Registry::instance()->CFG->template_settings, $this->_req_data );
+		EE_Registry::instance()->CFG->template_settings = apply_filters('FHEE__General_Settings_Admin_Page__update_template_settings__data', EE_Registry::instance()->CFG->template_settings, $this->_req_data);
 
 
 		//update custom post type slugs and detect if we need to flush rewrite rules
 		$old_slug = EE_Registry::instance()->CFG->core->event_cpt_slug;
-		EE_Registry::instance()->CFG->core->event_cpt_slug = empty( $this->_req_data['event_cpt_slug'] ) ? EE_Registry::instance()->CFG->core->event_cpt_slug : sanitize_title_with_dashes( $this->_req_data['event_cpt_slug'] );
+		EE_Registry::instance()->CFG->core->event_cpt_slug = empty($this->_req_data['event_cpt_slug']) ? EE_Registry::instance()->CFG->core->event_cpt_slug : sanitize_title_with_dashes($this->_req_data['event_cpt_slug']);
 
 
 		$what = 'Template Settings';
-		$success = $this->_update_espresso_configuration( $what, EE_Registry::instance()->CFG->template_settings, __FILE__, __FUNCTION__, __LINE__ );
+		$success = $this->_update_espresso_configuration($what, EE_Registry::instance()->CFG->template_settings, __FILE__, __FUNCTION__, __LINE__);
 
 
-		if ( EE_Registry::instance()->CFG->core->event_cpt_slug != $old_slug ) {
-			update_option( 'ee_flush_rewrite_rules', true );
+		if (EE_Registry::instance()->CFG->core->event_cpt_slug != $old_slug) {
+			update_option('ee_flush_rewrite_rules', true);
 		}
 
 
-		$this->_redirect_after_action( $success, $what, 'updated', array( 'action' => 'template_settings' ) );
+		$this->_redirect_after_action($success, $what, 'updated', array('action' => 'template_settings'));
 
 	}
 
@@ -740,7 +740,7 @@ 
 
 		$this->verify_cpt_object();
 
-		add_meta_box('espresso_event_editor_event_options', __('Event Registration Options', 'event_espresso'), array( $this, 'registration_options_meta_box' ), $this->page_slug, 'side', 'core');
+		add_meta_box('espresso_event_editor_event_options', __('Event Registration Options', 'event_espresso'), array($this, 'registration_options_meta_box'), $this->page_slug, 'side', 'core');
 		//add_meta_box('espresso_event_types', __('Event Type', 'event_espresso'), array( $this, 'event_type_meta_box' ), $this->page_slug, 'side', 'default' ); //add this back in when the feature is ready.
 
 		//todo feature in progress
@@ -764,16 +764,16 @@ 
 			array('id' => true, 'text' => __('Yes', 'event_espresso')),
 			array('id' => false, 'text' => __('No', 'event_espresso'))
 		);
-		$default_reg_status_values = EEM_Registration::reg_status_array(array(EEM_Registration::status_id_cancelled, EEM_Registration::status_id_declined, EEM_Registration::status_id_incomplete ), TRUE);
+		$default_reg_status_values = EEM_Registration::reg_status_array(array(EEM_Registration::status_id_cancelled, EEM_Registration::status_id_declined, EEM_Registration::status_id_incomplete), TRUE);
 		$template_args['active_status'] = $this->_cpt_model_obj->pretty_active_status(FALSE);
 		$template_args['_event'] = $this->_cpt_model_obj;
 		$template_args['additional_limit'] = $this->_cpt_model_obj->additional_limit();
 		$template_args['default_registration_status'] = EEH_Form_Fields::select_input('default_reg_status', $default_reg_status_values, $this->_cpt_model_obj->default_registration_status());
 		$template_args['display_description'] = EEH_Form_Fields::select_input('display_desc', $yes_no_values, $this->_cpt_model_obj->display_description());
 		$template_args['display_ticket_selector'] = EEH_Form_Fields::select_input('display_ticket_selector', $yes_no_values, $this->_cpt_model_obj->display_ticket_selector(), '', '', false);
-		$template_args['EVT_default_registration_status'] = EEH_Form_Fields::select_input('EVT_default_registration_status', $default_reg_status_values, $this->_cpt_model_obj->default_registration_status() );
-		$template_args['additional_registration_options'] = apply_filters( 'FHEE__Events_Admin_Page__registration_options_meta_box__additional_registration_options', '', $template_args, $yes_no_values, $default_reg_status_values );
-		$templatepath = EVENTS_CAF_TEMPLATE_PATH . 'event_registration_options.template.php';
+		$template_args['EVT_default_registration_status'] = EEH_Form_Fields::select_input('EVT_default_registration_status', $default_reg_status_values, $this->_cpt_model_obj->default_registration_status());
+		$template_args['additional_registration_options'] = apply_filters('FHEE__Events_Admin_Page__registration_options_meta_box__additional_registration_options', '', $template_args, $yes_no_values, $default_reg_status_values);
+		$templatepath = EVENTS_CAF_TEMPLATE_PATH.'event_registration_options.template.php';
 		EEH_Template::display_template($templatepath, $template_args);
 	}
 
@@ -786,9 +786,9 @@ 
 	 * @param  array  $box  metabox args
 	 * @return string       metabox contents
 	 */
-	public function event_type_meta_box( $post, $box ) {
-		$template_args['radio_list'] = $this->wp_terms_radio($post->ID, array( 'taxonomy' => 'espresso_event_type' ) );
-		$template = EVENTS_CAF_TEMPLATE_PATH . 'event_type_metabox_contents.template.php';
+	public function event_type_meta_box($post, $box) {
+		$template_args['radio_list'] = $this->wp_terms_radio($post->ID, array('taxonomy' => 'espresso_event_type'));
+		$template = EVENTS_CAF_TEMPLATE_PATH.'event_type_metabox_contents.template.php';
 		EEH_Template::display_template($template, $template_args);
 	}
 
@@ -798,7 +798,7 @@ 
 
 
 
-	public function wp_terms_radio( $post_id = 0, $args = array() ) {
+	public function wp_terms_radio($post_id = 0, $args = array()) {
 		$defaults = array(
 			'descendants_and_self' => 0,
 			'selected_cats' => false,
@@ -807,11 +807,11 @@ 
 			'taxonomy' => 'category',
 			'checked_ontop' => true
 		);
-		$args = apply_filters( 'wp_terms_checklist_args', $args, $post_id );
+		$args = apply_filters('wp_terms_checklist_args', $args, $post_id);
 
-		extract( wp_parse_args($args, $defaults), EXTR_SKIP );
+		extract(wp_parse_args($args, $defaults), EXTR_SKIP);
 
-		if ( empty($walker) || !is_a($walker, 'Walker') )
+		if (empty($walker) || ! is_a($walker, 'Walker'))
 			$walker = new Walker_Radio_Checklist;
 
 		$descendants_and_self = (int) $descendants_and_self;
@@ -819,37 +819,37 @@ 
 		$args = array('taxonomy' => $taxonomy);
 
 		$tax = get_taxonomy($taxonomy);
-		$args['disabled'] = !current_user_can($tax->cap->assign_terms);
+		$args['disabled'] = ! current_user_can($tax->cap->assign_terms);
 
-		if ( is_array( $selected_cats ) )
+		if (is_array($selected_cats))
 			$args['selected_cats'] = $selected_cats;
-		elseif ( $post_id )
+		elseif ($post_id)
 			$args['selected_cats'] = wp_get_object_terms($post_id, $taxonomy, array_merge($args, array('fields' => 'ids')));
 		else
 			$args['selected_cats'] = array();
 
-		if ( is_array( $popular_cats ) )
+		if (is_array($popular_cats))
 			$args['popular_cats'] = $popular_cats;
 		else
-			$args['popular_cats'] = get_terms( $taxonomy, array( 'fields' => 'ids', 'orderby' => 'count', 'order' => 'DESC', 'number' => 10, 'hierarchical' => false ) );
+			$args['popular_cats'] = get_terms($taxonomy, array('fields' => 'ids', 'orderby' => 'count', 'order' => 'DESC', 'number' => 10, 'hierarchical' => false));
 
-		if ( $descendants_and_self ) {
-			$categories = (array) get_terms($taxonomy, array( 'child_of' => $descendants_and_self, 'hierarchical' => 0, 'hide_empty' => 0 ) );
-			$self = get_term( $descendants_and_self, $taxonomy );
-			array_unshift( $categories, $self );
+		if ($descendants_and_self) {
+			$categories = (array) get_terms($taxonomy, array('child_of' => $descendants_and_self, 'hierarchical' => 0, 'hide_empty' => 0));
+			$self = get_term($descendants_and_self, $taxonomy);
+			array_unshift($categories, $self);
 		} else {
 			$categories = (array) get_terms($taxonomy, array('get' => 'all'));
 		}
 
-		if ( $checked_ontop ) {
+		if ($checked_ontop) {
 			// Post process $categories rather than adding an exclude to the get_terms() query to keep the query the same across all posts (for any query cache)
 			$checked_categories = array();
-			$keys = array_keys( $categories );
+			$keys = array_keys($categories);
 
-			foreach( $keys as $k ) {
-				if ( in_array( $categories[$k]->term_id, $args['selected_cats'] ) ) {
+			foreach ($keys as $k) {
+				if (in_array($categories[$k]->term_id, $args['selected_cats'])) {
 					$checked_categories[] = $categories[$k];
-					unset( $categories[$k] );
+					unset($categories[$k]);
 				}
 			}
 
@@ -874,18 +874,18 @@ 
 	 * @param  array  $list_table_obj the list table object
 	 * @return array                  new filters
 	 */
-	public function list_table_filters( $oldfilters, $list_table_obj ) {
+	public function list_table_filters($oldfilters, $list_table_obj) {
 		$filters = array();
 
 		//first month/year filters
 		$filters[] = $this->espresso_event_months_dropdown();
 
 
-		$status = isset( $this->_req_data['status'] ) ? $this->_req_data['status'] : NULL;
+		$status = isset($this->_req_data['status']) ? $this->_req_data['status'] : NULL;
 
 		//active status dropdown
-		if ( $status !== 'draft' )
-			$filter[] = $this->active_status_dropdown( isset( $this->_req_data['active_status'] ) ? $this->_req_data['active_status'] : '' );
+		if ($status !== 'draft')
+			$filter[] = $this->active_status_dropdown(isset($this->_req_data['active_status']) ? $this->_req_data['active_status'] : '');
 
 		//category filter
 		$filters[] = $this->category_dropdown();
@@ -907,17 +907,17 @@ 
 	 */
 	public function espresso_event_months_dropdown() {
 		//what we need to do is get all PRIMARY datetimes for all events to filter on. Note we need to include any other filters that are set!
-		$status = isset( $this->_req_data['status'] ) ? $this->_req_data['status'] : NULL;
+		$status = isset($this->_req_data['status']) ? $this->_req_data['status'] : NULL;
 
 		//categories?
-		$category = isset( $this->_req_data['EVT_CAT'] ) && $this->_req_data['EVT_CAT'] > 0 ? $this->_req_data['EVT_CAT'] : NULL;
+		$category = isset($this->_req_data['EVT_CAT']) && $this->_req_data['EVT_CAT'] > 0 ? $this->_req_data['EVT_CAT'] : NULL;
 
 		//active status?
-		$active_status = isset( $this->_req_data['active_status'] ) ? $this->_req_data['active_status'] : NULL;
+		$active_status = isset($this->_req_data['active_status']) ? $this->_req_data['active_status'] : NULL;
 
 		$cur_date = isset($this->_req_data['month_range']) ? $this->_req_data['month_range'] : '';
 
-		return EEH_Form_Fields::generate_event_months_dropdown( $cur_date, $status, $category, $active_status );
+		return EEH_Form_Fields::generate_event_months_dropdown($cur_date, $status, $category, $active_status);
 	}
 
 
@@ -928,12 +928,12 @@ 
 	 * @param  string $current_value whatever the ucrrent active status is
 	 * @return string                html dropdown.
 	 */
-	public function  active_status_dropdown( $current_value = '' ) {
+	public function  active_status_dropdown($current_value = '') {
 		$select_name = 'active_status';
-		$values = array('none' => __('Show Active/Inactive', 'event_espresso'), 'active' => __('Active', 'event_espresso'), 'upcoming' => __('Upcoming', 'event_espresso'), 'expired' => __('Expired', 'event_espresso'), 'inactive' => __('Inactive', 'event_espresso') );
+		$values = array('none' => __('Show Active/Inactive', 'event_espresso'), 'active' => __('Active', 'event_espresso'), 'upcoming' => __('Upcoming', 'event_espresso'), 'expired' => __('Expired', 'event_espresso'), 'inactive' => __('Inactive', 'event_espresso'));
 		$id = 'id="espresso-active-status-dropdown-filter"';
 		$class = 'wide';
-		echo EEH_Form_Fields::select_input( $select_name, $values, $current_value, $id, $class );
+		echo EEH_Form_Fields::select_input($select_name, $values, $current_value, $id, $class);
 	}
 
 
@@ -945,9 +945,9 @@ 
 	 * @return string html
 	 */
 	public function category_dropdown() {
-		$cur_cat = isset( $this->_req_data['EVT_CAT'] ) ? $this->_req_data['EVT_CAT'] : -1;
+		$cur_cat = isset($this->_req_data['EVT_CAT']) ? $this->_req_data['EVT_CAT'] : -1;
 
-		return EEH_Form_Fields::generate_event_category_dropdown( $cur_cat );
+		return EEH_Form_Fields::generate_event_category_dropdown($cur_cat);
 	}
 
 
@@ -959,14 +959,14 @@ 
 	 * @return int
 	 */
 	public function total_events_today() {
-		$start = EEM_Datetime::instance()->convert_datetime_for_query( 'DTT_EVT_start', date('Y-m-d' ) . ' 00:00:00', 'Y-m-d H:i:s', 'UTC' );
-		$end = EEM_Datetime::instance()->convert_datetime_for_query( 'DTT_EVT_start', date('Y-m-d' ) . ' 23:59:59', 'Y-m-d H:i:s', 'UTC' );
+		$start = EEM_Datetime::instance()->convert_datetime_for_query('DTT_EVT_start', date('Y-m-d').' 00:00:00', 'Y-m-d H:i:s', 'UTC');
+		$end = EEM_Datetime::instance()->convert_datetime_for_query('DTT_EVT_start', date('Y-m-d').' 23:59:59', 'Y-m-d H:i:s', 'UTC');
 
 		$where = array(
-			'Datetime.DTT_EVT_start' => array( 'BETWEEN', array($start, $end ) )
+			'Datetime.DTT_EVT_start' => array('BETWEEN', array($start, $end))
 			);
 
-		$count = EEM_Event::instance()->count( array( $where, 'caps' => 'read_admin' ), 'EVT_ID', true );
+		$count = EEM_Event::instance()->count(array($where, 'caps' => 'read_admin'), 'EVT_ID', true);
 		return $count;
 	}
 
@@ -981,14 +981,14 @@ 
 		$this_year_r = date('Y');
 		$this_month_r = date('m');
 		$days_this_month = date('t');
-		$start = EEM_Datetime::instance()->convert_datetime_for_query( 'DTT_EVT_start', $this_year_r . '-' . $this_month_r . '-01 00:00:00', 'Y-m-d H:i:s', 'UTC' );
-		$end = EEM_Datetime::instance()->convert_datetime_for_query( 'DTT_EVT_start', $this_year_r . '-' . $this_month_r . '-' . $days_this_month . ' 23:59:59', 'Y-m-d H:i:s', 'UTC' );
+		$start = EEM_Datetime::instance()->convert_datetime_for_query('DTT_EVT_start', $this_year_r.'-'.$this_month_r.'-01 00:00:00', 'Y-m-d H:i:s', 'UTC');
+		$end = EEM_Datetime::instance()->convert_datetime_for_query('DTT_EVT_start', $this_year_r.'-'.$this_month_r.'-'.$days_this_month.' 23:59:59', 'Y-m-d H:i:s', 'UTC');
 
 		$where = array(
-			'Datetime.DTT_EVT_start' => array( 'BETWEEN', array($start, $end ) )
+			'Datetime.DTT_EVT_start' => array('BETWEEN', array($start, $end))
 			);
 
-		$count = EEM_Event::instance()->count( array( $where, 'caps' => 'read_admin' ), 'EVT_ID', true );
+		$count = EEM_Event::instance()->count(array($where, 'caps' => 'read_admin'), 'EVT_ID', true);
 		return $count;
 	}
 
@@ -1005,53 +1005,53 @@ 
 
 
 
-	public function get_default_tickets( $per_page = 10, $count = FALSE, $trashed = FALSE ) {
+	public function get_default_tickets($per_page = 10, $count = FALSE, $trashed = FALSE) {
 
-		$orderby= empty( $this->_req_data['orderby'] ) ? 'TKT_name' : $this->_req_data['orderby'];
-		$order = empty( $this->_req_data['order'] ) ? 'ASC' : $this->_req_data['order'];
+		$orderby = empty($this->_req_data['orderby']) ? 'TKT_name' : $this->_req_data['orderby'];
+		$order = empty($this->_req_data['order']) ? 'ASC' : $this->_req_data['order'];
 
-		switch ( $orderby ) {
+		switch ($orderby) {
 			case 'TKT_name' :
-				$orderby = array( 'TKT_name' => $order );
+				$orderby = array('TKT_name' => $order);
 				break;
 
 			case 'TKT_price' :
-				$orderby = array( 'TKT_price' => $order );
+				$orderby = array('TKT_price' => $order);
 				break;
 
 			case 'TKT_uses' :
-				$orderby = array( 'TKT_uses' => $order );
+				$orderby = array('TKT_uses' => $order);
 				break;
 
 			case 'TKT_min' :
-				$orderby = array( 'TKT_min' => $order );
+				$orderby = array('TKT_min' => $order);
 				break;
 
 			case 'TKT_max' :
-				$orderby = array( 'TKT_max' => $order );
+				$orderby = array('TKT_max' => $order);
 				break;
 
 			case 'TKT_qty' :
-				$orderby = array( 'TKT_qty' => $order );
+				$orderby = array('TKT_qty' => $order);
 				break;
 		}
 
-		$current_page = isset( $this->_req_data['paged'] ) && !empty( $this->_req_data['paged'] ) ? $this->_req_data['paged'] : 1;
-		$per_page = isset( $this->_req_data['perpage'] ) && !empty( $this->_req_data['perpage'] ) ? $this->_req_data['perpage'] : $per_page;
+		$current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged']) ? $this->_req_data['paged'] : 1;
+		$per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage']) ? $this->_req_data['perpage'] : $per_page;
 
 		$_where = array(
 			'TKT_is_default' => 1,
 			'TKT_deleted' => $trashed
 			);
 
-		$offset = ($current_page-1)*$per_page;
-		$limit = array( $offset, $per_page );
+		$offset = ($current_page - 1) * $per_page;
+		$limit = array($offset, $per_page);
 
-		if ( isset( $this->_req_data['s'] ) ) {
-			$sstr = '%' . $this->_req_data['s'] . '%';
+		if (isset($this->_req_data['s'])) {
+			$sstr = '%'.$this->_req_data['s'].'%';
 			$_where['OR'] = array(
-				'TKT_name' => array('LIKE',$sstr ),
-				'TKT_description' => array('LIKE',$sstr )
+				'TKT_name' => array('LIKE', $sstr),
+				'TKT_description' => array('LIKE', $sstr)
 				);
 		}
 
@@ -1062,9 +1062,9 @@ 
 			'group_by'=>'TKT_ID'
 			);
 
-		if($count){
+		if ($count) {
 			return EEM_Ticket::instance()->count_deleted_and_undeleted(array($_where));
-		}else{
+		} else {
 			return EEM_Ticket::instance()->get_all_deleted_and_undeleted($query_params);
 		}
 
@@ -1074,35 +1074,35 @@ 
 
 
 
-	protected function _trash_or_restore_ticket(  $trash = FALSE ) {
+	protected function _trash_or_restore_ticket($trash = FALSE) {
 		$success = 1;
 
 		$TKT = EEM_Ticket::instance();
 
 		//checkboxes?
-		if ( !empty( $this->_req_data['checkbox'] ) && is_array( $this->_req_data['checkbox'] ) ) {
+		if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
 			//if array has more than one element then success message should be plural
-			$success = count( $this->_req_data['checkbox'] ) > 1 ? 2 : 1;
+			$success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
 
 			//cycle thru the boxes
-			while ( list( $TKT_ID, $value ) = each( $this->_req_data['checkbox'] ) ) {
-				if ( $trash ) {
-					if ( ! $TKT->delete_by_ID( $TKT_ID ) )
+			while (list($TKT_ID, $value) = each($this->_req_data['checkbox'])) {
+				if ($trash) {
+					if ( ! $TKT->delete_by_ID($TKT_ID))
 						$success = 0;
 				} else {
-					if ( ! $TKT->restore_by_ID( $TKT_ID ) )
+					if ( ! $TKT->restore_by_ID($TKT_ID))
 						$success = 0;
 				}
 			}
 		} else {
 			//grab single id and trash
-			$TKT_ID = absint( $this->_req_data['TKT_ID'] );
+			$TKT_ID = absint($this->_req_data['TKT_ID']);
 
-			if ( $trash ) {
-				if ( ! $TKT->delete_by_ID( $TKT_ID ) )
+			if ($trash) {
+				if ( ! $TKT->delete_by_ID($TKT_ID))
 					$success = 0;
 			} else {
-				if ( ! $TKT->restore_by_ID( $TKT_ID ) )
+				if ( ! $TKT->restore_by_ID($TKT_ID))
 					$success = 0;
 			}
 		}
@@ -1112,7 +1112,7 @@ 
 			'action' => 'ticket_list_table',
 			'status' => $trash ? '' : 'trashed'
 			);
-		$this->_redirect_after_action( $success, 'Tickets', $action_desc, $query_args );
+		$this->_redirect_after_action($success, 'Tickets', $action_desc, $query_args);
 	}
 
 
@@ -1125,21 +1125,21 @@ 
 		$TKT = EEM_Ticket::instance();
 
 		//checkboxes?
-		if ( !empty( $this->_req_data['checkbox'] ) && is_array( $this->_req_data['checkbox'] ) ) {
+		if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
 			//if array has more than one element then success message should be plural
-			$success = count( $this->_req_data['checkbox'] ) > 1 ? 2 : 1;
+			$success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
 
 			//cycle thru the boxes
-			while ( list( $TKT_ID, $value ) = each( $this->_req_data['checkbox'] ) ) {
+			while (list($TKT_ID, $value) = each($this->_req_data['checkbox'])) {
 				//delete
-				if ( ! $this->_delete_the_ticket( $TKT_ID ) ) {
+				if ( ! $this->_delete_the_ticket($TKT_ID)) {
 					$success = 0;
 				}
 			}
 		} else {
 			//grab single id and trash
-			$TKT_ID = absint( $this->_req_data['TKT_ID'] );
-			if ( ! $this->_delete_the_ticket( $TKT_ID ) ) {
+			$TKT_ID = absint($this->_req_data['TKT_ID']);
+			if ( ! $this->_delete_the_ticket($TKT_ID)) {
 					$success = 0;
 				}
 		}
@@ -1151,16 +1151,16 @@ 
 			);
 
 		//failsafe.  If the default ticket count === 1 then we need to redirect to event overview.
-		if ( EEM_Ticket::instance()->count_deleted_and_undeleted( array( array( 'TKT_is_default' => 1 ) ), 'TKT_ID', TRUE ) )
+		if (EEM_Ticket::instance()->count_deleted_and_undeleted(array(array('TKT_is_default' => 1)), 'TKT_ID', TRUE))
 			$query_args = array();
-		$this->_redirect_after_action( $success, 'Tickets', $action_desc, $query_args );
+		$this->_redirect_after_action($success, 'Tickets', $action_desc, $query_args);
 	}
 
 
 
 
-	protected function _delete_the_ticket( $TKT_ID ) {
-		$tkt = EEM_Ticket::instance()->get_one_by_ID( $TKT_ID );
+	protected function _delete_the_ticket($TKT_ID) {
+		$tkt = EEM_Ticket::instance()->get_one_by_ID($TKT_ID);
 		$tkt->_remove_relations('Datetime');
 		//delete all related prices first
 		$tkt->delete_related_permanently('Price');

Braces +44 added lines, -32 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -435,8 +436,9 @@ 
 		//k we've got EVT_ID so let's use that to get the event we'll duplicate
 		$orig_event = EEM_Event::instance()->get_one_by_ID( $this->_req_data['EVT_ID'] );
 
-		if ( ! $orig_event instanceof EE_Event )
-			throw new EE_Error( sprintf( __('An EE_Event object could not be retrieved for the given ID (%s)', 'event_espresso '), $this->_req_data['EVT_ID'] ) );
+		if ( ! $orig_event instanceof EE_Event ) {
+					throw new EE_Error( sprintf( __('An EE_Event object could not be retrieved for the given ID (%s)', 'event_espresso '), $this->_req_data['EVT_ID'] ) );
+		}
 
 		//k now let's clone the $orig_event before getting relations
 		$new_event = clone $orig_event;
@@ -510,8 +512,9 @@ 
 			//now let's get the ticket relations setup.
 			foreach ( (array) $orig_tkts as $orig_tkt ) {
 				//it's possible a datetime will have no tickets so let's verify we HAVE a ticket first.
-				if ( ! $orig_tkt instanceof EE_Ticket )
-					continue;
+				if ( ! $orig_tkt instanceof EE_Ticket ) {
+									continue;
+				}
 
 				//is this ticket archived?  If it is then let's skip
 				if ( $orig_tkt->get( 'TKT_deleted' ) ) {
@@ -620,9 +623,9 @@ 
 	protected function _events_export() {
 		if(isset($this->_req_data['EVT_ID'])){
 			$event_ids = $this->_req_data['EVT_ID'];
-		}elseif(isset($this->_req_data['EVT_IDs'])){
+		} elseif(isset($this->_req_data['EVT_IDs'])){
 			$event_ids = $this->_req_data['EVT_IDs'];
-		}else{
+		} else{
 			$event_ids = NULL;
 		}
 		//todo: I don't like doing this but it'll do until we modify EE_Export Class.
@@ -811,8 +814,9 @@ 
 
 		extract( wp_parse_args($args, $defaults), EXTR_SKIP );
 
-		if ( empty($walker) || !is_a($walker, 'Walker') )
-			$walker = new Walker_Radio_Checklist;
+		if ( empty($walker) || !is_a($walker, 'Walker') ) {
+					$walker = new Walker_Radio_Checklist;
+		}
 
 		$descendants_and_self = (int) $descendants_and_self;
 
@@ -821,17 +825,19 @@ 
 		$tax = get_taxonomy($taxonomy);
 		$args['disabled'] = !current_user_can($tax->cap->assign_terms);
 
-		if ( is_array( $selected_cats ) )
-			$args['selected_cats'] = $selected_cats;
-		elseif ( $post_id )
-			$args['selected_cats'] = wp_get_object_terms($post_id, $taxonomy, array_merge($args, array('fields' => 'ids')));
-		else
-			$args['selected_cats'] = array();
+		if ( is_array( $selected_cats ) ) {
+					$args['selected_cats'] = $selected_cats;
+		} elseif ( $post_id ) {
+					$args['selected_cats'] = wp_get_object_terms($post_id, $taxonomy, array_merge($args, array('fields' => 'ids')));
+		} else {
+					$args['selected_cats'] = array();
+		}
 
-		if ( is_array( $popular_cats ) )
-			$args['popular_cats'] = $popular_cats;
-		else
-			$args['popular_cats'] = get_terms( $taxonomy, array( 'fields' => 'ids', 'orderby' => 'count', 'order' => 'DESC', 'number' => 10, 'hierarchical' => false ) );
+		if ( is_array( $popular_cats ) ) {
+					$args['popular_cats'] = $popular_cats;
+		} else {
+					$args['popular_cats'] = get_terms( $taxonomy, array( 'fields' => 'ids', 'orderby' => 'count', 'order' => 'DESC', 'number' => 10, 'hierarchical' => false ) );
+		}
 
 		if ( $descendants_and_self ) {
 			$categories = (array) get_terms($taxonomy, array( 'child_of' => $descendants_and_self, 'hierarchical' => 0, 'hide_empty' => 0 ) );
@@ -884,8 +890,9 @@ 
 		$status = isset( $this->_req_data['status'] ) ? $this->_req_data['status'] : NULL;
 
 		//active status dropdown
-		if ( $status !== 'draft' )
-			$filter[] = $this->active_status_dropdown( isset( $this->_req_data['active_status'] ) ? $this->_req_data['active_status'] : '' );
+		if ( $status !== 'draft' ) {
+					$filter[] = $this->active_status_dropdown( isset( $this->_req_data['active_status'] ) ? $this->_req_data['active_status'] : '' );
+		}
 
 		//category filter
 		$filters[] = $this->category_dropdown();
@@ -1064,7 +1071,7 @@ 
 
 		if($count){
 			return EEM_Ticket::instance()->count_deleted_and_undeleted(array($_where));
-		}else{
+		} else{
 			return EEM_Ticket::instance()->get_all_deleted_and_undeleted($query_params);
 		}
 
@@ -1087,11 +1094,13 @@ 
 			//cycle thru the boxes
 			while ( list( $TKT_ID, $value ) = each( $this->_req_data['checkbox'] ) ) {
 				if ( $trash ) {
-					if ( ! $TKT->delete_by_ID( $TKT_ID ) )
-						$success = 0;
+					if ( ! $TKT->delete_by_ID( $TKT_ID ) ) {
+											$success = 0;
+					}
 				} else {
-					if ( ! $TKT->restore_by_ID( $TKT_ID ) )
-						$success = 0;
+					if ( ! $TKT->restore_by_ID( $TKT_ID ) ) {
+											$success = 0;
+					}
 				}
 			}
 		} else {
@@ -1099,11 +1108,13 @@ 
 			$TKT_ID = absint( $this->_req_data['TKT_ID'] );
 
 			if ( $trash ) {
-				if ( ! $TKT->delete_by_ID( $TKT_ID ) )
-					$success = 0;
+				if ( ! $TKT->delete_by_ID( $TKT_ID ) ) {
+									$success = 0;
+				}
 			} else {
-				if ( ! $TKT->restore_by_ID( $TKT_ID ) )
-					$success = 0;
+				if ( ! $TKT->restore_by_ID( $TKT_ID ) ) {
+									$success = 0;
+				}
 			}
 		}
 
@@ -1151,8 +1162,9 @@ 
 			);
 
 		//failsafe.  If the default ticket count === 1 then we need to redirect to event overview.
-		if ( EEM_Ticket::instance()->count_deleted_and_undeleted( array( array( 'TKT_is_default' => 1 ) ), 'TKT_ID', TRUE ) )
-			$query_args = array();
+		if ( EEM_Ticket::instance()->count_deleted_and_undeleted( array( array( 'TKT_is_default' => 1 ) ), 'TKT_ID', TRUE ) ) {
+					$query_args = array();
+		}
 		$this->_redirect_after_action( $success, 'Tickets', $action_desc, $query_args );
 	}
 

admin_pages/registrations/templates/attendee_registrations_main_meta_box.template.php

Spacing +18 added lines, -18 removed lines

@@ -5,42 +5,42 @@
 		<table class="admin-primary-mbox-tbl">
 			<thead>
 				<tr>
-					<th class="jst-left"><?php _e( 'Event Name', 'event_espresso' );?></th>
-					<th class="jst-left"><?php _e( 'REG ID', 'event_espresso' );?></th>
-					<th class="jst-left"><?php _e( 'TXN ID', 'event_espresso' );?></th>
-					<th class="jst-left"><?php _e( 'Reg Code', 'event_espresso' );?></th>
-					<th class="jst-rght"><?php _e( 'Ticket Price', 'event_espresso' );?></th>
+					<th class="jst-left"><?php _e('Event Name', 'event_espresso'); ?></th>
+					<th class="jst-left"><?php _e('REG ID', 'event_espresso'); ?></th>
+					<th class="jst-left"><?php _e('TXN ID', 'event_espresso'); ?></th>
+					<th class="jst-left"><?php _e('Reg Code', 'event_espresso'); ?></th>
+					<th class="jst-rght"><?php _e('Ticket Price', 'event_espresso'); ?></th>
 				</tr>
 			</thead>
 			<tbody>
-			<?php foreach( $registrations as $registration ) : ?>
+			<?php foreach ($registrations as $registration) : ?>
 				<tr>
 					<td class="jst-left">
 					<?php
-						$event_url = add_query_arg( array( 'action' => 'edit', 'post' => $registration->event_ID() ), admin_url( 'admin.php?page=espresso_events' ));
-						echo EE_Registry::instance()->CAP->current_user_can( 'ee_edit_event', 'espresso_events_edit', $registration->event_ID() ) ?  '<a href="'. $event_url .'"  title="'. esc_attr__( 'Edit Event', 'event_espresso' ) .'">' . $registration->event_name() . '</a>' : $registration->event_name();
+						$event_url = add_query_arg(array('action' => 'edit', 'post' => $registration->event_ID()), admin_url('admin.php?page=espresso_events'));
+						echo EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'espresso_events_edit', $registration->event_ID()) ? '<a href="'.$event_url.'"  title="'.esc_attr__('Edit Event', 'event_espresso').'">'.$registration->event_name().'</a>' : $registration->event_name();
 					?>
 					</td>
 					<td class="jst-left">
 					<?php
-							$reg_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_registration', '_REG_ID'=>$registration->ID() ), REG_ADMIN_URL );
-							echo EE_Registry::instance()->CAP->current_user_can( 'ee_read_registration', 'espresso_registrations_view_registration', $registration->ID() ) ? '
-							<a href="'.$reg_url.'" title="' . esc_attr__( 'View Registration Details', 'event_espresso' ) . '">' . 
-								sprintf( __( 'View Registration ', 'event_espresso'), $registration->ID() ) .
+							$reg_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_registration', '_REG_ID'=>$registration->ID()), REG_ADMIN_URL);
+							echo EE_Registry::instance()->CAP->current_user_can('ee_read_registration', 'espresso_registrations_view_registration', $registration->ID()) ? '
+							<a href="'.$reg_url.'" title="'.esc_attr__('View Registration Details', 'event_espresso').'">'. 
+								sprintf(__('View Registration ', 'event_espresso'), $registration->ID()).
 							'</a>' : '';
 					?>
 					</td>
 					<td class="jst-left">
 					<?php
-						$txn_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_transaction', 'TXN_ID'=>$registration->transaction_ID() ), TXN_ADMIN_URL );
-						echo EE_Registry::instance()->CAP->current_user_can( 'ee_read_transaction', 'espresso_transactions_view_transaction' ) ? '
-						<a href="'.$txn_url.'" title="' . esc_attr__( 'View Transaction Details', 'event_espresso' ) . '">
-							View Transaction ' . $registration->transaction_ID() . '
+						$txn_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_transaction', 'TXN_ID'=>$registration->transaction_ID()), TXN_ADMIN_URL);
+						echo EE_Registry::instance()->CAP->current_user_can('ee_read_transaction', 'espresso_transactions_view_transaction') ? '
+						<a href="'.$txn_url.'" title="'.esc_attr__('View Transaction Details', 'event_espresso').'">
+							View Transaction ' . $registration->transaction_ID().'
 						</a>' : '';
 					?>
 					</td>
-					<td class="jst-left"><?php echo $registration->reg_code();?></td>
-					<td class="jst-rght"><?php echo EEH_Template::format_currency( $registration->final_price() );?></td>
+					<td class="jst-left"><?php echo $registration->reg_code(); ?></td>
+					<td class="jst-rght"><?php echo EEH_Template::format_currency($registration->final_price()); ?></td>
 				</tr>
 			<?php endforeach; ?>
 			</tbody>

caffeinated/admin/extend/events/help_tabs/import_page.help_tab.php

Spacing +8 added lines, -8 removed lines

@@ -2,18 +2,18 @@
 <p>
 <?php _e('The importer can be used to import event information into Event Espresso using a CSV file.', 'event_espresso'); ?>
 </p>
-<h3><?php _e("Importing from other Event Espresso 4 Sites", 'event_espresso');?></h3>
+<h3><?php _e("Importing from other Event Espresso 4 Sites", 'event_espresso'); ?></h3>
 <p>
 <?php _e('To import Event Espresso data from another Event Espresso 4 install, export a CSV file from the admin Events overview page, or anywhere you can generate a CSV export file from. Then upload that file here (regardless of what type of information was exported).', 'event_espresso'); ?>
 </p>
 <p>
 <?php _e('Note: its possible that data from the other site have the same IDs as data in this site. The importer recognizes that this data is from a different database and inserts new items for each item in the CSV file, regardless of whether its ID matches that of an item in this site\'s database or not. However, the importer also remembers the mapping from the old site\'s database to this site\'s database, and on subsequent CSV importers from that site, the data in this database will be updated instead of re-inserting new items.', 'event_espresso'); ?>
 </p>
-<h3><?php _e("Importing from this Site", 'event_espresso');?></h3>
-<p><?php _e("You may want to export data from this site, modify it (or modify the database), and re-import it. When this is done, the importer recognizes that the data is from this site\'s database and updates the records (instead of inserting new items like it would have, had the CSV data been from a different site).", 'event_espresso');?></p>
+<h3><?php _e("Importing from this Site", 'event_espresso'); ?></h3>
+<p><?php _e("You may want to export data from this site, modify it (or modify the database), and re-import it. When this is done, the importer recognizes that the data is from this site\'s database and updates the records (instead of inserting new items like it would have, had the CSV data been from a different site).", 'event_espresso'); ?></p>
 
-	<h3><?php _e("Notes about Generating your own CSV Import Files", "event_espresso");?></h3>
-	<p><?php _e("If you think you could save time entering data into a CSV file, you can use the sample import file below. Note that creating your own CSV file is more complicated than in Event Espresso 3.1 because of the more advanced data structure, and so we recommend creating/editing your events using the normal web-interface.", "event_espresso");?></p>
-	<p><?php _e("The export file is just an export of an event, or if you do not have any events in your system, it will only contain column headers. Do not change those column headers. Add as many rows as you like. ", "event_espresso");?></p>
-	<p><?php _e("In the ID columns (columns ending in '_ID'), you should enter 'temporary IDs', which are unique numbers/words that identify that item, which can be used later when you want to refer to that item. (For example, if you assign an event's EVT_ID to be a temporary id of 'my-event-1', then use that same phrase 'my-event-1' to refer to that event in the Datetime model's EVT_ID column)", "event_espresso");?></p>
-	<p><?php _e("Also note, you do NOT have to enter info in for each model. (You can, for example, only enter in Term_Taxonomies and Term model data)", "event_espresso");?></p>
\ No newline at end of file
+	<h3><?php _e("Notes about Generating your own CSV Import Files", "event_espresso"); ?></h3>
+	<p><?php _e("If you think you could save time entering data into a CSV file, you can use the sample import file below. Note that creating your own CSV file is more complicated than in Event Espresso 3.1 because of the more advanced data structure, and so we recommend creating/editing your events using the normal web-interface.", "event_espresso"); ?></p>
+	<p><?php _e("The export file is just an export of an event, or if you do not have any events in your system, it will only contain column headers. Do not change those column headers. Add as many rows as you like. ", "event_espresso"); ?></p>
+	<p><?php _e("In the ID columns (columns ending in '_ID'), you should enter 'temporary IDs', which are unique numbers/words that identify that item, which can be used later when you want to refer to that item. (For example, if you assign an event's EVT_ID to be a temporary id of 'my-event-1', then use that same phrase 'my-event-1' to refer to that event in the Datetime model's EVT_ID column)", "event_espresso"); ?></p>
+	<p><?php _e("Also note, you do NOT have to enter info in for each model. (You can, for example, only enter in Term_Taxonomies and Term model data)", "event_espresso"); ?></p>
\ No newline at end of file

core/admin/EE_Admin_Hooks.core.php

Spacing +105 added lines, -105 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -209,7 +209,7 @@ 
 	 * constructor
 	 * @param EE_Admin_Page $admin_page the calling admin_page_object
 	 */
-	public function __construct( EE_Admin_Page $adminpage ) {
+	public function __construct(EE_Admin_Page $adminpage) {
 
 		$this->_adminpage_obj = $adminpage;
 		$this->_req_data = array_merge($_GET, $_POST);
@@ -217,11 +217,11 @@ 
 		$this->_set_hooks_properties();
 
 		//first let's verify we're on the right page
-		if ( !isset( $this->_req_data['page'] ) || ( isset( $this->_req_data['page'] ) && $this->_adminpage_obj->page_slug != $this->_req_data['page'] ) )
+		if ( ! isset($this->_req_data['page']) || (isset($this->_req_data['page']) && $this->_adminpage_obj->page_slug != $this->_req_data['page']))
 			return; //get out nothing more to be done here.
 
 		//allow for extends to modify properties
-		if ( method_exists( $this, '_extend_properties' ) )
+		if (method_exists($this, '_extend_properties'))
 			$this->_extend_properties();
 
 		$this->_set_page_object();
@@ -229,9 +229,9 @@ 
 		$this->_load_custom_methods();
 		$this->_load_routed_hooks();
 
-		add_action( 'admin_enqueue_scripts', array($this, 'enqueue_scripts_styles' ) );
-		add_action( 'admin_enqueue_scripts', array($this, 'add_metaboxes'), 20 );
-		add_action( 'admin_enqueue_scripts', array($this, 'remove_metaboxes'), 15 );
+		add_action('admin_enqueue_scripts', array($this, 'enqueue_scripts_styles'));
+		add_action('admin_enqueue_scripts', array($this, 'add_metaboxes'), 20);
+		add_action('admin_enqueue_scripts', array($this, 'remove_metaboxes'), 15);
 
 		$this->_ajax_hooks();
 
@@ -272,15 +272,15 @@ 
 	 */
 	public function enqueue_scripts_styles() {
 
-		if ( !empty( $this->_scripts_styles ) ) {
+		if ( ! empty($this->_scripts_styles)) {
 			//first let's do all the registrations
-			if ( !isset($this->_scripts_styles['registers'] ) ) {
+			if ( ! isset($this->_scripts_styles['registers'])) {
 				$msg[] = __('There is no "registers" index in the <code>$this->_scripts_styles</code> property.', 'event_espresso');
-				$msg[] = sprintf ( __('Make sure you read the phpdoc comments above the definition of the $_scripts_styles property in the <code>EE_Admin_Hooks</code> class and modify according in the %s child', 'event_espresso'), '<strong>' . $this->caller . '</strong>' );
-				throw new EE_Error( implode( '||', $msg ) );
+				$msg[] = sprintf(__('Make sure you read the phpdoc comments above the definition of the $_scripts_styles property in the <code>EE_Admin_Hooks</code> class and modify according in the %s child', 'event_espresso'), '<strong>'.$this->caller.'</strong>');
+				throw new EE_Error(implode('||', $msg));
 			}
 
-			foreach( $this->_scripts_styles['registers'] as $ref => $details ) {
+			foreach ($this->_scripts_styles['registers'] as $ref => $details) {
 				$defaults = array(
 					'type' => 'js',
 					'url' => '',
@@ -289,48 +289,48 @@ 
 					'footer' => TRUE
 					);
 				$details = wp_parse_args($details, $defaults);
-				extract( $details );
+				extract($details);
 
 				//let's make sure that we set the 'registers' type if it's not set! We need it later to determine whhich enqueu we do
 				$this->_scripts_styles['registers'][$ref]['type'] = $type;
 
 				//let's make sure we're not missing any REQUIRED parameters
-				if ( empty($url) ) {
-					$msg[] = sprintf( __('Missing the url for the requested %s', 'event_espresso'), $type == 'js' ? 'script' : 'stylesheet' );
-					$msg[] = sprintf( __('Doublecheck your <code>$this->_scripts_styles</code> array in %s and make sure that there is a "url" set for the %s ref', 'event_espresso'), '<strong>' . $this->caller . '</strong>', $ref );
-					throw new EE_Error( implode( '||', $msg ) );
+				if (empty($url)) {
+					$msg[] = sprintf(__('Missing the url for the requested %s', 'event_espresso'), $type == 'js' ? 'script' : 'stylesheet');
+					$msg[] = sprintf(__('Doublecheck your <code>$this->_scripts_styles</code> array in %s and make sure that there is a "url" set for the %s ref', 'event_espresso'), '<strong>'.$this->caller.'</strong>', $ref);
+					throw new EE_Error(implode('||', $msg));
 				}
 				//made it here so let's do the appropriate registration
-				$type == 'js' ? wp_register_script( $ref, $url, $depends, $version, $footer ) : wp_register_style( $ref, $url, $depends, $version );
+				$type == 'js' ? wp_register_script($ref, $url, $depends, $version, $footer) : wp_register_style($ref, $url, $depends, $version);
 			}
 
 			//k now lets do the enqueues
-			if( !isset( $this->_scripts_styles['enqueues'] ) )
-				return;  //not sure if we should throw an error here or not.
-			foreach( $this->_scripts_styles['enqueues'] as $ref => $routes ) {
+			if ( ! isset($this->_scripts_styles['enqueues']))
+				return; //not sure if we should throw an error here or not.
+			foreach ($this->_scripts_styles['enqueues'] as $ref => $routes) {
 				//make sure $routes is an array
 				$routes = (array) $routes;
 
-				if ( in_array($this->_current_route, $routes ) ) {
+				if (in_array($this->_current_route, $routes)) {
 					$this->_scripts_styles['registers'][$ref]['type'] == 'js' ? wp_enqueue_script($ref) : wp_enqueue_style($ref);
 					//if we have a localization for the script let's do that too.
-					if ( isset( $this->_scripts_styles['localize'][$ref] ) ) {
-						foreach ( $this->_scripts_styles['localize'][$ref] as $object_name => $indexes ) {
-							wp_localize_script($ref, $object_name , $this->_scripts_styles['localize'][$ref][$object_name] );
+					if (isset($this->_scripts_styles['localize'][$ref])) {
+						foreach ($this->_scripts_styles['localize'][$ref] as $object_name => $indexes) {
+							wp_localize_script($ref, $object_name, $this->_scripts_styles['localize'][$ref][$object_name]);
 						}
 					}
 				}
 			}
 
 			//let's do the deregisters
-			if ( !isset( $this->_scripts_styles['deregisters'] ) )
+			if ( ! isset($this->_scripts_styles['deregisters']))
 				return;
-			foreach ( $this->_scripts_styles['deregisters'] as $ref => $details ) {
+			foreach ($this->_scripts_styles['deregisters'] as $ref => $details) {
 				$defaults = array(
 					'type' => 'js'
 					);
-				$details = wp_parse_args( $details, $defaults );
-				extract( $details );
+				$details = wp_parse_args($details, $defaults);
+				extract($details);
 
 				$type == 'js' ? wp_deregister_script($ref) : wp_deregister_style($ref);
 
@@ -349,7 +349,7 @@ 
 	 */
 	private function _set_defaults() {
 		$this->_ajax_func = $this->_init_func = $this->_metaboxes = $this->_scripts = $this->_styles = $this->_wp_action_filters_priority = array();
-		$this->_current_route = isset( $_REQUEST['action'] ) ? $_REQUEST['action'] : 'default';
+		$this->_current_route = isset($_REQUEST['action']) ? $_REQUEST['action'] : 'default';
 		$this->caller = get_class($this);
 		$this->_extend = stripos($this->caller, 'Extend') ? TRUE : FALSE;
 	}
@@ -364,34 +364,34 @@ 
 	 */
 	protected function _set_page_object() {
 		//first make sure $this->_name is set
-		if ( empty( $this->_name ) ) {
+		if (empty($this->_name)) {
 			$msg[] = __('We can\'t load the page object', 'event_espresso');
-			$msg[] = sprintf( __("This is because the %s child class has not set the '_name' property", 'event_espresso'), $this->caller );
-			throw new EE_Error( implode( '||', $msg ) );
+			$msg[] = sprintf(__("This is because the %s child class has not set the '_name' property", 'event_espresso'), $this->caller);
+			throw new EE_Error(implode('||', $msg));
 		}
 
-		$ref = str_replace('_' , ' ', $this->_name); //take the_message -> the message
-		$ref = str_replace(' ', '_', ucwords($ref) ) . '_Admin_Page'; //take the message -> The_Message
+		$ref = str_replace('_', ' ', $this->_name); //take the_message -> the message
+		$ref = str_replace(' ', '_', ucwords($ref)).'_Admin_Page'; //take the message -> The_Message
 
 		//first default file (if exists)
-		$decaf_file = EE_ADMIN_PAGES . $this->_name . DS . $ref . '.core.php';
-		if ( is_readable( $decaf_file ) )
-		require_once( $decaf_file );
+		$decaf_file = EE_ADMIN_PAGES.$this->_name.DS.$ref.'.core.php';
+		if (is_readable($decaf_file))
+		require_once($decaf_file);
 
 		//now we have to do require for extended file (if needed)
-		if ( $this->_extend ) {
-			require_once( EE_CORE_CAF_ADMIN_EXTEND . $this->_name . DS . 'Extend_' . $ref . '.core.php' );
+		if ($this->_extend) {
+			require_once(EE_CORE_CAF_ADMIN_EXTEND.$this->_name.DS.'Extend_'.$ref.'.core.php');
 		}
 
 
 		//if we've got an extended class we use that!
-		$ref = $this->_extend ? 'Extend_' . $ref : $ref;
+		$ref = $this->_extend ? 'Extend_'.$ref : $ref;
 
 		//let's make sure the class exists
-		if ( !class_exists( $ref ) ) {
+		if ( ! class_exists($ref)) {
 			$msg[] = __('We can\'t load the page object', 'event_espresso');
-			$msg[] = sprintf( __('The class name that was given is %s. Check the spelling and make sure its correct, also there needs to be an autoloader setup for the class', 'event_espresso'), $ref );
-			throw new EE_Error( implode( '||', $msg ) );
+			$msg[] = sprintf(__('The class name that was given is %s. Check the spelling and make sure its correct, also there needs to be an autoloader setup for the class', 'event_espresso'), $ref);
+			throw new EE_Error(implode('||', $msg));
 		}
 
 		$a = new ReflectionClass($ref);
@@ -416,27 +416,27 @@ 
 		$method_callback = $this->_current_route == 'default' ? 'default_callback' : $this->_current_route;
 
 		//these run before the Admin_Page route executes.
-		if ( method_exists( $this, $method_callback ) ) {
-			call_user_func( array( $this, $method_callback) );
+		if (method_exists($this, $method_callback)) {
+			call_user_func(array($this, $method_callback));
 		}
 
 
 		//these run via the _redirect_after_action method in EE_Admin_Page which usually happens after non_UI methods in EE_Admin_Page classes.  There are two redirect actions, the first fires before $query_args might be manipulated by "save and close" actions and the seond fires right before the actual redirect happens.
 		//first the actions
 		//note that these action hooks will have the $query_args value available.
-		$admin_class_name = get_class( $this->_adminpage_obj );
+		$admin_class_name = get_class($this->_adminpage_obj);
 
-		if ( method_exists( $this, '_redirect_action_early_' . $this->_current_route ) ) {
-			add_action( 'AHEE__' . $admin_class_name . '___redirect_after_action__before_redirect_modification_' . $this->_current_route, array( $this, '_redirect_action_early_' . $this->_current_route ), 10 );
+		if (method_exists($this, '_redirect_action_early_'.$this->_current_route)) {
+			add_action('AHEE__'.$admin_class_name.'___redirect_after_action__before_redirect_modification_'.$this->_current_route, array($this, '_redirect_action_early_'.$this->_current_route), 10);
 		}
 
-		if ( method_exists( $this, '_redirect_action_' . $this->_current_route ) ) {
-			add_action( 'AHEE_redirect_' . $admin_class_name . $this->_current_route, array( $this, '_redirect_action_' . $this->_current_route ), 10 );
+		if (method_exists($this, '_redirect_action_'.$this->_current_route)) {
+			add_action('AHEE_redirect_'.$admin_class_name.$this->_current_route, array($this, '_redirect_action_'.$this->_current_route), 10);
 		}
 
 		//let's hook into the _redirect itself and allow for changing where the user goes after redirect.  This will have $query_args and $redirect_url available.
-		if ( method_exists( $this, '_redirect_filter_' . $this->_current_route ) ) {
-			add_filter( 'FHEE_redirect_' . $admin_class_name . $this->_current_route, array( $this, '_redirect_filter_' . $this->_current_route ), 10, 2 );
+		if (method_exists($this, '_redirect_filter_'.$this->_current_route)) {
+			add_filter('FHEE_redirect_'.$admin_class_name.$this->_current_route, array($this, '_redirect_filter_'.$this->_current_route), 10, 2);
 		}
 
 	}
@@ -459,12 +459,12 @@ 
 				'argnum' => 1,
 				'priority' => 10
 				),
-			'FHEE_list_table_views_' . $this->_adminpage_obj->page_slug . '_' . $this->_current_route => array(
+			'FHEE_list_table_views_'.$this->_adminpage_obj->page_slug.'_'.$this->_current_route => array(
 				'type' => 'filter',
 				'argnum' => 1,
 				'priority' => 10
 				),
-			'FHEE_list_table_views_' . $this->_adminpage_obj->page_slug => array(
+			'FHEE_list_table_views_'.$this->_adminpage_obj->page_slug => array(
 				'type' => 'filter',
 				'argnum' => 1,
 				'priority' => 10
@@ -483,14 +483,14 @@ 
 
 
 
-		foreach ( $hook_filter_array as $hook => $args ) {
-			if ( method_exists( $this, $this->_current_route . '_' . $hook ) ) {
-				if ( isset( $this->_wp_action_filters_priority[$hook] ) )
+		foreach ($hook_filter_array as $hook => $args) {
+			if (method_exists($this, $this->_current_route.'_'.$hook)) {
+				if (isset($this->_wp_action_filters_priority[$hook]))
 					$args['priority'] = $this->_wp_action_filters_priority[$hook];
-				if ( $args['type'] == 'action' )
-					add_action( $hook, array( $this, $this->_current_route . '_' . $hook ), $args['priority'], $args['argnum'] );
+				if ($args['type'] == 'action')
+					add_action($hook, array($this, $this->_current_route.'_'.$hook), $args['priority'], $args['argnum']);
 				else
-					add_filter( $hook, array( $this, $this->_current_route . '_' . $hook ), $args['priority'], $args['argnum'] );
+					add_filter($hook, array($this, $this->_current_route.'_'.$hook), $args['priority'], $args['argnum']);
 			}
 		}
 
@@ -503,18 +503,18 @@ 
 	 */
 	private function _ajax_hooks() {
 
-		if ( empty( $this->_ajax_func) )
+		if (empty($this->_ajax_func))
 			return; //get out there's nothing to take care of.
 
-		foreach ( $this->_ajax_func as $action => $method ) {
+		foreach ($this->_ajax_func as $action => $method) {
 			//make sure method exists
-			if ( !method_exists($this, $method) ) {
-				$msg[] = __('There is no corresponding method for the hook labeled in the _ajax_func array', 'event_espresso') . '<br />';
-				$msg[] = sprintf( __('The method name given in the array is %s, check the spelling and make sure it exists in the %s class', 'event_espresso' ), $method, $this->caller );
-				throw new EE_Error( implode('||', $msg ) );
+			if ( ! method_exists($this, $method)) {
+				$msg[] = __('There is no corresponding method for the hook labeled in the _ajax_func array', 'event_espresso').'<br />';
+				$msg[] = sprintf(__('The method name given in the array is %s, check the spelling and make sure it exists in the %s class', 'event_espresso'), $method, $this->caller);
+				throw new EE_Error(implode('||', $msg));
 			}
 
-			add_action('wp_ajax_' . $action, array( $this, $method ) );
+			add_action('wp_ajax_'.$action, array($this, $method));
 		}
 
 	}
@@ -527,21 +527,21 @@ 
 	 * @return void
 	 */
 	protected function _init_hooks() {
-		if ( empty( $this->_init_func) )
+		if (empty($this->_init_func))
 			return; //get out there's nothing to take care of.
 
 		//We need to determine what page_route we are on!
-		$current_route = isset ( $_REQUEST['action'] ) ? $_REQUEST['action'] : 'default';
+		$current_route = isset ($_REQUEST['action']) ? $_REQUEST['action'] : 'default';
 
-		foreach ( $this->_init_func as $route => $method ) {
+		foreach ($this->_init_func as $route => $method) {
 			//make sure method exists
-			if ( !method_exists($this, $method) ) {
-				$msg[] = __('There is no corresponding method for the hook labeled in the _init_func array', 'event_espresso') . '<br />';
-				$msg[] = sprintf( __('The method name given in the array is %s, check the spelling and make sure it exists in the %s class', 'event_espresso' ), $method, $this->caller );
-				throw new EE_Error( implode('||', $msg ) );
+			if ( ! method_exists($this, $method)) {
+				$msg[] = __('There is no corresponding method for the hook labeled in the _init_func array', 'event_espresso').'<br />';
+				$msg[] = sprintf(__('The method name given in the array is %s, check the spelling and make sure it exists in the %s class', 'event_espresso'), $method, $this->caller);
+				throw new EE_Error(implode('||', $msg));
 			}
-			if ( $route == $this->_current_route )
-				add_action('admin_init', array( $this, $method ) );
+			if ($route == $this->_current_route)
+				add_action('admin_init', array($this, $method));
 		}
 
 	}
@@ -556,28 +556,28 @@ 
 	 * @return void
 	 */
 	public function add_metaboxes() {
-		if ( empty( $this->_metaboxes ) )
+		if (empty($this->_metaboxes))
 			return; //get out we don't have any metaboxes to set for this connection
 
-		$this->_handle_metabox_array( $this->_metaboxes );
+		$this->_handle_metabox_array($this->_metaboxes);
 
 	}
 
 
 
-	private function _handle_metabox_array( $boxes, $add = TRUE ) {
+	private function _handle_metabox_array($boxes, $add = TRUE) {
 
-		foreach ( $boxes as $box ) {
-			if ( !isset($box['page_route']) )
+		foreach ($boxes as $box) {
+			if ( ! isset($box['page_route']))
 				continue; //we dont' have a valid array
 
 			//let's make sure $box['page_route'] is an array so the "foreach" will work.
 			$box['page_route'] = (array) $box['page_route'];
 
-			foreach ( $box['page_route'] as $route ) {
-				if ( $route != $this->_current_route )
+			foreach ($box['page_route'] as $route) {
+				if ($route != $this->_current_route)
 					continue; //get out we only add metaboxes for set route.
-				if ( $add )
+				if ($add)
 					$this->_add_metabox($box);
 				else
 					$this->_remove_metabox($box);
@@ -595,10 +595,10 @@ 
 	 */
 	public function remove_metaboxes() {
 
-		if ( empty( $this->_remove_metaboxes ) )
+		if (empty($this->_remove_metaboxes))
 			return; //get out there are no metaboxes to remove
 
-		$this->_handle_metabox_array( $this->_remove_metaboxes, FALSE );
+		$this->_handle_metabox_array($this->_remove_metaboxes, FALSE);
 	}
 
 
@@ -608,53 +608,53 @@ 
 	 * @access private
 	 * @param array $args an array of args that have been set for this metabox by the child class
 	 */
-	private function _add_metabox( $args ) {
+	private function _add_metabox($args) {
 		$current_screen = get_current_screen();
-		$screen_id = is_object( $current_screen ) ? $current_screen->id : NULL;
-		$func = isset( $args['func'] ) ? $args['func'] : 'some_invalid_callback';
+		$screen_id = is_object($current_screen) ? $current_screen->id : NULL;
+		$func = isset($args['func']) ? $args['func'] : 'some_invalid_callback';
 
 		//set defaults
 		$defaults = array(
 			'func' => $func,
-			'id' => $this->caller . '_' . $func . '_metabox',
+			'id' => $this->caller.'_'.$func.'_metabox',
 			'priority' => 'default',
 			'label' => $this->caller,
 			'context' => 'advanced',
 			'callback_args' => array(),
-			'page' => isset( $args['page'] ) ? $args['page'] : $screen_id
+			'page' => isset($args['page']) ? $args['page'] : $screen_id
 			);
 
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 		extract($args);
 
 
 		//make sure method exists
-		if ( !method_exists($this, $func) ) {
-			$msg[] = __('There is no corresponding method to display the metabox content', 'event_espresso') . '<br />';
-			$msg[] = sprintf( __('The method name given in the array is %s, check the spelling and make sure it exists in the %s class', 'event_espresso' ), $func, $this->caller );
-			throw new EE_Error( implode('||', $msg ) );
+		if ( ! method_exists($this, $func)) {
+			$msg[] = __('There is no corresponding method to display the metabox content', 'event_espresso').'<br />';
+			$msg[] = sprintf(__('The method name given in the array is %s, check the spelling and make sure it exists in the %s class', 'event_espresso'), $func, $this->caller);
+			throw new EE_Error(implode('||', $msg));
 		}
 
 		//everything checks out so lets add the metabox
-		add_meta_box( $id, $label, array( $this, $func ), $page, $context, $priority, $callback_args);
+		add_meta_box($id, $label, array($this, $func), $page, $context, $priority, $callback_args);
 	}
 
 
 
-	private function _remove_metabox( $args ) {
+	private function _remove_metabox($args) {
 		$current_screen = get_current_screen();
-		$screen_id = is_object( $current_screen ) ? $current_screen->id : NULL;
-		$func = isset( $args['func'] ) ? $args['func'] : 'some_invalid_callback';
+		$screen_id = is_object($current_screen) ? $current_screen->id : NULL;
+		$func = isset($args['func']) ? $args['func'] : 'some_invalid_callback';
 
 		//set defaults
 		$defaults = array(
-			'id' => isset( $args['id'] ) ? $args['id'] : $this->_current_route . '_' . $this->caller . '_' . $func . '_metabox',
+			'id' => isset($args['id']) ? $args['id'] : $this->_current_route.'_'.$this->caller.'_'.$func.'_metabox',
 			'context' => 'default',
-			'screen' => isset( $args['screen'] ) ? $args['screen'] : $screen_id
+			'screen' => isset($args['screen']) ? $args['screen'] : $screen_id
 		);
 
-		$args = wp_parse_args( $args, $defaults );
-		extract( $args );
+		$args = wp_parse_args($args, $defaults);
+		extract($args);
 
 		//everything checks out so lets remove the box!
 		remove_meta_box($id, $screen, $context);

core/business/EE_Transaction_Processor.class.php

Spacing +106 added lines, -106 removed lines

@@ -1,5 +1,5 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
-EE_Registry::instance()->load_class( 'Processor_Base' );
+EE_Registry::instance()->load_class('Processor_Base');
 
 /**
  * Class EE_Transaction_Processor
@@ -50,10 +50,10 @@ 
 	 * @param array $registration_query_params
 	 *@return EE_Transaction_Processor instance
 	 */
-	public static function instance( $registration_query_params = array() ) {
+	public static function instance($registration_query_params = array()) {
 		// check if class object is instantiated
-		if ( ! self::$_instance instanceof EE_Transaction_Processor ) {
-			self::$_instance = new self( $registration_query_params );
+		if ( ! self::$_instance instanceof EE_Transaction_Processor) {
+			self::$_instance = new self($registration_query_params);
 		}
 		return self::$_instance;
 	}
@@ -64,9 +64,9 @@ 
 	 * @param array $registration_query_params
 	 * @return EE_Transaction_Processor
 	 */
-	private function __construct( $registration_query_params = array() ) {
+	private function __construct($registration_query_params = array()) {
 		// make sure some query params are set for retrieving registrations
-		$this->_set_registration_query_params( $registration_query_params );
+		$this->_set_registration_query_params($registration_query_params);
 	}
 
 
@@ -75,8 +75,8 @@ 
 	 * @access private
 	 * @param array $registration_query_params
 	 */
-	private function _set_registration_query_params( $registration_query_params ) {
-		$this->_registration_query_params = ! empty( $registration_query_params ) ? $registration_query_params : array( 'order_by' => array( 'REG_count' => 'ASC' ));
+	private function _set_registration_query_params($registration_query_params) {
+		$this->_registration_query_params = ! empty($registration_query_params) ? $registration_query_params : array('order_by' => array('REG_count' => 'ASC'));
 	}
 
 
@@ -93,9 +93,9 @@ 
 	/**
 	 * @param string $old_txn_status
 	 */
-	public function set_old_txn_status( $old_txn_status ) {
+	public function set_old_txn_status($old_txn_status) {
 		// only set the first time
-		if ( $this->_old_txn_status === null ) {
+		if ($this->_old_txn_status === null) {
 			$this->_old_txn_status = $old_txn_status;
 		}
 	}
@@ -114,7 +114,7 @@ 
 	/**
 	 * @param string $new_txn_status
 	 */
-	public function set_new_txn_status( $new_txn_status ) {
+	public function set_new_txn_status($new_txn_status) {
 		$this->_new_txn_status = $new_txn_status;
 	}
 
@@ -145,17 +145,17 @@ 
 	 * @param bool   $check_all
 	 * @return boolean | int
 	 */
-	private function _reg_steps_completed( EE_Transaction $transaction, $reg_step_slug = '', $check_all = TRUE ) {
+	private function _reg_steps_completed(EE_Transaction $transaction, $reg_step_slug = '', $check_all = TRUE) {
 		$reg_steps = $transaction->reg_steps();
-		if ( ! is_array( $reg_steps ) || empty( $reg_steps )) {
+		if ( ! is_array($reg_steps) || empty($reg_steps)) {
 			return false;
 		}
 		// loop thru reg steps array)
-		foreach ( $reg_steps as $slug => $reg_step_completed ) {
+		foreach ($reg_steps as $slug => $reg_step_completed) {
 			// if NOT checking ALL steps (only checking one step)
-			if ( ! $check_all ) {
+			if ( ! $check_all) {
 				// and this is the one
-				if ( $slug == $reg_step_slug ) {
+				if ($slug == $reg_step_slug) {
 					return $reg_step_completed;
 				} else {
 					// skip to next reg step in loop
@@ -163,9 +163,9 @@ 
 				}
 			}
 			// if any reg step is NOT completed (ignoring any specific steps), then just leave
-			if ( $reg_step_completed !== true && $slug != $reg_step_slug ) {
+			if ($reg_step_completed !== true && $slug != $reg_step_slug) {
 				return false;
-			} else if ( $slug == $reg_step_slug ) {
+			} else if ($slug == $reg_step_slug) {
 				// if we reach this point, then we are testing either:
 				// all_reg_steps_completed_except() or
 				// all_reg_steps_completed_except_final_step(),
@@ -190,8 +190,8 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return boolean
 	 */
-	public function all_reg_steps_completed( EE_Transaction $transaction ) {
-		return $this->_reg_steps_completed( $transaction );
+	public function all_reg_steps_completed(EE_Transaction $transaction) {
+		return $this->_reg_steps_completed($transaction);
 	}
 
 
@@ -208,8 +208,8 @@ 
 	 * @param string $exception
 	 * @return boolean
 	 */
-	public function all_reg_steps_completed_except( EE_Transaction $transaction, $exception = '' ) {
-		return $this->_reg_steps_completed( $transaction, $exception );
+	public function all_reg_steps_completed_except(EE_Transaction $transaction, $exception = '') {
+		return $this->_reg_steps_completed($transaction, $exception);
 	}
 
 
@@ -225,8 +225,8 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return boolean
 	 */
-	public function all_reg_steps_completed_except_final_step( EE_Transaction $transaction ) {
-		return $this->_reg_steps_completed( $transaction, 'finalize_registration' );
+	public function all_reg_steps_completed_except_final_step(EE_Transaction $transaction) {
+		return $this->_reg_steps_completed($transaction, 'finalize_registration');
 	}
 
 
@@ -243,8 +243,8 @@ 
 	 * @param string $reg_step_slug
 	 * @return boolean | int
 	 */
-	public function reg_step_completed( EE_Transaction $transaction, $reg_step_slug ) {
-		return $this->_reg_steps_completed( $transaction, $reg_step_slug, FALSE );
+	public function reg_step_completed(EE_Transaction $transaction, $reg_step_slug) {
+		return $this->_reg_steps_completed($transaction, $reg_step_slug, FALSE);
 	}
 
 
@@ -260,8 +260,8 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return boolean | int
 	 */
-	public function final_reg_step_completed( EE_Transaction $transaction ) {
-		return $this->_reg_steps_completed( $transaction, 'finalize_registration', FALSE );
+	public function final_reg_step_completed(EE_Transaction $transaction) {
+		return $this->_reg_steps_completed($transaction, 'finalize_registration', FALSE);
 	}
 
 
@@ -275,9 +275,9 @@ 
 	 * @param string          $reg_step_slug
 	 * @return boolean
 	 */
-	public function set_reg_step_initiated( EE_Transaction $transaction, $reg_step_slug ) {
+	public function set_reg_step_initiated(EE_Transaction $transaction, $reg_step_slug) {
 		$current_time = time();
-		return $this->_set_reg_step_completed_status( $transaction, $reg_step_slug, $current_time );
+		return $this->_set_reg_step_completed_status($transaction, $reg_step_slug, $current_time);
 	}
 
 
@@ -291,8 +291,8 @@ 
 	 * @param string          $reg_step_slug
 	 * @return boolean
 	 */
-	public function set_reg_step_completed( EE_Transaction $transaction, $reg_step_slug ) {
-		return $this->_set_reg_step_completed_status( $transaction, $reg_step_slug, TRUE );
+	public function set_reg_step_completed(EE_Transaction $transaction, $reg_step_slug) {
+		return $this->_set_reg_step_completed_status($transaction, $reg_step_slug, TRUE);
 	}
 
 
@@ -306,8 +306,8 @@ 
 	 * @param string          $reg_step_slug
 	 * @return boolean
 	 */
-	public function set_reg_step_not_completed( EE_Transaction $transaction, $reg_step_slug ) {
-		return $this->_set_reg_step_completed_status( $transaction, $reg_step_slug, FALSE );
+	public function set_reg_step_not_completed(EE_Transaction $transaction, $reg_step_slug) {
+		return $this->_set_reg_step_completed_status($transaction, $reg_step_slug, FALSE);
 	}
 
 
@@ -323,36 +323,36 @@ 
 	 * @param boolean | int $status
 	 * @return boolean
 	 */
-	private function _set_reg_step_completed_status( EE_Transaction $transaction, $reg_step_slug, $status ) {
+	private function _set_reg_step_completed_status(EE_Transaction $transaction, $reg_step_slug, $status) {
 		// validate status
-		$status = is_bool( $status ) || is_numeric( $status ) ? $status : false;
+		$status = is_bool($status) || is_numeric($status) ? $status : false;
 		// get reg steps array
 		$txn_reg_steps = $transaction->reg_steps();
 		// if reg step does NOT exist
-		if ( ! isset( $txn_reg_steps[ $reg_step_slug ] )) {
+		if ( ! isset($txn_reg_steps[$reg_step_slug])) {
 			return false;
 		}
 		// if  we're trying to complete a step that is already completed
-		if ( $txn_reg_steps[ $reg_step_slug ] === true ) {
+		if ($txn_reg_steps[$reg_step_slug] === true) {
 			return true;
 		}
 		// if  we're trying to complete a step that hasn't even started
-		if ( $status === true && $txn_reg_steps[ $reg_step_slug ] === false ) {
+		if ($status === true && $txn_reg_steps[$reg_step_slug] === false) {
 			return false;
 		}
 		// if current status value matches the incoming value (no change)
-		if ( $txn_reg_steps[ $reg_step_slug ] === $status ) {
+		if ($txn_reg_steps[$reg_step_slug] === $status) {
 			// this will happen in cases where multiple AJAX requests occur during the same step
 			return true;
 		}
 		// if we're trying to set a start time
-		if ( is_numeric( $status ) && is_numeric( $txn_reg_steps[ $reg_step_slug ] )) {
+		if (is_numeric($status) && is_numeric($txn_reg_steps[$reg_step_slug])) {
 			// skip the update below, but don't return FALSE so that errors won't be displayed
 			return true;
 		}
 		// update completed status
-		$txn_reg_steps[ $reg_step_slug ] = $status;
-		$transaction->set_reg_steps( $txn_reg_steps );
+		$txn_reg_steps[$reg_step_slug] = $status;
+		$transaction->set_reg_steps($txn_reg_steps);
 		$transaction->save();
 		// DEBUG LOG
 		//$this->log(
@@ -378,11 +378,11 @@ 
 	 * @param string $reg_step_slug
 	 * @return void
 	 */
-	public function remove_reg_step( EE_Transaction $transaction, $reg_step_slug ) {
+	public function remove_reg_step(EE_Transaction $transaction, $reg_step_slug) {
 		// get reg steps array
 		$txn_reg_steps = $transaction->reg_steps();
-		unset( $txn_reg_steps[ $reg_step_slug ] );
-		$transaction->set_reg_steps( $txn_reg_steps );
+		unset($txn_reg_steps[$reg_step_slug]);
+		$transaction->set_reg_steps($txn_reg_steps);
 	}
 
 
@@ -396,14 +396,14 @@ 
 	 * @param EE_Transaction $transaction
 	 * 	@return 	boolean
 	 */
-	public function toggle_failed_transaction_status( EE_Transaction $transaction ) {
+	public function toggle_failed_transaction_status(EE_Transaction $transaction) {
 		// set incoming TXN_Status
-		$this->set_old_txn_status( $transaction->status_ID() );
+		$this->set_old_txn_status($transaction->status_ID());
 		// if TXN status is still set as "failed"...
-		if ( $transaction->status_ID() == EEM_Transaction::failed_status_code ) {
+		if ($transaction->status_ID() == EEM_Transaction::failed_status_code) {
 			// set incoming TXN_Status
-			$this->set_new_txn_status( EEM_Transaction::abandoned_status_code );
-			$transaction->set_status( EEM_Transaction::abandoned_status_code );
+			$this->set_new_txn_status(EEM_Transaction::abandoned_status_code);
+			$transaction->set_status(EEM_Transaction::abandoned_status_code);
 			return TRUE;
 		}
 		return FALSE;
@@ -419,20 +419,20 @@ 
 	 * @param EE_Transaction $transaction
 	 * 	@return 	boolean
 	 */
-	public function toggle_abandoned_transaction_status( EE_Transaction $transaction ) {
+	public function toggle_abandoned_transaction_status(EE_Transaction $transaction) {
 		// set incoming TXN_Status
-		$this->set_old_txn_status( $transaction->status_ID() );
+		$this->set_old_txn_status($transaction->status_ID());
 		// if TXN status has not been updated already due to a payment, and is still set as "failed" or "abandoned"...
-		if ( $transaction->status_ID() == EEM_Transaction::failed_status_code || $transaction->status_ID() == EEM_Transaction::abandoned_status_code ) {
-			$this->set_new_txn_status( EEM_Transaction::incomplete_status_code );
+		if ($transaction->status_ID() == EEM_Transaction::failed_status_code || $transaction->status_ID() == EEM_Transaction::abandoned_status_code) {
+			$this->set_new_txn_status(EEM_Transaction::incomplete_status_code);
 			// if a contact record for the primary registrant has been created
-			if ( $transaction->primary_registration() instanceof EE_Registration && $transaction->primary_registration()->attendee() instanceof EE_Attendee ) {
-				$transaction->set_status( EEM_Transaction::incomplete_status_code );
-				$this->set_new_txn_status( EEM_Transaction::incomplete_status_code );
+			if ($transaction->primary_registration() instanceof EE_Registration && $transaction->primary_registration()->attendee() instanceof EE_Attendee) {
+				$transaction->set_status(EEM_Transaction::incomplete_status_code);
+				$this->set_new_txn_status(EEM_Transaction::incomplete_status_code);
 			} else {
 				// no contact record? yer abandoned!
-				$transaction->set_status( EEM_Transaction::abandoned_status_code );
-				$this->set_new_txn_status( EEM_Transaction::abandoned_status_code );
+				$transaction->set_status(EEM_Transaction::abandoned_status_code);
+				$this->set_new_txn_status(EEM_Transaction::abandoned_status_code);
 			}
 			return TRUE;
 		}
@@ -450,16 +450,16 @@ 
 	 * @param array 	$registration_query_params - array of query WHERE params to use when retrieving cached registrations from a transaction
 	 * 	@return 	boolean
 	 */
-	public function manually_update_registration_statuses( EE_Transaction $transaction, $new_reg_status = '', $registration_query_params = array() ) {
-		$status_updates = $this->_call_method_on_registrations_via_Registration_Processor( 'manually_update_registration_status', $transaction, $registration_query_params, $new_reg_status );
+	public function manually_update_registration_statuses(EE_Transaction $transaction, $new_reg_status = '', $registration_query_params = array()) {
+		$status_updates = $this->_call_method_on_registrations_via_Registration_Processor('manually_update_registration_status', $transaction, $registration_query_params, $new_reg_status);
 		// send messages
 		/** @type EE_Registration_Processor $registration_processor */
-		$registration_processor = EE_Registry::instance()->load_class( 'Registration_Processor' );
+		$registration_processor = EE_Registry::instance()->load_class('Registration_Processor');
 		$registration_processor->trigger_registration_update_notifications(
 			$transaction->primary_registration(),
-			array( 'manually_updated' 	=> true )
+			array('manually_updated' 	=> true)
 		);
-		do_action( 'AHEE__EE_Transaction_Processor__manually_update_registration_statuses', $transaction, $status_updates );
+		do_action('AHEE__EE_Transaction_Processor__manually_update_registration_statuses', $transaction, $status_updates);
 		return $status_updates;
 	}
 
@@ -473,9 +473,9 @@ 
 	 * @param array 	$registration_query_params - array of query WHERE params to use when retrieving cached registrations from a transaction
 	 * 	@return 	boolean
 	 */
-	public function toggle_registration_statuses_for_default_approved_events( EE_Transaction $transaction, $registration_query_params = array() ) {
-		$status_updates = $this->_call_method_on_registrations_via_Registration_Processor( 'toggle_registration_status_for_default_approved_events', $transaction, $registration_query_params );
-		do_action( 'AHEE__EE_Transaction_Processor__toggle_registration_statuses_for_default_approved_events', $transaction, $status_updates );
+	public function toggle_registration_statuses_for_default_approved_events(EE_Transaction $transaction, $registration_query_params = array()) {
+		$status_updates = $this->_call_method_on_registrations_via_Registration_Processor('toggle_registration_status_for_default_approved_events', $transaction, $registration_query_params);
+		do_action('AHEE__EE_Transaction_Processor__toggle_registration_statuses_for_default_approved_events', $transaction, $status_updates);
 		return $status_updates;
 	}
 
@@ -489,9 +489,9 @@ 
 	 * @param array 	$registration_query_params - array of query WHERE params to use when retrieving cached registrations from a transaction
 	 * 	@return 	boolean
 	 */
-	public function toggle_registration_statuses_if_no_monies_owing( EE_Transaction $transaction, $registration_query_params = array() ) {
-		$status_updates = $this->_call_method_on_registrations_via_Registration_Processor( 'toggle_registration_status_if_no_monies_owing', $transaction, $registration_query_params );
-		do_action( 'AHEE__EE_Transaction_Processor__toggle_registration_statuses_if_no_monies_owing', $transaction, $status_updates );
+	public function toggle_registration_statuses_if_no_monies_owing(EE_Transaction $transaction, $registration_query_params = array()) {
+		$status_updates = $this->_call_method_on_registrations_via_Registration_Processor('toggle_registration_status_if_no_monies_owing', $transaction, $registration_query_params);
+		do_action('AHEE__EE_Transaction_Processor__toggle_registration_statuses_if_no_monies_owing', $transaction, $status_updates);
 		return $status_updates;
 	}
 
@@ -507,17 +507,17 @@ 
 	 * @throws \EE_Error
 	 * @return array
 	 */
-	public function update_transaction_and_registrations_after_checkout_or_payment( EE_Transaction $transaction, $payment = NULL, $registration_query_params = array() ) {
+	public function update_transaction_and_registrations_after_checkout_or_payment(EE_Transaction $transaction, $payment = NULL, $registration_query_params = array()) {
 		// set incoming TXN_Status, and consider it new since old status should have been set
-		$this->set_new_txn_status( $transaction->status_ID() );
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, $transaction->status_ID(), '$transaction->status_ID()' );
+		$this->set_new_txn_status($transaction->status_ID());
+		do_action('AHEE_log', __FILE__, __FUNCTION__, $transaction->status_ID(), '$transaction->status_ID()');
 		// make sure some query params are set for retrieving registrations
-		$this->_set_registration_query_params( $registration_query_params );
+		$this->_set_registration_query_params($registration_query_params);
 		// get final reg step status
-		$finalized = $this->final_reg_step_completed( $transaction );
+		$finalized = $this->final_reg_step_completed($transaction);
 		// if the 'finalize_registration' step has been initiated (has a timestamp) but has not yet been fully completed (TRUE)
-		if ( is_numeric( $finalized ) && $finalized !== true ) {
-			$this->set_reg_step_completed( $transaction, 'finalize_registration' );
+		if (is_numeric($finalized) && $finalized !== true) {
+			$this->set_reg_step_completed($transaction, 'finalize_registration');
 			$finalized = true;
 		}
 		$transaction->save();
@@ -540,13 +540,13 @@ 
 
 		// send messages
 		/** @type EE_Registration_Processor $registration_processor */
-		$registration_processor = EE_Registry::instance()->load_class( 'Registration_Processor' );
+		$registration_processor = EE_Registry::instance()->load_class('Registration_Processor');
 		$registration_processor->trigger_registration_update_notifications(
 			$transaction->primary_registration(),
 			$update_params
 		);
 
-		do_action( 'AHEE__EE_Transaction_Processor__update_transaction_and_registrations_after_checkout_or_payment', $transaction, $update_params );
+		do_action('AHEE__EE_Transaction_Processor__update_transaction_and_registrations_after_checkout_or_payment', $transaction, $update_params);
 		return $update_params;
 	}
 
@@ -564,23 +564,23 @@ 
 	 * @throws \EE_Error
 	 * @return boolean
 	 */
-	private function _call_method_on_registrations_via_Registration_Processor( $method_name,  EE_Transaction $transaction, $registration_query_params = array(), $additional_param = NULL ) {
+	private function _call_method_on_registrations_via_Registration_Processor($method_name, EE_Transaction $transaction, $registration_query_params = array(), $additional_param = NULL) {
 		$response = FALSE;
 		/** @type EE_Registration_Processor $registration_processor */
-		$registration_processor = EE_Registry::instance()->load_class( 'Registration_Processor' );
+		$registration_processor = EE_Registry::instance()->load_class('Registration_Processor');
 		// check that method exists
-		if ( ! method_exists( $registration_processor, $method_name )) {
-			throw new EE_Error( __( 'Method does not exist.', 'event_espresso' ));
+		if ( ! method_exists($registration_processor, $method_name)) {
+			throw new EE_Error(__('Method does not exist.', 'event_espresso'));
 		}
 		// make sure some query params are set for retrieving registrations
-		$this->_set_registration_query_params( $registration_query_params );
+		$this->_set_registration_query_params($registration_query_params);
 		// loop through cached registrations
-		foreach ( $transaction->registrations( $this->_registration_query_params ) as $registration ) {
-			if ( $registration instanceof EE_Registration ) {
-				if ( $additional_param ) {
-					$response = $registration_processor->$method_name( $registration, $additional_param ) ? TRUE : $response;
+		foreach ($transaction->registrations($this->_registration_query_params) as $registration) {
+			if ($registration instanceof EE_Registration) {
+				if ($additional_param) {
+					$response = $registration_processor->$method_name($registration, $additional_param) ? TRUE : $response;
 				} else {
-					$response = $registration_processor->$method_name( $registration ) ? TRUE : $response;
+					$response = $registration_processor->$method_name($registration) ? TRUE : $response;
 				}
 			}
 		}
@@ -605,46 +605,46 @@ 
 	public function set_transaction_payment_method_based_on_registration_statuses(
 		EE_Registration $edited_registration
 	) {
-		if ( $edited_registration instanceof EE_Registration ) {
+		if ($edited_registration instanceof EE_Registration) {
 			$transaction = $edited_registration->transaction();
-			if ( $transaction instanceof EE_Transaction ) {
+			if ($transaction instanceof EE_Transaction) {
 				$all_not_approved = true;
-				foreach ( $transaction->registrations() as $registration ) {
-					if ( $registration instanceof EE_Registration ) {
+				foreach ($transaction->registrations() as $registration) {
+					if ($registration instanceof EE_Registration) {
 						// if any REG != "Not Approved" then toggle to false
 						$all_not_approved = $registration->is_not_approved() ? $all_not_approved : false;
 					}
 				}
 				// if ALL Registrations are "Not Approved"
-				if ( $all_not_approved ) {
-					$transaction->set_payment_method_ID( null );
+				if ($all_not_approved) {
+					$transaction->set_payment_method_ID(null);
 					$transaction->save();
 				} else {
-					$available_payment_methods = EEM_Payment_Method::instance()->get_all_for_transaction( $transaction, EEM_Payment_Method::scope_cart );
-					if ( ! empty( $available_payment_methods ) ) {
+					$available_payment_methods = EEM_Payment_Method::instance()->get_all_for_transaction($transaction, EEM_Payment_Method::scope_cart);
+					if ( ! empty($available_payment_methods)) {
 						$PMD_ID = 0;
-						foreach ( $available_payment_methods as $available_payment_method ) {
-							if ( $available_payment_method instanceof EE_Payment_Method && $available_payment_method->open_by_default() ) {
+						foreach ($available_payment_methods as $available_payment_method) {
+							if ($available_payment_method instanceof EE_Payment_Method && $available_payment_method->open_by_default()) {
 								$PMD_ID = $available_payment_method->ID();
 								break;
 							}
 						}
-						if ( ! $PMD_ID ) {
-							$first_payment_method = reset( $available_payment_methods );
-							if ( $first_payment_method instanceof EE_Payment_Method ) {
+						if ( ! $PMD_ID) {
+							$first_payment_method = reset($available_payment_methods);
+							if ($first_payment_method instanceof EE_Payment_Method) {
 								$PMD_ID = $first_payment_method->ID();
 							} else {
 								EE_Error::add_error(
-									__( 'A valid Payment Method could not be determined. Please ensure that at least one Payment Method is activated.', 'event_espresso' ),
+									__('A valid Payment Method could not be determined. Please ensure that at least one Payment Method is activated.', 'event_espresso'),
 									__FILE__, __LINE__, __FUNCTION__
 								);
 							}
 						}
-						$transaction->set_payment_method_ID( $PMD_ID );
+						$transaction->set_payment_method_ID($PMD_ID);
 						$transaction->save();
 					} else {
 						EE_Error::add_error(
-							__( 'Please activate at least one Payment Method in order for things to operate correctly.', 'event_espresso' ),
+							__('Please activate at least one Payment Method in order for things to operate correctly.', 'event_espresso'),
 							__FILE__, __LINE__, __FUNCTION__
 						);
 					}

core/db_classes/EE_Registration.class.php

Spacing +180 added lines, -180 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * EE_Registration class
@@ -41,9 +41,9 @@ 
 	 *                             		    date_format and the second value is the time format
 	 * @return EE_Registration
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
 	}
 
 
@@ -54,8 +54,8 @@ 
 	 *                          		the website will be used.
 	 * @return EE_Registration
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 
 
@@ -66,8 +66,8 @@ 
 	 * @access        public
 	 * @param        int $EVT_ID Event ID
 	 */
-	public function set_event( $EVT_ID = 0 ) {
-		$this->set( 'EVT_ID', $EVT_ID );
+	public function set_event($EVT_ID = 0) {
+		$this->set('EVT_ID', $EVT_ID);
 	}
 
 
@@ -78,18 +78,18 @@ 
 	 * @param mixed  $field_value
 	 * @param bool   $use_default
 	 */
-	public function set( $field_name, $field_value, $use_default = FALSE ) {
-		switch( $field_name ) {
+	public function set($field_name, $field_value, $use_default = FALSE) {
+		switch ($field_name) {
 			case 'REG_code' :
-				if ( ! empty( $field_value ) && $this->reg_code() == '' ) {
-					$this->set_reg_code( $field_value, $use_default );
+				if ( ! empty($field_value) && $this->reg_code() == '') {
+					$this->set_reg_code($field_value, $use_default);
 				}
 				break;
 			case 'STS_ID' :
-				$this->set_status( $field_value, $use_default );
+				$this->set_status($field_value, $use_default);
 				break;
 			default :
-				parent::set( $field_name, $field_value, $use_default );
+				parent::set($field_name, $field_value, $use_default);
 		}
 	}
 
@@ -106,30 +106,30 @@ 
 	 * @param boolean $use_default
 	 * @return bool
 	 */
-	public function set_status( $new_STS_ID = NULL, $use_default = FALSE ) {
+	public function set_status($new_STS_ID = NULL, $use_default = FALSE) {
 		// get current REG_Status
 		$old_STS_ID = $this->status_ID();
 		// if status has changed
-		if ( $old_STS_ID != $new_STS_ID  ) {
+		if ($old_STS_ID != $new_STS_ID) {
 			// TO approved
-			if ( $new_STS_ID == EEM_Registration::status_id_approved ) {
+			if ($new_STS_ID == EEM_Registration::status_id_approved) {
 				// reserve a space by incrementing ticket and datetime sold values
 				$this->_reserve_registration_space();
-				do_action( 'AHEE__EE_Registration__set_status__to_approved', $this, $old_STS_ID, $new_STS_ID );
+				do_action('AHEE__EE_Registration__set_status__to_approved', $this, $old_STS_ID, $new_STS_ID);
 			// OR FROM  approved
-			} else if ( $old_STS_ID == EEM_Registration::status_id_approved ) {
+			} else if ($old_STS_ID == EEM_Registration::status_id_approved) {
 				// release a space by decrementing ticket and datetime sold values
 				$this->_release_registration_space();
-				do_action( 'AHEE__EE_Registration__set_status__from_approved', $this, $old_STS_ID, $new_STS_ID );
+				do_action('AHEE__EE_Registration__set_status__from_approved', $this, $old_STS_ID, $new_STS_ID);
 			}
 			// update status
-			parent::set( 'STS_ID', $new_STS_ID, $use_default );
-			do_action( 'AHEE__EE_Registration__set_status__after_update', $this );
+			parent::set('STS_ID', $new_STS_ID, $use_default);
+			do_action('AHEE__EE_Registration__set_status__after_update', $this);
 			return TRUE;
-		}else{
+		} else {
 			//even though the old value matches the new value, it's still good to
 			//allow the parent set method to have a say
-			parent::set( 'STS_ID', $new_STS_ID, $use_default );
+			parent::set('STS_ID', $new_STS_ID, $use_default);
 			return TRUE;
 		}
 	}
@@ -141,7 +141,7 @@ 
 	 * @access        public
 	 */
 	public function status_ID() {
-		return $this->get( 'STS_ID' );
+		return $this->get('STS_ID');
 	}
 
 
@@ -166,12 +166,12 @@ 
 	 * @param boolean $include_archived whether to include archived tickets or not.
 	 * @return EE_Ticket
 	 */
-	public function ticket( $include_archived = TRUE ) {
+	public function ticket($include_archived = TRUE) {
 		$query_params = array();
-		if ( $include_archived ) {
-			$query_params[ 'default_where_conditions' ] = 'none';
+		if ($include_archived) {
+			$query_params['default_where_conditions'] = 'none';
 		}
-		return $this->get_first_related( 'Ticket', $query_params );
+		return $this->get_first_related('Ticket', $query_params);
 	}
 
 
@@ -181,7 +181,7 @@ 
 	 * @return EE_Event
 	 */
 	public function event() {
-		return $this->get_first_related( 'Event' );
+		return $this->get_first_related('Event');
 	}
 
 
@@ -195,7 +195,7 @@ 
 	 */
 	public function wp_user() {
 		$event = $this->event();
-		if ( $event instanceof EE_Event ) {
+		if ($event instanceof EE_Event) {
 			return $event->wp_user();
 		}
 		return 0;
@@ -221,8 +221,8 @@ 
 	 * @access        public
 	 * @param        int $ATT_ID Attendee ID
 	 */
-	public function set_attendee_id( $ATT_ID = 0 ) {
-		$this->set( 'ATT_ID', $ATT_ID );
+	public function set_attendee_id($ATT_ID = 0) {
+		$this->set('ATT_ID', $ATT_ID);
 	}
 
 
@@ -233,8 +233,8 @@ 
 	 * @access        public
 	 * @param        int $TXN_ID Transaction ID
 	 */
-	public function set_transaction_id( $TXN_ID = 0 ) {
-		$this->set( 'TXN_ID', $TXN_ID );
+	public function set_transaction_id($TXN_ID = 0) {
+		$this->set('TXN_ID', $TXN_ID);
 	}
 
 
@@ -245,8 +245,8 @@ 
 	 * @access    public
 	 * @param    string $REG_session PHP Session ID
 	 */
-	public function set_session( $REG_session = '' ) {
-		$this->set( 'REG_session', $REG_session );
+	public function set_session($REG_session = '') {
+		$this->set('REG_session', $REG_session);
 	}
 
 
@@ -257,8 +257,8 @@ 
 	 * @access    public
 	 * @param    string $REG_url_link Registration URL Link
 	 */
-	public function set_reg_url_link( $REG_url_link = '' ) {
-		$this->set( 'REG_url_link', $REG_url_link );
+	public function set_reg_url_link($REG_url_link = '') {
+		$this->set('REG_url_link', $REG_url_link);
 	}
 
 
@@ -269,8 +269,8 @@ 
 	 * @access        public
 	 * @param        int $REG_count Primary Attendee
 	 */
-	public function set_count( $REG_count = 1 ) {
-		$this->set( 'REG_count', $REG_count );
+	public function set_count($REG_count = 1) {
+		$this->set('REG_count', $REG_count);
 	}
 
 
@@ -281,8 +281,8 @@ 
 	 * @access        public
 	 * @param        boolean $REG_group_size Group Registration
 	 */
-	public function set_group_size( $REG_group_size = FALSE ) {
-		$this->set( 'REG_group_size', $REG_group_size );
+	public function set_group_size($REG_group_size = FALSE) {
+		$this->set('REG_group_size', $REG_group_size);
 	}
 
 
@@ -365,8 +365,8 @@ 
 	 * @access        public
 	 * @param        mixed ( int or string ) $REG_date Registration Date - Unix timestamp or string representation of Date
 	 */
-	public function set_reg_date( $REG_date = FALSE ) {
-		$this->set( 'REG_date', $REG_date );
+	public function set_reg_date($REG_date = FALSE) {
+		$this->set('REG_date', $REG_date);
 	}
 
 
@@ -377,8 +377,8 @@ 
 	 * @access    public
 	 * @param    float $REG_final_price
 	 */
-	public function set_final_price( $REG_final_price = 0.00 ) {
-		$this->set( 'REG_final_price', $REG_final_price );
+	public function set_final_price($REG_final_price = 0.00) {
+		$this->set('REG_final_price', $REG_final_price);
 	}
 
 
@@ -389,8 +389,8 @@ 
 	 * @access    public
 	 * @param    float $REG_paid
 	 */
-	public function set_paid( $REG_paid = 0.00 ) {
-		$this->set( 'REG_paid', $REG_paid );
+	public function set_paid($REG_paid = 0.00) {
+		$this->set('REG_paid', $REG_paid);
 	}
 
 
@@ -401,8 +401,8 @@ 
 	 * @access        public
 	 * @param        boolean $REG_att_is_going Attendee Is Going
 	 */
-	public function set_att_is_going( $REG_att_is_going = FALSE ) {
-		$this->set( 'REG_att_is_going', $REG_att_is_going );
+	public function set_att_is_going($REG_att_is_going = FALSE) {
+		$this->set('REG_att_is_going', $REG_att_is_going);
 	}
 
 
@@ -412,7 +412,7 @@ 
 	 * @return EE_Attendee
 	 */
 	public function attendee() {
-		return $this->get_first_related( 'Attendee' );
+		return $this->get_first_related('Attendee');
 	}
 
 
@@ -422,7 +422,7 @@ 
 	 * @access        public
 	 */
 	public function event_ID() {
-		return $this->get( 'EVT_ID' );
+		return $this->get('EVT_ID');
 	}
 
 
@@ -433,7 +433,7 @@ 
 	 */
 	public function event_name() {
 		$event = $this->event_obj();
-		if ( $event ) {
+		if ($event) {
 			return $event->name();
 		} else {
 			return NULL;
@@ -447,7 +447,7 @@ 
 	 * @return EE_Event
 	 */
 	public function event_obj() {
-		return $this->get_first_related( 'Event' );
+		return $this->get_first_related('Event');
 	}
 
 
@@ -457,7 +457,7 @@ 
 	 * @access        public
 	 */
 	public function attendee_ID() {
-		return $this->get( 'ATT_ID' );
+		return $this->get('ATT_ID');
 	}
 
 
@@ -467,7 +467,7 @@ 
 	 * @access        public
 	 */
 	public function session_ID() {
-		return $this->get( 'REG_session' );
+		return $this->get('REG_session');
 	}
 
 
@@ -477,7 +477,7 @@ 
 	 * @param string $messenger 'pdf' or 'html'.  Default 'html'.
 	 * @return string
 	 */
-	public function receipt_url( $messenger = 'html' ) {
+	public function receipt_url($messenger = 'html') {
 
 		/**
 		 * The below will be deprecated one version after this.  We check first if there is a custom receipt template already in use on old system.  If there is then we just return the standard url for it.
@@ -486,12 +486,12 @@ 
 		 */
 		EE_Registry::instance()->load_helper('Template');
 		$template_relative_path = 'modules/gateways/Invoice/lib/templates/receipt_body.template.php';
-		$has_custom = EEH_Template::locate_template( $template_relative_path , array(), TRUE, TRUE, TRUE );
+		$has_custom = EEH_Template::locate_template($template_relative_path, array(), TRUE, TRUE, TRUE);
 
-		if ( $has_custom ) {
-			return add_query_arg( array( 'receipt' => 'true' ), $this->invoice_url( 'launch' ) );
+		if ($has_custom) {
+			return add_query_arg(array('receipt' => 'true'), $this->invoice_url('launch'));
 		}
-		return apply_filters( 'FHEE__EE_Registration__receipt_url__receipt_url', '', $this, $messenger, 'receipt' );
+		return apply_filters('FHEE__EE_Registration__receipt_url__receipt_url', '', $this, $messenger, 'receipt');
 	}
 
 
@@ -502,7 +502,7 @@ 
 	 * @param string $messenger 'pdf' or 'html'.  Default 'html'.
 	 * @return string
 	 */
-	public function invoice_url( $messenger = 'html' ) {
+	public function invoice_url($messenger = 'html') {
 		/**
 		 * The below will be deprecated one version after this.  We check first if there is a custom invoice template already in use on old system.  If there is then we just return the standard url for it.
 		 *
@@ -510,21 +510,21 @@ 
 		 */
 		EE_Registry::instance()->load_helper('Template');
 		$template_relative_path = 'modules/gateways/Invoice/lib/templates/invoice_body.template.php';
-		$has_custom = EEH_Template::locate_template( $template_relative_path , array(), TRUE, TRUE, TRUE );
+		$has_custom = EEH_Template::locate_template($template_relative_path, array(), TRUE, TRUE, TRUE);
 
-		if ( $has_custom ) {
-			if ( $messenger == 'html' ) {
-				return $this->invoice_url( 'launch' );
+		if ($has_custom) {
+			if ($messenger == 'html') {
+				return $this->invoice_url('launch');
 			}
 			$route = $messenger == 'download' || $messenger == 'pdf' ? 'download_invoice' : 'launch_invoice';
 
-			$query_args = array( 'ee' => $route, 'id' => $this->reg_url_link() );
-			if ( $messenger == 'html' ) {
+			$query_args = array('ee' => $route, 'id' => $this->reg_url_link());
+			if ($messenger == 'html') {
 				$query_args['html'] = TRUE;
 			}
-			return add_query_arg( $query_args, get_permalink( EE_Registry::instance()->CFG->core->thank_you_page_id ) );
+			return add_query_arg($query_args, get_permalink(EE_Registry::instance()->CFG->core->thank_you_page_id));
 		}
-		return apply_filters( 'FHEE__EE_Registration__invoice_url__invoice_url', '', $this, $messenger, 'invoice' );
+		return apply_filters('FHEE__EE_Registration__invoice_url__invoice_url', '', $this, $messenger, 'invoice');
 	}
 
 
@@ -534,7 +534,7 @@ 
 	 * @access        public
 	 */
 	public function reg_url_link() {
-		return $this->get( 'REG_url_link' );
+		return $this->get('REG_url_link');
 	}
 
 
@@ -544,8 +544,8 @@ 
 	 * @param string $type 'download','launch', or 'html' (default is 'launch')
 	 * @return void
 	 */
-	public function e_invoice_url( $type = 'launch' ) {
-		echo $this->invoice_url( $type );
+	public function e_invoice_url($type = 'launch') {
+		echo $this->invoice_url($type);
 	}
 
 
@@ -565,7 +565,7 @@ 
 	 * @return string
 	 */
 	public function payment_overview_url() {
-		return add_query_arg( array( 'e_reg_url_link' => $this->reg_url_link(), 'step' => 'payment_options', 'revisit' => TRUE ), EE_Registry::instance()->CFG->core->reg_page_url() );
+		return add_query_arg(array('e_reg_url_link' => $this->reg_url_link(), 'step' => 'payment_options', 'revisit' => TRUE), EE_Registry::instance()->CFG->core->reg_page_url());
 	}
 
 
@@ -576,7 +576,7 @@ 
 	 * @return string
 	 */
 	public function edit_attendee_information_url() {
-		return add_query_arg( array( 'e_reg_url_link' => $this->reg_url_link(), 'step' => 'attendee_information', 'revisit' => TRUE ), EE_Registry::instance()->CFG->core->reg_page_url() );
+		return add_query_arg(array('e_reg_url_link' => $this->reg_url_link(), 'step' => 'attendee_information', 'revisit' => TRUE), EE_Registry::instance()->CFG->core->reg_page_url());
 	}
 
 
@@ -586,8 +586,8 @@ 
 	 * @return string
 	 */
 	public function get_admin_edit_url() {
-		EE_Registry::instance()->load_helper( 'URL' );
-		return EEH_URL::add_query_args_and_nonce( array( 'page' => 'espresso_registrations', 'action' => 'view_registration', '_REG_ID' => $this->ID() ), admin_url( 'admin.php' ) );
+		EE_Registry::instance()->load_helper('URL');
+		return EEH_URL::add_query_args_and_nonce(array('page' => 'espresso_registrations', 'action' => 'view_registration', '_REG_ID' => $this->ID()), admin_url('admin.php'));
 	}
 
 
@@ -597,7 +597,7 @@ 
 	 * @access        public
 	 */
 	public function is_primary_registrant() {
-		return $this->get( 'REG_count' ) == 1 ? TRUE : FALSE;
+		return $this->get('REG_count') == 1 ? TRUE : FALSE;
 	}
 
 
@@ -606,12 +606,12 @@ 
 	 * This returns the primary registration object for this registration group (which may be this object).
 	 * @return EE_Registration
 	 */
-	public function get_primary_registration()  {
-		if ( $this->is_primary_registrant() )
+	public function get_primary_registration() {
+		if ($this->is_primary_registrant())
 			return $this;
 
 		//k reg_count !== 1 so let's get the EE_Registration object matching this txn_id and reg_count == 1
-		$primary_registrant = EEM_Registration::instance()->get_one( array( array('TXN_ID' => $this->transaction_ID(), 'REG_count' => 1 ) ) );
+		$primary_registrant = EEM_Registration::instance()->get_one(array(array('TXN_ID' => $this->transaction_ID(), 'REG_count' => 1)));
 		return $primary_registrant;
 	}
 
@@ -622,7 +622,7 @@ 
 	* 		@access		public
 	*/
 	public function count() {
-		return $this->get( 'REG_count' );
+		return $this->get('REG_count');
 	}
 
 
@@ -632,7 +632,7 @@ 
 	 * @access        public
 	 */
 	public function group_size() {
-		return $this->get( 'REG_group_size' );
+		return $this->get('REG_group_size');
 	}
 
 
@@ -642,7 +642,7 @@ 
 	 * @access        public
 	 */
 	public function date() {
-		return $this->get( 'REG_date' );
+		return $this->get('REG_date');
 	}
 
 
@@ -653,8 +653,8 @@ 
 	 * @param string $time_format
 	 * @return string
 	 */
-	public function pretty_date( $date_format = NULL, $time_format = NULL ) {
-		return $this->get_datetime( 'REG_date', $date_format, $time_format );
+	public function pretty_date($date_format = NULL, $time_format = NULL) {
+		return $this->get_datetime('REG_date', $date_format, $time_format);
 	}
 
 
@@ -667,7 +667,7 @@ 
 	 * @return    float
 	 */
 	public function final_price() {
-		return $this->get( 'REG_final_price' );
+		return $this->get('REG_final_price');
 	}
 
 
@@ -678,7 +678,7 @@ 
 	 * @return string
 	 */
 	public function pretty_final_price() {
-		return $this->get_pretty( 'REG_final_price' );
+		return $this->get_pretty('REG_final_price');
 	}
 
 
@@ -689,7 +689,7 @@ 
 	 * @return 	float
 	 */
 	public function paid() {
-		return $this->get( 'REG_paid' );
+		return $this->get('REG_paid');
 	}
 
 
@@ -700,7 +700,7 @@ 
 	 * @return 	float
 	 */
 	public function pretty_paid() {
-		return $this->get_pretty( 'REG_paid' );
+		return $this->get_pretty('REG_paid');
 	}
 
 
@@ -712,11 +712,11 @@ 
 	 * @param array $requires_payment
 	 * @return bool
 	 */
-	public function owes_monies_and_can_pay( $requires_payment = array()) {
+	public function owes_monies_and_can_pay($requires_payment = array()) {
 		// these reg statuses require payment (if event is not free)
-		$requires_payment = ! empty( $requires_payment ) ? $requires_payment : EEM_Registration::reg_statuses_that_allow_payment();
+		$requires_payment = ! empty($requires_payment) ? $requires_payment : EEM_Registration::reg_statuses_that_allow_payment();
 		if (
-			in_array( $this->status_ID(), $requires_payment ) &&
+			in_array($this->status_ID(), $requires_payment) &&
 			$this->final_price() != 0 &&
 			$this->final_price() != $this->paid()
 		) {
@@ -733,8 +733,8 @@ 
 	 * @param bool $show_icons
 	 * @return void
 	 */
-	public function e_pretty_status( $show_icons = FALSE ) {
-		echo $this->pretty_status( $show_icons );
+	public function e_pretty_status($show_icons = FALSE) {
+		echo $this->pretty_status($show_icons);
 	}
 
 
@@ -745,10 +745,10 @@ 
 	 * @param bool $show_icons
 	 * @return string
 	 */
-	public function pretty_status( $show_icons = FALSE ) {
-		$status = EEM_Status::instance()->localized_status( array( $this->status_ID() => __( 'unknown', 'event_espresso' ) ), FALSE, 'sentence' );
+	public function pretty_status($show_icons = FALSE) {
+		$status = EEM_Status::instance()->localized_status(array($this->status_ID() => __('unknown', 'event_espresso')), FALSE, 'sentence');
 		$icon = '';
-		switch ( $this->status_ID() ) {
+		switch ($this->status_ID()) {
 			case EEM_Registration::status_id_approved:
 				$icon = $show_icons ? '<span class="dashicons dashicons-star-filled ee-icon-size-16 green-text"></span>' : '';
 				break;
@@ -768,7 +768,7 @@ 
 				$icon = $show_icons ? '<span class="dashicons dashicons-no ee-icon-size-16 red-text"></span>' : '';
 				break;
 		}
-		return $icon . $status[ $this->status_ID() ];
+		return $icon.$status[$this->status_ID()];
 	}
 
 
@@ -778,7 +778,7 @@ 
 	 * @access        public
 	 */
 	public function att_is_going() {
-		return $this->get( 'REG_att_is_going' );
+		return $this->get('REG_att_is_going');
 	}
 
 
@@ -788,8 +788,8 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return EE_Answer[]
 	 */
-	public function answers( $query_params = NULL ) {
-		return $this->get_many_related( 'Answer', $query_params );
+	public function answers($query_params = NULL) {
+		return $this->get_many_related('Answer', $query_params);
 	}
 
 
@@ -803,9 +803,9 @@ 
 	 * (because the answer might be an array of answer values, so passing pretty_value=true
 	 * will convert it into some kind of string)
 	 */
-	public function answer_value_to_question( $question, $pretty_value=true ) {
+	public function answer_value_to_question($question, $pretty_value = true) {
 		$question_id = EEM_Question::instance()->ensure_is_ID($question);
-		return EEM_Answer::instance()->get_answer_value_to_question($this,$question_id,$pretty_value);
+		return EEM_Answer::instance()->get_answer_value_to_question($this, $question_id, $pretty_value);
 	}
 
 
@@ -818,13 +818,13 @@ 
 	 */
 	public function question_groups() {
 		$question_groups = array();
-		if ( $this->event() instanceof EE_Event ) {
+		if ($this->event() instanceof EE_Event) {
 			$question_groups = $this->event()->question_groups(
 				array(
 					array(
 						'Event_Question_Group.EQG_primary' => $this->count() == 1 ? true : false
 					),
-					'order_by' => array( 'QSG_order' => 'ASC' )
+					'order_by' => array('QSG_order' => 'ASC')
 				)
 			);
 		}
@@ -841,7 +841,7 @@ 
 	 */
 	public function count_question_groups() {
 		$qg_count = 0;
-		if ( $this->event() instanceof EE_Event ) {
+		if ($this->event() instanceof EE_Event) {
 			$qg_count = $this->event()->count_related(
 				'Question_Group',
 				array(
@@ -862,7 +862,7 @@ 
 	 * @return string
 	 */
 	public function reg_date() {
-		return $this->get_datetime( 'REG_date' );
+		return $this->get_datetime('REG_date');
 	}
 
 
@@ -874,7 +874,7 @@ 
 	 * @return EE_Datetime_Ticket
 	 */
 	public function datetime_ticket() {
-		return $this->get_first_related( 'Datetime_Ticket' );
+		return $this->get_first_related('Datetime_Ticket');
 	}
 
 
@@ -884,15 +884,15 @@ 
 	 * @param EE_Datetime_Ticket $datetime_ticket
 	 * @return EE_Datetime_Ticket
 	 */
-	public function set_datetime_ticket( $datetime_ticket ) {
-		return $this->_add_relation_to( $datetime_ticket, 'Datetime_Ticket' );
+	public function set_datetime_ticket($datetime_ticket) {
+		return $this->_add_relation_to($datetime_ticket, 'Datetime_Ticket');
 	}
 	/**
 	 * Gets deleted
 	 * @return boolean
 	 */
 	public function deleted() {
-		return $this->get( 'REG_deleted' );
+		return $this->get('REG_deleted');
 	}
 
 	/**
@@ -901,7 +901,7 @@ 
 	 * @return boolean
 	 */
 	public function set_deleted($deleted) {
-		$this->set( 'REG_deleted', $deleted );
+		$this->set('REG_deleted', $deleted);
 	}
 
 
@@ -911,7 +911,7 @@ 
 	 * @return EE_Status
 	 */
 	public function status_obj() {
-		return $this->get_first_related( 'Status' );
+		return $this->get_first_related('Status');
 	}
 
 
@@ -922,7 +922,7 @@ 
 	 * @return int
 	 */
 	public function count_checkins() {
-		return $this->get_model()->count_related( $this, 'Checkin' );
+		return $this->get_model()->count_related($this, 'Checkin');
 	}
 
 
@@ -932,7 +932,7 @@ 
 	 * @return int
 	 */
 	public function count_checkins_not_checkedout() {
-		return $this->get_model()->count_related( $this, 'Checkin', array( array( 'CHK_in' => 1 ) ) );
+		return $this->get_model()->count_related($this, 'Checkin', array(array('CHK_in' => 1)));
 	}
 
 
@@ -945,20 +945,20 @@ 
 	 *
 	 * @return bool
 	 */
-	public function can_checkin( $DTT_OR_ID, $check_approved = TRUE ) {
-		$DTT_ID = EEM_Datetime::instance()->ensure_is_ID( $DTT_OR_ID );
+	public function can_checkin($DTT_OR_ID, $check_approved = TRUE) {
+		$DTT_ID = EEM_Datetime::instance()->ensure_is_ID($DTT_OR_ID);
 
 		//first check registration status
-		if (  ( $check_approved && ! $this->is_approved() ) || ! $DTT_ID ) {
+		if (($check_approved && ! $this->is_approved()) || ! $DTT_ID) {
 			return false;
 		}
 		//is there a datetime ticket that matches this dtt_ID?
-		if ( ! ( EEM_Datetime_Ticket::instance()->exists( array( array( 'TKT_ID' => $this->get('TKT_ID' ), 'DTT_ID' => $DTT_ID ) ) ) ) ) {
+		if ( ! (EEM_Datetime_Ticket::instance()->exists(array(array('TKT_ID' => $this->get('TKT_ID'), 'DTT_ID' => $DTT_ID))))) {
 			return false;
 		}
 
 		//final check is against TKT_uses
-		return $this->verify_can_checkin_against_TKT_uses( $DTT_ID );
+		return $this->verify_can_checkin_against_TKT_uses($DTT_ID);
 	}
 
 
@@ -971,10 +971,10 @@ 
 	 * @param int | EE_Datetime  $DTT_OR_ID  The datetime the registration is being checked against
 	 * @return bool   true means can checkin.  false means cannot checkin.
 	 */
-	public function verify_can_checkin_against_TKT_uses( $DTT_OR_ID ) {
-		$DTT_ID = EEM_Datetime::instance()->ensure_is_ID( $DTT_OR_ID );
+	public function verify_can_checkin_against_TKT_uses($DTT_OR_ID) {
+		$DTT_ID = EEM_Datetime::instance()->ensure_is_ID($DTT_OR_ID);
 
-		if ( ! $DTT_ID ) {
+		if ( ! $DTT_ID) {
 			return false;
 		}
 
@@ -982,23 +982,23 @@ 
 
 		// if max uses is not set or equals infinity then return true cause its not a factor for whether user can check-in
 		// or not.
-		if ( ! $max_uses || $max_uses === EE_INF ) {
+		if ( ! $max_uses || $max_uses === EE_INF) {
 			return true;
 		}
 
 		//does this datetime have a checkin record?  If so, then the dtt count has already been verified so we can just
 		//go ahead and toggle.
-		if ( EEM_Checkin::instance()->exists( array( array( 'REG_ID' => $this->ID(), 'DTT_ID' => $DTT_ID ) ) ) ) {
+		if (EEM_Checkin::instance()->exists(array(array('REG_ID' => $this->ID(), 'DTT_ID' => $DTT_ID)))) {
 			return true;
 		}
 
 		//made it here so the last check is whether the number of checkins per unique datetime on this registration
 		//disallows further check-ins.
-		$count_unique_dtt_checkins = EEM_Checkin::instance()->count( array( array( 'REG_ID' => $this->ID(), 'CHK_in' => true ) ), 'DTT_ID', true );
+		$count_unique_dtt_checkins = EEM_Checkin::instance()->count(array(array('REG_ID' => $this->ID(), 'CHK_in' => true)), 'DTT_ID', true);
 		// checkins have already reached their max number of uses
 		// so registrant can NOT checkin
-		if ( $count_unique_dtt_checkins >= $max_uses ) {
-			EE_Error::add_error( __( 'Check-in denied because number of datetime uses for the ticket has been reached or exceeded.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if ($count_unique_dtt_checkins >= $max_uses) {
+			EE_Error::add_error(__('Check-in denied because number of datetime uses for the ticket has been reached or exceeded.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		return true;
@@ -1019,15 +1019,15 @@ 
 	 * @param  bool $verify  If true then can_checkin() is used to verify whether the person can be checked in or not.  Otherwise this forces change in checkin status.
 	 * @return int|BOOL            the chk_in status toggled to OR false if nothing got changed.
 	 */
-	public function toggle_checkin_status( $DTT_ID = null, $verify = false ) {
-		if ( empty( $DTT_ID ) ) {
+	public function toggle_checkin_status($DTT_ID = null, $verify = false) {
+		if (empty($DTT_ID)) {
 			$datetime = $this->get_related_primary_datetime();
 			$DTT_ID = $datetime->ID();
 		// verify the registration can checkin for the given DTT_ID
-		} elseif ( ! $this->can_checkin( $DTT_ID, $verify ) ) {
+		} elseif ( ! $this->can_checkin($DTT_ID, $verify)) {
 			EE_Error::add_error(
 					sprintf(
-						__( 'The given registration (ID:%1$d) can not be checked in to the given DTT_ID (%2$d), because the registration does not have access', 'event_espresso'),
+						__('The given registration (ID:%1$d) can not be checked in to the given DTT_ID (%2$d), because the registration does not have access', 'event_espresso'),
 						$this->ID(),
 						$DTT_ID
 					),
@@ -1041,8 +1041,8 @@ 
 			EE_Registration::checkin_status_out => EE_Registration::checkin_status_in
 		);
 		//start by getting the current status so we know what status we'll be changing to.
-		$cur_status = $this->check_in_status_for_datetime( $DTT_ID, NULL );
-		$status_to = $status_paths[ $cur_status ];
+		$cur_status = $this->check_in_status_for_datetime($DTT_ID, NULL);
+		$status_to = $status_paths[$cur_status];
 		// database only records true for checked IN or false for checked OUT
 		// no record ( null ) means checked in NEVER, but we obviously don't save that
 		$new_status = $status_to == EE_Registration::checkin_status_in ? true : false;
@@ -1050,24 +1050,24 @@ 
 		// because we are keeping track of Check-ins over time.
 		// Eventually we'll probably want to show a list table
 		// for the individual Check-ins so that they can be managed.
-		$checkin = EE_Checkin::new_instance( array(
+		$checkin = EE_Checkin::new_instance(array(
 				'REG_ID' => $this->ID(),
 				'DTT_ID' => $DTT_ID,
 				'CHK_in' => $new_status
-		) );
+		));
 		// if the record could not be saved then return false
-		if ( $checkin->save() === 0 ) {
-			if ( WP_DEBUG ) {
+		if ($checkin->save() === 0) {
+			if (WP_DEBUG) {
 				global $wpdb;
 				$error = sprintf(
-					__( 'Registration check in update failed because of the following database error: %1$s%2$s', 'event_espresso' ),
+					__('Registration check in update failed because of the following database error: %1$s%2$s', 'event_espresso'),
 					'<br />',
 					$wpdb->last_error
 				);
 			} else {
-				$error = __( 'Registration check in update failed because of an unknown database error', 'event_espresso' );
+				$error = __('Registration check in update failed because of an unknown database error', 'event_espresso');
 			}
-			EE_Error::add_error( $error, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($error, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		return $status_to;
@@ -1091,19 +1091,19 @@ 
 	 * @param EE_Checkin $checkin If present, we use the given checkin object rather than the dtt_id.
 	 * @return int            Integer representing Check-in status.
 	 */
-	public function check_in_status_for_datetime( $DTT_ID = 0, $checkin = NULL ) {
-		if ( empty( $DTT_ID ) && ! $checkin instanceof EE_Checkin ) {
+	public function check_in_status_for_datetime($DTT_ID = 0, $checkin = NULL) {
+		if (empty($DTT_ID) && ! $checkin instanceof EE_Checkin) {
 			$datetime = $this->get_related_primary_datetime();
-			if ( ! $datetime instanceof EE_Datetime ) {
+			if ( ! $datetime instanceof EE_Datetime) {
 				return 0;
 			}
 			$DTT_ID = $datetime->ID();
 		//verify the registration can checkin for the given DTT_ID
 		}
 		//get checkin object (if exists)
-		$checkin = $checkin instanceof EE_Checkin ? $checkin : $this->get_first_related( 'Checkin', array( array( 'DTT_ID' => $DTT_ID ), 'order_by' => array( 'CHK_timestamp' => 'DESC' ) ) );
-		if ( $checkin instanceof EE_Checkin ) {
-			if ( $checkin->get( 'CHK_in' ) ) {
+		$checkin = $checkin instanceof EE_Checkin ? $checkin : $this->get_first_related('Checkin', array(array('DTT_ID' => $DTT_ID), 'order_by' => array('CHK_timestamp' => 'DESC')));
+		if ($checkin instanceof EE_Checkin) {
+			if ($checkin->get('CHK_in')) {
 				return EE_Registration::checkin_status_in; //checked in
 			} else {
 				return EE_Registration::checkin_status_out; //had checked in but is now checked out.
@@ -1121,28 +1121,28 @@ 
 	 * @param bool $error  This just flags that you want an error message returned. This is put in so that the error message can be customized with the attendee name.
 	 * @return string         internationalized message
 	 */
-	public function get_checkin_msg( $DTT_ID, $error = FALSE ) {
+	public function get_checkin_msg($DTT_ID, $error = FALSE) {
 		//let's get the attendee first so we can include the name of the attendee
-		$attendee = $this->get_first_related( 'Attendee' );
-		if ( $attendee instanceof EE_Attendee ) {
-			if ( $error ) {
-				return sprintf( __( "%s's check-in status was not changed.", "event_espresso" ), $attendee->full_name() );
+		$attendee = $this->get_first_related('Attendee');
+		if ($attendee instanceof EE_Attendee) {
+			if ($error) {
+				return sprintf(__("%s's check-in status was not changed.", "event_espresso"), $attendee->full_name());
 			}
-			$cur_status = $this->check_in_status_for_datetime( $DTT_ID );
+			$cur_status = $this->check_in_status_for_datetime($DTT_ID);
 			//what is the status message going to be?
-			switch ( $cur_status ) {
+			switch ($cur_status) {
 				case EE_Registration::checkin_status_never :
-					return sprintf( __( "%s has been removed from Check-in records", "event_espresso" ), $attendee->full_name() );
+					return sprintf(__("%s has been removed from Check-in records", "event_espresso"), $attendee->full_name());
 					break;
 				case EE_Registration::checkin_status_in :
-					return sprintf( __( '%s has been checked in', 'event_espresso' ), $attendee->full_name() );
+					return sprintf(__('%s has been checked in', 'event_espresso'), $attendee->full_name());
 					break;
 				case EE_Registration::checkin_status_out :
-					return sprintf( __( '%s has been checked out', 'event_espresso' ), $attendee->full_name() );
+					return sprintf(__('%s has been checked out', 'event_espresso'), $attendee->full_name());
 					break;
 			}
 		}
-		return __( "The check-in status could not be determined.", "event_espresso" );
+		return __("The check-in status could not be determined.", "event_espresso");
 	}
 
 
@@ -1152,7 +1152,7 @@ 
 	 * @return EE_Transaction
 	 */
 	public function transaction() {
-		return $this->get_first_related( 'Transaction' );
+		return $this->get_first_related('Transaction');
 	}
 
 
@@ -1163,7 +1163,7 @@ 
 	 * @access        public
 	 */
 	public function reg_code() {
-		return $this->get( 'REG_code' );
+		return $this->get('REG_code');
 	}
 
 
@@ -1173,7 +1173,7 @@ 
 	 * @access        public
 	 */
 	public function transaction_ID() {
-		return $this->get( 'TXN_ID' );
+		return $this->get('TXN_ID');
 	}
 
 
@@ -1182,7 +1182,7 @@ 
 	 * @return int
 	 */
 	public function ticket_ID() {
-		return $this->get( 'TKT_ID' );
+		return $this->get('TKT_ID');
 	}
 
 
@@ -1194,17 +1194,17 @@ 
 	 * @param    string $REG_code Registration Code
 	 * @param	boolean $use_default
 	 */
-	public function set_reg_code( $REG_code, $use_default = FALSE ) {
-		if ( empty( $REG_code )) {
-			EE_Error::add_error( __( 'REG_code can not be empty.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+	public function set_reg_code($REG_code, $use_default = FALSE) {
+		if (empty($REG_code)) {
+			EE_Error::add_error(__('REG_code can not be empty.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return;
 		}
-		if ( ! $this->reg_code() ) {
-			parent::set( 'REG_code', $REG_code, $use_default );
+		if ( ! $this->reg_code()) {
+			parent::set('REG_code', $REG_code, $use_default);
 		} else {
 			EE_Error::doing_it_wrong(
-				__CLASS__ . '::' . __FUNCTION__,
-				__( 'Can not change a registration REG_code once it has been set.', 'event_espresso' ),
+				__CLASS__.'::'.__FUNCTION__,
+				__('Can not change a registration REG_code once it has been set.', 'event_espresso'),
 				'4.6.0'
 			);
 		}
@@ -1224,17 +1224,17 @@ 
 	 * @return EE_Registration[]  or empty array if this isn't a group registration.
 	 */
 	public function get_all_other_registrations_in_group() {
-		if ( $this->group_size() < 2 ) {
+		if ($this->group_size() < 2) {
 			return array();
 		}
 
 		$query[0] = array(
 			'TXN_ID' => $this->transaction_ID(),
-			'REG_ID' => array( '!=', $this->ID() ),
+			'REG_ID' => array('!=', $this->ID()),
 			'TKT_ID' => $this->ticket_ID()
 			);
 
-		$registrations = $this->get_model()->get_all( $query );
+		$registrations = $this->get_model()->get_all($query);
 		return $registrations;
 	}
 
@@ -1246,7 +1246,7 @@ 
 	 * @access 	public
 	 */
 	public function price_paid() {
-		EE_Error::doing_it_wrong( 'EE_Registration::price_paid()', __( 'This method is deprecated, please use EE_Registration::final_price() instead.', 'event_espresso' ), '4.7.0' );
+		EE_Error::doing_it_wrong('EE_Registration::price_paid()', __('This method is deprecated, please use EE_Registration::final_price() instead.', 'event_espresso'), '4.7.0');
 		return $this->final_price();
 	}
 
@@ -1258,9 +1258,9 @@ 
 	 * @access    public
 	 * @param    float $REG_final_price
 	 */
-	public function set_price_paid( $REG_final_price = 0.00 ) {
-		EE_Error::doing_it_wrong( 'EE_Registration::set_price_paid()', __( 'This method is deprecated, please use EE_Registration::set_final_price() instead.', 'event_espresso' ), '4.7.0' );
-		$this->set_final_price( $REG_final_price );
+	public function set_price_paid($REG_final_price = 0.00) {
+		EE_Error::doing_it_wrong('EE_Registration::set_price_paid()', __('This method is deprecated, please use EE_Registration::set_final_price() instead.', 'event_espresso'), '4.7.0');
+		$this->set_final_price($REG_final_price);
 	}
 
 
@@ -1271,7 +1271,7 @@ 
 	 * @return string
 	 */
 	public function pretty_price_paid() {
-		EE_Error::doing_it_wrong( 'EE_Registration::pretty_price_paid()', __( 'This method is deprecated, please use EE_Registration::pretty_final_price() instead.', 'event_espresso' ), '4.7.0' );
+		EE_Error::doing_it_wrong('EE_Registration::pretty_price_paid()', __('This method is deprecated, please use EE_Registration::pretty_final_price() instead.', 'event_espresso'), '4.7.0');
 		return $this->pretty_final_price();
 	}
 

modules/add_new_state/EED_Add_New_State.module.php

Spacing +160 added lines, -160 removed lines

@@ -16,7 +16,7 @@ 
 	 * @return EED_Add_New_State
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -27,16 +27,16 @@ 
 	 *  	@return 		void
 	 */
 	public static function set_hooks() {
-		add_action( 'wp_loaded', array( 'EED_Add_New_State', 'set_definitions' ), 2 );
-		add_action( 'wp_enqueue_scripts', array( 'EED_Add_New_State', 'translate_js_strings' ), 0 );
-		add_action( 'wp_enqueue_scripts', array( 'EED_Add_New_State', 'wp_enqueue_scripts' ), 10 );
-		add_filter( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___question_group_reg_form__question_group_reg_form', array( 'EED_Add_New_State', 'display_add_new_state_micro_form' ), 1, 1 );
-		add_filter( 'FHEE__EE_SPCO_Reg_Step_Payment_Options___get_billing_form_for_payment_method__billing_form', array( 'EED_Add_New_State', 'display_add_new_state_micro_form' ), 1, 1 );
-		add_filter( 'FHEE__EE_Single_Page_Checkout__process_attendee_information__valid_data_line_item', array( 'EED_Add_New_State', 'unset_new_state_request_params' ), 10, 1 );
-		add_filter( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__state_options', array( 'EED_Add_New_State', 'inject_new_reg_state_into_options' ), 10, 5 );
-		add_filter( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__country_options', array( 'EED_Add_New_State', 'inject_new_reg_country_into_options' ), 10, 5 );
-		add_filter( 'FHEE__EE_State_Select_Input____construct__state_options', array( 'EED_Add_New_State', 'state_options' ), 10, 1 );
-		add_filter( 'FHEE__EE_Country_Select_Input____construct__country_options', array( 'EED_Add_New_State', 'country_options' ), 10, 1 );
+		add_action('wp_loaded', array('EED_Add_New_State', 'set_definitions'), 2);
+		add_action('wp_enqueue_scripts', array('EED_Add_New_State', 'translate_js_strings'), 0);
+		add_action('wp_enqueue_scripts', array('EED_Add_New_State', 'wp_enqueue_scripts'), 10);
+		add_filter('FHEE__EE_SPCO_Reg_Step_Attendee_Information___question_group_reg_form__question_group_reg_form', array('EED_Add_New_State', 'display_add_new_state_micro_form'), 1, 1);
+		add_filter('FHEE__EE_SPCO_Reg_Step_Payment_Options___get_billing_form_for_payment_method__billing_form', array('EED_Add_New_State', 'display_add_new_state_micro_form'), 1, 1);
+		add_filter('FHEE__EE_Single_Page_Checkout__process_attendee_information__valid_data_line_item', array('EED_Add_New_State', 'unset_new_state_request_params'), 10, 1);
+		add_filter('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__state_options', array('EED_Add_New_State', 'inject_new_reg_state_into_options'), 10, 5);
+		add_filter('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__country_options', array('EED_Add_New_State', 'inject_new_reg_country_into_options'), 10, 5);
+		add_filter('FHEE__EE_State_Select_Input____construct__state_options', array('EED_Add_New_State', 'state_options'), 10, 1);
+		add_filter('FHEE__EE_Country_Select_Input____construct__country_options', array('EED_Add_New_State', 'country_options'), 10, 1);
 	}
 
 	/**
@@ -46,19 +46,19 @@ 
 	 *  	@return 		void
 	 */
 	public static function set_hooks_admin() {
-		add_action( 'wp_loaded', array( 'EED_Add_New_State', 'set_definitions' ), 2 );
-		add_filter( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___question_group_reg_form__question_group_reg_form', array( 'EED_Add_New_State', 'display_add_new_state_micro_form' ), 1, 1 );
-		add_filter( 'FHEE__EE_SPCO_Reg_Step_Payment_Options___get_billing_form_for_payment_method__billing_form', array( 'EED_Add_New_State', 'display_add_new_state_micro_form' ), 1, 1 );
-		add_action( 'wp_ajax_espresso_add_new_state', array( 'EED_Add_New_State', 'add_new_state' ));
-		add_action( 'wp_ajax_nopriv_espresso_add_new_state', array( 'EED_Add_New_State', 'add_new_state' ));
-		add_filter( 'FHEE__EE_Single_Page_Checkout__process_attendee_information__valid_data_line_item', array( 'EED_Add_New_State', 'unset_new_state_request_params' ), 10, 1 );
-		add_action( 'AHEE__General_Settings_Admin_Page__update_country_settings__state_saved', array( 'EED_Add_New_State', 'update_country_settings' ), 10, 3 );
-		add_action( 'AHEE__General_Settings_Admin_Page__delete_state__state_deleted', array( 'EED_Add_New_State', 'update_country_settings' ), 10, 3 );
-		add_filter( 'FHEE__EE_State_Select_Input____construct__state_options', array( 'EED_Add_New_State', 'state_options' ), 10, 1 );
-		add_filter( 'FHEE__EE_Country_Select_Input____construct__country_options', array( 'EED_Add_New_State', 'country_options' ), 10, 1 );
-		add_filter( 'FHEE__Single_Page_Checkout___check_form_submission__request_params', array( 'EED_Add_New_State', 'filter_checkout_request_params' ), 10, 1 );
-		add_filter( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__state_options', array( 'EED_Add_New_State', 'inject_new_reg_state_into_options' ), 10, 5 );
-		add_filter( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__country_options', array( 'EED_Add_New_State', 'inject_new_reg_country_into_options' ), 10, 5 );
+		add_action('wp_loaded', array('EED_Add_New_State', 'set_definitions'), 2);
+		add_filter('FHEE__EE_SPCO_Reg_Step_Attendee_Information___question_group_reg_form__question_group_reg_form', array('EED_Add_New_State', 'display_add_new_state_micro_form'), 1, 1);
+		add_filter('FHEE__EE_SPCO_Reg_Step_Payment_Options___get_billing_form_for_payment_method__billing_form', array('EED_Add_New_State', 'display_add_new_state_micro_form'), 1, 1);
+		add_action('wp_ajax_espresso_add_new_state', array('EED_Add_New_State', 'add_new_state'));
+		add_action('wp_ajax_nopriv_espresso_add_new_state', array('EED_Add_New_State', 'add_new_state'));
+		add_filter('FHEE__EE_Single_Page_Checkout__process_attendee_information__valid_data_line_item', array('EED_Add_New_State', 'unset_new_state_request_params'), 10, 1);
+		add_action('AHEE__General_Settings_Admin_Page__update_country_settings__state_saved', array('EED_Add_New_State', 'update_country_settings'), 10, 3);
+		add_action('AHEE__General_Settings_Admin_Page__delete_state__state_deleted', array('EED_Add_New_State', 'update_country_settings'), 10, 3);
+		add_filter('FHEE__EE_State_Select_Input____construct__state_options', array('EED_Add_New_State', 'state_options'), 10, 1);
+		add_filter('FHEE__EE_Country_Select_Input____construct__country_options', array('EED_Add_New_State', 'country_options'), 10, 1);
+		add_filter('FHEE__Single_Page_Checkout___check_form_submission__request_params', array('EED_Add_New_State', 'filter_checkout_request_params'), 10, 1);
+		add_filter('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__state_options', array('EED_Add_New_State', 'inject_new_reg_state_into_options'), 10, 5);
+		add_filter('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__country_options', array('EED_Add_New_State', 'inject_new_reg_country_into_options'), 10, 5);
 	}
 
 
@@ -70,8 +70,8 @@ 
 	 *  	@return 		void
 	 */
 	public static function set_definitions() {
-		define( 'ANS_ASSETS_URL', plugin_dir_url( __FILE__ ) . 'assets' . DS );
-		define( 'ANS_TEMPLATES_PATH', str_replace( '\\', DS, plugin_dir_path( __FILE__ )) . 'templates' . DS );
+		define('ANS_ASSETS_URL', plugin_dir_url(__FILE__).'assets'.DS);
+		define('ANS_TEMPLATES_PATH', str_replace('\\', DS, plugin_dir_path(__FILE__)).'templates'.DS);
 	}
 
 
@@ -83,7 +83,7 @@ 
 	 * @param \WP $WP
 	 * @return        void
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
 	}
 
 
@@ -111,9 +111,9 @@ 
 	 * 	@return 		void
 	 */
 	public static function wp_enqueue_scripts() {
-		if ( apply_filters( 'EED_Single_Page_Checkout__SPCO_active', false ) ) {
-			wp_register_script( 'add_new_state', ANS_ASSETS_URL . 'add_new_state.js', array( 'espresso_core', 'single_page_checkout' ), EVENT_ESPRESSO_VERSION, true );
-			wp_enqueue_script( 'add_new_state' );
+		if (apply_filters('EED_Single_Page_Checkout__SPCO_active', false)) {
+			wp_register_script('add_new_state', ANS_ASSETS_URL.'add_new_state.js', array('espresso_core', 'single_page_checkout'), EVENT_ESPRESSO_VERSION, true);
+			wp_enqueue_script('add_new_state');
 		}
 	}
 
@@ -127,30 +127,30 @@ 
 	 * @return 	string
 	 */
 //	public static function display_add_new_state_micro_form( $html, EE_Form_Input_With_Options_Base $input ){
-	public static function display_add_new_state_micro_form( EE_Form_Section_Proper $question_group_reg_form ){
+	public static function display_add_new_state_micro_form(EE_Form_Section_Proper $question_group_reg_form) {
 		// only add the 'new_state_micro_form' when displaying reg forms,
 		// not during processing since we process the 'new_state_micro_form' in it's own AJAX request
-		$action = EE_Registry::instance()->REQ->get( 'action', '' );
-		if ( $action === 'process_reg_step' || $action === 'update_reg_step' ) {
+		$action = EE_Registry::instance()->REQ->get('action', '');
+		if ($action === 'process_reg_step' || $action === 'update_reg_step') {
 			return $question_group_reg_form;
 		}
 		// is the "state" question in this form section?
-		$input = $question_group_reg_form->get_subsection( 'state' );
+		$input = $question_group_reg_form->get_subsection('state');
 		// we're only doing this for state select inputs
-		if ( $input instanceof EE_State_Select_Input ) {
+		if ($input instanceof EE_State_Select_Input) {
 			// load helpers
-			EE_Registry::instance()->load_helper( 'HTML' );
+			EE_Registry::instance()->load_helper('HTML');
 			// grab any set values from the request
-			$country_name = str_replace( 'state', 'new_state_country', $input->html_name() );
-			$state_name = str_replace( 'state', 'new_state_name', $input->html_name() );
-			$abbrv_name = str_replace( 'state', 'new_state_abbrv', $input->html_name() );
-			$new_state_submit_id = str_replace( 'state', 'new_state', $input->html_id() );
+			$country_name = str_replace('state', 'new_state_country', $input->html_name());
+			$state_name = str_replace('state', 'new_state_name', $input->html_name());
+			$abbrv_name = str_replace('state', 'new_state_abbrv', $input->html_name());
+			$new_state_submit_id = str_replace('state', 'new_state', $input->html_id());
 			$country_options = array();
 			$countries = EEM_Country::instance()->get_all_countries();
-			if ( ! empty( $countries )) {
-				foreach( $countries as $country ){
-					if ( $country instanceof EE_Country ) {
-						$country_options[ $country->ID() ] = $country->name();
+			if ( ! empty($countries)) {
+				foreach ($countries as $country) {
+					if ($country instanceof EE_Country) {
+						$country_options[$country->ID()] = $country->name();
 					}
 				}
 			}
@@ -163,8 +163,8 @@ 
 						// add hidden input to indicate that a new state is being added
 						'add_new_state' 	=> new EE_Hidden_Input(
 							array(
-								'html_name' 	=> str_replace( 'state', 'add_new_state', $input->html_name() ),
-								'html_id' 			=> str_replace( 'state', 'add_new_state', $input->html_id() ),
+								'html_name' 	=> str_replace('state', 'add_new_state', $input->html_name()),
+								'html_id' 			=> str_replace('state', 'add_new_state', $input->html_id()),
 								'default'			=> 0
 							)
 						),
@@ -176,10 +176,10 @@ 
 									'',
 									__('click here to add a new state/province', 'event_espresso'),
 									'',
-									'display-' . $input->html_id(),
+									'display-'.$input->html_id(),
 									'ee-form-add-new-state-lnk display-the-hidden smaller-text hide-if-no-js',
 									'',
-									'rel="' . $input->html_id() . '"'
+									'rel="'.$input->html_id().'"'
 								)
 							)
 						),
@@ -187,13 +187,13 @@ 
 						'add_new_state_micro_form' =>new EE_Form_Section_HTML(
 							apply_filters(
 								'FHEE__EED_Add_New_State__display_add_new_state_micro_form__add_new_state_micro_form',
-								EEH_HTML::div( '', $input->html_id() . '-dv', 'ee-form-add-new-state-dv', 'display: none;' ) .
-								EEH_HTML::h6( __('If your State/Province does not appear in the list above, you can easily add it by doing the following:', 'event_espresso')) .
-								EEH_HTML::ul() .
-								EEH_HTML::li( __('first select the Country that your State/Province belongs to', 'event_espresso') ) .
-								EEH_HTML::li( __('enter the name of your State/Province', 'event_espresso') ) .
-								EEH_HTML::li( __('enter a two to six letter abbreviation for the name of your State/Province', 'event_espresso') ) .
-								EEH_HTML::li( __('click the ADD button', 'event_espresso') ) .
+								EEH_HTML::div('', $input->html_id().'-dv', 'ee-form-add-new-state-dv', 'display: none;').
+								EEH_HTML::h6(__('If your State/Province does not appear in the list above, you can easily add it by doing the following:', 'event_espresso')).
+								EEH_HTML::ul().
+								EEH_HTML::li(__('first select the Country that your State/Province belongs to', 'event_espresso')).
+								EEH_HTML::li(__('enter the name of your State/Province', 'event_espresso')).
+								EEH_HTML::li(__('enter a two to six letter abbreviation for the name of your State/Province', 'event_espresso')).
+								EEH_HTML::li(__('click the ADD button', 'event_espresso')).
 								EEH_HTML::ulx()
 							)
 						),
@@ -202,10 +202,10 @@ 
 							$country_options,
 							array(
 								'html_name' 			=> $country_name,
-								'html_id' 					=> str_replace( 'state', 'new_state_country', $input->html_id() ),
-								'html_class' 			=> $input->html_class() . ' new-state-country',
+								'html_id' 					=> str_replace('state', 'new_state_country', $input->html_id()),
+								'html_class' 			=> $input->html_class().' new-state-country',
 								'html_label_text'		=> __('New State/Province Country', 'event_espresso'),
-								'default'					=> EE_Registry::instance()->REQ->get( $country_name, '' ),
+								'default'					=> EE_Registry::instance()->REQ->get($country_name, ''),
 								'required' 				=> false
 							)
 						),
@@ -213,23 +213,23 @@ 
 						'new_state_name' => new EE_Text_Input(
 							array(
 								'html_name' 			=> $state_name,
-								'html_id' 					=> str_replace( 'state', 'new_state_name', $input->html_id() ),
-								'html_class' 			=> $input->html_class() . ' new-state-state',
+								'html_id' 					=> str_replace('state', 'new_state_name', $input->html_id()),
+								'html_class' 			=> $input->html_class().' new-state-state',
 								'html_label_text'		=> __('New State/Province Name', 'event_espresso'),
-								'default'					=> EE_Registry::instance()->REQ->get( $state_name, '' ),
+								'default'					=> EE_Registry::instance()->REQ->get($state_name, ''),
 								'required' 				=> false
 							)
 						),
-						'spacer' => new EE_Form_Section_HTML( EEH_HTML::br() ),
+						'spacer' => new EE_Form_Section_HTML(EEH_HTML::br()),
 						// NEW STATE NAME
 						'new_state_abbrv' => new EE_Text_Input(
 							array(
 								'html_name' 					=> $abbrv_name,
-								'html_id' 							=> str_replace( 'state', 'new_state_abbrv', $input->html_id() ),
-								'html_class' 					=> $input->html_class() . ' new-state-abbrv',
+								'html_id' 							=> str_replace('state', 'new_state_abbrv', $input->html_id()),
+								'html_class' 					=> $input->html_class().' new-state-abbrv',
 								'html_label_text'				=> __('New State/Province Abbreviation', 'event_espresso'),
 								'html_other_attributes'	=> 'size="24"',
-								'default'							=> EE_Registry::instance()->REQ->get( $abbrv_name, '' ),
+								'default'							=> EE_Registry::instance()->REQ->get($abbrv_name, ''),
 								'required' 						=> false
 							)
 						),
@@ -237,26 +237,26 @@ 
 						'add_new_state_submit_button' => new EE_Form_Section_HTML(
 							apply_filters(
 								'FHEE__EED_Add_New_State__display_add_new_state_micro_form__add_new_state_submit_button',
-								EEH_HTML::nbsp(3) .
-								EEH_HTML::link( '', __('ADD', 'event_espresso'), '', 'submit-' . $new_state_submit_id, 'ee-form-add-new-state-submit button button-secondary', '', 'rel="' . $new_state_submit_id . '"' )
+								EEH_HTML::nbsp(3).
+								EEH_HTML::link('', __('ADD', 'event_espresso'), '', 'submit-'.$new_state_submit_id, 'ee-form-add-new-state-submit button button-secondary', '', 'rel="'.$new_state_submit_id.'"')
 							)
 						),
 						// extra info
 						'add_new_state_extra' => new EE_Form_Section_HTML(
 							apply_filters(
 								'FHEE__EED_Add_New_State__display_add_new_state_micro_form__add_new_state_extra',
-								EEH_HTML::br(2) .
-								EEH_HTML::div( '', '', 'small-text' ) .
-								EEH_HTML::strong( __('Don\'t know your State/Province Abbreviation?', 'event_espresso') ) .
-								EEH_HTML::br() .
+								EEH_HTML::br(2).
+								EEH_HTML::div('', '', 'small-text').
+								EEH_HTML::strong(__('Don\'t know your State/Province Abbreviation?', 'event_espresso')).
+								EEH_HTML::br().
 								sprintf(
 									__('You can look here: %s, for a list of Countries and links to their State/Province Abbreviations ("Subdivisions assigned codes" column).', 'event_espresso'),
-									EEH_HTML::link( 'http://en.wikipedia.org/wiki/ISO_3166-2', 'http://en.wikipedia.org/wiki/ISO_3166-2', '', '', 'ee-form-add-new-state-wiki-lnk' )
-								) .
-								EEH_HTML::divx() .
-								EEH_HTML::br() .
-								EEH_HTML::link( '', __('cancel new state/province', 'event_espresso'), '', 'hide-' . $input->html_id(), 'ee-form-cancel-new-state-lnk smaller-text', '', 'rel="' . $input->html_id() . '"' ) .
-								EEH_HTML::divx() .
+									EEH_HTML::link('http://en.wikipedia.org/wiki/ISO_3166-2', 'http://en.wikipedia.org/wiki/ISO_3166-2', '', '', 'ee-form-add-new-state-wiki-lnk')
+								).
+								EEH_HTML::divx().
+								EEH_HTML::br().
+								EEH_HTML::link('', __('cancel new state/province', 'event_espresso'), '', 'hide-'.$input->html_id(), 'ee-form-cancel-new-state-lnk smaller-text', '', 'rel="'.$input->html_id().'"').
+								EEH_HTML::divx().
 								EEH_HTML::br()
 							)
 						)
@@ -264,7 +264,7 @@ 
 					)
 				)
 			);
-			$question_group_reg_form->add_subsections( array( 'new_state_micro_form' => $new_state_micro_form ), 'state', false );
+			$question_group_reg_form->add_subsections(array('new_state_micro_form' => $new_state_micro_form), 'state', false);
 		}
 		return $question_group_reg_form;
 	}
@@ -281,41 +281,41 @@ 
 	 */
 	public static function add_new_state() {
 		$REQ = EE_Registry::instance()->load_core('Request_Handler');
-		if ( $REQ->is_set( 'add_new_state' ) && $REQ->get( 'add_new_state' ) == 1 ) {
+		if ($REQ->is_set('add_new_state') && $REQ->get('add_new_state') == 1) {
 			EE_Registry::instance()->load_model('State');
 			// grab country ISO code, new state name, and new state abbreviation
-			$state_country = $REQ->is_set( 'new_state_country' ) ? sanitize_text_field( $REQ->get( 'new_state_country' )) : FALSE;
-			$state_name = $REQ->is_set( 'new_state_name' ) ? sanitize_text_field( $REQ->get( 'new_state_name' )) : FALSE;
-			$state_abbr = $REQ->is_set( 'new_state_abbrv' ) ? sanitize_text_field( $REQ->get( 'new_state_abbrv' )) : FALSE;
+			$state_country = $REQ->is_set('new_state_country') ? sanitize_text_field($REQ->get('new_state_country')) : FALSE;
+			$state_name = $REQ->is_set('new_state_name') ? sanitize_text_field($REQ->get('new_state_name')) : FALSE;
+			$state_abbr = $REQ->is_set('new_state_abbrv') ? sanitize_text_field($REQ->get('new_state_abbrv')) : FALSE;
 
 //echo '<h4>$state_country : ' . $state_country . '  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>';
 //echo '<h4>$state_name : ' . $state_name . '  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>';
 //echo '<h4>$state_abbr : ' . $state_abbr . '  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>';
 
-			if ( $state_country && $state_name && $state_abbr ) {
-				$new_state = EED_Add_New_State::save_new_state_to_db( array(
-					'CNT_ISO'=> strtoupper( $state_country ),
-					'STA_abbrev' => strtoupper( $state_abbr ),
-					'STA_name' => ucwords( $state_name ),
+			if ($state_country && $state_name && $state_abbr) {
+				$new_state = EED_Add_New_State::save_new_state_to_db(array(
+					'CNT_ISO'=> strtoupper($state_country),
+					'STA_abbrev' => strtoupper($state_abbr),
+					'STA_name' => ucwords($state_name),
 					'STA_active' => FALSE
 				));
 
-				if ( $new_state instanceof EE_State ) {
+				if ($new_state instanceof EE_State) {
 					// clean house
-					EE_Registry::instance()->REQ->un_set( 'add_new_state' );
-					EE_Registry::instance()->REQ->un_set( 'new_state_country' );
-					EE_Registry::instance()->REQ->un_set( 'new_state_name' );
-					EE_Registry::instance()->REQ->un_set( 'new_state_abbrv' );
+					EE_Registry::instance()->REQ->un_set('add_new_state');
+					EE_Registry::instance()->REQ->un_set('new_state_country');
+					EE_Registry::instance()->REQ->un_set('new_state_name');
+					EE_Registry::instance()->REQ->un_set('new_state_abbrv');
 
 					// get any existing new states
 					$new_states = EE_Registry::instance()->SSN->get_session_data(
 						'new_states'
 					);
-					$new_states[ $new_state->ID() ] = $new_state;
-					EE_Registry::instance()->SSN->set_session_data( array( 'new_states' => $new_states ));
+					$new_states[$new_state->ID()] = $new_state;
+					EE_Registry::instance()->SSN->set_session_data(array('new_states' => $new_states));
 
-					if ( EE_Registry::instance()->REQ->ajax ) {
-						echo json_encode( array(
+					if (EE_Registry::instance()->REQ->ajax) {
+						echo json_encode(array(
 							'success' => TRUE,
 							'id' => $new_state->ID(),
 							'name' => $new_state->name(),
@@ -330,12 +330,12 @@ 
 				}
 
 			} else {
-				$error = __( 'A new State/Province could not be added because invalid or missing data was received.', 'event_espresso' );
-				if ( EE_Registry::instance()->REQ->ajax ) {
-					echo json_encode( array( 'error' => $error ));
+				$error = __('A new State/Province could not be added because invalid or missing data was received.', 'event_espresso');
+				if (EE_Registry::instance()->REQ->ajax) {
+					echo json_encode(array('error' => $error));
 					exit();
 				} else {
-					EE_Error::add_error( $error, __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_error($error, __FILE__, __FUNCTION__, __LINE__);
 				}
 			}
 		}
@@ -353,11 +353,11 @@ 
 	 * @param array $request_params
 	 * @return array
 	 */
-	public static function filter_checkout_request_params ( $request_params ) {
-		foreach ( $request_params as $form_section ) {
-			if ( is_array( $form_section )) {
-				EED_Add_New_State::unset_new_state_request_params( $form_section );
-				EED_Add_New_State::filter_checkout_request_params( $form_section );
+	public static function filter_checkout_request_params($request_params) {
+		foreach ($request_params as $form_section) {
+			if (is_array($form_section)) {
+				EED_Add_New_State::unset_new_state_request_params($form_section);
+				EED_Add_New_State::filter_checkout_request_params($form_section);
 			}
 		}
 		return $request_params;
@@ -372,12 +372,12 @@ 
 	 * @param array $request_params
 	 * @return        boolean
 	 */
-	public static function unset_new_state_request_params ( $request_params ) {
-		unset( $request_params[ 'new_state_micro_form' ] );
-		unset( $request_params[ 'add_new_state' ] );
-		unset( $request_params[ 'new_state_country' ] );
-		unset( $request_params[ 'new_state_name' ] );
-		unset( $request_params[ 'new_state_abbrv' ] );
+	public static function unset_new_state_request_params($request_params) {
+		unset($request_params['new_state_micro_form']);
+		unset($request_params['add_new_state']);
+		unset($request_params['new_state_country']);
+		unset($request_params['new_state_name']);
+		unset($request_params['new_state_abbrv']);
 		return $request_params;
 	}
 
@@ -390,25 +390,25 @@ 
 	 * @param array $props_n_values
 	 * @return        boolean
 	 */
-	public static function save_new_state_to_db ( $props_n_values = array() ) {
+	public static function save_new_state_to_db($props_n_values = array()) {
 //		EEH_Debug_Tools::printr( $props_n_values, '$props_n_values  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-		$existing_state = EEM_State::instance()->get_all( array( $props_n_values, 'limit' => 1 ));
-		if ( ! empty( $existing_state )) {
-			return array_pop( $existing_state );
+		$existing_state = EEM_State::instance()->get_all(array($props_n_values, 'limit' => 1));
+		if ( ! empty($existing_state)) {
+			return array_pop($existing_state);
 		}
-		$new_state = EE_State::new_instance( $props_n_values );
-		if ( $new_state instanceof EE_State ) {
+		$new_state = EE_State::new_instance($props_n_values);
+		if ($new_state instanceof EE_State) {
 			// if not non-ajax admin
-			$new_state_key = $new_state->country_iso() . '-' . $new_state->abbrev();
+			$new_state_key = $new_state->country_iso().'-'.$new_state->abbrev();
 			$new_state_notice = sprintf(
-					__( 'A new State named "%1$s (%2$s)" was dynamically added from an Event Espresso form for the Country of "%3$s".%5$sTo verify, edit, and/or delete this new State, please go to the %4$s and update the States / Provinces section.%5$sCheck "Yes" to have this new State added to dropdown select lists in forms.', 'event_espresso' ),
-					'<b>' . $new_state->name() . '</b>',
-					'<b>' . $new_state->abbrev() . '</b>',
-					'<b>' . $new_state->country()->name() . '</b>',
-					'<a href="' . add_query_arg( array( 'page' => 'espresso_general_settings', 'action' => 'country_settings', 'country' => $new_state->country_iso() ), admin_url( 'admin.php' )) . '">' . __( 'Event Espresso - General Settings > Countries Tab', 'event_espresso' ) . '</a>',
+					__('A new State named "%1$s (%2$s)" was dynamically added from an Event Espresso form for the Country of "%3$s".%5$sTo verify, edit, and/or delete this new State, please go to the %4$s and update the States / Provinces section.%5$sCheck "Yes" to have this new State added to dropdown select lists in forms.', 'event_espresso'),
+					'<b>'.$new_state->name().'</b>',
+					'<b>'.$new_state->abbrev().'</b>',
+					'<b>'.$new_state->country()->name().'</b>',
+					'<a href="'.add_query_arg(array('page' => 'espresso_general_settings', 'action' => 'country_settings', 'country' => $new_state->country_iso()), admin_url('admin.php')).'">'.__('Event Espresso - General Settings > Countries Tab', 'event_espresso').'</a>',
 					'<br />'
 			);
-			EE_Error::add_persistent_admin_notice( $new_state_key, $new_state_notice );
+			EE_Error::add_persistent_admin_notice($new_state_key, $new_state_notice);
 			$new_state->save();
 			EEM_State::instance()->reset_cached_states();
 			return $new_state;
@@ -427,22 +427,22 @@ 
 	 * @param array  $cols_n_values
 	 * @return        boolean
 	 */
-	public static function update_country_settings( $CNT_ISO = '', $STA_ID = '', $cols_n_values = array() ) {
-		$CNT_ISO = ! empty( $CNT_ISO ) ? $CNT_ISO : FALSE;
-		if ( ! $CNT_ISO ) {
-			EE_Error::add_error( __( 'An invalid or missing Country ISO Code was received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+	public static function update_country_settings($CNT_ISO = '', $STA_ID = '', $cols_n_values = array()) {
+		$CNT_ISO = ! empty($CNT_ISO) ? $CNT_ISO : FALSE;
+		if ( ! $CNT_ISO) {
+			EE_Error::add_error(__('An invalid or missing Country ISO Code was received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
-		$STA_abbrev = is_array( $cols_n_values ) && isset( $cols_n_values['STA_abbrev'] ) ? $cols_n_values['STA_abbrev'] : FALSE;
-		if (  ! $STA_abbrev && ! empty( $STA_ID )) {
-			$state = EEM_State::instance()->get_one_by_ID( $STA_ID );
-			if ( $state instanceof EE_State ) {
+		$STA_abbrev = is_array($cols_n_values) && isset($cols_n_values['STA_abbrev']) ? $cols_n_values['STA_abbrev'] : FALSE;
+		if ( ! $STA_abbrev && ! empty($STA_ID)) {
+			$state = EEM_State::instance()->get_one_by_ID($STA_ID);
+			if ($state instanceof EE_State) {
 				$STA_abbrev = $state->abbrev();
 			}
 		}
-		if ( ! $STA_abbrev ) {
-			EE_Error::add_error( __( 'An invalid or missing State Abbreviation was received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $STA_abbrev) {
+			EE_Error::add_error(__('An invalid or missing State Abbreviation was received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
-		EE_Error::dismiss_persistent_admin_notice( $CNT_ISO . '-' . $STA_abbrev, TRUE, TRUE );
+		EE_Error::dismiss_persistent_admin_notice($CNT_ISO.'-'.$STA_abbrev, TRUE, TRUE);
 	}
 
 
@@ -458,19 +458,19 @@ 
 	 * @param $answer
 	 * @return bool
 	 */
-	public static function inject_new_reg_state_into_options( $state_options = array(), EE_SPCO_Reg_Step_Attendee_Information $reg_step, EE_Registration $registration, EE_Question $question, $answer ) {
-		if ( $answer instanceof EE_Answer  && $question instanceof EE_Question && $question->type() === EEM_Question::QST_type_state ) {
+	public static function inject_new_reg_state_into_options($state_options = array(), EE_SPCO_Reg_Step_Attendee_Information $reg_step, EE_Registration $registration, EE_Question $question, $answer) {
+		if ($answer instanceof EE_Answer && $question instanceof EE_Question && $question->type() === EEM_Question::QST_type_state) {
 			$STA_ID = $answer->value();
-			if ( ! empty( $STA_ID ) ) {
-				$state = EEM_State::instance()->get_one_by_ID( $STA_ID );
-				if ( $state instanceof EE_State ) {
+			if ( ! empty($STA_ID)) {
+				$state = EEM_State::instance()->get_one_by_ID($STA_ID);
+				if ($state instanceof EE_State) {
 					$country = $state->country();
-					if ( $country instanceof EE_Country ) {
-						if ( ! isset( $state_options[ $country->name() ] )) {
-							$state_options[ $country->name() ] = array();
+					if ($country instanceof EE_Country) {
+						if ( ! isset($state_options[$country->name()])) {
+							$state_options[$country->name()] = array();
 						}
-						if ( ! isset( $state_options[ $country->name() ][ $STA_ID ] )) {
-							$state_options[ $country->name() ][ $STA_ID ] = $state->name();
+						if ( ! isset($state_options[$country->name()][$STA_ID])) {
+							$state_options[$country->name()][$STA_ID] = $state->name();
 						}
 					}
 				}
@@ -492,14 +492,14 @@ 
 	 * @param $answer
 	 * @return bool
 	 */
-	public static function inject_new_reg_country_into_options( $country_options = array(), EE_SPCO_Reg_Step_Attendee_Information $reg_step, EE_Registration $registration, EE_Question $question, $answer ) {
-		if ( $answer instanceof EE_Answer && $question instanceof EE_Question && $question->type() === EEM_Question::QST_type_country ) {
+	public static function inject_new_reg_country_into_options($country_options = array(), EE_SPCO_Reg_Step_Attendee_Information $reg_step, EE_Registration $registration, EE_Question $question, $answer) {
+		if ($answer instanceof EE_Answer && $question instanceof EE_Question && $question->type() === EEM_Question::QST_type_country) {
 			$CNT_ISO = $answer->value();
-			if ( ! empty( $CNT_ISO ) ) {
-				$country = EEM_Country::instance()->get_one_by_ID( $CNT_ISO );
-				if ( $country instanceof EE_Country ) {
-					if ( ! isset( $country_options[ $CNT_ISO ] ) ) {
-						$country_options[ $CNT_ISO ] = $country->name();
+			if ( ! empty($CNT_ISO)) {
+				$country = EEM_Country::instance()->get_one_by_ID($CNT_ISO);
+				if ($country instanceof EE_Country) {
+					if ( ! isset($country_options[$CNT_ISO])) {
+						$country_options[$CNT_ISO] = $country->name();
 					}
 				}
 			}
@@ -516,17 +516,17 @@ 
 	 * @param EE_State[]  $state_options
 	 * @return        boolean
 	 */
-	public static function state_options( $state_options = array() ) {
+	public static function state_options($state_options = array()) {
 		$new_states = EE_Registry::instance()->SSN->get_session_data(
 			'new_states'
 		);
-		if ( is_array( $new_states ) && ! empty( $new_states )) {
-			foreach ( $new_states as $new_state ) {
+		if (is_array($new_states) && ! empty($new_states)) {
+			foreach ($new_states as $new_state) {
 				if (
 					$new_state instanceof EE_State
 					&& $new_state->country() instanceof EE_Country
 				) {
-					$state_options[ $new_state->country()->name() ][ $new_state->ID() ] = $new_state->name();
+					$state_options[$new_state->country()->name()][$new_state->ID()] = $new_state->name();
 				}
 			}
 		}
@@ -542,17 +542,17 @@ 
 	 * @param EE_Country[]  $country_options
 	 * @return        boolean
 	 */
-	public static function country_options( $country_options = array() ) {
+	public static function country_options($country_options = array()) {
 		$new_states = EE_Registry::instance()->SSN->get_session_data(
 			'new_states'
 		);
-		if ( is_array( $new_states ) && ! empty( $new_states )) {
-			foreach ( $new_states as $new_state ) {
+		if (is_array($new_states) && ! empty($new_states)) {
+			foreach ($new_states as $new_state) {
 				if (
 					$new_state instanceof EE_State
 					&& $new_state->country() instanceof EE_Country
 				) {
-					$country_options[ $new_state->country()->ID() ] = $new_state->country()->name();
+					$country_options[$new_state->country()->ID()] = $new_state->country()->name();
 				}
 			}
 		}

modules/single_page_checkout/EED_Single_Page_Checkout.module.php

Spacing +273 added lines, -273 removed lines

@@ -38,8 +38,8 @@ 
 	 * @return EED_Single_Page_Checkout
 	 */
 	public static function instance() {
-		add_filter( 'EED_Single_Page_Checkout__SPCO_active', '__return_true' );
-		return parent::get_instance( __CLASS__ );
+		add_filter('EED_Single_Page_Checkout__SPCO_active', '__return_true');
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -84,22 +84,22 @@ 
 	 */
 	public static function set_hooks_admin() {
 		EED_Single_Page_Checkout::set_definitions();
-		if ( defined( 'DOING_AJAX' )) {
+		if (defined('DOING_AJAX')) {
 			// going to start an output buffer in case anything gets accidentally output that might disrupt our JSON response
 			ob_start();
 			EED_Single_Page_Checkout::load_request_handler();
 			EED_Single_Page_Checkout::load_reg_steps();
 		} else {
 			// hook into the top of pre_get_posts to set the reg step routing, which gives other modules or plugins a chance to modify the reg steps, but just before the routes get called
-			add_action( 'pre_get_posts', array( 'EED_Single_Page_Checkout', 'load_reg_steps' ), 1 );
+			add_action('pre_get_posts', array('EED_Single_Page_Checkout', 'load_reg_steps'), 1);
 		}
 		// set ajax hooks
-		add_action( 'wp_ajax_process_reg_step', array( 'EED_Single_Page_Checkout', 'process_reg_step' ));
-		add_action( 'wp_ajax_nopriv_process_reg_step', array( 'EED_Single_Page_Checkout', 'process_reg_step' ));
-		add_action( 'wp_ajax_display_spco_reg_step', array( 'EED_Single_Page_Checkout', 'display_reg_step' ));
-		add_action( 'wp_ajax_nopriv_display_spco_reg_step', array( 'EED_Single_Page_Checkout', 'display_reg_step' ));
-		add_action( 'wp_ajax_update_reg_step', array( 'EED_Single_Page_Checkout', 'update_reg_step' ));
-		add_action( 'wp_ajax_nopriv_update_reg_step', array( 'EED_Single_Page_Checkout', 'update_reg_step' ));
+		add_action('wp_ajax_process_reg_step', array('EED_Single_Page_Checkout', 'process_reg_step'));
+		add_action('wp_ajax_nopriv_process_reg_step', array('EED_Single_Page_Checkout', 'process_reg_step'));
+		add_action('wp_ajax_display_spco_reg_step', array('EED_Single_Page_Checkout', 'display_reg_step'));
+		add_action('wp_ajax_nopriv_display_spco_reg_step', array('EED_Single_Page_Checkout', 'display_reg_step'));
+		add_action('wp_ajax_update_reg_step', array('EED_Single_Page_Checkout', 'update_reg_step'));
+		add_action('wp_ajax_nopriv_update_reg_step', array('EED_Single_Page_Checkout', 'update_reg_step'));
 	}
 
 
@@ -108,8 +108,8 @@ 
 	 * 	process ajax request
 	 * @param string $ajax_action
 	 */
-	public static function process_ajax_request( $ajax_action ) {
-		EE_Registry::instance()->REQ->set( 'action', $ajax_action );
+	public static function process_ajax_request($ajax_action) {
+		EE_Registry::instance()->REQ->set('action', $ajax_action);
 		EED_Single_Page_Checkout::instance()->_initialize();
 	}
 
@@ -119,7 +119,7 @@ 
 	 * 	ajax display registration step
 	 */
 	public static function display_reg_step() {
-		EED_Single_Page_Checkout::process_ajax_request( 'display_spco_reg_step' );
+		EED_Single_Page_Checkout::process_ajax_request('display_spco_reg_step');
 	}
 
 
@@ -128,7 +128,7 @@ 
 	 * 	ajax process registration step
 	 */
 	public static function process_reg_step() {
-		EED_Single_Page_Checkout::process_ajax_request( 'process_reg_step' );
+		EED_Single_Page_Checkout::process_ajax_request('process_reg_step');
 	}
 
 
@@ -137,7 +137,7 @@ 
 	 * 	ajax process registration step
 	 */
 	public static function update_reg_step() {
-		EED_Single_Page_Checkout::process_ajax_request( 'update_reg_step' );
+		EED_Single_Page_Checkout::process_ajax_request('update_reg_step');
 	}
 
 
@@ -149,7 +149,7 @@ 
 	 * @return void
 	 */
 	public static function update_checkout() {
-		EED_Single_Page_Checkout::process_ajax_request( 'update_checkout' );
+		EED_Single_Page_Checkout::process_ajax_request('update_checkout');
 	}
 
 
@@ -162,8 +162,8 @@ 
 	 */
 	public static function load_request_handler() {
 		// load core Request_Handler class
-		if ( ! isset( EE_Registry::instance()->REQ )) {
-			EE_Registry::instance()->load_core( 'Request_Handler' );
+		if ( ! isset(EE_Registry::instance()->REQ)) {
+			EE_Registry::instance()->load_core('Request_Handler');
 		}
 	}
 
@@ -176,14 +176,14 @@ 
 	 *  @return 	void
 	 */
 	public static function set_definitions() {
-		define( 'SPCO_BASE_PATH', rtrim( str_replace( array( '\\', '/' ), DS, plugin_dir_path( __FILE__ )), DS ) . DS );
-		define( 'SPCO_CSS_URL', plugin_dir_url( __FILE__ ) . 'css' . DS );
-		define( 'SPCO_IMG_URL', plugin_dir_url( __FILE__ ) . 'img' . DS );
-		define( 'SPCO_JS_URL', plugin_dir_url( __FILE__ ) . 'js' . DS );
-		define( 'SPCO_INC_PATH', SPCO_BASE_PATH . 'inc' . DS );
-		define( 'SPCO_REG_STEPS_PATH', SPCO_BASE_PATH . 'reg_steps' . DS );
-		define( 'SPCO_TEMPLATES_PATH', SPCO_BASE_PATH . 'templates' . DS );
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder( SPCO_BASE_PATH, TRUE );
+		define('SPCO_BASE_PATH', rtrim(str_replace(array('\\', '/'), DS, plugin_dir_path(__FILE__)), DS).DS);
+		define('SPCO_CSS_URL', plugin_dir_url(__FILE__).'css'.DS);
+		define('SPCO_IMG_URL', plugin_dir_url(__FILE__).'img'.DS);
+		define('SPCO_JS_URL', plugin_dir_url(__FILE__).'js'.DS);
+		define('SPCO_INC_PATH', SPCO_BASE_PATH.'inc'.DS);
+		define('SPCO_REG_STEPS_PATH', SPCO_BASE_PATH.'reg_steps'.DS);
+		define('SPCO_TEMPLATES_PATH', SPCO_BASE_PATH.'templates'.DS);
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(SPCO_BASE_PATH, TRUE);
 	}
 
 
@@ -198,31 +198,31 @@ 
 	 */
 	public static function load_reg_steps() {
 		static $reg_steps_loaded = FALSE;
-		if ( $reg_steps_loaded ) {
+		if ($reg_steps_loaded) {
 			return;
 		}
 		// load EE_SPCO_Reg_Step base class
 //		EE_Registry::instance()->load_file( SPCO_INC_PATH, 'EE_SPCO_Reg_Step', 'class'  );
 		// filter list of reg_steps
-		$reg_steps_to_load = apply_filters( 'AHEE__SPCO__load_reg_steps__reg_steps_to_load', EED_Single_Page_Checkout::get_reg_steps() );
+		$reg_steps_to_load = apply_filters('AHEE__SPCO__load_reg_steps__reg_steps_to_load', EED_Single_Page_Checkout::get_reg_steps());
 		// sort by key (order)
-		ksort( $reg_steps_to_load );
+		ksort($reg_steps_to_load);
 		// loop through folders
-		foreach ( $reg_steps_to_load as $order => $reg_step ) {
+		foreach ($reg_steps_to_load as $order => $reg_step) {
 			// we need a
-			if ( isset( $reg_step['file_path'], $reg_step['class_name'], $reg_step['slug'] )) {
+			if (isset($reg_step['file_path'], $reg_step['class_name'], $reg_step['slug'])) {
 				// copy over to the reg_steps_array
-				EED_Single_Page_Checkout::$_reg_steps_array[ $order ] = $reg_step;
+				EED_Single_Page_Checkout::$_reg_steps_array[$order] = $reg_step;
 				// register custom key route for each reg step ( ie: step=>"slug" - this is the entire reason we load the reg steps array now )
-				EE_Config::register_route( $reg_step['slug'], 'EED_Single_Page_Checkout', 'run', 'step' );
+				EE_Config::register_route($reg_step['slug'], 'EED_Single_Page_Checkout', 'run', 'step');
 				// add AJAX or other hooks
-				if ( isset( $reg_step['has_hooks'] ) && $reg_step['has_hooks'] ) {
+				if (isset($reg_step['has_hooks']) && $reg_step['has_hooks']) {
 					// setup autoloaders if necessary
-					if ( ! class_exists( $reg_step['class_name'] )) {
-						EEH_Autoloader::register_autoloaders_for_each_file_in_folder( $reg_step['file_path'], TRUE );
+					if ( ! class_exists($reg_step['class_name'])) {
+						EEH_Autoloader::register_autoloaders_for_each_file_in_folder($reg_step['file_path'], TRUE);
 					}
-					if ( is_callable( $reg_step['class_name'], 'set_hooks' )) {
-						call_user_func( array( $reg_step['class_name'], 'set_hooks' ));
+					if (is_callable($reg_step['class_name'], 'set_hooks')) {
+						call_user_func(array($reg_step['class_name'], 'set_hooks'));
 					}
 				}
 			}
@@ -241,28 +241,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
@@ -282,9 +282,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();
@@ -300,14 +300,14 @@ 
 	 */
 	public static function process_registration_from_admin() {
 		EED_Single_Page_Checkout::load_reg_steps();
-		EE_Registry::instance()->REQ->set( 'step', 'attendee_information' );
-		EE_Registry::instance()->REQ->set( 'action', 'process_reg_step' );
-		EE_Registry::instance()->REQ->set( 'process_form_submission', true );
+		EE_Registry::instance()->REQ->set('step', 'attendee_information');
+		EE_Registry::instance()->REQ->set('action', 'process_reg_step');
+		EE_Registry::instance()->REQ->set('process_form_submission', true);
 		EED_Single_Page_Checkout::instance()->_initialize();
-		if ( EED_Single_Page_Checkout::instance()->checkout->current_step->completed() ) {
-			$final_reg_step = end( EED_Single_Page_Checkout::instance()->checkout->reg_steps );
-			if ( $final_reg_step instanceof EE_SPCO_Reg_Step_Finalize_Registration ) {
-				if ( $final_reg_step->process_reg_step() ) {
+		if (EED_Single_Page_Checkout::instance()->checkout->current_step->completed()) {
+			$final_reg_step = end(EED_Single_Page_Checkout::instance()->checkout->reg_steps);
+			if ($final_reg_step instanceof EE_SPCO_Reg_Step_Finalize_Registration) {
+				if ($final_reg_step->process_reg_step()) {
 					return EED_Single_Page_Checkout::instance()->checkout->transaction;
 				}
 			}
@@ -324,8 +324,8 @@ 
 	 * @param WP_Query $WP_Query
 	 * @return    void
 	 */
-	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 )) {
+	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)) {
 			$this->_initialize();
 		}
 	}
@@ -340,8 +340,8 @@ 
 	 * @param WP_Query $WP_Query
 	 * @return    void
 	 */
-	public static function init( $WP_Query ) {
-		EED_Single_Page_Checkout::instance()->run( $WP_Query );
+	public static function init($WP_Query) {
+		EED_Single_Page_Checkout::instance()->run($WP_Query);
 	}
 
 
@@ -355,32 +355,32 @@ 
 	 */
 	private function _initialize() {
 		// ensure SPCO doesn't run twice
-		if ( EED_Single_Page_Checkout::$_initialized ) {
+		if (EED_Single_Page_Checkout::$_initialized) {
 			return;
 		}
 		// setup the EE_Checkout object
 		$this->checkout = $this->_initialize_checkout();
 		// filter checkout
-		$this->checkout = apply_filters( 'FHEE__EED_Single_Page_Checkout___initialize__checkout', $this->checkout );
+		$this->checkout = apply_filters('FHEE__EED_Single_Page_Checkout___initialize__checkout', $this->checkout);
 		// get the $_GET
 		$this->_get_request_vars();
 		// filter continue_reg
-		$this->checkout->continue_reg = apply_filters( 'FHEE__EED_Single_Page_Checkout__init___continue_reg', TRUE, $this->checkout );
+		$this->checkout->continue_reg = apply_filters('FHEE__EED_Single_Page_Checkout__init___continue_reg', TRUE, $this->checkout);
 		// load the reg steps array
-		if ( ! $this->_load_and_instantiate_reg_steps() ) {
+		if ( ! $this->_load_and_instantiate_reg_steps()) {
 			EED_Single_Page_Checkout::$_initialized = true;
 			return;
 		}
 		// set the current step
-		$this->checkout->set_current_step( $this->checkout->step );
+		$this->checkout->set_current_step($this->checkout->step);
 		// and the next step
 		$this->checkout->set_next_step();
 		// was there already a valid transaction in the checkout from the session ?
-		if ( ! $this->checkout->transaction instanceof EE_Transaction ) {
+		if ( ! $this->checkout->transaction instanceof EE_Transaction) {
 			// get transaction from db or session
 			$this->checkout->transaction = $this->checkout->reg_url_link && ! is_admin() ? $this->_get_transaction_and_cart_for_previous_visit() : $this->_get_cart_for_current_session_and_setup_new_transaction();
-			if ( ! $this->checkout->transaction instanceof EE_Transaction ) {
-				EE_Error::add_error( __( 'Your Registration and Transaction information could not be retrieved from the db.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__);
+			if ( ! $this->checkout->transaction instanceof EE_Transaction) {
+				EE_Error::add_error(__('Your Registration and Transaction information could not be retrieved from the db.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				// add some style and make it dance
 				$this->checkout->transaction = EE_Transaction::new_instance();
 				$this->add_styles_and_scripts();
@@ -388,10 +388,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;
 		}
@@ -416,9 +416,9 @@ 
 		// set no cache headers and constants
 		EE_System::do_not_cache();
 		// add anchor
-		add_action( 'loop_start', array( $this, 'set_checkout_anchor' ), 1 );
+		add_action('loop_start', array($this, 'set_checkout_anchor'), 1);
 		// remove transaction lock
-		add_action( 'shutdown', array( $this, 'unlock_transaction' ), 1 );
+		add_action('shutdown', array($this, 'unlock_transaction'), 1);
 	}
 
 
@@ -435,20 +435,20 @@ 
 		// look in session for existing checkout
 		$checkout = EE_Registry::instance()->SSN->checkout();
 		// verify
-		if ( ! $checkout instanceof EE_Checkout ) {
+		if ( ! $checkout instanceof EE_Checkout) {
 			// instantiate EE_Checkout object for handling the properties of the current checkout process
-			$checkout = EE_Registry::instance()->load_file( SPCO_INC_PATH, 'EE_Checkout', 'class', array(), FALSE  );
+			$checkout = EE_Registry::instance()->load_file(SPCO_INC_PATH, 'EE_Checkout', 'class', array(), FALSE);
 			// verify again
-			if ( ! $checkout instanceof EE_Checkout ) {
-				throw new EE_Error( __( 'The EE_Checkout class could not be loaded.', 'event_espresso' ) );
+			if ( ! $checkout instanceof EE_Checkout) {
+				throw new EE_Error(__('The EE_Checkout class could not be loaded.', 'event_espresso'));
 			}
 		} else {
-			if ( $checkout->current_step->is_final_step() && $checkout->exit_spco() === true )  {
-				wp_safe_redirect( $checkout->redirect_url );
+			if ($checkout->current_step->is_final_step() && $checkout->exit_spco() === true) {
+				wp_safe_redirect($checkout->redirect_url);
 				exit();
 			}
 		}
-		$checkout = apply_filters( 'FHEE__EED_Single_Page_Checkout___initialize_checkout__checkout', $checkout );
+		$checkout = apply_filters('FHEE__EED_Single_Page_Checkout___initialize_checkout__checkout', $checkout);
 		// reset anything that needs a clean slate for each request
 		$checkout->reset_for_current_request();
 		return $checkout;
@@ -466,22 +466,22 @@ 
 		// load classes
 		EED_Single_Page_Checkout::load_request_handler();
 		//make sure this request is marked as belonging to EE
-		EE_Registry::instance()->REQ->set_espresso_page( TRUE );
+		EE_Registry::instance()->REQ->set_espresso_page(TRUE);
 		// which step is being requested ?
-		$this->checkout->step = EE_Registry::instance()->REQ->get( 'step', $this->_get_first_step() );
+		$this->checkout->step = EE_Registry::instance()->REQ->get('step', $this->_get_first_step());
 		// which step is being edited ?
-		$this->checkout->edit_step = EE_Registry::instance()->REQ->get( 'edit_step', '' );
+		$this->checkout->edit_step = EE_Registry::instance()->REQ->get('edit_step', '');
 		// and what we're doing on the current step
-		$this->checkout->action = EE_Registry::instance()->REQ->get( 'action', 'display_spco_reg_step' );
+		$this->checkout->action = EE_Registry::instance()->REQ->get('action', 'display_spco_reg_step');
 		// returning to edit ?
-		$this->checkout->reg_url_link = EE_Registry::instance()->REQ->get( 'e_reg_url_link', '' );
+		$this->checkout->reg_url_link = EE_Registry::instance()->REQ->get('e_reg_url_link', '');
 		// or some other kind of revisit ?
-		$this->checkout->revisit = EE_Registry::instance()->REQ->get( 'revisit', FALSE );
+		$this->checkout->revisit = EE_Registry::instance()->REQ->get('revisit', FALSE);
 		// and whether or not to generate a reg form for this request
-		$this->checkout->generate_reg_form = EE_Registry::instance()->REQ->get( 'generate_reg_form', TRUE ); 		// TRUE 	FALSE
+		$this->checkout->generate_reg_form = EE_Registry::instance()->REQ->get('generate_reg_form', TRUE); // TRUE 	FALSE
 		// and whether or not to process a reg form submission for this request
-		$this->checkout->process_form_submission = EE_Registry::instance()->REQ->get( 'process_form_submission', FALSE ); 		// TRUE 	FALSE
-		$this->checkout->process_form_submission = $this->checkout->action !== 'display_spco_reg_step' ? $this->checkout->process_form_submission : FALSE; 		// TRUE 	FALSE
+		$this->checkout->process_form_submission = EE_Registry::instance()->REQ->get('process_form_submission', FALSE); // TRUE 	FALSE
+		$this->checkout->process_form_submission = $this->checkout->action !== 'display_spco_reg_step' ? $this->checkout->process_form_submission : FALSE; // TRUE 	FALSE
 		//$this->_display_request_vars();
 	}
 
@@ -494,17 +494,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__);
 	}
 
 
@@ -518,8 +518,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';
 	}
 
 
@@ -535,37 +535,37 @@ 
 	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 );
-			} else if ( EE_Registry::instance()->CFG->registration->reg_confirmation_last && isset( 	$this->checkout->reg_steps['registration_confirmation'] )) {
+				$this->checkout->remove_reg_step('registration_confirmation', false);
+			} else if (EE_Registry::instance()->CFG->registration->reg_confirmation_last && isset($this->checkout->reg_steps['registration_confirmation'])) {
 				// set the order to something big like 100
-				$this->checkout->set_reg_step_order( 'registration_confirmation', 100 );
+				$this->checkout->set_reg_step_order('registration_confirmation', 100);
 			}
 			// filter the array for good luck
-			$this->checkout->reg_steps = apply_filters( 'FHEE__Single_Page_Checkout__load_reg_steps__reg_steps', $this->checkout->reg_steps );
+			$this->checkout->reg_steps = apply_filters('FHEE__Single_Page_Checkout__load_reg_steps__reg_steps', $this->checkout->reg_steps);
 			// finally re-sort based on the reg step class order properties
 			$this->checkout->sort_reg_steps();
 		} else {
-			foreach ( $this->checkout->reg_steps as $reg_step ) {
+			foreach ($this->checkout->reg_steps as $reg_step) {
 				// set all current step stati to FALSE
-				$reg_step->set_is_current_step( FALSE );
+				$reg_step->set_is_current_step(FALSE);
 			}
 		}
-		if ( empty( $this->checkout->reg_steps )) {
-			EE_Error::add_error( __( 'No Reg Steps were loaded..', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__);
+		if (empty($this->checkout->reg_steps)) {
+			EE_Error::add_error(__('No Reg Steps were loaded..', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 			// make reg step details available to JS
@@ -583,34 +583,34 @@ 
 	 * @param int   $order
 	 * @return bool
 	 */
-	private function _load_and_instantiate_reg_step( $reg_step = array(), $order = 0 ) {
+	private function _load_and_instantiate_reg_step($reg_step = array(), $order = 0) {
 
 		// we need a file_path, class_name, and slug to add a reg step
-		if ( isset( $reg_step['file_path'], $reg_step['class_name'], $reg_step['slug'] )) {
+		if (isset($reg_step['file_path'], $reg_step['class_name'], $reg_step['slug'])) {
 			// if editing a specific step, but this is NOT that step... (and it's not the 'finalize_registration' step)
-			if ( $this->checkout->reg_url_link && $this->checkout->step !== $reg_step['slug'] && $reg_step['slug'] !== 'finalize_registration' ) {
+			if ($this->checkout->reg_url_link && $this->checkout->step !== $reg_step['slug'] && $reg_step['slug'] !== 'finalize_registration') {
 				return true;
 			}
 			// instantiate step class using file path and class name
-			$reg_step_obj = EE_Registry::instance()->load_file( $reg_step['file_path'], $reg_step['class_name'], 'class', $this->checkout, FALSE  );
+			$reg_step_obj = EE_Registry::instance()->load_file($reg_step['file_path'], $reg_step['class_name'], 'class', $this->checkout, FALSE);
 			// did we gets the goods ?
-			if ( $reg_step_obj instanceof EE_SPCO_Reg_Step ) {
+			if ($reg_step_obj instanceof EE_SPCO_Reg_Step) {
 				// set reg step order based on config
-				$reg_step_obj->set_order( $order );
+				$reg_step_obj->set_order($order);
 				// add instantiated reg step object to the master reg steps array
-				$this->checkout->add_reg_step( $reg_step_obj );
+				$this->checkout->add_reg_step($reg_step_obj);
 			} else {
-				EE_Error::add_error( __( 'The current step could not be set.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error(__('The current step could not be set.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				return false;
 			}
 		} else {
-			if ( WP_DEBUG ) {
+			if (WP_DEBUG) {
 				EE_Error::add_error(
 					sprintf(
-						__( 'A registration step could not be loaded. One or more of the following data points is invalid:%4$s%5$sFile Path: %1$s%6$s%5$sClass Name: %2$s%6$s%5$sSlug: %3$s%6$s%7$s', 'event_espresso' ),
-						isset( $reg_step['file_path'] ) ? $reg_step['file_path'] : '',
-						isset( $reg_step['class_name'] ) ? $reg_step['class_name'] : '',
-						isset( $reg_step['slug'] ) ? $reg_step['slug'] : '',
+						__('A registration step could not be loaded. One or more of the following data points is invalid:%4$s%5$sFile Path: %1$s%6$s%5$sClass Name: %2$s%6$s%5$sSlug: %3$s%6$s%7$s', 'event_espresso'),
+						isset($reg_step['file_path']) ? $reg_step['file_path'] : '',
+						isset($reg_step['class_name']) ? $reg_step['class_name'] : '',
+						isset($reg_step['slug']) ? $reg_step['slug'] : '',
 						'<ul>',
 						'<li>',
 						'</li>',
@@ -634,16 +634,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;
 		}
 	}
@@ -657,11 +657,11 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return EE_Cart
 	 */
-	private function _get_cart_for_transaction( $transaction ) {
-		$cart = $transaction instanceof EE_Transaction ? EE_Cart::get_cart_from_txn( $transaction ) : NULL;
+	private function _get_cart_for_transaction($transaction) {
+		$cart = $transaction instanceof EE_Transaction ? EE_Cart::get_cart_from_txn($transaction) : NULL;
 		// verify cart
-		if ( ! $cart instanceof EE_Cart ) {
-			$cart = EE_Registry::instance()->load_core( 'Cart' );
+		if ( ! $cart instanceof EE_Cart) {
+			$cart = EE_Registry::instance()->load_core('Cart');
 		}
 		return $cart;
 	}
@@ -676,8 +676,8 @@ 
 	 * @param EE_Transaction $transaction
 	 * 	@return EE_Cart
 	 */
-	public function get_cart_for_transaction( EE_Transaction $transaction ) {
-		return EE_Cart::get_cart_from_txn( $transaction );
+	public function get_cart_for_transaction(EE_Transaction $transaction) {
+		return EE_Cart::get_cart_from_txn($transaction);
 	}
 
 
@@ -692,17 +692,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;
 	}
@@ -722,15 +722,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;
 	}
@@ -744,34 +744,34 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return EE_Cart
 	 */
-	private function _get_registrations( EE_Transaction $transaction ) {
+	private function _get_registrations(EE_Transaction $transaction) {
 		// first step: grab the registrants  { : o
-		$registrations = $transaction->registrations( $this->checkout->reg_cache_where_params, true );
+		$registrations = $transaction->registrations($this->checkout->reg_cache_where_params, true);
 		// verify registrations have been set
-		if ( empty( $registrations )) {
+		if (empty($registrations)) {
 			// if no cached registrations, then check the db
-			$registrations = $transaction->registrations( $this->checkout->reg_cache_where_params, false );
+			$registrations = $transaction->registrations($this->checkout->reg_cache_where_params, false);
 			// still nothing ? well as long as this isn't a revisit
-			if ( empty( $registrations ) && ! $this->checkout->revisit ) {
+			if (empty($registrations) && ! $this->checkout->revisit) {
 				// generate new registrations from scratch
-				$registrations = $this->_initialize_registrations( $transaction );
+				$registrations = $this->_initialize_registrations($transaction);
 			}
 		}
 		// sort by their original registration order
-		usort( $registrations, array( 'EED_Single_Page_Checkout', 'sort_registrations_by_REG_count' ));
+		usort($registrations, array('EED_Single_Page_Checkout', 'sort_registrations_by_REG_count'));
 		// then loop thru the array
-		foreach ( $registrations as $registration ) {
+		foreach ($registrations as $registration) {
 			// verify each registration
-			if ( $registration instanceof EE_Registration ) {
+			if ($registration instanceof EE_Registration) {
 				// we display all attendee info for the primary registrant
-				if ( $this->checkout->reg_url_link == $registration->reg_url_link() && $registration->is_primary_registrant() ) {
+				if ($this->checkout->reg_url_link == $registration->reg_url_link() && $registration->is_primary_registrant()) {
 					$this->checkout->primary_revisit = TRUE;
 					break;
-				} else if ( $this->checkout->revisit && $this->checkout->reg_url_link != $registration->reg_url_link() ) {
+				} else if ($this->checkout->revisit && $this->checkout->reg_url_link != $registration->reg_url_link()) {
 					// but hide info if it doesn't belong to you
-					$transaction->clear_cache( 'Registration', $registration->ID() );
+					$transaction->clear_cache('Registration', $registration->ID());
 				}
-				$this->checkout->set_reg_status_updated( $registration->ID(), false );
+				$this->checkout->set_reg_status_updated($registration->ID(), false);
 			}
 		}
 	}
@@ -785,17 +785,17 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return    array
 	 */
-	private function _initialize_registrations( EE_Transaction $transaction ) {
+	private function _initialize_registrations(EE_Transaction $transaction) {
 		$att_nmbr = 0;
 		$registrations = array();
-		if ( $transaction instanceof EE_Transaction ) {
+		if ($transaction instanceof EE_Transaction) {
 			/** @type EE_Registration_Processor $registration_processor */
-			$registration_processor = EE_Registry::instance()->load_class( 'Registration_Processor' );
+			$registration_processor = EE_Registry::instance()->load_class('Registration_Processor');
 			$this->checkout->total_ticket_count = $this->checkout->cart->all_ticket_quantity_count();
 			// now let's add the cart items to the $transaction
-			foreach ( $this->checkout->cart->get_tickets() as $line_item ) {
+			foreach ($this->checkout->cart->get_tickets() as $line_item) {
 				//do the following for each ticket of this type they selected
-				for ( $x = 1; $x <= $line_item->quantity(); $x++ ) {
+				for ($x = 1; $x <= $line_item->quantity(); $x++) {
 					$att_nmbr++;
 					$registration = $registration_processor->generate_ONE_registration_from_line_item(
 						$line_item,
@@ -803,12 +803,12 @@ 
 						$att_nmbr,
 						$this->checkout->total_ticket_count
 					);
-					if ( $registration instanceof EE_Registration ) {
-						$registrations[ $registration->ID() ] = $registration;
+					if ($registration instanceof EE_Registration) {
+						$registrations[$registration->ID()] = $registration;
 					}
 				}
 			}
-			$registration_processor->fix_reg_final_price_rounding_issue( $transaction );
+			$registration_processor->fix_reg_final_price_rounding_issue($transaction);
 		}
 		return $registrations;
 	}
@@ -823,12 +823,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;
 	}
 
 
@@ -843,35 +843,35 @@ 
 	 */
 	private function _final_verifications() {
 		// filter checkout
-		$this->checkout = apply_filters( 'FHEE__EED_Single_Page_Checkout___final_verifications__checkout', $this->checkout );
+		$this->checkout = apply_filters('FHEE__EED_Single_Page_Checkout___final_verifications__checkout', $this->checkout);
 		//verify that current step is still set correctly
-		if ( ! $this->checkout->current_step instanceof EE_SPCO_Reg_Step ) {
-			EE_Error::add_error( __( 'We\'re sorry but the registration process can not proceed because one or more registration steps were not setup correctly. Please refresh the page and try again or contact support.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $this->checkout->current_step instanceof EE_SPCO_Reg_Step) {
+			EE_Error::add_error(__('We\'re sorry but the registration process can not proceed because one or more registration steps were not setup correctly. Please refresh the page and try again or contact support.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		// if returning to SPCO, then verify that primary registrant is set
-		if ( ! empty( $this->checkout->reg_url_link )) {
+		if ( ! empty($this->checkout->reg_url_link)) {
 			$valid_registrant = $this->checkout->transaction->primary_registration();
-			if ( ! $valid_registrant instanceof EE_Registration ) {
-				EE_Error::add_error( __( 'We\'re sorry but there appears to be an error with the "reg_url_link" or the primary registrant for this transaction. Please refresh the page and try again or contact support.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+			if ( ! $valid_registrant instanceof EE_Registration) {
+				EE_Error::add_error(__('We\'re sorry but there appears to be an error with the "reg_url_link" or the primary registrant for this transaction. Please refresh the page and try again or contact support.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				return false;
 			}
 			$valid_registrant = null;
-			foreach ( $this->checkout->transaction->registrations( $this->checkout->reg_cache_where_params ) as $registration ) {
-				if ( $registration instanceof EE_Registration ) {
-					if ( $registration->reg_url_link() == $this->checkout->reg_url_link ) {
+			foreach ($this->checkout->transaction->registrations($this->checkout->reg_cache_where_params) as $registration) {
+				if ($registration instanceof EE_Registration) {
+					if ($registration->reg_url_link() == $this->checkout->reg_url_link) {
 						$valid_registrant = $registration;
 					}
 				}
 			}
-			if ( ! $valid_registrant instanceof EE_Registration ) {
-				EE_Error::add_error( __( 'We\'re sorry but there appears to be an error with the "reg_url_link" or the transaction itself. Please refresh the page and try again or contact support.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+			if ( ! $valid_registrant instanceof EE_Registration) {
+				EE_Error::add_error(__('We\'re sorry but there appears to be an error with the "reg_url_link" or the transaction itself. Please refresh the page and try again or contact support.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				return false;
 			}
 		}
 		// now that things have been kinda sufficiently verified,
 		// let's add the checkout to the session so that's available other systems
-		EE_Registry::instance()->SSN->set_checkout( $this->checkout );
+		EE_Registry::instance()->SSN->set_checkout($this->checkout);
 		return true;
 	}
 
@@ -887,28 +887,28 @@ 
 	 * @access    private
 	 * @param bool $reinitializing
 	 */
-	private function _initialize_reg_steps( $reinitializing = false ) {
-		$this->checkout->set_reg_step_initiated( $this->checkout->current_step );
+	private function _initialize_reg_steps($reinitializing = false) {
+		$this->checkout->set_reg_step_initiated($this->checkout->current_step);
 		// loop thru all steps to call their individual "initialize" methods and set i18n strings for JS
-		foreach ( $this->checkout->reg_steps as $reg_step ) {
-			if ( ! $reg_step->initialize_reg_step() ) {
+		foreach ($this->checkout->reg_steps as $reg_step) {
+			if ( ! $reg_step->initialize_reg_step()) {
 				// if not initialized then maybe this step is being removed...
-				if ( $reg_step->is_current_step() && ! $reinitializing ) {
+				if ($reg_step->is_current_step() && ! $reinitializing) {
 					// if it was the current step, then we need to start over here
-					$this->_initialize_reg_steps( true );
+					$this->_initialize_reg_steps(true);
 					return;
 				}
 				continue;
 			}
 			// i18n
 			$reg_step->translate_js_strings();
-			if ( $reg_step->is_current_step() ) {
+			if ($reg_step->is_current_step()) {
 				// the text that appears on the reg step form submit button
 				$reg_step->set_submit_button_text();
 			}
 		}
 		// dynamically creates hook point like: AHEE__Single_Page_Checkout___initialize_reg_step__attendee_information
-		do_action( "AHEE__Single_Page_Checkout___initialize_reg_step__{$this->checkout->current_step->slug()}", $this->checkout->current_step );
+		do_action("AHEE__Single_Page_Checkout___initialize_reg_step__{$this->checkout->current_step->slug()}", $this->checkout->current_step);
 	}
 
 
@@ -921,39 +921,39 @@ 
 	 */
 	private function _check_form_submission() {
 		//does this request require the reg form to be generated ?
-		if ( $this->checkout->generate_reg_form ) {
+		if ($this->checkout->generate_reg_form) {
 			// ever heard that song by Blue Rodeo ?
 			try {
 				$this->checkout->current_step->reg_form = $this->checkout->current_step->generate_reg_form();
 				// if not displaying a form, then check for form submission
-				if ( $this->checkout->process_form_submission && $this->checkout->current_step->reg_form->was_submitted() ) {
+				if ($this->checkout->process_form_submission && $this->checkout->current_step->reg_form->was_submitted()) {
 					// clear out any old data in case this step is being run again
-					$this->checkout->current_step->set_valid_data( array() );
+					$this->checkout->current_step->set_valid_data(array());
 					// capture submitted form data
 					$this->checkout->current_step->reg_form->receive_form_submission(
-						apply_filters( 'FHEE__Single_Page_Checkout___check_form_submission__request_params', EE_Registry::instance()->REQ->params(), $this->checkout )
+						apply_filters('FHEE__Single_Page_Checkout___check_form_submission__request_params', EE_Registry::instance()->REQ->params(), $this->checkout)
 					);
 					// validate submitted form data
-					if ( ! $this->checkout->current_step->reg_form->is_valid() || ! $this->checkout->continue_reg ) {
+					if ( ! $this->checkout->current_step->reg_form->is_valid() || ! $this->checkout->continue_reg) {
 						// thou shall not pass !!!
 						$this->checkout->continue_reg = FALSE;
 						// any form validation errors?
-						if ( $this->checkout->current_step->reg_form->submission_error_message() != '' ) {
+						if ($this->checkout->current_step->reg_form->submission_error_message() != '') {
 							$submission_error_messages = array();
 							// bad, bad, bad registrant
-							foreach( $this->checkout->current_step->reg_form->get_validation_errors_accumulated() as $validation_error ){
-								if ( $validation_error instanceof EE_Validation_Error ) {
-									$submission_error_messages[] = sprintf( __( '%s : %s', 'event_espresso' ), $validation_error->get_form_section()->html_label_text(), $validation_error->getMessage() );
+							foreach ($this->checkout->current_step->reg_form->get_validation_errors_accumulated() as $validation_error) {
+								if ($validation_error instanceof EE_Validation_Error) {
+									$submission_error_messages[] = sprintf(__('%s : %s', 'event_espresso'), $validation_error->get_form_section()->html_label_text(), $validation_error->getMessage());
 								}
 							}
-							EE_Error::add_error( join( '<br />', $submission_error_messages ), __FILE__, __FUNCTION__, __LINE__ );
+							EE_Error::add_error(join('<br />', $submission_error_messages), __FILE__, __FUNCTION__, __LINE__);
 						}
 						// well not really... what will happen is we'll just get redirected back to redo the current step
 						$this->go_to_next_step();
 						return;
 					}
 				}
-			} catch( EE_Error $e ) {
+			} catch (EE_Error $e) {
 				$e->get_error();
 			}
 		}
@@ -969,38 +969,38 @@ 
 	 */
 	private function _process_form_action() {
 		// what cha wanna do?
-		switch( $this->checkout->action ) {
+		switch ($this->checkout->action) {
 			// AJAX next step reg form
 			case 'display_spco_reg_step' :
 				$this->checkout->redirect = FALSE;
-				if ( EE_Registry::instance()->REQ->ajax ) {
-					$this->checkout->json_response->set_reg_step_html( $this->checkout->current_step->display_reg_form() );
+				if (EE_Registry::instance()->REQ->ajax) {
+					$this->checkout->json_response->set_reg_step_html($this->checkout->current_step->display_reg_form());
 				}
 				break;
 
 			default :
 				// meh... do one of those other steps first
-				if ( ! empty( $this->checkout->action ) && is_callable( array( $this->checkout->current_step, $this->checkout->action ))) {
+				if ( ! empty($this->checkout->action) && is_callable(array($this->checkout->current_step, $this->checkout->action))) {
 					// dynamically creates hook point like: AHEE__Single_Page_Checkout__before_attendee_information__process_reg_step
-					do_action( "AHEE__Single_Page_Checkout__before_{$this->checkout->current_step->slug()}__{$this->checkout->action}", $this->checkout->current_step );
+					do_action("AHEE__Single_Page_Checkout__before_{$this->checkout->current_step->slug()}__{$this->checkout->action}", $this->checkout->current_step);
 					// call action on current step
-					if ( call_user_func( array( $this->checkout->current_step, $this->checkout->action )) ) {
+					if (call_user_func(array($this->checkout->current_step, $this->checkout->action))) {
 						// good registrant, you get to proceed
-						if ( $this->checkout->current_step->success_message() != '' ) {
-							if ( apply_filters( 'FHEE__Single_Page_Checkout___process_form_action__display_success', false ) ) {
-								EE_Error::add_success( $this->checkout->current_step->success_message() . '<br />' . $this->checkout->next_step->_instructions() );
+						if ($this->checkout->current_step->success_message() != '') {
+							if (apply_filters('FHEE__Single_Page_Checkout___process_form_action__display_success', false)) {
+								EE_Error::add_success($this->checkout->current_step->success_message().'<br />'.$this->checkout->next_step->_instructions());
 							}
 						}
 						// pack it up, pack it in...
 						$this->_setup_redirect();
 					}
 					// dynamically creates hook point like: AHEE__Single_Page_Checkout__after_payment_options__process_reg_step
-					do_action( "AHEE__Single_Page_Checkout__after_{$this->checkout->current_step->slug()}__{$this->checkout->action}", $this->checkout->current_step );
+					do_action("AHEE__Single_Page_Checkout__after_{$this->checkout->current_step->slug()}__{$this->checkout->action}", $this->checkout->current_step);
 
 				} else {
 					EE_Error::add_error(
 						sprintf(
-							__( 'The requested form action "%s" does not exist for the current "%s" registration step.', 'event_espresso' ),
+							__('The requested form action "%s" does not exist for the current "%s" registration step.', 'event_espresso'),
 							$this->checkout->action,
 							$this->checkout->current_step->name()
 						),
@@ -1026,10 +1026,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);
 		}
 	}
 
@@ -1045,42 +1045,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);
 	}
 
 
@@ -1093,25 +1093,25 @@ 
 	 */
 	public function enqueue_styles_and_scripts() {
 		// load css
-		wp_register_style( 'single_page_checkout', SPCO_CSS_URL . 'single_page_checkout.css', array(), EVENT_ESPRESSO_VERSION );
-		wp_enqueue_style( 'single_page_checkout' );
+		wp_register_style('single_page_checkout', SPCO_CSS_URL.'single_page_checkout.css', array(), EVENT_ESPRESSO_VERSION);
+		wp_enqueue_style('single_page_checkout');
 		// load JS
-		wp_register_script( 'jquery_plugin', EE_THIRD_PARTY_URL . 'jquery	.plugin.min.js', array( 'jquery' ), '1.0.1', TRUE );
-		wp_register_script( 'jquery_countdown', EE_THIRD_PARTY_URL . 'jquery	.countdown.min.js', array( 'jquery_plugin' ), '2.0.2', TRUE );
-		wp_register_script( 'single_page_checkout', SPCO_JS_URL . 'single_page_checkout.js', array( 'espresso_core', 'underscore', 'ee_form_section_validation', 'jquery_countdown' ), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_enqueue_script( 'single_page_checkout' );
+		wp_register_script('jquery_plugin', EE_THIRD_PARTY_URL.'jquery	.plugin.min.js', array('jquery'), '1.0.1', TRUE);
+		wp_register_script('jquery_countdown', EE_THIRD_PARTY_URL.'jquery	.countdown.min.js', array('jquery_plugin'), '2.0.2', TRUE);
+		wp_register_script('single_page_checkout', SPCO_JS_URL.'single_page_checkout.js', array('espresso_core', 'underscore', 'ee_form_section_validation', 'jquery_countdown'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_enqueue_script('single_page_checkout');
 
 		/**
 		 * global action hook for enqueueing styles and scripts with
 		 * spco calls.
 		 */
-		do_action( 'AHEE__EED_Single_Page_Checkout__enqueue_styles_and_scripts', $this );
+		do_action('AHEE__EED_Single_Page_Checkout__enqueue_styles_and_scripts', $this);
 
 		/**
 		 * dynamic action hook for enqueueing styles and scripts with spco calls.
 		 * The hook will end up being something like AHEE__EED_Single_Page_Checkout__enqueue_styles_and_scripts__attendee_information
 		 */
-		do_action( 'AHEE__EED_Single_Page_Checkout__enqueue_styles_and_scripts__' . $this->checkout->current_step->slug(), $this );
+		do_action('AHEE__EED_Single_Page_Checkout__enqueue_styles_and_scripts__'.$this->checkout->current_step->slug(), $this);
 
 		// add css and JS for current step
 		$this->checkout->current_step->enqueue_styles_and_scripts();
@@ -1127,20 +1127,20 @@ 
 	 */
 	private function _display_spco_reg_form() {
 		// if registering via the admin, just display the reg form for the current step
-		if ( $this->checkout->admin_request ) {
-			EE_Registry::instance()->REQ->add_output( $this->checkout->current_step->display_reg_form() );
+		if ($this->checkout->admin_request) {
+			EE_Registry::instance()->REQ->add_output($this->checkout->current_step->display_reg_form());
 		} else {
 			// add powered by EE msg
-			add_action( 'AHEE__SPCO__reg_form_footer', array( 'EED_Single_Page_Checkout', 'display_registration_footer' ));
+			add_action('AHEE__SPCO__reg_form_footer', array('EED_Single_Page_Checkout', 'display_registration_footer'));
 
-			$empty_cart = count( $this->checkout->transaction->registrations( $this->checkout->reg_cache_where_params ) ) < 1 ? true : false;
+			$empty_cart = count($this->checkout->transaction->registrations($this->checkout->reg_cache_where_params)) < 1 ? true : false;
 			$cookies_not_set_msg = '';
-			if ( $empty_cart ) {
-				if ( ! isset( $_COOKIE[ 'ee_cookie_test' ] ) ) {
+			if ($empty_cart) {
+				if ( ! isset($_COOKIE['ee_cookie_test'])) {
 					$cookies_not_set_msg = apply_filters(
 						'FHEE__Single_Page_Checkout__display_spco_reg_form__cookies_not_set_msg',
 						sprintf(
-							__( '%1$s%3$sIt appears your browser is not currently set to accept Cookies%4$s%5$sIn order to register for events, you need to enable cookies.%7$sIf you require assistance, then click the following link to learn how to %8$senable cookies%9$s%6$s%2$s', 'event_espresso' ),
+							__('%1$s%3$sIt appears your browser is not currently set to accept Cookies%4$s%5$sIn order to register for events, you need to enable cookies.%7$sIf you require assistance, then click the following link to learn how to %8$senable cookies%9$s%6$s%2$s', 'event_espresso'),
 							'<div class="ee-attention">',
 							'</div>',
 							'<h6 class="important-notice">',
@@ -1161,7 +1161,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,
@@ -1170,8 +1170,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>'
 										)
@@ -1179,14 +1179,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());
 		}
 	}
 
@@ -1200,8 +1200,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>';
 		}
 	}
@@ -1215,18 +1215,18 @@ 
 	 *  @return 	string
 	 */
 	public static function display_registration_footer() {
-		if ( apply_filters( 'FHEE__EE_Front__Controller__show_reg_footer', EE_Registry::instance()->CFG->admin->show_reg_footer ) ) {
-			EE_Registry::instance()->CFG->admin->affiliate_id = ! empty( EE_Registry::instance()->CFG->admin->affiliate_id ) ? EE_Registry::instance()->CFG->admin->affiliate_id : 'default';
-			$url = add_query_arg( array( 'ap_id' => EE_Registry::instance()->CFG->admin->affiliate_id ), 'http://eventespresso.com/' );
-			$url = apply_filters( 'FHEE__EE_Front_Controller__registration_footer__url', $url );
+		if (apply_filters('FHEE__EE_Front__Controller__show_reg_footer', EE_Registry::instance()->CFG->admin->show_reg_footer)) {
+			EE_Registry::instance()->CFG->admin->affiliate_id = ! empty(EE_Registry::instance()->CFG->admin->affiliate_id) ? EE_Registry::instance()->CFG->admin->affiliate_id : 'default';
+			$url = add_query_arg(array('ap_id' => EE_Registry::instance()->CFG->admin->affiliate_id), 'http://eventespresso.com/');
+			$url = apply_filters('FHEE__EE_Front_Controller__registration_footer__url', $url);
 			echo apply_filters(
 				'FHEE__EE_Front_Controller__display_registration_footer',
 				sprintf(
-					__( '%1$sEvent Registration Powered by Event Espresso%2$sEvent Registration and Ticketing%3$s Powered by %4$sEvent Espresso - Event Registration and Management System for WordPress%5$sEvent Espresso%6$s', 'event_espresso' ),
-					'<div id="espresso-registration-footer-dv"><a href="' . $url . '" title="',
+					__('%1$sEvent Registration Powered by Event Espresso%2$sEvent Registration and Ticketing%3$s Powered by %4$sEvent Espresso - Event Registration and Management System for WordPress%5$sEvent Espresso%6$s', 'event_espresso'),
+					'<div id="espresso-registration-footer-dv"><a href="'.$url.'" title="',
 					'" target="_blank">',
 					'</a>',
-					'<a href="' . $url . '" title="',
+					'<a href="'.$url.'" title="',
 					'" target="_blank">',
 					'</a></div>'
 				)
@@ -1257,12 +1257,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);
 		}
 	}
 
@@ -1275,12 +1275,12 @@ 
 	 * @return void
 	 */
 	public function go_to_next_step() {
-		if ( EE_Registry::instance()->REQ->ajax ) {
+		if (EE_Registry::instance()->REQ->ajax) {
 			// capture contents of output buffer we started earlier in the request, and insert into JSON response
-			$this->checkout->json_response->set_unexpected_errors( ob_get_clean() );
+			$this->checkout->json_response->set_unexpected_errors(ob_get_clean());
 		}
 		// just return for these conditions
-		if ( $this->checkout->admin_request || $this->checkout->action == 'redirect_form' || $this->checkout->action == 'update_checkout' ) {
+		if ($this->checkout->admin_request || $this->checkout->action == 'redirect_form' || $this->checkout->action == 'update_checkout') {
 			return;
 		}
 		// AJAX response
@@ -1301,7 +1301,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__,
@@ -1311,10 +1311,10 @@ 
 			//		'continue_reg'               => $this->checkout->continue_reg,
 			//	)
 			//);
-			$this->checkout->json_response->set_registration_time_limit( $this->checkout->get_registration_time_limit() );
-			$this->checkout->json_response->set_payment_amount( $this->checkout->amount_owing );
+			$this->checkout->json_response->set_registration_time_limit($this->checkout->get_registration_time_limit());
+			$this->checkout->json_response->set_payment_amount($this->checkout->amount_owing);
 			// just send the ajax (
-			$json_response = apply_filters( 'FHEE__EE_Single_Page_Checkout__JSON_response', $this->checkout->json_response );
+			$json_response = apply_filters('FHEE__EE_Single_Page_Checkout__JSON_response', $this->checkout->json_response);
 			$this->unlock_transaction();
 			echo $json_response;
 			exit();
@@ -1331,9 +1331,9 @@ 
 	 */
 	protected function _handle_html_redirects() {
 		// going somewhere ?
-		if ( $this->checkout->redirect && ! empty( $this->checkout->redirect_url ) ) {
+		if ($this->checkout->redirect && ! empty($this->checkout->redirect_url)) {
 			// store notices in a transient
-			EE_Error::get_notices( false, true, true );
+			EE_Error::get_notices(false, true, true);
 			$this->unlock_transaction();
 			// DEBUG LOG
 			//$this->checkout->log(
@@ -1344,7 +1344,7 @@ 
 			//		'headers_list'    => headers_list(),
 			//	)
 			//);
-			wp_safe_redirect( $this->checkout->redirect_url );
+			wp_safe_redirect($this->checkout->redirect_url);
 			exit();
 		}
 	}