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/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/admin/EE_Admin_Page_CPT.core.php

Braces +49 added lines, -28 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * EE_Admin_Page_CPT class
  *
@@ -236,8 +238,9 @@ 
 
 		$containers = array();
 
-		if ( empty( $wp_meta_boxes ) )
-			return;
+		if ( empty( $wp_meta_boxes ) ) {
+					return;
+		}
 
 		$current_metaboxes = isset( $wp_meta_boxes[$this->page_slug] ) ? $wp_meta_boxes[$this->page_slug] : array();
 
@@ -341,8 +344,9 @@ 
 
 
 		//this is a filter that allows the addition of extra html after the permalink field on the wp post edit-form
-		if ( method_exists( $this, 'extra_permalink_field_buttons' ) )
-			add_filter('get_sample_permalink_html', array( $this, 'extra_permalink_field_buttons' ), 10, 4 );
+		if ( method_exists( $this, 'extra_permalink_field_buttons' ) ) {
+					add_filter('get_sample_permalink_html', array( $this, 'extra_permalink_field_buttons' ), 10, 4 );
+		}
 
 		//add preview button
 		add_filter('get_sample_permalink_html', array($this, 'preview_button_html'), 5, 4 );
@@ -352,12 +356,14 @@ 
 		add_action('post_submitbox_misc_actions', array($this, 'custom_post_stati_dropdown' ), 10 );
 
 		//This allows adding additional information to the publish post submitbox on the wp post edit form
-		if ( method_exists( $this, 'extra_misc_actions_publish_box' ) )
-			add_action('post_submitbox_misc_actions', array( $this, 'extra_misc_actions_publish_box' ), 10 );
+		if ( method_exists( $this, 'extra_misc_actions_publish_box' ) ) {
+					add_action('post_submitbox_misc_actions', array( $this, 'extra_misc_actions_publish_box' ), 10 );
+		}
 
 		//This allows for adding additional stuff after the title field on the wp post edit form.  This is also before the wp_editor for post description field.
