eventespresso / event-espresso-core

caffeinated/admin/extend/general_settings/Extend_General_Settings_Admin_Page.core.php

Spacing +23 added lines, -23 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -32,30 +32,30 @@ 
 
 
 
-	public function __construct( $routing = TRUE ) {
-		parent::__construct( $routing );
-		define( 'GEN_SET_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'general_settings/templates/' );
+	public function __construct($routing = TRUE) {
+		parent::__construct($routing);
+		define('GEN_SET_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND.'general_settings/templates/');
 	}
 
 
 
 	protected function _extend_page_config() {
 
-		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'general_settings';
+		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND.'general_settings';
 
 		//filters and action hooks here
-		add_action('AHEE__admin_option_settings__template__before', array( $this, 'use_venue_and_staff_manager_settings'), 10 );
-		add_action( 'AHEE__admin_option_settings__template__before', array( $this, 'debug_logging_options' ), 9 );
-		add_filter( 'FHEE__General_Settings_Admin_Page___update_admin_option_settings__CFG_admin', array( $this, 'update_debug_logging_options' ), 10, 1 );
+		add_action('AHEE__admin_option_settings__template__before', array($this, 'use_venue_and_staff_manager_settings'), 10);
+		add_action('AHEE__admin_option_settings__template__before', array($this, 'debug_logging_options'), 9);
+		add_filter('FHEE__General_Settings_Admin_Page___update_admin_option_settings__CFG_admin', array($this, 'update_debug_logging_options'), 10, 1);
 
 	}
 
 
 
-	public function use_venue_and_staff_manager_settings( $template_args ) {
-		$_args['use_personnel_manager_select'] = EEH_Form_Fields::select_input('use_personnel_manager', $template_args['values'], $template_args['use_personnel_manager'] );
-		$template = GEN_SET_CAF_TEMPLATE_PATH . 'use_venue_and_staff_manager_settings.template.php';
-		EEH_Template::display_template( $template, $_args );
+	public function use_venue_and_staff_manager_settings($template_args) {
+		$_args['use_personnel_manager_select'] = EEH_Form_Fields::select_input('use_personnel_manager', $template_args['values'], $template_args['use_personnel_manager']);
+		$template = GEN_SET_CAF_TEMPLATE_PATH.'use_venue_and_staff_manager_settings.template.php';
+		EEH_Template::display_template($template, $_args);
 	}
 
 
@@ -68,12 +68,12 @@ 
 	 * @param array $template_args
 	 * @return void
 	 */
-	public function debug_logging_options( $template_args = array() ) {
+	public function debug_logging_options($template_args = array()) {
 		$template_args['use_full_logging'] = EE_Registry::instance()->CFG->admin->use_full_logging;
-		$template_args['use_remote_logging'] = isset( EE_Registry::instance()->CFG->admin->use_remote_logging ) ? absint( EE_Registry::instance()->CFG->admin->use_remote_logging ) : FALSE;
-		$template_args['remote_logging_url'] = isset( EE_Registry::instance()->CFG->admin->remote_logging_url ) && ! empty( EE_Registry::instance()->CFG->admin->remote_logging_url ) ? stripslashes( EE_Registry::instance()->CFG->admin->remote_logging_url ) : '';
-		$template = GEN_SET_CAF_TEMPLATE_PATH . 'debug_log_settings.template.php';
-		EEH_Template::display_template( $template, $template_args );
+		$template_args['use_remote_logging'] = isset(EE_Registry::instance()->CFG->admin->use_remote_logging) ? absint(EE_Registry::instance()->CFG->admin->use_remote_logging) : FALSE;
+		$template_args['remote_logging_url'] = isset(EE_Registry::instance()->CFG->admin->remote_logging_url) && ! empty(EE_Registry::instance()->CFG->admin->remote_logging_url) ? stripslashes(EE_Registry::instance()->CFG->admin->remote_logging_url) : '';
+		$template = GEN_SET_CAF_TEMPLATE_PATH.'debug_log_settings.template.php';
+		EEH_Template::display_template($template, $template_args);
 	}
 
 
@@ -84,17 +84,17 @@ 
 	 * @param array $admin_options
 	 * @return array
 	 */
-	public function update_debug_logging_options( $admin_options = array() ) {
-		$use_full_logging = isset( $this->_req_data['use_full_logging'] ) ? (bool)absint( $this->_req_data['use_full_logging'] ) : $admin_options->use_full_logging;
+	public function update_debug_logging_options($admin_options = array()) {
+		$use_full_logging = isset($this->_req_data['use_full_logging']) ? (bool) absint($this->_req_data['use_full_logging']) : $admin_options->use_full_logging;
 		$admin_options->use_full_logging = $use_full_logging;
 		
-		if ( $use_full_logging === FALSE ) {
-			EE_Error::get_notices( FALSE );
+		if ($use_full_logging === FALSE) {
+			EE_Error::get_notices(FALSE);
 			EE_Error::reset_notices();
 		}
 
-		$admin_options->use_remote_logging = isset( $this->_req_data['use_remote_logging'] ) ? absint( $this->_req_data['use_remote_logging'] ) : $admin_options->use_remote_logging;
-		$admin_options->remote_logging_url = isset( $this->_req_data['remote_logging_url'] ) ? esc_url_raw( $this->_req_data['remote_logging_url'] ) : $admin_options->remote_logging_url;
+		$admin_options->use_remote_logging = isset($this->_req_data['use_remote_logging']) ? absint($this->_req_data['use_remote_logging']) : $admin_options->use_remote_logging;
+		$admin_options->remote_logging_url = isset($this->_req_data['remote_logging_url']) ? esc_url_raw($this->_req_data['remote_logging_url']) : $admin_options->remote_logging_url;
 		return $admin_options;
 	}
 

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

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/registration_form/Registration_Form_Question_Groups_Admin_List_Table.class.php

Spacing +30 added lines, -30 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -31,7 +31,7 @@ 
 class Registration_Form_Question_Groups_Admin_List_Table extends EE_Admin_List_Table {
 
 
-	public function __construct( $admin_page ) {
+	public function __construct($admin_page) {
 		parent::__construct($admin_page);
 	}
 
@@ -39,8 +39,8 @@ 
 
 
 	protected function _setup_data() {
-		$this->_data = $this->_view != 'trash' ? $this->_admin_page->get_question_groups( $this->_per_page,$this->_current_page, FALSE ) : $this->_admin_page->get_trashed_question_groups( $this->_per_page,$this->_current_page, FALSE );
-		$this->_all_data_count = $this->_view != 'trash' ? $this->_admin_page->get_question_groups( $this->_per_page,$this->_current_page, TRUE ) : $this->_admin_page->get_trashed_question_groups( $this->_per_page,$this->_current_page, TRUE );
+		$this->_data = $this->_view != 'trash' ? $this->_admin_page->get_question_groups($this->_per_page, $this->_current_page, FALSE) : $this->_admin_page->get_trashed_question_groups($this->_per_page, $this->_current_page, FALSE);
+		$this->_all_data_count = $this->_view != 'trash' ? $this->_admin_page->get_question_groups($this->_per_page, $this->_current_page, TRUE) : $this->_admin_page->get_trashed_question_groups($this->_per_page, $this->_current_page, TRUE);
 	}
 
 
@@ -49,8 +49,8 @@ 
 
 	protected function _set_properties() {
 		$this->_wp_list_args = array(
-			'singular' => __('question group', 'event_espresso' ),
-			'plural' => __('question groups', 'event_espresso' ),
+			'singular' => __('question group', 'event_espresso'),
+			'plural' => __('question groups', 'event_espresso'),
 			'ajax' => TRUE, //for now,
 			'screen' => $this->_admin_page->get_current_screen()->id
 			);
@@ -65,8 +65,8 @@ 
 			);
 
 		$this->_sortable_columns = array(
-			'id' => array( 'QSG_ID' => FALSE ),
-			'name' => array( 'QSG_name' => FALSE )
+			'id' => array('QSG_ID' => FALSE),
+			'name' => array('QSG_name' => FALSE)
 			);
 
 		$this->_hidden_columns = array(
@@ -92,9 +92,9 @@ 
 
 
 	protected function _add_view_counts() {
-		$this->_views['all']['count'] = $this->_admin_page->get_question_groups( $this->_per_page,$this->_current_page, TRUE );
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_question_groups', 'espresso_registration_form_trash_question_group' ) ) {
-			$this->_views['trash']['count'] = $this->_admin_page->get_trashed_question_groups( $this->_per_page,$this->_current_page, TRUE );
+		$this->_views['all']['count'] = $this->_admin_page->get_question_groups($this->_per_page, $this->_current_page, TRUE);
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_question_groups', 'espresso_registration_form_trash_question_group')) {
+			$this->_views['trash']['count'] = $this->_admin_page->get_trashed_question_groups($this->_per_page, $this->_current_page, TRUE);
 		}
 	}
 
@@ -107,7 +107,7 @@ 
 		$system_group = $item->get('QSG_system');
 		$has_questions_with_answers = $item->has_questions_with_answers();
 		$lock_icon = $system_group === 0 && $this->_view == 'trash' && $has_questions_with_answers ? 'ee-lock-icon ee-alternate-color' : 'ee-lock-icon ee-system-lock';
-		return $system_group > 0 || ( $system_group === 0 && $this->_view == 'trash' && $has_questions_with_answers ) || ! EE_Registry::instance()->CAP->current_user_can( 'ee_delete_question_groups', 'espresso_registration_form_trash_question_groups', $item->ID() ) ? '<span class="' . $lock_icon . '"></span>'  . sprintf( '<input type="hidden" name="hdnchk[%1$d]" value="%1$d" />', $item->ID() )  : sprintf( '<input type="checkbox" id="QSG_ID[%1$d]" name="checkbox[%1$d]" value="%1$d" />', $item->ID() );
+		return $system_group > 0 || ($system_group === 0 && $this->_view == 'trash' && $has_questions_with_answers) || ! EE_Registry::instance()->CAP->current_user_can('ee_delete_question_groups', 'espresso_registration_form_trash_question_groups', $item->ID()) ? '<span class="'.$lock_icon.'"></span>'.sprintf('<input type="hidden" name="hdnchk[%1$d]" value="%1$d" />', $item->ID()) : sprintf('<input type="checkbox" id="QSG_ID[%1$d]" name="checkbox[%1$d]" value="%1$d" />', $item->ID());
 	}
 
 
@@ -117,7 +117,7 @@ 
 
 	public function column_id(EE_Question_Group $item) {
 		$content = $item->ID();
-		$content .= '  <span class="show-on-mobile-view-only">' .$item->name() . '</span>';
+		$content .= '  <span class="show-on-mobile-view-only">'.$item->name().'</span>';
 		return $content;
 	}
 
@@ -127,7 +127,7 @@ 
 		$actions = array();
 
 		//return $item->name();
-		if ( !defined('REG_ADMIN_URL') )
+		if ( ! defined('REG_ADMIN_URL'))
 			define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
 
 		$edit_query_args = array(
@@ -152,32 +152,32 @@ 
 
 
 
-		$edit_link = EE_Admin_Page::add_query_args_and_nonce( $edit_query_args, EE_FORMS_ADMIN_URL );
-		$trash_link = EE_Admin_Page::add_query_args_and_nonce( $trash_query_args, EE_FORMS_ADMIN_URL );
-		$restore_link = EE_Admin_Page::add_query_args_and_nonce( $restore_query_args, EE_FORMS_ADMIN_URL );
-		$delete_link = EE_Admin_Page::add_query_args_and_nonce( $delete_query_args, EE_FORMS_ADMIN_URL );
+		$edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EE_FORMS_ADMIN_URL);
+		$trash_link = EE_Admin_Page::add_query_args_and_nonce($trash_query_args, EE_FORMS_ADMIN_URL);
+		$restore_link = EE_Admin_Page::add_query_args_and_nonce($restore_query_args, EE_FORMS_ADMIN_URL);
+		$delete_link = EE_Admin_Page::add_query_args_and_nonce($delete_query_args, EE_FORMS_ADMIN_URL);
 
-		if (  EE_Registry::instance()->CAP->current_user_can( 'ee_edit_question_group', 'espresso_registration_form_edit_question_group', $item->ID() ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_edit_question_group', 'espresso_registration_form_edit_question_group', $item->ID())) {
 			$actions = array(
-				'edit' => '<a href="' . $edit_link . '" title="' . esc_attr__('Edit Question Group', 'event_espresso') . '">' . __('Edit', 'event_espresso') . '</a>'
+				'edit' => '<a href="'.$edit_link.'" title="'.esc_attr__('Edit Question Group', 'event_espresso').'">'.__('Edit', 'event_espresso').'</a>'
 			);
 		}
-		if ( $item->get('QSG_system') < 1 && $this->_view != 'trash' &&  EE_Registry::instance()->CAP->current_user_can( 'ee_delete_question_group', 'espresso_registration_form_trash_question_group', $item->ID() ) ) {
-			$actions['delete'] = '<a href="' . $trash_link . '" title="' . esc_attr__('Delete Question Group', 'event_espresso') . '">' . __('Trash', 'event_espresso') . '</a>';
+		if ($item->get('QSG_system') < 1 && $this->_view != 'trash' && EE_Registry::instance()->CAP->current_user_can('ee_delete_question_group', 'espresso_registration_form_trash_question_group', $item->ID())) {
+			$actions['delete'] = '<a href="'.$trash_link.'" title="'.esc_attr__('Delete Question Group', 'event_espresso').'">'.__('Trash', 'event_espresso').'</a>';
 		}
 
-		if ( $this->_view == 'trash' ) {
+		if ($this->_view == 'trash') {
 
-			if (  EE_Registry::instance()->CAP->current_user_can( 'ee_delete_question_group', 'espresso_registration_form_restore_question_group', $item->ID() ) ) {
-				$actions['restore'] = '<a href="' . $restore_link . '" title="' . esc_attr__('Restore Question Group', 'event_espresso') . '">' . __('Restore', 'event_espresso') . '</a>';
+			if (EE_Registry::instance()->CAP->current_user_can('ee_delete_question_group', 'espresso_registration_form_restore_question_group', $item->ID())) {
+				$actions['restore'] = '<a href="'.$restore_link.'" title="'.esc_attr__('Restore Question Group', 'event_espresso').'">'.__('Restore', 'event_espresso').'</a>';
 			}
 
-			if ( !$item->has_questions_with_answers() &&  EE_Registry::instance()->CAP->current_user_can( 'ee_delete_question_group', 'espresso_registration_form_delete_question_group', $item->ID() ) ) {
-				$actions['delete'] = '<a href="' . $delete_link . '" title="' . esc_attr__('Delete Question Group Permanently', 'event_espresso') . '">' . __('Delete Permanently', 'event_espresso') . '</a>';
+			if ( ! $item->has_questions_with_answers() && EE_Registry::instance()->CAP->current_user_can('ee_delete_question_group', 'espresso_registration_form_delete_question_group', $item->ID())) {
+				$actions['delete'] = '<a href="'.$delete_link.'" title="'.esc_attr__('Delete Question Group Permanently', 'event_espresso').'">'.__('Delete Permanently', 'event_espresso').'</a>';
 			}
 		}
 
-		$content =  EE_Registry::instance()->CAP->current_user_can( 'ee_edit_question_group', 'espresso_registration_form_edit_question_group', $item->ID() ) ? '<strong><a class="row-title" href="' . $edit_link . '">' . $item->name() . '</a></strong>' : $item->name();
+		$content = EE_Registry::instance()->CAP->current_user_can('ee_edit_question_group', 'espresso_registration_form_edit_question_group', $item->ID()) ? '<strong><a class="row-title" href="'.$edit_link.'">'.$item->name().'</a></strong>' : $item->name();
 		$content .= $this->row_actions($actions);
 		return $content;
 	}
@@ -198,13 +198,13 @@ 
 
 
 	public function column_show_group_name(EE_Question_Group $item) {
-		return $this->_yes_no[ $item->show_group_name() ];
+		return $this->_yes_no[$item->show_group_name()];
 	}
 
 
 
 	public function column_show_group_desc(EE_Question_Group $item) {
-		return $this->_yes_no[ $item->show_group_desc() ];
+		return $this->_yes_no[$item->show_group_desc()];
 	}
 
 

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

core/libraries/plugin_api/EE_Register_Config.lib.php

Spacing +18 added lines, -18 removed lines

@@ -42,24 +42,24 @@ 
 	 *                       		}
 	 * @return void
 	 */
-	public static function register( $config_class = NULL, $setup_args = array() ) {
+	public static function register($config_class = NULL, $setup_args = array()) {
 
-		$setup_args['config_name'] = isset( $setup_args['config_name'] ) && ! empty( $setup_args['config_name'] ) ? $setup_args['config_name'] : $config_class;
-		$setup_args['config_section'] = isset( $setup_args['config_section'] ) && ! empty( $setup_args['config_section'] ) ? $setup_args['config_section'] : 'addons';
+		$setup_args['config_name'] = isset($setup_args['config_name']) && ! empty($setup_args['config_name']) ? $setup_args['config_name'] : $config_class;
+		$setup_args['config_section'] = isset($setup_args['config_section']) && ! empty($setup_args['config_section']) ? $setup_args['config_section'] : 'addons';
 
 		//required fields MUST be present, so let's make sure they are.
-		if ( empty( $config_class ) || ! is_array( $setup_args ) || empty( $setup_args['config_name'] )) {
-			throw new EE_Error( __( 'In order to register a Config Class with EE_Register_Config::register(), you must include a "config_class" (the actual class name for this config class). As well, you can supply an array containing the following keys: "config_section" the main section of the config object the settings will be saved under (by default the new config will be registered under EE_Config::instance()->modules or EE_Config::instance()->addons depending on what type of class is calling this), "config_name" (by default the new config will be registered to EE_Config::instance()->{config_section}->{config_class}, but supplying a "config_name" will set the property name that this variable is accessible by. ie: EE_Config::instance()->{config_section}->{config_name})', 'event_espresso' ));
+		if (empty($config_class) || ! is_array($setup_args) || empty($setup_args['config_name'])) {
+			throw new EE_Error(__('In order to register a Config Class with EE_Register_Config::register(), you must include a "config_class" (the actual class name for this config class). As well, you can supply an array containing the following keys: "config_section" the main section of the config object the settings will be saved under (by default the new config will be registered under EE_Config::instance()->modules or EE_Config::instance()->addons depending on what type of class is calling this), "config_name" (by default the new config will be registered to EE_Config::instance()->{config_section}->{config_class}, but supplying a "config_name" will set the property name that this variable is accessible by. ie: EE_Config::instance()->{config_section}->{config_name})', 'event_espresso'));
 		}
 
 		//make sure we don't register twice
-		if( isset( self::$_ee_config_registry[ $config_class ] ) ){
+		if (isset(self::$_ee_config_registry[$config_class])) {
 			return;
 		}
 
 
 		//first find out if this happened too late.
-		if ( did_action( 'AHEE__EE_System__load_core_configuration__begin' ) ) {
+		if (did_action('AHEE__EE_System__load_core_configuration__begin')) {
 			EE_Error::doing_it_wrong(
 				__METHOD__,
 				sprintf(
@@ -70,13 +70,13 @@ 
 				);
 		}
 		//add incoming stuff to our registry property
-		self::$_ee_config_registry[ $config_class ] = array(
+		self::$_ee_config_registry[$config_class] = array(
 			'section' => $setup_args['config_section'],
 			'name' => $setup_args['config_name']
 		);
 
-		add_action( 'AHEE__EE_Config___load_core_config__end', array( 'EE_Register_Config', 'set_config' ), 15, 1 );
-		add_action( 'AHEE__EE_Config__update_espresso_config__end', array( 'EE_Register_Config', 'set_config' ), 15, 1 );
+		add_action('AHEE__EE_Config___load_core_config__end', array('EE_Register_Config', 'set_config'), 15, 1);
+		add_action('AHEE__EE_Config__update_espresso_config__end', array('EE_Register_Config', 'set_config'), 15, 1);
 	}
 
 
@@ -90,18 +90,18 @@ 
 	 * @param \EE_Config $EE_Config
 	 * @return \StdClass
 	 */
-	public static function set_config( EE_Config $EE_Config ) {
-		foreach ( self::$_ee_config_registry as $config_class => $settings ) {
+	public static function set_config(EE_Config $EE_Config) {
+		foreach (self::$_ee_config_registry as $config_class => $settings) {
 			//first some validation of our incoming class_name.  We'll throw an error early if its' not registered correctly
-			if ( ! class_exists( $config_class )) {
+			if ( ! class_exists($config_class)) {
 				throw new EE_Error(
 					sprintf(
-						__( 'The "%s" config class can not be registered with EE_Config because it does not exist.  Verify that an autoloader has been set for this class', 'event_espresso' ),
+						__('The "%s" config class can not be registered with EE_Config because it does not exist.  Verify that an autoloader has been set for this class', 'event_espresso'),
 						$config_class
 					)
 				 );
 			}
-			$EE_Config->get_config( $settings['section'], $settings['name'], $config_class );
+			$EE_Config->get_config($settings['section'], $settings['name'], $config_class);
 		}
 	}
 
@@ -111,8 +111,8 @@ 
 	/**
 	 * @param mixed $config_class_name
 	 */
-	public static function deregister( $config_class_name = NULL ) {
-		if ( ! empty( self::$_ee_config_registry[ $config_class_name ] ))
-    			unset( self::$_ee_config_registry[ $config_class_name ] );
+	public static function deregister($config_class_name = NULL) {
+		if ( ! empty(self::$_ee_config_registry[$config_class_name]))
+    			unset(self::$_ee_config_registry[$config_class_name]);
 	}
 }

Indentation +1 added lines, -1 removed lines

@@ -113,6 +113,6 @@
 	 */
 	public static function deregister( $config_class_name = NULL ) {
 		if ( ! empty( self::$_ee_config_registry[ $config_class_name ] ))
-    			unset( self::$_ee_config_registry[ $config_class_name ] );
+				unset( self::$_ee_config_registry[ $config_class_name ] );
 	}
 }

modules/single_page_checkout/reg_steps/payment_options/EE_SPCO_Reg_Step_Payment_Options.class.php

Doc Comments +13 added lines, -11 removed lines

@@ -103,7 +103,7 @@ 
 
 
 	/**
-	 * @return null
+	 * @return EE_Line_Item_Display
 	 */
 	public function line_item_display() {
 		return $this->line_item_display;
@@ -112,7 +112,7 @@ 
 
 
 	/**
-	 * @param null $line_item_display
+	 * @param EE_Line_Item_Display $line_item_display
 	 */
 	public function set_line_item_display( $line_item_display ) {
 		$this->line_item_display = $line_item_display;
@@ -180,7 +180,7 @@ 
 
 
 	/**
-	 * @return bool
+	 * @return EE_Form_Section_Proper
 	 */
 	public function generate_reg_form() {
 		EE_Registry::instance()->load_helper( 'HTML' );
@@ -537,6 +537,7 @@ 
 	 *    _apply_registration_payments_to_amount_owing
 	 *
 	 * @access    protected
+	 * @param EE_Base_Class[] $registrations
 	 * @return    void
 	 */
 	protected function _apply_registration_payments_to_amount_owing( $registrations ) {
@@ -754,7 +755,7 @@ 
 	 * get_billing_form_html_for_payment_method
 	 *
 	 * @access public
-	 * @return string
+	 * @return boolean
 	 */
 	public function get_billing_form_html_for_payment_method() {
 		// how have they chosen to pay?
@@ -874,7 +875,7 @@ 
 	 * switch_payment_method
 	 *
 	 * @access public
-	 * @return string
+	 * @return boolean
 	 */
 	public function switch_payment_method() {
 		if ( ! $this->_verify_payment_method_is_set() ) {
@@ -1041,7 +1042,7 @@ 
 
 	/**
 	 * process_reg_step
-	 * @return boolean
+	 * @return null|boolean
 	 */
 	public function process_reg_step() {
 		// how have they chosen to pay?
@@ -1117,7 +1118,7 @@ 
 	 *    update_reg_step
 	 *    this is the final step after a user  revisits the site to retry a payment
 	 *
-	 * @return boolean
+	 * @return null|boolean
 	 */
 	public function update_reg_step() {
 		$success = TRUE;
@@ -1399,7 +1400,7 @@ 
 	 *
 	 * 	@access 	private
 	 * 	@type 	EE_Payment_Method $payment_method
-	 * 	@return 	mixed	EE_Payment | boolean
+	 * 	@return 	EE_Payment|null	EE_Payment | boolean
 	 */
 	private function _attempt_payment( EE_Payment_Method $payment_method ) {
 		$payment =NULL;
@@ -1602,6 +1603,7 @@ 
 	 * @access private
 	 * @type    EE_Payment $payment
 	 * @param string $payment_occurs
+	 * @param EE_Payment|null $payment
 	 * @return bool
 	 * @throws \EE_Error
 	 */
@@ -1708,7 +1710,7 @@ 
 	 * 		or present the payment options again
 	 *
 	 * @access private
-	 * @return EE_Payment | FALSE
+	 * @return boolean | FALSE
 	 */
 	public function process_gateway_response() {
 		$payment = null;
@@ -1769,7 +1771,7 @@ 
 	 * _validate_return
 	 *
 	 * @access private
-	 * @return bool
+	 * @return boolean|null
 	 */
 	private function _validate_offsite_return() {
 		$TXN_ID = (int)EE_Registry::instance()->REQ->get( 'spco_txn', 0 );
@@ -1836,7 +1838,7 @@ 
 	 *
 	 * @access private
 	 * @param \EE_Registration $primary_registrant
-	 * @return bool
+	 * @return false|null
 	 */
 	private function _redirect_wayward_request( EE_Registration $primary_registrant ) {
 		if ( ! $primary_registrant instanceof EE_Registration ) {

Spacing +370 added lines, -370 removed lines

@@ -28,15 +28,15 @@ 
 	 *  @return 	void
 	 */
 	public static function set_hooks() {
-		add_filter( 'FHEE__SPCO__EE_Line_Item_Filter_Collection', array( 'EE_SPCO_Reg_Step_Payment_Options', 'add_spco_line_item_filters' ) );
-		add_action( 'wp_ajax_switch_spco_billing_form', array( 'EE_SPCO_Reg_Step_Payment_Options', 'switch_spco_billing_form' ));
-		add_action( 'wp_ajax_nopriv_switch_spco_billing_form', array( 'EE_SPCO_Reg_Step_Payment_Options', 'switch_spco_billing_form' ));
-		add_action( 'wp_ajax_save_payer_details', array( 'EE_SPCO_Reg_Step_Payment_Options', 'save_payer_details' ));
-		add_action( 'wp_ajax_nopriv_save_payer_details', array( 'EE_SPCO_Reg_Step_Payment_Options', 'save_payer_details' ));
-		add_action( 'wp_ajax_get_transaction_details_for_gateways', array( 'EE_SPCO_Reg_Step_Payment_Options', 'get_transaction_details' ) );
-		add_action( 'wp_ajax_nopriv_get_transaction_details_for_gateways', array( 'EE_SPCO_Reg_Step_Payment_Options', 'get_transaction_details' )
+		add_filter('FHEE__SPCO__EE_Line_Item_Filter_Collection', array('EE_SPCO_Reg_Step_Payment_Options', 'add_spco_line_item_filters'));
+		add_action('wp_ajax_switch_spco_billing_form', array('EE_SPCO_Reg_Step_Payment_Options', 'switch_spco_billing_form'));
+		add_action('wp_ajax_nopriv_switch_spco_billing_form', array('EE_SPCO_Reg_Step_Payment_Options', 'switch_spco_billing_form'));
+		add_action('wp_ajax_save_payer_details', array('EE_SPCO_Reg_Step_Payment_Options', 'save_payer_details'));
+		add_action('wp_ajax_nopriv_save_payer_details', array('EE_SPCO_Reg_Step_Payment_Options', 'save_payer_details'));
+		add_action('wp_ajax_get_transaction_details_for_gateways', array('EE_SPCO_Reg_Step_Payment_Options', 'get_transaction_details'));
+		add_action('wp_ajax_nopriv_get_transaction_details_for_gateways', array('EE_SPCO_Reg_Step_Payment_Options', 'get_transaction_details')
 		);
-		add_filter( 'FHEE__EED_Recaptcha___bypass_recaptcha__bypass_request_params_array', array( 'EE_SPCO_Reg_Step_Payment_Options', 'bypass_recaptcha_for_load_payment_method' ), 10, 1 );
+		add_filter('FHEE__EED_Recaptcha___bypass_recaptcha__bypass_request_params_array', array('EE_SPCO_Reg_Step_Payment_Options', 'bypass_recaptcha_for_load_payment_method'), 10, 1);
 	}
 
 
@@ -45,7 +45,7 @@ 
 	 * 	ajax switch_spco_billing_form
 	 */
 	public static function switch_spco_billing_form() {
-		EED_Single_Page_Checkout::process_ajax_request( 'switch_payment_method' );
+		EED_Single_Page_Checkout::process_ajax_request('switch_payment_method');
 	}
 
 
@@ -54,7 +54,7 @@ 
 	 * 	ajax save_payer_details
 	 */
 	public static function save_payer_details() {
-		EED_Single_Page_Checkout::process_ajax_request( 'save_payer_details_via_ajax' );
+		EED_Single_Page_Checkout::process_ajax_request('save_payer_details_via_ajax');
 	}
 
 
@@ -63,7 +63,7 @@ 
 	 * 	ajax get_transaction_details
 	 */
 	public static function get_transaction_details() {
-		EED_Single_Page_Checkout::process_ajax_request( 'get_transaction_details_for_gateways' );
+		EED_Single_Page_Checkout::process_ajax_request('get_transaction_details_for_gateways');
 	}
 
 
@@ -91,13 +91,13 @@ 
 	 * @param    EE_Checkout $checkout
 	 * @return    \EE_SPCO_Reg_Step_Payment_Options
 	 */
-	public function __construct( EE_Checkout $checkout ) {
+	public function __construct(EE_Checkout $checkout) {
 		$this->_slug = 'payment_options';
 		$this->_name = __('Payment Options', 'event_espresso');
-		$this->_template = SPCO_REG_STEPS_PATH . $this->_slug . DS . 'payment_options_main.template.php';
+		$this->_template = SPCO_REG_STEPS_PATH.$this->_slug.DS.'payment_options_main.template.php';
 		$this->checkout = $checkout;
 		$this->_reset_success_message();
-		$this->set_instructions( __('Please select a method of payment and provide any necessary billing information before proceeding.', 'event_espresso'));
+		$this->set_instructions(__('Please select a method of payment and provide any necessary billing information before proceeding.', 'event_espresso'));
 	}
 
 
@@ -114,7 +114,7 @@ 
 	/**
 	 * @param null $line_item_display
 	 */
-	public function set_line_item_display( $line_item_display ) {
+	public function set_line_item_display($line_item_display) {
 		$this->line_item_display = $line_item_display;
 	}
 
@@ -125,9 +125,9 @@ 
 	 * @return void
 	 */
 	public function translate_js_strings() {
-		EE_Registry::$i18n_js_strings['no_payment_method'] = __( 'Please select a method of payment in order to continue.', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['invalid_payment_method'] = __( 'A valid method of payment could not be determined. Please refresh the page and try again.', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['forwarding_to_offsite'] = __( 'Forwarding to Secure Payment Provider.', 'event_espresso' );
+		EE_Registry::$i18n_js_strings['no_payment_method'] = __('Please select a method of payment in order to continue.', 'event_espresso');
+		EE_Registry::$i18n_js_strings['invalid_payment_method'] = __('A valid method of payment could not be determined. Please refresh the page and try again.', 'event_espresso');
+		EE_Registry::$i18n_js_strings['forwarding_to_offsite'] = __('Forwarding to Secure Payment Provider.', 'event_espresso');
 	}
 
 
@@ -156,20 +156,20 @@ 
 			// 	$ 0.00 transactions (no payment required)
 			! $this->checkout->payment_required()
 			// but do NOT remove if current action being called belongs to this reg step
-			&& ! is_callable( array( $this, $this->checkout->action ) )
+			&& ! is_callable(array($this, $this->checkout->action))
 			&& ! $this->completed()
 		) {
 			// and if so, then we no longer need the Payment Options step
-			if ( $this->is_current_step() ) {
+			if ($this->is_current_step()) {
 				$this->checkout->generate_reg_form = false;
 			}
-			$this->checkout->remove_reg_step( $this->_slug );
+			$this->checkout->remove_reg_step($this->_slug);
 			// DEBUG LOG
 			//$this->checkout->log( __CLASS__, __FUNCTION__, __LINE__ );
 			return false;
 		}
 		// load EEM_Payment_Method
-		EE_Registry::instance()->load_model( 'Payment_Method' );
+		EE_Registry::instance()->load_model('Payment_Method');
 		// get all active payment methods
 		$this->checkout->available_payment_methods = EEM_Payment_Method::instance()->get_all_for_transaction(
 			$this->checkout->transaction, EEM_Payment_Method::scope_cart
@@ -183,7 +183,7 @@ 
 	 * @return bool
 	 */
 	public function generate_reg_form() {
-		EE_Registry::instance()->load_helper( 'HTML' );
+		EE_Registry::instance()->load_helper('HTML');
 		// reset in case someone changes their mind
 		$this->_reset_selected_method_of_payment();
 		// set some defaults
@@ -194,15 +194,15 @@ 
 		$sold_out_events = array();
 		$reg_count = 0;
 		// loop thru registrations to gather info
-		$registrations = $this->checkout->transaction->registrations( $this->checkout->reg_cache_where_params );
-		foreach ( $registrations as $registration ) {
+		$registrations = $this->checkout->transaction->registrations($this->checkout->reg_cache_where_params);
+		foreach ($registrations as $registration) {
 			/** @var $registration EE_Registration */
 			$reg_count++;
 			// if returning registrant is Approved then do NOT do this
-			if ( ! ( $this->checkout->revisit && $registration->status_ID() == EEM_Registration::status_id_approved )) {
-				if ( $registration->event()->is_sold_out() || $registration->event()->is_sold_out( true )) {
+			if ( ! ($this->checkout->revisit && $registration->status_ID() == EEM_Registration::status_id_approved)) {
+				if ($registration->event()->is_sold_out() || $registration->event()->is_sold_out(true)) {
 					// add event to list of events that are sold out
-					$sold_out_events[ $registration->event()->ID() ] = $registration->event();
+					$sold_out_events[$registration->event()->ID()] = $registration->event();
 					do_action(
 						'AHEE__EE_SPCO_Reg_Step_Payment_Options__generate_reg_form__sold_out_event',
 						$registration->event(),
@@ -210,9 +210,9 @@ 
 					);
 				}
 				// event requires admin approval
-				if ( $registration->status_ID() == EEM_Registration::status_id_not_approved ) {
+				if ($registration->status_ID() == EEM_Registration::status_id_not_approved) {
 					// add event to list of events with pre-approval reg status
-					$registrations_requiring_pre_approval[ $registration->ID() ] = $registration;
+					$registrations_requiring_pre_approval[$registration->ID()] = $registration;
 					do_action(
 						'AHEE__EE_SPCO_Reg_Step_Payment_Options__generate_reg_form__event_requires_pre_approval',
 						$registration->event(),
@@ -221,29 +221,29 @@ 
 				}
 			}
 			// are they allowed to pay now and is there monies owing?
-			if ( $registration->owes_monies_and_can_pay() ) {
-				$registrations_requiring_payment[ $registration->ID() ] = $registration;
+			if ($registration->owes_monies_and_can_pay()) {
+				$registrations_requiring_payment[$registration->ID()] = $registration;
 				do_action(
 					'AHEE__EE_SPCO_Reg_Step_Payment_Options__generate_reg_form__event_requires_payment',
 					$registration->event(),
 					$this
 				);
-			} else if ( ! $this->checkout->revisit && $registration->status_ID() != EEM_Registration::status_id_not_approved && $registration->ticket()->is_free()  ) {
-				$registrations_for_free_events[ $registration->event()->ID() ] = $registration;
+			} else if ( ! $this->checkout->revisit && $registration->status_ID() != EEM_Registration::status_id_not_approved && $registration->ticket()->is_free()) {
+				$registrations_for_free_events[$registration->event()->ID()] = $registration;
 			}
 		}
 		$subsections = array();
 		// now decide which template to load
-		if ( ! empty( $sold_out_events )) {
-			$subsections['sold_out_events'] = $this->_sold_out_events( $sold_out_events );
+		if ( ! empty($sold_out_events)) {
+			$subsections['sold_out_events'] = $this->_sold_out_events($sold_out_events);
 		}
-		if ( ! empty( $registrations_requiring_pre_approval )) {
-			$subsections['registrations_requiring_pre_approval'] = $this->_registrations_requiring_pre_approval( $registrations_requiring_pre_approval );
+		if ( ! empty($registrations_requiring_pre_approval)) {
+			$subsections['registrations_requiring_pre_approval'] = $this->_registrations_requiring_pre_approval($registrations_requiring_pre_approval);
 		}
-		if ( ! empty( $registrations_for_free_events ) ) {
-			$subsections[ 'no_payment_required' ] = $this->_no_payment_required( $registrations_for_free_events );
+		if ( ! empty($registrations_for_free_events)) {
+			$subsections['no_payment_required'] = $this->_no_payment_required($registrations_for_free_events);
 		}
-		if ( ! empty( $registrations_requiring_payment ) ) {
+		if ( ! empty($registrations_requiring_payment)) {
 			// autoload Line_Item_Display classes
 			EEH_Autoloader::register_line_item_filter_autoloaders();
 			$line_item_filter_processor = new EE_Line_Item_Filter_Processor(
@@ -254,17 +254,17 @@ 
 				$this->checkout->cart->get_grand_total()
 			);
 			$filtered_line_item_tree = $line_item_filter_processor->process();
-			if ( $this->checkout->amount_owing > 0 ) {
+			if ($this->checkout->amount_owing > 0) {
 				EEH_Autoloader::register_line_item_display_autoloaders();
-				$this->set_line_item_display( new EE_Line_Item_Display( 'spco' ) );
-				$subsections[ 'payment_options' ] = $this->_display_payment_options(
+				$this->set_line_item_display(new EE_Line_Item_Display('spco'));
+				$subsections['payment_options'] = $this->_display_payment_options(
 					$this->line_item_display->display_line_item(
 						$filtered_line_item_tree,
-						array( 'registrations' => $registrations )
+						array('registrations' => $registrations)
 					)
 				);
 				$this->checkout->amount_owing = $filtered_line_item_tree->total();
-				$this->_apply_registration_payments_to_amount_owing( $registrations );
+				$this->_apply_registration_payments_to_amount_owing($registrations);
 			}
 		} else {
 			$this->_hide_reg_step_submit_button_if_revisit();
@@ -297,7 +297,7 @@ 
 	 * @param \EE_Line_Item_Filter_Collection $line_item_filter_collection
 	 * @return \EE_Line_Item_Filter_Collection
 	 */
-	public static function add_spco_line_item_filters( EE_Line_Item_Filter_Collection $line_item_filter_collection ) {
+	public static function add_spco_line_item_filters(EE_Line_Item_Filter_Collection $line_item_filter_collection) {
 		$line_item_filter_collection->add(
 			new EE_Billable_Line_Item_Filter(
 				EE_Registry::instance()->SSN->checkout()->transaction->registrations(
@@ -305,7 +305,7 @@ 
 				)
 			)
 		);
-		$line_item_filter_collection->add( new EE_Non_Zero_Line_Item_Filter() );
+		$line_item_filter_collection->add(new EE_Non_Zero_Line_Item_Filter());
 		return $line_item_filter_collection;
 	}
 
@@ -319,8 +319,8 @@ 
 	 * @return void
 	 */
 	protected function _hide_reg_step_submit_button_if_revisit() {
-		if ( $this->checkout->revisit ) {
-			add_filter( 'FHEE__EE_SPCO_Reg_Step__reg_step_submit_button__sbmt_btn_html', '__return_empty_string' );
+		if ($this->checkout->revisit) {
+			add_filter('FHEE__EE_SPCO_Reg_Step__reg_step_submit_button__sbmt_btn_html', '__return_empty_string');
 		}
 	}
 
@@ -331,12 +331,12 @@ 
 	 * @param \EE_Event[] $sold_out_events_array
 	 * @return \EE_Form_Section_Proper
 	 */
-	private function _sold_out_events( $sold_out_events_array = array() ) {
+	private function _sold_out_events($sold_out_events_array = array()) {
 		// set some defaults
 		$this->checkout->selected_method_of_payment = 'events_sold_out';
 		$sold_out_events = '';
-		foreach ( $sold_out_events_array as $sold_out_event ) {
-			$sold_out_events .= EEH_HTML::li( EEH_HTML::span( $sold_out_event->name(), '', 'dashicons dashicons-marker ee-icon-size-16 pink-text' ));
+		foreach ($sold_out_events_array as $sold_out_event) {
+			$sold_out_events .= EEH_HTML::li(EEH_HTML::span($sold_out_event->name(), '', 'dashicons dashicons-marker ee-icon-size-16 pink-text'));
 		}
 		return new EE_Form_Section_Proper(
 			array(
@@ -348,14 +348,14 @@ 
 				),
 				'layout_strategy'		=> new EE_Template_Layout(
 					array(
-						'layout_template_file' 	=> SPCO_REG_STEPS_PATH . $this->_slug . DS . 'sold_out_events.template.php', // layout_template
+						'layout_template_file' 	=> SPCO_REG_STEPS_PATH.$this->_slug.DS.'sold_out_events.template.php', // layout_template
 						'template_args'  				=> apply_filters(
 							'FHEE__EE_SPCO_Reg_Step_Payment_Options___sold_out_events__template_args',
 							array(
 								'sold_out_events' 			=> $sold_out_events,
 								'sold_out_events_msg' 	=> apply_filters(
 									'FHEE__EE_SPCO_Reg_Step_Payment_Options___sold_out_events__sold_out_events_msg',
-									__( 'It appears that the event you were about to make a payment for has sold out since you first registered. If you have already made a partial payment towards this event, please contact the event administrator for a refund.', 'event_espresso' )
+									__('It appears that the event you were about to make a payment for has sold out since you first registered. If you have already made a partial payment towards this event, please contact the event administrator for a refund.', 'event_espresso')
 								)
 							)
 						)
@@ -372,14 +372,14 @@ 
 	 * @param array $registrations_requiring_pre_approval
 	 * @return \EE_Form_Section_Proper
 	 */
-	private function _registrations_requiring_pre_approval( $registrations_requiring_pre_approval = array()) {
+	private function _registrations_requiring_pre_approval($registrations_requiring_pre_approval = array()) {
 		$events_requiring_pre_approval = '';
-		foreach ( $registrations_requiring_pre_approval as $registration ) {
-			if ( $registration instanceof EE_Registration && $registration->event() instanceof EE_Event ) {
-				$events_requiring_pre_approval[ $registration->event()->ID() ] = EEH_HTML::li(
-					EEH_HTML::span( '', '', 'dashicons dashicons-marker ee-icon-size-16 orange-text'
+		foreach ($registrations_requiring_pre_approval as $registration) {
+			if ($registration instanceof EE_Registration && $registration->event() instanceof EE_Event) {
+				$events_requiring_pre_approval[$registration->event()->ID()] = EEH_HTML::li(
+					EEH_HTML::span('', '', 'dashicons dashicons-marker ee-icon-size-16 orange-text'
 					)
-					. EEH_HTML::span( $registration->event()->name(), '', 'orange-text' )
+					. EEH_HTML::span($registration->event()->name(), '', 'orange-text')
 				);
 			}
 		}
@@ -391,14 +391,14 @@ 
 				),
 				'layout_strategy'		=> new EE_Template_Layout(
 					array(
-						'layout_template_file' 	=> SPCO_REG_STEPS_PATH . $this->_slug . DS . 'events_requiring_pre_approval.template.php', // layout_template
+						'layout_template_file' 	=> SPCO_REG_STEPS_PATH.$this->_slug.DS.'events_requiring_pre_approval.template.php', // layout_template
 						'template_args'  				=> apply_filters(
 							'FHEE__EE_SPCO_Reg_Step_Payment_Options___sold_out_events__template_args',
 							array(
-								'events_requiring_pre_approval' 			=> implode( '', $events_requiring_pre_approval ),
+								'events_requiring_pre_approval' 			=> implode('', $events_requiring_pre_approval),
 								'events_requiring_pre_approval_msg' 	=> apply_filters(
 									'FHEE__EE_SPCO_Reg_Step_Payment_Options___events_requiring_pre_approval__events_requiring_pre_approval_msg',
-									__( 'The following events do not require payment at this time and will not be billed during this transaction. Billing will only occur after the attendee has been approved by the event organizer. You will be notified when your registration has been processed. If this is a free event, then no billing will occur.', 'event_espresso' )
+									__('The following events do not require payment at this time and will not be billed during this transaction. Billing will only occur after the attendee has been approved by the event organizer. You will be notified when your registration has been processed. If this is a free event, then no billing will occur.', 'event_espresso')
 								)
 							)
 						),
@@ -416,7 +416,7 @@ 
 	 * @param \EE_Event[] $registrations_for_free_events
 	 * @return \EE_Form_Section_Proper
 	 */
-	private function _no_payment_required( $registrations_for_free_events = array() ) {
+	private function _no_payment_required($registrations_for_free_events = array()) {
 		// set some defaults
 		$this->checkout->selected_method_of_payment = 'no_payment_required';
 		// generate no_payment_required form
@@ -428,7 +428,7 @@ 
 				),
 				'layout_strategy' 	=> new EE_Template_Layout(
 					array(
-						'layout_template_file' 	=> SPCO_REG_STEPS_PATH . $this->_slug . DS . 'no_payment_required.template.php', // layout_template
+						'layout_template_file' 	=> SPCO_REG_STEPS_PATH.$this->_slug.DS.'no_payment_required.template.php', // layout_template
 						'template_args'  				=> apply_filters(
 							'FHEE__EE_SPCO_Reg_Step_Payment_Options___no_payment_required__template_args',
 							array(
@@ -436,7 +436,7 @@ 
 								'registrations' => array(),
 								'ticket_count' 	=> array(),
 								'registrations_for_free_events' 	=> $registrations_for_free_events,
-								'no_payment_required_msg' => EEH_HTML::p( __( 'This is a free event, so no billing will occur.', 'event_espresso' ))
+								'no_payment_required_msg' => EEH_HTML::p(__('This is a free event, so no billing will occur.', 'event_espresso'))
 							)
 						),
 					)
@@ -453,7 +453,7 @@ 
 	 * @param string $transaction_details
 	 * @return \EE_Form_Section_Proper
 	 */
-	private function _display_payment_options( $transaction_details = '' ) {
+	private function _display_payment_options($transaction_details = '') {
 		// has method_of_payment been set by no-js user?
 		$this->checkout->selected_method_of_payment = $this->_get_selected_method_of_payment();
 		// build payment options form
@@ -465,20 +465,20 @@ 
 						'before_payment_options' => apply_filters(
 							'FHEE__EE_SPCO_Reg_Step_Payment_Options___display_payment_options__before_payment_options',
 							new EE_Form_Section_Proper(
-								array( 'layout_strategy'	=> new EE_Div_Per_Section_Layout() )
+								array('layout_strategy'	=> new EE_Div_Per_Section_Layout())
 							)
 						),
 						'payment_options' => $this->_setup_payment_options(),
 						'after_payment_options' => apply_filters(
 							'FHEE__EE_SPCO_Reg_Step_Payment_Options___display_payment_options__after_payment_options',
 							new EE_Form_Section_Proper(
-								array( 'layout_strategy'	=> new EE_Div_Per_Section_Layout() )
+								array('layout_strategy'	=> new EE_Div_Per_Section_Layout())
 							)
 						),
 						'default_hidden_inputs' => $this->reg_step_hidden_inputs(),
-						'extra_hidden_inputs' 	=> $this->_extra_hidden_inputs( FALSE )
+						'extra_hidden_inputs' 	=> $this->_extra_hidden_inputs(FALSE)
 					),
-					'layout_strategy'	=> new EE_Template_Layout( array(
+					'layout_strategy'	=> new EE_Template_Layout(array(
 							'layout_template_file' 	=> $this->_template,
 							'template_args'  				=> apply_filters(
 								'FHEE__EE_SPCO_Reg_Step_Payment_Options___display_payment_options__template_args',
@@ -502,11 +502,11 @@ 
 	 * @param bool $no_payment_required
 	 * @return \EE_Form_Section_Proper
 	 */
-	private function _extra_hidden_inputs( $no_payment_required = TRUE ) {
+	private function _extra_hidden_inputs($no_payment_required = TRUE) {
 
 		return new EE_Form_Section_Proper(
 			array(
-				'html_id' 				=> 'ee-' . $this->slug() . '-extra-hidden-inputs',
+				'html_id' 				=> 'ee-'.$this->slug().'-extra-hidden-inputs',
 				'layout_strategy'	=> new EE_Div_Per_Section_Layout(),
 				'subsections' 		=> array(
 					'spco_no_payment_required' => new EE_Hidden_Input(
@@ -539,16 +539,16 @@ 
 	 * @access    protected
 	 * @return    void
 	 */
-	protected function _apply_registration_payments_to_amount_owing( $registrations ) {
+	protected function _apply_registration_payments_to_amount_owing($registrations) {
 		$payments = array();
-		foreach ( $registrations as $registration ) {
-			if ( $registration instanceof EE_Registration && $registration->owes_monies_and_can_pay() ) {
+		foreach ($registrations as $registration) {
+			if ($registration instanceof EE_Registration && $registration->owes_monies_and_can_pay()) {
 				$payments = $payments + $registration->registration_payments();
 			}
 		}
-		if ( ! empty( $payments ) ) {
-			foreach ( $payments as $payment ) {
-				if ( $payment instanceof EE_Registration_Payment ) {
+		if ( ! empty($payments)) {
+			foreach ($payments as $payment) {
+				if ($payment instanceof EE_Registration_Payment) {
 					$this->checkout->amount_owing -= $payment->amount();
 				}
 			}
@@ -563,9 +563,9 @@ 
 	 * @param 	bool $force_reset
 	 * @return 	void
 	 */
-	private function _reset_selected_method_of_payment( $force_reset = FALSE ) {
-		$reset_payment_method = $force_reset ? TRUE : sanitize_text_field( EE_Registry::instance()->REQ->get( 'reset_payment_method', FALSE ));
-		if ( $reset_payment_method ) {
+	private function _reset_selected_method_of_payment($force_reset = FALSE) {
+		$reset_payment_method = $force_reset ? TRUE : sanitize_text_field(EE_Registry::instance()->REQ->get('reset_payment_method', FALSE));
+		if ($reset_payment_method) {
 			$this->checkout->selected_method_of_payment = NULL;
 			$this->checkout->payment_method = NULL;
 			$this->checkout->billing_form = NULL;
@@ -584,9 +584,9 @@ 
 	 * @param string $selected_method_of_payment
 	 * 	@return 		EE_Billing_Info_Form
 	 */
-	private function _save_selected_method_of_payment( $selected_method_of_payment = '' ) {
-		$selected_method_of_payment = ! empty( $selected_method_of_payment ) ? $selected_method_of_payment : $this->checkout->selected_method_of_payment;
-		EE_Registry::instance()->SSN->set_session_data( array( 'selected_method_of_payment' => $selected_method_of_payment ));
+	private function _save_selected_method_of_payment($selected_method_of_payment = '') {
+		$selected_method_of_payment = ! empty($selected_method_of_payment) ? $selected_method_of_payment : $this->checkout->selected_method_of_payment;
+		EE_Registry::instance()->SSN->set_session_data(array('selected_method_of_payment' => $selected_method_of_payment));
 	}
 
 
@@ -599,40 +599,40 @@ 
 		// load payment method classes
 		$this->checkout->available_payment_methods = $this->_get_available_payment_methods();
 		// switch up header depending on number of available payment methods
-		$payment_method_header = count( $this->checkout->available_payment_methods ) > 1
-			? apply_filters( 'FHEE__registration_page_payment_options__method_of_payment_hdr', __( 'Please Select Your Method of Payment', 'event_espresso' ))
-			: apply_filters( 'FHEE__registration_page_payment_options__method_of_payment_hdr', __( 'Method of Payment', 'event_espresso' ));
+		$payment_method_header = count($this->checkout->available_payment_methods) > 1
+			? apply_filters('FHEE__registration_page_payment_options__method_of_payment_hdr', __('Please Select Your Method of Payment', 'event_espresso'))
+			: apply_filters('FHEE__registration_page_payment_options__method_of_payment_hdr', __('Method of Payment', 'event_espresso'));
 		$available_payment_methods = array(
 			// display the "Payment Method" header
 			'payment_method_header' => new EE_Form_Section_HTML(
-				EEH_HTML::h4 ( $payment_method_header, 'method-of-payment-hdr' )
+				EEH_HTML::h4($payment_method_header, 'method-of-payment-hdr')
 			)
 		);
 		// the list of actual payment methods ( invoice, paypal, etc ) in a  ( slug => HTML )  format
 		$available_payment_method_options = array();
 		$default_payment_method_option = array();
 		// additional instructions to be displayed and hidden below payment methods (adding a clearing div to start)
-		$payment_methods_billing_info = array( new EE_Form_Section_HTML( EEH_HTML::div ( '<br />', '', '', 'clear:both;' )));
+		$payment_methods_billing_info = array(new EE_Form_Section_HTML(EEH_HTML::div('<br />', '', '', 'clear:both;')));
 		// loop through payment methods
-		foreach( $this->checkout->available_payment_methods as $payment_method ) {
-			if ( $payment_method instanceof EE_Payment_Method ) {
-				$payment_method_button = EEH_HTML::img( $payment_method->button_url(), $payment_method->name(), 'spco-payment-method-' . $payment_method->slug() . '-btn-img', 'spco-payment-method-btn-img' );
+		foreach ($this->checkout->available_payment_methods as $payment_method) {
+			if ($payment_method instanceof EE_Payment_Method) {
+				$payment_method_button = EEH_HTML::img($payment_method->button_url(), $payment_method->name(), 'spco-payment-method-'.$payment_method->slug().'-btn-img', 'spco-payment-method-btn-img');
 				// check if any payment methods are set as default
 				// if payment method is already selected OR nothing is selected and this payment method should be open_by_default
-				if (( $this->checkout->selected_method_of_payment == $payment_method->slug() ) || ( ! $this->checkout->selected_method_of_payment && $payment_method->open_by_default() )) {
+				if (($this->checkout->selected_method_of_payment == $payment_method->slug()) || ( ! $this->checkout->selected_method_of_payment && $payment_method->open_by_default())) {
 					$this->checkout->selected_method_of_payment = $payment_method->slug();
 					$this->_save_selected_method_of_payment();
-					$default_payment_method_option[ $payment_method->slug() ] =  $payment_method_button;
+					$default_payment_method_option[$payment_method->slug()] = $payment_method_button;
 				} else {
-					$available_payment_method_options[ $payment_method->slug() ] =  $payment_method_button;
+					$available_payment_method_options[$payment_method->slug()] = $payment_method_button;
 				}
-				$payment_methods_billing_info[ $payment_method->slug() . '-info' ] = $this->_payment_method_billing_info( $payment_method );
+				$payment_methods_billing_info[$payment_method->slug().'-info'] = $this->_payment_method_billing_info($payment_method);
 			}
 		}
 		// prepend available_payment_method_options with default_payment_method_option so that it appears first in list of PMs
 		$available_payment_method_options = $default_payment_method_option + $available_payment_method_options;
 		// now generate the actual form  inputs
-		$available_payment_methods['available_payment_methods'] = $this->_available_payment_method_inputs( $available_payment_method_options );
+		$available_payment_methods['available_payment_methods'] = $this->_available_payment_method_inputs($available_payment_method_options);
 		$available_payment_methods = $available_payment_methods + $payment_methods_billing_info;
 
 		// build the available payment methods form
@@ -652,19 +652,19 @@ 
 	 * @return EE_Payment_Method[]
 	 */
 	protected function _get_available_payment_methods() {
-		if ( ! empty( $this->checkout->available_payment_methods )) {
+		if ( ! empty($this->checkout->available_payment_methods)) {
 			return $this->checkout->available_payment_methods;
 		}
 		$available_payment_methods = array();
 		// load EEM_Payment_Method
-		EE_Registry::instance()->load_model( 'Payment_Method' );
+		EE_Registry::instance()->load_model('Payment_Method');
 		/** @type EEM_Payment_Method $EEM_Payment_Method */
 		$EEM_Payment_Method = EE_Registry::instance()->LIB->EEM_Payment_Method;
 		// get all active payment methods
-		$payment_methods = $EEM_Payment_Method->get_all_for_transaction( $this->checkout->transaction, EEM_Payment_Method::scope_cart );
-		foreach ( $payment_methods as $payment_method ) {
-			if ( $payment_method instanceof EE_Payment_Method ) {
-				$available_payment_methods[ $payment_method->slug() ] = $payment_method;
+		$payment_methods = $EEM_Payment_Method->get_all_for_transaction($this->checkout->transaction, EEM_Payment_Method::scope_cart);
+		foreach ($payment_methods as $payment_method) {
+			if ($payment_method instanceof EE_Payment_Method) {
+				$available_payment_methods[$payment_method->slug()] = $payment_method;
 			}
 		}
 		return $available_payment_methods;
@@ -680,14 +680,14 @@ 
 	 * @param 	array $available_payment_method_options
 	 * @return 	\EE_Form_Section_Proper
 	 */
-	private function _available_payment_method_inputs( $available_payment_method_options = array() ) {
+	private function _available_payment_method_inputs($available_payment_method_options = array()) {
 		// generate inputs
 		return new EE_Form_Section_Proper(
 			array(
 				'html_id' 				=> 'ee-available-payment-method-inputs',
 				'layout_strategy'	=> new EE_Div_Per_Section_Layout(),
 				'subsections' 		=> array(
-					'' => new EE_Radio_Button_Input (
+					'' => new EE_Radio_Button_Input(
 						$available_payment_method_options,
 						array(
 							'html_name' 				=> 'selected_method_of_payment',
@@ -711,36 +711,36 @@ 
 	 * @param 	EE_Payment_Method $payment_method
 	 * @return 	\EE_Form_Section_Proper
 	 */
-	private function _payment_method_billing_info( EE_Payment_Method $payment_method ) {
+	private function _payment_method_billing_info(EE_Payment_Method $payment_method) {
 		$currently_selected = $this->checkout->selected_method_of_payment == $payment_method->slug() ? TRUE : FALSE;
 		// generate the billing form for payment method
-		$billing_form = $currently_selected ? $this->_get_billing_form_for_payment_method( $payment_method ) : new EE_Form_Section_HTML();
+		$billing_form = $currently_selected ? $this->_get_billing_form_for_payment_method($payment_method) : new EE_Form_Section_HTML();
 		$this->checkout->billing_form = $currently_selected ? $billing_form : $this->checkout->billing_form;
 		// it's all in the details
-		$info_html = EEH_HTML::h3 ( __( 'Important information regarding your payment', 'event_espresso' ), '', 'spco-payment-method-hdr' );
+		$info_html = EEH_HTML::h3(__('Important information regarding your payment', 'event_espresso'), '', 'spco-payment-method-hdr');
 		// add some info regarding the step, either from what's saved in the admin, or a default string depending on whether the PM has a billing form or not
-		if ( $payment_method->description() ) {
+		if ($payment_method->description()) {
 			$payment_method_info = $payment_method->description();
-		} elseif ( $billing_form instanceof EE_Billing_Info_Form ) {
-			$payment_method_info = sprintf( __( 'Please provide the following billing information, then click the "%1$s" button below in order to proceed.', 'event_espresso' ), $this->submit_button_text() );
+		} elseif ($billing_form instanceof EE_Billing_Info_Form) {
+			$payment_method_info = sprintf(__('Please provide the following billing information, then click the "%1$s" button below in order to proceed.', 'event_espresso'), $this->submit_button_text());
 		} else {
-			$payment_method_info = sprintf( __( 'Please click the "%1$s" button below in order to proceed.', 'event_espresso' ), $this->submit_button_text() );
+			$payment_method_info = sprintf(__('Please click the "%1$s" button below in order to proceed.', 'event_espresso'), $this->submit_button_text());
 		}
-		$info_html .= EEH_HTML::p (
-			apply_filters( 'FHEE__EE_SPCO_Reg_Step_Payment_Options___payment_method_billing_info__payment_method_info', $payment_method_info ),
+		$info_html .= EEH_HTML::p(
+			apply_filters('FHEE__EE_SPCO_Reg_Step_Payment_Options___payment_method_billing_info__payment_method_info', $payment_method_info),
 			'',
 			'spco-payment-method-desc ee-attention'
 		);
 
 		return new EE_Form_Section_Proper(
 			array(
-				'html_id' 					=> 'spco-payment-method-info-' . $payment_method->slug(),
+				'html_id' 					=> 'spco-payment-method-info-'.$payment_method->slug(),
 				'html_class' 			=> 'spco-payment-method-info-dv',
 				// only display the selected or default PM
 				'html_style' 			=> $currently_selected ? '' : 'display:none;',
 				'layout_strategy'		=> new EE_Div_Per_Section_Layout(),
 				'subsections' 			=> array(
-					'info' 					=> new EE_Form_Section_HTML( $info_html ),
+					'info' 					=> new EE_Form_Section_HTML($info_html),
 					'billing_form' 		=> $currently_selected ? $billing_form : new EE_Form_Section_HTML()
 				)
 			)
@@ -758,12 +758,12 @@ 
 	 */
 	public function get_billing_form_html_for_payment_method() {
 		// how have they chosen to pay?
-		$this->checkout->selected_method_of_payment = $this->_get_selected_method_of_payment( TRUE );
+		$this->checkout->selected_method_of_payment = $this->_get_selected_method_of_payment(TRUE);
 		$this->checkout->payment_method = $this->_get_payment_method_for_selected_method_of_payment();
-		if ( ! $this->checkout->payment_method instanceof EE_Payment_Method ) {
+		if ( ! $this->checkout->payment_method instanceof EE_Payment_Method) {
 			return FALSE;
 		}
-		if ( apply_filters( 'FHEE__EE_SPCO_Reg_Step_Payment_Options__registration_checkout__selected_payment_method__display_success', false ) ) {
+		if (apply_filters('FHEE__EE_SPCO_Reg_Step_Payment_Options__registration_checkout__selected_payment_method__display_success', false)) {
             EE_Error::add_success(
                 apply_filters(
                     'FHEE__Single_Page_Checkout__registration_checkout__selected_payment_method',
@@ -772,20 +772,20 @@ 
             );
         }
 		// now generate billing form for selected method of payment
-		$payment_method_billing_form = $this->_get_billing_form_for_payment_method( $this->checkout->payment_method );
+		$payment_method_billing_form = $this->_get_billing_form_for_payment_method($this->checkout->payment_method);
 		// fill form with attendee info if applicable
-		if ( $payment_method_billing_form instanceof EE_Billing_Attendee_Info_Form && $this->checkout->transaction_has_primary_registrant() ) {
-			$payment_method_billing_form->populate_from_attendee( $this->checkout->transaction->primary_registration()->attendee() );
+		if ($payment_method_billing_form instanceof EE_Billing_Attendee_Info_Form && $this->checkout->transaction_has_primary_registrant()) {
+			$payment_method_billing_form->populate_from_attendee($this->checkout->transaction->primary_registration()->attendee());
 		}
 		// and debug content
-		if ( $payment_method_billing_form instanceof EE_Billing_Info_Form && $this->checkout->payment_method->type_obj() instanceof EE_PMT_Base ) {
-			$payment_method_billing_form = $this->checkout->payment_method->type_obj()->apply_billing_form_debug_settings( $payment_method_billing_form );
+		if ($payment_method_billing_form instanceof EE_Billing_Info_Form && $this->checkout->payment_method->type_obj() instanceof EE_PMT_Base) {
+			$payment_method_billing_form = $this->checkout->payment_method->type_obj()->apply_billing_form_debug_settings($payment_method_billing_form);
 		}
 		$billing_info = $payment_method_billing_form instanceof EE_Form_Section_Proper ? $payment_method_billing_form->get_html() : '';
-		$this->checkout->json_response->set_return_data( array( 'payment_method_info' => $billing_info ));
+		$this->checkout->json_response->set_return_data(array('payment_method_info' => $billing_info));
 		// localize validation rules for main form
 		$this->checkout->current_step->reg_form->localize_validation_rules();
-		$this->checkout->json_response->add_validation_rules( EE_Form_Section_Proper::js_localization() );
+		$this->checkout->json_response->add_validation_rules(EE_Form_Section_Proper::js_localization());
 		return TRUE;
 	}
 
@@ -798,15 +798,15 @@ 
 	 * @param EE_Payment_Method $payment_method
 	 * @return \EE_Billing_Info_Form
 	 */
-	private function _get_billing_form_for_payment_method( EE_Payment_Method $payment_method ) {
-		$billing_form = $payment_method->type_obj()->billing_form( $this->checkout->transaction, array( 'amount_owing' => $this->checkout->amount_owing ) );
-		if ( $billing_form instanceof EE_Billing_Info_Form ) {
-			if ( EE_Registry::instance()->REQ->is_set( 'payment_method' )) {
-                if ( apply_filters('FHEE__EE_SPCO_Reg_Step_Payment_Options__registration_checkout__selected_payment_method__display_success', false )) {
+	private function _get_billing_form_for_payment_method(EE_Payment_Method $payment_method) {
+		$billing_form = $payment_method->type_obj()->billing_form($this->checkout->transaction, array('amount_owing' => $this->checkout->amount_owing));
+		if ($billing_form instanceof EE_Billing_Info_Form) {
+			if (EE_Registry::instance()->REQ->is_set('payment_method')) {
+                if (apply_filters('FHEE__EE_SPCO_Reg_Step_Payment_Options__registration_checkout__selected_payment_method__display_success', false)) {
                     EE_Error::add_success(
                         apply_filters(
                             'FHEE__Single_Page_Checkout__registration_checkout__selected_payment_method',
-                            sprintf( __( 'You have selected "%s" as your method of payment. Please note the important payment information below.', 'event_espresso' ), $payment_method->name() )
+                            sprintf(__('You have selected "%s" as your method of payment. Please note the important payment information below.', 'event_espresso'), $payment_method->name())
                         )
                     );
                 }
@@ -831,27 +831,27 @@ 
 	 * @param string 		$request_param
 	 * @return NULL|string
 	 */
-	private function _get_selected_method_of_payment( $required = FALSE, $request_param = 'selected_method_of_payment' ) {
+	private function _get_selected_method_of_payment($required = FALSE, $request_param = 'selected_method_of_payment') {
 		// is selected_method_of_payment set in the request ?
-		$selected_method_of_payment = EE_Registry::instance()->REQ->get( $request_param, FALSE );
-		if ( $selected_method_of_payment ) {
+		$selected_method_of_payment = EE_Registry::instance()->REQ->get($request_param, FALSE);
+		if ($selected_method_of_payment) {
 			// sanitize it
-			$selected_method_of_payment = is_array( $selected_method_of_payment ) ? array_shift( $selected_method_of_payment ) : $selected_method_of_payment;
-			$selected_method_of_payment = sanitize_text_field( $selected_method_of_payment );
+			$selected_method_of_payment = is_array($selected_method_of_payment) ? array_shift($selected_method_of_payment) : $selected_method_of_payment;
+			$selected_method_of_payment = sanitize_text_field($selected_method_of_payment);
 			// store it in the session so that it's available for all subsequent requests including AJAX
-			$this->_save_selected_method_of_payment( $selected_method_of_payment );
+			$this->_save_selected_method_of_payment($selected_method_of_payment);
 		} else {
 			// or is is set in the session ?
-			$selected_method_of_payment = EE_Registry::instance()->SSN->get_session_data( 'selected_method_of_payment' );
+			$selected_method_of_payment = EE_Registry::instance()->SSN->get_session_data('selected_method_of_payment');
 		}
 		// do ya really really gotta have it?
-		if ( empty( $selected_method_of_payment ) && $required ) {
+		if (empty($selected_method_of_payment) && $required) {
 			EE_Error::add_error(
 				sprintf(
-					__( 'The selected method of payment could not be determined.%sPlease ensure that you have selected one before proceeding.%sIf you continue to experience difficulties, then refresh your browser and try again, or contact %s for assistance.', 'event_espresso' ),
+					__('The selected method of payment could not be determined.%sPlease ensure that you have selected one before proceeding.%sIf you continue to experience difficulties, then refresh your browser and try again, or contact %s for assistance.', 'event_espresso'),
 					'<br/>',
 					'<br/>',
-					EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+					EE_Registry::instance()->CFG->organization->get_pretty('email')
 				),
 				__FILE__, __FUNCTION__, __LINE__
 			);
@@ -877,37 +877,37 @@ 
 	 * @return string
 	 */
 	public function switch_payment_method() {
-		if ( ! $this->_verify_payment_method_is_set() ) {
+		if ( ! $this->_verify_payment_method_is_set()) {
 			return FALSE;
 		}
-		if ( apply_filters( 'FHEE__EE_SPCO_Reg_Step_Payment_Options__registration_checkout__selected_payment_method__display_success', false ) ) {
+		if (apply_filters('FHEE__EE_SPCO_Reg_Step_Payment_Options__registration_checkout__selected_payment_method__display_success', false)) {
 			EE_Error::add_success(
 				apply_filters(
 					'FHEE__Single_Page_Checkout__registration_checkout__selected_payment_method',
-					sprintf( __( 'You have selected "%s" as your method of payment. Please note the important payment information below.', 'event_espresso' ), $this->checkout->payment_method->name() )
+					sprintf(__('You have selected "%s" as your method of payment. Please note the important payment information below.', 'event_espresso'), $this->checkout->payment_method->name())
 				)
 			);
 		}
 		// generate billing form for selected method of payment if it hasn't been done already
-		if ( $this->checkout->payment_method->type_obj()->has_billing_form() ) {
-			$this->checkout->billing_form = $this->_get_billing_form_for_payment_method( $this->checkout->payment_method );
+		if ($this->checkout->payment_method->type_obj()->has_billing_form()) {
+			$this->checkout->billing_form = $this->_get_billing_form_for_payment_method($this->checkout->payment_method);
 		}
 		// fill form with attendee info if applicable
-		if ( $this->checkout->billing_form instanceof EE_Billing_Attendee_Info_Form && $this->checkout->transaction_has_primary_registrant() ) {
-			$this->checkout->billing_form->populate_from_attendee( $this->checkout->transaction->primary_registration()->attendee() );
+		if ($this->checkout->billing_form instanceof EE_Billing_Attendee_Info_Form && $this->checkout->transaction_has_primary_registrant()) {
+			$this->checkout->billing_form->populate_from_attendee($this->checkout->transaction->primary_registration()->attendee());
 		}
 		// and debug content
-		if ( $this->checkout->billing_form instanceof EE_Billing_Info_Form && $this->checkout->payment_method->type_obj() instanceof EE_PMT_Base ) {
-			$this->checkout->billing_form = $this->checkout->payment_method->type_obj()->apply_billing_form_debug_settings( $this->checkout->billing_form );
+		if ($this->checkout->billing_form instanceof EE_Billing_Info_Form && $this->checkout->payment_method->type_obj() instanceof EE_PMT_Base) {
+			$this->checkout->billing_form = $this->checkout->payment_method->type_obj()->apply_billing_form_debug_settings($this->checkout->billing_form);
 		}
 		// get html and validation rules for form
-		if ( $this->checkout->billing_form instanceof EE_Form_Section_Proper ) {
-			$this->checkout->json_response->set_return_data( array( 'payment_method_info' => $this->checkout->billing_form->get_html() ));
+		if ($this->checkout->billing_form instanceof EE_Form_Section_Proper) {
+			$this->checkout->json_response->set_return_data(array('payment_method_info' => $this->checkout->billing_form->get_html()));
 			// localize validation rules for main form
-			$this->checkout->billing_form->localize_validation_rules( TRUE );
-			$this->checkout->json_response->add_validation_rules( EE_Form_Section_Proper::js_localization() );
+			$this->checkout->billing_form->localize_validation_rules(TRUE);
+			$this->checkout->json_response->add_validation_rules(EE_Form_Section_Proper::js_localization());
 		} else {
-			$this->checkout->json_response->set_return_data( array( 'payment_method_info' => '' ));
+			$this->checkout->json_response->set_return_data(array('payment_method_info' => ''));
 		}
 		//prevents advancement to next step
 		$this->checkout->continue_reg = FALSE;
@@ -922,12 +922,12 @@ 
 	 */
 	protected function _verify_payment_method_is_set() {
 		// generate billing form for selected method of payment if it hasn't been done already
-		if ( empty( $this->checkout->selected_method_of_payment )) {
+		if (empty($this->checkout->selected_method_of_payment)) {
 			// how have they chosen to pay?
-			$this->checkout->selected_method_of_payment = $this->_get_selected_method_of_payment( TRUE );
+			$this->checkout->selected_method_of_payment = $this->_get_selected_method_of_payment(TRUE);
 		}
 		// verify payment method
-		if ( ! $this->checkout->payment_method instanceof EE_Payment_Method ) {
+		if ( ! $this->checkout->payment_method instanceof EE_Payment_Method) {
 			// get payment method for selected method of payment
 			$this->checkout->payment_method = $this->_get_payment_method_for_selected_method_of_payment();
 		}
@@ -947,23 +947,23 @@ 
 	 * @return void
 	 */
 	public function save_payer_details_via_ajax() {
-		if ( ! $this->_verify_payment_method_is_set() ) {
+		if ( ! $this->_verify_payment_method_is_set()) {
 			return;
 		}
 		// generate billing form for selected method of payment if it hasn't been done already
-		if ( $this->checkout->payment_method->type_obj()->has_billing_form() ) {
-			$this->checkout->billing_form = $this->_get_billing_form_for_payment_method( $this->checkout->payment_method );
+		if ($this->checkout->payment_method->type_obj()->has_billing_form()) {
+			$this->checkout->billing_form = $this->_get_billing_form_for_payment_method($this->checkout->payment_method);
 		}
 		// generate primary attendee from payer info if applicable
 		if ( ! $this->checkout->transaction_has_primary_registrant()) {
 			$attendee = $this->_create_attendee_from_request_data();
-			if ( $attendee instanceof EE_Attendee ) {
-				foreach ( $this->checkout->transaction->registrations() as $registration ) {
-					if ( $registration->is_primary_registrant() ) {
+			if ($attendee instanceof EE_Attendee) {
+				foreach ($this->checkout->transaction->registrations() as $registration) {
+					if ($registration->is_primary_registrant()) {
 						$this->checkout->primary_attendee_obj = $attendee;
-						$registration->_add_relation_to( $attendee, 'Attendee' );
-						$registration->set_attendee_id( $attendee->ID() );
-						$registration->update_cache_after_object_save( 'Attendee', $attendee );
+						$registration->_add_relation_to($attendee, 'Attendee');
+						$registration->set_attendee_id($attendee->ID());
+						$registration->update_cache_after_object_save('Attendee', $attendee);
 					}
 				}
 			}
@@ -976,56 +976,56 @@ 
 	 * uses info from alternate GET or POST data (such as AJAX) to create a new attendee
 	 * @return \EE_Attendee
 	 */
-	protected function _create_attendee_from_request_data(){
+	protected function _create_attendee_from_request_data() {
 		// get State ID
-		$STA_ID = ! empty( $_REQUEST['state'] ) ? sanitize_text_field( $_REQUEST['state'] ) : '';
-		if ( ! empty( $STA_ID )) {
+		$STA_ID = ! empty($_REQUEST['state']) ? sanitize_text_field($_REQUEST['state']) : '';
+		if ( ! empty($STA_ID)) {
 			// can we get state object from name ?
-			EE_Registry::instance()->load_model( 'State' );
-			$state = EEM_State::instance()->get_col( array( array( 'STA_name' => $STA_ID ), 'limit' => 1), 'STA_ID' );
-			$STA_ID = is_array( $state ) && ! empty( $state ) ? reset( $state ) : $STA_ID;
+			EE_Registry::instance()->load_model('State');
+			$state = EEM_State::instance()->get_col(array(array('STA_name' => $STA_ID), 'limit' => 1), 'STA_ID');
+			$STA_ID = is_array($state) && ! empty($state) ? reset($state) : $STA_ID;
 		}
 		// get Country ISO
-		$CNT_ISO = ! empty( $_REQUEST['country'] ) ? sanitize_text_field( $_REQUEST['country'] ) : '';
-		if ( ! empty( $CNT_ISO )) {
+		$CNT_ISO = ! empty($_REQUEST['country']) ? sanitize_text_field($_REQUEST['country']) : '';
+		if ( ! empty($CNT_ISO)) {
 			// can we get country object from name ?
-			EE_Registry::instance()->load_model( 'Country' );
-			$country = EEM_Country::instance()->get_col( array( array( 'CNT_name' => $CNT_ISO ), 'limit' => 1), 'CNT_ISO' );
-			$CNT_ISO = is_array( $country ) && ! empty( $country ) ? reset( $country ) : $CNT_ISO;
+			EE_Registry::instance()->load_model('Country');
+			$country = EEM_Country::instance()->get_col(array(array('CNT_name' => $CNT_ISO), 'limit' => 1), 'CNT_ISO');
+			$CNT_ISO = is_array($country) && ! empty($country) ? reset($country) : $CNT_ISO;
 		}
 		// grab attendee data
 		$attendee_data = array(
-			'ATT_fname' 		=> ! empty( $_REQUEST['first_name'] ) ? sanitize_text_field( $_REQUEST['first_name'] ) : '',
-			'ATT_lname' 		=> ! empty( $_REQUEST['last_name'] ) ? sanitize_text_field( $_REQUEST['last_name'] ) : '',
-			'ATT_email' 		=> ! empty( $_REQUEST['email'] ) ? sanitize_email( $_REQUEST['email'] ) : '',
-			'ATT_address' 		=> ! empty( $_REQUEST['address'] ) ? sanitize_text_field( $_REQUEST['address'] ) : '',
-			'ATT_address2' 	=> ! empty( $_REQUEST['address2'] ) ? sanitize_text_field( $_REQUEST['address2'] ) : '',
-			'ATT_city' 			=> ! empty( $_REQUEST['city'] ) ? sanitize_text_field( $_REQUEST['city'] ) : '',
+			'ATT_fname' 		=> ! empty($_REQUEST['first_name']) ? sanitize_text_field($_REQUEST['first_name']) : '',
+			'ATT_lname' 		=> ! empty($_REQUEST['last_name']) ? sanitize_text_field($_REQUEST['last_name']) : '',
+			'ATT_email' 		=> ! empty($_REQUEST['email']) ? sanitize_email($_REQUEST['email']) : '',
+			'ATT_address' 		=> ! empty($_REQUEST['address']) ? sanitize_text_field($_REQUEST['address']) : '',
+			'ATT_address2' 	=> ! empty($_REQUEST['address2']) ? sanitize_text_field($_REQUEST['address2']) : '',
+			'ATT_city' 			=> ! empty($_REQUEST['city']) ? sanitize_text_field($_REQUEST['city']) : '',
 			'STA_ID' 				=> $STA_ID,
 			'CNT_ISO' 			=> $CNT_ISO,
-			'ATT_zip' 				=> ! empty( $_REQUEST['zip'] ) ? sanitize_text_field( $_REQUEST['zip'] ) : '',
-			'ATT_phone' 		=> ! empty( $_REQUEST['phone'] ) ? sanitize_text_field( $_REQUEST['phone'] ) : '',
+			'ATT_zip' 				=> ! empty($_REQUEST['zip']) ? sanitize_text_field($_REQUEST['zip']) : '',
+			'ATT_phone' 		=> ! empty($_REQUEST['phone']) ? sanitize_text_field($_REQUEST['phone']) : '',
 		);
 		// validate the email address since it is the most important piece of info
-		if ( empty( $attendee_data['ATT_email'] ) || $attendee_data['ATT_email'] != $_REQUEST['email'] ) {
-			EE_Error::add_error( __( 'An invalid email address was submitted.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($attendee_data['ATT_email']) || $attendee_data['ATT_email'] != $_REQUEST['email']) {
+			EE_Error::add_error(__('An invalid email address was submitted.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
 		// does this attendee already exist in the db ? we're searching using a combination of first name, last name, AND email address
-		if ( ! empty( $attendee_data['ATT_fname'] ) && ! empty( $attendee_data['ATT_lname'] ) && ! empty( $attendee_data['ATT_email'] ) ) {
-			$existing_attendee = EE_Registry::instance()->LIB->EEM_Attendee->find_existing_attendee( array(
+		if ( ! empty($attendee_data['ATT_fname']) && ! empty($attendee_data['ATT_lname']) && ! empty($attendee_data['ATT_email'])) {
+			$existing_attendee = EE_Registry::instance()->LIB->EEM_Attendee->find_existing_attendee(array(
 				'ATT_fname' => $attendee_data['ATT_fname'],
 				'ATT_lname' => $attendee_data['ATT_lname'],
 				'ATT_email' => $attendee_data['ATT_email']
 			));
-			if ( $existing_attendee instanceof EE_Attendee ) {
+			if ($existing_attendee instanceof EE_Attendee) {
 				return $existing_attendee;
 			}
 		}
 		// no existing attendee? kk let's create a new one
 		// kinda lame, but we need a first and last name to create an attendee, so use the email address if those don't exist
-		$attendee_data['ATT_fname'] = ! empty( $attendee_data['ATT_fname'] ) ? $attendee_data['ATT_fname'] : $attendee_data['ATT_email'];
-		$attendee_data['ATT_lname'] = ! empty( $attendee_data['ATT_lname'] ) ? $attendee_data['ATT_lname'] : $attendee_data['ATT_email'];
-		return EE_Attendee::new_instance( $attendee_data );
+		$attendee_data['ATT_fname'] = ! empty($attendee_data['ATT_fname']) ? $attendee_data['ATT_fname'] : $attendee_data['ATT_email'];
+		$attendee_data['ATT_lname'] = ! empty($attendee_data['ATT_lname']) ? $attendee_data['ATT_lname'] : $attendee_data['ATT_email'];
+		return EE_Attendee::new_instance($attendee_data);
 	}
 
 
@@ -1045,22 +1045,22 @@ 
 	 */
 	public function process_reg_step() {
 		// how have they chosen to pay?
-		$this->checkout->selected_method_of_payment = $this->checkout->transaction->is_free() ? 'no_payment_required' : $this->_get_selected_method_of_payment( TRUE );
+		$this->checkout->selected_method_of_payment = $this->checkout->transaction->is_free() ? 'no_payment_required' : $this->_get_selected_method_of_payment(TRUE);
 		// choose your own adventure based on method_of_payment
-		switch(  $this->checkout->selected_method_of_payment ) {
+		switch ($this->checkout->selected_method_of_payment) {
 
 			case 'events_sold_out' :
 				$this->checkout->redirect = TRUE;
 				$this->checkout->redirect_url = $this->checkout->cancel_page_url;
-				$this->checkout->json_response->set_redirect_url( $this->checkout->redirect_url );
+				$this->checkout->json_response->set_redirect_url($this->checkout->redirect_url);
 				// mark this reg step as completed
 				$this->set_completed();
 				return FALSE;
 				break;
 
 			case 'payments_closed' :
-				if ( apply_filters( 'FHEE__EE_SPCO_Reg_Step_Payment_Options__process_reg_step__payments_closed__display_success', false ) ) {
-					EE_Error::add_success( __( 'no payment required at this time.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+				if (apply_filters('FHEE__EE_SPCO_Reg_Step_Payment_Options__process_reg_step__payments_closed__display_success', false)) {
+					EE_Error::add_success(__('no payment required at this time.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				}
 				// mark this reg step as completed
 				$this->set_completed();
@@ -1068,8 +1068,8 @@ 
 				break;
 
 			case 'no_payment_required' :
-				if ( apply_filters( 'FHEE__EE_SPCO_Reg_Step_Payment_Options__process_reg_step__no_payment_required__display_success', false ) ) {
-					EE_Error::add_success( __( 'no payment required.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+				if (apply_filters('FHEE__EE_SPCO_Reg_Step_Payment_Options__process_reg_step__no_payment_required__display_success', false)) {
+					EE_Error::add_success(__('no payment required.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				}
 				// mark this reg step as completed
 				$this->set_completed();
@@ -1078,9 +1078,9 @@ 
 
 			default:
 				$payment_successful = $this->_process_payment();
-				if ( $payment_successful ) {
+				if ($payment_successful) {
 					$this->checkout->continue_reg = true;
-					$this->_maybe_set_completed( $this->checkout->payment_method );
+					$this->_maybe_set_completed($this->checkout->payment_method);
 				} else {
 					$this->checkout->continue_reg = false;
 				}
@@ -1098,8 +1098,8 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return void
 	 */
-	protected function _maybe_set_completed( EE_Payment_Method $payment_method ) {
-		switch ( $payment_method->type_obj()->payment_occurs() ) {
+	protected function _maybe_set_completed(EE_Payment_Method $payment_method) {
+		switch ($payment_method->type_obj()->payment_occurs()) {
 			case EE_PMT_Base::offsite :
 				break;
 			case EE_PMT_Base::onsite :
@@ -1122,15 +1122,15 @@ 
 	public function update_reg_step() {
 		$success = TRUE;
 		// if payment required
-		if ( $this->checkout->transaction->total() > 0 ) {
-			do_action ('AHEE__EE_Single_Page_Checkout__process_finalize_registration__before_gateway', $this->checkout->transaction );
+		if ($this->checkout->transaction->total() > 0) {
+			do_action('AHEE__EE_Single_Page_Checkout__process_finalize_registration__before_gateway', $this->checkout->transaction);
 			// attempt payment via payment method
 			$success = $this->process_reg_step();
 		}
-		if ( $success && ! $this->checkout->redirect ) {
-			$this->checkout->cart->get_grand_total()->save_this_and_descendants_to_txn( $this->checkout->transaction->ID() );
+		if ($success && ! $this->checkout->redirect) {
+			$this->checkout->cart->get_grand_total()->save_this_and_descendants_to_txn($this->checkout->transaction->ID());
 			 // set return URL
-			$this->checkout->redirect_url = add_query_arg( array( 'e_reg_url_link' => $this->checkout->reg_url_link ), $this->checkout->thank_you_page_url );
+			$this->checkout->redirect_url = add_query_arg(array('e_reg_url_link' => $this->checkout->reg_url_link), $this->checkout->thank_you_page_url);
 		}
 		return $success;
 	}
@@ -1150,24 +1150,24 @@ 
 		// clear any previous errors related to not selecting a payment method
 //		EE_Error::overwrite_errors();
 		// ya gotta make a choice man
-		if ( empty( $this->checkout->selected_method_of_payment )) {
-			$this->checkout->json_response->set_plz_select_method_of_payment( __( 'Please select a method of payment before proceeding.', 'event_espresso' ));
+		if (empty($this->checkout->selected_method_of_payment)) {
+			$this->checkout->json_response->set_plz_select_method_of_payment(__('Please select a method of payment before proceeding.', 'event_espresso'));
 			return FALSE;
 		}
 		// get EE_Payment_Method object
-		if ( ! $this->checkout->payment_method = $this->_get_payment_method_for_selected_method_of_payment() ) {
+		if ( ! $this->checkout->payment_method = $this->_get_payment_method_for_selected_method_of_payment()) {
 			return FALSE;
 		}
 		// setup billing form
-		if ( $this->checkout->payment_method->is_on_site() ) {
-			$this->checkout->billing_form = $this->_get_billing_form_for_payment_method( $this->checkout->payment_method );
+		if ($this->checkout->payment_method->is_on_site()) {
+			$this->checkout->billing_form = $this->_get_billing_form_for_payment_method($this->checkout->payment_method);
 			// bad billing form ?
-			if ( ! $this->_billing_form_is_valid() ) {
+			if ( ! $this->_billing_form_is_valid()) {
 				return FALSE;
 			}
 		}
 		// ensure primary registrant has been fully processed
-		if ( ! $this->_setup_primary_registrant_prior_to_payment() ) {
+		if ( ! $this->_setup_primary_registrant_prior_to_payment()) {
 			return FALSE;
 		}
 		/** @type EE_Transaction_Processor $transaction_processor */
@@ -1175,24 +1175,24 @@ 
 		// in case a registrant leaves to an Off-Site Gateway and never returns, we want to approve any registrations for events with a default reg status of Approved
 		//$transaction_processor->toggle_registration_statuses_for_default_approved_events( $this->checkout->transaction, $this->checkout->reg_cache_where_params );
 		// attempt payment
-		$payment = $this->_attempt_payment( $this->checkout->payment_method );
+		$payment = $this->_attempt_payment($this->checkout->payment_method);
 		// process results
-		$payment = $this->_validate_payment( $payment );
-		$payment = $this->_post_payment_processing( $payment );
+		$payment = $this->_validate_payment($payment);
+		$payment = $this->_post_payment_processing($payment);
 		// verify payment
-		if ( $payment instanceof EE_Payment ) {
+		if ($payment instanceof EE_Payment) {
 			// store that for later
 			$this->checkout->payment = $payment;
 			/** @type EE_Transaction_Processor $transaction_processor */
-			$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+			$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 			// we can also consider the TXN to not have been failed, so temporarily upgrade it's status to abandoned
-			$transaction_processor->toggle_failed_transaction_status( $this->checkout->transaction );
-			if ( $payment->status() == EEM_Payment::status_id_approved || $payment->status() == EEM_Payment::status_id_pending ) {
+			$transaction_processor->toggle_failed_transaction_status($this->checkout->transaction);
+			if ($payment->status() == EEM_Payment::status_id_approved || $payment->status() == EEM_Payment::status_id_pending) {
 				return true;
 			} else {
 				return false;
 			}
-		} else if ( $payment === true ) {
+		} else if ($payment === true) {
 			// please note that offline payment methods will NOT make a payment,
 			// but instead just mark themselves as the PMD_ID on the transaction, and return true
 			$this->checkout->payment = $payment;
@@ -1211,10 +1211,10 @@ 
 	 * @return bool
 	 */
 	public function redirect_form() {
-		$payment_method_billing_info = $this->_payment_method_billing_info( $this->_get_payment_method_for_selected_method_of_payment() );
+		$payment_method_billing_info = $this->_payment_method_billing_info($this->_get_payment_method_for_selected_method_of_payment());
 		$html = $payment_method_billing_info->get_html_and_js();
 		$html .= $this->checkout->redirect_form;
-		EE_Registry::instance()->REQ->add_output( $html );
+		EE_Registry::instance()->REQ->add_output($html);
 		return TRUE;
 	}
 
@@ -1227,36 +1227,36 @@ 
 	 * @return bool
 	 */
 	private function _billing_form_is_valid() {
-		if ( ! $this->checkout->payment_method->type_obj()->has_billing_form() ) {
+		if ( ! $this->checkout->payment_method->type_obj()->has_billing_form()) {
 			return TRUE;
 		}
-		if ( $this->checkout->billing_form instanceof EE_Billing_Info_Form ) {
-			if ( $this->checkout->billing_form->was_submitted() ) {
+		if ($this->checkout->billing_form instanceof EE_Billing_Info_Form) {
+			if ($this->checkout->billing_form->was_submitted()) {
 				$this->checkout->billing_form->receive_form_submission();
-				if ( $this->checkout->billing_form->is_valid() ) {
+				if ($this->checkout->billing_form->is_valid()) {
 					return TRUE;
 				}
 				$validation_errors = $this->checkout->billing_form->get_validation_errors_accumulated();
 				$error_strings = array();
-				foreach( $validation_errors as $validation_error ){
-					if( $validation_error instanceof EE_Validation_Error ){
+				foreach ($validation_errors as $validation_error) {
+					if ($validation_error instanceof EE_Validation_Error) {
 						$form_section = $validation_error->get_form_section();
-						if( $form_section instanceof EE_Form_Input_Base ){
+						if ($form_section instanceof EE_Form_Input_Base) {
 							$label = $form_section->html_label_text();
-						}elseif( $form_section instanceof EE_Form_Section_Base ){
+						}elseif ($form_section instanceof EE_Form_Section_Base) {
 							$label = $form_section->name();
-						}else{
-							$label = __( 'Validation Error', 'event_espresso' );
+						} else {
+							$label = __('Validation Error', 'event_espresso');
 						}
-						$error_strings[] = sprintf('%1$s: %2$s', $label, $validation_error->getMessage() );
+						$error_strings[] = sprintf('%1$s: %2$s', $label, $validation_error->getMessage());
 					}
 				}
-				EE_Error::add_error( sprintf( __( 'One or more billing form inputs are invalid and require correction before proceeding. %1$s %2$s', 'event_espresso' ), '<br/>', implode( '<br/>', $error_strings )  ), __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error(sprintf(__('One or more billing form inputs are invalid and require correction before proceeding. %1$s %2$s', 'event_espresso'), '<br/>', implode('<br/>', $error_strings)), __FILE__, __FUNCTION__, __LINE__);
 			} else {
-				EE_Error::add_error( __( 'The billing form was not submitted or something prevented it\'s submission.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error(__('The billing form was not submitted or something prevented it\'s submission.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			}
 		} else {
-			EE_Error::add_error( __( 'The submitted billing form is invalid possibly due to a technical reason.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error(__('The submitted billing form is invalid possibly due to a technical reason.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
 		return FALSE;
 	}
@@ -1274,9 +1274,9 @@ 
 	 */
 		private function _setup_primary_registrant_prior_to_payment() {
 			// check if transaction has a primary registrant and that it has a related Attendee object
-			if ( ! $this->checkout->transaction_has_primary_registrant() ) {
+			if ( ! $this->checkout->transaction_has_primary_registrant()) {
 				// need to at least gather some primary registrant data before attempting payment
-				if ( $this->checkout->billing_form instanceof EE_Billing_Attendee_Info_Form && ! $this->_capture_primary_registration_data_from_billing_form() ) {
+				if ($this->checkout->billing_form instanceof EE_Billing_Attendee_Info_Form && ! $this->_capture_primary_registration_data_from_billing_form()) {
 					return FALSE;
 				}
 			}
@@ -1284,13 +1284,13 @@ 
 			// grab the primary_registration object
 			$primary_registration = $this->checkout->transaction->primary_registration();
 			/** @type EE_Transaction_Processor $transaction_processor */
-			$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+			$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 			// at this point we'll consider a TXN to not have been failed
-			$transaction_processor->toggle_failed_transaction_status( $this->checkout->transaction );
+			$transaction_processor->toggle_failed_transaction_status($this->checkout->transaction);
 			// save the TXN ( which clears cached copy of primary_registration)
 			$this->checkout->transaction->save();
 			// grab TXN ID and save it to the primary_registration
-			$primary_registration->set_transaction_id( $this->checkout->transaction->ID() );
+			$primary_registration->set_transaction_id($this->checkout->transaction->ID());
 			// save what we have so far
 			$primary_registration->save();
 			return TRUE;
@@ -1307,41 +1307,41 @@ 
 		private function _capture_primary_registration_data_from_billing_form() {
 			// convert billing form data into an attendee
 			$this->checkout->primary_attendee_obj = $this->checkout->billing_form->create_attendee_from_billing_form_data();
-			if ( ! $this->checkout->primary_attendee_obj instanceof EE_Attendee ) {
+			if ( ! $this->checkout->primary_attendee_obj instanceof EE_Attendee) {
 				EE_Error::add_error(
 					sprintf(
-						__( 'The billing form details could not be used for attendee details due to a technical issue.%sPlease try again or contact %s for assistance.', 'event_espresso' ),
+						__('The billing form details could not be used for attendee details due to a technical issue.%sPlease try again or contact %s for assistance.', 'event_espresso'),
 						'<br/>',
-						EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+						EE_Registry::instance()->CFG->organization->get_pretty('email')
 					), __FILE__, __FUNCTION__, __LINE__
 				);
 				return FALSE;
 			}
 			$primary_registration = $this->checkout->transaction->primary_registration();
-			if ( ! $primary_registration instanceof EE_Registration ) {
+			if ( ! $primary_registration instanceof EE_Registration) {
 				EE_Error::add_error(
 					sprintf(
-						__( 'The primary registrant for this transaction could not be determined due to a technical issue.%sPlease try again or contact %s for assistance.', 'event_espresso' ),
+						__('The primary registrant for this transaction could not be determined due to a technical issue.%sPlease try again or contact %s for assistance.', 'event_espresso'),
 						'<br/>',
-						EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+						EE_Registry::instance()->CFG->organization->get_pretty('email')
 					), __FILE__, __FUNCTION__, __LINE__
 				);
 				return FALSE;
 			}
-			if ( ! $primary_registration->_add_relation_to( $this->checkout->primary_attendee_obj, 'Attendee' ) instanceof EE_Attendee ) {
+			if ( ! $primary_registration->_add_relation_to($this->checkout->primary_attendee_obj, 'Attendee') instanceof EE_Attendee) {
 				EE_Error::add_error(
 					sprintf(
-						__( 'The primary registrant could not be associated with this transaction due to a technical issue.%sPlease try again or contact %s for assistance.', 'event_espresso' ),
+						__('The primary registrant could not be associated with this transaction due to a technical issue.%sPlease try again or contact %s for assistance.', 'event_espresso'),
 						'<br/>',
-						EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+						EE_Registry::instance()->CFG->organization->get_pretty('email')
 					), __FILE__, __FUNCTION__, __LINE__
 				);
 				return FALSE;
 			}
 			/** @type EE_Registration_Processor $registration_processor */
-			$registration_processor = EE_Registry::instance()->load_class( 'Registration_Processor' );
+			$registration_processor = EE_Registry::instance()->load_class('Registration_Processor');
 			// at this point, we should have enough details about the registrant to consider the registration NOT incomplete
-			$registration_processor->toggle_incomplete_registration_status_to_default( $primary_registration );
+			$registration_processor->toggle_incomplete_registration_status_to_default($primary_registration);
 
 			return TRUE;
 		}
@@ -1357,35 +1357,35 @@ 
 	 */
 		private function _get_payment_method_for_selected_method_of_payment() {
 			// get EE_Payment_Method object
-			if ( isset( $this->checkout->available_payment_methods[ $this->checkout->selected_method_of_payment ] )) {
-				$payment_method = $this->checkout->available_payment_methods[ $this->checkout->selected_method_of_payment ];
+			if (isset($this->checkout->available_payment_methods[$this->checkout->selected_method_of_payment])) {
+				$payment_method = $this->checkout->available_payment_methods[$this->checkout->selected_method_of_payment];
 			} else {
 				// load EEM_Payment_Method
-				EE_Registry::instance()->load_model( 'Payment_Method' );
+				EE_Registry::instance()->load_model('Payment_Method');
 				/** @type EEM_Payment_Method $EEM_Payment_Method */
 				$EEM_Payment_Method = EE_Registry::instance()->LIB->EEM_Payment_Method;
-				$payment_method = $EEM_Payment_Method->get_one_by_slug( $this->checkout->selected_method_of_payment );
+				$payment_method = $EEM_Payment_Method->get_one_by_slug($this->checkout->selected_method_of_payment);
 			}
 			// verify $payment_method
-			if ( ! $payment_method instanceof EE_Payment_Method ) {
+			if ( ! $payment_method instanceof EE_Payment_Method) {
 				// not a payment
 				EE_Error::add_error(
 					sprintf(
-						__( 'The selected method of payment could not be determined due to a technical issue.%sPlease try again or contact %s for assistance.', 'event_espresso' ),
+						__('The selected method of payment could not be determined due to a technical issue.%sPlease try again or contact %s for assistance.', 'event_espresso'),
 						'<br/>',
-						EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+						EE_Registry::instance()->CFG->organization->get_pretty('email')
 					), __FILE__, __FUNCTION__, __LINE__
 				);
 				return NULL;
 			}
 			// and verify it has a valid Payment_Method Type object
-			if ( ! $payment_method->type_obj() instanceof EE_PMT_Base ) {
+			if ( ! $payment_method->type_obj() instanceof EE_PMT_Base) {
 				// not a payment
 				EE_Error::add_error(
 					sprintf(
-						__( 'A valid payment method could not be determined due to a technical issue.%sPlease try again or contact %s for assistance.', 'event_espresso' ),
+						__('A valid payment method could not be determined due to a technical issue.%sPlease try again or contact %s for assistance.', 'event_espresso'),
 						'<br/>',
-						EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+						EE_Registry::instance()->CFG->organization->get_pretty('email')
 					), __FILE__, __FUNCTION__, __LINE__
 				);
 				return NULL;
@@ -1404,30 +1404,30 @@ 
 	 * 	@type 	EE_Payment_Method $payment_method
 	 * 	@return 	mixed	EE_Payment | boolean
 	 */
-	private function _attempt_payment( EE_Payment_Method $payment_method ) {
-		$payment =NULL;
+	private function _attempt_payment(EE_Payment_Method $payment_method) {
+		$payment = NULL;
 		$this->checkout->transaction->save();
-		$payment_processor = EE_Registry::instance()->load_core( 'Payment_Processor' );
-		if ( ! $payment_processor instanceof EE_Payment_Processor ) {
+		$payment_processor = EE_Registry::instance()->load_core('Payment_Processor');
+		if ( ! $payment_processor instanceof EE_Payment_Processor) {
 			return FALSE;
 		}
 		try {
-			$payment_processor->set_revisit( $this->checkout->revisit );
+			$payment_processor->set_revisit($this->checkout->revisit);
 			// generate payment object
 			$payment = $payment_processor->process_payment(
 				$payment_method,
 				$this->checkout->transaction,
 				$this->checkout->amount_owing,
 				$this->checkout->billing_form,
-				$this->_get_return_url( $payment_method ),
+				$this->_get_return_url($payment_method),
 				'CART',
 				$this->checkout->admin_request,
 				TRUE,
 				$this->reg_step_url()
 			);
 
-		} catch( Exception $e ) {
-			$this->_handle_payment_processor_exception( $e );
+		} catch (Exception $e) {
+			$this->_handle_payment_processor_exception($e);
 		}
 		return $payment;
 	}
@@ -1441,12 +1441,12 @@ 
 	 * @param \Exception $e
 	 * @return void
 	 */
-	protected function _handle_payment_processor_exception( Exception $e ) {
+	protected function _handle_payment_processor_exception(Exception $e) {
 		EE_Error::add_error(
 			sprintf(
-				__( 'The payment could not br processed due to a technical issue.%1$sPlease try again or contact %2$s for assistance.||The following Exception was thrown in %4$s on line %5$s:%1$s%3$s', 'event_espresso' ),
+				__('The payment could not br processed due to a technical issue.%1$sPlease try again or contact %2$s for assistance.||The following Exception was thrown in %4$s on line %5$s:%1$s%3$s', 'event_espresso'),
 				'<br/>',
-				EE_Registry::instance()->CFG->organization->get_pretty( 'email' ),
+				EE_Registry::instance()->CFG->organization->get_pretty('email'),
 				$e->getMessage(),
 				$e->getFile(),
 				$e->getLine()
@@ -1463,9 +1463,9 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return string
 	 */
-	protected function _get_return_url( EE_Payment_Method $payment_method ) {
+	protected function _get_return_url(EE_Payment_Method $payment_method) {
 		$return_url = '';
-		switch ( $payment_method->type_obj()->payment_occurs() ) {
+		switch ($payment_method->type_obj()->payment_occurs()) {
 
 			case EE_PMT_Base::offsite :
 				$return_url = add_query_arg(
@@ -1496,27 +1496,27 @@ 
 	 * @param EE_Payment $payment
 	 * @return EE_Payment | FALSE
 	 */
-	private function _validate_payment( $payment = NULL ) {
-		if (  $this->checkout->payment_method->is_off_line() ) {
+	private function _validate_payment($payment = NULL) {
+		if ($this->checkout->payment_method->is_off_line()) {
 			return TRUE;
 		}
 		// verify payment object
-		if ( $payment instanceof EE_Payment ) {
+		if ($payment instanceof EE_Payment) {
 			if (
 				$payment->status() != EEM_Payment::status_id_approved
 				&& $payment->status() != EEM_Payment::status_id_pending
 				&& $payment->status() != EEM_Payment::status_id_cancelled
 				&& $payment->gateway_response() != ''
 			) {
-				EE_Error::add_error( $payment->gateway_response(), __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error($payment->gateway_response(), __FILE__, __FUNCTION__, __LINE__);
 			}
 		} else {
 			// not a payment
 			EE_Error::add_error(
 				sprintf(
-					__( 'A valid payment was not generated due to a technical issue.%1$sPlease try again or contact %2$s for assistance.', 'event_espresso' ),
+					__('A valid payment was not generated due to a technical issue.%1$sPlease try again or contact %2$s for assistance.', 'event_espresso'),
 					'<br/>',
-					EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+					EE_Registry::instance()->CFG->organization->get_pretty('email')
 				), __FILE__, __FUNCTION__, __LINE__
 			);
 			return FALSE;
@@ -1533,23 +1533,23 @@ 
 	 * @param EE_Payment $payment
 	 * @return bool
 	 */
-	private function _post_payment_processing( $payment = NULL ) {
+	private function _post_payment_processing($payment = NULL) {
 		// On-Site payment?
-		if ( $this->checkout->payment_method->is_on_site() ) {
-			if ( ! $this->_process_payment_status( $payment, EE_PMT_Base::onsite )) {
+		if ($this->checkout->payment_method->is_on_site()) {
+			if ( ! $this->_process_payment_status($payment, EE_PMT_Base::onsite)) {
 				//$this->_setup_redirect_for_next_step();
 				$this->checkout->continue_reg = false;
 			}
 			// Off-Site payment?
-		} else if ( $this->checkout->payment_method->is_off_site() ) {
+		} else if ($this->checkout->payment_method->is_off_site()) {
 			// if a payment object was made and it specifies a redirect url, then we'll setup that redirect info
-			if ( $payment instanceof EE_Payment && $payment->redirect_url() ){
-				do_action( 'AHEE_log', __CLASS__, __FUNCTION__, $payment->redirect_url(), '$payment->redirect_url()' );
+			if ($payment instanceof EE_Payment && $payment->redirect_url()) {
+				do_action('AHEE_log', __CLASS__, __FUNCTION__, $payment->redirect_url(), '$payment->redirect_url()');
 				$this->checkout->redirect = TRUE;
 				$this->checkout->redirect_form = $payment->redirect_form();
-				$this->checkout->redirect_url = $this->reg_step_url( 'redirect_form' );
+				$this->checkout->redirect_url = $this->reg_step_url('redirect_form');
 				// set JSON response
-				$this->checkout->json_response->set_redirect_form( $this->checkout->redirect_form );
+				$this->checkout->json_response->set_redirect_form($this->checkout->redirect_form);
 				// set cron job for finalizing the TXN
 				// in case the user does not return from the off-site gateway
 				EE_Cron_Tasks::schedule_finalize_abandoned_transactions_check(
@@ -1557,21 +1557,21 @@ 
 					$this->checkout->transaction->ID()
 				);
 				// and lastly, let's bump the payment status to pending
-				$payment->set_status( EEM_Payment::status_id_pending );
+				$payment->set_status(EEM_Payment::status_id_pending);
 				$payment->save();
 			} else {
 				// not a payment
 				$this->checkout->continue_reg = false;
 				EE_Error::add_error(
 					sprintf(
-						__( 'It appears the Off Site Payment Method was not configured properly.%sPlease try again or contact %s for assistance.', 'event_espresso' ),
+						__('It appears the Off Site Payment Method was not configured properly.%sPlease try again or contact %s for assistance.', 'event_espresso'),
 						'<br/>',
-						EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+						EE_Registry::instance()->CFG->organization->get_pretty('email')
 					), __FILE__, __FUNCTION__, __LINE__
 				);
 			}
 			// Off-Line payment?
-		} else if ( $payment === TRUE ) {
+		} else if ($payment === TRUE) {
 			//$this->_setup_redirect_for_next_step();
 			return TRUE;
 		} else {
@@ -1607,65 +1607,65 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	private function _process_payment_status( $payment, $payment_occurs = EE_PMT_Base::offline ) {
+	private function _process_payment_status($payment, $payment_occurs = EE_PMT_Base::offline) {
 		// off-line payment? carry on
-		if ( $payment_occurs == EE_PMT_Base::offline ) {
+		if ($payment_occurs == EE_PMT_Base::offline) {
 			return true;
 		}
 		// verify payment validity
-		if ( $payment instanceof EE_Payment ) {
-			do_action( 'AHEE_log', __CLASS__, __FUNCTION__, $payment->status(), '$payment->status()' );
+		if ($payment instanceof EE_Payment) {
+			do_action('AHEE_log', __CLASS__, __FUNCTION__, $payment->status(), '$payment->status()');
 			$msg = $payment->gateway_response();
 			// check results
-			switch ( $payment->status() ) {
+			switch ($payment->status()) {
 
 				// good payment
 				case EEM_Payment::status_id_approved :
-					EE_Error::add_success( __( 'Your payment was processed successfully.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_success(__('Your payment was processed successfully.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 					return TRUE;
 					break;
 
 				// slow payment
 				case EEM_Payment::status_id_pending :
-					if ( empty( $msg )) {
-						$msg = __( 'Your payment appears to have been processed successfully, but the Instant Payment Notification has not yet been received. It should arrive shortly.', 'event_espresso' );
+					if (empty($msg)) {
+						$msg = __('Your payment appears to have been processed successfully, but the Instant Payment Notification has not yet been received. It should arrive shortly.', 'event_espresso');
 					}
-					EE_Error::add_success( $msg, __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_success($msg, __FILE__, __FUNCTION__, __LINE__);
 					return TRUE;
 					break;
 
 				// don't wanna payment
 				case EEM_Payment::status_id_cancelled :
-					if ( empty( $msg )) {
+					if (empty($msg)) {
 						$msg = _n(
 							'Payment cancelled. Please try again.',
 							'Payment cancelled. Please try again or select another method of payment.',
-							count( $this->checkout->available_payment_methods ),
+							count($this->checkout->available_payment_methods),
 							'event_espresso'
 						);
 					}
-					EE_Error::add_attention( $msg, __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_attention($msg, __FILE__, __FUNCTION__, __LINE__);
 					return FALSE;
 					break;
 
 				// not enough payment
 				case EEM_Payment::status_id_declined :
-					if ( empty( $msg )) {
+					if (empty($msg)) {
 						$msg = _n(
 							'We\'re sorry but your payment was declined. Please try again.',
 							'We\'re sorry but your payment was declined. Please try again or select another method of payment.',
-							count( $this->checkout->available_payment_methods ),
+							count($this->checkout->available_payment_methods),
 							'event_espresso'
 						);
 					}
-					EE_Error::add_attention( $msg, __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_attention($msg, __FILE__, __FUNCTION__, __LINE__);
 					return FALSE;
 					break;
 
 				// bad payment
 				case EEM_Payment::status_id_failed :
-					if ( ! empty( $msg ) ) {
-						EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+					if ( ! empty($msg)) {
+						EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 						return false;
 					}
 					// default to error below
@@ -1675,14 +1675,14 @@ 
 		}
 		// off-site payment gateway responses are too unreliable, so let's just assume that
 		// the payment processing is just running slower than the registrant's request
-		if ( $payment_occurs == EE_PMT_Base::offsite ) {
+		if ($payment_occurs == EE_PMT_Base::offsite) {
 			return true;
 		}
 		EE_Error::add_error(
 				sprintf(
-					__( 'Your payment could not be processed successfully due to a technical issue.%sPlease try again or contact %s for assistance.', 'event_espresso' ),
+					__('Your payment could not be processed successfully due to a technical issue.%sPlease try again or contact %s for assistance.', 'event_espresso'),
 					'<br/>',
-					EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+					EE_Registry::instance()->CFG->organization->get_pretty('email')
 				),
 				__FILE__, __FUNCTION__, __LINE__
 			);
@@ -1715,13 +1715,13 @@ 
 	public function process_gateway_response() {
 		$payment = null;
 		// how have they chosen to pay?
-		$this->checkout->selected_method_of_payment = $this->_get_selected_method_of_payment( true );
+		$this->checkout->selected_method_of_payment = $this->_get_selected_method_of_payment(true);
 		// get EE_Payment_Method object
-		if ( ! $this->checkout->payment_method = $this->_get_payment_method_for_selected_method_of_payment() ) {
+		if ( ! $this->checkout->payment_method = $this->_get_payment_method_for_selected_method_of_payment()) {
 			$this->checkout->continue_reg = false;
 			return false;
 		}
-		if ( ! $this->checkout->payment_method->is_off_site() ) {
+		if ( ! $this->checkout->payment_method->is_off_site()) {
 			return false;
 		}
 		$this->_validate_offsite_return();
@@ -1735,23 +1735,23 @@ 
 		//	true
 		//);
 		// verify TXN
-		if ( $this->checkout->transaction instanceof EE_Transaction ) {
+		if ($this->checkout->transaction instanceof EE_Transaction) {
 			$gateway = $this->checkout->payment_method->type_obj()->get_gateway();
-			if ( ! $gateway instanceof EE_Offsite_Gateway ) {
+			if ( ! $gateway instanceof EE_Offsite_Gateway) {
 				$this->checkout->continue_reg = false;
 				return false;
 			}
-			$payment = $this->_process_off_site_payment( $gateway );
-			$payment = $this->_process_cancelled_payments( $payment );
-			$payment = $this->_validate_payment( $payment );
+			$payment = $this->_process_off_site_payment($gateway);
+			$payment = $this->_process_cancelled_payments($payment);
+			$payment = $this->_validate_payment($payment);
 			// if payment was not declined by the payment gateway or cancelled by the registrant
-			if ( $this->_process_payment_status( $payment, EE_PMT_Base::offsite ) ) {
+			if ($this->_process_payment_status($payment, EE_PMT_Base::offsite)) {
 				//$this->_setup_redirect_for_next_step();
 				// store that for later
 				$this->checkout->payment = $payment;
 				// mark this reg step as completed, as long as gateway doesn't use a separate IPN request,
 				// because we will complete this step during the IPN processing then
-				if ( $gateway instanceof EE_Offsite_Gateway && ! $gateway->uses_separate_IPN_request() ) {
+				if ($gateway instanceof EE_Offsite_Gateway && ! $gateway->uses_separate_IPN_request()) {
 					$this->set_completed();
 				}
 				return true;
@@ -1774,19 +1774,19 @@ 
 	 * @return bool
 	 */
 	private function _validate_offsite_return() {
-		$TXN_ID = (int)EE_Registry::instance()->REQ->get( 'spco_txn', 0 );
-		if ( $TXN_ID != $this->checkout->transaction->ID() ) {
+		$TXN_ID = (int) EE_Registry::instance()->REQ->get('spco_txn', 0);
+		if ($TXN_ID != $this->checkout->transaction->ID()) {
 			// Houston... we might have a problem
 			$invalid_TXN = false;
 			// first gather some info
-			$valid_TXN = EEM_Transaction::instance()->get_one_by_ID( $TXN_ID );
+			$valid_TXN = EEM_Transaction::instance()->get_one_by_ID($TXN_ID);
 			$primary_registrant = $valid_TXN instanceof EE_Transaction ? $valid_TXN->primary_registration() : null;
 			// let's start by retrieving the cart for this TXN
-			$cart = EE_Cart::get_cart_from_txn( $this->checkout->transaction );
-			if ( $cart instanceof EE_Cart ) {
+			$cart = EE_Cart::get_cart_from_txn($this->checkout->transaction);
+			if ($cart instanceof EE_Cart) {
 				// verify that the current cart has tickets
 				$tickets = $cart->get_tickets();
-				if ( empty( $tickets ) ) {
+				if (empty($tickets)) {
 					$invalid_TXN = true;
 				}
 			} else {
@@ -1794,39 +1794,39 @@ 
 			}
 			$valid_TXN_SID = $primary_registrant instanceof EE_Registration ? $primary_registrant->session_ID() : null;
 			// validate current Session ID and compare against valid TXN session ID
-			if ( EE_Session::instance()->id() === null ) {
+			if (EE_Session::instance()->id() === null) {
 				$invalid_TXN = true;
-			} else if ( EE_Session::instance()->id() === $valid_TXN_SID ) {
+			} else if (EE_Session::instance()->id() === $valid_TXN_SID) {
 				// WARNING !!!
 				// this could be PayPal sending back duplicate requests (ya they do that)
 				// or it **could** mean someone is simply registering AGAIN after having just done so
 				// so now we need to determine if this current TXN looks valid or not
 				/** @type EE_Transaction_Processor $transaction_processor */
-				$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+				$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 				// has this step even been started ?
-				if ( $transaction_processor->reg_step_completed( $this->checkout->transaction, $this->slug() === false )
+				if ($transaction_processor->reg_step_completed($this->checkout->transaction, $this->slug() === false)
 				) {
 					// really? you're half way through this reg step, but you never started it ?
 					$invalid_TXN = true;
 				}
 			}
-			if ( $invalid_TXN ) {
+			if ($invalid_TXN) {
 				// is the valid TXN completed ?
-				if ( $valid_TXN instanceof EE_Transaction ) {
+				if ($valid_TXN instanceof EE_Transaction) {
 					/** @type EE_Transaction_Processor $transaction_processor */
-					$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+					$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 					// has this step even been started ?
-					$reg_step_completed = $transaction_processor->reg_step_completed( $valid_TXN, $this->slug() );
-					if ( $reg_step_completed !== false && $reg_step_completed !== true ) {
+					$reg_step_completed = $transaction_processor->reg_step_completed($valid_TXN, $this->slug());
+					if ($reg_step_completed !== false && $reg_step_completed !== true) {
 						// so it **looks** like this is a double request from PayPal
 						// so let's try to pick up where we left off
 						$this->checkout->transaction = $valid_TXN;
-						$this->checkout->refresh_all_entities( true );
+						$this->checkout->refresh_all_entities(true);
 						return;
 					}
 				}
 				// you appear to be lost?
-				$this->_redirect_wayward_request( $primary_registrant );
+				$this->_redirect_wayward_request($primary_registrant);
 			}
 		}
 	}
@@ -1840,16 +1840,16 @@ 
 	 * @param \EE_Registration $primary_registrant
 	 * @return bool
 	 */
-	private function _redirect_wayward_request( EE_Registration $primary_registrant ) {
-		if ( ! $primary_registrant instanceof EE_Registration ) {
+	private function _redirect_wayward_request(EE_Registration $primary_registrant) {
+		if ( ! $primary_registrant instanceof EE_Registration) {
 			// try redirecting based on the current TXN
 			$primary_registrant = $this->checkout->transaction instanceof EE_Transaction ? $this->checkout->transaction->primary_registration() : null;
-			if ( ! $primary_registrant instanceof EE_Registration ) {
+			if ( ! $primary_registrant instanceof EE_Registration) {
 				EE_Error::add_error(
 					sprintf(
-						__( 'Invalid information was received from the Off-Site Payment Processor and your Transaction details could not be retrieved from the database.%1$sPlease try again or contact %2$s for assistance.', 'event_espresso' ),
+						__('Invalid information was received from the Off-Site Payment Processor and your Transaction details could not be retrieved from the database.%1$sPlease try again or contact %2$s for assistance.', 'event_espresso'),
 						'<br/>',
-						EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+						EE_Registry::instance()->CFG->organization->get_pretty('email')
 					),
 					__FILE__, __FUNCTION__, __LINE__
 				);
@@ -1877,16 +1877,16 @@ 
 	 * @param \EE_Offsite_Gateway $gateway
 	 * @return \EE_Payment
 	 */
-	private function _process_off_site_payment( EE_Offsite_Gateway $gateway ) {
+	private function _process_off_site_payment(EE_Offsite_Gateway $gateway) {
 		try {
 			// if gateway uses_separate_IPN_request, then we don't have to process the IPN manually
-			if ( $gateway instanceof EE_Offsite_Gateway && $gateway->uses_separate_IPN_request() ) {
+			if ($gateway instanceof EE_Offsite_Gateway && $gateway->uses_separate_IPN_request()) {
 				$payment = $this->checkout->transaction->last_payment();
 				//$payment_source = 'last_payment';
 			} else {
 				// get payment details and process results
 				/** @type EE_Payment_Processor $payment_processor */
-				$payment_processor = EE_Registry::instance()->load_core( 'Payment_Processor' );
+				$payment_processor = EE_Registry::instance()->load_core('Payment_Processor');
 				$payment = $payment_processor->process_ipn(
 					$_REQUEST,
 					$this->checkout->transaction,
@@ -1896,14 +1896,14 @@ 
 				);
 				//$payment_source = 'process_ipn';
 			}
-		} catch ( Exception $e ) {
+		} catch (Exception $e) {
 			// let's just eat the exception and try to move on using any previously set payment info
 			$payment = $this->checkout->transaction->last_payment();
 			//$payment_source = 'last_payment after Exception';
 			// but if we STILL don't have a payment object
-			if ( ! $payment instanceof EE_Payment ) {
+			if ( ! $payment instanceof EE_Payment) {
 				// then we'll object ! ( not object like a thing... but object like what a lawyer says ! )
-				$this->_handle_payment_processor_exception( $e );
+				$this->_handle_payment_processor_exception($e);
 			}
 		}
 		// DEBUG LOG
@@ -1927,13 +1927,13 @@ 
 	 * @param EE_Payment $payment
 	 * @return EE_Payment | FALSE
 	 */
-	private function _process_cancelled_payments( $payment = NULL ) {
+	private function _process_cancelled_payments($payment = NULL) {
 		if (
-			isset( $_REQUEST[ 'ee_cancel_payment' ] )
+			isset($_REQUEST['ee_cancel_payment'])
 			&& $payment instanceof EE_Payment
 			&& $payment->status() == EEM_Payment::status_id_failed
 		) {
-			$payment->set_status( EEM_Payment::status_id_cancelled );
+			$payment->set_status(EEM_Payment::status_id_cancelled);
 		}
 		return $payment;
 	}
@@ -1950,23 +1950,23 @@ 
 	public function get_transaction_details_for_gateways() {
 		$txn_details = array();
 		// ya gotta make a choice man
-		if ( empty( $this->checkout->selected_method_of_payment ) ) {
+		if (empty($this->checkout->selected_method_of_payment)) {
 			$txn_details = array(
-				'error' => __( 'Please select a method of payment before proceeding.', 'event_espresso' )
+				'error' => __('Please select a method of payment before proceeding.', 'event_espresso')
 			);
 		}
 		// get EE_Payment_Method object
 		if (
-			empty( $txn_details ) &&
+			empty($txn_details) &&
 			! $this->checkout->payment_method = $this->_get_payment_method_for_selected_method_of_payment()
 		) {
 			$txn_details = array(
 				'selected_method_of_payment' => $this->checkout->selected_method_of_payment,
-				'error' => __( 'A valid Payment Method could not be determined.', 'event_espresso' )
+				'error' => __('A valid Payment Method could not be determined.', 'event_espresso')
 			);
 		}
-		if ( empty( $txn_details ) && $this->checkout->transaction instanceof EE_Transaction ) {
-			$return_url = $this->_get_return_url( $this->checkout->payment_method );
+		if (empty($txn_details) && $this->checkout->transaction instanceof EE_Transaction) {
+			$return_url = $this->_get_return_url($this->checkout->payment_method);
 			$txn_details = array(
 				'TXN_ID'        			=> $this->checkout->transaction->ID(),
 				'TXN_timestamp' 	=> $this->checkout->transaction->datetime(),
@@ -1977,7 +1977,7 @@ 
 				'PMD_ID'        			=> $this->checkout->transaction->payment_method_ID(),
 				'payment_amount' => $this->checkout->amount_owing,
 				'return_url' 				=> $return_url,
-				'cancel_url' 				=> add_query_arg( array( 'ee_cancel_payment' => true ), $return_url ),
+				'cancel_url' 				=> add_query_arg(array('ee_cancel_payment' => true), $return_url),
 				'notify_url' 				=> EE_Config::instance()->core->txn_page_url(
 					array(
 						'e_reg_url_link'    			=> $this->checkout->transaction->primary_registration()->reg_url_link(),
@@ -1986,7 +1986,7 @@ 
 				)
 			);
 		}
-		echo json_encode( $txn_details );
+		echo json_encode($txn_details);
 		exit();
 	}
 

Indentation +26 added lines, -26 removed lines

@@ -1,16 +1,16 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
  /**
- *
- * Class EE_SPCO_Reg_Step_Payment_Options
- *
- * Description
- *
- * @package 			Event Espresso
- * @subpackage 	core
- * @author 				Brent Christensen
- * @since 				4.5.0
- *
- */
+  *
+  * Class EE_SPCO_Reg_Step_Payment_Options
+  *
+  * Description
+  *
+  * @package 			Event Espresso
+  * @subpackage 	core
+  * @author 				Brent Christensen
+  * @since 				4.5.0
+  *
+  */
 class EE_SPCO_Reg_Step_Payment_Options extends EE_SPCO_Reg_Step {
 
 	/**
@@ -764,13 +764,13 @@ 
 			return FALSE;
 		}
 		if ( apply_filters( 'FHEE__EE_SPCO_Reg_Step_Payment_Options__registration_checkout__selected_payment_method__display_success', false ) ) {
-            EE_Error::add_success(
-                apply_filters(
-                    'FHEE__Single_Page_Checkout__registration_checkout__selected_payment_method',
-                    sprintf(__('You have selected "%s" as your method of payment. Please note the important payment information below.', 'event_espresso'), $this->checkout->payment_method->name())
-                )
-            );
-        }
+			EE_Error::add_success(
+				apply_filters(
+					'FHEE__Single_Page_Checkout__registration_checkout__selected_payment_method',
+					sprintf(__('You have selected "%s" as your method of payment. Please note the important payment information below.', 'event_espresso'), $this->checkout->payment_method->name())
+				)
+			);
+		}
 		// now generate billing form for selected method of payment
 		$payment_method_billing_form = $this->_get_billing_form_for_payment_method( $this->checkout->payment_method );
 		// fill form with attendee info if applicable
@@ -802,14 +802,14 @@ 
 		$billing_form = $payment_method->type_obj()->billing_form( $this->checkout->transaction, array( 'amount_owing' => $this->checkout->amount_owing ) );
 		if ( $billing_form instanceof EE_Billing_Info_Form ) {
 			if ( EE_Registry::instance()->REQ->is_set( 'payment_method' )) {
-                if ( apply_filters('FHEE__EE_SPCO_Reg_Step_Payment_Options__registration_checkout__selected_payment_method__display_success', false )) {
-                    EE_Error::add_success(
-                        apply_filters(
-                            'FHEE__Single_Page_Checkout__registration_checkout__selected_payment_method',
-                            sprintf( __( 'You have selected "%s" as your method of payment. Please note the important payment information below.', 'event_espresso' ), $payment_method->name() )
-                        )
-                    );
-                }
+				if ( apply_filters('FHEE__EE_SPCO_Reg_Step_Payment_Options__registration_checkout__selected_payment_method__display_success', false )) {
+					EE_Error::add_success(
+						apply_filters(
+							'FHEE__Single_Page_Checkout__registration_checkout__selected_payment_method',
+							sprintf( __( 'You have selected "%s" as your method of payment. Please note the important payment information below.', 'event_espresso' ), $payment_method->name() )
+						)
+					);
+				}
 			}
 			return apply_filters(
 				'FHEE__EE_SPCO_Reg_Step_Payment_Options___get_billing_form_for_payment_method__billing_form',

core/db_classes/EE_Event.class.php

Braces +3 added lines, -6 removed lines

@@ -352,8 +352,7 @@ 
 		$short_desc = $this->get( 'EVT_short_desc' );
 		if ( !empty( $short_desc ) || $not_full_desc ) {
 			return $short_desc;
-		}
-		else {
+		} else {
 			$full_desc = $this->get( 'EVT_desc' );
 			return wp_trim_words( $full_desc, $num_words, $more );
 		}
@@ -965,8 +964,7 @@ 
 	public function is_sold_out( $actual = FALSE ) {
 		if ( ! $actual ) {
 			return $this->status() == EEM_Event::sold_out;
-		}
-		else {
+		} else {
 			return $this->perform_sold_out_status_check();
 		}
 	}
@@ -1158,8 +1156,7 @@ 
 	public function get_permalink() {
 		if ( $this->external_url() ) {
 			return $this->external_url();
-		}
-		else {
+		} else {
 			return parent::get_permalink();
 		}
 	}

Spacing +216 added lines, -216 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');
 }
 
 /**
@@ -35,9 +35,9 @@ 
 	 *                             		    date_format and the second value is the time format
 	 * @return EE_Event
 	 */
-	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);
 	}
 
 
@@ -48,8 +48,8 @@ 
 	 *                          		the website will be used.
 	 * @return EE_Event
 	 */
-	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);
 	}
 
 
@@ -61,13 +61,13 @@ 
 	 * @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 'status' :
-				$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);
 		}
 	}
 
@@ -86,29 +86,29 @@ 
 	 * @return bool|void
 	 * @throws \EE_Error
 	 */
-	public function set_status( $new_status = null, $use_default = false ) {
+	public function set_status($new_status = null, $use_default = false) {
 		// get current Event status
 		$old_status = $this->status();
 		// if status has changed
-		if ( $old_status != $new_status ) {
+		if ($old_status != $new_status) {
 			// TO sold_out
-			if ( $new_status == EEM_Event::sold_out ) {
+			if ($new_status == EEM_Event::sold_out) {
 				// save the previous event status so that we can revert if the event is no longer sold out
-				$this->add_post_meta( '_previous_event_status', $old_status );
-				do_action( 'AHEE__EE_Event__set_status__to_sold_out', $this, $old_status, $new_status );
+				$this->add_post_meta('_previous_event_status', $old_status);
+				do_action('AHEE__EE_Event__set_status__to_sold_out', $this, $old_status, $new_status);
 				// OR FROM  sold_out
-			} else if ( $old_status == EEM_Event::sold_out ) {
-				$this->delete_post_meta( '_previous_event_status' );
-				do_action( 'AHEE__EE_Event__set_status__from_sold_out', $this, $old_status, $new_status );
+			} else if ($old_status == EEM_Event::sold_out) {
+				$this->delete_post_meta('_previous_event_status');
+				do_action('AHEE__EE_Event__set_status__from_sold_out', $this, $old_status, $new_status);
 			}
 			// update status
-			parent::set( 'status', $new_status, $use_default );
-			do_action( 'AHEE__EE_Event__set_status__after_update', $this );
+			parent::set('status', $new_status, $use_default);
+			do_action('AHEE__EE_Event__set_status__after_update', $this);
 			return true;
 		} 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( 'status', $new_status, $use_default );
+			parent::set('status', $new_status, $use_default);
 			return true;
 		}
 	}
@@ -121,8 +121,8 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return EE_Datetime[]
 	 */
-	public function datetimes( $query_params = array() ) {
-		return $this->get_many_related( 'Datetime', $query_params );
+	public function datetimes($query_params = array()) {
+		return $this->get_many_related('Datetime', $query_params);
 	}
 
 
@@ -133,7 +133,7 @@ 
 	 * @return EE_Datetime[]
 	 */
 	public function datetimes_in_chronological_order() {
-		return $this->get_many_related( 'Datetime', array( 'order_by' => array( 'DTT_EVT_start' => 'ASC' ) ) );
+		return $this->get_many_related('Datetime', array('order_by' => array('DTT_EVT_start' => 'ASC')));
 	}
 
 
@@ -149,8 +149,8 @@ 
 	 * @param null $limit
 	 * @return \EE_Datetime[]
 	 */
-	public function datetimes_ordered( $show_expired = true, $show_deleted = false, $limit = null ) {
-		return EEM_Datetime::instance( $this->_timezone )->get_datetimes_for_event_ordered_by_DTT_order( $this->ID(), $show_expired, $show_deleted, $limit );
+	public function datetimes_ordered($show_expired = true, $show_deleted = false, $limit = null) {
+		return EEM_Datetime::instance($this->_timezone)->get_datetimes_for_event_ordered_by_DTT_order($this->ID(), $show_expired, $show_deleted, $limit);
 	}
 
 
@@ -160,7 +160,7 @@ 
 	 * @return EE_Datetime
 	 */
 	public function first_datetime() {
-		return $this->get_first_related( 'Datetime' );
+		return $this->get_first_related('Datetime');
 	}
 
 
@@ -171,11 +171,11 @@ 
 	 * @param bool $try_to_exclude_deleted
 	 * @return EE_Datetime
 	 */
-	public function primary_datetime( $try_to_exclude_expired = TRUE, $try_to_exclude_deleted = TRUE ) {
-		if ( !empty ( $this->_Primary_Datetime ) ) {
+	public function primary_datetime($try_to_exclude_expired = TRUE, $try_to_exclude_deleted = TRUE) {
+		if ( ! empty ($this->_Primary_Datetime)) {
 			return $this->_Primary_Datetime;
 		}
-		$this->_Primary_Datetime = EEM_Datetime::instance( $this->_timezone )->get_primary_datetime_for_event( $this->ID(), $try_to_exclude_expired, $try_to_exclude_deleted );
+		$this->_Primary_Datetime = EEM_Datetime::instance($this->_timezone)->get_primary_datetime_for_event($this->ID(), $try_to_exclude_expired, $try_to_exclude_deleted);
 		return $this->_Primary_Datetime;
 	}
 
@@ -186,30 +186,30 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return EE_Ticket[]
 	 */
-	public function tickets( $query_params = array() ) {
+	public function tickets($query_params = array()) {
 		//first get all datetimes
 		$datetimes = $this->datetimes_ordered();
-		if ( ! $datetimes ) {
+		if ( ! $datetimes) {
 			return array();
 		}
 
 		$datetime_ids = array();
-		foreach ( $datetimes as $datetime ) {
+		foreach ($datetimes as $datetime) {
 			$datetime_ids[] = $datetime->ID();
 		}
 
-		$where_params = array( 'Datetime.DTT_ID' => array( 'IN', $datetime_ids ) );
+		$where_params = array('Datetime.DTT_ID' => array('IN', $datetime_ids));
 
 		//if incoming $query_params has where conditions let's merge but not override existing.
-		if ( is_array( $query_params ) && isset( $query_params[0]) ) {
-			$where_params = array_merge( $query_params[0], $where_params );
-			unset( $query_params[0] );
+		if (is_array($query_params) && isset($query_params[0])) {
+			$where_params = array_merge($query_params[0], $where_params);
+			unset($query_params[0]);
 		}
 
 		//now add $where_params to $query_params
 		$query_params[0] = $where_params;
 
-		return EEM_Ticket::instance()->get_all( $query_params );
+		return EEM_Ticket::instance()->get_all($query_params);
 	}
 
 
@@ -218,7 +218,7 @@ 
 	 * @return bool
 	 */
 	function additional_limit() {
-		return $this->get( 'EVT_additional_limit' );
+		return $this->get('EVT_additional_limit');
 	}
 
 
@@ -227,7 +227,7 @@ 
 	 * @return bool
 	 */
 	function allow_overflow() {
-		return $this->get( 'EVT_allow_overflow' );
+		return $this->get('EVT_allow_overflow');
 	}
 
 
@@ -236,7 +236,7 @@ 
 	 * @return bool
 	 */
 	function created() {
-		return $this->get( 'EVT_created' );
+		return $this->get('EVT_created');
 	}
 
 
@@ -245,7 +245,7 @@ 
 	 * @return bool
 	 */
 	function description() {
-		return $this->get( 'EVT_desc' );
+		return $this->get('EVT_desc');
 	}
 
 
@@ -255,7 +255,7 @@ 
 	 * @return string of html
 	 */
 	function description_filtered() {
-		return $this->get_pretty( 'EVT_desc' );
+		return $this->get_pretty('EVT_desc');
 	}
 
 
@@ -264,7 +264,7 @@ 
 	 * @return bool
 	 */
 	function display_description() {
-		return $this->get( 'EVT_display_desc' );
+		return $this->get('EVT_display_desc');
 	}
 
 
@@ -273,7 +273,7 @@ 
 	 * @return bool
 	 */
 	function display_ticket_selector() {
-		return (bool)$this->get( 'EVT_display_ticket_selector' );
+		return (bool) $this->get('EVT_display_ticket_selector');
 	}
 
 
@@ -282,7 +282,7 @@ 
 	 * @return bool
 	 */
 	function external_url() {
-		return $this->get( 'EVT_external_URL' );
+		return $this->get('EVT_external_URL');
 	}
 
 
@@ -291,7 +291,7 @@ 
 	 * @return bool
 	 */
 	function member_only() {
-		return $this->get( 'EVT_member_only' );
+		return $this->get('EVT_member_only');
 	}
 
 
@@ -300,7 +300,7 @@ 
 	 * @return bool
 	 */
 	function phone() {
-		return $this->get( 'EVT_phone' );
+		return $this->get('EVT_phone');
 	}
 
 
@@ -309,7 +309,7 @@ 
 	 * @return bool
 	 */
 	function modified() {
-		return $this->get( 'EVT_modified' );
+		return $this->get('EVT_modified');
 	}
 
 
@@ -318,7 +318,7 @@ 
 	 * @return bool
 	 */
 	function name() {
-		return $this->get( 'EVT_name' );
+		return $this->get('EVT_name');
 	}
 
 
@@ -327,7 +327,7 @@ 
 	 * @return bool
 	 */
 	function order() {
-		return $this->get( 'EVT_order' );
+		return $this->get('EVT_order');
 	}
 
 
@@ -336,8 +336,8 @@ 
 	 * @return bool|string
 	 */
 	function default_registration_status() {
-		$event_default_registration_status = $this->get( 'EVT_default_registration_status' );
-		return !empty( $event_default_registration_status ) ? $event_default_registration_status : EE_Registry::instance()->CFG->registration->default_STS_ID;
+		$event_default_registration_status = $this->get('EVT_default_registration_status');
+		return ! empty($event_default_registration_status) ? $event_default_registration_status : EE_Registry::instance()->CFG->registration->default_STS_ID;
 	}
 
 
@@ -348,14 +348,14 @@ 
 	 * @param bool $not_full_desc
 	 * @return bool|string
 	 */
-	function short_description( $num_words = 55, $more = NULL, $not_full_desc = FALSE ) {
-		$short_desc = $this->get( 'EVT_short_desc' );
-		if ( !empty( $short_desc ) || $not_full_desc ) {
+	function short_description($num_words = 55, $more = NULL, $not_full_desc = FALSE) {
+		$short_desc = $this->get('EVT_short_desc');
+		if ( ! empty($short_desc) || $not_full_desc) {
 			return $short_desc;
 		}
 		else {
-			$full_desc = $this->get( 'EVT_desc' );
-			return wp_trim_words( $full_desc, $num_words, $more );
+			$full_desc = $this->get('EVT_desc');
+			return wp_trim_words($full_desc, $num_words, $more);
 		}
 	}
 
@@ -365,7 +365,7 @@ 
 	 * @return bool
 	 */
 	function slug() {
-		return $this->get( 'EVT_slug' );
+		return $this->get('EVT_slug');
 	}
 
 
@@ -374,7 +374,7 @@ 
 	 * @return bool
 	 */
 	function timezone_string() {
-		return $this->get( 'EVT_timezone_string' );
+		return $this->get('EVT_timezone_string');
 	}
 
 
@@ -383,7 +383,7 @@ 
 	 * @return bool
 	 */
 	function visible_on() {
-		return $this->get( 'EVT_visible_on' );
+		return $this->get('EVT_visible_on');
 	}
 
 
@@ -392,7 +392,7 @@ 
 	 * @return bool
 	 */
 	function wp_user() {
-		return $this->get( 'EVT_wp_user' );
+		return $this->get('EVT_wp_user');
 	}
 
 
@@ -401,7 +401,7 @@ 
 	 * @return bool
 	 */
 	function donations() {
-		return $this->get( 'EVT_donations' );
+		return $this->get('EVT_donations');
 	}
 
 
@@ -409,8 +409,8 @@ 
 	/**
 	 * @param $limit
 	 */
-	function set_additional_limit( $limit ) {
-		$this->set( 'EVT_additional_limit', $limit );
+	function set_additional_limit($limit) {
+		$this->set('EVT_additional_limit', $limit);
 	}
 
 
@@ -418,8 +418,8 @@ 
 	/**
 	 * @param $created
 	 */
-	function set_created( $created ) {
-		$this->set( 'EVT_created', $created );
+	function set_created($created) {
+		$this->set('EVT_created', $created);
 	}
 
 
@@ -427,8 +427,8 @@ 
 	/**
 	 * @param $desc
 	 */
-	function set_description( $desc ) {
-		$this->set( 'EVT_desc', $desc );
+	function set_description($desc) {
+		$this->set('EVT_desc', $desc);
 	}
 
 
@@ -436,8 +436,8 @@ 
 	/**
 	 * @param $display_desc
 	 */
-	function set_display_description( $display_desc ) {
-		$this->set( 'EVT_display_desc', $display_desc );
+	function set_display_description($display_desc) {
+		$this->set('EVT_display_desc', $display_desc);
 	}
 
 
@@ -445,8 +445,8 @@ 
 	/**
 	 * @param $display_ticket_selector
 	 */
-	function set_display_ticket_selector( $display_ticket_selector ) {
-		$this->set( 'EVT_display_ticket_selector', $display_ticket_selector );
+	function set_display_ticket_selector($display_ticket_selector) {
+		$this->set('EVT_display_ticket_selector', $display_ticket_selector);
 	}
 
 
@@ -454,8 +454,8 @@ 
 	/**
 	 * @param $external_url
 	 */
-	function set_external_url( $external_url ) {
-		$this->set( 'EVT_external_URL', $external_url );
+	function set_external_url($external_url) {
+		$this->set('EVT_external_URL', $external_url);
 	}
 
 
@@ -463,8 +463,8 @@ 
 	/**
 	 * @param $member_only
 	 */
-	function set_member_only( $member_only ) {
-		$this->set( 'EVT_member_only', $member_only );
+	function set_member_only($member_only) {
+		$this->set('EVT_member_only', $member_only);
 	}
 
 
@@ -472,8 +472,8 @@ 
 	/**
 	 * @param $event_phone
 	 */
-	function set_event_phone( $event_phone ) {
-		$this->set( 'EVT_phone', $event_phone );
+	function set_event_phone($event_phone) {
+		$this->set('EVT_phone', $event_phone);
 	}
 
 
@@ -481,8 +481,8 @@ 
 	/**
 	 * @param $modified
 	 */
-	function set_modified( $modified ) {
-		$this->set( 'EVT_modified', $modified );
+	function set_modified($modified) {
+		$this->set('EVT_modified', $modified);
 	}
 
 
@@ -490,8 +490,8 @@ 
 	/**
 	 * @param $name
 	 */
-	function set_name( $name ) {
-		$this->set( 'EVT_name', $name );
+	function set_name($name) {
+		$this->set('EVT_name', $name);
 	}
 
 
@@ -499,8 +499,8 @@ 
 	/**
 	 * @param $order
 	 */
-	function set_order( $order ) {
-		$this->set( 'EVT_order', $order );
+	function set_order($order) {
+		$this->set('EVT_order', $order);
 	}
 
 
@@ -508,8 +508,8 @@ 
 	/**
 	 * @param $short_desc
 	 */
-	function set_short_description( $short_desc ) {
-		$this->set( 'EVT_short_desc', $short_desc );
+	function set_short_description($short_desc) {
+		$this->set('EVT_short_desc', $short_desc);
 	}
 
 
@@ -517,8 +517,8 @@ 
 	/**
 	 * @param $slug
 	 */
-	function set_slug( $slug ) {
-		$this->set( 'EVT_slug', $slug );
+	function set_slug($slug) {
+		$this->set('EVT_slug', $slug);
 	}
 
 
@@ -526,8 +526,8 @@ 
 	/**
 	 * @param $timezone_string
 	 */
-	function set_timezone_string( $timezone_string ) {
-		$this->set( 'EVT_timezone_string', $timezone_string );
+	function set_timezone_string($timezone_string) {
+		$this->set('EVT_timezone_string', $timezone_string);
 	}
 
 
@@ -535,8 +535,8 @@ 
 	/**
 	 * @param $visible_on
 	 */
-	function set_visible_on( $visible_on ) {
-		$this->set( 'EVT_visible_on', $visible_on );
+	function set_visible_on($visible_on) {
+		$this->set('EVT_visible_on', $visible_on);
 	}
 
 
@@ -544,8 +544,8 @@ 
 	/**
 	 * @param $wp_user
 	 */
-	function set_wp_user( $wp_user ) {
-		$this->set( 'EVT_wp_user', $wp_user );
+	function set_wp_user($wp_user) {
+		$this->set('EVT_wp_user', $wp_user);
 	}
 
 
@@ -553,8 +553,8 @@ 
 	/**
 	 * @param $default_registration_status
 	 */
-	function set_default_registration_status( $default_registration_status ) {
-		$this->set( 'EVT_default_registration_status', $default_registration_status );
+	function set_default_registration_status($default_registration_status) {
+		$this->set('EVT_default_registration_status', $default_registration_status);
 	}
 
 
@@ -562,8 +562,8 @@ 
 	/**
 	 * @param $donations
 	 */
-	function set_donations( $donations ) {
-		$this->set( 'EVT_donations', $donations );
+	function set_donations($donations) {
+		$this->set('EVT_donations', $donations);
 	}
 
 
@@ -573,8 +573,8 @@ 
 	 * @param EE_Venue /int $venue_id_or_obj
 	 * @return EE_Venue
 	 */
-	function add_venue( $venue_id_or_obj ) {
-		return $this->_add_relation_to( $venue_id_or_obj, 'Venue' );
+	function add_venue($venue_id_or_obj) {
+		return $this->_add_relation_to($venue_id_or_obj, 'Venue');
 	}
 
 
@@ -584,8 +584,8 @@ 
 	 * @param EE_Venue /int $venue_id_or_obj
 	 * @return EE_Venue
 	 */
-	function remove_venue( $venue_id_or_obj ) {
-		return $this->_remove_relation_to( $venue_id_or_obj, 'Venue' );
+	function remove_venue($venue_id_or_obj) {
+		return $this->_remove_relation_to($venue_id_or_obj, 'Venue');
 	}
 
 
@@ -595,8 +595,8 @@ 
 	 * @param array $query_params like EEM_Base::get_all's $query_params
 	 * @return EE_Venue[]
 	 */
-	function venues( $query_params = array() ) {
-		return $this->get_many_related( 'Venue', $query_params );
+	function venues($query_params = array()) {
+		return $this->get_many_related('Venue', $query_params);
 	}
 
 
@@ -608,7 +608,7 @@ 
 	 */
 	private function _has_ID_and_is_published() {
 		// first check if event id is present and not NULL, then check if this event is published (or any of the equivalent "published" statuses)
-		return ( $this->ID() && $this->ID() !== NULL && ( $this->status() == 'publish' || $this->status() == EEM_Event::sold_out || $this->status() == EEM_Event::postponed || $this->status() == EEM_Event::cancelled ) ) ? TRUE : FALSE;
+		return ($this->ID() && $this->ID() !== NULL && ($this->status() == 'publish' || $this->status() == EEM_Event::sold_out || $this->status() == EEM_Event::postponed || $this->status() == EEM_Event::cancelled)) ? TRUE : FALSE;
 	}
 
 
@@ -620,21 +620,21 @@ 
 	 */
 	public function is_upcoming() {
 		// check if event id is present and if this event is published
-		if ( $this->is_inactive() ) {
+		if ($this->is_inactive()) {
 			return FALSE;
 		}
 		// set initial value
 		$upcoming = FALSE;
 		//next let's get all datetimes and loop through them
 		$datetimes = $this->datetimes_in_chronological_order();
-		foreach ( $datetimes as $datetime ) {
-			if ( $datetime instanceof EE_Datetime ) {
+		foreach ($datetimes as $datetime) {
+			if ($datetime instanceof EE_Datetime) {
 				//if this dtt is expired then we continue cause one of the other datetimes might be upcoming.
-				if ( $datetime->is_expired() ) {
+				if ($datetime->is_expired()) {
 					continue;
 				}
 				//if this dtt is active then we return false.
-				if ( $datetime->is_active() ) {
+				if ($datetime->is_active()) {
 					return FALSE;
 				}
 				//otherwise let's check upcoming status
@@ -651,21 +651,21 @@ 
 	 */
 	public function is_active() {
 		// check if event id is present and if this event is published
-		if ( $this->is_inactive() ) {
+		if ($this->is_inactive()) {
 			return FALSE;
 		}
 		// set initial value
 		$active = FALSE;
 		//next let's get all datetimes and loop through them
 		$datetimes = $this->datetimes_in_chronological_order();
-		foreach ( $datetimes as $datetime ) {
-			if ( $datetime instanceof EE_Datetime ) {
+		foreach ($datetimes as $datetime) {
+			if ($datetime instanceof EE_Datetime) {
 				//if this dtt is expired then we continue cause one of the other datetimes might be active.
-				if ( $datetime->is_expired() ) {
+				if ($datetime->is_expired()) {
 					continue;
 				}
 				//if this dtt is upcoming then we return false.
-				if ( $datetime->is_upcoming() ) {
+				if ($datetime->is_upcoming()) {
 					return FALSE;
 				}
 				//otherwise let's check active status
@@ -682,17 +682,17 @@ 
 	 */
 	public function is_expired() {
 		// check if event id is present and if this event is published
-		if ( $this->is_inactive() ) {
+		if ($this->is_inactive()) {
 			return FALSE;
 		}
 		// set initial value
 		$expired = FALSE;
 		//first let's get all datetimes and loop through them
 		$datetimes = $this->datetimes_in_chronological_order();
-		foreach ( $datetimes as $datetime ) {
-			if ( $datetime instanceof EE_Datetime ) {
+		foreach ($datetimes as $datetime) {
+			if ($datetime instanceof EE_Datetime) {
 				//if this dtt is upcoming or active then we return false.
-				if ( $datetime->is_upcoming() || $datetime->is_active() ) {
+				if ($datetime->is_upcoming() || $datetime->is_active()) {
 					return FALSE;
 				}
 				//otherwise let's check active status
@@ -709,7 +709,7 @@ 
 	 */
 	public function is_inactive() {
 		// check if event id is present and if this event is published
-		if ( $this->_has_ID_and_is_published() ) {
+		if ($this->_has_ID_and_is_published()) {
 			return FALSE;
 		}
 		return TRUE;
@@ -727,37 +727,37 @@ 
 	 */
 	public function perform_sold_out_status_check() {
 		// get all unexpired untrashed tickets
-		$tickets = $this->tickets( array(
+		$tickets = $this->tickets(array(
 			array(
-				'TKT_end_date'   => array( '>=', EEM_Ticket::instance()->current_time_for_query( 'TKT_end_date' ) ),
+				'TKT_end_date'   => array('>=', EEM_Ticket::instance()->current_time_for_query('TKT_end_date')),
 				'TKT_deleted'    => false
 			)
 		));
 		// if all the tickets are just expired, then don't update the event status to sold out
-		if ( empty( $tickets )) {
+		if (empty($tickets)) {
 			return true;
 		}
 		// set initial value
 		$spaces_remaining = 0;
-		foreach( $tickets as $ticket ) {
-			if ( $ticket instanceof EE_Ticket ) {
-				$spaces_remaining += $ticket->qty( 'saleable' );
+		foreach ($tickets as $ticket) {
+			if ($ticket instanceof EE_Ticket) {
+				$spaces_remaining += $ticket->qty('saleable');
 			}
 		}
-		if ( $spaces_remaining === 0 ) {
-			$this->set_status( EEM_Event::sold_out );
-			if ( !is_admin() || ( is_admin() && defined( 'DOING_AJAX' ) ) ) {
+		if ($spaces_remaining === 0) {
+			$this->set_status(EEM_Event::sold_out);
+			if ( ! is_admin() || (is_admin() && defined('DOING_AJAX'))) {
 				$this->save();
 			}
 			$sold_out = TRUE;
 		} else {
 			$sold_out = FALSE;
 			// was event previously marked as sold out ?
-			if ( $this->status() == EEM_Event::sold_out ) {
+			if ($this->status() == EEM_Event::sold_out) {
 				// revert status to previous value, if it was set
-				$previous_event_status = $this->get_post_meta( '_previous_event_status', true );
-				if ( $previous_event_status ) {
-					$this->set_status( $previous_event_status );
+				$previous_event_status = $this->get_post_meta('_previous_event_status', true);
+				if ($previous_event_status) {
+					$this->set_status($previous_event_status);
 				}
 			}
 		}
@@ -781,15 +781,15 @@ 
 	 */
 	public function spaces_remaining_for_sale() {
 		//first get total available spaces including consideration for tickets that have already sold.
-		$spaces_available = $this->total_available_spaces( true );
+		$spaces_available = $this->total_available_spaces(true);
 
 		//if total available = 0, then exit right away because that means everything is expired.
-		if ( $spaces_available === 0 ) {
+		if ($spaces_available === 0) {
 			return 0;
 		}
 
 		//subtract total approved registrations from spaces available to get how many are remaining.
-		$spots_taken = EEM_Registration::instance()->count( array( array( 'EVT_ID' => $this->ID(), 'STS_ID' => EEM_Registration::status_id_approved ) ), 'REG_ID', true );
+		$spots_taken = EEM_Registration::instance()->count(array(array('EVT_ID' => $this->ID(), 'STS_ID' => EEM_Registration::status_id_approved)), 'REG_ID', true);
 		$spaces_remaining = $spaces_available - $spots_taken;
 
 		return $spaces_remaining > 0 ? $spaces_remaining : 0;
@@ -822,29 +822,29 @@ 
 	 *
 	 * @return  int|float  (Note: if EE_INF is returned its considered a float by PHP)
 	 */
-	public function total_available_spaces( $current_total_available = false ) {
+	public function total_available_spaces($current_total_available = false) {
 		$spaces_available = 0;
 
 		//first get all tickets on the event and include expired tickets
-		$tickets = $this->tickets( array( 'default_where_conditions' => 'none' ) );
+		$tickets = $this->tickets(array('default_where_conditions' => 'none'));
 		$ticket_sums = array();
 		$datetime_limits = array();
 
 		//loop through tickets and normalize them
-		foreach ( $tickets as $ticket ) {
-			$datetimes = $ticket->datetimes( array( 'order_by' => array( 'DTT_reg_limit' => 'ASC' ) ) );
+		foreach ($tickets as $ticket) {
+			$datetimes = $ticket->datetimes(array('order_by' => array('DTT_reg_limit' => 'ASC')));
 
-			if ( empty( $datetimes ) ) {
+			if (empty($datetimes)) {
 				continue;
 			}
 
 			//first datetime should be the lowest datetime
-			$least_datetime = reset( $datetimes );
+			$least_datetime = reset($datetimes);
 
 			//lets reset the ticket quantity to be the lower of either the lowest datetime reg limit or the ticket quantity
 			//IF datetimes sold (and we're not doing current live total available, then use spaces remaining for datetime, not reg_limit.
-			if ( $current_total_available ) {
-				if ( $ticket->is_remaining() ) {
+			if ($current_total_available) {
+				if ($ticket->is_remaining()) {
 					$remaining = $ticket->remaining();
 				} else {
 					$spaces_available += $ticket->sold();
@@ -852,23 +852,23 @@ 
 					continue;
 				}
 			} else {
-				$remaining = min( $ticket->qty(), $least_datetime->reg_limit() );
+				$remaining = min($ticket->qty(), $least_datetime->reg_limit());
 			}
 
 			//if $ticket_limit == infinity then let's drop out right away and just return that because any infinity amount trumps all other "available" amounts.
-			if ( $remaining == EE_INF ) {
+			if ($remaining == EE_INF) {
 				return EE_INF;
 			}
 
 			//multiply normalized $tkt quantity by the number of datetimes on the ticket as the "sum"
 			//also include the sum of all the datetime reg limits on the ticket for breaking ties.
-			$ticket_sums[$ticket->ID()]['sum'] = $remaining * count( $datetimes );
+			$ticket_sums[$ticket->ID()]['sum'] = $remaining * count($datetimes);
 			$ticket_sums[$ticket->ID()]['datetime_sums'] = 0;
-			foreach ( $datetimes as $datetime ) {
-				if ( $datetime->reg_limit() === EE_INF ) {
+			foreach ($datetimes as $datetime) {
+				if ($datetime->reg_limit() === EE_INF) {
 					$ticket_sums[$ticket->ID()]['datetime_sums'] = EE_INF;
 				} else {
-					$ticket_sums[ $ticket->ID() ]['datetime_sums'] += $current_total_available ? $datetime->spaces_remaining() : $datetime->reg_limit();
+					$ticket_sums[$ticket->ID()]['datetime_sums'] += $current_total_available ? $datetime->spaces_remaining() : $datetime->reg_limit();
 				}
 				$datetime_limits[$datetime->ID()] = $current_total_available ? $datetime->spaces_remaining() : $datetime->reg_limit();
 			}
@@ -879,74 +879,74 @@ 
 		//ticket quantity by the number of datetimes on the ticket).  For tie-breakers, then the next sort is based on the
 		//ticket with the greatest sum of all remaining datetime->spaces_remaining() ( or $datetime->reg_limit() if not
 		//$current_total_available ) for the datetimes on the ticket.
-		usort( $ticket_sums, function( $a, $b ) {
-			if ( $a['sum'] == $b['sum'] ) {
-				if ( $a['datetime_sums'] == $b['datetime_sums'] ) {
+		usort($ticket_sums, function($a, $b) {
+			if ($a['sum'] == $b['sum']) {
+				if ($a['datetime_sums'] == $b['datetime_sums']) {
 					return 0;
 				}
 
 				return $a['datetime_sums'] < $b['datetime_sums'] ? 1 : -1;
 			}
-			return ( $a['sum'] < $b['sum'] ) ? -1 : 1;
+			return ($a['sum'] < $b['sum']) ? -1 : 1;
 		});
 
 		//now let's loop through the sorted tickets and simulate sellouts
-		foreach ( $ticket_sums as $ticket_info ) {
-			if ( $ticket_info['ticket'] instanceof EE_Ticket ) {
+		foreach ($ticket_sums as $ticket_info) {
+			if ($ticket_info['ticket'] instanceof EE_Ticket) {
 
-				$datetimes = $ticket_info['ticket']->datetimes( array( 'order_by' => array( 'DTT_reg_limit' => 'ASC' ) ) );
+				$datetimes = $ticket_info['ticket']->datetimes(array('order_by' => array('DTT_reg_limit' => 'ASC')));
 				//need to sort these $datetimes by remaining (only if $current_total_available)
 				//setup datetimes for simulation
 				$ticket_datetimes_remaining = array();
-				foreach( $datetimes as $datetime ) {
+				foreach ($datetimes as $datetime) {
 					$ticket_datetimes_remaining[$datetime->ID()]['rem'] = $datetime_limits[$datetime->ID()];
 					$ticket_datetimes_remaining[$datetime->ID()]['datetime'] = $datetime;
 				}
-				usort( $ticket_datetimes_remaining, function( $a, $b ) {
-					if ( $a['rem'] == $b['rem'] ) {
+				usort($ticket_datetimes_remaining, function($a, $b) {
+					if ($a['rem'] == $b['rem']) {
 						return 0;
 					}
-					return ( $a['rem'] < $b['rem'] ) ? -1 : 1;
+					return ($a['rem'] < $b['rem']) ? -1 : 1;
 				});
 
 
 				//get the remaining on the first datetime (which should be the one with the least remaining) and that is
 				//what we add to the spaces_available running total.  Then we need to decrease the remaining on our datetime tracker.
-				$lowest_datetime = reset( $ticket_datetimes_remaining );
+				$lowest_datetime = reset($ticket_datetimes_remaining);
 
 				//need to get the lower of; what the remaining is on the lowest datetime, and the remaining on the ticket.
 				// If this ends up being 0 (because of previous tickets in our simulation selling out), then it has already
 				// been tracked on $spaces available and this ticket is now sold out for the simulation, so we can continue
 				// to the next ticket.
-				if ( $current_total_available ) {
-					$remaining = min( $lowest_datetime['rem'], $ticket_info['ticket']->remaining() );
+				if ($current_total_available) {
+					$remaining = min($lowest_datetime['rem'], $ticket_info['ticket']->remaining());
 				} else {
-					$remaining = min( $lowest_datetime['rem'], $ticket_info['ticket']->qty() );
+					$remaining = min($lowest_datetime['rem'], $ticket_info['ticket']->qty());
 				}
 
 				//if $remaining is infinite that means that all datetimes on this ticket are infinite but we've made it here because all
 				//tickets have a quantity.  So we don't have to track datetimes, we can just use ticket quantities for total
 				//available.
-				if ( $remaining === EE_INF ) {
+				if ($remaining === EE_INF) {
 					$spaces_available += $ticket_info['ticket']->qty();
 					continue;
 				}
 
 				//if ticket has sold amounts then we also need to add that (but only if doing live counts)
-				if ( $current_total_available ) {
+				if ($current_total_available) {
 					$spaces_available += $ticket_info['ticket']->sold();
 				}
 
-				if ( $remaining <= 0 ) {
+				if ($remaining <= 0) {
 					continue;
 				} else {
 					$spaces_available += $remaining;
 				}
 
 				//loop through the datetimes and sell them out!
-				foreach ( $ticket_datetimes_remaining as $datetime_info ) {
-					if ( $datetime_info['datetime'] instanceof EE_Datetime ) {
-						$datetime_limits[ $datetime_info['datetime']->ID() ] += - $remaining;
+				foreach ($ticket_datetimes_remaining as $datetime_info) {
+					if ($datetime_info['datetime'] instanceof EE_Datetime) {
+						$datetime_limits[$datetime_info['datetime']->ID()] += - $remaining;
 					}
 				}
 			}
@@ -962,8 +962,8 @@ 
 	 * @param  bool $actual whether or not to perform calculations to not only figure the actual status but also to flip the status if necessary to sold out If false, we just check the existing status of the event
 	 * @return boolean
 	 */
-	public function is_sold_out( $actual = FALSE ) {
-		if ( ! $actual ) {
+	public function is_sold_out($actual = FALSE) {
+		if ( ! $actual) {
 			return $this->status() == EEM_Event::sold_out;
 		}
 		else {
@@ -1008,30 +1008,30 @@ 
 	 *
 	 * @return bool | string - based on EE_Datetime active constants or FALSE if error.
 	 */
-	public function get_active_status( $reset = false ) {
+	public function get_active_status($reset = false) {
 		// if the active status has already been set, then just use that value (unless we are resetting it)
-		if ( ! empty( $this->_active_status ) && ! $reset ) {
+		if ( ! empty($this->_active_status) && ! $reset) {
 			return $this->_active_status;
 		}
 		//first check if event id is present on this object
-		if ( ! $this->ID() ) {
+		if ( ! $this->ID()) {
 			return false;
 		}
 
-		$where_params_for_event  = array( array( 'EVT_ID' => $this->ID() ) );
+		$where_params_for_event = array(array('EVT_ID' => $this->ID()));
 
 		//if event is published:
-		if ( $this->status() === 'publish' ) {
+		if ($this->status() === 'publish') {
 			//active?
-			if ( EEM_Datetime::instance()->get_datetime_count_for_status( EE_Datetime::active, $where_params_for_event ) > 0 ) {
+			if (EEM_Datetime::instance()->get_datetime_count_for_status(EE_Datetime::active, $where_params_for_event) > 0) {
 				$this->_active_status = EE_Datetime::active;
 			} else {
 				//upcoming?
-				if ( EEM_Datetime::instance()->get_datetime_count_for_status( EE_Datetime::upcoming, $where_params_for_event  ) > 0 ) {
+				if (EEM_Datetime::instance()->get_datetime_count_for_status(EE_Datetime::upcoming, $where_params_for_event) > 0) {
 					$this->_active_status = EE_Datetime::upcoming;
 				} else {
 					//expired?
-					if ( EEM_Datetime::instance()->get_datetime_count_for_status( EE_Datetime::expired, $where_params_for_event  ) > 0 ) {
+					if (EEM_Datetime::instance()->get_datetime_count_for_status(EE_Datetime::expired, $where_params_for_event) > 0) {
 						$this->_active_status = EE_Datetime::expired;
 					} else {
 						//it would be odd if things make it this far because it basically means there are no datetime's
@@ -1042,7 +1042,7 @@ 
 			}
 		} else {
 			//the event is not published, so let's just set it's active status according to its' post status
-			switch ( $this->status() ) {
+			switch ($this->status()) {
 				case EEM_Event::sold_out :
 					$this->_active_status = EE_Datetime::sold_out;
 					break;
@@ -1068,10 +1068,10 @@ 
 	 * @param boolean $echo     whether to return (FALSE), or echo out the result (TRUE)
 	 * @return mixed void|string
 	 */
-	public function pretty_active_status( $echo = TRUE ) {
+	public function pretty_active_status($echo = TRUE) {
 		$active_status = $this->get_active_status();
-		$status = '<span class="ee-status event-active-status-' . $active_status . '">' . EEH_Template::pretty_status( $active_status, FALSE, 'sentence' ) . '</span>';
-		if ( $echo ) {
+		$status = '<span class="ee-status event-active-status-'.$active_status.'">'.EEH_Template::pretty_status($active_status, FALSE, 'sentence').'</span>';
+		if ($echo) {
 			echo $status;
 			return '';
 		}
@@ -1085,12 +1085,12 @@ 
 	 */
 	public function get_number_of_tickets_sold() {
 		$tkt_sold = 0;
-		if ( !$this->ID() ) {
+		if ( ! $this->ID()) {
 			return 0;
 		}
 		$datetimes = $this->datetimes();
-		foreach ( $datetimes as $datetime ) {
-			if ( $datetime instanceof EE_Datetime ) {
+		foreach ($datetimes as $datetime) {
+			if ($datetime instanceof EE_Datetime) {
 				$tkt_sold += $datetime->sold();
 			}
 		}
@@ -1105,7 +1105,7 @@ 
 	 * @return int
 	 */
 	public function get_count_of_all_registrations() {
-		return EEM_Event::instance()->count_related( $this, 'Registration' );
+		return EEM_Event::instance()->count_related($this, 'Registration');
 	}
 
 
@@ -1115,9 +1115,9 @@ 
 	 * @return EE_Ticket
 	 */
 	public function get_ticket_with_earliest_start_time() {
-		$where[ 'Datetime.EVT_ID' ] = $this->ID();
-		$query_params = array( $where, 'order_by' => array( 'TKT_start_date' => 'ASC' ) );
-		return EE_Registry::instance()->load_model( 'Ticket' )->get_one( $query_params );
+		$where['Datetime.EVT_ID'] = $this->ID();
+		$query_params = array($where, 'order_by' => array('TKT_start_date' => 'ASC'));
+		return EE_Registry::instance()->load_model('Ticket')->get_one($query_params);
 	}
 
 
@@ -1127,9 +1127,9 @@ 
 	 * @return EE_Ticket
 	 */
 	public function get_ticket_with_latest_end_time() {
-		$where[ 'Datetime.EVT_ID' ] = $this->ID();
-		$query_params = array( $where, 'order_by' => array( 'TKT_end_date' => 'DESC' ) );
-		return EE_Registry::instance()->load_model( 'Ticket' )->get_one( $query_params );
+		$where['Datetime.EVT_ID'] = $this->ID();
+		$query_params = array($where, 'order_by' => array('TKT_end_date' => 'DESC'));
+		return EE_Registry::instance()->load_model('Ticket')->get_one($query_params);
 	}
 
 
@@ -1141,11 +1141,11 @@ 
 	public function tickets_on_sale() {
 		$earliest_ticket = $this->get_ticket_with_earliest_start_time();
 		$latest_ticket = $this->get_ticket_with_latest_end_time();
-		if ( !$latest_ticket instanceof EE_Ticket && !$earliest_ticket instanceof EE_Ticket ) {
+		if ( ! $latest_ticket instanceof EE_Ticket && ! $earliest_ticket instanceof EE_Ticket) {
 			return FALSE;
 		}
 		//check on sale for these two tickets.
-		if ( $latest_ticket->is_on_sale() || $earliest_ticket->is_on_sale() ) {
+		if ($latest_ticket->is_on_sale() || $earliest_ticket->is_on_sale()) {
 			return TRUE;
 		}
 		return FALSE;
@@ -1159,7 +1159,7 @@ 
 	 * @return string
 	 */
 	public function get_permalink() {
-		if ( $this->external_url() ) {
+		if ($this->external_url()) {
 			return $this->external_url();
 		}
 		else {
@@ -1174,10 +1174,10 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return EE_Term
 	 */
-	public function first_event_category( $query_params = array() ) {
-		$query_params[ 0 ][ 'Term_Taxonomy.taxonomy' ] = 'espresso_event_categories';
-		$query_params[ 0 ][ 'Term_Taxonomy.Event.EVT_ID' ] = $this->ID();
-		return EEM_Term::instance()->get_one( $query_params );
+	public function first_event_category($query_params = array()) {
+		$query_params[0]['Term_Taxonomy.taxonomy'] = 'espresso_event_categories';
+		$query_params[0]['Term_Taxonomy.Event.EVT_ID'] = $this->ID();
+		return EEM_Term::instance()->get_one($query_params);
 	}
 
 
@@ -1187,10 +1187,10 @@ 
 	 * @param array $query_params
 	 * @return EE_Term[]
 	 */
-	public function get_all_event_categories( $query_params = array() ) {
-		$query_params[ 0 ][ 'Term_Taxonomy.taxonomy' ] = 'espresso_event_categories';
-		$query_params[ 0 ][ 'Term_Taxonomy.Event.EVT_ID' ] = $this->ID();
-		return EEM_Term::instance()->get_all( $query_params );
+	public function get_all_event_categories($query_params = array()) {
+		$query_params[0]['Term_Taxonomy.taxonomy'] = 'espresso_event_categories';
+		$query_params[0]['Term_Taxonomy.Event.EVT_ID'] = $this->ID();
+		return EEM_Term::instance()->get_all($query_params);
 	}
 
 	/**
@@ -1198,8 +1198,8 @@ 
 	 * @param array $query_params @see EEM_Base::get_all
 	 * @return EE_Question_Group[]
 	 */
-	public function question_groups($query_params = array()){
-		$query_params = ! empty( $query_params ) ? $query_params : array( 'order_by' => array( 'QSG_order' => 'ASC' ));
+	public function question_groups($query_params = array()) {
+		$query_params = ! empty($query_params) ? $query_params : array('order_by' => array('QSG_order' => 'ASC'));
 		return $this->get_many_related('Question_Group', $query_params);
 	}
 
@@ -1239,12 +1239,12 @@ 
 	 */
 	public function get_admin_edit_link() {
 		EE_Registry::instance()->load_helper('URL');
-		return EEH_URL::add_query_args_and_nonce( array(
+		return EEH_URL::add_query_args_and_nonce(array(
 			'page' => 'espresso_events',
 			'action' => 'edit',
 			'post' => $this->ID()
 			),
-			admin_url( 'admin.php' )
+			admin_url('admin.php')
 		);
 	}
 
@@ -1257,11 +1257,11 @@ 
 	 */
 	public function get_admin_settings_link() {
 		EE_Registry::instance()->load_helper('URL');
-		return EEH_URL::add_query_args_and_nonce( array(
+		return EEH_URL::add_query_args_and_nonce(array(
 			'page' => 'espresso_events',
 			'action' => 'default_event_settings'
 			),
-			admin_url( 'admin.php' )
+			admin_url('admin.php')
 		);
 	}
 
@@ -1277,11 +1277,11 @@ 
 	public function get_admin_overview_link() {
 
 		EE_Registry::instance()->load_helper('URL');
-		return EEH_URL::add_query_args_and_nonce( array(
+		return EEH_URL::add_query_args_and_nonce(array(
 			'page' => 'espresso_events',
 			'action' => 'default'
 		),
-			admin_url( 'admin.php' )
+			admin_url('admin.php')
 		);
 	}
 

core/libraries/batch/JobHandlers/AttendeesReport.php

Doc Comments +5 added lines

@@ -87,6 +87,11 @@
 	public function count_units_to_process() {
 		return \EEM_Attendee::instance()->count();
 	}
+
+	/**
+	 * @param integer $offset
+	 * @param integer $limit
+	 */
 	public function get_csv_data( $offset, $limit ) {
 		$attendee_rows = \EEM_Attendee::instance()->get_all_wpdb_results( 
 				array( 

Spacing +36 added lines, -36 removed lines

@@ -18,7 +18,7 @@ 
 use EventEspressoBatchRequest\Helpers\JobParameters;
 use EventEspressoBatchRequest\Helpers\JobStepResponse;
 
-if (!defined('EVENT_ESPRESSO_VERSION')) {
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
 }
 
@@ -27,83 +27,83 @@ 
 	
 	
 	public function create_job(JobParameters $job_parameters) {
-		if( ! \EE_Capabilities::instance()->current_user_can( 'ee_read_contacts', 'generating_report' ) ) {
+		if ( ! \EE_Capabilities::instance()->current_user_can('ee_read_contacts', 'generating_report')) {
 			throw new BatchRequestException(
-				__( 'You do not have permission to view contacts', 'event_espresso')
+				__('You do not have permission to view contacts', 'event_espresso')
 			);
 		}
 		$filepath = $this->create_file_from_job_with_name(
 			$job_parameters->job_id(),
 			__('contact-list-report.csv', 'event_espresso')
 		);
-		$job_parameters->add_extra_data( 'filepath', $filepath );
-		$job_parameters->set_job_size( $this->count_units_to_process() );
+		$job_parameters->add_extra_data('filepath', $filepath);
+		$job_parameters->set_job_size($this->count_units_to_process());
 		//we should also set the header columns
-		$csv_data_for_row = $this->get_csv_data( 0, 1 );
-		\EE_Registry::instance()->load_helper( 'Export' );
-		\EEH_Export::write_data_array_to_csv( $filepath, $csv_data_for_row, true );
+		$csv_data_for_row = $this->get_csv_data(0, 1);
+		\EE_Registry::instance()->load_helper('Export');
+		\EEH_Export::write_data_array_to_csv($filepath, $csv_data_for_row, true);
 		//if we actually processed a row there, record it
-		if( $job_parameters->job_size() ) {
-			$job_parameters->mark_processed( 1 );
+		if ($job_parameters->job_size()) {
+			$job_parameters->mark_processed(1);
 		}
 		return new JobStepResponse(
 			$job_parameters,
-			__( 'Contacts report started successfully...', 'event_espresso' )
+			__('Contacts report started successfully...', 'event_espresso')
 		);
 	}
 	
 
 	public function continue_job(JobParameters $job_parameters, $batch_size = 50) {
-		$csv_data = $this->get_csv_data( $job_parameters->units_processed(), $batch_size );
-		\EE_Registry::instance()->load_helper( 'Export' );
-		\EEH_Export::write_data_array_to_csv( $job_parameters->extra_datum( 'filepath' ), $csv_data, false );
-		$units_processed = count( $csv_data );
-		$job_parameters->mark_processed( $units_processed );
+		$csv_data = $this->get_csv_data($job_parameters->units_processed(), $batch_size);
+		\EE_Registry::instance()->load_helper('Export');
+		\EEH_Export::write_data_array_to_csv($job_parameters->extra_datum('filepath'), $csv_data, false);
+		$units_processed = count($csv_data);
+		$job_parameters->mark_processed($units_processed);
 		$extra_response_data = array(
 			'file_url' => ''
 		);
-		if( $units_processed < $batch_size ) {
-			$job_parameters->set_status( JobParameters::status_complete );
-			$extra_response_data[ 'file_url' ] = $this->get_url_to_file( $job_parameters->extra_datum( 'filepath' ) );
+		if ($units_processed < $batch_size) {
+			$job_parameters->set_status(JobParameters::status_complete);
+			$extra_response_data['file_url'] = $this->get_url_to_file($job_parameters->extra_datum('filepath'));
 		}
 		return new JobStepResponse(
 				$job_parameters,
 				sprintf(
-					__( 'Wrote %1$s rows to report CSV file...', 'event_espresso' ),
-					count( $csv_data ) ),
+					__('Wrote %1$s rows to report CSV file...', 'event_espresso'),
+					count($csv_data) ),
 				$extra_response_data );
 	}
 
 	
 	public function cleanup_job(JobParameters $job_parameters) {
 		$this->_file_helper->delete(
-			\EEH_File::remove_filename_from_filepath( $job_parameters->extra_datum( 'filepath' ) ),
+			\EEH_File::remove_filename_from_filepath($job_parameters->extra_datum('filepath')),
 			true,
 			'd'
 		);
-		return new JobStepResponse( $job_parameters, __( 'Cleaned up temporary file', 'event_espresso' ) );
+		return new JobStepResponse($job_parameters, __('Cleaned up temporary file', 'event_espresso'));
 	}
 	
 	public function count_units_to_process() {
 		return \EEM_Attendee::instance()->count();
 	}
-	public function get_csv_data( $offset, $limit ) {
+	public function get_csv_data($offset, $limit) {
 		$attendee_rows = \EEM_Attendee::instance()->get_all_wpdb_results( 
 				array( 
-					'limit' => array( $offset, $limit ),
-					'force_join' => array( 'State', 'Country' ) ) );
+					'limit' => array($offset, $limit),
+					'force_join' => array('State', 'Country') ) );
 		$csv_data = array();
-		foreach( $attendee_rows as $attendee_row ){
+		foreach ($attendee_rows as $attendee_row) {
 			$csv_row = array();
-			foreach( \EEM_Attendee::instance()->field_settings() as $field_name => $field_obj ){
-				if( $field_name == 'STA_ID' ){
-					$state_name_field = \EEM_State::instance()->field_settings_for( 'STA_name' );
-					$csv_row[ __( 'State', 'event_espresso' ) ] = $attendee_row[ $state_name_field->get_qualified_column() ];
-				}elseif( $field_name == 'CNT_ISO' ){
-					$country_name_field = \EEM_Country::instance()->field_settings_for( 'CNT_name' );
-					$csv_row[ __( 'Country', 'event_espresso' ) ] = $attendee_row[ $country_name_field->get_qualified_column() ];
-				}else{
-					$csv_row[ $field_obj->get_nicename() ] = $attendee_row[ $field_obj->get_qualified_column() ];
+			foreach (\EEM_Attendee::instance()->field_settings() as $field_name => $field_obj) {
+				if ($field_name == 'STA_ID') {
+					$state_name_field = \EEM_State::instance()->field_settings_for('STA_name');
+					$csv_row[__('State', 'event_espresso')] = $attendee_row[$state_name_field->get_qualified_column()];
+				}elseif ($field_name == 'CNT_ISO') {
+					$country_name_field = \EEM_Country::instance()->field_settings_for('CNT_name');
+					$csv_row[__('Country', 'event_espresso')] = $attendee_row[$country_name_field->get_qualified_column()];
+				} else {
+					$csv_row[$field_obj->get_nicename()] = $attendee_row[$field_obj->get_qualified_column()];
 				}
 			}
 			$csv_data[] = $csv_row;

Braces +2 added lines, -2 removed lines

@@ -99,10 +99,10 @@
 				if( $field_name == 'STA_ID' ){
 					$state_name_field = \EEM_State::instance()->field_settings_for( 'STA_name' );
 					$csv_row[ __( 'State', 'event_espresso' ) ] = $attendee_row[ $state_name_field->get_qualified_column() ];
-				}elseif( $field_name == 'CNT_ISO' ){
+				} elseif( $field_name == 'CNT_ISO' ){
 					$country_name_field = \EEM_Country::instance()->field_settings_for( 'CNT_name' );
 					$csv_row[ __( 'Country', 'event_espresso' ) ] = $attendee_row[ $country_name_field->get_qualified_column() ];
-				}else{
+				} else{
 					$csv_row[ $field_obj->get_nicename() ] = $attendee_row[ $field_obj->get_qualified_column() ];
 				}
 			}

admin_pages/support/Support_Admin_Page_Init.core.php

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -32,11 +32,11 @@ 
 
 	public function __construct() {
 		//define some help/support page related constants
-		define( 'EE_SUPPORT_PG_SLUG', 'espresso_support' );
-		define( 'EE_SUPPORT_ADMIN_URL', admin_url('admin.php?page=' . EE_SUPPORT_PG_SLUG ));
-		define( 'EE_SUPPORT_ADMIN_TEMPLATE_PATH', EE_ADMIN_PAGES . 'support/templates/');
-		define( 'EE_SUPPORT_ADMIN', EE_ADMIN_PAGES . 'support/' );
-		define( 'EE_SUPPORT_ASSETS_URL', EE_ADMIN_PAGES_URL . 'support/assets/' );
+		define('EE_SUPPORT_PG_SLUG', 'espresso_support');
+		define('EE_SUPPORT_ADMIN_URL', admin_url('admin.php?page='.EE_SUPPORT_PG_SLUG));
+		define('EE_SUPPORT_ADMIN_TEMPLATE_PATH', EE_ADMIN_PAGES.'support/templates/');
+		define('EE_SUPPORT_ADMIN', EE_ADMIN_PAGES.'support/');
+		define('EE_SUPPORT_ASSETS_URL', EE_ADMIN_PAGES_URL.'support/assets/');
 		parent::__construct();
 	}
 
@@ -45,7 +45,7 @@ 
 	}
 
 	protected function _set_menu_map() {
-		$this->_menu_map = new EE_Admin_Page_Sub_Menu( array(
+		$this->_menu_map = new EE_Admin_Page_Sub_Menu(array(
 			'menu_group' => 'extras',
 			'menu_order' => 30,
 			'show_on_menu' => EE_Admin_Page_Menu_Map::BLOG_AND_NETWORK_ADMIN,

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