eventespresso / event-espresso-core

core/EE_Front_Controller.core.php

Spacing +111 added lines, -111 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {exit('No direct script access allowed');}
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {exit('No direct script access allowed'); }
 /**
  * Event Espresso
  *
@@ -75,37 +75,37 @@ 
 		$this->Request_Handler = $Request_Handler;
 		$this->Module_Request_Router = $Module_Request_Router;
 		// make sure template tags are loaded immediately so that themes don't break
-		add_action( 'AHEE__EE_System__core_loaded_and_ready', array( $this, 'load_espresso_template_tags' ), 10 );
+		add_action('AHEE__EE_System__core_loaded_and_ready', array($this, 'load_espresso_template_tags'), 10);
 		// determine how to integrate WP_Query with the EE models
-		add_action( 'AHEE__EE_System__initialize', array( $this, 'employ_CPT_Strategy' ));
+		add_action('AHEE__EE_System__initialize', array($this, 'employ_CPT_Strategy'));
 		// load other resources and begin to actually run shortcodes and modules
-		add_action( 'wp_loaded', array( $this, 'wp_loaded' ), 5 );
+		add_action('wp_loaded', array($this, 'wp_loaded'), 5);
 		// analyse the incoming WP request
-		add_action( 'parse_request', array( $this, 'get_request' ), 1, 1 );
+		add_action('parse_request', array($this, 'get_request'), 1, 1);
 		// process any content shortcodes
-		add_action( 'parse_request', array( $this, '_initialize_shortcodes' ), 5 );
+		add_action('parse_request', array($this, '_initialize_shortcodes'), 5);
 		// process request with module factory
-		add_action( 'pre_get_posts', array( $this, 'pre_get_posts' ), 10, 1 );
+		add_action('pre_get_posts', array($this, 'pre_get_posts'), 10, 1);
 		// before headers sent
-		add_action( 'wp', array( $this, 'wp' ), 5 );
+		add_action('wp', array($this, 'wp'), 5);
 		// load css and js
-		add_action('wp_enqueue_scripts', array( $this, 'wp_enqueue_scripts' ), 1 );
+		add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 1);
 		// header
-		add_action('wp_head', array( $this, 'header_meta_tag' ), 5 );
-		add_filter( 'template_include', array( $this, 'template_include' ), 1 );
+		add_action('wp_head', array($this, 'header_meta_tag'), 5);
+		add_filter('template_include', array($this, 'template_include'), 1);
 		// display errors
-		add_action('loop_start', array( $this, 'display_errors' ), 2 );
+		add_action('loop_start', array($this, 'display_errors'), 2);
 		// the content
 		// add_filter( 'the_content', array( $this, 'the_content' ), 5, 1 );
 		//exclude our private cpt comments
-		add_filter( 'comments_clauses', array( $this, 'filter_wp_comments'), 10, 1 );
+		add_filter('comments_clauses', array($this, 'filter_wp_comments'), 10, 1);
 		//make sure any ajax requests will respect the url schema when requests are made against admin-ajax.php (http:// or https://)
-		add_filter( 'admin_url', array( $this, 'maybe_force_admin_ajax_ssl' ), 200, 1 );
+		add_filter('admin_url', array($this, 'maybe_force_admin_ajax_ssl'), 200, 1);
 		// action hook EE
-		do_action( 'AHEE__EE_Front_Controller__construct__done',$this );
+		do_action('AHEE__EE_Front_Controller__construct__done', $this);
 		// for checking that browser cookies are enabled
-		if ( apply_filters( 'FHEE__EE_Front_Controller____construct__set_test_cookie', true )) {
-			setcookie( 'ee_cookie_test', uniqid(), time() + 24 * HOUR_IN_SECONDS, '/' );
+		if (apply_filters('FHEE__EE_Front_Controller____construct__set_test_cookie', true)) {
+			setcookie('ee_cookie_test', uniqid(), time() + 24 * HOUR_IN_SECONDS, '/');
 		}
 	}
 
@@ -141,8 +141,8 @@ 
 	 * 	@return void
 	 */
 	public function load_espresso_template_tags() {
-		if ( is_readable( EE_PUBLIC . 'template_tags.php' )) {
-			require_once( EE_PUBLIC . 'template_tags.php' );
+		if (is_readable(EE_PUBLIC.'template_tags.php')) {
+			require_once(EE_PUBLIC.'template_tags.php');
 		}
 	}
 
@@ -157,12 +157,12 @@ 
 	 * @param  array $clauses array of comment clauses setup by WP_Comment_Query
 	 * @return array array of comment clauses with modifications.
 	 */
-	public function filter_wp_comments( $clauses ) {
+	public function filter_wp_comments($clauses) {
 		global $wpdb;
-		if ( strpos( $clauses['join'], $wpdb->posts ) !== FALSE ) {
+		if (strpos($clauses['join'], $wpdb->posts) !== FALSE) {
 			$cpts = EE_Register_CPTs::get_private_CPTs();
-			foreach ( $cpts as $cpt => $details ) {
-				$clauses['where'] .= $wpdb->prepare( " AND $wpdb->posts.post_type != %s", $cpt );
+			foreach ($cpts as $cpt => $details) {
+				$clauses['where'] .= $wpdb->prepare(" AND $wpdb->posts.post_type != %s", $cpt);
 			}
 		}
 		return $clauses;
@@ -179,8 +179,8 @@ 
 	 *  @return 	void
 	 */
 	public function employ_CPT_Strategy() {
-		if ( apply_filters( 'FHEE__EE_Front_Controller__employ_CPT_Strategy',true) ){
-			$this->Registry->load_core( 'CPT_Strategy' );
+		if (apply_filters('FHEE__EE_Front_Controller__employ_CPT_Strategy', true)) {
+			$this->Registry->load_core('CPT_Strategy');
 		}
 	}
 
@@ -192,9 +192,9 @@ 
 	 * @param  string $url    incoming url
 	 * @return string         final assembled url
 	 */
-	public function maybe_force_admin_ajax_ssl( $url ) {
-		if ( is_ssl() && preg_match( '/admin-ajax.php/', $url )) {
-			$url = str_replace( 'http://', 'https://', $url );
+	public function maybe_force_admin_ajax_ssl($url) {
+		if (is_ssl() && preg_match('/admin-ajax.php/', $url)) {
+			$url = str_replace('http://', 'https://', $url);
 		}
 		return $url;
 	}
@@ -231,10 +231,10 @@ 
 	 * @param WP $WP
 	 * @return void
 	 */
-	public function get_request( WP $WP ) {
-		do_action( 'AHEE__EE_Front_Controller__get_request__start' );
-		$this->Request_Handler->parse_request( $WP );
-		do_action( 'AHEE__EE_Front_Controller__get_request__complete' );
+	public function get_request(WP $WP) {
+		do_action('AHEE__EE_Front_Controller__get_request__start');
+		$this->Request_Handler->parse_request($WP);
+		do_action('AHEE__EE_Front_Controller__get_request__complete');
 	}
 
 
@@ -246,21 +246,21 @@ 
 	 * @param WP $WP
 	 * @return    void
 	 */
-	public function _initialize_shortcodes( WP $WP ) {
-		do_action( 'AHEE__EE_Front_Controller__initialize_shortcodes__begin', $WP, $this );
-		$this->Request_Handler->set_request_vars( $WP );
+	public function _initialize_shortcodes(WP $WP) {
+		do_action('AHEE__EE_Front_Controller__initialize_shortcodes__begin', $WP, $this);
+		$this->Request_Handler->set_request_vars($WP);
 		// grab post_name from request
-		$current_post = apply_filters( 'FHEE__EE_Front_Controller__initialize_shortcodes__current_post_name', $this->Request_Handler->get( 'post_name' ));
-		$show_on_front = get_option( 'show_on_front' );
+		$current_post = apply_filters('FHEE__EE_Front_Controller__initialize_shortcodes__current_post_name', $this->Request_Handler->get('post_name'));
+		$show_on_front = get_option('show_on_front');
 		// if it's not set, then check if frontpage is blog
-		if ( empty( $current_post ) ) {
+		if (empty($current_post)) {
 			// yup.. this is the posts page, prepare to load all shortcode modules
 			$current_post = 'posts';
 			// unless..
-			if ( $show_on_front === 'page' ) {
+			if ($show_on_front === 'page') {
 				// some other page is set as the homepage
-				$page_on_front = get_option( 'page_on_front' );
-				if ( $page_on_front ) {
+				$page_on_front = get_option('page_on_front');
+				if ($page_on_front) {
 					// k now we need to find the post_name for this page
 					global $wpdb;
 					$page_on_front = $wpdb->get_var(
@@ -277,22 +277,22 @@ 
 		// where are posts being displayed ?
 		$page_for_posts = EE_Config::get_page_for_posts();
 		// in case $current_post is hierarchical like: /parent-page/current-page
-		$current_post = basename( $current_post );
+		$current_post = basename($current_post);
 		// are we on a category page?
-		$term_exists = is_array( term_exists( $current_post, 'category' )) || array_key_exists( 'category_name', $WP->query_vars );
+		$term_exists = is_array(term_exists($current_post, 'category')) || array_key_exists('category_name', $WP->query_vars);
 		// make sure shortcodes are set
-		if ( isset( $this->Registry->CFG->core->post_shortcodes )) {
-			if ( ! isset( $this->Registry->CFG->core->post_shortcodes[ $page_for_posts ] ) ) {
-				$this->Registry->CFG->core->post_shortcodes[ $page_for_posts ] = array();
+		if (isset($this->Registry->CFG->core->post_shortcodes)) {
+			if ( ! isset($this->Registry->CFG->core->post_shortcodes[$page_for_posts])) {
+				$this->Registry->CFG->core->post_shortcodes[$page_for_posts] = array();
 			}
 			// cycle thru all posts with shortcodes set
-			foreach ( $this->Registry->CFG->core->post_shortcodes as $post_name => $post_shortcodes ) {
+			foreach ($this->Registry->CFG->core->post_shortcodes as $post_name => $post_shortcodes) {
 				// filter shortcodes so
-				$post_shortcodes = apply_filters( 'FHEE__Front_Controller__initialize_shortcodes__post_shortcodes', $post_shortcodes );
+				$post_shortcodes = apply_filters('FHEE__Front_Controller__initialize_shortcodes__post_shortcodes', $post_shortcodes);
 				// now cycle thru shortcodes
-				foreach ( $post_shortcodes as $shortcode_class => $post_id ) {
+				foreach ($post_shortcodes as $shortcode_class => $post_id) {
 					// are we on this page, or on the blog page, or an EE CPT category page ?
-					if ( $current_post === $post_name || $term_exists ) {
+					if ($current_post === $post_name || $term_exists) {
 						// maybe init the shortcode
 						$this->initialize_shortcode_if_active_on_page(
 							$shortcode_class,
@@ -307,16 +307,16 @@ 
 					// but the shortcode is not being tracked for this page
 					} else if (
 						$post_name !== $page_for_posts
-						&& isset( $this->Registry->CFG->core->post_shortcodes[ $page_for_posts ] )
-						&& ! isset( $this->Registry->CFG->core->post_shortcodes[ $page_for_posts ][ $shortcode_class ] )
+						&& isset($this->Registry->CFG->core->post_shortcodes[$page_for_posts])
+						&& ! isset($this->Registry->CFG->core->post_shortcodes[$page_for_posts][$shortcode_class])
 					) {
 						// then remove the "fallback" shortcode processor
-						remove_shortcode( $shortcode_class );
+						remove_shortcode($shortcode_class);
 					}
 				}
 			}
 		}
-		do_action( 'AHEE__EE_Front_Controller__initialize_shortcodes__end', $this );
+		do_action('AHEE__EE_Front_Controller__initialize_shortcodes__end', $this);
 	}
 
 
@@ -338,8 +338,8 @@ 
 		$WP
 	) {
 		// verify shortcode is in list of registered shortcodes
-		if ( ! isset( $this->Registry->shortcodes->{$shortcode_class} ) ) {
-			if ( $current_post !== $page_for_posts && current_user_can( 'edit_post', $post_id ) ) {
+		if ( ! isset($this->Registry->shortcodes->{$shortcode_class} )) {
+			if ($current_post !== $page_for_posts && current_user_can('edit_post', $post_id)) {
 				EE_Error::add_error(
 					sprintf(
 						__(
@@ -352,24 +352,24 @@ 
 					__FUNCTION__,
 					__LINE__
 				);
-				add_filter( 'FHEE_run_EE_the_content', '__return_true' );
+				add_filter('FHEE_run_EE_the_content', '__return_true');
 			}
-			add_shortcode( $shortcode_class, array( 'EES_Shortcode', 'invalid_shortcode_processor' ) );
+			add_shortcode($shortcode_class, array('EES_Shortcode', 'invalid_shortcode_processor'));
 			return;
 		}
 		// is this : a shortcodes set exclusively for this post, or for the home page, or a category, or a taxonomy ?
 		if (
 			$term_exists
 			|| $current_post === $page_for_posts
-			|| isset( $this->Registry->CFG->core->post_shortcodes[ $current_post ] )
+			|| isset($this->Registry->CFG->core->post_shortcodes[$current_post])
 		) {
 			// let's pause to reflect on this...
-			$sc_reflector = new ReflectionClass( 'EES_' . $shortcode_class );
+			$sc_reflector = new ReflectionClass('EES_'.$shortcode_class);
 			// ensure that class is actually a shortcode
 			if (
-				defined( 'WP_DEBUG' )
+				defined('WP_DEBUG')
 				&& WP_DEBUG === true
-				&& ! $sc_reflector->isSubclassOf( 'EES_Shortcode' )
+				&& ! $sc_reflector->isSubclassOf('EES_Shortcode')
 			) {
 				EE_Error::add_error(
 					sprintf(
@@ -383,13 +383,13 @@ 
 					__FUNCTION__,
 					__LINE__
 				);
-				add_filter( 'FHEE_run_EE_the_content', '__return_true' );
+				add_filter('FHEE_run_EE_the_content', '__return_true');
 				return;
 			}
 			// and pass the request object to the run method
 			$this->Registry->shortcodes->{$shortcode_class} = $sc_reflector->newInstance();
 			// fire the shortcode class's run method, so that it can activate resources
-			$this->Registry->shortcodes->{$shortcode_class}->run( $WP );
+			$this->Registry->shortcodes->{$shortcode_class}->run($WP);
 		}
 	}
 
@@ -402,19 +402,19 @@ 
 	 * @param   WP_Query    $WP_Query
 	 * @return    void
 	 */
-	public function pre_get_posts( $WP_Query ) {
+	public function pre_get_posts($WP_Query) {
 		// only load Module_Request_Router if this is the main query
 		if (
 			$this->Module_Request_Router instanceof EE_Module_Request_Router
 			&& $WP_Query->is_main_query()
 		) {
 				// cycle thru module routes
-				while ( $route = $this->Module_Request_Router->get_route( $WP_Query )) {
+				while ($route = $this->Module_Request_Router->get_route($WP_Query)) {
 					// determine module and method for route
-					$module = $this->Module_Request_Router->resolve_route( $route[0], $route[1] );
-					if( $module instanceof EED_Module ) {
+					$module = $this->Module_Request_Router->resolve_route($route[0], $route[1]);
+					if ($module instanceof EED_Module) {
 						// get registered view for route
-						$this->_template_path = $this->Module_Request_Router->get_view( $route );
+						$this->_template_path = $this->Module_Request_Router->get_view($route);
 						// grab module name
 						$module_name = $module->module_name();
 						// map the module to the module objects
@@ -456,29 +456,29 @@ 
 	public function wp_enqueue_scripts() {
 
 		// css is turned ON by default, but prior to the wp_enqueue_scripts hook, can be turned OFF  via:  add_filter( 'FHEE_load_css', '__return_false' );
-		if ( apply_filters( 'FHEE_load_css', TRUE ) ) {
+		if (apply_filters('FHEE_load_css', TRUE)) {
 
 			$this->Registry->CFG->template_settings->enable_default_style = TRUE;
 			//Load the ThemeRoller styles if enabled
-			if ( isset( $this->Registry->CFG->template_settings->enable_default_style ) && $this->Registry->CFG->template_settings->enable_default_style ) {
+			if (isset($this->Registry->CFG->template_settings->enable_default_style) && $this->Registry->CFG->template_settings->enable_default_style) {
 
 				//Load custom style sheet if available
-				if ( isset( $this->Registry->CFG->template_settings->custom_style_sheet )) {
-					wp_register_style('espresso_custom_css', EVENT_ESPRESSO_UPLOAD_URL . 'css/' . $this->Registry->CFG->template_settings->custom_style_sheet, EVENT_ESPRESSO_VERSION );
+				if (isset($this->Registry->CFG->template_settings->custom_style_sheet)) {
+					wp_register_style('espresso_custom_css', EVENT_ESPRESSO_UPLOAD_URL.'css/'.$this->Registry->CFG->template_settings->custom_style_sheet, EVENT_ESPRESSO_VERSION);
 					wp_enqueue_style('espresso_custom_css');
 				}
 
-				if ( is_readable( EVENT_ESPRESSO_UPLOAD_DIR . 'css/style.css' )) {
-					wp_register_style( 'espresso_default', EVENT_ESPRESSO_UPLOAD_DIR . 'css/espresso_default.css', array( 'dashicons' ), EVENT_ESPRESSO_VERSION );
+				if (is_readable(EVENT_ESPRESSO_UPLOAD_DIR.'css/style.css')) {
+					wp_register_style('espresso_default', EVENT_ESPRESSO_UPLOAD_DIR.'css/espresso_default.css', array('dashicons'), EVENT_ESPRESSO_VERSION);
 				} else {
-					wp_register_style( 'espresso_default', EE_GLOBAL_ASSETS_URL . 'css/espresso_default.css', array( 'dashicons' ), EVENT_ESPRESSO_VERSION );
+					wp_register_style('espresso_default', EE_GLOBAL_ASSETS_URL.'css/espresso_default.css', array('dashicons'), EVENT_ESPRESSO_VERSION);
 				}
 				wp_enqueue_style('espresso_default');
 
-				if ( is_readable( get_stylesheet_directory() . EE_Config::get_current_theme() . DS . 'style.css' )) {
-					wp_register_style( 'espresso_style', get_stylesheet_directory_uri() . EE_Config::get_current_theme() . DS . 'style.css', array( 'dashicons', 'espresso_default' ) );
+				if (is_readable(get_stylesheet_directory().EE_Config::get_current_theme().DS.'style.css')) {
+					wp_register_style('espresso_style', get_stylesheet_directory_uri().EE_Config::get_current_theme().DS.'style.css', array('dashicons', 'espresso_default'));
 				} else {
-					wp_register_style( 'espresso_style', EE_TEMPLATES_URL . EE_Config::get_current_theme() . DS . 'style.css', array( 'dashicons', 'espresso_default' ) );
+					wp_register_style('espresso_style', EE_TEMPLATES_URL.EE_Config::get_current_theme().DS.'style.css', array('dashicons', 'espresso_default'));
 				}
 
 			}
@@ -486,38 +486,38 @@ 
 		}
 
 		// js is turned ON by default, but prior to the wp_enqueue_scripts hook, can be turned OFF  via:  add_filter( 'FHEE_load_js', '__return_false' );
-		if ( apply_filters( 'FHEE_load_js', TRUE ) ) {
+		if (apply_filters('FHEE_load_js', TRUE)) {
 
-			wp_enqueue_script( 'jquery' );
+			wp_enqueue_script('jquery');
 			//let's make sure that all required scripts have been setup
-			if ( function_exists( 'wp_script_is' ) && ! wp_script_is( 'jquery' )) {
+			if (function_exists('wp_script_is') && ! wp_script_is('jquery')) {
 				$msg = sprintf(
-					__( '%sJquery is not loaded!%sEvent Espresso is unable to load Jquery due to a conflict with your theme or another plugin.', 'event_espresso' ),
+					__('%sJquery is not loaded!%sEvent Espresso is unable to load Jquery due to a conflict with your theme or another plugin.', 'event_espresso'),
 					'<em><br />',
 					'</em>'
 				);
-				EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			}
 			// load core js
-			wp_register_script( 'espresso_core', EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE );
-			wp_enqueue_script( 'espresso_core' );
-			wp_localize_script( 'espresso_core', 'eei18n', EE_Registry::$i18n_js_strings );
+			wp_register_script('espresso_core', EE_GLOBAL_ASSETS_URL.'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE);
+			wp_enqueue_script('espresso_core');
+			wp_localize_script('espresso_core', 'eei18n', EE_Registry::$i18n_js_strings);
 
 		}
 
 		//qtip is turned OFF by default, but prior to the wp_enqueue_scripts hook, can be turned back on again via: add_filter('FHEE_load_qtip', '__return_true' );
-		if ( apply_filters( 'FHEE_load_qtip', FALSE ) ) {
+		if (apply_filters('FHEE_load_qtip', FALSE)) {
 			EEH_Qtip_Loader::instance()->register_and_enqueue();
 		}
 
 
 		//accounting.js library
 		// @link http://josscrowcroft.github.io/accounting.js/
-		if ( apply_filters( 'FHEE_load_accounting_js', FALSE ) ) {
-			$acct_js = EE_THIRD_PARTY_URL . 'accounting/accounting.js';
-			wp_register_script( 'ee-accounting', EE_GLOBAL_ASSETS_URL . 'scripts/ee-accounting-config.js', array('ee-accounting-core'), EVENT_ESPRESSO_VERSION, TRUE );
-			wp_register_script( 'ee-accounting-core', $acct_js, array('underscore'), '0.3.2', TRUE );
-			wp_enqueue_script( 'ee-accounting' );
+		if (apply_filters('FHEE_load_accounting_js', FALSE)) {
+			$acct_js = EE_THIRD_PARTY_URL.'accounting/accounting.js';
+			wp_register_script('ee-accounting', EE_GLOBAL_ASSETS_URL.'scripts/ee-accounting-config.js', array('ee-accounting-core'), EVENT_ESPRESSO_VERSION, TRUE);
+			wp_register_script('ee-accounting-core', $acct_js, array('underscore'), '0.3.2', TRUE);
+			wp_enqueue_script('ee-accounting');
 
 			$currency_config = array(
 				'currency' => array(
@@ -540,21 +540,21 @@ 
 			wp_localize_script('ee-accounting', 'EE_ACCOUNTING_CFG', $currency_config);
 		}
 
-		if ( ! function_exists( 'wp_head' )) {
+		if ( ! function_exists('wp_head')) {
 			$msg = sprintf(
-				__( '%sMissing wp_head() function.%sThe WordPress function wp_head() seems to be missing in your theme. Please contact the theme developer to make sure this is fixed before using Event Espresso.', 'event_espresso' ),
+				__('%sMissing wp_head() function.%sThe WordPress function wp_head() seems to be missing in your theme. Please contact the theme developer to make sure this is fixed before using Event Espresso.', 'event_espresso'),
 				'<em><br />',
 				'</em>'
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		}
-		if ( ! function_exists( 'wp_footer' )) {
+		if ( ! function_exists('wp_footer')) {
 			$msg = sprintf(
-				__( '%sMissing wp_footer() function.%sThe WordPress function wp_footer() seems to be missing in your theme. Please contact the theme developer to make sure this is fixed before using Event Espresso.', 'event_espresso' ),
+				__('%sMissing wp_footer() function.%sThe WordPress function wp_footer() seems to be missing in your theme. Please contact the theme developer to make sure this is fixed before using Event Espresso.', 'event_espresso'),
 				'<em><br />',
 				'</em>'
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		}
 
 	}
@@ -568,7 +568,7 @@ 
 	 *  @return 	void
 	 */
 	public function header_meta_tag() {
-		print( apply_filters("FHEE__EE_Front_Controller__header_meta_tag","<meta name='generator' content='Event Espresso Version " . EVENT_ESPRESSO_VERSION . "' />"));
+		print(apply_filters("FHEE__EE_Front_Controller__header_meta_tag", "<meta name='generator' content='Event Espresso Version ".EVENT_ESPRESSO_VERSION."' />"));
 	}
 
 
@@ -609,10 +609,10 @@ 
 	 */
 	public function display_errors() {
 		static $shown_already = FALSE;
-		do_action( 'AHEE__EE_Front_Controller__display_errors__begin' );
+		do_action('AHEE__EE_Front_Controller__display_errors__begin');
 		if (
 			! $shown_already
-			&& apply_filters( 'FHEE__EE_Front_Controller__display_errors', TRUE )
+			&& apply_filters('FHEE__EE_Front_Controller__display_errors', TRUE)
 			&& is_main_query()
 			&& ! is_feed()
 			&& in_the_loop()
@@ -620,9 +620,9 @@ 
 		) {
 			echo EE_Error::get_notices();
 			$shown_already = TRUE;
-			EEH_Template::display_template( EE_TEMPLATES . 'espresso-ajax-notices.template.php' );
+			EEH_Template::display_template(EE_TEMPLATES.'espresso-ajax-notices.template.php');
 		}
-		do_action( 'AHEE__EE_Front_Controller__display_errors__end' );
+		do_action('AHEE__EE_Front_Controller__display_errors__end');
 	}
 
 
@@ -637,12 +637,12 @@ 
 	 * @param   string $template_include_path
 	 * @return    string
 	 */
-	public function template_include( $template_include_path = NULL ) {
-		if ( $this->Request_Handler->is_espresso_page() ) {
-			$this->_template_path = ! empty( $this->_template_path ) ? basename( $this->_template_path ) : basename( $template_include_path );
-			$template_path = EEH_Template::locate_template( $this->_template_path, array(), false );
-			$this->_template_path = ! empty( $template_path ) ? $template_path : $template_include_path;
-			$this->_template = basename( $this->_template_path );
+	public function template_include($template_include_path = NULL) {
+		if ($this->Request_Handler->is_espresso_page()) {
+			$this->_template_path = ! empty($this->_template_path) ? basename($this->_template_path) : basename($template_include_path);
+			$template_path = EEH_Template::locate_template($this->_template_path, array(), false);
+			$this->_template_path = ! empty($template_path) ? $template_path : $template_include_path;
+			$this->_template = basename($this->_template_path);
 			return $this->_template_path;
 		}
 		return $template_include_path;
@@ -657,7 +657,7 @@ 
 	 * @param bool $with_path
 	 * @return    string
 	 */
-	public function get_selected_template( $with_path = FALSE ) {
+	public function get_selected_template($with_path = FALSE) {
 		return $with_path ? $this->_template_path : $this->_template;
 	}
 

core/libraries/payment_methods/EE_PMT_Base.lib.php

Spacing +106 added lines, -106 removed lines

@@ -14,7 +14,7 @@ 
  * @since 				$VID:$
  *
  */
-abstract class EE_PMT_Base{
+abstract class EE_PMT_Base {
 
 	const onsite = 'on-site';
 	const offsite = 'off-site';
@@ -95,31 +95,31 @@ 
 	 * @return EE_PMT_Base
 	 */
 	function __construct($pm_instance = NULL) {
-		if ( $pm_instance instanceof EE_Payment_Method ){
+		if ($pm_instance instanceof EE_Payment_Method) {
 			$this->set_instance($pm_instance);
 		}
-		if($this->_gateway){
-			$this->_gateway->set_payment_model( EEM_Payment::instance() );
-			$this->_gateway->set_payment_log( EEM_Change_Log::instance() );
-			$this->_gateway->set_template_helper( new EEH_Template() );
-			$this->_gateway->set_line_item_helper( new EEH_Line_Item() );
-			$this->_gateway->set_money_helper( new EEH_Money() );
+		if ($this->_gateway) {
+			$this->_gateway->set_payment_model(EEM_Payment::instance());
+			$this->_gateway->set_payment_log(EEM_Change_Log::instance());
+			$this->_gateway->set_template_helper(new EEH_Template());
+			$this->_gateway->set_line_item_helper(new EEH_Line_Item());
+			$this->_gateway->set_money_helper(new EEH_Money());
 		}
-		if ( ! isset( $this->_has_billing_form ) ) {
+		if ( ! isset($this->_has_billing_form)) {
 			// by default, On Site gateways have a billing form
-			if ( $this->payment_occurs() == EE_PMT_Base::onsite ) {
-				$this->set_has_billing_form( true );
+			if ($this->payment_occurs() == EE_PMT_Base::onsite) {
+				$this->set_has_billing_form(true);
 			} else {
-				$this->set_has_billing_form( false );
+				$this->set_has_billing_form(false);
 			}
 		}
 
-		if( ! $this->_pretty_name){
+		if ( ! $this->_pretty_name) {
 			throw new EE_Error(sprintf(__("You must set the pretty name for the Payment Method Type in the constructor (_pretty_name), and please make it internationalized", "event_espresso")));
 		}
 		//if the child didn't specify a default button, use the credit card one
-		if( $this->_default_button_url === NULL){
-			$this->_default_button_url = EE_PLUGIN_DIR_URL . 'payment_methods' . DS . 'pay-by-credit-card.png';
+		if ($this->_default_button_url === NULL) {
+			$this->_default_button_url = EE_PLUGIN_DIR_URL.'payment_methods'.DS.'pay-by-credit-card.png';
 		}
 	}
 
@@ -128,8 +128,8 @@ 
 	/**
 	 * @param boolean $has_billing_form
 	 */
-	public function set_has_billing_form( $has_billing_form ) {
-		$this->_has_billing_form = filter_var( $has_billing_form, FILTER_VALIDATE_BOOLEAN );
+	public function set_has_billing_form($has_billing_form) {
+		$this->_has_billing_form = filter_var($has_billing_form, FILTER_VALIDATE_BOOLEAN);
 	}
 
 
@@ -137,10 +137,10 @@ 
 	/**
 	 * sets the file_folder property
 	 */
-	protected function _set_file_folder(){
+	protected function _set_file_folder() {
 		$reflector = new ReflectionClass(get_class($this));
 		$fn = $reflector->getFileName();
-		$this->_file_folder =  dirname($fn).DS;
+		$this->_file_folder = dirname($fn).DS;
 	}
 
 
@@ -148,10 +148,10 @@ 
 	/**
 	 * sets the file URL with a trailing slash for this PMT
 	 */
-	protected function _set_file_url(){
-		$plugins_dir_fixed = str_replace('\\',DS,WP_PLUGIN_DIR);
-		$file_folder_fixed = str_replace('\\',DS,$this->file_folder());
-		$file_path = str_replace($plugins_dir_fixed,WP_PLUGIN_URL,$file_folder_fixed);
+	protected function _set_file_url() {
+		$plugins_dir_fixed = str_replace('\\', DS, WP_PLUGIN_DIR);
+		$file_folder_fixed = str_replace('\\', DS, $this->file_folder());
+		$file_path = str_replace($plugins_dir_fixed, WP_PLUGIN_URL, $file_folder_fixed);
 		$this->_file_url = $file_path;
 	}
 
@@ -159,7 +159,7 @@ 
 	 * Gets the default description on all payment methods of this type
 	 * @return string
 	 */
-	public function default_description(){
+	public function default_description() {
 		return $this->_default_description;
 	}
 
@@ -169,8 +169,8 @@ 
 	 * Returns the folder containing the PMT child class, with a trailing slash
 	 * @return string
 	 */
-	public function file_folder(){
-		if( ! $this->_file_folder ) {
+	public function file_folder() {
+		if ( ! $this->_file_folder) {
 			$this->_set_file_folder();
 		}
 		return $this->_file_folder;
@@ -181,8 +181,8 @@ 
 	/**
 	 * @return string
 	 */
-	public function file_url(){
-		if( ! $this->_file_url ) {
+	public function file_url() {
+		if ( ! $this->_file_url) {
 			$this->_set_file_url();
 		}
 		return $this->_file_url;
@@ -195,14 +195,14 @@ 
 	 * Its important teh payment method instance is set before
 	 * @param EE_Payment_Method $payment_method_instance
 	 */
-	function set_instance($payment_method_instance){
+	function set_instance($payment_method_instance) {
 		$this->_pm_instance = $payment_method_instance;
 		//if they have already requested the settings form, make sure its
 		//data matches this model object
-		if($this->_settings_form){
+		if ($this->_settings_form) {
 			$this->settings_form()->populate_model_obj($payment_method_instance);
 		}
-		if($this->_gateway && $this->_gateway instanceof EE_Gateway){
+		if ($this->_gateway && $this->_gateway instanceof EE_Gateway) {
 			$this->_gateway->set_settings($payment_method_instance->settings_array());
 		}
 	}
@@ -213,14 +213,14 @@ 
 	 * Gets teh form for displaying to admins where they setup the payment method
 	 * @return EE_Payment_Method_Form
 	 */
-	function settings_form(){
-		if( ! $this->_settings_form){
+	function settings_form() {
+		if ( ! $this->_settings_form) {
 			$this->_settings_form = $this->generate_new_settings_form();
-			$this->_settings_form->set_payment_method_type( $this );
-			$this->_settings_form->_construct_finalize(NULL, NULL );
+			$this->_settings_form->set_payment_method_type($this);
+			$this->_settings_form->_construct_finalize(NULL, NULL);
 			//if we have already assigned a model object to this pmt, make
 			//sure its reflected in teh form we just generated
-			if($this->_pm_instance){
+			if ($this->_pm_instance) {
 				$this->_settings_form->populate_model_obj($this->_pm_instance);
 			}
 		}
@@ -246,7 +246,7 @@ 
 	 * this payment method type's settings form later in the request
 	 * @param EE_Payment_Method_Form $form
 	 */
-	public function set_settings_form($form){
+	public function set_settings_form($form) {
 		$this->_settings_form = $form;
 	}
 
@@ -269,10 +269,10 @@ 
 	 * @param array $extra_args
 	 * @return \EE_Billing_Attendee_Info_Form|\EE_Billing_Info_Form|null
 	 */
-	public function billing_form( EE_Transaction $transaction = NULL, $extra_args = array() ){
+	public function billing_form(EE_Transaction $transaction = NULL, $extra_args = array()) {
 		// has billing form already been regenerated ? or overwrite cache?
-		if ( ! $this->_billing_form instanceof EE_Billing_Info_Form || ! $this->_cache_billing_form ){
-			$this->_billing_form = $this->generate_new_billing_form( $transaction, $extra_args );
+		if ( ! $this->_billing_form instanceof EE_Billing_Info_Form || ! $this->_cache_billing_form) {
+			$this->_billing_form = $this->generate_new_billing_form($transaction, $extra_args);
 		}
 		//if we know who the attendee is, and this is a billing form
 		//that uses attendee info, populate it
@@ -281,8 +281,8 @@ 
 			$transaction instanceof EE_Transaction &&
 			$transaction->primary_registration() instanceof EE_Registration &&
 			$transaction->primary_registration()->attendee() instanceof EE_Attendee
-		){
-			$this->_billing_form->populate_from_attendee( $transaction->primary_registration()->attendee() );
+		) {
+			$this->_billing_form->populate_from_attendee($transaction->primary_registration()->attendee());
 		}
 		return $this->_billing_form;
 	}
@@ -293,7 +293,7 @@ 
 	 * @param \EE_Transaction $transaction
 	 * @return \EE_Billing_Info_Form
 	 */
-	abstract function generate_new_billing_form( EE_Transaction $transaction = NULL );
+	abstract function generate_new_billing_form(EE_Transaction $transaction = NULL);
 
 
 
@@ -304,7 +304,7 @@ 
 	 * @param \EE_Billing_Info_Form $billing_form
 	 * @return \EE_Billing_Info_Form
 	 */
-	public function apply_billing_form_debug_settings( EE_Billing_Info_Form $billing_form ) {
+	public function apply_billing_form_debug_settings(EE_Billing_Info_Form $billing_form) {
 		return $billing_form;
 	}
 
@@ -315,7 +315,7 @@ 
 	 * if you have form
 	 * @param EE_Payment_Method $form
 	 */
-	public function set_billing_form($form){
+	public function set_billing_form($form) {
 		$this->_billing_form = $form;
 	}
 
@@ -325,7 +325,7 @@ 
 	 * Returns whether or not this payment method requires HTTPS to be used
 	 * @return boolean
 	 */
-	function requires_https(){
+	function requires_https() {
 		return $this->_requires_https;
 	}
 
@@ -343,9 +343,9 @@ 
 	 * @return EE_Payment
 	 * @throws EE_Error
 	 */
-	function process_payment( EE_Transaction $transaction, $amount = null, $billing_info = null, $return_url = null,$fail_url = '', $method = 'CART', $by_admin = false ){
+	function process_payment(EE_Transaction $transaction, $amount = null, $billing_info = null, $return_url = null, $fail_url = '', $method = 'CART', $by_admin = false) {
 		// @todo: add surcharge for the payment method, if any
-		if ( $this->_gateway ) {
+		if ($this->_gateway) {
 			//there is a gateway, so we're going to make a payment object
 			//but wait! do they already have a payment in progress that we thought was failed?
 			$duplicate_properties = array(
@@ -356,10 +356,10 @@ 
 				'PAY_amount' 					=> $amount !== null ? $amount : $transaction->remaining(),
 				'PAY_gateway_response' 	=> null,
 			);
-			$payment = EEM_Payment::instance()->get_one( array( $duplicate_properties ));
+			$payment = EEM_Payment::instance()->get_one(array($duplicate_properties));
 			//if we didn't already have a payment in progress for the same thing,
 			//then we actually want to make a new payment
-			if ( ! $payment instanceof EE_Payment ){
+			if ( ! $payment instanceof EE_Payment) {
 				$payment = EE_Payment::new_instance(
 					array_merge(
 						$duplicate_properties,
@@ -375,10 +375,10 @@ 
 			}
 			//make sure the payment has been saved to show we started it, and so it has an ID should the gateway try to log it
 			$payment->save();
-			$billing_values = $this->_get_billing_values_from_form( $billing_info );
+			$billing_values = $this->_get_billing_values_from_form($billing_info);
 
 			//  Offsite Gateway
-			if( $this->_gateway instanceof EE_Offsite_Gateway ){
+			if ($this->_gateway instanceof EE_Offsite_Gateway) {
 
 				$payment = $this->_gateway->set_redirection_info(
 					$payment,
@@ -394,17 +394,17 @@ 
 				);
 				$payment->save();
 			//  Onsite Gateway
-			} elseif ( $this->_gateway instanceof EE_Onsite_Gateway ) {
+			} elseif ($this->_gateway instanceof EE_Onsite_Gateway) {
 
-				$payment = $this->_gateway->do_direct_payment($payment,$billing_values);
+				$payment = $this->_gateway->do_direct_payment($payment, $billing_values);
 				$payment->save();
 
 			} else {
 				throw new EE_Error(
 					sprintf(
-						__('Gateway for payment method type "%s" is "%s", not a subclass of either EE_Offsite_Gateway or EE_Onsite_Gateway, or null (to indicate NO gateway)', 'event_espresso' ),
+						__('Gateway for payment method type "%s" is "%s", not a subclass of either EE_Offsite_Gateway or EE_Onsite_Gateway, or null (to indicate NO gateway)', 'event_espresso'),
 						get_class($this),
-						gettype( $this->_gateway )
+						gettype($this->_gateway)
 					)
 				);
 			}
@@ -426,8 +426,8 @@ 
 		}
 
 		// if there is billing info, clean it and save it now
-		if( $billing_info instanceof EE_Billing_Attendee_Info_Form ){
-			$this->_save_billing_info_to_attendee( $billing_info, $transaction );
+		if ($billing_info instanceof EE_Billing_Attendee_Info_Form) {
+			$this->_save_billing_info_to_attendee($billing_info, $transaction);
 		}
 
 		return $payment;
@@ -440,10 +440,10 @@ 
 	 * @param EE_Billing_Info_Form $billing_form
 	 * @return array
 	 */
-	protected function _get_billing_values_from_form( $billing_form ){
-		if($billing_form instanceof EE_Form_Section_Proper ){
-			return $billing_form->input_pretty_values( true );
-		}else{
+	protected function _get_billing_values_from_form($billing_form) {
+		if ($billing_form instanceof EE_Form_Section_Proper) {
+			return $billing_form->input_pretty_values(true);
+		} else {
 			return NULL;
 		}
 	}
@@ -457,13 +457,13 @@ 
 	 * @return EE_Payment
 	 * @throws EE_Error
 	 */
-	public function handle_ipn($req_data,$transaction){
+	public function handle_ipn($req_data, $transaction) {
 		$transaction = EEM_Transaction::instance()->ensure_is_obj($transaction);
-		if( ! $this->_gateway instanceof EE_Offsite_Gateway){
-			throw new EE_Error(sprintf(__("Could not handle IPN because '%s' is not an offsite gateway", "event_espresso"), print_r( $this->_gateway, TRUE )));
+		if ( ! $this->_gateway instanceof EE_Offsite_Gateway) {
+			throw new EE_Error(sprintf(__("Could not handle IPN because '%s' is not an offsite gateway", "event_espresso"), print_r($this->_gateway, TRUE)));
 
 		}
-		$payment = $this->_gateway->handle_payment_update( $req_data, $transaction );
+		$payment = $this->_gateway->handle_payment_update($req_data, $transaction);
 		return $payment;
 	}
 
@@ -476,22 +476,22 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return boolean success
 	 */
-	protected function _save_billing_info_to_attendee($billing_form, $transaction){
-		if( ! $transaction || ! $transaction instanceof EE_Transaction){
+	protected function _save_billing_info_to_attendee($billing_form, $transaction) {
+		if ( ! $transaction || ! $transaction instanceof EE_Transaction) {
 			EE_Error::add_error(__("Cannot save billing info because no transaction was specified", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		$primary_reg = $transaction->primary_registration();
-		if( ! $primary_reg ){
+		if ( ! $primary_reg) {
 			EE_Error::add_error(__("Cannot save billing info because the transaction has no primary registration", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		$attendee = $primary_reg->attendee();
-		if( ! $attendee ){
+		if ( ! $attendee) {
 			EE_Error::add_error(__("Cannot save billing info because the transaction's primary registration has no attendee!", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
-		return $attendee->save_and_clean_billing_info_for_payment_method($billing_form, $transaction->payment_method() );
+		return $attendee->save_and_clean_billing_info_for_payment_method($billing_form, $transaction->payment_method());
 
 	}
 
@@ -504,7 +504,7 @@ 
 	 * @param array $req_data
 	 * @return EE_Payment
 	 */
-	protected function find_payment_for_ipn( EE_Transaction $transaction, $req_data = array() ){
+	protected function find_payment_for_ipn(EE_Transaction $transaction, $req_data = array()) {
 		return $transaction->last_payment();
 	}
 
@@ -521,8 +521,8 @@ 
 	 * and identifies the IPN as being for this payment method (not just fo ra payment method of this type)
 	 * @throws EE_Error
 	 */
-	public function handle_unclaimed_ipn( $req_data = array() ){
-		throw new EE_Error(sprintf(__("Payment Method '%s' cannot handle unclaimed IPNs", "event_espresso"), get_class($this) ));
+	public function handle_unclaimed_ipn($req_data = array()) {
+		throw new EE_Error(sprintf(__("Payment Method '%s' cannot handle unclaimed IPNs", "event_espresso"), get_class($this)));
 	}
 
 
@@ -538,7 +538,7 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return EE_Payment
 	 */
-	public function finalize_payment_for($transaction){
+	public function finalize_payment_for($transaction) {
 		return $transaction->last_payment();
 	}
 
@@ -548,10 +548,10 @@ 
 	 * Whether or not this payment method's gateway supports sending refund requests
 	 * @return boolean
 	 */
-	public function supports_sending_refunds(){
-		if($this->_gateway && $this->_gateway instanceof EE_Gateway){
+	public function supports_sending_refunds() {
+		if ($this->_gateway && $this->_gateway instanceof EE_Gateway) {
 			return $this->_gateway->supports_sending_refunds();
-		}else{
+		} else {
 			return false;
 		}
 	}
@@ -565,14 +565,14 @@ 
 	 * @throws EE_Error
 	 * @return EE_Payment
 	 */
-	public function process_refund( EE_Payment $payment, $refund_info = array()){
-		if ( $this->_gateway && $this->_gateway instanceof EE_Gateway ) {
-			return $this->_gateway->do_direct_refund( $payment, $refund_info );
+	public function process_refund(EE_Payment $payment, $refund_info = array()) {
+		if ($this->_gateway && $this->_gateway instanceof EE_Gateway) {
+			return $this->_gateway->do_direct_refund($payment, $refund_info);
 		} else {
 			throw new EE_Error(
 				sprintf(
-					__( 'Payment Method Type "%s" does not support sending refund requests', 'event_espresso' ),
-					get_class( $this )
+					__('Payment Method Type "%s" does not support sending refund requests', 'event_espresso'),
+					get_class($this)
 				)
 			);
 		}
@@ -586,15 +586,15 @@ 
 	 * @return string
 	 * @throws EE_Error
 	 */
-	public function payment_occurs(){
-		if( ! $this->_gateway){
+	public function payment_occurs() {
+		if ( ! $this->_gateway) {
 			return EE_PMT_Base::offline;
-		}elseif($this->_gateway instanceof EE_Onsite_Gateway){
+		}elseif ($this->_gateway instanceof EE_Onsite_Gateway) {
 			return EE_PMT_Base::onsite;
-		}elseif($this->_gateway instanceof EE_Offsite_Gateway){
+		}elseif ($this->_gateway instanceof EE_Offsite_Gateway) {
 			return EE_PMT_Base::offsite;
-		}else{
-			throw new EE_Error(sprintf(__("Payment method type '%s's gateway isn't an instance of EE_Onsite_Gateway, EE_Offsite_Gateway, or null. It must be one of those", "event_espresso"),get_class($this)));
+		} else {
+			throw new EE_Error(sprintf(__("Payment method type '%s's gateway isn't an instance of EE_Onsite_Gateway, EE_Offsite_Gateway, or null. It must be one of those", "event_espresso"), get_class($this)));
 		}
 	}
 
@@ -607,8 +607,8 @@ 
 	 * @param EE_Payment $payment
 	 * @return string
 	 */
-	public function payment_overview_content(EE_Payment $payment){
-		return EEH_Template::display_template(EE_LIBRARIES.'payment_methods'.DS.'templates'.DS.'payment_details_content.template.php', array('payment_method'=>$this->_pm_instance,'payment'=>$payment) , true);
+	public function payment_overview_content(EE_Payment $payment) {
+		return EEH_Template::display_template(EE_LIBRARIES.'payment_methods'.DS.'templates'.DS.'payment_details_content.template.php', array('payment_method'=>$this->_pm_instance, 'payment'=>$payment), true);
 	}
 
 
@@ -621,7 +621,7 @@ 
 	 *	@type array $template_args any arguments you want passed to the template file while rendering.
 	 *				Keys will be variable names and values with be their values.
 	 */
-	public function help_tabs_config(){
+	public function help_tabs_config() {
 		return array();
 	}
 
@@ -632,9 +632,9 @@ 
 	 * the payment method's table's PMT_type column)
 	 * @return string
 	 */
-	public function system_name(){
+	public function system_name() {
 		$classname = get_class($this);
-		return str_replace("EE_PMT_",'',$classname);
+		return str_replace("EE_PMT_", '', $classname);
 	}
 
 
@@ -643,7 +643,7 @@ 
 	 * A pretty i18n version of the PMT name
 	 * @return string
 	 */
-	public function pretty_name(){
+	public function pretty_name() {
 		return $this->_pretty_name;
 	}
 
@@ -653,7 +653,7 @@ 
 	 * Gets the default absolute URL to the payment method type's button
 	 * @return string
 	 */
-	public function default_button_url(){
+	public function default_button_url() {
 		return $this->_default_button_url;
 	}
 
@@ -663,7 +663,7 @@ 
 	 * Gets the gateway used by this payment method (if any)
 	 * @return EE_Gateway
 	 */
-	public function get_gateway(){
+	public function get_gateway() {
 		return $this->_gateway;
 	}
 
@@ -672,8 +672,8 @@ 
 	/**
 	 * @return string html for the link to a help tab
 	 */
-	public function get_help_tab_link(){
-		return EEH_Template::get_help_tab_link( $this->get_help_tab_name() );
+	public function get_help_tab_link() {
+		return EEH_Template::get_help_tab_link($this->get_help_tab_name());
 	}
 
 
@@ -682,8 +682,8 @@ 
 	 * Returns the name of the help tab for this PMT
 	 * @return string
 	 */
-	public function get_help_tab_name(){
-		return 'ee_' . strtolower( $this->system_name() ) . '_help_tab';
+	public function get_help_tab_name() {
+		return 'ee_'.strtolower($this->system_name()).'_help_tab';
 	}
 
 	/**
@@ -691,8 +691,8 @@ 
 	 * this PMT by an admin
 	 * @return string
 	 */
-	public function cap_name(){
-		return 'ee_payment_method_' . strtolower( $this->system_name() );
+	public function cap_name() {
+		return 'ee_payment_method_'.strtolower($this->system_name());
 	}
 
 	/**
@@ -704,9 +704,9 @@ 
 	 * @param EE_Payment $payment
 	 * @return void
 	 */
-	public function update_txn_based_on_payment( $payment ){
-		if( $this->_gateway instanceof EE_Gateway ){
-			$this->_gateway->update_txn_based_on_payment( $payment );
+	public function update_txn_based_on_payment($payment) {
+		if ($this->_gateway instanceof EE_Gateway) {
+			$this->_gateway->update_txn_based_on_payment($payment);
 		}
 	}
 

core/libraries/payment_methods/EE_Payment_Method_Manager.lib.php

Spacing +78 added lines, -78 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {exit('No direct script access allowed');}
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {exit('No direct script access allowed'); }
 /**
  *
  * Class EE_Payment_Method_Manager
@@ -35,7 +35,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated, and instantiated properly
-		if ( ! self::$_instance instanceof EE_Payment_Method_Manager ) {
+		if ( ! self::$_instance instanceof EE_Payment_Method_Manager) {
 			self::$_instance = new self();
 		}
 		EE_Registry::instance()->load_lib('PMT_Base');
@@ -46,7 +46,7 @@ 
 	 * Resets the instance and returns a new one
 	 * @return EE_Payment_Method_Manager
 	 */
-	public static function reset(){
+	public static function reset() {
 		self::$_instance = NULL;
 		return self::instance();
 	}
@@ -57,12 +57,12 @@ 
 	 * or just re-use the PMTs we found last time we checked during this request (if
 	 * we have not yet checked during this request, then we need to check anyways)
 	 */
-	public function maybe_register_payment_methods( $force_recheck = FALSE ){
-		if( ! $this->_payment_method_types || $force_recheck ){
+	public function maybe_register_payment_methods($force_recheck = FALSE) {
+		if ( ! $this->_payment_method_types || $force_recheck) {
 			$this->_register_payment_methods();
 			//if in admin lets ensure caps are set.
-			if ( is_admin() ) {
-				add_filter( 'FHEE__EE_Capabilities__init_caps_map__caps', array( $this, 'add_payment_method_caps' ) );
+			if (is_admin()) {
+				add_filter('FHEE__EE_Capabilities__init_caps_map__caps', array($this, 'add_payment_method_caps'));
 				EE_Registry::instance()->CAP->init_caps();
 			}
 		}
@@ -75,19 +75,19 @@ 
 	 */
 	protected function _register_payment_methods() {
 		// grab list of installed modules
-		$pm_to_register = glob( EE_PAYMENT_METHODS . '*', GLOB_ONLYDIR );
+		$pm_to_register = glob(EE_PAYMENT_METHODS.'*', GLOB_ONLYDIR);
 		// filter list of modules to register
-		$pm_to_register = apply_filters( 'FHEE__EE_Payment_Method_Manager__register_payment_methods__payment_methods_to_register', $pm_to_register );
+		$pm_to_register = apply_filters('FHEE__EE_Payment_Method_Manager__register_payment_methods__payment_methods_to_register', $pm_to_register);
 
 		// loop through folders
-		foreach ( $pm_to_register as $pm_path ) {
-				$this->register_payment_method( $pm_path );
+		foreach ($pm_to_register as $pm_path) {
+				$this->register_payment_method($pm_path);
 		}
-		do_action( 'FHEE__EE_Payment_Method_Manager__register_payment_methods__registered_payment_methods' );
+		do_action('FHEE__EE_Payment_Method_Manager__register_payment_methods__registered_payment_methods');
 		// filter list of installed modules
 		//keep them organized alphabetically by the payment method type's name
-		ksort( $this->_payment_method_types );
-		return apply_filters( 'FHEE__EE_Payment_Method_Manager__register_payment_methods__installed_payment_methods', $this->_payment_method_types );
+		ksort($this->_payment_method_types);
+		return apply_filters('FHEE__EE_Payment_Method_Manager__register_payment_methods__installed_payment_methods', $this->_payment_method_types);
 	}
 
 
@@ -99,35 +99,35 @@ 
 	 * @param string $payment_method_path - full path up to and including payment method folder
 	 * @return boolean
 	 */
-	public function register_payment_method( $payment_method_path = '' ) {
-		do_action( 'AHEE__EE_Payment_Method_Manager__register_payment_method__begin',$payment_method_path );
+	public function register_payment_method($payment_method_path = '') {
+		do_action('AHEE__EE_Payment_Method_Manager__register_payment_method__begin', $payment_method_path);
 		$module_ext = '.pm.php';
 		// make all separators match
-		$payment_method_path = rtrim( str_replace( '/\\', DS, $payment_method_path ), DS );
+		$payment_method_path = rtrim(str_replace('/\\', DS, $payment_method_path), DS);
 		// grab and sanitize module name
-		$module_dir = basename( $payment_method_path );
+		$module_dir = basename($payment_method_path);
 		// create classname from module directory name
-		$module = str_replace( ' ', '_', str_replace( '_', ' ', $module_dir ));
+		$module = str_replace(' ', '_', str_replace('_', ' ', $module_dir));
 		// add class prefix
-		$module_class = 'EE_PMT_' . $module;
+		$module_class = 'EE_PMT_'.$module;
 		// does the module exist ?
-		if ( ! is_readable( $payment_method_path . DS . $module_class . $module_ext )) {
-			$msg = sprintf( __( 'The requested %s payment method file could not be found or is not readable due to file permissions.', 'event_espresso' ), $module );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! is_readable($payment_method_path.DS.$module_class.$module_ext)) {
+			$msg = sprintf(__('The requested %s payment method file could not be found or is not readable due to file permissions.', 'event_espresso'), $module);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		if ( WP_DEBUG === TRUE ) { EEH_Debug_Tools::instance()->start_timer(); }
+		if (WP_DEBUG === TRUE) { EEH_Debug_Tools::instance()->start_timer(); }
 		// load the module class file
-		require_once( $payment_method_path . DS . $module_class . $module_ext );
-		if ( WP_DEBUG === TRUE ) { EEH_Debug_Tools::instance()->stop_timer("Requiring payment method $module_class"); }
+		require_once($payment_method_path.DS.$module_class.$module_ext);
+		if (WP_DEBUG === TRUE) { EEH_Debug_Tools::instance()->stop_timer("Requiring payment method $module_class"); }
 		// verify that class exists
-		if ( ! class_exists( $module_class )) {
-			$msg = sprintf( __( 'The requested %s module class does not exist.', 'event_espresso' ), $module_class );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! class_exists($module_class)) {
+			$msg = sprintf(__('The requested %s module class does not exist.', 'event_espresso'), $module_class);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		// add to array of registered modules
-		$this->_payment_method_types[ $module ] = $payment_method_path . DS . $module_class . $module_ext;
+		$this->_payment_method_types[$module] = $payment_method_path.DS.$module_class.$module_ext;
 		return TRUE;
 	}
 	/**
@@ -136,18 +136,18 @@ 
 	 * @param boolean $force_recheck whether to force re-checking for new payment method types
 	 * @return boolean
 	 */
-	public function payment_method_type_exists($payment_method_name, $force_recheck = FALSE){
+	public function payment_method_type_exists($payment_method_name, $force_recheck = FALSE) {
 		if (
 			$force_recheck
-			|| ! is_array( $this->_payment_method_types )
-			|| ! isset( $this->_payment_method_types[$payment_method_name] )
+			|| ! is_array($this->_payment_method_types)
+			|| ! isset($this->_payment_method_types[$payment_method_name])
 		) {
 			$this->maybe_register_payment_methods($force_recheck);
 		}
-		if(isset($this->_payment_method_types[$payment_method_name])){
+		if (isset($this->_payment_method_types[$payment_method_name])) {
 			require_once($this->_payment_method_types[$payment_method_name]);
 			return true;
-		}else{
+		} else {
 			return false;
 		}
 	}
@@ -158,16 +158,16 @@ 
 	 * @param boolean $force_recheck whether to force re-checking for new payment method types
 	 * @return array
 	 */
-	public function payment_method_type_names($with_prefixes = FALSE, $force_recheck = FALSE ){
+	public function payment_method_type_names($with_prefixes = FALSE, $force_recheck = FALSE) {
 		$this->maybe_register_payment_methods($force_recheck);
-		if($with_prefixes){
+		if ($with_prefixes) {
 			$classnames = array_keys($this->_payment_method_types);
 			$payment_methods = array();
-			foreach($classnames as $classname){
+			foreach ($classnames as $classname) {
 				$payment_methods[] = $this->payment_method_class_from_type($classname);
 			}
 			return $payment_methods;
-		}else{
+		} else {
 			return array_keys($this->_payment_method_types);
 		}
 	}
@@ -177,10 +177,10 @@ 
 	 * @param boolean $force_recheck whether to force re-checking for new payment method types
 	 * @return EE_PMT_Base[]
 	 */
-	public function payment_method_types( $force_recheck = FALSE ){
+	public function payment_method_types($force_recheck = FALSE) {
 		$this->maybe_register_payment_methods($force_recheck);
 		$pmt_objs = array();
-		foreach($this->payment_method_type_names(true) as $classname){
+		foreach ($this->payment_method_type_names(true) as $classname) {
 			$pmt_objs[] = new $classname;
 		}
 		return $pmt_objs;
@@ -192,8 +192,8 @@ 
 	 * @param string $classname
 	 * @return string
 	 */
-	public function payment_method_type_sans_class_prefix($classname){
-		return str_replace( "EE_PMT_", "", $classname );
+	public function payment_method_type_sans_class_prefix($classname) {
+		return str_replace("EE_PMT_", "", $classname);
 	}
 
 	/**
@@ -201,7 +201,7 @@ 
 	 * @param string $type
 	 * @return string
 	 */
-	public function payment_method_class_from_type($type){
+	public function payment_method_class_from_type($type) {
 		$this->maybe_register_payment_methods();
 		return "EE_PMT_".$type;
 	}
@@ -215,39 +215,39 @@ 
 	 * @return \EE_Payment_Method
 	 * @throws \EE_Error
 	 */
-	public function activate_a_payment_method_of_type( $payment_method_type ){
+	public function activate_a_payment_method_of_type($payment_method_type) {
 		$payment_method = EEM_Payment_Method::instance()->get_one_of_type($payment_method_type);
-		if( ! $payment_method instanceof EE_Payment_Method ){
+		if ( ! $payment_method instanceof EE_Payment_Method) {
 			$pm_type_class = $this->payment_method_class_from_type($payment_method_type);
-			if(class_exists($pm_type_class)){
+			if (class_exists($pm_type_class)) {
 				/** @var $pm_type_obj EE_PMT_Base */
 				$pm_type_obj = new $pm_type_class;
 				$payment_method = EEM_Payment_Method::instance()->get_one_by_slug($pm_type_obj->system_name());
-				if( ! $payment_method){
-					$payment_method = $this->create_payment_method_of_type( $pm_type_obj );
+				if ( ! $payment_method) {
+					$payment_method = $this->create_payment_method_of_type($pm_type_obj);
 				}
-				$payment_method->set_type( $payment_method_type );
-				$this->initialize_payment_method( $payment_method );
+				$payment_method->set_type($payment_method_type);
+				$this->initialize_payment_method($payment_method);
 			} else {
 				throw new EE_Error(
 					sprintf(
-						__( 'There is no payment method of type %1$s, so it could not be activated', 'event_espresso'),
+						__('There is no payment method of type %1$s, so it could not be activated', 'event_espresso'),
 						$pm_type_class )
 				);
 			}
 		}
 		$payment_method->set_active();
 		$payment_method->save();
-		$this->set_usable_currencies_on_payment_method( $payment_method );
-		if( $payment_method->type() === 'Invoice' ){
+		$this->set_usable_currencies_on_payment_method($payment_method);
+		if ($payment_method->type() === 'Invoice') {
 			/** @type EE_Message_Resource_Manager $message_resource_manager */
-			$message_resource_manager = EE_Registry::instance()->load_lib( 'Message_Resource_Manager' );
-			$message_resource_manager->ensure_message_type_is_active( 'invoice', 'html' );
-			$message_resource_manager->ensure_messenger_is_active( 'pdf' );
+			$message_resource_manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
+			$message_resource_manager->ensure_message_type_is_active('invoice', 'html');
+			$message_resource_manager->ensure_messenger_is_active('pdf');
 			EE_Error::add_attention(
 				sprintf(
-					__( 'Note, when the invoice payment method is activated, the invoice message type, html messenger, and pdf messenger are activated as well for the %1$smessages system%2$s.', 'event_espresso' ),
-					'<a href="' . admin_url( 'admin.php?page=espresso_messages') . '">',
+					__('Note, when the invoice payment method is activated, the invoice message type, html messenger, and pdf messenger are activated as well for the %1$smessages system%2$s.', 'event_espresso'),
+					'<a href="'.admin_url('admin.php?page=espresso_messages').'">',
 					'</a>'
 				)
 			);
@@ -265,17 +265,17 @@ 
 	 * @return EE_Payment_Method
 	 * @throws \EE_Error
 	 */
-	public function create_payment_method_of_type( $pm_type_obj ) {
+	public function create_payment_method_of_type($pm_type_obj) {
 		global $current_user;
 		$payment_method = EE_Payment_Method::new_instance(
 			array(
 				'PMD_type' 		 => $pm_type_obj->system_name(),
 				'PMD_name' 		 => $pm_type_obj->pretty_name(),
 				'PMD_admin_name' => $pm_type_obj->pretty_name(),
-				'PMD_slug' 		 => $pm_type_obj->system_name(),//automatically converted to slug
+				'PMD_slug' 		 => $pm_type_obj->system_name(), //automatically converted to slug
 				'PMD_wp_user' 	 => $current_user->ID,
 				'PMD_order' 	 => EEM_Payment_Method::instance()->count(
-					array( array( 'PMD_type' => array( '!=', 'Admin_Only' )))
+					array(array('PMD_type' => array('!=', 'Admin_Only')))
 				) * 10,
 			)
 		);
@@ -291,21 +291,21 @@ 
 	 * @return EE_Payment_Method
 	 * @throws \EE_Error
 	 */
-	public function initialize_payment_method( $payment_method ) {
+	public function initialize_payment_method($payment_method) {
 		$pm_type_obj = $payment_method->type_obj();
-		$payment_method->set_description( $pm_type_obj->default_description() );
-		if( ! $payment_method->button_url() ){
-			$payment_method->set_button_url( $pm_type_obj->default_button_url() );
+		$payment_method->set_description($pm_type_obj->default_description());
+		if ( ! $payment_method->button_url()) {
+			$payment_method->set_button_url($pm_type_obj->default_button_url());
 		}
 		//now add setup its default extra meta properties
 		$extra_metas = $pm_type_obj->settings_form()->extra_meta_inputs();
-		if ( ! empty( $extra_metas ) ) {
+		if ( ! empty($extra_metas)) {
 			//verify the payment method has an ID before adding extra meta
-			if ( ! $payment_method->ID() ) {
+			if ( ! $payment_method->ID()) {
 				$payment_method->save();
 			}
-			foreach ( $extra_metas as $meta_name => $input ) {
-				$payment_method->update_extra_meta( $meta_name, $input->raw_value() );
+			foreach ($extra_metas as $meta_name => $input) {
+				$payment_method->update_extra_meta($meta_name, $input->raw_value());
 			}
 		}
 		return $payment_method;
@@ -320,8 +320,8 @@ 
 	 * @return EE_Payment_Method
 	 * @throws \EE_Error
 	 */
-	public function set_usable_currencies_on_payment_method( $payment_method ) {
-		foreach($payment_method->get_all_usable_currencies() as $currency_obj){
+	public function set_usable_currencies_on_payment_method($payment_method) {
+		foreach ($payment_method->get_all_usable_currencies() as $currency_obj) {
 			$payment_method->_add_relation_to($currency_obj, 'Currency');
 		}
 		return $payment_method;
@@ -339,19 +339,19 @@ 
 	 *
 	 * @return int count of rows updated.
 	 */
-	public function deactivate_payment_method( $payment_method_slug ) {
+	public function deactivate_payment_method($payment_method_slug) {
 		EE_Log::instance()->log(
 				__FILE__,
 				__FUNCTION__,
 				sprintf(
-					__( 'Payment method with slug %1$s is being deactivated by site admin', 'event_espresso' ),
+					__('Payment method with slug %1$s is being deactivated by site admin', 'event_espresso'),
 					$payment_method_slug
 				),
 				'payment_method_change'
 			);
 		$count_updated = EEM_Payment_Method::instance()->update(
-			array( 'PMD_scope' => array() ),
-			array( array( 'PMD_slug' => $payment_method_slug ) )
+			array('PMD_scope' => array()),
+			array(array('PMD_slug' => $payment_method_slug))
 		);
 		return $count_updated;
 	}
@@ -365,7 +365,7 @@ 
 	 * @param array $caps capabilities being filtered
 	 * @return array
 	 */
-	public function add_payment_method_caps( $caps ) {
+	public function add_payment_method_caps($caps) {
 		/* add dynamic caps from payment methods
 		 * at the time of writing, october 20 2014, these are the caps added:
 		 * ee_payment_method_admin_only
@@ -380,7 +380,7 @@ 
 		 * their related capability automatically added too, so long as they are
 		 * registered properly using EE_Register_Payment_Method::register()
 		 */
-		foreach( $this->payment_method_types() as $payment_method_type_obj ){
+		foreach ($this->payment_method_types() as $payment_method_type_obj) {
 			$caps['administrator'][] = $payment_method_type_obj->cap_name();
 		}
 		return $caps;

core/libraries/form_sections/strategies/validation/EE_Simple_HTML_Validation_Strategy.strategy.php

Spacing +11 added lines, -11 removed lines

@@ -10,17 +10,17 @@ 
  * @since 				4.6
  *
  */
-class EE_Simple_HTML_Validation_Strategy extends EE_Validation_Strategy_Base{
+class EE_Simple_HTML_Validation_Strategy extends EE_Validation_Strategy_Base {
 
 	/**
 	 * @param null $validation_error_message
 	 */
-	public function __construct( $validation_error_message = NULL ) {
-		if( ! $validation_error_message ){
+	public function __construct($validation_error_message = NULL) {
+		if ( ! $validation_error_message) {
 			$allowedtags = $this->_get_allowed_tags();
-			$validation_error_message = sprintf( __( "Only simple HTML tags are allowed. Eg, %s", "event_espresso" ), implode( ",", array_keys( $allowedtags ) ) );
+			$validation_error_message = sprintf(__("Only simple HTML tags are allowed. Eg, %s", "event_espresso"), implode(",", array_keys($allowedtags)));
 		}
-		parent::__construct( $validation_error_message );
+		parent::__construct($validation_error_message);
 	}
 
 
@@ -43,8 +43,8 @@ 
 	 */
 	public function get_list_of_allowed_tags() {
 		$allowed_tags = $this->_get_allowed_tags();
-		ksort( $allowed_tags );
-		return implode( ', ', array_keys( $allowed_tags ) );
+		ksort($allowed_tags);
+		return implode(', ', array_keys($allowed_tags));
 	}
 
 
@@ -55,10 +55,10 @@ 
 	 */
 	public function validate($normalized_value) {
 		$allowedtags = $this->_get_allowed_tags();
-		parent::validate( $normalized_value );
-		$normalized_value_sans_tags =  wp_kses( "$normalized_value",$allowedtags );
-		if ( strlen( $normalized_value ) > strlen( $normalized_value_sans_tags ) ) {
-			throw new EE_Validation_Error( $this->get_validation_error_message(), 'complex_html_tags' );
+		parent::validate($normalized_value);
+		$normalized_value_sans_tags = wp_kses("$normalized_value", $allowedtags);
+		if (strlen($normalized_value) > strlen($normalized_value_sans_tags)) {
+			throw new EE_Validation_Error($this->get_validation_error_message(), 'complex_html_tags');
 		}
 	}
 }
\ No newline at end of file

core/libraries/batch/JobHandlers/AttendeesReport.php

Spacing +35 added lines, -35 removed lines

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

modules/ticket_selector/EED_Ticket_Selector.module.php

Spacing +206 added lines, -206 removed lines

@@ -57,15 +57,15 @@ 
 	 * @return EED_Ticket_Selector
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
 
-	protected function set_config(){
-		$this->set_config_section( 'template_settings' );
-		$this->set_config_class( 'EE_Ticket_Selector_Config' );
-		$this->set_config_name( 'EED_Ticket_Selector' );
+	protected function set_config() {
+		$this->set_config_section('template_settings');
+		$this->set_config_class('EE_Ticket_Selector_Config');
+		$this->set_config_name('EED_Ticket_Selector');
 	}
 
 
@@ -80,14 +80,14 @@ 
 	 */
 	public static function set_hooks() {
 		// routing
-		EE_Config::register_route( 'iframe', 'EED_Ticket_Selector', 'ticket_selector_iframe', 'ticket_selector' );
-		EE_Config::register_route( 'process_ticket_selections', 'EED_Ticket_Selector', 'process_ticket_selections' );
-		add_action( 'wp_loaded', array( 'EED_Ticket_Selector', 'set_definitions' ), 2 );
+		EE_Config::register_route('iframe', 'EED_Ticket_Selector', 'ticket_selector_iframe', 'ticket_selector');
+		EE_Config::register_route('process_ticket_selections', 'EED_Ticket_Selector', 'process_ticket_selections');
+		add_action('wp_loaded', array('EED_Ticket_Selector', 'set_definitions'), 2);
 		//add_action( 'AHEE_event_details_before_post', array( 'EED_Ticket_Selector', 'ticket_selector_form_open' ), 10, 1 );
-		add_action( 'AHEE_event_details_header_bottom', array( 'EED_Ticket_Selector', 'display_ticket_selector' ), 10, 1 );
+		add_action('AHEE_event_details_header_bottom', array('EED_Ticket_Selector', 'display_ticket_selector'), 10, 1);
 		//add_action( 'AHEE__ticket_selector_chart__template__after_ticket_selector', array( 'EED_Ticket_Selector', 'display_ticket_selector_submit' ), 10, 1 );
 		//add_action( 'AHEE_event_details_after_post', array( 'EED_Ticket_Selector', 'ticket_selector_form_close' ), 10 );
-		add_action( 'wp_enqueue_scripts', array( 'EED_Ticket_Selector', 'load_tckt_slctr_assets' ), 10 );
+		add_action('wp_enqueue_scripts', array('EED_Ticket_Selector', 'load_tckt_slctr_assets'), 10);
 	}
 
 
@@ -99,10 +99,10 @@ 
 	 *  @return 	void
 	 */
 	public static function set_hooks_admin() {
-		add_action( 'wp_loaded', array( 'EED_Ticket_Selector', 'set_definitions' ), 2 );
+		add_action('wp_loaded', array('EED_Ticket_Selector', 'set_definitions'), 2);
 		//add button for iframe code to event editor.
-		add_filter( 'get_sample_permalink_html', array( 'EED_Ticket_Selector', 'iframe_code_button' ), 10, 4 );
-		add_action( 'admin_enqueue_scripts', array( 'EED_Ticket_Selector', 'load_tckt_slctr_assets_admin' ), 10 );
+		add_filter('get_sample_permalink_html', array('EED_Ticket_Selector', 'iframe_code_button'), 10, 4);
+		add_action('admin_enqueue_scripts', array('EED_Ticket_Selector', 'load_tckt_slctr_assets_admin'), 10);
 	}
 
 
@@ -114,15 +114,15 @@ 
 	 *  @return 	void
 	 */
 	public static function set_definitions() {
-		define( 'TICKET_SELECTOR_ASSETS_URL', plugin_dir_url( __FILE__ ) . 'assets' . DS );
-		define( 'TICKET_SELECTOR_TEMPLATES_PATH', str_replace( '\\', DS, plugin_dir_path( __FILE__ )) . 'templates' . DS );
+		define('TICKET_SELECTOR_ASSETS_URL', plugin_dir_url(__FILE__).'assets'.DS);
+		define('TICKET_SELECTOR_TEMPLATES_PATH', str_replace('\\', DS, plugin_dir_path(__FILE__)).'templates'.DS);
 
 		//if config is not set, initialize
 		//If config is not set, set it.
-		if ( ! isset( EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector ) ) {
+		if ( ! isset(EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector)) {
 			EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector = new EE_Ticket_Selector_Config();
 		}
-		EE_Registry::$i18n_js_strings[ 'ts_embed_iframe_title' ] = __( 'Copy and Paste the following:', 'event_espresso' );
+		EE_Registry::$i18n_js_strings['ts_embed_iframe_title'] = __('Copy and Paste the following:', 'event_espresso');
 	}
 
 
@@ -133,7 +133,7 @@ 
 	 * 	@param	object 			$WP
 	 * 	@return 	void
 	 */
-	public function run( $WP ) {}
+	public function run($WP) {}
 
 
 	/**
@@ -145,23 +145,23 @@ 
 	public function ticket_selector_iframe() {
 		self::$_in_iframe = true;
 		/** @type EEM_Event $EEM_Event */
-		$EEM_Event = EE_Registry::instance()->load_model( 'Event' );
+		$EEM_Event = EE_Registry::instance()->load_model('Event');
 		$event = $EEM_Event->get_one_by_ID(
-			EE_Registry::instance()->REQ->get( 'event', 0 )
+			EE_Registry::instance()->REQ->get('event', 0)
 		);
-		EE_Registry::instance()->REQ->set_espresso_page( true );
-		$template_args['ticket_selector'] = EED_Ticket_Selector::display_ticket_selector( $event );
+		EE_Registry::instance()->REQ->set_espresso_page(true);
+		$template_args['ticket_selector'] = EED_Ticket_Selector::display_ticket_selector($event);
 		$template_args['css'] = apply_filters(
 			'FHEE__EED_Ticket_Selector__ticket_selector_iframe__css',
 			array(
-				TICKET_SELECTOR_ASSETS_URL . 'ticket_selector_embed.css?ver=' . EVENT_ESPRESSO_VERSION,
-				TICKET_SELECTOR_ASSETS_URL . 'ticket_selector.css?ver=' . EVENT_ESPRESSO_VERSION,
-				includes_url( 'css/dashicons.min.css?ver=' . $GLOBALS['wp_version'] ),
-				EE_GLOBAL_ASSETS_URL . 'css/espresso_default.css?ver=' . EVENT_ESPRESSO_VERSION
+				TICKET_SELECTOR_ASSETS_URL.'ticket_selector_embed.css?ver='.EVENT_ESPRESSO_VERSION,
+				TICKET_SELECTOR_ASSETS_URL.'ticket_selector.css?ver='.EVENT_ESPRESSO_VERSION,
+				includes_url('css/dashicons.min.css?ver='.$GLOBALS['wp_version']),
+				EE_GLOBAL_ASSETS_URL.'css/espresso_default.css?ver='.EVENT_ESPRESSO_VERSION
 			)
 		);
-		EE_Registry::$i18n_js_strings[ 'ticket_selector_iframe' ] = true;
-		EE_Registry::$i18n_js_strings[ 'EEDTicketSelectorMsg' ] = __( 'Please choose at least one ticket before continuing.', 'event_espresso' );
+		EE_Registry::$i18n_js_strings['ticket_selector_iframe'] = true;
+		EE_Registry::$i18n_js_strings['EEDTicketSelectorMsg'] = __('Please choose at least one ticket before continuing.', 'event_espresso');
 		$template_args['eei18n'] = apply_filters(
 			'FHEE__EED_Ticket_Selector__ticket_selector_iframe__eei18n_js_strings',
 			EE_Registry::localize_i18n_js_strings()
@@ -169,18 +169,18 @@ 
 		$template_args['js'] = apply_filters(
 			'FHEE__EED_Ticket_Selector__ticket_selector_iframe__js',
 			array(
-				includes_url( 'js/jquery/jquery.js?ver=' . $GLOBALS['wp_version'] ),
-				EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js?ver=' . EVENT_ESPRESSO_VERSION,
-				TICKET_SELECTOR_ASSETS_URL . 'ticket_selector_iframe_embed.js?ver=' . EVENT_ESPRESSO_VERSION
+				includes_url('js/jquery/jquery.js?ver='.$GLOBALS['wp_version']),
+				EE_GLOBAL_ASSETS_URL.'scripts/espresso_core.js?ver='.EVENT_ESPRESSO_VERSION,
+				TICKET_SELECTOR_ASSETS_URL.'ticket_selector_iframe_embed.js?ver='.EVENT_ESPRESSO_VERSION
 			)
 		);
-		$template_args[ 'notices' ] = EEH_Template::display_template(
-			EE_TEMPLATES . 'espresso-ajax-notices.template.php',
+		$template_args['notices'] = EEH_Template::display_template(
+			EE_TEMPLATES.'espresso-ajax-notices.template.php',
 			array(),
 			true
 		);
 		EEH_Template::display_template(
-			TICKET_SELECTOR_TEMPLATES_PATH . 'ticket_selector_chart_iframe.template.php',
+			TICKET_SELECTOR_TEMPLATES_PATH.'ticket_selector_chart_iframe.template.php',
 			$template_args
 		);
 		exit;
@@ -199,23 +199,23 @@ 
 	 *
 	 * @return string The new html string for the permalink area.
 	 */
-	public static function iframe_code_button( $permalink_string, $id, $new_title, $new_slug ) {
+	public static function iframe_code_button($permalink_string, $id, $new_title, $new_slug) {
 		//make sure this is ONLY when editing and the event id has been set.
-		if ( ! empty( $id ) )  {
-			$post = get_post( $id );
+		if ( ! empty($id)) {
+			$post = get_post($id);
 
 			//if NOT event then let's get out.
-			if ( $post->post_type !== 'espresso_events' ) {
+			if ($post->post_type !== 'espresso_events') {
 				return $permalink_string;
 			}
 
-			$ticket_selector_url = add_query_arg( array( 'ticket_selector' => 'iframe', 'event' => $id ), site_url() );
+			$ticket_selector_url = add_query_arg(array('ticket_selector' => 'iframe', 'event' => $id), site_url());
 
-			$permalink_string .= '<a id="js-ticket-selector-embed-trigger" class="button button-small" href="#"  tabindex="-1">' . __('Embed', 'event_espresso') . '</a> ';
+			$permalink_string .= '<a id="js-ticket-selector-embed-trigger" class="button button-small" href="#"  tabindex="-1">'.__('Embed', 'event_espresso').'</a> ';
 			$permalink_string .= '
 <div id="js-ts-iframe" style="display:none">
 	<div style="width:100%; height: 500px;">
-		<iframe src="' . $ticket_selector_url . '" width="100%" height="100%"></iframe>
+		<iframe src="' . $ticket_selector_url.'" width="100%" height="100%"></iframe>
 	</div>
 </div>';
 		}
@@ -234,22 +234,22 @@ 
 	 * @param 	mixed $event
 	 * @return 	bool
 	 */
-	protected static function set_event( $event = null ) {
-		if( $event === null ) {
+	protected static function set_event($event = null) {
+		if ($event === null) {
 			global $post;
 			$event = $post;
 		}
-		if ( $event instanceof EE_Event ) {
+		if ($event instanceof EE_Event) {
 			self::$_event = $event;
-		} else if ( $event instanceof WP_Post && isset( $event->EE_Event ) && $event->EE_Event instanceof EE_Event ) {
+		} else if ($event instanceof WP_Post && isset($event->EE_Event) && $event->EE_Event instanceof EE_Event) {
 			self::$_event = $event->EE_Event;
-		} else if ( $event instanceof WP_Post && $event->post_type == 'espresso_events' ) {
-			$event->EE_Event = EEM_Event::instance()->instantiate_class_from_post_object( $event );
+		} else if ($event instanceof WP_Post && $event->post_type == 'espresso_events') {
+			$event->EE_Event = EEM_Event::instance()->instantiate_class_from_post_object($event);
 			self::$_event = $event->EE_Event;
 		} else {
-			$user_msg = __( 'No Event object or an invalid Event object was supplied.', 'event_espresso' );
-			$dev_msg = $user_msg . __( 'In order to generate a ticket selector, please ensure you are passing either an EE_Event object or a WP_Post object of the post type "espresso_event" to the EE_Ticket_Selector class constructor.', 'event_espresso' );
-			EE_Error::add_error( $user_msg . '||' . $dev_msg, __FILE__, __FUNCTION__, __LINE__ );
+			$user_msg = __('No Event object or an invalid Event object was supplied.', 'event_espresso');
+			$dev_msg = $user_msg.__('In order to generate a ticket selector, please ensure you are passing either an EE_Event object or a WP_Post object of the post type "espresso_event" to the EE_Ticket_Selector class constructor.', 'event_espresso');
+			EE_Error::add_error($user_msg.'||'.$dev_msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		return true;
@@ -268,11 +268,11 @@ 
 	 * @param 	bool 	$view_details
 	 * @return 	string
 	 */
-	public static function display_ticket_selector( $event = NULL, $view_details = FALSE ) {
+	public static function display_ticket_selector($event = NULL, $view_details = FALSE) {
 		// reset filter for displaying submit button
-		remove_filter( 'FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true' );
+		remove_filter('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true');
 		// poke and prod incoming event till it tells us what it is
-		if ( ! EED_Ticket_Selector::set_event( $event )) {
+		if ( ! EED_Ticket_Selector::set_event($event)) {
 			return false;
 		}
 		$event_post = self::$_event instanceof EE_Event ? self::$_event->ID() : $event;
@@ -283,7 +283,7 @@ 
 			&& (
 				! self::$_event->display_ticket_selector()
 				|| $view_details
-				|| post_password_required( $event_post )
+				|| post_password_required($event_post)
 				|| (
 					$_event_active_status != EE_Datetime::active
 					&& $_event_active_status != EE_Datetime::upcoming
@@ -301,68 +301,68 @@ 
 		$template_args = array();
 		$template_args['event_status'] = $_event_active_status;
 
-		$template_args['date_format'] = apply_filters( 'FHEE__EED_Ticket_Selector__display_ticket_selector__date_format', get_option( 'date_format' ) );
-		$template_args['time_format'] = apply_filters( 'FHEE__EED_Ticket_Selector__display_ticket_selector__time_format', get_option( 'time_format' ) );
+		$template_args['date_format'] = apply_filters('FHEE__EED_Ticket_Selector__display_ticket_selector__date_format', get_option('date_format'));
+		$template_args['time_format'] = apply_filters('FHEE__EED_Ticket_Selector__display_ticket_selector__time_format', get_option('time_format'));
 
 		$template_args['EVT_ID'] = self::$_event->ID();
 		$template_args['event'] = self::$_event;
 
 		// is the event expired ?
 		$template_args['event_is_expired'] = self::$_event->is_expired();
-		if ( $template_args['event_is_expired'] ) {
-			return '<div class="ee-event-expired-notice"><span class="important-notice">' . __( 'We\'re sorry, but all tickets sales have ended because the event is expired.', 'event_espresso' ) . '</span></div>';
+		if ($template_args['event_is_expired']) {
+			return '<div class="ee-event-expired-notice"><span class="important-notice">'.__('We\'re sorry, but all tickets sales have ended because the event is expired.', 'event_espresso').'</span></div>';
 		}
 
 		$ticket_query_args = array(
-			array( 'Datetime.EVT_ID' => self::$_event->ID() ),
-			'order_by' => array( 'TKT_order' => 'ASC', 'TKT_required' => 'DESC', 'TKT_start_date' => 'ASC', 'TKT_end_date' => 'ASC' , 'Datetime.DTT_EVT_start' => 'DESC' )
+			array('Datetime.EVT_ID' => self::$_event->ID()),
+			'order_by' => array('TKT_order' => 'ASC', 'TKT_required' => 'DESC', 'TKT_start_date' => 'ASC', 'TKT_end_date' => 'ASC', 'Datetime.DTT_EVT_start' => 'DESC')
 		);
 
-		if ( ! EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_expired_tickets ) {
+		if ( ! EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_expired_tickets) {
 			//use the correct applicable time query depending on what version of core is being run.
-			$current_time = method_exists( 'EEM_Datetime', 'current_time_for_query' ) ? time() : current_time('timestamp');
-			$ticket_query_args[0]['TKT_end_date'] = array( '>', $current_time );
+			$current_time = method_exists('EEM_Datetime', 'current_time_for_query') ? time() : current_time('timestamp');
+			$ticket_query_args[0]['TKT_end_date'] = array('>', $current_time);
 		}
 
 		// get all tickets for this event ordered by the datetime
-		$template_args['tickets'] = EEM_Ticket::instance()->get_all( $ticket_query_args );
+		$template_args['tickets'] = EEM_Ticket::instance()->get_all($ticket_query_args);
 
-		if ( count( $template_args['tickets'] ) < 1 ) {
-			return '<div class="ee-event-expired-notice"><span class="important-notice">' . __( 'We\'re sorry, but all ticket sales have ended.', 'event_espresso' ) . '</span></div>';
+		if (count($template_args['tickets']) < 1) {
+			return '<div class="ee-event-expired-notice"><span class="important-notice">'.__('We\'re sorry, but all ticket sales have ended.', 'event_espresso').'</span></div>';
 		}
 
 		// filter the maximum qty that can appear in the Ticket Selector qty dropdowns
-		$template_args['max_atndz'] = apply_filters('FHEE__EE_Ticket_Selector__display_ticket_selector__max_tickets', self::$_event->additional_limit() );
-		if ( $template_args['max_atndz'] < 1 ) {
-			$sales_closed_msg = __( 'We\'re sorry, but ticket sales have been closed at this time. Please check back again later.', 'event_espresso' );
-			if ( current_user_can( 'edit_post', self::$_event->ID() )) {
-				$sales_closed_msg .=  sprintf(
-					__( '%sNote to Event Admin:%sThe "Maximum number of tickets allowed per order for this event" in the Event Registration Options has been set to "0". This effectively turns off ticket sales. %s(click to edit this event)%s', 'event_espresso' ),
+		$template_args['max_atndz'] = apply_filters('FHEE__EE_Ticket_Selector__display_ticket_selector__max_tickets', self::$_event->additional_limit());
+		if ($template_args['max_atndz'] < 1) {
+			$sales_closed_msg = __('We\'re sorry, but ticket sales have been closed at this time. Please check back again later.', 'event_espresso');
+			if (current_user_can('edit_post', self::$_event->ID())) {
+				$sales_closed_msg .= sprintf(
+					__('%sNote to Event Admin:%sThe "Maximum number of tickets allowed per order for this event" in the Event Registration Options has been set to "0". This effectively turns off ticket sales. %s(click to edit this event)%s', 'event_espresso'),
 					'<div class="ee-attention" style="text-align: left;"><b>',
 					'</b><br />',
-					$link = '<span class="edit-link"><a class="post-edit-link" href="' . get_edit_post_link( self::$_event->ID() ) . '">',
+					$link = '<span class="edit-link"><a class="post-edit-link" href="'.get_edit_post_link(self::$_event->ID()).'">',
 					'</a></span></div>'
 				);
 			}
-			return '<p><span class="important-notice">' . $sales_closed_msg . '</span></p>';
+			return '<p><span class="important-notice">'.$sales_closed_msg.'</span></p>';
 		}
 
-		$templates['ticket_selector'] = TICKET_SELECTOR_TEMPLATES_PATH . 'ticket_selector_chart.template.php';
-		$templates['ticket_selector'] = apply_filters( 'FHEE__EE_Ticket_Selector__display_ticket_selector__template_path', $templates['ticket_selector'], self::$_event );
+		$templates['ticket_selector'] = TICKET_SELECTOR_TEMPLATES_PATH.'ticket_selector_chart.template.php';
+		$templates['ticket_selector'] = apply_filters('FHEE__EE_Ticket_Selector__display_ticket_selector__template_path', $templates['ticket_selector'], self::$_event);
 
 		// redirecting to another site for registration ??
 		$external_url = self::$_event->external_url() !== NULL || self::$_event->external_url() !== '' ? self::$_event->external_url() : FALSE;
 		// set up the form (but not for the admin)
-		$ticket_selector = ! is_admin() ? EED_Ticket_Selector::ticket_selector_form_open( self::$_event->ID(), $external_url ) : '';
+		$ticket_selector = ! is_admin() ? EED_Ticket_Selector::ticket_selector_form_open(self::$_event->ID(), $external_url) : '';
 		// if not redirecting to another site for registration
-		if ( ! $external_url ) {
+		if ( ! $external_url) {
 			// then display the ticket selector
-			$ticket_selector .= EEH_Template::locate_template( $templates['ticket_selector'], $template_args );
+			$ticket_selector .= EEH_Template::locate_template($templates['ticket_selector'], $template_args);
 		} else {
 			// if not we still need to trigger the display of the submit button
-			add_filter( 'FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true' );
+			add_filter('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true');
 			//display notice to admin that registration is external
-			$ticket_selector .= ! is_admin() ? '' : __( 'Registration is at an external URL for this event.', 'event_espresso' );
+			$ticket_selector .= ! is_admin() ? '' : __('Registration is at an external URL for this event.', 'event_espresso');
 		}
 		// submit button and form close tag
 		$ticket_selector .= ! is_admin() ? EED_Ticket_Selector::display_ticket_selector_submit() : '';
@@ -382,25 +382,25 @@ 
 	 * @param 		string $external_url
 	 * @return 		string
 	 */
-	public static function ticket_selector_form_open( $ID = 0, $external_url = '' ) {
+	public static function ticket_selector_form_open($ID = 0, $external_url = '') {
 		// if redirecting, we don't need any anything else
-		if ( $external_url ) {
-			$html = '<form method="GET" action="' . EEH_URL::refactor_url( $external_url ) . '">';
-			$query_args = EEH_URL::get_query_string( $external_url );
-			foreach ( $query_args as $query_arg => $value ) {
-				$html .= '<input type="hidden" name="' . $query_arg . '" value="' . $value . '">';
+		if ($external_url) {
+			$html = '<form method="GET" action="'.EEH_URL::refactor_url($external_url).'">';
+			$query_args = EEH_URL::get_query_string($external_url);
+			foreach ($query_args as $query_arg => $value) {
+				$html .= '<input type="hidden" name="'.$query_arg.'" value="'.$value.'">';
 			}
 			return $html;
 		}
-		$checkout_url = EEH_Event_View::event_link_url( $ID );
-		if ( ! $checkout_url ) {
-			EE_Error::add_error( __('The URL for the Event Details page could not be retrieved.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		$checkout_url = EEH_Event_View::event_link_url($ID);
+		if ( ! $checkout_url) {
+			EE_Error::add_error(__('The URL for the Event Details page could not be retrieved.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
 		$extra_params = self::$_in_iframe ? ' target="_blank"' : '';
-		$html = '<form method="POST" action="' . $checkout_url . '"' . $extra_params . '>';
-		$html .= wp_nonce_field( 	'process_ticket_selections', 'process_ticket_selections_nonce', TRUE, FALSE );
+		$html = '<form method="POST" action="'.$checkout_url.'"'.$extra_params.'>';
+		$html .= wp_nonce_field('process_ticket_selections', 'process_ticket_selections_nonce', TRUE, FALSE);
 		$html .= '<input type="hidden" name="ee" value="process_ticket_selections">';
-		$html = apply_filters( 'FHEE__EE_Ticket_Selector__ticket_selector_form_open__html', $html, self::$_event );
+		$html = apply_filters('FHEE__EE_Ticket_Selector__ticket_selector_form_open__html', $html, self::$_event);
 		return $html;
 	}
 
@@ -415,23 +415,23 @@ 
 	 * 	@return		string
 	 */
 	public static function display_ticket_selector_submit() {
-		if ( ! is_admin() ) {
-			if ( apply_filters( 'FHEE__EE_Ticket_Selector__display_ticket_selector_submit', FALSE ) ) {
+		if ( ! is_admin()) {
+			if (apply_filters('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', FALSE)) {
 				$btn_text = apply_filters(
 					'FHEE__EE_Ticket_Selector__display_ticket_selector_submit__btn_text',
-					__('Register Now', 'event_espresso' ),
+					__('Register Now', 'event_espresso'),
 					self::$_event
 				);
 				$external_url = self::$_event->external_url();
-				$html = '<input id="ticket-selector-submit-'. self::$_event->ID() .'-btn"';
+				$html = '<input id="ticket-selector-submit-'.self::$_event->ID().'-btn"';
 				$html .= ' class="ticket-selector-submit-btn ';
-				$html .= empty( $external_url ) ? 'ticket-selector-submit-ajax"' : '"';
-				$html .= ' type="submit" value="' . $btn_text . '" />';
-				$html .= apply_filters( 'FHEE__EE_Ticket_Selector__after_ticket_selector_submit', '', self::$_event );
+				$html .= empty($external_url) ? 'ticket-selector-submit-ajax"' : '"';
+				$html .= ' type="submit" value="'.$btn_text.'" />';
+				$html .= apply_filters('FHEE__EE_Ticket_Selector__after_ticket_selector_submit', '', self::$_event);
 				$html .= '<div class="clear"><br/></div></form>';
 				return $html;
-			} else if ( is_archive() ) {
-				return EED_Ticket_Selector::ticket_selector_form_close() . EED_Ticket_Selector::display_view_details_btn();
+			} else if (is_archive()) {
+				return EED_Ticket_Selector::ticket_selector_form_close().EED_Ticket_Selector::display_view_details_btn();
 			}
 		}
 		return '';
@@ -463,13 +463,13 @@ 
 	 * 	@return		string
 	 */
 	public static function display_view_details_btn() {
-		if ( ! self::$_event->get_permalink() ) {
-			EE_Error::add_error( __('The URL for the Event Details page could not be retrieved.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! self::$_event->get_permalink()) {
+			EE_Error::add_error(__('The URL for the Event Details page could not be retrieved.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
-		$view_details_btn = '<form method="POST" action="' . self::$_event->get_permalink() . '">';
-		$btn_text = apply_filters( 'FHEE__EE_Ticket_Selector__display_view_details_btn__btn_text', __( 'View Details', 'event_espresso' ), self::$_event );
-		$view_details_btn .= '<input id="ticket-selector-submit-'. self::$_event->ID() .'-btn" class="ticket-selector-submit-btn view-details-btn" type="submit" value="' . $btn_text . '" />';
-		$view_details_btn .= apply_filters( 'FHEE__EE_Ticket_Selector__after_view_details_btn', '', self::$_event );
+		$view_details_btn = '<form method="POST" action="'.self::$_event->get_permalink().'">';
+		$btn_text = apply_filters('FHEE__EE_Ticket_Selector__display_view_details_btn__btn_text', __('View Details', 'event_espresso'), self::$_event);
+		$view_details_btn .= '<input id="ticket-selector-submit-'.self::$_event->ID().'-btn" class="ticket-selector-submit-btn view-details-btn" type="submit" value="'.$btn_text.'" />';
+		$view_details_btn .= apply_filters('FHEE__EE_Ticket_Selector__after_view_details_btn', '', self::$_event);
 		$view_details_btn .= '<div class="clear"><br/></div>';
 		$view_details_btn .= '</form>';
 		return $view_details_btn;
@@ -488,11 +488,11 @@ 
 	 * 	@return		array  or FALSE
 	 */
 	public function process_ticket_selections() {
-		do_action( 'EED_Ticket_Selector__process_ticket_selections__before' );
+		do_action('EED_Ticket_Selector__process_ticket_selections__before');
 		// check nonce
-		if ( ! is_admin() && ( ! EE_Registry::instance()->REQ->is_set( 'process_ticket_selections_nonce' ) || ! wp_verify_nonce( EE_Registry::instance()->REQ->get( 'process_ticket_selections_nonce' ), 'process_ticket_selections' ))) {
+		if ( ! is_admin() && ( ! EE_Registry::instance()->REQ->is_set('process_ticket_selections_nonce') || ! wp_verify_nonce(EE_Registry::instance()->REQ->get('process_ticket_selections_nonce'), 'process_ticket_selections'))) {
 			EE_Error::add_error(
-				sprintf( __( 'We\'re sorry but your request failed to pass a security check.%sPlease click the back button on your browser and try again.', 'event_espresso' ), '<br/>' ),
+				sprintf(__('We\'re sorry but your request failed to pass a security check.%sPlease click the back button on your browser and try again.', 'event_espresso'), '<br/>'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 			return FALSE;
@@ -506,16 +506,16 @@ 
 
 		//we should really only have 1 registration in the works now (ie, no MER) so clear any previous items in the cart.
 		// When MER happens this will probably need to be tweaked, possibly wrapped in a conditional checking for some constant defined in MER etc.
-		EE_Registry::instance()->load_core( 'Session' );
+		EE_Registry::instance()->load_core('Session');
 		// unless otherwise requested, clear the session
-		if ( apply_filters( 'FHEE__EE_Ticket_Selector__process_ticket_selections__clear_session', TRUE )) {
-			EE_Registry::instance()->SSN->clear_session( __CLASS__, __FUNCTION__ );
+		if (apply_filters('FHEE__EE_Ticket_Selector__process_ticket_selections__clear_session', TRUE)) {
+			EE_Registry::instance()->SSN->clear_session(__CLASS__, __FUNCTION__);
 		}
 		//d( EE_Registry::instance()->SSN );
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		// do we have an event id?
-		if ( EE_Registry::instance()->REQ->is_set( 'tkt-slctr-event-id' ) ) {
+		if (EE_Registry::instance()->REQ->is_set('tkt-slctr-event-id')) {
 			// validate/sanitize data
 			$valid = self::_validate_post_data();
 
@@ -525,41 +525,41 @@ 
 			//EEH_Debug_Tools::printr( $valid[ 'max_atndz' ], 'max_atndz', __FILE__, __LINE__ );
 
 			//check total tickets ordered vs max number of attendees that can register
-			if ( $valid['total_tickets'] > $valid['max_atndz'] ) {
+			if ($valid['total_tickets'] > $valid['max_atndz']) {
 
 				// ordering too many tickets !!!
 				$total_tickets_string = _n('You have attempted to purchase %s ticket.', 'You have attempted to purchase %s tickets.', $valid['total_tickets'], 'event_espresso');
-				$limit_error_1 = sprintf( $total_tickets_string, $valid['total_tickets'] );
+				$limit_error_1 = sprintf($total_tickets_string, $valid['total_tickets']);
 				// dev only message
 				$max_atndz_string = _n('The registration limit for this event is %s ticket per registration, therefore the total number of tickets you may purchase at a time can not exceed %s.', 'The registration limit for this event is %s tickets per registration, therefore the total number of tickets you may purchase at a time can not exceed %s.', $valid['max_atndz'], 'event_espresso');
-				$limit_error_2 = sprintf( $max_atndz_string, $valid['max_atndz'], $valid['max_atndz'] );
-				EE_Error::add_error( $limit_error_1 . '<br/>' . $limit_error_2, __FILE__, __FUNCTION__, __LINE__ );
+				$limit_error_2 = sprintf($max_atndz_string, $valid['max_atndz'], $valid['max_atndz']);
+				EE_Error::add_error($limit_error_1.'<br/>'.$limit_error_2, __FILE__, __FUNCTION__, __LINE__);
 			} else {
 
 				// all data appears to be valid
 				$tckts_slctd = FALSE;
 				$success = TRUE;
 				// load cart
-				EE_Registry::instance()->load_core( 'Cart' );
+				EE_Registry::instance()->load_core('Cart');
 
 				// cycle thru the number of data rows sent from the event listing
-				for ( $x = 0; $x < $valid['rows']; $x++ ) {
+				for ($x = 0; $x < $valid['rows']; $x++) {
 					// does this row actually contain a ticket quantity?
-					if ( isset( $valid['qty'][$x] ) && $valid['qty'][$x] > 0 ) {
+					if (isset($valid['qty'][$x]) && $valid['qty'][$x] > 0) {
 						// YES we have a ticket quantity
 						$tckts_slctd = TRUE;
 						//						d( $valid['ticket_obj'][$x] );
-						if ( $valid['ticket_obj'][$x] instanceof EE_Ticket ) {
+						if ($valid['ticket_obj'][$x] instanceof EE_Ticket) {
 							// then add ticket to cart
-							$ticket_added = self::_add_ticket_to_cart( $valid['ticket_obj'][$x], $valid['qty'][$x] );
+							$ticket_added = self::_add_ticket_to_cart($valid['ticket_obj'][$x], $valid['qty'][$x]);
 							$success = ! $ticket_added ? FALSE : $success;
-							if ( EE_Error::has_error() ) {
+							if (EE_Error::has_error()) {
 								break;
 							}
 						} else {
 							// nothing added to cart retrieved
 							EE_Error::add_error(
-								sprintf( __( 'A valid ticket could not be retrieved for the event.%sPlease click the back button on your browser and try again.', 'event_espresso' ), '<br/>' ),
+								sprintf(__('A valid ticket could not be retrieved for the event.%sPlease click the back button on your browser and try again.', 'event_espresso'), '<br/>'),
 								__FILE__, __FUNCTION__, __LINE__
 							);
 						}
@@ -568,45 +568,45 @@ 
 				//d( EE_Registry::instance()->CART );
 				//die(); // <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< KILL REDIRECT HERE BEFORE CART UPDATE
 
-				if ( $tckts_slctd ) {
-					if ( $success ) {
-						do_action( 'FHEE__EE_Ticket_Selector__process_ticket_selections__before_redirecting_to_checkout', EE_Registry::instance()->CART, $this );
+				if ($tckts_slctd) {
+					if ($success) {
+						do_action('FHEE__EE_Ticket_Selector__process_ticket_selections__before_redirecting_to_checkout', EE_Registry::instance()->CART, $this);
 						EE_Registry::instance()->CART->recalculate_all_cart_totals();
-						EE_Registry::instance()->CART->save_cart( FALSE );
+						EE_Registry::instance()->CART->save_cart(FALSE);
 						EE_Registry::instance()->SSN->update();
 						//d( EE_Registry::instance()->CART );
 						//die(); // <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< OR HERE TO KILL REDIRECT AFTER CART UPDATE
 						// just return TRUE for registrations being made from admin
-						if ( is_admin() ) {
+						if (is_admin()) {
 							return TRUE;
 						}
-						wp_safe_redirect( apply_filters( 'FHEE__EE_Ticket_Selector__process_ticket_selections__success_redirect_url', EE_Registry::instance()->CFG->core->reg_page_url() ));
+						wp_safe_redirect(apply_filters('FHEE__EE_Ticket_Selector__process_ticket_selections__success_redirect_url', EE_Registry::instance()->CFG->core->reg_page_url()));
 						exit();
 
 					} else {
-						if ( ! EE_Error::has_error() ) {
+						if ( ! EE_Error::has_error()) {
 							// nothing added to cart
-							EE_Error::add_attention( __( 'No tickets were added for the event', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+							EE_Error::add_attention(__('No tickets were added for the event', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 						}
 					}
 
 				} else {
 					// no ticket quantities were selected
-					EE_Error::add_error( __( 'You need to select a ticket quantity before you can proceed.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_error(__('You need to select a ticket quantity before you can proceed.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				}
 			}
 			//die(); // <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< KILL BEFORE REDIRECT
 			// at this point, just return if registration is being made from admin
-			if ( is_admin() ) {
+			if (is_admin()) {
 				return FALSE;
 			}
-			if ( $valid['return_url'] ) {
-				EE_Error::get_notices( FALSE, TRUE );
-				wp_safe_redirect( $valid['return_url'] );
+			if ($valid['return_url']) {
+				EE_Error::get_notices(FALSE, TRUE);
+				wp_safe_redirect($valid['return_url']);
 				exit();
-			} elseif ( isset( $event_to_add['id'] )) {
-				EE_Error::get_notices( FALSE, TRUE );
-				wp_safe_redirect( get_permalink( $event_to_add['id'] ));
+			} elseif (isset($event_to_add['id'])) {
+				EE_Error::get_notices(FALSE, TRUE);
+				wp_safe_redirect(get_permalink($event_to_add['id']));
 				exit();
 			} else {
 				echo EE_Error::get_notices();
@@ -615,7 +615,7 @@ 
 		} else {
 			// $_POST['tkt-slctr-event-id'] was not set ?!?!?!?
 			EE_Error::add_error(
-				sprintf( __( 'An event id was not provided or was not received.%sPlease click the back button on your browser and try again.', 'event_espresso' ), '<br/>' ),
+				sprintf(__('An event id was not provided or was not received.%sPlease click the back button on your browser and try again.', 'event_espresso'), '<br/>'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 		}
@@ -633,18 +633,18 @@ 
 	 * @return        array  or FALSE
 	 */
 	private static function _validate_post_data() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		// start with an empty array()
 		$valid_data = array();
 		//		d( $_POST );
 		//if event id is valid
-		$id = absint( EE_Registry::instance()->REQ->get( 'tkt-slctr-event-id' ));
-		if ( $id ) {
+		$id = absint(EE_Registry::instance()->REQ->get('tkt-slctr-event-id'));
+		if ($id) {
 			// grab valid id
 			$valid_data['id'] = $id;
 			// grab and sanitize return-url
-			$valid_data['return_url'] = esc_url_raw( EE_Registry::instance()->REQ->get( 'tkt-slctr-return-url-' . $id ));
+			$valid_data['return_url'] = esc_url_raw(EE_Registry::instance()->REQ->get('tkt-slctr-return-url-'.$id));
 			// array of other form names
 			$inputs_to_clean = array(
 				'event_id' => 'tkt-slctr-event-id',
@@ -657,22 +657,22 @@ 
 			// let's track the total number of tickets ordered.'
 			$valid_data['total_tickets'] = 0;
 			// cycle through $inputs_to_clean array
-			foreach ( $inputs_to_clean as $what => $input_to_clean ) {
+			foreach ($inputs_to_clean as $what => $input_to_clean) {
 				// check for POST data
-				if ( EE_Registry::instance()->REQ->is_set( $input_to_clean . $id )) {
+				if (EE_Registry::instance()->REQ->is_set($input_to_clean.$id)) {
 					// grab value
-					$input_value = EE_Registry::instance()->REQ->get( $input_to_clean . $id );
+					$input_value = EE_Registry::instance()->REQ->get($input_to_clean.$id);
 					switch ($what) {
 
 						// integers
 						case 'event_id':
-							$valid_data[$what] = absint( $input_value );
+							$valid_data[$what] = absint($input_value);
 							// get event via the event id we put in the form
-							$valid_data['event'] = EE_Registry::instance()->load_model( 'Event' )->get_one_by_ID( $valid_data['event_id'] );
+							$valid_data['event'] = EE_Registry::instance()->load_model('Event')->get_one_by_ID($valid_data['event_id']);
 							break;
 						case 'rows':
 						case 'max_atndz':
-							$valid_data[$what] = absint( $input_value );
+							$valid_data[$what] = absint($input_value);
 							break;
 
 						// arrays of integers
@@ -680,27 +680,27 @@ 
 							//							d( $input_value );
 							$row_qty = $input_value;
 							// if qty is coming from a radio button input, then we need to assemble an array of rows
-							if( ! is_array( $row_qty )) {
+							if ( ! is_array($row_qty)) {
 								// get number of rows
-								$rows = EE_Registry::instance()->REQ->is_set( 'tkt-slctr-rows-' . $id ) ? absint( EE_Registry::instance()->REQ->get( 'tkt-slctr-rows-' . $id )) : 1;
+								$rows = EE_Registry::instance()->REQ->is_set('tkt-slctr-rows-'.$id) ? absint(EE_Registry::instance()->REQ->get('tkt-slctr-rows-'.$id)) : 1;
 								//								d( $rows );
 								// explode ints by the dash
-								$row_qty = explode( '-', $row_qty );
-								$row = isset( $row_qty[0] ) ? ( absint( $row_qty[0] )) : 1;
-								$qty = isset( $row_qty[1] ) ? absint( $row_qty[1] ) : 0;
-								$row_qty = array( $row => $qty );
+								$row_qty = explode('-', $row_qty);
+								$row = isset($row_qty[0]) ? (absint($row_qty[0])) : 1;
+								$qty = isset($row_qty[1]) ? absint($row_qty[1]) : 0;
+								$row_qty = array($row => $qty);
 								//								 d( $row_qty );
-								for( $x = 1; $x <= $rows; $x++ ) {
-									if ( ! isset( $row_qty[$x] )) {
+								for ($x = 1; $x <= $rows; $x++) {
+									if ( ! isset($row_qty[$x])) {
 										$row_qty[$x] = 0;
 									}
 								}
 							}
-							ksort( $row_qty );
+							ksort($row_qty);
 							//							 d( $row_qty );
 							// cycle thru values
-							foreach ( $row_qty as $qty ) {
-								$qty = absint( $qty );
+							foreach ($row_qty as $qty) {
+								$qty = absint($qty);
 								// sanitize as integers
 								$valid_data[$what][] = $qty;
 								$valid_data['total_tickets'] += $qty;
@@ -711,19 +711,19 @@ 
 						case 'ticket_id':
 							$value_array = array();
 							// cycle thru values
-							foreach ( $input_value as $key=>$value ) {
+							foreach ($input_value as $key=>$value) {
 								// allow only numbers, letters,  spaces, commas and dashes
-								$value_array[ $key ] = wp_strip_all_tags( $value );
+								$value_array[$key] = wp_strip_all_tags($value);
 								// get ticket via the ticket id we put in the form
-								$ticket_obj = EE_Registry::instance()->load_model( 'Ticket' )->get_one_by_ID( $value );
-								$valid_data['ticket_obj'][ $key ] = $ticket_obj;
+								$ticket_obj = EE_Registry::instance()->load_model('Ticket')->get_one_by_ID($value);
+								$valid_data['ticket_obj'][$key] = $ticket_obj;
 							}
-							$valid_data[ $what ] = $value_array;
+							$valid_data[$what] = $value_array;
 							break;
 
 						case 'return_url' :
 							// grab and sanitize return-url
-							$valid_data[$what] = esc_url_raw( $input_value );
+							$valid_data[$what] = esc_url_raw($input_value);
 							break;
 
 					} 	// end switch $what
@@ -731,7 +731,7 @@ 
 			} 	// end foreach $inputs_to_clean
 
 		} else {
-			EE_Error::add_error( __('The event id provided was not valid.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error(__('The event id provided was not valid.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 
@@ -749,28 +749,28 @@ 
 	 * @param int       $qty
 	 * @return TRUE on success, FALSE on fail
 	 */
-	private static function _add_ticket_to_cart( EE_Ticket $ticket = NULL, $qty = 1 ) {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+	private static function _add_ticket_to_cart(EE_Ticket $ticket = NULL, $qty = 1) {
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		// get the number of spaces left for this datetime ticket
-		$available_spaces = self::_ticket_datetime_availability( $ticket );
+		$available_spaces = self::_ticket_datetime_availability($ticket);
 		// compare available spaces against the number of tickets being purchased
-		if ( $available_spaces >= $qty ) {
+		if ($available_spaces >= $qty) {
 			// allow addons to prevent a ticket from being added to cart
-			if ( ! apply_filters( 'FHEE__EE_Ticket_Selector___add_ticket_to_cart__allow_add_to_cart', true, $ticket, $qty, $available_spaces ) ) {
+			if ( ! apply_filters('FHEE__EE_Ticket_Selector___add_ticket_to_cart__allow_add_to_cart', true, $ticket, $qty, $available_spaces)) {
 				return false;
 			}
 			// add event to cart
-			if( EE_Registry::instance()->CART->add_ticket_to_cart( $ticket, $qty )) {
-				self::_recalculate_ticket_datetime_availability( $ticket, $qty );
+			if (EE_Registry::instance()->CART->add_ticket_to_cart($ticket, $qty)) {
+				self::_recalculate_ticket_datetime_availability($ticket, $qty);
 				return true;
 			} else {
 				return false;
 			}
 		} else {
 			// tickets can not be purchased but let's find the exact number left for the last ticket selected PRIOR to subtracting tickets
-			$available_spaces = self::_ticket_datetime_availability( $ticket, true );
+			$available_spaces = self::_ticket_datetime_availability($ticket, true);
 			// greedy greedy greedy eh?
-			if ( $available_spaces > 0 ) {
+			if ($available_spaces > 0) {
 				// add error messaging - we're using the _n function that will generate the appropriate singular or plural message based on the number of $available_spaces
 				EE_Error::add_error(
 					sprintf(
@@ -786,7 +786,7 @@ 
 					__FILE__, __FUNCTION__, __LINE__
 				);
 			} else {
-				EE_Error::add_error( __('We\'re sorry, but there are no available spaces left for this event at this particular date and time.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error(__('We\'re sorry, but there are no available spaces left for this event at this particular date and time.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			}
 			return false;
 		}
@@ -804,22 +804,22 @@ 
 	 * @param 	bool         $get_original_ticket_spaces
 	 * @return 	int
 	 */
-	private static function _ticket_datetime_availability( EE_Ticket $ticket, $get_original_ticket_spaces = FALSE ) {
+	private static function _ticket_datetime_availability(EE_Ticket $ticket, $get_original_ticket_spaces = FALSE) {
 		// if the $_available_spaces array has not been set up yet...
-		if ( ! isset( self::$_available_spaces['tickets'][ $ticket->ID() ] )) {
-				self::_set_initial_ticket_datetime_availability( $ticket );
+		if ( ! isset(self::$_available_spaces['tickets'][$ticket->ID()])) {
+				self::_set_initial_ticket_datetime_availability($ticket);
 		}
 		$available_spaces = $ticket->qty() - $ticket->sold();
-		if ( isset( self::$_available_spaces['tickets'][ $ticket->ID() ] )) {
+		if (isset(self::$_available_spaces['tickets'][$ticket->ID()])) {
 			// loop thru tickets, which will ALSO include individual ticket records AND a total
-			foreach ( self::$_available_spaces['tickets'][ $ticket->ID() ] as $DTD_ID => $spaces  ) {
+			foreach (self::$_available_spaces['tickets'][$ticket->ID()] as $DTD_ID => $spaces) {
 				// if we want the original datetime availability BEFORE we started subtracting tickets ?
-				if ( $get_original_ticket_spaces ) {
+				if ($get_original_ticket_spaces) {
 					// then grab the available spaces from the "tickets" array and compare with the above to get the lowest number
-					$available_spaces = min( $available_spaces, self::$_available_spaces['tickets'][ $ticket->ID() ][ $DTD_ID ] );
+					$available_spaces = min($available_spaces, self::$_available_spaces['tickets'][$ticket->ID()][$DTD_ID]);
 				} else {
 					// we want the updated ticket availability as stored in the "datetimes" array
-					$available_spaces = min( $available_spaces, self::$_available_spaces['datetimes'][ $DTD_ID ] );
+					$available_spaces = min($available_spaces, self::$_available_spaces['datetimes'][$DTD_ID]);
 				}
 			}
 		}
@@ -835,23 +835,23 @@ 
 	 * @param 	EE_Ticket $ticket
 	 * @return 	int
 	 */
-	private static function _set_initial_ticket_datetime_availability( EE_Ticket $ticket ) {
+	private static function _set_initial_ticket_datetime_availability(EE_Ticket $ticket) {
 		// first, get all of the datetimes that are available to this ticket
 		$datetimes = $ticket->get_many_related(
 			'Datetime',
-			array( array( 'DTT_EVT_end' => array( '>=', EEM_Datetime::instance()->current_time_for_query( 'DTT_EVT_end' ) ) ), 'order_by' => array( 'DTT_EVT_start' => 'ASC' ))
+			array(array('DTT_EVT_end' => array('>=', EEM_Datetime::instance()->current_time_for_query('DTT_EVT_end'))), 'order_by' => array('DTT_EVT_start' => 'ASC'))
 		);
-		if ( ! empty( $datetimes )) {
+		if ( ! empty($datetimes)) {
 			// now loop thru all of the datetimes
-			foreach ( $datetimes as $datetime  ) {
-				if ( $datetime instanceof EE_Datetime ) {
+			foreach ($datetimes as $datetime) {
+				if ($datetime instanceof EE_Datetime) {
 					// the number of spaces available for the datetime without considering individual ticket quantities
 					$spaces_remaining = $datetime->spaces_remaining();
 					// save the total available spaces ( the lesser of the ticket qty minus the number of tickets sold or the datetime spaces remaining) to this ticket using the datetime ID as the key
-					self::$_available_spaces['tickets'][ $ticket->ID() ][ $datetime->ID() ] = min(( $ticket->qty() - $ticket->sold() ), $spaces_remaining );
+					self::$_available_spaces['tickets'][$ticket->ID()][$datetime->ID()] = min(($ticket->qty() - $ticket->sold()), $spaces_remaining);
 					// if the remaining spaces for this datetime is already set, then compare that against the datetime spaces remaining, and take the lowest number,
 					// else just take the datetime spaces remaining, and assign to the datetimes array
-					self::$_available_spaces['datetimes'][ $datetime->ID() ] = isset( self::$_available_spaces['datetimes'][ $datetime->ID() ] ) ? min( self::$_available_spaces['datetimes'][ $datetime->ID() ], $spaces_remaining ) : $spaces_remaining;
+					self::$_available_spaces['datetimes'][$datetime->ID()] = isset(self::$_available_spaces['datetimes'][$datetime->ID()]) ? min(self::$_available_spaces['datetimes'][$datetime->ID()], $spaces_remaining) : $spaces_remaining;
 				}
 			}
 		}
@@ -867,12 +867,12 @@ 
 	 * @param 	int   $qty
 	 * @return 	int
 	 */
-	private static function _recalculate_ticket_datetime_availability( EE_Ticket $ticket, $qty = 0 ) {
-		if ( isset( self::$_available_spaces['tickets'][ $ticket->ID() ] )) {
+	private static function _recalculate_ticket_datetime_availability(EE_Ticket $ticket, $qty = 0) {
+		if (isset(self::$_available_spaces['tickets'][$ticket->ID()])) {
 			// loop thru tickets, which will ALSO include individual ticket records AND a total
-			foreach ( self::$_available_spaces['tickets'][ $ticket->ID() ] as $DTD_ID => $spaces  ) {
+			foreach (self::$_available_spaces['tickets'][$ticket->ID()] as $DTD_ID => $spaces) {
 				// subtract the qty of selected tickets from each datetime's available spaces this ticket has access to,
-				self::$_available_spaces['datetimes'][ $DTD_ID ] = self::$_available_spaces['datetimes'][ $DTD_ID ] - $qty;
+				self::$_available_spaces['datetimes'][$DTD_ID] = self::$_available_spaces['datetimes'][$DTD_ID] - $qty;
 			}
 		}
 	}
@@ -889,8 +889,8 @@ 
 	*/
 	public static function load_tckt_slctr_assets() {
 		// add some style
-		if ( apply_filters( 'FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', FALSE ) ) {
-			wp_register_style('ticket_selector', TICKET_SELECTOR_ASSETS_URL . 'ticket_selector.css');
+		if (apply_filters('FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', FALSE)) {
+			wp_register_style('ticket_selector', TICKET_SELECTOR_ASSETS_URL.'ticket_selector.css');
 			wp_enqueue_style('ticket_selector');
 			// make it dance
 			//			wp_register_script('ticket_selector', TICKET_SELECTOR_ASSETS_URL . 'ticket_selector.js', array('espresso_core'), '', TRUE);
@@ -904,9 +904,9 @@ 
 
 	public static function load_tckt_slctr_assets_admin() {
 		//iframe button js on admin event editor page
-		if ( EE_Registry::instance()->REQ->get('page') == 'espresso_events' && EE_Registry::instance()->REQ->get('action') == 'edit' ) {
-			wp_register_script( 'ticket_selector_embed', TICKET_SELECTOR_ASSETS_URL . 'ticket-selector-embed.js', array( 'ee-dialog' ), EVENT_ESPRESSO_VERSION, true );
-			wp_enqueue_script( 'ticket_selector_embed' );
+		if (EE_Registry::instance()->REQ->get('page') == 'espresso_events' && EE_Registry::instance()->REQ->get('action') == 'edit') {
+			wp_register_script('ticket_selector_embed', TICKET_SELECTOR_ASSETS_URL.'ticket-selector-embed.js', array('ee-dialog'), EVENT_ESPRESSO_VERSION, true);
+			wp_enqueue_script('ticket_selector_embed');
 		}
 	}
 

shortcodes/espresso_txn_page/EES_Espresso_Txn_Page.shortcode.php

Spacing +17 added lines, -17 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {exit('No direct script access allowed');}
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {exit('No direct script access allowed'); }
 /**
  * EES_Espresso_Txn_Page
  *
@@ -27,7 +27,7 @@ 
 	 *  @return 	void
 	 */
 	public static function set_hooks() {
-		add_action( 'wp_loaded', array( 'EES_Espresso_Txn_Page', 'set_definitions' ), 2 );
+		add_action('wp_loaded', array('EES_Espresso_Txn_Page', 'set_definitions'), 2);
 	}
 
 	/**
@@ -48,8 +48,8 @@ 
 	 *  @return 	void
 	 */
 	public static function set_definitions() {
-		define( 'TXN_PAGE_ASSETS_URL', plugin_dir_url( __FILE__ ) . 'assets' . DS );
-		define( 'TXN_PAGE_TEMPLATES_PATH', str_replace( '\\', DS, plugin_dir_path( __FILE__ )) . 'templates' . DS );
+		define('TXN_PAGE_ASSETS_URL', plugin_dir_url(__FILE__).'assets'.DS);
+		define('TXN_PAGE_TEMPLATES_PATH', str_replace('\\', DS, plugin_dir_path(__FILE__)).'templates'.DS);
 	}
 
 
@@ -66,21 +66,21 @@ 
 	 * @throws \Exception
 	 * @throws \EE_Error
 	 */
-	public function run( WP $WP ) {
+	public function run(WP $WP) {
 		$this->_current_txn = null;
-		if ( EE_Registry::instance()->REQ->is_set('e_reg_url_link' )){
+		if (EE_Registry::instance()->REQ->is_set('e_reg_url_link')) {
 			/** @var EEM_Transaction $EEM_Transaction */
-			$EEM_Transaction = EE_Registry::instance()->load_model( 'Transaction' );
+			$EEM_Transaction = EE_Registry::instance()->load_model('Transaction');
 			$this->_current_txn = $EEM_Transaction->get_transaction_from_reg_url_link();
 		}
-		if ( $this->_current_txn instanceof EE_Transaction ) {
+		if ($this->_current_txn instanceof EE_Transaction) {
 			$payment_method = null;
-			$payment_method_slug = EE_Registry::instance()->REQ->get( 'ee_payment_method', null );
-			if( $payment_method_slug ) {
-				$payment_method = EEM_Payment_Method::instance()->get_one_by_slug( $payment_method_slug );
+			$payment_method_slug = EE_Registry::instance()->REQ->get('ee_payment_method', null);
+			if ($payment_method_slug) {
+				$payment_method = EEM_Payment_Method::instance()->get_one_by_slug($payment_method_slug);
 			}
 
-			if ( $payment_method instanceof EE_Payment_Method && $payment_method->is_off_site() ) {
+			if ($payment_method instanceof EE_Payment_Method && $payment_method->is_off_site()) {
 				$gateway = $payment_method->type_obj()->get_gateway();
 				if (
 					$gateway instanceof EE_Offsite_Gateway
@@ -90,12 +90,12 @@ 
 					)
 				) {
 					/** @type EE_Payment_Processor $payment_processor */
-					$payment_processor = EE_Registry::instance()->load_core( 'Payment_Processor' );
-					$payment_processor->process_ipn( $_REQUEST, $this->_current_txn, $payment_method );
+					$payment_processor = EE_Registry::instance()->load_core('Payment_Processor');
+					$payment_processor->process_ipn($_REQUEST, $this->_current_txn, $payment_method);
 				}
 			}
 			//allow gateways to add a filter to stop rendering the page
-			if( apply_filters( 'FHEE__EES_Espresso_Txn_Page__run__exit', FALSE ) ){
+			if (apply_filters('FHEE__EES_Espresso_Txn_Page__run__exit', FALSE)) {
 				exit;
 			}
 		}
@@ -112,8 +112,8 @@ 
 	 *  @param		array 	$attributes
 	 *  @return 	string
 	 */
-	public function process_shortcode( $attributes = array() ) {
-		return __( 'This is the Event Espresso Transactions page. This page receives instant payment notification (IPN) requests and should have a status of published, but should not be easily accessible by site visitors. Do not add it to your website\'s navigation menu or link to it from another page. Also, do not delete it or change its status to private.', 'event_espresso' );
+	public function process_shortcode($attributes = array()) {
+		return __('This is the Event Espresso Transactions page. This page receives instant payment notification (IPN) requests and should have a status of published, but should not be easily accessible by site visitors. Do not add it to your website\'s navigation menu or link to it from another page. Also, do not delete it or change its status to private.', 'event_espresso');
 	}
 
 

core/libraries/form_sections/payment_methods/EE_Billing_Attendee_Info_Form.form.php

Spacing +51 added lines, -51 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -14,31 +14,31 @@ 
  * @author				Mike Nelson
  *
  */
-class EE_Billing_Attendee_Info_Form extends EE_Billing_Info_Form{
+class EE_Billing_Attendee_Info_Form extends EE_Billing_Info_Form {
 
 	/**
 	 *
 	 * @param EE_Payment_Method $payment_method
 	 * @param array $options_array @see EE_Form_Section_Proper::__construct()
 	 */
-	public function __construct( EE_Payment_Method $payment_method, $options_array= array()){
+	public function __construct(EE_Payment_Method $payment_method, $options_array = array()) {
 		$options_array['subsections'] = array_merge(
 			array(
-				'first_name' 	=> new EE_Text_Input( array( 'required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-fname', 'html_label_text' => __( 'First Name', 'event_espresso' ) ) ),
-				'last_name'		=> new EE_Text_Input( array( 'required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-lname', 'html_label_text' => __( 'Last Name', 'event_espresso' ) ) ),
-				'email'				=> new EE_Email_Input( array( 'required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-email', 'html_label_text' => __( 'Email', 'event_espresso' ) ) ),
-				'address'			=> new EE_Text_Input( array( 'html_label_text'=>  __( 'Address', 'event_espresso'), 'required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-address' )),
-				'address2'		=> new EE_Text_Input( array( 'html_label_text'=> __( 'Address 2', 'event_espresso'), 'html_class' => 'ee-billing-qstn ee-billing-qstn-address2' )),
-				'city'					=> new EE_Text_Input( array( 'required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-city', 'html_label_text' => __( 'City', 'event_espresso' ) ) ),
-				'state' 				=> apply_filters( 'FHEE__EE_Billing_Attendee_Info_Form__state_field', new EE_State_Select_Input( NULL, array( 'required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-state', 'html_label_text' => __( 'State', 'event_espresso' ) ) ) ),
-				'country' 			=> apply_filters( 'FHEE__EE_Billing_Attendee_Info_Form__country_field', new EE_Country_Select_Input( NULL, array( 'required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-country', 'html_label_text' => __( 'Country', 'event_espresso' ) ) ) ),
-				'zip'					=> new EE_Text_Input( array( 'required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-zip', 'html_label_text' => __( 'Zip', 'event_espresso' ) ) ),
-				'phone'			=> new EE_Text_Input( array( 'html_class' => 'ee-billing-qstn ee-billing-qstn-phone', 'html_label_text' => __( 'Phone', 'event_espresso' ) )),
+				'first_name' 	=> new EE_Text_Input(array('required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-fname', 'html_label_text' => __('First Name', 'event_espresso'))),
+				'last_name'		=> new EE_Text_Input(array('required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-lname', 'html_label_text' => __('Last Name', 'event_espresso'))),
+				'email'				=> new EE_Email_Input(array('required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-email', 'html_label_text' => __('Email', 'event_espresso'))),
+				'address'			=> new EE_Text_Input(array('html_label_text'=>  __('Address', 'event_espresso'), 'required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-address')),
+				'address2'		=> new EE_Text_Input(array('html_label_text'=> __('Address 2', 'event_espresso'), 'html_class' => 'ee-billing-qstn ee-billing-qstn-address2')),
+				'city'					=> new EE_Text_Input(array('required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-city', 'html_label_text' => __('City', 'event_espresso'))),
+				'state' 				=> apply_filters('FHEE__EE_Billing_Attendee_Info_Form__state_field', new EE_State_Select_Input(NULL, array('required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-state', 'html_label_text' => __('State', 'event_espresso')))),
+				'country' 			=> apply_filters('FHEE__EE_Billing_Attendee_Info_Form__country_field', new EE_Country_Select_Input(NULL, array('required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-country', 'html_label_text' => __('Country', 'event_espresso')))),
+				'zip'					=> new EE_Text_Input(array('required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-zip', 'html_label_text' => __('Zip', 'event_espresso'))),
+				'phone'			=> new EE_Text_Input(array('html_class' => 'ee-billing-qstn ee-billing-qstn-phone', 'html_label_text' => __('Phone', 'event_espresso'))),
 			),
-			isset( $options_array['subsections'] ) ? $options_array['subsections'] : array()
+			isset($options_array['subsections']) ? $options_array['subsections'] : array()
 		);
 
-		parent::__construct( $payment_method, $options_array );
+		parent::__construct($payment_method, $options_array);
 
 	}
 
@@ -46,11 +46,11 @@ 
 	 * Sets the defaults for the billing form according to the attendee's details
 	 * @param EE_Attendee $attendee
 	 */
-	public function populate_from_attendee( $attendee ){
+	public function populate_from_attendee($attendee) {
 		$attendee = EEM_Attendee::instance()->ensure_is_obj($attendee);
 		/** @var $attendee EE_Attendee */
 		$this->populate_defaults( 
-			apply_filters( 'FHEE__EE_Billing_Attendee_Info_Form__populate_from_attendee',
+			apply_filters('FHEE__EE_Billing_Attendee_Info_Form__populate_from_attendee',
 				array(
 					'first_name'=>$attendee->fname(),
 					'last_name'=>$attendee->lname(),
@@ -78,48 +78,48 @@ 
 	 * @param \EE_Attendee $attendee - the attendee object to copy details to
 	 * @return \EE_Attendee
 	 */
-	public function copy_billing_form_data_to_attendee( EE_Attendee $attendee ){
+	public function copy_billing_form_data_to_attendee(EE_Attendee $attendee) {
 		// grab billing form data
 		$data = $this->valid_data();
 		// copy first_name
-		if ( ! empty( $data['first_name'] )) {
-			$attendee->set_fname( $data['first_name'] );
+		if ( ! empty($data['first_name'])) {
+			$attendee->set_fname($data['first_name']);
 		}
 		// copy last_name
-		if ( ! empty( $data['last_name'] )) {
-			$attendee->set_lname( $data['last_name'] );
+		if ( ! empty($data['last_name'])) {
+			$attendee->set_lname($data['last_name']);
 		}
 		// copy email
-		if ( ! empty( $data['email'] )) {
-			$attendee->set_email( $data['email'] );
+		if ( ! empty($data['email'])) {
+			$attendee->set_email($data['email']);
 		}
 		// copy address
-		if ( ! empty( $data['address'] )) {
-			$attendee->set_address( $data['address'] );
+		if ( ! empty($data['address'])) {
+			$attendee->set_address($data['address']);
 		}
 		// copy address2
-		if ( ! empty( $data['address2'] )) {
-			$attendee->set_address2( $data['address2'] );
+		if ( ! empty($data['address2'])) {
+			$attendee->set_address2($data['address2']);
 		}
 		// copy city
-		if ( ! empty( $data['city'] )) {
-			$attendee->set_city( $data['city'] );
+		if ( ! empty($data['city'])) {
+			$attendee->set_city($data['city']);
 		}
 		// copy state
-		if ( ! empty( $data['state'] )) {
-			$attendee->set_state( $data['state'] );
+		if ( ! empty($data['state'])) {
+			$attendee->set_state($data['state']);
 		}
 		// copy country
-		if ( ! empty( $data['country'] )) {
-			$attendee->set_country( $data['country'] );
+		if ( ! empty($data['country'])) {
+			$attendee->set_country($data['country']);
 		}
 		// copy zip
-		if ( ! empty( $data['zip'] )) {
-			$attendee->set_zip( $data['zip'] );
+		if ( ! empty($data['zip'])) {
+			$attendee->set_zip($data['zip']);
 		}
 		// copy phone
-		if ( ! empty( $data['phone'] )) {
-			$attendee->set_phone( $data['phone'] );
+		if ( ! empty($data['phone'])) {
+			$attendee->set_phone($data['phone']);
 		}
 		return $attendee;
 	}
@@ -130,20 +130,20 @@ 
 	 * uses info from the billing form to create a new attendee
 	 * @return \EE_Attendee
 	 */
-	public function create_attendee_from_billing_form_data(){
+	public function create_attendee_from_billing_form_data() {
 		// grab billing form data
 		$data = $this->valid_data();
-		return EE_Attendee::new_instance( array(
-			'ATT_fname' 		=> ! empty( $data['first_name'] ) ? $data['first_name'] : '',
-			'ATT_lname' 		=> ! empty( $data['last_name'] ) ? $data['last_name'] : '',
-			'ATT_email' 		=> ! empty( $data['email'] ) ? $data['email'] : '',
-			'ATT_address' 		=> ! empty( $data['address'] ) ? $data['address'] : '',
-			'ATT_address2' 	=> ! empty( $data['address2'] ) ? $data['address2'] : '',
-			'ATT_city' 			=> ! empty( $data['city'] ) ? $data['city'] : '',
-			'STA_ID' 				=> ! empty( $data['state'] ) ? $data['state'] : '',
-			'CNT_ISO' 			=> ! empty( $data['country'] ) ? $data['country'] : '',
-			'ATT_zip' 				=> ! empty( $data['zip'] ) ? $data['zip'] : '',
-			'ATT_phone' 		=> ! empty( $data['phone'] ) ? $data['phone'] : '',
+		return EE_Attendee::new_instance(array(
+			'ATT_fname' 		=> ! empty($data['first_name']) ? $data['first_name'] : '',
+			'ATT_lname' 		=> ! empty($data['last_name']) ? $data['last_name'] : '',
+			'ATT_email' 		=> ! empty($data['email']) ? $data['email'] : '',
+			'ATT_address' 		=> ! empty($data['address']) ? $data['address'] : '',
+			'ATT_address2' 	=> ! empty($data['address2']) ? $data['address2'] : '',
+			'ATT_city' 			=> ! empty($data['city']) ? $data['city'] : '',
+			'STA_ID' 				=> ! empty($data['state']) ? $data['state'] : '',
+			'CNT_ISO' 			=> ! empty($data['country']) ? $data['country'] : '',
+			'ATT_zip' 				=> ! empty($data['zip']) ? $data['zip'] : '',
+			'ATT_phone' 		=> ! empty($data['phone']) ? $data['phone'] : '',
 		));
 	}
 }

core/helpers/EEH_Template.helper.php

Spacing +202 added lines, -202 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,50 +407,50 @@ 
 	 * @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 = (float) $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;
 				}
 
 				// 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;
 	}
@@ -465,11 +465,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];
 	}
 
 
@@ -482,9 +482,9 @@ 
 	 * @param string  $icon
 	 * @return string 	the html output for the button
 	 */
-	public static function get_button_or_link( $url, $label, $class = 'button-primary', $icon = '' ) {
-		$label = ! empty( $icon ) ? '<span class="' . $icon . '"></span>' . $label : $label;
-		$button = '<a id="' . sanitize_title_with_dashes($label) . '" href="' . $url . '" class="' . $class . '">' . $label . '</a>';
+	public static function get_button_or_link($url, $label, $class = 'button-primary', $icon = '') {
+		$label = ! empty($icon) ? '<span class="'.$icon.'"></span>'.$label : $label;
+		$button = '<a id="'.sanitize_title_with_dashes($label).'" href="'.$url.'" class="'.$class.'">'.$label.'</a>';
 		return $button;
 	}
 
@@ -501,21 +501,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>';
 	}
 
 
@@ -527,31 +527,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 {
@@ -559,7 +559,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>';
@@ -580,31 +580,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;
 	}
 
@@ -617,8 +617,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)) {
@@ -631,10 +631,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
@@ -648,7 +648,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
@@ -678,8 +678,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);
 	}
 
 
@@ -703,13 +703,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(
@@ -717,68 +717,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">',
@@ -787,29 +787,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>';
 	}
 
 
@@ -825,7 +825,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
 	 *
@@ -837,21 +837,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