eventespresso / event-espresso-core

core/libraries/payment_methods/EE_Offsite_Gateway.lib.php

Spacing +7 added lines, -7 removed lines

@@ -24,7 +24,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-abstract class EE_Offsite_Gateway extends EE_Gateway{
+abstract class EE_Offsite_Gateway extends EE_Gateway {
 
 	/**
 	 * whether or not the gateway uses an IPN
@@ -61,7 +61,7 @@ 
 	 * @param string     $cancel_url URL to send the user to after a cancelled payment attempt on teh payment provider's website
 	 * @return EE_Payment
 	 */
-	public abstract function set_redirection_info( $payment, $billing_info = array(), $return_url = NULL, $notify_url = NULL, $cancel_url = NULL);
+	public abstract function set_redirection_info($payment, $billing_info = array(), $return_url = NULL, $notify_url = NULL, $cancel_url = NULL);
 
 
 
@@ -74,7 +74,7 @@ 
 	 * @param EEI_Transaction $transaction
 	 * @return EEI_Payment updated
 	 */
-	public abstract function handle_payment_update($update_info,$transaction);
+	public abstract function handle_payment_update($update_info, $transaction);
 
 
 
@@ -101,8 +101,8 @@ 
 	 * @access protected
 	 * @param boolean $uses_separate_IPN_request
 	 */
-	protected function set_uses_separate_IPN_request( $uses_separate_IPN_request ) {
-		$this->_uses_separate_IPN_request = filter_var( $uses_separate_IPN_request, FILTER_VALIDATE_BOOLEAN );
+	protected function set_uses_separate_IPN_request($uses_separate_IPN_request) {
+		$this->_uses_separate_IPN_request = filter_var($uses_separate_IPN_request, FILTER_VALIDATE_BOOLEAN);
 	}
 	
 	/**
@@ -116,8 +116,8 @@ 
 	 * @param boolean $separate_IPN_request
 	 * @return boolean
 	 */
-	public function handle_IPN_in_this_request( $request_data, $separate_IPN_request ) {
-		if( $separate_IPN_request ) {
+	public function handle_IPN_in_this_request($request_data, $separate_IPN_request) {
+		if ($separate_IPN_request) {
 			return $this->_uses_separate_IPN_request;
 		} else {
 			//it's a request where the user returned from an offsite gateway

core/admin/PostShortcodeTracking.php

Spacing +84 added lines, -84 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\admin;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -28,31 +28,31 @@ 
 	public static function set_hooks_admin() {
 		add_action(
 			'save_post',
-			array( 'EventEspresso\core\admin\PostShortcodeTracking', 'parse_post_content_on_save' ),
+			array('EventEspresso\core\admin\PostShortcodeTracking', 'parse_post_content_on_save'),
 			100,
 			2
 		);
 		add_action(
 			'delete_post',
-			array( 'EventEspresso\core\admin\PostShortcodeTracking', 'unset_post_shortcodes_on_delete' ),
+			array('EventEspresso\core\admin\PostShortcodeTracking', 'unset_post_shortcodes_on_delete'),
 			100,
 			1
 		);
 		add_action(
 			'add_option_page_for_posts',
-			array( 'EventEspresso\core\admin\PostShortcodeTracking', 'reset_page_for_posts_on_initial_set' ),
+			array('EventEspresso\core\admin\PostShortcodeTracking', 'reset_page_for_posts_on_initial_set'),
 			100,
 			2
 		);
 		add_action(
 			'update_option',
-			array( 'EventEspresso\core\admin\PostShortcodeTracking', 'reset_page_for_posts_on_change' ),
+			array('EventEspresso\core\admin\PostShortcodeTracking', 'reset_page_for_posts_on_change'),
 			100,
 			3
 		);
 		add_action(
 			'delete_option',
-			array( 'EventEspresso\core\admin\PostShortcodeTracking', 'reset_page_for_posts_on_delete' ),
+			array('EventEspresso\core\admin\PostShortcodeTracking', 'reset_page_for_posts_on_delete'),
 			100,
 			1
 		);
@@ -72,61 +72,61 @@ 
 	 * @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) {
 		// if the post is trashed, then let's remove our post shortcode tracking
-		if ( $post instanceof \WP_Post && $post->post_status === 'trash' ) {
-			PostShortcodeTracking::unset_post_shortcodes_on_delete( $post_ID );
+		if ($post instanceof \WP_Post && $post->post_status === 'trash') {
+			PostShortcodeTracking::unset_post_shortcodes_on_delete($post_ID);
 			return;
 		}
 		// default post types
-		$post_types = array( 'post' => 0, 'page' => 1 );
+		$post_types = array('post' => 0, 'page' => 1);
 		// add CPTs
 		$CPTs = \EE_Register_CPTs::get_CPTs();
-		$post_types = array_merge( $post_types, $CPTs );
+		$post_types = array_merge($post_types, $CPTs);
 		// for default or CPT posts...
-		if ( isset( $post_types[ $post->post_type ] ) ) {
+		if (isset($post_types[$post->post_type])) {
 			// post on frontpage ?
 			$page_for_posts = \EE_Config::get_page_for_posts();
-			if ( $post->post_name === $page_for_posts ) {
-				PostShortcodeTracking::set_post_shortcodes_for_posts_page( $page_for_posts );
+			if ($post->post_name === $page_for_posts) {
+				PostShortcodeTracking::set_post_shortcodes_for_posts_page($page_for_posts);
 				return;
 			}
 			// array of shortcodes indexed by post name
-			\EE_Registry::CFG()->core->post_shortcodes = isset( \EE_Registry::CFG()->core->post_shortcodes )
+			\EE_Registry::CFG()->core->post_shortcodes = isset(\EE_Registry::CFG()->core->post_shortcodes)
 				? \EE_Registry::CFG()->core->post_shortcodes
 				: array();
 			// whether to proceed with update
 			$update_post_shortcodes = false;
 			// empty both arrays
-			\EE_Registry::CFG()->core->post_shortcodes[ $post->post_name ] = array();
+			\EE_Registry::CFG()->core->post_shortcodes[$post->post_name] = array();
 			// check that posts page is already being tracked
-			if ( ! isset( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ] ) ) {
+			if ( ! isset(\EE_Registry::CFG()->core->post_shortcodes[$page_for_posts])) {
 				// if not, then ensure that it is properly added
-				\EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ] = array();
+				\EE_Registry::CFG()->core->post_shortcodes[$page_for_posts] = array();
 			}
 			// loop thru shortcodes
-			foreach ( \EE_Registry::instance()->shortcodes as $EES_Shortcode => $shortcode_dir ) {
+			foreach (\EE_Registry::instance()->shortcodes as $EES_Shortcode => $shortcode_dir) {
 				// convert to UPPERCASE to get actual shortcode
-				$EES_Shortcode = strtoupper( $EES_Shortcode );
+				$EES_Shortcode = strtoupper($EES_Shortcode);
 				// is the shortcode in the post_content ?
-				if ( strpos( $post->post_content, $EES_Shortcode ) !== false ) {
+				if (strpos($post->post_content, $EES_Shortcode) !== false) {
 					// map shortcode to post names and post IDs
-					\EE_Registry::CFG()->core->post_shortcodes[ $post->post_name ][ $EES_Shortcode ] = $post_ID;
+					\EE_Registry::CFG()->core->post_shortcodes[$post->post_name][$EES_Shortcode] = $post_ID;
 					// and add this shortcode to the tracking for the blog page
-					PostShortcodeTracking::set_post_shortcode_for_posts_page( $page_for_posts, $EES_Shortcode, $post_ID );
+					PostShortcodeTracking::set_post_shortcode_for_posts_page($page_for_posts, $EES_Shortcode, $post_ID);
 					$update_post_shortcodes = true;
 				} else {
 					// shortcode is not present in post content, so check if we were tracking it previously
 					// stop tracking if shortcode is not used in this specific post
-					if ( isset( \EE_Registry::CFG()->core->post_shortcodes[ $post->post_name ][ $EES_Shortcode ] ) ) {
-						unset( \EE_Registry::CFG()->core->post_shortcodes[ $post->post_name ][ $EES_Shortcode ] );
+					if (isset(\EE_Registry::CFG()->core->post_shortcodes[$post->post_name][$EES_Shortcode])) {
+						unset(\EE_Registry::CFG()->core->post_shortcodes[$post->post_name][$EES_Shortcode]);
 						$update_post_shortcodes = true;
 					}
 					// make sure that something is set for the shortcode posts (even though we may remove this)
 					$shortcode_posts = isset(
-						\EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ]
+						\EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$EES_Shortcode]
 					)
-						? \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ]
+						? \EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$EES_Shortcode]
 						: array();
 					// and stop tracking for this shortcode on the blog page if it is not used
 					$update_post_shortcodes = PostShortcodeTracking::unset_posts_page_shortcode_for_post(
@@ -140,8 +140,8 @@ 
 						: $update_post_shortcodes;
 				}
 			}
-			if ( $update_post_shortcodes ) {
-				PostShortcodeTracking::update_post_shortcodes( $page_for_posts );
+			if ($update_post_shortcodes) {
+				PostShortcodeTracking::update_post_shortcodes($page_for_posts);
 			}
 		}
 	}
@@ -158,15 +158,15 @@ 
 	 * @param  string $page_for_posts
 	 * @return void
 	 */
-	protected static function set_post_shortcodes_for_posts_page( $page_for_posts ) {
-		\EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ] = array();
+	protected static function set_post_shortcodes_for_posts_page($page_for_posts) {
+		\EE_Registry::CFG()->core->post_shortcodes[$page_for_posts] = array();
 		// loop thru shortcodes
-		foreach ( \EE_Registry::CFG()->core->post_shortcodes as $post_name => $post_shortcodes ) {
-			foreach ( $post_shortcodes as $EES_Shortcode => $post_ID ) {
-				PostShortcodeTracking::set_post_shortcode_for_posts_page( $page_for_posts, $EES_Shortcode, $post_ID );
+		foreach (\EE_Registry::CFG()->core->post_shortcodes as $post_name => $post_shortcodes) {
+			foreach ($post_shortcodes as $EES_Shortcode => $post_ID) {
+				PostShortcodeTracking::set_post_shortcode_for_posts_page($page_for_posts, $EES_Shortcode, $post_ID);
 			}
 		}
-		PostShortcodeTracking::update_post_shortcodes( $page_for_posts );
+		PostShortcodeTracking::update_post_shortcodes($page_for_posts);
 	}
 
 
@@ -181,24 +181,24 @@ 
 	 * @param         $EES_Shortcode
 	 * @param         $post_ID
 	 */
-	protected static function set_post_shortcode_for_posts_page( $page_for_posts, $EES_Shortcode, $post_ID ) {
+	protected static function set_post_shortcode_for_posts_page($page_for_posts, $EES_Shortcode, $post_ID) {
 		// critical page shortcodes that we do NOT want added to the Posts page (blog)
 		$critical_shortcodes = \EE_Registry::CFG()->core->get_critical_pages_shortcodes_array();
 		// if the shortcode is NOT one of the critical page shortcodes like ESPRESSO_TXN_PAGE
-		if ( in_array( $EES_Shortcode, $critical_shortcodes ) ) {
+		if (in_array($EES_Shortcode, $critical_shortcodes)) {
 			return;
 		}
 		// add shortcode to "Posts page" tracking
-		if ( isset( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] ) ) {
+		if (isset(\EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$EES_Shortcode])) {
 			// make sure tracking is in form of an array
-			if ( ! is_array( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] ) ) {
-				\EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] = array(
-					\EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] => true
+			if ( ! is_array(\EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$EES_Shortcode])) {
+				\EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$EES_Shortcode] = array(
+					\EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$EES_Shortcode] => true
 				);
 			}
-			\EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] += array( $post_ID => true );
+			\EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$EES_Shortcode] += array($post_ID => true);
 		} else {
-			\EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] = array( $post_ID => true );
+			\EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$EES_Shortcode] = array($post_ID => true);
 		}
 	}
 
@@ -211,16 +211,16 @@ 
 	 * @param  int $ID
 	 * @return void
 	 */
-	public static function unset_post_shortcodes_on_delete( $ID ) {
+	public static function unset_post_shortcodes_on_delete($ID) {
 		$update_post_shortcodes = false;
 		// post on frontpage ?
 		$page_for_posts = \EE_Config::get_page_for_posts();
 		// looking for any references to this post
-		foreach ( \EE_Registry::CFG()->core->post_shortcodes as $post_name => $post_shortcodes ) {
+		foreach (\EE_Registry::CFG()->core->post_shortcodes as $post_name => $post_shortcodes) {
 			// is this the "Posts Page" (blog) ?
-			if ( $post_name === $page_for_posts ) {
+			if ($post_name === $page_for_posts) {
 				// loop thru shortcodes registered for the posts page
-				foreach ( $post_shortcodes as $shortcode_class => $shortcode_posts ) {
+				foreach ($post_shortcodes as $shortcode_class => $shortcode_posts) {
 					$update_post_shortcodes = PostShortcodeTracking::unset_posts_page_shortcode_for_post(
 						$ID,
 						$shortcode_class,
@@ -233,17 +233,17 @@ 
 				}
 			} else {
 				// loop thru shortcodes registered for each page
-				foreach ( $post_shortcodes as $shortcode_class => $post_ID ) {
+				foreach ($post_shortcodes as $shortcode_class => $post_ID) {
 					// if this is page is being deleted, then don't track any post shortcodes for it
-					if ( $post_ID === $ID ) {
-						unset( \EE_Registry::CFG()->core->post_shortcodes[ $post_name ] );
+					if ($post_ID === $ID) {
+						unset(\EE_Registry::CFG()->core->post_shortcodes[$post_name]);
 						$update_post_shortcodes = true;
 					}
 				}
 			}
 		}
-		if ( $update_post_shortcodes ) {
-			PostShortcodeTracking::update_post_shortcodes( $page_for_posts );
+		if ($update_post_shortcodes) {
+			PostShortcodeTracking::update_post_shortcodes($page_for_posts);
 		}
 	}
 
@@ -268,20 +268,20 @@ 
 		$update_post_shortcodes = false
 	) {
 		// make sure that an array of post IDs is being tracked for each  shortcode
-		if ( ! is_array( $shortcode_posts ) ) {
-			\EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $shortcode_class ] = array(
+		if ( ! is_array($shortcode_posts)) {
+			\EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$shortcode_class] = array(
 				$shortcode_posts => true
 			);
 			$update_post_shortcodes = true;
 		}
 		// now if the ID of the post being deleted is in the $shortcode_posts array
-		if ( is_array( $shortcode_posts ) && isset( $shortcode_posts[ $ID ] ) ) {
-			unset( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $shortcode_class ][ $ID ] );
+		if (is_array($shortcode_posts) && isset($shortcode_posts[$ID])) {
+			unset(\EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$shortcode_class][$ID]);
 			$update_post_shortcodes = true;
 		}
 		// if nothing is registered for that shortcode anymore, then delete the shortcode altogether
-		if ( empty( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $shortcode_class ] ) ) {
-			unset( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $shortcode_class ] );
+		if (empty(\EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$shortcode_class])) {
+			unset(\EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$shortcode_class]);
 			$update_post_shortcodes = true;
 		}
 		return $update_post_shortcodes;
@@ -296,9 +296,9 @@ 
 	 * @param $page_for_posts
 	 * @return    void
 	 */
-	public static function update_post_shortcodes( $page_for_posts = '' ) {
+	public static function update_post_shortcodes($page_for_posts = '') {
 		// make sure page_for_posts is set
-		$page_for_posts = ! empty( $page_for_posts )
+		$page_for_posts = ! empty($page_for_posts)
 			? $page_for_posts
 			: \EE_Config::get_page_for_posts();
 		// allow others to mess stuff up :D
@@ -314,45 +314,45 @@ 
 			$page_for_posts
 		);
 		// verify that post_shortcodes is set
-		\EE_Config::instance()->core->post_shortcodes = isset( \EE_Config::instance()->core->post_shortcodes )
-		                                                && is_array( \EE_Config::instance()->core->post_shortcodes )
+		\EE_Config::instance()->core->post_shortcodes = isset(\EE_Config::instance()->core->post_shortcodes)
+		                                                && is_array(\EE_Config::instance()->core->post_shortcodes)
 			? \EE_Config::instance()->core->post_shortcodes
 			: array();
 		// cycle thru post_shortcodes
-		foreach ( \EE_Config::instance()->core->post_shortcodes as $post_name => $shortcodes ) {
+		foreach (\EE_Config::instance()->core->post_shortcodes as $post_name => $shortcodes) {
 			// are there any shortcodes to track ?
-			if ( ! empty( $shortcodes ) ) {
+			if ( ! empty($shortcodes)) {
 				// loop thru list of tracked shortcodes
-				foreach ( $shortcodes as $shortcode => $post_id ) {
+				foreach ($shortcodes as $shortcode => $post_id) {
 					// if shortcode is for a critical page,
 					// BUT this is NOT the corresponding critical page for that shortcode
-					if ( $post_name === $page_for_posts ) {
+					if ($post_name === $page_for_posts) {
 						continue;
 					}
 					// skip the posts page, because we want all shortcodes registered for it
-					if ( $post_name === $page_for_posts ) {
+					if ($post_name === $page_for_posts) {
 						continue;
 					}
 					// make sure post still exists
-					$post = get_post( $post_id );
+					$post = get_post($post_id);
 					// check that the post name matches what we have saved
-					if ( $post && $post->post_name === $post_name ) {
+					if ($post && $post->post_name === $post_name) {
 						// if so, then break before hitting the unset below
 						continue;
 					}
 					// we don't like missing posts around here >:(
-					unset( \EE_Config::instance()->core->post_shortcodes[ $post_name ] );
+					unset(\EE_Config::instance()->core->post_shortcodes[$post_name]);
 				}
 			} else {
 				// you got no shortcodes to keep track of !
-				unset( \EE_Config::instance()->core->post_shortcodes[ $post_name ] );
+				unset(\EE_Config::instance()->core->post_shortcodes[$post_name]);
 			}
 		}
 		// critical page shortcodes that we do NOT want added to the Posts page (blog)
 		$critical_shortcodes = \EE_Config::instance()->core->get_critical_pages_shortcodes_array();
-		$critical_shortcodes = array_flip( $critical_shortcodes );
-		foreach ( $critical_shortcodes as $critical_shortcode ) {
-			unset( \EE_Config::instance()->core->post_shortcodes[ $page_for_posts ][ $critical_shortcode ] );
+		$critical_shortcodes = array_flip($critical_shortcodes);
+		foreach ($critical_shortcodes as $critical_shortcode) {
+			unset(\EE_Config::instance()->core->post_shortcodes[$page_for_posts][$critical_shortcode]);
 		}
 		//only show errors
 		\EE_Config::instance()->update_espresso_config();
@@ -372,8 +372,8 @@ 
 	 * @param  string $value
 	 * @return void
 	 */
-	public static function reset_page_for_posts_on_initial_set( $option, $value ) {
-		PostShortcodeTracking::reset_page_for_posts_on_change( $option, '', $value );
+	public static function reset_page_for_posts_on_initial_set($option, $value) {
+		PostShortcodeTracking::reset_page_for_posts_on_change($option, '', $value);
 	}
 
 
@@ -390,13 +390,13 @@ 
 	 * @param  string $value
 	 * @return void
 	 */
-	public static function reset_page_for_posts_on_change( $option, $old_value = '', $value = '' ) {
-		if ( $option === 'page_for_posts' ) {
+	public static function reset_page_for_posts_on_change($option, $old_value = '', $value = '') {
+		if ($option === 'page_for_posts') {
 			global $wpdb;
 			$table = $wpdb->posts;
 			$SQL = "SELECT post_name from $table WHERE post_type='posts' OR post_type='page' AND post_status='publish' AND ID=%d";
-			$new_page_for_posts = $value ? $wpdb->get_var( $wpdb->prepare( $SQL, $value ) ) : 'posts';
-			PostShortcodeTracking::set_post_shortcodes_for_posts_page( $new_page_for_posts );
+			$new_page_for_posts = $value ? $wpdb->get_var($wpdb->prepare($SQL, $value)) : 'posts';
+			PostShortcodeTracking::set_post_shortcodes_for_posts_page($new_page_for_posts);
 		}
 	}
 
@@ -412,9 +412,9 @@ 
 	 * @param  string $option
 	 * @return void
 	 */
-	public static function reset_page_for_posts_on_delete( $option ) {
-		if ( $option === 'page_for_posts' ) {
-			PostShortcodeTracking::set_post_shortcodes_for_posts_page( 'posts' );
+	public static function reset_page_for_posts_on_delete($option) {
+		if ($option === 'page_for_posts') {
+			PostShortcodeTracking::set_post_shortcodes_for_posts_page('posts');
 		}
 	}
 

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 +140 added lines, -140 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()->level() !== EE_Maintenance_Mode::level_2_complete_maintenance ){
+		if (EE_Maintenance_Mode::instance()->level() !== EE_Maintenance_Mode::level_2_complete_maintenance) {
 			//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);
 
 	}
 

admin_pages/events/Events_Admin_Page.core.php

Indentation +3 added lines, -3 removed lines

@@ -606,9 +606,9 @@
 		// first check if event is active.
 		if (
 			$orig_status === EEM_Event::cancelled
-		    || $orig_status === EEM_Event::postponed
-		    || $event->is_expired()
-		    || $event->is_inactive()
+			|| $orig_status === EEM_Event::postponed
+			|| $event->is_expired()
+			|| $event->is_inactive()
 		) {
 			return;
 		}

Braces +17 added lines, -11 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if (!defined('EVENT_ESPRESSO_VERSION')) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -1484,10 +1485,11 @@ 
 			//get the earliest datetime (if present);
 			$earliest_dtt = $this->_cpt_model_obj->ID() > 0 ? $this->_cpt_model_obj->get_first_related('Datetime', array('order_by'=> array('DTT_EVT_start' => 'ASC' ) ) ) : NULL;
 
-			if ( !empty( $earliest_dtt ) )
-				$template_args['TKT_end_date'] = $earliest_dtt->get_datetime('DTT_EVT_start', 'Y-m-d', 'h:i a');
-			else
-				$template_args['TKT_end_date'] = date('Y-m-d h:i a', mktime(0, 0, 0, date("m"), date("d")+7, date("Y") ) );
+			if ( !empty( $earliest_dtt ) ) {
+							$template_args['TKT_end_date'] = $earliest_dtt->get_datetime('DTT_EVT_start', 'Y-m-d', 'h:i a');
+			} else {
+							$template_args['TKT_end_date'] = date('Y-m-d h:i a', mktime(0, 0, 0, date("m"), date("d")+7, date("Y") ) );
+			}
 		}
 
 		$template_args = array_merge( $template_args, $price_args );
@@ -1725,8 +1727,9 @@ 
 		}
 		$action = $event_status == 'trash' ? 'moved to the trash' : 'restored from the trash';
 
-		if ( $redirect_after )
-			$this->_redirect_after_action($success, 'Event', $action, array('action' => 'default'));
+		if ( $redirect_after ) {
+					$this->_redirect_after_action($success, 'Event', $action, array('action' => 'default'));
+		}
 	}
 
 	/**
@@ -1853,8 +1856,9 @@ 
 			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		}
 
-		if ( $redirect_after )
-			$this->_redirect_after_action($success, 'Event', 'deleted', array('action' => 'default', 'status' => 'trash'));
+		if ( $redirect_after ) {
+					$this->_redirect_after_action($success, 'Event', 'deleted', array('action' => 'default', 'status' => 'trash'));
+		}
 	}
 
 	/**
@@ -2091,8 +2095,10 @@ 
 	 * @return void
 	 */
 	private function _set_category_object() {
-		if ( isset( $this->_category->id ) && !empty( $this->_category->id ) )
-			return; //already have the category object so get out.
+		if ( isset( $this->_category->id ) && !empty( $this->_category->id ) ) {
+					return;
+		}
+		//already have the category object so get out.
 
 		//set default category object
 		$this->_set_empty_category_object();

Spacing +383 added lines, -383 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -66,7 +66,7 @@ 
 		$this->_cpt_edit_routes = array(
 			'espresso_events' => 'edit'
 		);
-		add_action('AHEE__EE_Admin_Page_CPT__set_model_object__after_set_object', array( $this, 'verify_event_edit' ) );
+		add_action('AHEE__EE_Admin_Page_CPT__set_model_object__after_set_object', array($this, 'verify_event_edit'));
 	}
 
 	protected function _ajax_hooks() {
@@ -92,7 +92,7 @@ 
 				'edit' => __('Update Event', 'event_espresso'),
 				'add_category' => __('Save New Category', 'event_espresso'),
 				'edit_category' => __('Update Category', 'event_espresso'),
-				'template_settings' => __( 'Update Settings', 'event_espresso' )
+				'template_settings' => __('Update Settings', 'event_espresso')
 				)
 		);
 	}
@@ -102,8 +102,8 @@ 
 		//load field generator helper
 
 		//is there a evt_id in the request?
-		$evt_id = ! empty( $this->_req_data['EVT_ID'] ) && ! is_array( $this->_req_data['EVT_ID'] ) ? $this->_req_data['EVT_ID'] : 0;
-		$evt_id = ! empty( $this->_req_data['post'] ) ? $this->_req_data['post'] : $evt_id;
+		$evt_id = ! empty($this->_req_data['EVT_ID']) && ! is_array($this->_req_data['EVT_ID']) ? $this->_req_data['EVT_ID'] : 0;
+		$evt_id = ! empty($this->_req_data['post']) ? $this->_req_data['post'] : $evt_id;
 
 
 		$this->_page_routes = array(
@@ -317,7 +317,7 @@ 
 				'help_tour' => array(
 					'Event_Editor_Help_Tour'
 					),
-				'qtips' => array( 'EE_Event_Editor_Decaf_Tips' ),
+				'qtips' => array('EE_Event_Editor_Decaf_Tips'),
 				'require_nonce' => FALSE
 			),
 			'edit' => array(
@@ -373,7 +373,7 @@ 
 				/*'help_tour' => array(
 					'Event_Edit_Help_Tour'
 				),*/
-				'qtips' => array( 'EE_Event_Editor_Decaf_Tips' ),
+				'qtips' => array('EE_Event_Editor_Decaf_Tips'),
 				'require_nonce' => FALSE
 			),
 			'default_event_settings' => array(
@@ -395,7 +395,7 @@ 
 						'filename' => 'events_default_settings_status'
 					)
 				),
-				'help_tour' => array( 'Event_Default_Settings_Help_Tour'),
+				'help_tour' => array('Event_Default_Settings_Help_Tour'),
 				'require_nonce' => FALSE
 			),
 			//template settings
@@ -411,7 +411,7 @@ 
 						'filename' => 'general_settings_templates'
 					)
 				),
-				'help_tour' => array( 'Templates_Help_Tour' ),
+				'help_tour' => array('Templates_Help_Tour'),
 				'require_nonce' => FALSE
 			),
 			//event category stuff
@@ -435,7 +435,7 @@ 
 					'label' => __('Edit Category', 'event_espresso'),
 					'order' => 15,
 					'persistent' => FALSE,
-					'url' => isset($this->_req_data['EVT_CAT_ID']) ? add_query_arg(array('EVT_CAT_ID' => $this->_req_data['EVT_CAT_ID'] ), $this->_current_page_view_url )  : $this->_admin_base_url
+					'url' => isset($this->_req_data['EVT_CAT_ID']) ? add_query_arg(array('EVT_CAT_ID' => $this->_req_data['EVT_CAT_ID']), $this->_current_page_view_url) : $this->_admin_base_url
 					),
 				'help_tabs' => array(
 					'edit_category_help_tab' => array(
@@ -505,14 +505,14 @@ 
 
 	public function load_scripts_styles() {
 
-		wp_register_style('events-admin-css', EVENTS_ASSETS_URL . 'events-admin-page.css', array(), EVENT_ESPRESSO_VERSION);
-		wp_register_style('ee-cat-admin', EVENTS_ASSETS_URL . 'ee-cat-admin.css', array(), EVENT_ESPRESSO_VERSION );
+		wp_register_style('events-admin-css', EVENTS_ASSETS_URL.'events-admin-page.css', array(), EVENT_ESPRESSO_VERSION);
+		wp_register_style('ee-cat-admin', EVENTS_ASSETS_URL.'ee-cat-admin.css', array(), EVENT_ESPRESSO_VERSION);
 		wp_enqueue_style('events-admin-css');
 		wp_enqueue_style('ee-cat-admin');
 		//todo note: we also need to load_scripts_styles per view (i.e. default/view_report/event_details
 		//registers for all views
 		//scripts
-		wp_register_script('event_editor_js', EVENTS_ASSETS_URL . 'event_editor.js', array('ee_admin_js', 'jquery-ui-slider', 'jquery-ui-timepicker-addon'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_register_script('event_editor_js', EVENTS_ASSETS_URL.'event_editor.js', array('ee_admin_js', 'jquery-ui-slider', 'jquery-ui-timepicker-addon'), EVENT_ESPRESSO_VERSION, TRUE);
 	}
 
 	/**
@@ -530,11 +530,11 @@ 
 	public function load_scripts_styles_edit() {
 		//styles
 		wp_enqueue_style('espresso-ui-theme');
-		wp_register_style('event-editor-css', EVENTS_ASSETS_URL . 'event-editor.css', array('ee-admin-css'), EVENT_ESPRESSO_VERSION );
+		wp_register_style('event-editor-css', EVENTS_ASSETS_URL.'event-editor.css', array('ee-admin-css'), EVENT_ESPRESSO_VERSION);
 		wp_enqueue_style('event-editor-css');
 
 		//scripts
-		wp_register_script('event-datetime-metabox', EVENTS_ASSETS_URL . 'event-datetime-metabox.js', array('event_editor_js', 'ee-datepicker'), EVENT_ESPRESSO_VERSION );
+		wp_register_script('event-datetime-metabox', EVENTS_ASSETS_URL.'event-datetime-metabox.js', array('event_editor_js', 'ee-datepicker'), EVENT_ESPRESSO_VERSION);
 		wp_enqueue_script('event-datetime-metabox');
 
 	}
@@ -569,7 +569,7 @@ 
 
 
 	public function admin_init() {
-		EE_Registry::$i18n_js_strings[ 'image_confirm' ] = __( 'Do you really want to delete this image? Please remember to update your event to complete the removal.', 'event_espresso' );
+		EE_Registry::$i18n_js_strings['image_confirm'] = __('Do you really want to delete this image? Please remember to update your event to complete the removal.', 'event_espresso');
 	}
 
 
@@ -590,12 +590,12 @@ 
 	 */
 	public function verify_event_edit($event = NULL) {
 		// no event?
-		if ( empty( $event )) {
+		if (empty($event)) {
 			// set event
 			$event = $this->_cpt_model_obj;
 		}
 		// STILL no event?
-		if ( empty ( $event )) {
+		if (empty ($event)) {
 			return;
 		}
 		$orig_status = $event->status();
@@ -609,27 +609,27 @@ 
 			return;
 		}
 		//made it here so it IS active... next check that any of the tickets are sold.
-		if ( $event->is_sold_out( true ) ) {
-			if ( $orig_status !== EEM_Event::sold_out && $event->status() !== $orig_status ) {
+		if ($event->is_sold_out(true)) {
+			if ($orig_status !== EEM_Event::sold_out && $event->status() !== $orig_status) {
 				EE_Error::add_attention(
 					sprintf(
-						__( 'Please note that the Event Status has automatically been changed to %s because there are no more spaces available for this event.  However, this change is not permanent until you update the event.  You can change the status back to something else before updating if you wish.', 'event_espresso' ),
-						EEH_Template::pretty_status( EEM_Event::sold_out, FALSE, 'sentence' )
+						__('Please note that the Event Status has automatically been changed to %s because there are no more spaces available for this event.  However, this change is not permanent until you update the event.  You can change the status back to something else before updating if you wish.', 'event_espresso'),
+						EEH_Template::pretty_status(EEM_Event::sold_out, FALSE, 'sentence')
 					)
 				);
 			}
 			return;
-		} else if ( $orig_status === EEM_Event::sold_out ) {
+		} else if ($orig_status === EEM_Event::sold_out) {
 			EE_Error::add_attention(
 				sprintf(
-					__( 'Please note that the Event Status has automatically been changed to %s because more spaces have become available for this event, most likely due to abandoned transactions freeing up reserved tickets.  However, this change is not permanent until you update the event. If you wish, you can change the status back to something else before updating.',
-						'event_espresso' ),
-					EEH_Template::pretty_status( $event->status(), false, 'sentence' )
+					__('Please note that the Event Status has automatically been changed to %s because more spaces have become available for this event, most likely due to abandoned transactions freeing up reserved tickets.  However, this change is not permanent until you update the event. If you wish, you can change the status back to something else before updating.',
+						'event_espresso'),
+					EEH_Template::pretty_status($event->status(), false, 'sentence')
 				)
 			);
 		}
 		//now we need to determine if the event has any tickets on sale.  If not then we dont' show the error
-		if ( ! $event->tickets_on_sale() ) {
+		if ( ! $event->tickets_on_sale()) {
 			return;
 		}
 		//made it here so show warning
@@ -648,7 +648,7 @@ 
 	 */
 	protected function _edit_event_warning() {
 		// we don't want to add warnings during these requests
-		if ( isset( $this->_req_data['action'] ) && $this->_req_data['action'] === 'editpost' ) {
+		if (isset($this->_req_data['action']) && $this->_req_data['action'] === 'editpost') {
 			return;
 		}
 		EE_Error::add_attention(
@@ -679,7 +679,7 @@ 
 			),
 		);
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_events', 'espresso_events_trash_events' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_events', 'espresso_events_trash_events')) {
 			$this->_views['trash'] = array(
 				'slug' => 'trash',
 				'label' => __('Trash', 'event_espresso'),
@@ -709,39 +709,39 @@ 
 				'desc' => __('View Registrations for Event', 'event_espresso')
 			)
 		);
-		$items  = apply_filters( 'FHEE__Events_Admin_Page___event_legend_items__items', $items );
+		$items = apply_filters('FHEE__Events_Admin_Page___event_legend_items__items', $items);
 		$statuses = array(
 			'sold_out_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::sold_out,
-				'desc' => EEH_Template::pretty_status( EE_Datetime::sold_out, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::sold_out,
+				'desc' => EEH_Template::pretty_status(EE_Datetime::sold_out, FALSE, 'sentence')
 			),
 			'active_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::active,
-				'desc' => EEH_Template::pretty_status( EE_Datetime::active, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::active,
+				'desc' => EEH_Template::pretty_status(EE_Datetime::active, FALSE, 'sentence')
 			),
 			'upcoming_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::upcoming,
-				'desc' => EEH_Template::pretty_status( EE_Datetime::upcoming, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::upcoming,
+				'desc' => EEH_Template::pretty_status(EE_Datetime::upcoming, FALSE, 'sentence')
 			),
 			'postponed_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::postponed,
-				'desc' => EEH_Template::pretty_status( EE_Datetime::postponed, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::postponed,
+				'desc' => EEH_Template::pretty_status(EE_Datetime::postponed, FALSE, 'sentence')
 			),
 			'cancelled_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::cancelled,
-				'desc' => EEH_Template::pretty_status( EE_Datetime::cancelled, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::cancelled,
+				'desc' => EEH_Template::pretty_status(EE_Datetime::cancelled, FALSE, 'sentence')
 			),
 			'expired_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::expired,
-				'desc' => EEH_Template::pretty_status( EE_Datetime::expired, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::expired,
+				'desc' => EEH_Template::pretty_status(EE_Datetime::expired, FALSE, 'sentence')
 			),
 			'inactive_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::inactive,
-				'desc' => EEH_Template::pretty_status( EE_Datetime::inactive, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::inactive,
+				'desc' => EEH_Template::pretty_status(EE_Datetime::inactive, FALSE, 'sentence')
 			)
 		);
-		$statuses = apply_filters( 'FHEE__Events_Admin_Page__event_legend_items__statuses', $statuses );
-		return array_merge( $items, $statuses );
+		$statuses = apply_filters('FHEE__Events_Admin_Page__event_legend_items__statuses', $statuses);
+		return array_merge($items, $statuses);
 	}
 
 
@@ -753,8 +753,8 @@ 
 	 * @return EEM_Event
 	 */
 	private function _event_model() {
-		if ( ! $this->_event_model instanceof EEM_Event ) {
-			$this->_event_model = EE_Registry::instance()->load_model( 'Event' );
+		if ( ! $this->_event_model instanceof EEM_Event) {
+			$this->_event_model = EE_Registry::instance()->load_model('Event');
 		}
 		return $this->_event_model;
 	}
@@ -773,12 +773,12 @@ 
 	 * @param  string $new_slug  what the slug is
 	 * @return string            The new html string for the permalink area
 	 */
-	public function extra_permalink_field_buttons( $return, $id, $new_title, $new_slug ) {
+	public function extra_permalink_field_buttons($return, $id, $new_title, $new_slug) {
 		//make sure this is only when editing
-		if ( !empty( $id ) ) {
-			$post = get_post( $id );
-			$return .= '<a class="button button-small" onclick="prompt(\'Shortcode:\', jQuery(\'#shortcode\').val()); return false;" href="#"  tabindex="-1">' . __('Shortcode', 'event_espresso') . '</a> ';
-			$return .= '<input id="shortcode" type="hidden" value="[ESPRESSO_TICKET_SELECTOR event_id=' . $post->ID . ']">';
+		if ( ! empty($id)) {
+			$post = get_post($id);
+			$return .= '<a class="button button-small" onclick="prompt(\'Shortcode:\', jQuery(\'#shortcode\').val()); return false;" href="#"  tabindex="-1">'.__('Shortcode', 'event_espresso').'</a> ';
+			$return .= '<input id="shortcode" type="hidden" value="[ESPRESSO_TICKET_SELECTOR event_id='.$post->ID.']">';
 		}
 		return $return;
 	}
@@ -794,8 +794,8 @@ 
 	 * @return string html for generated table
 	 */
 	protected function _events_overview_list_table() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		$this->_template_args['after_list_table'] = EEH_Template::get_button_or_link( get_post_type_archive_link('espresso_events'), __("View Event Archive Page", "event_espresso"), 'button' ) .
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$this->_template_args['after_list_table'] = EEH_Template::get_button_or_link(get_post_type_archive_link('espresso_events'), __("View Event Archive Page", "event_espresso"), 'button').
 		$this->_display_legend($this->_event_legend_items());
 		$this->_admin_page_title .= $this->get_action_link_or_button('create_new', 'add', array(), 'add-new-h2');
 		$this->display_admin_list_table_page_with_no_sidebar();
@@ -813,51 +813,51 @@ 
 
 
 
-	protected function _insert_update_cpt_item( $post_id, $post ) {
+	protected function _insert_update_cpt_item($post_id, $post) {
 
-		if ( $post instanceof WP_Post && $post->post_type !== 'espresso_events' ) {
+		if ($post instanceof WP_Post && $post->post_type !== 'espresso_events') {
 			//getout we're not processing an event save.
 			return;
 		}
 
 		$event_values = array(
-			'EVT_display_desc' => !empty( $this->_req_data['display_desc'] ) ? 1 : 0,
-			'EVT_display_ticket_selector' => !empty( $this->_req_data['display_ticket_selector'] ) ? 1 : 0,
+			'EVT_display_desc' => ! empty($this->_req_data['display_desc']) ? 1 : 0,
+			'EVT_display_ticket_selector' => ! empty($this->_req_data['display_ticket_selector']) ? 1 : 0,
 			'EVT_additional_limit' => min(
-					apply_filters( 'FHEE__EE_Events_Admin__insert_update_cpt_item__EVT_additional_limit_max', 255 ),
-					!empty( $this->_req_data['additional_limit'] ) ? $this->_req_data['additional_limit'] : NULL ),
-			'EVT_default_registration_status' => !empty( $this->_req_data['EVT_default_registration_status'] ) ? $this->_req_data['EVT_default_registration_status'] : EE_Registry::instance()->CFG->registration->default_STS_ID,
-			'EVT_member_only' => !empty( $this->_req_data['member_only'] ) ? 1 : 0,
-			'EVT_allow_overflow' => !empty( $this->_req_data['EVT_allow_overflow'] ) ? 1 : 0,
-			'EVT_timezone_string' => !empty( $this->_req_data['timezone_string'] ) ? $this->_req_data['timezone_string'] : NULL,
-			'EVT_external_URL' => !empty( $this->_req_data['externalURL'] ) ? $this->_req_data['externalURL'] : NULL,
-			'EVT_phone' => !empty( $this->_req_data['event_phone'] ) ? $this->_req_data['event_phone'] : NULL
+					apply_filters('FHEE__EE_Events_Admin__insert_update_cpt_item__EVT_additional_limit_max', 255),
+					! empty($this->_req_data['additional_limit']) ? $this->_req_data['additional_limit'] : NULL ),
+			'EVT_default_registration_status' => ! empty($this->_req_data['EVT_default_registration_status']) ? $this->_req_data['EVT_default_registration_status'] : EE_Registry::instance()->CFG->registration->default_STS_ID,
+			'EVT_member_only' => ! empty($this->_req_data['member_only']) ? 1 : 0,
+			'EVT_allow_overflow' => ! empty($this->_req_data['EVT_allow_overflow']) ? 1 : 0,
+			'EVT_timezone_string' => ! empty($this->_req_data['timezone_string']) ? $this->_req_data['timezone_string'] : NULL,
+			'EVT_external_URL' => ! empty($this->_req_data['externalURL']) ? $this->_req_data['externalURL'] : NULL,
+			'EVT_phone' => ! empty($this->_req_data['event_phone']) ? $this->_req_data['event_phone'] : NULL
 			);
 
 		//update event
-		$success = $this->_event_model()->update_by_ID( $event_values, $post_id );
+		$success = $this->_event_model()->update_by_ID($event_values, $post_id);
 
 
 		//get event_object for other metaboxes... though it would seem to make sense to just use $this->_event_model()->get_one_by_ID( $post_id ).. i have to setup where conditions to override the filters in the model that filter out autodraft and inherit statuses so we GET the inherit id!
-		$get_one_where = array( $this->_event_model()->primary_key_name() => $post_id, 'status' => $post->post_status );
-		$event = $this->_event_model()->get_one( array($get_one_where) );
+		$get_one_where = array($this->_event_model()->primary_key_name() => $post_id, 'status' => $post->post_status);
+		$event = $this->_event_model()->get_one(array($get_one_where));
 
 
 		//the following are default callbacks for event attachment updates that can be overridden by caffeinated functionality and/or addons.
-		$event_update_callbacks = apply_filters( 'FHEE__Events_Admin_Page___insert_update_cpt_item__event_update_callbacks', array( array($this, '_default_venue_update' ), array( $this, '_default_tickets_update') ) );
+		$event_update_callbacks = apply_filters('FHEE__Events_Admin_Page___insert_update_cpt_item__event_update_callbacks', array(array($this, '_default_venue_update'), array($this, '_default_tickets_update')));
 
 		$att_success = TRUE;
 
-		foreach ( $event_update_callbacks as $e_callback ) {
-			$_succ = call_user_func_array( $e_callback, array( $event,  $this->_req_data ) );
-			$att_success = !$att_success ? $att_success : $_succ; //if ANY of these updates fail then we want the appropriate global error message
+		foreach ($event_update_callbacks as $e_callback) {
+			$_succ = call_user_func_array($e_callback, array($event, $this->_req_data));
+			$att_success = ! $att_success ? $att_success : $_succ; //if ANY of these updates fail then we want the appropriate global error message
 		}
 
 		//any errors?
-		if ( $success && FALSE === $att_success ) {
-			EE_Error::add_error( __('Event Details saved successfully but something went wrong with saving attachments.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
-		} else if ( $success === FALSE ) {
-			EE_Error::add_error( __('Event Details did not save successfully.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if ($success && FALSE === $att_success) {
+			EE_Error::add_error(__('Event Details saved successfully but something went wrong with saving attachments.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
+		} else if ($success === FALSE) {
+			EE_Error::add_error(__('Event Details did not save successfully.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 
@@ -867,14 +867,14 @@ 
 	/**
 	 * @see parent::restore_item()
 	 */
-	protected function _restore_cpt_item( $post_id, $revision_id ) {
+	protected function _restore_cpt_item($post_id, $revision_id) {
 		//copy existing event meta to new post
 		$post_evt = $this->_event_model()->get_one_by_ID($post_id);
-		if ( $post_evt instanceof EE_Event ) {
+		if ($post_evt instanceof EE_Event) {
 			//meta revision restore
-			$post_evt->restore_revision( $revision_id );
+			$post_evt->restore_revision($revision_id);
 			//related objs restore
-			$post_evt->restore_revision( $revision_id, array( 'Venue', 'Datetime', 'Price' ) );
+			$post_evt->restore_revision($revision_id, array('Venue', 'Datetime', 'Price'));
 		}
 	}
 
@@ -887,52 +887,52 @@ 
 	 * @param  array  $data   The request data from the form
 	 * @return bool           Success or fail.
 	 */
-	protected function _default_venue_update( $evtobj, $data ) {
-		require_once( EE_MODELS . 'EEM_Venue.model.php' );
+	protected function _default_venue_update($evtobj, $data) {
+		require_once(EE_MODELS.'EEM_Venue.model.php');
 		$venue_model = EE_Registry::instance()->load_model('Venue');
 		$rows_affected = NULL;
-		$venue_id = !empty( $data['venue_id'] ) ? $data['venue_id'] : NULL;
+		$venue_id = ! empty($data['venue_id']) ? $data['venue_id'] : NULL;
 
 		// very important.  If we don't have a venue name...
 		// then we'll get out because not necessary to create empty venue
-		if ( empty( $data['venue_title'] ) ) {
+		if (empty($data['venue_title'])) {
 			return false;
 		}
 
 		$venue_array = array(
 				'VNU_wp_user' => $evtobj->get('EVT_wp_user'),
-				'VNU_name' => !empty( $data['venue_title'] ) ? $data['venue_title'] : NULL,
-				'VNU_desc' => !empty( $data['venue_description'] ) ? $data['venue_description'] : NULL,
-				'VNU_identifier' => !empty( $data['venue_identifier'] ) ? $data['venue_identifier'] : NULL,
-				'VNU_short_desc' => !empty( $data['venue_short_description'] ) ? $data['venue_short_description'] : NULL,
-				'VNU_address' => !empty( $data['address'] ) ? $data['address'] : NULL,
-				'VNU_address2' => !empty( $data['address2'] ) ? $data['address2'] : NULL,
-				'VNU_city' => !empty( $data['city'] ) ? $data['city'] : NULL,
-				'STA_ID' => !empty( $data['state'] ) ? $data['state'] : NULL,
-				'CNT_ISO' => !empty( $data['countries'] ) ? $data['countries'] : NULL,
-				'VNU_zip' => !empty( $data['zip'] ) ? $data['zip'] : NULL,
-				'VNU_phone' => !empty( $data['venue_phone'] ) ? $data['venue_phone'] : NULL,
-				'VNU_capacity' => !empty( $data['venue_capacity'] ) ? $data['venue_capacity'] : NULL,
-				'VNU_url' => !empty($data['venue_url'] ) ? $data['venue_url'] : NULL,
-				'VNU_virtual_phone' => !empty($data['virtual_phone']) ? $data['virtual_phone'] : NULL,
-				'VNU_virtual_url' => !empty( $data['virtual_url'] ) ? $data['virtual_url'] : NULL,
-				'VNU_enable_for_gmap' => isset( $data['enable_for_gmap'] ) ? 1 : 0,
+				'VNU_name' => ! empty($data['venue_title']) ? $data['venue_title'] : NULL,
+				'VNU_desc' => ! empty($data['venue_description']) ? $data['venue_description'] : NULL,
+				'VNU_identifier' => ! empty($data['venue_identifier']) ? $data['venue_identifier'] : NULL,
+				'VNU_short_desc' => ! empty($data['venue_short_description']) ? $data['venue_short_description'] : NULL,
+				'VNU_address' => ! empty($data['address']) ? $data['address'] : NULL,
+				'VNU_address2' => ! empty($data['address2']) ? $data['address2'] : NULL,
+				'VNU_city' => ! empty($data['city']) ? $data['city'] : NULL,
+				'STA_ID' => ! empty($data['state']) ? $data['state'] : NULL,
+				'CNT_ISO' => ! empty($data['countries']) ? $data['countries'] : NULL,
+				'VNU_zip' => ! empty($data['zip']) ? $data['zip'] : NULL,
+				'VNU_phone' => ! empty($data['venue_phone']) ? $data['venue_phone'] : NULL,
+				'VNU_capacity' => ! empty($data['venue_capacity']) ? $data['venue_capacity'] : NULL,
+				'VNU_url' => ! empty($data['venue_url']) ? $data['venue_url'] : NULL,
+				'VNU_virtual_phone' => ! empty($data['virtual_phone']) ? $data['virtual_phone'] : NULL,
+				'VNU_virtual_url' => ! empty($data['virtual_url']) ? $data['virtual_url'] : NULL,
+				'VNU_enable_for_gmap' => isset($data['enable_for_gmap']) ? 1 : 0,
 				'status' => 'publish'
 			);
 
 
 		//if we've got the venue_id then we're just updating the existing venue so let's do that and then get out.
-		if ( !empty( $venue_id ) ) {
-			$update_where = array( $venue_model->primary_key_name() => $venue_id );
-			$rows_affected = $venue_model->update( $venue_array, array( $update_where ) );
+		if ( ! empty($venue_id)) {
+			$update_where = array($venue_model->primary_key_name() => $venue_id);
+			$rows_affected = $venue_model->update($venue_array, array($update_where));
 			//we've gotta make sure that the venue is always attached to a revision.. add_relation_to should take care of making sure that the relation is already present.
-			$evtobj->_add_relation_to( $venue_id, 'Venue' );
+			$evtobj->_add_relation_to($venue_id, 'Venue');
 			return $rows_affected > 0 ? TRUE : FALSE;
 		} else {
 			//we insert the venue
-			$venue_id = $venue_model->insert( $venue_array );
-			$evtobj->_add_relation_to( $venue_id, 'Venue' );
-			return !empty( $venue_id ) ? TRUE : FALSE;
+			$venue_id = $venue_model->insert($venue_array);
+			$evtobj->_add_relation_to($venue_id, 'Venue');
+			return ! empty($venue_id) ? TRUE : FALSE;
 		}
 		//when we have the ancestor come in it's already been handled by the revision save.
 	}
@@ -946,54 +946,54 @@ 
 	 * @param  array    $data   The request data from the form
 	 * @return bool             success or fail
 	 */
-	protected function _default_tickets_update( EE_Event $evtobj, $data ) {
+	protected function _default_tickets_update(EE_Event $evtobj, $data) {
 		$success = true;
 		$saved_dtt = null;
 		$saved_tickets = array();
-		$incoming_date_formats = array( 'Y-m-d', 'h:i a' );
+		$incoming_date_formats = array('Y-m-d', 'h:i a');
 
-		foreach ( $data['edit_event_datetimes'] as $row => $dtt ) {
+		foreach ($data['edit_event_datetimes'] as $row => $dtt) {
 			//trim all values to ensure any excess whitespace is removed.
-			$dtt =  array_map( 'trim', $dtt );
-			$dtt['DTT_EVT_end'] = isset($dtt['DTT_EVT_end']) && ! empty( $dtt['DTT_EVT_end'] ) ? $dtt['DTT_EVT_end'] : $dtt['DTT_EVT_start'];
+			$dtt = array_map('trim', $dtt);
+			$dtt['DTT_EVT_end'] = isset($dtt['DTT_EVT_end']) && ! empty($dtt['DTT_EVT_end']) ? $dtt['DTT_EVT_end'] : $dtt['DTT_EVT_start'];
 			$datetime_values = array(
-				'DTT_ID' 		=> ! empty( $dtt['DTT_ID'] ) ? $dtt['DTT_ID'] : NULL,
+				'DTT_ID' 		=> ! empty($dtt['DTT_ID']) ? $dtt['DTT_ID'] : NULL,
 				'DTT_EVT_start' => $dtt['DTT_EVT_start'],
 				'DTT_EVT_end' 	=> $dtt['DTT_EVT_end'],
-				'DTT_reg_limit' => empty( $dtt['DTT_reg_limit'] ) ? EE_INF : $dtt['DTT_reg_limit'],
+				'DTT_reg_limit' => empty($dtt['DTT_reg_limit']) ? EE_INF : $dtt['DTT_reg_limit'],
 				'DTT_order' 	=> $row,
 			);
 
 			//if we have an id then let's get existing object first and then set the new values.  Otherwise we instantiate a new object for save.
 
-			if ( !empty( $dtt['DTT_ID'] ) ) {
-				$DTM = EE_Registry::instance()->load_model('Datetime', array( $evtobj->get_timezone() ) )->get_one_by_ID($dtt['DTT_ID'] );
-				$DTM->set_date_format( $incoming_date_formats[0] );
-				$DTM->set_time_format( $incoming_date_formats[1] );
-				foreach ( $datetime_values as $field => $value ) {
-					$DTM->set( $field, $value );
+			if ( ! empty($dtt['DTT_ID'])) {
+				$DTM = EE_Registry::instance()->load_model('Datetime', array($evtobj->get_timezone()))->get_one_by_ID($dtt['DTT_ID']);
+				$DTM->set_date_format($incoming_date_formats[0]);
+				$DTM->set_time_format($incoming_date_formats[1]);
+				foreach ($datetime_values as $field => $value) {
+					$DTM->set($field, $value);
 				}
 
 				//make sure the $dtt_id here is saved just in case after the add_relation_to() the autosave replaces it.  We need to do this so we dont' TRASH the parent DTT.
 				$saved_dtts[$DTM->ID()] = $DTM;
 			} else {
-				$DTM = EE_Registry::instance()->load_class('Datetime', array( $datetime_values ), FALSE, FALSE );
-				$DTM->set_date_format( $incoming_date_formats[0] );
-				$DTM->set_time_format( $incoming_date_formats[1] );
-				$DTM->set_timezone( $evtobj->get_timezone() );
-				foreach ( $datetime_values as $field => $value ) {
-					$DTM->set( $field, $value );
+				$DTM = EE_Registry::instance()->load_class('Datetime', array($datetime_values), FALSE, FALSE);
+				$DTM->set_date_format($incoming_date_formats[0]);
+				$DTM->set_time_format($incoming_date_formats[1]);
+				$DTM->set_timezone($evtobj->get_timezone());
+				foreach ($datetime_values as $field => $value) {
+					$DTM->set($field, $value);
 				}
 			}
 			$DTM->save();
 
-			$DTT = $evtobj->_add_relation_to( $DTM, 'Datetime' );
+			$DTT = $evtobj->_add_relation_to($DTM, 'Datetime');
 
 			//load DTT helper
 
 			//before going any further make sure our dates are setup correctly so that the end date is always equal or greater than the start date.
-			if( $DTT->get_raw('DTT_EVT_start') > $DTT->get_raw('DTT_EVT_end') ) {
-				$DTT->set('DTT_EVT_end', $DTT->get('DTT_EVT_start') );
+			if ($DTT->get_raw('DTT_EVT_start') > $DTT->get_raw('DTT_EVT_end')) {
+				$DTT->set('DTT_EVT_end', $DTT->get('DTT_EVT_start'));
 				$DTT = EEH_DTT_Helper::date_time_add($DTT, 'DTT_EVT_end', 'days');
 				$DTT->save();
 			}
@@ -1001,45 +1001,45 @@ 
 			//now we got to make sure we add the new DTT_ID to the $saved_dtts array  because it is possible there was a new one created for the autosave.
 			$saved_dtt = $DTT;
 
-			$success = !$success ? $success : $DTT; //if ANY of these updates fail then we want the appropriate global error message. //todod this is actually sucky we need a better error message but this is what it is for now.
+			$success = ! $success ? $success : $DTT; //if ANY of these updates fail then we want the appropriate global error message. //todod this is actually sucky we need a better error message but this is what it is for now.
 		}
 
 		//no dtts get deleted so we don't do any of that logic here.
 		//update tickets next
-		$old_tickets = isset( $data['ticket_IDs'] ) ? explode(',', $data['ticket_IDs'] ) : array();
-		foreach ( $data['edit_tickets'] as $row => $tkt ) {
-			$incoming_date_formats = array( 'Y-m-d', 'h:i a' );
+		$old_tickets = isset($data['ticket_IDs']) ? explode(',', $data['ticket_IDs']) : array();
+		foreach ($data['edit_tickets'] as $row => $tkt) {
+			$incoming_date_formats = array('Y-m-d', 'h:i a');
 			$update_prices = false;
-			$ticket_price = isset( $data['edit_prices'][$row][1]['PRC_amount'] ) ? $data['edit_prices'][$row][1]['PRC_amount'] : 0;
+			$ticket_price = isset($data['edit_prices'][$row][1]['PRC_amount']) ? $data['edit_prices'][$row][1]['PRC_amount'] : 0;
 
 			// trim inputs to ensure any excess whitespace is removed.
-			$tkt = array_map( 'trim', $tkt );
+			$tkt = array_map('trim', $tkt);
 
-			if ( empty( $tkt['TKT_start_date'] ) ) {
+			if (empty($tkt['TKT_start_date'])) {
 				//let's use now in the set timezone.
-				$now = new DateTime( 'now', new DateTimeZone( $evtobj->get_timezone() ) );
-				$tkt['TKT_start_date'] = $now->format( $incoming_date_formats[0] . ' ' . $incoming_date_formats[1] );
+				$now = new DateTime('now', new DateTimeZone($evtobj->get_timezone()));
+				$tkt['TKT_start_date'] = $now->format($incoming_date_formats[0].' '.$incoming_date_formats[1]);
 			}
 
-			if ( empty( $tkt['TKT_end_date'] ) ) {
+			if (empty($tkt['TKT_end_date'])) {
 				//use the start date of the first datetime
 				$dtt = $evtobj->first_datetime();
-				$tkt['TKT_end_date'] = $dtt->start_date_and_time( $incoming_date_formats[0], $incoming_date_formats[1] );
+				$tkt['TKT_end_date'] = $dtt->start_date_and_time($incoming_date_formats[0], $incoming_date_formats[1]);
 			}
 
 			$TKT_values = array(
-				'TKT_ID' 			=> !empty( $tkt['TKT_ID'] ) ? $tkt['TKT_ID'] : NULL,
-				'TTM_ID' 			=> !empty( $tkt['TTM_ID'] ) ? $tkt['TTM_ID'] : 0,
-				'TKT_name' 			=> !empty( $tkt['TKT_name'] ) ? $tkt['TKT_name'] : '',
-				'TKT_description' 	=> !empty( $tkt['TKT_description'] ) ? $tkt['TKT_description'] : '',
+				'TKT_ID' 			=> ! empty($tkt['TKT_ID']) ? $tkt['TKT_ID'] : NULL,
+				'TTM_ID' 			=> ! empty($tkt['TTM_ID']) ? $tkt['TTM_ID'] : 0,
+				'TKT_name' 			=> ! empty($tkt['TKT_name']) ? $tkt['TKT_name'] : '',
+				'TKT_description' 	=> ! empty($tkt['TKT_description']) ? $tkt['TKT_description'] : '',
 				'TKT_start_date' 	=> $tkt['TKT_start_date'],
 				'TKT_end_date' 		=> $tkt['TKT_end_date'],
-				'TKT_qty' 			=> ! isset( $tkt[ 'TKT_qty' ] ) || $tkt[ 'TKT_qty' ] === '' ? EE_INF : $tkt['TKT_qty'],
-				'TKT_uses' 			=> ! isset( $tkt[ 'TKT_uses' ] ) || $tkt[ 'TKT_uses' ] === '' ? EE_INF : $tkt[ 'TKT_uses' ],
-				'TKT_min' 			=> empty( $tkt['TKT_min'] ) ? 0 : $tkt['TKT_min'],
-				'TKT_max' 			=> empty( $tkt['TKT_max'] ) ? EE_INF : $tkt['TKT_max'],
+				'TKT_qty' 			=> ! isset($tkt['TKT_qty']) || $tkt['TKT_qty'] === '' ? EE_INF : $tkt['TKT_qty'],
+				'TKT_uses' 			=> ! isset($tkt['TKT_uses']) || $tkt['TKT_uses'] === '' ? EE_INF : $tkt['TKT_uses'],
+				'TKT_min' 			=> empty($tkt['TKT_min']) ? 0 : $tkt['TKT_min'],
+				'TKT_max' 			=> empty($tkt['TKT_max']) ? EE_INF : $tkt['TKT_max'],
 				'TKT_row' 			=> $row,
-				'TKT_order' 		=> isset( $tkt['TKT_order'] ) ? $tkt['TKT_order'] : $row,
+				'TKT_order' 		=> isset($tkt['TKT_order']) ? $tkt['TKT_order'] : $row,
 				'TKT_price' 		=> $ticket_price
 			);
 
@@ -1047,7 +1047,7 @@ 
 
 
 			//if this is a default TKT, then we need to set the TKT_ID to 0 and update accordingly, which means in turn that the prices will become new prices as well.
-			if ( isset( $tkt['TKT_is_default'] ) && $tkt['TKT_is_default'] ) {
+			if (isset($tkt['TKT_is_default']) && $tkt['TKT_is_default']) {
 				$TKT_values['TKT_ID'] = 0;
 				$TKT_values['TKT_is_default'] = 0;
 				$TKT_values['TKT_price'] = $ticket_price;
@@ -1058,58 +1058,58 @@ 
 			//we actually do our saves a head of doing any add_relations to because its entirely possible that this ticket didn't removed or added to any datetime in the session but DID have it's items modified.
 			//keep in mind that if the TKT has been sold (and we have changed pricing information), then we won't be updating the tkt but instead a new tkt will be created and the old one archived.
 
-			if ( !empty( $tkt['TKT_ID'] ) ) {
-				$TKT = EE_Registry::instance()->load_model( 'Ticket', array( $evtobj->get_timezone() ) )->get_one_by_ID( $tkt['TKT_ID'] );
-				if ( $TKT instanceof EE_Ticket ) {
-					$ticket_sold = $TKT->count_related( 'Registration', array( array( 'STS_ID' => array( 'NOT IN', array( EEM_Registration::status_id_incomplete ) ) ) ) ) > 0 ? true : false;
+			if ( ! empty($tkt['TKT_ID'])) {
+				$TKT = EE_Registry::instance()->load_model('Ticket', array($evtobj->get_timezone()))->get_one_by_ID($tkt['TKT_ID']);
+				if ($TKT instanceof EE_Ticket) {
+					$ticket_sold = $TKT->count_related('Registration', array(array('STS_ID' => array('NOT IN', array(EEM_Registration::status_id_incomplete))))) > 0 ? true : false;
 					//let's just check the total price for the existing ticket and determine if it matches the new total price.  if they are different then we create a new ticket (if tkts sold) if they aren't different then we go ahead and modify existing ticket.
-					$create_new_TKT = $ticket_sold && $ticket_price != $TKT->get( 'TKT_price' ) && ! $TKT->get( 'TKT_deleted' ) ? true : false;
-					$TKT->set_date_format( $incoming_date_formats[ 0 ] );
-					$TKT->set_time_format( $incoming_date_formats[ 1 ] );
+					$create_new_TKT = $ticket_sold && $ticket_price != $TKT->get('TKT_price') && ! $TKT->get('TKT_deleted') ? true : false;
+					$TKT->set_date_format($incoming_date_formats[0]);
+					$TKT->set_time_format($incoming_date_formats[1]);
 					//set new values
-					foreach ( $TKT_values as $field => $value ) {
-						if ( $field == 'TKT_qty' ) {
-							$TKT->set_qty( $value );
+					foreach ($TKT_values as $field => $value) {
+						if ($field == 'TKT_qty') {
+							$TKT->set_qty($value);
 						} else {
-							$TKT->set( $field, $value );
+							$TKT->set($field, $value);
 						}
 					}
 					//if $create_new_TKT is false then we can safely update the existing ticket.  Otherwise we have to create a new ticket.
-					if ( $create_new_TKT ) {
+					if ($create_new_TKT) {
 						//archive the old ticket first
-						$TKT->set( 'TKT_deleted', 1 );
+						$TKT->set('TKT_deleted', 1);
 						$TKT->save();
 						//make sure this ticket is still recorded in our saved_tkts so we don't run it through the regular trash routine.
-						$saved_tickets[ $TKT->ID() ] = $TKT;
+						$saved_tickets[$TKT->ID()] = $TKT;
 						//create new ticket that's a copy of the existing except a new id of course (and not archived) AND has the new TKT_price associated with it.
 						$TKT = clone $TKT;
-						$TKT->set( 'TKT_ID', 0 );
-						$TKT->set( 'TKT_deleted', 0 );
-						$TKT->set( 'TKT_price', $ticket_price );
-						$TKT->set( 'TKT_sold', 0 );
+						$TKT->set('TKT_ID', 0);
+						$TKT->set('TKT_deleted', 0);
+						$TKT->set('TKT_price', $ticket_price);
+						$TKT->set('TKT_sold', 0);
 						//now we need to make sure that $new prices are created as well and attached to new ticket.
 						$update_prices = true;
 					}
 					//make sure price is set if it hasn't been already
-					$TKT->set( 'TKT_price', $ticket_price );
+					$TKT->set('TKT_price', $ticket_price);
 				}
 
 			} else {
 				//no TKT_id so a new TKT
 				$TKT_values['TKT_price'] = $ticket_price;
-				$TKT = EE_Registry::instance()->load_class('Ticket', array( $TKT_values ), FALSE, FALSE );
-				if ( $TKT instanceof EE_Ticket ) {
+				$TKT = EE_Registry::instance()->load_class('Ticket', array($TKT_values), FALSE, FALSE);
+				if ($TKT instanceof EE_Ticket) {
 					//need to reset values to properly account for the date formats
-					$TKT->set_date_format( $incoming_date_formats[0] );
-					$TKT->set_time_format( $incoming_date_formats[1] );
-					$TKT->set_timezone( $evtobj->get_timezone() );
+					$TKT->set_date_format($incoming_date_formats[0]);
+					$TKT->set_time_format($incoming_date_formats[1]);
+					$TKT->set_timezone($evtobj->get_timezone());
 
 					//set new values
-					foreach ( $TKT_values as $field => $value ) {
-						if ( $field == 'TKT_qty' ) {
-							$TKT->set_qty( $value );
+					foreach ($TKT_values as $field => $value) {
+						if ($field == 'TKT_qty') {
+							$TKT->set_qty($value);
 						} else {
-							$TKT->set( $field, $value );
+							$TKT->set($field, $value);
 						}
 					}
 
@@ -1117,31 +1117,31 @@ 
 				}
 			}
 			// cap ticket qty by datetime reg limits
-			$TKT->set_qty( min( $TKT->qty(), $TKT->qty( 'reg_limit' ) ) );
+			$TKT->set_qty(min($TKT->qty(), $TKT->qty('reg_limit')));
 			//update ticket.
 			$TKT->save();
 
 			//before going any further make sure our dates are setup correctly so that the end date is always equal or greater than the start date.
-			if( $TKT->get_raw('TKT_start_date') > $TKT->get_raw('TKT_end_date') ) {
-				$TKT->set('TKT_end_date', $TKT->get('TKT_start_date') );
+			if ($TKT->get_raw('TKT_start_date') > $TKT->get_raw('TKT_end_date')) {
+				$TKT->set('TKT_end_date', $TKT->get('TKT_start_date'));
 				$TKT = EEH_DTT_Helper::date_time_add($TKT, 'TKT_end_date', 'days');
 				$TKT->save();
 			}
 
 			//initially let's add the ticket to the dtt
-			$saved_dtt->_add_relation_to( $TKT, 'Ticket' );
+			$saved_dtt->_add_relation_to($TKT, 'Ticket');
 
 			$saved_tickets[$TKT->ID()] = $TKT;
 
 			//add prices to ticket
-			$this->_add_prices_to_ticket( $data['edit_prices'][$row], $TKT, $update_prices );
+			$this->_add_prices_to_ticket($data['edit_prices'][$row], $TKT, $update_prices);
 		}
 		//however now we need to handle permanently deleting tickets via the ui.  Keep in mind that the ui does not allow deleting/archiving tickets that have ticket sold.  However, it does allow for deleting tickets that have no tickets sold, in which case we want to get rid of permanently because there is no need to save in db.
-		$old_tickets = isset( $old_tickets[0] ) && $old_tickets[0] == '' ? array() : $old_tickets;
-		$tickets_removed = array_diff( $old_tickets, array_keys( $saved_tickets ) );
+		$old_tickets = isset($old_tickets[0]) && $old_tickets[0] == '' ? array() : $old_tickets;
+		$tickets_removed = array_diff($old_tickets, array_keys($saved_tickets));
 
-		foreach ( $tickets_removed as $id ) {
-			$id = absint( $id );
+		foreach ($tickets_removed as $id) {
+			$id = absint($id);
 
 			//get the ticket for this id
 			$tkt_to_remove = EE_Registry::instance()->load_model('Ticket')->get_one_by_ID($id);
@@ -1149,7 +1149,7 @@ 
 			//need to get all the related datetimes on this ticket and remove from every single one of them (remember this process can ONLY kick off if there are NO tkts_sold)
 			$dtts = $tkt_to_remove->get_many_related('Datetime');
 
-			foreach( $dtts as $dtt ) {
+			foreach ($dtts as $dtt) {
 				$tkt_to_remove->_remove_relation_to($dtt, 'Datetime');
 			}
 
@@ -1160,7 +1160,7 @@ 
 			//finally let's delete this ticket (which should not be blocked at this point b/c we've removed all our relationships)
 			$tkt_to_remove->delete_permanently();
 		}
-		return array( $saved_dtt, $saved_tickets );
+		return array($saved_dtt, $saved_tickets);
 	}
 
 
@@ -1175,31 +1175,31 @@ 
 	 * @param bool 		$new_prices Whether attach existing incoming prices or create new ones.
 	 * @return  void
 	 */
-	private function  _add_prices_to_ticket( $prices, EE_Ticket $ticket, $new_prices = FALSE ) {
-		foreach ( $prices as $row => $prc ) {
+	private function  _add_prices_to_ticket($prices, EE_Ticket $ticket, $new_prices = FALSE) {
+		foreach ($prices as $row => $prc) {
 			$PRC_values = array(
-				'PRC_ID' => !empty( $prc['PRC_ID'] ) ? $prc['PRC_ID'] : NULL,
-				'PRT_ID' => !empty( $prc['PRT_ID'] ) ? $prc['PRT_ID'] : NULL,
-				'PRC_amount' => !empty( $prc['PRC_amount'] ) ? $prc['PRC_amount'] : 0,
-				'PRC_name' => !empty( $prc['PRC_name'] ) ? $prc['PRC_name'] : '',
-				'PRC_desc' => !empty( $prc['PRC_desc'] ) ? $prc['PRC_desc'] : '',
+				'PRC_ID' => ! empty($prc['PRC_ID']) ? $prc['PRC_ID'] : NULL,
+				'PRT_ID' => ! empty($prc['PRT_ID']) ? $prc['PRT_ID'] : NULL,
+				'PRC_amount' => ! empty($prc['PRC_amount']) ? $prc['PRC_amount'] : 0,
+				'PRC_name' => ! empty($prc['PRC_name']) ? $prc['PRC_name'] : '',
+				'PRC_desc' => ! empty($prc['PRC_desc']) ? $prc['PRC_desc'] : '',
 				'PRC_is_default' => 0, //make sure prices are NOT set as default from this context
 				'PRC_order' => $row
 			);
 
-			if ( $new_prices || empty( $PRC_values['PRC_ID'] ) ) {
+			if ($new_prices || empty($PRC_values['PRC_ID'])) {
 				$PRC_values['PRC_ID'] = 0;
-				$PRC = EE_Registry::instance()->load_class('Price', array( $PRC_values ), FALSE, FALSE);
+				$PRC = EE_Registry::instance()->load_class('Price', array($PRC_values), FALSE, FALSE);
 			} else {
-				$PRC = EE_Registry::instance()->load_model( 'Price' )->get_one_by_ID( $prc['PRC_ID'] );
+				$PRC = EE_Registry::instance()->load_model('Price')->get_one_by_ID($prc['PRC_ID']);
 				//update this price with new values
-				foreach ( $PRC_values as $field => $newprc ) {
-					$PRC->set( $field, $newprc );
+				foreach ($PRC_values as $field => $newprc) {
+					$PRC->set($field, $newprc);
 				}
 				$PRC->save();
 			}
 
-			$ticket->_add_relation_to( $PRC, 'Price' );
+			$ticket->_add_relation_to($PRC, 'Price');
 		}
 	}
 
@@ -1237,9 +1237,9 @@ 
 		//load formatter helper
 
   		//args for getting related registrations
-  		$approved_query_args = array( array( 'REG_deleted' => 0, 'STS_ID' => EEM_Registration::status_id_approved ) );
-  		$not_approved_query_args = array( array( 'REG_deleted' => 0, 'STS_ID' => EEM_Registration::status_id_not_approved ) );
-  		$pending_payment_query_args = array( array( 'REG_deleted' => 0, 'STS_ID' => EEM_Registration::status_id_pending_payment ) );
+  		$approved_query_args = array(array('REG_deleted' => 0, 'STS_ID' => EEM_Registration::status_id_approved));
+  		$not_approved_query_args = array(array('REG_deleted' => 0, 'STS_ID' => EEM_Registration::status_id_not_approved));
+  		$pending_payment_query_args = array(array('REG_deleted' => 0, 'STS_ID' => EEM_Registration::status_id_pending_payment));
 
 
 		// publish box
@@ -1268,9 +1268,9 @@ 
 				),
 				REG_ADMIN_URL
 			),
-			'approved_regs' => $this->_cpt_model_obj->count_related( 'Registration', $approved_query_args ),
-			'not_approved_regs' => $this->_cpt_model_obj->count_related( 'Registration', $not_approved_query_args ),
-			'pending_payment_regs' => $this->_cpt_model_obj->count_related( 'Registration', $pending_payment_query_args ),
+			'approved_regs' => $this->_cpt_model_obj->count_related('Registration', $approved_query_args),
+			'not_approved_regs' => $this->_cpt_model_obj->count_related('Registration', $not_approved_query_args),
+			'pending_payment_regs' => $this->_cpt_model_obj->count_related('Registration', $pending_payment_query_args),
 			'misc_pub_section_class' => apply_filters(
 				'FHEE_Events_Admin_Page___generate_publish_box_extra_content__misc_pub_section_class',
 				'misc-pub-section'
@@ -1289,9 +1289,9 @@ 
 			'AHEE__Events_Admin_Page___generate_publish_box_extra_content__event_editor_overview_add',
 			$this->_cpt_model_obj
 		);
-		$publish_box_extra_args[ 'event_editor_overview_add' ] = ob_get_clean();
+		$publish_box_extra_args['event_editor_overview_add'] = ob_get_clean();
 		// load template
-		EEH_Template::display_template( EVENTS_TEMPLATE_PATH . 'event_publish_box_extras.template.php', $publish_box_extra_args );
+		EEH_Template::display_template(EVENTS_TEMPLATE_PATH.'event_publish_box_extras.template.php', $publish_box_extra_args);
 	}
 
 
@@ -1323,16 +1323,16 @@ 
 		$this->verify_cpt_object();
 		add_meta_box(
 			'espresso_event_editor_tickets',
-			__( 'Event Datetime & Ticket', 'event_espresso' ),
-			array( $this, 'ticket_metabox' ),
+			__('Event Datetime & Ticket', 'event_espresso'),
+			array($this, 'ticket_metabox'),
 			$this->page_slug,
 			'normal',
 			'high'
 		);
 		add_meta_box(
 			'espresso_event_editor_event_options',
-			__( 'Event Registration Options', 'event_espresso' ),
-			array( $this, 'registration_options_meta_box' ),
+			__('Event Registration Options', 'event_espresso'),
+			array($this, 'registration_options_meta_box'),
 			$this->page_slug,
 			'side',
 			'default'
@@ -1362,36 +1362,36 @@ 
 			'disabled' => ''
 			);
 
-		$event_id = is_object( $this->_cpt_model_obj ) ? $this->_cpt_model_obj->ID() : NULL;
+		$event_id = is_object($this->_cpt_model_obj) ? $this->_cpt_model_obj->ID() : NULL;
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		/**
 		 * 1. Start with retrieving Datetimes
 		 * 2. Fore each datetime get related tickets
 		 * 3. For each ticket get related prices
 		 */
-		$times = EE_Registry::instance()->load_model('Datetime' )->get_all_event_dates( $event_id );
+		$times = EE_Registry::instance()->load_model('Datetime')->get_all_event_dates($event_id);
 		/** @type EE_Datetime $first_datetime */
-		$first_datetime = reset( $times );
+		$first_datetime = reset($times);
 		//do we get related tickets?
-		if ( $first_datetime instanceof EE_Datetime
-			&& $first_datetime->ID() !== 0 ) {
+		if ($first_datetime instanceof EE_Datetime
+			&& $first_datetime->ID() !== 0) {
 			$existing_datetime_ids[] = $first_datetime->get('DTT_ID');
 			$template_args['time'] = $first_datetime;
 			$related_tickets = $first_datetime->tickets(
 				array(
-					array( 'OR' => array( 'TKT_deleted' => 1, 'TKT_deleted*' => 0 ) ),
+					array('OR' => array('TKT_deleted' => 1, 'TKT_deleted*' => 0)),
 					'default_where_conditions' => 'none'
 				)
 			);
 
-			if ( !empty($related_tickets) ) {
+			if ( ! empty($related_tickets)) {
 				$template_args['total_ticket_rows'] = count($related_tickets);
 				$row = 0;
-				foreach ( $related_tickets as $ticket ) {
+				foreach ($related_tickets as $ticket) {
 					$existing_ticket_ids[] = $ticket->get('TKT_ID');
-					$template_args['ticket_rows'] .= $this->_get_ticket_row($ticket, FALSE, $row );
+					$template_args['ticket_rows'] .= $this->_get_ticket_row($ticket, FALSE, $row);
 
 					$row++;
 				}
@@ -1399,13 +1399,13 @@ 
 				$template_args['total_ticket_rows'] = 1;
 				/** @type EE_Ticket $ticket */
 				$ticket = EE_Registry::instance()->load_model('Ticket')->create_default_object();
-				$template_args['ticket_rows'] .= $this->_get_ticket_row( $ticket );
+				$template_args['ticket_rows'] .= $this->_get_ticket_row($ticket);
 			}
 		} else {
 			$template_args['time'] = $times[0];
 			/** @type EE_Ticket $ticket */
 			$ticket = EE_Registry::instance()->load_model('Ticket')->get_all_default_tickets();
-			$template_args['ticket_rows'] .= $this->_get_ticket_row( $ticket[1] );
+			$template_args['ticket_rows'] .= $this->_get_ticket_row($ticket[1]);
 			// NOTE: we're just sending the first default row
 			// (decaf can't manage default tickets so this should be sufficient);
 		}
@@ -1414,8 +1414,8 @@ 
 		$template_args['ticket_options_help_link'] = $this->_get_help_tab_link('ticket_options_info');
 		$template_args['existing_datetime_ids'] = implode(',', $existing_datetime_ids);
 		$template_args['existing_ticket_ids'] = implode(',', $existing_ticket_ids);
-		$template_args['ticket_js_structure'] = $this->_get_ticket_row( EE_Registry::instance()->load_model('Ticket')->create_default_object(), TRUE );
-		$template = apply_filters( 'FHEE__Events_Admin_Page__ticket_metabox__template', EVENTS_TEMPLATE_PATH . 'event_tickets_metabox_main.template.php' );
+		$template_args['ticket_js_structure'] = $this->_get_ticket_row(EE_Registry::instance()->load_model('Ticket')->create_default_object(), TRUE);
+		$template = apply_filters('FHEE__Events_Admin_Page__ticket_metabox__template', EVENTS_TEMPLATE_PATH.'event_tickets_metabox_main.template.php');
 		EEH_Template::display_template($template, $template_args);
 	}
 
@@ -1430,21 +1430,21 @@ 
 	 * @param int        $row
 	 * @return string generated html for the ticket row.
 	 */
-	private function _get_ticket_row( $ticket, $skeleton = FALSE, $row = 0 ) {
+	private function _get_ticket_row($ticket, $skeleton = FALSE, $row = 0) {
 		$template_args = array(
-			'tkt_status_class' => ' tkt-status-' . $ticket->ticket_status(),
-			'tkt_archive_class' => $ticket->ticket_status() === EE_Ticket::archived && !$skeleton ? ' tkt-archived' : '',
+			'tkt_status_class' => ' tkt-status-'.$ticket->ticket_status(),
+			'tkt_archive_class' => $ticket->ticket_status() === EE_Ticket::archived && ! $skeleton ? ' tkt-archived' : '',
 			'ticketrow' => $skeleton ? 'TICKETNUM' : $row,
 			'TKT_ID' => $ticket->get('TKT_ID'),
 			'TKT_name' => $ticket->get('TKT_name'),
 			'TKT_start_date' => $skeleton ? '' : $ticket->get_date('TKT_start_date', 'Y-m-d h:i a'),
 			'TKT_end_date' => $skeleton ? '' : $ticket->get_date('TKT_end_date', 'Y-m-d h:i a'),
 			'TKT_is_default' => $ticket->get('TKT_is_default'),
-			'TKT_qty' => $ticket->get_pretty('TKT_qty','input'),
+			'TKT_qty' => $ticket->get_pretty('TKT_qty', 'input'),
 			'edit_ticketrow_name' => $skeleton ? 'TICKETNAMEATTR' : 'edit_tickets',
 			'TKT_sold' => $skeleton ? 0 : $ticket->get('TKT_sold'),
-			'trash_icon' => ( $skeleton || ( !empty( $ticket ) && ! $ticket->get('TKT_deleted') ) ) && ( !empty( $ticket ) && $ticket->get('TKT_sold') === 0 ) ? 'trash-icon dashicons dashicons-post-trash clickable' : 'ee-lock-icon',
-			'disabled' => $skeleton || ( !empty( $ticket ) && ! $ticket->get('TKT_deleted' ) ) ? '' : ' disabled=disabled'
+			'trash_icon' => ($skeleton || ( ! empty($ticket) && ! $ticket->get('TKT_deleted'))) && ( ! empty($ticket) && $ticket->get('TKT_sold') === 0) ? 'trash-icon dashicons dashicons-post-trash clickable' : 'ee-lock-icon',
+			'disabled' => $skeleton || ( ! empty($ticket) && ! $ticket->get('TKT_deleted')) ? '' : ' disabled=disabled'
 			);
 
 		$price = $ticket->ID() !== 0 ? $ticket->get_first_related('Price', array('default_where_conditions' => 'none')) : EE_Registry::instance()->load_model('Price')->create_default_object();
@@ -1460,23 +1460,23 @@ 
 
 		//make sure we have default start and end dates if skeleton
 		//handle rows that should NOT be empty
-		if ( empty( $template_args['TKT_start_date'] ) ) {
+		if (empty($template_args['TKT_start_date'])) {
 			//if empty then the start date will be now.
 			$template_args['TKT_start_date'] = date('Y-m-d h:i a', current_time('timestamp'));
 		}
 
-		if ( empty( $template_args['TKT_end_date'] ) ) {
+		if (empty($template_args['TKT_end_date'])) {
 			//get the earliest datetime (if present);
-			$earliest_dtt = $this->_cpt_model_obj->ID() > 0 ? $this->_cpt_model_obj->get_first_related('Datetime', array('order_by'=> array('DTT_EVT_start' => 'ASC' ) ) ) : NULL;
+			$earliest_dtt = $this->_cpt_model_obj->ID() > 0 ? $this->_cpt_model_obj->get_first_related('Datetime', array('order_by'=> array('DTT_EVT_start' => 'ASC'))) : NULL;
 
-			if ( !empty( $earliest_dtt ) )
+			if ( ! empty($earliest_dtt))
 				$template_args['TKT_end_date'] = $earliest_dtt->get_datetime('DTT_EVT_start', 'Y-m-d', 'h:i a');
 			else
-				$template_args['TKT_end_date'] = date('Y-m-d h:i a', mktime(0, 0, 0, date("m"), date("d")+7, date("Y") ) );
+				$template_args['TKT_end_date'] = date('Y-m-d h:i a', mktime(0, 0, 0, date("m"), date("d") + 7, date("Y")));
 		}
 
-		$template_args = array_merge( $template_args, $price_args );
-		$template = apply_filters( 'FHEE__Events_Admin_Page__get_ticket_row__template', EVENTS_TEMPLATE_PATH . 'event_tickets_metabox_ticket_row.template.php', $ticket);
+		$template_args = array_merge($template_args, $price_args);
+		$template = apply_filters('FHEE__Events_Admin_Page__get_ticket_row__template', EVENTS_TEMPLATE_PATH.'event_tickets_metabox_ticket_row.template.php', $ticket);
 		return EEH_Template::display_template($template, $template_args, TRUE);
 	}
 
@@ -1505,8 +1505,8 @@ 
 		$template_args['default_registration_status'] = EEH_Form_Fields::select_input('default_reg_status', $default_reg_status_values, $this->_cpt_model_obj->default_registration_status());
 		$template_args['display_description'] = EEH_Form_Fields::select_input('display_desc', $yes_no_values, $this->_cpt_model_obj->display_description());
 		$template_args['display_ticket_selector'] = EEH_Form_Fields::select_input('display_ticket_selector', $yes_no_values, $this->_cpt_model_obj->display_ticket_selector(), '', '', false);
-		$template_args['additional_registration_options'] = apply_filters( 'FHEE__Events_Admin_Page__registration_options_meta_box__additional_registration_options', '', $template_args, $yes_no_values, $default_reg_status_values );
-		$templatepath = EVENTS_TEMPLATE_PATH . 'event_registration_options.template.php';
+		$template_args['additional_registration_options'] = apply_filters('FHEE__Events_Admin_Page__registration_options_meta_box__additional_registration_options', '', $template_args, $yes_no_values, $default_reg_status_values);
+		$templatepath = EVENTS_TEMPLATE_PATH.'event_registration_options.template.php';
 		EEH_Template::display_template($templatepath, $template_args);
 	}
 
@@ -1534,21 +1534,21 @@ 
 		$EEME = $this->_event_model();
 
 		$offset = ($current_page - 1) * $per_page;
-		$limit = $count ? NULL : $offset . ',' . $per_page;
+		$limit = $count ? NULL : $offset.','.$per_page;
 		$orderby = isset($this->_req_data['orderby']) ? $this->_req_data['orderby'] : 'EVT_ID';
 		$order = isset($this->_req_data['order']) ? $this->_req_data['order'] : "DESC";
 
 		if (isset($this->_req_data['month_range'])) {
 			$pieces = explode(' ', $this->_req_data['month_range'], 3);
-			$month_r = !empty($pieces[0]) ? date('m', strtotime($pieces[0])) : '';
-			$year_r = !empty($pieces[1]) ? $pieces[1] : '';
+			$month_r = ! empty($pieces[0]) ? date('m', strtotime($pieces[0])) : '';
+			$year_r = ! empty($pieces[1]) ? $pieces[1] : '';
 		}
 
 		$where = array();
 
-		$status = isset( $this->_req_data['status'] ) ? $this->_req_data['status'] : NULL;
+		$status = isset($this->_req_data['status']) ? $this->_req_data['status'] : NULL;
 		//determine what post_status our condition will have for the query.
-		switch ( $status ) {
+		switch ($status) {
 			case 'month' :
 			case 'today' :
 			case NULL :
@@ -1556,7 +1556,7 @@ 
 				break;
 
 			case 'draft' :
-				$where['status'] = array( 'IN', array('draft', 'auto-draft') );
+				$where['status'] = array('IN', array('draft', 'auto-draft'));
 				break;
 
 			default :
@@ -1564,43 +1564,43 @@ 
 		}
 
 		//categories?
-		$category = isset( $this->_req_data['EVT_CAT'] ) && $this->_req_data['EVT_CAT'] > 0 ? $this->_req_data['EVT_CAT'] : NULL;
+		$category = isset($this->_req_data['EVT_CAT']) && $this->_req_data['EVT_CAT'] > 0 ? $this->_req_data['EVT_CAT'] : NULL;
 
-		if ( !empty ( $category ) ) {
+		if ( ! empty ($category)) {
 			$where['Term_Taxonomy.taxonomy'] = 'espresso_event_categories';
 			$where['Term_Taxonomy.term_id'] = $category;
 		}
 
 		//date where conditions
-		$start_formats = EEM_Datetime::instance()->get_formats_for( 'DTT_EVT_start' );
+		$start_formats = EEM_Datetime::instance()->get_formats_for('DTT_EVT_start');
 		if (isset($this->_req_data['month_range']) && $this->_req_data['month_range'] != '') {
-			$DateTime = new DateTime( $year_r . '-' . $month_r . '-01 00:00:00', new DateTimeZone( EEM_Datetime::instance()->get_timezone() ) );
-			$start = $DateTime->format( implode( ' ', $start_formats  ) );
-			$end = $DateTime->setDate( $year_r, $month_r, $DateTime->format('t') )->setTime(23,59,59)->format( implode( ' ', $start_formats ) );
-			$where['Datetime.DTT_EVT_start'] = array('BETWEEN', array( $start, $end ) );
+			$DateTime = new DateTime($year_r.'-'.$month_r.'-01 00:00:00', new DateTimeZone(EEM_Datetime::instance()->get_timezone()));
+			$start = $DateTime->format(implode(' ', $start_formats));
+			$end = $DateTime->setDate($year_r, $month_r, $DateTime->format('t'))->setTime(23, 59, 59)->format(implode(' ', $start_formats));
+			$where['Datetime.DTT_EVT_start'] = array('BETWEEN', array($start, $end));
 		} else if (isset($this->_req_data['status']) && $this->_req_data['status'] == 'today') {
-			$DateTime = new DateTime( 'now', new DateTimeZone( EEM_Event::instance()->get_timezone() ) );
-			$start = $DateTime->setTime( 0,0,0 )->format( implode( ' ', $start_formats ) );
-			$end = $DateTime->setTime( 23, 59, 59 )->format( implode( ' ', $start_formats ) );
-			$where['Datetime.DTT_EVT_start'] = array( 'BETWEEN', array( $start, $end ) );
-		} else if ( isset($this->_req_data['status']) && $this->_req_data['status'] == 'month' ) {
-			$now = date( 'Y-m-01' );
-			$DateTime = new DateTime( $now, new DateTimeZone( EEM_Event::instance()->get_timezone() ) );
-			$start = $DateTime->setTime( 0, 0, 0 )->format( implode( ' ', $start_formats ) );
-			$end = $DateTime->setDate( date('Y'), date('m'), $DateTime->format('t' ) )->setTime( 23, 59, 59 )->format( implode( ' ', $start_formats ) );
-			$where['Datetime.DTT_EVT_start'] = array( 'BETWEEN', array( $start, $end ) );
+			$DateTime = new DateTime('now', new DateTimeZone(EEM_Event::instance()->get_timezone()));
+			$start = $DateTime->setTime(0, 0, 0)->format(implode(' ', $start_formats));
+			$end = $DateTime->setTime(23, 59, 59)->format(implode(' ', $start_formats));
+			$where['Datetime.DTT_EVT_start'] = array('BETWEEN', array($start, $end));
+		} else if (isset($this->_req_data['status']) && $this->_req_data['status'] == 'month') {
+			$now = date('Y-m-01');
+			$DateTime = new DateTime($now, new DateTimeZone(EEM_Event::instance()->get_timezone()));
+			$start = $DateTime->setTime(0, 0, 0)->format(implode(' ', $start_formats));
+			$end = $DateTime->setDate(date('Y'), date('m'), $DateTime->format('t'))->setTime(23, 59, 59)->format(implode(' ', $start_formats));
+			$where['Datetime.DTT_EVT_start'] = array('BETWEEN', array($start, $end));
 		}
 
 
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_events', 'get_events' ) ) {
-			$where['EVT_wp_user'] =  get_current_user_id();
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_events', 'get_events')) {
+			$where['EVT_wp_user'] = get_current_user_id();
 		} else {
-			if ( ! isset( $where['status'] ) ) {
-				if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_private_events', 'get_events' ) ) {
+			if ( ! isset($where['status'])) {
+				if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_private_events', 'get_events')) {
 					$where['OR'] = array(
-						'status*restrict_private' => array( '!=', 'private' ),
+						'status*restrict_private' => array('!=', 'private'),
 						'AND' => array(
-							'status*inclusive' => array( '=', 'private' ),
+							'status*inclusive' => array('=', 'private'),
 							'EVT_wp_user' => get_current_user_id()
 						)
 					);
@@ -1608,16 +1608,16 @@ 
 			}
 		}
 
-		if ( isset( $this->_req_data['EVT_wp_user'] ) ) {
-			if ( $this->_req_data['EVT_wp_user'] != get_current_user_id() && EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_events', 'get_events' ) ) {
+		if (isset($this->_req_data['EVT_wp_user'])) {
+			if ($this->_req_data['EVT_wp_user'] != get_current_user_id() && EE_Registry::instance()->CAP->current_user_can('ee_read_others_events', 'get_events')) {
 				$where['EVT_wp_user'] = $this->_req_data['EVT_wp_user'];
 			}
 		}
 
 
 		//search query handling
-		if ( isset( $this->_req_data['s'] ) ) {
-			$search_string = '%' . $this->_req_data['s'] . '%';
+		if (isset($this->_req_data['s'])) {
+			$search_string = '%'.$this->_req_data['s'].'%';
 			$where['OR'] = array(
 				'EVT_name' => array('LIKE', $search_string),
 				'EVT_desc' => array('LIKE', $search_string),
@@ -1626,32 +1626,32 @@ 
 		}
 
 
-		$where = apply_filters( 'FHEE__Events_Admin_Page__get_events__where', $where, $this->_req_data );
-		$query_params = apply_filters( 'FHEE__Events_Admin_Page__get_events__query_params', array($where, 'limit' => $limit, 'order_by' => $orderby, 'order' => $order, 'group_by' => 'EVT_ID' ), $this->_req_data );
+		$where = apply_filters('FHEE__Events_Admin_Page__get_events__where', $where, $this->_req_data);
+		$query_params = apply_filters('FHEE__Events_Admin_Page__get_events__query_params', array($where, 'limit' => $limit, 'order_by' => $orderby, 'order' => $order, 'group_by' => 'EVT_ID'), $this->_req_data);
 
 
 		//let's first check if we have special requests coming in.
-		if ( isset( $this->_req_data['active_status'] ) ) {
-			switch ( $this->_req_data['active_status'] ) {
+		if (isset($this->_req_data['active_status'])) {
+			switch ($this->_req_data['active_status']) {
 				case 'upcoming' :
-					return $EEME->get_upcoming_events( $query_params, $count );
+					return $EEME->get_upcoming_events($query_params, $count);
 					break;
 
 				case 'expired' :
-					return $EEME->get_expired_events( $query_params, $count );
+					return $EEME->get_expired_events($query_params, $count);
 					break;
 
 				case 'active' :
-					return $EEME->get_active_events( $query_params, $count );
+					return $EEME->get_active_events($query_params, $count);
 					break;
 
 				case 'inactive' :
-					return $EEME->get_inactive_events( $query_params, $count );
+					return $EEME->get_inactive_events($query_params, $count);
 					break;
 			}
 		}
 
-		$events = $count ? $EEME->count( array( $where ), 'EVT_ID', true ) : $EEME->get_all( $query_params );
+		$events = $count ? $EEME->count(array($where), 'EVT_ID', true) : $EEME->get_all($query_params);
 
 		return $events;
 	}
@@ -1660,23 +1660,23 @@ 
 
 
 	//handling for WordPress CPT actions (trash, restore, delete)
-	public function trash_cpt_item( $post_id ) {
+	public function trash_cpt_item($post_id) {
 		$this->_req_data['EVT_ID'] = $post_id;
-		$this->_trash_or_restore_event( 'trash', FALSE );
+		$this->_trash_or_restore_event('trash', FALSE);
 	}
 
 
 
 
-	public function restore_cpt_item( $post_id ) {
+	public function restore_cpt_item($post_id) {
 		$this->_req_data['EVT_ID'] = $post_id;
-		$this->_trash_or_restore_event( 'draft', FALSE );
+		$this->_trash_or_restore_event('draft', FALSE);
 	}
 
 
-	public function delete_cpt_item( $post_id ) {
+	public function delete_cpt_item($post_id) {
 		$this->_req_data['EVT_ID'] = $post_id;
-		$this->_delete_event( FALSE );
+		$this->_delete_event(FALSE);
 	}
 
 
@@ -1688,7 +1688,7 @@ 
 	 * @param  string $event_status
 	 * @return void
 	 */
-	protected function _trash_or_restore_event($event_status = 'trash', $redirect_after = TRUE ) {
+	protected function _trash_or_restore_event($event_status = 'trash', $redirect_after = TRUE) {
 		//determine the event id and set to array.
 		$EVT_ID = isset($this->_req_data['EVT_ID']) ? absint($this->_req_data['EVT_ID']) : FALSE;
 		// loop thru events
@@ -1696,7 +1696,7 @@ 
 			// clean status
 			$event_status = sanitize_key($event_status);
 			// grab status
-			if (!empty($event_status)) {
+			if ( ! empty($event_status)) {
 				$success = $this->_change_event_status($EVT_ID, $event_status);
 			} else {
 				$success = FALSE;
@@ -1710,7 +1710,7 @@ 
 		}
 		$action = $event_status == 'trash' ? 'moved to the trash' : 'restored from the trash';
 
-		if ( $redirect_after )
+		if ($redirect_after)
 			$this->_redirect_after_action($success, 'Event', $action, array('action' => 'default'));
 	}
 
@@ -1725,7 +1725,7 @@ 
 		// clean status
 		$event_status = sanitize_key($event_status);
 		// grab status
-		if (!empty($event_status)) {
+		if ( ! empty($event_status)) {
 			$success = TRUE;
 			//determine the event id and set to array.
 			$EVT_IDs = isset($this->_req_data['EVT_IDs']) ? (array) $this->_req_data['EVT_IDs'] : array();
@@ -1760,15 +1760,15 @@ 
 	 * @param  string $event_status
 	 * @return bool
 	 */
-	private function _change_event_status( $EVT_ID = 0, $event_status = '') {
+	private function _change_event_status($EVT_ID = 0, $event_status = '') {
 		// grab event id
-		if (!$EVT_ID) {
+		if ( ! $EVT_ID) {
 			$msg = __('An error occurred. No Event ID or an invalid Event ID was received.', 'event_espresso');
 			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 
-		$this->_cpt_model_obj = EEM_Event::instance()->get_one_by_ID( $EVT_ID );
+		$this->_cpt_model_obj = EEM_Event::instance()->get_one_by_ID($EVT_ID);
 
 		// clean status
 		$event_status = sanitize_key($event_status);
@@ -1794,7 +1794,7 @@ 
 				$hook = FALSE;
 		}
 		//use class to change status
-		$this->_cpt_model_obj->set_status( $event_status );
+		$this->_cpt_model_obj->set_status($event_status);
 		$success = $this->_cpt_model_obj->save();
 
 		if ($success === FALSE) {
@@ -1816,15 +1816,15 @@ 
 	 * @access protected
 	 * @param bool $redirect_after
 	 */
-	protected function _delete_event( $redirect_after = TRUE ) {
+	protected function _delete_event($redirect_after = TRUE) {
 		//determine the event id and set to array.
 		$EVT_ID = isset($this->_req_data['EVT_ID']) ? absint($this->_req_data['EVT_ID']) : NULL;
-		$EVT_ID = isset( $this->_req_data['post'] ) ? absint( $this->_req_data['post'] ) : $EVT_ID;
+		$EVT_ID = isset($this->_req_data['post']) ? absint($this->_req_data['post']) : $EVT_ID;
 
 
 		// loop thru events
 		if ($EVT_ID) {
-			$success = $this->_permanently_delete_event( $EVT_ID );
+			$success = $this->_permanently_delete_event($EVT_ID);
 			// get list of events with no prices
 			$espresso_no_ticket_prices = get_option('ee_no_ticket_prices', array());
 			// remove this event from the list of events with no prices
@@ -1838,7 +1838,7 @@ 
 			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		}
 
-		if ( $redirect_after )
+		if ($redirect_after)
 			$this->_redirect_after_action($success, 'Event', 'deleted', array('action' => 'default', 'status' => 'trash'));
 	}
 
@@ -1856,12 +1856,12 @@ 
 		$EVT_IDs = isset($this->_req_data['EVT_IDs']) ? (array) $this->_req_data['EVT_IDs'] : array();
 		// loop thru events
 		foreach ($EVT_IDs as $EVT_ID) {
-			$EVT_ID = absint( $EVT_ID );
-			if ( $EVT_ID ) {
-				$results = $this->_permanently_delete_event( $EVT_ID );
+			$EVT_ID = absint($EVT_ID);
+			if ($EVT_ID) {
+				$results = $this->_permanently_delete_event($EVT_ID);
 				$success = $results !== FALSE ? $success : FALSE;
 				// remove this event from the list of events with no prices
-				unset( $espresso_no_ticket_prices[ $EVT_ID ] );
+				unset($espresso_no_ticket_prices[$EVT_ID]);
 			} else {
 				$success = FALSE;
 				$msg = __('An error occurred. An event could not be deleted because a valid event ID was not not supplied.', 'event_espresso');
@@ -1881,9 +1881,9 @@ 
 	 * @param  int $EVT_ID
 	 * @return bool
 	 */
-	private function _permanently_delete_event( $EVT_ID = 0 ) {
+	private function _permanently_delete_event($EVT_ID = 0) {
 		// grab event id
-		if ( ! $EVT_ID ) {
+		if ( ! $EVT_ID) {
 			$msg = __('An error occurred. No Event ID or an invalid Event ID was received.', 'event_espresso');
 			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
@@ -1892,19 +1892,19 @@ 
 			! $this->_cpt_model_obj instanceof EE_Event
 			|| $this->_cpt_model_obj->ID() !== $EVT_ID
 		) {
-			$this->_cpt_model_obj = EEM_Event::instance()->get_one_by_ID( $EVT_ID );
+			$this->_cpt_model_obj = EEM_Event::instance()->get_one_by_ID($EVT_ID);
 		}
 
-		if ( ! $this->_cpt_model instanceof EE_Event ) {
+		if ( ! $this->_cpt_model instanceof EE_Event) {
 			return false;
 		}
 
 		//need to delete related tickets and prices first.
 		$datetimes = $this->_cpt_model_obj->get_many_related('Datetime');
-		foreach ( $datetimes as $datetime ) {
+		foreach ($datetimes as $datetime) {
 			$this->_cpt_model_obj->_remove_relation_to($datetime, 'Datetime');
 			$tickets = $datetime->get_many_related('Ticket');
-			foreach ( $tickets as $ticket ) {
+			foreach ($tickets as $ticket) {
 				$ticket->_remove_relation_to($datetime, 'Datetime');
 				$ticket->delete_related_permanently('Price');
 				$ticket->delete_permanently();
@@ -1914,14 +1914,14 @@ 
 
 		//what about related venues or terms?
 		$venues = $this->_cpt_model_obj->get_many_related('Venue');
-		foreach ( $venues as $venue ) {
+		foreach ($venues as $venue) {
 			$this->_cpt_model_obj->_remove_relation_to($venue, 'Venue');
 		}
 
 		//any attached question groups?
 		$question_groups = $this->_cpt_model_obj->get_many_related('Question_Group');
-		if ( !empty( $question_groups ) ) {
-			foreach ( $question_groups as $question_group ) {
+		if ( ! empty($question_groups)) {
+			foreach ($question_groups as $question_group) {
 				$this->_cpt_model_obj->_remove_relation_to($question_group, 'Question_Group');
 			}
 		}
@@ -1930,12 +1930,12 @@ 
 
 
 		//Message Template Groups
-		$this->_cpt_model_obj->_remove_relations( 'Message_Template_Group' );
+		$this->_cpt_model_obj->_remove_relations('Message_Template_Group');
 
 		/** @type EE_Term_Taxonomy[] $term_taxonomies */
 		$term_taxonomies = $this->_cpt_model_obj->term_taxonomies();
 
-		foreach ( $term_taxonomies as $term_taxonomy ) {
+		foreach ($term_taxonomies as $term_taxonomy) {
 			$this->_cpt_model_obj->remove_relation_to_term_taxonomy($term_taxonomy);
 		}
 
@@ -1949,7 +1949,7 @@ 
 			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		do_action( 'AHEE__Events_Admin_Page___permanently_delete_event__after_event_deleted', $EVT_ID );
+		do_action('AHEE__Events_Admin_Page___permanently_delete_event__after_event_deleted', $EVT_ID);
 		return TRUE;
 	}
 
@@ -1966,7 +1966,7 @@ 
 	 */
 	public function total_events() {
 
-		$count = EEM_Event::instance()->count( array( 'caps' => 'read_admin' ), 'EVT_ID', true );
+		$count = EEM_Event::instance()->count(array('caps' => 'read_admin'), 'EVT_ID', true);
 		return $count;
 	}
 
@@ -1981,10 +1981,10 @@ 
 	 */
 	public function total_events_draft() {
 		$where = array(
-			'status' => array( 'IN', array('draft', 'auto-draft' ) )
+			'status' => array('IN', array('draft', 'auto-draft'))
 			);
 
-		$count = EEM_Event::instance()->count( array( $where, 'caps' => 'read_admin' ), 'EVT_ID', true );
+		$count = EEM_Event::instance()->count(array($where, 'caps' => 'read_admin'), 'EVT_ID', true);
 		return $count;
 	}
 
@@ -2003,7 +2003,7 @@ 
 			'status' => 'trash'
 			);
 
-		$count = EEM_Event::instance()->count( array( $where, 'caps' => 'read_admin' ), 'EVT_ID', true );
+		$count = EEM_Event::instance()->count(array($where, 'caps' => 'read_admin'), 'EVT_ID', true);
 		return $count;
 	}
 
@@ -2031,11 +2031,11 @@ 
 			// translated
 			TRUE
 		);
-		$this->_template_args['default_reg_status'] = isset( EE_Registry::instance()->CFG->registration->default_STS_ID ) ? sanitize_text_field( EE_Registry::instance()->CFG->registration->default_STS_ID ) : EEM_Registration::status_id_pending_payment;
+		$this->_template_args['default_reg_status'] = isset(EE_Registry::instance()->CFG->registration->default_STS_ID) ? sanitize_text_field(EE_Registry::instance()->CFG->registration->default_STS_ID) : EEM_Registration::status_id_pending_payment;
 
 		$this->_set_add_edit_form_tags('update_default_event_settings');
 		$this->_set_publish_post_box_vars(NULL, FALSE, FALSE, NULL, FALSE);
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template(EVENTS_TEMPLATE_PATH . 'event_settings.template.php', $this->_template_args, TRUE);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(EVENTS_TEMPLATE_PATH.'event_settings.template.php', $this->_template_args, TRUE);
 		$this->display_admin_page_with_sidebar();
 	}
 
@@ -2061,9 +2061,9 @@ 
 
 	protected function _template_settings() {
 		$this->_admin_page_title = __('Template Settings (Preview)', 'event_espresso');
-		$this->_template_args['preview_img'] = '<img src="' . EVENTS_ASSETS_URL . DS . 'images' . DS . 'caffeinated_template_features.jpg" alt="' . esc_attr__( 'Template Settings Preview screenshot', 'event_espresso' ) . '" />';
-		$this->_template_args['preview_text'] = '<strong>'.__( 'Template Settings is a feature that is only available in the Caffeinated version of Event Espresso. Template Settings allow you to configure some of the appearance options for both the Event List and Event Details pages.', 'event_espresso' ).'</strong>';
-		$this->display_admin_caf_preview_page( 'template_settings_tab' );
+		$this->_template_args['preview_img'] = '<img src="'.EVENTS_ASSETS_URL.DS.'images'.DS.'caffeinated_template_features.jpg" alt="'.esc_attr__('Template Settings Preview screenshot', 'event_espresso').'" />';
+		$this->_template_args['preview_text'] = '<strong>'.__('Template Settings is a feature that is only available in the Caffeinated version of Event Espresso. Template Settings allow you to configure some of the appearance options for both the Event List and Event Details pages.', 'event_espresso').'</strong>';
+		$this->display_admin_caf_preview_page('template_settings_tab');
 	}
 
 
@@ -2076,22 +2076,22 @@ 
 	 * @return void
 	 */
 	private function _set_category_object() {
-		if ( isset( $this->_category->id ) && !empty( $this->_category->id ) )
+		if (isset($this->_category->id) && ! empty($this->_category->id))
 			return; //already have the category object so get out.
 
 		//set default category object
 		$this->_set_empty_category_object();
 
 		//only set if we've got an id
-		if ( !isset($this->_req_data['EVT_CAT_ID'] ) ) {
+		if ( ! isset($this->_req_data['EVT_CAT_ID'])) {
 			return;
 		}
 
 		$category_id = absint($this->_req_data['EVT_CAT_ID']);
 
-		$term = get_term( $category_id, 'espresso_event_categories' );
+		$term = get_term($category_id, 'espresso_event_categories');
 
-		if ( !empty( $term ) ) {
+		if ( ! empty($term)) {
 			$this->_category->category_name = $term->name;
 			$this->_category->category_identifier = $term->slug;
 			$this->_category->category_desc = $term->description;
@@ -2105,13 +2105,13 @@ 
 
 	private function _set_empty_category_object() {
 		$this->_category = new stdClass();
-		$this->_category->category_name = $this->_category->category_identifier = $this->_category->category_desc  = '';
+		$this->_category->category_name = $this->_category->category_identifier = $this->_category->category_desc = '';
 		$this->_category->id = $this->_category->parent = 0;
 	}
 
 
 	protected function _category_list_table() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		$this->_search_btn_label = __('Categories', 'event_espresso');
 		$this->_admin_page_title .= $this->get_action_link_or_button('add_category', 'add_category', array(), 'add-new-h2');
 		$this->display_admin_list_table_page_with_sidebar();
@@ -2127,14 +2127,14 @@ 
 		$this->_set_add_edit_form_tags($route);
 
 		$this->_set_category_object();
-		$id = !empty($this->_category->id) ? $this->_category->id : '';
+		$id = ! empty($this->_category->id) ? $this->_category->id : '';
 
 		$delete_action = 'delete_category';
 
 		//custom redirect
-		$redirect = EE_Admin_Page::add_query_args_and_nonce( array('action' => 'category_list'), $this->_admin_base_url );
+		$redirect = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'category_list'), $this->_admin_base_url);
 
-		$this->_set_publish_post_box_vars( 'EVT_CAT_ID', $id, $delete_action, $redirect );
+		$this->_set_publish_post_box_vars('EVT_CAT_ID', $id, $delete_action, $redirect);
 
 		//take care of contents
 		$this->_template_args['admin_page_content'] = $this->_category_details_content();
@@ -2148,25 +2148,25 @@ 
 			'type' => 'wp_editor',
 			'value' => EEH_Formatter::admin_format_content($this->_category->category_desc),
 			'class' => 'my_editor_custom',
-			'wpeditor_args' => array('media_buttons' => FALSE )
+			'wpeditor_args' => array('media_buttons' => FALSE)
 		);
-		$_wp_editor = $this->_generate_admin_form_fields( $editor_args, 'array' );
+		$_wp_editor = $this->_generate_admin_form_fields($editor_args, 'array');
 
-		$all_terms = get_terms( array('espresso_event_categories' ), array( 'hide_empty' => 0, 'exclude' => array( $this->_category->id ) ) );
+		$all_terms = get_terms(array('espresso_event_categories'), array('hide_empty' => 0, 'exclude' => array($this->_category->id)));
 
 		//setup category select for term parents.
 		$category_select_values[] = array(
 			'text' => __('No Parent', 'event_espresso'),
 			'id' => 0
 			);
-		foreach ( $all_terms as $term ) {
+		foreach ($all_terms as $term) {
 			$category_select_values[] = array(
 				'text' => $term->name,
 				'id' => $term->term_id
 				);
 		}
 
-		$category_select = EEH_Form_Fields::select_input( 'category_parent', $category_select_values, $this->_category->parent );
+		$category_select = EEH_Form_Fields::select_input('category_parent', $category_select_values, $this->_category->parent);
 
 		$template_args = array(
 			'category' => $this->_category,
@@ -2176,15 +2176,15 @@ 
 			'disable' => '',
 			'disabled_message' => FALSE
 			);
-		$template = EVENTS_TEMPLATE_PATH . 'event_category_details.template.php';
-		return EEH_Template::display_template($template, $template_args, TRUE );
+		$template = EVENTS_TEMPLATE_PATH.'event_category_details.template.php';
+		return EEH_Template::display_template($template, $template_args, TRUE);
 	}
 
 
 	protected function _delete_categories() {
-		$cat_ids = isset( $this->_req_data['EVT_CAT_ID'] ) ? (array) $this->_req_data['EVT_CAT_ID'] : (array) $this->_req_data['category_id'];
+		$cat_ids = isset($this->_req_data['EVT_CAT_ID']) ? (array) $this->_req_data['EVT_CAT_ID'] : (array) $this->_req_data['category_id'];
 
-		foreach ( $cat_ids as $cat_id ) {
+		foreach ($cat_ids as $cat_id) {
 			$this->_delete_category($cat_id);
 		}
 
@@ -2192,7 +2192,7 @@ 
 		$query_args = array(
 			'action' => 'category_list'
 			);
-		$this->_redirect_after_action(0,'','',$query_args);
+		$this->_redirect_after_action(0, '', '', $query_args);
 
 	}
 
@@ -2202,61 +2202,61 @@ 
 
 	protected function _delete_category($cat_id) {
 		global $wpdb;
-		$cat_id = absint( $cat_id );
-		wp_delete_term( $cat_id, 'espresso_event_categories' );
+		$cat_id = absint($cat_id);
+		wp_delete_term($cat_id, 'espresso_event_categories');
 	}
 
 
 
 	protected function _insert_or_update_category($new_category) {
 
-		$cat_id = $new_category ? $this->_insert_category() : $this->_insert_category( TRUE );
+		$cat_id = $new_category ? $this->_insert_category() : $this->_insert_category(TRUE);
 		$success = 0; //we already have a success message so lets not send another.
 
-		if ( $cat_id ) {
+		if ($cat_id) {
 			$query_args = array(
 				'action'     => 'edit_category',
 				'EVT_CAT_ID' => $cat_id
 			);
 		} else {
-			$query_args = array( 'action' => 'add_category' );
+			$query_args = array('action' => 'add_category');
 		}
-		$this->_redirect_after_action( $success, '','', $query_args, TRUE );
+		$this->_redirect_after_action($success, '', '', $query_args, TRUE);
 
 	}
 
 
 
-	private function _insert_category( $update = FALSE ) {
+	private function _insert_category($update = FALSE) {
 		$cat_id = $update ? $this->_req_data['EVT_CAT_ID'] : '';
-		$category_name= isset( $this->_req_data['category_name'] ) ? $this->_req_data['category_name'] : '';
-		$category_desc= isset( $this->_req_data['category_desc'] ) ? $this->_req_data['category_desc'] : '';
-		$category_parent = isset( $this->_req_data['category_parent'] ) ? $this->_req_data['category_parent'] : 0;
+		$category_name = isset($this->_req_data['category_name']) ? $this->_req_data['category_name'] : '';
+		$category_desc = isset($this->_req_data['category_desc']) ? $this->_req_data['category_desc'] : '';
+		$category_parent = isset($this->_req_data['category_parent']) ? $this->_req_data['category_parent'] : 0;
 
-		if ( empty( $category_name ) ) {
-			$msg = __( 'You must add a name for the category.', 'event_espresso' );
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($category_name)) {
+			$msg = __('You must add a name for the category.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 
-		$term_args=array(
+		$term_args = array(
 			'name'=>$category_name,
 			'description'=>$category_desc,
 			'parent'=>$category_parent
 		);
 		//was the category_identifier input disabled?
-		if(isset($this->_req_data['category_identifier'])){
+		if (isset($this->_req_data['category_identifier'])) {
 			$term_args['slug'] = $this->_req_data['category_identifier'];
 		}
-		$insert_ids = $update ? wp_update_term( $cat_id, 'espresso_event_categories', $term_args ) :wp_insert_term( $category_name, 'espresso_event_categories', $term_args );
+		$insert_ids = $update ? wp_update_term($cat_id, 'espresso_event_categories', $term_args) : wp_insert_term($category_name, 'espresso_event_categories', $term_args);
 
-		if ( !is_array( $insert_ids ) ) {
-			$msg = __( 'An error occurred and the category has not been saved to the database.', 'event_espresso' );
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! is_array($insert_ids)) {
+			$msg = __('An error occurred and the category has not been saved to the database.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		} else {
 			$cat_id = $insert_ids['term_id'];
-			$msg = sprintf ( __('The category %s was successfuly saved', 'event_espresso'), $category_name );
-			EE_Error::add_success( $msg );
+			$msg = sprintf(__('The category %s was successfuly saved', 'event_espresso'), $category_name);
+			EE_Error::add_success($msg);
 		}
 
 		return $cat_id;
@@ -2265,32 +2265,32 @@ 
 
 
 
-	public function get_categories( $per_page = 10, $current_page = 1, $count = FALSE ) {
+	public function get_categories($per_page = 10, $current_page = 1, $count = FALSE) {
 		global $wpdb;
 
 		//testing term stuff
-		$orderby = isset( $this->_req_data['orderby'] ) ? $this->_req_data['orderby'] : 'Term.term_id';
-		$order = isset( $this->_req_data['order'] ) ? $this->_req_data['order'] : 'DESC';
-		$limit = ($current_page-1)*$per_page;
+		$orderby = isset($this->_req_data['orderby']) ? $this->_req_data['orderby'] : 'Term.term_id';
+		$order = isset($this->_req_data['order']) ? $this->_req_data['order'] : 'DESC';
+		$limit = ($current_page - 1) * $per_page;
 
-		$where = array( 'taxonomy' => 'espresso_event_categories' );
+		$where = array('taxonomy' => 'espresso_event_categories');
 
-		if ( isset( $this->_req_data['s'] ) ) {
-			$sstr = '%' . $this->_req_data['s'] . '%';
+		if (isset($this->_req_data['s'])) {
+			$sstr = '%'.$this->_req_data['s'].'%';
 			$where['OR'] = array(
-				'Term.name' => array( 'LIKE', $sstr),
-				'description' => array( 'LIKE', $sstr )
+				'Term.name' => array('LIKE', $sstr),
+				'description' => array('LIKE', $sstr)
 				);
 		}
 
 		$query_params = array(
-			$where ,
-			'order_by' => array( $orderby => $order ),
-			'limit' => $limit . ',' . $per_page,
+			$where,
+			'order_by' => array($orderby => $order),
+			'limit' => $limit.','.$per_page,
 			'force_join' => array('Term')
 			);
 
-		$categories = $count ? EEM_Term_Taxonomy::instance()->count( $query_params, 'term_id' ) :EEM_Term_Taxonomy::instance()->get_all( $query_params );
+		$categories = $count ? EEM_Term_Taxonomy::instance()->count($query_params, 'term_id') : EEM_Term_Taxonomy::instance()->get_all($query_params);
 
 		return $categories;
 	}

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

Spacing +326 added lines, -326 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -38,32 +38,32 @@ 
 	public static function set_hooks() {
 		add_filter(
 			'FHEE__SPCO__EE_Line_Item_Filter_Collection',
-			array( 'EE_SPCO_Reg_Step_Payment_Options', 'add_spco_line_item_filters' )
+			array('EE_SPCO_Reg_Step_Payment_Options', 'add_spco_line_item_filters')
 		);
 		add_action(
 			'wp_ajax_switch_spco_billing_form',
-			array( 'EE_SPCO_Reg_Step_Payment_Options', 'switch_spco_billing_form' )
+			array('EE_SPCO_Reg_Step_Payment_Options', 'switch_spco_billing_form')
 		);
 		add_action(
 			'wp_ajax_nopriv_switch_spco_billing_form',
-			array( 'EE_SPCO_Reg_Step_Payment_Options', 'switch_spco_billing_form' )
+			array('EE_SPCO_Reg_Step_Payment_Options', 'switch_spco_billing_form')
 		);
-		add_action( 'wp_ajax_save_payer_details', array( 'EE_SPCO_Reg_Step_Payment_Options', 'save_payer_details' ) );
+		add_action('wp_ajax_save_payer_details', array('EE_SPCO_Reg_Step_Payment_Options', 'save_payer_details'));
 		add_action(
 			'wp_ajax_nopriv_save_payer_details',
-			array( 'EE_SPCO_Reg_Step_Payment_Options', 'save_payer_details' )
+			array('EE_SPCO_Reg_Step_Payment_Options', 'save_payer_details')
 		);
 		add_action(
 			'wp_ajax_get_transaction_details_for_gateways',
-			array( 'EE_SPCO_Reg_Step_Payment_Options', 'get_transaction_details' )
+			array('EE_SPCO_Reg_Step_Payment_Options', 'get_transaction_details')
 		);
 		add_action(
 			'wp_ajax_nopriv_get_transaction_details_for_gateways',
-			array( 'EE_SPCO_Reg_Step_Payment_Options', 'get_transaction_details' )
+			array('EE_SPCO_Reg_Step_Payment_Options', 'get_transaction_details')
 		);
 		add_filter(
 			'FHEE__EED_Recaptcha___bypass_recaptcha__bypass_request_params_array',
-			array( 'EE_SPCO_Reg_Step_Payment_Options', 'bypass_recaptcha_for_load_payment_method' ),
+			array('EE_SPCO_Reg_Step_Payment_Options', 'bypass_recaptcha_for_load_payment_method'),
 			10,
 			1
 		);
@@ -77,7 +77,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public static function switch_spco_billing_form() {
-		EED_Single_Page_Checkout::process_ajax_request( 'switch_payment_method' );
+		EED_Single_Page_Checkout::process_ajax_request('switch_payment_method');
 	}
 
 
@@ -88,7 +88,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public static function save_payer_details() {
-		EED_Single_Page_Checkout::process_ajax_request( 'save_payer_details_via_ajax' );
+		EED_Single_Page_Checkout::process_ajax_request('save_payer_details_via_ajax');
 	}
 
 
@@ -99,7 +99,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public static function get_transaction_details() {
-		EED_Single_Page_Checkout::process_ajax_request( 'get_transaction_details_for_gateways' );
+		EED_Single_Page_Checkout::process_ajax_request('get_transaction_details_for_gateways');
 	}
 
 
@@ -127,10 +127,10 @@ 
 	 * @param    EE_Checkout $checkout
 	 * @return    \EE_SPCO_Reg_Step_Payment_Options
 	 */
-	public function __construct( EE_Checkout $checkout ) {
+	public function __construct(EE_Checkout $checkout) {
 		$this->_slug = 'payment_options';
-		$this->_name = __( 'Payment Options', 'event_espresso' );
-		$this->_template = SPCO_REG_STEPS_PATH . $this->_slug . DS . 'payment_options_main.template.php';
+		$this->_name = __('Payment Options', 'event_espresso');
+		$this->_template = SPCO_REG_STEPS_PATH.$this->_slug.DS.'payment_options_main.template.php';
 		$this->checkout = $checkout;
 		$this->_reset_success_message();
 		$this->set_instructions(
@@ -155,7 +155,7 @@ 
 	/**
 	 * @param null $line_item_display
 	 */
-	public function set_line_item_display( $line_item_display ) {
+	public function set_line_item_display($line_item_display) {
 		$this->line_item_display = $line_item_display;
 	}
 
@@ -173,8 +173,8 @@ 
 	/**
 	 * @param boolean $handle_IPN_in_this_request
 	 */
-	public function set_handle_IPN_in_this_request( $handle_IPN_in_this_request ) {
-		$this->handle_IPN_in_this_request = filter_var( $handle_IPN_in_this_request, FILTER_VALIDATE_BOOLEAN );
+	public function set_handle_IPN_in_this_request($handle_IPN_in_this_request) {
+		$this->handle_IPN_in_this_request = filter_var($handle_IPN_in_this_request, FILTER_VALIDATE_BOOLEAN);
 	}
 
 
@@ -227,20 +227,20 @@ 
 			// 	$ 0.00 transactions (no payment required)
 			! $this->checkout->payment_required()
 			// but do NOT remove if current action being called belongs to this reg step
-			&& ! is_callable( array( $this, $this->checkout->action ) )
+			&& ! is_callable(array($this, $this->checkout->action))
 			&& ! $this->completed()
 		) {
 			// and if so, then we no longer need the Payment Options step
-			if ( $this->is_current_step() ) {
+			if ($this->is_current_step()) {
 				$this->checkout->generate_reg_form = false;
 			}
-			$this->checkout->remove_reg_step( $this->_slug );
+			$this->checkout->remove_reg_step($this->_slug);
 			// DEBUG LOG
 			//$this->checkout->log( __CLASS__, __FUNCTION__, __LINE__ );
 			return false;
 		}
 		// load EEM_Payment_Method
-		EE_Registry::instance()->load_model( 'Payment_Method' );
+		EE_Registry::instance()->load_model('Payment_Method');
 		// get all active payment methods
 		$this->checkout->available_payment_methods = EEM_Payment_Method::instance()->get_all_for_transaction(
 			$this->checkout->transaction,
@@ -266,8 +266,8 @@ 
 		$sold_out_events = array();
 		$reg_count = 0;
 		// loop thru registrations to gather info
-		$registrations = $this->checkout->transaction->registrations( $this->checkout->reg_cache_where_params );
-		foreach ( $registrations as $registration ) {
+		$registrations = $this->checkout->transaction->registrations($this->checkout->reg_cache_where_params);
+		foreach ($registrations as $registration) {
 			/** @var $registration EE_Registration */
 			$reg_count++;
 			// if returning registrant is Approved then do NOT do this
@@ -277,9 +277,9 @@ 
 				&& $registration->status_ID() === EEM_Registration::status_id_approved
 			)
 			) {
-				if ( $registration->event()->is_sold_out() || $registration->event()->is_sold_out( true ) ) {
+				if ($registration->event()->is_sold_out() || $registration->event()->is_sold_out(true)) {
 					// add event to list of events that are sold out
-					$sold_out_events[ $registration->event()->ID() ] = $registration->event();
+					$sold_out_events[$registration->event()->ID()] = $registration->event();
 					do_action(
 						'AHEE__EE_SPCO_Reg_Step_Payment_Options__generate_reg_form__sold_out_event',
 						$registration->event(),
@@ -287,9 +287,9 @@ 
 					);
 				}
 				// event requires admin approval
-				if ( $registration->status_ID() === EEM_Registration::status_id_not_approved ) {
+				if ($registration->status_ID() === EEM_Registration::status_id_not_approved) {
 					// add event to list of events with pre-approval reg status
-					$registrations_requiring_pre_approval[ $registration->ID() ] = $registration;
+					$registrations_requiring_pre_approval[$registration->ID()] = $registration;
 					do_action(
 						'AHEE__EE_SPCO_Reg_Step_Payment_Options__generate_reg_form__event_requires_pre_approval',
 						$registration->event(),
@@ -298,8 +298,8 @@ 
 				}
 			}
 			// are they allowed to pay now and is there monies owing?
-			if ( $registration->owes_monies_and_can_pay() ) {
-				$registrations_requiring_payment[ $registration->ID() ] = $registration;
+			if ($registration->owes_monies_and_can_pay()) {
+				$registrations_requiring_payment[$registration->ID()] = $registration;
 				do_action(
 					'AHEE__EE_SPCO_Reg_Step_Payment_Options__generate_reg_form__event_requires_payment',
 					$registration->event(),
@@ -310,23 +310,23 @@ 
 				&& $registration->status_ID() !== EEM_Registration::status_id_not_approved
 				&& $registration->ticket()->is_free()
 			) {
-				$registrations_for_free_events[ $registration->event()->ID() ] = $registration;
+				$registrations_for_free_events[$registration->event()->ID()] = $registration;
 			}
 		}
 		$subsections = array();
 		// now decide which template to load
-		if ( ! empty( $sold_out_events ) ) {
-			$subsections['sold_out_events'] = $this->_sold_out_events( $sold_out_events );
+		if ( ! empty($sold_out_events)) {
+			$subsections['sold_out_events'] = $this->_sold_out_events($sold_out_events);
 		}
-		if ( ! empty( $registrations_requiring_pre_approval ) ) {
+		if ( ! empty($registrations_requiring_pre_approval)) {
 			$subsections['registrations_requiring_pre_approval'] = $this->_registrations_requiring_pre_approval(
 				$registrations_requiring_pre_approval
 			);
 		}
-		if ( ! empty( $registrations_for_free_events ) ) {
-			$subsections['no_payment_required'] = $this->_no_payment_required( $registrations_for_free_events );
+		if ( ! empty($registrations_for_free_events)) {
+			$subsections['no_payment_required'] = $this->_no_payment_required($registrations_for_free_events);
 		}
-		if ( ! empty( $registrations_requiring_payment ) ) {
+		if ( ! empty($registrations_requiring_payment)) {
 			// autoload Line_Item_Display classes
 			EEH_Autoloader::register_line_item_filter_autoloaders();
 			$line_item_filter_processor = new EE_Line_Item_Filter_Processor(
@@ -338,17 +338,17 @@ 
 			);
 			/** @var EE_Line_Item $filtered_line_item_tree */
 			$filtered_line_item_tree = $line_item_filter_processor->process();
-			if ( $this->checkout->amount_owing > 0 ) {
+			if ($this->checkout->amount_owing > 0) {
 				EEH_Autoloader::register_line_item_display_autoloaders();
-				$this->set_line_item_display( new EE_Line_Item_Display( 'spco' ) );
+				$this->set_line_item_display(new EE_Line_Item_Display('spco'));
 				$subsections['payment_options'] = $this->_display_payment_options(
 					$this->line_item_display->display_line_item(
 						$filtered_line_item_tree,
-						array( 'registrations' => $registrations )
+						array('registrations' => $registrations)
 					)
 				);
 				$this->checkout->amount_owing = $filtered_line_item_tree->total();
-				$this->_apply_registration_payments_to_amount_owing( $registrations );
+				$this->_apply_registration_payments_to_amount_owing($registrations);
 			}
 		} else {
 			$this->_hide_reg_step_submit_button_if_revisit();
@@ -378,7 +378,7 @@ 
 	 * @param \EE_Line_Item_Filter_Collection $line_item_filter_collection
 	 * @return \EE_Line_Item_Filter_Collection
 	 */
-	public static function add_spco_line_item_filters( EE_Line_Item_Filter_Collection $line_item_filter_collection ) {
+	public static function add_spco_line_item_filters(EE_Line_Item_Filter_Collection $line_item_filter_collection) {
 		$line_item_filter_collection->add(
 			new EE_Billable_Line_Item_Filter(
 				EE_Registry::instance()->SSN->checkout()->transaction->registrations(
@@ -386,7 +386,7 @@ 
 				)
 			)
 		);
-		$line_item_filter_collection->add( new EE_Non_Zero_Line_Item_Filter() );
+		$line_item_filter_collection->add(new EE_Non_Zero_Line_Item_Filter());
 		return $line_item_filter_collection;
 	}
 
@@ -400,8 +400,8 @@ 
 	 * @return void
 	 */
 	protected function _hide_reg_step_submit_button_if_revisit() {
-		if ( $this->checkout->revisit ) {
-			add_filter( 'FHEE__EE_SPCO_Reg_Step__reg_step_submit_button__sbmt_btn_html', '__return_empty_string' );
+		if ($this->checkout->revisit) {
+			add_filter('FHEE__EE_SPCO_Reg_Step__reg_step_submit_button__sbmt_btn_html', '__return_empty_string');
 		}
 	}
 
@@ -414,13 +414,13 @@ 
 	 * @return \EE_Form_Section_Proper
 	 * @throws \EE_Error
 	 */
-	private function _sold_out_events( $sold_out_events_array = array() ) {
+	private function _sold_out_events($sold_out_events_array = array()) {
 		// set some defaults
 		$this->checkout->selected_method_of_payment = 'events_sold_out';
 		$sold_out_events = '';
-		foreach ( $sold_out_events_array as $sold_out_event ) {
+		foreach ($sold_out_events_array as $sold_out_event) {
 			$sold_out_events .= EEH_HTML::li(
-				EEH_HTML::span( $sold_out_event->name(), '', 'dashicons dashicons-marker ee-icon-size-16 pink-text' )
+				EEH_HTML::span($sold_out_event->name(), '', 'dashicons dashicons-marker ee-icon-size-16 pink-text')
 			);
 		}
 		return new EE_Form_Section_Proper(
@@ -465,17 +465,17 @@ 
 	 * @return \EE_Form_Section_Proper
 	 * @throws \EE_Error
 	 */
-	private function _registrations_requiring_pre_approval( $registrations_requiring_pre_approval = array() ) {
+	private function _registrations_requiring_pre_approval($registrations_requiring_pre_approval = array()) {
 		$events_requiring_pre_approval = '';
-		foreach ( $registrations_requiring_pre_approval as $registration ) {
-			if ( $registration instanceof EE_Registration && $registration->event() instanceof EE_Event ) {
-				$events_requiring_pre_approval[ $registration->event()->ID() ] = EEH_HTML::li(
+		foreach ($registrations_requiring_pre_approval as $registration) {
+			if ($registration instanceof EE_Registration && $registration->event() instanceof EE_Event) {
+				$events_requiring_pre_approval[$registration->event()->ID()] = EEH_HTML::li(
 					EEH_HTML::span(
 						'',
 						'',
 						'dashicons dashicons-marker ee-icon-size-16 orange-text'
 					)
-					. EEH_HTML::span( $registration->event()->name(), '', 'orange-text' )
+					. EEH_HTML::span($registration->event()->name(), '', 'orange-text')
 				);
 			}
 		}
@@ -494,7 +494,7 @@ 
 						'template_args'        => apply_filters(
 							'FHEE__EE_SPCO_Reg_Step_Payment_Options___sold_out_events__template_args',
 							array(
-								'events_requiring_pre_approval'     => implode( '', $events_requiring_pre_approval ),
+								'events_requiring_pre_approval'     => implode('', $events_requiring_pre_approval),
 								'events_requiring_pre_approval_msg' => apply_filters(
 									'FHEE__EE_SPCO_Reg_Step_Payment_Options___events_requiring_pre_approval__events_requiring_pre_approval_msg',
 									__(
@@ -519,7 +519,7 @@ 
 	 * @return \EE_Form_Section_Proper
 	 * @throws \EE_Error
 	 */
-	private function _no_payment_required( $registrations_for_free_events = array() ) {
+	private function _no_payment_required($registrations_for_free_events = array()) {
 		// set some defaults
 		$this->checkout->selected_method_of_payment = 'no_payment_required';
 		// generate no_payment_required form
@@ -543,7 +543,7 @@ 
 								'ticket_count'                  => array(),
 								'registrations_for_free_events' => $registrations_for_free_events,
 								'no_payment_required_msg'       => EEH_HTML::p(
-									__( 'This is a free event, so no billing will occur.', 'event_espresso' )
+									__('This is a free event, so no billing will occur.', 'event_espresso')
 								)
 							)
 						),
@@ -562,7 +562,7 @@ 
 	 * @return \EE_Form_Section_Proper
 	 * @throws \EE_Error
 	 */
-	private function _display_payment_options( $transaction_details = '' ) {
+	private function _display_payment_options($transaction_details = '') {
 		// has method_of_payment been set by no-js user?
 		$this->checkout->selected_method_of_payment = $this->_get_selected_method_of_payment();
 		// build payment options form
@@ -574,18 +574,18 @@ 
 						'before_payment_options' => apply_filters(
 							'FHEE__EE_SPCO_Reg_Step_Payment_Options___display_payment_options__before_payment_options',
 							new EE_Form_Section_Proper(
-								array( 'layout_strategy' => new EE_Div_Per_Section_Layout() )
+								array('layout_strategy' => new EE_Div_Per_Section_Layout())
 							)
 						),
 						'payment_options'        => $this->_setup_payment_options(),
 						'after_payment_options'  => apply_filters(
 							'FHEE__EE_SPCO_Reg_Step_Payment_Options___display_payment_options__after_payment_options',
 							new EE_Form_Section_Proper(
-								array( 'layout_strategy' => new EE_Div_Per_Section_Layout() )
+								array('layout_strategy' => new EE_Div_Per_Section_Layout())
 							)
 						),
 						'default_hidden_inputs'  => $this->reg_step_hidden_inputs(),
-						'extra_hidden_inputs'    => $this->_extra_hidden_inputs( false )
+						'extra_hidden_inputs'    => $this->_extra_hidden_inputs(false)
 					),
 					'layout_strategy' => new EE_Template_Layout(
 						array(
@@ -614,10 +614,10 @@ 
 	 * @return \EE_Form_Section_Proper
 	 * @throws \EE_Error
 	 */
-	private function _extra_hidden_inputs( $no_payment_required = true ) {
+	private function _extra_hidden_inputs($no_payment_required = true) {
 		return new EE_Form_Section_Proper(
 			array(
-				'html_id'         => 'ee-' . $this->slug() . '-extra-hidden-inputs',
+				'html_id'         => 'ee-'.$this->slug().'-extra-hidden-inputs',
 				'layout_strategy' => new EE_Div_Per_Section_Layout(),
 				'subsections'     => array(
 					'spco_no_payment_required' => new EE_Hidden_Input(
@@ -649,16 +649,16 @@ 
 	 * @access protected
 	 * @param array $registrations
 	 */
-	protected function _apply_registration_payments_to_amount_owing( array $registrations ) {
+	protected function _apply_registration_payments_to_amount_owing(array $registrations) {
 		$payments = array();
-		foreach ( $registrations as $registration ) {
-			if ( $registration instanceof EE_Registration && $registration->owes_monies_and_can_pay() ) {
+		foreach ($registrations as $registration) {
+			if ($registration instanceof EE_Registration && $registration->owes_monies_and_can_pay()) {
 				$payments += $registration->registration_payments();
 			}
 		}
-		if ( ! empty( $payments ) ) {
-			foreach ( $payments as $payment ) {
-				if ( $payment instanceof EE_Registration_Payment ) {
+		if ( ! empty($payments)) {
+			foreach ($payments as $payment) {
+				if ($payment instanceof EE_Registration_Payment) {
 					$this->checkout->amount_owing -= $payment->amount();
 				}
 			}
@@ -674,11 +674,11 @@ 
 	 * @param    bool $force_reset
 	 * @return    void
 	 */
-	private function _reset_selected_method_of_payment( $force_reset = false ) {
+	private function _reset_selected_method_of_payment($force_reset = false) {
 		$reset_payment_method = $force_reset
 			? true
-			: sanitize_text_field( EE_Registry::instance()->REQ->get( 'reset_payment_method', false ) );
-		if ( $reset_payment_method ) {
+			: sanitize_text_field(EE_Registry::instance()->REQ->get('reset_payment_method', false));
+		if ($reset_payment_method) {
 			$this->checkout->selected_method_of_payment = null;
 			$this->checkout->payment_method = null;
 			$this->checkout->billing_form = null;
@@ -697,12 +697,12 @@ 
 	 * @param string $selected_method_of_payment
 	 * @return        EE_Billing_Info_Form
 	 */
-	private function _save_selected_method_of_payment( $selected_method_of_payment = '' ) {
-		$selected_method_of_payment = ! empty( $selected_method_of_payment )
+	private function _save_selected_method_of_payment($selected_method_of_payment = '') {
+		$selected_method_of_payment = ! empty($selected_method_of_payment)
 			? $selected_method_of_payment
 			: $this->checkout->selected_method_of_payment;
 		EE_Registry::instance()->SSN->set_session_data(
-			array( 'selected_method_of_payment' => $selected_method_of_payment )
+			array('selected_method_of_payment' => $selected_method_of_payment)
 		);
 	}
 
@@ -718,19 +718,19 @@ 
 		// load payment method classes
 		$this->checkout->available_payment_methods = $this->_get_available_payment_methods();
 		// switch up header depending on number of available payment methods
-		$payment_method_header = count( $this->checkout->available_payment_methods ) > 1
+		$payment_method_header = count($this->checkout->available_payment_methods) > 1
 			? apply_filters(
 				'FHEE__registration_page_payment_options__method_of_payment_hdr',
-				__( 'Please Select Your Method of Payment', 'event_espresso' )
+				__('Please Select Your Method of Payment', 'event_espresso')
 			)
 			: apply_filters(
 				'FHEE__registration_page_payment_options__method_of_payment_hdr',
-				__( 'Method of Payment', 'event_espresso' )
+				__('Method of Payment', 'event_espresso')
 			);
 		$available_payment_methods = array(
 			// display the "Payment Method" header
 			'payment_method_header' => new EE_Form_Section_HTML(
-				EEH_HTML::h4( $payment_method_header, 'method-of-payment-hdr' )
+				EEH_HTML::h4($payment_method_header, 'method-of-payment-hdr')
 			)
 		);
 		// the list of actual payment methods ( invoice, paypal, etc ) in a  ( slug => HTML )  format
@@ -739,32 +739,32 @@ 
 		// additional instructions to be displayed and hidden below payment methods (adding a clearing div to start)
 		$payment_methods_billing_info = array(
 			new EE_Form_Section_HTML(
-				EEH_HTML::div( '<br />', '', '', 'clear:both;' )
+				EEH_HTML::div('<br />', '', '', 'clear:both;')
 			)
 		);
 		// loop through payment methods
-		foreach ( $this->checkout->available_payment_methods as $payment_method ) {
-			if ( $payment_method instanceof EE_Payment_Method ) {
+		foreach ($this->checkout->available_payment_methods as $payment_method) {
+			if ($payment_method instanceof EE_Payment_Method) {
 				$payment_method_button = EEH_HTML::img(
 					$payment_method->button_url(),
 					$payment_method->name(),
-					'spco-payment-method-' . $payment_method->slug() . '-btn-img',
+					'spco-payment-method-'.$payment_method->slug().'-btn-img',
 					'spco-payment-method-btn-img'
 				);
 				// check if any payment methods are set as default
 				// if payment method is already selected OR nothing is selected and this payment method should be open_by_default
 				if (
-					( $this->checkout->selected_method_of_payment === $payment_method->slug() )
-					|| ( ! $this->checkout->selected_method_of_payment && $payment_method->open_by_default() )
+					($this->checkout->selected_method_of_payment === $payment_method->slug())
+					|| ( ! $this->checkout->selected_method_of_payment && $payment_method->open_by_default())
 				) {
 					$this->checkout->selected_method_of_payment = $payment_method->slug();
 					$this->_save_selected_method_of_payment();
-					$default_payment_method_option[ $payment_method->slug() ] = $payment_method_button;
+					$default_payment_method_option[$payment_method->slug()] = $payment_method_button;
 				} else {
-					$available_payment_method_options[ $payment_method->slug() ] = $payment_method_button;
+					$available_payment_method_options[$payment_method->slug()] = $payment_method_button;
 				}
-				$payment_methods_billing_info[ $payment_method->slug()
-				                               . '-info' ] = $this->_payment_method_billing_info(
+				$payment_methods_billing_info[$payment_method->slug()
+				                               . '-info'] = $this->_payment_method_billing_info(
 					$payment_method
 				);
 			}
@@ -794,12 +794,12 @@ 
 	 * @return EE_Payment_Method[]
 	 */
 	protected function _get_available_payment_methods() {
-		if ( ! empty( $this->checkout->available_payment_methods ) ) {
+		if ( ! empty($this->checkout->available_payment_methods)) {
 			return $this->checkout->available_payment_methods;
 		}
 		$available_payment_methods = array();
 		// load EEM_Payment_Method
-		EE_Registry::instance()->load_model( 'Payment_Method' );
+		EE_Registry::instance()->load_model('Payment_Method');
 		/** @type EEM_Payment_Method $EEM_Payment_Method */
 		$EEM_Payment_Method = EE_Registry::instance()->LIB->EEM_Payment_Method;
 		// get all active payment methods
@@ -807,9 +807,9 @@ 
 			$this->checkout->transaction,
 			EEM_Payment_Method::scope_cart
 		);
-		foreach ( $payment_methods as $payment_method ) {
-			if ( $payment_method instanceof EE_Payment_Method ) {
-				$available_payment_methods[ $payment_method->slug() ] = $payment_method;
+		foreach ($payment_methods as $payment_method) {
+			if ($payment_method instanceof EE_Payment_Method) {
+				$available_payment_methods[$payment_method->slug()] = $payment_method;
 			}
 		}
 		return $available_payment_methods;
@@ -824,14 +824,14 @@ 
 	 * @param    array $available_payment_method_options
 	 * @return    \EE_Form_Section_Proper
 	 */
-	private function _available_payment_method_inputs( $available_payment_method_options = array() ) {
+	private function _available_payment_method_inputs($available_payment_method_options = array()) {
 		// generate inputs
 		return new EE_Form_Section_Proper(
 			array(
 				'html_id'         => 'ee-available-payment-method-inputs',
 				'layout_strategy' => new EE_Div_Per_Section_Layout(),
 				'subsections'     => array(
-					'' => new EE_Radio_Button_Input (
+					'' => new EE_Radio_Button_Input(
 						$available_payment_method_options,
 						array(
 							'html_name'          => 'selected_method_of_payment',
@@ -856,28 +856,28 @@ 
 	 * @return    \EE_Form_Section_Proper
 	 * @throws \EE_Error
 	 */
-	private function _payment_method_billing_info( EE_Payment_Method $payment_method ) {
+	private function _payment_method_billing_info(EE_Payment_Method $payment_method) {
 		$currently_selected = $this->checkout->selected_method_of_payment === $payment_method->slug()
 			? true
 			: false;
 		// generate the billing form for payment method
 		$billing_form = $currently_selected
-			? $this->_get_billing_form_for_payment_method( $payment_method )
+			? $this->_get_billing_form_for_payment_method($payment_method)
 			: new EE_Form_Section_HTML();
 		$this->checkout->billing_form = $currently_selected
 			? $billing_form
 			: $this->checkout->billing_form;
 		// it's all in the details
 		$info_html = EEH_HTML::h3(
-			__( 'Important information regarding your payment', 'event_espresso' ),
+			__('Important information regarding your payment', 'event_espresso'),
 			'',
 			'spco-payment-method-hdr'
 		);
 		// add some info regarding the step, either from what's saved in the admin,
 		// or a default string depending on whether the PM has a billing form or not
-		if ( $payment_method->description() ) {
+		if ($payment_method->description()) {
 			$payment_method_info = $payment_method->description();
-		} elseif ( $billing_form instanceof EE_Billing_Info_Form ) {
+		} elseif ($billing_form instanceof EE_Billing_Info_Form) {
 			$payment_method_info = sprintf(
 				__(
 					'Please provide the following billing information, then click the "%1$s" button below in order to proceed.',
@@ -887,7 +887,7 @@ 
 			);
 		} else {
 			$payment_method_info = sprintf(
-				__( 'Please click the "%1$s" button below in order to proceed.', 'event_espresso' ),
+				__('Please click the "%1$s" button below in order to proceed.', 'event_espresso'),
 				$this->submit_button_text()
 			);
 		}
@@ -901,13 +901,13 @@ 
 		);
 		return new EE_Form_Section_Proper(
 			array(
-				'html_id'         => 'spco-payment-method-info-' . $payment_method->slug(),
+				'html_id'         => 'spco-payment-method-info-'.$payment_method->slug(),
 				'html_class'      => 'spco-payment-method-info-dv',
 				// only display the selected or default PM
 				'html_style'      => $currently_selected ? '' : 'display:none;',
 				'layout_strategy' => new EE_Div_Per_Section_Layout(),
 				'subsections'     => array(
-					'info'         => new EE_Form_Section_HTML( $info_html ),
+					'info'         => new EE_Form_Section_HTML($info_html),
 					'billing_form' => $currently_selected ? $billing_form : new EE_Form_Section_HTML()
 				)
 			)
@@ -925,15 +925,15 @@ 
 	 */
 	public function get_billing_form_html_for_payment_method() {
 		// how have they chosen to pay?
-		$this->checkout->selected_method_of_payment = $this->_get_selected_method_of_payment( true );
+		$this->checkout->selected_method_of_payment = $this->_get_selected_method_of_payment(true);
 		$this->checkout->payment_method = $this->_get_payment_method_for_selected_method_of_payment();
-		if ( ! $this->checkout->payment_method instanceof EE_Payment_Method ) {
+		if ( ! $this->checkout->payment_method instanceof EE_Payment_Method) {
 			return false;
 		}
-		if ( apply_filters(
+		if (apply_filters(
 			'FHEE__EE_SPCO_Reg_Step_Payment_Options__registration_checkout__selected_payment_method__display_success',
 			false
-		) ) {
+		)) {
 			EE_Error::add_success(
 				apply_filters(
 					'FHEE__Single_Page_Checkout__registration_checkout__selected_payment_method',
@@ -948,7 +948,7 @@ 
 			);
 		}
 		// now generate billing form for selected method of payment
-		$payment_method_billing_form = $this->_get_billing_form_for_payment_method( $this->checkout->payment_method );
+		$payment_method_billing_form = $this->_get_billing_form_for_payment_method($this->checkout->payment_method);
 		// fill form with attendee info if applicable
 		if (
 			$payment_method_billing_form instanceof EE_Billing_Attendee_Info_Form
@@ -970,10 +970,10 @@ 
 		$billing_info = $payment_method_billing_form instanceof EE_Form_Section_Proper
 			? $payment_method_billing_form->get_html()
 			: '';
-		$this->checkout->json_response->set_return_data( array( 'payment_method_info' => $billing_info ) );
+		$this->checkout->json_response->set_return_data(array('payment_method_info' => $billing_info));
 		// localize validation rules for main form
 		$this->checkout->current_step->reg_form->localize_validation_rules();
-		$this->checkout->json_response->add_validation_rules( EE_Form_Section_Proper::js_localization() );
+		$this->checkout->json_response->add_validation_rules(EE_Form_Section_Proper::js_localization());
 		return true;
 	}
 
@@ -987,18 +987,18 @@ 
 	 * @return \EE_Billing_Info_Form
 	 * @throws \EE_Error
 	 */
-	private function _get_billing_form_for_payment_method( EE_Payment_Method $payment_method ) {
+	private function _get_billing_form_for_payment_method(EE_Payment_Method $payment_method) {
 		$billing_form = $payment_method->type_obj()->billing_form(
 			$this->checkout->transaction,
-			array( 'amount_owing' => $this->checkout->amount_owing )
+			array('amount_owing' => $this->checkout->amount_owing)
 		);
-		if ( $billing_form instanceof EE_Billing_Info_Form ) {
+		if ($billing_form instanceof EE_Billing_Info_Form) {
 			if (
 				apply_filters(
 					'FHEE__EE_SPCO_Reg_Step_Payment_Options__registration_checkout__selected_payment_method__display_success',
 					false
 				)
-				&& EE_Registry::instance()->REQ->is_set( 'payment_method' )
+				&& EE_Registry::instance()->REQ->is_set('payment_method')
 			) {
 				EE_Error::add_success(
 					apply_filters(
@@ -1040,15 +1040,15 @@ 
 		$request_param = 'selected_method_of_payment'
 	) {
 		// is selected_method_of_payment set in the request ?
-		$selected_method_of_payment = EE_Registry::instance()->REQ->get( $request_param, false );
-		if ( $selected_method_of_payment ) {
+		$selected_method_of_payment = EE_Registry::instance()->REQ->get($request_param, false);
+		if ($selected_method_of_payment) {
 			// sanitize it
-			$selected_method_of_payment = is_array( $selected_method_of_payment )
-				? array_shift( $selected_method_of_payment )
+			$selected_method_of_payment = is_array($selected_method_of_payment)
+				? array_shift($selected_method_of_payment)
 				: $selected_method_of_payment;
-			$selected_method_of_payment = sanitize_text_field( $selected_method_of_payment );
+			$selected_method_of_payment = sanitize_text_field($selected_method_of_payment);
 			// store it in the session so that it's available for all subsequent requests including AJAX
-			$this->_save_selected_method_of_payment( $selected_method_of_payment );
+			$this->_save_selected_method_of_payment($selected_method_of_payment);
 		} else {
 			// or is is set in the session ?
 			$selected_method_of_payment = EE_Registry::instance()->SSN->get_session_data(
@@ -1056,7 +1056,7 @@ 
 			);
 		}
 		// do ya really really gotta have it?
-		if ( empty( $selected_method_of_payment ) && $required ) {
+		if (empty($selected_method_of_payment) && $required) {
 			EE_Error::add_error(
 				sprintf(
 					__(
@@ -1065,7 +1065,7 @@ 
 					),
 					'<br/>',
 					'<br/>',
-					EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+					EE_Registry::instance()->CFG->organization->get_pretty('email')
 				),
 				__FILE__,
 				__FUNCTION__,
@@ -1092,13 +1092,13 @@ 
 	 * @throws \EE_Error
 	 */
 	public function switch_payment_method() {
-		if ( ! $this->_verify_payment_method_is_set() ) {
+		if ( ! $this->_verify_payment_method_is_set()) {
 			return false;
 		}
-		if ( apply_filters(
+		if (apply_filters(
 			'FHEE__EE_SPCO_Reg_Step_Payment_Options__registration_checkout__selected_payment_method__display_success',
 			false
-		) ) {
+		)) {
 			EE_Error::add_success(
 				apply_filters(
 					'FHEE__Single_Page_Checkout__registration_checkout__selected_payment_method',
@@ -1113,13 +1113,13 @@ 
 			);
 		}
 		// generate billing form for selected method of payment if it hasn't been done already
-		if ( $this->checkout->payment_method->type_obj()->has_billing_form() ) {
+		if ($this->checkout->payment_method->type_obj()->has_billing_form()) {
 			$this->checkout->billing_form = $this->_get_billing_form_for_payment_method(
 				$this->checkout->payment_method
 			);
 		}
 		// fill form with attendee info if applicable
-		if ( $this->checkout->billing_form instanceof EE_Billing_Attendee_Info_Form
+		if ($this->checkout->billing_form instanceof EE_Billing_Attendee_Info_Form
 		     && $this->checkout->transaction_has_primary_registrant()
 		) {
 			$this->checkout->billing_form->populate_from_attendee(
@@ -1127,7 +1127,7 @@ 
 			);
 		}
 		// and debug content
-		if ( $this->checkout->billing_form instanceof EE_Billing_Info_Form
+		if ($this->checkout->billing_form instanceof EE_Billing_Info_Form
 		     && $this->checkout->payment_method->type_obj() instanceof EE_PMT_Base
 		) {
 			$this->checkout->billing_form = $this->checkout->payment_method->type_obj()->apply_billing_form_debug_settings(
@@ -1135,15 +1135,15 @@ 
 			);
 		}
 		// get html and validation rules for form
-		if ( $this->checkout->billing_form instanceof EE_Form_Section_Proper ) {
+		if ($this->checkout->billing_form instanceof EE_Form_Section_Proper) {
 			$this->checkout->json_response->set_return_data(
-				array( 'payment_method_info' => $this->checkout->billing_form->get_html() )
+				array('payment_method_info' => $this->checkout->billing_form->get_html())
 			);
 			// localize validation rules for main form
-			$this->checkout->billing_form->localize_validation_rules( true );
-			$this->checkout->json_response->add_validation_rules( EE_Form_Section_Proper::js_localization() );
+			$this->checkout->billing_form->localize_validation_rules(true);
+			$this->checkout->json_response->add_validation_rules(EE_Form_Section_Proper::js_localization());
 		} else {
-			$this->checkout->json_response->set_return_data( array( 'payment_method_info' => '' ) );
+			$this->checkout->json_response->set_return_data(array('payment_method_info' => ''));
 		}
 		//prevents advancement to next step
 		$this->checkout->continue_reg = false;
@@ -1160,12 +1160,12 @@ 
 	 */
 	protected function _verify_payment_method_is_set() {
 		// generate billing form for selected method of payment if it hasn't been done already
-		if ( empty( $this->checkout->selected_method_of_payment ) ) {
+		if (empty($this->checkout->selected_method_of_payment)) {
 			// how have they chosen to pay?
-			$this->checkout->selected_method_of_payment = $this->_get_selected_method_of_payment( true );
+			$this->checkout->selected_method_of_payment = $this->_get_selected_method_of_payment(true);
 		}
 		// verify payment method
-		if ( ! $this->checkout->payment_method instanceof EE_Payment_Method ) {
+		if ( ! $this->checkout->payment_method instanceof EE_Payment_Method) {
 			// get payment method for selected method of payment
 			$this->checkout->payment_method = $this->_get_payment_method_for_selected_method_of_payment();
 		}
@@ -1184,25 +1184,25 @@ 
 	 * @throws \EE_Error
 	 */
 	public function save_payer_details_via_ajax() {
-		if ( ! $this->_verify_payment_method_is_set() ) {
+		if ( ! $this->_verify_payment_method_is_set()) {
 			return;
 		}
 		// generate billing form for selected method of payment if it hasn't been done already
-		if ( $this->checkout->payment_method->type_obj()->has_billing_form() ) {
+		if ($this->checkout->payment_method->type_obj()->has_billing_form()) {
 			$this->checkout->billing_form = $this->_get_billing_form_for_payment_method(
 				$this->checkout->payment_method
 			);
 		}
 		// generate primary attendee from payer info if applicable
-		if ( ! $this->checkout->transaction_has_primary_registrant() ) {
+		if ( ! $this->checkout->transaction_has_primary_registrant()) {
 			$attendee = $this->_create_attendee_from_request_data();
-			if ( $attendee instanceof EE_Attendee ) {
-				foreach ( $this->checkout->transaction->registrations() as $registration ) {
-					if ( $registration->is_primary_registrant() ) {
+			if ($attendee instanceof EE_Attendee) {
+				foreach ($this->checkout->transaction->registrations() as $registration) {
+					if ($registration->is_primary_registrant()) {
 						$this->checkout->primary_attendee_obj = $attendee;
-						$registration->_add_relation_to( $attendee, 'Attendee' );
-						$registration->set_attendee_id( $attendee->ID() );
-						$registration->update_cache_after_object_save( 'Attendee', $attendee );
+						$registration->_add_relation_to($attendee, 'Attendee');
+						$registration->set_attendee_id($attendee->ID());
+						$registration->update_cache_after_object_save('Attendee', $attendee);
 					}
 				}
 			}
@@ -1219,50 +1219,50 @@ 
 	 */
 	protected function _create_attendee_from_request_data() {
 		// get State ID
-		$STA_ID = ! empty( $_REQUEST['state'] ) ? sanitize_text_field( $_REQUEST['state'] ) : '';
-		if ( ! empty( $STA_ID ) ) {
+		$STA_ID = ! empty($_REQUEST['state']) ? sanitize_text_field($_REQUEST['state']) : '';
+		if ( ! empty($STA_ID)) {
 			// can we get state object from name ?
-			EE_Registry::instance()->load_model( 'State' );
-			$state = EEM_State::instance()->get_col( array( array( 'STA_name' => $STA_ID ), 'limit' => 1 ), 'STA_ID' );
-			$STA_ID = is_array( $state ) && ! empty( $state ) ? reset( $state ) : $STA_ID;
+			EE_Registry::instance()->load_model('State');
+			$state = EEM_State::instance()->get_col(array(array('STA_name' => $STA_ID), 'limit' => 1), 'STA_ID');
+			$STA_ID = is_array($state) && ! empty($state) ? reset($state) : $STA_ID;
 		}
 		// get Country ISO
-		$CNT_ISO = ! empty( $_REQUEST['country'] ) ? sanitize_text_field( $_REQUEST['country'] ) : '';
-		if ( ! empty( $CNT_ISO ) ) {
+		$CNT_ISO = ! empty($_REQUEST['country']) ? sanitize_text_field($_REQUEST['country']) : '';
+		if ( ! empty($CNT_ISO)) {
 			// can we get country object from name ?
-			EE_Registry::instance()->load_model( 'Country' );
+			EE_Registry::instance()->load_model('Country');
 			$country = EEM_Country::instance()->get_col(
-				array( array( 'CNT_name' => $CNT_ISO ), 'limit' => 1 ),
+				array(array('CNT_name' => $CNT_ISO), 'limit' => 1),
 				'CNT_ISO'
 			);
-			$CNT_ISO = is_array( $country ) && ! empty( $country ) ? reset( $country ) : $CNT_ISO;
+			$CNT_ISO = is_array($country) && ! empty($country) ? reset($country) : $CNT_ISO;
 		}
 		// grab attendee data
 		$attendee_data = array(
-			'ATT_fname'    => ! empty( $_REQUEST['first_name'] ) ? sanitize_text_field( $_REQUEST['first_name'] ) : '',
-			'ATT_lname'    => ! empty( $_REQUEST['last_name'] ) ? sanitize_text_field( $_REQUEST['last_name'] ) : '',
-			'ATT_email'    => ! empty( $_REQUEST['email'] ) ? sanitize_email( $_REQUEST['email'] ) : '',
-			'ATT_address'  => ! empty( $_REQUEST['address'] ) ? sanitize_text_field( $_REQUEST['address'] ) : '',
-			'ATT_address2' => ! empty( $_REQUEST['address2'] ) ? sanitize_text_field( $_REQUEST['address2'] ) : '',
-			'ATT_city'     => ! empty( $_REQUEST['city'] ) ? sanitize_text_field( $_REQUEST['city'] ) : '',
+			'ATT_fname'    => ! empty($_REQUEST['first_name']) ? sanitize_text_field($_REQUEST['first_name']) : '',
+			'ATT_lname'    => ! empty($_REQUEST['last_name']) ? sanitize_text_field($_REQUEST['last_name']) : '',
+			'ATT_email'    => ! empty($_REQUEST['email']) ? sanitize_email($_REQUEST['email']) : '',
+			'ATT_address'  => ! empty($_REQUEST['address']) ? sanitize_text_field($_REQUEST['address']) : '',
+			'ATT_address2' => ! empty($_REQUEST['address2']) ? sanitize_text_field($_REQUEST['address2']) : '',
+			'ATT_city'     => ! empty($_REQUEST['city']) ? sanitize_text_field($_REQUEST['city']) : '',
 			'STA_ID'       => $STA_ID,
 			'CNT_ISO'      => $CNT_ISO,
-			'ATT_zip'      => ! empty( $_REQUEST['zip'] ) ? sanitize_text_field( $_REQUEST['zip'] ) : '',
-			'ATT_phone'    => ! empty( $_REQUEST['phone'] ) ? sanitize_text_field( $_REQUEST['phone'] ) : '',
+			'ATT_zip'      => ! empty($_REQUEST['zip']) ? sanitize_text_field($_REQUEST['zip']) : '',
+			'ATT_phone'    => ! empty($_REQUEST['phone']) ? sanitize_text_field($_REQUEST['phone']) : '',
 		);
 		// validate the email address since it is the most important piece of info
-		if ( empty( $attendee_data['ATT_email'] ) || $attendee_data['ATT_email'] !== $_REQUEST['email'] ) {
+		if (empty($attendee_data['ATT_email']) || $attendee_data['ATT_email'] !== $_REQUEST['email']) {
 			EE_Error::add_error(
-				__( 'An invalid email address was submitted.', 'event_espresso' ),
+				__('An invalid email address was submitted.', 'event_espresso'),
 				__FILE__,
 				__FUNCTION__,
 				__LINE__
 			);
 		}
 		// does this attendee already exist in the db ? we're searching using a combination of first name, last name, AND email address
-		if ( ! empty( $attendee_data['ATT_fname'] )
-		     && ! empty( $attendee_data['ATT_lname'] )
-		     && ! empty( $attendee_data['ATT_email'] )
+		if ( ! empty($attendee_data['ATT_fname'])
+		     && ! empty($attendee_data['ATT_lname'])
+		     && ! empty($attendee_data['ATT_email'])
 		) {
 			$existing_attendee = EE_Registry::instance()->LIB->EEM_Attendee->find_existing_attendee(
 				array(
@@ -1271,19 +1271,19 @@ 
 					'ATT_email' => $attendee_data['ATT_email']
 				)
 			);
-			if ( $existing_attendee instanceof EE_Attendee ) {
+			if ($existing_attendee instanceof EE_Attendee) {
 				return $existing_attendee;
 			}
 		}
 		// no existing attendee? kk let's create a new one
 		// kinda lame, but we need a first and last name to create an attendee, so use the email address if those don't exist
-		$attendee_data['ATT_fname'] = ! empty( $attendee_data['ATT_fname'] )
+		$attendee_data['ATT_fname'] = ! empty($attendee_data['ATT_fname'])
 			? $attendee_data['ATT_fname']
 			: $attendee_data['ATT_email'];
-		$attendee_data['ATT_lname'] = ! empty( $attendee_data['ATT_lname'] )
+		$attendee_data['ATT_lname'] = ! empty($attendee_data['ATT_lname'])
 			? $attendee_data['ATT_lname']
 			: $attendee_data['ATT_email'];
-		return EE_Attendee::new_instance( $attendee_data );
+		return EE_Attendee::new_instance($attendee_data);
 	}
 
 
@@ -1301,26 +1301,26 @@ 
 		// how have they chosen to pay?
 		$this->checkout->selected_method_of_payment = $this->checkout->transaction->is_free()
 			? 'no_payment_required'
-			: $this->_get_selected_method_of_payment( true );
+			: $this->_get_selected_method_of_payment(true);
 		// choose your own adventure based on method_of_payment
-		switch ( $this->checkout->selected_method_of_payment ) {
+		switch ($this->checkout->selected_method_of_payment) {
 
 			case 'events_sold_out' :
 				$this->checkout->redirect = true;
 				$this->checkout->redirect_url = $this->checkout->cancel_page_url;
-				$this->checkout->json_response->set_redirect_url( $this->checkout->redirect_url );
+				$this->checkout->json_response->set_redirect_url($this->checkout->redirect_url);
 				// mark this reg step as completed
 				$this->set_completed();
 				return false;
 				break;
 
 			case 'payments_closed' :
-				if ( apply_filters(
+				if (apply_filters(
 					'FHEE__EE_SPCO_Reg_Step_Payment_Options__process_reg_step__payments_closed__display_success',
 					false
-				) ) {
+				)) {
 					EE_Error::add_success(
-						__( 'no payment required at this time.', 'event_espresso' ),
+						__('no payment required at this time.', 'event_espresso'),
 						__FILE__,
 						__FUNCTION__,
 						__LINE__
@@ -1332,12 +1332,12 @@ 
 				break;
 
 			case 'no_payment_required' :
-				if ( apply_filters(
+				if (apply_filters(
 					'FHEE__EE_SPCO_Reg_Step_Payment_Options__process_reg_step__no_payment_required__display_success',
 					false
-				) ) {
+				)) {
 					EE_Error::add_success(
-						__( 'no payment required.', 'event_espresso' ),
+						__('no payment required.', 'event_espresso'),
 						__FILE__,
 						__FUNCTION__,
 						__LINE__
@@ -1350,9 +1350,9 @@ 
 
 			default:
 				$payment_successful = $this->_process_payment();
-				if ( $payment_successful ) {
+				if ($payment_successful) {
 					$this->checkout->continue_reg = true;
-					$this->_maybe_set_completed( $this->checkout->payment_method );
+					$this->_maybe_set_completed($this->checkout->payment_method);
 				} else {
 					$this->checkout->continue_reg = false;
 				}
@@ -1371,8 +1371,8 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	protected function _maybe_set_completed( EE_Payment_Method $payment_method ) {
-		switch ( $payment_method->type_obj()->payment_occurs() ) {
+	protected function _maybe_set_completed(EE_Payment_Method $payment_method) {
+		switch ($payment_method->type_obj()->payment_occurs()) {
 			case EE_PMT_Base::offsite :
 				break;
 			case EE_PMT_Base::onsite :
@@ -1395,7 +1395,7 @@ 
 	public function update_reg_step() {
 		$success = true;
 		// if payment required
-		if ( $this->checkout->transaction->total() > 0 ) {
+		if ($this->checkout->transaction->total() > 0) {
 			do_action(
 				'AHEE__EE_Single_Page_Checkout__process_finalize_registration__before_gateway',
 				$this->checkout->transaction
@@ -1403,13 +1403,13 @@ 
 			// attempt payment via payment method
 			$success = $this->process_reg_step();
 		}
-		if ( $success && ! $this->checkout->redirect ) {
+		if ($success && ! $this->checkout->redirect) {
 			$this->checkout->cart->get_grand_total()->save_this_and_descendants_to_txn(
 				$this->checkout->transaction->ID()
 			);
 			// set return URL
 			$this->checkout->redirect_url = add_query_arg(
-				array( 'e_reg_url_link' => $this->checkout->reg_url_link ),
+				array('e_reg_url_link' => $this->checkout->reg_url_link),
 				$this->checkout->thank_you_page_url
 			);
 		}
@@ -1429,28 +1429,28 @@ 
 		// clear any previous errors related to not selecting a payment method
 //		EE_Error::overwrite_errors();
 		// ya gotta make a choice man
-		if ( empty( $this->checkout->selected_method_of_payment ) ) {
+		if (empty($this->checkout->selected_method_of_payment)) {
 			$this->checkout->json_response->set_plz_select_method_of_payment(
-				__( 'Please select a method of payment before proceeding.', 'event_espresso' )
+				__('Please select a method of payment before proceeding.', 'event_espresso')
 			);
 			return false;
 		}
 		// get EE_Payment_Method object
-		if ( ! $this->checkout->payment_method = $this->_get_payment_method_for_selected_method_of_payment() ) {
+		if ( ! $this->checkout->payment_method = $this->_get_payment_method_for_selected_method_of_payment()) {
 			return false;
 		}
 		// setup billing form
-		if ( $this->checkout->payment_method->is_on_site() ) {
+		if ($this->checkout->payment_method->is_on_site()) {
 			$this->checkout->billing_form = $this->_get_billing_form_for_payment_method(
 				$this->checkout->payment_method
 			);
 			// bad billing form ?
-			if ( ! $this->_billing_form_is_valid() ) {
+			if ( ! $this->_billing_form_is_valid()) {
 				return false;
 			}
 		}
 		// ensure primary registrant has been fully processed
-		if ( ! $this->_setup_primary_registrant_prior_to_payment() ) {
+		if ( ! $this->_setup_primary_registrant_prior_to_payment()) {
 			return false;
 		}
 		/** @type EE_Transaction_Processor $transaction_processor */
@@ -1458,18 +1458,18 @@ 
 		// in case a registrant leaves to an Off-Site Gateway and never returns, we want to approve any registrations for events with a default reg status of Approved
 		//$transaction_processor->toggle_registration_statuses_for_default_approved_events( $this->checkout->transaction, $this->checkout->reg_cache_where_params );
 		// attempt payment
-		$payment = $this->_attempt_payment( $this->checkout->payment_method );
+		$payment = $this->_attempt_payment($this->checkout->payment_method);
 		// process results
-		$payment = $this->_validate_payment( $payment );
-		$payment = $this->_post_payment_processing( $payment );
+		$payment = $this->_validate_payment($payment);
+		$payment = $this->_post_payment_processing($payment);
 		// verify payment
-		if ( $payment instanceof EE_Payment ) {
+		if ($payment instanceof EE_Payment) {
 			// store that for later
 			$this->checkout->payment = $payment;
 			/** @type EE_Transaction_Processor $transaction_processor */
-			$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+			$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 			// we can also consider the TXN to not have been failed, so temporarily upgrade it's status to abandoned
-			$transaction_processor->toggle_failed_transaction_status( $this->checkout->transaction );
+			$transaction_processor->toggle_failed_transaction_status($this->checkout->transaction);
 			$payment_status = $payment->status();
 			if (
 				$payment_status === EEM_Payment::status_id_approved
@@ -1479,7 +1479,7 @@ 
 			} else {
 				return false;
 			}
-		} else if ( $payment === true ) {
+		} else if ($payment === true) {
 			// please note that offline payment methods will NOT make a payment,
 			// but instead just mark themselves as the PMD_ID on the transaction, and return true
 			$this->checkout->payment = $payment;
@@ -1504,7 +1504,7 @@ 
 		);
 		$html = $payment_method_billing_info->get_html_and_js();
 		$html .= $this->checkout->redirect_form;
-		EE_Registry::instance()->REQ->add_output( $html );
+		EE_Registry::instance()->REQ->add_output($html);
 		return true;
 	}
 
@@ -1518,28 +1518,28 @@ 
 	 * @throws \EE_Error
 	 */
 	private function _billing_form_is_valid() {
-		if ( ! $this->checkout->payment_method->type_obj()->has_billing_form() ) {
+		if ( ! $this->checkout->payment_method->type_obj()->has_billing_form()) {
 			return true;
 		}
-		if ( $this->checkout->billing_form instanceof EE_Billing_Info_Form ) {
-			if ( $this->checkout->billing_form->was_submitted() ) {
+		if ($this->checkout->billing_form instanceof EE_Billing_Info_Form) {
+			if ($this->checkout->billing_form->was_submitted()) {
 				$this->checkout->billing_form->receive_form_submission();
-				if ( $this->checkout->billing_form->is_valid() ) {
+				if ($this->checkout->billing_form->is_valid()) {
 					return true;
 				}
 				$validation_errors = $this->checkout->billing_form->get_validation_errors_accumulated();
 				$error_strings = array();
-				foreach ( $validation_errors as $validation_error ) {
-					if ( $validation_error instanceof EE_Validation_Error ) {
+				foreach ($validation_errors as $validation_error) {
+					if ($validation_error instanceof EE_Validation_Error) {
 						$form_section = $validation_error->get_form_section();
-						if ( $form_section instanceof EE_Form_Input_Base ) {
+						if ($form_section instanceof EE_Form_Input_Base) {
 							$label = $form_section->html_label_text();
-						} elseif ( $form_section instanceof EE_Form_Section_Base ) {
+						} elseif ($form_section instanceof EE_Form_Section_Base) {
 							$label = $form_section->name();
 						} else {
-							$label = __( 'Validation Error', 'event_espresso' );
+							$label = __('Validation Error', 'event_espresso');
 						}
-						$error_strings[] = sprintf( '%1$s: %2$s', $label, $validation_error->getMessage() );
+						$error_strings[] = sprintf('%1$s: %2$s', $label, $validation_error->getMessage());
 					}
 				}
 				EE_Error::add_error(
@@ -1549,7 +1549,7 @@ 
 							'event_espresso'
 						),
 						'<br/>',
-						implode( '<br/>', $error_strings )
+						implode('<br/>', $error_strings)
 					),
 					__FILE__,
 					__FUNCTION__,
@@ -1568,7 +1568,7 @@ 
 			}
 		} else {
 			EE_Error::add_error(
-				__( 'The submitted billing form is invalid possibly due to a technical reason.', 'event_espresso' ),
+				__('The submitted billing form is invalid possibly due to a technical reason.', 'event_espresso'),
 				__FILE__,
 				__FUNCTION__,
 				__LINE__
@@ -1603,13 +1603,13 @@ 
 		// grab the primary_registration object
 		$primary_registration = $this->checkout->transaction->primary_registration();
 		/** @type EE_Transaction_Processor $transaction_processor */
-		$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+		$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 		// at this point we'll consider a TXN to not have been failed
-		$transaction_processor->toggle_failed_transaction_status( $this->checkout->transaction );
+		$transaction_processor->toggle_failed_transaction_status($this->checkout->transaction);
 		// save the TXN ( which clears cached copy of primary_registration)
 		$this->checkout->transaction->save();
 		// grab TXN ID and save it to the primary_registration
-		$primary_registration->set_transaction_id( $this->checkout->transaction->ID() );
+		$primary_registration->set_transaction_id($this->checkout->transaction->ID());
 		// save what we have so far
 		$primary_registration->save();
 		return true;
@@ -1627,7 +1627,7 @@ 
 	private function _capture_primary_registration_data_from_billing_form() {
 		// convert billing form data into an attendee
 		$this->checkout->primary_attendee_obj = $this->checkout->billing_form->create_attendee_from_billing_form_data();
-		if ( ! $this->checkout->primary_attendee_obj instanceof EE_Attendee ) {
+		if ( ! $this->checkout->primary_attendee_obj instanceof EE_Attendee) {
 			EE_Error::add_error(
 				sprintf(
 					__(
@@ -1635,7 +1635,7 @@ 
 						'event_espresso'
 					),
 					'<br/>',
-					EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+					EE_Registry::instance()->CFG->organization->get_pretty('email')
 				),
 				__FILE__,
 				__FUNCTION__,
@@ -1644,7 +1644,7 @@ 
 			return false;
 		}
 		$primary_registration = $this->checkout->transaction->primary_registration();
-		if ( ! $primary_registration instanceof EE_Registration ) {
+		if ( ! $primary_registration instanceof EE_Registration) {
 			EE_Error::add_error(
 				sprintf(
 					__(
@@ -1652,7 +1652,7 @@ 
 						'event_espresso'
 					),
 					'<br/>',
-					EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+					EE_Registry::instance()->CFG->organization->get_pretty('email')
 				),
 				__FILE__,
 				__FUNCTION__,
@@ -1660,7 +1660,7 @@ 
 			);
 			return false;
 		}
-		if ( ! $primary_registration->_add_relation_to( $this->checkout->primary_attendee_obj, 'Attendee' )
+		if ( ! $primary_registration->_add_relation_to($this->checkout->primary_attendee_obj, 'Attendee')
 		       instanceof
 		       EE_Attendee
 		) {
@@ -1671,7 +1671,7 @@ 
 						'event_espresso'
 					),
 					'<br/>',
-					EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+					EE_Registry::instance()->CFG->organization->get_pretty('email')
 				),
 				__FILE__,
 				__FUNCTION__,
@@ -1680,9 +1680,9 @@ 
 			return false;
 		}
 		/** @type EE_Registration_Processor $registration_processor */
-		$registration_processor = EE_Registry::instance()->load_class( 'Registration_Processor' );
+		$registration_processor = EE_Registry::instance()->load_class('Registration_Processor');
 		// at this point, we should have enough details about the registrant to consider the registration NOT incomplete
-		$registration_processor->toggle_incomplete_registration_status_to_default( $primary_registration );
+		$registration_processor->toggle_incomplete_registration_status_to_default($primary_registration);
 		return true;
 	}
 
@@ -1698,17 +1698,17 @@ 
 	 */
 	private function _get_payment_method_for_selected_method_of_payment() {
 		// get EE_Payment_Method object
-		if ( isset( $this->checkout->available_payment_methods[ $this->checkout->selected_method_of_payment ] ) ) {
-			$payment_method = $this->checkout->available_payment_methods[ $this->checkout->selected_method_of_payment ];
+		if (isset($this->checkout->available_payment_methods[$this->checkout->selected_method_of_payment])) {
+			$payment_method = $this->checkout->available_payment_methods[$this->checkout->selected_method_of_payment];
 		} else {
 			// load EEM_Payment_Method
-			EE_Registry::instance()->load_model( 'Payment_Method' );
+			EE_Registry::instance()->load_model('Payment_Method');
 			/** @type EEM_Payment_Method $EEM_Payment_Method */
 			$EEM_Payment_Method = EE_Registry::instance()->LIB->EEM_Payment_Method;
-			$payment_method = $EEM_Payment_Method->get_one_by_slug( $this->checkout->selected_method_of_payment );
+			$payment_method = $EEM_Payment_Method->get_one_by_slug($this->checkout->selected_method_of_payment);
 		}
 		// verify $payment_method
-		if ( ! $payment_method instanceof EE_Payment_Method ) {
+		if ( ! $payment_method instanceof EE_Payment_Method) {
 			// not a payment
 			EE_Error::add_error(
 				sprintf(
@@ -1717,7 +1717,7 @@ 
 						'event_espresso'
 					),
 					'<br/>',
-					EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+					EE_Registry::instance()->CFG->organization->get_pretty('email')
 				),
 				__FILE__,
 				__FUNCTION__,
@@ -1726,7 +1726,7 @@ 
 			return null;
 		}
 		// and verify it has a valid Payment_Method Type object
-		if ( ! $payment_method->type_obj() instanceof EE_PMT_Base ) {
+		if ( ! $payment_method->type_obj() instanceof EE_PMT_Base) {
 			// not a payment
 			EE_Error::add_error(
 				sprintf(
@@ -1735,7 +1735,7 @@ 
 						'event_espresso'
 					),
 					'<br/>',
-					EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+					EE_Registry::instance()->CFG->organization->get_pretty('email')
 				),
 				__FILE__,
 				__FUNCTION__,
@@ -1756,29 +1756,29 @@ 
 	 * @return    mixed    EE_Payment | boolean
 	 * @throws \EE_Error
 	 */
-	private function _attempt_payment( EE_Payment_Method $payment_method ) {
+	private function _attempt_payment(EE_Payment_Method $payment_method) {
 		$payment = null;
 		$this->checkout->transaction->save();
-		$payment_processor = EE_Registry::instance()->load_core( 'Payment_Processor' );
-		if ( ! $payment_processor instanceof EE_Payment_Processor ) {
+		$payment_processor = EE_Registry::instance()->load_core('Payment_Processor');
+		if ( ! $payment_processor instanceof EE_Payment_Processor) {
 			return false;
 		}
 		try {
-			$payment_processor->set_revisit( $this->checkout->revisit );
+			$payment_processor->set_revisit($this->checkout->revisit);
 			// generate payment object
 			$payment = $payment_processor->process_payment(
 				$payment_method,
 				$this->checkout->transaction,
 				$this->checkout->amount_owing,
 				$this->checkout->billing_form,
-				$this->_get_return_url( $payment_method ),
+				$this->_get_return_url($payment_method),
 				'CART',
 				$this->checkout->admin_request,
 				true,
 				$this->reg_step_url()
 			);
-		} catch ( Exception $e ) {
-			$this->_handle_payment_processor_exception( $e );
+		} catch (Exception $e) {
+			$this->_handle_payment_processor_exception($e);
 		}
 		return $payment;
 	}
@@ -1793,7 +1793,7 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	protected function _handle_payment_processor_exception( Exception $e ) {
+	protected function _handle_payment_processor_exception(Exception $e) {
 		EE_Error::add_error(
 			sprintf(
 				__(
@@ -1801,7 +1801,7 @@ 
 					'event_espresso'
 				),
 				'<br/>',
-				EE_Registry::instance()->CFG->organization->get_pretty( 'email' ),
+				EE_Registry::instance()->CFG->organization->get_pretty('email'),
 				$e->getMessage(),
 				$e->getFile(),
 				$e->getLine()
@@ -1822,9 +1822,9 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	protected function _get_return_url( EE_Payment_Method $payment_method ) {
+	protected function _get_return_url(EE_Payment_Method $payment_method) {
 		$return_url = '';
-		switch ( $payment_method->type_obj()->payment_occurs() ) {
+		switch ($payment_method->type_obj()->payment_occurs()) {
 			case EE_PMT_Base::offsite :
 				$return_url = add_query_arg(
 					array(
@@ -1853,12 +1853,12 @@ 
 	 * @return EE_Payment | FALSE
 	 * @throws \EE_Error
 	 */
-	private function _validate_payment( $payment = null ) {
-		if ( $this->checkout->payment_method->is_off_line() ) {
+	private function _validate_payment($payment = null) {
+		if ($this->checkout->payment_method->is_off_line()) {
 			return true;
 		}
 		// verify payment object
-		if ( ! $payment instanceof EE_Payment ) {
+		if ( ! $payment instanceof EE_Payment) {
 			// not a payment
 			EE_Error::add_error(
 				sprintf(
@@ -1867,7 +1867,7 @@ 
 						'event_espresso'
 					),
 					'<br/>',
-					EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+					EE_Registry::instance()->CFG->organization->get_pretty('email')
 				),
 				__FILE__,
 				__FUNCTION__,
@@ -1888,27 +1888,27 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	private function _post_payment_processing( $payment = null ) {
+	private function _post_payment_processing($payment = null) {
 		// Off-Line payment?
-		if ( $payment === true ) {
+		if ($payment === true) {
 			//$this->_setup_redirect_for_next_step();
 			return true;
 		// On-Site payment?
-		} else if ( $this->checkout->payment_method->is_on_site() ) {
-			if ( ! $this->_process_payment_status( $payment, EE_PMT_Base::onsite ) ) {
+		} else if ($this->checkout->payment_method->is_on_site()) {
+			if ( ! $this->_process_payment_status($payment, EE_PMT_Base::onsite)) {
 				//$this->_setup_redirect_for_next_step();
 				$this->checkout->continue_reg = false;
 			}
 		// Off-Site payment?
-		} else if ( $this->checkout->payment_method->is_off_site() ) {
+		} else if ($this->checkout->payment_method->is_off_site()) {
 			// if a payment object was made and it specifies a redirect url, then we'll setup that redirect info
-			if ( $payment instanceof EE_Payment && $payment->redirect_url() ) {
-				do_action( 'AHEE_log', __CLASS__, __FUNCTION__, $payment->redirect_url(), '$payment->redirect_url()' );
+			if ($payment instanceof EE_Payment && $payment->redirect_url()) {
+				do_action('AHEE_log', __CLASS__, __FUNCTION__, $payment->redirect_url(), '$payment->redirect_url()');
 				$this->checkout->redirect = true;
 				$this->checkout->redirect_form = $payment->redirect_form();
-				$this->checkout->redirect_url = $this->reg_step_url( 'redirect_form' );
+				$this->checkout->redirect_url = $this->reg_step_url('redirect_form');
 				// set JSON response
-				$this->checkout->json_response->set_redirect_form( $this->checkout->redirect_form );
+				$this->checkout->json_response->set_redirect_form($this->checkout->redirect_form);
 				// set cron job for finalizing the TXN
 				// in case the user does not return from the off-site gateway
 				EE_Cron_Tasks::schedule_finalize_abandoned_transactions_check(
@@ -1916,7 +1916,7 @@ 
 					$this->checkout->transaction->ID()
 				);
 				// and lastly, let's bump the payment status to pending
-				$payment->set_status( EEM_Payment::status_id_pending );
+				$payment->set_status(EEM_Payment::status_id_pending);
 				$payment->save();
 			} else {
 				// not a payment
@@ -1928,7 +1928,7 @@ 
 							'event_espresso'
 						),
 						'<br/>',
-						EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+						EE_Registry::instance()->CFG->organization->get_pretty('email')
 					),
 					__FILE__,
 					__FUNCTION__,
@@ -1966,21 +1966,21 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	private function _process_payment_status( $payment, $payment_occurs = EE_PMT_Base::offline ) {
+	private function _process_payment_status($payment, $payment_occurs = EE_PMT_Base::offline) {
 		// off-line payment? carry on
-		if ( $payment_occurs === EE_PMT_Base::offline ) {
+		if ($payment_occurs === EE_PMT_Base::offline) {
 			return true;
 		}
 		// verify payment validity
-		if ( $payment instanceof EE_Payment ) {
-			do_action( 'AHEE_log', __CLASS__, __FUNCTION__, $payment->status(), '$payment->status()' );
+		if ($payment instanceof EE_Payment) {
+			do_action('AHEE_log', __CLASS__, __FUNCTION__, $payment->status(), '$payment->status()');
 			$msg = $payment->gateway_response();
 			// check results
-			switch ( $payment->status() ) {
+			switch ($payment->status()) {
 				// good payment
 				case EEM_Payment::status_id_approved :
 					EE_Error::add_success(
-						__( 'Your payment was processed successfully.', 'event_espresso' ),
+						__('Your payment was processed successfully.', 'event_espresso'),
 						__FILE__,
 						__FUNCTION__,
 						__LINE__
@@ -1989,45 +1989,45 @@ 
 					break;
 				// slow payment
 				case EEM_Payment::status_id_pending :
-					if ( empty( $msg ) ) {
+					if (empty($msg)) {
 						$msg = __(
 							'Your payment appears to have been processed successfully, but the Instant Payment Notification has not yet been received. It should arrive shortly.',
 							'event_espresso'
 						);
 					}
-					EE_Error::add_success( $msg, __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_success($msg, __FILE__, __FUNCTION__, __LINE__);
 					return true;
 					break;
 				// don't wanna payment
 				case EEM_Payment::status_id_cancelled :
-					if ( empty( $msg ) ) {
+					if (empty($msg)) {
 						$msg = _n(
 							'Payment cancelled. Please try again.',
 							'Payment cancelled. Please try again or select another method of payment.',
-							count( $this->checkout->available_payment_methods ),
+							count($this->checkout->available_payment_methods),
 							'event_espresso'
 						);
 					}
-					EE_Error::add_attention( $msg, __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_attention($msg, __FILE__, __FUNCTION__, __LINE__);
 					return false;
 					break;
 				// not enough payment
 				case EEM_Payment::status_id_declined :
-					if ( empty( $msg ) ) {
+					if (empty($msg)) {
 						$msg = _n(
 							'We\'re sorry but your payment was declined. Please try again.',
 							'We\'re sorry but your payment was declined. Please try again or select another method of payment.',
-							count( $this->checkout->available_payment_methods ),
+							count($this->checkout->available_payment_methods),
 							'event_espresso'
 						);
 					}
-					EE_Error::add_attention( $msg, __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_attention($msg, __FILE__, __FUNCTION__, __LINE__);
 					return false;
 					break;
 				// bad payment
 				case EEM_Payment::status_id_failed :
-					if ( ! empty( $msg ) ) {
-						EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+					if ( ! empty($msg)) {
+						EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 						return false;
 					}
 					// default to error below
@@ -2036,7 +2036,7 @@ 
 		}
 		// off-site payment gateway responses are too unreliable, so let's just assume that
 		// the payment processing is just running slower than the registrant's request
-		if ( $payment_occurs === EE_PMT_Base::offsite ) {
+		if ($payment_occurs === EE_PMT_Base::offsite) {
 			return true;
 		}
 		EE_Error::add_error(
@@ -2046,7 +2046,7 @@ 
 					'event_espresso'
 				),
 				'<br/>',
-				EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+				EE_Registry::instance()->CFG->organization->get_pretty('email')
 			),
 			__FILE__,
 			__FUNCTION__,
@@ -2079,13 +2079,13 @@ 
 	public function process_gateway_response() {
 		$payment = null;
 		// how have they chosen to pay?
-		$this->checkout->selected_method_of_payment = $this->_get_selected_method_of_payment( true );
+		$this->checkout->selected_method_of_payment = $this->_get_selected_method_of_payment(true);
 		// get EE_Payment_Method object
-		if ( ! $this->checkout->payment_method = $this->_get_payment_method_for_selected_method_of_payment() ) {
+		if ( ! $this->checkout->payment_method = $this->_get_payment_method_for_selected_method_of_payment()) {
 			$this->checkout->continue_reg = false;
 			return false;
 		}
-		if ( ! $this->checkout->payment_method->is_off_site() ) {
+		if ( ! $this->checkout->payment_method->is_off_site()) {
 			return false;
 		}
 		$this->_validate_offsite_return();
@@ -2099,23 +2099,23 @@ 
 		//	true
 		//);
 		// verify TXN
-		if ( $this->checkout->transaction instanceof EE_Transaction ) {
+		if ($this->checkout->transaction instanceof EE_Transaction) {
 			$gateway = $this->checkout->payment_method->type_obj()->get_gateway();
-			if ( ! $gateway instanceof EE_Offsite_Gateway ) {
+			if ( ! $gateway instanceof EE_Offsite_Gateway) {
 				$this->checkout->continue_reg = false;
 				return false;
 			}
-			$payment = $this->_process_off_site_payment( $gateway );
-			$payment = $this->_process_cancelled_payments( $payment );
-			$payment = $this->_validate_payment( $payment );
+			$payment = $this->_process_off_site_payment($gateway);
+			$payment = $this->_process_cancelled_payments($payment);
+			$payment = $this->_validate_payment($payment);
 			// if payment was not declined by the payment gateway or cancelled by the registrant
-			if ( $this->_process_payment_status( $payment, EE_PMT_Base::offsite ) ) {
+			if ($this->_process_payment_status($payment, EE_PMT_Base::offsite)) {
 				//$this->_setup_redirect_for_next_step();
 				// store that for later
 				$this->checkout->payment = $payment;
 				// mark this reg step as completed, as long as gateway doesn't use a separate IPN request,
 				// because we will complete this step during the IPN processing then
-				if ( $gateway instanceof EE_Offsite_Gateway && ! $this->handle_IPN_in_this_request() ) {
+				if ($gateway instanceof EE_Offsite_Gateway && ! $this->handle_IPN_in_this_request()) {
 					$this->set_completed();
 				}
 				return true;
@@ -2139,21 +2139,21 @@ 
 	 * @throws \EE_Error
 	 */
 	private function _validate_offsite_return() {
-		$TXN_ID = (int)EE_Registry::instance()->REQ->get( 'spco_txn', 0 );
-		if ( $TXN_ID !== $this->checkout->transaction->ID() ) {
+		$TXN_ID = (int) EE_Registry::instance()->REQ->get('spco_txn', 0);
+		if ($TXN_ID !== $this->checkout->transaction->ID()) {
 			// Houston... we might have a problem
 			$invalid_TXN = false;
 			// first gather some info
-			$valid_TXN = EEM_Transaction::instance()->get_one_by_ID( $TXN_ID );
+			$valid_TXN = EEM_Transaction::instance()->get_one_by_ID($TXN_ID);
 			$primary_registrant = $valid_TXN instanceof EE_Transaction
 				? $valid_TXN->primary_registration()
 				: null;
 			// let's start by retrieving the cart for this TXN
-			$cart = $this->checkout->get_cart_for_transaction( $this->checkout->transaction );
-			if ( $cart instanceof EE_Cart ) {
+			$cart = $this->checkout->get_cart_for_transaction($this->checkout->transaction);
+			if ($cart instanceof EE_Cart) {
 				// verify that the current cart has tickets
 				$tickets = $cart->get_tickets();
-				if ( empty( $tickets ) ) {
+				if (empty($tickets)) {
 					$invalid_TXN = true;
 				}
 			} else {
@@ -2163,39 +2163,39 @@ 
 				? $primary_registrant->session_ID()
 				: null;
 			// validate current Session ID and compare against valid TXN session ID
-			if ( EE_Session::instance()->id() === null ) {
+			if (EE_Session::instance()->id() === null) {
 				$invalid_TXN = true;
-			} else if ( EE_Session::instance()->id() === $valid_TXN_SID ) {
+			} else if (EE_Session::instance()->id() === $valid_TXN_SID) {
 				// WARNING !!!
 				// this could be PayPal sending back duplicate requests (ya they do that)
 				// or it **could** mean someone is simply registering AGAIN after having just done so
 				// so now we need to determine if this current TXN looks valid or not
 				/** @type EE_Transaction_Processor $transaction_processor */
-				$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+				$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 				// has this step even been started ?
-				if ( $transaction_processor->reg_step_completed( $this->checkout->transaction, $this->slug() === false )
+				if ($transaction_processor->reg_step_completed($this->checkout->transaction, $this->slug() === false)
 				) {
 					// really? you're half way through this reg step, but you never started it ?
 					$invalid_TXN = true;
 				}
 			}
-			if ( $invalid_TXN ) {
+			if ($invalid_TXN) {
 				// is the valid TXN completed ?
-				if ( $valid_TXN instanceof EE_Transaction ) {
+				if ($valid_TXN instanceof EE_Transaction) {
 					/** @type EE_Transaction_Processor $transaction_processor */
-					$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+					$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 					// has this step even been started ?
-					$reg_step_completed = $transaction_processor->reg_step_completed( $valid_TXN, $this->slug() );
-					if ( $reg_step_completed !== false && $reg_step_completed !== true ) {
+					$reg_step_completed = $transaction_processor->reg_step_completed($valid_TXN, $this->slug());
+					if ($reg_step_completed !== false && $reg_step_completed !== true) {
 						// so it **looks** like this is a double request from PayPal
 						// so let's try to pick up where we left off
 						$this->checkout->transaction = $valid_TXN;
-						$this->checkout->refresh_all_entities( true );
+						$this->checkout->refresh_all_entities(true);
 						return;
 					}
 				}
 				// you appear to be lost?
-				$this->_redirect_wayward_request( $primary_registrant );
+				$this->_redirect_wayward_request($primary_registrant);
 			}
 		}
 	}
@@ -2210,14 +2210,14 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	private function _redirect_wayward_request( EE_Registration $primary_registrant ) {
-		if ( ! $primary_registrant instanceof EE_Registration ) {
+	private function _redirect_wayward_request(EE_Registration $primary_registrant) {
+		if ( ! $primary_registrant instanceof EE_Registration) {
 			// try redirecting based on the current TXN
 			$primary_registrant = $this->checkout->transaction instanceof EE_Transaction
 				? $this->checkout->transaction->primary_registration()
 				: null;
 		}
-		if ( ! $primary_registrant instanceof EE_Registration ) {
+		if ( ! $primary_registrant instanceof EE_Registration) {
 			EE_Error::add_error(
 				sprintf(
 					__(
@@ -2225,7 +2225,7 @@ 
 						'event_espresso'
 					),
 					'<br/>',
-					EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+					EE_Registry::instance()->CFG->organization->get_pretty('email')
 				),
 				__FILE__,
 				__FUNCTION__,
@@ -2256,17 +2256,17 @@ 
 	 * @return \EE_Payment
 	 * @throws \EE_Error
 	 */
-	private function _process_off_site_payment( EE_Offsite_Gateway $gateway ) {
+	private function _process_off_site_payment(EE_Offsite_Gateway $gateway) {
 		try {
 			$request_data = \EE_Registry::instance()->REQ->params();
 			// if gateway uses_separate_IPN_request, then we don't have to process the IPN manually
 			$this->set_handle_IPN_in_this_request(
-				$gateway->handle_IPN_in_this_request( $request_data, false )
+				$gateway->handle_IPN_in_this_request($request_data, false)
 			);
-			if ( $this->handle_IPN_in_this_request() ) {
+			if ($this->handle_IPN_in_this_request()) {
 				// get payment details and process results
 				/** @type EE_Payment_Processor $payment_processor */
-				$payment_processor = EE_Registry::instance()->load_core( 'Payment_Processor' );
+				$payment_processor = EE_Registry::instance()->load_core('Payment_Processor');
 				$payment = $payment_processor->process_ipn(
 					$request_data,
 					$this->checkout->transaction,
@@ -2279,14 +2279,14 @@ 
 				$payment = $this->checkout->transaction->last_payment();
 				//$payment_source = 'last_payment';
 			}
-		} catch ( Exception $e ) {
+		} catch (Exception $e) {
 			// let's just eat the exception and try to move on using any previously set payment info
 			$payment = $this->checkout->transaction->last_payment();
 			//$payment_source = 'last_payment after Exception';
 			// but if we STILL don't have a payment object
-			if ( ! $payment instanceof EE_Payment ) {
+			if ( ! $payment instanceof EE_Payment) {
 				// then we'll object ! ( not object like a thing... but object like what a lawyer says ! )
-				$this->_handle_payment_processor_exception( $e );
+				$this->_handle_payment_processor_exception($e);
 			}
 		}
 		// DEBUG LOG
@@ -2311,13 +2311,13 @@ 
 	 * @return EE_Payment | FALSE
 	 * @throws \EE_Error
 	 */
-	private function _process_cancelled_payments( $payment = null ) {
+	private function _process_cancelled_payments($payment = null) {
 		if (
 			$payment instanceof EE_Payment
-			&& isset( $_REQUEST['ee_cancel_payment'] )
+			&& isset($_REQUEST['ee_cancel_payment'])
 			&& $payment->status() === EEM_Payment::status_id_failed
 		) {
-			$payment->set_status( EEM_Payment::status_id_cancelled );
+			$payment->set_status(EEM_Payment::status_id_cancelled);
 		}
 		return $payment;
 	}
@@ -2334,14 +2334,14 @@ 
 	public function get_transaction_details_for_gateways() {
 		$txn_details = array();
 		// ya gotta make a choice man
-		if ( empty( $this->checkout->selected_method_of_payment ) ) {
+		if (empty($this->checkout->selected_method_of_payment)) {
 			$txn_details = array(
-				'error' => __( 'Please select a method of payment before proceeding.', 'event_espresso' )
+				'error' => __('Please select a method of payment before proceeding.', 'event_espresso')
 			);
 		}
 		// get EE_Payment_Method object
 		if (
-			empty( $txn_details )
+			empty($txn_details)
 			&&
 			! $this->checkout->payment_method = $this->_get_payment_method_for_selected_method_of_payment()
 		) {
@@ -2353,8 +2353,8 @@ 
 				)
 			);
 		}
-		if ( empty( $txn_details ) && $this->checkout->transaction instanceof EE_Transaction ) {
-			$return_url = $this->_get_return_url( $this->checkout->payment_method );
+		if (empty($txn_details) && $this->checkout->transaction instanceof EE_Transaction) {
+			$return_url = $this->_get_return_url($this->checkout->payment_method);
 			$txn_details = array(
 				'TXN_ID'         => $this->checkout->transaction->ID(),
 				'TXN_timestamp'  => $this->checkout->transaction->datetime(),
@@ -2365,7 +2365,7 @@ 
 				'PMD_ID'         => $this->checkout->transaction->payment_method_ID(),
 				'payment_amount' => $this->checkout->amount_owing,
 				'return_url'     => $return_url,
-				'cancel_url'     => add_query_arg( array( 'ee_cancel_payment' => true ), $return_url ),
+				'cancel_url'     => add_query_arg(array('ee_cancel_payment' => true), $return_url),
 				'notify_url'     => EE_Config::instance()->core->txn_page_url(
 					array(
 						'e_reg_url_link'    => $this->checkout->transaction->primary_registration()->reg_url_link(),
@@ -2374,7 +2374,7 @@ 
 				)
 			);
 		}
-		echo json_encode( $txn_details );
+		echo json_encode($txn_details);
 		exit();
 	}
 

modules/single_page_checkout/reg_steps/finalize_registration/EE_SPCO_Reg_Step_Finalize_Registration.class.php

Spacing +29 added lines, -29 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -22,9 +22,9 @@ 
 	 * @param    EE_Checkout $checkout
 	 * @return    \EE_SPCO_Reg_Step_Finalize_Registration
 	 */
-	public function __construct( EE_Checkout $checkout ) {
+	public function __construct(EE_Checkout $checkout) {
 		$this->_slug = 'finalize_registration';
-		$this->_name = __( 'Finalize Registration', 'event_espresso' );
+		$this->_name = __('Finalize Registration', 'event_espresso');
 		$this->_submit_button_text = $this->_name;
 		$this->_template = '';
 		$this->checkout = $checkout;
@@ -47,7 +47,7 @@ 
 	 */
 	public function initialize_reg_step() {
 		// there's actually no reg form to process if this is the final step
-		if ( $this->is_current_step() ) {
+		if ($this->is_current_step()) {
 			$this->checkout->step = $_REQUEST['step'] = $this->slug();
 			$this->checkout->action = $_REQUEST['action'] = 'process_reg_step';
 			$this->checkout->generate_reg_form = false;
@@ -73,7 +73,7 @@ 
 	 */
 	public function process_reg_step() {
 		// ensure all data gets refreshed from the db
-		$this->checkout->refresh_all_entities( true );
+		$this->checkout->refresh_all_entities(true);
 		// ensures that all details and statuses for transaction, registration, and payments are updated
 		$txn_update_params = $this->_finalize_transaction();
 		// DEBUG LOG
@@ -102,13 +102,13 @@ 
 			$txn_update_params
 		);
 		// check if transaction has a primary registrant and that it has a related Attendee object
-		if ( ! $this->_validate_primary_registrant() ) {
+		if ( ! $this->_validate_primary_registrant()) {
 			return false;
 		}
 		// you don't have to go home but you can't stay here !
 		$this->checkout->redirect = true;
 		$this->checkout->continue_reg = true;
-		$this->checkout->json_response->set_redirect_url( $this->checkout->redirect_url );
+		$this->checkout->json_response->set_redirect_url($this->checkout->redirect_url);
 		if (
 			! (
 				$this->checkout->payment_method instanceof EE_Payment_Method
@@ -133,26 +133,26 @@ 
 	 */
 	protected function _finalize_transaction() {
 		/** @type EE_Transaction_Processor $transaction_processor */
-		$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+		$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 		//set revisit flag in txn processor
-		$transaction_processor->set_revisit( $this->checkout->revisit );
+		$transaction_processor->set_revisit($this->checkout->revisit);
 		// at this point we'll consider a TXN to not have been abandoned
-		$transaction_processor->toggle_abandoned_transaction_status( $this->checkout->transaction );
-		if ( $this->checkout->cart instanceof EE_Cart ) {
+		$transaction_processor->toggle_abandoned_transaction_status($this->checkout->transaction);
+		if ($this->checkout->cart instanceof EE_Cart) {
 			// save TXN data to the cart
 			$this->checkout->cart->get_grand_total()->save_this_and_descendants_to_txn(
 				$this->checkout->transaction->ID()
 			);
 		}
 		/** @type EE_Transaction_Payments $transaction_payments */
-		$transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' );
+		$transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments');
 		// maybe update status, but don't save transaction just yet
-		$transaction_payments->update_transaction_status_based_on_total_paid( $this->checkout->transaction, false );
+		$transaction_payments->update_transaction_status_based_on_total_paid($this->checkout->transaction, false);
 		// maybe send messages
 		$this->_trigger_notifications();
 		// this will result in the base session properties getting saved to the TXN_Session_data field
 		$this->checkout->transaction->set_txn_session_data(
-			EE_Registry::instance()->SSN->get_session_data( null, true )
+			EE_Registry::instance()->SSN->get_session_data(null, true)
 		);
 		// update the TXN if payment conditions have changed
 		return $transaction_processor->update_transaction_and_registrations_after_checkout_or_payment(
@@ -174,10 +174,10 @@ 
 	 * @throws \EE_Error
 	 */
 	protected function _trigger_notifications() {
-		if ( $this->checkout->payment_method instanceof EE_Payment_Method ) {
-			$is_revisit = filter_var( $this->checkout->revisit, FILTER_VALIDATE_BOOLEAN );
-			if ( $this->checkout->payment_method->is_off_site() ) {
-				$gateway= $this->checkout->payment_method->type_obj()->get_gateway();
+		if ($this->checkout->payment_method instanceof EE_Payment_Method) {
+			$is_revisit = filter_var($this->checkout->revisit, FILTER_VALIDATE_BOOLEAN);
+			if ($this->checkout->payment_method->is_off_site()) {
+				$gateway = $this->checkout->payment_method->type_obj()->get_gateway();
 				if (
 					! $is_revisit
 					&& $gateway instanceof EE_Offsite_Gateway
@@ -187,10 +187,10 @@ 
 					)
 				) {
 					// first time through SPCO and we are processing the payment notification NOW
-					add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true', 10 );
+					add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true', 10);
 				} else {
 					// do NOT trigger notifications because this is a revisit, OR it was already done during the IPN
-					remove_all_filters( 'FHEE__EED_Messages___maybe_registration__deliver_notifications' );
+					remove_all_filters('FHEE__EED_Messages___maybe_registration__deliver_notifications');
 					add_filter(
 						'FHEE__EED_Messages___maybe_registration__deliver_notifications',
 						'__return_false',
@@ -199,12 +199,12 @@ 
 				}
 			} else if (
 				// if SPCO revisit and TXN status has changed due to a payment
-				$is_revisit && ( $this->checkout->txn_status_updated || $this->checkout->any_reg_status_updated() )
+				$is_revisit && ($this->checkout->txn_status_updated || $this->checkout->any_reg_status_updated())
 			) {
 				// send out notifications
-				add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true', 10 );
-			} else if ( ! $is_revisit ) {
-				add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true', 10 );
+				add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true', 10);
+			} else if ( ! $is_revisit) {
+				add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true', 10);
 			}
 		}
 	}
@@ -218,9 +218,9 @@ 
 	 * @throws \EE_Error
 	 */
 	protected function _validate_primary_registrant() {
-		if ( ! $this->checkout->transaction_has_primary_registrant() ) {
+		if ( ! $this->checkout->transaction_has_primary_registrant()) {
 			EE_Error::add_error(
-				__( 'A valid Primary Registration for this Transaction could not be found.', 'event_espresso' ),
+				__('A valid Primary Registration for this Transaction could not be found.', 'event_espresso'),
 				__FILE__,
 				__FUNCTION__,
 				__LINE__
@@ -231,7 +231,7 @@ 
 		}
 		// setup URL for redirect
 		$this->checkout->redirect_url = add_query_arg(
-			array( 'e_reg_url_link' => $this->checkout->transaction->primary_registration()->reg_url_link() ),
+			array('e_reg_url_link' => $this->checkout->transaction->primary_registration()->reg_url_link()),
 			$this->checkout->thank_you_page_url
 		);
 		return true;
@@ -244,7 +244,7 @@ 
 	 */
 	public function update_reg_step() {
 		EE_Error::doing_it_wrong(
-			__CLASS__ . '::' . __FILE__,
+			__CLASS__.'::'.__FILE__,
 			__(
 				'Can not call update_reg_step() on the Finalize Registration reg step.',
 				'event_espresso'

admin_pages/messages/Messages_Admin_Page.core.php

Spacing +597 added lines, -597 removed lines

@@ -1,5 +1,5 @@ 
-<?php if (!defined('EVENT_ESPRESSO_VERSION') )
-	{exit('NO direct script access allowed');}
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION'))
+	{exit('NO direct script access allowed'); }
 
 /**
  *
@@ -72,10 +72,10 @@ 
 	/**
 	 * @param bool $routing
 	 */
-	public function __construct( $routing = true ) {
+	public function __construct($routing = true) {
 		//make sure messages autoloader is running
 		EED_Messages::set_autoloaders();
-		parent::__construct( $routing );
+		parent::__construct($routing);
 	}
 
 
@@ -89,7 +89,7 @@ 
 
 		$this->_activate_state = isset($this->_req_data['activate_state']) ? (array) $this->_req_data['activate_state'] : array();
 
-		$this->_active_messenger = isset( $this->_req_data['messenger'] ) ? $this->_req_data['messenger'] : null;
+		$this->_active_messenger = isset($this->_req_data['messenger']) ? $this->_req_data['messenger'] : null;
 		$this->_load_message_resource_manager();
 	}
 
@@ -103,7 +103,7 @@ 
 	 * @throws EE_Error
 	*/
 	protected function _load_message_resource_manager() {
-		$this->_message_resource_manager = EE_Registry::instance()->load_lib( 'Message_Resource_Manager' );
+		$this->_message_resource_manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
 	}
 
 
@@ -119,10 +119,10 @@ 
 		$messengers = $this->_message_resource_manager->active_messengers();
 		//setup messengers for selects
 		$i = 1;
-		foreach ( $messengers as $messenger_name => $messenger ) {
-			if ( $messenger instanceof EE_messenger ) {
-				$m_values[ $i ][ 'id' ] = $messenger_name;
-				$m_values[ $i ][ 'text' ] = ucwords( $messenger->label[ 'singular' ] );
+		foreach ($messengers as $messenger_name => $messenger) {
+			if ($messenger instanceof EE_messenger) {
+				$m_values[$i]['id'] = $messenger_name;
+				$m_values[$i]['text'] = ucwords($messenger->label['singular']);
 				$i++;
 			}
 		}
@@ -141,10 +141,10 @@ 
 		$mt_values = array();
 		$message_types = $this->_message_resource_manager->installed_message_types();
 		$i = 1;
-		foreach ( $message_types as $message_type_name => $message_type ) {
-			if ( $message_type instanceof EE_message_type ) {
-				$mt_values[ $i ][ 'id' ] = $message_type_name;
-				$mt_values[ $i ][ 'text' ] = ucwords( $message_type->label[ 'singular' ] );
+		foreach ($message_types as $message_type_name => $message_type) {
+			if ($message_type instanceof EE_message_type) {
+				$mt_values[$i]['id'] = $message_type_name;
+				$mt_values[$i]['text'] = ucwords($message_type->label['singular']);
 				$i++;
 			}
 		}
@@ -154,11 +154,11 @@ 
 
 
 	protected function _ajax_hooks() {
-		add_action('wp_ajax_activate_messenger', array($this, 'activate_messenger_toggle' ) );
-		add_action('wp_ajax_activate_mt', array( $this, 'activate_mt_toggle') );
-		add_action('wp_ajax_ee_msgs_save_settings', array( $this, 'save_settings') );
-		add_action('wp_ajax_ee_msgs_update_mt_form', array( $this, 'update_mt_form' ) );
-		add_action('wp_ajax_switch_template_pack', array( $this, 'switch_template_pack' ) );
+		add_action('wp_ajax_activate_messenger', array($this, 'activate_messenger_toggle'));
+		add_action('wp_ajax_activate_mt', array($this, 'activate_mt_toggle'));
+		add_action('wp_ajax_ee_msgs_save_settings', array($this, 'save_settings'));
+		add_action('wp_ajax_ee_msgs_update_mt_form', array($this, 'update_mt_form'));
+		add_action('wp_ajax_switch_template_pack', array($this, 'switch_template_pack'));
 	}
 
 
@@ -190,13 +190,13 @@ 
 	*		@return void
 	*/
 	protected function _set_page_routes() {
-		$grp_id = ! empty( $this->_req_data['GRP_ID'] ) && ! is_array( $this->_req_data['GRP_ID'] )
+		$grp_id = ! empty($this->_req_data['GRP_ID']) && ! is_array($this->_req_data['GRP_ID'])
 			? $this->_req_data['GRP_ID']
 			: 0;
-		$grp_id = empty( $grp_id ) && !empty( $this->_req_data['id'] )
+		$grp_id = empty($grp_id) && ! empty($this->_req_data['id'])
 			? $this->_req_data['id']
 			: $grp_id;
-		$msg_id = ! empty( $this->_req_data['MSG_ID'] ) && ! is_array( $this->_req_data['MSG_ID'] )
+		$msg_id = ! empty($this->_req_data['MSG_ID']) && ! is_array($this->_req_data['MSG_ID'])
 			? $this->_req_data['MSG_ID']
 			: 0;
 
@@ -238,35 +238,35 @@ 
 			'insert_message_template' => array(
 				'func' => '_insert_or_update_message_template',
 				'capability' => 'ee_edit_messages',
-				'args' => array( 'new_template' => true ),
+				'args' => array('new_template' => true),
 				'noheader' => true
 			 ),
 			'update_message_template' => array(
 				'func' => '_insert_or_update_message_template',
 				'capability' => 'ee_edit_message',
 				'obj_id' => $grp_id,
-				'args' => array( 'new_template' => false ),
+				'args' => array('new_template' => false),
 				'noheader' => true
 			),
 			'trash_message_template' => array(
 				'func' => '_trash_or_restore_message_template',
 				'capability' => 'ee_delete_message',
 				'obj_id' => $grp_id,
-				'args' => array( 'trash' => true, 'all' => true ),
+				'args' => array('trash' => true, 'all' => true),
 				'noheader' => true
 			),
 			'trash_message_template_context' => array(
 				'func' => '_trash_or_restore_message_template',
 				'capability' => 'ee_delete_message',
 				'obj_id' => $grp_id,
-				'args' => array( 'trash' => true ),
+				'args' => array('trash' => true),
 				'noheader' => true
 			),
 			'restore_message_template' => array(
 				'func' => '_trash_or_restore_message_template',
 				'capability' => 'ee_delete_message',
 				'obj_id' => $grp_id,
-				'args' => array( 'trash' => false, 'all' => true ),
+				'args' => array('trash' => false, 'all' => true),
 				'noheader' => true
 			),
 			'restore_message_template_context' => array(
@@ -380,7 +380,7 @@ 
 						'filename' => 'messages_overview_other',
 					),
 				),
-				'help_tour' => array( 'Messages_Overview_Help_Tour' ),
+				'help_tour' => array('Messages_Overview_Help_Tour'),
 				'require_nonce' => false
 			),
 			'custom_mtps' => array(
@@ -415,7 +415,7 @@ 
 				),
 				'metaboxes' => array('_publish_post_box', '_register_edit_meta_boxes'),
 				'has_metaboxes' => true,
-				'help_tour' => array( 'Message_Templates_Edit_Help_Tour' ),
+				'help_tour' => array('Message_Templates_Edit_Help_Tour'),
 				'help_tabs' => array(
 					'edit_message_template' => array(
 						'title' => __('Message Template Editor', 'event_espresso'),
@@ -471,7 +471,7 @@ 
 						'filename' => 'messages_settings_messengers'
 					),
 				),
-				'help_tour' => array( 'Messages_Settings_Help_Tour' ),
+				'help_tour' => array('Messages_Settings_Help_Tour'),
 				'require_nonce' => false
 			)
 		);
@@ -504,7 +504,7 @@ 
 
 
 	protected function _add_screen_options_default() {
-		$this->_admin_page_title = __( 'Message Activity', 'event_espresso' );
+		$this->_admin_page_title = __('Message Activity', 'event_espresso');
 		$this->_per_page_screen_option();
 	}
 
@@ -526,37 +526,37 @@ 
 
 
 	public function messages_help_tab() {
-		EEH_Template::display_template( EE_MSG_TEMPLATE_PATH . 'ee_msg_messages_help_tab.template.php' );
+		EEH_Template::display_template(EE_MSG_TEMPLATE_PATH.'ee_msg_messages_help_tab.template.php');
 	}
 
 
 	public function messengers_help_tab() {
-		EEH_Template::display_template( EE_MSG_TEMPLATE_PATH . 'ee_msg_messenger_help_tab.template.php' );
+		EEH_Template::display_template(EE_MSG_TEMPLATE_PATH.'ee_msg_messenger_help_tab.template.php');
 	}
 
 
 	public function message_types_help_tab() {
-		EEH_Template::display_template( EE_MSG_TEMPLATE_PATH . 'ee_msg_message_type_help_tab.template.php' );
+		EEH_Template::display_template(EE_MSG_TEMPLATE_PATH.'ee_msg_message_type_help_tab.template.php');
 	}
 
 
 	public function messages_overview_help_tab() {
-		EEH_Template::display_template( EE_MSG_TEMPLATE_PATH . 'ee_msg_overview_help_tab.template.php' );
+		EEH_Template::display_template(EE_MSG_TEMPLATE_PATH.'ee_msg_overview_help_tab.template.php');
 	}
 
 
 	public function message_templates_help_tab() {
-		EEH_Template::display_template( EE_MSG_TEMPLATE_PATH . 'ee_msg_message_templates_help_tab.template.php' );
+		EEH_Template::display_template(EE_MSG_TEMPLATE_PATH.'ee_msg_message_templates_help_tab.template.php');
 	}
 
 
 	public function edit_message_template_help_tab() {
-		$args['img1'] = '<img src="' . EE_MSG_ASSETS_URL . 'images/editor.png' . '" alt="' . esc_attr__('Editor Title', 'event_espresso') . '" />';
-		$args['img2'] = '<img src="' . EE_MSG_ASSETS_URL . 'images/switch-context.png' . '" alt="' . esc_attr__('Context Switcher and Preview', 'event_espresso') . '" />';
-		$args['img3'] = '<img class="left" src="' . EE_MSG_ASSETS_URL . 'images/form-fields.png' . '" alt="' . esc_attr__('Message Template Form Fields', 'event_espresso') . '" />';
-		$args['img4'] = '<img class="right" src="' . EE_MSG_ASSETS_URL . 'images/shortcodes-metabox.png' . '" alt="' . esc_attr__('Shortcodes Metabox', 'event_espresso') . '" />';
-		$args['img5'] = '<img class="right" src="' . EE_MSG_ASSETS_URL . 'images/publish-meta-box.png' . '" alt="' . esc_attr__('Publish Metabox', 'event_espresso') . '" />';
-		EEH_Template::display_template( EE_MSG_TEMPLATE_PATH . 'ee_msg_messages_templates_editor_help_tab.template.php', $args);
+		$args['img1'] = '<img src="'.EE_MSG_ASSETS_URL.'images/editor.png'.'" alt="'.esc_attr__('Editor Title', 'event_espresso').'" />';
+		$args['img2'] = '<img src="'.EE_MSG_ASSETS_URL.'images/switch-context.png'.'" alt="'.esc_attr__('Context Switcher and Preview', 'event_espresso').'" />';
+		$args['img3'] = '<img class="left" src="'.EE_MSG_ASSETS_URL.'images/form-fields.png'.'" alt="'.esc_attr__('Message Template Form Fields', 'event_espresso').'" />';
+		$args['img4'] = '<img class="right" src="'.EE_MSG_ASSETS_URL.'images/shortcodes-metabox.png'.'" alt="'.esc_attr__('Shortcodes Metabox', 'event_espresso').'" />';
+		$args['img5'] = '<img class="right" src="'.EE_MSG_ASSETS_URL.'images/publish-meta-box.png'.'" alt="'.esc_attr__('Publish Metabox', 'event_espresso').'" />';
+		EEH_Template::display_template(EE_MSG_TEMPLATE_PATH.'ee_msg_messages_templates_editor_help_tab.template.php', $args);
 	}
 
 
@@ -564,22 +564,22 @@ 
 	public function message_template_shortcodes_help_tab() {
 		$this->_set_shortcodes();
 		$args['shortcodes'] = $this->_shortcodes;
-		EEH_Template::display_template( EE_MSG_TEMPLATE_PATH . 'ee_msg_messages_shortcodes_help_tab.template.php', $args );
+		EEH_Template::display_template(EE_MSG_TEMPLATE_PATH.'ee_msg_messages_shortcodes_help_tab.template.php', $args);
 	}
 
 
 
 	public function preview_message_help_tab() {
-		EEH_Template::display_template( EE_MSG_TEMPLATE_PATH . 'ee_msg_preview_help_tab.template.php' );
+		EEH_Template::display_template(EE_MSG_TEMPLATE_PATH.'ee_msg_preview_help_tab.template.php');
 	}
 
 
 	public function settings_help_tab() {
-		$args['img1'] = '<img class="inline-text" src="' . EE_MSG_ASSETS_URL . 'images/email-tab-active.png' . '" alt="' . esc_attr__('Active Email Tab', 'event_espresso') . '" />';
-		$args['img2'] = '<img class="inline-text" src="' . EE_MSG_ASSETS_URL . 'images/email-tab-inactive.png' . '" alt="' . esc_attr__('Inactive Email Tab', 'event_espresso') . '" />';
+		$args['img1'] = '<img class="inline-text" src="'.EE_MSG_ASSETS_URL.'images/email-tab-active.png'.'" alt="'.esc_attr__('Active Email Tab', 'event_espresso').'" />';
+		$args['img2'] = '<img class="inline-text" src="'.EE_MSG_ASSETS_URL.'images/email-tab-inactive.png'.'" alt="'.esc_attr__('Inactive Email Tab', 'event_espresso').'" />';
 		$args['img3'] = '<div class="switch"><input id="ee-on-off-toggle-on" class="ee-on-off-toggle ee-toggle-round-flat" type="checkbox" checked="checked"><label for="ee-on-off-toggle-on"></label>';
 		$args['img4'] = '<div class="switch"><input id="ee-on-off-toggle-on" class="ee-on-off-toggle ee-toggle-round-flat" type="checkbox"><label for="ee-on-off-toggle-on"></label>';
-		EEH_Template::display_template( EE_MSG_TEMPLATE_PATH . 'ee_msg_messages_settings_help_tab.template.php', $args);
+		EEH_Template::display_template(EE_MSG_TEMPLATE_PATH.'ee_msg_messages_settings_help_tab.template.php', $args);
 	}
 
 
@@ -587,31 +587,31 @@ 
 
 
 	public function load_scripts_styles() {
-		wp_register_style('espresso_ee_msg', EE_MSG_ASSETS_URL . 'ee_message_admin.css', EVENT_ESPRESSO_VERSION );
+		wp_register_style('espresso_ee_msg', EE_MSG_ASSETS_URL.'ee_message_admin.css', EVENT_ESPRESSO_VERSION);
 		wp_enqueue_style('espresso_ee_msg');
 
-		wp_register_script('ee-messages-settings', EE_MSG_ASSETS_URL . 'ee-messages-settings.js', array('jquery-ui-droppable', 'ee-serialize-full-array'), EVENT_ESPRESSO_VERSION, true );
-		wp_register_script( 'ee-msg-list-table-js', EE_MSG_ASSETS_URL. 'ee_message_admin_list_table.js', array( 'ee-dialog' ), EVENT_ESPRESSO_VERSION );
+		wp_register_script('ee-messages-settings', EE_MSG_ASSETS_URL.'ee-messages-settings.js', array('jquery-ui-droppable', 'ee-serialize-full-array'), EVENT_ESPRESSO_VERSION, true);
+		wp_register_script('ee-msg-list-table-js', EE_MSG_ASSETS_URL.'ee_message_admin_list_table.js', array('ee-dialog'), EVENT_ESPRESSO_VERSION);
 	}
 
 
 
 	public function load_scripts_styles_default() {
-		wp_enqueue_script( 'ee-msg-list-table-js' );
+		wp_enqueue_script('ee-msg-list-table-js');
 	}
 
 
 
 
 
-	public function wp_editor_css( $mce_css ) {
+	public function wp_editor_css($mce_css) {
 		//if we're on the edit_message_template route
-		if ( $this->_req_action == 'edit_message_template' && $this->_active_messenger instanceof EE_messenger  ) {
+		if ($this->_req_action == 'edit_message_template' && $this->_active_messenger instanceof EE_messenger) {
 			$message_type_name = $this->_active_message_type_name;
 
 			//we're going to REPLACE the existing mce css
 			//we need to get the css file location from the active messenger
-			$mce_css = $this->_active_messenger->get_variation($this->_template_pack, $message_type_name, true, 'wpeditor', $this->_variation );
+			$mce_css = $this->_active_messenger->get_variation($this->_template_pack, $message_type_name, true, 'wpeditor', $this->_variation);
 		}
 
 		return $mce_css;
@@ -629,15 +629,15 @@ 
 			$this->_message_template_group->messenger_obj()->label['singular'],
 			$this->_message_template_group->message_type_obj()->label['singular']
 		);
-		EE_Registry::$i18n_js_strings['confirm_switch_template_pack'] = __('Switching the template pack for a messages template will reset the content for the template so the new layout is loaded.  Any custom content in the existing template will be lost. Are you sure you wish to do this?', 'event_espresso' );
+		EE_Registry::$i18n_js_strings['confirm_switch_template_pack'] = __('Switching the template pack for a messages template will reset the content for the template so the new layout is loaded.  Any custom content in the existing template will be lost. Are you sure you wish to do this?', 'event_espresso');
 
-		wp_register_script('ee_msgs_edit_js', EE_MSG_ASSETS_URL . 'ee_message_editor.js', array('jquery'), EVENT_ESPRESSO_VERSION );
+		wp_register_script('ee_msgs_edit_js', EE_MSG_ASSETS_URL.'ee_message_editor.js', array('jquery'), EVENT_ESPRESSO_VERSION);
 
 		wp_enqueue_script('ee_admin_js');
 		wp_enqueue_script('ee_msgs_edit_js');
 
 		//add in special css for tiny_mce
-		add_filter( 'mce_css', array( $this, 'wp_editor_css' ) );
+		add_filter('mce_css', array($this, 'wp_editor_css'));
 	}
 
 
@@ -646,22 +646,22 @@ 
 
 		$this->_set_message_template_group();
 
-		if ( isset( $this->_req_data['messenger'] ) ) {
-			$this->_active_messenger = $this->_message_resource_manager->get_active_messenger( $this->_req_data['messenger'] );
+		if (isset($this->_req_data['messenger'])) {
+			$this->_active_messenger = $this->_message_resource_manager->get_active_messenger($this->_req_data['messenger']);
 		}
 
-		$message_type_name = isset( $this->_req_data['message_type'] ) ? $this->_req_data['message_type'] : '';
+		$message_type_name = isset($this->_req_data['message_type']) ? $this->_req_data['message_type'] : '';
 
 
-		wp_enqueue_style('espresso_preview_css', $this->_active_messenger->get_variation( $this->_template_pack, $message_type_name, true, 'preview', $this->_variation ) );
+		wp_enqueue_style('espresso_preview_css', $this->_active_messenger->get_variation($this->_template_pack, $message_type_name, true, 'preview', $this->_variation));
 	}
 
 
 
 	public function load_scripts_styles_settings() {
-		wp_register_style( 'ee-message-settings', EE_MSG_ASSETS_URL . 'ee_message_settings.css', array(), EVENT_ESPRESSO_VERSION );
-		wp_enqueue_style( 'ee-text-links' );
-		wp_enqueue_style( 'ee-message-settings' );
+		wp_register_style('ee-message-settings', EE_MSG_ASSETS_URL.'ee_message_settings.css', array(), EVENT_ESPRESSO_VERSION);
+		wp_enqueue_style('ee-text-links');
+		wp_enqueue_style('ee-message-settings');
 
 		wp_enqueue_script('ee-messages-settings');
 	}
@@ -691,40 +691,40 @@ 
 	 * set views array for message queue list table
 	 */
 	public function _set_list_table_views_default() {
-		EE_Registry::instance()->load_helper( 'Template' );
+		EE_Registry::instance()->load_helper('Template');
 
-		$common_bulk_actions = EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'message_list_table_bulk_actions' )
+		$common_bulk_actions = EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'message_list_table_bulk_actions')
 			? array(
-				'generate_now' => __( 'Generate Now', 'event_espresso' ),
-		        'generate_and_send_now' => __( 'Generate and Send Now', 'event_espresso' ),
-		        'queue_for_resending' => __( 'Queue for Resending', 'event_espresso' ),
-		        'send_now' => __( 'Send Now', 'event_espresso' )
+				'generate_now' => __('Generate Now', 'event_espresso'),
+		        'generate_and_send_now' => __('Generate and Send Now', 'event_espresso'),
+		        'queue_for_resending' => __('Queue for Resending', 'event_espresso'),
+		        'send_now' => __('Send Now', 'event_espresso')
 				)
 			: array();
 
-		$delete_bulk_action = EE_Registry::instance()->CAP->current_user_can( 'ee_delete_messages', 'message_list_table_bulk_actions' )
-			? array( 'delete_ee_messages' => __( 'Delete Messages', 'event_espresso' ) )
+		$delete_bulk_action = EE_Registry::instance()->CAP->current_user_can('ee_delete_messages', 'message_list_table_bulk_actions')
+			? array('delete_ee_messages' => __('Delete Messages', 'event_espresso'))
 			: array();
 
 
 		$this->_views = array(
 			 'all' => array(
 			    'slug' => 'all',
-			    'label' => __( 'All', 'event_espresso' ),
+			    'label' => __('All', 'event_espresso'),
 			    'count' => 0,
-			    'bulk_action' => array_merge( $common_bulk_actions, $delete_bulk_action )
+			    'bulk_action' => array_merge($common_bulk_actions, $delete_bulk_action)
 			 )
 		);
 
 
-		foreach ( EEM_Message::instance()->all_statuses() as $status ) {
-			if ( $status === EEM_Message::status_debug_only && ( ! defined( 'WP_DEBUG' ) || ! WP_DEBUG ) ) {
+		foreach (EEM_Message::instance()->all_statuses() as $status) {
+			if ($status === EEM_Message::status_debug_only && ( ! defined('WP_DEBUG') || ! WP_DEBUG)) {
 				continue;
 			}
 			$status_bulk_actions = $common_bulk_actions;
 			//unset bulk actions not applying to status
-			if ( ! empty( $status_bulk_actions ) ) {
-				switch ( $status ) {
+			if ( ! empty($status_bulk_actions)) {
+				switch ($status) {
 					case EEM_Message::status_idle :
 					case EEM_Message::status_resend :
 						$status_bulk_actions['send_now'] = $common_bulk_actions['send_now'];
@@ -736,21 +736,21 @@ 
 						break;
 
 					case EEM_Message::status_incomplete :
-						unset( $status_bulk_actions['queue_for_resending'], $status_bulk_actions['send_now'] );
+						unset($status_bulk_actions['queue_for_resending'], $status_bulk_actions['send_now']);
 						break;
 
 					case EEM_Message::status_retry :
 					case EEM_Message::status_sent :
-						unset( $status_bulk_actions['generate_now'], $status_bulk_actions['generate_and_send_now'] );
+						unset($status_bulk_actions['generate_now'], $status_bulk_actions['generate_and_send_now']);
 						break;
 				}
 			}
 
-			$this->_views[ strtolower( $status ) ] = array(
-				'slug' => strtolower( $status ),
-				'label' => EEH_Template::pretty_status( $status, false, 'sentence' ),
+			$this->_views[strtolower($status)] = array(
+				'slug' => strtolower($status),
+				'label' => EEH_Template::pretty_status($status, false, 'sentence'),
 				'count' => 0,
-				'bulk_action' => array_merge( $status_bulk_actions, $delete_bulk_action )
+				'bulk_action' => array_merge($status_bulk_actions, $delete_bulk_action)
 			);
 		}
 	}
@@ -769,8 +769,8 @@ 
 	protected function _message_queue_list_table() {
 		$this->_search_btn_label = __('Message Activity', 'event_espresso');
 		$this->_template_args['per_column'] = 6;
-		$this->_template_args['after_list_table'] = $this->_display_legend( $this->_message_legend_items() );
-		$this->_template_args['before_list_table'] = '<h3>' . EEM_Message::instance()->get_pretty_label_for_results() . '</h3>';
+		$this->_template_args['after_list_table'] = $this->_display_legend($this->_message_legend_items());
+		$this->_template_args['before_list_table'] = '<h3>'.EEM_Message::instance()->get_pretty_label_for_results().'</h3>';
 		$this->display_admin_list_table_page_with_no_sidebar();
 	}
 
@@ -783,8 +783,8 @@ 
 		$action_css_classes = EEH_MSG_Template::get_message_action_icons();
 		$action_items = array();
 
-		foreach( $action_css_classes as $action_item => $action_details ) {
-			if ( $action_item === 'see_notifications_for' ) {
+		foreach ($action_css_classes as $action_item => $action_details) {
+			if ($action_item === 'see_notifications_for') {
 				continue;
 			}
 			$action_items[$action_item] = array(
@@ -796,37 +796,37 @@ 
 		/** @type array $status_items status legend setup*/
 		$status_items = array(
 			'sent_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Message::status_sent,
-				'desc' => EEH_Template::pretty_status( EEM_Message::status_sent, false, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Message::status_sent,
+				'desc' => EEH_Template::pretty_status(EEM_Message::status_sent, false, 'sentence')
 				),
 			'idle_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Message::status_idle,
-				'desc' => EEH_Template::pretty_status( EEM_Message::status_idle, false, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Message::status_idle,
+				'desc' => EEH_Template::pretty_status(EEM_Message::status_idle, false, 'sentence')
 				),
 			'failed_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Message::status_failed,
-				'desc' => EEH_Template::pretty_status( EEM_Message::status_failed, false, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Message::status_failed,
+				'desc' => EEH_Template::pretty_status(EEM_Message::status_failed, false, 'sentence')
 			),
 			'resend_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Message::status_resend,
-				'desc' => EEH_Template::pretty_status( EEM_Message::status_resend, false, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Message::status_resend,
+				'desc' => EEH_Template::pretty_status(EEM_Message::status_resend, false, 'sentence')
 				),
 			'incomplete_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Message::status_incomplete,
-				'desc' => EEH_Template::pretty_status( EEM_Message::status_incomplete, false, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Message::status_incomplete,
+				'desc' => EEH_Template::pretty_status(EEM_Message::status_incomplete, false, 'sentence')
 				),
 			'retry_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Message::status_retry,
-				'desc' => EEH_Template::pretty_status( EEM_Message::status_retry, false, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Message::status_retry,
+				'desc' => EEH_Template::pretty_status(EEM_Message::status_retry, false, 'sentence')
 				)
 		);
-		if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+		if (defined('WP_DEBUG') && WP_DEBUG) {
 			$status_items['debug_only_status'] = array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Message::status_debug_only,
-				'desc' => EEH_Template::pretty_status( EEM_Message::status_debug_only, false, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Message::status_debug_only,
+				'desc' => EEH_Template::pretty_status(EEM_Message::status_debug_only, false, 'sentence')
 			);
 		}
-		return array_merge( $action_items, $status_items );
+		return array_merge($action_items, $status_items);
 	}
 
 
@@ -836,9 +836,9 @@ 
 
 	protected function _custom_mtps_preview() {
 		$this->_admin_page_title = __('Custom Message Templates (Preview)', 'event_espresso');
-		$this->_template_args['preview_img'] = '<img src="' . EE_MSG_ASSETS_URL . 'images/custom_mtps_preview.png" alt="' . esc_attr__('Preview Custom Message Templates screenshot', 'event_espresso' ) . '" />';
+		$this->_template_args['preview_img'] = '<img src="'.EE_MSG_ASSETS_URL.'images/custom_mtps_preview.png" alt="'.esc_attr__('Preview Custom Message Templates screenshot', 'event_espresso').'" />';
 		$this->_template_args['preview_text'] = '<strong>'.__('Custom Message Templates is a feature that is only available in the caffeinated version of Event Espresso.  With the Custom Message Templates feature, you are able to create custom templates and set them per event.', 'event_espresso').'</strong>';
-		$this->display_admin_caf_preview_page( 'custom_message_types', false );
+		$this->display_admin_caf_preview_page('custom_message_types', false);
 	}
 
 
@@ -862,31 +862,31 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_message_templates( $perpage = 10, $type = 'in_use', $count = false, $all = false, $global = true ) {
+	public function get_message_templates($perpage = 10, $type = 'in_use', $count = false, $all = false, $global = true) {
 
 		$MTP = EEM_Message_Template_Group::instance();
 
 		$this->_req_data['orderby'] = empty($this->_req_data['orderby']) ? 'GRP_ID' : $this->_req_data['orderby'];
 		$orderby = $this->_req_data['orderby'];
 
-		$order = ( isset( $this->_req_data['order'] ) && ! empty( $this->_req_data['order'] ) ) ? $this->_req_data['order'] : 'ASC';
+		$order = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order'] : 'ASC';
 
-		$current_page = isset( $this->_req_data['paged'] ) && !empty( $this->_req_data['paged'] ) ? $this->_req_data['paged'] : 1;
-		$per_page = isset( $this->_req_data['perpage'] ) && !empty( $this->_req_data['perpage'] ) ? $this->_req_data['perpage'] : $perpage;
+		$current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged']) ? $this->_req_data['paged'] : 1;
+		$per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage']) ? $this->_req_data['perpage'] : $perpage;
 
-		$offset = ($current_page-1)*$per_page;
-		$limit = $all ? null : array( $offset, $per_page );
+		$offset = ($current_page - 1) * $per_page;
+		$limit = $all ? null : array($offset, $per_page);
 
 
 		//options will match what is in the _views array property
-		switch( $type ) {
+		switch ($type) {
 
 			case 'in_use':
-				$templates = $MTP->get_all_active_message_templates($orderby, $order, $limit, $count, $global, true );
+				$templates = $MTP->get_all_active_message_templates($orderby, $order, $limit, $count, $global, true);
 				break;
 
 			default:
-				$templates = $MTP->get_all_trashed_grouped_message_templates($orderby, $order, $limit, $count, $global );
+				$templates = $MTP->get_all_trashed_grouped_message_templates($orderby, $order, $limit, $count, $global);
 
 		}
 
@@ -905,8 +905,8 @@ 
 		$installed_message_types = $this->_message_resource_manager->installed_message_types();
 		$installed = array();
 
-		foreach ( $installed_message_types as $message_type ) {
-			$installed[ $message_type->name ] = $message_type;
+		foreach ($installed_message_types as $message_type) {
+			$installed[$message_type->name] = $message_type;
 		}
 
 		return $installed;
@@ -925,24 +925,24 @@ 
 	 *
 	 * @throws EE_error
 	 */
-	protected function _add_message_template(  $message_type = '', $messenger='', $GRP_ID = '' ) {
+	protected function _add_message_template($message_type = '', $messenger = '', $GRP_ID = '') {
 		//set values override any request data
-		$message_type = !empty( $message_type ) ? $message_type : '';
-		$message_type = empty( $message_type ) && !empty( $this->_req_data['message_type'] ) ? $this->_req_data['message_type'] : $message_type;
+		$message_type = ! empty($message_type) ? $message_type : '';
+		$message_type = empty($message_type) && ! empty($this->_req_data['message_type']) ? $this->_req_data['message_type'] : $message_type;
 
-		$messenger = !empty( $messenger ) ? $messenger : '';
-		$messenger = empty( $messenger ) && !empty( $this->_req_data['messenger'] ) ? $this->_req_data['messenger'] : $messenger;
+		$messenger = ! empty($messenger) ? $messenger : '';
+		$messenger = empty($messenger) && ! empty($this->_req_data['messenger']) ? $this->_req_data['messenger'] : $messenger;
 
-		$GRP_ID = !empty( $GRP_ID ) ? $GRP_ID : '';
-		$GRP_ID = empty( $GRP_ID ) && !empty( $this->_req_data['GRP_ID'] ) ? $this->_req_data['GRP_ID'] : $GRP_ID;
+		$GRP_ID = ! empty($GRP_ID) ? $GRP_ID : '';
+		$GRP_ID = empty($GRP_ID) && ! empty($this->_req_data['GRP_ID']) ? $this->_req_data['GRP_ID'] : $GRP_ID;
 
 		//we need messenger and message type.  They should be coming from the event editor. If not here then return error
-		if ( empty( $message_type ) || empty( $messenger )  )
-			{throw new EE_error(__('Sorry, but we can\'t create new templates because we\'re missing the messenger or message type', 'event_espresso'));}
+		if (empty($message_type) || empty($messenger))
+			{throw new EE_error(__('Sorry, but we can\'t create new templates because we\'re missing the messenger or message type', 'event_espresso')); }
 
 		//we need the GRP_ID for the template being used as the base for the new template
-		if ( empty( $GRP_ID ) )
-			{throw new EE_Error( __('In order to create a custom message template the GRP_ID of the template being used as a base is needed', 'event_espresso' ) );}
+		if (empty($GRP_ID))
+			{throw new EE_Error(__('In order to create a custom message template the GRP_ID of the template being used as a base is needed', 'event_espresso')); }
 
 		//let's just make sure the template gets generated!
 
@@ -963,8 +963,8 @@ 
 	 * @param int      $GRP_ID         GRP_ID for the related message template group this new template will be based
 	 *                                 off of.
 	 */
-	public function add_message_template( $message_type, $messenger, $GRP_ID ) {
-		$this->_add_message_template( $message_type, $messenger, $GRP_ID );
+	public function add_message_template($message_type, $messenger, $GRP_ID) {
+		$this->_add_message_template($message_type, $messenger, $GRP_ID);
 	}
 
 
@@ -975,14 +975,14 @@ 
 	 * @return void
 	 */
 	protected function _edit_message_template() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '');
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		$template_fields = '';
 		$sidebar_fields = '';
 		//we filter the tinyMCE settings to remove the validation since message templates by their nature will not have valid html in the templates.
-		add_filter( 'tiny_mce_before_init', array( $this, 'filter_tinymce_init'), 10, 2 );
+		add_filter('tiny_mce_before_init', array($this, 'filter_tinymce_init'), 10, 2);
 
-		$GRP_ID = isset( $this->_req_data['id'] ) && !empty( $this->_req_data['id'] )
-			? absint( $this->_req_data['id'] )
+		$GRP_ID = isset($this->_req_data['id']) && ! empty($this->_req_data['id'])
+			? absint($this->_req_data['id'])
 			: false;
 
 		$this->_set_shortcodes(); //this also sets the _message_template property.
@@ -990,20 +990,20 @@ 
 		$c_label = $message_template_group->context_label();
 		$c_config = $message_template_group->contexts_config();
 
-		reset( $c_config );
-		$context = isset( $this->_req_data['context']) && !empty($this->_req_data['context'] )
+		reset($c_config);
+		$context = isset($this->_req_data['context']) && ! empty($this->_req_data['context'])
 			? strtolower($this->_req_data['context'])
 			: key($c_config);
 
 
-		if ( empty($GRP_ID) ) {
+		if (empty($GRP_ID)) {
 			$action = 'insert_message_template';
 			//$button_both = false;
 			//$button_text = array( __( 'Save','event_espresso') );
 			//$button_actions = array('something_different');
 			//$referrer = false;
 			$edit_message_template_form_url = add_query_arg(
-				array( 'action' => $action, 'noheader' => true ),
+				array('action' => $action, 'noheader' => true),
 				EE_MSG_ADMIN_URL
 			);
 		} else {
@@ -1013,7 +1013,7 @@ 
 			//$button_actions = array();
 			//$referrer = $this->_admin_base_url;
 			$edit_message_template_form_url = add_query_arg(
-				array( 'action' => $action, 'noheader' => true ),
+				array('action' => $action, 'noheader' => true),
 				EE_MSG_ADMIN_URL
 			);
 		}
@@ -1027,14 +1027,14 @@ 
 
 		//Do we have any validation errors?
 		$validators = $this->_get_transient();
-		$v_fields = !empty($validators) ? array_keys($validators) : array();
+		$v_fields = ! empty($validators) ? array_keys($validators) : array();
 
 
 		//we need to assemble the title from Various details
 		$context_label = sprintf(
 			__('(%s %s)', 'event_espresso'),
 			$c_config[$context]['label'],
-			ucwords($c_label['label'] )
+			ucwords($c_label['label'])
 		);
 
 		$title = sprintf(
@@ -1055,7 +1055,7 @@ 
 			$message_template_group->message_type()
 		);
 
-		if ( !$template_field_structure ) {
+		if ( ! $template_field_structure) {
 			$template_field_structure = false;
 			$template_fields = __('There was an error in assembling the fields for this display (you should see an error message)', 'event_espresso');
 		}
@@ -1065,51 +1065,51 @@ 
 
 
 		//if we have the extra key.. then we need to remove the content index from the template_field_structure as it will get handled in the "extra" array.
-		if ( is_array($template_field_structure[$context]) && isset( $template_field_structure[$context]['extra']) ) {
-			foreach ( $template_field_structure[$context]['extra'] as $reference_field => $new_fields ) {
-				unset( $template_field_structure[$context][$reference_field] );
+		if (is_array($template_field_structure[$context]) && isset($template_field_structure[$context]['extra'])) {
+			foreach ($template_field_structure[$context]['extra'] as $reference_field => $new_fields) {
+				unset($template_field_structure[$context][$reference_field]);
 			}
 		}
 
 		//let's loop through the template_field_structure and actually assemble the input fields!
-		if ( !empty($template_field_structure) ) {
-			foreach ( $template_field_structure[$context] as $template_field => $field_setup_array ) {
+		if ( ! empty($template_field_structure)) {
+			foreach ($template_field_structure[$context] as $template_field => $field_setup_array) {
 				//if this is an 'extra' template field then we need to remove any existing fields that are keyed up in the extra array and reset them.
-				if ( $template_field == 'extra' ) {
+				if ($template_field == 'extra') {
 					$this->_template_args['is_extra_fields'] = true;
-					foreach ( $field_setup_array as $reference_field => $new_fields_array ) {
-						$message_template = $message_templates[ $context ][ $reference_field ];
+					foreach ($field_setup_array as $reference_field => $new_fields_array) {
+						$message_template = $message_templates[$context][$reference_field];
 						$content = $message_template instanceof EE_Message_Template
-							? $message_template->get( 'MTP_content' )
+							? $message_template->get('MTP_content')
 							: '';
-						foreach ( $new_fields_array as $extra_field =>  $extra_array ) {
+						foreach ($new_fields_array as $extra_field =>  $extra_array) {
 							//let's verify if we need this extra field via the shortcodes parameter.
 							$continue = false;
-							if ( isset( $extra_array['shortcodes_required'] ) ) {
-								foreach ( (array) $extra_array['shortcodes_required'] as $shortcode ) {
-									if ( !array_key_exists( $shortcode, $this->_shortcodes ) )
-										{$continue = true;}
+							if (isset($extra_array['shortcodes_required'])) {
+								foreach ((array) $extra_array['shortcodes_required'] as $shortcode) {
+									if ( ! array_key_exists($shortcode, $this->_shortcodes))
+										{$continue = true; }
 								}
-								if ( $continue ) {continue;}
+								if ($continue) {continue; }
 							}
 
-							$field_id = $reference_field . '-' . $extra_field . '-content';
+							$field_id = $reference_field.'-'.$extra_field.'-content';
 							$template_form_fields[$field_id] = $extra_array;
-							$template_form_fields[$field_id]['name'] = 'MTP_template_fields[' . $reference_field . '][content][' . $extra_field . ']';
-							$css_class = isset( $extra_array['css_class'] ) ? $extra_array['css_class'] : '';
+							$template_form_fields[$field_id]['name'] = 'MTP_template_fields['.$reference_field.'][content]['.$extra_field.']';
+							$css_class = isset($extra_array['css_class']) ? $extra_array['css_class'] : '';
 
-							$template_form_fields[$field_id]['css_class'] = ! empty( $v_fields )
+							$template_form_fields[$field_id]['css_class'] = ! empty($v_fields)
 																			&& in_array($extra_field, $v_fields)
 																			&&
 																			(
-								                                                is_array($validators[$extra_field] )
-																				&& isset( $validators[$extra_field]['msg'] )
+								                                                is_array($validators[$extra_field])
+																				&& isset($validators[$extra_field]['msg'])
 							                                                )
-								? 'validate-error ' . $css_class
+								? 'validate-error '.$css_class
 								: $css_class;
 
-							$template_form_fields[$field_id]['value'] = !empty($message_templates) && isset($content[$extra_field])
-								? stripslashes( html_entity_decode( $content[$extra_field], ENT_QUOTES, "UTF-8") )
+							$template_form_fields[$field_id]['value'] = ! empty($message_templates) && isset($content[$extra_field])
+								? stripslashes(html_entity_decode($content[$extra_field], ENT_QUOTES, "UTF-8"))
 								: '';
 
 							//do we have a validation error?  if we do then let's use that value instead
@@ -1125,32 +1125,32 @@ 
 								$field_id
 							);
 
-							if ( isset( $extra_array['input'] ) && $extra_array['input'] == 'wp_editor' ) {
+							if (isset($extra_array['input']) && $extra_array['input'] == 'wp_editor') {
 								//we want to decode the entities
 								$template_form_fields[$field_id]['value'] = stripslashes(
-									html_entity_decode( $template_form_fields[$field_id]['value'], ENT_QUOTES, "UTF-8")
+									html_entity_decode($template_form_fields[$field_id]['value'], ENT_QUOTES, "UTF-8")
 								);
 
 							}/**/
 						}
-						$templatefield_MTP_id = $reference_field . '-MTP_ID';
-						$templatefield_templatename_id = $reference_field . '-name';
+						$templatefield_MTP_id = $reference_field.'-MTP_ID';
+						$templatefield_templatename_id = $reference_field.'-name';
 
 						$template_form_fields[$templatefield_MTP_id] = array(
-							'name' => 'MTP_template_fields[' . $reference_field . '][MTP_ID]',
+							'name' => 'MTP_template_fields['.$reference_field.'][MTP_ID]',
 							'label' => null,
 							'input' => 'hidden',
 							'type' => 'int',
 							'required' => false,
 							'validation' => false,
-							'value' => !empty($message_templates) ? $message_template->ID() : '',
+							'value' => ! empty($message_templates) ? $message_template->ID() : '',
 							'css_class' => '',
 							'format' => '%d',
 							'db-col' => 'MTP_ID'
 						);
 
 						$template_form_fields[$templatefield_templatename_id] = array(
-							'name' => 'MTP_template_fields[' . $reference_field . '][name]',
+							'name' => 'MTP_template_fields['.$reference_field.'][name]',
 							'label' => null,
 							'input' => 'hidden',
 							'type' => 'string',
@@ -1164,14 +1164,14 @@ 
 					}
 					continue; //skip the next stuff, we got the necessary fields here for this dataset.
 				} else {
-					$field_id = $template_field . '-content';
+					$field_id = $template_field.'-content';
 					$template_form_fields[$field_id] = $field_setup_array;
-					$template_form_fields[$field_id]['name'] = 'MTP_template_fields[' . $template_field . '][content]';
-					$message_template = isset( $message_templates[ $context ][ $template_field ] )
-						? $message_templates[ $context ][ $template_field ]
+					$template_form_fields[$field_id]['name'] = 'MTP_template_fields['.$template_field.'][content]';
+					$message_template = isset($message_templates[$context][$template_field])
+						? $message_templates[$context][$template_field]
 						: null;
-					$template_form_fields[$field_id]['value'] = ! empty( $message_templates )
-																&& is_array( $message_templates[$context] )
+					$template_form_fields[$field_id]['value'] = ! empty($message_templates)
+																&& is_array($message_templates[$context])
 																&& $message_template instanceof EE_Message_Template
 						? $message_template->get('MTP_content')
 						: '';
@@ -1184,10 +1184,10 @@ 
 
 					$template_form_fields[$field_id]['db-col'] = 'MTP_content';
 					$css_class = isset($field_setup_array['css_class']) ? $field_setup_array['css_class'] : '';
-					$template_form_fields[$field_id]['css_class'] =  ! empty( $v_fields )
-																	 && in_array( $template_field, $v_fields )
-																	 && isset( $validators[$template_field]['msg'] )
-						? 'validate-error ' . $css_class
+					$template_form_fields[$field_id]['css_class'] = ! empty($v_fields)
+																	 && in_array($template_field, $v_fields)
+																	 && isset($validators[$template_field]['msg'])
+						? 'validate-error '.$css_class
 						: $css_class;
 
 					//shortcode selector
@@ -1198,12 +1198,12 @@ 
 
 				//k took care of content field(s) now let's take care of others.
 
-				$templatefield_MTP_id = $template_field . '-MTP_ID';
-				$templatefield_field_templatename_id = $template_field . '-name';
+				$templatefield_MTP_id = $template_field.'-MTP_ID';
+				$templatefield_field_templatename_id = $template_field.'-name';
 
 				//foreach template field there are actually two form fields created
 				$template_form_fields[$templatefield_MTP_id] = array(
-					'name' => 'MTP_template_fields[' . $template_field . '][MTP_ID]',
+					'name' => 'MTP_template_fields['.$template_field.'][MTP_ID]',
 					'label' => null,
 					'input' => 'hidden',
 					'type' => 'int',
@@ -1216,7 +1216,7 @@ 
 				);
 
 				$template_form_fields[$templatefield_field_templatename_id] = array(
-					'name' => 'MTP_template_fields[' . $template_field . '][name]',
+					'name' => 'MTP_template_fields['.$template_field.'][name]',
 					'label' => null,
 					'input' => 'hidden',
 					'type' => 'string',
@@ -1360,13 +1360,13 @@ 
 				'value' => $GRP_ID
 				);
 			$sidebar_form_fields['ee-msg-evt-nonce'] = array(
-				'name' => $action . '_nonce',
+				'name' => $action.'_nonce',
 				'input' => 'hidden',
 				'type' => 'string',
-				'value' => wp_create_nonce( $action . '_nonce')
+				'value' => wp_create_nonce($action.'_nonce')
 				);
 
-			if ( isset($this->_req_data['template_switch']) && $this->_req_data['template_switch'] ) {
+			if (isset($this->_req_data['template_switch']) && $this->_req_data['template_switch']) {
 				$sidebar_form_fields['ee-msg-template-switch'] = array(
 					'name' => 'template_switch',
 					'input' => 'hidden',
@@ -1376,8 +1376,8 @@ 
 			}
 
 
-			$template_fields = $this->_generate_admin_form_fields( $template_form_fields );
-			$sidebar_fields = $this->_generate_admin_form_fields( $sidebar_form_fields );
+			$template_fields = $this->_generate_admin_form_fields($template_form_fields);
+			$sidebar_fields = $this->_generate_admin_form_fields($sidebar_form_fields);
 
 
 		} //end if ( !empty($template_field_structure) )
@@ -1389,7 +1389,7 @@ 
 			 $GRP_ID,
 			 false,
 			 add_query_arg(
-			    array( 'action' => 'global_mtps' ),
+			    array('action' => 'global_mtps'),
 			    $this->_admin_base_url
 			 )
 		);
@@ -1405,7 +1405,7 @@ 
 			),
 			$this->_admin_base_url
 		);
-		$preview_button = '<a href="' . $preview_url . '" class="button-secondary messages-preview-button">' . __('Preview', 'event_espresso') . '</a>';
+		$preview_button = '<a href="'.$preview_url.'" class="button-secondary messages-preview-button">'.__('Preview', 'event_espresso').'</a>';
 
 
 		//setup context switcher
@@ -1433,17 +1433,17 @@ 
 		$this->_template_args['after_admin_page_content'] = $this->_add_form_element_after();
 
 		$this->_template_path = $this->_template_args['GRP_ID']
-			? EE_MSG_TEMPLATE_PATH . 'ee_msg_details_main_edit_meta_box.template.php'
-			: EE_MSG_TEMPLATE_PATH . 'ee_msg_details_main_add_meta_box.template.php';
+			? EE_MSG_TEMPLATE_PATH.'ee_msg_details_main_edit_meta_box.template.php'
+			: EE_MSG_TEMPLATE_PATH.'ee_msg_details_main_add_meta_box.template.php';
 
 		//send along EE_Message_Template_Group object for further template use.
 		$this->_template_args['MTP'] = $message_template_group;
 
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( $this->_template_path, $this->_template_args, true );
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template($this->_template_path, $this->_template_args, true);
 
 
 		//finally, let's set the admin_page title
-		$this->_admin_page_title = sprintf( __('Editing %s', 'event_espresso'), $title );
+		$this->_admin_page_title = sprintf(__('Editing %s', 'event_espresso'), $title);
 
 
 		//we need to take care of setting the shortcodes property for use elsewhere.
@@ -1456,7 +1456,7 @@ 
 	}
 
 
-	public function filter_tinymce_init( $mceInit, $editor_id ) {
+	public function filter_tinymce_init($mceInit, $editor_id) {
 		return $mceInit;
 	}
 
@@ -1467,7 +1467,7 @@ 
 	}
 
 	public function _add_form_element_before() {
-		return '<form method="post" action="' . $this->_template_args["edit_message_template_form_url"] . '" id="ee-msg-edit-frm">';
+		return '<form method="post" action="'.$this->_template_args["edit_message_template_form_url"].'" id="ee-msg-edit-frm">';
 	}
 
 	public function _add_form_element_after() {
@@ -1484,25 +1484,25 @@ 
 	 *
 	 */
 	public function switch_template_pack() {
-		$GRP_ID = ! empty( $this->_req_data['GRP_ID'] ) ? $this->_req_data['GRP_ID'] : 0;
-		$template_pack = ! empty( $this->_req_data['template_pack'] ) ? $this->_req_data['template_pack'] : '';
+		$GRP_ID = ! empty($this->_req_data['GRP_ID']) ? $this->_req_data['GRP_ID'] : 0;
+		$template_pack = ! empty($this->_req_data['template_pack']) ? $this->_req_data['template_pack'] : '';
 
 		//verify we have needed values.
-		if ( empty( $GRP_ID ) || empty( $template_pack ) ) {
+		if (empty($GRP_ID) || empty($template_pack)) {
 			$this->_template_args['error'] = true;
-			EE_Error::add_error( __('The required date for switching templates is not available.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__  );
+			EE_Error::add_error(__('The required date for switching templates is not available.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		} else {
 			//get template, set the new template_pack and then reset to default
 			/** @type EE_Message_Template_Group $message_template_group */
-			$message_template_group = EEM_Message_Template_Group::instance()->get_one_by_ID( $GRP_ID );
+			$message_template_group = EEM_Message_Template_Group::instance()->get_one_by_ID($GRP_ID);
 
-			$message_template_group->set_template_pack_name( $template_pack );
+			$message_template_group->set_template_pack_name($template_pack);
 			$this->_req_data['msgr'] = $message_template_group->messenger();
 			$this->_req_data['mt'] = $message_template_group->message_type();
 
 			$query_args = $this->_reset_to_default_template();
 
-			if ( empty( $query_args['id'] ) ) {
+			if (empty($query_args['id'])) {
 				EE_Error::add_error(
 					__(
 						'Something went wrong with switching the template pack. Please try again or contact EE support',
@@ -1512,7 +1512,7 @@ 
 				);
 				$this->_template_args['error'] = true;
 			} else {
-				$template_label =$message_template_group->get_template_pack()->label;
+				$template_label = $message_template_group->get_template_pack()->label;
 				$template_pack_labels = $message_template_group->messenger_obj()->get_supports_labels();
 				EE_Error::add_success(
 					sprintf(
@@ -1525,7 +1525,7 @@ 
 					)
 				);
 				//generate the redirect url for js.
-				$url = self::add_query_args_and_nonce( $query_args, $this->_admin_base_url );
+				$url = self::add_query_args_and_nonce($query_args, $this->_admin_base_url);
 				$this->_template_args['data']['redirect_url'] = $url;
 				$this->_template_args['success'] = true;
 			}
@@ -1547,9 +1547,9 @@ 
 	protected function _reset_to_default_template() {
 
 		$templates = array();
-		$GRP_ID = !empty( $this->_req_data['GRP_ID'] ) ? $this->_req_data['GRP_ID'] : 0;
+		$GRP_ID = ! empty($this->_req_data['GRP_ID']) ? $this->_req_data['GRP_ID'] : 0;
 		//we need to make sure we've got the info we need.
-		if ( ! isset( $this->_req_data['msgr'], $this->_req_data['mt'], $this->_req_data['GRP_ID'] ) ) {
+		if ( ! isset($this->_req_data['msgr'], $this->_req_data['mt'], $this->_req_data['GRP_ID'])) {
 			EE_Error::add_error(
 				__(
 					'In order to reset the template to its default we require the messenger, message type, and message template GRP_ID to know what is being reset.  At least one of these is missing.',
@@ -1561,9 +1561,9 @@ 
 
 		// all templates will be reset to whatever the defaults are
 		// for the global template matching the messenger and message type.
-		$success = !empty( $GRP_ID ) ? true : false;
+		$success = ! empty($GRP_ID) ? true : false;
 
-		if ( $success ) {
+		if ($success) {
 
 			//let's first determine if the incoming template is a global template,
 			// if it isn't then we need to get the global template matching messenger and message type.
@@ -1571,9 +1571,9 @@ 
 
 
 			//note this is ONLY deleting the template fields (Message Template rows) NOT the message template group.
-			$success = $this->_delete_mtp_permanently( $GRP_ID, false );
+			$success = $this->_delete_mtp_permanently($GRP_ID, false);
 
-			if ( $success ) {
+			if ($success) {
 				// if successfully deleted, lets generate the new ones.
 				// Note. We set GLOBAL to true, because resets on ANY template
 				// will use the related global template defaults for regeneration.
@@ -1591,32 +1591,32 @@ 
 		}
 
 		//any error messages?
-		if ( !$success ) {
+		if ( ! $success) {
 			EE_Error::add_error(
-				__( 'Something went wrong with deleting existing templates. Unable to reset to default', 'event_espresso' ),
+				__('Something went wrong with deleting existing templates. Unable to reset to default', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 		}
 
 		//all good, let's add a success message!
-		if ( $success && ! empty( $templates ) ) {
+		if ($success && ! empty($templates)) {
 			$templates = $templates[0]; //the info for the template we generated is the first element in the returned array.
 			EE_Error::overwrite_success();
-			EE_Error::add_success( __('Templates have been reset to defaults.', 'event_espresso') );
+			EE_Error::add_success(__('Templates have been reset to defaults.', 'event_espresso'));
 		}
 
 
 		$query_args = array(
-			'id' => isset( $templates['GRP_ID'] ) ? $templates['GRP_ID'] : null,
-			'context' => isset( $templates['MTP_context'] ) ? $templates['MTP_context'] : null,
-			'action' => isset( $templates['GRP_ID'] ) ? 'edit_message_template' : 'global_mtps'
+			'id' => isset($templates['GRP_ID']) ? $templates['GRP_ID'] : null,
+			'context' => isset($templates['MTP_context']) ? $templates['MTP_context'] : null,
+			'action' => isset($templates['GRP_ID']) ? 'edit_message_template' : 'global_mtps'
 			);
 
 		//if called via ajax then we return query args otherwise redirect
-		if ( defined('DOING_AJAX') && DOING_AJAX ) {
+		if (defined('DOING_AJAX') && DOING_AJAX) {
 			return $query_args;
 		} else {
-			$this->_redirect_after_action( false, '', '', $query_args, true );
+			$this->_redirect_after_action(false, '', '', $query_args, true);
 			return null;
 		}
 	}
@@ -1629,7 +1629,7 @@ 
 	 * @param bool $send if TRUE then we are doing an actual TEST send with the results of the preview.
 	 * @return string
 	 */
-	public function _preview_message( $send = false ) {
+	public function _preview_message($send = false) {
 		//first make sure we've got the necessary parameters
 		if (
 			! isset(
@@ -1645,13 +1645,13 @@ 
 			);
 		}
 
-		EE_Registry::instance()->REQ->set( 'GRP_ID', $this->_req_data['GRP_ID'] );
+		EE_Registry::instance()->REQ->set('GRP_ID', $this->_req_data['GRP_ID']);
 
 
 		//get the preview!
-		$preview = EED_Messages::preview_message( $this->_req_data['message_type'], $this->_req_data['context'], $this->_req_data['messenger'], $send );
+		$preview = EED_Messages::preview_message($this->_req_data['message_type'], $this->_req_data['context'], $this->_req_data['messenger'], $send);
 
-		if ( $send ) {
+		if ($send) {
 			return $preview;
 		}
 
@@ -1661,22 +1661,22 @@ 
 			'context' => $this->_req_data['context'],
 			'action' => 'edit_message_template'
 			);
-		$go_back_url = parent::add_query_args_and_nonce( $query_args, $this->_admin_base_url );
-		$preview_button = '<a href="' . $go_back_url . '" class="button-secondary messages-preview-go-back-button">' . __('Go Back to Edit', 'event_espresso') . '</a>';
+		$go_back_url = parent::add_query_args_and_nonce($query_args, $this->_admin_base_url);
+		$preview_button = '<a href="'.$go_back_url.'" class="button-secondary messages-preview-go-back-button">'.__('Go Back to Edit', 'event_espresso').'</a>';
 		$message_types = $this->get_installed_message_types();
-		$active_messenger = $this->_message_resource_manager->get_active_messenger( $this->_req_data['messenger'] );
+		$active_messenger = $this->_message_resource_manager->get_active_messenger($this->_req_data['messenger']);
 		$active_messenger_label = $active_messenger instanceof EE_messenger
-			? ucwords( $active_messenger->label['singular'] )
-			: esc_html__( 'Unknown Messenger', 'event_espresso' );
+			? ucwords($active_messenger->label['singular'])
+			: esc_html__('Unknown Messenger', 'event_espresso');
 		//let's provide a helpful title for context
 		$preview_title = sprintf(
-			__( 'Viewing Preview for %s %s Message Template', 'event_espresso' ),
+			__('Viewing Preview for %s %s Message Template', 'event_espresso'),
 			$active_messenger_label,
-			ucwords( $message_types[ $this->_req_data[ 'message_type' ] ]->label[ 'singular' ] )
+			ucwords($message_types[$this->_req_data['message_type']]->label['singular'])
 		);
 		//setup display of preview.
 		$this->_admin_page_title = $preview_title;
-		$this->_template_args['admin_page_content'] = $preview_button . '<br />' .stripslashes($preview);
+		$this->_template_args['admin_page_content'] = $preview_button.'<br />'.stripslashes($preview);
 		$this->_template_args['data']['force_json'] = true;
 		return '';
 	}
@@ -1706,9 +1706,9 @@ 
 	 * @return void
 	 */
 	protected function _register_edit_meta_boxes() {
-		add_meta_box( 'mtp_valid_shortcodes', __('Valid Shortcodes', 'event_espresso'), array( $this, 'shortcode_meta_box' ), $this->_current_screen->id, 'side', 'default' );
-		add_meta_box( 'mtp_extra_actions', __('Extra Actions', 'event_espresso'), array( $this, 'extra_actions_meta_box' ), $this->_current_screen->id, 'side', 'high' );
-		add_meta_box( 'mtp_templates', __('Template Styles', 'event_espresso'), array( $this, 'template_pack_meta_box' ), $this->_current_screen->id, 'side', 'high' );
+		add_meta_box('mtp_valid_shortcodes', __('Valid Shortcodes', 'event_espresso'), array($this, 'shortcode_meta_box'), $this->_current_screen->id, 'side', 'default');
+		add_meta_box('mtp_extra_actions', __('Extra Actions', 'event_espresso'), array($this, 'extra_actions_meta_box'), $this->_current_screen->id, 'side', 'high');
+		add_meta_box('mtp_templates', __('Template Styles', 'event_espresso'), array($this, 'template_pack_meta_box'), $this->_current_screen->id, 'side', 'high');
 	}
 
 
@@ -1727,14 +1727,14 @@ 
 
 		$tp_select_values = array();
 
-		foreach ( $tp_collection as $tp ) {
+		foreach ($tp_collection as $tp) {
 			//only include template packs that support this messenger and message type!
 			$supports = $tp->get_supports();
 			if (
-				! isset( $supports[ $this->_message_template_group->messenger() ] )
+				! isset($supports[$this->_message_template_group->messenger()])
 				|| ! in_array(
 					$this->_message_template_group->message_type(),
-					$supports[ $this->_message_template_group->messenger() ]
+					$supports[$this->_message_template_group->messenger()]
 				)
 			) {
 				//not supported
@@ -1748,7 +1748,7 @@ 
 		}
 
 		//if empty $tp_select_values then we make sure default is set because EVERY message type should be supported by the default template pack.  This still allows for the odd template pack to override.
-		if ( empty( $tp_select_values ) ) {
+		if (empty($tp_select_values)) {
 			$tp_select_values[] = array(
 				'text' => __('Default', 'event_espresso'),
 				'id' => 'default'
@@ -1761,14 +1761,14 @@ 
 			$this->_message_template_group->message_type()
 		);
 		$variations_select_values = array();
-		foreach ( $variations as $variation => $label ) {
+		foreach ($variations as $variation => $label) {
 			$variations_select_values[] = array(
 				'text' => $label,
 				'id' => $variation
 			);
 		}
 
-		$template_pack_labels= $this->_message_template_group->messenger_obj()->get_supports_labels();
+		$template_pack_labels = $this->_message_template_group->messenger_obj()->get_supports_labels();
 
 		$template_args['template_packs_selector'] = EEH_Form_Fields::select_input(
 			'MTP_template_pack',
@@ -1785,9 +1785,9 @@ 
 		$template_args['template_pack_description'] = $template_pack_labels->template_pack_description;
 		$template_args['template_variation_description'] = $template_pack_labels->template_variation_description;
 
-		$template = EE_MSG_TEMPLATE_PATH . 'template_pack_and_variations_metabox.template.php';
+		$template = EE_MSG_TEMPLATE_PATH.'template_pack_and_variations_metabox.template.php';
 
-		EEH_Template::display_template( $template, $template_args );
+		EEH_Template::display_template($template, $template_args);
 	}
 
 
@@ -1818,47 +1818,47 @@ 
 		//first we need to see if there are any fields
 		$fields = $this->_message_template_group->messenger_obj()->get_test_settings_fields();
 
-		if ( !empty( $fields ) ) {
+		if ( ! empty($fields)) {
 			//yup there be fields
-			foreach ( $fields as $field => $config ) {
-				$field_id = $this->_message_template_group->messenger() . '_' . $field;
+			foreach ($fields as $field => $config) {
+				$field_id = $this->_message_template_group->messenger().'_'.$field;
 				$existing = $this->_message_template_group->messenger_obj()->get_existing_test_settings();
-				$default = isset( $config['default'] ) ? $config['default'] : '';
-				$default = isset( $config['value'] ) ? $config['value'] : $default;
+				$default = isset($config['default']) ? $config['default'] : '';
+				$default = isset($config['value']) ? $config['value'] : $default;
 
 				//if type is hidden and the value is empty something may have gone wrong so let's correct with the defaults
 				$fix = $config['input'] == 'hidden' && isset($existing[$field]) && empty($existing[$field]) ? $default : '';
-				$existing[$field] = isset( $existing[$field] ) && empty( $fix ) ? $existing[$field] : $fix;
+				$existing[$field] = isset($existing[$field]) && empty($fix) ? $existing[$field] : $fix;
 
 				$template_form_fields[$field_id] = array(
-					'name' => 'test_settings_fld[' . $field . ']',
+					'name' => 'test_settings_fld['.$field.']',
 					'label' => $config['label'],
 					'input' => $config['input'],
 					'type' => $config['type'],
 					'required' => $config['required'],
 					'validation' => $config['validation'],
-					'value' => isset( $existing[$field] ) ? $existing[$field] : $default,
+					'value' => isset($existing[$field]) ? $existing[$field] : $default,
 					'css_class' => $config['css_class'],
-					'options' => isset( $config['options'] ) ? $config['options'] : array(),
+					'options' => isset($config['options']) ? $config['options'] : array(),
 					'default' => $default,
 					'format' => $config['format']
 					);
 			}
 		}
 
-		$test_settings_fields = !empty( $template_form_fields)
-			? $this->_generate_admin_form_fields( $template_form_fields, 'string', 'ee_tst_settings_flds' )
+		$test_settings_fields = ! empty($template_form_fields)
+			? $this->_generate_admin_form_fields($template_form_fields, 'string', 'ee_tst_settings_flds')
 			: '';
 
 		$test_settings_html = '';
 		//print out $test_settings_fields
-		if ( !empty( $test_settings_fields ) ) {
+		if ( ! empty($test_settings_fields)) {
 			echo $test_settings_fields;
-			$test_settings_html = '<input type="submit" class="button-primary mtp-test-button alignright" name="test_button" value="' . __('Test Send', 'event_espresso') . '" /><div style="clear:both"></div>';
+			$test_settings_html = '<input type="submit" class="button-primary mtp-test-button alignright" name="test_button" value="'.__('Test Send', 'event_espresso').'" /><div style="clear:both"></div>';
 		}
 
 		//and button
-		echo $test_settings_html . '<p>' . __('Need to reset this message type and start over?', 'event_espresso') . '</p>' . '<div class="publishing-action alignright resetbutton">' . $button . '</div><div style="clear:both"></div>';
+		echo $test_settings_html.'<p>'.__('Need to reset this message type and start over?', 'event_espresso').'</p>'.'<div class="publishing-action alignright resetbutton">'.$button.'</div><div style="clear:both"></div>';
 	}
 
 
@@ -1873,13 +1873,13 @@ 
      * @param string $linked_input_id The css id of the input that the shortcodes get added to.
      * @return string
     */
-	protected function _get_shortcode_selector( $field, $linked_input_id ) {
+	protected function _get_shortcode_selector($field, $linked_input_id) {
 		$template_args = array(
-			'shortcodes' => $this->_get_shortcodes( array( $field ), true ),
+			'shortcodes' => $this->_get_shortcodes(array($field), true),
 			'fieldname' => $field,
 			'linked_input_id' => $linked_input_id
 		);
-		return EEH_Template::display_template( EE_MSG_TEMPLATE_PATH . 'shortcode_selector_skeleton.template.php', $template_args, true );
+		return EEH_Template::display_template(EE_MSG_TEMPLATE_PATH.'shortcode_selector_skeleton.template.php', $template_args, true);
 	}
 
 
@@ -1894,13 +1894,13 @@ 
 		$shortcodes = $this->_get_shortcodes(array(), false); //just make sure shortcodes property is set
 		//$messenger = $this->_message_template_group->messenger_obj();
 		//now let's set the content depending on the status of the shortcodes array
-		if ( empty( $shortcodes ) ) {
-			$content = '<p>' . __('There are no valid shortcodes available', 'event_espresso') . '</p>';
+		if (empty($shortcodes)) {
+			$content = '<p>'.__('There are no valid shortcodes available', 'event_espresso').'</p>';
 			echo $content;
 		} else {
 			//$alt = 0;
 			?>
-			<div style="float:right; margin-top:10px"><?php echo $this->_get_help_tab_link('message_template_shortcodes'); ?></div><p class="small-text"><?php printf( __('You can view the shortcodes usable in your template by clicking the %s icon next to each field.', 'event_espresso' ), '<span class="dashicons dashicons-menu"></span>' ); ?></p>
+			<div style="float:right; margin-top:10px"><?php echo $this->_get_help_tab_link('message_template_shortcodes'); ?></div><p class="small-text"><?php printf(__('You can view the shortcodes usable in your template by clicking the %s icon next to each field.', 'event_espresso'), '<span class="dashicons dashicons-menu"></span>'); ?></p>
 			<?php
 		}
 
@@ -1917,7 +1917,7 @@ 
 	protected function _set_shortcodes() {
 
 		//no need to run this if the property is already set
-		if ( !empty($this->_shortcodes ) ) {return;}
+		if ( ! empty($this->_shortcodes)) {return; }
 
 		$this->_shortcodes = $this->_get_shortcodes();
 	}
@@ -1939,14 +1939,14 @@ 
 	 * @return array          Shortcodes indexed by fieldname and the an array of shortcode/label pairs OR if merged is true
 	 *                       just an array of shortcode/label pairs.
 	 */
-	protected function _get_shortcodes( $fields = array(), $merged = true ) {
+	protected function _get_shortcodes($fields = array(), $merged = true) {
 		$this->_set_message_template_group();
 
 		//we need the messenger and message template to retrieve the valid shortcodes array.
-		$GRP_ID = isset( $this->_req_data['id'] ) && !empty( $this->_req_data['id'] ) ? absint( $this->_req_data['id'] ) : false;
-		$context = isset( $this->_req_data['context'] ) ? $this->_req_data['context'] : key( $this->_message_template_group->contexts_config() );
+		$GRP_ID = isset($this->_req_data['id']) && ! empty($this->_req_data['id']) ? absint($this->_req_data['id']) : false;
+		$context = isset($this->_req_data['context']) ? $this->_req_data['context'] : key($this->_message_template_group->contexts_config());
 
-		return !empty($GRP_ID) ? $this->_message_template_group->get_shortcodes( $context, $fields, $merged ) : array();
+		return ! empty($GRP_ID) ? $this->_message_template_group->get_shortcodes($context, $fields, $merged) : array();
 	}
 
 
@@ -1959,19 +1959,19 @@ 
 	 */
 	protected function _set_message_template_group() {
 
-		if ( !empty( $this->_message_template_group ) )
-			{return;} //get out if this is already set.
+		if ( ! empty($this->_message_template_group))
+			{return; } //get out if this is already set.
 
-		$GRP_ID =  ! empty( $this->_req_data['GRP_ID'] ) ? absint( $this->_req_data['GRP_ID'] ) : false;
-		$GRP_ID = empty( $GRP_ID ) && ! empty( $this->_req_data['id'] ) ? $this->_req_data['id'] : $GRP_ID;
+		$GRP_ID = ! empty($this->_req_data['GRP_ID']) ? absint($this->_req_data['GRP_ID']) : false;
+		$GRP_ID = empty($GRP_ID) && ! empty($this->_req_data['id']) ? $this->_req_data['id'] : $GRP_ID;
 
 		//let's get the message templates
 		$MTP = EEM_Message_Template_Group::instance();
 
-		if ( empty($GRP_ID) )
-			{$this->_message_template_group = $MTP->create_default_object();}
+		if (empty($GRP_ID))
+			{$this->_message_template_group = $MTP->create_default_object(); }
 		else
-			{$this->_message_template_group = $MTP->get_one_by_ID( $GRP_ID );}
+			{$this->_message_template_group = $MTP->get_one_by_ID($GRP_ID); }
 
 		$this->_template_pack = $this->_message_template_group->get_template_pack();
 		$this->_variation = $this->_message_template_group->get_template_pack_variation();
@@ -1990,7 +1990,7 @@ 
 	 * @param array $args various things the context switcher needs.
 	 *
 	 */
-	protected function _set_context_switcher( EE_Message_Template_Group $template_group_object, $args) {
+	protected function _set_context_switcher(EE_Message_Template_Group $template_group_object, $args) {
 		$context_details = $template_group_object->contexts_config();
 		$context_label = $template_group_object->context_label();
 		ob_start();
@@ -1998,20 +1998,20 @@ 
 		<div class="ee-msg-switcher-container">
 			<form method="get" action="<?php echo EE_MSG_ADMIN_URL; ?>" id="ee-msg-context-switcher-frm">
 				<?php
-					foreach ( $args as $name => $value ) {
-						if ( $name == 'context' || empty($value) || $name == 'extra' ) {continue;}
+					foreach ($args as $name => $value) {
+						if ($name == 'context' || empty($value) || $name == 'extra') {continue; }
 						?>
 						<input type="hidden" name="<?php echo $name; ?>" value = "<?php echo $value; ?>" />
 						<?php
 					}
 					//setup nonce_url
-					wp_nonce_field($args['action'] . '_nonce', $args['action'] . '_nonce', false);
+					wp_nonce_field($args['action'].'_nonce', $args['action'].'_nonce', false);
 				?>
 				<select name="context">
 					<?php
 					$context_templates = $template_group_object->context_templates();
-					if ( is_array($context_templates) ) :
-							foreach ( $context_templates as $context => $template_fields ) :
+					if (is_array($context_templates)) :
+							foreach ($context_templates as $context => $template_fields) :
 								$checked = ($context == $args['context']) ? 'selected="selected"' : '';
 					?>
 					<option value="<?php echo $context; ?>" <?php echo $checked; ?>>
@@ -2019,7 +2019,7 @@ 
 					</option>
 					<?php endforeach; endif; ?>
 				</select>
-				<?php $button_text = sprintf( __('Switch %s', 'event_espresso'), ucwords($context_label['label']) ); ?>
+				<?php $button_text = sprintf(__('Switch %s', 'event_espresso'), ucwords($context_label['label'])); ?>
 				<input id="submit-msg-context-switcher-sbmt" class="button-secondary" type="submit" value="<?php echo $button_text; ?>">
 			</form>
 			<?php echo $args['extra']; ?>
@@ -2046,8 +2046,8 @@ 
 	 * @return array
 	 */
 	protected function _set_message_template_column_values($index) {
-		if ( is_array($this->_req_data['MTP_template_fields'][$index]['content'] ) ) {
-			foreach ( $this->_req_data['MTP_template_fields'][$index]['content'] as $field => $value ) {
+		if (is_array($this->_req_data['MTP_template_fields'][$index]['content'])) {
+			foreach ($this->_req_data['MTP_template_fields'][$index]['content'] as $field => $value) {
 				$this->_req_data['MTP_template_fields'][$index]['content'][$field] = $value;
 			}
 		} /*else {
@@ -2056,22 +2056,22 @@ 
 
 
 		$set_column_values = array(
-			'MTP_ID'             => absint( $this->_req_data[ 'MTP_template_fields' ][ $index ][ 'MTP_ID' ] ),
-			'GRP_ID'             => absint( $this->_req_data[ 'GRP_ID' ] ),
-			'MTP_user_id'        => absint( $this->_req_data[ 'MTP_user_id' ] ),
-			'MTP_messenger'      => strtolower( $this->_req_data[ 'MTP_messenger' ] ),
-			'MTP_message_type'   => strtolower( $this->_req_data[ 'MTP_message_type' ] ),
-			'MTP_template_field' => strtolower( $this->_req_data[ 'MTP_template_fields' ][ $index ][ 'name' ] ),
-			'MTP_context'        => strtolower( $this->_req_data[ 'MTP_context' ] ),
-			'MTP_content'        => $this->_req_data[ 'MTP_template_fields' ][ $index ][ 'content' ],
-			'MTP_is_global'      => isset( $this->_req_data[ 'MTP_is_global' ] )
-				? absint( $this->_req_data[ 'MTP_is_global' ] )
+			'MTP_ID'             => absint($this->_req_data['MTP_template_fields'][$index]['MTP_ID']),
+			'GRP_ID'             => absint($this->_req_data['GRP_ID']),
+			'MTP_user_id'        => absint($this->_req_data['MTP_user_id']),
+			'MTP_messenger'      => strtolower($this->_req_data['MTP_messenger']),
+			'MTP_message_type'   => strtolower($this->_req_data['MTP_message_type']),
+			'MTP_template_field' => strtolower($this->_req_data['MTP_template_fields'][$index]['name']),
+			'MTP_context'        => strtolower($this->_req_data['MTP_context']),
+			'MTP_content'        => $this->_req_data['MTP_template_fields'][$index]['content'],
+			'MTP_is_global'      => isset($this->_req_data['MTP_is_global'])
+				? absint($this->_req_data['MTP_is_global'])
 				: 0,
-			'MTP_is_override'    => isset( $this->_req_data[ 'MTP_is_override' ] )
-				? absint( $this->_req_data[ 'MTP_is_override' ] )
+			'MTP_is_override'    => isset($this->_req_data['MTP_is_override'])
+				? absint($this->_req_data['MTP_is_override'])
 				: 0,
-			'MTP_deleted'        => absint( $this->_req_data[ 'MTP_deleted' ] ),
-			'MTP_is_active'      => absint( $this->_req_data[ 'MTP_is_active' ] )
+			'MTP_deleted'        => absint($this->_req_data['MTP_deleted']),
+			'MTP_is_active'      => absint($this->_req_data['MTP_is_active'])
 		);
 
 
@@ -2083,36 +2083,36 @@ 
 
 
 
-	protected function _insert_or_update_message_template($new = false ) {
+	protected function _insert_or_update_message_template($new = false) {
 
-		do_action ( 'AHEE_log', __FILE__, __FUNCTION__, '');
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		$success = 0;
 		$override = false;
 
 		//setup notices description
-		$messenger = ! empty( $this->_req_data['MTP_messenger'] )
-			? ucwords( str_replace( '_', ' ', $this->_req_data['MTP_messenger'] ) )
+		$messenger = ! empty($this->_req_data['MTP_messenger'])
+			? ucwords(str_replace('_', ' ', $this->_req_data['MTP_messenger']))
 			: false;
 
-		$message_type = ! empty( $this->_req_data['MTP_message_type'] )
-			? ucwords( str_replace( '_', ' ', $this->_req_data['MTP_message_type'] ) )
+		$message_type = ! empty($this->_req_data['MTP_message_type'])
+			? ucwords(str_replace('_', ' ', $this->_req_data['MTP_message_type']))
 			: false;
 
-		$context = ! empty( $this->_req_data['MTP_context'] )
-			? ucwords( str_replace( '_', ' ', $this->_req_data['MTP_context'] ) )
+		$context = ! empty($this->_req_data['MTP_context'])
+			? ucwords(str_replace('_', ' ', $this->_req_data['MTP_context']))
 			: false;
 
-		$item_desc = $messenger ? $messenger . ' ' . $message_type . ' ' . $context . ' ' : '';
+		$item_desc = $messenger ? $messenger.' '.$message_type.' '.$context.' ' : '';
 		$item_desc .= 'Message Template';
 		$query_args = array();
 		$edit_array = array();
 		$action_desc = '';
 
 		//if this is "new" then we need to generate the default contexts for the selected messenger/message_type for user to edit.
-		if ( $new ) {
-			$GRP_ID = !empty( $this->_req_data['GRP_ID'] ) ? $this->_req_data['GRP_ID'] : 0;
-			if ( $edit_array = $this->_generate_new_templates($messenger, $message_type, $GRP_ID ) ) {
-				if ( empty($edit_array) ) {
+		if ($new) {
+			$GRP_ID = ! empty($this->_req_data['GRP_ID']) ? $this->_req_data['GRP_ID'] : 0;
+			if ($edit_array = $this->_generate_new_templates($messenger, $message_type, $GRP_ID)) {
+				if (empty($edit_array)) {
 					$success = 0;
 				} else {
 					$success = 1;
@@ -2131,7 +2131,7 @@ 
 
 
 			//run update for each template field in displayed context
-			if ( !isset($this->_req_data['MTP_template_fields']) && empty($this->_req_data['MTP_template_fields'] ) ) {
+			if ( ! isset($this->_req_data['MTP_template_fields']) && empty($this->_req_data['MTP_template_fields'])) {
 				EE_Error::add_error(
 					__('There was a problem saving the template fields from the form because I didn\'t receive any actual template field data.', 'event_espresso'),
 					__FILE__, __FUNCTION__, __LINE__
@@ -2140,25 +2140,25 @@ 
 
 			} else {
 				//first validate all fields!
-				$validates = $MTPG->validate($this->_req_data['MTP_template_fields'], $this->_req_data['MTP_context'],  $this->_req_data['MTP_messenger'], $this->_req_data['MTP_message_type']);
+				$validates = $MTPG->validate($this->_req_data['MTP_template_fields'], $this->_req_data['MTP_context'], $this->_req_data['MTP_messenger'], $this->_req_data['MTP_message_type']);
 
 				//if $validate returned error messages (i.e. is_array()) then we need to process them and setup an appropriate response. HMM, dang this isn't correct, $validates will ALWAYS be an array.  WE need to make sure there is no actual error messages in validates.
-				if ( is_array($validates) && !empty($validates) ) {
+				if (is_array($validates) && ! empty($validates)) {
 					//add the transient so when the form loads we know which fields to highlight
-					$this->_add_transient( 'edit_message_template', $validates );
+					$this->_add_transient('edit_message_template', $validates);
 
 					$success = 0;
 
 					//setup notices
-					foreach ( $validates as $field => $error ) {
-						if ( isset($error['msg'] ) ) {
-							EE_Error::add_error( $error['msg'], __FILE__, __FUNCTION__, __LINE__ );
+					foreach ($validates as $field => $error) {
+						if (isset($error['msg'])) {
+							EE_Error::add_error($error['msg'], __FILE__, __FUNCTION__, __LINE__);
 						}
 					}
 
 				} else {
 					$set_column_values = array();
-					foreach ( $this->_req_data['MTP_template_fields'] as $template_field => $content ) {
+					foreach ($this->_req_data['MTP_template_fields'] as $template_field => $content) {
 						$set_column_values = $this->_set_message_template_column_values($template_field);
 
 						$where_cols_n_values = array(
@@ -2171,11 +2171,11 @@ 
 							'MTP_context' => $set_column_values['MTP_context'],
 							'MTP_content' => $set_column_values['MTP_content']
 						);
-						if ( $updated = $MTP->update( $message_template_fields, array( $where_cols_n_values ) ) ) {
-							if ( $updated === false ) {
+						if ($updated = $MTP->update($message_template_fields, array($where_cols_n_values))) {
+							if ($updated === false) {
 								EE_Error::add_error(
 									sprintf(
-										__( '%s field was NOT updated for some reason', 'event_espresso' ),
+										__('%s field was NOT updated for some reason', 'event_espresso'),
 										$template_field
 									),
 									__FILE__, __FUNCTION__, __LINE__
@@ -2189,46 +2189,46 @@ 
 
 					//we can use the last set_column_values for the MTPG update (because its the same for all of these specific MTPs)
 					$mtpg_fields = array(
-						'MTP_user_id'      => $set_column_values[ 'MTP_user_id' ],
-						'MTP_messenger'    => $set_column_values[ 'MTP_messenger' ],
-						'MTP_message_type' => $set_column_values[ 'MTP_message_type' ],
-						'MTP_is_global'    => $set_column_values[ 'MTP_is_global' ],
-						'MTP_is_override'  => $set_column_values[ 'MTP_is_override' ],
-						'MTP_deleted'      => $set_column_values[ 'MTP_deleted' ],
-						'MTP_is_active'    => $set_column_values[ 'MTP_is_active' ],
-						'MTP_name'         => ! empty( $this->_req_data[ 'ee_msg_non_global_fields' ][ 'MTP_name' ] )
-							? $this->_req_data[ 'ee_msg_non_global_fields' ][ 'MTP_name' ]
+						'MTP_user_id'      => $set_column_values['MTP_user_id'],
+						'MTP_messenger'    => $set_column_values['MTP_messenger'],
+						'MTP_message_type' => $set_column_values['MTP_message_type'],
+						'MTP_is_global'    => $set_column_values['MTP_is_global'],
+						'MTP_is_override'  => $set_column_values['MTP_is_override'],
+						'MTP_deleted'      => $set_column_values['MTP_deleted'],
+						'MTP_is_active'    => $set_column_values['MTP_is_active'],
+						'MTP_name'         => ! empty($this->_req_data['ee_msg_non_global_fields']['MTP_name'])
+							? $this->_req_data['ee_msg_non_global_fields']['MTP_name']
 							: '',
-						'MTP_description'  => ! empty( $this->_req_data[ 'ee_msg_non_global_fields' ][ 'MTP_description' ] )
-							? $this->_req_data[ 'ee_msg_non_global_fields' ][ 'MTP_description' ]
+						'MTP_description'  => ! empty($this->_req_data['ee_msg_non_global_fields']['MTP_description'])
+							? $this->_req_data['ee_msg_non_global_fields']['MTP_description']
 							: ''
 					);
 
-					$mtpg_where = array('GRP_ID' => $set_column_values['GRP_ID'] );
-					$updated = $MTPG->update( $mtpg_fields, array($mtpg_where) );
+					$mtpg_where = array('GRP_ID' => $set_column_values['GRP_ID']);
+					$updated = $MTPG->update($mtpg_fields, array($mtpg_where));
 
-					if ( $updated === false ) {
+					if ($updated === false) {
 						EE_Error::add_error(
 							sprintf(
-								__( 'The Message Template Group (%d) was NOT updated for some reason', 'event_espresso' ),
-								$set_column_values[ 'GRP_ID' ]
+								__('The Message Template Group (%d) was NOT updated for some reason', 'event_espresso'),
+								$set_column_values['GRP_ID']
 							),
 							__FILE__, __FUNCTION__, __LINE__
 						);
 					} else {
 						//k now we need to ensure the template_pack and template_variation fields are set.
-						$template_pack = ! empty( $this->_req_data['MTP_template_pack' ] )
+						$template_pack = ! empty($this->_req_data['MTP_template_pack'])
 							? $this->_req_data['MTP_template_pack']
 							: 'default';
 
-						$template_variation = ! empty( $this->_req_data['MTP_template_variation'] )
+						$template_variation = ! empty($this->_req_data['MTP_template_variation'])
 							? $this->_req_data['MTP_template_variation']
 							: 'default';
 
-						$mtpg_obj = $MTPG->get_one_by_ID( $set_column_values['GRP_ID'] );
-						if ( $mtpg_obj instanceof EE_Message_Template_Group ) {
-							$mtpg_obj->set_template_pack_name( $template_pack );
-							$mtpg_obj->set_template_pack_variation( $template_variation );
+						$mtpg_obj = $MTPG->get_one_by_ID($set_column_values['GRP_ID']);
+						if ($mtpg_obj instanceof EE_Message_Template_Group) {
+							$mtpg_obj->set_template_pack_name($template_pack);
+							$mtpg_obj->set_template_pack_variation($template_variation);
 						}
 						$success = 1;
 					}
@@ -2238,7 +2238,7 @@ 
 		}
 
 		//we return things differently if doing ajax
-		if ( defined('DOING_AJAX') && DOING_AJAX ) {
+		if (defined('DOING_AJAX') && DOING_AJAX) {
 			$this->_template_args['success'] = $success;
 			$this->_template_args['error'] = ! $success ? true : false;
 			$this->_template_args['content'] = '';
@@ -2246,9 +2246,9 @@ 
 				'grpID' => $edit_array['GRP_ID'],
 				'templateName' => $edit_array['template_name']
 				);
-			if ( $success ) {
+			if ($success) {
 				EE_Error::overwrite_success();
-				EE_Error::add_success( __('The new template has been created and automatically selected for this event.  You can edit the new template by clicking the edit button.  Note before this template is assigned to this event, the event must be saved.', 'event_espresso') );
+				EE_Error::add_success(__('The new template has been created and automatically selected for this event.  You can edit the new template by clicking the edit button.  Note before this template is assigned to this event, the event must be saved.', 'event_espresso'));
 			}
 
 			$this->_return_json();
@@ -2256,13 +2256,13 @@ 
 
 
 		//was a test send triggered?
-		if ( isset( $this->_req_data['test_button'] ) ) {
+		if (isset($this->_req_data['test_button'])) {
 			EE_Error::overwrite_success();
-			$this->_do_test_send( $this->_req_data['MTP_context'],  $this->_req_data['MTP_messenger'], $this->_req_data['MTP_message_type'] );
+			$this->_do_test_send($this->_req_data['MTP_context'], $this->_req_data['MTP_messenger'], $this->_req_data['MTP_message_type']);
 			$override = true;
 		}
 
-		if ( empty( $query_args ) ) {
+		if (empty($query_args)) {
 			$query_args = array(
 				'id' => $this->_req_data['GRP_ID'],
 				'context' => $this->_req_data['MTP_context'],
@@ -2270,7 +2270,7 @@ 
 				);
 		}
 
-		$this->_redirect_after_action( $success, $item_desc, $action_desc, $query_args, $override );
+		$this->_redirect_after_action($success, $item_desc, $action_desc, $query_args, $override);
 	}
 
 
@@ -2284,28 +2284,28 @@ 
 	 * @param  string $message_type message type being tested
 	 *
 	 */
-	protected function _do_test_send( $context, $messenger, $message_type ) {
+	protected function _do_test_send($context, $messenger, $message_type) {
 		//set things up for preview
 		$this->_req_data['messenger'] = $messenger;
 		$this->_req_data['message_type'] = $message_type;
 		$this->_req_data['context'] = $context;
-		$this->_req_data['GRP_ID'] = isset($this->_req_data['GRP_ID'] ) ? $this->_req_data['GRP_ID'] : '';
-		$active_messenger = $this->_message_resource_manager->get_active_messenger( $messenger );
+		$this->_req_data['GRP_ID'] = isset($this->_req_data['GRP_ID']) ? $this->_req_data['GRP_ID'] : '';
+		$active_messenger = $this->_message_resource_manager->get_active_messenger($messenger);
 
 		//let's save any existing fields that might be required by the messenger
 		if (
-			isset( $this->_req_data['test_settings_fld'] )
+			isset($this->_req_data['test_settings_fld'])
 			&& $active_messenger instanceof EE_messenger
 		) {
-			$active_messenger->set_existing_test_settings( $this->_req_data['test_settings_fld'] );
+			$active_messenger->set_existing_test_settings($this->_req_data['test_settings_fld']);
 		}
 
 		$success = $this->_preview_message(true);
 
-		if ( $success ) {
-			EE_Error::add_success( __('Test message sent', 'event_espresso') );
+		if ($success) {
+			EE_Error::add_success(__('Test message sent', 'event_espresso'));
 		} else {
-			EE_Error::add_error( __('The test message was not sent', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error(__('The test message was not sent', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 
@@ -2331,11 +2331,11 @@ 
 	protected function _generate_new_templates($messenger, $message_types, $GRP_ID = 0, $global = false) {
 
 		//if no $message_types are given then that's okay... this may be a messenger that just adds shortcodes, so we just don't generate any templates.
-		if ( empty( $message_types ) ) {
+		if (empty($message_types)) {
 			return true;
 		}
 
-		return EEH_MSG_Template::generate_new_templates( $messenger, $message_types, $GRP_ID, $global );
+		return EEH_MSG_Template::generate_new_templates($messenger, $message_types, $GRP_ID, $global);
 	}
 
 
@@ -2351,33 +2351,33 @@ 
 	 *
 	 * @return void
 	 */
-	protected function _trash_or_restore_message_template($trash = true, $all = false ) {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+	protected function _trash_or_restore_message_template($trash = true, $all = false) {
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		$MTP = EEM_Message_Template_Group::instance();
 
 		$success = 1;
 
 		//incoming GRP_IDs
-		if ( $all ) {
+		if ($all) {
 			//Checkboxes
-			if ( !empty( $this->_req_data['checkbox'] ) && is_array($this->_req_data['checkbox'] ) ) {
+			if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
 				//if array has more than one element then success message should be plural.
 				//todo: what about nonce?
-				$success = count( $this->_req_data['checkbox'] ) > 1 ? 2 : 1;
+				$success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
 
 				//cycle through checkboxes
-				while ( list( $GRP_ID, $value ) = each ($this->_req_data['checkbox']) ) {
-					$trashed_or_restored = $trash ? $MTP->delete_by_ID( $GRP_ID ) : $MTP->restore_by_ID( $GRP_ID );
-					if ( ! $trashed_or_restored ) {
+				while (list($GRP_ID, $value) = each($this->_req_data['checkbox'])) {
+					$trashed_or_restored = $trash ? $MTP->delete_by_ID($GRP_ID) : $MTP->restore_by_ID($GRP_ID);
+					if ( ! $trashed_or_restored) {
 						$success = 0;
 					}
 				}
 			} else {
 				//grab single GRP_ID and handle
-				$GRP_ID = isset( $this->_req_data['id'] ) ? absint($this->_req_data['id']) : 0;
-				if ( ! empty( $GRP_ID ) ) {
-					$trashed_or_restored = $trash ? $MTP->delete_by_ID( $GRP_ID ) : $MTP->restore_by_ID( $GRP_ID );
-					if ( ! $trashed_or_restored ) {
+				$GRP_ID = isset($this->_req_data['id']) ? absint($this->_req_data['id']) : 0;
+				if ( ! empty($GRP_ID)) {
+					$trashed_or_restored = $trash ? $MTP->delete_by_ID($GRP_ID) : $MTP->restore_by_ID($GRP_ID);
+					if ( ! $trashed_or_restored) {
 						$success = 0;
 					}
 				} else {
@@ -2389,13 +2389,13 @@ 
 
 		$action_desc = $trash ? __('moved to the trash', 'event_espresso') : __('restored', 'event_espresso');
 
-		$action_desc = !empty( $this->_req_data['template_switch'] ) ? __('switched') : $action_desc;
+		$action_desc = ! empty($this->_req_data['template_switch']) ? __('switched') : $action_desc;
 
 		$item_desc = $all ? _n('Message Template Group', 'Message Template Groups', $success, 'event_espresso') : _n('Message Template Context', 'Message Template Contexts', $success, 'event_espresso');
 
-		$item_desc = !empty( $this->_req_data['template_switch'] ) ? _n('template', 'templates', $success, 'event_espresso') : $item_desc;
+		$item_desc = ! empty($this->_req_data['template_switch']) ? _n('template', 'templates', $success, 'event_espresso') : $item_desc;
 
-		$this->_redirect_after_action( $success, $item_desc, $action_desc, array() );
+		$this->_redirect_after_action($success, $item_desc, $action_desc, array());
 
 	}
 
@@ -2411,24 +2411,24 @@ 
 	 * @return void
 	 */
 	protected function _delete_message_template() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		//checkboxes
-		if ( !empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'] ) ) {
+		if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
 			//if array has more than one element then success message should be plural
-			$success = count( $this->_req_data['checkbox'] ) > 1 ? 2 : 1;
+			$success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
 
 			//cycle through bulk action checkboxes
-			while ( list( $GRP_ID, $value ) = each($this->_req_data['checkbox'] ) ) {
-				$success = $this->_delete_mtp_permanently( $GRP_ID );
+			while (list($GRP_ID, $value) = each($this->_req_data['checkbox'])) {
+				$success = $this->_delete_mtp_permanently($GRP_ID);
 			}
 		} else {
 			//grab single grp_id and delete
-			$GRP_ID = absint($this->_req_data['id'] );
-			$success = $this->_delete_mtp_permanently( $GRP_ID );
+			$GRP_ID = absint($this->_req_data['id']);
+			$success = $this->_delete_mtp_permanently($GRP_ID);
 		}
 
-		$this->_redirect_after_action( $success, 'Message Templates', 'deleted', array() );
+		$this->_redirect_after_action($success, 'Message Templates', 'deleted', array());
 
 	}
 
@@ -2443,20 +2443,20 @@ 
 	 *
 	 * @return bool        boolean to indicate the success of the deletes or not.
 	 */
-	private function _delete_mtp_permanently( $GRP_ID, $include_group = true ) {
+	private function _delete_mtp_permanently($GRP_ID, $include_group = true) {
 		$success = 1;
 		$MTPG = EEM_Message_Template_Group::instance();
 		//first let's GET this group
-		$MTG = $MTPG->get_one_by_ID( $GRP_ID );
+		$MTG = $MTPG->get_one_by_ID($GRP_ID);
 		//then delete permanently all the related Message Templates
-		$deleted = $MTG->delete_related_permanently( 'Message_Template' );
+		$deleted = $MTG->delete_related_permanently('Message_Template');
 
-		if ( $deleted === 0 )
-			{$success = 0;}
+		if ($deleted === 0)
+			{$success = 0; }
 
 		//now delete permanently this particular group
 
-		if ( $include_group && ! $MTG->delete_permanently() ) {
+		if ($include_group && ! $MTG->delete_permanently()) {
 			$success = 0;
 		}
 		return $success;
@@ -2474,7 +2474,7 @@ 
 	*	@return string
 	*/
 	protected function _learn_more_about_message_templates_link() {
-		return '<a class="hidden" style="margin:0 20px; cursor:pointer; font-size:12px;" >' . __('learn more about how message templates works', 'event_espresso') . '</a>';
+		return '<a class="hidden" style="margin:0 20px; cursor:pointer; font-size:12px;" >'.__('learn more about how message templates works', 'event_espresso').'</a>';
 	}
 
 
@@ -2492,10 +2492,10 @@ 
 
 		$this->_set_m_mt_settings();
 
-		$selected_messenger = isset( $this->_req_data['selected_messenger'] ) ? $this->_req_data['selected_messenger'] : 'email';
+		$selected_messenger = isset($this->_req_data['selected_messenger']) ? $this->_req_data['selected_messenger'] : 'email';
 
 		//let's setup the messenger tabs
-		$this->_template_args['admin_page_header'] = EEH_Tabbed_Content::tab_text_links( $this->_m_mt_settings['messenger_tabs'], 'messenger_links', '|', $selected_messenger );
+		$this->_template_args['admin_page_header'] = EEH_Tabbed_Content::tab_text_links($this->_m_mt_settings['messenger_tabs'], 'messenger_links', '|', $selected_messenger);
 		$this->_template_args['before_admin_page_content'] = '<div class="ui-widget ui-helper-clearfix">';
 		$this->_template_args['after_admin_page_content'] = '</div><!-- end .ui-widget -->';
 
@@ -2514,7 +2514,7 @@ 
 	 */
 	protected function _set_m_mt_settings() {
 		//first if this is already set then lets get out no need to regenerate data.
-		if ( !empty($this->_m_mt_settings) ) {
+		if ( ! empty($this->_m_mt_settings)) {
 			return;
 		}
 
@@ -2529,10 +2529,10 @@ 
 
 		//assemble the array for the _tab_text_links helper
 
-		foreach ( $messengers as $messenger ) {
+		foreach ($messengers as $messenger) {
 			$this->_m_mt_settings['messenger_tabs'][$messenger->name] = array(
 				'label' => ucwords($messenger->label['singular']),
-				'class' => $this->_message_resource_manager->is_messenger_active( $messenger->name ) ? 'messenger-active' : '',
+				'class' => $this->_message_resource_manager->is_messenger_active($messenger->name) ? 'messenger-active' : '',
 				'href' => $messenger->name,
 				'title' => __('Modify this Messenger', 'event_espresso'),
 				'slug' => $messenger->name,
@@ -2542,26 +2542,26 @@ 
 
 			$message_types_for_messenger = $messenger->get_valid_message_types();
 
-			foreach ( $message_types as $message_type ) {
+			foreach ($message_types as $message_type) {
 				//first we need to verify that this message type is valid with this messenger. Cause if it isn't then it shouldn't show in either the inactive OR active metabox.
-				if ( ! in_array( $message_type->name, $message_types_for_messenger ) ) {
+				if ( ! in_array($message_type->name, $message_types_for_messenger)) {
 					continue;
 				}
 
-				$a_or_i = $this->_message_resource_manager->is_message_type_active_for_messenger( $messenger->name, $message_type->name ) ? 'active' : 'inactive';
+				$a_or_i = $this->_message_resource_manager->is_message_type_active_for_messenger($messenger->name, $message_type->name) ? 'active' : 'inactive';
 
 				$this->_m_mt_settings['message_type_tabs'][$messenger->name][$a_or_i][$message_type->name] = array(
-					'label'    => ucwords( $message_type->label[ 'singular' ] ),
-					'class'    => 'message-type-' . $a_or_i,
-					'slug_id'  => $message_type->name . '-messagetype-' . $messenger->name,
-					'mt_nonce' => wp_create_nonce( $message_type->name . '_nonce' ),
-					'href'     => 'espresso_' . $message_type->name . '_message_type_settings',
+					'label'    => ucwords($message_type->label['singular']),
+					'class'    => 'message-type-'.$a_or_i,
+					'slug_id'  => $message_type->name.'-messagetype-'.$messenger->name,
+					'mt_nonce' => wp_create_nonce($message_type->name.'_nonce'),
+					'href'     => 'espresso_'.$message_type->name.'_message_type_settings',
 					'title'    => $a_or_i == 'active'
-						? __( 'Drag this message type to the Inactive window to deactivate', 'event_espresso' )
-						: __( 'Drag this message type to the messenger to activate', 'event_espresso' ),
+						? __('Drag this message type to the Inactive window to deactivate', 'event_espresso')
+						: __('Drag this message type to the messenger to activate', 'event_espresso'),
 					'content'  => $a_or_i == 'active'
-						? $this->_message_type_settings_content( $message_type, $messenger, true )
-						: $this->_message_type_settings_content( $message_type, $messenger ),
+						? $this->_message_type_settings_content($message_type, $messenger, true)
+						: $this->_message_type_settings_content($message_type, $messenger),
 					'slug'     => $message_type->name,
 					'active'   => $a_or_i == 'active' ? true : false,
 					'obj'      => $message_type
@@ -2580,34 +2580,34 @@ 
 	 *
 	 * @return string                html output for the content
 	 */
-	protected function _message_type_settings_content( $message_type, $messenger, $active = false ) {
+	protected function _message_type_settings_content($message_type, $messenger, $active = false) {
 		//get message type fields
 		$fields = $message_type->get_admin_settings_fields();
-		$settings_template_args['template_form_fields']= '';
+		$settings_template_args['template_form_fields'] = '';
 
-		if ( !empty( $fields ) && $active ) {
+		if ( ! empty($fields) && $active) {
 
-			$existing_settings = $message_type->get_existing_admin_settings( $messenger->name );
+			$existing_settings = $message_type->get_existing_admin_settings($messenger->name);
 
-			foreach( $fields as $fldname => $fldprops ) {
-				$field_id = $messenger->name . '-' . $message_type->name . '-' . $fldname;
+			foreach ($fields as $fldname => $fldprops) {
+				$field_id = $messenger->name.'-'.$message_type->name.'-'.$fldname;
 				$template_form_field[$field_id] = array(
-					'name' => 'message_type_settings[' . $fldname . ']',
+					'name' => 'message_type_settings['.$fldname.']',
 					'label' => $fldprops['label'],
 					'input' => $fldprops['field_type'],
 					'type' => $fldprops['value_type'],
 					'required' => $fldprops['required'],
 					'validation' => $fldprops['validation'],
-					'value' => isset( $existing_settings[$fldname]) ? $existing_settings[$fldname] : $fldprops['default'],
-					'options' => isset( $fldprops['options'] ) ? $fldprops['options'] : array(),
-					'default' => isset( $existing_settings[$fldname] ) ? $existing_settings[$fldname] : $fldprops['default'],
+					'value' => isset($existing_settings[$fldname]) ? $existing_settings[$fldname] : $fldprops['default'],
+					'options' => isset($fldprops['options']) ? $fldprops['options'] : array(),
+					'default' => isset($existing_settings[$fldname]) ? $existing_settings[$fldname] : $fldprops['default'],
 					'css_class' => 'no-drag',
 					'format' => $fldprops['format']
 				);
 			}
 
 
-			$settings_template_args['template_form_fields'] = !empty($template_form_field) ? $this->_generate_admin_form_fields( $template_form_field, 'string', 'ee_mt_activate_form' ) : '';
+			$settings_template_args['template_form_fields'] = ! empty($template_form_field) ? $this->_generate_admin_form_fields($template_form_field, 'string', 'ee_mt_activate_form') : '';
 		}
 
 		$settings_template_args['description'] = $message_type->description;
@@ -2627,13 +2627,13 @@ 
 					)
 				);
 
-		$settings_template_args['hidden_fields'] = $this->_generate_admin_form_fields( $settings_template_args['hidden_fields'], 'array' );
-		$settings_template_args['show_form'] = empty( $settings_template_args['template_form_fields'] ) ? ' hidden' : '';
+		$settings_template_args['hidden_fields'] = $this->_generate_admin_form_fields($settings_template_args['hidden_fields'], 'array');
+		$settings_template_args['show_form'] = empty($settings_template_args['template_form_fields']) ? ' hidden' : '';
 
 
 
-		$template = EE_MSG_TEMPLATE_PATH . 'ee_msg_mt_settings_content.template.php';
-		$content = EEH_Template::display_template( $template, $settings_template_args, true );
+		$template = EE_MSG_TEMPLATE_PATH.'ee_msg_mt_settings_content.template.php';
+		$content = EEH_Template::display_template($template, $settings_template_args, true);
 		return $content;
 	}
 
@@ -2650,27 +2650,27 @@ 
 		$m_boxes = $mt_boxes = array();
 		$m_template_args = $mt_template_args = array();
 
-		$selected_messenger = isset( $this->_req_data['selected_messenger'] ) ? $this->_req_data['selected_messenger'] : 'email';
+		$selected_messenger = isset($this->_req_data['selected_messenger']) ? $this->_req_data['selected_messenger'] : 'email';
 
-		if ( isset( $this->_m_mt_settings[ 'messenger_tabs' ] ) ) {
-			foreach ( $this->_m_mt_settings[ 'messenger_tabs' ] as $messenger => $tab_array ) {
-				$hide_on_message = $this->_message_resource_manager->is_messenger_active( $messenger ) ? '' : 'hidden';
-				$hide_off_message = $this->_message_resource_manager->is_messenger_active( $messenger ) ? 'hidden' : '';
+		if (isset($this->_m_mt_settings['messenger_tabs'])) {
+			foreach ($this->_m_mt_settings['messenger_tabs'] as $messenger => $tab_array) {
+				$hide_on_message = $this->_message_resource_manager->is_messenger_active($messenger) ? '' : 'hidden';
+				$hide_off_message = $this->_message_resource_manager->is_messenger_active($messenger) ? 'hidden' : '';
 				//messenger meta boxes
 				$active = $selected_messenger == $messenger ? true : false;
-				$active_mt_tabs = isset( $this->_m_mt_settings[ 'message_type_tabs' ][ $messenger ][ 'active' ] )
-				? $this->_m_mt_settings[ 'message_type_tabs' ][ $messenger ][ 'active' ]
+				$active_mt_tabs = isset($this->_m_mt_settings['message_type_tabs'][$messenger]['active'])
+				? $this->_m_mt_settings['message_type_tabs'][$messenger]['active']
 				: '';
-				$m_boxes[ $messenger . '_a_box' ] = sprintf(
-				__( '%s Settings', 'event_espresso' ),
-				$tab_array[ 'label' ]
+				$m_boxes[$messenger.'_a_box'] = sprintf(
+				__('%s Settings', 'event_espresso'),
+				$tab_array['label']
 				);
-				$m_template_args[ $messenger . '_a_box' ] = array(
-				'active_message_types'   => ! empty( $active_mt_tabs ) ? $this->_get_mt_tabs( $active_mt_tabs ) : '',
-				'inactive_message_types' => isset( $this->_m_mt_settings[ 'message_type_tabs' ][ $messenger ][ 'inactive' ] )
-				? $this->_get_mt_tabs( $this->_m_mt_settings[ 'message_type_tabs' ][ $messenger ][ 'inactive' ] )
+				$m_template_args[$messenger.'_a_box'] = array(
+				'active_message_types'   => ! empty($active_mt_tabs) ? $this->_get_mt_tabs($active_mt_tabs) : '',
+				'inactive_message_types' => isset($this->_m_mt_settings['message_type_tabs'][$messenger]['inactive'])
+				? $this->_get_mt_tabs($this->_m_mt_settings['message_type_tabs'][$messenger]['inactive'])
 				: '',
-				'content'                => $this->_get_messenger_box_content( $tab_array[ 'obj' ] ),
+				'content'                => $this->_get_messenger_box_content($tab_array['obj']),
 				'hidden'                 => $active ? '' : ' hidden',
 				'hide_on_message'        => $hide_on_message,
 				'messenger'              => $messenger,
@@ -2679,11 +2679,11 @@ 
 				// message type meta boxes
 				// (which is really just the inactive container for each messenger
 				// showing inactive message types for that messenger)
-				$mt_boxes[ $messenger . '_i_box' ] = __( 'Inactive Message Types', 'event_espresso' );
-				$mt_template_args[ $messenger . '_i_box' ] = array(
-				'active_message_types'   => ! empty( $active_mt_tabs ) ? $this->_get_mt_tabs( $active_mt_tabs ) : '',
-				'inactive_message_types' => isset( $this->_m_mt_settings[ 'message_type_tabs' ][ $messenger ][ 'inactive' ] )
-				? $this->_get_mt_tabs( $this->_m_mt_settings[ 'message_type_tabs' ][ $messenger ][ 'inactive' ] )
+				$mt_boxes[$messenger.'_i_box'] = __('Inactive Message Types', 'event_espresso');
+				$mt_template_args[$messenger.'_i_box'] = array(
+				'active_message_types'   => ! empty($active_mt_tabs) ? $this->_get_mt_tabs($active_mt_tabs) : '',
+				'inactive_message_types' => isset($this->_m_mt_settings['message_type_tabs'][$messenger]['inactive'])
+				? $this->_get_mt_tabs($this->_m_mt_settings['message_type_tabs'][$messenger]['inactive'])
 				: '',
 				'hidden'                 => $active ? '' : ' hidden',
 				'hide_on_message'        => $hide_on_message,
@@ -2696,12 +2696,12 @@ 
 
 
 		//register messenger metaboxes
-		$m_template_path = EE_MSG_TEMPLATE_PATH . 'ee_msg_details_messenger_mt_meta_box.template.php';
-		foreach ( $m_boxes as $box => $label ) {
-			$callback_args = array( 'template_path' => $m_template_path, 'template_args' => $m_template_args[$box] );
-			$msgr = str_replace( '_a_box', '', $box );
+		$m_template_path = EE_MSG_TEMPLATE_PATH.'ee_msg_details_messenger_mt_meta_box.template.php';
+		foreach ($m_boxes as $box => $label) {
+			$callback_args = array('template_path' => $m_template_path, 'template_args' => $m_template_args[$box]);
+			$msgr = str_replace('_a_box', '', $box);
 			add_meta_box(
-				'espresso_' . $msgr . '_settings',
+				'espresso_'.$msgr.'_settings',
 				$label,
 				create_function(
 					'$post, $metabox',
@@ -2715,14 +2715,14 @@ 
 		}
 
 		//register message type metaboxes
-		$mt_template_path = EE_MSG_TEMPLATE_PATH . 'ee_msg_details_messenger_meta_box.template.php';
-		foreach ( $mt_boxes as $box => $label ) {
+		$mt_template_path = EE_MSG_TEMPLATE_PATH.'ee_msg_details_messenger_meta_box.template.php';
+		foreach ($mt_boxes as $box => $label) {
 			$callback_args = array(
-				'template_path' => $mt_template_path, 'template_args' => $mt_template_args[ $box ]
+				'template_path' => $mt_template_path, 'template_args' => $mt_template_args[$box]
 			);
-			$mt = str_replace( '_i_box', '', $box );
+			$mt = str_replace('_i_box', '', $box);
 			add_meta_box(
-				'espresso_' . $mt . '_inactive_mts',
+				'espresso_'.$mt.'_inactive_mts',
 				$label,
 				create_function(
 					'$post, $metabox',
@@ -2745,13 +2745,13 @@ 
 	 *
 	 * @return string            html formatted tabs
 	 */
-	protected function _get_mt_tabs( $tab_array ) {
+	protected function _get_mt_tabs($tab_array) {
 		$tab_array = (array) $tab_array;
-		$template = EE_MSG_TEMPLATE_PATH . 'ee_msg_details_mt_settings_tab_item.template.php';
+		$template = EE_MSG_TEMPLATE_PATH.'ee_msg_details_mt_settings_tab_item.template.php';
 		$tabs = '';
 
-		foreach ( $tab_array as $tab ) {
-			$tabs .=  EEH_Template::display_template( $template, $tab, true );
+		foreach ($tab_array as $tab) {
+			$tabs .= EEH_Template::display_template($template, $tab, true);
 		}
 
 		return $tabs;
@@ -2767,29 +2767,29 @@ 
 	 *
 	 * @return string            html formatted content
 	 */
-	protected function _get_messenger_box_content( EE_messenger $messenger ) {
+	protected function _get_messenger_box_content(EE_messenger $messenger) {
 
 		$fields = $messenger->get_admin_settings_fields();
 		$settings_template_args['template_form_fields'] = '';
 
 		//is $messenger active?
-		$settings_template_args['active'] = $this->_message_resource_manager->is_messenger_active( $messenger->name );
+		$settings_template_args['active'] = $this->_message_resource_manager->is_messenger_active($messenger->name);
 
 
-		if ( ! empty( $fields ) ) {
+		if ( ! empty($fields)) {
 
 			$existing_settings = $messenger->get_existing_admin_settings();
 
-			foreach( $fields as $fldname => $fldprops ) {
-				$field_id = $messenger->name . '-' . $fldname;
+			foreach ($fields as $fldname => $fldprops) {
+				$field_id = $messenger->name.'-'.$fldname;
 				$template_form_field[$field_id] = array(
-					'name' => 'messenger_settings[' . $field_id . ']',
+					'name' => 'messenger_settings['.$field_id.']',
 					'label' => $fldprops['label'],
 					'input' => $fldprops['field_type'],
 					'type' => $fldprops['value_type'],
 					'required' => $fldprops['required'],
 					'validation' => $fldprops['validation'],
-					'value' => isset( $existing_settings[$field_id])
+					'value' => isset($existing_settings[$field_id])
 						? $existing_settings[$field_id]
 						: $fldprops['default'],
 					'css_class' => '',
@@ -2798,8 +2798,8 @@ 
 			}
 
 
-			$settings_template_args['template_form_fields'] = !empty($template_form_field)
-				? $this->_generate_admin_form_fields( $template_form_field, 'string', 'ee_m_activate_form' )
+			$settings_template_args['template_form_fields'] = ! empty($template_form_field)
+				? $this->_generate_admin_form_fields($template_form_field, 'string', 'ee_m_activate_form')
 				: '';
 		}
 
@@ -2816,39 +2816,39 @@ 
 			);
 
 		//make sure any active message types that are existing are included in the hidden fields
-		if ( isset( $this->_m_mt_settings['message_type_tabs'][$messenger->name]['active'] ) ) {
-			foreach ( $this->_m_mt_settings['message_type_tabs'][$messenger->name]['active'] as $mt => $values ) {
+		if (isset($this->_m_mt_settings['message_type_tabs'][$messenger->name]['active'])) {
+			foreach ($this->_m_mt_settings['message_type_tabs'][$messenger->name]['active'] as $mt => $values) {
 				$settings_template_args['hidden_fields']['messenger_settings[message_types]['.$mt.']'] = array(
 						'type' => 'hidden',
 						'value' => $mt
 					);
 			}
 		}
-		$settings_template_args[ 'hidden_fields' ] = $this->_generate_admin_form_fields(
-			$settings_template_args[ 'hidden_fields' ],
+		$settings_template_args['hidden_fields'] = $this->_generate_admin_form_fields(
+			$settings_template_args['hidden_fields'],
 			'array'
 		);
-		$active = $this->_message_resource_manager->is_messenger_active( $messenger->name );
+		$active = $this->_message_resource_manager->is_messenger_active($messenger->name);
 
 		$settings_template_args['messenger'] = $messenger->name;
 		$settings_template_args['description'] = $messenger->description;
 		$settings_template_args['show_hide_edit_form'] = $active ? '' : ' hidden';
 
 
-		$settings_template_args['show_hide_edit_form'] = $this->_message_resource_manager->is_messenger_active( $messenger->name )
+		$settings_template_args['show_hide_edit_form'] = $this->_message_resource_manager->is_messenger_active($messenger->name)
 			? $settings_template_args['show_hide_edit_form']
 			: ' hidden';
 
-		$settings_template_args['show_hide_edit_form'] = empty( $settings_template_args['template_form_fields'] )
+		$settings_template_args['show_hide_edit_form'] = empty($settings_template_args['template_form_fields'])
 			? ' hidden'
 			: $settings_template_args['show_hide_edit_form'];
 
 
 		$settings_template_args['on_off_action'] = $active ? 'messenger-off' : 'messenger-on';
-		$settings_template_args['nonce'] = wp_create_nonce('activate_' . $messenger->name . '_toggle_nonce');
+		$settings_template_args['nonce'] = wp_create_nonce('activate_'.$messenger->name.'_toggle_nonce');
 		$settings_template_args['on_off_status'] = $active ? true : false;
-		$template = EE_MSG_TEMPLATE_PATH . 'ee_msg_m_settings_content.template.php';
-		$content = EEH_Template::display_template( $template, $settings_template_args, true);
+		$template = EE_MSG_TEMPLATE_PATH.'ee_msg_m_settings_content.template.php';
+		$content = EEH_Template::display_template($template, $settings_template_args, true);
 		return $content;
 	}
 
@@ -2862,9 +2862,9 @@ 
 		$success = true;
 		$this->_prep_default_response_for_messenger_or_message_type_toggle();
 		//let's check that we have required data
-		if ( !isset( $this->_req_data[ 'messenger' ] ) ) {
+		if ( ! isset($this->_req_data['messenger'])) {
 			EE_Error::add_error(
-				__( 'Messenger name needed to toggle activation. None given', 'event_espresso' ),
+				__('Messenger name needed to toggle activation. None given', 'event_espresso'),
 				__FILE__,
 				__FUNCTION__,
 				__LINE__
@@ -2873,14 +2873,14 @@ 
 		}
 
 		//do a nonce check here since we're not arriving via a normal route
-		$nonce = isset($this->_req_data[ 'activate_nonce' ]) ? sanitize_text_field( $this->_req_data[ 'activate_nonce'] ) : '';
-		$nonce_ref = 'activate_' . $this->_req_data['messenger'] . '_toggle_nonce';
+		$nonce = isset($this->_req_data['activate_nonce']) ? sanitize_text_field($this->_req_data['activate_nonce']) : '';
+		$nonce_ref = 'activate_'.$this->_req_data['messenger'].'_toggle_nonce';
 
-		$this->_verify_nonce( $nonce, $nonce_ref );
+		$this->_verify_nonce($nonce, $nonce_ref);
 
 
 
-		if ( !isset( $this->_req_data[ 'status' ])) {
+		if ( ! isset($this->_req_data['status'])) {
 			EE_Error::add_error(
 				__(
 					'Messenger status needed to know whether activation or deactivation is happening. No status is given',
@@ -2896,11 +2896,11 @@ 
 		//do check to verify we have a valid status.
 		$status = $this->_req_data['status'];
 
-		if ( $status != 'off' && $status != 'on' ) {
+		if ($status != 'off' && $status != 'on') {
 			EE_Error::add_error(
 				sprintf(
-					__( 'The given status (%s) is not valid. Must be "off" or "on"', 'event_espresso' ),
-					$this->_req_data[ 'status' ]
+					__('The given status (%s) is not valid. Must be "off" or "on"', 'event_espresso'),
+					$this->_req_data['status']
 				),
 				__FILE__,
 				__FUNCTION__,
@@ -2909,11 +2909,11 @@ 
 			$success = false;
 		}
 
-		if ( $success ) {
+		if ($success) {
 			//made it here?  Stop dawdling then!!
 			$success = $status == 'off'
-				? $this->_deactivate_messenger( $this->_req_data['messenger'] )
-				: $this->_activate_messenger( $this->_req_data['messenger'] );
+				? $this->_deactivate_messenger($this->_req_data['messenger'])
+				: $this->_activate_messenger($this->_req_data['messenger']);
 		}
 
 		$this->_template_args['success'] = $success;
@@ -2936,7 +2936,7 @@ 
 		$this->_prep_default_response_for_messenger_or_message_type_toggle();
 
 		//let's make sure we have the necessary data
-		if ( ! isset( $this->_req_data[ 'message_type' ] ) ) {
+		if ( ! isset($this->_req_data['message_type'])) {
 			EE_Error::add_error(
 				__('Message Type name needed to toggle activation. None given', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
@@ -2944,7 +2944,7 @@ 
 			$success = false;
 		}
 
-		if ( ! isset( $this->_req_data[ 'messenger' ] ) ) {
+		if ( ! isset($this->_req_data['messenger'])) {
 			EE_Error::add_error(
 				__('Messenger name needed to toggle activation. None given', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
@@ -2952,7 +2952,7 @@ 
 			$success = false;
 		}
 
-		if ( ! isset( $this->_req_data[ 'status' ])) {
+		if ( ! isset($this->_req_data['status'])) {
 			EE_Error::add_error(
 				__('Messenger status needed to know whether activation or deactivation is happening. No status is given', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
@@ -2964,7 +2964,7 @@ 
 		//do check to verify we have a valid status.
 		$status = $this->_req_data['status'];
 
-		if ( $status != 'activate' && $status != 'deactivate' ) {
+		if ($status != 'activate' && $status != 'deactivate') {
 			EE_Error::add_error(
 				sprintf(
 					__('The given status (%s) is not valid. Must be "active" or "inactive"', 'event_espresso'),
@@ -2977,16 +2977,16 @@ 
 
 
 		//do a nonce check here since we're not arriving via a normal route
-		$nonce = isset( $this->_req_data['mt_nonce'] ) ? sanitize_text_field( $this->_req_data['mt_nonce'] ) : '';
-		$nonce_ref = $this->_req_data['message_type'] . '_nonce';
+		$nonce = isset($this->_req_data['mt_nonce']) ? sanitize_text_field($this->_req_data['mt_nonce']) : '';
+		$nonce_ref = $this->_req_data['message_type'].'_nonce';
 
-		$this->_verify_nonce( $nonce, $nonce_ref );
+		$this->_verify_nonce($nonce, $nonce_ref);
 
-		if ( $success ) {
+		if ($success) {
 			//made it here? um, what are you waiting for then?
 			$success = $status == 'deactivate'
-				? $this->_deactivate_message_type_for_messenger( $this->_req_data['messenger'], $this->_req_data['message_type'] )
-				: $this->_activate_message_type_for_messenger( $this->_req_data['messenger'], $this->_req_data['message_type'] );
+				? $this->_deactivate_message_type_for_messenger($this->_req_data['messenger'], $this->_req_data['message_type'])
+				: $this->_activate_message_type_for_messenger($this->_req_data['messenger'], $this->_req_data['message_type']);
 		}
 
 		$this->_template_args['success'] = $success;
@@ -3000,30 +3000,30 @@ 
 	 * @param string $messenger_name The name of the messenger being activated
 	 * @return bool
 	 */
-	protected function _activate_messenger( $messenger_name ) {
+	protected function _activate_messenger($messenger_name) {
 		/** @var EE_messenger $active_messenger  This will be present because it can't be toggled if it isn't*/
-		$active_messenger = $this->_message_resource_manager->get_messenger( $messenger_name );
+		$active_messenger = $this->_message_resource_manager->get_messenger($messenger_name);
 		$message_types_to_activate = $active_messenger instanceof EE_Messenger ? $active_messenger->get_default_message_types() : array();
 
 		//ensure is active
-		$this->_message_resource_manager->activate_messenger( $messenger_name, $message_types_to_activate );
+		$this->_message_resource_manager->activate_messenger($messenger_name, $message_types_to_activate);
 
 		//set response_data for reload
-		foreach( $message_types_to_activate as $message_type_name ) {
+		foreach ($message_types_to_activate as $message_type_name) {
 			/** @var EE_message_type $message_type */
-			$message_type = $this->_message_resource_manager->get_message_type( $message_type_name );
-			if ( $this->_message_resource_manager->is_message_type_active_for_messenger( $messenger_name, $message_type_name )
+			$message_type = $this->_message_resource_manager->get_message_type($message_type_name);
+			if ($this->_message_resource_manager->is_message_type_active_for_messenger($messenger_name, $message_type_name)
 			     && $message_type instanceof EE_message_type
 			) {
 				$this->_template_args['data']['active_mts'][] = $message_type_name;
-				if ( $message_type->get_admin_settings_fields() ) {
+				if ($message_type->get_admin_settings_fields()) {
 					$this->_template_args['data']['mt_reload'][] = $message_type_name;
 				}
 			}
 		}
 
 		//add success message for activating messenger
-		return $this->_setup_response_message_for_activating_messenger_with_message_types( $active_messenger );
+		return $this->_setup_response_message_for_activating_messenger_with_message_types($active_messenger);
 
 	}
 
@@ -3034,11 +3034,11 @@ 
 	 * @param string $messenger_name The name of the messenger being activated
 	 * @return bool
 	 */
-	protected function _deactivate_messenger( $messenger_name ) {
+	protected function _deactivate_messenger($messenger_name) {
 		/** @var EE_messenger $active_messenger  This will be present because it can't be toggled if it isn't*/
-		$active_messenger = $this->_message_resource_manager->get_messenger( $messenger_name );
-		$this->_message_resource_manager->deactivate_messenger( $messenger_name );
-		return $this->_setup_response_message_for_deactivating_messenger_with_message_types( $active_messenger );
+		$active_messenger = $this->_message_resource_manager->get_messenger($messenger_name);
+		$this->_message_resource_manager->deactivate_messenger($messenger_name);
+		return $this->_setup_response_message_for_deactivating_messenger_with_message_types($active_messenger);
 	}
 
 
@@ -3049,23 +3049,23 @@ 
 	 * @param string $message_type_name  The name of the message type being activated for the messenger
 	 * @return bool
 	 */
-	protected function _activate_message_type_for_messenger( $messenger_name, $message_type_name ) {
+	protected function _activate_message_type_for_messenger($messenger_name, $message_type_name) {
 		/** @var EE_messenger $active_messenger  This will be present because it can't be toggled if it isn't*/
-		$active_messenger = $this->_message_resource_manager->get_messenger( $messenger_name );
+		$active_messenger = $this->_message_resource_manager->get_messenger($messenger_name);
 		/** @var EE_message_type $message_type_to_activate This will be present because it can't be toggled if it isn't*/
-		$message_type_to_activate = $this->_message_resource_manager->get_message_type( $message_type_name );
+		$message_type_to_activate = $this->_message_resource_manager->get_message_type($message_type_name);
 
 		//ensure is active
-		$this->_message_resource_manager->activate_messenger( $messenger_name, $message_type_name );
+		$this->_message_resource_manager->activate_messenger($messenger_name, $message_type_name);
 
 		//set response for load
-		if ( $this->_message_resource_manager->is_message_type_active_for_messenger( $messenger_name, $message_type_name ) ) {
+		if ($this->_message_resource_manager->is_message_type_active_for_messenger($messenger_name, $message_type_name)) {
 			$this->_template_args['data']['active_mts'][] = $message_type_name;
-			if ( $message_type_to_activate->get_admin_settings_fields() ) {
+			if ($message_type_to_activate->get_admin_settings_fields()) {
 				$this->_template_args['data']['mt_reload'][] = $message_type_name;
 			}
 		}
-		return $this->_setup_response_message_for_activating_messenger_with_message_types( $active_messenger, $message_type_to_activate );
+		return $this->_setup_response_message_for_activating_messenger_with_message_types($active_messenger, $message_type_to_activate);
 	}
 
 
@@ -3077,13 +3077,13 @@ 
 	 * @param string $message_type_name  The name of the message type being deactivated for the messenger
 	 * @return bool
 	 */
-	protected function _deactivate_message_type_for_messenger( $messenger_name, $message_type_name ) {
+	protected function _deactivate_message_type_for_messenger($messenger_name, $message_type_name) {
 		/** @var EE_messenger $active_messenger  This will be present because it can't be toggled if it isn't*/
-		$active_messenger = $this->_message_resource_manager->get_messenger( $messenger_name );
+		$active_messenger = $this->_message_resource_manager->get_messenger($messenger_name);
 		/** @var EE_message_type $message_type_to_activate This will be present because it can't be toggled if it isn't*/
-		$message_type_to_deactivate = $this->_message_resource_manager->get_message_type( $message_type_name );
-		$this->_message_resource_manager->deactivate_message_type_for_messenger( $message_type_name, $messenger_name );
-		return $this->_setup_response_message_for_deactivating_messenger_with_message_types( $active_messenger, $message_type_to_deactivate );
+		$message_type_to_deactivate = $this->_message_resource_manager->get_message_type($message_type_name);
+		$this->_message_resource_manager->deactivate_message_type_for_messenger($message_type_name, $messenger_name);
+		return $this->_setup_response_message_for_deactivating_messenger_with_message_types($active_messenger, $message_type_to_deactivate);
 	}
 
 
@@ -3114,9 +3114,9 @@ 
 		EE_Message_Type $message_type = null
 	) {
 		//if $messenger isn't a valid messenger object then get out.
-		if ( ! $messenger instanceof EE_Messenger ) {
+		if ( ! $messenger instanceof EE_Messenger) {
 			EE_Error::add_error(
-				__( 'The messenger being activated is not a valid messenger', 'event_espresso' ),
+				__('The messenger being activated is not a valid messenger', 'event_espresso'),
 				__FILE__,
 				__FUNCTION__,
 				__LINE__
@@ -3124,32 +3124,32 @@ 
 			return false;
 		}
 		//activated
-		if ( $this->_template_args['data']['active_mts'] ) {
+		if ($this->_template_args['data']['active_mts']) {
 			EE_Error::overwrite_success();
 			//activated a message type with the messenger
-			if ( $message_type instanceof EE_message_type ) {
+			if ($message_type instanceof EE_message_type) {
 				EE_Error::add_success(
 					sprintf(
 						__('%s message type has been successfully activated with the %s messenger', 'event_espresso'),
-						ucwords( $message_type->label['singular'] ),
-						ucwords( $messenger->label['singular'] )
+						ucwords($message_type->label['singular']),
+						ucwords($messenger->label['singular'])
 					)
 				);
 
 				//if message type was invoice then let's make sure we activate the invoice payment method.
-				if ( $message_type->name == 'invoice' ) {
-					EE_Registry::instance()->load_lib( 'Payment_Method_Manager' );
-					$pm = EE_Payment_Method_Manager::instance()->activate_a_payment_method_of_type( 'Invoice' );
-					if ( $pm instanceof EE_Payment_Method ) {
-						EE_Error::add_attention( __('Activating the invoice message type also automatically activates the invoice payment method.  If you do not wish the invoice payment method to be active, or to change its settings, visit the payment method admin page.', 'event_espresso' ) );
+				if ($message_type->name == 'invoice') {
+					EE_Registry::instance()->load_lib('Payment_Method_Manager');
+					$pm = EE_Payment_Method_Manager::instance()->activate_a_payment_method_of_type('Invoice');
+					if ($pm instanceof EE_Payment_Method) {
+						EE_Error::add_attention(__('Activating the invoice message type also automatically activates the invoice payment method.  If you do not wish the invoice payment method to be active, or to change its settings, visit the payment method admin page.', 'event_espresso'));
 					}
 				}
 			//just toggles the entire messenger
 			} else {
 				EE_Error::add_success(
 					sprintf(
-						__( '%s messenger has been successfully activated', 'event_espresso' ),
-						ucwords( $messenger->label[ 'singular' ] )
+						__('%s messenger has been successfully activated', 'event_espresso'),
+						ucwords($messenger->label['singular'])
 					)
 				);
 			}
@@ -3159,12 +3159,12 @@ 
 		//message types after the activation process.  However its possible some messengers don't HAVE any default_message_types
 		//in which case we just give a success message for the messenger being successfully activated.
 		} else {
-			if ( ! $messenger->get_default_message_types() ) {
+			if ( ! $messenger->get_default_message_types()) {
 				//messenger doesn't have any default message types so still a success.
 				EE_Error::add_success(
 					sprintf(
-						__('%s messenger was successfully activated.', 'event_espresso' ),
-						ucwords( $messenger->label['singular'] )
+						__('%s messenger was successfully activated.', 'event_espresso'),
+						ucwords($messenger->label['singular'])
 						)
 				);
 				return true;
@@ -3172,13 +3172,13 @@ 
 				EE_Error::add_error(
 					$message_type instanceof EE_message_type
 						? sprintf(
-						__( '%s message type was not successfully activated with the %s messenger', 'event_espresso' ),
-						ucwords( $message_type->label['singular'] ),
-						ucwords( $messenger->label['singular'] )
+						__('%s message type was not successfully activated with the %s messenger', 'event_espresso'),
+						ucwords($message_type->label['singular']),
+						ucwords($messenger->label['singular'])
 					)
 						: sprintf(
-						__( '%s messenger was not successfully activated', 'event_espresso' ),
-						ucwords( $messenger->label['singular'] )
+						__('%s messenger was not successfully activated', 'event_espresso'),
+						ucwords($messenger->label['singular'])
 					),
 					__FILE__,
 					__FUNCTION__,
@@ -3206,9 +3206,9 @@ 
 		EE_Error::overwrite_success();
 
 		//if $messenger isn't a valid messenger object then get out.
-		if ( ! $messenger instanceof EE_Messenger ) {
+		if ( ! $messenger instanceof EE_Messenger) {
 			EE_Error::add_error(
-				__( 'The messenger being deactivated is not a valid messenger', 'event_espresso' ),
+				__('The messenger being deactivated is not a valid messenger', 'event_espresso'),
 				__FILE__,
 				__FUNCTION__,
 				__LINE__
@@ -3216,13 +3216,13 @@ 
 			return false;
 		}
 
-		if ( $message_type instanceof EE_message_type ) {
+		if ($message_type instanceof EE_message_type) {
 			$message_type_name = $message_type->name;
 			EE_Error::add_success(
 				sprintf(
 					__('%s message type has been successfully deactivated for the %s messenger.', 'event_espresso'),
-					ucwords( $message_type->label['singular'] ),
-					ucwords ( $messenger->label['singular'] )
+					ucwords($message_type->label['singular']),
+					ucwords($messenger->label['singular'])
 				)
 			);
 		} else {
@@ -3230,20 +3230,20 @@ 
 			EE_Error::add_success(
 				sprintf(
 					__('%s messenger has been successfully deactivated.', 'event_espresso'),
-					ucwords( $messenger->label['singular'] )
+					ucwords($messenger->label['singular'])
 				)
 			);
 		}
 
 		//if messenger was html or message type was invoice then let's make sure we deactivate invoice payment method.
-		if ( $messenger->name == 'html'  || $message_type_name == 'invoice') {
-			EE_Registry::instance()->load_lib( 'Payment_Method_Manager' );
-			$count_updated = EE_Payment_Method_Manager::instance()->deactivate_payment_method( 'invoice' );
-			if ( $count_updated > 0 ) {
+		if ($messenger->name == 'html' || $message_type_name == 'invoice') {
+			EE_Registry::instance()->load_lib('Payment_Method_Manager');
+			$count_updated = EE_Payment_Method_Manager::instance()->deactivate_payment_method('invoice');
+			if ($count_updated > 0) {
 				$msg = $message_type_name == 'invoice'
-					? __('Deactivating the invoice message type also automatically deactivates the invoice payment method. In order for invoices to be generated the invoice message type must be active. If you completed this action by mistake, simply reactivate the invoice message type and then visit the payment methods admin page to reactivate the invoice payment method.', 'event_espresso' )
-					: __('Deactivating the html messenger also automatically deactivates the invoice payment method.  In order for invoices to be generated the html messenger must be be active.  If you completed this action by mistake, simply reactivate the html messenger, then visit the payment methods admin page to reactivate the invoice payment method.', 'event_espresso' );
-				EE_Error::add_attention( $msg );
+					? __('Deactivating the invoice message type also automatically deactivates the invoice payment method. In order for invoices to be generated the invoice message type must be active. If you completed this action by mistake, simply reactivate the invoice message type and then visit the payment methods admin page to reactivate the invoice payment method.', 'event_espresso')
+					: __('Deactivating the html messenger also automatically deactivates the invoice payment method.  In order for invoices to be generated the html messenger must be be active.  If you completed this action by mistake, simply reactivate the html messenger, then visit the payment methods admin page to reactivate the invoice payment method.', 'event_espresso');
+				EE_Error::add_attention($msg);
 			}
 		}
 		return true;
@@ -3254,17 +3254,17 @@ 
 	 * handles updating a message type form on messenger activation IF the message type has settings fields. (via ajax)
 	 */
 	public function update_mt_form() {
-		if ( !isset( $this->_req_data['messenger'] ) || !isset( $this->_req_data['message_type'] ) ) {
-			EE_Error::add_error( __('Require message type or messenger to send an updated form'), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! isset($this->_req_data['messenger']) || ! isset($this->_req_data['message_type'])) {
+			EE_Error::add_error(__('Require message type or messenger to send an updated form'), __FILE__, __FUNCTION__, __LINE__);
 			$this->_return_json();
 		}
 
 		$message_types = $this->get_installed_message_types();
 
-		$message_type = $message_types[ $this->_req_data['message_type'] ];
-		$messenger = $this->_message_resource_manager->get_active_messenger( $this->_req_data['messenger'] );
+		$message_type = $message_types[$this->_req_data['message_type']];
+		$messenger = $this->_message_resource_manager->get_active_messenger($this->_req_data['messenger']);
 
-		$content = $this->_message_type_settings_content ( $message_type, $messenger, true );
+		$content = $this->_message_type_settings_content($message_type, $messenger, true);
 		$this->_template_args['success'] = true;
 		$this->_template_args['content'] = $content;
 		$this->_return_json();
@@ -3278,45 +3278,45 @@ 
 	 *
 	 */
 	public function save_settings() {
-		if ( !isset( $this->_req_data['type'] ) ) {
-			EE_Error::add_error(__('Cannot save settings because type is unknown (messenger settings or messsage type settings?)', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! isset($this->_req_data['type'])) {
+			EE_Error::add_error(__('Cannot save settings because type is unknown (messenger settings or messsage type settings?)', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			$this->_template_args['error'] = true;
 			$this->_return_json();
 		}
 
 
-		if ( $this->_req_data['type'] == 'messenger' ) {
+		if ($this->_req_data['type'] == 'messenger') {
 			$settings = $this->_req_data['messenger_settings']; //this should be an array.
 			$messenger = $settings['messenger'];
 			//let's setup the settings data
-			foreach ( $settings as $key => $value ) {
-				switch ( $key ) {
+			foreach ($settings as $key => $value) {
+				switch ($key) {
 					case 'messenger' :
-						unset( $settings['messenger'] );
+						unset($settings['messenger']);
 						break;
 					case 'message_types' :
-						unset( $settings['message_types'] );
+						unset($settings['message_types']);
 						break;
 					default :
 						$settings[$key] = $value;
 						break;
 				}
 			}
-			$this->_message_resource_manager->add_settings_for_messenger( $messenger, $settings );
+			$this->_message_resource_manager->add_settings_for_messenger($messenger, $settings);
 		}
 
-		else if ( $this->_req_data['type'] == 'message_type' ) {
+		else if ($this->_req_data['type'] == 'message_type') {
 			$settings = $this->_req_data['message_type_settings'];
 			$messenger = $settings['messenger'];
 			$message_type = $settings['message_type'];
 
-			foreach ( $settings as $key => $value ) {
-				switch ( $key ) {
+			foreach ($settings as $key => $value) {
+				switch ($key) {
 					case 'messenger' :
-						unset( $settings['messenger'] );
+						unset($settings['messenger']);
 						break;
 					case 'message_type' :
-						unset( $settings['message_type'] );
+						unset($settings['message_type']);
 						break;
 					default :
 						$settings[$key] = $value;
@@ -3324,16 +3324,16 @@ 
 				}
 			}
 
-			$this->_message_resource_manager->add_settings_for_message_type( $messenger, $message_type, $settings );
+			$this->_message_resource_manager->add_settings_for_message_type($messenger, $message_type, $settings);
 		}
 
 		//okay we should have the data all setup.  Now we just update!
 		$success = $this->_message_resource_manager->update_active_messengers_option();
 
-		if ( $success ) {
-			EE_Error::add_success( __('Settings updated', 'event_espresso') );
+		if ($success) {
+			EE_Error::add_success(__('Settings updated', 'event_espresso'));
 		} else {
-			EE_Error::add_error( __('Settings did not get updated', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error(__('Settings did not get updated', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
 
 		$this->_template_args['success'] = $success;
@@ -3355,8 +3355,8 @@ 
      */
 	protected function _generate_now() {
 		$msg_ids = $this->_get_msg_ids_from_request();
-		EED_Messages::generate_now( $msg_ids );
-		$this->_redirect_after_action( false, '', '', array(), true );
+		EED_Messages::generate_now($msg_ids);
+		$this->_redirect_after_action(false, '', '', array(), true);
 	}
 
 
@@ -3371,7 +3371,7 @@ 
 	protected function _generate_and_send_now() {
 		$this->_generate_now();
 		$this->_send_now();
-		$this->_redirect_after_action( false, '', '', array(), true );
+		$this->_redirect_after_action(false, '', '', array(), true);
 	}
 
 
@@ -3385,8 +3385,8 @@ 
      */
 	protected function _queue_for_resending() {
 		$msg_ids = $this->_get_msg_ids_from_request();
-		EED_Messages::queue_for_resending( $msg_ids );
-		$this->_redirect_after_action( false, '', '', array(), true );
+		EED_Messages::queue_for_resending($msg_ids);
+		$this->_redirect_after_action(false, '', '', array(), true);
 	}
 
 
@@ -3399,8 +3399,8 @@ 
      */
 	protected function _send_now() {
 		$msg_ids = $this->_get_msg_ids_from_request();
-		EED_Messages::send_now( $msg_ids );
-		$this->_redirect_after_action( false, '', '', array(), true );
+		EED_Messages::send_now($msg_ids);
+		$this->_redirect_after_action(false, '', '', array(), true);
 	}
 
 
@@ -3414,23 +3414,23 @@ 
 	protected function _delete_ee_messages() {
 		$msg_ids = $this->_get_msg_ids_from_request();
 		$deleted_count = 0;
-		foreach ( $msg_ids as $msg_id ) {
-			if ( EEM_Message::instance()->delete_by_ID( $msg_id ) ) {
+		foreach ($msg_ids as $msg_id) {
+			if (EEM_Message::instance()->delete_by_ID($msg_id)) {
 				$deleted_count++;
 			}
 		}
-		if ( $deleted_count ) {
+		if ($deleted_count) {
 			$this->_redirect_after_action(
 				true,
-				_n( 'message', 'messages', $deleted_count, 'event_espresso' ),
+				_n('message', 'messages', $deleted_count, 'event_espresso'),
 				__('deleted', 'event_espresso')
 			);
 		} else {
 			EE_Error::add_error(
-				_n( 'The message was not deleted.', 'The messages were not deleted', count( $msg_ids ), 'event_espresso' ),
+				_n('The message was not deleted.', 'The messages were not deleted', count($msg_ids), 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
-			$this->_redirect_after_action( false, '', '', array(), true );
+			$this->_redirect_after_action(false, '', '', array(), true);
 		}
 	}
 
@@ -3443,10 +3443,10 @@ 
      *  @return array
      */
 	protected function _get_msg_ids_from_request() {
-		if ( ! isset( $this->_req_data['MSG_ID'] ) ) {
+		if ( ! isset($this->_req_data['MSG_ID'])) {
 			return array();
 		}
-		return is_array( $this->_req_data['MSG_ID'] ) ? array_keys( $this->_req_data['MSG_ID'] ) : array( $this->_req_data['MSG_ID'] );
+		return is_array($this->_req_data['MSG_ID']) ? array_keys($this->_req_data['MSG_ID']) : array($this->_req_data['MSG_ID']);
 	}