eventespresso / event-espresso-core

modules/core_rest_api/EED_Core_Rest_Api.module.php

Spacing +108 added lines, -108 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 use EventEspresso\core\libraries\rest_api\Calculated_Model_Fields;
 
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -35,7 +35,7 @@ 
 	 */
 	public static function instance() {
 		self::$_field_calculator = new Calculated_Model_Fields();
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -65,10 +65,10 @@ 
 
 
 	public static function set_hooks_both() {
-		add_action( 'rest_api_init', array( 'EED_Core_Rest_Api', 'register_routes' ), 10 );
-		add_action( 'rest_api_init', array( 'EED_Core_Rest_Api', 'set_hooks_rest_api' ), 5 );
-		add_filter( 'rest_route_data', array( 'EED_Core_Rest_Api', 'hide_old_endpoints' ), 10, 2 );
-		add_filter( 'rest_index', array( 'EventEspresso\core\libraries\rest_api\controllers\model\Meta', 'filter_ee_metadata_into_index' ) );
+		add_action('rest_api_init', array('EED_Core_Rest_Api', 'register_routes'), 10);
+		add_action('rest_api_init', array('EED_Core_Rest_Api', 'set_hooks_rest_api'), 5);
+		add_filter('rest_route_data', array('EED_Core_Rest_Api', 'hide_old_endpoints'), 10, 2);
+		add_filter('rest_index', array('EventEspresso\core\libraries\rest_api\controllers\model\Meta', 'filter_ee_metadata_into_index'));
 		EED_Core_Rest_Api::invalidate_cached_route_data_on_version_change();
 	}
 
@@ -87,7 +87,7 @@ 
 	 * Loads all the hooks which make requests to old versions of the API
 	 * appear the same as they always did
 	 */
-	public static function set_hooks_for_changes(){
+	public static function set_hooks_for_changes() {
 		self::_set_hooks_for_changes();
 	}
 
@@ -97,11 +97,11 @@ 
 	 * replace it with application passwords.
 	 */
 	public static function maybe_notify_of_basic_auth_removal() {
-		if( 
+		if ( 
 			apply_filters( 
 				'FHEE__EED_Core_Rest_Api__maybe_notify_of_basic_auth_removal__override',
-				! isset( $_SERVER['PHP_AUTH_USER'] )
-			&& ! isset( $_SERVER['HTTP_AUTHORIZATION'] ) 
+				! isset($_SERVER['PHP_AUTH_USER'])
+			&& ! isset($_SERVER['HTTP_AUTHORIZATION']) 
 			) 
 		) {
 			//sure it's a WP API request, but they aren't using basic auth, so don't bother them
@@ -109,20 +109,20 @@ 
 		}
 		//ok they're using the WP API with Basic Auth
 		$message = sprintf(
-			__( 'We noticed you\'re using the WP API, which is used by the Event Espresso 4 mobile apps. Because of security and compatibility concerns, we will soon be removing our default authentication mechanism, WP API Basic Auth, from Event Espresso. It is recommended you instead install the %1$sWP Application Passwords plugin%2$s and use it with the EE4 Mobile apps. See %3$sour mobile app documentation%2$s for more information. %4$sIf you have installed the WP API Basic Auth plugin separately, or are not using the Event Espresso 4 mobile apps, you can disregard this message.%4$sThe Event Espresso Team', 'event_espresso' ),
+			__('We noticed you\'re using the WP API, which is used by the Event Espresso 4 mobile apps. Because of security and compatibility concerns, we will soon be removing our default authentication mechanism, WP API Basic Auth, from Event Espresso. It is recommended you instead install the %1$sWP Application Passwords plugin%2$s and use it with the EE4 Mobile apps. See %3$sour mobile app documentation%2$s for more information. %4$sIf you have installed the WP API Basic Auth plugin separately, or are not using the Event Espresso 4 mobile apps, you can disregard this message.%4$sThe Event Espresso Team', 'event_espresso'),
 			'<a href="https://wordpress.org/plugins/application-passwords/">',
 			'</a>',
 			'<a href="https://eventespresso.com/wiki/ee4-event-apps/#authentication">',
 			'<br/>'
 		);
-		EE_Error::add_persistent_admin_notice( 'using_basic_auth', $message );
-		if( ! get_option( 'ee_notified_admin_on_basic_auth_removal', false ) ) {
-			add_option( 'ee_notified_admin_on_basic_auth_removal', true );
+		EE_Error::add_persistent_admin_notice('using_basic_auth', $message);
+		if ( ! get_option('ee_notified_admin_on_basic_auth_removal', false)) {
+			add_option('ee_notified_admin_on_basic_auth_removal', true);
 			//piggy back off EE_Error::set_content_type, which sets the content type to HTML
-			add_filter( 'wp_mail_content_type', array( 'EE_Error', 'set_content_type' ));
+			add_filter('wp_mail_content_type', array('EE_Error', 'set_content_type'));
 			//and send the message to the site admin too
-			wp_mail( get_option( 'admin_email' ), __( 'Notice of Removal of WP API Basic Auth From Event Espresso 4', 'event_espresso' ), $message );
-			remove_filter( 'wp_mail_content_type', array( 'EE_Error', 'set_content_type' ));
+			wp_mail(get_option('admin_email'), __('Notice of Removal of WP API Basic Auth From Event Espresso 4', 'event_espresso'), $message);
+			remove_filter('wp_mail_content_type', array('EE_Error', 'set_content_type'));
 		}
 	}
 	/**
@@ -130,16 +130,16 @@ 
 	 * appear the same as they always did
 	 */
 	protected static function _set_hooks_for_changes() {
-		$folder_contents = EEH_File::get_contents_of_folders( array( EE_LIBRARIES . 'rest_api' . DS . 'changes' ), false );
-		foreach( $folder_contents as $classname_in_namespace => $filepath ) {
+		$folder_contents = EEH_File::get_contents_of_folders(array(EE_LIBRARIES.'rest_api'.DS.'changes'), false);
+		foreach ($folder_contents as $classname_in_namespace => $filepath) {
 			//ignore the base parent class
-			if( $classname_in_namespace === 'Changes_In_Base' ) {
+			if ($classname_in_namespace === 'Changes_In_Base') {
 				continue;
 			}
-			$full_classname = 'EventEspresso\core\libraries\rest_api\changes\\' . $classname_in_namespace;
-			if ( class_exists( $full_classname )) {
+			$full_classname = 'EventEspresso\core\libraries\rest_api\changes\\'.$classname_in_namespace;
+			if (class_exists($full_classname)) {
 				$instance_of_class = new $full_classname;
-				if ( $instance_of_class instanceof EventEspresso\core\libraries\rest_api\changes\Changes_In_Base ) {
+				if ($instance_of_class instanceof EventEspresso\core\libraries\rest_api\changes\Changes_In_Base) {
 					$instance_of_class->set_hooks();
 				}
 			}
@@ -152,16 +152,16 @@ 
 	 * so we actually prefer to only do it when an EE plugin is activated or upgraded
 	 */
 	public static function register_routes() {
-		foreach( EED_Core_Rest_Api::get_ee_route_data() as $namespace => $relative_urls ) {
-			foreach( $relative_urls as $endpoint => $routes ) {
-				foreach( $routes as $route ) {
+		foreach (EED_Core_Rest_Api::get_ee_route_data() as $namespace => $relative_urls) {
+			foreach ($relative_urls as $endpoint => $routes) {
+				foreach ($routes as $route) {
 					register_rest_route(
 						$namespace,
 						$endpoint,
 						array(
-							'callback' => $route[ 'callback' ],
-							'methods' => $route[ 'methods' ],
-							'args' => isset( $route[ 'args' ] ) ? $route[ 'args' ] : array(),
+							'callback' => $route['callback'],
+							'methods' => $route['methods'],
+							'args' => isset($route['args']) ? $route['args'] : array(),
 						)
 					);
 				}
@@ -175,11 +175,11 @@ 
 	 * next time the WP API is used
 	 */
 	public static function invalidate_cached_route_data_on_version_change() {
-		if( EE_System::instance()->detect_req_type() != EE_System::req_type_normal ) {
+		if (EE_System::instance()->detect_req_type() != EE_System::req_type_normal) {
 			EED_Core_Rest_Api::invalidate_cached_route_data();
 		}
-		foreach( EE_Registry::instance()->addons as $addon ){
-			if( $addon instanceof EE_Addon && $addon->detect_req_type() != EE_System::req_type_normal ) {
+		foreach (EE_Registry::instance()->addons as $addon) {
+			if ($addon instanceof EE_Addon && $addon->detect_req_type() != EE_System::req_type_normal) {
 				EED_Core_Rest_Api::invalidate_cached_route_data();
 			}
 		}
@@ -190,8 +190,8 @@ 
 	 */
 	public static function invalidate_cached_route_data() {
 		//delete the saved EE REST API routes
-		foreach( EED_Core_Rest_Api::versions_served() as $version => $hidden ){
-			delete_option( EED_Core_Rest_Api::saved_routes_option_names . $version );
+		foreach (EED_Core_Rest_Api::versions_served() as $version => $hidden) {
+			delete_option(EED_Core_Rest_Api::saved_routes_option_names.$version);
 		}
 	}
 
@@ -205,8 +205,8 @@ 
 	 */
 	public static function get_ee_route_data() {
 		$ee_routes = array();
-		foreach( self::versions_served() as $version => $hidden_endpoints ) {
-			$ee_routes[  self::ee_api_namespace . $version ] = self::_get_ee_route_data_for_version( $version, $hidden_endpoints );
+		foreach (self::versions_served() as $version => $hidden_endpoints) {
+			$ee_routes[self::ee_api_namespace.$version] = self::_get_ee_route_data_for_version($version, $hidden_endpoints);
 		}
 		return $ee_routes;
 	}
@@ -218,10 +218,10 @@ 
 	 * @param boolean $hidden_endpoints
 	 * @return array
 	 */
-	protected static function _get_ee_route_data_for_version( $version, $hidden_endpoints = false ) {
-		$ee_routes = get_option( self::saved_routes_option_names . $version , null );
-		if( ! $ee_routes || ( defined('EE_REST_API_DEBUG_MODE') && EE_REST_API_DEBUG_MODE )){
-			$ee_routes = self::_save_ee_route_data_for_version( $version, $hidden_endpoints );
+	protected static function _get_ee_route_data_for_version($version, $hidden_endpoints = false) {
+		$ee_routes = get_option(self::saved_routes_option_names.$version, null);
+		if ( ! $ee_routes || (defined('EE_REST_API_DEBUG_MODE') && EE_REST_API_DEBUG_MODE)) {
+			$ee_routes = self::_save_ee_route_data_for_version($version, $hidden_endpoints);
 		}
 		return $ee_routes;
 	}
@@ -235,18 +235,18 @@ 
 	 * @param boolean $hidden_endpoints
 	 * @return mixed|null|void
 	 */
-	protected static function _save_ee_route_data_for_version( $version, $hidden_endpoints = false ) {
+	protected static function _save_ee_route_data_for_version($version, $hidden_endpoints = false) {
 		$instance = self::instance();
 		$routes = apply_filters(
 			'EED_Core_Rest_Api__save_ee_route_data_for_version__routes',
 			array_replace_recursive(
-				$instance->_get_config_route_data_for_version( $version, $hidden_endpoints ),
-				$instance->_get_meta_route_data_for_version( $version, $hidden_endpoints ),
-				$instance->_get_model_route_data_for_version( $version, $hidden_endpoints ),
-				$instance->_get_rpc_route_data_for_version( $version, $hidden_endpoints )
+				$instance->_get_config_route_data_for_version($version, $hidden_endpoints),
+				$instance->_get_meta_route_data_for_version($version, $hidden_endpoints),
+				$instance->_get_model_route_data_for_version($version, $hidden_endpoints),
+				$instance->_get_rpc_route_data_for_version($version, $hidden_endpoints)
 			)
 		);
-		update_option( self::saved_routes_option_names . $version, $routes, true );
+		update_option(self::saved_routes_option_names.$version, $routes, true);
 		return $routes;
 	}
 
@@ -257,7 +257,7 @@ 
 	 * @return void
 	 */
 	public static function save_ee_routes() {
-		if( EE_Maintenance_Mode::instance()->models_can_query() ){
+		if (EE_Maintenance_Mode::instance()->models_can_query()) {
 			$instance = self::instance();
 			$routes = apply_filters(
 				'EED_Core_Rest_Api__save_ee_routes__routes',
@@ -268,7 +268,7 @@ 
 					$instance->_register_rpc_routes()
 				)
 			);
-			update_option( self::saved_routes_option_names, $routes, true );
+			update_option(self::saved_routes_option_names, $routes, true);
 		}
 	}
 
@@ -279,8 +279,8 @@ 
 	 */
 	protected function _register_model_routes() {
 		$model_routes = array( );
-		foreach( self::versions_served() as $version => $hidden_endpoint ) {
-			$model_routes[ EED_Core_Rest_Api::ee_api_namespace . $version ] = $this->_get_config_route_data_for_version( $version, $hidden_endpoint );
+		foreach (self::versions_served() as $version => $hidden_endpoint) {
+			$model_routes[EED_Core_Rest_Api::ee_api_namespace.$version] = $this->_get_config_route_data_for_version($version, $hidden_endpoint);
 		}
 		return $model_routes;
 	}
@@ -291,8 +291,8 @@ 
 	 * @param boolean $hidden_endpoint
 	 * @return array
 	 */
-	protected function _get_model_route_data_for_version( $version, $hidden_endpoint = false ) {
-		$model_version_info = new \EventEspresso\core\libraries\rest_api\Model_Version_Info( $version );
+	protected function _get_model_route_data_for_version($version, $hidden_endpoint = false) {
+		$model_version_info = new \EventEspresso\core\libraries\rest_api\Model_Version_Info($version);
 		$models_to_register = apply_filters(
 			'FHEE__EED_Core_REST_API___register_model_routes',
 			$model_version_info->models_for_requested_version()
@@ -301,21 +301,21 @@ 
 		unset($models_to_register['Extra_Meta']);
 		unset($models_to_register['Extra_Join']);
 		$model_routes = array();
-		foreach ( $models_to_register as $model_name => $model_classname ) {
-			$model = \EE_Registry::instance()->load_model( $model_name );
+		foreach ($models_to_register as $model_name => $model_classname) {
+			$model = \EE_Registry::instance()->load_model($model_name);
 			//yes we could just register one route for ALL models, but then they wouldn't show up in the index
-			$plural_model_route = EEH_Inflector::pluralize_and_lower( $model_name );
-			$singular_model_route = $plural_model_route . '/(?P<id>\d+)' ;
-			$model_routes[ $plural_model_route ] = array(
+			$plural_model_route = EEH_Inflector::pluralize_and_lower($model_name);
+			$singular_model_route = $plural_model_route.'/(?P<id>\d+)';
+			$model_routes[$plural_model_route] = array(
 					array(
 						'callback' => array(
 							'EventEspresso\core\libraries\rest_api\controllers\model\Read',
 							'handle_request_get_all' ),
 						'methods' => WP_REST_Server::READABLE,
 						'hidden_endpoint' => $hidden_endpoint,
-						'args' => $this->_get_read_query_params( $model, $version ),
+						'args' => $this->_get_read_query_params($model, $version),
 						'_links' => array(
-							'self' => rest_url( EED_Core_Rest_Api::ee_api_namespace . $version . $singular_model_route ),
+							'self' => rest_url(EED_Core_Rest_Api::ee_api_namespace.$version.$singular_model_route),
 						)
 					),
 //						array(
@@ -326,14 +326,14 @@ 
 //							'hidden_endpoint' => $hidden_endpoint
 //						)
 				);
-			$model_routes[ $singular_model_route ] = array(
+			$model_routes[$singular_model_route] = array(
 					array(
 						'callback' => array(
 							'EventEspresso\core\libraries\rest_api\controllers\model\Read',
 							'handle_request_get_one' ),
 						'methods' => WP_REST_Server::READABLE,
 						'hidden_endpoint' => $hidden_endpoint,
-						'args' => $this->_get_response_selection_query_params( $model, $version)
+						'args' => $this->_get_response_selection_query_params($model, $version)
 					),
 //						array(
 //							'callback' => array(
@@ -344,19 +344,19 @@ 
 //							),
 			);
 			//@todo: also handle  DELETE for a single item
-			foreach ( $model_version_info->relation_settings( $model ) as $relation_name => $relation_obj ) {
+			foreach ($model_version_info->relation_settings($model) as $relation_name => $relation_obj) {
 				$related_model_name_endpoint_part = EventEspresso\core\libraries\rest_api\controllers\model\Read::get_related_entity_name(
 					$relation_name,
 					$relation_obj
 				);
-				$model_routes[ $singular_model_route . '/' . $related_model_name_endpoint_part ] = array(
+				$model_routes[$singular_model_route.'/'.$related_model_name_endpoint_part] = array(
 						array(
 							'callback' => array(
 								'EventEspresso\core\libraries\rest_api\controllers\model\Read',
 								'handle_request_get_related' ),
 							'methods' => WP_REST_Server::READABLE,
 							'hidden_endpoint' => $hidden_endpoint,
-							'args' => $this->_get_read_query_params( $relation_obj->get_other_model(), $version ),
+							'args' => $this->_get_read_query_params($relation_obj->get_other_model(), $version),
 						),
 //							array(
 //								'callback' => array(
@@ -379,8 +379,8 @@ 
 	 */
 	protected function _register_rpc_routes() {
 		$routes = array();
-		foreach( self::versions_served() as $version => $hidden_endpoint ) {
-			$routes[ self::ee_api_namespace . $version ] = $this->_get_rpc_route_data_for_version( $version, $hidden_endpoint );
+		foreach (self::versions_served() as $version => $hidden_endpoint) {
+			$routes[self::ee_api_namespace.$version] = $this->_get_rpc_route_data_for_version($version, $hidden_endpoint);
 		}
 		return $routes;
 	}
@@ -391,10 +391,10 @@ 
 	 * @param boolean $hidden_endpoint
 	 * @return array
 	 */
-	protected function _get_rpc_route_data_for_version( $version, $hidden_endpoint = false ) {
+	protected function _get_rpc_route_data_for_version($version, $hidden_endpoint = false) {
 		$this_versions_routes = array();
 			//checkin endpoint
-			$this_versions_routes[ 'registrations/(?P<REG_ID>\d+)/toggle_checkin_for_datetime/(?P<DTT_ID>\d+)' ] = array(
+			$this_versions_routes['registrations/(?P<REG_ID>\d+)/toggle_checkin_for_datetime/(?P<DTT_ID>\d+)'] = array(
 				array(
 					'callback' => array(
 						'EventEspresso\core\libraries\rest_api\controllers\rpc\Checkin',
@@ -405,7 +405,7 @@ 
 						'force' => array(
 							'required' => false,
 							'default' => false,
-							'description' => __( 'Whether to force toggle checkin, or to verify the registration status and allowed ticket uses', 'event_espresso' )
+							'description' => __('Whether to force toggle checkin, or to verify the registration status and allowed ticket uses', 'event_espresso')
 						)
 					)
 				)
@@ -424,7 +424,7 @@ 
 	 * @param string $version
 	 * @return array
 	 */
-	protected function _get_response_selection_query_params( \EEM_Base $model, $version ) {
+	protected function _get_response_selection_query_params(\EEM_Base $model, $version) {
 		return apply_filters(
 			'FHEE__EED_Core_Rest_Api___get_response_selection_query_params',
 			array(
@@ -435,7 +435,7 @@ 
 				'calculate' => array(
 					'required' => false,
 					'default' => '',
-					'enum' => self::$_field_calculator->retrieve_calculated_fields_for_model( $model )
+					'enum' => self::$_field_calculator->retrieve_calculated_fields_for_model($model)
 				)
 			),
 			$model,
@@ -453,13 +453,13 @@ 
 	 * @return array    describing the args acceptable when querying this model
 	 * @throws \EE_Error
 	 */
-	protected function _get_read_query_params( \EEM_Base $model, $version ) {
+	protected function _get_read_query_params(\EEM_Base $model, $version) {
 		$default_orderby = array();
-		foreach( $model->get_combined_primary_key_fields() as $key_field ) {
-			$default_orderby[ $key_field->get_name() ] = 'ASC';
+		foreach ($model->get_combined_primary_key_fields() as $key_field) {
+			$default_orderby[$key_field->get_name()] = 'ASC';
 		}
 		return array_merge(
-			$this->_get_response_selection_query_params( $model, $version ),
+			$this->_get_response_selection_query_params($model, $version),
 			array(
 				'where' => array(
 					'required' => false,
@@ -496,8 +496,8 @@ 
 	 */
 	protected function _register_config_routes() {
 		$config_routes = array();
-		foreach( self::versions_served() as $version => $hidden_endpoint ) {
-			$config_routes[ self::ee_api_namespace . $version ] = $this->_get_config_route_data_for_version( $version,	$hidden_endpoint );
+		foreach (self::versions_served() as $version => $hidden_endpoint) {
+			$config_routes[self::ee_api_namespace.$version] = $this->_get_config_route_data_for_version($version, $hidden_endpoint);
 		}
 		return $config_routes;
 	}
@@ -508,7 +508,7 @@ 
 	 * @param boolean $hidden_endpoint
 	 * @return array
 	 */
-	protected function _get_config_route_data_for_version( $version, $hidden_endpoint ) {
+	protected function _get_config_route_data_for_version($version, $hidden_endpoint) {
 		return array(
 			'config' => array(
 				array(
@@ -538,8 +538,8 @@ 
 	 */
 	protected function _register_meta_routes() {
 		$meta_routes = array();
-		foreach( self::versions_served() as $version => $hidden_endpoint ) {
-			$meta_routes[ self::ee_api_namespace . $version ] = $this->_get_meta_route_data_for_version( $version, $hidden_endpoint );
+		foreach (self::versions_served() as $version => $hidden_endpoint) {
+			$meta_routes[self::ee_api_namespace.$version] = $this->_get_meta_route_data_for_version($version, $hidden_endpoint);
 		}
 		return $meta_routes;
 	}
@@ -550,7 +550,7 @@ 
 	 * @param boolean $hidden_endpoint
 	 * @return array
 	 */
-	protected function _get_meta_route_data_for_version( $version, $hidden_endpoint = false ) {
+	protected function _get_meta_route_data_for_version($version, $hidden_endpoint = false) {
 		return array(
 			'resources'  => array(
 				array(
@@ -572,25 +572,25 @@ 
 	 * @param array $route_data
 	 * @return array
 	 */
-	public static function hide_old_endpoints( $route_data ) {
+	public static function hide_old_endpoints($route_data) {
 		//allow API clients to override which endpoints get hidden, in case
 		//they want to discover particular endpoints
 		//also, we don't have access to the request so we have to just grab it from the superglobal
 		$force_show_ee_namespace = ltrim(
-			EEH_Array::is_set( $_REQUEST, 'force_show_ee_namespace', '' ),
+			EEH_Array::is_set($_REQUEST, 'force_show_ee_namespace', ''),
 			'/'
 		);
 		
-		foreach( EED_Core_Rest_Api::get_ee_route_data() as $namespace => $relative_urls ) {
-			foreach( $relative_urls as $endpoint => $routes ) {
-				foreach( $routes as $route ) {
+		foreach (EED_Core_Rest_Api::get_ee_route_data() as $namespace => $relative_urls) {
+			foreach ($relative_urls as $endpoint => $routes) {
+				foreach ($routes as $route) {
 					//by default, hide "hidden_endpoint"s, unless the request indicates
 					//to $force_show_ee_namespace, in which case only show that one
 					//namespace's endpoints (and hide all others)
-					if( ( $route[ 'hidden_endpoint' ] && $force_show_ee_namespace === '' )
-						|| ( $force_show_ee_namespace !== '' && $force_show_ee_namespace !== $namespace ) ) {
-						$full_route = '/' . ltrim( $namespace, '/' ) . '/' . ltrim( $endpoint, '/' );
-						unset( $route_data[ $full_route ] );
+					if (($route['hidden_endpoint'] && $force_show_ee_namespace === '')
+						|| ($force_show_ee_namespace !== '' && $force_show_ee_namespace !== $namespace)) {
+						$full_route = '/'.ltrim($namespace, '/').'/'.ltrim($endpoint, '/');
+						unset($route_data[$full_route]);
 					}
 				}
 			}
@@ -629,8 +629,8 @@ 
 	 */
 	public static function latest_rest_api_version() {
 		$versions_served = \EED_Core_Rest_Api::versions_served();
-		$versions_served_keys = array_keys( $versions_served );
-		return end( $versions_served_keys );
+		$versions_served_keys = array_keys($versions_served);
+		return end($versions_served_keys);
 	}
 
 	/**
@@ -644,32 +644,32 @@ 
 	public static function versions_served() {
 		$versions_served = array();
 		$possibly_served_versions = EED_Core_Rest_Api::version_compatibilities();
-		$lowest_compatible_version = end( $possibly_served_versions);
-		reset( $possibly_served_versions );
-		$versions_served_historically = array_keys( $possibly_served_versions );
-		$latest_version = end( $versions_served_historically );
-		reset( $versions_served_historically );
+		$lowest_compatible_version = end($possibly_served_versions);
+		reset($possibly_served_versions);
+		$versions_served_historically = array_keys($possibly_served_versions);
+		$latest_version = end($versions_served_historically);
+		reset($versions_served_historically);
 		//for each version of core we have ever served:
-		foreach ( $versions_served_historically as $key_versioned_endpoint ) {
+		foreach ($versions_served_historically as $key_versioned_endpoint) {
 			//if it's not above the current core version, and it's compatible with the current version of core
-			if( $key_versioned_endpoint == $latest_version ) {
+			if ($key_versioned_endpoint == $latest_version) {
 				//don't hide the latest version in the index
-				$versions_served[ $key_versioned_endpoint ] = false;
-			} else if(
+				$versions_served[$key_versioned_endpoint] = false;
+			} else if (
 				$key_versioned_endpoint < EED_Core_Rest_Api::core_version()
 				&& $key_versioned_endpoint >= $lowest_compatible_version
 			) {
 				//include, but hide, previous versions which are still supported
-				$versions_served[ $key_versioned_endpoint ] = true;
-			} elseif(
+				$versions_served[$key_versioned_endpoint] = true;
+			} elseif (
 				apply_filters(
 					'FHEE__EED_Core_Rest_Api__versions_served__include_incompatible_versions',
 					false,
 					$possibly_served_versions
 				)
-			){
+			) {
 				//if a version is no longer supported, don't include it in index or list of versions served
-				$versions_served[ $key_versioned_endpoint ] = true;
+				$versions_served[$key_versioned_endpoint] = true;
 			}
 		}
 		return $versions_served;
@@ -682,7 +682,7 @@ 
 	 * @return string
 	 */
 	public static function core_version() {
-		return apply_filters( 'FHEE__EED_Core_REST_API__core_version', implode('.', array_slice( explode( '.', espresso_version() ), 0, 3 ) ) );
+		return apply_filters('FHEE__EED_Core_REST_API__core_version', implode('.', array_slice(explode('.', espresso_version()), 0, 3)));
 	}
 
 	/**
@@ -707,7 +707,7 @@ 
 	 * @param  WP $WP
 	 * @return    void
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
 
 	}
 

modules/ticket_selector/templates/ticket_selector_chart.template.php

Spacing +156 added lines, -156 removed lines

@@ -11,18 +11,18 @@ 
 
 $row = 1;
 $max = 1;
-$ticket_count = count( $tickets );
+$ticket_count = count($tickets);
 $ticket_status_display = '';
-if ( ! $ticket_count ) {
+if ( ! $ticket_count) {
 	return;
 }
 
 $required_ticket_sold_out = FALSE;
-$template_settings = isset ( EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector )
+$template_settings = isset (EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector)
 	? EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector
 	: new EE_Ticket_Selector_Config();
 
-$tax_settings = isset ( EE_Registry::instance()->CFG->tax_settings )
+$tax_settings = isset (EE_Registry::instance()->CFG->tax_settings)
 	? EE_Registry::instance()->CFG->tax_settings
 	: new EE_Tax_Config();
 
@@ -31,22 +31,22 @@ 
 
 ob_start();
 
-foreach ( $tickets as $TKT_ID => $ticket ) {
-	if ( $ticket instanceof EE_Ticket ) {
+foreach ($tickets as $TKT_ID => $ticket) {
+	if ($ticket instanceof EE_Ticket) {
 		$cols = 2;
 		$max = $ticket->max();
 		$min = 0;
 		$remaining = $ticket->remaining();
-		if ( $ticket->is_on_sale() && $ticket->is_remaining() ) {
+		if ($ticket->is_on_sale() && $ticket->is_remaining()) {
 			// offer the number of $tickets_remaining or $max_atndz, whichever is smaller
-			$max = min( $remaining, $max_atndz );
+			$max = min($remaining, $max_atndz);
 			// but... we also want to restrict the number of tickets by the ticket max setting,
 			// however, the max still can't be higher than what was just set above
-			$max = $ticket->max() > 0 ? min( $ticket->max(), $max ) : $max;
+			$max = $ticket->max() > 0 ? min($ticket->max(), $max) : $max;
 			// and we also want to restrict the minimum number of tickets by the ticket min setting
 			$min = $ticket->min() > 0 ? $ticket->min() : 0;
 			// and if the ticket is required, then make sure that min qty is at least 1
-			$min = $ticket->required() ? max( $min, 1 ) : $min;
+			$min = $ticket->required() ? max($min, 1) : $min;
 		} else {
 			// set flag if ticket is required (flag is set to start date so that future tickets are not blocked)
 			$required_ticket_sold_out = $ticket->required() && ! $remaining ? $ticket->start_date() : $required_ticket_sold_out;
@@ -58,41 +58,41 @@ 
 		$taxable_tickets = $ticket->taxable() ? true : $taxable_tickets;
 		$ticket_bundle = FALSE;
 		// for ticket bundles, set min and max qty the same
-		if ( $ticket->min() !== 0 && $ticket->min() === $ticket->max() ) {
+		if ($ticket->min() !== 0 && $ticket->min() === $ticket->max()) {
 			$ticket_price *= $ticket->min();
 			$ticket_bundle = TRUE;
 		}
-		$ticket_price = apply_filters( 'FHEE__ticket_selector_chart_template__ticket_price', $ticket_price, $ticket );
+		$ticket_price = apply_filters('FHEE__ticket_selector_chart_template__ticket_price', $ticket_price, $ticket);
 		// if a previous required ticket with the same sale start date is sold out, then mark this ticket as sold out as well.
 		// tickets that go on sale at a later date than the required ticket  will NOT be affected
 		$tkt_status = $required_ticket_sold_out !== FALSE && $required_ticket_sold_out === $ticket->start_date() ? EE_Ticket::sold_out : $ticket->ticket_status();
 		$tkt_status = $event_status === EE_Datetime::sold_out ? EE_Ticket::sold_out : $tkt_status;
 		// check ticket status
-		switch ( $tkt_status ) {
+		switch ($tkt_status) {
 			// sold_out
 			case EE_Ticket::sold_out :
-				$ticket_status = '<span class="ticket-sales-sold-out">' . $ticket->ticket_status( TRUE ) . '</span>';
+				$ticket_status = '<span class="ticket-sales-sold-out">'.$ticket->ticket_status(TRUE).'</span>';
 				$status_class = 'ticket-sales-sold-out lt-grey-text';
 			break;
 			// expired
 			case EE_Ticket::expired :
-				$ticket_status = '<span class="ticket-sales-expired">' . $ticket->ticket_status( TRUE ) . '</span>';
+				$ticket_status = '<span class="ticket-sales-expired">'.$ticket->ticket_status(TRUE).'</span>';
 				$status_class = 'ticket-sales-expired lt-grey-text';
 			break;
 			// archived
 			case EE_Ticket::archived :
-				$ticket_status = '<span class="archived-ticket">' . $ticket->ticket_status( TRUE ) . '</span>';
+				$ticket_status = '<span class="archived-ticket">'.$ticket->ticket_status(TRUE).'</span>';
 				$status_class = 'archived-ticket hidden';
 			break;
 			// pending
 			case EE_Ticket::pending :
-				$ticket_status = '<span class="ticket-pending">' . $ticket->ticket_status( TRUE ) . '</span>';
+				$ticket_status = '<span class="ticket-pending">'.$ticket->ticket_status(TRUE).'</span>';
 				$status_class = 'ticket-pending';
 			break;
 			// onsale
 			case EE_Ticket::onsale :
 			default :
-				$ticket_status = '<span class="ticket-on-sale">' . $ticket->ticket_status( TRUE ) . '</span>';
+				$ticket_status = '<span class="ticket-on-sale">'.$ticket->ticket_status(TRUE).'</span>';
 				$status_class = 'ticket-on-sale';
 			break;
 		}
@@ -132,7 +132,7 @@ 
             "tckt-slctr-tkt-details-{$EVT_ID}-{$TKT_ID}"
         );
 	?>
-				<tr class="tckt-slctr-tbl-tr <?php echo $status_class . ' ' . espresso_get_object_css_class( $ticket ); ?>">
+				<tr class="tckt-slctr-tbl-tr <?php echo $status_class.' '.espresso_get_object_css_class($ticket); ?>">
 		<?php
 		/**
 		 * Allow plugins to hook in and abort the generation and display of the contents of this
@@ -144,24 +144,24 @@ 
 		 *
 		 * @var string|bool
 		 */
-		if ( false !== ( $new_row_cells_content = apply_filters( 'FHEE__ticket_selector_chart_template__do_ticket_inside_row', false, $ticket, $max, $min, $required_ticket_sold_out, $ticket_price, $ticket_bundle, $ticket_status, $status_class ) ) ) {
+		if (false !== ($new_row_cells_content = apply_filters('FHEE__ticket_selector_chart_template__do_ticket_inside_row', false, $ticket, $max, $min, $required_ticket_sold_out, $ticket_price, $ticket_bundle, $ticket_status, $status_class))) {
 			echo $new_row_cells_content;
 			echo '</tr>';
 			continue;
 		}
 		?>
 					<td class="tckt-slctr-tbl-td-name">
-						<b><?php echo $ticket->get_pretty('TKT_name');?></b>
-						<?php if ( $template_settings->show_ticket_details ) : ?>
-							<a id="display-<?php echo $ticket_details_css_id; ?>" class="display-tckt-slctr-tkt-details display-the-hidden lt-grey-text smaller-text hide-if-no-js" rel="<?php echo $ticket_details_css_id; ?>" title="<?php echo esc_attr( apply_filters( 'FHEE__ticket_selector_chart_template__show_ticket_details_link_title', __( 'click to show additional ticket details', 'event_espresso' )) ); ?>">
-								<?php echo sprintf( __( 'show%1$sdetails%1$s+', 'event_espresso' ), '&nbsp;' ); ?>
+						<b><?php echo $ticket->get_pretty('TKT_name'); ?></b>
+						<?php if ($template_settings->show_ticket_details) : ?>
+							<a id="display-<?php echo $ticket_details_css_id; ?>" class="display-tckt-slctr-tkt-details display-the-hidden lt-grey-text smaller-text hide-if-no-js" rel="<?php echo $ticket_details_css_id; ?>" title="<?php echo esc_attr(apply_filters('FHEE__ticket_selector_chart_template__show_ticket_details_link_title', __('click to show additional ticket details', 'event_espresso'))); ?>">
+								<?php echo sprintf(__('show%1$sdetails%1$s+', 'event_espresso'), '&nbsp;'); ?>
 							</a>
-							<a id="hide-<?php echo $ticket_details_css_id; ?>" class="hide-tckt-slctr-tkt-details hide-the-displayed lt-grey-text smaller-text hide-if-no-js" rel="<?php echo $ticket_details_css_id; ?>" title="<?php echo esc_attr( apply_filters( 'FHEE__ticket_selector_chart_template__hide_ticket_details_link_title', __( 'click to hide additional ticket details', 'event_espresso' )) ); ?>" style="display:none;">
-								<?php echo sprintf( __( 'hide%1$sdetails%1$s-', 'event_espresso' ), '&nbsp;' ); ?>
+							<a id="hide-<?php echo $ticket_details_css_id; ?>" class="hide-tckt-slctr-tkt-details hide-the-displayed lt-grey-text smaller-text hide-if-no-js" rel="<?php echo $ticket_details_css_id; ?>" title="<?php echo esc_attr(apply_filters('FHEE__ticket_selector_chart_template__hide_ticket_details_link_title', __('click to hide additional ticket details', 'event_espresso'))); ?>" style="display:none;">
+								<?php echo sprintf(__('hide%1$sdetails%1$s-', 'event_espresso'), '&nbsp;'); ?>
 							</a>
 						<?php endif; //end show details check ?>
-					<?php if ( $ticket->required() ) { ?>
-						<p class="ticket-required-pg"><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_required_message', __( 'This ticket is required and must be purchased.', 'event_espresso' )); ?></p>
+					<?php if ($ticket->required()) { ?>
+						<p class="ticket-required-pg"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_required_message', __('This ticket is required and must be purchased.', 'event_espresso')); ?></p>
 					<?php } ?>
 					<?php
 //	echo '<br/><b>$max_atndz : ' . $max_atndz . '</b>';
@@ -177,16 +177,16 @@ 
 					</td>
 					<?php
 					if (
-						apply_filters( 'FHEE__ticket_selector_chart_template__display_ticket_price_details', TRUE )
+						apply_filters('FHEE__ticket_selector_chart_template__display_ticket_price_details', TRUE)
 					) { ?>
 					<td class="tckt-slctr-tbl-td-price jst-rght"><?php
-						echo EEH_Template::format_currency( $ticket_price );
+						echo EEH_Template::format_currency($ticket_price);
 						echo $ticket->taxable() ? '<span class="taxable-tickets-asterisk grey-text">*</span>' : '';
 						?>&nbsp;<span class="smaller-text no-bold"><?php
-						if ( $ticket_bundle ) {
-							echo apply_filters( 'FHEE__ticket_selector_chart_template__per_ticket_bundle_text', __( ' / bundle', 'event_espresso' ));
+						if ($ticket_bundle) {
+							echo apply_filters('FHEE__ticket_selector_chart_template__per_ticket_bundle_text', __(' / bundle', 'event_espresso'));
 						} else {
-							echo apply_filters( 'FHEE__ticket_selector_chart_template__per_ticket_text', __( '', 'event_espresso' ));
+							echo apply_filters('FHEE__ticket_selector_chart_template__per_ticket_text', __('', 'event_espresso'));
 						}?></span>&nbsp;</td>
 						<?php $cols++; ?>
 					<?php } ?>
@@ -194,28 +194,28 @@ 
 					<?php
 					$hidden_input_qty = $max_atndz > 1 ? TRUE : FALSE;
 					$ticket_status_display = '';
-					if ( $max_atndz === 0 ) {
+					if ($max_atndz === 0) {
 						// registration is CLOSED because admin set max attendees to ZERO
-						$ticket_status_display = '<span class="sold-out">' . apply_filters(
+						$ticket_status_display = '<span class="sold-out">'.apply_filters(
 													 'FHEE__ticket_selector_chart_template__ticket_closed_msg',
-													 __( 'Closed', 'event_espresso' )
-												 ) . '</span>';
-					} else if ( $tkt_status === EE_Ticket::sold_out || $remaining === 0 ) {
+													 __('Closed', 'event_espresso')
+												 ).'</span>';
+					} else if ($tkt_status === EE_Ticket::sold_out || $remaining === 0) {
 						// SOLD OUT - no tickets remaining
-						$ticket_status_display = '<span class="sold-out">' . apply_filters(
+						$ticket_status_display = '<span class="sold-out">'.apply_filters(
 													'FHEE__ticket_selector_chart_template__ticket_sold_out_msg',
-													__( 'Sold&nbsp;Out', 'event_espresso' )
-												) . '</span>';
-					} else if ( $tkt_status === EE_Ticket::expired || $tkt_status === EE_Ticket::archived ) {
+													__('Sold&nbsp;Out', 'event_espresso')
+												).'</span>';
+					} else if ($tkt_status === EE_Ticket::expired || $tkt_status === EE_Ticket::archived) {
 						// expired or archived ticket
 						$ticket_status_display = $ticket_status;
-					} else if ( $tkt_status === EE_Ticket::pending ) {
+					} else if ($tkt_status === EE_Ticket::pending) {
 						// ticket not on sale yet
 						$ticket_status_display = '<span class="ticket-pending-pg">
 						<span class="ticket-pending">'
 						. apply_filters(
 							'FHEE__ticket_selector_chart_template__ticket_goes_on_sale_msg',
-							__( 'Goes&nbsp;On&nbsp;Sale', 'event_espresso' )
+							__('Goes&nbsp;On&nbsp;Sale', 'event_espresso')
 						 )
 					. '</span><br/>
 						<span class="small-text">'
@@ -228,36 +228,36 @@ 
 						)
 					. '</span>
 					</span>';
-					} else if ( $ticket->min() > $remaining ) {
+					} else if ($ticket->min() > $remaining) {
 						// min qty purchasable is less than tickets available
 						$ticket_status_display = '
 					<div class="archived-ticket-pg">
 						<span class="archived-ticket small-text">'
-						 . apply_filters( 'FHEE__ticket_selector_chart_template__ticket_not_available_msg', __( 'Not Available', 'event_espresso' ))
+						 . apply_filters('FHEE__ticket_selector_chart_template__ticket_not_available_msg', __('Not Available', 'event_espresso'))
 					 . '</span><br/>
 					</div>';
-					} else if ( $max_atndz  === 1 ) {
+					} else if ($max_atndz === 1) {
 						// only ONE attendee is allowed to register at a time
 						// display submit button since we have tickets available
-						add_filter( 'FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true' );
+						add_filter('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true');
 					?>
-						<input type="radio" name="tkt-slctr-qty-<?php echo $EVT_ID; ?>" id="ticket-selector-tbl-qty-slct-<?php echo $EVT_ID . '-' . $row; ?>" class="ticket-selector-tbl-qty-slct" value="<?php echo $row . '-'; ?>1" <?php echo $row === 1 ? ' checked="checked"' : ''; ?>  title=""/>
+						<input type="radio" name="tkt-slctr-qty-<?php echo $EVT_ID; ?>" id="ticket-selector-tbl-qty-slct-<?php echo $EVT_ID.'-'.$row; ?>" class="ticket-selector-tbl-qty-slct" value="<?php echo $row.'-'; ?>1" <?php echo $row === 1 ? ' checked="checked"' : ''; ?>  title=""/>
 					<?php
 						$hidden_input_qty = FALSE;
 
-					} else if ( $max > 0 ) {
+					} else if ($max > 0) {
 						// display submit button since we have tickets available
-						add_filter( 'FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true' );
+						add_filter('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true');
 					?>
-					<select name="tkt-slctr-qty-<?php echo $EVT_ID; ?>[]" id="ticket-selector-tbl-qty-slct-<?php echo $EVT_ID . '-' . $row; ?>" class="ticket-selector-tbl-qty-slct" title="">
+					<select name="tkt-slctr-qty-<?php echo $EVT_ID; ?>[]" id="ticket-selector-tbl-qty-slct-<?php echo $EVT_ID.'-'.$row; ?>" class="ticket-selector-tbl-qty-slct" title="">
 					<?php
 						// this ensures that non-required tickets with non-zero MIN QTYs don't HAVE to be purchased
-						if ( ! $ticket->required() && $min !== 0 ) {
+						if ( ! $ticket->required() && $min !== 0) {
 					?>
 						<option value="0">&nbsp;0&nbsp;</option>
 					<?php }
 						// offer ticket quantities from the min to the max
-						for ( $i = $min; $i <= $max; $i++) {
+						for ($i = $min; $i <= $max; $i++) {
 					?>
 						<option value="<?php echo $i; ?>">&nbsp;<?php echo $i; ?>&nbsp;</option>
 					<?php } ?>
@@ -268,7 +268,7 @@ 
 					}
 					echo $ticket_status_display;
 					// depending on group reg we need to change the format for qty
-					if ( $hidden_input_qty ) {
+					if ($hidden_input_qty) {
 					?>
 					<input type="hidden" name="tkt-slctr-qty-<?php echo $EVT_ID; ?>[]" value="0" />
 					<?php
@@ -278,33 +278,33 @@ 
 
 					</td>
 				</tr>
-				<?php if ( $template_settings->show_ticket_details ) : ?>
-					<tr class="tckt-slctr-tkt-details-tr <?php echo espresso_get_object_css_class( $ticket, '', 'details' );?>">
+				<?php if ($template_settings->show_ticket_details) : ?>
+					<tr class="tckt-slctr-tkt-details-tr <?php echo espresso_get_object_css_class($ticket, '', 'details'); ?>">
 						<td class="tckt-slctr-tkt-details-td" colspan="<?php echo $cols; ?>" >
 							<div id="<?php echo $ticket_details_css_id; ?>-dv" class="tckt-slctr-tkt-details-dv" style="display: none;">
 
 								<section class="tckt-slctr-tkt-details-sctn">
-									<h3><?php _e( 'Details', 'event_espresso' ); ?></h3>
+									<h3><?php _e('Details', 'event_espresso'); ?></h3>
 									<p><?php echo $ticket->description(); ?></p>
 
-									<?php if ( $ticket_price !== 0 && apply_filters( 'FHEE__ticket_selector_chart_template__display_ticket_price_details', TRUE ) ) { ?>
+									<?php if ($ticket_price !== 0 && apply_filters('FHEE__ticket_selector_chart_template__display_ticket_price_details', TRUE)) { ?>
 									<section class="tckt-slctr-tkt-price-sctn">
-										<h5><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_price_breakdown_heading', __( 'Price', 'event_espresso' )); ?></h5>
+										<h5><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_price_breakdown_heading', __('Price', 'event_espresso')); ?></h5>
 										<div class="tckt-slctr-tkt-details-tbl-wrap-dv">
 											<table class="tckt-slctr-tkt-details-tbl">
 												<thead>
 													<tr>
-														<th class="ee-third-width"><span class="small-text"><?php _e( 'Name', 'event_espresso' ); ?></span></th>
-														<th class="jst-cntr"><span class="small-text"><?php _e( 'Description', 'event_espresso' ); ?></span></th>
-														<th class="ee-fourth-width jst-rght"><span class="small-text"><?php _e( 'Amount', 'event_espresso' ); ?></span></th>
+														<th class="ee-third-width"><span class="small-text"><?php _e('Name', 'event_espresso'); ?></span></th>
+														<th class="jst-cntr"><span class="small-text"><?php _e('Description', 'event_espresso'); ?></span></th>
+														<th class="ee-fourth-width jst-rght"><span class="small-text"><?php _e('Amount', 'event_espresso'); ?></span></th>
 													</tr>
 												</thead>
 												<tbody>
-										<?php if ( $ticket->base_price() instanceof EE_Price ) { ?>
+										<?php if ($ticket->base_price() instanceof EE_Price) { ?>
 													<tr>
-														<td data-th="<?php _e( 'Name', 'event_espresso' ); ?>" class="small-text"><b><?php echo $ticket->base_price()->name(); ?></b></td>
-														<td data-th="<?php _e( 'Description', 'event_espresso' ); ?>" class="small-text"><?php echo $ticket->base_price()->desc(); ?></td>
-														<td data-th="<?php _e( 'Amount', 'event_espresso' ); ?>" class="jst-rght small-text"><?php echo $ticket->base_price()->pretty_price(); ?></td>
+														<td data-th="<?php _e('Name', 'event_espresso'); ?>" class="small-text"><b><?php echo $ticket->base_price()->name(); ?></b></td>
+														<td data-th="<?php _e('Description', 'event_espresso'); ?>" class="small-text"><?php echo $ticket->base_price()->desc(); ?></td>
+														<td data-th="<?php _e('Amount', 'event_espresso'); ?>" class="jst-rght small-text"><?php echo $ticket->base_price()->pretty_price(); ?></td>
 													</tr>
 													<?php
 															$running_total = $ticket->base_price()->amount();
@@ -312,44 +312,44 @@ 
 															$running_total = 0;
 														}
 														// now add price modifiers
-														foreach ( $ticket->price_modifiers() as $price_mod ) { ?>
+														foreach ($ticket->price_modifiers() as $price_mod) { ?>
 													<tr>
-														<td data-th="<?php _e( 'Name', 'event_espresso' ); ?>" class="jst-rght small-text"><?php echo $price_mod->name(); ?></td>
-													<?php if ( $price_mod->is_percent() ) { ?>
-														<td data-th="<?php _e( 'Description', 'event_espresso' ); ?>" class="small-text"><?php echo $price_mod->desc(); ?> <?php echo $price_mod->amount(); ?>%</td>
+														<td data-th="<?php _e('Name', 'event_espresso'); ?>" class="jst-rght small-text"><?php echo $price_mod->name(); ?></td>
+													<?php if ($price_mod->is_percent()) { ?>
+														<td data-th="<?php _e('Description', 'event_espresso'); ?>" class="small-text"><?php echo $price_mod->desc(); ?> <?php echo $price_mod->amount(); ?>%</td>
 														<?php
-															$new_sub_total = $running_total * ( $price_mod->amount() / 100 );
+															$new_sub_total = $running_total * ($price_mod->amount() / 100);
 															$new_sub_total = $price_mod->is_discount() ? $new_sub_total * -1 : $new_sub_total;
 														?>
 													<?php } else { ?>
 														<?php $new_sub_total = $price_mod->is_discount() ? $price_mod->amount() * -1 : $price_mod->amount(); ?>
-														<td data-th="<?php _e( 'Description', 'event_espresso' ); ?>" class="small-text"><?php echo $price_mod->desc(); ?></td>
+														<td data-th="<?php _e('Description', 'event_espresso'); ?>" class="small-text"><?php echo $price_mod->desc(); ?></td>
 														<?php $new_sub_total = $price_mod->is_discount() ? $price_mod->amount() * -1 : $price_mod->amount(); ?>
 													<?php } ?>
-														<td data-th="<?php _e( 'Amount', 'event_espresso' ); ?>" class="jst-rght small-text"><?php echo EEH_Template::format_currency( $new_sub_total ); ?></td>
+														<td data-th="<?php _e('Amount', 'event_espresso'); ?>" class="jst-rght small-text"><?php echo EEH_Template::format_currency($new_sub_total); ?></td>
 														<?php $running_total += $new_sub_total; ?>
 													</tr>
 												<?php } ?>
-												<?php if ( $ticket->taxable() ) { ?>
+												<?php if ($ticket->taxable()) { ?>
 													<?php //$ticket_subtotal =$ticket->get_ticket_subtotal(); ?>
 													<tr>
-														<td colspan="2" class="jst-rght small-text sbttl"><b><?php _e( 'subtotal', 'event_espresso' ); ?></b></td>
-														<td data-th="<?php _e( 'subtotal', 'event_espresso' ); ?>" class="jst-rght small-text"><b><?php echo  EEH_Template::format_currency( $running_total ); ?></b></td>
+														<td colspan="2" class="jst-rght small-text sbttl"><b><?php _e('subtotal', 'event_espresso'); ?></b></td>
+														<td data-th="<?php _e('subtotal', 'event_espresso'); ?>" class="jst-rght small-text"><b><?php echo  EEH_Template::format_currency($running_total); ?></b></td>
 													</tr>
 
-													<?php foreach ( $ticket->get_ticket_taxes_for_admin() as $tax ) { ?>
+													<?php foreach ($ticket->get_ticket_taxes_for_admin() as $tax) { ?>
 													<tr>
-														<td data-th="<?php _e( 'Name', 'event_espresso' ); ?>" class="jst-rght small-text"><?php echo $tax->name(); ?></td>
-														<td data-th="<?php _e( 'Description', 'event_espresso' ); ?>" class="jst-rght small-text"><?php echo $tax->amount(); ?>%</td>
-														<?php $tax_amount = $running_total * ( $tax->amount() / 100 ); ?>
-														<td data-th="<?php _e( 'Amount', 'event_espresso' ); ?>" class="jst-rght small-text"><?php echo EEH_Template::format_currency( $tax_amount ); ?></td>
+														<td data-th="<?php _e('Name', 'event_espresso'); ?>" class="jst-rght small-text"><?php echo $tax->name(); ?></td>
+														<td data-th="<?php _e('Description', 'event_espresso'); ?>" class="jst-rght small-text"><?php echo $tax->amount(); ?>%</td>
+														<?php $tax_amount = $running_total * ($tax->amount() / 100); ?>
+														<td data-th="<?php _e('Amount', 'event_espresso'); ?>" class="jst-rght small-text"><?php echo EEH_Template::format_currency($tax_amount); ?></td>
 														<?php $running_total += $tax_amount; ?>
 													</tr>
 													<?php } ?>
 												<?php } ?>
 													<tr>
-														<td colspan="2" class="jst-rght small-text ttl-lbl-td"><b><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_total_price', __( 'Total', 'event_espresso' )); ?></b></td>
-														<td data-th="<?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_total_price', __( 'Total', 'event_espresso' )); ?>" class="jst-rght small-text"><b><?php echo EEH_Template::format_currency( $running_total ); ?></b></td>
+														<td colspan="2" class="jst-rght small-text ttl-lbl-td"><b><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_total_price', __('Total', 'event_espresso')); ?></b></td>
+														<td data-th="<?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_total_price', __('Total', 'event_espresso')); ?>" class="jst-rght small-text"><b><?php echo EEH_Template::format_currency($running_total); ?></b></td>
 													</tr>
 												</tbody>
 											</table>
@@ -359,106 +359,106 @@ 
 									<?php } ?>
 
 									<section class="tckt-slctr-tkt-sale-dates-sctn">
-										<h5><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_sales_date_heading', __( 'Sale Dates', 'event_espresso' )); ?></h5>
-										<span class="drk-grey-text small-text no-bold"> - <?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_dates_available_message', __( 'The dates when this option is available for purchase.', 'event_espresso' )); ?></span><br/>
-										<span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_goes_on_sale', __( 'Goes On Sale:', 'event_espresso' )); ?></span><span class="dashicons dashicons-calendar"></span><?php echo $ticket->get_i18n_datetime( 'TKT_start_date', $date_format) . ' &nbsp; '; ?><span class="dashicons dashicons-clock"></span><?php echo $ticket->get_i18n_datetime( 'TKT_start_date',  $time_format ) ; ?><br/>
-										<span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_sales_end', __( 'Sales End:', 'event_espresso' )); ?></span><span class="dashicons dashicons-calendar"></span><?php echo $ticket->get_i18n_datetime( 'TKT_end_date', $date_format ) . ' &nbsp; '; ?><span class="dashicons dashicons-clock"></span><?php echo $ticket->get_i18n_datetime( 'TKT_end_date', $time_format ) ; ?><br/>
+										<h5><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_sales_date_heading', __('Sale Dates', 'event_espresso')); ?></h5>
+										<span class="drk-grey-text small-text no-bold"> - <?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_dates_available_message', __('The dates when this option is available for purchase.', 'event_espresso')); ?></span><br/>
+										<span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_goes_on_sale', __('Goes On Sale:', 'event_espresso')); ?></span><span class="dashicons dashicons-calendar"></span><?php echo $ticket->get_i18n_datetime('TKT_start_date', $date_format).' &nbsp; '; ?><span class="dashicons dashicons-clock"></span><?php echo $ticket->get_i18n_datetime('TKT_start_date', $time_format); ?><br/>
+										<span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_sales_end', __('Sales End:', 'event_espresso')); ?></span><span class="dashicons dashicons-calendar"></span><?php echo $ticket->get_i18n_datetime('TKT_end_date', $date_format).' &nbsp; '; ?><span class="dashicons dashicons-clock"></span><?php echo $ticket->get_i18n_datetime('TKT_end_date', $time_format); ?><br/>
 									</section>
 									<br/>
 
-									<?php do_action( 'AHEE__ticket_selector_chart_template__after_ticket_date', $ticket ); ?>
+									<?php do_action('AHEE__ticket_selector_chart_template__after_ticket_date', $ticket); ?>
 
-									<?php if ( $ticket->min() &&$ticket->max() ) { ?>
+									<?php if ($ticket->min() && $ticket->max()) { ?>
 									<section class="tckt-slctr-tkt-quantities-sctn">
-										<h5><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_heading', __( 'Purchasable Quantities', 'event_espresso' )); ?></h5>
-										<span class="drk-grey-text small-text no-bold"> - <?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_message', __( 'The number of tickets that can be purchased per transaction (if available).', 'event_espresso' )); ?></span><br/>
-										<span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_min_qty', __( 'Minimum Qty:', 'event_espresso' )); ?></span><?php echo $ticket->min() > 0 ? $ticket->min() : 0; ?>
-										<?php if ( $ticket->min() > $remaining ) { ?> &nbsp; <span class="important-notice small-text"><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_min_qty_message', __( 'The Minimum Quantity purchasable for this ticket exceeds the number of spaces remaining', 'event_espresso' )); ?></span><?php } ?><br/>
+										<h5><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_heading', __('Purchasable Quantities', 'event_espresso')); ?></h5>
+										<span class="drk-grey-text small-text no-bold"> - <?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_message', __('The number of tickets that can be purchased per transaction (if available).', 'event_espresso')); ?></span><br/>
+										<span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_min_qty', __('Minimum Qty:', 'event_espresso')); ?></span><?php echo $ticket->min() > 0 ? $ticket->min() : 0; ?>
+										<?php if ($ticket->min() > $remaining) { ?> &nbsp; <span class="important-notice small-text"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_min_qty_message', __('The Minimum Quantity purchasable for this ticket exceeds the number of spaces remaining', 'event_espresso')); ?></span><?php } ?><br/>
 										<?php //$max = min( $max, $max_atndz );?>
-										<span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_max_qty', __( 'Maximum Qty:', 'event_espresso' )); ?></span><?php echo $ticket->max() === EE_INF ? __( 'no limit', 'event_espresso' ) : max( $ticket->max(), 1 ); ?><br/>
+										<span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_max_qty', __('Maximum Qty:', 'event_espresso')); ?></span><?php echo $ticket->max() === EE_INF ? __('no limit', 'event_espresso') : max($ticket->max(), 1); ?><br/>
 									</section>
 									<br/>
 									<?php } ?>
 
-									<?php if ( $ticket->uses() !== EE_INF && ( ! defined( 'EE_DECAF' ) || EE_DECAF !== TRUE )) { ?>
+									<?php if ($ticket->uses() !== EE_INF && ( ! defined('EE_DECAF') || EE_DECAF !== TRUE)) { ?>
 									<section class="tckt-slctr-tkt-uses-sctn">
-										<h5><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_event_date_ticket_uses_heading', __( 'Event Date Ticket Uses', 'event_espresso' )); ?></h5>
+										<h5><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_date_ticket_uses_heading', __('Event Date Ticket Uses', 'event_espresso')); ?></h5>
 										<span class="drk-grey-text small-text no-bold"> - <?php
 											echo apply_filters(
 												'FHEE__ticket_selector_chart_template__ticket_details_event_date_ticket_uses_message',
 												sprintf(
-													__( 'The number of separate event datetimes (see table below) that this ticket can be used to gain admittance to.%1$s%2$sAdmission is always one person per ticket.%3$s', 'event_espresso' ),
+													__('The number of separate event datetimes (see table below) that this ticket can be used to gain admittance to.%1$s%2$sAdmission is always one person per ticket.%3$s', 'event_espresso'),
 													'<br/>',
 													'<strong>',
 													'</strong>'
 												)
 											);
 											?></span><br/>
-										<span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_event_date_number_datetimes', __( '# Datetimes:', 'event_espresso' )); ?></span><?php  echo $ticket->uses();?><br/>
+										<span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_date_number_datetimes', __('# Datetimes:', 'event_espresso')); ?></span><?php  echo $ticket->uses(); ?><br/>
 									</section>
 									<?php } ?>
 
 									<?php
-									$datetimes = $ticket->datetimes_ordered( $event_is_expired, FALSE );
+									$datetimes = $ticket->datetimes_ordered($event_is_expired, FALSE);
 									$chart_column_width = $template_settings->show_ticket_sale_columns ? ' ee-fourth-width' : ' ee-half-width';
-									if ( ! empty( $datetimes )) { ?>
+									if ( ! empty($datetimes)) { ?>
 									<section class="tckt-slctr-tkt-datetimes-sctn">
-										<h5><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_event_access_heading', __( 'Access', 'event_espresso' )); ?></h5>
-										<span class="drk-grey-text small-text no-bold"> - <?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_event_access_message', __( 'This option allows access to the following dates and times.', 'event_espresso' )); ?></span>
+										<h5><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_access_heading', __('Access', 'event_espresso')); ?></h5>
+										<span class="drk-grey-text small-text no-bold"> - <?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_access_message', __('This option allows access to the following dates and times.', 'event_espresso')); ?></span>
 										<div class="tckt-slctr-tkt-details-tbl-wrap-dv">
 											<table class="tckt-slctr-tkt-details-tbl">
 												<thead>
 													<tr>
 														<th class="tckt-slctr-tkt-details-date-th">
-															<span class="dashicons dashicons-calendar"></span><span class="small-text"><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_event_date', __( 'Date ', 'event_espresso' )); ?></span>
+															<span class="dashicons dashicons-calendar"></span><span class="small-text"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_access_table_event_date', __('Date ', 'event_espresso')); ?></span>
 														</th>
 														<th class="tckt-slctr-tkt-details-time-th <?php echo $chart_column_width; ?>">
-															<span class="dashicons dashicons-clock"></span><span class="small-text"><?php _e( 'Time ', 'event_espresso' ); ?></span>
+															<span class="dashicons dashicons-clock"></span><span class="small-text"><?php _e('Time ', 'event_espresso'); ?></span>
 														</th>
-														<?php if ( $template_settings->show_ticket_sale_columns ) : ?>
+														<?php if ($template_settings->show_ticket_sale_columns) : ?>
 															<th class="tckt-slctr-tkt-details-this-ticket-sold-th ee-fourth-width cntr">
-																<span class="smaller-text"><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_sold', sprintf( __( 'Sold', 'event_espresso' ), '<br/>' )); ?></span>
+																<span class="smaller-text"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_sold', sprintf(__('Sold', 'event_espresso'), '<br/>')); ?></span>
 															</th>
 															<th class="tckt-slctr-tkt-details-this-ticket-left-th ee-fourth-width cntr">
-																<span class="smaller-text"><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_left', sprintf( __( 'Remaining', 'event_espresso' ), '<br/>' )); ?></span>
+																<span class="smaller-text"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_left', sprintf(__('Remaining', 'event_espresso'), '<br/>')); ?></span>
 															</th>
 															<th class="tckt-slctr-tkt-details-total-tickets-sold-th ee-fourth-width cntr">
-																<span class="smaller-text"><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_sold', sprintf( __( 'Total%sSold', 'event_espresso' ), '<br/>' )); ?></span>
+																<span class="smaller-text"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_sold', sprintf(__('Total%sSold', 'event_espresso'), '<br/>')); ?></span>
 															</th>
 															<th class="tckt-slctr-tkt-details-total-tickets-left-th ee-fourth-width cntr">
-																<span class="smaller-text"><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_left', sprintf( __( 'Total Spaces%sLeft', 'event_espresso' ), '<br/>' )); ?></span>
+																<span class="smaller-text"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_left', sprintf(__('Total Spaces%sLeft', 'event_espresso'), '<br/>')); ?></span>
 															</th>
 														<?php endif; //end $template_settings->show_ticket_sale_columns conditional ?>
 													</tr>
 												</thead>
 												<tbody>
 											<?php
-												foreach ( $datetimes as $datetime ) {
-													if ( $datetime instanceof EE_Datetime ) {
+												foreach ($datetimes as $datetime) {
+													if ($datetime instanceof EE_Datetime) {
 											?>
 
 												<tr>
-													<td data-th="<?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_event_date', __( 'Event Date ', 'event_espresso' )); ?>" class="small-text">
+													<td data-th="<?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_access_table_event_date', __('Event Date ', 'event_espresso')); ?>" class="small-text">
 														<?php $datetime_name = $datetime->name(); ?>
-														<?php echo ! empty( $datetime_name ) ? '<b>' . $datetime_name . '</b><br/>' : ''; ?>
-														<?php echo $datetime->date_range( $date_format, __( ' to  ', 'event_espresso' )); ?>
+														<?php echo ! empty($datetime_name) ? '<b>'.$datetime_name.'</b><br/>' : ''; ?>
+														<?php echo $datetime->date_range($date_format, __(' to  ', 'event_espresso')); ?>
 													</td>
-													<td data-th="<?php _e( 'Time ', 'event_espresso' ); ?>" class="cntr small-text">
-														<?php echo $datetime->time_range( $time_format, __( ' to  ', 'event_espresso' )); ?>
+													<td data-th="<?php _e('Time ', 'event_espresso'); ?>" class="cntr small-text">
+														<?php echo $datetime->time_range($time_format, __(' to  ', 'event_espresso')); ?>
 													</td>
-													<?php if ( $template_settings->show_ticket_sale_columns ) : ?>
-														<td data-th="<?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_sold', __( 'Sold', 'event_espresso' )); ?>" class="cntr small-text">
+													<?php if ($template_settings->show_ticket_sale_columns) : ?>
+														<td data-th="<?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_sold', __('Sold', 'event_espresso')); ?>" class="cntr small-text">
 															<?php echo $ticket->sold(); ?>
 														</td>
-														<td data-th="<?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_left', __( 'Remaining', 'event_espresso' )); ?>" class="cntr small-text">
-															<?php echo $ticket->qty() === EE_INF ? '<span class="smaller-text">' .  __( 'unlimited ', 'event_espresso' ) . '</span>' : $ticket->qty() - $ticket->sold(); ?>
+														<td data-th="<?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_left', __('Remaining', 'event_espresso')); ?>" class="cntr small-text">
+															<?php echo $ticket->qty() === EE_INF ? '<span class="smaller-text">'.__('unlimited ', 'event_espresso').'</span>' : $ticket->qty() - $ticket->sold(); ?>
 														</td>
-														<td data-th="<?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_sold', __( 'Total Sold', 'event_espresso' )); ?>" class="cntr small-text">
+														<td data-th="<?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_sold', __('Total Sold', 'event_espresso')); ?>" class="cntr small-text">
 															<?php echo $datetime->sold(); ?>
 														</td>
-												<?php $tkts_left = $datetime->sold_out() ? '<span class="sold-out smaller-text">' . __( 'Sold&nbsp;Out', 'event_espresso' ) . '</span>' : $datetime->spaces_remaining(); ?>
-														<td data-th="<?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_left', __( 'Total Spaces Left', 'event_espresso' )); ?>" class="cntr small-text">
-															<?php echo $tkts_left === EE_INF ? '<span class="smaller-text">' .  __( 'unlimited ', 'event_espresso' ) . '</span>' : $tkts_left; ?>
+												<?php $tkts_left = $datetime->sold_out() ? '<span class="sold-out smaller-text">'.__('Sold&nbsp;Out', 'event_espresso').'</span>' : $datetime->spaces_remaining(); ?>
+														<td data-th="<?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_left', __('Total Spaces Left', 'event_espresso')); ?>" class="cntr small-text">
+															<?php echo $tkts_left === EE_INF ? '<span class="smaller-text">'.__('unlimited ', 'event_espresso').'</span>' : $tkts_left; ?>
 														</td>
 													<?php endif; //end $template_settings->show_ticket_sale_columns conditional ?>
 												</tr>
@@ -476,7 +476,7 @@ 
 							</div>
 						</td>
 					</tr>
-				<?php endif;  //end template_settings->show_ticket_details check?>
+				<?php endif; //end template_settings->show_ticket_details check?>
 	<?php
 			$row++;
 		}
@@ -485,8 +485,8 @@ 
 $ticket_row_html = ob_get_clean();
 // if there is only ONE ticket with a max qty of ONE, and it is free... then not much need for the ticket selector
 $hide_ticket_selector = $ticket_count === 1 && $max_atndz === 1 && $ticket->is_free() ? true : false;
-$hide_ticket_selector = apply_filters( 'FHEE__ticket_selector_chart_template__hide_ticket_selector', $hide_ticket_selector, $EVT_ID );
-remove_all_filters( 'FHEE__EE_Ticket_Selector__hide_ticket_selector' );
+$hide_ticket_selector = apply_filters('FHEE__ticket_selector_chart_template__hide_ticket_selector', $hide_ticket_selector, $EVT_ID);
+remove_all_filters('FHEE__EE_Ticket_Selector__hide_ticket_selector');
 // EEH_Debug_Tools::printr( apply_filters( 'FHEE__EE_Ticket_Selector__display_ticket_selector_submit', false ), 'display submit', __FILE__, __LINE__ );
 // EEH_Debug_Tools::printr( (string) $ticket_count, '$ticket_count', __FILE__, __LINE__ );
 // EEH_Debug_Tools::printr( (string) $max, '$max', __FILE__, __LINE__ );
@@ -500,20 +500,20 @@ 
 * @param string '#tkt-slctr-tbl-' . $EVT_ID The html ID to anchor to
 * @param int $EVT_ID The Event ID
 */
-$anchor_id = apply_filters( 'FHEE__EE_Ticket_Selector__redirect_anchor_id', '#tkt-slctr-tbl-' . $EVT_ID, $EVT_ID );
-if ( ! $hide_ticket_selector ) {
+$anchor_id = apply_filters('FHEE__EE_Ticket_Selector__redirect_anchor_id', '#tkt-slctr-tbl-'.$EVT_ID, $EVT_ID);
+if ( ! $hide_ticket_selector) {
 ?>
 <div id="tkt-slctr-tbl-wrap-dv-<?php echo $EVT_ID; ?>" class="tkt-slctr-tbl-wrap-dv">
 
-	<?php do_action( 'AHEE__ticket_selector_chart__template__before_ticket_selector', $event ); ?>
+	<?php do_action('AHEE__ticket_selector_chart__template__before_ticket_selector', $event); ?>
 
 	<table id="tkt-slctr-tbl-<?php echo $EVT_ID; ?>" class="tkt-slctr-tbl">
 		<thead>
 			<tr>
 				<th scope="col" class="ee-ticket-selector-ticket-details-th">
-					<?php echo esc_html( apply_filters( 'FHEE__ticket_selector_chart_template__table_header_available_tickets', '', $EVT_ID ) ); ?>
+					<?php echo esc_html(apply_filters('FHEE__ticket_selector_chart_template__table_header_available_tickets', '', $EVT_ID)); ?>
 				</th>
-				<?php if ( apply_filters( 'FHEE__ticket_selector_chart_template__display_ticket_price_details', TRUE ) ) { ?>
+				<?php if (apply_filters('FHEE__ticket_selector_chart_template__display_ticket_price_details', TRUE)) { ?>
 				<th scope="col" class="ee-ticket-selector-ticket-price-th cntr">
 					<?php
 						/**
@@ -524,7 +524,7 @@ 
 						 * @param string 'Price' The translatable text to display in the table header for price
 						 * @param int $EVT_ID The Event ID
 						 */
-						echo esc_html( apply_filters( 'FHEE__ticket_selector_chart_template__table_header_price', __( 'Price', 'event_espresso' ), $EVT_ID ) );
+						echo esc_html(apply_filters('FHEE__ticket_selector_chart_template__table_header_price', __('Price', 'event_espresso'), $EVT_ID));
 					?>
 				</th>
 				<?php } ?>
@@ -538,77 +538,77 @@ 
 						* @param string 'Qty*' The translatable text to display in the table header for the Quantity of tickets
 						* @param int $EVT_ID The Event ID
 						*/
-						echo esc_html( apply_filters( 'FHEE__ticket_selector_chart_template__table_header_qty', __( 'Qty*', 'event_espresso' ), $EVT_ID ) );
+						echo esc_html(apply_filters('FHEE__ticket_selector_chart_template__table_header_qty', __('Qty*', 'event_espresso'), $EVT_ID));
 					?>
 				</th>
 			</tr>
 		</thead>
 		<tbody>
-			<?php echo $ticket_row_html;?>
+			<?php echo $ticket_row_html; ?>
 		</tbody>
 	</table>
 	<?php
-	if ( $taxable_tickets && apply_filters( 'FHEE__ticket_selector_chart_template__display_ticket_price_details', true ) ) {
-		if ( $tax_settings->prices_displayed_including_taxes ) {
-			$ticket_price_includes_taxes = __( '* price includes taxes', 'event_espresso' );
+	if ($taxable_tickets && apply_filters('FHEE__ticket_selector_chart_template__display_ticket_price_details', true)) {
+		if ($tax_settings->prices_displayed_including_taxes) {
+			$ticket_price_includes_taxes = __('* price includes taxes', 'event_espresso');
 		} else {
-			$ticket_price_includes_taxes = __( '* price does not include taxes', 'event_espresso' );
+			$ticket_price_includes_taxes = __('* price does not include taxes', 'event_espresso');
 		}
-		echo '<p class="small-text lt-grey-text" style="text-align:right; margin: -1em 0 1em;">' . $ticket_price_includes_taxes . '</p>';
+		echo '<p class="small-text lt-grey-text" style="text-align:right; margin: -1em 0 1em;">'.$ticket_price_includes_taxes.'</p>';
 	}
 	?>
 
 	<input type="hidden" name="noheader" value="true" />
-	<input type="hidden" name="tkt-slctr-return-url-<?php echo $EVT_ID ?>" value="<?php echo EEH_URL::filter_input_server_url() . $anchor_id; ?>" />
+	<input type="hidden" name="tkt-slctr-return-url-<?php echo $EVT_ID ?>" value="<?php echo EEH_URL::filter_input_server_url().$anchor_id; ?>" />
 	<input type="hidden" name="tkt-slctr-rows-<?php echo $EVT_ID; ?>" value="<?php echo $row - 1; ?>" />
 	<input type="hidden" name="tkt-slctr-max-atndz-<?php echo $EVT_ID; ?>" value="<?php echo $max_atndz; ?>" />
 	<input type="hidden" name="tkt-slctr-event-id" value="<?php echo $EVT_ID; ?>" />
 
 <?php
-if ( $max_atndz > 0 ) {
+if ($max_atndz > 0) {
 	echo apply_filters(
 		'FHEE__ticket_selector_chart_template__maximum_tickets_purchased_footnote',
 		''
 	);
 }
-if ( ! apply_filters( 'FHEE__EE_Ticket_Selector__display_ticket_selector_submit', false ) ) {
-	add_filter( 'FHEE__EE_Ticket_Selector__no_ticket_selector_submit', '__return_true' );
+if ( ! apply_filters('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', false)) {
+	add_filter('FHEE__EE_Ticket_Selector__no_ticket_selector_submit', '__return_true');
 }
-do_action( 'AHEE__ticket_selector_chart__template__after_ticket_selector', $EVT_ID, $event );
+do_action('AHEE__ticket_selector_chart__template__after_ticket_selector', $EVT_ID, $event);
 ?>
 
 <?php
-} else if ( isset( $TKT_ID ) ) {
-	add_filter( 'FHEE__EE_Ticket_Selector__hide_ticket_selector', '__return_true' );
+} else if (isset($TKT_ID)) {
+	add_filter('FHEE__EE_Ticket_Selector__hide_ticket_selector', '__return_true');
 ?>
 
 <input type="hidden" name="tkt-slctr-qty-<?php echo $EVT_ID; ?>[]" value="1"/>
 <input type="hidden" name="tkt-slctr-ticket-id-<?php echo $EVT_ID; ?>[]" value="<?php echo $TKT_ID; ?>"/>
 <input type="hidden" name="noheader" value="true"/>
-<input type="hidden" name="tkt-slctr-return-url-<?php echo $EVT_ID ?>" value="<?php echo EEH_URL::filter_input_server_url() . $anchor_id; ?>"/>
+<input type="hidden" name="tkt-slctr-return-url-<?php echo $EVT_ID ?>" value="<?php echo EEH_URL::filter_input_server_url().$anchor_id; ?>"/>
 <input type="hidden" name="tkt-slctr-rows-<?php echo $EVT_ID; ?>" value="<?php echo $row - 1; ?>"/>
 <input type="hidden" name="tkt-slctr-max-atndz-<?php echo $EVT_ID; ?>" value="<?php echo $max_atndz; ?>"/>
 <input type="hidden" name="tkt-slctr-event-id" value="<?php echo $EVT_ID; ?>"/>
 <?php
-	if ( $ticket instanceof EE_Ticket ) {
-		do_action( 'AHEE__ticket_selector_chart__template__before_ticket_selector', $event );
+	if ($ticket instanceof EE_Ticket) {
+		do_action('AHEE__ticket_selector_chart__template__before_ticket_selector', $event);
 		$ticket_description = $ticket->description();
-		$ticket_description .= ! empty( $ticket_description )
-			? '<br />' . $ticket_status_display
+		$ticket_description .= ! empty($ticket_description)
+			? '<br />'.$ticket_status_display
 			: $ticket_status_display;
-		if ( ! strpos( $ticket_description, '<div' ) ) {
+		if ( ! strpos($ticket_description, '<div')) {
 			$ticket_description = "<p>{$ticket_description}</p>";
 		}
 ?>
 <div id="no-tkt-slctr-ticket-dv-<?php echo $EVT_ID; ?>" class="no-tkt-slctr-ticket-dv">
 	<div class="no-tkt-slctr-ticket-content-dv">
 		<h5><?php echo $ticket->name(); ?></h5>
-		<?php if ( ! empty( $ticket_description ) ) { ?>
+		<?php if ( ! empty($ticket_description)) { ?>
 		<?php echo $ticket_description; ?>
 		<?php } ?>
 	</div>
 <?php
-		do_action( 'AHEE__ticket_selector_chart__template__after_ticket_selector', $EVT_ID, $event );
+		do_action('AHEE__ticket_selector_chart__template__after_ticket_selector', $EVT_ID, $event);
 	}
 }
 ?>

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

Indentation +41 added lines, -41 removed lines

@@ -466,38 +466,38 @@ 
 	 * @throws \EE_Error
 	 */
 	public static function find_registrations_that_lost_their_space( array $registrations, $revisit = false ) {
-        // registrations per event
+		// registrations per event
 		$event_reg_count = array();
 		// spaces left per event
 		$event_spaces_remaining = array();
-        // tickets left sorted by ID
-        $tickets_remaining = array();
-        // registrations that have lost their space
+		// tickets left sorted by ID
+		$tickets_remaining = array();
+		// registrations that have lost their space
 		$ejected_registrations = array();
 		foreach ( $registrations as $REG_ID => $registration ) {
 			if ( $registration->status_ID() === EEM_Registration::status_id_approved ) {
 				continue;
 			}
 			$EVT_ID = $registration->event_ID();
-            $ticket = $registration->ticket();
-            if ( ! isset($tickets_remaining[$ticket->ID()])) {
-                $tickets_remaining[$ticket->ID()] = $ticket->remaining();
-            }
-            if ($tickets_remaining[$ticket->ID()] > 0) {
-                if ( ! isset($event_reg_count[$EVT_ID])) {
-                    $event_reg_count[$EVT_ID] = 0;
-                }
-                $event_reg_count[$EVT_ID]++;
-                if ( ! isset($event_spaces_remaining[$EVT_ID])) {
-                    $event_spaces_remaining[$EVT_ID] = $registration->event()->spaces_remaining_for_sale();
-                }
-            }
+			$ticket = $registration->ticket();
+			if ( ! isset($tickets_remaining[$ticket->ID()])) {
+				$tickets_remaining[$ticket->ID()] = $ticket->remaining();
+			}
+			if ($tickets_remaining[$ticket->ID()] > 0) {
+				if ( ! isset($event_reg_count[$EVT_ID])) {
+					$event_reg_count[$EVT_ID] = 0;
+				}
+				$event_reg_count[$EVT_ID]++;
+				if ( ! isset($event_spaces_remaining[$EVT_ID])) {
+					$event_spaces_remaining[$EVT_ID] = $registration->event()->spaces_remaining_for_sale();
+				}
+			}
 			if (
 				$revisit
 				&& (
-                    $tickets_remaining[$ticket->ID()] === 0
-				    || $event_reg_count[ $EVT_ID ] > $event_spaces_remaining[ $EVT_ID ]
-                )
+					$tickets_remaining[$ticket->ID()] === 0
+					|| $event_reg_count[ $EVT_ID ] > $event_spaces_remaining[ $EVT_ID ]
+				)
 			) {
 				$ejected_registrations[ $REG_ID ] = $registration->event();
 				if ( $registration->status_ID() !== EEM_Registration::status_id_wait_list ) {
@@ -572,9 +572,9 @@ 
 				'layout_strategy' => new EE_Template_Layout(
 					array(
 						'layout_template_file' => SPCO_REG_STEPS_PATH
-						                          . $this->_slug
-						                          . DS
-						                          . 'sold_out_events.template.php',
+												  . $this->_slug
+												  . DS
+												  . 'sold_out_events.template.php',
 						'template_args'        => apply_filters(
 							'FHEE__EE_SPCO_Reg_Step_Payment_Options___sold_out_events__template_args',
 							array(
@@ -625,9 +625,9 @@ 
 				'layout_strategy' => new EE_Template_Layout(
 					array(
 						'layout_template_file' => SPCO_REG_STEPS_PATH
-						                          . $this->_slug
-						                          . DS
-						                          . 'sold_out_events.template.php',
+												  . $this->_slug
+												  . DS
+												  . 'sold_out_events.template.php',
 						'template_args'        => apply_filters(
 							'FHEE__EE_SPCO_Reg_Step_Payment_Options___insufficient_spaces_available__template_args',
 							array(
@@ -679,9 +679,9 @@ 
 				'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
+												  . $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(
@@ -723,9 +723,9 @@ 
 				'layout_strategy' => new EE_Template_Layout(
 					array(
 						'layout_template_file' => SPCO_REG_STEPS_PATH
-						                          . $this->_slug
-						                          . DS
-						                          . 'no_payment_required.template.php', // layout_template
+												  . $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(
@@ -955,7 +955,7 @@ 
 					$available_payment_method_options[ $payment_method->slug() ] = $payment_method_button;
 				}
 				$payment_methods_billing_info[ $payment_method->slug()
-				                               . '-info' ] = $this->_payment_method_billing_info(
+											   . '-info' ] = $this->_payment_method_billing_info(
 					$payment_method
 				);
 			}
@@ -1143,7 +1143,7 @@ 
 		// fill form with attendee info if applicable
 		if (
 			$payment_method_billing_form instanceof EE_Billing_Attendee_Info_Form
-		    && $this->checkout->transaction_has_primary_registrant()
+			&& $this->checkout->transaction_has_primary_registrant()
 		) {
 			$payment_method_billing_form->populate_from_attendee(
 				$this->checkout->transaction->primary_registration()->attendee()
@@ -1152,7 +1152,7 @@ 
 		// and debug content
 		if (
 			$payment_method_billing_form instanceof EE_Billing_Info_Form
-		    && $this->checkout->payment_method->type_obj() instanceof EE_PMT_Base
+			&& $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
@@ -1327,7 +1327,7 @@ 
 		}
 		// 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->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
@@ -1461,8 +1461,8 @@ 
 		}
 		// 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'] )
+			 && ! empty( $attendee_data['ATT_lname'] )
+			 && ! empty( $attendee_data['ATT_email'] )
 		) {
 			$existing_attendee = EE_Registry::instance()->LIB->EEM_Attendee->find_existing_attendee(
 				array(
@@ -1702,7 +1702,7 @@ 
 			$payment_status = $payment->status();
 			if (
 				$payment_status === EEM_Payment::status_id_approved
-			    || $payment_status === EEM_Payment::status_id_pending
+				|| $payment_status === EEM_Payment::status_id_pending
 			) {
 				return true;
 			} else {
@@ -1888,8 +1888,8 @@ 
 			return false;
 		}
 		if ( ! $primary_registration->_add_relation_to( $this->checkout->primary_attendee_obj, 'Attendee' )
-		       instanceof
-		       EE_Attendee
+			   instanceof
+			   EE_Attendee
 		) {
 			EE_Error::add_error(
 				sprintf(

Spacing +347 added lines, -347 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');
 }
 
 
@@ -38,32 +38,32 @@ 
 	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' )
+			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' )
+			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' )
+			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_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' )
+			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' )
+			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' )
+			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' ),
+			array('EE_SPCO_Reg_Step_Payment_Options', 'bypass_recaptcha_for_load_payment_method'),
 			10,
 			1
 		);
@@ -77,7 +77,7 @@ 
 	 * @throws \EE_Error
 	 */
 	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');
 	}
 
 
@@ -88,7 +88,7 @@ 
 	 * @throws \EE_Error
 	 */
 	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');
 	}
 
 
@@ -99,7 +99,7 @@ 
 	 * @throws \EE_Error
 	 */
 	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');
 	}
 
 
@@ -126,10 +126,10 @@ 
 	 * @access    public
 	 * @param    EE_Checkout $checkout
 	 */
-	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->_name = __('Payment Options', 'event_espresso');
+		$this->_template = SPCO_REG_STEPS_PATH.$this->_slug.DS.'payment_options_main.template.php';
 		$this->checkout = $checkout;
 		$this->_reset_success_message();
 		$this->set_instructions(
@@ -154,7 +154,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;
 	}
 
@@ -172,8 +172,8 @@ 
 	/**
 	 * @param boolean $handle_IPN_in_this_request
 	 */
-	public function set_handle_IPN_in_this_request( $handle_IPN_in_this_request ) {
-		$this->handle_IPN_in_this_request = filter_var( $handle_IPN_in_this_request, FILTER_VALIDATE_BOOLEAN );
+	public function set_handle_IPN_in_this_request($handle_IPN_in_this_request) {
+		$this->handle_IPN_in_this_request = filter_var($handle_IPN_in_this_request, FILTER_VALIDATE_BOOLEAN);
 	}
 
 
@@ -208,14 +208,14 @@ 
 	public function enqueue_styles_and_scripts() {
 		$transaction = $this->checkout->transaction;
 		//if the transaction isn't set or nothing is owed on it, don't enqueue any JS
-		if( ! $transaction instanceof EE_Transaction || EEH_Money::compare_floats( $transaction->remaining(), 0 ) ) {
+		if ( ! $transaction instanceof EE_Transaction || EEH_Money::compare_floats($transaction->remaining(), 0)) {
 			return;
 		}
-		foreach( EEM_Payment_Method::instance()->get_all_for_transaction( $transaction, EEM_Payment_Method::scope_cart ) as $payment_method ) {
+		foreach (EEM_Payment_Method::instance()->get_all_for_transaction($transaction, EEM_Payment_Method::scope_cart) as $payment_method) {
 			$type_obj = $payment_method->type_obj();
-			if( $type_obj instanceof EE_PMT_Base ) {
-				$billing_form = $type_obj->generate_new_billing_form( $transaction );
-				if( $billing_form instanceof EE_Form_Section_Proper ) {
+			if ($type_obj instanceof EE_PMT_Base) {
+				$billing_form = $type_obj->generate_new_billing_form($transaction);
+				if ($billing_form instanceof EE_Form_Section_Proper) {
 					$billing_form->enqueue_js();
 				}
 			}
@@ -240,20 +240,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,
@@ -280,15 +280,15 @@ 
 		$insufficient_spaces_available = array();
 		$reg_count = 0;
 		// loop thru registrations to gather info
-		$registrations = $this->checkout->transaction->registrations( $this->checkout->reg_cache_where_params );
+		$registrations = $this->checkout->transaction->registrations($this->checkout->reg_cache_where_params);
 		$ejected_registrations = EE_SPCO_Reg_Step_Payment_Options::find_registrations_that_lost_their_space(
 			$registrations,
 			$this->checkout->revisit
 		);
-		foreach ( $registrations as $REG_ID => $registration ) {
+		foreach ($registrations as $REG_ID => $registration) {
 			// has this registration lost it's space ?
-			if ( isset( $ejected_registrations[ $REG_ID ] ) ) {
-				$insufficient_spaces_available[ $registration->event()->ID() ] = $registration->event();
+			if (isset($ejected_registrations[$REG_ID])) {
+				$insufficient_spaces_available[$registration->event()->ID()] = $registration->event();
 				continue;
 			}
 			/** @var $registration EE_Registration */
@@ -300,9 +300,9 @@ 
 				&& $registration->status_ID() === EEM_Registration::status_id_approved
 			)
 			) {
-				if ( $registration->event()->is_sold_out() || $registration->event()->is_sold_out( true ) ) {
+				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(),
@@ -311,9 +311,9 @@ 
 					continue;
 				}
 				// 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[ $REG_ID ] = $registration;
+					$registrations_requiring_pre_approval[$REG_ID] = $registration;
 					do_action(
 						'AHEE__EE_SPCO_Reg_Step_Payment_Options__generate_reg_form__event_requires_pre_approval',
 						$registration->event(),
@@ -322,8 +322,8 @@ 
 				}
 			}
 			// are they allowed to pay now and is there monies owing?
-			if ( $registration->owes_monies_and_can_pay() ) {
-				$registrations_requiring_payment[ $REG_ID ] = $registration;
+			if ($registration->owes_monies_and_can_pay()) {
+				$registrations_requiring_payment[$REG_ID] = $registration;
 				do_action(
 					'AHEE__EE_SPCO_Reg_Step_Payment_Options__generate_reg_form__event_requires_payment',
 					$registration->event(),
@@ -334,29 +334,29 @@ 
 				&& $registration->status_ID() !== EEM_Registration::status_id_not_approved
 				&& $registration->ticket()->is_free()
 			) {
-				$registrations_for_free_events[ $registration->event()->ID() ] = $registration;
+				$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( $insufficient_spaces_available ) ) {
+		if ( ! empty($insufficient_spaces_available)) {
 			$subsections['insufficient_space'] = $this->_insufficient_spaces_available(
 				$insufficient_spaces_available
 			);
 		}
-		if ( ! empty( $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 ( $this->checkout->amount_owing > 0 ) {
+		if ( ! empty($registrations_requiring_payment)) {
+			if ($this->checkout->amount_owing > 0) {
 				// autoload Line_Item_Display classes
 				EEH_Autoloader::register_line_item_filter_autoloaders();
 				$line_item_filter_processor = new EE_Line_Item_Filter_Processor(
@@ -369,15 +369,15 @@ 
 				/** @var EE_Line_Item $filtered_line_item_tree */
 				$filtered_line_item_tree = $line_item_filter_processor->process();
 				EEH_Autoloader::register_line_item_display_autoloaders();
-				$this->set_line_item_display( new EE_Line_Item_Display( 'spco' ) );
+				$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();
@@ -408,7 +408,7 @@ 
 	 * @return \EE_Line_Item_Filter_Collection
 	 * @throws \EE_Error
 	 */
-	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_SPCO_Reg_Step_Payment_Options::remove_ejected_registrations(
@@ -418,7 +418,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;
 	}
 
@@ -434,15 +434,15 @@ 
 	 * @return \EE_Registration[]
 	 * @throws \EE_Error
 	 */
-	public static function remove_ejected_registrations( array $registrations ) {
+	public static function remove_ejected_registrations(array $registrations) {
 		$ejected_registrations = EE_SPCO_Reg_Step_Payment_Options::find_registrations_that_lost_their_space(
 			$registrations,
 			EE_Registry::instance()->SSN->checkout()->revisit
 		);
-		foreach ( $registrations as $REG_ID => $registration ) {
+		foreach ($registrations as $REG_ID => $registration) {
 			// has this registration lost it's space ?
-			if ( isset( $ejected_registrations[ $REG_ID ] ) ) {
-				unset( $registrations[ $REG_ID ] );
+			if (isset($ejected_registrations[$REG_ID])) {
+				unset($registrations[$REG_ID]);
 				continue;
 			}
 		}
@@ -465,7 +465,7 @@ 
 	 * @return array
 	 * @throws \EE_Error
 	 */
-	public static function find_registrations_that_lost_their_space( array $registrations, $revisit = false ) {
+	public static function find_registrations_that_lost_their_space(array $registrations, $revisit = false) {
         // registrations per event
 		$event_reg_count = array();
 		// spaces left per event
@@ -474,8 +474,8 @@ 
         $tickets_remaining = array();
         // registrations that have lost their space
 		$ejected_registrations = array();
-		foreach ( $registrations as $REG_ID => $registration ) {
-			if ( $registration->status_ID() === EEM_Registration::status_id_approved ) {
+		foreach ($registrations as $REG_ID => $registration) {
+			if ($registration->status_ID() === EEM_Registration::status_id_approved) {
 				continue;
 			}
 			$EVT_ID = $registration->event_ID();
@@ -496,13 +496,13 @@ 
 				$revisit
 				&& (
                     $tickets_remaining[$ticket->ID()] === 0
-				    || $event_reg_count[ $EVT_ID ] > $event_spaces_remaining[ $EVT_ID ]
+				    || $event_reg_count[$EVT_ID] > $event_spaces_remaining[$EVT_ID]
                 )
 			) {
-				$ejected_registrations[ $REG_ID ] = $registration->event();
-				if ( $registration->status_ID() !== EEM_Registration::status_id_wait_list ) {
+				$ejected_registrations[$REG_ID] = $registration->event();
+				if ($registration->status_ID() !== EEM_Registration::status_id_wait_list) {
 					/** @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->manually_update_registration_status(
 						$registration,
@@ -537,8 +537,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');
 		}
 	}
 
@@ -552,13 +552,13 @@ 
 	 * @return \EE_Form_Section_Proper
 	 * @throws \EE_Error
 	 */
-	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 ) {
+		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' )
+				EEH_HTML::span('  '.$sold_out_event->name(), '', 'dashicons dashicons-marker ee-icon-size-16 pink-text')
 			);
 		}
 		return new EE_Form_Section_Proper(
@@ -605,14 +605,14 @@ 
 	 * @return \EE_Form_Section_Proper
 	 * @throws \EE_Error
 	 */
-	private function _insufficient_spaces_available( $insufficient_spaces_events_array = array() ) {
+	private function _insufficient_spaces_available($insufficient_spaces_events_array = array()) {
 		// set some defaults
 		$this->checkout->selected_method_of_payment = 'invoice';
 		$insufficient_space_events = '';
-		foreach ( $insufficient_spaces_events_array as $event ) {
-			if ( $event instanceof EE_Event ) {
+		foreach ($insufficient_spaces_events_array as $event) {
+			if ($event instanceof EE_Event) {
 				$insufficient_space_events .= EEH_HTML::li(
-					EEH_HTML::span( ' ' . $event->name(), '', 'dashicons dashicons-marker ee-icon-size-16 pink-text' )
+					EEH_HTML::span(' '.$event->name(), '', 'dashicons dashicons-marker ee-icon-size-16 pink-text')
 				);
 			}
 		}
@@ -656,17 +656,17 @@ 
 	 * @return \EE_Form_Section_Proper
 	 * @throws \EE_Error
 	 */
-	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(
+		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')
 				);
 			}
 		}
@@ -685,7 +685,7 @@ 
 						'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',
 									__(
@@ -710,7 +710,7 @@ 
 	 * @return \EE_Form_Section_Proper
 	 * @throws \EE_Error
 	 */
-	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
@@ -734,7 +734,7 @@ 
 								'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' )
+									__('This is a free event, so no billing will occur.', 'event_espresso')
 								)
 							)
 						),
@@ -753,7 +753,7 @@ 
 	 * @return \EE_Form_Section_Proper
 	 * @throws \EE_Error
 	 */
-	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
@@ -765,18 +765,18 @@ 
 						'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(
@@ -805,10 +805,10 @@ 
 	 * @return \EE_Form_Section_Proper
 	 * @throws \EE_Error
 	 */
-	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(
@@ -840,16 +840,16 @@ 
 	 * @access protected
 	 * @param array $registrations
 	 */
-	protected function _apply_registration_payments_to_amount_owing( array $registrations ) {
+	protected function _apply_registration_payments_to_amount_owing(array $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 += $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();
 				}
 			}
@@ -865,11 +865,11 @@ 
 	 * @param    bool $force_reset
 	 * @return    void
 	 */
-	private function _reset_selected_method_of_payment( $force_reset = false ) {
+	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 ) {
+			: 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;
@@ -888,12 +888,12 @@ 
 	 * @param string $selected_method_of_payment
 	 * @return  void
 	 */
-	private function _save_selected_method_of_payment( $selected_method_of_payment = '' ) {
-		$selected_method_of_payment = ! empty( $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 )
+			array('selected_method_of_payment' => $selected_method_of_payment)
 		);
 	}
 
@@ -909,19 +909,19 @@ 
 		// 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
+		$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' )
+				__('Please Select Your Method of Payment', 'event_espresso')
 			)
 			: apply_filters(
 				'FHEE__registration_page_payment_options__method_of_payment_hdr',
-				__( 'Method of Payment', 'event_espresso' )
+				__('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
@@ -930,32 +930,32 @@ 
 		// 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;' )
+				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 ) {
+		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-'.$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() )
+					($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_methods_billing_info[$payment_method->slug()
+				                               . '-info'] = $this->_payment_method_billing_info(
 					$payment_method
 				);
 			}
@@ -985,12 +985,12 @@ 
 	 * @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
@@ -998,9 +998,9 @@ 
 			$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;
+		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;
@@ -1015,14 +1015,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',
@@ -1047,28 +1047,28 @@ 
 	 * @return    \EE_Form_Section_Proper
 	 * @throws \EE_Error
 	 */
-	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 )
+			? $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' ),
+			__('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 ) {
+		} 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.',
@@ -1078,7 +1078,7 @@ 
 			);
 		} else {
 			$payment_method_info = sprintf(
-				__( 'Please click the "%1$s" button below in order to proceed.', 'event_espresso' ),
+				__('Please click the "%1$s" button below in order to proceed.', 'event_espresso'),
 				$this->submit_button_text()
 			);
 		}
@@ -1092,13 +1092,13 @@ 
 		);
 		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()
 				)
 			)
@@ -1116,15 +1116,15 @@ 
 	 */
 	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(
+		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',
@@ -1139,7 +1139,7 @@ 
 			);
 		}
 		// 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
@@ -1161,10 +1161,10 @@ 
 		$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;
 	}
 
@@ -1178,18 +1178,18 @@ 
 	 * @return \EE_Billing_Info_Form|\EE_Form_Section_HTML
 	 * @throws \EE_Error
 	 */
-	private function _get_billing_form_for_payment_method( EE_Payment_Method $payment_method ) {
+	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 )
+			array('amount_owing' => $this->checkout->amount_owing)
 		);
-		if ( $billing_form instanceof EE_Billing_Info_Form ) {
+		if ($billing_form instanceof EE_Billing_Info_Form) {
 			if (
 				apply_filters(
 					'FHEE__EE_SPCO_Reg_Step_Payment_Options__registration_checkout__selected_payment_method__display_success',
 					false
 				)
-				&& EE_Registry::instance()->REQ->is_set( 'payment_method' )
+				&& EE_Registry::instance()->REQ->is_set('payment_method')
 			) {
 				EE_Error::add_success(
 					apply_filters(
@@ -1231,15 +1231,15 @@ 
 		$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 = 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 = 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(
@@ -1247,7 +1247,7 @@ 
 			);
 		}
 		// 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(
 					__(
@@ -1256,7 +1256,7 @@ 
 					),
 					'<br/>',
 					'<br/>',
-					EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+					EE_Registry::instance()->CFG->organization->get_pretty('email')
 				),
 				__FILE__,
 				__FUNCTION__,
@@ -1283,13 +1283,13 @@ 
 	 * @throws \EE_Error
 	 */
 	public function switch_payment_method() {
-		if ( ! $this->_verify_payment_method_is_set() ) {
+		if ( ! $this->_verify_payment_method_is_set()) {
 			return false;
 		}
-		if ( apply_filters(
+		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',
@@ -1304,7 +1304,7 @@ 
 			);
 		}
 		// 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() ) {
+		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
 			);
@@ -1326,7 +1326,7 @@ 
 			);
 		}
 		// and debug content
-		if ( $this->checkout->billing_form instanceof EE_Billing_Info_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(
@@ -1334,15 +1334,15 @@ 
 			);
 		}
 		// get html and validation rules for form
-		if ( $this->checkout->billing_form instanceof EE_Form_Section_Proper ) {
+		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() )
+				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;
@@ -1359,12 +1359,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();
 		}
@@ -1383,25 +1383,25 @@ 
 	 * @throws \EE_Error
 	 */
 	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() ) {
+		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() ) {
+		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);
 					}
 				}
 			}
@@ -1419,50 +1419,50 @@ 
 	 */
 	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' );
+			EE_Registry::instance()->load_model('Country');
 			$country = EEM_Country::instance()->get_col(
-				array( array( 'CNT_name' => $CNT_ISO ), 'limit' => 1 ),
+				array(array('CNT_name' => $CNT_ISO), 'limit' => 1),
 				'CNT_ISO'
 			);
-			$CNT_ISO = is_array( $country ) && ! empty( $country ) ? reset( $country ) : $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'] ) {
+		if (empty($attendee_data['ATT_email']) || $attendee_data['ATT_email'] !== $_REQUEST['email']) {
 			EE_Error::add_error(
-				__( 'An invalid email address was submitted.', 'event_espresso' ),
+				__('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'] )
+		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(
@@ -1471,19 +1471,19 @@ 
 					'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'] = ! 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'] = ! empty($attendee_data['ATT_lname'])
 			? $attendee_data['ATT_lname']
 			: $attendee_data['ATT_email'];
-		return EE_Attendee::new_instance( $attendee_data );
+		return EE_Attendee::new_instance($attendee_data);
 	}
 
 
@@ -1501,26 +1501,26 @@ 
 		// 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->_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(
+				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' ),
+						__('no payment required at this time.', 'event_espresso'),
 						__FILE__,
 						__FUNCTION__,
 						__LINE__
@@ -1532,12 +1532,12 @@ 
 				break;
 
 			case 'no_payment_required' :
-				if ( apply_filters(
+				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' ),
+						__('no payment required.', 'event_espresso'),
 						__FILE__,
 						__FUNCTION__,
 						__LINE__
@@ -1557,15 +1557,15 @@ 
 					EE_Registry::instance()->SSN->checkout()->revisit
 				);
 				// calculate difference between the two arrays
-				$registrations = array_diff( $registrations, $ejected_registrations );
-				if ( empty( $registrations ) ) {
+				$registrations = array_diff($registrations, $ejected_registrations);
+				if (empty($registrations)) {
 					$this->_redirect_because_event_sold_out();
 					return false;
 				}
 				$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;
 				}
@@ -1586,10 +1586,10 @@ 
 		$this->checkout->continue_reg = false;
 		// set redirect URL
 		$this->checkout->redirect_url = add_query_arg(
-			array( 'e_reg_url_link' => $this->checkout->reg_url_link ),
+			array('e_reg_url_link' => $this->checkout->reg_url_link),
 			$this->checkout->current_step->reg_step_url()
 		);
-		$this->checkout->json_response->set_redirect_url( $this->checkout->redirect_url );
+		$this->checkout->json_response->set_redirect_url($this->checkout->redirect_url);
 	}
 
 
@@ -1602,8 +1602,8 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	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 :
@@ -1626,7 +1626,7 @@ 
 	public function update_reg_step() {
 		$success = true;
 		// if payment required
-		if ( $this->checkout->transaction->total() > 0 ) {
+		if ($this->checkout->transaction->total() > 0) {
 			do_action(
 				'AHEE__EE_Single_Page_Checkout__process_finalize_registration__before_gateway',
 				$this->checkout->transaction
@@ -1634,13 +1634,13 @@ 
 			// attempt payment via payment method
 			$success = $this->process_reg_step();
 		}
-		if ( $success && ! $this->checkout->redirect ) {
+		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 ),
+				array('e_reg_url_link' => $this->checkout->reg_url_link),
 				$this->checkout->thank_you_page_url
 			);
 		}
@@ -1660,28 +1660,28 @@ 
 		// 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 ) ) {
+		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' )
+				__('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() ) {
+		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 */
@@ -1689,12 +1689,12 @@ 
 		// 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;
 			// we can also consider the TXN to not have been failed, so temporarily upgrade it's status to abandoned
@@ -1708,7 +1708,7 @@ 
 			} 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;
@@ -1733,7 +1733,7 @@ 
 		);
 		$html = $payment_method_billing_info->get_html();
 		$html .= $this->checkout->redirect_form;
-		EE_Registry::instance()->REQ->add_output( $html );
+		EE_Registry::instance()->REQ->add_output($html);
 		return true;
 	}
 
@@ -1747,28 +1747,28 @@ 
 	 * @throws \EE_Error
 	 */
 	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' );
+							$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(
@@ -1778,7 +1778,7 @@ 
 							'event_espresso'
 						),
 						'<br/>',
-						implode( '<br/>', $error_strings )
+						implode('<br/>', $error_strings)
 					),
 					__FILE__,
 					__FUNCTION__,
@@ -1797,7 +1797,7 @@ 
 			}
 		} else {
 			EE_Error::add_error(
-				__( 'The submitted billing form is invalid possibly due to a technical reason.', 'event_espresso' ),
+				__('The submitted billing form is invalid possibly due to a technical reason.', 'event_espresso'),
 				__FILE__,
 				__FUNCTION__,
 				__LINE__
@@ -1836,7 +1836,7 @@ 
 		// 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;
@@ -1854,7 +1854,7 @@ 
 	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(
 					__(
@@ -1862,7 +1862,7 @@ 
 						'event_espresso'
 					),
 					'<br/>',
-					EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+					EE_Registry::instance()->CFG->organization->get_pretty('email')
 				),
 				__FILE__,
 				__FUNCTION__,
@@ -1871,7 +1871,7 @@ 
 			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(
 					__(
@@ -1879,7 +1879,7 @@ 
 						'event_espresso'
 					),
 					'<br/>',
-					EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+					EE_Registry::instance()->CFG->organization->get_pretty('email')
 				),
 				__FILE__,
 				__FUNCTION__,
@@ -1887,7 +1887,7 @@ 
 			);
 			return false;
 		}
-		if ( ! $primary_registration->_add_relation_to( $this->checkout->primary_attendee_obj, 'Attendee' )
+		if ( ! $primary_registration->_add_relation_to($this->checkout->primary_attendee_obj, 'Attendee')
 		       instanceof
 		       EE_Attendee
 		) {
@@ -1898,7 +1898,7 @@ 
 						'event_espresso'
 					),
 					'<br/>',
-					EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+					EE_Registry::instance()->CFG->organization->get_pretty('email')
 				),
 				__FILE__,
 				__FUNCTION__,
@@ -1907,9 +1907,9 @@ 
 			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;
 	}
 
@@ -1924,22 +1924,22 @@ 
 	 * @throws \EE_Error
 	 */
 	private function _get_payment_method_for_selected_method_of_payment() {
-		if ( $this->checkout->selected_method_of_payment === 'events_sold_out' ) {
+		if ($this->checkout->selected_method_of_payment === 'events_sold_out') {
 			$this->_redirect_because_event_sold_out();
 			return null;
 		}
 		// 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(
@@ -1948,7 +1948,7 @@ 
 						'event_espresso'
 					),
 					'<br/>',
-					EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+					EE_Registry::instance()->CFG->organization->get_pretty('email')
 				),
 				__FILE__,
 				__FUNCTION__,
@@ -1957,7 +1957,7 @@ 
 			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(
@@ -1966,7 +1966,7 @@ 
 						'event_espresso'
 					),
 					'<br/>',
-					EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+					EE_Registry::instance()->CFG->organization->get_pretty('email')
 				),
 				__FILE__,
 				__FUNCTION__,
@@ -1987,29 +1987,29 @@ 
 	 * @return    mixed    EE_Payment | boolean
 	 * @throws \EE_Error
 	 */
-	private function _attempt_payment( EE_Payment_Method $payment_method ) {
+	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;
 	}
@@ -2024,7 +2024,7 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	protected function _handle_payment_processor_exception( Exception $e ) {
+	protected function _handle_payment_processor_exception(Exception $e) {
 		EE_Error::add_error(
 			sprintf(
 				__(
@@ -2032,7 +2032,7 @@ 
 					'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()
@@ -2053,9 +2053,9 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	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(
 					array(
@@ -2084,12 +2084,12 @@ 
 	 * @return EE_Payment | FALSE
 	 * @throws \EE_Error
 	 */
-	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) {
 			// not a payment
 			EE_Error::add_error(
 				sprintf(
@@ -2098,7 +2098,7 @@ 
 						'event_espresso'
 					),
 					'<br/>',
-					EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+					EE_Registry::instance()->CFG->organization->get_pretty('email')
 				),
 				__FILE__,
 				__FUNCTION__,
@@ -2119,27 +2119,27 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	private function _post_payment_processing( $payment = null ) {
+	private function _post_payment_processing($payment = null) {
 		// Off-Line payment?
-		if ( $payment === true ) {
+		if ($payment === true) {
 			//$this->_setup_redirect_for_next_step();
 			return true;
 		// On-Site payment?
-		} else if ( $this->checkout->payment_method->is_on_site() ) {
-			if ( ! $this->_process_payment_status( $payment, EE_PMT_Base::onsite ) ) {
+		} else 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(
@@ -2147,7 +2147,7 @@ 
 					$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
@@ -2159,7 +2159,7 @@ 
 							'event_espresso'
 						),
 						'<br/>',
-						EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+						EE_Registry::instance()->CFG->organization->get_pretty('email')
 					),
 					__FILE__,
 					__FUNCTION__,
@@ -2197,21 +2197,21 @@ 
 	 * @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' ),
+						__('Your payment was processed successfully.', 'event_espresso'),
 						__FILE__,
 						__FUNCTION__,
 						__LINE__
@@ -2220,45 +2220,45 @@ 
 					break;
 				// slow payment
 				case EEM_Payment::status_id_pending :
-					if ( empty( $msg ) ) {
+					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
@@ -2267,7 +2267,7 @@ 
 		}
 		// 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(
@@ -2277,7 +2277,7 @@ 
 					'event_espresso'
 				),
 				'<br/>',
-				EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+				EE_Registry::instance()->CFG->organization->get_pretty('email')
 			),
 			__FILE__,
 			__FUNCTION__,
@@ -2310,13 +2310,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();
@@ -2330,23 +2330,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 && ! $this->handle_IPN_in_this_request() ) {
+				if ($gateway instanceof EE_Offsite_Gateway && ! $this->handle_IPN_in_this_request()) {
 					$this->set_completed();
 				}
 				return true;
@@ -2370,21 +2370,21 @@ 
 	 * @throws \EE_Error
 	 */
 	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 = $this->checkout->get_cart_for_transaction( $this->checkout->transaction );
-			if ( $cart instanceof EE_Cart ) {
+			$cart = $this->checkout->get_cart_for_transaction($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 {
@@ -2394,35 +2394,35 @@ 
 				? $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
 				// has this step even been started ?
-				if ( $this->checkout->transaction->reg_step_completed( $this->slug() === false )
+				if ($this->checkout->transaction->reg_step_completed($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) {
 					// has this step even been started ?
-					$reg_step_completed = $valid_TXN->reg_step_completed( $this->slug() );
-					if ( $reg_step_completed !== false && $reg_step_completed !== true ) {
+					$reg_step_completed = $valid_TXN->reg_step_completed($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);
 			}
 		}
 	}
@@ -2437,14 +2437,14 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	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(
 					__(
@@ -2452,7 +2452,7 @@ 
 						'event_espresso'
 					),
 					'<br/>',
-					EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+					EE_Registry::instance()->CFG->organization->get_pretty('email')
 				),
 				__FILE__,
 				__FUNCTION__,
@@ -2483,17 +2483,17 @@ 
 	 * @return \EE_Payment
 	 * @throws \EE_Error
 	 */
-	private function _process_off_site_payment( EE_Offsite_Gateway $gateway ) {
+	private function _process_off_site_payment(EE_Offsite_Gateway $gateway) {
 		try {
 			$request_data = \EE_Registry::instance()->REQ->params();
 			// if gateway uses_separate_IPN_request, then we don't have to process the IPN manually
 			$this->set_handle_IPN_in_this_request(
-				$gateway->handle_IPN_in_this_request( $request_data, false )
+				$gateway->handle_IPN_in_this_request($request_data, false)
 			);
-			if ( $this->handle_IPN_in_this_request() ) {
+			if ($this->handle_IPN_in_this_request()) {
 				// 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_data,
 					$this->checkout->transaction,
@@ -2506,14 +2506,14 @@ 
 				$payment = $this->checkout->transaction->last_payment();
 				//$payment_source = 'last_payment';
 			}
-		} 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
@@ -2538,13 +2538,13 @@ 
 	 * @return EE_Payment | FALSE
 	 * @throws \EE_Error
 	 */
-	private function _process_cancelled_payments( $payment = null ) {
+	private function _process_cancelled_payments($payment = null) {
 		if (
 			$payment instanceof EE_Payment
-			&& isset( $_REQUEST['ee_cancel_payment'] )
+			&& isset($_REQUEST['ee_cancel_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;
 	}
@@ -2561,14 +2561,14 @@ 
 	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()
 		) {
@@ -2580,8 +2580,8 @@ 
 				)
 			);
 		}
-		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(),
@@ -2592,7 +2592,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(),
@@ -2601,7 +2601,7 @@ 
 				)
 			);
 		}
-		echo json_encode( $txn_details );
+		echo json_encode($txn_details);
 		exit();
 	}
 

core/libraries/payment_methods/EE_PMT_Base.lib.php

Indentation +11 added lines, -11 removed lines

@@ -277,17 +277,17 @@
 		//if we know who the attendee is, and this is a billing form
 		//that uses attendee info, populate it
 		if (
-            apply_filters(
-                'FHEE__populate_billing_form_fields_from_attendee',
-                (
-                    $this->_billing_form instanceof EE_Billing_Attendee_Info_Form
-                    && $transaction instanceof EE_Transaction
-                    && $transaction->primary_registration() instanceof EE_Registration
-                    && $transaction->primary_registration()->attendee() instanceof EE_Attendee
-                ),
-                $this->_billing_form,
-                $transaction
-            )
+			apply_filters(
+				'FHEE__populate_billing_form_fields_from_attendee',
+				(
+					$this->_billing_form instanceof EE_Billing_Attendee_Info_Form
+					&& $transaction instanceof EE_Transaction
+					&& $transaction->primary_registration() instanceof EE_Registration
+					&& $transaction->primary_registration()->attendee() instanceof EE_Attendee
+				),
+				$this->_billing_form,
+				$transaction
+			)
 		){
 			$this->_billing_form->populate_from_attendee( $transaction->primary_registration()->attendee() );
 		}

core/helpers/EEH_Template.helper.php

Spacing +219 added lines, -219 removed lines

@@ -15,7 +15,7 @@ 
 
 
 
-if ( ! function_exists( 'espresso_get_template_part' )) {
+if ( ! function_exists('espresso_get_template_part')) {
 	/**
 	 * espresso_get_template_part
 	 * basically a copy of the WordPress get_template_part() function but uses EEH_Template::locate_template() instead, and doesn't add base versions of files
@@ -25,14 +25,14 @@ 
 	 * @param string $name The name of the specialised template.
 	 * @return string        the html output for the formatted money value
 	 */
-	function espresso_get_template_part( $slug = NULL, $name = NULL ) {
-		EEH_Template::get_template_part( $slug, $name );
+	function espresso_get_template_part($slug = NULL, $name = NULL) {
+		EEH_Template::get_template_part($slug, $name);
 	}
 }
 
 
 
-if ( ! function_exists( 'espresso_get_object_css_class' )) {
+if ( ! function_exists('espresso_get_object_css_class')) {
 	/**
 	 * espresso_get_object_css_class - attempts to generate a css class based on the type of EE object passed
 	 *
@@ -42,8 +42,8 @@ 
 	 * @param  string $suffix added to the end of the generated class
 	 * @return string
 	 */
-	function espresso_get_object_css_class( $object = NULL, $prefix = '', $suffix = '' ) {
-		return EEH_Template::get_object_css_class( $object, $prefix, $suffix );
+	function espresso_get_object_css_class($object = NULL, $prefix = '', $suffix = '') {
+		return EEH_Template::get_object_css_class($object, $prefix, $suffix);
 	}
 }
 
@@ -70,7 +70,7 @@ 
 	 * 	@return boolean
 	 */
 	public static function is_espresso_theme() {
-		return wp_get_theme()->get( 'TextDomain' ) == 'event_espresso' ? TRUE : FALSE;
+		return wp_get_theme()->get('TextDomain') == 'event_espresso' ? TRUE : FALSE;
 	}
 
 	/**
@@ -79,9 +79,9 @@ 
 	 * 	@return void
 	 */
 	public static function load_espresso_theme_functions() {
-		if ( ! defined( 'EE_THEME_FUNCTIONS_LOADED' )) {
-			if ( is_readable( EE_PUBLIC . EE_Config::get_current_theme() . DS . 'functions.php' )) {
-				require_once( EE_PUBLIC . EE_Config::get_current_theme() . DS . 'functions.php' );
+		if ( ! defined('EE_THEME_FUNCTIONS_LOADED')) {
+			if (is_readable(EE_PUBLIC.EE_Config::get_current_theme().DS.'functions.php')) {
+				require_once(EE_PUBLIC.EE_Config::get_current_theme().DS.'functions.php');
 			}
 		}
 	}
@@ -93,17 +93,17 @@ 
 	 * 	@return array
 	 */
 	public static function get_espresso_themes() {
-		if ( empty( EEH_Template::$_espresso_themes )) {
-			$espresso_themes =  glob( EE_PUBLIC . '*', GLOB_ONLYDIR );
-			if ( empty( $espresso_themes ) ) {
+		if (empty(EEH_Template::$_espresso_themes)) {
+			$espresso_themes = glob(EE_PUBLIC.'*', GLOB_ONLYDIR);
+			if (empty($espresso_themes)) {
 				return array();
 			}
-			if (( $key = array_search( 'global_assets', $espresso_themes )) !== FALSE ) {
-			    unset( $espresso_themes[ $key ] );
+			if (($key = array_search('global_assets', $espresso_themes)) !== FALSE) {
+			    unset($espresso_themes[$key]);
 			}
 			EEH_Template::$_espresso_themes = array();
-			foreach ( $espresso_themes as $espresso_theme ) {
-				EEH_Template::$_espresso_themes[ basename( $espresso_theme ) ] = $espresso_theme;
+			foreach ($espresso_themes as $espresso_theme) {
+				EEH_Template::$_espresso_themes[basename($espresso_theme)] = $espresso_theme;
 			}
 		}
 		return EEH_Template::$_espresso_themes;
@@ -122,16 +122,16 @@ 
 	 * @param bool   $return_string
 	 * @return string        the html output for the formatted money value
 	 */
-	public static function get_template_part( $slug = NULL, $name = NULL, $template_args = array(), $return_string = FALSE  ) {
-		do_action( "get_template_part_{$slug}-{$name}", $slug, $name );
+	public static function get_template_part($slug = NULL, $name = NULL, $template_args = array(), $return_string = FALSE) {
+		do_action("get_template_part_{$slug}-{$name}", $slug, $name);
 		$templates = array();
 		$name = (string) $name;
-		if ( $name != '' ) {
+		if ($name != '') {
 			$templates[] = "{$slug}-{$name}.php";
 		}
 		// allow template parts to be turned off via something like: add_filter( 'FHEE__content_espresso_events_tickets_template__display_datetimes', '__return_false' );
-		if ( apply_filters( "FHEE__EEH_Template__get_template_part__display__{$slug}_{$name}", TRUE )) {
-			EEH_Template::locate_template( $templates, $template_args, TRUE, $return_string );
+		if (apply_filters("FHEE__EEH_Template__get_template_part__display__{$slug}_{$name}", TRUE)) {
+			EEH_Template::locate_template($templates, $template_args, TRUE, $return_string);
 		}
 	}
 
@@ -182,26 +182,26 @@ 
 	 * 				Used in places where you don't actually load the template, you just want to know if there's a custom version of it.
 	 * @return mixed
 	 */
-	public static function locate_template( $templates = array(), $template_args = array(), $load = TRUE, $return_string = TRUE, $check_if_custom = FALSE ) {
+	public static function locate_template($templates = array(), $template_args = array(), $load = TRUE, $return_string = TRUE, $check_if_custom = FALSE) {
 		// first use WP locate_template to check for template in the current theme folder
-		$template_path = locate_template( $templates );
+		$template_path = locate_template($templates);
 
-		if ( $check_if_custom && !empty( $template_path ) )
+		if ($check_if_custom && ! empty($template_path))
 			return TRUE;
 
 		// not in the theme
-		if ( empty( $template_path )) {
+		if (empty($template_path)) {
 			// not even a template to look for ?
-			if ( empty( $templates )) {
+			if (empty($templates)) {
 				// get post_type
-				$post_type = EE_Registry::instance()->REQ->get( 'post_type' );
+				$post_type = EE_Registry::instance()->REQ->get('post_type');
 				// get array of EE Custom Post Types
 				$EE_CPTs = EE_Register_CPTs::get_CPTs();
 				// build template name based on request
-				if ( isset( $EE_CPTs[ $post_type ] )) {
-					$archive_or_single =  is_archive() ? 'archive' : '';
-					$archive_or_single =  is_single() ? 'single' : $archive_or_single;
-					$templates = $archive_or_single . '-' . $post_type . '.php';
+				if (isset($EE_CPTs[$post_type])) {
+					$archive_or_single = is_archive() ? 'archive' : '';
+					$archive_or_single = is_single() ? 'single' : $archive_or_single;
+					$templates = $archive_or_single.'-'.$post_type.'.php';
 				}
 			}
 			// currently active EE template theme
@@ -210,81 +210,81 @@ 
 			// array of paths to folders that may contain templates
 			$template_folder_paths = array(
 				// first check the /wp-content/uploads/espresso/templates/(current EE theme)/  folder for an EE theme template file
-				EVENT_ESPRESSO_TEMPLATE_DIR . $current_theme,
+				EVENT_ESPRESSO_TEMPLATE_DIR.$current_theme,
 				// then in the root of the /wp-content/uploads/espresso/templates/ folder
 				EVENT_ESPRESSO_TEMPLATE_DIR
 			);
 
 			//add core plugin folders for checking only if we're not $check_if_custom
-			if ( ! $check_if_custom ) {
+			if ( ! $check_if_custom) {
 				$core_paths = array(
 					// in the  /wp-content/plugins/(EE4 folder)/public/(current EE theme)/ folder within the plugin
-					EE_PUBLIC . $current_theme,
+					EE_PUBLIC.$current_theme,
 					// in the  /wp-content/plugins/(EE4 folder)/core/templates/(current EE theme)/ folder within the plugin
-					EE_TEMPLATES . $current_theme,
+					EE_TEMPLATES.$current_theme,
 					// or maybe relative from the plugin root: /wp-content/plugins/(EE4 folder)/
 					EE_PLUGIN_DIR_PATH
 					);
-				$template_folder_paths = array_merge( $template_folder_paths, $core_paths );
+				$template_folder_paths = array_merge($template_folder_paths, $core_paths);
 			}
 
 			// now filter that array
-			$template_folder_paths = apply_filters( 'FHEE__EEH_Template__locate_template__template_folder_paths', $template_folder_paths );
-			$templates = is_array( $templates ) ? $templates : array( $templates );
-			$template_folder_paths = is_array( $template_folder_paths ) ? $template_folder_paths : array( $template_folder_paths );
+			$template_folder_paths = apply_filters('FHEE__EEH_Template__locate_template__template_folder_paths', $template_folder_paths);
+			$templates = is_array($templates) ? $templates : array($templates);
+			$template_folder_paths = is_array($template_folder_paths) ? $template_folder_paths : array($template_folder_paths);
 			// array to hold all possible template paths
 			$full_template_paths = array();
 
 			// loop through $templates
-			foreach ( $templates as $template ) {
+			foreach ($templates as $template) {
 				// normalize directory separators
-				$template = EEH_File::standardise_directory_separators( $template );
-				$file_name = basename( $template );
-				$template_path_minus_file_name = substr( $template, 0, ( strlen( $file_name ) * -1 ) );
+				$template = EEH_File::standardise_directory_separators($template);
+				$file_name = basename($template);
+				$template_path_minus_file_name = substr($template, 0, (strlen($file_name) * -1));
 				// while looping through all template folder paths
-				foreach ( $template_folder_paths as $template_folder_path ) {
+				foreach ($template_folder_paths as $template_folder_path) {
 					// normalize directory separators
-					$template_folder_path = EEH_File::standardise_directory_separators( $template_folder_path );
+					$template_folder_path = EEH_File::standardise_directory_separators($template_folder_path);
 					// determine if any common base path exists between the two paths
 					$common_base_path = EEH_Template::_find_common_base_path(
-						array( $template_folder_path, $template_path_minus_file_name )
+						array($template_folder_path, $template_path_minus_file_name)
 					);
-					if ( $common_base_path !== '' ) {
+					if ($common_base_path !== '') {
 						// both paths have a common base, so just tack the filename onto our search path
-						$resolved_path = EEH_File::end_with_directory_separator( $template_folder_path ) . $file_name;
+						$resolved_path = EEH_File::end_with_directory_separator($template_folder_path).$file_name;
 					} else {
 						// no common base path, so let's just concatenate
-						$resolved_path = EEH_File::end_with_directory_separator( $template_folder_path ) . $template;
+						$resolved_path = EEH_File::end_with_directory_separator($template_folder_path).$template;
 					}
 					// build up our template locations array by adding our resolved paths
 					$full_template_paths[] = $resolved_path;
 				}
 				// if $template is an absolute path, then we'll tack it onto the start of our array so that it gets searched first
-				array_unshift( $full_template_paths, $template );
+				array_unshift($full_template_paths, $template);
 				// path to the directory of the current theme: /wp-content/themes/(current WP theme)/
-				array_unshift( $full_template_paths, get_stylesheet_directory() . DS . $file_name );
+				array_unshift($full_template_paths, get_stylesheet_directory().DS.$file_name);
 			}
 			// filter final array of full template paths
-			$full_template_paths = apply_filters( 'FHEE__EEH_Template__locate_template__full_template_paths', $full_template_paths, $file_name );
+			$full_template_paths = apply_filters('FHEE__EEH_Template__locate_template__full_template_paths', $full_template_paths, $file_name);
 			// now loop through our final array of template location paths and check each location
-			foreach ( (array)$full_template_paths as $full_template_path ) {
-				if ( is_readable( $full_template_path )) {
-					$template_path = str_replace( array( '\\', '/' ), DIRECTORY_SEPARATOR, $full_template_path );
+			foreach ((array) $full_template_paths as $full_template_path) {
+				if (is_readable($full_template_path)) {
+					$template_path = str_replace(array('\\', '/'), DIRECTORY_SEPARATOR, $full_template_path);
 					// hook that can be used to display the full template path that will be used
-					do_action( 'AHEE__EEH_Template__locate_template__full_template_path', $template_path );
+					do_action('AHEE__EEH_Template__locate_template__full_template_path', $template_path);
 					break;
 				}
 			}
 		}
 		// if we got it and you want to see it...
-		if ( $template_path && $load && ! $check_if_custom  ) {
-			if ( $return_string ) {
-				return EEH_Template::display_template( $template_path, $template_args, TRUE );
+		if ($template_path && $load && ! $check_if_custom) {
+			if ($return_string) {
+				return EEH_Template::display_template($template_path, $template_args, TRUE);
 			} else {
-				EEH_Template::display_template( $template_path, $template_args, FALSE );
+				EEH_Template::display_template($template_path, $template_args, FALSE);
 			}
 		}
-		return $check_if_custom && ! empty( $template_path ) ? TRUE : $template_path;
+		return $check_if_custom && ! empty($template_path) ? TRUE : $template_path;
 	}
 
 
@@ -297,21 +297,21 @@ 
 	 * @param array $paths
 	 * @return string
 	 */
-	protected static function _find_common_base_path( $paths ) {
+	protected static function _find_common_base_path($paths) {
 		$last_offset = 0;
 		$common_base_path = '';
-		while ( ( $index = strpos( $paths[ 0 ], DS, $last_offset ) ) !== false ) {
+		while (($index = strpos($paths[0], DS, $last_offset)) !== false) {
 			$dir_length = $index - $last_offset + 1;
-			$directory = substr( $paths[ 0 ], $last_offset, $dir_length );
-			foreach ( $paths as $path ) {
-				if ( substr( $path, $last_offset, $dir_length ) != $directory ) {
+			$directory = substr($paths[0], $last_offset, $dir_length);
+			foreach ($paths as $path) {
+				if (substr($path, $last_offset, $dir_length) != $directory) {
 					return $common_base_path;
 				}
 			}
 			$common_base_path .= $directory;
 			$last_offset = $index + 1;
 		}
-		return substr( $common_base_path, 0, -1 );
+		return substr($common_base_path, 0, -1);
 	}
 
 
@@ -323,7 +323,7 @@ 
 	 * @param  boolean    $return_string whether to send output immediately to screen, or capture and return as a string
 	 * @return mixed string
 	 */
-	public static function display_template( $template_path = FALSE, $template_args = array(), $return_string = FALSE ) {
+	public static function display_template($template_path = FALSE, $template_args = array(), $return_string = FALSE) {
 
 		/**
 		 * These two filters are intended for last minute changes to templates being loaded and/or template arg
@@ -334,26 +334,26 @@ 
 		 *
 		 * @since 4.6.0
 		 */
-		$template_path = apply_filters( 'FHEE__EEH_Template__display_template__template_path', $template_path );
-		$template_args = apply_filters( 'FHEE__EEH_Template__display_template__template_args', $template_args );
+		$template_path = apply_filters('FHEE__EEH_Template__display_template__template_path', $template_path);
+		$template_args = apply_filters('FHEE__EEH_Template__display_template__template_args', $template_args);
 
 		// you gimme nuttin - YOU GET NUTTIN !!
-		if ( ! $template_path || ! is_readable( $template_path )) {
+		if ( ! $template_path || ! is_readable($template_path)) {
 			return '';
 		}
 		// if $template_args are not in an array, then make it so
-		if ( ! is_array( $template_args ) && ! is_object( $template_args )) {
-			$template_args = array( $template_args );
+		if ( ! is_array($template_args) && ! is_object($template_args)) {
+			$template_args = array($template_args);
 		}
-		extract( (array) $template_args);
+		extract((array) $template_args);
 
-		if ( $return_string ) {
+		if ($return_string) {
 			// because we want to return a string, we are going to capture the output
 			ob_start();
-			include( $template_path );
+			include($template_path);
 			return ob_get_clean();
 		} else {
-			include( $template_path );
+			include($template_path);
 		}
 		return '';
 	}
@@ -371,27 +371,27 @@ 
 	 * @param  string $suffix added to the end of the generated class
 	 * @return string
 	 */
-	public static function get_object_css_class( $object = NULL, $prefix = '', $suffix = '' ) {
+	public static function get_object_css_class($object = NULL, $prefix = '', $suffix = '') {
 		// in the beginning...
-		$prefix = ! empty( $prefix ) ? rtrim( $prefix, '-' ) . '-' : '';
+		$prefix = ! empty($prefix) ? rtrim($prefix, '-').'-' : '';
 		// da muddle
 		$class = '';
 		// the end
-		$suffix = ! empty( $suffix ) ? '-' . ltrim( $suffix, '-' ) : '';
+		$suffix = ! empty($suffix) ? '-'.ltrim($suffix, '-') : '';
 		// is the passed object an EE object ?
-		if ( $object instanceof EE_Base_Class ) {
+		if ($object instanceof EE_Base_Class) {
 			// grab the exact type of object
-			$obj_class = get_class( $object );
+			$obj_class = get_class($object);
 			// depending on the type of object...
-			switch ( $obj_class ) {
+			switch ($obj_class) {
 				// no specifics just yet...
 				default :
-					$class = strtolower( str_replace( '_', '-', $obj_class ));
-					$class .= method_exists( $obj_class, 'name' ) ? '-' . sanitize_title( $object->name() ) : '';
+					$class = strtolower(str_replace('_', '-', $obj_class));
+					$class .= method_exists($obj_class, 'name') ? '-'.sanitize_title($object->name()) : '';
 
 			}
 		}
-		return $prefix . $class . $suffix;
+		return $prefix.$class.$suffix;
 	}
 
 
@@ -407,54 +407,54 @@ 
 	 * @param string      $cur_code_span_class
 	 * @return string        the html output for the formatted money value
 	 */
-	public static function format_currency( $amount = NULL, $return_raw = FALSE, $display_code = TRUE, $CNT_ISO = '', $cur_code_span_class = 'currency-code' ) {
+	public static function format_currency($amount = NULL, $return_raw = FALSE, $display_code = TRUE, $CNT_ISO = '', $cur_code_span_class = 'currency-code') {
 		// ensure amount was received
-		if ( is_null( $amount ) ) {
-			$msg = __( 'In order to format currency, an amount needs to be passed.', 'event_espresso' );
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if (is_null($amount)) {
+			$msg = __('In order to format currency, an amount needs to be passed.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return '';
 		}
 		//ensure amount is float
-		$amount = apply_filters( 'FHEE__EEH_Template__format_currency__raw_amount', (float) $amount );
-		$CNT_ISO = apply_filters( 'FHEE__EEH_Template__format_currency__CNT_ISO', $CNT_ISO, $amount );
+		$amount = apply_filters('FHEE__EEH_Template__format_currency__raw_amount', (float) $amount);
+		$CNT_ISO = apply_filters('FHEE__EEH_Template__format_currency__CNT_ISO', $CNT_ISO, $amount);
 		// filter raw amount (allows 0.00 to be changed to "free" for example)
-		$amount_formatted = apply_filters( 'FHEE__EEH_Template__format_currency__amount', $amount, $return_raw );
+		$amount_formatted = apply_filters('FHEE__EEH_Template__format_currency__amount', $amount, $return_raw);
 		// still a number or was amount converted to a string like "free" ?
-		if ( is_float( $amount_formatted )) {
+		if (is_float($amount_formatted)) {
 			// was a country ISO code passed ? if so generate currency config object for that country
-			$mny = $CNT_ISO !== '' ? new EE_Currency_Config( $CNT_ISO ) : NULL;
+			$mny = $CNT_ISO !== '' ? new EE_Currency_Config($CNT_ISO) : NULL;
 			// verify results
-			if ( ! $mny instanceof EE_Currency_Config ) {
+			if ( ! $mny instanceof EE_Currency_Config) {
 				// set default config country currency settings
 				$mny = EE_Registry::instance()->CFG->currency instanceof EE_Currency_Config ? EE_Registry::instance()->CFG->currency : new EE_Currency_Config();
 			}
 			// format float
-			$amount_formatted = number_format( $amount, $mny->dec_plc, $mny->dec_mrk, $mny->thsnds );
+			$amount_formatted = number_format($amount, $mny->dec_plc, $mny->dec_mrk, $mny->thsnds);
 			// add formatting ?
-			if ( ! $return_raw ) {
+			if ( ! $return_raw) {
 				// add currency sign
-				if( $mny->sign_b4 ){
-					if( $amount >= 0 ){
-						$amount_formatted = $mny->sign . $amount_formatted;
-					}else{
-						$amount_formatted = '-' . $mny->sign . str_replace( '-', '', $amount_formatted );
+				if ($mny->sign_b4) {
+					if ($amount >= 0) {
+						$amount_formatted = $mny->sign.$amount_formatted;
+					} else {
+						$amount_formatted = '-'.$mny->sign.str_replace('-', '', $amount_formatted);
 					}
 
-				}else{
-					$amount_formatted =  $amount_formatted . $mny->sign;
+				} else {
+					$amount_formatted = $amount_formatted.$mny->sign;
 				}
 
 				// filter to allow global setting of display_code
-				$display_code = apply_filters( 'FHEE__EEH_Template__format_currency__display_code', $display_code );
+				$display_code = apply_filters('FHEE__EEH_Template__format_currency__display_code', $display_code);
 
 				// add currency code ?
-				$amount_formatted = $display_code ? $amount_formatted . ' <span class="' . $cur_code_span_class . '">(' . $mny->code . ')</span>' : $amount_formatted;
+				$amount_formatted = $display_code ? $amount_formatted.' <span class="'.$cur_code_span_class.'">('.$mny->code.')</span>' : $amount_formatted;
 			}
 			// filter results
-			$amount_formatted = apply_filters( 'FHEE__EEH_Template__format_currency__amount_formatted', $amount_formatted, $mny, $return_raw );
+			$amount_formatted = apply_filters('FHEE__EEH_Template__format_currency__amount_formatted', $amount_formatted, $mny, $return_raw);
 		}
 		// clean up vars
-		unset( $mny );
+		unset($mny);
 		// return formatted currency amount
 		return $amount_formatted;
 	}
@@ -469,11 +469,11 @@ 
 	 * @param  string  $schema    'UPPER', 'lower', or 'Sentence'
 	 * @return string             The localized label for the status id.
 	 */
-	public static function pretty_status( $status_id, $plural = FALSE, $schema = 'upper' ) {
+	public static function pretty_status($status_id, $plural = FALSE, $schema = 'upper') {
 		/** @type EEM_Status $EEM_Status */
-		$EEM_Status = EE_Registry::instance()->load_model( 'Status' );
-		$status = $EEM_Status->localized_status( array( $status_id => __( 'unknown', 'event_espresso' )), $plural, $schema );
-		return $status[ $status_id ];
+		$EEM_Status = EE_Registry::instance()->load_model('Status');
+		$status = $EEM_Status->localized_status(array($status_id => __('unknown', 'event_espresso')), $plural, $schema);
+		return $status[$status_id];
 	}
 
 
@@ -488,21 +488,21 @@ 
 	 * @param string  $title
 	 * @return string the html output for the button
 	 */
-	public static function get_button_or_link( $url, $label, $class = 'button-primary', $icon = '', $title = '' ) {
+	public static function get_button_or_link($url, $label, $class = 'button-primary', $icon = '', $title = '') {
 		$icon_html = '';
-		if ( ! empty( $icon ) ) {
-			$dashicons = preg_split( "(ee-icon |dashicons )", $icon );
-			$dashicons = array_filter( $dashicons );
-			$count = count( $dashicons );
+		if ( ! empty($icon)) {
+			$dashicons = preg_split("(ee-icon |dashicons )", $icon);
+			$dashicons = array_filter($dashicons);
+			$count = count($dashicons);
 			$icon_html .= $count > 1 ? '<span class="ee-composite-dashicon">' : '';
-			foreach ( $dashicons as $dashicon ) {
-				$type = strpos( $dashicon, 'ee-icon' ) !== false ? 'ee-icon ' : 'dashicons ';
-				$icon_html .= '<span class="' . $type . $dashicon . '"></span>';
+			foreach ($dashicons as $dashicon) {
+				$type = strpos($dashicon, 'ee-icon') !== false ? 'ee-icon ' : 'dashicons ';
+				$icon_html .= '<span class="'.$type.$dashicon.'"></span>';
 			}
 			$icon_html .= $count > 1 ? '</span>' : '';
 		}
-		$label = ! empty( $icon ) ? $icon_html . $label : $label;
-		$button = '<a id="' . sanitize_title_with_dashes($label) . '" href="' . $url . '" class="' . $class . '" title="' . $title . '">' . $label . '</a>';
+		$label = ! empty($icon) ? $icon_html.$label : $label;
+		$button = '<a id="'.sanitize_title_with_dashes($label).'" href="'.$url.'" class="'.$class.'" title="'.$title.'">'.$label.'</a>';
 		return $button;
 	}
 
@@ -519,21 +519,21 @@ 
 	 * @param bool|string $help_text   (optional) send help text you want to use for the link if default not to be used
 	 * @return string              generated link
 	 */
-	public static function get_help_tab_link( $help_tab_id, $page = FALSE, $action = FALSE, $icon_style = FALSE, $help_text = FALSE ) {
+	public static function get_help_tab_link($help_tab_id, $page = FALSE, $action = FALSE, $icon_style = FALSE, $help_text = FALSE) {
 
-		if ( ! $page )
-			$page = isset( $_REQUEST['page'] ) && ! empty( $_REQUEST['page'] ) ? sanitize_key( $_REQUEST['page'] ) : $page;
+		if ( ! $page)
+			$page = isset($_REQUEST['page']) && ! empty($_REQUEST['page']) ? sanitize_key($_REQUEST['page']) : $page;
 
-		if ( ! $action )
-			$action = isset( $_REQUEST['action'] ) && ! empty( $_REQUEST['action'] ) ? sanitize_key( $_REQUEST['action'] ) : $action;
+		if ( ! $action)
+			$action = isset($_REQUEST['action']) && ! empty($_REQUEST['action']) ? sanitize_key($_REQUEST['action']) : $action;
 
 		$action = empty($action) ? 'default' : $action;
 
 
-		$help_tab_lnk = $page . '-' . $action . '-' . $help_tab_id;
-		$icon = !$icon_style ? ' dashicons-editor-help' : $icon_style;
-		$help_text = !$help_text ? '' : $help_text;
-		return '<a id="' . $help_tab_lnk . '" class="ee-clickable dashicons espresso-help-tab-lnk ee-icon-size-22' . $icon . '" title="' . esc_attr__('Click to open the \'Help\' tab for more information about this feature.', 'event_espresso') . '" > ' . $help_text . ' </a>';
+		$help_tab_lnk = $page.'-'.$action.'-'.$help_tab_id;
+		$icon = ! $icon_style ? ' dashicons-editor-help' : $icon_style;
+		$help_text = ! $help_text ? '' : $help_text;
+		return '<a id="'.$help_tab_lnk.'" class="ee-clickable dashicons espresso-help-tab-lnk ee-icon-size-22'.$icon.'" title="'.esc_attr__('Click to open the \'Help\' tab for more information about this feature.', 'event_espresso').'" > '.$help_text.' </a>';
 	}
 
 
@@ -545,31 +545,31 @@ 
 	 * @param EE_Help_Tour
 	 * @return string         html
 	 */
-	public static function help_tour_stops_generator( EE_Help_Tour $tour ) {
+	public static function help_tour_stops_generator(EE_Help_Tour $tour) {
 		$id = $tour->get_slug();
 		$stops = $tour->get_stops();
 
-		$content = '<ol style="display:none" id="' . $id . '">';
+		$content = '<ol style="display:none" id="'.$id.'">';
 
-		foreach ( $stops as $stop ) {
-			$data_id = !empty( $stop['id'] ) ? ' data-id="' . $stop['id'] . '"' : '';
-			$data_class = empty( $data_id ) && !empty( $stop['class'] ) ? ' data-class="' . $stop['class'] . '"' : '';
+		foreach ($stops as $stop) {
+			$data_id = ! empty($stop['id']) ? ' data-id="'.$stop['id'].'"' : '';
+			$data_class = empty($data_id) && ! empty($stop['class']) ? ' data-class="'.$stop['class'].'"' : '';
 
 			//if container is set to modal then let's make sure we set the options accordingly
-			if ( empty( $data_id ) && empty( $data_class ) ) {
+			if (empty($data_id) && empty($data_class)) {
 				$stop['options']['modal'] = true;
 				$stop['options']['expose'] = true;
 			}
 
-			$custom_class = !empty( $stop['custom_class'] ) ? ' class="' . $stop['custom_class'] . '"' : '';
-			$button_text = !empty( $stop['button_text'] ) ? ' data-button="' . $stop['button_text'] . '"' : '';
+			$custom_class = ! empty($stop['custom_class']) ? ' class="'.$stop['custom_class'].'"' : '';
+			$button_text = ! empty($stop['button_text']) ? ' data-button="'.$stop['button_text'].'"' : '';
 			$inner_content = isset($stop['content']) ? $stop['content'] : '';
 
 			//options
-			if ( isset( $stop['options'] ) && is_array( $stop['options'] ) ) {
+			if (isset($stop['options']) && is_array($stop['options'])) {
 				$options = ' data-options="';
-				foreach ( $stop['options'] as $option => $value ) {
-					$options .= $option . ':' . $value . ';';
+				foreach ($stop['options'] as $option => $value) {
+					$options .= $option.':'.$value.';';
 				}
 				$options .= '"';
 			} else {
@@ -577,7 +577,7 @@ 
 			}
 
 			//let's put all together
-			$content .= '<li' . $data_id . $data_class . $custom_class . $button_text . $options . '>' . $inner_content . '</li>';
+			$content .= '<li'.$data_id.$data_class.$custom_class.$button_text.$options.'>'.$inner_content.'</li>';
 		}
 
 		$content .= '</ol>';
@@ -598,31 +598,31 @@ 
 	 * @throws EE_Error
 	 * @return string               html structure for status.
 	 */
-	public static function status_legend( $status_array, $active_status = '' ) {
-		if ( !is_array( $status_array ) )
-			throw new EE_Error( __('The EEH_Template::status_legend helper required the incoming status_array argument to be an array!', 'event_espresso') );
+	public static function status_legend($status_array, $active_status = '') {
+		if ( ! is_array($status_array))
+			throw new EE_Error(__('The EEH_Template::status_legend helper required the incoming status_array argument to be an array!', 'event_espresso'));
 
 		$setup_array = array();
-		foreach ( $status_array as $item => $status ) {
+		foreach ($status_array as $item => $status) {
 			$setup_array[$item] = array(
-					'class' => 'ee-status-legend ee-status-legend-' . $status,
-					'desc' => EEH_Template::pretty_status( $status, FALSE, 'sentence' ),
+					'class' => 'ee-status-legend ee-status-legend-'.$status,
+					'desc' => EEH_Template::pretty_status($status, FALSE, 'sentence'),
 					'status' => $status
 				);
 		}
 
-		$content = '<div class="ee-list-table-legend-container">' . "\n";
-		$content .= '<h3>' . __('Status Legend', 'event_espresso') . '</h3>' . "\n";
-		$content .= '<dl class="ee-list-table-legend">' . "\n\t";
-		foreach ( $setup_array as $item => $details ) {
+		$content = '<div class="ee-list-table-legend-container">'."\n";
+		$content .= '<h3>'.__('Status Legend', 'event_espresso').'</h3>'."\n";
+		$content .= '<dl class="ee-list-table-legend">'."\n\t";
+		foreach ($setup_array as $item => $details) {
 			$active_class = $active_status == $details['status'] ? ' class="ee-is-active-status"' : '';
-			$content .= '<dt id="ee-legend-item-tooltip-' . $item . '"' . $active_class . '>' . "\n\t\t";
-			$content .= '<span class="' . $details['class'] . '"></span>' . "\n\t\t";
-			$content .= '<span class="ee-legend-description">' . $details['desc'] . '</span>' . "\n\t";
-			$content .= '</dt>' . "\n";
+			$content .= '<dt id="ee-legend-item-tooltip-'.$item.'"'.$active_class.'>'."\n\t\t";
+			$content .= '<span class="'.$details['class'].'"></span>'."\n\t\t";
+			$content .= '<span class="ee-legend-description">'.$details['desc'].'</span>'."\n\t";
+			$content .= '</dt>'."\n";
 		}
-		$content .= '</dl>' . "\n";
-		$content .= '</div>' . "\n";
+		$content .= '</dl>'."\n";
+		$content .= '</div>'."\n";
 		return $content;
 	}
 
@@ -635,8 +635,8 @@ 
 	 * @return string
 	 */
 	public static function layout_array_as_table($data) {
-	if (is_object($data) || $data instanceof __PHP_Incomplete_Class ) {
-		$data = (array)$data;
+	if (is_object($data) || $data instanceof __PHP_Incomplete_Class) {
+		$data = (array) $data;
 	}
 	ob_start();
 	if (is_array($data)) {
@@ -649,10 +649,10 @@ 
 						?>
 						<tr>
 							<td>
-								<?php echo $data_key;?>
+								<?php echo $data_key; ?>
 							</td>
 							<td>
-								<?php echo self::layout_array_as_table($data_values);?>
+								<?php echo self::layout_array_as_table($data_values); ?>
 							</td>
 						</tr>
 						<?php
@@ -666,7 +666,7 @@ 
 			<ul>
 				<?php
 				foreach ($data as $datum) {
-					echo "<li>"; echo self::layout_array_as_table($datum);echo "</li>";
+					echo "<li>"; echo self::layout_array_as_table($datum); echo "</li>";
 				}?>
 			</ul>
 			<?php
@@ -696,8 +696,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function paging_html( $total_items, $current, $per_page, $url, $show_num_field = TRUE, $paged_arg_name = 'paged', $items_label = array() ) {
-		echo self::get_paging_html( $total_items, $current, $per_page, $url, $show_num_field, $paged_arg_name, $items_label );
+	public static function paging_html($total_items, $current, $per_page, $url, $show_num_field = TRUE, $paged_arg_name = 'paged', $items_label = array()) {
+		echo self::get_paging_html($total_items, $current, $per_page, $url, $show_num_field, $paged_arg_name, $items_label);
 	}
 
 
@@ -721,13 +721,13 @@ 
 	 *                                 )
 	 * @return  string
 	 */
-	public static function get_paging_html( $total_items, $current, $per_page, $url, $show_num_field = TRUE, $paged_arg_name = 'paged', $items_label = array() ) {
+	public static function get_paging_html($total_items, $current, $per_page, $url, $show_num_field = TRUE, $paged_arg_name = 'paged', $items_label = array()) {
 		$page_links = array();
 		$disable_first = $disable_last = '';
 		$total_items = (int) $total_items;
 		$per_page = (int) $per_page;
 		$current = (int) $current;
-		$paged_arg_name = empty( $paged_arg_name ) ? 'paged' : sanitize_key( $paged_arg_name );
+		$paged_arg_name = empty($paged_arg_name) ? 'paged' : sanitize_key($paged_arg_name);
 
 		//filter items_label
 		$items_label = apply_filters(
@@ -735,68 +735,68 @@ 
 			$items_label
 		);
 
-		if ( empty( $items_label )
-		     || ! is_array( $items_label )
-		     || ! isset( $items_label['single'] )
-		     || ! isset( $items_label['plural'] ) ) {
+		if (empty($items_label)
+		     || ! is_array($items_label)
+		     || ! isset($items_label['single'])
+		     || ! isset($items_label['plural'])) {
 			$items_label = array(
-				'single' => __( '1 item', 'event_espresso' ),
-				'plural' => __( '%s items', 'event_espresso' )
+				'single' => __('1 item', 'event_espresso'),
+				'plural' => __('%s items', 'event_espresso')
 			);
 		} else {
 			$items_label = array(
-				'single' => '1 ' . esc_html( $items_label['single'] ),
-				'plural' => '%s ' . esc_html( $items_label['plural'] )
+				'single' => '1 '.esc_html($items_label['single']),
+				'plural' => '%s '.esc_html($items_label['plural'])
 			);
 		}
 
-		$total_pages = ceil( $total_items / $per_page );
+		$total_pages = ceil($total_items / $per_page);
 
-		if ( $total_pages <= 1 )
+		if ($total_pages <= 1)
 			return '';
 
-		$item_label = $total_items > 1 ? sprintf( $items_label['plural'], $total_items ) : $items_label['single'];
+		$item_label = $total_items > 1 ? sprintf($items_label['plural'], $total_items) : $items_label['single'];
 
-		$output = '<span class="displaying-num">' . $item_label . '</span>';
+		$output = '<span class="displaying-num">'.$item_label.'</span>';
 
-		if ( $current === 1 ) {
+		if ($current === 1) {
 			$disable_first = ' disabled';
 		}
-		if ( $current == $total_pages ) {
+		if ($current == $total_pages) {
 			$disable_last = ' disabled';
 		}
 
-		$page_links[] = sprintf( "<a class='%s' title='%s' href='%s'>%s</a>",
-			'first-page' . $disable_first,
-			esc_attr__( 'Go to the first page' ),
-			esc_url( remove_query_arg( $paged_arg_name, $url ) ),
+		$page_links[] = sprintf("<a class='%s' title='%s' href='%s'>%s</a>",
+			'first-page'.$disable_first,
+			esc_attr__('Go to the first page'),
+			esc_url(remove_query_arg($paged_arg_name, $url)),
 			'&laquo;'
 		);
 
 		$page_links[] = sprintf(
 			'<a class="%s" title="%s" href="%s">%s</a>',
-			'prev-page' . $disable_first,
-			esc_attr__( 'Go to the previous page' ),
-			esc_url( add_query_arg( $paged_arg_name, max( 1, $current-1 ), $url ) ),
+			'prev-page'.$disable_first,
+			esc_attr__('Go to the previous page'),
+			esc_url(add_query_arg($paged_arg_name, max(1, $current - 1), $url)),
 			'&lsaquo;'
 		);
 
-		if ( ! $show_num_field ) {
+		if ( ! $show_num_field) {
 			$html_current_page = $current;
 		} else {
-			$html_current_page = sprintf( "<input class='current-page' title='%s' type='text' name=$paged_arg_name value='%s' size='%d' />",
-				esc_attr__( 'Current page' ),
+			$html_current_page = sprintf("<input class='current-page' title='%s' type='text' name=$paged_arg_name value='%s' size='%d' />",
+				esc_attr__('Current page'),
 				$current,
-				strlen( $total_pages )
+				strlen($total_pages)
 			);
 		}
 
 		$html_total_pages = sprintf(
 			'<span class="total-pages">%s</span>',
-			number_format_i18n( $total_pages )
+			number_format_i18n($total_pages)
 		);
 		$page_links[] = sprintf(
-			_x( '%3$s%1$s of %2$s%4$s', 'paging' ),
+			_x('%3$s%1$s of %2$s%4$s', 'paging'),
 			$html_current_page,
 			$html_total_pages,
 			'<span class="paging-input">',
@@ -805,29 +805,29 @@ 
 
 		$page_links[] = sprintf(
 			'<a class="%s" title="%s" href="%s">%s</a>',
-			'next-page' . $disable_last,
-			esc_attr__( 'Go to the next page' ),
-			esc_url( add_query_arg( $paged_arg_name, min( $total_pages, $current+1 ), $url ) ),
+			'next-page'.$disable_last,
+			esc_attr__('Go to the next page'),
+			esc_url(add_query_arg($paged_arg_name, min($total_pages, $current + 1), $url)),
 			'&rsaquo;'
 		);
 
 		$page_links[] = sprintf(
 			'<a class="%s" title="%s" href="%s">%s</a>',
-			'last-page' . $disable_last,
-			esc_attr__( 'Go to the last page' ),
-			esc_url( add_query_arg( $paged_arg_name, $total_pages, $url ) ),
+			'last-page'.$disable_last,
+			esc_attr__('Go to the last page'),
+			esc_url(add_query_arg($paged_arg_name, $total_pages, $url)),
 			'&raquo;'
 		);
 
-		$output .= "\n" . '<span class="pagination-links">' . join( "\n", $page_links ) . '</span>';
+		$output .= "\n".'<span class="pagination-links">'.join("\n", $page_links).'</span>';
 		// set page class
-		if ( $total_pages ) {
+		if ($total_pages) {
 			$page_class = $total_pages < 2 ? ' one-page' : '';
 		} else {
 			$page_class = ' no-pages';
 		}
 
-		return '<div class="tablenav"><div class="tablenav-pages' . $page_class . '">' . $output . '</div></div>';
+		return '<div class="tablenav"><div class="tablenav-pages'.$page_class.'">'.$output.'</div></div>';
 	}
 
 
@@ -837,8 +837,8 @@ 
 	 * @param string $wrap_id
 	 * @return string
 	 */
-	public static function powered_by_event_espresso( $wrap_class = '', $wrap_id = '' ) {
-		$admin = is_admin() && ! ( defined( 'DOING_AJAX' ) && DOING_AJAX );
+	public static function powered_by_event_espresso($wrap_class = '', $wrap_id = '') {
+		$admin = is_admin() && ! (defined('DOING_AJAX') && DOING_AJAX);
 		if (
 			! $admin &&
 			! apply_filters(
@@ -849,17 +849,17 @@ 
 			return '';
 		}
 		$tag = $admin ? 'span' : 'div';
-		$attributes = ! empty( $wrap_id ) ? " id=\"{$wrap_id}\"" : '';
+		$attributes = ! empty($wrap_id) ? " id=\"{$wrap_id}\"" : '';
 		$wrap_class = $admin ? "{$wrap_class} float-left" : $wrap_class;
-		$attributes .= ! empty( $wrap_class )
+		$attributes .= ! empty($wrap_class)
 			? " class=\"{$wrap_class} powered-by-event-espresso-credit\""
 			: ' class="powered-by-event-espresso-credit"';
-		$powered_by = apply_filters( 'FHEE__EEH_Template__powered_by_event_espresso_text', $admin ? 'Event Espresso - ' . EVENT_ESPRESSO_VERSION : 'Event Espresso' );
+		$powered_by = apply_filters('FHEE__EEH_Template__powered_by_event_espresso_text', $admin ? 'Event Espresso - '.EVENT_ESPRESSO_VERSION : 'Event Espresso');
 		$url = add_query_arg(
-			array( 'ap_id' => EE_Registry::instance()->CFG->admin->affiliate_id() ),
+			array('ap_id' => EE_Registry::instance()->CFG->admin->affiliate_id()),
 			'https://eventespresso.com/'
 		);
-		$url = apply_filters( 'FHEE__EEH_Template__powered_by_event_espresso__url', $url );
+		$url = apply_filters('FHEE__EEH_Template__powered_by_event_espresso__url', $url);
 		return (string) apply_filters(
 			'FHEE__EEH_Template__powered_by_event_espresso__html',
 			sprintf(
@@ -891,7 +891,7 @@ 
 //add_filter( 'FHEE__EEH_Template__format_currency__amount', 'convert_zero_to_free', 10, 2 );
 
 
-if ( ! function_exists( 'espresso_pagination' ) ) {
+if ( ! function_exists('espresso_pagination')) {
 	/**
 	 *    espresso_pagination
 	 *
@@ -903,21 +903,21 @@ 
 		$big = 999999999; // need an unlikely integer
 		$pagination = paginate_links(
 		array(
-		'base'         => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
+		'base'         => str_replace($big, '%#%', esc_url(get_pagenum_link($big))),
 		'format'       => '?paged=%#%',
-		'current'      => max( 1, get_query_var( 'paged' ) ),
+		'current'      => max(1, get_query_var('paged')),
 		'total'        => $wp_query->max_num_pages,
 		'show_all'     => true,
 		'end_size'     => 10,
 		'mid_size'     => 6,
 		'prev_next'    => true,
-		'prev_text'    => __( '&lsaquo; PREV', 'event_espresso' ),
-		'next_text'    => __( 'NEXT &rsaquo;', 'event_espresso' ),
+		'prev_text'    => __('&lsaquo; PREV', 'event_espresso'),
+		'next_text'    => __('NEXT &rsaquo;', 'event_espresso'),
 		'type'         => 'plain',
 		'add_args'     => false,
 		'add_fragment' => ''
 		)
 		);
-		echo ! empty( $pagination ) ? '<div class="ee-pagination-dv clear">' . $pagination . '</div>' : '';
+		echo ! empty($pagination) ? '<div class="ee-pagination-dv clear">'.$pagination.'</div>' : '';
 	}
 }
\ No newline at end of file

core/libraries/messages/messenger/EE_Email_messenger.class.php

Spacing +55 added lines, -55 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -29,7 +29,7 @@ 
 /**
  * This sets up the email messenger for the EE_messages (notifications) subsystem in EE.
  */
-class EE_Email_messenger extends EE_messenger  {
+class EE_Email_messenger extends EE_messenger {
 
 	/**
 	 * The following are the properties that email requires for the message going out.
@@ -77,7 +77,7 @@ 
 	protected function _set_valid_shortcodes() {
 		//remember by leaving the other fields not set, those fields will inherit the valid shortcodes from the message type.
 		$this->_valid_shortcodes = array(
-			'to' => array('email','event_author', 'primary_registration_details', 'recipient_details'),
+			'to' => array('email', 'event_author', 'primary_registration_details', 'recipient_details'),
 			'from' => array('email', 'event_author', 'primary_registration_details', 'recipient_details')
 			);
 	}
@@ -111,7 +111,7 @@ 
 				'shortcodes' => array('organization', 'primary_registration_details', 'event_author', 'primary_registration_details', 'recipient_details')
 				),
 			'content' => array(
-				'shortcodes' => array('event_list','attendee_list', 'ticket_list', 'organization', 'primary_registration_details', 'primary_registration_list', 'event_author', 'recipient_details', 'recipient_list', 'transaction', 'messenger')
+				'shortcodes' => array('event_list', 'attendee_list', 'ticket_list', 'organization', 'primary_registration_details', 'primary_registration_list', 'event_author', 'recipient_details', 'recipient_list', 'transaction', 'messenger')
 				),
 			'attendee_list' => array(
 				'shortcodes' => array('attendee', 'event_list', 'ticket_list'),
@@ -122,7 +122,7 @@ 
 				'required' => array('[EVENT_LIST]')
 				),
 			'ticket_list' => array(
-				'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list','primary_registration_details', 'recipient_details'),
+				'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'primary_registration_details', 'recipient_details'),
 				'required' => array('[TICKET_LIST]')
 				),
 			'datetime_list' => array(
@@ -141,21 +141,21 @@ 
 	 *
 	 * @since 4.5.0
 	 */
-	public function do_secondary_messenger_hooks( $sending_messenger_name ) {
-		if ( $sending_messenger_name = 'html' ) {
-			add_filter( 'FHEE__EE_Messages_Template_Pack__get_variation', array( $this, 'add_email_css' ), 10, 8 );
+	public function do_secondary_messenger_hooks($sending_messenger_name) {
+		if ($sending_messenger_name = 'html') {
+			add_filter('FHEE__EE_Messages_Template_Pack__get_variation', array($this, 'add_email_css'), 10, 8);
 		}
 	}
 
 
 
 
-	public function add_email_css( $variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url, EE_Messages_Template_Pack $template_pack ) {
+	public function add_email_css($variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url, EE_Messages_Template_Pack $template_pack) {
 		//prevent recursion on this callback.
-		remove_filter( 'FHEE__EE_Messages_Template_Pack__get_variation', array( $this, 'add_email_css' ), 10 );
-		$variation = $this->get_variation( $template_pack, $message_type, $url, 'main', $variation, FALSE  );
+		remove_filter('FHEE__EE_Messages_Template_Pack__get_variation', array($this, 'add_email_css'), 10);
+		$variation = $this->get_variation($template_pack, $message_type, $url, 'main', $variation, FALSE);
 
-		add_filter( 'FHEE__EE_Messages_Template_Pack__get_variation', array( $this, 'add_email_css' ), 10, 8 );
+		add_filter('FHEE__EE_Messages_Template_Pack__get_variation', array($this, 'add_email_css'), 10, 8);
 		return $variation;
 	}
 
@@ -187,7 +187,7 @@ 
 				'required' => FALSE,
 				'validation' => FALSE,
 				'format' => '%s',
-				'value' => sprintf( __('Test email sent from %s', 'event_espresso'), get_bloginfo('name') ),
+				'value' => sprintf(__('Test email sent from %s', 'event_espresso'), get_bloginfo('name')),
 				'default'=> '',
 				'css_class' => ''
 				)
@@ -349,16 +349,16 @@ 
 	 * @return bool | WP_Error  true if message delivered, false if it didn't deliver OR bubble up any error object if present.
 	 */
 	protected function _send_message() {
-		$success =  wp_mail(
-			html_entity_decode( $this->_to, ENT_QUOTES, "UTF-8" ),
-			stripslashes( html_entity_decode( $this->_subject, ENT_QUOTES, "UTF-8" )),
+		$success = wp_mail(
+			html_entity_decode($this->_to, ENT_QUOTES, "UTF-8"),
+			stripslashes(html_entity_decode($this->_subject, ENT_QUOTES, "UTF-8")),
 			$this->_body(),
 			$this->_headers()
 		);
-		if ( ! $success ) {
+		if ( ! $success) {
 			EE_Error::add_error(
 				sprintf(
-					__( 'The email did not send successfully.%3$sThe WordPress wp_mail function is used for sending mails but does not give any useful information when an email fails to send.%3$sIt is possible the "to" address (%1$s) or "from" address (%2$s) is invalid.%3$s', 'event_espresso'),
+					__('The email did not send successfully.%3$sThe WordPress wp_mail function is used for sending mails but does not give any useful information when an email fails to send.%3$sIt is possible the "to" address (%1$s) or "from" address (%2$s) is invalid.%3$s', 'event_espresso'),
 					$this->_to,
 					$this->_from,
 					'<br />'
@@ -377,7 +377,7 @@ 
 	 * @return string html body of the message content and the related css.
 	 */
 	protected function _preview() {
-		return $this->_body( true );
+		return $this->_body(true);
 	}
 
 
@@ -392,18 +392,18 @@ 
 	 */
 	protected function _headers() {
 		$this->_ensure_has_from_email_address();
-		$from = stripslashes_deep( html_entity_decode($this->_from,  ENT_QUOTES,"UTF-8" ) );
+		$from = stripslashes_deep(html_entity_decode($this->_from, ENT_QUOTES, "UTF-8"));
 		$headers = array(
 			'MIME-Version: 1.0',
-			'From:' . $from,
-			'Reply-To:' . $from,
+			'From:'.$from,
+			'Reply-To:'.$from,
 			'Content-Type:text/html; charset=utf-8'
 			);
 
 		//but wait!  Header's for the from is NOT reliable because some plugins don't respect From: as set in the header.
-		add_filter( 'wp_mail_from',  array( $this, 'set_from_address' ), 100 );
-		add_filter( 'wp_mail_from_name', array( $this, 'set_from_name' ), 100 );
-		return apply_filters( 'FHEE__EE_Email_messenger___headers', $headers, $this->_incoming_message_type, $this );
+		add_filter('wp_mail_from', array($this, 'set_from_address'), 100);
+		add_filter('wp_mail_from_name', array($this, 'set_from_name'), 100);
+		return apply_filters('FHEE__EE_Email_messenger___headers', $headers, $this->_incoming_message_type, $this);
 	}
 
 
@@ -412,7 +412,7 @@ 
 	 * address for the from address to avoid problems with sending emails.
 	 */
 	protected function _ensure_has_from_email_address() {
-		if ( empty( $this->_from ) ) {
+		if (empty($this->_from)) {
 			$this->_from = get_bloginfo('admin_email');
 		}
 	}
@@ -429,21 +429,21 @@ 
 	 * @return array
 	 */
 	private function _parse_from() {
-		if ( strpos( $this->_from, '<' ) !== false ) {
-			$from_name = substr( $this->_from, 0, strpos( $this->_from, '<' ) - 1 );
-			$from_name = str_replace( '"', '', $from_name );
-			$from_name = trim( $from_name );
-
-			$from_email = substr( $this->_from, strpos( $this->_from, '<' ) + 1 );
-			$from_email = str_replace( '>', '', $from_email );
-			$from_email = trim( $from_email );
-		} elseif ( trim( $this->_from ) !== '' ) {
+		if (strpos($this->_from, '<') !== false) {
+			$from_name = substr($this->_from, 0, strpos($this->_from, '<') - 1);
+			$from_name = str_replace('"', '', $from_name);
+			$from_name = trim($from_name);
+
+			$from_email = substr($this->_from, strpos($this->_from, '<') + 1);
+			$from_email = str_replace('>', '', $from_email);
+			$from_email = trim($from_email);
+		} elseif (trim($this->_from) !== '') {
 			$from_name = '';
-			$from_email = trim( $this->_from );
+			$from_email = trim($this->_from);
 		} else {
 			$from_name = $from_email = '';
 		}
-		return array( $from_name, $from_email );
+		return array($from_name, $from_email);
 	}
 
 
@@ -456,10 +456,10 @@ 
 	 *
 	 * @param string $from_email What the original from_email is.
 	 */
-	public function set_from_address( $from_email ) {
+	public function set_from_address($from_email) {
 		$parsed_from = $this->_parse_from();
 		//includes fallback if the parsing failed.
-		$from_email = is_array( $parsed_from ) && ! empty( $parsed_from[1] ) ? $parsed_from[1] : get_bloginfo( 'admin_email' );
+		$from_email = is_array($parsed_from) && ! empty($parsed_from[1]) ? $parsed_from[1] : get_bloginfo('admin_email');
 		return $from_email;
 	}
 
@@ -473,16 +473,16 @@ 
 	 *
 	 * @param string $from_name The original from_name.
 	 */
-	public function set_from_name( $from_name ) {
+	public function set_from_name($from_name) {
 		$parsed_from = $this->_parse_from();
-		if ( is_array( $parsed_from) && ! empty( $parsed_from[0] ) ) {
-			$from_name =  $parsed_from[0];
+		if (is_array($parsed_from) && ! empty($parsed_from[0])) {
+			$from_name = $parsed_from[0];
 		}
 
 		//if from name is "WordPress" let's sub in the site name instead (more friendly!)
 		$from_name = $from_name == 'WordPress' ? get_bloginfo() : $from_name;
 
-		return stripslashes_deep( html_entity_decode($from_name,  ENT_QUOTES,"UTF-8" ) );
+		return stripslashes_deep(html_entity_decode($from_name, ENT_QUOTES, "UTF-8"));
 	}
 
 
@@ -493,14 +493,14 @@ 
 	 * @param bool $preview will determine whether this is preview template or not.
 	 * @return string formatted body for email.
 	 */
-	protected function _body( $preview = false ) {
+	protected function _body($preview = false) {
 		//setup template args!
 		$this->_template_args = array(
 			'subject' => $this->_subject,
 			'from' => $this->_from,
-			'main_body' => wpautop(stripslashes_deep( html_entity_decode($this->_content,  ENT_QUOTES,"UTF-8" ) ))
+			'main_body' => wpautop(stripslashes_deep(html_entity_decode($this->_content, ENT_QUOTES, "UTF-8")))
 			);
-		$body =  $this->_get_main_template( $preview );
+		$body = $this->_get_main_template($preview);
 
 		/**
 		 * This filter allows one to bypass the CSSToInlineStyles tool and leave the body untouched.
@@ -508,17 +508,17 @@ 
 		 * @type    bool    $preview    Indicates whether a preview is being generated or not.
 		 * @return  bool    true  indicates to use the inliner, false bypasses it.
 		 */
-		if ( apply_filters( 'FHEE__EE_Email_messenger__apply_CSSInliner ', true, $preview ) ) {
+		if (apply_filters('FHEE__EE_Email_messenger__apply_CSSInliner ', true, $preview)) {
 
 			//require CssToInlineStyles library and its dependencies via composer autoloader
-			require_once EE_THIRD_PARTY . 'cssinliner/vendor/autoload.php';
+			require_once EE_THIRD_PARTY.'cssinliner/vendor/autoload.php';
 
 			//now if this isn't a preview, let's setup the body so it has inline styles
-			if ( ! $preview || ( $preview && defined( 'DOING_AJAX' ) ) ) {
-				$style = file_get_contents( $this->get_variation( $this->_tmp_pack, $this->_incoming_message_type->name, FALSE, 'main', $this->_variation ), TRUE );
-				$CSS = new TijsVerkoyen\CssToInlineStyles\CssToInlineStyles( $body, $style );
-				$body = ltrim( $CSS->convert( true ), ">\n" ); //for some reason the library has a bracket and new line at the beginning.  This takes care of that.
-				$body = ltrim( $body, "<?" ); //see https://events.codebasehq.com/projects/event-espresso/tickets/8609
+			if ( ! $preview || ($preview && defined('DOING_AJAX'))) {
+				$style = file_get_contents($this->get_variation($this->_tmp_pack, $this->_incoming_message_type->name, FALSE, 'main', $this->_variation), TRUE);
+				$CSS = new TijsVerkoyen\CssToInlineStyles\CssToInlineStyles($body, $style);
+				$body = ltrim($CSS->convert(true), ">\n"); //for some reason the library has a bracket and new line at the beginning.  This takes care of that.
+				$body = ltrim($body, "<?"); //see https://events.codebasehq.com/projects/event-espresso/tickets/8609
 			}
 
 		}
@@ -537,8 +537,8 @@ 
 	public function get_existing_test_settings() {
 		$settings = parent::get_existing_test_settings();
 		//override subject if present because we always want it to be fresh.
-		if ( is_array( $settings ) && ! empty( $settings['subject'] ) ) {
-			$settings['subject'] = sprintf( __('Test email sent from %s', 'event_espresso'), get_bloginfo('name') );
+		if (is_array($settings) && ! empty($settings['subject'])) {
+			$settings['subject'] = sprintf(__('Test email sent from %s', 'event_espresso'), get_bloginfo('name'));
 		}
 		return $settings;
 	}

espresso.php

Spacing +92 added lines, -92 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( ! defined( 'ABSPATH' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('ABSPATH')) {
+	exit('No direct script access allowed');
 }
 /*
   Plugin Name:		Event Espresso
@@ -42,7 +42,7 @@ 
  *
  */
 
-if ( function_exists( 'espresso_version' ) ) {
+if (function_exists('espresso_version')) {
 
 	/**
 	 *    espresso_duplicate_plugin_error
@@ -51,12 +51,12 @@ 
 	function espresso_duplicate_plugin_error() {
 		?>
 		<div class="error">
-			<p><?php _e( 'Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.', 'event_espresso' ); ?></p>
+			<p><?php _e('Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.', 'event_espresso'); ?></p>
 		</div>
 		<?php
-		espresso_deactivate_plugin( plugin_basename( __FILE__ ) );
+		espresso_deactivate_plugin(plugin_basename(__FILE__));
 	}
-	add_action( 'admin_notices', 'espresso_duplicate_plugin_error', 1 );
+	add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
 
 } else {
 
@@ -67,102 +67,102 @@ 
 	 * @return string
 	 */
 	function espresso_version() {
-		return apply_filters( 'FHEE__espresso__espresso_version', '4.9.17.rc.006' );
+		return apply_filters('FHEE__espresso__espresso_version', '4.9.17.rc.006');
 	}
 
 	// define versions
-	define( 'EVENT_ESPRESSO_VERSION', espresso_version() );
-	define( 'EE_MIN_WP_VER_REQUIRED', '4.1' );
-	define( 'EE_MIN_WP_VER_RECOMMENDED', '4.4.2' );
-	define( 'EE_MIN_PHP_VER_REQUIRED', '5.3.0' );
-	define( 'EE_MIN_PHP_VER_RECOMMENDED', '5.4.44' );
-	define( 'EVENT_ESPRESSO_MAIN_FILE', __FILE__ );
+	define('EVENT_ESPRESSO_VERSION', espresso_version());
+	define('EE_MIN_WP_VER_REQUIRED', '4.1');
+	define('EE_MIN_WP_VER_RECOMMENDED', '4.4.2');
+	define('EE_MIN_PHP_VER_REQUIRED', '5.3.0');
+	define('EE_MIN_PHP_VER_RECOMMENDED', '5.4.44');
+	define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
 	//used to be DIRECTORY_SEPARATOR, but that caused issues on windows
-	if ( ! defined( 'DS' ) ) {
-		define( 'DS', '/' );
+	if ( ! defined('DS')) {
+		define('DS', '/');
 	}
-	if ( ! defined( 'PS' ) ) {
-		define( 'PS', PATH_SEPARATOR );
+	if ( ! defined('PS')) {
+		define('PS', PATH_SEPARATOR);
 	}
-	if ( ! defined( 'SP' ) ) {
-		define( 'SP', ' ' );
+	if ( ! defined('SP')) {
+		define('SP', ' ');
 	}
-	if ( ! defined( 'EENL' ) ) {
-		define( 'EENL', "\n" );
+	if ( ! defined('EENL')) {
+		define('EENL', "\n");
 	}
-	define( 'EE_SUPPORT_EMAIL', 'support@eventespresso.com' );
+	define('EE_SUPPORT_EMAIL', 'support@eventespresso.com');
 	// define the plugin directory and URL
-	define( 'EE_PLUGIN_BASENAME', plugin_basename( EVENT_ESPRESSO_MAIN_FILE ) );
-	define( 'EE_PLUGIN_DIR_PATH', plugin_dir_path( EVENT_ESPRESSO_MAIN_FILE ) );
-	define( 'EE_PLUGIN_DIR_URL', plugin_dir_url( EVENT_ESPRESSO_MAIN_FILE ) );
+	define('EE_PLUGIN_BASENAME', plugin_basename(EVENT_ESPRESSO_MAIN_FILE));
+	define('EE_PLUGIN_DIR_PATH', plugin_dir_path(EVENT_ESPRESSO_MAIN_FILE));
+	define('EE_PLUGIN_DIR_URL', plugin_dir_url(EVENT_ESPRESSO_MAIN_FILE));
 	// main root folder paths
-	define( 'EE_ADMIN_PAGES', EE_PLUGIN_DIR_PATH . 'admin_pages' . DS );
-	define( 'EE_CORE', EE_PLUGIN_DIR_PATH . 'core' . DS );
-	define( 'EE_MODULES', EE_PLUGIN_DIR_PATH . 'modules' . DS );
-	define( 'EE_PUBLIC', EE_PLUGIN_DIR_PATH . 'public' . DS );
-	define( 'EE_SHORTCODES', EE_PLUGIN_DIR_PATH . 'shortcodes' . DS );
-	define( 'EE_WIDGETS', EE_PLUGIN_DIR_PATH . 'widgets' . DS );
-	define( 'EE_PAYMENT_METHODS', EE_PLUGIN_DIR_PATH . 'payment_methods' . DS );
-	define( 'EE_CAFF_PATH', EE_PLUGIN_DIR_PATH . 'caffeinated' . DS );
+	define('EE_ADMIN_PAGES', EE_PLUGIN_DIR_PATH.'admin_pages'.DS);
+	define('EE_CORE', EE_PLUGIN_DIR_PATH.'core'.DS);
+	define('EE_MODULES', EE_PLUGIN_DIR_PATH.'modules'.DS);
+	define('EE_PUBLIC', EE_PLUGIN_DIR_PATH.'public'.DS);
+	define('EE_SHORTCODES', EE_PLUGIN_DIR_PATH.'shortcodes'.DS);
+	define('EE_WIDGETS', EE_PLUGIN_DIR_PATH.'widgets'.DS);
+	define('EE_PAYMENT_METHODS', EE_PLUGIN_DIR_PATH.'payment_methods'.DS);
+	define('EE_CAFF_PATH', EE_PLUGIN_DIR_PATH.'caffeinated'.DS);
 	// core system paths
-	define( 'EE_ADMIN', EE_CORE . 'admin' . DS );
-	define( 'EE_CPTS', EE_CORE . 'CPTs' . DS );
-	define( 'EE_CLASSES', EE_CORE . 'db_classes' . DS );
-	define( 'EE_INTERFACES', EE_CORE . 'interfaces' . DS );
-	define( 'EE_BUSINESS', EE_CORE . 'business' . DS );
-	define( 'EE_MODELS', EE_CORE . 'db_models' . DS );
-	define( 'EE_HELPERS', EE_CORE . 'helpers' . DS );
-	define( 'EE_LIBRARIES', EE_CORE . 'libraries' . DS );
-	define( 'EE_TEMPLATES', EE_CORE . 'templates' . DS );
-	define( 'EE_THIRD_PARTY', EE_CORE . 'third_party_libs' . DS );
-	define( 'EE_GLOBAL_ASSETS', EE_TEMPLATES . 'global_assets' . DS );
-	define( 'EE_FORM_SECTIONS', EE_LIBRARIES . 'form_sections' . DS );
+	define('EE_ADMIN', EE_CORE.'admin'.DS);
+	define('EE_CPTS', EE_CORE.'CPTs'.DS);
+	define('EE_CLASSES', EE_CORE.'db_classes'.DS);
+	define('EE_INTERFACES', EE_CORE.'interfaces'.DS);
+	define('EE_BUSINESS', EE_CORE.'business'.DS);
+	define('EE_MODELS', EE_CORE.'db_models'.DS);
+	define('EE_HELPERS', EE_CORE.'helpers'.DS);
+	define('EE_LIBRARIES', EE_CORE.'libraries'.DS);
+	define('EE_TEMPLATES', EE_CORE.'templates'.DS);
+	define('EE_THIRD_PARTY', EE_CORE.'third_party_libs'.DS);
+	define('EE_GLOBAL_ASSETS', EE_TEMPLATES.'global_assets'.DS);
+	define('EE_FORM_SECTIONS', EE_LIBRARIES.'form_sections'.DS);
 	// gateways
-	define( 'EE_GATEWAYS', EE_MODULES . 'gateways' . DS );
-	define( 'EE_GATEWAYS_URL', EE_PLUGIN_DIR_URL . 'modules' . DS . 'gateways' . DS );
+	define('EE_GATEWAYS', EE_MODULES.'gateways'.DS);
+	define('EE_GATEWAYS_URL', EE_PLUGIN_DIR_URL.'modules'.DS.'gateways'.DS);
 	// asset URL paths
-	define( 'EE_TEMPLATES_URL', EE_PLUGIN_DIR_URL . 'core' . DS . 'templates' . DS );
-	define( 'EE_GLOBAL_ASSETS_URL', EE_TEMPLATES_URL . 'global_assets' . DS );
-	define( 'EE_IMAGES_URL', EE_GLOBAL_ASSETS_URL . 'images' . DS );
-	define( 'EE_THIRD_PARTY_URL', EE_PLUGIN_DIR_URL . 'core' . DS . 'third_party_libs' . DS );
-	define( 'EE_HELPERS_ASSETS', EE_PLUGIN_DIR_URL . 'core/helpers/assets/' );
-	define( 'EE_LIBRARIES_URL', EE_PLUGIN_DIR_URL . 'core/libraries/' );
+	define('EE_TEMPLATES_URL', EE_PLUGIN_DIR_URL.'core'.DS.'templates'.DS);
+	define('EE_GLOBAL_ASSETS_URL', EE_TEMPLATES_URL.'global_assets'.DS);
+	define('EE_IMAGES_URL', EE_GLOBAL_ASSETS_URL.'images'.DS);
+	define('EE_THIRD_PARTY_URL', EE_PLUGIN_DIR_URL.'core'.DS.'third_party_libs'.DS);
+	define('EE_HELPERS_ASSETS', EE_PLUGIN_DIR_URL.'core/helpers/assets/');
+	define('EE_LIBRARIES_URL', EE_PLUGIN_DIR_URL.'core/libraries/');
 	// define upload paths
 	$uploads = wp_upload_dir();
 	// define the uploads directory and URL
-	define( 'EVENT_ESPRESSO_UPLOAD_DIR', $uploads[ 'basedir' ] . DS . 'espresso' . DS );
-	define( 'EVENT_ESPRESSO_UPLOAD_URL', $uploads[ 'baseurl' ] . DS . 'espresso' . DS );
+	define('EVENT_ESPRESSO_UPLOAD_DIR', $uploads['basedir'].DS.'espresso'.DS);
+	define('EVENT_ESPRESSO_UPLOAD_URL', $uploads['baseurl'].DS.'espresso'.DS);
 	// define the templates directory and URL
-	define( 'EVENT_ESPRESSO_TEMPLATE_DIR', $uploads[ 'basedir' ] . DS . 'espresso' . DS . 'templates' . DS );
-	define( 'EVENT_ESPRESSO_TEMPLATE_URL', $uploads[ 'baseurl' ] . DS . 'espresso' . DS . 'templates' . DS );
+	define('EVENT_ESPRESSO_TEMPLATE_DIR', $uploads['basedir'].DS.'espresso'.DS.'templates'.DS);
+	define('EVENT_ESPRESSO_TEMPLATE_URL', $uploads['baseurl'].DS.'espresso'.DS.'templates'.DS);
 	// define the gateway directory and URL
-	define( 'EVENT_ESPRESSO_GATEWAY_DIR', $uploads[ 'basedir' ] . DS . 'espresso' . DS . 'gateways' . DS );
-	define( 'EVENT_ESPRESSO_GATEWAY_URL', $uploads[ 'baseurl' ] . DS . 'espresso' . DS . 'gateways' . DS );
+	define('EVENT_ESPRESSO_GATEWAY_DIR', $uploads['basedir'].DS.'espresso'.DS.'gateways'.DS);
+	define('EVENT_ESPRESSO_GATEWAY_URL', $uploads['baseurl'].DS.'espresso'.DS.'gateways'.DS);
 	// languages folder/path
-	define( 'EE_LANGUAGES_SAFE_LOC', '..' . DS . 'uploads' . DS . 'espresso' . DS . 'languages' . DS );
-	define( 'EE_LANGUAGES_SAFE_DIR', EVENT_ESPRESSO_UPLOAD_DIR . 'languages' . DS );
+	define('EE_LANGUAGES_SAFE_LOC', '..'.DS.'uploads'.DS.'espresso'.DS.'languages'.DS);
+	define('EE_LANGUAGES_SAFE_DIR', EVENT_ESPRESSO_UPLOAD_DIR.'languages'.DS);
 	//check for dompdf fonts in uploads
-	if ( file_exists( EVENT_ESPRESSO_UPLOAD_DIR . 'fonts' . DS ) ) {
-		define( 'DOMPDF_FONT_DIR', EVENT_ESPRESSO_UPLOAD_DIR . 'fonts' . DS );
+	if (file_exists(EVENT_ESPRESSO_UPLOAD_DIR.'fonts'.DS)) {
+		define('DOMPDF_FONT_DIR', EVENT_ESPRESSO_UPLOAD_DIR.'fonts'.DS);
 	}
 	//ajax constants
-	define( 'EE_FRONT_AJAX', isset( $_REQUEST[ 'ee_front_ajax' ] ) || isset( $_REQUEST[ 'data' ][ 'ee_front_ajax' ] ) ? true : false );
-	define( 'EE_ADMIN_AJAX', isset( $_REQUEST[ 'ee_admin_ajax' ] ) || isset( $_REQUEST[ 'data' ][ 'ee_admin_ajax' ] ) ? true : false );
+	define('EE_FRONT_AJAX', isset($_REQUEST['ee_front_ajax']) || isset($_REQUEST['data']['ee_front_ajax']) ? true : false);
+	define('EE_ADMIN_AJAX', isset($_REQUEST['ee_admin_ajax']) || isset($_REQUEST['data']['ee_admin_ajax']) ? true : false);
 	//just a handy constant occasionally needed for finding values representing infinity in the DB
 	//you're better to use this than its straight value (currently -1) in case you ever
 	//want to change its default value! or find when -1 means infinity
-	define( 'EE_INF_IN_DB', -1 );
-	define( 'EE_INF', INF > (float)PHP_INT_MAX ? INF : PHP_INT_MAX );
-	define( 'EE_DEBUG', false );
+	define('EE_INF_IN_DB', -1);
+	define('EE_INF', INF > (float) PHP_INT_MAX ? INF : PHP_INT_MAX);
+	define('EE_DEBUG', false);
 
 	/**
 	 *    espresso_plugin_activation
 	 *    adds a wp-option to indicate that EE has been activated via the WP admin plugins page
 	 */
 	function espresso_plugin_activation() {
-		update_option( 'ee_espresso_activation', true );
+		update_option('ee_espresso_activation', true);
 	}
-	register_activation_hook( EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation' );
+	register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
 
 
 
@@ -176,7 +176,7 @@ 
 		//	}
 		//
 	}
-	register_deactivation_hook( EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_deactivation' );
+	register_deactivation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_deactivation');
 
 
 
@@ -186,15 +186,15 @@ 
 	 */
 	function espresso_load_error_handling() {
 		// load debugging tools
-		if ( WP_DEBUG === true && is_readable( EE_HELPERS . 'EEH_Debug_Tools.helper.php' ) ) {
-			require_once( EE_HELPERS . 'EEH_Debug_Tools.helper.php' );
+		if (WP_DEBUG === true && is_readable(EE_HELPERS.'EEH_Debug_Tools.helper.php')) {
+			require_once(EE_HELPERS.'EEH_Debug_Tools.helper.php');
 			EEH_Debug_Tools::instance();
 		}
 		// load error handling
-		if ( is_readable( EE_CORE . 'EE_Error.core.php' ) ) {
-			require_once( EE_CORE . 'EE_Error.core.php' );
+		if (is_readable(EE_CORE.'EE_Error.core.php')) {
+			require_once(EE_CORE.'EE_Error.core.php');
 		} else {
-			wp_die( __( 'The EE_Error core class could not be loaded.', 'event_espresso' ) );
+			wp_die(__('The EE_Error core class could not be loaded.', 'event_espresso'));
 		}
 	}
 
@@ -208,25 +208,25 @@ 
 	 * @param    string $full_path_to_file
 	 * @throws    EE_Error
 	 */
-	function espresso_load_required( $classname, $full_path_to_file ) {
+	function espresso_load_required($classname, $full_path_to_file) {
 		static $error_handling_loaded = false;
-		if ( ! $error_handling_loaded ) {
+		if ( ! $error_handling_loaded) {
 			espresso_load_error_handling();
 			$error_handling_loaded = true;
 		}
-		if ( is_readable( $full_path_to_file ) ) {
-			require_once( $full_path_to_file );
+		if (is_readable($full_path_to_file)) {
+			require_once($full_path_to_file);
 		} else {
-			throw new EE_Error ( sprintf(
-				__( 'The %s class file could not be located or is not readable due to file permissions.', 'event_espresso' ),
+			throw new EE_Error(sprintf(
+				__('The %s class file could not be located or is not readable due to file permissions.', 'event_espresso'),
 				$classname
-			) );
+			));
 		}
 	}
 
-	espresso_load_required( 'EEH_Base', EE_CORE . 'helpers' . DS . 'EEH_Base.helper.php' );
-	espresso_load_required( 'EEH_File', EE_CORE . 'helpers' . DS . 'EEH_File.helper.php' );
-	espresso_load_required( 'EE_Bootstrap', EE_CORE . 'EE_Bootstrap.core.php' );
+	espresso_load_required('EEH_Base', EE_CORE.'helpers'.DS.'EEH_Base.helper.php');
+	espresso_load_required('EEH_File', EE_CORE.'helpers'.DS.'EEH_File.helper.php');
+	espresso_load_required('EE_Bootstrap', EE_CORE.'EE_Bootstrap.core.php');
 	new EE_Bootstrap();
 
 
@@ -235,7 +235,7 @@ 
 
 
 
-if ( ! function_exists( 'espresso_deactivate_plugin' ) ) {
+if ( ! function_exists('espresso_deactivate_plugin')) {
 	/**
 	*    deactivate_plugin
 	* usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
@@ -244,11 +244,11 @@ 
 	* @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file
 	* @return    void
 	*/
-	function espresso_deactivate_plugin( $plugin_basename = '' ) {
-		if ( ! function_exists( 'deactivate_plugins' ) ) {
-			require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+	function espresso_deactivate_plugin($plugin_basename = '') {
+		if ( ! function_exists('deactivate_plugins')) {
+			require_once(ABSPATH.'wp-admin/includes/plugin.php');
 		}
-		unset( $_GET[ 'activate' ], $_REQUEST[ 'activate' ] );
-		deactivate_plugins( $plugin_basename );
+		unset($_GET['activate'], $_REQUEST['activate']);
+		deactivate_plugins($plugin_basename);
 	}
 }