-		if ( method_exists( $this, 'edit_form_after_title' ) )
-			add_action('edit_form_after_title', array( $this, 'edit_form_after_title' ), 10 );
+		if ( method_exists( $this, 'edit_form_after_title' ) ) {
+					add_action('edit_form_after_title', array( $this, 'edit_form_after_title' ), 10 );
+		}
 
 
 		/**
@@ -548,7 +554,9 @@ 
 
 
 		//make sure we define doing autosave (cause WP isn't triggering this we want to make sure we define it)
-		if ( !defined('DOING_AUTOSAVE') ) define('DOING_AUTOSAVE', true);
+		if ( !defined('DOING_AUTOSAVE') ) {
+			define('DOING_AUTOSAVE', true);
+		}
 
 		//if we made it here then the nonce checked out.  Let's run our methods and actions
 		if ( method_exists( $this, '_ee_autosave_' . $this->_current_view ) ) {
@@ -578,8 +586,9 @@ 
 	protected function _extend_page_config_for_cpt() {
 
 		//before doing anything we need to make sure this runs ONLY when the loaded page matches the set page_slug
-		if ( ( isset( $this->_req_data['page'] ) && $this->_req_data['page'] != $this->page_slug ) )
-			return;
+		if ( ( isset( $this->_req_data['page'] ) && $this->_req_data['page'] != $this->page_slug ) ) {
+					return;
+		}
 
 		//set page routes and page config but ONLY if we're not viewing a custom setup cpt route as defined in _cpt_routes
 		if ( !empty( $this->_cpt_object ) ) {
@@ -611,8 +620,9 @@ 
 		}
 
 		//load the next section only if this is a matching cpt route as set in the cpt routes array.
-		if ( !isset( $this->_cpt_routes[$this->_req_action] ) )
-			return;
+		if ( !isset( $this->_cpt_routes[$this->_req_action] ) ) {
+					return;
+		}
 
 
 		$this->_cpt_route = isset( $this->_cpt_routes[$this->_req_action] ) ? TRUE : FALSE;
@@ -896,8 +906,10 @@ 
 			}
 		}
 
-		if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE )
-			return; //TODO we'll remove this after reimplementing autosave in 4.2
+		if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
+					return;
+		}
+		//TODO we'll remove this after reimplementing autosave in 4.2
 		$this->_insert_update_cpt_item( $post_id, $post );
 	}
 
@@ -974,7 +986,9 @@ 
 	 */
 	public function modify_current_screen() {
 		//ONLY do this if the current page_route IS a cpt route
-		if ( !$this->_cpt_route ) return;
+		if ( !$this->_cpt_route ) {
+			return;
+		}
 		//routing things REALLY early b/c this is a cpt admin page
 		set_current_screen( $this->_cpt_routes[$this->_req_action]);
 		$this->_current_screen = get_current_screen();
@@ -1014,8 +1028,9 @@ 
 	public function add_shortlink_button_to_editor( $shortlink, $id, $context, $allow_slugs ) {
 		if ( !empty( $id ) && '' != get_option('permalink_structure') ) {
 			$post = get_post( $id );
-			if ( isset($post->post_type) && $this->page_slug == $post->post_type )
-			$shortlink = home_url('?p=' . $post->ID);
+			if ( isset($post->post_type) && $this->page_slug == $post->post_type ) {
+						$shortlink = home_url('?p=' . $post->ID);
+			}
 		}
 		return $shortlink;
 	}
@@ -1028,7 +1043,9 @@ 
 	 * @return void
 	 */
 	public function route_admin_request() {
-		if ( $this->_cpt_route ) return;
+		if ( $this->_cpt_route ) {
+			return;
+		}
 		try {
 			$this->_route_admin_request();
 		} catch ( EE_Error $e ) {
@@ -1067,8 +1084,9 @@ 
 		$rev_id = isset($this->_req_data['revision']) ? $this->_req_data['revision'] : NULL;
 
 		//can't do anything without revision so let's get out if not present
-		if ( empty( $rev_id ) )
-			return $location;
+		if ( empty( $rev_id ) ) {
+					return $location;
+		}
 
 		//get rev_post_data
 		$rev = get_post($rev_id);
@@ -1097,8 +1115,9 @@ 
 	 */
 	public function modify_edit_post_link( $link, $id, $context ) {
 		$post = get_post( $id );
-		if ( !isset( $this->_req_data['action'] ) || !isset( $this->_cpt_routes[$this->_req_data['action']] ) || $post->post_type !== $this->_cpt_routes[$this->_req_data['action']] )
-			return $link;
+		if ( !isset( $this->_req_data['action'] ) || !isset( $this->_cpt_routes[$this->_req_data['action']] ) || $post->post_type !== $this->_cpt_routes[$this->_req_data['action']] ) {
+					return $link;
+		}
 		$query_args = array(
 			'action' => isset($this->_cpt_edit_routes[$post->post_type]) ? $this->_cpt_edit_routes[$post->post_type] : 'edit',
 			'post' => $id
@@ -1118,8 +1137,9 @@ 
 	 */
 	public function modify_delete_post_link( $delete_link, $post_id, $force_delete ) {
 		$post = get_post($post_id);
-		if ( !isset( $this->_req_data['action'] ) || ( isset( $this->_cpt_routes[$this->_req_data['action']] ) && $post->post_type !== $this->_cpt_routes[$this->_req_data['action']] ) )
-			return $delete_link;
+		if ( !isset( $this->_req_data['action'] ) || ( isset( $this->_cpt_routes[$this->_req_data['action']] ) && $post->post_type !== $this->_cpt_routes[$this->_req_data['action']] ) ) {
+					return $delete_link;
+		}
 
 		return add_query_arg( array('current_route' => 'trash' ), $delete_link );
 	}
@@ -1133,8 +1153,9 @@ 
 	 * @return string           url to redirect to
 	 */
 	public function cpt_trash_post_location_redirect( $location, $status ) {
-		if ( isset( $this->_req_data['action'] ) && $this->_req_data['action'] !== 'trash' && empty( $this->_req_data['post'] ) )
-			return $location;
+		if ( isset( $this->_req_data['action'] ) && $this->_req_data['action'] !== 'trash' && empty( $this->_req_data['post'] ) ) {
+					return $location;
+		}
 
 		$post = get_post( $this->_req_data['post'] );
 		$query_args = array( 'action' => 'default' );

Indentation +11 added lines, -11 removed lines

@@ -78,8 +78,8 @@ 
 
 
 	/**
-	* @var EE_CPT_Base
-	*/
+	 * @var EE_CPT_Base
+	 */
 	protected $_cpt_model_obj = FALSE;
 
 
@@ -659,12 +659,12 @@ 
 		$model = null;
 		if (
 			empty( $this->_cpt_model_names )
-		    || (
-			     ! $ignore_route_check
-			     && ! isset( $this->_cpt_routes[ $this->_req_action ] )
-		    ) || (
-			     $this->_cpt_model_obj instanceof EE_CPT_Base
-			     && $this->_cpt_model_obj->ID() === $id
+			|| (
+				 ! $ignore_route_check
+				 && ! isset( $this->_cpt_routes[ $this->_req_action ] )
+			) || (
+				 $this->_cpt_model_obj instanceof EE_CPT_Base
+				 && $this->_cpt_model_obj->ID() === $id
 			)
 		) {
 			EE_Admin::debug_log( __METHOD__, array( '**RETURN**' => true ) );
@@ -906,9 +906,9 @@ 
 		//if our cpt object is not instantiated and its NOT the same post_id as what is triggering this callback, then exit.
 		if ( $update
 			&& (
-			     ! $this->_cpt_model_obj instanceof EE_CPT_Base
-			     || $this->_cpt_model_obj->ID() !== $post_id
-		     )
+				 ! $this->_cpt_model_obj instanceof EE_CPT_Base
+				 || $this->_cpt_model_obj->ID() !== $post_id
+			 )
 		) {
 			return;
 		}

Spacing +250 added lines, -250 removed lines

@@ -113,7 +113,7 @@ 
 	 * @param  object $post    The post object of the cpt that was saved.
 	 * @return void
 	 */
-	abstract protected function _insert_update_cpt_item( $post_id, $post );
+	abstract protected function _insert_update_cpt_item($post_id, $post);
 
 
 
@@ -126,7 +126,7 @@ 
 	 * @param  string $post_id The ID of the cpt that was trashed
 	 * @return void
 	 */
-	abstract public function trash_cpt_item( $post_id );
+	abstract public function trash_cpt_item($post_id);
 
 
 
@@ -137,7 +137,7 @@ 
 	 * @param  string $post_id theID of the cpt that was untrashed
 	 * @return void
 	 */
-	abstract public function restore_cpt_item( $post_id );
+	abstract public function restore_cpt_item($post_id);
 
 
 
@@ -148,7 +148,7 @@ 
 	 * @param  string $post_id the ID of the cpt that was deleted
 	 * @return void
 	 */
-	abstract public function delete_cpt_item( $post_id );
+	abstract public function delete_cpt_item($post_id);
 
 
 
@@ -161,32 +161,32 @@ 
 	 */
 	protected function _before_page_setup() {
 
-		$page = isset( $this->_req_data['page'] ) ? $this->_req_data['page'] : $this->page_slug;
+		$page = isset($this->_req_data['page']) ? $this->_req_data['page'] : $this->page_slug;
 
-		$this->_cpt_routes = array_merge(array('create_new'=>$this->page_slug, 'edit' => $this->page_slug, 'trash' => $this->page_slug), $this->_cpt_routes );
+		$this->_cpt_routes = array_merge(array('create_new'=>$this->page_slug, 'edit' => $this->page_slug, 'trash' => $this->page_slug), $this->_cpt_routes);
 
 		//let's see if the current route has a value for cpt_object_slug if it does we use that instead of the page
-		$this->_cpt_object = isset($this->_req_data['action']) && isset( $this->_cpt_routes[$this->_req_data['action']] ) ? get_post_type_object($this->_cpt_routes[$this->_req_data['action']]) : get_post_type_object( $page );
+		$this->_cpt_object = isset($this->_req_data['action']) && isset($this->_cpt_routes[$this->_req_data['action']]) ? get_post_type_object($this->_cpt_routes[$this->_req_data['action']]) : get_post_type_object($page);
 
 		//tweak pagenow for page loading.
-		if( ! $this->_pagenow_map ) {
+		if ( ! $this->_pagenow_map) {
 			$this->_pagenow_map = array(
 				'create_new' => 'post-new.php',
 				'edit' => 'post.php',
 				'trash' => 'post.php'
 				);
 		}
-		add_action( 'current_screen', array( $this, 'modify_pagenow') );
+		add_action('current_screen', array($this, 'modify_pagenow'));
 
 
 		//TODO the below will need to be reworked to account for the cpt routes that are NOT based off of page but action param.
 		//get current page from autosave
-		$current_page = isset( $this->_req_data['ee_autosave_data']['ee-cpt-hidden-inputs']['current_page'] ) ? $this->_req_data['ee_autosave_data']['ee-cpt-hidden-inputs']['current_page'] : NULL;
-		$this->_current_page = isset( $this->_req_data['current_page'] ) ? $this->_req_data['current_page'] : $current_page;
+		$current_page = isset($this->_req_data['ee_autosave_data']['ee-cpt-hidden-inputs']['current_page']) ? $this->_req_data['ee_autosave_data']['ee-cpt-hidden-inputs']['current_page'] : NULL;
+		$this->_current_page = isset($this->_req_data['current_page']) ? $this->_req_data['current_page'] : $current_page;
 
 
 		//autosave... make sure its only for the correct page
-		if ( !empty($this->_current_page ) && $this->_current_page == $this->page_slug ) {
+		if ( ! empty($this->_current_page) && $this->_current_page == $this->page_slug) {
 			//setup autosave ajax hook
 			//add_action('wp_ajax_ee-autosave', array( $this, 'do_extra_autosave_stuff' ), 10 ); //TODO reactivate when 4.2 autosave is implemented
 		}
@@ -202,10 +202,10 @@ 
 	 *
 	 * @return void
 	 */
-	public function modify_pagenow( $current_screen ) {
+	public function modify_pagenow($current_screen) {
 		global $pagenow;
 		//possibly reset pagenow.
-		if ( ! empty( $this->_req_data['page'] ) && $this->_req_data['page'] == $this->page_slug && !empty( $this->_req_data['action'] ) && isset( $this->_pagenow_map[$this->_req_data['action'] ] ) ) {
+		if ( ! empty($this->_req_data['page']) && $this->_req_data['page'] == $this->page_slug && ! empty($this->_req_data['action']) && isset($this->_pagenow_map[$this->_req_data['action']])) {
 			$pagenow = $this->_pagenow_map[$this->_req_data['action']];
 		}
 	}
@@ -220,8 +220,8 @@ 
 	 * @param  array $ids an array of ids for containers that hold form inputs we want autosave to pickup.  Typically you would send along the id of a metabox container.
 	 * @return void
 	 */
-	protected function _register_autosave_containers( $ids ) {
-		$this->_autosave_containers = array_merge( $this->_autosave_fields, (array) $ids );
+	protected function _register_autosave_containers($ids) {
+		$this->_autosave_containers = array_merge($this->_autosave_fields, (array) $ids);
 	}
 
 
@@ -236,22 +236,22 @@ 
 
 		$containers = array();
 
-		if ( empty( $wp_meta_boxes ) )
+		if (empty($wp_meta_boxes))
 			return;
 
-		$current_metaboxes = isset( $wp_meta_boxes[$this->page_slug] ) ? $wp_meta_boxes[$this->page_slug] : array();
+		$current_metaboxes = isset($wp_meta_boxes[$this->page_slug]) ? $wp_meta_boxes[$this->page_slug] : array();
 
-		foreach ( $current_metaboxes as $box_context ) {
-			foreach ( $box_context as $box_details ) {
-				foreach ( $box_details as $box ) {
-					if ( is_array( $box['callback'] ) && ( $box['callback'][0] instanceof EE_Admin_Page || $box['callback'][0] instanceof EE_Admin_Hooks ) ){
+		foreach ($current_metaboxes as $box_context) {
+			foreach ($box_context as $box_details) {
+				foreach ($box_details as $box) {
+					if (is_array($box['callback']) && ($box['callback'][0] instanceof EE_Admin_Page || $box['callback'][0] instanceof EE_Admin_Hooks)) {
 						$containers[] = $box['id'];
 					}
 				}
 			}
 		}
 
-		$this->_autosave_containers = array_merge( $this->_autosave_containers, $containers );
+		$this->_autosave_containers = array_merge($this->_autosave_containers, $containers);
 
 		//add hidden inputs container
 		$this->_autosave_containers[] = 'ee-cpt-hidden-inputs';
@@ -268,13 +268,13 @@ 
 		wp_enqueue_script('cpt-autosave');/**/ //todo re-enable when we start doing autosave again in 4.2
 
 		//filter _autosave_containers
-		$containers = apply_filters( 'FHEE__EE_Admin_Page_CPT___load_autosave_scripts_styles__containers', $this->_autosave_containers, $this );
-		$containers = apply_filters( 'FHEE__EE_Admin_Page_CPT__' . get_class($this) . '___load_autosave_scripts_styles__containers', $containers, $this );
+		$containers = apply_filters('FHEE__EE_Admin_Page_CPT___load_autosave_scripts_styles__containers', $this->_autosave_containers, $this);
+		$containers = apply_filters('FHEE__EE_Admin_Page_CPT__'.get_class($this).'___load_autosave_scripts_styles__containers', $containers, $this);
 
-		wp_localize_script('event_editor_js', 'EE_AUTOSAVE_IDS', $containers ); //todo once we enable autosaves, this needs to be switched to localize with "cpt-autosave"
+		wp_localize_script('event_editor_js', 'EE_AUTOSAVE_IDS', $containers); //todo once we enable autosaves, this needs to be switched to localize with "cpt-autosave"
 
 		$unsaved_data_msg = array(
-			'eventmsg' => sprintf( __("The changes you made to this %s will be lost if you navigate away from this page.", 'event_espresso'), $this->_cpt_object->labels->singular_name),
+			'eventmsg' => sprintf(__("The changes you made to this %s will be lost if you navigate away from this page.", 'event_espresso'), $this->_cpt_object->labels->singular_name),
 			'inputChanged' => 0
 			);
 
@@ -286,7 +286,7 @@ 
 	public function load_page_dependencies() {
 		try {
 			$this->_load_page_dependencies();
-		} catch ( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$e->get_error();
 		}
 	}
@@ -302,7 +302,7 @@ 
 	protected function _load_page_dependencies() {
 
 		//we only add stuff if this is a cpt_route!
-		if ( !$this->_cpt_route ) {
+		if ( ! $this->_cpt_route) {
 			parent::_load_page_dependencies();
 			return;
 		}
@@ -312,72 +312,72 @@ 
 
 		//the following filters are for setting all the redirects on DEFAULT WP custom post type actions
 		//let's add a hidden input to the post-edit form so we know when we have to trigger our custom redirects!  Otherwise the redirects will happen on ALL post saves which wouldn't be good of course!
-		add_action('edit_form_after_title', array( $this, 'cpt_post_form_hidden_input') );
+		add_action('edit_form_after_title', array($this, 'cpt_post_form_hidden_input'));
 
 		//inject our Admin page nav tabs...
 		//let's make sure the nav tabs are set if they aren't already
 		//if ( empty( $this->_nav_tabs ) ) $this->_set_nav_tabs();
-		add_action('post_edit_form_tag', array( $this, 'inject_nav_tabs' ) );
+		add_action('post_edit_form_tag', array($this, 'inject_nav_tabs'));
 
 		//modify the post_updated messages array
-		add_action('post_updated_messages', array( $this, 'post_update_messages' ), 10 );
+		add_action('post_updated_messages', array($this, 'post_update_messages'), 10);
 
 		//add shortlink button to cpt edit screens.  We can do this as a universal thing BECAUSE, cpts use the same format for shortlinks as posts!
-		add_filter( 'pre_get_shortlink', array( $this, 'add_shortlink_button_to_editor' ), 10, 4 );
+		add_filter('pre_get_shortlink', array($this, 'add_shortlink_button_to_editor'), 10, 4);
 
 		//This basically allows us to change the title of the "publish" metabox area on CPT pages by setting a 'publishbox' value in the $_labels property array in the child class.
-		if ( !empty($this->_labels['publishbox'] ) ) {
+		if ( ! empty($this->_labels['publishbox'])) {
 
-			$box_label = is_array( $this->_labels['publishbox'] ) && isset( $this->_labels['publishbox'][$this->_req_action]) ? $this->_labels['publishbox'][$this->_req_action] : $this->_labels['publishbox'];
+			$box_label = is_array($this->_labels['publishbox']) && isset($this->_labels['publishbox'][$this->_req_action]) ? $this->_labels['publishbox'][$this->_req_action] : $this->_labels['publishbox'];
 
-			remove_meta_box( 'submitdiv', __( 'Publish' ), 'post_submit_meta_box', $this->_cpt_routes[$this->_req_action], 'side', 'core' );
-			add_meta_box( 'submitdiv', $box_label, 'post_submit_meta_box', $this->_cpt_routes[$this->_req_action], 'side', 'core' );
+			remove_meta_box('submitdiv', __('Publish'), 'post_submit_meta_box', $this->_cpt_routes[$this->_req_action], 'side', 'core');
+			add_meta_box('submitdiv', $box_label, 'post_submit_meta_box', $this->_cpt_routes[$this->_req_action], 'side', 'core');
 		}
 
 		//let's add page_templates metabox if this cpt added support for it.
-		if ( $this->_supports_page_templates($this->_cpt_object->name) ) {
-			add_meta_box( 'page_templates', __('Page Template', 'event_espresso' ), array( $this, 'page_template_meta_box' ), $this->_cpt_routes[$this->_req_action], 'side', 'default' );
+		if ($this->_supports_page_templates($this->_cpt_object->name)) {
+			add_meta_box('page_templates', __('Page Template', 'event_espresso'), array($this, 'page_template_meta_box'), $this->_cpt_routes[$this->_req_action], 'side', 'default');
 		}/**/
 
 
 		//this is a filter that allows the addition of extra html after the permalink field on the wp post edit-form
-		if ( method_exists( $this, 'extra_permalink_field_buttons' ) )
-			add_filter('get_sample_permalink_html', array( $this, 'extra_permalink_field_buttons' ), 10, 4 );
+		if (method_exists($this, 'extra_permalink_field_buttons'))
+			add_filter('get_sample_permalink_html', array($this, 'extra_permalink_field_buttons'), 10, 4);
 
 		//add preview button
-		add_filter('get_sample_permalink_html', array($this, 'preview_button_html'), 5, 4 );
+		add_filter('get_sample_permalink_html', array($this, 'preview_button_html'), 5, 4);
 
 
 		//insert our own post_stati dropdown
-		add_action('post_submitbox_misc_actions', array($this, 'custom_post_stati_dropdown' ), 10 );
+		add_action('post_submitbox_misc_actions', array($this, 'custom_post_stati_dropdown'), 10);
 
 		//This allows adding additional information to the publish post submitbox on the wp post edit form
-		if ( method_exists( $this, 'extra_misc_actions_publish_box' ) )
-			add_action('post_submitbox_misc_actions', array( $this, 'extra_misc_actions_publish_box' ), 10 );
+		if (method_exists($this, 'extra_misc_actions_publish_box'))
+			add_action('post_submitbox_misc_actions', array($this, 'extra_misc_actions_publish_box'), 10);
 
 		//This allows for adding additional stuff after the title field on the wp post edit form.  This is also before the wp_editor for post description field.
-		if ( method_exists( $this, 'edit_form_after_title' ) )
-			add_action('edit_form_after_title', array( $this, 'edit_form_after_title' ), 10 );
+		if (method_exists($this, 'edit_form_after_title'))
+			add_action('edit_form_after_title', array($this, 'edit_form_after_title'), 10);
 
 
 		/**
 		 * Filtering WP's esc_url to capture urls pointing to core wp routes so they point to our route.
 		 */
-		add_filter( 'clean_url', array( $this, 'switch_core_wp_urls_with_ours' ), 10, 3 );
+		add_filter('clean_url', array($this, 'switch_core_wp_urls_with_ours'), 10, 3);
 
 
 		parent::_load_page_dependencies();
 
 		//notice we are ALSO going to load the pagenow hook set for this route (see _before_page_setup for the reset of the pagenow global ). This is for any plugins that are doing things properly and hooking into the load page hook for core wp cpt routes.
 		global $pagenow;
-		do_action( 'load-' . $pagenow );
+		do_action('load-'.$pagenow);
 
 		$this->modify_current_screen();
-		add_action( 'admin_enqueue_scripts', array( $this, 'setup_autosave_hooks'), 30 );
+		add_action('admin_enqueue_scripts', array($this, 'setup_autosave_hooks'), 30);
 		//we route REALLY early.
 		try {
 			$this->_route_admin_request();
-		} catch ( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$e->get_error();
 		}
 	}
@@ -396,21 +396,21 @@ 
 	 *
 	 * @return string possibly a new url for our route.
 	 */
-	public function switch_core_wp_urls_with_ours( $good_protocol_url, $original_url, $_context ) {
+	public function switch_core_wp_urls_with_ours($good_protocol_url, $original_url, $_context) {
 		$routes_to_match = array(
 			0 => array(
 				'edit.php?post_type=espresso_attendees',
 				'admin.php?page=espresso_registrations&action=contact_list'
 				),
 			 1 => array(
-			 	'edit.php?post_type=' . $this->_cpt_object->name,
-			 	'admin.php?page=' . $this->_cpt_object->name
+			 	'edit.php?post_type='.$this->_cpt_object->name,
+			 	'admin.php?page='.$this->_cpt_object->name
 				)
 			);
 
-		foreach( $routes_to_match as $route_matches ) {
-			if ( strpos( $good_protocol_url, $route_matches[0] ) !== false ) {
-				return str_replace( $route_matches[0], $route_matches[1], $good_protocol_url );
+		foreach ($routes_to_match as $route_matches) {
+			if (strpos($good_protocol_url, $route_matches[0]) !== false) {
+				return str_replace($route_matches[0], $route_matches[1], $good_protocol_url);
 
 			}
 		}
@@ -426,10 +426,10 @@ 
 	 * @param string $cpt_name The cpt slug we're checking on.
 	 * @return bool True supported, false not.
 	 */
-	private function _supports_page_templates( $cpt_name ) {
+	private function _supports_page_templates($cpt_name) {
 		$cpt_args = EE_Register_CPTs::get_CPTs();
-		$cpt_args = isset( $cpt_args[$cpt_name] ) ? $cpt_args[$cpt_name]['args'] : array();
-		return ! empty( $cpt_args['page_templates'] ) ? TRUE : FALSE;
+		$cpt_args = isset($cpt_args[$cpt_name]) ? $cpt_args[$cpt_name]['args'] : array();
+		return ! empty($cpt_args['page_templates']) ? TRUE : FALSE;
 	}
 
 
@@ -444,9 +444,9 @@ 
 	public function page_template_meta_box() {
 		global $post;
 		$template = '';
-		if ( count( get_page_templates( $post ) ) != 0 ) {
-			$page_template = get_post_meta( $post->ID, '_wp_page_template', TRUE );
-			$template = !empty( $page_template ) ? $page_template : '';
+		if (count(get_page_templates($post)) != 0) {
+			$page_template = get_post_meta($post->ID, '_wp_page_template', TRUE);
+			$template = ! empty($page_template) ? $page_template : '';
 		}
 		?>
 		<p><strong><?php _e('Template') ?></strong></p>
@@ -470,10 +470,10 @@ 
 	 * @param  string $new_slug  what the slug is
 	 * @return string            The new html string for the permalink area
 	 */
-	public function preview_button_html( $return, $id, $new_title, $new_slug ) {
-		$post = get_post( $id );
-		if ( 'publish' != get_post_status( $post ) ) {
-			$return .= '<span_id="view-post-btn"><a href="' . wp_get_shortlink($id, 'post') . '" class="button button-small">' . __('Preview', 'event_espresso') . '</a></span>' . "\n";
+	public function preview_button_html($return, $id, $new_title, $new_slug) {
+		$post = get_post($id);
+		if ('publish' != get_post_status($post)) {
+			$return .= '<span_id="view-post-btn"><a href="'.wp_get_shortlink($id, 'post').'" class="button button-small">'.__('Preview', 'event_espresso').'</a></span>'."\n";
 		}
 		return $return;
 	}
@@ -493,18 +493,18 @@ 
 			'cur_status' =>  $this->_cpt_model_obj->status(),
 			'statuses' => $statuses,
 			'cur_status_label' => $cur_status_label,
-			'localized_status_save' => sprintf( __('Save %s', 'event_espresso'), $cur_status_label )
+			'localized_status_save' => sprintf(__('Save %s', 'event_espresso'), $cur_status_label)
 			);
 
 		//we'll add a trash post status (WP doesn't add one for some reason)
-		if ( $this->_cpt_model_obj->status() == 'trash' ) {
+		if ($this->_cpt_model_obj->status() == 'trash') {
 			$template_args['cur_status_label'] = __('Trashed', 'event_espresso');
 			$statuses['trash'] = __('Trashed', 'event_espresso');
 			$template_args['statuses'] = $statuses;
 		}
 
-		$template = EE_ADMIN_TEMPLATE . 'status_dropdown.template.php';
-		EEH_Template::display_template( $template, $template_args );
+		$template = EE_ADMIN_TEMPLATE.'status_dropdown.template.php';
+		EEH_Template::display_template($template, $template_args);
 	}
 
 
@@ -543,22 +543,22 @@ 
 	public function do_extra_autosave_stuff() {
 
 		//next let's check for the autosave nonce (we'll use _verify_nonce )
-		$nonce = isset( $this->_req_data['autosavenonce'] ) ? $this->_req_data['autosavenonce'] : NULL;
-		$this->_verify_nonce( $nonce, 'autosave' );
+		$nonce = isset($this->_req_data['autosavenonce']) ? $this->_req_data['autosavenonce'] : NULL;
+		$this->_verify_nonce($nonce, 'autosave');
 
 
 		//make sure we define doing autosave (cause WP isn't triggering this we want to make sure we define it)
-		if ( !defined('DOING_AUTOSAVE') ) define('DOING_AUTOSAVE', true);
+		if ( ! defined('DOING_AUTOSAVE')) define('DOING_AUTOSAVE', true);
 
 		//if we made it here then the nonce checked out.  Let's run our methods and actions
-		if ( method_exists( $this, '_ee_autosave_' . $this->_current_view ) ) {
-			call_user_func( array( $this, '_ee_autosave_' . $this->_current_view ) );
+		if (method_exists($this, '_ee_autosave_'.$this->_current_view)) {
+			call_user_func(array($this, '_ee_autosave_'.$this->_current_view));
 		} else {
 			$this->_template_args['success'] = TRUE;
 		}
 
-		do_action( 'AHEE__EE_Admin_Page_CPT__do_extra_autosave_stuff__global_after', $this );
-		do_action( 'AHEE__EE_Admin_Page_CPT__do_extra_autosave_stuff__after_' . get_class( $this ), $this );
+		do_action('AHEE__EE_Admin_Page_CPT__do_extra_autosave_stuff__global_after', $this);
+		do_action('AHEE__EE_Admin_Page_CPT__do_extra_autosave_stuff__after_'.get_class($this), $this);
 
 		//now let's return json
 		$this->_return_json();
@@ -578,18 +578,18 @@ 
 	protected function _extend_page_config_for_cpt() {
 
 		//before doing anything we need to make sure this runs ONLY when the loaded page matches the set page_slug
-		if ( ( isset( $this->_req_data['page'] ) && $this->_req_data['page'] != $this->page_slug ) )
+		if ((isset($this->_req_data['page']) && $this->_req_data['page'] != $this->page_slug))
 			return;
 
 		//set page routes and page config but ONLY if we're not viewing a custom setup cpt route as defined in _cpt_routes
-		if ( !empty( $this->_cpt_object ) ) {
-			$this->_page_routes = array_merge( array(
+		if ( ! empty($this->_cpt_object)) {
+			$this->_page_routes = array_merge(array(
 				'create_new' => '_create_new_cpt_item',
 				'edit' => '_edit_cpt_item'
-				), $this->_page_routes );
+				), $this->_page_routes);
 
 
-			$this->_page_config = array_merge( array(
+			$this->_page_config = array_merge(array(
 				'create_new' => array(
 					'nav' => array(
 						'label' => $this->_cpt_object->labels->add_new_item,
@@ -611,23 +611,23 @@ 
 		}
 
 		//load the next section only if this is a matching cpt route as set in the cpt routes array.
-		if ( !isset( $this->_cpt_routes[$this->_req_action] ) )
+		if ( ! isset($this->_cpt_routes[$this->_req_action]))
 			return;
 
 
-		$this->_cpt_route = isset( $this->_cpt_routes[$this->_req_action] ) ? TRUE : FALSE;
+		$this->_cpt_route = isset($this->_cpt_routes[$this->_req_action]) ? TRUE : FALSE;
 		//add_action('FHEE__EE_Admin_Page___load_page_dependencies__after_load', array( $this, 'modify_current_screen') );
 
 
-		if ( empty( $this->_cpt_object ) ) {
-			$msg = sprintf( __('This page has been set as being related to a registered custom post type, however, the custom post type object could not be retrieved. There are two possible reasons for this:  1. The "%s" does not match a registered post type. or 2. The custom post type is not registered for the "%s" action as indexed in the "$_cpt_routes" property on this class (%s).'), $this->page_slug, $this->_req_action, get_class($this) );
-			throw new EE_Error( $msg );
+		if (empty($this->_cpt_object)) {
+			$msg = sprintf(__('This page has been set as being related to a registered custom post type, however, the custom post type object could not be retrieved. There are two possible reasons for this:  1. The "%s" does not match a registered post type. or 2. The custom post type is not registered for the "%s" action as indexed in the "$_cpt_routes" property on this class (%s).'), $this->page_slug, $this->_req_action, get_class($this));
+			throw new EE_Error($msg);
 		}
 
 
-		if ( $this->_cpt_route ) {
-			$id = isset( $this->_req_data['post'] ) ? $this->_req_data['post'] : NULL;
-			$this->_set_model_object( $id );
+		if ($this->_cpt_route) {
+			$id = isset($this->_req_data['post']) ? $this->_req_data['post'] : NULL;
+			$this->_set_model_object($id);
 		}
 
 	}
@@ -641,13 +641,13 @@ 
 	 * @param int  $id The id to retrieve the model object for. If empty we set a default object.
 	 * @param bool $ignore_route_check
 	 */
-	protected function _set_model_object( $id = NULL, $ignore_route_check = false ) {
+	protected function _set_model_object($id = NULL, $ignore_route_check = false) {
 		$model = null;
 		if (
-			empty( $this->_cpt_model_names )
+			empty($this->_cpt_model_names)
 		    || (
 			     ! $ignore_route_check
-			     && ! isset( $this->_cpt_routes[ $this->_req_action ] )
+			     && ! isset($this->_cpt_routes[$this->_req_action])
 		    ) || (
 			     $this->_cpt_model_obj instanceof EE_CPT_Base
 			     && $this->_cpt_model_obj->ID() === $id
@@ -657,21 +657,21 @@ 
 			return;
 		}
 		//if ignore_route_check is true, then get the model name via EE_Register_CPTs
-		if ( $ignore_route_check ) {
+		if ($ignore_route_check) {
 			$model_names = EE_Register_CPTs::get_cpt_model_names();
-			$post_type = get_post_type( $id );
-			if ( isset( $model_names[ $post_type ] ) ) {
-				$model = EE_Registry::instance()->load_model( $model_names[ $post_type ] );
+			$post_type = get_post_type($id);
+			if (isset($model_names[$post_type])) {
+				$model = EE_Registry::instance()->load_model($model_names[$post_type]);
 			}
 		} else {
-			$model = EE_Registry::instance()->load_model( $this->_cpt_model_names[$this->_req_action] );
+			$model = EE_Registry::instance()->load_model($this->_cpt_model_names[$this->_req_action]);
 		}
 
-		if ( $model instanceof EEM_Base ) {
-			$this->_cpt_model_obj = ! empty( $id ) ? $model->get_one_by_ID( $id ) : $model->create_default_object();
+		if ($model instanceof EEM_Base) {
+			$this->_cpt_model_obj = ! empty($id) ? $model->get_one_by_ID($id) : $model->create_default_object();
 		}
 
-		do_action( 'AHEE__EE_Admin_Page_CPT__set_model_object__after_set_object' );
+		do_action('AHEE__EE_Admin_Page_CPT__set_model_object__after_set_object');
 	}
 
 
@@ -685,47 +685,47 @@ 
 	 */
 	public function admin_init_global() {
 
-		$post = isset( $this->_req_data['post'] ) ? get_post( $this->_req_data['post'] ) : NULL;
+		$post = isset($this->_req_data['post']) ? get_post($this->_req_data['post']) : NULL;
 
 		//its possible this is a new save so let's catch that instead
-		$post = isset( $this->_req_data['post_ID'] ) ? get_post( $this->_req_data['post_ID'] ) : $post;
+		$post = isset($this->_req_data['post_ID']) ? get_post($this->_req_data['post_ID']) : $post;
 		$post_type = $post ? $post->post_type : false;
 
 		$current_route = isset($this->_req_data['current_route']) ? $this->_req_data['current_route'] : 'shouldneverwork';
 
-		$route_to_check = $post_type && isset( $this->_cpt_routes[$current_route]) ? $this->_cpt_routes[$current_route] : '';
+		$route_to_check = $post_type && isset($this->_cpt_routes[$current_route]) ? $this->_cpt_routes[$current_route] : '';
 
-		add_filter( 'get_delete_post_link', array( $this, 'modify_delete_post_link'), 10, 3 );
-		add_filter( 'get_edit_post_link', array( $this, 'modify_edit_post_link'), 10, 3 );
+		add_filter('get_delete_post_link', array($this, 'modify_delete_post_link'), 10, 3);
+		add_filter('get_edit_post_link', array($this, 'modify_edit_post_link'), 10, 3);
 
 
-		if ( $post_type === $route_to_check ) {
-			add_filter('redirect_post_location', array( $this, 'cpt_post_location_redirect'), 10, 2 );
+		if ($post_type === $route_to_check) {
+			add_filter('redirect_post_location', array($this, 'cpt_post_location_redirect'), 10, 2);
 			//catch trashed wp redirect
-			add_filter('wp_redirect', array( $this, 'cpt_trash_post_location_redirect' ), 10, 2 );
+			add_filter('wp_redirect', array($this, 'cpt_trash_post_location_redirect'), 10, 2);
 		}
 
 		//now let's filter redirect if we're on a revision page and the revision is for an event CPT.
-		$revision = isset( $this->_req_data['revision'] ) ? $this->_req_data['revision'] : NULL;
+		$revision = isset($this->_req_data['revision']) ? $this->_req_data['revision'] : NULL;
 
 		/**var_dump($this->_req_data);
 		exit();/**/
 
-		if ( !empty( $revision ) ) {
-			$action = isset( $this->_req_data['action'] ) ? $this->_req_data['action'] : NULL;
+		if ( ! empty($revision)) {
+			$action = isset($this->_req_data['action']) ? $this->_req_data['action'] : NULL;
 
 			//doing a restore?
-			if ( !empty( $action ) && $action == 'restore' ) {
+			if ( ! empty($action) && $action == 'restore') {
 
 				//get post for revision
-				$rev_post = get_post( $revision );
-				$rev_parent = get_post( $rev_post->post_parent );
+				$rev_post = get_post($revision);
+				$rev_parent = get_post($rev_post->post_parent);
 
 				//only do our redirect filter AND our restore revision action if the post_type for the parent is one of our cpts.
-				if ( $rev_parent && $rev_parent->post_type == $this->page_slug ) {
-					add_filter('wp_redirect', array($this, 'revision_redirect'), 10, 2 );
+				if ($rev_parent && $rev_parent->post_type == $this->page_slug) {
+					add_filter('wp_redirect', array($this, 'revision_redirect'), 10, 2);
 					//restores of revisions
-					add_action('wp_restore_post_revision', array($this, 'restore_revision'), 10, 2 );
+					add_action('wp_restore_post_revision', array($this, 'restore_revision'), 10, 2);
 				}
 			}
 
@@ -734,15 +734,15 @@ 
 		//NOTE we ONLY want to run these hooks if we're on the right class for the given post type.  Otherwise we could see some really freaky things happen!
 
 
-		if ( $post_type && $post_type === $route_to_check ) {
+		if ($post_type && $post_type === $route_to_check) {
 			//$post_id, $post
-			add_action('save_post', array( $this, 'insert_update'), 10, 3 );
+			add_action('save_post', array($this, 'insert_update'), 10, 3);
 
 			//$post_id
-			add_action('trashed_post', array( $this, 'before_trash_cpt_item' ), 10 );
-			add_action('trashed_post', array( $this, 'dont_permanently_delete_ee_cpts'), 10 );
-			add_action('untrashed_post', array( $this, 'before_restore_cpt_item'), 10 );
-			add_action('after_delete_post', array( $this, 'before_delete_cpt_item'), 10 );
+			add_action('trashed_post', array($this, 'before_trash_cpt_item'), 10);
+			add_action('trashed_post', array($this, 'dont_permanently_delete_ee_cpts'), 10);
+			add_action('untrashed_post', array($this, 'before_restore_cpt_item'), 10);
+			add_action('after_delete_post', array($this, 'before_delete_cpt_item'), 10);
 		}
 
 	}
@@ -756,13 +756,13 @@ 
 	 *
 	 * @param int $post_id
 	 */
-	public function before_trash_cpt_item( $post_id ) {
-		$this->_set_model_object( $post_id, true );
+	public function before_trash_cpt_item($post_id) {
+		$this->_set_model_object($post_id, true);
 		//if our cpt object isn't existent then get out immediately.
-		if ( ! $this->_cpt_model_obj instanceof EE_CPT_Base || $this->_cpt_model_obj->ID() !== $post_id ) {
+		if ( ! $this->_cpt_model_obj instanceof EE_CPT_Base || $this->_cpt_model_obj->ID() !== $post_id) {
 			return;
 		}
-		$this->trash_cpt_item( $post_id );
+		$this->trash_cpt_item($post_id);
 	}
 
 
@@ -772,13 +772,13 @@ 
 	 *
 	 * @param $post_id
 	 */
-	public function before_restore_cpt_item( $post_id ) {
-		$this->_set_model_object( $post_id, true );
+	public function before_restore_cpt_item($post_id) {
+		$this->_set_model_object($post_id, true);
 		//if our cpt object isn't existent then get out immediately.
-		if ( ! $this->_cpt_model_obj instanceof EE_CPT_Base || $this->_cpt_model_obj->ID() !== $post_id ) {
+		if ( ! $this->_cpt_model_obj instanceof EE_CPT_Base || $this->_cpt_model_obj->ID() !== $post_id) {
 			return;
 		}
-		$this->restore_cpt_item( $post_id );
+		$this->restore_cpt_item($post_id);
 	}
 
 
@@ -787,13 +787,13 @@ 
 	 * Execute some basic checks before calling the delete_cpt_item method in the child class.
 	 * @param $post_id
 	 */
-	public function before_delete_cpt_item( $post_id ) {
-		$this->_set_model_object( $post_id, true );
+	public function before_delete_cpt_item($post_id) {
+		$this->_set_model_object($post_id, true);
 		//if our cpt object isn't existent then get out immediately.
-		if ( ! $this->_cpt_model_obj instanceof EE_CPT_Base || $this->_cpt_model_obj->ID() !== $post_id ) {
+		if ( ! $this->_cpt_model_obj instanceof EE_CPT_Base || $this->_cpt_model_obj->ID() !== $post_id) {
 			return;
 		}
-		$this->delete_cpt_item( $post_id );
+		$this->delete_cpt_item($post_id);
 	}
 
 
@@ -805,15 +805,15 @@ 
 	 * @return void
 	 */
 	public function verify_cpt_object() {
-		$label = !empty( $this->_cpt_object ) ? $this->_cpt_object->labels->singular_name : $this->page_label;
+		$label = ! empty($this->_cpt_object) ? $this->_cpt_object->labels->singular_name : $this->page_label;
 		// verify event object
-		if ( ! $this->_cpt_model_obj instanceof EE_CPT_Base ) {
-			throw new EE_Error( sprintf( __('Something has gone wrong with the page load because we are unable to set up the object for the %1$s.  This usually happens when the given id for the page route is NOT for the correct custom post type for this page', 'event_espresso' ), $label ) );
+		if ( ! $this->_cpt_model_obj instanceof EE_CPT_Base) {
+			throw new EE_Error(sprintf(__('Something has gone wrong with the page load because we are unable to set up the object for the %1$s.  This usually happens when the given id for the page route is NOT for the correct custom post type for this page', 'event_espresso'), $label));
 		}
 		//if auto-draft then throw an error
-		if ( $this->_cpt_model_obj->get('status') == 'auto-draft' ) {
+		if ($this->_cpt_model_obj->get('status') == 'auto-draft') {
 			EE_Error::overwrite_errors();
-			EE_Error::add_error( sprintf( __('This %1$s was saved without a title, description, or excerpt which means that none of the extra details you added were saved properly.  All autodrafts will show up in the "draft" view of your event list table.  You can delete them from there. Please click the "Add %1$s" button to refresh and restart.'), $label ), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error(sprintf(__('This %1$s was saved without a title, description, or excerpt which means that none of the extra details you added were saved properly.  All autodrafts will show up in the "draft" view of your event list table.  You can delete them from there. Please click the "Add %1$s" button to refresh and restart.'), $label), __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 
@@ -842,22 +842,22 @@ 
 	public function load_global_scripts_styles() {
 		parent::load_global_scripts_styles();
 
-		if ( $this->_cpt_model_obj instanceof EE_CPT_Base ) {
+		if ($this->_cpt_model_obj instanceof EE_CPT_Base) {
 			//setup custom post status object for localize script but only if we've got a cpt object
 			$statuses = $this->_cpt_model_obj->get_custom_post_statuses();
 
-			if ( !empty($statuses) ) {
+			if ( ! empty($statuses)) {
 				//get ALL statuses!
 				$statuses = $this->_cpt_model_obj->get_all_post_statuses();
 				//setup object
 				$ee_cpt_statuses = array();
-				foreach ( $statuses as $status => $label ) {
+				foreach ($statuses as $status => $label) {
 					$ee_cpt_statuses[$status] = array(
 						'label' => $label,
-						'save_label' => sprintf( __('Save as %s', 'event_espresso'), $label )
+						'save_label' => sprintf(__('Save as %s', 'event_espresso'), $label)
 						);
 				}
-				wp_localize_script('ee_admin_js', 'eeCPTstatuses', $ee_cpt_statuses );
+				wp_localize_script('ee_admin_js', 'eeCPTstatuses', $ee_cpt_statuses);
 			}
 		}
 	}
@@ -872,11 +872,11 @@ 
 	 * @param  bool   $update  Whether this is an update or a new save.
 	 * @return void
 	 */
-	public function insert_update( $post_id, $post, $update ) {
+	public function insert_update($post_id, $post, $update) {
 
 		//make sure that if this is a revision OR trash action that we don't do any updates!
 		if (
-			isset( $this->_req_data['action'] )
+			isset($this->_req_data['action'])
 			&& (
 				$this->_req_data['action'] == 'restore'
 				|| $this->_req_data['action'] == 'trash'
@@ -885,10 +885,10 @@ 
 			return;
 		}
 
-		$this->_set_model_object( $post_id, true );
+		$this->_set_model_object($post_id, true);
 
 		//if our cpt object is not instantiated and its NOT the same post_id as what is triggering this callback, then exit.
-		if ( $update
+		if ($update
 			&& (
 			     ! $this->_cpt_model_obj instanceof EE_CPT_Base
 			     || $this->_cpt_model_obj->ID() !== $post_id
@@ -909,19 +909,19 @@ 
 		}/**/ //TODO reactivate after autosave is implemented in 4.2
 
 		//take care of updating any selected page_template IF this cpt supports it.
-		if ( $this->_supports_page_templates($post->post_type ) && !empty( $this->_req_data['page_template'] ) ) {
+		if ($this->_supports_page_templates($post->post_type) && ! empty($this->_req_data['page_template'])) {
 			$post->page_template = $this->_req_data['page_template'];
-			$page_templates = wp_get_theme()->get_page_templates( $post );
-			if ( 'default' != $this->_req_data['page_template']  && ! isset( $page_templates[ $this->_req_data['page_template'] ] ) ) {
-				EE_Error::add_error( __('Invalid Page Template.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+			$page_templates = wp_get_theme()->get_page_templates($post);
+			if ('default' != $this->_req_data['page_template'] && ! isset($page_templates[$this->_req_data['page_template']])) {
+				EE_Error::add_error(__('Invalid Page Template.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			} else {
-				update_post_meta( $post_id, '_wp_page_template', $this->_req_data['page_template'] );
+				update_post_meta($post_id, '_wp_page_template', $this->_req_data['page_template']);
 			}
 		}
 
-		if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE )
+		if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)
 			return; //TODO we'll remove this after reimplementing autosave in 4.2
-		$this->_insert_update_cpt_item( $post_id, $post );
+		$this->_insert_update_cpt_item($post_id, $post);
 	}
 
 
@@ -934,15 +934,15 @@ 
 	 * @param  int    $post_id ID of the post
 	 * @return void
 	 */
-	public function dont_permanently_delete_ee_cpts( $post_id ) {
+	public function dont_permanently_delete_ee_cpts($post_id) {
 		//only do this if we're actually processing one of our CPTs
 		//if our cpt object isn't existent then get out immediately.
-		if ( ! $this->_cpt_model_obj instanceof EE_CPT_Base ) {
+		if ( ! $this->_cpt_model_obj instanceof EE_CPT_Base) {
 			return;
 		}
 
-		delete_post_meta( $post_id, '_wp_trash_meta_status' );
-		delete_post_meta( $post_id, '_wp_trash_meta_time');
+		delete_post_meta($post_id, '_wp_trash_meta_status');
+		delete_post_meta($post_id, '_wp_trash_meta_time');
 
 		//our cpts may have comments so let's take care of that too
 		delete_post_meta($post_id, '_wp_trash_meta_comments_status');
@@ -960,14 +960,14 @@ 
 	 * @param  int    $revision_id ID of revision being restored
 	 * @return void
 	 */
-	public function restore_revision( $post_id, $revision_id ) {
-		$this->_restore_cpt_item( $post_id, $revision_id );
+	public function restore_revision($post_id, $revision_id) {
+		$this->_restore_cpt_item($post_id, $revision_id);
 
 		//global action
-		do_action( 'AHEE_EE_Admin_Page_CPT__restore_revision', $post_id, $revision_id);
+		do_action('AHEE_EE_Admin_Page_CPT__restore_revision', $post_id, $revision_id);
 
 		//class specific action so you can limit hooking into a specific page.
-		do_action( 'AHEE_EE_Admin_Page_CPT_' . get_class($this) . '__restore_revision', $post_id, $revision_id );
+		do_action('AHEE_EE_Admin_Page_CPT_'.get_class($this).'__restore_revision', $post_id, $revision_id);
 	}
 
 
@@ -978,7 +978,7 @@ 
 	 * @param  int $revision_id ID of revision for item
 	 * @return void
 	 */
-	abstract protected function _restore_cpt_item( $post_id, $revision_id );
+	abstract protected function _restore_cpt_item($post_id, $revision_id);
 
 
 
@@ -997,9 +997,9 @@ 
 	 */
 	public function modify_current_screen() {
 		//ONLY do this if the current page_route IS a cpt route
-		if ( !$this->_cpt_route ) return;
+		if ( ! $this->_cpt_route) return;
 		//routing things REALLY early b/c this is a cpt admin page
-		set_current_screen( $this->_cpt_routes[$this->_req_action]);
+		set_current_screen($this->_cpt_routes[$this->_req_action]);
 		$this->_current_screen = get_current_screen();
 		$this->_current_screen->base = 'event-espresso';
 		$this->_add_help_tabs(); //we make sure we add any help tabs back in!
@@ -1020,8 +1020,8 @@ 
 	 * @param string $title The new title (or existing if there is no editor_title defined)
 	 * @return string
 	 */
-	public function add_custom_editor_default_title( $title ) {
-		return isset( $this->_labels['editor_title'][$this->_cpt_routes[$this->_req_action]] ) ? $this->_labels['editor_title'][$this->_cpt_routes[$this->_req_action]] : $title;
+	public function add_custom_editor_default_title($title) {
+		return isset($this->_labels['editor_title'][$this->_cpt_routes[$this->_req_action]]) ? $this->_labels['editor_title'][$this->_cpt_routes[$this->_req_action]] : $title;
 	}
 
 
@@ -1034,11 +1034,11 @@ 
 	 * @param bool   $allow_slugs Whether to allow post slugs in the shortlink.
 	 * @return string
 	 */
-	public function add_shortlink_button_to_editor( $shortlink, $id, $context, $allow_slugs ) {
-		if ( !empty( $id ) && '' != get_option('permalink_structure') ) {
-			$post = get_post( $id );
-			if ( isset($post->post_type) && $this->page_slug == $post->post_type )
-			$shortlink = home_url('?p=' . $post->ID);
+	public function add_shortlink_button_to_editor($shortlink, $id, $context, $allow_slugs) {
+		if ( ! empty($id) && '' != get_option('permalink_structure')) {
+			$post = get_post($id);
+			if (isset($post->post_type) && $this->page_slug == $post->post_type)
+			$shortlink = home_url('?p='.$post->ID);
 		}
 		return $shortlink;
 	}
@@ -1051,10 +1051,10 @@ 
 	 * @return void
 	 */
 	public function route_admin_request() {
-		if ( $this->_cpt_route ) return;
+		if ($this->_cpt_route) return;
 		try {
 			$this->_route_admin_request();
-		} catch ( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$e->get_error();
 		}
 	}
@@ -1067,12 +1067,12 @@ 
 	 * @return string html
 	 */
 	public function cpt_post_form_hidden_input() {
-		echo '<input type="hidden" name="ee_cpt_item_redirect_url" value="' . $this->_admin_base_url . '" />';
+		echo '<input type="hidden" name="ee_cpt_item_redirect_url" value="'.$this->_admin_base_url.'" />';
 
 		//we're also going to add the route value and the current page so we can direct autosave parsing correctly
 		echo '<div id="ee-cpt-hidden-inputs">';
-		echo '<input type="hidden" id="current_route" name="current_route" value="' . $this->_current_view . '" />';
-		echo '<input type="hidden" id="current_page" name="current_page" value="' . $this->page_slug . '" />';
+		echo '<input type="hidden" id="current_route" name="current_route" value="'.$this->_current_view.'" />';
+		echo '<input type="hidden" id="current_page" name="current_page" value="'.$this->page_slug.'" />';
 		echo '</div>';
 	}
 
@@ -1085,12 +1085,12 @@ 
 	 * @param  int    $status   Status for http header
 	 * @return string           new (or original) url to redirect to.
 	 */
-	public function revision_redirect( $location, $status ) {
+	public function revision_redirect($location, $status) {
 		//get revision
 		$rev_id = isset($this->_req_data['revision']) ? $this->_req_data['revision'] : NULL;
 
 		//can't do anything without revision so let's get out if not present
-		if ( empty( $rev_id ) )
+		if (empty($rev_id))
 			return $location;
 
 		//get rev_post_data
@@ -1104,8 +1104,8 @@ 
 				'message' => 5
 			);
 
-		$this->_process_notices( $query_args, TRUE );
-		return self::add_query_args_and_nonce( $query_args, $admin_url );
+		$this->_process_notices($query_args, TRUE);
+		return self::add_query_args_and_nonce($query_args, $admin_url);
 	}
 
 
@@ -1118,16 +1118,16 @@ 
 	 * @param  string $context optional, defaults to display.  How to write the '&'
 	 * @return string          the link
 	 */
-	public function modify_edit_post_link( $link, $id, $context ) {
-		$post = get_post( $id );
-		if ( !isset( $this->_req_data['action'] ) || !isset( $this->_cpt_routes[$this->_req_data['action']] ) || $post->post_type !== $this->_cpt_routes[$this->_req_data['action']] )
+	public function modify_edit_post_link($link, $id, $context) {
+		$post = get_post($id);
+		if ( ! isset($this->_req_data['action']) || ! isset($this->_cpt_routes[$this->_req_data['action']]) || $post->post_type !== $this->_cpt_routes[$this->_req_data['action']])
 			return $link;
 		$query_args = array(
 			'action' => isset($this->_cpt_edit_routes[$post->post_type]) ? $this->_cpt_edit_routes[$post->post_type] : 'edit',
 			'post' => $id
 			);
 
-		return self::add_query_args_and_nonce( $query_args, $this->_admin_base_url );
+		return self::add_query_args_and_nonce($query_args, $this->_admin_base_url);
 	}
 
 
@@ -1139,12 +1139,12 @@ 
 	 * @param  bool   $force_delete whether this is forcing a hard delete instead of trash
 	 * @return string               new delete link
 	 */
-	public function modify_delete_post_link( $delete_link, $post_id, $force_delete ) {
+	public function modify_delete_post_link($delete_link, $post_id, $force_delete) {
 		$post = get_post($post_id);
-		if ( !isset( $this->_req_data['action'] ) || ( isset( $this->_cpt_routes[$this->_req_data['action']] ) && $post->post_type !== $this->_cpt_routes[$this->_req_data['action']] ) )
+		if ( ! isset($this->_req_data['action']) || (isset($this->_cpt_routes[$this->_req_data['action']]) && $post->post_type !== $this->_cpt_routes[$this->_req_data['action']]))
 			return $delete_link;
 
-		return add_query_arg( array('current_route' => 'trash' ), $delete_link );
+		return add_query_arg(array('current_route' => 'trash'), $delete_link);
 	}
 
 
@@ -1155,16 +1155,16 @@ 
 	 * @param  string $status   status
 	 * @return string           url to redirect to
 	 */
-	public function cpt_trash_post_location_redirect( $location, $status ) {
-		if ( isset( $this->_req_data['action'] ) && $this->_req_data['action'] !== 'trash' && empty( $this->_req_data['post'] ) )
+	public function cpt_trash_post_location_redirect($location, $status) {
+		if (isset($this->_req_data['action']) && $this->_req_data['action'] !== 'trash' && empty($this->_req_data['post']))
 			return $location;
 
-		$post = get_post( $this->_req_data['post'] );
-		$query_args = array( 'action' => 'default' );
+		$post = get_post($this->_req_data['post']);
+		$query_args = array('action' => 'default');
 		$this->_cpt_object = get_post_type_object($post->post_type);
-		EE_Error::add_success( sprintf( __('%s trashed.', 'event_espresso'), $this->_cpt_object->labels->singular_name) );
-		$this->_process_notices( $query_args, TRUE );
-		return self::add_query_args_and_nonce( $query_args, $this->_admin_base_url );
+		EE_Error::add_success(sprintf(__('%s trashed.', 'event_espresso'), $this->_cpt_object->labels->singular_name));
+		$this->_process_notices($query_args, TRUE);
+		return self::add_query_args_and_nonce($query_args, $this->_admin_base_url);
 	}
 
 
@@ -1179,21 +1179,21 @@ 
 	 * @param  string $post_id  This is the 'ID' value of the wp_posts table
 	 * @return string           the new location to redirect to
 	 */
-	public function cpt_post_location_redirect( $location, $post_id ) {
+	public function cpt_post_location_redirect($location, $post_id) {
 		//we DO have a match so let's setup the url
 		//we have to get the post to determine our route
 		$post = get_post($post_id);
 		$edit_route = $this->_cpt_edit_routes[$post->post_type];
 
 		//shared query_args
-		$query_args = array( 'action' => $edit_route, 'post' => $post_id );
+		$query_args = array('action' => $edit_route, 'post' => $post_id);
 		$admin_url = $this->_admin_base_url;
 //		$append = '';
 
-		if ( isset( $this->_req_data['save'] ) || isset( $this->_req_data['publish'] ) ) {
-			$status = get_post_status( $post_id );
-			if ( isset( $this->_req_data['publish'] ) ) {
-				switch ( $status ) {
+		if (isset($this->_req_data['save']) || isset($this->_req_data['publish'])) {
+			$status = get_post_status($post_id);
+			if (isset($this->_req_data['publish'])) {
+				switch ($status) {
 					case 'pending':
 						$message = 8;
 						break;
@@ -1206,13 +1206,13 @@ 
 			} else {
 					$message = 'draft' == $status ? 10 : 1;
 			}
-		} else if ( isset( $this->_req_data['addmeta']) && $this->_req_data['addmeta'] ) {
+		} else if (isset($this->_req_data['addmeta']) && $this->_req_data['addmeta']) {
 			$message = 2;
 //			$append = '#postcustom';
-		} else if ( isset( $this->_req_data['deletemeta']) && $this->_req_data['deletemeta'] ) {
+		} else if (isset($this->_req_data['deletemeta']) && $this->_req_data['deletemeta']) {
 			$message = 3;
 //			$append = '#postcustom';
-		} elseif ( $this->_req_data['action'] == 'post-quickpress-save-cont' ) {
+		} elseif ($this->_req_data['action'] == 'post-quickpress-save-cont') {
 			$message = 7;
 		} else {
 			$message = 4;
@@ -1220,11 +1220,11 @@ 
 
 		//change the message if the post type is not viewable on the frontend
 		$this->_cpt_object = get_post_type_object($post->post_type);
-		$message = $message === 1 && !$this->_cpt_object->publicly_queryable ? 4 : $message;
+		$message = $message === 1 && ! $this->_cpt_object->publicly_queryable ? 4 : $message;
 
-		$query_args = array_merge( array( 'message' => $message ), $query_args );
-		$this->_process_notices( $query_args, TRUE );
-		return self::add_query_args_and_nonce( $query_args, $admin_url );
+		$query_args = array_merge(array('message' => $message), $query_args);
+		$this->_process_notices($query_args, TRUE);
+		return self::add_query_args_and_nonce($query_args, $admin_url);
 	}
 
 
@@ -1256,10 +1256,10 @@ 
 	 * @param  array $messages the original messages array
 	 * @return array           the new messages array
 	 */
-	public function post_update_messages( $messages ) {
+	public function post_update_messages($messages) {
 		global $post;
-		$id = isset( $this->_req_data['post'] ) ? $this->_req_data['post'] : NULL;
-		$id = empty( $id ) && is_object( $post ) ? $post->ID : NULL;
+		$id = isset($this->_req_data['post']) ? $this->_req_data['post'] : NULL;
+		$id = empty($id) && is_object($post) ? $post->ID : NULL;
 
 //		$post_type = $post ? $post->post_type : false;
 
@@ -1272,9 +1272,9 @@ 
 			0 => '', //Unused. Messages start at index 1.
 
 			1 => sprintf(
-				__( '%1$s updated. %2$sView %1$s%3$s', 'event_espresso'),
+				__('%1$s updated. %2$sView %1$s%3$s', 'event_espresso'),
 				$this->_cpt_object->labels->singular_name,
-				'<a href="' . esc_url( get_permalink( $id )) . '">',
+				'<a href="'.esc_url(get_permalink($id)).'">',
 				'</a>'
 			),
 
@@ -1282,38 +1282,38 @@ 
 
 			3 => __('Custom field deleted.'),
 
-			4 => sprintf( __( '%1$s updated.', 'event_espresso'), $this->_cpt_object->labels->singular_name ),
+			4 => sprintf(__('%1$s updated.', 'event_espresso'), $this->_cpt_object->labels->singular_name),
 
-			5 => isset( $_GET['revision'] ) ? sprintf( __('%s restored to revision from %s', 'event_espresso'), $this->_cpt_object->labels->singular_name, wp_post_revision_title( (int) $_GET['revision'], FALSE ) ) : FALSE,
+			5 => isset($_GET['revision']) ? sprintf(__('%s restored to revision from %s', 'event_espresso'), $this->_cpt_object->labels->singular_name, wp_post_revision_title((int) $_GET['revision'], FALSE)) : FALSE,
 
 			6 => sprintf(
-					__( '%1$s published. %2$sView %1$s%3$s', 'event_espresso'),
+					__('%1$s published. %2$sView %1$s%3$s', 'event_espresso'),
 					$this->_cpt_object->labels->singular_name,
-					'<a href="' . esc_url( get_permalink( $id )) . '">',
+					'<a href="'.esc_url(get_permalink($id)).'">',
 					'</a>'
 				),
 
-			7 => sprintf( __( '%1$s saved.', 'event_espresso'), $this->_cpt_object->labels->singular_name ),
+			7 => sprintf(__('%1$s saved.', 'event_espresso'), $this->_cpt_object->labels->singular_name),
 
 			8 => sprintf(
 				__('%1$s submitted. %2$sPreview %1$s%3$s', 'event_espresso'),
 				$this->_cpt_object->labels->singular_name,
-				'<a target="_blank" href="' . esc_url( add_query_arg( 'preview', 'true', get_permalink( $id ))) . '">',
+				'<a target="_blank" href="'.esc_url(add_query_arg('preview', 'true', get_permalink($id))).'">',
 				'</a>'
 			),
 
 			9 => sprintf(
-				__( '%1$s scheduled for: %2$s. %3$s">Preview %1$s%3$s', 'event_espresso'),
+				__('%1$s scheduled for: %2$s. %3$s">Preview %1$s%3$s', 'event_espresso'),
 				$this->_cpt_object->labels->singular_name,
-				'<strong>' . date_i18n( __( 'M j, Y @ G:i' ), strtotime( $post->post_date )) . '</strong>',
-				'<a target="_blank" href="' . esc_url( get_permalink( $id )),
+				'<strong>'.date_i18n(__('M j, Y @ G:i'), strtotime($post->post_date)).'</strong>',
+				'<a target="_blank" href="'.esc_url(get_permalink($id)),
 				'</a>'
 			),
 
 			10 => sprintf(
 				__('%1$s draft updated. %2$s">Preview page%3$s', 'event_espresso'),
 				$this->_cpt_object->labels->singular_name,
-				'<a target="_blank" href="' . esc_url( add_query_arg( 'preview', 'true', get_permalink( $id ))) ,
+				'<a target="_blank" href="'.esc_url(add_query_arg('preview', 'true', get_permalink($id))),
 				'</a>'
 			)
 		);
@@ -1340,24 +1340,24 @@ 
 		$post_type_object = $this->_cpt_object;
 		$title = $post_type_object->labels->add_new_item;
 		$editing = TRUE;
-		wp_enqueue_script( 'autosave' );
-		$post = $post = get_default_post_to_edit( $this->_cpt_routes[$this->_req_action], TRUE );
+		wp_enqueue_script('autosave');
+		$post = $post = get_default_post_to_edit($this->_cpt_routes[$this->_req_action], TRUE);
 		$post_ID = $post->ID;
 		$is_IE = $is_IE;
 
-		add_action( 'admin_print_styles', array( $this, 'add_new_admin_page_global' ) );
+		add_action('admin_print_styles', array($this, 'add_new_admin_page_global'));
 
 		//modify the default editor title field with default title.
-		add_filter('enter_title_here', array( $this, 'add_custom_editor_default_title' ), 10 );
+		add_filter('enter_title_here', array($this, 'add_custom_editor_default_title'), 10);
 
-		include_once WP_ADMIN_PATH . 'edit-form-advanced.php';
+		include_once WP_ADMIN_PATH.'edit-form-advanced.php';
 	}
 
 
 
 
 	public function add_new_admin_page_global() {
-		$admin_page = !empty( $this->_req_data['post'] ) ? 'post-php' : 'post-new-php';
+		$admin_page = ! empty($this->_req_data['post']) ? 'post-php' : 'post-new-php';
 		?>
 		<script type="text/javascript">
 			adminpage = '<?php echo $admin_page; ?>';
@@ -1379,16 +1379,16 @@ 
 	 */
 	protected function _edit_cpt_item() {
 		global $post, $title, $is_IE, $post_type, $post_type_object;
-		$post_id = isset( $this->_req_data['post'] ) ? $this->_req_data['post'] : NULL;
-		$post = !empty( $post_id ) ? get_post( $post_id, OBJECT, 'edit' ) : NULL;
+		$post_id = isset($this->_req_data['post']) ? $this->_req_data['post'] : NULL;
+		$post = ! empty($post_id) ? get_post($post_id, OBJECT, 'edit') : NULL;
 
-		if ( empty ( $post ) ) {
-			wp_die( __('You attempted to edit an item that doesn&#8217;t exist. Perhaps it was deleted?') );
+		if (empty ($post)) {
+			wp_die(__('You attempted to edit an item that doesn&#8217;t exist. Perhaps it was deleted?'));
 		}
 
-		if ( ! empty( $_GET['get-post-lock'] ) ) {
-			wp_set_post_lock( $post_id );
-			wp_redirect( get_edit_post_link( $post_id, 'url' ) );
+		if ( ! empty($_GET['get-post-lock'])) {
+			wp_set_post_lock($post_id);
+			wp_redirect(get_edit_post_link($post_id, 'url'));
 			exit();
 		}
 
@@ -1398,32 +1398,32 @@ 
 		$post_type = $this->_cpt_routes[$this->_req_action];
 		$post_type_object = $this->_cpt_object;
 
-		if ( ! wp_check_post_lock( $post->ID ) ) {
-			$active_post_lock = wp_set_post_lock( $post->ID );
+		if ( ! wp_check_post_lock($post->ID)) {
+			$active_post_lock = wp_set_post_lock($post->ID);
 			//wp_enqueue_script('autosave');
 		}
 
 		$title = $this->_cpt_object->labels->edit_item;
 
-		add_action('admin_footer', '_admin_notice_post_locked' );
+		add_action('admin_footer', '_admin_notice_post_locked');
 
-		if ( isset( $this->_cpt_routes[$this->_req_data['action']] ) && !isset( $this->_labels['hide_add_button_on_cpt_route'][$this->_req_data['action']] ) ) {
-			$create_new_action = apply_filters( 'FHEE__EE_Admin_Page_CPT___edit_cpt_item__create_new_action', 'create_new', $this );
+		if (isset($this->_cpt_routes[$this->_req_data['action']]) && ! isset($this->_labels['hide_add_button_on_cpt_route'][$this->_req_data['action']])) {
+			$create_new_action = apply_filters('FHEE__EE_Admin_Page_CPT___edit_cpt_item__create_new_action', 'create_new', $this);
 
-			$post_new_file = EE_Admin_Page::add_query_args_and_nonce( array('action' => $create_new_action, 'page' => $this->page_slug), 'admin.php' );
+			$post_new_file = EE_Admin_Page::add_query_args_and_nonce(array('action' => $create_new_action, 'page' => $this->page_slug), 'admin.php');
 		}
 
-		if ( post_type_supports($this->_cpt_routes[$this->_req_action], 'comments') ) {
+		if (post_type_supports($this->_cpt_routes[$this->_req_action], 'comments')) {
 			wp_enqueue_script('admin-comments');
 			enqueue_comment_hotkeys_js();
 		}
 
-		add_action( 'admin_print_styles', array( $this, 'add_new_admin_page_global' ) );
+		add_action('admin_print_styles', array($this, 'add_new_admin_page_global'));
 
 		//modify the default editor title field with default title.
-		add_filter('enter_title_here', array( $this, 'add_custom_editor_default_title' ), 10 );
+		add_filter('enter_title_here', array($this, 'add_custom_editor_default_title'), 10);
 
-		include_once WP_ADMIN_PATH . 'edit-form-advanced.php';
+		include_once WP_ADMIN_PATH.'edit-form-advanced.php';
 
 	}
 

shortcodes/espresso_txn_page/EES_Espresso_Txn_Page.shortcode.php

Indentation +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
 				$gateway = $payment_method->type_obj()->get_gateway();
 				if (
 					$gateway instanceof EE_Offsite_Gateway
-				    && $gateway->handle_IPN_in_this_request(
+					&& $gateway->handle_IPN_in_this_request(
 						\EE_Registry::instance()->REQ->params(),
 						true
 					)

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/admin/EE_Admin.core.php

Indentation +15 added lines, -15 removed lines

@@ -183,11 +183,11 @@ 
 
 
 	/**
-	* init- should fire after shortcode, module,  addon, other plugin (default priority), and even EE_Front_Controller's init phases have run
-	*
-	* @access public
-	* @return void
-	*/
+	 * init- should fire after shortcode, module,  addon, other plugin (default priority), and even EE_Front_Controller's init phases have run
+	 *
+	 * @access public
+	 * @return void
+	 */
 	public function init() {
 		EE_Admin::debug_log( __METHOD__ );
 		//only enable most of the EE_Admin IF we're not in full maintenance mode
@@ -474,11 +474,11 @@ 
 
 
 	/**
-	* admin_init
-	*
-	* @access public
-	* @return void
-	*/
+	 * admin_init
+	 *
+	 * @access public
+	 * @return void
+	 */
 	public function admin_init() {
 
 		/**
@@ -631,11 +631,11 @@ 
 
 
 	/**
-	* 	dismiss_persistent_admin_notice
-	*
-	*	@access 	public
-	* 	@return 		void
-	*/
+	 * 	dismiss_persistent_admin_notice
+	 *
+	 *	@access 	public
+	 * 	@return 		void
+	 */
 	public function dismiss_ee_nag_notice_callback() {
 		EE_Error::dismiss_persistent_admin_notice();
 	}

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *

Spacing +144 added lines, -144 removed lines

@@ -40,7 +40,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated
-		if (  ! self::$_instance instanceof EE_Admin ) {
+		if ( ! self::$_instance instanceof EE_Admin) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -57,30 +57,30 @@ 
 		// define global EE_Admin constants
 		$this->_define_all_constants();
 		// set autoloaders for our admin page classes based on included path information
-		EEH_Autoloader::instance()->register_autoloaders_for_each_file_in_folder( EE_ADMIN );
+		EEH_Autoloader::instance()->register_autoloaders_for_each_file_in_folder(EE_ADMIN);
 		// admin hooks
-		add_filter( 'plugin_action_links', array( $this, 'filter_plugin_actions' ), 10, 2 );
+		add_filter('plugin_action_links', array($this, 'filter_plugin_actions'), 10, 2);
 		// load EE_Request_Handler early
-		add_action( 'AHEE__EE_System__core_loaded_and_ready', array( $this, 'get_request' ));
-		add_action( 'AHEE__EE_System__initialize_last', array( $this, 'init' ));
+		add_action('AHEE__EE_System__core_loaded_and_ready', array($this, 'get_request'));
+		add_action('AHEE__EE_System__initialize_last', array($this, 'init'));
 		// post shortcode tracking
 		add_action(
 			'AHEE__EE_System__initialize_last',
-			array( 'EventEspresso\core\admin\PostShortcodeTracking', 'set_hooks_admin' )
+			array('EventEspresso\core\admin\PostShortcodeTracking', 'set_hooks_admin')
 		);
-		add_action( 'AHEE__EE_Admin_Page__route_admin_request', array( $this, 'route_admin_request' ), 100, 2 );
-		add_action( 'wp_loaded', array( $this, 'wp_loaded' ), 100 );
-		add_action( 'admin_init', array( $this, 'admin_init' ), 100 );
-		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_admin_scripts' ), 20 );
-		add_action( 'admin_notices', array( $this, 'display_admin_notices' ), 10 );
-		add_action( 'network_admin_notices', array( $this, 'display_admin_notices' ), 10 );
-		add_filter( 'pre_update_option', array( $this, 'check_for_invalid_datetime_formats' ), 100, 2 );
-		add_filter('admin_footer_text', array( $this, 'espresso_admin_footer' ));
+		add_action('AHEE__EE_Admin_Page__route_admin_request', array($this, 'route_admin_request'), 100, 2);
+		add_action('wp_loaded', array($this, 'wp_loaded'), 100);
+		add_action('admin_init', array($this, 'admin_init'), 100);
+		add_action('admin_enqueue_scripts', array($this, 'enqueue_admin_scripts'), 20);
+		add_action('admin_notices', array($this, 'display_admin_notices'), 10);
+		add_action('network_admin_notices', array($this, 'display_admin_notices'), 10);
+		add_filter('pre_update_option', array($this, 'check_for_invalid_datetime_formats'), 100, 2);
+		add_filter('admin_footer_text', array($this, 'espresso_admin_footer'));
 
 		//reset Environment config (we only do this on admin page loads);
 		EE_Registry::instance()->CFG->environment->recheck_values();
 
-		do_action( 'AHEE__EE_Admin__loaded' );
+		do_action('AHEE__EE_Admin__loaded');
 	}
 
 
@@ -95,11 +95,11 @@ 
 	 * @return void
 	 */
 	private function _define_all_constants() {
-		define( 'EE_ADMIN_URL', EE_PLUGIN_DIR_URL . 'core/admin/' );
-		define( 'EE_ADMIN_PAGES_URL', EE_PLUGIN_DIR_URL . 'admin_pages/' );
-		define( 'EE_ADMIN_TEMPLATE', EE_ADMIN . 'templates' . DS );
-		define( 'WP_ADMIN_PATH', ABSPATH . 'wp-admin/' );
-		define( 'WP_AJAX_URL', admin_url( 'admin-ajax.php' ));
+		define('EE_ADMIN_URL', EE_PLUGIN_DIR_URL.'core/admin/');
+		define('EE_ADMIN_PAGES_URL', EE_PLUGIN_DIR_URL.'admin_pages/');
+		define('EE_ADMIN_TEMPLATE', EE_ADMIN.'templates'.DS);
+		define('WP_ADMIN_PATH', ABSPATH.'wp-admin/');
+		define('WP_AJAX_URL', admin_url('admin-ajax.php'));
 	}
 
 
@@ -112,23 +112,23 @@ 
 	 * @param 	string 	$plugin
 	 * @return 	array
 	 */
-	public function filter_plugin_actions( $links, $plugin ) {
+	public function filter_plugin_actions($links, $plugin) {
 		// set $main_file in stone
 		static $main_file;
 		// if $main_file is not set yet
-		if ( ! $main_file ) {
-			$main_file = plugin_basename( EVENT_ESPRESSO_MAIN_FILE );
+		if ( ! $main_file) {
+			$main_file = plugin_basename(EVENT_ESPRESSO_MAIN_FILE);
 		}
-		 if ( $plugin === $main_file ) {
+		 if ($plugin === $main_file) {
 		 	// compare current plugin to this one
-			if ( EE_Maintenance_Mode::instance()->level() === EE_Maintenance_Mode::level_2_complete_maintenance ) {
-				$maintenance_link = '<a href="admin.php?page=espresso_maintenance_settings" title="Event Espresso is in maintenance mode.  Click this link to learn why.">' . __('Maintenance Mode Active', 'event_espresso' ) . '</a>';
-				array_unshift( $links, $maintenance_link );
+			if (EE_Maintenance_Mode::instance()->level() === EE_Maintenance_Mode::level_2_complete_maintenance) {
+				$maintenance_link = '<a href="admin.php?page=espresso_maintenance_settings" title="Event Espresso is in maintenance mode.  Click this link to learn why.">'.__('Maintenance Mode Active', 'event_espresso').'</a>';
+				array_unshift($links, $maintenance_link);
 			} else {
-				$org_settings_link = '<a href="admin.php?page=espresso_general_settings">' . __( 'Settings', 'event_espresso' ) . '</a>';
-				$events_link = '<a href="admin.php?page=espresso_events">' . __( 'Events', 'event_espresso' ) . '</a>';
+				$org_settings_link = '<a href="admin.php?page=espresso_general_settings">'.__('Settings', 'event_espresso').'</a>';
+				$events_link = '<a href="admin.php?page=espresso_events">'.__('Events', 'event_espresso').'</a>';
 				// add before other links
-				array_unshift( $links, $org_settings_link, $events_link );
+				array_unshift($links, $org_settings_link, $events_link);
 			}
 		}
 		return $links;
@@ -143,8 +143,8 @@ 
 	 *	@return void
 	 */
 	public function get_request() {
-		EE_Registry::instance()->load_core( 'Request_Handler' );
-		EE_Registry::instance()->load_core( 'CPT_Strategy' );
+		EE_Registry::instance()->load_core('Request_Handler');
+		EE_Registry::instance()->load_core('CPT_Strategy');
 	}
 
 
@@ -156,11 +156,11 @@ 
 	 * @param array $admin_page_folder_names
 	 * @return array
 	 */
-	public function hide_admin_pages_except_maintenance_mode( $admin_page_folder_names = array() ){
+	public function hide_admin_pages_except_maintenance_mode($admin_page_folder_names = array()) {
 		return array(
-			'maintenance' => EE_ADMIN_PAGES . 'maintenance' . DS,
-			'about' => EE_ADMIN_PAGES . 'about' . DS,
-			'support' => EE_ADMIN_PAGES . 'support' . DS
+			'maintenance' => EE_ADMIN_PAGES.'maintenance'.DS,
+			'about' => EE_ADMIN_PAGES.'about'.DS,
+			'support' => EE_ADMIN_PAGES.'support'.DS
 		);
 	}
 
@@ -174,31 +174,31 @@ 
 	*/
 	public function init() {
 		//only enable most of the EE_Admin IF we're not in full maintenance mode
-		if ( EE_Maintenance_Mode::instance()->models_can_query() ){
+		if (EE_Maintenance_Mode::instance()->models_can_query()) {
 			//ok so we want to enable the entire admin
-			add_action( 'wp_ajax_dismiss_ee_nag_notice', array( $this, 'dismiss_ee_nag_notice_callback' ));
-			add_action( 'admin_notices', array( $this, 'get_persistent_admin_notices' ), 9 );
-			add_action( 'network_admin_notices', array( $this, 'get_persistent_admin_notices' ), 9 );
+			add_action('wp_ajax_dismiss_ee_nag_notice', array($this, 'dismiss_ee_nag_notice_callback'));
+			add_action('admin_notices', array($this, 'get_persistent_admin_notices'), 9);
+			add_action('network_admin_notices', array($this, 'get_persistent_admin_notices'), 9);
 			//at a glance dashboard widget
-			add_filter( 'dashboard_glance_items', array( $this, 'dashboard_glance_items' ), 10 );
+			add_filter('dashboard_glance_items', array($this, 'dashboard_glance_items'), 10);
 			//filter for get_edit_post_link used on comments for custom post types
-			add_filter( 'get_edit_post_link', array( $this, 'modify_edit_post_link' ), 10, 2 );
+			add_filter('get_edit_post_link', array($this, 'modify_edit_post_link'), 10, 2);
 		}
 		// run the admin page factory but ONLY if we are doing an ee admin ajax request
-		if ( !defined('DOING_AJAX') || EE_ADMIN_AJAX ) {
+		if ( ! defined('DOING_AJAX') || EE_ADMIN_AJAX) {
 			try {
 				//this loads the controller for the admin pages which will setup routing etc
-				EE_Registry::instance()->load_core( 'Admin_Page_Loader' );
-			} catch ( EE_Error $e ) {
+				EE_Registry::instance()->load_core('Admin_Page_Loader');
+			} catch (EE_Error $e) {
 				$e->get_error();
 			}
 		}
-		add_filter( 'content_save_pre', array( $this, 'its_eSpresso' ), 10, 1 );
+		add_filter('content_save_pre', array($this, 'its_eSpresso'), 10, 1);
 		//make sure our CPTs and custom taxonomy metaboxes get shown for first time users
-		add_action('admin_head', array($this, 'enable_hidden_ee_nav_menu_metaboxes' ), 10 );
-		add_action('admin_head', array( $this, 'register_custom_nav_menu_boxes' ), 10 );
+		add_action('admin_head', array($this, 'enable_hidden_ee_nav_menu_metaboxes'), 10);
+		add_action('admin_head', array($this, 'register_custom_nav_menu_boxes'), 10);
 		//exclude EE critical pages from all nav menus and wp_list_pages
-		add_filter('nav_menu_meta_box_object', array( $this, 'remove_pages_from_nav_menu'), 10 );
+		add_filter('nav_menu_meta_box_object', array($this, 'remove_pages_from_nav_menu'), 10);
 	}
 
 
@@ -211,9 +211,9 @@ 
 	 * @param  object $post_type WP post type object
 	 * @return object            WP post type object
 	 */
-	public function remove_pages_from_nav_menu( $post_type ) {
+	public function remove_pages_from_nav_menu($post_type) {
 		//if this isn't the "pages" post type let's get out
-		if ( $post_type->name !== 'page' ) {
+		if ($post_type->name !== 'page') {
 			return $post_type;
 		}
 		$critical_pages = EE_Registry::instance()->CFG->core->get_critical_pages_array();
@@ -233,28 +233,28 @@ 
 	 */
 	public function enable_hidden_ee_nav_menu_metaboxes() {
 		global $wp_meta_boxes, $pagenow;
-		if ( ! is_array($wp_meta_boxes) || $pagenow !== 'nav-menus.php' ) {
+		if ( ! is_array($wp_meta_boxes) || $pagenow !== 'nav-menus.php') {
 			return;
 		}
 		$user = wp_get_current_user();
 		//has this been done yet?
-		if ( get_user_option( 'ee_nav_menu_initialized', $user->ID ) ) {
+		if (get_user_option('ee_nav_menu_initialized', $user->ID)) {
 			return;
 		}
 
-		$hidden_meta_boxes = get_user_option( 'metaboxhidden_nav-menus', $user->ID );
-		$initial_meta_boxes = apply_filters( 'FHEE__EE_Admin__enable_hidden_ee_nav_menu_boxes__initial_meta_boxes', array( 'nav-menu-theme-locations', 'add-page', 'add-custom-links', 'add-category', 'add-espresso_events', 'add-espresso_venues', 'add-espresso_event_categories', 'add-espresso_venue_categories', 'add-post-type-post', 'add-post-type-page' ) );
+		$hidden_meta_boxes = get_user_option('metaboxhidden_nav-menus', $user->ID);
+		$initial_meta_boxes = apply_filters('FHEE__EE_Admin__enable_hidden_ee_nav_menu_boxes__initial_meta_boxes', array('nav-menu-theme-locations', 'add-page', 'add-custom-links', 'add-category', 'add-espresso_events', 'add-espresso_venues', 'add-espresso_event_categories', 'add-espresso_venue_categories', 'add-post-type-post', 'add-post-type-page'));
 
-		if ( is_array( $hidden_meta_boxes ) ) {
-			foreach ( $hidden_meta_boxes as $key => $meta_box_id ) {
-				if ( in_array( $meta_box_id, $initial_meta_boxes ) ) {
-					unset( $hidden_meta_boxes[ $key ] );
+		if (is_array($hidden_meta_boxes)) {
+			foreach ($hidden_meta_boxes as $key => $meta_box_id) {
+				if (in_array($meta_box_id, $initial_meta_boxes)) {
+					unset($hidden_meta_boxes[$key]);
 				}
 			}
 		}
 
-		update_user_option( $user->ID, 'metaboxhidden_nav-menus', $hidden_meta_boxes, true );
-		update_user_option( $user->ID, 'ee_nav_menu_initialized', 1, true );
+		update_user_option($user->ID, 'metaboxhidden_nav-menus', $hidden_meta_boxes, true);
+		update_user_option($user->ID, 'ee_nav_menu_initialized', 1, true);
 	}
 
 
@@ -273,7 +273,7 @@ 
 	 * @return void
 	 */
 	public function register_custom_nav_menu_boxes() {
-		add_meta_box( 'add-extra-nav-menu-pages', __('Event Espresso Pages', 'event_espresso'), array( $this, 'ee_cpt_archive_pages' ), 'nav-menus', 'side', 'core' );
+		add_meta_box('add-extra-nav-menu-pages', __('Event Espresso Pages', 'event_espresso'), array($this, 'ee_cpt_archive_pages'), 'nav-menus', 'side', 'core');
 	}
 
 
@@ -289,16 +289,16 @@ 
 	 *
 	 * @return string  the (maybe) modified link
 	 */
-	public function modify_edit_post_link( $link, $id ) {
-		if ( ! $post = get_post( $id ) ){
+	public function modify_edit_post_link($link, $id) {
+		if ( ! $post = get_post($id)) {
 			return $link;
 		}
-		if ( $post->post_type === 'espresso_attendees' ) {
+		if ($post->post_type === 'espresso_attendees') {
 			$query_args = array(
 				'action' => 'edit_attendee',
 				'post' => $id
 			);
-			return EEH_URL::add_query_args_and_nonce( $query_args, admin_url('admin.php?page=espresso_registrations') );
+			return EEH_URL::add_query_args_and_nonce($query_args, admin_url('admin.php?page=espresso_registrations'));
 		}
 		return $link;
 	}
@@ -310,7 +310,7 @@ 
 		global $nav_menu_selected_id;
 
 		$db_fields = false;
-		$walker = new Walker_Nav_Menu_Checklist( $db_fields );
+		$walker = new Walker_Nav_Menu_Checklist($db_fields);
 		$current_tab = 'event-archives';
 
 		/*if ( ! empty( $_REQUEST['quick-search-posttype-' . $post_type_name] ) ) {
@@ -329,9 +329,9 @@ 
 		?>
 		<div id="posttype-extra-nav-menu-pages" class="posttypediv">
 			<ul id="posttype-extra-nav-menu-pages-tabs" class="posttype-tabs add-menu-item-tabs">
-				<li <?php echo ( 'event-archives' === $current_tab ? ' class="tabs"' : '' ); ?>>
-					<a class="nav-tab-link" data-type="tabs-panel-posttype-extra-nav-menu-pages-event-archives" href="<?php if ( $nav_menu_selected_id ) {echo esc_url(add_query_arg('extra-nav-menu-pages-tab', 'event-archives', remove_query_arg($removed_args)));} ?>#tabs-panel-posttype-extra-nav-menu-pages-event-archives">
-						<?php _e( 'Event Archive Pages', 'event_espresso' ); ?>
+				<li <?php echo ('event-archives' === $current_tab ? ' class="tabs"' : ''); ?>>
+					<a class="nav-tab-link" data-type="tabs-panel-posttype-extra-nav-menu-pages-event-archives" href="<?php if ($nav_menu_selected_id) {echo esc_url(add_query_arg('extra-nav-menu-pages-tab', 'event-archives', remove_query_arg($removed_args))); } ?>#tabs-panel-posttype-extra-nav-menu-pages-event-archives">
+						<?php _e('Event Archive Pages', 'event_espresso'); ?>
 					</a>
 				</li>
 			<?php /* // temporarily removing but leaving skeleton in place in case we ever decide to add more tabs.
@@ -349,13 +349,13 @@ 
  			<?php */ ?>
 
 			<div id="tabs-panel-posttype-extra-nav-menu-pages-event-archives" class="tabs-panel <?php
-			echo ( 'event-archives' === $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
+			echo ('event-archives' === $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive');
 			?>">
 				<ul id="extra-nav-menu-pageschecklist-event-archives" class="categorychecklist form-no-clear">
 					<?php
 					$pages = $this->_get_extra_nav_menu_pages_items();
 					$args['walker'] = $walker;
-					echo walk_nav_menu_tree( array_map( array( $this, '_setup_extra_nav_menu_pages_items' ), $pages), 0, (object) $args );
+					echo walk_nav_menu_tree(array_map(array($this, '_setup_extra_nav_menu_pages_items'), $pages), 0, (object) $args);
 					?>
 				</ul>
 			</div><!-- /.tabs-panel -->
@@ -363,18 +363,18 @@ 
 			<p class="button-controls">
 				<span class="list-controls">
 					<a href="<?php
-						echo esc_url( add_query_arg(
+						echo esc_url(add_query_arg(
 							array(
 								'extra-nav-menu-pages-tab' => 'event-archives',
 								'selectall' => 1,
 							),
-							remove_query_arg( $removed_args )
+							remove_query_arg($removed_args)
 						));
 					?>#posttype-extra-nav-menu-pages>" class="select-all"><?php _e('Select All'); ?></a>
 				</span>
 
 				<span class="add-to-menu">
-					<input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e( __( 'Add to Menu' ) ); ?>" name="add-post-type-menu-item" id="<?php esc_attr_e( 'submit-posttype-extra-nav-menu-pages' ); ?>" />
+					<input type="submit"<?php wp_nav_menu_disabled_check($nav_menu_selected_id); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e(__('Add to Menu')); ?>" name="add-post-type-menu-item" id="<?php esc_attr_e('submit-posttype-extra-nav-menu-pages'); ?>" />
 					<span class="spinner"></span>
 				</span>
 			</p>
@@ -395,10 +395,10 @@ 
 	private function _get_extra_nav_menu_pages_items() {
 		$menuitems[] = array(
 			'title' => __('Event List', 'event_espresso'),
-			'url' => get_post_type_archive_link( 'espresso_events' ),
+			'url' => get_post_type_archive_link('espresso_events'),
 			'description' => __('Archive page for all events.', 'event_espresso')
 		);
-		return apply_filters( 'FHEE__EE_Admin__get_extra_nav_menu_pages_items', $menuitems );
+		return apply_filters('FHEE__EE_Admin__get_extra_nav_menu_pages_items', $menuitems);
 	}
 
 
@@ -410,7 +410,7 @@ 
 	 * @param $menu_item_values
 	 * @return stdClass
 	 */
-	private function _setup_extra_nav_menu_pages_items( $menu_item_values ) {
+	private function _setup_extra_nav_menu_pages_items($menu_item_values) {
 		$menu_item = new stdClass();
 		$keys = array(
 			'ID' => 0,
@@ -430,8 +430,8 @@ 
 			'xfn' => ''
 		);
 
-		foreach ( $keys as $key => $value) {
-			$menu_item->{$key} = isset( $menu_item_values[ $key]) ? $menu_item_values[ $key] : $value;
+		foreach ($keys as $key => $value) {
+			$menu_item->{$key} = isset($menu_item_values[$key]) ? $menu_item_values[$key] : $value;
 		}
 		return $menu_item;
 	}
@@ -470,9 +470,9 @@ 
 		 * - check if doing post processing of one of EE CPTs
 		 * - instantiate the corresponding EE CPT model for the post_type being processed.
 		 */
-		if ( isset( $_POST['action'], $_POST['post_type'] ) && $_POST['action'] === 'editpost' ) {
-			EE_Registry::instance()->load_core( 'Register_CPTs' );
-			EE_Register_CPTs::instantiate_cpt_models( $_POST['post_type'] );
+		if (isset($_POST['action'], $_POST['post_type']) && $_POST['action'] === 'editpost') {
+			EE_Registry::instance()->load_core('Register_CPTs');
+			EE_Register_CPTs::instantiate_cpt_models($_POST['post_type']);
 		}
 
 
@@ -481,8 +481,8 @@ 
 		 * 'options-reading.php' core WordPress admin settings page.  This is for user-proofing.
 		 */
 		global $pagenow;
-		if ( $pagenow === 'options-reading.php' ) {
-			add_filter( 'wp_dropdown_pages', array( $this, 'modify_dropdown_pages' ) );
+		if ($pagenow === 'options-reading.php') {
+			add_filter('wp_dropdown_pages', array($this, 'modify_dropdown_pages'));
 		}
 
 	}
@@ -494,25 +494,25 @@ 
 	 * @param string $output  Current output.
 	 * @return string
 	 */
-	public function modify_dropdown_pages( $output ) {
+	public function modify_dropdown_pages($output) {
 		//get critical pages
 		$critical_pages = EE_Registry::instance()->CFG->core->get_critical_pages_array();
 
 		//split current output by line break for easier parsing.
-		$split_output = explode( "\n", $output );
+		$split_output = explode("\n", $output);
 
 		//loop through to remove any critical pages from the array.
-		foreach ( $critical_pages as $page_id ) {
-			$needle = 'value="' . $page_id . '"';
-			foreach( $split_output as $key => $haystack ) {
-				if( strpos( $haystack, $needle ) !== false ) {
-					unset( $split_output[$key] );
+		foreach ($critical_pages as $page_id) {
+			$needle = 'value="'.$page_id.'"';
+			foreach ($split_output as $key => $haystack) {
+				if (strpos($haystack, $needle) !== false) {
+					unset($split_output[$key]);
 				}
 			}
 		}
 
 		//replace output with the new contents
-		return implode( "\n", $split_output );
+		return implode("\n", $split_output);
 	}
 
 
@@ -526,36 +526,36 @@ 
 	public function enqueue_admin_scripts() {
 		// this javascript is loaded on every admin page to catch any injections ee needs to add to wp run js.
 		// Note: the intention of this script is to only do TARGETED injections.  I.E, only injecting on certain script calls.
-		wp_enqueue_script('ee-inject-wp', EE_ADMIN_URL . 'assets/ee-cpt-wp-injects.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_enqueue_script('ee-inject-wp', EE_ADMIN_URL.'assets/ee-cpt-wp-injects.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE);
 		// register cookie script for future dependencies
-		wp_register_script('jquery-cookie', EE_THIRD_PARTY_URL . 'joyride/jquery.cookie.js', array('jquery'), '2.1', TRUE );
+		wp_register_script('jquery-cookie', EE_THIRD_PARTY_URL.'joyride/jquery.cookie.js', array('jquery'), '2.1', TRUE);
 		// jquery_validate loading is turned OFF by default, but prior to the admin_enqueue_scripts hook, can be turned back on again via:  add_filter( 'FHEE_load_jquery_validate', '__return_true' );
-		if ( apply_filters( 'FHEE_load_jquery_validate', FALSE ) ) {
+		if (apply_filters('FHEE_load_jquery_validate', FALSE)) {
 			// register jQuery Validate
-			wp_register_script('jquery-validate', EE_GLOBAL_ASSETS_URL . 'scripts/jquery.validate.min.js', array('jquery'), '1.15.0', TRUE);
+			wp_register_script('jquery-validate', EE_GLOBAL_ASSETS_URL.'scripts/jquery.validate.min.js', array('jquery'), '1.15.0', TRUE);
 		}
 		//joyride is turned OFF by default, but prior to the admin_enqueue_scripts hook, can be turned back on again vai: add_filter('FHEE_load_joyride', '__return_true' );
-		if ( apply_filters( 'FHEE_load_joyride', FALSE ) ) {
+		if (apply_filters('FHEE_load_joyride', FALSE)) {
 			//joyride style
-			wp_register_style('joyride-css', EE_THIRD_PARTY_URL . 'joyride/joyride-2.1.css', array(), '2.1');
-			wp_register_style('ee-joyride-css', EE_GLOBAL_ASSETS_URL . 'css/ee-joyride-styles.css', array('joyride-css'), EVENT_ESPRESSO_VERSION );
-			wp_register_script('joyride-modernizr', EE_THIRD_PARTY_URL . 'joyride/modernizr.mq.js', array(), '2.1', TRUE );
+			wp_register_style('joyride-css', EE_THIRD_PARTY_URL.'joyride/joyride-2.1.css', array(), '2.1');
+			wp_register_style('ee-joyride-css', EE_GLOBAL_ASSETS_URL.'css/ee-joyride-styles.css', array('joyride-css'), EVENT_ESPRESSO_VERSION);
+			wp_register_script('joyride-modernizr', EE_THIRD_PARTY_URL.'joyride/modernizr.mq.js', array(), '2.1', TRUE);
 			//joyride JS
-			wp_register_script('jquery-joyride', EE_THIRD_PARTY_URL . 'joyride/jquery.joyride-2.1.js', array('jquery-cookie', 'joyride-modernizr'), '2.1', TRUE );
+			wp_register_script('jquery-joyride', EE_THIRD_PARTY_URL.'joyride/jquery.joyride-2.1.js', array('jquery-cookie', 'joyride-modernizr'), '2.1', TRUE);
 			// wanna go for a joyride?
 			wp_enqueue_style('ee-joyride-css');
 			wp_enqueue_script('jquery-joyride');
 		}
 		//qtip is turned OFF by default, but prior to the admin_enqueue_scripts hook, can be turned back on again via: add_filter('FHEE_load_qtips', '__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 ) ) {
-			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', EE_THIRD_PARTY_URL . 'accounting/accounting.js', array('underscore'), '0.3.2', TRUE );
-			wp_enqueue_script( 'ee-accounting' );
+		if (apply_filters('FHEE_load_accounting_js', FALSE)) {
+			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', EE_THIRD_PARTY_URL.'accounting/accounting.js', array('underscore'), '0.3.2', TRUE);
+			wp_enqueue_script('ee-accounting');
 			// array of settings to get converted to JSON array via wp_localize_script
 			$currency_config = array(
 				'currency' => array(
@@ -602,11 +602,11 @@ 
 	public function get_persistent_admin_notices() {
 		// http://www.example.com/wp-admin/admin.php?page=espresso_general_settings&action=critical_pages&critical_pages_nonce=2831ce0f30
 		$args = array(
-			'page' => EE_Registry::instance()->REQ->is_set( 'page' ) ? EE_Registry::instance()->REQ->get( 'page' ) : '',
-			'action' => EE_Registry::instance()->REQ->is_set( 'action' ) ? EE_Registry::instance()->REQ->get( 'action' ) : '',
+			'page' => EE_Registry::instance()->REQ->is_set('page') ? EE_Registry::instance()->REQ->get('page') : '',
+			'action' => EE_Registry::instance()->REQ->is_set('action') ? EE_Registry::instance()->REQ->get('action') : '',
 		);
-		$return_url = EE_Admin_Page::add_query_args_and_nonce( $args, EE_ADMIN_URL );
-		echo EE_Error::get_persistent_admin_notices( $return_url );
+		$return_url = EE_Admin_Page::add_query_args_and_nonce($args, EE_ADMIN_URL);
+		echo EE_Error::get_persistent_admin_notices($return_url);
 	}
 
 
@@ -627,26 +627,26 @@ 
 	 * @param $elements
 	 * @return array
 	 */
-	public function dashboard_glance_items( $elements ) {
+	public function dashboard_glance_items($elements) {
 		$events = EEM_Event::instance()->count();
-		$items['events']['url'] = EE_Admin_Page::add_query_args_and_nonce( array('page' => 'espresso_events'), admin_url('admin.php') );
-		$items['events']['text'] = sprintf( _n( '%s Event', '%s Events', $events ), number_format_i18n( $events ) );
+		$items['events']['url'] = EE_Admin_Page::add_query_args_and_nonce(array('page' => 'espresso_events'), admin_url('admin.php'));
+		$items['events']['text'] = sprintf(_n('%s Event', '%s Events', $events), number_format_i18n($events));
 		$items['events']['title'] = __('Click to view all Events', 'event_espresso');
 		$registrations = EEM_Registration::instance()->count(
 			array(
 				array(
-					'STS_ID' => array( '!=', EEM_Registration::status_id_incomplete )
+					'STS_ID' => array('!=', EEM_Registration::status_id_incomplete)
 				)
 			)
 		);
-		$items['registrations']['url'] = EE_Admin_Page::add_query_args_and_nonce( array('page' => 'espresso_registrations' ), admin_url('admin.php') );
-		$items['registrations']['text'] = sprintf( _n( '%s Registration', '%s Registrations', $registrations ), number_format_i18n($registrations) );
+		$items['registrations']['url'] = EE_Admin_Page::add_query_args_and_nonce(array('page' => 'espresso_registrations'), admin_url('admin.php'));
+		$items['registrations']['text'] = sprintf(_n('%s Registration', '%s Registrations', $registrations), number_format_i18n($registrations));
 		$items['registrations']['title'] = __('Click to view all registrations', 'event_espresso');
 
-		$items = apply_filters( 'FHEE__EE_Admin__dashboard_glance_items__items', $items );
+		$items = apply_filters('FHEE__EE_Admin__dashboard_glance_items__items', $items);
 
-		foreach ( $items as $type => $item_properties ) {
-			$elements[] = sprintf( '<a class="ee-dashboard-link-' . $type . '" href="%s" title="%s">%s</a>', $item_properties['url'], $item_properties['title'], $item_properties['text'] );
+		foreach ($items as $type => $item_properties) {
+			$elements[] = sprintf('<a class="ee-dashboard-link-'.$type.'" href="%s" title="%s">%s</a>', $item_properties['url'], $item_properties['title'], $item_properties['text']);
 		}
 		return $elements;
 	}
@@ -663,31 +663,31 @@ 
 	 * @throws EE_Error
 	 * @return    string
 	 */
-	public function check_for_invalid_datetime_formats( $value, $option ) {
+	public function check_for_invalid_datetime_formats($value, $option) {
 		// check for date_format or time_format
-		switch ( $option ) {
+		switch ($option) {
 			case 'date_format' :
-				$date_time_format = $value . ' ' . get_option('time_format');
+				$date_time_format = $value.' '.get_option('time_format');
 				break;
 			case 'time_format' :
-				$date_time_format = get_option('date_format') . ' ' . $value;
+				$date_time_format = get_option('date_format').' '.$value;
 				break;
 			default :
 				$date_time_format = FALSE;
 		}
 		// do we have a date_time format to check ?
-		if ( $date_time_format ) {
-			$error_msg = EEH_DTT_Helper::validate_format_string( $date_time_format );
+		if ($date_time_format) {
+			$error_msg = EEH_DTT_Helper::validate_format_string($date_time_format);
 
-			if ( is_array( $error_msg ) ) {
-				$msg = '<p>' . sprintf( __( 'The following date time "%s" ( %s ) is difficult to be properly parsed by PHP for the following reasons:', 'event_espresso' ), date( $date_time_format ) , $date_time_format  ) . '</p><p><ul>';
+			if (is_array($error_msg)) {
+				$msg = '<p>'.sprintf(__('The following date time "%s" ( %s ) is difficult to be properly parsed by PHP for the following reasons:', 'event_espresso'), date($date_time_format), $date_time_format).'</p><p><ul>';
 
 
-				foreach ( $error_msg as $error ) {
-					$msg .= '<li>' . $error . '</li>';
+				foreach ($error_msg as $error) {
+					$msg .= '<li>'.$error.'</li>';
 				}
 
-				$msg .= '</ul></p><p>' . sprintf( __( '%sPlease note that your date and time formats have been reset to "F j, Y" and "g:i a" respectively.%s', 'event_espresso' ), '<span style="color:#D54E21;">', '</span>' ) . '</p>';
+				$msg .= '</ul></p><p>'.sprintf(__('%sPlease note that your date and time formats have been reset to "F j, Y" and "g:i a" respectively.%s', 'event_espresso'), '<span style="color:#D54E21;">', '</span>').'</p>';
 
 				// trigger WP settings error
 				add_settings_error(
@@ -697,7 +697,7 @@ 
 				);
 
 				// set format to something valid
-				switch ( $option ) {
+				switch ($option) {
 					case 'date_format' :
 						$value = 'F j, Y';
 						break;
@@ -719,8 +719,8 @@ 
 	 * @param $content
 	 * @return    string
 	 */
-	public function its_eSpresso( $content ) {
-		return str_replace( '[EXPRESSO_', '[ESPRESSO_', $content );
+	public function its_eSpresso($content) {
+		return str_replace('[EXPRESSO_', '[ESPRESSO_', $content);
 	}
 
 
@@ -733,9 +733,9 @@ 
 	 */
 	public function espresso_admin_footer() {
 		return sprintf(
-			__( 'Event Registration and Ticketing Powered by %sEvent Registration Powered by Event Espresso%s', 'event_espresso' ),
+			__('Event Registration and Ticketing Powered by %sEvent Registration Powered by Event Espresso%s', 'event_espresso'),
 			'<a href="https://eventespresso.com/" title="',
-			'">' . EVENT_ESPRESSO_POWERED_BY . '</a>'
+			'">'.EVENT_ESPRESSO_POWERED_BY.'</a>'
 		);
 	}
 
@@ -755,12 +755,12 @@ 
 	 * @param array $config
 	 * @return void
 	 */
-	public static function register_ee_admin_page( $page_basename, $page_path, $config = array() ) {
-		EE_Error::doing_it_wrong( __METHOD__, sprintf( __('Usage is deprecated.  Use EE_Register_Admin_Page::register() for registering the %s admin page.', 'event_espresso'), $page_basename), '4.3' );
-		if ( class_exists( 'EE_Register_Admin_Page' ) ) {
+	public static function register_ee_admin_page($page_basename, $page_path, $config = array()) {
+		EE_Error::doing_it_wrong(__METHOD__, sprintf(__('Usage is deprecated.  Use EE_Register_Admin_Page::register() for registering the %s admin page.', 'event_espresso'), $page_basename), '4.3');
+		if (class_exists('EE_Register_Admin_Page')) {
 			$config['page_path'] = $page_path;
 		}
-		EE_Register_Admin_Page::register( $page_basename, $config );
+		EE_Register_Admin_Page::register($page_basename, $config);
 
 	}
 
@@ -773,7 +773,7 @@ 
 	 * @param  \WP_Post $post
 	 * @return void
 	 */
-	public static function parse_post_content_on_save( $post_ID, $post ) {
+	public static function parse_post_content_on_save($post_ID, $post) {
 		EE_Error::doing_it_wrong(
 			__METHOD__,
 			__(
@@ -782,7 +782,7 @@ 
 			),
 			'4.8.41'
 		);
-		EventEspresso\core\admin\PostShortcodeTracking::parse_post_content_on_save( $post_ID, $post );
+		EventEspresso\core\admin\PostShortcodeTracking::parse_post_content_on_save($post_ID, $post);
 	}
 
 
@@ -795,7 +795,7 @@ 
 	 * @param  $value
 	 * @return void
 	 */
-	public function reset_page_for_posts_on_change( $option, $old_value, $value ) {
+	public function reset_page_for_posts_on_change($option, $old_value, $value) {
 		EE_Error::doing_it_wrong(
 			__METHOD__,
 			__(
@@ -804,7 +804,7 @@ 
 			),
 			'4.8.41'
 		);
-		EventEspresso\core\admin\PostShortcodeTracking::reset_page_for_posts_on_change( $option, $old_value, $value );
+		EventEspresso\core\admin\PostShortcodeTracking::reset_page_for_posts_on_change($option, $old_value, $value);
 	}
 
 }

core/libraries/form_sections/inputs/EE_Select_Reveal_Input.input.php

Spacing +16 added lines, -16 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_Select_Reveal_Input
  *
@@ -11,7 +11,7 @@ 
  * @since 				4.6
  *
  */
-class EE_Select_Reveal_Input extends EE_Select_Input{
+class EE_Select_Reveal_Input extends EE_Select_Input {
 
 	/**
 	 * @param array $answer_options Array keys which match a sibling section's name
@@ -26,8 +26,8 @@ 
 	 *
 	 * @param array $input_settings
 	 */
-	public function __construct( $answer_options, $input_settings = array() ){
-		parent::__construct( $answer_options, $input_settings );
+	public function __construct($answer_options, $input_settings = array()) {
+		parent::__construct($answer_options, $input_settings);
 	}
 
 	/**
@@ -36,17 +36,17 @@ 
 	 */
 	public function sibling_sections_controlled() {
 		$sibling_sections = array();
-		foreach( $this->options() as $sibling_section_name => $sibling_section ) {
+		foreach ($this->options() as $sibling_section_name => $sibling_section) {
 			//if it's an empty string just leave it alone
-			if( empty( $sibling_section_name ) ) {
+			if (empty($sibling_section_name)) {
 				continue;
 			}
-			$sibling_section = $this->find_section_from_path( '../' . $sibling_section_name );
-			if(
+			$sibling_section = $this->find_section_from_path('../'.$sibling_section_name);
+			if (
 				$sibling_section instanceof EE_Form_Section_Base
-				&& ! empty( $sibling_section_name ) 
+				&& ! empty($sibling_section_name) 
 			) {
-				$sibling_sections[ $sibling_section_name ] = $sibling_section;
+				$sibling_sections[$sibling_section_name] = $sibling_section;
 			}
 		}
 		return $sibling_sections;
@@ -59,15 +59,15 @@ 
 	 * @param array $form_other_js_data
 	 * @return array
 	 */
-	public function get_other_js_data( $form_other_js_data = array() ) {
-		if( ! isset($form_other_js_data[ 'select_reveal_inputs' ] ) ) {
-			$form_other_js_data[ 'select_reveal_inputs' ] = array();
+	public function get_other_js_data($form_other_js_data = array()) {
+		if ( ! isset($form_other_js_data['select_reveal_inputs'])) {
+			$form_other_js_data['select_reveal_inputs'] = array();
 		}
 		$sibling_input_to_html_id_map = array();
-		foreach( $this->sibling_sections_controlled() as $sibling_section_path => $sibling_section ) {
-			$sibling_input_to_html_id_map[ $sibling_section_path ] = $sibling_section->html_id();
+		foreach ($this->sibling_sections_controlled() as $sibling_section_path => $sibling_section) {
+			$sibling_input_to_html_id_map[$sibling_section_path] = $sibling_section->html_id();
 		}
-		$form_other_js_data[ 'select_reveal_inputs' ][ $this->html_id() ] = $sibling_input_to_html_id_map;
+		$form_other_js_data['select_reveal_inputs'][$this->html_id()] = $sibling_input_to_html_id_map;
 		return $form_other_js_data;
 	}
 

core/libraries/form_sections/inputs/EE_CVV_Input.input.php

Indentation +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 			! isset( $input_settings['include_whats_this_link'] )
 			|| (
 				isset( $input_settings['include_whats_this_link'] )
-			     && $input_settings['include_whats_this_link'] === true
+				 && $input_settings['include_whats_this_link'] === true
 			)
 		) {
 			$this->_html_label_text = sprintf(

Spacing +6 added lines, -6 removed lines

@@ -8,7 +8,7 @@ 
  * @subpackage
  * @author				Mike Nelson
  */
-class EE_CVV_Input extends EE_Text_Input{
+class EE_CVV_Input extends EE_Text_Input {
 
 	/**
 	 * @param array $input_settings {
@@ -19,8 +19,8 @@ 
 		$this->set_sensitive_data_removal_strategy(new EE_CCV_Sensitive_Data_Removal());
 		$this->_add_validation_strategy(
 			new EE_Text_Validation_Strategy(
-				isset( $input_settings[ 'validation_error_message' ] )
-					?  $input_settings[ 'validation_error_message' ]
+				isset($input_settings['validation_error_message'])
+					? $input_settings['validation_error_message']
 					: __(
 						'The CVV is either a 3 digit number on the back of your card, or 4 digit number on the front',
 						'event_espresso'
@@ -29,10 +29,10 @@ 
 			)
 		);
 		parent::__construct($input_settings);
-		if(
-			! isset( $input_settings['include_whats_this_link'] )
+		if (
+			! isset($input_settings['include_whats_this_link'])
 			|| (
-				isset( $input_settings['include_whats_this_link'] )
+				isset($input_settings['include_whats_this_link'])
 			     && $input_settings['include_whats_this_link'] === true
 			)
 		) {

core/libraries/messages/EE_Messages_Scheduler.lib.php

Spacing +18 added lines, -18 removed lines

@@ -23,18 +23,18 @@ 
 	 */
 	public function __construct() {
 		//register tasks (and make sure only registered once).
-		if ( ! has_action( 'FHEE__EEH_Activation__get_cron_tasks', array( $this, 'register_scheduled_tasks' ) ) ) {
-			add_action( 'FHEE__EEH_Activation__get_cron_tasks', array( $this, 'register_scheduled_tasks' ), 10 );
+		if ( ! has_action('FHEE__EEH_Activation__get_cron_tasks', array($this, 'register_scheduled_tasks'))) {
+			add_action('FHEE__EEH_Activation__get_cron_tasks', array($this, 'register_scheduled_tasks'), 10);
 		}
 
 		//register callbacks for scheduled events (but make sure they are set only once).
-		if ( ! has_action( 'AHEE__EE_Messages_Scheduler__generation', array( 'EE_Messages_Scheduler', 'batch_generation' ) ) ) {
-			add_action( 'AHEE__EE_Messages_Scheduler__generation', array( 'EE_Messages_Scheduler', 'batch_generation') );
-			add_action( 'AHEE__EE_Messages_Scheduler__sending', array( 'EE_Messages_Scheduler', 'batch_sending' ) );
+		if ( ! has_action('AHEE__EE_Messages_Scheduler__generation', array('EE_Messages_Scheduler', 'batch_generation'))) {
+			add_action('AHEE__EE_Messages_Scheduler__generation', array('EE_Messages_Scheduler', 'batch_generation'));
+			add_action('AHEE__EE_Messages_Scheduler__sending', array('EE_Messages_Scheduler', 'batch_sending'));
 		}
 
 		//add custom schedules
-		add_filter( 'cron_schedules', array( $this, 'custom_schedules' ) );
+		add_filter('cron_schedules', array($this, 'custom_schedules'));
 	}
 
 
@@ -44,10 +44,10 @@ 
 	 * Add custom schedules for wp_cron
 	 * @param $schedules
 	 */
-	public function custom_schedules( $schedules ) {
+	public function custom_schedules($schedules) {
 		$schedules['ee_message_cron'] = array(
 			'interval' => self::message_cron_schedule,
-			'display' => __( 'This is the cron time interval for EE Message schedules (defaults to once every 5 minutes)', 'event_espresso' )
+			'display' => __('This is the cron time interval for EE Message schedules (defaults to once every 5 minutes)', 'event_espresso')
 		);
 		return $schedules;
 	}
@@ -58,7 +58,7 @@ 
 	 * @param array $tasks  already existing scheduled tasks
 	 * @return array
 	 */
-	public function register_scheduled_tasks( $tasks ) {
+	public function register_scheduled_tasks($tasks) {
 		$tasks['AHEE__EE_Messages_Scheduler__generation'] = 'ee_message_cron';
 		$tasks['AHEE__EE_Messages_Scheduler__sending'] = 'ee_message_cron';
 		return $tasks;
@@ -70,10 +70,10 @@ 
 	 * Note: The EED_Messages module has the handlers for these requests.
 	 * @param string $task  The task the request is being generated for.
 	 */
-	public static function initiate_scheduled_non_blocking_request( $task ) {
+	public static function initiate_scheduled_non_blocking_request($task) {
 		//transient is used for flood control on msg_cron_trigger requests
-		$transient_key = 'ee_trans_' . uniqid( $task );
-		set_transient( $transient_key, 1, 5 * MINUTE_IN_SECONDS );
+		$transient_key = 'ee_trans_'.uniqid($task);
+		set_transient($transient_key, 1, 5 * MINUTE_IN_SECONDS);
 		$request_url = add_query_arg(
 			array(
 				'ee' => 'msg_cron_trigger',
@@ -84,13 +84,13 @@ 
 		);
 		$request_args = array(
 			'timeout' => 300,
-			'blocking' => ( defined( 'DOING_CRON' ) && DOING_CRON ) || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ? true : false,
+			'blocking' => (defined('DOING_CRON') && DOING_CRON) || (defined('DOING_AJAX') && DOING_AJAX) ? true : false,
 			'sslverify' => false,
 			'redirection' => 10,
 		);
-		$response = wp_remote_get( $request_url, $request_args );
-		if ( is_wp_error( $response ) ) {
-			trigger_error( $response->get_error_message() );
+		$response = wp_remote_get($request_url, $request_args);
+		if (is_wp_error($response)) {
+			trigger_error($response->get_error_message());
 		}
 	}
 
@@ -102,7 +102,7 @@ 
 	 * Callback for scheduled AHEE__EE_Messages_Scheduler__generation wp cron event
 	 */
 	public static function batch_generation() {
-		EE_Messages_Scheduler::initiate_scheduled_non_blocking_request( 'generate' );
+		EE_Messages_Scheduler::initiate_scheduled_non_blocking_request('generate');
 	}
 
 
@@ -112,7 +112,7 @@ 
 	 * Callback for scheduled AHEE__EE_Messages_Scheduler__sending
 	 */
 	public static function batch_sending() {
-		EE_Messages_Scheduler::initiate_scheduled_non_blocking_request( 'send' );
+		EE_Messages_Scheduler::initiate_scheduled_non_blocking_request('send');
 	}
 
 } //end EE_Messages_Scheduler
\ No newline at end of file

admin_pages/messages/EE_Message_List_Table.class.php

Spacing +116 added lines, -116 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') ){
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
 	exit('NO direct script access allowed');
 }
 /**
@@ -26,8 +26,8 @@ 
 
 
 	protected function _setup_data() {
-		$this->_data = $this->_get_messages( $this->_per_page, $this->_view );
-		$this->_all_data_count = $this->_get_messages( $this->_per_page, $this->_view, true );
+		$this->_data = $this->_get_messages($this->_per_page, $this->_view);
+		$this->_all_data_count = $this->_get_messages($this->_per_page, $this->_view, true);
 	}
 
 
@@ -35,32 +35,32 @@ 
 
 	protected function _set_properties() {
 		$this->_wp_list_args = array(
-			'singular' => __( 'Message', 'event_espresso' ),
-			'plural' => __( 'Messages', 'event_espresso' ),
+			'singular' => __('Message', 'event_espresso'),
+			'plural' => __('Messages', 'event_espresso'),
 			'ajax' => true,
 			'screen' => $this->get_admin_page()->get_current_screen()->id
 		);
 
 		$this->_columns = array(
 			'cb' => '<input type="checkbox" />',
-			'to' => __( 'To', 'event_espresso' ),
-			'from' => __( 'From', 'event_espresso' ),
-			'messenger' => __( 'Messenger', 'event_espresso' ),
-			'message_type' => __( 'Message Type', 'event_espresso' ),
-			'context' => __( 'Context', 'event_espresso' ),
-			'modified' => __( 'Modified', 'event_espresso' ),
-			'action' => __( 'Actions', 'event_espresso' ),
-			'msg_id' => __( 'ID', 'event_espresso' ),
+			'to' => __('To', 'event_espresso'),
+			'from' => __('From', 'event_espresso'),
+			'messenger' => __('Messenger', 'event_espresso'),
+			'message_type' => __('Message Type', 'event_espresso'),
+			'context' => __('Context', 'event_espresso'),
+			'modified' => __('Modified', 'event_espresso'),
+			'action' => __('Actions', 'event_espresso'),
+			'msg_id' => __('ID', 'event_espresso'),
 		);
 
 		$this->_sortable_columns = array(
-			'modified' => array( 'MSG_modified' => true ),
-			'message_type' => array( 'MSG_message_type' => false ),
-			'messenger' => array( 'MSG_messenger' => false ),
-			'to' => array( 'MSG_to' => false ),
-			'from' => array( 'MSG_from' => false ),
-			'context' => array( 'MSG_context' => false ),
-			'msg_id' => array( 'MSG_ID', false ),
+			'modified' => array('MSG_modified' => true),
+			'message_type' => array('MSG_message_type' => false),
+			'messenger' => array('MSG_messenger' => false),
+			'to' => array('MSG_to' => false),
+			'from' => array('MSG_from' => false),
+			'context' => array('MSG_context' => false),
+			'msg_id' => array('MSG_ID', false),
 		);
 
 		$this->_primary_column = 'to';
@@ -78,11 +78,11 @@ 
 	 * @param  object $item the current item
 	 * @return string
 	 */
-	protected function _get_row_class( $item ) {
-		$class = parent::_get_row_class( $item );
+	protected function _get_row_class($item) {
+		$class = parent::_get_row_class($item);
 		//add status class
-		$class .= ' ee-status-strip msg-status-' . $item->STS_ID();
-		if ( $this->_has_checkbox_column ) {
+		$class .= ' ee-status-strip msg-status-'.$item->STS_ID();
+		if ($this->_has_checkbox_column) {
 			$class .= ' has-checkbox-column';
 		}
 		return $class;
@@ -101,7 +101,7 @@ 
 	 */
 	protected function _get_table_filters() {
 		$filters = array();
-		EE_Registry::instance()->load_helper( 'Form_Fields' );
+		EE_Registry::instance()->load_helper('Form_Fields');
 		//setup messengers for selects
 		$m_values = $this->get_admin_page()->get_messengers_for_list_table();
 		//lets do the same for message types
@@ -110,88 +110,88 @@ 
 		$contexts = $this->get_admin_page()->get_contexts_for_message_types_for_list_table();
 		$i = 1;
 		$labels = $c_values = array();
-		foreach ( $contexts as $context => $label ) {
+		foreach ($contexts as $context => $label) {
 			//some message types may have the same label for a different context, so we're grouping these together so the end user
 			//doesn't get confused.
-			if ( isset( $labels[ $label ] ) ) {
-				$c_values[ $labels[ $label ] ]['id'] .= ',' . $context;
+			if (isset($labels[$label])) {
+				$c_values[$labels[$label]]['id'] .= ','.$context;
 				continue;
 			}
-			$c_values[ $i ]['id'] = $context;
-			$c_values[ $i ]['text'] = $label;
-			$labels[ $label ] = $i;
+			$c_values[$i]['id'] = $context;
+			$c_values[$i]['text'] = $label;
+			$labels[$label] = $i;
 			$i++;
 		}
 
 		$msgr_default[0] = array(
 			'id' => 'none_selected',
-			'text' => __( 'All Messengers', 'event_espresso' )
+			'text' => __('All Messengers', 'event_espresso')
 		);
 
 		$mt_default[0] = array(
 			'id' => 'none_selected',
-			'text' => __( 'All Message Types', 'event_espresso' )
+			'text' => __('All Message Types', 'event_espresso')
 		);
 
 		$c_default[0] = array(
 			'id' => 'none_selected',
-			'text' => __( 'All Contexts', 'event_espresso ' )
+			'text' => __('All Contexts', 'event_espresso ')
 		);
 
-		$msgr_filters = count( $m_values ) > 1
-			? array_merge( $msgr_default, $m_values )
+		$msgr_filters = count($m_values) > 1
+			? array_merge($msgr_default, $m_values)
 			: $m_values;
-		$mt_filters = ! empty( $mt_values ) && count( $mt_values ) > 1
-			? array_merge( $mt_default, $mt_values )
+		$mt_filters = ! empty($mt_values) && count($mt_values) > 1
+			? array_merge($mt_default, $mt_values)
 			: (array) $mt_values;
-		$c_filters = ! empty( $c_values ) && count( $c_values ) > 1
-			? array_merge( $c_default, $c_values )
+		$c_filters = ! empty($c_values) && count($c_values) > 1
+			? array_merge($c_default, $c_values)
 			: (array) $c_values;
 
-		if ( empty( $msgr_filters ) ) {
+		if (empty($msgr_filters)) {
 			$msgr_filters[0] = array(
 				'id'   => 'none_selected',
-				'text' => __( 'No Messengers active', 'event_espresso' )
+				'text' => __('No Messengers active', 'event_espresso')
 			);
 		}
 
-		if ( empty( $mt_filters ) ) {
+		if (empty($mt_filters)) {
 			$mt_filters[0] = array(
 				'id'   => 'none_selected',
-				'text' => __( 'No Message Types active', 'event_espresso' )
+				'text' => __('No Message Types active', 'event_espresso')
 			);
 		}
 
-		if ( empty( $c_filters ) ) {
+		if (empty($c_filters)) {
 			$c_filters[0] = array(
 				'id'   => 'none_selected',
-				'text' => __( 'No Contexts (because no message types active)', 'event_espresso' )
+				'text' => __('No Contexts (because no message types active)', 'event_espresso')
 			);
 		}
 
-		if ( count ( $msgr_filters ) > 1 ) {
+		if (count($msgr_filters) > 1) {
 			$filters[] = EEH_Form_Fields::select_input(
 				'ee_messenger_filter_by',
-				array_values( $msgr_filters ),
-				isset( $this->_req_data['ee_messenger_filter_by'] )
-					? sanitize_title( $this->_req_data['ee_messenger_filter_by'] )
+				array_values($msgr_filters),
+				isset($this->_req_data['ee_messenger_filter_by'])
+					? sanitize_title($this->_req_data['ee_messenger_filter_by'])
 					: ''
 			);
 		}
-		if ( count( $mt_filters ) > 1 ) {
+		if (count($mt_filters) > 1) {
 		$filters[] = EEH_Form_Fields::select_input(
 				'ee_message_type_filter_by',
-				array_values( $mt_filters ),
-				isset( $this->_req_data['ee_message_type_filter_by'] ) ? sanitize_title(
+				array_values($mt_filters),
+				isset($this->_req_data['ee_message_type_filter_by']) ? sanitize_title(
 					$this->_req_data['ee_message_type_filter_by']
 				) : ''
 			);
 		}
-		if ( count( $c_filters ) > 1 ) {
+		if (count($c_filters) > 1) {
 			$filters[] = EEH_Form_Fields::select_input(
 				'ee_context_filter_by',
-				array_values( $c_filters ),
-				isset( $this->_req_data['ee_context_filter_by'] ) ? sanitize_text_field(
+				array_values($c_filters),
+				isset($this->_req_data['ee_context_filter_by']) ? sanitize_text_field(
 					$this->_req_data['ee_context_filter_by']
 				) : ''
 			);
@@ -202,8 +202,8 @@ 
 
 
 	protected function _add_view_counts() {
-		foreach ( $this->_views as $view => $args ) {
-			$this->_views[ $view ]['count'] = $this->_get_messages( $this->_per_page, $view, true, true );
+		foreach ($this->_views as $view => $args) {
+			$this->_views[$view]['count'] = $this->_get_messages($this->_per_page, $view, true, true);
 		}
 	}
 
@@ -214,8 +214,8 @@ 
 	 * @return string   checkbox
 	 * @throws \EE_Error
 	 */
-	public function column_cb( $message ) {
-		return sprintf( '<input type="checkbox" name="MSG_ID[%s]" value="1" />', $message->ID() );
+	public function column_cb($message) {
+		return sprintf('<input type="checkbox" name="MSG_ID[%s]" value="1" />', $message->ID());
 	}
 
 
@@ -225,7 +225,7 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function column_msg_id( EE_Message $message ) {
+	public function column_msg_id(EE_Message $message) {
 		return $message->ID();
 	}
 
@@ -236,8 +236,8 @@ 
 	 * @return string    The recipient of the message
 	 * @throws \EE_Error
 	 */
-	public function column_to( EE_Message $message ) {
-		EE_Registry::instance()->load_helper( 'URL' );
+	public function column_to(EE_Message $message) {
+		EE_Registry::instance()->load_helper('URL');
 		$actions = array();
 		$actions['delete'] = '<a href="'
 			. EEH_URL::add_query_args_and_nonce(
@@ -246,10 +246,10 @@ 
 					'action' => 'delete_ee_message',
 					'MSG_ID' => $message->ID()
 				),
-				admin_url( 'admin.php' )
+				admin_url('admin.php')
 			)
-			. '">' . __( 'Delete', 'event_espresso' ) . '</a>';
-		return $message->to() . $this->row_actions( $actions );
+			. '">'.__('Delete', 'event_espresso').'</a>';
+		return $message->to().$this->row_actions($actions);
 	}
 
 
@@ -257,7 +257,7 @@ 
 	 * @param EE_Message $message
 	 * @return string   The sender of the message
 	 */
-	public function column_from( EE_Message $message ) {
+	public function column_from(EE_Message $message) {
 		return $message->from();
 	}
 
@@ -267,8 +267,8 @@ 
 	 * @param EE_Message $message
 	 * @return string  The messenger used to send the message.
 	 */
-	public function column_messenger( EE_Message $message ) {
-		return ucwords( $message->messenger_label() );
+	public function column_messenger(EE_Message $message) {
+		return ucwords($message->messenger_label());
 	}
 
 
@@ -276,8 +276,8 @@ 
 	 * @param EE_Message $message
 	 * @return string  The message type used to generate the message.
 	 */
-	public function column_message_type( EE_Message $message ) {
-		return ucwords( $message->message_type_label() );
+	public function column_message_type(EE_Message $message) {
+		return ucwords($message->message_type_label());
 	}
 
 
@@ -285,7 +285,7 @@ 
 	 * @param EE_Message $message
 	 * @return string  The context the message was generated for.
 	 */
-	public function column_context( EE_Message $message ) {
+	public function column_context(EE_Message $message) {
 		return $message->context_label();
 	}
 
@@ -294,7 +294,7 @@ 
 	 * @param EE_Message $message
 	 * @return string    The timestamp when this message was last modified.
 	 */
-	public function column_modified( EE_Message $message ) {
+	public function column_modified(EE_Message $message) {
 		return $message->modified();
 	}
 
@@ -303,36 +303,36 @@ 
 	 * @param EE_Message $message
 	 * @return string   Actions that can be done on the current message.
 	 */
-	public function column_action( EE_Message $message ) {
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
+	public function column_action(EE_Message $message) {
+		EE_Registry::instance()->load_helper('MSG_Template');
 		$action_links = array(
-			'view' => EEH_MSG_Template::get_message_action_link( 'view', $message ),
-			'error' => EEH_MSG_Template::get_message_action_link( 'error', $message ),
-			'generate_now' => EEH_MSG_Template::get_message_action_link( 'generate_now', $message ),
-			'send_now' => EEH_MSG_Template::get_message_action_link( 'send_now', $message ),
-			'queue_for_resending' => EEH_MSG_Template::get_message_action_link( 'queue_for_resending', $message ),
-			'view_transaction' => EEH_MSG_Template::get_message_action_link( 'view_transaction', $message ),
+			'view' => EEH_MSG_Template::get_message_action_link('view', $message),
+			'error' => EEH_MSG_Template::get_message_action_link('error', $message),
+			'generate_now' => EEH_MSG_Template::get_message_action_link('generate_now', $message),
+			'send_now' => EEH_MSG_Template::get_message_action_link('send_now', $message),
+			'queue_for_resending' => EEH_MSG_Template::get_message_action_link('queue_for_resending', $message),
+			'view_transaction' => EEH_MSG_Template::get_message_action_link('view_transaction', $message),
 		);
 		$content = '';
-		switch ( $message->STS_ID() ) {
+		switch ($message->STS_ID()) {
 			case EEM_Message::status_sent :
-				$content = $action_links['view'] . $action_links['queue_for_resending'] . $action_links['view_transaction'];
+				$content = $action_links['view'].$action_links['queue_for_resending'].$action_links['view_transaction'];
 				break;
 			case EEM_Message::status_resend :
-				$content = $action_links['view'] . $action_links['send_now'] . $action_links['view_transaction'];
+				$content = $action_links['view'].$action_links['send_now'].$action_links['view_transaction'];
 				break;
 			case EEM_Message::status_retry :
-				$content = $action_links['view'] . $action_links['send_now'] . $action_links['error'] . $action_links['view_transaction'];
+				$content = $action_links['view'].$action_links['send_now'].$action_links['error'].$action_links['view_transaction'];
 				break;
 			case EEM_Message::status_failed :
 			case EEM_Message::status_debug_only :
-				$content = $action_links['error'] . $action_links['view_transaction'];
+				$content = $action_links['error'].$action_links['view_transaction'];
 				break;
 			case EEM_Message::status_idle :
-				$content = $action_links['view'] . $action_links['send_now'] . $action_links['view_transaction'];
+				$content = $action_links['view'].$action_links['send_now'].$action_links['view_transaction'];
 				break;
 			case EEM_Message::status_incomplete;
-				$content = $action_links['generate_now'] . $action_links['view_transaction'];
+				$content = $action_links['generate_now'].$action_links['view_transaction'];
 				break;
 		}
 		return $content;
@@ -350,69 +350,69 @@ 
 	 * @return int | EE_Message[]
 	 * @throws \EE_Error
 	 */
-	protected function _get_messages( $perpage = 10, $view = 'all', $count = false, $all = false ) {
+	protected function _get_messages($perpage = 10, $view = 'all', $count = false, $all = false) {
 
-		$current_page = isset( $this->_req_data['paged'] ) && ! empty( $this->_req_data['paged'] )
+		$current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged'])
 			? $this->_req_data['paged']
 			: 1;
 
-		$per_page = isset( $this->_req_data['perpage'] ) && ! empty( $this->_req_data['perpage'] )
+		$per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage'])
 			? $this->_req_data['perpage']
 			: $perpage;
 
-		$offset = ( $current_page - 1 ) * $per_page;
-		$limit = $all || $count ? null : array( $offset, $per_page );
+		$offset = ($current_page - 1) * $per_page;
+		$limit = $all || $count ? null : array($offset, $per_page);
 		$query_params = array(
-			'order_by' => empty( $this->_req_data[ 'orderby' ] ) ? 'MSG_modified' : $this->_req_data[ 'orderby' ],
-			'order'    => empty( $this->_req_data[ 'order' ] ) ? 'DESC' : $this->_req_data[ 'order' ],
+			'order_by' => empty($this->_req_data['orderby']) ? 'MSG_modified' : $this->_req_data['orderby'],
+			'order'    => empty($this->_req_data['order']) ? 'DESC' : $this->_req_data['order'],
 			'limit'    => $limit,
 		);
 
 		/**
 		 * Any filters coming in from other routes?
 		 */
-		if ( isset( $this->_req_data['filterby'] ) ) {
-			$query_params = array_merge( $query_params, EEM_Message::instance()->filter_by_query_params() );
-			if ( ! $count ) {
+		if (isset($this->_req_data['filterby'])) {
+			$query_params = array_merge($query_params, EEM_Message::instance()->filter_by_query_params());
+			if ( ! $count) {
 				$query_params['group_by'] = 'MSG_ID';
 			}
 		}
 
 		//view conditionals
-		if ( $view !== 'all' && $count && $all ) {
+		if ($view !== 'all' && $count && $all) {
 			$query_params[0]['AND*view_conditional'] = array(
-				'STS_ID' => strtoupper( $view ),
+				'STS_ID' => strtoupper($view),
 			);
 		}
 
-		if ( ! $all && ! empty( $this->_req_data['status'] ) && $this->_req_data['status'] !== 'all' ) {
+		if ( ! $all && ! empty($this->_req_data['status']) && $this->_req_data['status'] !== 'all') {
 			$query_params[0]['AND*view_conditional'] = array(
-				'STS_ID' => strtoupper( $this->_req_data['status'] ),
+				'STS_ID' => strtoupper($this->_req_data['status']),
 			);
 		}
 
-		if ( ! $all && ! empty( $this->_req_data['s'] ) ) {
-			$search_string = '%' . $this->_req_data['s'] . '%';
+		if ( ! $all && ! empty($this->_req_data['s'])) {
+			$search_string = '%'.$this->_req_data['s'].'%';
 			$query_params[0]['OR'] = array(
-				'MSG_to' => array( 'LIKE', $search_string ),
-				'MSG_from' => array( 'LIKE', $search_string ),
-				'MSG_subject' => array( 'LIKE', $search_string ),
-				'MSG_content' => array( 'LIKE', $search_string ),
+				'MSG_to' => array('LIKE', $search_string),
+				'MSG_from' => array('LIKE', $search_string),
+				'MSG_subject' => array('LIKE', $search_string),
+				'MSG_content' => array('LIKE', $search_string),
 			);
 		}
 
 		//account for debug only status.  We don't show Messages with the EEM_Message::status_debug_only to clients when
 		//`WP_DEBUG` is false.
-		if ( ! defined( 'WP_DEBUG' ) || ! WP_DEBUG ) {
+		if ( ! defined('WP_DEBUG') || ! WP_DEBUG) {
 			$query_params[0]['AND*debug_only_conditional'] = array(
-				'STS_ID' => array( '!=', EEM_Message::status_debug_only )
+				'STS_ID' => array('!=', EEM_Message::status_debug_only)
 			);
 		}
 
 		//account for filters
 		if (
 			! $all
-			&& isset( $this->_req_data['ee_messenger_filter_by'] )
+			&& isset($this->_req_data['ee_messenger_filter_by'])
 			&& $this->_req_data['ee_messenger_filter_by'] !== 'none_selected'
 		) {
 			$query_params[0]['AND*messenger_filter'] = array(
@@ -421,7 +421,7 @@ 
 		}
 		if (
 			! $all
-			&& ! empty( $this->_req_data['ee_message_type_filter_by'] )
+			&& ! empty($this->_req_data['ee_message_type_filter_by'])
 			&& $this->_req_data['ee_message_type_filter_by'] !== 'none_selected'
 		) {
 			$query_params[0]['AND*message_type_filter'] = array(
@@ -431,17 +431,17 @@ 
 
 		if (
 			! $all
-			&& ! empty( $this->_req_data['ee_context_filter_by'] )
+			&& ! empty($this->_req_data['ee_context_filter_by'])
 			&& $this->_req_data['ee_context_filter_by'] !== 'none_selected'
 		) {
 			$query_params[0]['AND*context_filter'] = array(
-				'MSG_context' => array( 'IN', explode( ',', $this->_req_data['ee_context_filter_by'] ) )
+				'MSG_context' => array('IN', explode(',', $this->_req_data['ee_context_filter_by']))
 			);
 		}
 
 		return $count
-			? EEM_Message::instance()->count( $query_params, null, true )
-			: EEM_Message::instance()->get_all( $query_params );
+			? EEM_Message::instance()->count($query_params, null, true)
+			: EEM_Message::instance()->get_all($query_params);
 
 	}
 } //end EE_Message_List_Table class
\ No newline at end of file