eventespresso / event-espresso-core

admin_pages/support/Support_Admin_Page.core.php

Spacing +19 added lines, -19 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -30,8 +30,8 @@ 
 class Support_Admin_Page extends EE_Admin_Page {
 
 
-	public function __construct( $routing = TRUE ) {
-		parent::__construct( $routing );
+	public function __construct($routing = TRUE) {
+		parent::__construct($routing);
 	}
 
 
@@ -85,14 +85,14 @@ 
 				'nav' => array(
 					'label' => __('Shortcodes', 'event_espresso'),
 					'order' => 30),
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array('_shortcodes_boxes' ) ),
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_shortcodes_boxes')),
 				'require_nonce' => FALSE
 				),
 			'contact_support' => array(
 				'nav' => array(
 					'label' => __('Support', 'event_espresso'),
 					'order' => 40),
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array( '_support_boxes' ) ),
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_support_boxes')),
 				'require_nonce' => FALSE
 				),
 			'developers' => array(
@@ -120,8 +120,8 @@ 
 
 
 	protected function _installation() {
-		$template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH . 'support_admin_details_installation.template.php';
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, '', TRUE);
+		$template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH.'support_admin_details_installation.template.php';
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, '', TRUE);
 		$this->display_admin_page_with_sidebar();
 	}
 
@@ -146,10 +146,10 @@ 
 			'other_resources' => __('Other Resources', 'event_espresso')
 			);
 
-		foreach ( $boxes as $box => $label ) {
-			$template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH . 'support_admin_details_' . $box . '.template.php';
+		foreach ($boxes as $box => $label) {
+			$template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH.'support_admin_details_'.$box.'.template.php';
 			$callback_args = array('template_path' => $template_path);
-			add_meta_box( 'espresso_' . $box . '_settings', $label, create_function('$post, $metabox', 'echo EEH_Template::display_template( $metabox["args"]["template_path"], "", TRUE );'), $this->_current_screen_id, 'normal', 'high', $callback_args);
+			add_meta_box('espresso_'.$box.'_settings', $label, create_function('$post, $metabox', 'echo EEH_Template::display_template( $metabox["args"]["template_path"], "", TRUE );'), $this->_current_screen_id, 'normal', 'high', $callback_args);
 		}
 	}
 
@@ -170,15 +170,15 @@ 
 			'shortcodes_event_listings' => __('Event Listings', 'event_espresso'),
 			'shortcodes_ticket_selector' => __('Event Ticket Selector', 'event_espresso'),
 			'shortcodes_category' => __('Event Categories', 'event_espresso'),
-			'shortcodes_attendee' => __( 'Event Attendees', 'event_espresso' )
+			'shortcodes_attendee' => __('Event Attendees', 'event_espresso')
 			/*'shortcodes_single_events' => __('Single Events', 'event_espresso'),*/
 			/*'shortcodes_attendee_listings' => __('Attendee Listings', 'event_espresso'),*/
 			);
 
-		foreach ( $boxes as $box => $label ) {
-			$template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH . 'support_admin_details_' . $box . '.template.php';
+		foreach ($boxes as $box => $label) {
+			$template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH.'support_admin_details_'.$box.'.template.php';
 			$callback_args = array('template_path' => $template_path);
-			add_meta_box( 'espresso_' . $box . '_settings', $label, create_function('$post, $metabox', 'echo EEH_Template::display_template( $metabox["args"]["template_path"], "", TRUE );'), $this->_current_screen_id, 'normal', 'high', $callback_args);
+			add_meta_box('espresso_'.$box.'_settings', $label, create_function('$post, $metabox', 'echo EEH_Template::display_template( $metabox["args"]["template_path"], "", TRUE );'), $this->_current_screen_id, 'normal', 'high', $callback_args);
 		}
 	}
 
@@ -197,17 +197,17 @@ 
 			'important_information' => __('Important Information', 'event_espresso')
 			);
 
-		foreach ( $boxes as $box => $label ) {
-			$template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH . 'support_admin_details_' . $box . '.template.php';
+		foreach ($boxes as $box => $label) {
+			$template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH.'support_admin_details_'.$box.'.template.php';
 			$callback_args = array('template_path' => $template_path, 'template_args' => $this->_template_args);
-			add_meta_box( 'espresso_' . $box . '_settings', $label, create_function('$post, $metabox', 'echo EEH_Template::display_template( $metabox["args"]["template_path"], $metabox["args"]["template_args"], TRUE );'), $this->_current_screen_id, 'normal', 'high', $callback_args);
+			add_meta_box('espresso_'.$box.'_settings', $label, create_function('$post, $metabox', 'echo EEH_Template::display_template( $metabox["args"]["template_path"], $metabox["args"]["template_args"], TRUE );'), $this->_current_screen_id, 'normal', 'high', $callback_args);
 		}
 	}
 
 
 	protected function _developers() {
-		$template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH . 'developers_admin_details.template.php';
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, array(), true );
+		$template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH.'developers_admin_details.template.php';
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, array(), true);
 		$this->display_admin_page_with_sidebar();
 	}
 

core/admin/EE_Admin.core.php

Indentation +21 added lines, -21 removed lines

@@ -24,10 +24,10 @@ 
 final class EE_Admin {
 
    /**
-     * 	EE_Admin Object
-     * 	@private _instance
-	 * 	@private 	protected
-     */
+    * 	EE_Admin Object
+    * 	@private _instance
+    * 	@private 	protected
+    */
 	private static $_instance = NULL;
 
 	/**
@@ -56,8 +56,8 @@ 
 
 
    /**
-     * class constructor
-     */
+    * class constructor
+    */
 	protected function __construct() {
 		// define global EE_Admin constants
 		$this->_define_all_constants();
@@ -168,11 +168,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() {
 
 		//only enable most of the EE_Admin IF we're not in full maintenance mode
@@ -463,11 +463,11 @@ 
 
 
 	/**
-	* admin_init
-	*
-	* @access public
-	* @return void
-	*/
+	 * admin_init
+	 *
+	 * @access public
+	 * @return void
+	 */
 	public function admin_init() {
 
 		/**
@@ -624,11 +624,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();
 	}

Spacing +174 added lines, -174 removed lines

@@ -47,7 +47,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;
@@ -62,25 +62,25 @@ 
 		// 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_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_System__core_loaded_and_ready', array($this, 'get_request'));
+		add_action('AHEE__EE_System__initialize_last', array($this, 'init'));
+		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
 		);
 	}
 
@@ -175,36 +175,36 @@ 
 	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( 'save_post', array( 'EE_Admin', 'parse_post_content_on_save' ), 100, 2 );
-			add_action( 'update_option', array( $this, 'reset_page_for_posts_on_change' ), 100, 3 );
-			add_filter( 'content_save_pre', array( $this, 'its_eSpresso' ), 10, 1 );
-			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('save_post', array('EE_Admin', 'parse_post_content_on_save'), 100, 2);
+			add_action('update_option', array($this, 'reset_page_for_posts_on_change'), 100, 3);
+			add_filter('content_save_pre', array($this, 'its_eSpresso'), 10, 1);
+			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, 3 );
+			add_filter('get_edit_post_link', array($this, 'modify_edit_post_link'), 10, 3);
 		}
 
 		// 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();
 			}
 		}
 
 		//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);
 	}
 
 
@@ -217,9 +217,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();
@@ -239,28 +239,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);
 	}
 
 
@@ -279,7 +279,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');
 	}
 
 
@@ -296,17 +296,17 @@ 
 	 *
 	 * @return string  the (maybe) modified link
 	 */
-	public function modify_edit_post_link( $link, $id, $context ) {
-		if ( ! $post = get_post( $id ) )
+	public function modify_edit_post_link($link, $id, $context) {
+		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
 				);
 			EE_Registry::instance()->load_helper('URL');
-			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;
 	}
@@ -318,7 +318,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] ) ) {
@@ -337,9 +337,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.
@@ -357,13 +357,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 -->
@@ -371,18 +371,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>
@@ -403,10 +403,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);
 	}
 
 
@@ -418,7 +418,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,
@@ -438,8 +438,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;
 	}
@@ -478,10 +478,10 @@ 
 		 * - 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['action'] == 'editpost' ) {
-			if ( isset( $_POST['post_type'] ) ) {
-				EE_Registry::instance()->load_core( 'Register_CPTs' );
-				EE_Register_CPTs::instantiate_cpt_models( $_POST['post_type'] );
+		if (isset($_POST['action']) && $_POST['action'] == 'editpost') {
+			if (isset($_POST['post_type'])) {
+				EE_Registry::instance()->load_core('Register_CPTs');
+				EE_Register_CPTs::instantiate_cpt_models($_POST['post_type']);
 			}
 		}
 
@@ -491,8 +491,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'));
 		}
 
 	}
@@ -504,25 +504,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
-		$output = implode( "\n", $split_output );
+		$output = implode("\n", $split_output);
 
 		return $output;
 	}
@@ -538,37 +538,37 @@ 
 	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.11.1', TRUE);
+			wp_register_script('jquery-validate', EE_GLOBAL_ASSETS_URL.'scripts/jquery.validate.min.js', array('jquery'), '1.11.1', 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)) {
 			EE_Registry::instance()->load_helper('Qtip_Loader');
 			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(
@@ -615,11 +615,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);
 	}
 
 
@@ -640,26 +640,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;
 	}
@@ -678,63 +678,63 @@ 
 	 * @param $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) {
 		// 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();
 			$maybe_remove_from_posts = array();
 			// critical page shortcodes that we do NOT want added to the Posts page (blog)
 			$critical_shortcodes = EE_Registry::instance()->CFG->core->get_critical_pages_shortcodes_array();
 			// array of shortcodes indexed by post name
-			EE_Registry::instance()->CFG->core->post_shortcodes = isset( EE_Registry::instance()->CFG->core->post_shortcodes ) ? EE_Registry::instance()->CFG->core->post_shortcodes : array();
+			EE_Registry::instance()->CFG->core->post_shortcodes = isset(EE_Registry::instance()->CFG->core->post_shortcodes) ? EE_Registry::instance()->CFG->core->post_shortcodes : array();
 			// whether to proceed with update, if an entry already exists for this post, then we want to update
-			$update_post_shortcodes = isset( EE_Registry::instance()->CFG->core->post_shortcodes[ $post->post_name ] ) ? true : false;
+			$update_post_shortcodes = isset(EE_Registry::instance()->CFG->core->post_shortcodes[$post->post_name]) ? true : false;
 			// empty both arrays
-			EE_Registry::instance()->CFG->core->post_shortcodes[ $post->post_name ] = array();
+			EE_Registry::instance()->CFG->core->post_shortcodes[$post->post_name] = array();
 			// check that posts page is already being tracked
-			if ( ! isset( EE_Registry::instance()->CFG->core->post_shortcodes[ $page_for_posts ] ) ) {
+			if ( ! isset(EE_Registry::instance()->CFG->core->post_shortcodes[$page_for_posts])) {
 				// if not, then ensure that it is properly added
-				EE_Registry::instance()->CFG->core->post_shortcodes[ $page_for_posts ] = array();
+				EE_Registry::instance()->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::instance()->CFG->core->post_shortcodes[ $post->post_name ][ $EES_Shortcode ] = $post_ID;
+					EE_Registry::instance()->CFG->core->post_shortcodes[$post->post_name][$EES_Shortcode] = $post_ID;
 					// 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)) {
 						// add shortcode to "Posts page" tracking
-						EE_Registry::instance()->CFG->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] = $post_ID;
+						EE_Registry::instance()->CFG->core->post_shortcodes[$page_for_posts][$EES_Shortcode] = $post_ID;
 					}
 					$update_post_shortcodes = TRUE;
-					unset( $maybe_remove_from_posts[ $EES_Shortcode ] );
+					unset($maybe_remove_from_posts[$EES_Shortcode]);
 				} else {
-					$maybe_remove_from_posts[ $EES_Shortcode ] = $post_ID;
+					$maybe_remove_from_posts[$EES_Shortcode] = $post_ID;
 				}
 			}
-			if ( $update_post_shortcodes ) {
+			if ($update_post_shortcodes) {
 				// remove shortcodes from $maybe_remove_from_posts that are still being used
-				foreach ( EE_Registry::instance()->CFG->core->post_shortcodes as $post_name => $shortcodes ) {
-					if ( $post_name == $page_for_posts ) {
+				foreach (EE_Registry::instance()->CFG->core->post_shortcodes as $post_name => $shortcodes) {
+					if ($post_name == $page_for_posts) {
 						continue;
 					}
 					// compute difference between active post_shortcodes array and $maybe_remove_from_posts array
-					$maybe_remove_from_posts = array_diff_key( $maybe_remove_from_posts, $shortcodes );
+					$maybe_remove_from_posts = array_diff_key($maybe_remove_from_posts, $shortcodes);
 				}
 				// now unset unused shortcodes from the $page_for_posts post_shortcodes
-				foreach ( $maybe_remove_from_posts as $shortcode => $post_ID ) {
-					unset( EE_Registry::instance()->CFG->core->post_shortcodes[ $page_for_posts ][ $shortcode ] );
+				foreach ($maybe_remove_from_posts as $shortcode => $post_ID) {
+					unset(EE_Registry::instance()->CFG->core->post_shortcodes[$page_for_posts][$shortcode]);
 				}
-				EE_Registry::instance()->CFG->update_post_shortcodes( $page_for_posts );
+				EE_Registry::instance()->CFG->update_post_shortcodes($page_for_posts);
 			}
 		}
 	}
@@ -752,32 +752,32 @@ 
 	 * @throws EE_Error
 	 * @return    string
 	 */
-	public function check_for_invalid_datetime_formats( $value, $option ) {
-		EE_Registry::instance()->load_helper( 'DTT_Helper' );
+	public function check_for_invalid_datetime_formats($value, $option) {
+		EE_Registry::instance()->load_helper('DTT_Helper');
 		// 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(
@@ -787,7 +787,7 @@ 
 				);
 
 				// set format to something valid
-				switch ( $option ) {
+				switch ($option) {
 					case 'date_format' :
 						$value = 'F j, Y';
 						break;
@@ -813,14 +813,14 @@ 
 	 * @param 	$value
 	 * @return 	void
 	 */
-	public function reset_page_for_posts_on_change( $option, $old_value, $value ) {
-		if ( $option == 'page_for_posts' ) {
+	public function reset_page_for_posts_on_change($option, $old_value, $value) {
+		if ($option == 'page_for_posts') {
 			global $wpdb;
-			$SQL = 'SELECT post_name from ' . $wpdb->posts . ' WHERE post_type="posts" OR post_type="page" AND post_status="publish" AND ID=%s';
-			$old_page_for_posts = $old_value ? $wpdb->get_var( $wpdb->prepare( $SQL, $old_value )) : 'posts';
-			$new_page_for_posts = $value ? $wpdb->get_var( $wpdb->prepare( $SQL, $value )) : 'posts';
-			EE_Registry::instance()->CFG->core->post_shortcodes[ $new_page_for_posts ] = EE_Registry::instance()->CFG->core->post_shortcodes[ $old_page_for_posts ];
-			EE_Registry::instance()->CFG->update_post_shortcodes( $new_page_for_posts );
+			$SQL = 'SELECT post_name from '.$wpdb->posts.' WHERE post_type="posts" OR post_type="page" AND post_status="publish" AND ID=%s';
+			$old_page_for_posts = $old_value ? $wpdb->get_var($wpdb->prepare($SQL, $old_value)) : 'posts';
+			$new_page_for_posts = $value ? $wpdb->get_var($wpdb->prepare($SQL, $value)) : 'posts';
+			EE_Registry::instance()->CFG->core->post_shortcodes[$new_page_for_posts] = EE_Registry::instance()->CFG->core->post_shortcodes[$old_page_for_posts];
+			EE_Registry::instance()->CFG->update_post_shortcodes($new_page_for_posts);
 		}
 	}
 
@@ -833,8 +833,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);
 	}
 
 
@@ -847,9 +847,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>'
 		);
 	}
 
@@ -869,11 +869,11 @@ 
 	 * @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);
 	}
 
 

core/db_models/EEM_Registration.model.php

Indentation +19 added lines, -19 removed lines

@@ -219,11 +219,11 @@ 
 
 
 	/**
-	*		retrieve ALL registrations for a particular Attendee from db
-	* 		@access		public
-	* 		@param		int		$ATT_ID
-	*		@return 	EE_Registration[]
-	*/
+	 *		retrieve ALL registrations for a particular Attendee from db
+	 * 		@access		public
+	 * 		@param		int		$ATT_ID
+	 *		@return 	EE_Registration[]
+	 */
 	public function get_all_registrations_for_attendee( $ATT_ID = 0 ) {
 		if ( ! $ATT_ID ) {
 			return FALSE;
@@ -250,14 +250,14 @@ 
 
 
 	/**
-	*		retrieve registration for a specific transaction attendee from db
-	*
-	* 		@access		public
-	* 		@param	int	$TXN_ID
-	* 		@param    int		$ATT_ID
-	* 		@param    int		$att_nmbr 	in case the ATT_ID is the same for multiple registrations (same details used) then the attendee number is required
-	*		@return 		mixed		array on success, FALSE on fail
-	*/
+	 *		retrieve registration for a specific transaction attendee from db
+	 *
+	 * 		@access		public
+	 * 		@param	int	$TXN_ID
+	 * 		@param    int		$ATT_ID
+	 * 		@param    int		$att_nmbr 	in case the ATT_ID is the same for multiple registrations (same details used) then the attendee number is required
+	 *		@return 		mixed		array on success, FALSE on fail
+	 */
 	public function get_registration_for_transaction_attendee( $TXN_ID = 0, $ATT_ID = 0, $att_nmbr = 0 ) {
 		return $this->get_one(array(
 			array(
@@ -270,12 +270,12 @@ 
 
 
 	/**
-	*		get the number of registrations per day  for the Registration Admin page Reports Tab.
+	 *		get the number of registrations per day  for the Registration Admin page Reports Tab.
 	 *		(doesn't utilize models because it's a fairly specialized query)
-	* 		@access		public
+	 * 		@access		public
 	 *		@param $period string which can be passed to php's strtotime function (eg "-1 month")
 	 *		@return stdClass[] with properties regDate and total
-	*/
+	 */
 	public function get_registrations_per_day_report( $period = '-1 month' ) {
 
 		$sql_date = $this->convert_datetime_for_query( 'REG_date', date("Y-m-d H:i:s", strtotime($period) ), 'Y-m-d H:i:s', 'UTC' );
@@ -304,11 +304,11 @@ 
 
 
 	/**
-	*		get the number of registrations per event  for the Registration Admin page Reports Tab
-	* 		@access		public
+	 *		get the number of registrations per event  for the Registration Admin page Reports Tab
+	 * 		@access		public
 	 * @param $period string which can be passed to php's strtotime function (eg "-1 month")
 	 *		@return stdClass[] each with properties event_name, reg_limit, and total
-	*/
+	 */
 	public function get_registrations_per_event_report( $period = '-1 month' ) {
 
 		$date_sql = $this->convert_datetime_for_query( 'REG_date', date( "Y-m-d H:i:s", strtotime( $period )), 'Y-m-d H:i:s', 'UTC' );

Spacing +69 added lines, -69 removed lines

@@ -1,6 +1,6 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
-require_once ( EE_MODELS . 'EEM_Soft_Delete_Base.model.php' );
-require_once ( EE_CLASSES . 'EE_Registration.class.php' );
+require_once (EE_MODELS.'EEM_Soft_Delete_Base.model.php');
+require_once (EE_CLASSES.'EE_Registration.class.php');
 /**
  *
  * Registration Model
@@ -92,31 +92,31 @@ 
 	 *    Note this just sends the timezone info to the date time model field objects.  Default is NULL (and will be assumed using the set timezone in the 'timezone_string' wp option)
 	 * @return \EEM_Registration
 	 */
-	protected function __construct( $timezone ) {
-		$this->singular_item = __('Registration','event_espresso');
-		$this->plural_item = __('Registrations','event_espresso');
+	protected function __construct($timezone) {
+		$this->singular_item = __('Registration', 'event_espresso');
+		$this->plural_item = __('Registrations', 'event_espresso');
 
 		$this->_tables = array(
-			'Registration'=>new EE_Primary_Table('esp_registration','REG_ID')
+			'Registration'=>new EE_Primary_Table('esp_registration', 'REG_ID')
 		);
 		$this->_fields = array(
 			'Registration'=>array(
-				'REG_ID'=>new EE_Primary_Key_Int_Field('REG_ID', __('Registration ID','event_espresso')),
-				'EVT_ID'=>new EE_Foreign_Key_Int_Field('EVT_ID', __('Event ID','event_espresso'), false, 0, 'Event'),
-				'ATT_ID'=>new EE_Foreign_Key_Int_Field('ATT_ID', __('Attendee ID','event_espresso'), false, 0, 'Attendee'),
-				'TXN_ID'=>new EE_Foreign_Key_Int_Field('TXN_ID', __('Transaction ID','event_espresso'), false, 0, 'Transaction'),
-				'TKT_ID'=>new EE_Foreign_Key_Int_Field('TKT_ID', __('Ticket ID','event_espresso'), false, 0, 'Ticket'),
-				'STS_ID'=>new EE_Foreign_Key_String_Field('STS_ID', __('Status ID','event_espresso'), false, EEM_Registration::status_id_incomplete, 'Status'),
-				'REG_date'=>new EE_Datetime_Field('REG_date', __('Time registration occurred','event_espresso'), false, time(), $timezone ),
-				'REG_final_price'=>new EE_Money_Field('REG_final_price', __('Registration\'s share of the transaction total','event_espresso'), false, 0),
-				'REG_paid'=>new EE_Money_Field('REG_paid', __('Amount paid to date towards registration','event_espresso'), false, 0),
-				'REG_session'=>new EE_Plain_Text_Field('REG_session', __('Session ID of registration','event_espresso'), false, ''),
-				'REG_code'=>new EE_Plain_Text_Field('REG_code', __('Unique Code for this registration','event_espresso'), false, ''),
-				'REG_url_link'=>new EE_Plain_Text_Field('REG_url_link', __('String to be used in URL for identifying registration','event_espresso'), false, ''),
-				'REG_count'=>new EE_Integer_Field('REG_count', __('Count of this registration in the group registration ','event_espresso'), true, 1),
-				'REG_group_size'=>new EE_Integer_Field('REG_group_size', __('Number of registrations on this group','event_espresso'), false, 1),
-				'REG_att_is_going'=>new EE_Boolean_Field('REG_att_is_going', __('Flag indicating the registrant plans on attending','event_espresso'), false, false),
-				'REG_deleted' => new EE_Trashed_Flag_Field('REG_deleted', __('Flag indicating if registration has been archived or not.', 'event_espresso'), false, false )
+				'REG_ID'=>new EE_Primary_Key_Int_Field('REG_ID', __('Registration ID', 'event_espresso')),
+				'EVT_ID'=>new EE_Foreign_Key_Int_Field('EVT_ID', __('Event ID', 'event_espresso'), false, 0, 'Event'),
+				'ATT_ID'=>new EE_Foreign_Key_Int_Field('ATT_ID', __('Attendee ID', 'event_espresso'), false, 0, 'Attendee'),
+				'TXN_ID'=>new EE_Foreign_Key_Int_Field('TXN_ID', __('Transaction ID', 'event_espresso'), false, 0, 'Transaction'),
+				'TKT_ID'=>new EE_Foreign_Key_Int_Field('TKT_ID', __('Ticket ID', 'event_espresso'), false, 0, 'Ticket'),
+				'STS_ID'=>new EE_Foreign_Key_String_Field('STS_ID', __('Status ID', 'event_espresso'), false, EEM_Registration::status_id_incomplete, 'Status'),
+				'REG_date'=>new EE_Datetime_Field('REG_date', __('Time registration occurred', 'event_espresso'), false, time(), $timezone),
+				'REG_final_price'=>new EE_Money_Field('REG_final_price', __('Registration\'s share of the transaction total', 'event_espresso'), false, 0),
+				'REG_paid'=>new EE_Money_Field('REG_paid', __('Amount paid to date towards registration', 'event_espresso'), false, 0),
+				'REG_session'=>new EE_Plain_Text_Field('REG_session', __('Session ID of registration', 'event_espresso'), false, ''),
+				'REG_code'=>new EE_Plain_Text_Field('REG_code', __('Unique Code for this registration', 'event_espresso'), false, ''),
+				'REG_url_link'=>new EE_Plain_Text_Field('REG_url_link', __('String to be used in URL for identifying registration', 'event_espresso'), false, ''),
+				'REG_count'=>new EE_Integer_Field('REG_count', __('Count of this registration in the group registration ', 'event_espresso'), true, 1),
+				'REG_group_size'=>new EE_Integer_Field('REG_group_size', __('Number of registrations on this group', 'event_espresso'), false, 1),
+				'REG_att_is_going'=>new EE_Boolean_Field('REG_att_is_going', __('Flag indicating the registrant plans on attending', 'event_espresso'), false, false),
+				'REG_deleted' => new EE_Trashed_Flag_Field('REG_deleted', __('Flag indicating if registration has been archived or not.', 'event_espresso'), false, false)
 			)
 		);
 		$this->_model_relations = array(
@@ -128,11 +128,11 @@ 
 			'Answer'=>new EE_Has_Many_Relation(),
 			'Checkin'=>new EE_Has_Many_Relation(),
 			'Registration_Payment' => new EE_Has_Many_Relation(),
-			'Payment'=>new EE_HABTM_Relation( 'Registration_Payment' ),
+			'Payment'=>new EE_HABTM_Relation('Registration_Payment'),
 		);
 		$this->_model_chain_to_wp_user = 'Event';
 
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 
@@ -165,9 +165,9 @@ 
 	 *		@param bool  $translated If true will return the values as singular localized strings
 	 *		@return array
 	 */
-	public static function reg_status_array( $exclude = array(), $translated = FALSE ) {
-		EEM_Registration::instance()->_get_registration_status_array( $exclude );
-		return $translated ? EEM_Status::instance()->localized_status( self::$_reg_status, FALSE, 'sentence') : self::$_reg_status;
+	public static function reg_status_array($exclude = array(), $translated = FALSE) {
+		EEM_Registration::instance()->_get_registration_status_array($exclude);
+		return $translated ? EEM_Status::instance()->localized_status(self::$_reg_status, FALSE, 'sentence') : self::$_reg_status;
 	}
 
 
@@ -178,19 +178,19 @@ 
 	 * @param array $exclude
 	 * @return array
 	 */
-	private function _get_registration_status_array( $exclude = array() ) {
+	private function _get_registration_status_array($exclude = array()) {
 		//in the very rare circumstance that we are deleting a model's table's data
 		//and the table hasn't actually been created, this could have an error
 		/** @type WPDB $wpdb */
 		global $wpdb;
-		EE_Registry::instance()->load_helper( 'Activation' );
-		if( EEH_Activation::table_exists( $wpdb->prefix . 'esp_status' ) ){
-			$SQL = 'SELECT STS_ID, STS_code FROM '. $wpdb->prefix . 'esp_status WHERE STS_type = "registration"';
-			$results = $wpdb->get_results( $SQL );
+		EE_Registry::instance()->load_helper('Activation');
+		if (EEH_Activation::table_exists($wpdb->prefix.'esp_status')) {
+			$SQL = 'SELECT STS_ID, STS_code FROM '.$wpdb->prefix.'esp_status WHERE STS_type = "registration"';
+			$results = $wpdb->get_results($SQL);
 			self::$_reg_status = array();
-			foreach ( $results as $status ) {
-				if ( ! in_array( $status->STS_ID, $exclude )) {
-					self::$_reg_status[ $status->STS_ID ] = $status->STS_code;
+			foreach ($results as $status) {
+				if ( ! in_array($status->STS_ID, $exclude)) {
+					self::$_reg_status[$status->STS_ID] = $status->STS_code;
 				}
 			}
 		}
@@ -205,15 +205,15 @@ 
 	 * @param  array  $where_params Array of query_params as described in the comments for EEM_Base::get_all()
 	 * @return wpdb results array
 	 */
-	public function get_reg_months_and_years( $where_params ) {
+	public function get_reg_months_and_years($where_params) {
 		$query_params[0] = $where_params;
 		$query_params['group_by'] = array('reg_year', 'reg_month');
-		$query_params['order_by'] = array( 'REG_date' => 'DESC' );
+		$query_params['order_by'] = array('REG_date' => 'DESC');
 		$columns_to_select = array(
 			'reg_year' => array('YEAR(REG_date)', '%s'),
 			'reg_month' => array('MONTHNAME(REG_date)', '%s')
 			);
-		return $this->_get_all_wpdb_results( $query_params, OBJECT, $columns_to_select );
+		return $this->_get_all_wpdb_results($query_params, OBJECT, $columns_to_select);
 	}
 
 
@@ -225,11 +225,11 @@ 
 	* 		@param		int		$ATT_ID
 	*		@return 	EE_Registration[]
 	*/
-	public function get_all_registrations_for_attendee( $ATT_ID = 0 ) {
-		if ( ! $ATT_ID ) {
+	public function get_all_registrations_for_attendee($ATT_ID = 0) {
+		if ( ! $ATT_ID) {
 			return FALSE;
 		}
-		return $this->get_all( array( array( 'ATT_ID' => $ATT_ID )));
+		return $this->get_all(array(array('ATT_ID' => $ATT_ID)));
 	}
 
 
@@ -240,8 +240,8 @@ 
 	 * @param string $REG_url_link
 	 * @return EE_Registration
 	 */
-	public function get_registration_for_reg_url_link($REG_url_link){
-		if(!$REG_url_link){
+	public function get_registration_for_reg_url_link($REG_url_link) {
+		if ( ! $REG_url_link) {
 			return false;
 		}
 		return $this->get_one(array(array('REG_url_link'=>$REG_url_link)));
@@ -259,13 +259,13 @@ 
 	* 		@param    int		$att_nmbr 	in case the ATT_ID is the same for multiple registrations (same details used) then the attendee number is required
 	*		@return 		mixed		array on success, FALSE on fail
 	*/
-	public function get_registration_for_transaction_attendee( $TXN_ID = 0, $ATT_ID = 0, $att_nmbr = 0 ) {
+	public function get_registration_for_transaction_attendee($TXN_ID = 0, $ATT_ID = 0, $att_nmbr = 0) {
 		return $this->get_one(array(
 			array(
 				'TXN_ID'=>$TXN_ID,
 				'ATT_ID'=>$ATT_ID
 			),
-			'limit'=>array( min( ( $att_nmbr-1 ), 0 ), 1 )
+			'limit'=>array(min(($att_nmbr - 1), 0), 1)
 		));
 	}
 
@@ -277,19 +277,19 @@ 
 	 *		@param $period string which can be passed to php's strtotime function (eg "-1 month")
 	 *		@return stdClass[] with properties regDate and total
 	*/
-	public function get_registrations_per_day_report( $period = '-1 month' ) {
+	public function get_registrations_per_day_report($period = '-1 month') {
 
-		$sql_date = $this->convert_datetime_for_query( 'REG_date', date("Y-m-d H:i:s", strtotime($period) ), 'Y-m-d H:i:s', 'UTC' );
-		$where = array( 'REG_date' => array( '>=', $sql_date ), 'STS_ID' => array( '!=', EEM_Registration::status_id_incomplete ) );
+		$sql_date = $this->convert_datetime_for_query('REG_date', date("Y-m-d H:i:s", strtotime($period)), 'Y-m-d H:i:s', 'UTC');
+		$where = array('REG_date' => array('>=', $sql_date), 'STS_ID' => array('!=', EEM_Registration::status_id_incomplete));
 
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_registrations', 'reg_per_day_report' ) ) {
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_day_report')) {
 			$where['Event.EVT_wp_user'] = get_current_user_id();
 		}
 
-		$offset = get_option( 'gmt_offset' );
+		$offset = get_option('gmt_offset');
 		$query_interval = $offset < 0
-			? 'DATE_SUB(REG_date, INTERVAL ' . $offset*-1 . ' HOUR)'
-			: 'DATE_ADD(REG_date, INTERVAL ' . $offset . ' HOUR)';
+			? 'DATE_SUB(REG_date, INTERVAL '.$offset * -1.' HOUR)'
+			: 'DATE_ADD(REG_date, INTERVAL '.$offset.' HOUR)';
 
 		$results = $this->_get_all_wpdb_results(
 				array(
@@ -299,8 +299,8 @@ 
 				),
 				OBJECT,
 				array(
-					'regDate'=>array( 'DATE(' . $query_interval . ')','%s'),
-					'total'=>array('count(REG_ID)','%d')
+					'regDate'=>array('DATE('.$query_interval.')', '%s'),
+					'total'=>array('count(REG_ID)', '%d')
 				));
 		return $results;
 	}
@@ -315,23 +315,23 @@ 
 	 * @param $period string which can be passed to php's strtotime function (eg "-1 month")
 	 *		@return stdClass[] each with properties event_name, reg_limit, and total
 	*/
-	public function get_registrations_per_event_report( $period = '-1 month' ) {
+	public function get_registrations_per_event_report($period = '-1 month') {
 
-		$date_sql = $this->convert_datetime_for_query( 'REG_date', date( "Y-m-d H:i:s", strtotime( $period )), 'Y-m-d H:i:s', 'UTC' );
-		$where = array( 'REG_date' => array( '>=', $date_sql ), 'STS_ID' => array( '!=', EEM_Registration::status_id_incomplete ) );
+		$date_sql = $this->convert_datetime_for_query('REG_date', date("Y-m-d H:i:s", strtotime($period)), 'Y-m-d H:i:s', 'UTC');
+		$where = array('REG_date' => array('>=', $date_sql), 'STS_ID' => array('!=', EEM_Registration::status_id_incomplete));
 
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_registrations', 'reg_per_event_report' ) ) {
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_event_report')) {
 			$where['Event.EVT_wp_user'] = get_current_user_id();
 		}
 		$results = $this->_get_all_wpdb_results(array(
 			$where,
 			'group_by'=>'Event.EVT_name',
 			'order_by'=>'Event.EVT_name',
-			'limit'=>array(0,24)),
+			'limit'=>array(0, 24)),
 			OBJECT,
 			array(
-				'event_name'=>array('Event_CPT.post_title','%s'),
-				'total'=>array('COUNT(REG_ID)','%s')
+				'event_name'=>array('Event_CPT.post_title', '%s'),
+				'total'=>array('COUNT(REG_ID)', '%s')
 			)
 		);
 
@@ -345,11 +345,11 @@ 
 	 * @param int $TXN_ID
 	 * @return EE_Registration
 	 */
-	public function get_primary_registration_for_transaction_ID( $TXN_ID = 0){
-		if( ! $TXN_ID ){
+	public function get_primary_registration_for_transaction_ID($TXN_ID = 0) {
+		if ( ! $TXN_ID) {
 			return false;
 		}
-		return $this->get_one(array(array('TXN_ID'=>$TXN_ID,'REG_count'=>  EEM_Registration::PRIMARY_REGISTRANT_COUNT)));
+		return $this->get_one(array(array('TXN_ID'=>$TXN_ID, 'REG_count'=>  EEM_Registration::PRIMARY_REGISTRANT_COUNT)));
 	}
 
 
@@ -361,11 +361,11 @@ 
 	 *		@param boolean $for_incomplete_payments
 	 *		@return int
 	 */
-	public function get_event_registration_count ( $EVT_ID, $for_incomplete_payments = FALSE ) {
+	public function get_event_registration_count($EVT_ID, $for_incomplete_payments = FALSE) {
 		// we only count approved registrations towards registration limits
-		$query_params = array( array( 'EVT_ID' => $EVT_ID, 'STS_ID' => self::status_id_approved ) );
-		if( $for_incomplete_payments ){
-			$query_params[0]['Transaction.STS_ID']=array('!=',  EEM_Transaction::complete_status_code);
+		$query_params = array(array('EVT_ID' => $EVT_ID, 'STS_ID' => self::status_id_approved));
+		if ($for_incomplete_payments) {
+			$query_params[0]['Transaction.STS_ID'] = array('!=', EEM_Transaction::complete_status_code);
 		}
 
 		return $this->count($query_params);
@@ -381,7 +381,7 @@ 
 		/** @type WPDB $wpdb */
 		global $wpdb;
 		return $wpdb->query(
-				'DELETE r FROM ' . $this->table() . ' r LEFT JOIN ' . EEM_Transaction::instance()->table() . ' t ON r.TXN_ID = t.TXN_ID WHERE t.TXN_ID IS NULL' );
+				'DELETE r FROM '.$this->table().' r LEFT JOIN '.EEM_Transaction::instance()->table().' t ON r.TXN_ID = t.TXN_ID WHERE t.TXN_ID IS NULL' );
 	}
 
 

core/libraries/plugin_api/EE_Register_Addon.lib.php

Indentation +27 added lines, -27 removed lines

@@ -1,29 +1,29 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
 /**
- * Event Espresso
- *
- * Event Registration and Ticketing Management Plugin for WordPress
- *
- * @ package			Event Espresso
- * @ author			    Event Espresso
- * @ copyright		(c) 2008-2014 Event Espresso  All Rights Reserved.
- * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
- * @ link					http://www.eventespresso.com
- * @ version		 	$VID:$
- *
- * ------------------------------------------------------------------------
- */
+	 * Event Espresso
+	 *
+	 * Event Registration and Ticketing Management Plugin for WordPress
+	 *
+	 * @ package			Event Espresso
+	 * @ author			    Event Espresso
+	 * @ copyright		(c) 2008-2014 Event Espresso  All Rights Reserved.
+	 * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
+	 * @ link					http://www.eventespresso.com
+	 * @ version		 	$VID:$
+	 *
+	 * ------------------------------------------------------------------------
+	 */
 /**
- * Class EE_Register_Addon
- *
- * EEI_Plugin_API class for registering addons for use with EE core.
- * Receives an array of addon details and takes care of adding all of the necessary hooks and filters to setup things such as autoloaders, configuration settings, data migration scripts, admin pages, modules, shortcodes, and even widgets
- *
- * @package        	Event Espresso
- * @subpackage  	plugin api, addons
- * @since 				4.3.0
- * @author 				Brent Christensen
- */
+	 * Class EE_Register_Addon
+	 *
+	 * EEI_Plugin_API class for registering addons for use with EE core.
+	 * Receives an array of addon details and takes care of adding all of the necessary hooks and filters to setup things such as autoloaders, configuration settings, data migration scripts, admin pages, modules, shortcodes, and even widgets
+	 *
+	 * @package        	Event Espresso
+	 * @subpackage  	plugin api, addons
+	 * @since 				4.3.0
+	 * @author 				Brent Christensen
+	 */
 class EE_Register_Addon implements EEI_Plugin_API {
 
 
@@ -138,10 +138,10 @@ 
 	 *       		 An array of message types with the key as the message type name and the values as below:
 	 *        		@type string $mtfilename The filename of the message type being registered.  This will be the main
 	 *                                       EE_{Messagetype_Name}_message_type class. (eg. EE_Declined_Registration_message_type.class.php). Required.
-	*               @type array $autoloadpaths An array of paths to add to the messages autoloader for the new message type. Required.
-	*               @type array $messengers_to_activate_with An array of messengers that this message
-	*                           type should activate with. Each value in the array should match the name property of a EE_messenger. Optional.
-	*               @type array $messengers_to_validate_with An array of messengers that this message
+	 *               @type array $autoloadpaths An array of paths to add to the messages autoloader for the new message type. Required.
+	 *               @type array $messengers_to_activate_with An array of messengers that this message
+	 *                           type should activate with. Each value in the array should match the name property of a EE_messenger. Optional.
+	 *               @type array $messengers_to_validate_with An array of messengers that this message
 	 *                          type should validate with. Each value in the array should match the name property of an EE_messenger. Optional.
 	 *       	}
 	 *			@type array $custom_post_types

Spacing +170 added lines, -170 removed lines

@@ -66,23 +66,23 @@ 
 	 * @param string $min_core_version
 	 * @return string always like '4.3.0.rc.000'
 	 */
-	protected static function _effective_version( $min_core_version ) {
+	protected static function _effective_version($min_core_version) {
 		// versions: 4 . 3 . 1 . p . 123
 		// offsets:    0 . 1 . 2 . 3 . 4
-		$version_parts = explode( '.', $min_core_version );
+		$version_parts = explode('.', $min_core_version);
 		//check they specified the micro version (after 2nd period)
-		if( ! isset( $version_parts[ 2 ] ) ) {
-			$version_parts[ 2] = '0';
+		if ( ! isset($version_parts[2])) {
+			$version_parts[2] = '0';
 		}
 		//if they didn't specify the 'p', or 'rc' part. Just assume the lowest possible
 		//soon we can assume that's 'rc', but this current version is 'alpha'
-		if( ! isset( $version_parts[ 3 ] ) ) {
-			$version_parts[ 3 ] = 'dev';
+		if ( ! isset($version_parts[3])) {
+			$version_parts[3] = 'dev';
 		}
-		if( ! isset( $version_parts[ 4 ] ) ) {
-			$version_parts[ 4 ] = '000';
+		if ( ! isset($version_parts[4])) {
+			$version_parts[4] = '000';
 		}
-		return implode( '.', $version_parts );
+		return implode('.', $version_parts);
 
 	}
 
@@ -92,8 +92,8 @@ 
 	 * @param string $actual_core_version the actual core version, optional
 	 * @return boolean
 	 */
-	public static  function _meets_min_core_version_requirement( $min_core_version, $actual_core_version = EVENT_ESPRESSO_VERSION ) {
-		return version_compare( self::_effective_version( $actual_core_version ), self::_effective_version( $min_core_version ), '>=' );
+	public static  function _meets_min_core_version_requirement($min_core_version, $actual_core_version = EVENT_ESPRESSO_VERSION) {
+		return version_compare(self::_effective_version($actual_core_version), self::_effective_version($min_core_version), '>=');
 	}
 
 
@@ -155,235 +155,235 @@ 
 	 * @throws EE_Error
 	 * @return void
 	 */
-	public static function register( $addon_name = '', $setup_args = array()  ) {
+	public static function register($addon_name = '', $setup_args = array()) {
 		// required fields MUST be present, so let's make sure they are.
-		if ( empty( $addon_name ) || ! is_array( $setup_args )) {
-			throw new EE_Error( __( 'In order to register an EE_Addon with EE_Register_Addon::register(), you must include the "addon_name" (the name of the addon), and an array of arguments.', 'event_espresso' ));
+		if (empty($addon_name) || ! is_array($setup_args)) {
+			throw new EE_Error(__('In order to register an EE_Addon with EE_Register_Addon::register(), you must include the "addon_name" (the name of the addon), and an array of arguments.', 'event_espresso'));
 		}
-		if ( ! isset($setup_args[ 'main_file_path' ]) || empty( $setup_args[ 'main_file_path' ] ) ){
-			throw new EE_Error( sprintf( __( 'When registering an addon, you didn\'t provide the "main_file_path", which is the full path to the main file loaded directly by Wordpress. You only provided %s', 'event_espresso' ), implode(",", array_keys( $setup_args ) ) ) );
+		if ( ! isset($setup_args['main_file_path']) || empty($setup_args['main_file_path'])) {
+			throw new EE_Error(sprintf(__('When registering an addon, you didn\'t provide the "main_file_path", which is the full path to the main file loaded directly by Wordpress. You only provided %s', 'event_espresso'), implode(",", array_keys($setup_args))));
 		}
 		// check that addon has not already been registered with that name
-		if ( isset( self::$_settings[ $addon_name ] ) && ! did_action( 'activate_plugin' ) ) {
-			throw new EE_Error( sprintf( __( 'An EE_Addon with the name "%s" has already been registered and each EE_Addon requires a unique name.', 'event_espresso' ), $addon_name ));
+		if (isset(self::$_settings[$addon_name]) && ! did_action('activate_plugin')) {
+			throw new EE_Error(sprintf(__('An EE_Addon with the name "%s" has already been registered and each EE_Addon requires a unique name.', 'event_espresso'), $addon_name));
 		}
 
 
 		// no class name for addon?
-		if ( empty( $setup_args['class_name'] )) {
+		if (empty($setup_args['class_name'])) {
 			// generate one by first separating name with spaces
-			$class_name = str_replace( array( '-', '_' ), ' ', trim( $addon_name ));
+			$class_name = str_replace(array('-', '_'), ' ', trim($addon_name));
 			//capitalize, then replace spaces with underscores
-			$class_name = str_replace( ' ', '_', ucwords( $class_name ));
+			$class_name = str_replace(' ', '_', ucwords($class_name));
 		} else {
 			$class_name = $setup_args['class_name'];
 		}
-		$class_name = strpos( $class_name, 'EE_' ) === 0 ? $class_name : 'EE_' . $class_name;
+		$class_name = strpos($class_name, 'EE_') === 0 ? $class_name : 'EE_'.$class_name;
 		//setup $_settings array from incoming values.
 		$addon_settings = array(
 			// generated from the addon name, changes something like "calendar" to "EE_Calendar"
 			'class_name' 						=> $class_name,
 			// the addon slug for use in URLs, etc
-			'plugin_slug' 						=> isset( $setup_args['plugin_slug'] ) ? (string)$setup_args['plugin_slug'] : '',
+			'plugin_slug' 						=> isset($setup_args['plugin_slug']) ? (string) $setup_args['plugin_slug'] : '',
 			// page slug to be used when generating the "Settings" link on the WP plugin page
-			'plugin_action_slug' 			=> isset( $setup_args[ 'plugin_action_slug' ] ) ? (string)$setup_args[ 'plugin_action_slug' ] : '',
+			'plugin_action_slug' 			=> isset($setup_args['plugin_action_slug']) ? (string) $setup_args['plugin_action_slug'] : '',
 			// the "software" version for the addon
-			'version' 								=> isset( $setup_args['version'] ) ? (string)$setup_args['version'] : '',
+			'version' 								=> isset($setup_args['version']) ? (string) $setup_args['version'] : '',
 			// the minimum version of EE Core that the addon will work with
-			'min_core_version' 			=> isset( $setup_args['min_core_version'] ) ? (string)$setup_args['min_core_version'] : '',
+			'min_core_version' 			=> isset($setup_args['min_core_version']) ? (string) $setup_args['min_core_version'] : '',
 			// full server path to main file (file loaded directly by WP)
-			'main_file_path' 					=> isset( $setup_args['main_file_path'] ) ? (string)$setup_args['main_file_path'] : '',
+			'main_file_path' 					=> isset($setup_args['main_file_path']) ? (string) $setup_args['main_file_path'] : '',
 			// path to folder containing files for integrating with the EE core admin and/or setting up EE admin pages
-			'admin_path' 						=> isset( $setup_args['admin_path'] ) ? (string)$setup_args['admin_path'] : '',
+			'admin_path' 						=> isset($setup_args['admin_path']) ? (string) $setup_args['admin_path'] : '',
 			// a method to be called when the EE Admin is first invoked, can be used for hooking into any admin page
-			'admin_callback' 				=> isset( $setup_args['admin_callback'] ) ? (string)$setup_args['admin_callback'] : '',
+			'admin_callback' 				=> isset($setup_args['admin_callback']) ? (string) $setup_args['admin_callback'] : '',
 			// the section name for this addon's configuration settings section (defaults to "addons")
-			'config_section' 					=> isset( $setup_args['config_section'] ) ? (string)$setup_args['config_section'] : 'addons',
+			'config_section' 					=> isset($setup_args['config_section']) ? (string) $setup_args['config_section'] : 'addons',
 			// the class name for this addon's configuration settings object
-			'config_class' 						=> isset( $setup_args['config_class'] ) ? (string)$setup_args['config_class'] : '',
+			'config_class' 						=> isset($setup_args['config_class']) ? (string) $setup_args['config_class'] : '',
 			//the name given to the config for this addons' configuration settings object (optional)
-			'config_name' 					=> isset( $setup_args['config_name'] ) ? (string) $setup_args['config_name']: '',
+			'config_name' 					=> isset($setup_args['config_name']) ? (string) $setup_args['config_name'] : '',
 			// an array of "class names" => "full server paths" for any classes that might be invoked by the addon
-			'autoloader_paths' 			=> isset( $setup_args['autoloader_paths'] ) ? (array)$setup_args['autoloader_paths'] : array(),
+			'autoloader_paths' 			=> isset($setup_args['autoloader_paths']) ? (array) $setup_args['autoloader_paths'] : array(),
 			// an array of  "full server paths" for any folders containing classes that might be invoked by the addon
-			'autoloader_folders' 			=> isset( $setup_args['autoloader_folders'] ) ? (array)$setup_args['autoloader_folders'] : array(),
+			'autoloader_folders' 			=> isset($setup_args['autoloader_folders']) ? (array) $setup_args['autoloader_folders'] : array(),
 			// array of full server paths to any EE_DMS data migration scripts used by the addon
-			'dms_paths' 						=> isset( $setup_args['dms_paths'] ) ? (array)$setup_args['dms_paths'] : array(),
+			'dms_paths' 						=> isset($setup_args['dms_paths']) ? (array) $setup_args['dms_paths'] : array(),
 			// array of full server paths to any EED_Modules used by the addon
-			'module_paths' 					=> isset( $setup_args['module_paths'] ) ? (array)$setup_args['module_paths'] : array(),
+			'module_paths' 					=> isset($setup_args['module_paths']) ? (array) $setup_args['module_paths'] : array(),
 			// array of full server paths to any EES_Shortcodes used by the addon
-			'shortcode_paths'			 	=> isset( $setup_args['shortcode_paths'] ) ? (array)$setup_args['shortcode_paths'] : array(),
+			'shortcode_paths'			 	=> isset($setup_args['shortcode_paths']) ? (array) $setup_args['shortcode_paths'] : array(),
 			// array of full server paths to any WP_Widgets used by the addon
-			'widget_paths' 					=> isset( $setup_args['widget_paths'] ) ? (array)$setup_args['widget_paths'] : array(),
+			'widget_paths' 					=> isset($setup_args['widget_paths']) ? (array) $setup_args['widget_paths'] : array(),
 			// array of PUE options used by the addon
-			'pue_options' 						=> isset( $setup_args['pue_options'] ) ? (array)$setup_args['pue_options'] : array(),
-			'message_types' 				=> isset( $setup_args['message_types'] ) ? (array) $setup_args['message_types'] : array(),
-			'capabilities' 						=> isset( $setup_args['capabilities'] ) ? (array) $setup_args['capabilities'] : array(),
-			'capability_maps' 				=> isset( $setup_args['capability_maps'] ) ? (array) $setup_args['capability_maps'] : array(),
-			'model_paths' 					=> isset( $setup_args['model_paths'] ) ? (array) $setup_args['model_paths'] : array(),
-			'class_paths' 						=> isset( $setup_args['class_paths'] ) ? (array) $setup_args['class_paths'] : array(),
-			'model_extension_paths' 	=> isset( $setup_args['model_extension_paths'] ) ? (array) $setup_args['model_extension_paths'] : array(),
-			'class_extension_paths' 		=> isset( $setup_args['class_extension_paths'] ) ? (array) $setup_args['class_extension_paths'] : array(),
-			'custom_post_types' 			=> isset( $setup_args['custom_post_types'] ) ? (array) $setup_args['custom_post_types'] : array(),
-			'custom_taxonomies' 		=> isset( $setup_args['custom_taxonomies'] ) ? (array) $setup_args['custom_taxonomies'] : array(),
-			'payment_method_paths'	=> isset( $setup_args[ 'payment_method_paths' ] ) ? (array) $setup_args[ 'payment_method_paths' ] : array(),
-			'default_terms' 					=> isset( $setup_args['default_terms'] ) ? (array) $setup_args['default_terms'] : array(),
+			'pue_options' 						=> isset($setup_args['pue_options']) ? (array) $setup_args['pue_options'] : array(),
+			'message_types' 				=> isset($setup_args['message_types']) ? (array) $setup_args['message_types'] : array(),
+			'capabilities' 						=> isset($setup_args['capabilities']) ? (array) $setup_args['capabilities'] : array(),
+			'capability_maps' 				=> isset($setup_args['capability_maps']) ? (array) $setup_args['capability_maps'] : array(),
+			'model_paths' 					=> isset($setup_args['model_paths']) ? (array) $setup_args['model_paths'] : array(),
+			'class_paths' 						=> isset($setup_args['class_paths']) ? (array) $setup_args['class_paths'] : array(),
+			'model_extension_paths' 	=> isset($setup_args['model_extension_paths']) ? (array) $setup_args['model_extension_paths'] : array(),
+			'class_extension_paths' 		=> isset($setup_args['class_extension_paths']) ? (array) $setup_args['class_extension_paths'] : array(),
+			'custom_post_types' 			=> isset($setup_args['custom_post_types']) ? (array) $setup_args['custom_post_types'] : array(),
+			'custom_taxonomies' 		=> isset($setup_args['custom_taxonomies']) ? (array) $setup_args['custom_taxonomies'] : array(),
+			'payment_method_paths'	=> isset($setup_args['payment_method_paths']) ? (array) $setup_args['payment_method_paths'] : array(),
+			'default_terms' 					=> isset($setup_args['default_terms']) ? (array) $setup_args['default_terms'] : array(),
 			// if not empty, inserts a new table row after this plugin's row on the WP Plugins page that can be used for adding upgrading/marketing info
-			'plugins_page_row' 			=> isset( $setup_args['plugins_page_row'] ) ? $setup_args['plugins_page_row'] : '',
+			'plugins_page_row' 			=> isset($setup_args['plugins_page_row']) ? $setup_args['plugins_page_row'] : '',
 		);
 
 		// if plugin_action_slug is NOT set, but an admin page path IS set, then let's just use the plugin_slug since that will be used for linking to the admin page
-		$addon_settings[ 'plugin_action_slug' ] = empty( $addon_settings[ 'plugin_action_slug' ] ) && ! empty( $addon_settings[ 'admin_path' ] ) ? $addon_settings[ 'plugin_slug' ] : $addon_settings[ 'plugin_action_slug' ];
+		$addon_settings['plugin_action_slug'] = empty($addon_settings['plugin_action_slug']) && ! empty($addon_settings['admin_path']) ? $addon_settings['plugin_slug'] : $addon_settings['plugin_action_slug'];
 		// full server path to main file (file loaded directly by WP)
-		$addon_settings['plugin_basename'] = plugin_basename( $addon_settings[ 'main_file_path' ] );
+		$addon_settings['plugin_basename'] = plugin_basename($addon_settings['main_file_path']);
 
 		//check whether this addon version is compatible with EE core
-		if ( isset( EE_Register_Addon::$_incompatible_addons[ $addon_name ] ) &&
-				! self::_meets_min_core_version_requirement( EE_Register_Addon::$_incompatible_addons[ $addon_name ], $addon_settings[ 'version' ] ) ) {
+		if (isset(EE_Register_Addon::$_incompatible_addons[$addon_name]) &&
+				! self::_meets_min_core_version_requirement(EE_Register_Addon::$_incompatible_addons[$addon_name], $addon_settings['version'])) {
 			$incompatibility_message = sprintf(
-				__( 'The Event Espresso "%1$s" addon was deactivated because it is incompatible with this version of core.%2$s Only version %3$s or higher of "%1$s" can run with this version of core. This can happen when attempting to run beta versions or release candidates with older versions of core, or running old versions of addons with a newer version of core.%2$sPlease upgrade Event Espresso Core and the "%1$s" addon, then re-attempt activating it.', 'event_espresso' ),
+				__('The Event Espresso "%1$s" addon was deactivated because it is incompatible with this version of core.%2$s Only version %3$s or higher of "%1$s" can run with this version of core. This can happen when attempting to run beta versions or release candidates with older versions of core, or running old versions of addons with a newer version of core.%2$sPlease upgrade Event Espresso Core and the "%1$s" addon, then re-attempt activating it.', 'event_espresso'),
 				$addon_name,
 				'<br />',
-				EE_Register_Addon::$_incompatible_addons[ $addon_name ]
+				EE_Register_Addon::$_incompatible_addons[$addon_name]
 			);
-		} else if ( ! self::_meets_min_core_version_requirement( $setup_args[ 'min_core_version' ], espresso_version() ) ) {
+		} else if ( ! self::_meets_min_core_version_requirement($setup_args['min_core_version'], espresso_version())) {
 			$incompatibility_message = sprintf(
-				__( 'The Event Espresso "%1$s" addon could not be activated because it requires Event Espresso Core version "%2$s" or higher in order to run.%4$sYour version of Event Espresso Core is currently at "%3$s". Please upgrade Event Espresso Core first and then re-attempt activating "%1$s".', 'event_espresso' ),
+				__('The Event Espresso "%1$s" addon could not be activated because it requires Event Espresso Core version "%2$s" or higher in order to run.%4$sYour version of Event Espresso Core is currently at "%3$s". Please upgrade Event Espresso Core first and then re-attempt activating "%1$s".', 'event_espresso'),
 				$addon_name,
-				self::_effective_version( $setup_args[ 'min_core_version' ] ),
-				self::_effective_version( espresso_version() ),
+				self::_effective_version($setup_args['min_core_version']),
+				self::_effective_version(espresso_version()),
 				'<br />'
 			);
 		} else {
 			$incompatibility_message = '';
 		}
-		if ( ! empty( $incompatibility_message ) ) {
+		if ( ! empty($incompatibility_message)) {
 			//remove 'activate' from the REQUEST so WP doesn't erroneously tell the user the
 			//plugin activated fine when it didn't
-			if( isset( $_GET[ 'activate' ]) ) {
-				unset( $_GET[ 'activate' ] );
+			if (isset($_GET['activate'])) {
+				unset($_GET['activate']);
 			}
-			if( isset( $_REQUEST[ 'activate' ] ) ){
-				unset( $_REQUEST[ 'activate' ] );
+			if (isset($_REQUEST['activate'])) {
+				unset($_REQUEST['activate']);
 			}
 			//and show an error message indicating the plugin didn't activate properly
-			EE_Error::add_error( $incompatibility_message, __FILE__, __FUNCTION__, __LINE__ );
-			if ( current_user_can( 'activate_plugins' )) {
-				require_once( ABSPATH.'wp-admin/includes/plugin.php' );
-				deactivate_plugins( plugin_basename( $addon_settings[ 'main_file_path' ] ), TRUE );
+			EE_Error::add_error($incompatibility_message, __FILE__, __FUNCTION__, __LINE__);
+			if (current_user_can('activate_plugins')) {
+				require_once(ABSPATH.'wp-admin/includes/plugin.php');
+				deactivate_plugins(plugin_basename($addon_settings['main_file_path']), TRUE);
 			}
 			return;
 		}
 		//this is an activation request
-		if( did_action( 'activate_plugin' ) ){
+		if (did_action('activate_plugin')) {
 			//to find if THIS is the addon that was activated,
 			//just check if we have already registered it or not
 			//(as the newly-activated addon wasn't around the first time addons were registered)
-			if( ! isset( self::$_settings[ $addon_name ] ) ){
-				self::$_settings[ $addon_name ] = $addon_settings;
+			if ( ! isset(self::$_settings[$addon_name])) {
+				self::$_settings[$addon_name] = $addon_settings;
 				$addon = self::_load_and_init_addon_class($addon_name);
 				$addon->set_activation_indicator_option();
 				//dont bother setting up the rest of the addon.
 				//we know it was just activated and the request will end soon
 			}
 			return;
-		}else{
+		} else {
 			// make sure this was called in the right place!
-			if ( ! did_action( 'AHEE__EE_System__load_espresso_addons' ) || did_action( 'AHEE__EE_System___detect_if_activation_or_upgrade__begin' )) {
+			if ( ! did_action('AHEE__EE_System__load_espresso_addons') || did_action('AHEE__EE_System___detect_if_activation_or_upgrade__begin')) {
 				EE_Error::doing_it_wrong(
 					__METHOD__,
 					sprintf(
-						__( 'An attempt to register an EE_Addon named "%s" has failed because it was not registered at the correct time.  Please use the "AHEE__EE_System__load_espresso_addons" hook to register addons.','event_espresso'),
+						__('An attempt to register an EE_Addon named "%s" has failed because it was not registered at the correct time.  Please use the "AHEE__EE_System__load_espresso_addons" hook to register addons.', 'event_espresso'),
 						$addon_name
 					),
 					'4.3.0'
 				);
 			}
-			self::$_settings[ $addon_name ] = $addon_settings;
+			self::$_settings[$addon_name] = $addon_settings;
 		}
 		// we need cars
-		if ( ! empty( self::$_settings[ $addon_name ]['autoloader_paths'] )) {
+		if ( ! empty(self::$_settings[$addon_name]['autoloader_paths'])) {
 			// setup autoloader for single file
-			EEH_Autoloader::instance()->register_autoloader( self::$_settings[ $addon_name ]['autoloader_paths'] );
+			EEH_Autoloader::instance()->register_autoloader(self::$_settings[$addon_name]['autoloader_paths']);
 		}
 		// setup autoloaders for folders
-		if ( ! empty( self::$_settings[ $addon_name ]['autoloader_folders'] )) {
-			foreach ( self::$_settings[ $addon_name ]['autoloader_folders'] as $autoloader_folder ) {
-				EEH_Autoloader::register_autoloaders_for_each_file_in_folder( $autoloader_folder );
+		if ( ! empty(self::$_settings[$addon_name]['autoloader_folders'])) {
+			foreach (self::$_settings[$addon_name]['autoloader_folders'] as $autoloader_folder) {
+				EEH_Autoloader::register_autoloaders_for_each_file_in_folder($autoloader_folder);
 			}
 		}
 		// register new models
-		if ( ! empty( self::$_settings[ $addon_name ]['model_paths'] ) || ! empty( self::$_settings[ $addon_name ]['class_paths'] )) {
-			EE_Register_Model::register( $addon_name, array( 'model_paths' => self::$_settings[ $addon_name ]['model_paths'] , 'class_paths' => self::$_settings[ $addon_name ]['class_paths']));
+		if ( ! empty(self::$_settings[$addon_name]['model_paths']) || ! empty(self::$_settings[$addon_name]['class_paths'])) {
+			EE_Register_Model::register($addon_name, array('model_paths' => self::$_settings[$addon_name]['model_paths'], 'class_paths' => self::$_settings[$addon_name]['class_paths']));
 		}
 		// register model extensions
-		if ( ! empty( self::$_settings[ $addon_name ]['model_extension_paths'] ) || ! empty( self::$_settings[ $addon_name ]['class_extension_paths'] )) {
-			EE_Register_Model_Extensions::register( $addon_name, array( 'model_extension_paths' => self::$_settings[ $addon_name ]['model_extension_paths'] , 'class_extension_paths' => self::$_settings[ $addon_name ]['class_extension_paths']));
+		if ( ! empty(self::$_settings[$addon_name]['model_extension_paths']) || ! empty(self::$_settings[$addon_name]['class_extension_paths'])) {
+			EE_Register_Model_Extensions::register($addon_name, array('model_extension_paths' => self::$_settings[$addon_name]['model_extension_paths'], 'class_extension_paths' => self::$_settings[$addon_name]['class_extension_paths']));
 		}
 		// setup DMS
-		if ( ! empty( self::$_settings[ $addon_name ]['dms_paths'] )) {
-			EE_Register_Data_Migration_Scripts::register( $addon_name, array( 'dms_paths' => self::$_settings[ $addon_name ]['dms_paths'] ));
+		if ( ! empty(self::$_settings[$addon_name]['dms_paths'])) {
+			EE_Register_Data_Migration_Scripts::register($addon_name, array('dms_paths' => self::$_settings[$addon_name]['dms_paths']));
 		}
 		// if config_class is present let's register config.
-		if ( ! empty( self::$_settings[ $addon_name ]['config_class'] )) {
+		if ( ! empty(self::$_settings[$addon_name]['config_class'])) {
 			EE_Register_Config::register(
-				self::$_settings[ $addon_name ]['config_class'],
+				self::$_settings[$addon_name]['config_class'],
 				array(
-					'config_section' => self::$_settings[ $addon_name ]['config_section'],
-					'config_name' => self::$_settings[ $addon_name ]['config_name']
+					'config_section' => self::$_settings[$addon_name]['config_section'],
+					'config_name' => self::$_settings[$addon_name]['config_name']
 				)
 			);
 		}
 		// register admin page
-		if ( ! empty( self::$_settings[ $addon_name ]['admin_path'] )) {
-			EE_Register_Admin_Page::register( $addon_name, array( 'page_path' => self::$_settings[ $addon_name ]['admin_path'] ));
+		if ( ! empty(self::$_settings[$addon_name]['admin_path'])) {
+			EE_Register_Admin_Page::register($addon_name, array('page_path' => self::$_settings[$addon_name]['admin_path']));
 
 		}
 		// add to list of modules to be registered
-		if ( ! empty( self::$_settings[ $addon_name ]['module_paths'] )) {
-			EE_Register_Module::register( $addon_name, array( 'module_paths' => self::$_settings[ $addon_name ]['module_paths'] ));
+		if ( ! empty(self::$_settings[$addon_name]['module_paths'])) {
+			EE_Register_Module::register($addon_name, array('module_paths' => self::$_settings[$addon_name]['module_paths']));
 		}
 		// add to list of shortcodes to be registered
-		if ( ! empty( self::$_settings[ $addon_name ]['shortcode_paths'] )) {
-			EE_Register_Shortcode::register( $addon_name, array( 'shortcode_paths' => self::$_settings[ $addon_name ]['shortcode_paths'] ));
+		if ( ! empty(self::$_settings[$addon_name]['shortcode_paths'])) {
+			EE_Register_Shortcode::register($addon_name, array('shortcode_paths' => self::$_settings[$addon_name]['shortcode_paths']));
 		}
 		// add to list of widgets to be registered
-		if ( ! empty( self::$_settings[ $addon_name ]['widget_paths'] )) {
-			EE_Register_Widget::register( $addon_name, array( 'widget_paths' => self::$_settings[ $addon_name ]['widget_paths'] ));
+		if ( ! empty(self::$_settings[$addon_name]['widget_paths'])) {
+			EE_Register_Widget::register($addon_name, array('widget_paths' => self::$_settings[$addon_name]['widget_paths']));
 		}
 
 		//register capability related stuff.
-		if ( ! empty( self::$_settings[ $addon_name ]['capabilities'] ) ) {
-			EE_Register_Capabilities::register( $addon_name , array( 'capabilities' => self::$_settings[$addon_name]['capabilities'], 'capability_maps' => self::$_settings[$addon_name]['capability_maps'] ) );
+		if ( ! empty(self::$_settings[$addon_name]['capabilities'])) {
+			EE_Register_Capabilities::register($addon_name, array('capabilities' => self::$_settings[$addon_name]['capabilities'], 'capability_maps' => self::$_settings[$addon_name]['capability_maps']));
 		}
 		//any message type to register?
-		if (  !empty( self::$_settings[$addon_name]['message_types'] ) ) {
-				add_action( 'EE_Brewing_Regular___messages_caf', array( 'EE_Register_Addon', 'register_message_types' ) );
+		if ( ! empty(self::$_settings[$addon_name]['message_types'])) {
+				add_action('EE_Brewing_Regular___messages_caf', array('EE_Register_Addon', 'register_message_types'));
 		}
 
 		// if plugin update engine is being used for auto-updates (not needed if PUE is not being used)
-		if ( ! empty( $setup_args['pue_options'] )) {
-			self::$_settings[ $addon_name ]['pue_options'] = array(
-				'pue_plugin_slug' 	=> isset( $setup_args['pue_options']['pue_plugin_slug'] ) ? (string)$setup_args['pue_options']['pue_plugin_slug'] : 'espresso_' . strtolower( $class_name ),
-				'plugin_basename' => isset( $setup_args['pue_options']['plugin_basename'] ) ? (string)$setup_args['pue_options']['plugin_basename'] : plugin_basename( self::$_settings[ $addon_name ]['main_file_path'] ),
-				'checkPeriod' 			=> isset( $setup_args['pue_options']['checkPeriod'] ) ? (string)$setup_args['pue_options']['checkPeriod'] : '24',
-				'use_wp_update'		=> isset( $setup_args['pue_options']['use_wp_update'] ) ? (string)$setup_args['pue_options']['use_wp_update'] : FALSE
+		if ( ! empty($setup_args['pue_options'])) {
+			self::$_settings[$addon_name]['pue_options'] = array(
+				'pue_plugin_slug' 	=> isset($setup_args['pue_options']['pue_plugin_slug']) ? (string) $setup_args['pue_options']['pue_plugin_slug'] : 'espresso_'.strtolower($class_name),
+				'plugin_basename' => isset($setup_args['pue_options']['plugin_basename']) ? (string) $setup_args['pue_options']['plugin_basename'] : plugin_basename(self::$_settings[$addon_name]['main_file_path']),
+				'checkPeriod' 			=> isset($setup_args['pue_options']['checkPeriod']) ? (string) $setup_args['pue_options']['checkPeriod'] : '24',
+				'use_wp_update'		=> isset($setup_args['pue_options']['use_wp_update']) ? (string) $setup_args['pue_options']['use_wp_update'] : FALSE
 			);
-			add_action( 'AHEE__EE_System__brew_espresso__after_pue_init', array( 'EE_Register_Addon', 'load_pue_update' ));
+			add_action('AHEE__EE_System__brew_espresso__after_pue_init', array('EE_Register_Addon', 'load_pue_update'));
 		}
 
 		//any custom post type/ custom capabilities or default terms to register
-		if ( !empty( self::$_settings[$addon_name]['custom_post_types'] ) || !empty( self::$_settings[$addon_name]['custom_taxonomies'] ) ) {
-			EE_Register_CPT::register( $addon_name, array( 'cpts' => self::$_settings[$addon_name]['custom_post_types'] , 'cts' => self::$_settings[$addon_name]['custom_taxonomies'], 'default_terms' => self::$_settings[$addon_name]['default_terms'] ) );
+		if ( ! empty(self::$_settings[$addon_name]['custom_post_types']) || ! empty(self::$_settings[$addon_name]['custom_taxonomies'])) {
+			EE_Register_CPT::register($addon_name, array('cpts' => self::$_settings[$addon_name]['custom_post_types'], 'cts' => self::$_settings[$addon_name]['custom_taxonomies'], 'default_terms' => self::$_settings[$addon_name]['default_terms']));
 		}
-		if( ! empty( self::$_settings[ $addon_name ][ 'payment_method_paths' ] ) ){
-			EE_Register_Payment_Method::register($addon_name, array( 'payment_method_paths' => self::$_settings[ $addon_name ][ 'payment_method_paths' ] ) );
+		if ( ! empty(self::$_settings[$addon_name]['payment_method_paths'])) {
+			EE_Register_Payment_Method::register($addon_name, array('payment_method_paths' => self::$_settings[$addon_name]['payment_method_paths']));
 		}
 		// load and instantiate main addon class
 		$addon = self::_load_and_init_addon_class($addon_name);
 		// call any additional admin_callback functions during load_admin_controller hook
-		if ( ! empty( self::$_settings[ $addon_name ]['admin_callback'] )) {
-			add_action( 'AHEE__EE_System__load_controllers__load_admin_controllers', array( $addon, self::$_settings[ $addon_name ]['admin_callback'] ));
+		if ( ! empty(self::$_settings[$addon_name]['admin_callback'])) {
+			add_action('AHEE__EE_System__load_controllers__load_admin_controllers', array($addon, self::$_settings[$addon_name]['admin_callback']));
 		}
 	}
 
@@ -394,22 +394,22 @@ 
 	 * @param string $addon_name
 	 * @return EE_Addon
 	 */
-	private static function _load_and_init_addon_class($addon_name){
-		$addon = EE_Registry::instance()->load_addon( dirname( self::$_settings[ $addon_name ]['main_file_path'] ), self::$_settings[ $addon_name ]['class_name'] );
-		$addon->set_name( $addon_name );
-		$addon->set_plugin_slug( self::$_settings[ $addon_name ][ 'plugin_slug' ] );
-		$addon->set_plugin_basename( self::$_settings[ $addon_name ][ 'plugin_basename' ] );
-		$addon->set_main_plugin_file( self::$_settings[ $addon_name ]['main_file_path'] );
-		$addon->set_plugin_action_slug( self::$_settings[ $addon_name ][ 'plugin_action_slug' ] );
-		$addon->set_plugins_page_row( self::$_settings[ $addon_name ][ 'plugins_page_row' ] );
-		$addon->set_version( self::$_settings[ $addon_name ]['version'] );
-		$addon->set_min_core_version( self::_effective_version( self::$_settings[ $addon_name ]['min_core_version'] ) );
-		$addon->set_config_section( self::$_settings[ $addon_name ]['config_section'] );
-		$addon->set_config_class( self::$_settings[ $addon_name ]['config_class'] );
-		$addon->set_config_name( self::$_settings[ $addon_name ]['config_name'] );
+	private static function _load_and_init_addon_class($addon_name) {
+		$addon = EE_Registry::instance()->load_addon(dirname(self::$_settings[$addon_name]['main_file_path']), self::$_settings[$addon_name]['class_name']);
+		$addon->set_name($addon_name);
+		$addon->set_plugin_slug(self::$_settings[$addon_name]['plugin_slug']);
+		$addon->set_plugin_basename(self::$_settings[$addon_name]['plugin_basename']);
+		$addon->set_main_plugin_file(self::$_settings[$addon_name]['main_file_path']);
+		$addon->set_plugin_action_slug(self::$_settings[$addon_name]['plugin_action_slug']);
+		$addon->set_plugins_page_row(self::$_settings[$addon_name]['plugins_page_row']);
+		$addon->set_version(self::$_settings[$addon_name]['version']);
+		$addon->set_min_core_version(self::_effective_version(self::$_settings[$addon_name]['min_core_version']));
+		$addon->set_config_section(self::$_settings[$addon_name]['config_section']);
+		$addon->set_config_class(self::$_settings[$addon_name]['config_class']);
+		$addon->set_config_name(self::$_settings[$addon_name]['config_name']);
 		//unfortunately this can't be hooked in upon construction, because we don't have
 		//the plugin mainfile's path upon construction.
-		register_deactivation_hook($addon->get_main_plugin_file(), array($addon,'deactivation'));
+		register_deactivation_hook($addon->get_main_plugin_file(), array($addon, 'deactivation'));
 		return $addon;
 	}
 
@@ -422,18 +422,18 @@ 
 	 */
 	public static function load_pue_update() {
 		// load PUE client
-		require_once  EE_THIRD_PARTY . 'pue' . DS . 'pue-client.php';
+		require_once  EE_THIRD_PARTY.'pue'.DS.'pue-client.php';
 		// cycle thru settings
-		foreach ( self::$_settings as $settings ) {
-			if ( ! empty( $settings['pue_options'] )) {
+		foreach (self::$_settings as $settings) {
+			if ( ! empty($settings['pue_options'])) {
 				// initiate the class and start the plugin update engine!
 				new PluginUpdateEngineChecker(
 				// host file URL
 					'https://eventespresso.com',
 					// plugin slug(s)
 					array(
-						'premium' => array( 'p' => $settings['pue_options']['pue_plugin_slug'] ),
-						'prerelease' => array( 'beta' => $settings['pue_options']['pue_plugin_slug'] . '-pr' )
+						'premium' => array('p' => $settings['pue_options']['pue_plugin_slug']),
+						'prerelease' => array('beta' => $settings['pue_options']['pue_plugin_slug'].'-pr')
 					),
 					// options
 					array(
@@ -461,9 +461,9 @@ 
 	 * @return void
 	 */
 	public static function register_message_types() {
-		foreach ( self::$_settings as $settings ) {
-			foreach( $settings['message_types'] as $message_type => $message_type_settings ) {
-				EE_Register_Message_Type::register( $message_type, $message_type_settings );
+		foreach (self::$_settings as $settings) {
+			foreach ($settings['message_types'] as $message_type => $message_type_settings) {
+				EE_Register_Message_Type::register($message_type, $message_type_settings);
 			}
 		}
 	}
@@ -479,60 +479,60 @@ 
 	 * @throws EE_Error
 	 * @return void
 	 */
-	public static function deregister( $addon_name = NULL ) {
-		if ( isset( self::$_settings[ $addon_name ] )) {
-			$class_name = self::$_settings[ $addon_name ]['class_name'];
-			if ( ! empty( self::$_settings[ $addon_name ]['dms_paths'] )) {
+	public static function deregister($addon_name = NULL) {
+		if (isset(self::$_settings[$addon_name])) {
+			$class_name = self::$_settings[$addon_name]['class_name'];
+			if ( ! empty(self::$_settings[$addon_name]['dms_paths'])) {
 				// setup DMS
-				EE_Register_Data_Migration_Scripts::deregister( $addon_name );
+				EE_Register_Data_Migration_Scripts::deregister($addon_name);
 			}
-			if ( ! empty( self::$_settings[ $addon_name ]['admin_path'] )) {
+			if ( ! empty(self::$_settings[$addon_name]['admin_path'])) {
 				// register admin page
-				EE_Register_Admin_Page::deregister( $addon_name );
+				EE_Register_Admin_Page::deregister($addon_name);
 			}
-			if ( ! empty( self::$_settings[ $addon_name ]['module_paths'] )) {
+			if ( ! empty(self::$_settings[$addon_name]['module_paths'])) {
 				// add to list of modules to be registered
-				EE_Register_Module::deregister( $addon_name );
+				EE_Register_Module::deregister($addon_name);
 			}
-			if ( ! empty( self::$_settings[ $addon_name ]['shortcode_paths'] )) {
+			if ( ! empty(self::$_settings[$addon_name]['shortcode_paths'])) {
 				// add to list of shortcodes to be registered
-				EE_Register_Shortcode::deregister( $addon_name );
+				EE_Register_Shortcode::deregister($addon_name);
 			}
-			if ( ! empty( self::$_settings[ $addon_name ]['config_class'] )) {
+			if ( ! empty(self::$_settings[$addon_name]['config_class'])) {
 				// if config_class present let's register config.
-				EE_Register_Config::deregister( self::$_settings[ $addon_name ]['config_class']);
+				EE_Register_Config::deregister(self::$_settings[$addon_name]['config_class']);
 			}
-			if ( ! empty( self::$_settings[ $addon_name ]['widget_paths'] )) {
+			if ( ! empty(self::$_settings[$addon_name]['widget_paths'])) {
 				// add to list of widgets to be registered
-				EE_Register_Widget::deregister( $addon_name );
+				EE_Register_Widget::deregister($addon_name);
 			}
-			if ( ! empty( self::$_settings[ $addon_name ]['model_paths'] ) ||
-					! empty( self::$_settings[ $addon_name ]['class_paths'] )) {
+			if ( ! empty(self::$_settings[$addon_name]['model_paths']) ||
+					! empty(self::$_settings[$addon_name]['class_paths'])) {
 				// add to list of shortcodes to be registered
-				EE_Register_Model::deregister( $addon_name );
+				EE_Register_Model::deregister($addon_name);
 			}
-			if ( ! empty( self::$_settings[ $addon_name ]['model_extension_paths'] ) ||
-					! empty( self::$_settings[ $addon_name ]['class_extension_paths'] )) {
+			if ( ! empty(self::$_settings[$addon_name]['model_extension_paths']) ||
+					! empty(self::$_settings[$addon_name]['class_extension_paths'])) {
 				// add to list of shortcodes to be registered
-				EE_Register_Model_Extensions::deregister( $addon_name );
+				EE_Register_Model_Extensions::deregister($addon_name);
 				}
-			if (  !empty( self::$_settings[$addon_name]['message_types'] ) ) {
-				foreach( self::$_settings[$addon_name]['message_types'] as $message_type => $message_type_settings ) {
-					EE_Register_Message_Type::deregister( $message_type );
+			if ( ! empty(self::$_settings[$addon_name]['message_types'])) {
+				foreach (self::$_settings[$addon_name]['message_types'] as $message_type => $message_type_settings) {
+					EE_Register_Message_Type::deregister($message_type);
 				}
 			}
 			//deregister capabilities for addon
-			if ( ! empty( self::$_settings[$addon_name]['capabilities'] ) || ! empty( self::$_settings[$addon_name]['capability_maps']) ) {
-				EE_Register_Capabilities::deregister( $addon_name );
+			if ( ! empty(self::$_settings[$addon_name]['capabilities']) || ! empty(self::$_settings[$addon_name]['capability_maps'])) {
+				EE_Register_Capabilities::deregister($addon_name);
 			}
 			//deregister custom_post_types for addon
-			if ( ! empty( self::$_settings[$addon_name]['custom_post_types'] ) ) {
-				EE_Register_CPT::deregister( $addon_name );
+			if ( ! empty(self::$_settings[$addon_name]['custom_post_types'])) {
+				EE_Register_CPT::deregister($addon_name);
 			}
-			remove_action('deactivate_'.EE_Registry::instance()->addons->{$class_name}->get_main_plugin_file_basename(),  array( EE_Registry::instance()->addons->{$class_name}, 'deactivation' ) );
-			remove_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations', array( EE_Registry::instance()->addons->{$class_name}, 'initialize_db_if_no_migrations_required' ) );
+			remove_action('deactivate_'.EE_Registry::instance()->addons->{$class_name}->get_main_plugin_file_basename(), array(EE_Registry::instance()->addons->{$class_name}, 'deactivation'));
+			remove_action('AHEE__EE_System__perform_activations_upgrades_and_migrations', array(EE_Registry::instance()->addons->{$class_name}, 'initialize_db_if_no_migrations_required'));
 			unset(EE_Registry::instance()->addons->{$class_name});
-			unset( self::$_settings[ $addon_name ] );
+			unset(self::$_settings[$addon_name]);
 		}
 	}
 

modules/single_page_checkout/reg_steps/attendee_information/EE_SPCO_Reg_Step_Attendee_Information.class.php

Braces +1 added lines, -1 removed lines

@@ -808,7 +808,7 @@
 
 				} // end of if ( ! $this->checkout->revisit || $this->checkout->primary_revisit || ( $this->checkout->revisit && $this->checkout->reg_url_link == $reg_url_link )) {
 
-			}  else {
+			} else {
 				EE_Error::add_error( __( 'An invalid or missing line item ID was encountered while attempting to process the registration form.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
 				// remove malformed data
 				unset( $valid_data[ $reg_url_link ] );

Spacing +249 added lines, -250 removed lines

@@ -37,13 +37,13 @@ 
 	 * @param    EE_Checkout $checkout
 	 * @return    \EE_SPCO_Reg_Step_Attendee_Information
 	 */
-	public function __construct( EE_Checkout $checkout ) {
+	public function __construct(EE_Checkout $checkout) {
 		$this->_slug = 'attendee_information';
 		$this->_name = __('Attendee Information', 'event_espresso');
-		$this->_template = SPCO_REG_STEPS_PATH . $this->_slug . DS . 'attendee_info_main.template.php';
+		$this->_template = SPCO_REG_STEPS_PATH.$this->_slug.DS.'attendee_info_main.template.php';
 		$this->checkout = $checkout;
 		$this->_reset_success_message();
-		$this->set_instructions( __('Please answer the following registration questions before proceeding.', 'event_espresso'));
+		$this->set_instructions(__('Please answer the following registration questions before proceeding.', 'event_espresso'));
 	}
 
 
@@ -52,7 +52,7 @@ 
 		EE_Registry::$i18n_js_strings['required_field'] = __(' is a required question.', 'event_espresso');
 		EE_Registry::$i18n_js_strings['required_multi_field'] = __(' is a required question. Please enter a value for at least one of the options.', 'event_espresso');
 		EE_Registry::$i18n_js_strings['answer_required_questions'] = __('Please answer all required questions correctly before proceeding.', 'event_espresso');
-		EE_Registry::$i18n_js_strings['attendee_info_copied'] = sprintf( __('The attendee information was successfully copied.%sPlease ensure the rest of the registration form is completed before proceeding.', 'event_espresso'), '<br/>' );
+		EE_Registry::$i18n_js_strings['attendee_info_copied'] = sprintf(__('The attendee information was successfully copied.%sPlease ensure the rest of the registration form is completed before proceeding.', 'event_espresso'), '<br/>');
 		EE_Registry::$i18n_js_strings['attendee_info_copy_error'] = __('An unknown error occurred on the server while attempting to copy the attendee information. Please refresh the page and try again.', 'event_espresso');
 		EE_Registry::$i18n_js_strings['enter_valid_email'] = __('You must enter a valid email address.', 'event_espresso');
 		EE_Registry::$i18n_js_strings['valid_email_and_questions'] = __('You must enter a valid email address and answer all other required questions before you can proceed.', 'event_espresso');
@@ -85,7 +85,7 @@ 
 		EEH_Autoloader::register_line_item_display_autoloaders();
 		$Line_Item_Display = new EE_Line_Item_Display();
 		// calculate taxes
-		$Line_Item_Display->display_line_item( $this->checkout->cart->get_grand_total(), array( 'set_tax_rate' => true ) );
+		$Line_Item_Display->display_line_item($this->checkout->cart->get_grand_total(), array('set_tax_rate' => true));
 		EE_Registry::instance()->load_helper('Line_Item');
 		/** @var $subsections EE_Form_Section_Proper[] */
 		$subsections = array(
@@ -97,33 +97,33 @@ 
 			'ticket_count' 	=> array()
 		);
 		// grab the saved registrations from the transaction
-		$registrations = $this->checkout->transaction->registrations( $this->checkout->reg_cache_where_params );
-		if ( $registrations ) {
-			foreach ( $registrations as $registration ) {
-				if ( $registration instanceof EE_Registration ) {
+		$registrations = $this->checkout->transaction->registrations($this->checkout->reg_cache_where_params);
+		if ($registrations) {
+			foreach ($registrations as $registration) {
+				if ($registration instanceof EE_Registration) {
 					// can this registration be processed during this visit ?
-					if ( $this->checkout->visit_allows_processing_of_this_registration( $registration ) ) {
-						$subsections[ $registration->reg_url_link() ] = $this->_registrations_reg_form( $registration );
-						if ( ! $this->checkout->admin_request ) {
-							$template_args['registrations'][ $registration->reg_url_link() ] = $registration;
-							$template_args['ticket_count'][ $registration->ticket()->ID() ] = isset( $template_args['ticket_count'][ $registration->ticket()->ID() ] ) ? $template_args['ticket_count'][ $registration->ticket()->ID() ] + 1 : 1;
-							$ticket_line_item = EEH_Line_Item::get_line_items_by_object_type_and_IDs( $this->checkout->cart->get_grand_total(), 'Ticket', array( $registration->ticket()->ID() ) );
-							$ticket_line_item = is_array( $ticket_line_item ) ? reset( $ticket_line_item ) : $ticket_line_item;
-							$template_args['ticket_line_item'][ $registration->ticket()->ID() ] = $Line_Item_Display->display_line_item( $ticket_line_item );
+					if ($this->checkout->visit_allows_processing_of_this_registration($registration)) {
+						$subsections[$registration->reg_url_link()] = $this->_registrations_reg_form($registration);
+						if ( ! $this->checkout->admin_request) {
+							$template_args['registrations'][$registration->reg_url_link()] = $registration;
+							$template_args['ticket_count'][$registration->ticket()->ID()] = isset($template_args['ticket_count'][$registration->ticket()->ID()]) ? $template_args['ticket_count'][$registration->ticket()->ID()] + 1 : 1;
+							$ticket_line_item = EEH_Line_Item::get_line_items_by_object_type_and_IDs($this->checkout->cart->get_grand_total(), 'Ticket', array($registration->ticket()->ID()));
+							$ticket_line_item = is_array($ticket_line_item) ? reset($ticket_line_item) : $ticket_line_item;
+							$template_args['ticket_line_item'][$registration->ticket()->ID()] = $Line_Item_Display->display_line_item($ticket_line_item);
 						}
-						if ( $registration->is_primary_registrant() ) {
+						if ($registration->is_primary_registrant()) {
 							$primary_registrant = $registration->reg_url_link();
 						}
 					}
 				}
 			}
 			// print_copy_info ?
-			if ( $primary_registrant && count( $registrations ) > 1 && ! $this->checkout->admin_request ) {
+			if ($primary_registrant && count($registrations) > 1 && ! $this->checkout->admin_request) {
 				// TODO: add admin option for toggling copy attendee info, then use that value to change $this->_print_copy_info
 				$copy_options['spco_copy_attendee_chk'] = $this->_print_copy_info ? $this->_copy_attendee_info_form() : $this->_auto_copy_attendee_info();
 				// generate hidden input
-				if ( isset( $subsections[ $primary_registrant ] ) && $subsections[ $primary_registrant ] instanceof EE_Form_Section_Proper ) {
-					$subsections[ $primary_registrant ]->add_subsections( $copy_options, 'primary_registrant', false );
+				if (isset($subsections[$primary_registrant]) && $subsections[$primary_registrant] instanceof EE_Form_Section_Proper) {
+					$subsections[$primary_registrant]->add_subsections($copy_options, 'primary_registrant', false);
 				}
 			}
 
@@ -135,8 +135,7 @@ 
 				'html_id' 					=> $this->reg_form_name(),
 				'subsections' 			=> $subsections,
 				'layout_strategy'		=> $this->checkout->admin_request ?
-					new EE_Div_Per_Section_Layout() :
-					new EE_Template_Layout(
+					new EE_Div_Per_Section_Layout() : new EE_Template_Layout(
 						array(
 							'layout_template_file' 	=> $this->_template, // layout_template
 							'template_args' 				=> $template_args
@@ -153,61 +152,61 @@ 
 	 * @param EE_Registration $registration
 	 * @return EE_Form_Section_Proper
 	 */
-	private function _registrations_reg_form( EE_Registration $registration ) {
-		EE_Registry::instance()->load_helper( 'Template' );
+	private function _registrations_reg_form(EE_Registration $registration) {
+		EE_Registry::instance()->load_helper('Template');
 		static $attendee_nmbr = 1;
 		// array of params to pass to parent constructor
 		$form_args = array(
-			'html_id' 				=> 'ee-registration-' . $registration->reg_url_link(),
+			'html_id' 				=> 'ee-registration-'.$registration->reg_url_link(),
 			'html_class' 		=> 'ee-reg-form-attendee-dv',
 			'html_style' 		=> $this->checkout->admin_request ? 'padding:0em 2em 1em; margin:3em 0 0; border:1px solid #ddd;' : '',
 			'subsections' 		=> array(),
 			'layout_strategy' => new EE_Fieldset_Section_Layout(
 				array(
 					'legend_class' 	=> 'spco-attendee-lgnd smaller-text lt-grey-text',
-					'legend_text' 	=> sprintf( __( 'Attendee %d', 'event_espresso' ), $attendee_nmbr )
+					'legend_text' 	=> sprintf(__('Attendee %d', 'event_espresso'), $attendee_nmbr)
 				)
 			)
 		);
 		// verify that registration has valid event
-		if ( $registration->event() instanceof EE_Event ) {
+		if ($registration->event() instanceof EE_Event) {
 			$query_params = array(
 				array(
 					'Event.EVT_ID' => $registration->event()->ID(),
 					'Event_Question_Group.EQG_primary' => $registration->count() == 1 ? TRUE : FALSE
 				),
-				'order_by'=>array( 'QSG_order'=>'ASC' )
+				'order_by'=>array('QSG_order'=>'ASC')
 			);
-			$question_groups = $registration->event()->question_groups( $query_params );
-			if ( $question_groups ) {
-				foreach ( $question_groups as $question_group ) {
-					if ( $question_group instanceof EE_Question_Group ) {
-						$form_args['subsections'][ $question_group->identifier() ] = $this->_question_group_reg_form( $registration, $question_group );
+			$question_groups = $registration->event()->question_groups($query_params);
+			if ($question_groups) {
+				foreach ($question_groups as $question_group) {
+					if ($question_group instanceof EE_Question_Group) {
+						$form_args['subsections'][$question_group->identifier()] = $this->_question_group_reg_form($registration, $question_group);
 						// add hidden input
-						$form_args['subsections']['additional_attendee_reg_info'] = $this->_additional_attendee_reg_info_input( $registration );
+						$form_args['subsections']['additional_attendee_reg_info'] = $this->_additional_attendee_reg_info_input($registration);
 					}
 				}
 				// if we have question groups for additional attendees, then display the copy options
 				$this->_print_copy_info = $attendee_nmbr > 1 ? TRUE : $this->_print_copy_info;
 			} else {
-				$form_args['subsections'][ 'attendee_info_not_required_' . $registration->reg_url_link() ] = new EE_Form_Section_HTML(
+				$form_args['subsections']['attendee_info_not_required_'.$registration->reg_url_link()] = new EE_Form_Section_HTML(
 					EEH_Template::locate_template(
-						SPCO_REG_STEPS_PATH . $this->_slug . DS . 'attendee_info_not_required.template.php',
-						apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___registrations_reg_form__attendee_info_not_required_template_args', array()),
+						SPCO_REG_STEPS_PATH.$this->_slug.DS.'attendee_info_not_required.template.php',
+						apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___registrations_reg_form__attendee_info_not_required_template_args', array()),
 						TRUE,
 						TRUE
 					)
 				);
 				// add hidden input
-				$form_args['subsections']['additional_attendee_reg_info'] = $this->_additional_attendee_reg_info_input( $registration, FALSE );
+				$form_args['subsections']['additional_attendee_reg_info'] = $this->_additional_attendee_reg_info_input($registration, FALSE);
 			}
 		}
-		if ( $registration->is_primary_registrant() ) {
+		if ($registration->is_primary_registrant()) {
 			// generate hidden input
-			$form_args['subsections']['primary_registrant'] = $this->_additional_primary_registrant_inputs( $registration );
+			$form_args['subsections']['primary_registrant'] = $this->_additional_primary_registrant_inputs($registration);
 		}
 		$attendee_nmbr++;
-		return new EE_Form_Section_Proper( $form_args );
+		return new EE_Form_Section_Proper($form_args);
 	}
 
 
@@ -220,11 +219,11 @@ 
 	 * @param bool  $additional_attendee_reg_info
 	 * @return    EE_Form_Input_Base
 	 */
-	private function _additional_attendee_reg_info_input( EE_Registration $registration, $additional_attendee_reg_info = TRUE ){
+	private function _additional_attendee_reg_info_input(EE_Registration $registration, $additional_attendee_reg_info = TRUE) {
 		// generate hidden input
 		return new EE_Hidden_Input(
 			array(
-				'html_id' 				=> 'additional-attendee-reg-info-' . $registration->reg_url_link(),
+				'html_id' 				=> 'additional-attendee-reg-info-'.$registration->reg_url_link(),
 				'default'				=> $additional_attendee_reg_info
 			)
 		);
@@ -237,22 +236,22 @@ 
 	 * @param EE_Question_Group $question_group
 	 * @return EE_Form_Section_Proper
 	 */
-	private function _question_group_reg_form( EE_Registration $registration, EE_Question_Group $question_group ){
+	private function _question_group_reg_form(EE_Registration $registration, EE_Question_Group $question_group) {
 		// array of params to pass to parent constructor
 		$form_args = array(
-			'html_id' 					=> 'ee-reg-form-qstn-grp-' . $question_group->identifier(),
+			'html_id' 					=> 'ee-reg-form-qstn-grp-'.$question_group->identifier(),
 			'html_class' 			=> $this->checkout->admin_request ? 'form-table ee-reg-form-qstn-grp-dv' : 'ee-reg-form-qstn-grp-dv',
-			'html_label_id' 		=> 'ee-reg-form-qstn-grp-' . $question_group->identifier() . '-lbl',
+			'html_label_id' 		=> 'ee-reg-form-qstn-grp-'.$question_group->identifier().'-lbl',
 			'subsections' 			=> array(
-				'reg_form_qstn_grp_hdr' => $this->_question_group_header( $question_group )
+				'reg_form_qstn_grp_hdr' => $this->_question_group_header($question_group)
 			),
 			'layout_strategy' 	=> $this->checkout->admin_request ? new EE_Admin_Two_Column_Layout() : new EE_Div_Per_Section_Layout()
 		);
 		// where params
-		$query_params = array( 'QST_deleted' => 0 );
+		$query_params = array('QST_deleted' => 0);
 		// don't load admin only questions on the frontend
-		if ( ! $this->checkout->admin_request ) {
-			$query_params['QST_admin_only'] = array( '!=', TRUE );
+		if ( ! $this->checkout->admin_request) {
+			$query_params['QST_admin_only'] = array('!=', TRUE);
 		}
 		$questions = $question_group->get_many_related(
 			'Question',
@@ -264,21 +263,21 @@ 
 			)
 		);
 		// filter for additional content before questions
-		$form_args['subsections']['reg_form_questions_before'] = new EE_Form_Section_HTML( apply_filters( 'FHEE__EEH_Form_Fields__generate_question_groups_html__before_question_group_questions', '', $registration, $question_group, $this ));
+		$form_args['subsections']['reg_form_questions_before'] = new EE_Form_Section_HTML(apply_filters('FHEE__EEH_Form_Fields__generate_question_groups_html__before_question_group_questions', '', $registration, $question_group, $this));
 		// loop thru questions
-		foreach ( $questions as $question ) {
-			if( $question instanceof EE_Question ){
+		foreach ($questions as $question) {
+			if ($question instanceof EE_Question) {
 				$identifier = $question->is_system_question() ? $question->system_ID() : $question->ID();
-				$form_args['subsections'][ $identifier ] = $this->reg_form_question( $registration, $question );
+				$form_args['subsections'][$identifier] = $this->reg_form_question($registration, $question);
 			}
 		}
-		$form_args['subsections'] = apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information__question_group_reg_form__subsections_array', $form_args['subsections'], $registration, $question_group, $this );
+		$form_args['subsections'] = apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information__question_group_reg_form__subsections_array', $form_args['subsections'], $registration, $question_group, $this);
 
 		// filter for additional content after questions
-		$form_args['subsections']['reg_form_questions_after'] = new EE_Form_Section_HTML( apply_filters( 'FHEE__EEH_Form_Fields__generate_question_groups_html__after_question_group_questions', '', $registration, $question_group, $this ));
+		$form_args['subsections']['reg_form_questions_after'] = new EE_Form_Section_HTML(apply_filters('FHEE__EEH_Form_Fields__generate_question_groups_html__after_question_group_questions', '', $registration, $question_group, $this));
 //		d( $form_args );
-		$question_group_reg_form = new EE_Form_Section_Proper( $form_args );
-		return apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___question_group_reg_form__question_group_reg_form', $question_group_reg_form, $registration, $question_group, $this );
+		$question_group_reg_form = new EE_Form_Section_Proper($form_args);
+		return apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___question_group_reg_form__question_group_reg_form', $question_group_reg_form, $registration, $question_group, $this);
 	}
 
 
@@ -288,12 +287,12 @@ 
 	 * @param EE_Question_Group $question_group
 	 * @return 	EE_Form_Section_HTML
 	 */
-	private function _question_group_header( EE_Question_Group $question_group ){
+	private function _question_group_header(EE_Question_Group $question_group) {
 		$html = '';
 		// group_name
-		if ( $question_group->show_group_name() && $question_group->name() != '' ) {
+		if ($question_group->show_group_name() && $question_group->name() != '') {
 			EE_Registry::instance()->load_helper('HTML');
-			if ( $this->checkout->admin_request ) {
+			if ($this->checkout->admin_request) {
 				$html .= EEH_HTML::br();
 				$html .= EEH_HTML::h3(
 					$question_group->name(),
@@ -307,7 +306,7 @@ 
 			}
 		}
 		// group_desc
-		if ( $question_group->show_group_desc() && $question_group->desc() != '' ) {
+		if ($question_group->show_group_desc() && $question_group->desc() != '') {
 			$html .= EEH_HTML::p(
 				$question_group->desc(),
 				'',
@@ -315,7 +314,7 @@ 
 			);
 
 		}
-		return new EE_Form_Section_HTML( $html );
+		return new EE_Form_Section_HTML($html);
 	}
 
 
@@ -324,14 +323,14 @@ 
 	 * @access public
 	 * @return 	EE_Form_Section_Proper
 	 */
-	private function _copy_attendee_info_form(){
+	private function _copy_attendee_info_form() {
 		// array of params to pass to parent constructor
 		return new EE_Form_Section_Proper(
 			array(
 				'subsections' 			=> $this->_copy_attendee_info_inputs(),
 				'layout_strategy' 	=> new EE_Template_Layout(
 					array(
-						'layout_template_file' 			=> SPCO_REG_STEPS_PATH . $this->_slug . DS . 'copy_attendee_info.template.php', // layout_template
+						'layout_template_file' 			=> SPCO_REG_STEPS_PATH.$this->_slug.DS.'copy_attendee_info.template.php', // layout_template
 						'begin_template_file' 			=> NULL,
 						'input_template_file' 				=> NULL,
 						'subsection_template_file' 	=> NULL,
@@ -353,8 +352,8 @@ 
 	private function _auto_copy_attendee_info() {
 		return new EE_Form_Section_HTML(
 			EEH_Template::locate_template(
-				SPCO_REG_STEPS_PATH . $this->_slug . DS . '_auto_copy_attendee_info.template.php',
-				apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information__auto_copy_attendee_info__template_args', array()),
+				SPCO_REG_STEPS_PATH.$this->_slug.DS.'_auto_copy_attendee_info.template.php',
+				apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information__auto_copy_attendee_info__template_args', array()),
 				TRUE,
 				TRUE
 			)
@@ -373,25 +372,25 @@ 
 		$copy_attendee_info_inputs = array();
 		$prev_ticket = NULL;
 		// grab the saved registrations from the transaction
-		$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) {
 			// for all  attendees other than the primary attendee
-			if ( $registration instanceof EE_Registration && ! $registration->is_primary_registrant() ) {
+			if ($registration instanceof EE_Registration && ! $registration->is_primary_registrant()) {
 				// if this is a new ticket OR if this is the very first additional attendee after the primary attendee
-				if ( $registration->ticket()->ID() !== $prev_ticket ) {
+				if ($registration->ticket()->ID() !== $prev_ticket) {
 					$item_name = $registration->ticket()->name();
-					$item_name .= $registration->ticket()->description() != '' ? ' - ' . $registration->ticket()->description() : '';
-					$copy_attendee_info_inputs[ 'spco_copy_attendee_chk[ticket-' . $registration->ticket()->ID() . ']' ] = new EE_Form_Section_HTML(
-						'<h6 class="spco-copy-attendee-event-hdr">' . $item_name . '</h6>'
+					$item_name .= $registration->ticket()->description() != '' ? ' - '.$registration->ticket()->description() : '';
+					$copy_attendee_info_inputs['spco_copy_attendee_chk[ticket-'.$registration->ticket()->ID().']'] = new EE_Form_Section_HTML(
+						'<h6 class="spco-copy-attendee-event-hdr">'.$item_name.'</h6>'
 					);
 					$prev_ticket = $registration->ticket()->ID();
 				}
 
-				$copy_attendee_info_inputs[ 'spco_copy_attendee_chk[' . $registration->ID() . ']' ] = new
+				$copy_attendee_info_inputs['spco_copy_attendee_chk['.$registration->ID().']'] = new
 				EE_Checkbox_Multi_Input(
-					array( $registration->ID() => sprintf( __('Attendee #%s', 'event_espresso'), $registration->count() )),
+					array($registration->ID() => sprintf(__('Attendee #%s', 'event_espresso'), $registration->count())),
 					array(
-						'html_id' 								=> 'spco-copy-attendee-chk-' . $registration->reg_url_link(),
+						'html_id' 								=> 'spco-copy-attendee-chk-'.$registration->reg_url_link(),
 						'html_class' 						=> 'spco-copy-attendee-chk ee-do-not-validate',
 						'display_html_label_text' 	=> FALSE
 					)
@@ -410,7 +409,7 @@ 
 	 * @param EE_Registration $registration
 	 * @return    EE_Form_Input_Base
 	 */
-	private function _additional_primary_registrant_inputs( EE_Registration $registration ){
+	private function _additional_primary_registrant_inputs(EE_Registration $registration) {
 		// generate hidden input
 		return new EE_Hidden_Input(
 			array(
@@ -428,31 +427,31 @@ 
 	 * @param EE_Question     $question
 	 * @return 	EE_Form_Input_Base
 	 */
-	public function reg_form_question( EE_Registration $registration, EE_Question $question ){
+	public function reg_form_question(EE_Registration $registration, EE_Question $question) {
 
 		// if this question was for an attendee detail, then check for that answer
-		$answer_value = EEM_Answer::instance()->get_attendee_property_answer_value( $registration, $question->system_ID() );
+		$answer_value = EEM_Answer::instance()->get_attendee_property_answer_value($registration, $question->system_ID());
 		$answer = $answer_value === null
-				? EEM_Answer::instance()->get_one( array( array( 'QST_ID' => $question->ID(), 'REG_ID' => $registration->ID() )	) )
+				? EEM_Answer::instance()->get_one(array(array('QST_ID' => $question->ID(), 'REG_ID' => $registration->ID())))
 				: null;
 		// if NOT returning to edit an existing registration OR if this question is for an attendee property OR we still don't have an EE_Answer object
-		if( ! $registration->reg_url_link() || $answer_value || ! $answer instanceof EE_Answer ) {
+		if ( ! $registration->reg_url_link() || $answer_value || ! $answer instanceof EE_Answer) {
 			// create an EE_Answer object for storing everything in
-			$answer = EE_Answer::new_instance ( array(
+			$answer = EE_Answer::new_instance(array(
 				'QST_ID'=> $question->ID(),
 				'REG_ID'=> $registration->ID()
 			));
 		}
 		// verify instance
-		if( $answer instanceof EE_Answer ){
-			if ( ! empty( $answer_value )) {
-				$answer->set( 'ANS_value', $answer_value );
+		if ($answer instanceof EE_Answer) {
+			if ( ! empty($answer_value)) {
+				$answer->set('ANS_value', $answer_value);
 			}
-			$answer->cache( 'Question', $question );
-			$answer_cache_id =$question->system_ID() != NULL ? $question->system_ID() . '-' . $registration->reg_url_link() : $question->ID() . '-' . $registration->reg_url_link();
-			$registration->cache( 'Answer', $answer, $answer_cache_id );
+			$answer->cache('Question', $question);
+			$answer_cache_id = $question->system_ID() != NULL ? $question->system_ID().'-'.$registration->reg_url_link() : $question->ID().'-'.$registration->reg_url_link();
+			$registration->cache('Answer', $answer, $answer_cache_id);
 		}
-		return $this->_generate_question_input( $registration, $question, $answer );
+		return $this->_generate_question_input($registration, $question, $answer);
 
 	}
 
@@ -464,31 +463,31 @@ 
 	 * @param mixed EE_Answer|NULL      $answer
 	 * @return EE_Form_Input_Base
 	 */
-	private function _generate_question_input( EE_Registration $registration, EE_Question $question, $answer ){
+	private function _generate_question_input(EE_Registration $registration, EE_Question $question, $answer) {
 		$identifier = $question->is_system_question() ? $question->system_ID() : $question->ID();
-		$this->_required_questions[ $identifier ] = $question->required() ? true : false;
-		add_filter( 'FHEE__EE_Question__generate_form_input__country_options', array( $this, 'use_cached_countries_for_form_input' ), 10, 4 );
-		add_filter( 'FHEE__EE_Question__generate_form_input__state_options', array( $this, 'use_cached_states_for_form_input' ), 10, 4 );
+		$this->_required_questions[$identifier] = $question->required() ? true : false;
+		add_filter('FHEE__EE_Question__generate_form_input__country_options', array($this, 'use_cached_countries_for_form_input'), 10, 4);
+		add_filter('FHEE__EE_Question__generate_form_input__state_options', array($this, 'use_cached_states_for_form_input'), 10, 4);
 		$input_constructor_args = array(
-			'html_name'     => 'ee_reg_qstn[' . $registration->ID() . '][' . $identifier . ']',
-			'html_id'       => 'ee_reg_qstn-' . $registration->ID() . '-' . $identifier,
-			'html_class'    => 'ee-reg-qstn ee-reg-qstn-' . $identifier,
-			'html_label_id' => 'ee_reg_qstn-' . $registration->ID() . '-' . $identifier,
+			'html_name'     => 'ee_reg_qstn['.$registration->ID().']['.$identifier.']',
+			'html_id'       => 'ee_reg_qstn-'.$registration->ID().'-'.$identifier,
+			'html_class'    => 'ee-reg-qstn ee-reg-qstn-'.$identifier,
+			'html_label_id' => 'ee_reg_qstn-'.$registration->ID().'-'.$identifier,
 			'html_label_class'	=> 'ee-reg-qstn',
 		);
-		$input_constructor_args['html_label_id'] 	.= '-lbl';
-		if ( $answer instanceof EE_Answer && $answer->ID() ) {
-			$input_constructor_args[ 'html_name' ] .= '[' . $answer->ID() . ']';
-			$input_constructor_args[ 'html_id' ] .= '-' . $answer->ID();
-			$input_constructor_args[ 'html_label_id' ] .= '-' . $answer->ID();
+		$input_constructor_args['html_label_id'] .= '-lbl';
+		if ($answer instanceof EE_Answer && $answer->ID()) {
+			$input_constructor_args['html_name'] .= '['.$answer->ID().']';
+			$input_constructor_args['html_id'] .= '-'.$answer->ID();
+			$input_constructor_args['html_label_id'] .= '-'.$answer->ID();
 		}
-		$form_input =  $question->generate_form_input(
+		$form_input = $question->generate_form_input(
 			$registration,
 			$answer,
 			$input_constructor_args
 		);
-		remove_filter( 'FHEE__EE_Question__generate_form_input__country_options', array( $this, 'use_cached_countries_for_form_input' ) );
-		remove_filter( 'FHEE__EE_Question__generate_form_input__state_options', array( $this, 'use_cached_states_for_form_input' ) );
+		remove_filter('FHEE__EE_Question__generate_form_input__country_options', array($this, 'use_cached_countries_for_form_input'));
+		remove_filter('FHEE__EE_Question__generate_form_input__state_options', array($this, 'use_cached_states_for_form_input'));
 		return $form_input;
 	}
 
@@ -502,20 +501,20 @@ 
 	 * @param EE_Registration $registration
 	 * @return array 2d keys are country IDs, values are their names
 	 */
-	public function use_cached_countries_for_form_input( $countries_list, $question, $registration, $answer ) {
-		$country_options = array( '' => '' );
+	public function use_cached_countries_for_form_input($countries_list, $question, $registration, $answer) {
+		$country_options = array('' => '');
 		// get possibly cached list of countries
 		$countries = $this->checkout->action == 'process_reg_step' ? EEM_Country::instance()->get_all_countries() : EEM_Country::instance()->get_all_active_countries();
-		if ( ! empty( $countries )) {
-			foreach( $countries as $country ){
-				if ( $country instanceof EE_Country ) {
-					$country_options[ $country->ID() ] = $country->name();
+		if ( ! empty($countries)) {
+			foreach ($countries as $country) {
+				if ($country instanceof EE_Country) {
+					$country_options[$country->ID()] = $country->name();
 				}
 			}
 		}
-		if( $question instanceof EE_Question 
-			&& $registration instanceof EE_Registration ) {
-			$answer = EEM_Answer::instance()->get_one( array( array( 'QST_ID' => $question->ID(), 'REG_ID' => $registration->ID() ) ) );
+		if ($question instanceof EE_Question 
+			&& $registration instanceof EE_Registration) {
+			$answer = EEM_Answer::instance()->get_one(array(array('QST_ID' => $question->ID(), 'REG_ID' => $registration->ID())));
 		} else {
 			$answer = EE_Answer::new_instance();
 		}
@@ -540,19 +539,19 @@ 
 	 * @param EE_Registration $registration
 	 * @return array 2d keys are state IDs, values are their names
 	 */
-	public function use_cached_states_for_form_input( $states_list, $question, $registration, $answer ) {
-		$state_options = array( '' => array( '' => ''));
+	public function use_cached_states_for_form_input($states_list, $question, $registration, $answer) {
+		$state_options = array('' => array('' => ''));
 		$states = $this->checkout->action == 'process_reg_step' ? EEM_State::instance()->get_all_states() : EEM_State::instance()->get_all_active_states();
-		if ( ! empty( $states )) {
-			foreach( $states as $state ){
-				if ( $state instanceof EE_State ) {
-					$state_options[ $state->country()->name() ][ $state->ID() ] = $state->name();
+		if ( ! empty($states)) {
+			foreach ($states as $state) {
+				if ($state instanceof EE_State) {
+					$state_options[$state->country()->name()][$state->ID()] = $state->name();
 				}
 			}
 		}
-		if( $question instanceof EE_Question 
-			&& $registration instanceof EE_Registration ) {
-			$answer = EEM_Answer::instance()->get_one( array( array( 'QST_ID' => $question->ID(), 'REG_ID' => $registration->ID() ) ) );
+		if ($question instanceof EE_Question 
+			&& $registration instanceof EE_Registration) {
+			$answer = EEM_Answer::instance()->get_one(array(array('QST_ID' => $question->ID(), 'REG_ID' => $registration->ID())));
 		} else {
 			$answer = EE_Answer::new_instance();
 		}
@@ -586,65 +585,65 @@ 
 	 */
 	public function process_reg_step() {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		// grab validated data from form
 		$valid_data = $this->checkout->current_step->valid_data();
 		//EEH_Debug_Tools::printr( $_REQUEST, '$_REQUEST', __FILE__, __LINE__ );
 		//EEH_Debug_Tools::printr( $valid_data, '$valid_data', __FILE__, __LINE__ );
 		// if we don't have any $valid_data then something went TERRIBLY WRONG !!!
-		if ( empty( $valid_data ))  {
-			EE_Error::add_error( __('No valid question responses were received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($valid_data)) {
+			EE_Error::add_error(__('No valid question responses were received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		//EEH_Debug_Tools::printr( $this->checkout->transaction, '$this->checkout->transaction', __FILE__, __LINE__ );
-		if ( ! $this->checkout->transaction instanceof EE_Transaction || ! $this->checkout->continue_reg ) {
-			EE_Error::add_error( __( 'A valid transaction could not be initiated for processing your registrations.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $this->checkout->transaction instanceof EE_Transaction || ! $this->checkout->continue_reg) {
+			EE_Error::add_error(__('A valid transaction could not be initiated for processing your registrations.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		// get cached registrations
-		$registrations = $this->checkout->transaction->registrations( $this->checkout->reg_cache_where_params );
+		$registrations = $this->checkout->transaction->registrations($this->checkout->reg_cache_where_params);
 		// verify we got the goods
-		if ( empty( $registrations )) {
-			EE_Error::add_error( __( 'Your form data could not be applied to any valid registrations.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($registrations)) {
+			EE_Error::add_error(__('Your form data could not be applied to any valid registrations.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		// extract attendee info from form data and save to model objects
-		$registrations_processed = $this->_process_registrations( $registrations, $valid_data );
+		$registrations_processed = $this->_process_registrations($registrations, $valid_data);
 		// if first pass thru SPCO, then let's check processed registrations against the total number of tickets in the cart
-		if ( $registrations_processed === FALSE ) {
+		if ($registrations_processed === FALSE) {
 			// but return immediately if the previous step exited early due to errors
 			return FALSE;
-		} else if ( ! $this->checkout->revisit && $registrations_processed !== $this->checkout->total_ticket_count ) {
+		} else if ( ! $this->checkout->revisit && $registrations_processed !== $this->checkout->total_ticket_count) {
 			// generate a correctly translated string for all possible singular/plural combinations
-			if ( $this->checkout->total_ticket_count === 1 && $registrations_processed !== 1 ) {
+			if ($this->checkout->total_ticket_count === 1 && $registrations_processed !== 1) {
 				$error_msg = sprintf(
-					__( 'There was %1$d ticket in the Event Queue, but %2$ds registrations were processed', 'event_espresso' ),
+					__('There was %1$d ticket in the Event Queue, but %2$ds registrations were processed', 'event_espresso'),
 					$this->checkout->total_ticket_count,
 					$registrations_processed
 				);
-			} else if ( $this->checkout->total_ticket_count !== 1 && $registrations_processed === 1 ) {
+			} else if ($this->checkout->total_ticket_count !== 1 && $registrations_processed === 1) {
 				$error_msg = sprintf(
-					__( 'There was a total of %1$d tickets in the Event Queue, but only %2$ds registration was processed', 'event_espresso' ),
+					__('There was a total of %1$d tickets in the Event Queue, but only %2$ds registration was processed', 'event_espresso'),
 					$this->checkout->total_ticket_count,
 					$registrations_processed
 				);
 			} else {
 				$error_msg = sprintf(
-					__( 'There was a total of %1$d tickets in the Event Queue, but %2$ds registrations were processed', 'event_espresso' ),
+					__('There was a total of %1$d tickets in the Event Queue, but %2$ds registrations were processed', 'event_espresso'),
 					$this->checkout->total_ticket_count,
 					$registrations_processed
 				);
 
 			}
-			EE_Error::add_error( $error_msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($error_msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		// mark this reg step as completed
 		$this->set_completed();
-		$this->_set_success_message( __('The Attendee Information Step has been successfully completed.', 'event_espresso' ));
+		$this->_set_success_message(__('The Attendee Information Step has been successfully completed.', 'event_espresso'));
 		//do action in case a plugin wants to do something with the data submitted in step 1.
 		//passes EE_Single_Page_Checkout, and it's posted data
-		do_action( 'AHEE__EE_Single_Page_Checkout__process_attendee_information__end', $this, $valid_data );
+		do_action('AHEE__EE_Single_Page_Checkout__process_attendee_information__end', $this, $valid_data);
 		return TRUE;
 
 	}
@@ -658,9 +657,9 @@ 
 	 * @param array             $valid_data
 	 * @return boolean | int
 	 */
-	private function _process_registrations( $registrations = array(), $valid_data = array() ) {
+	private function _process_registrations($registrations = array(), $valid_data = array()) {
 		// load resources and set some defaults
-		EE_Registry::instance()->load_model( 'Attendee' );
+		EE_Registry::instance()->load_model('Attendee');
 		// holder for primary registrant attendee object
 		$this->checkout->primary_attendee_obj = NULL;
 		// array for tracking reg form data for the primary registrant
@@ -677,19 +676,19 @@ 
 		// attendee counter
 		$att_nmbr = 0;
 		// grab the saved registrations from the transaction
-		foreach ( $registrations  as $registration ) {
+		foreach ($registrations  as $registration) {
 			// verify EE_Registration object
-			if ( ! $registration instanceof EE_Registration ) {
-				EE_Error::add_error( __( 'An invalid Registration object was discovered when attempting to process your registration information.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__);
+			if ( ! $registration instanceof EE_Registration) {
+				EE_Error::add_error(__('An invalid Registration object was discovered when attempting to process your registration information.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				return FALSE;
 			}
 			$reg_url_link = $registration->reg_url_link();
 			// reg_url_link exists ?
-			if ( $reg_url_link ) {
+			if ($reg_url_link) {
 				// should this registration be processed during this visit ?
-				if ( $this->checkout->visit_allows_processing_of_this_registration( $registration ) ) {
+				if ($this->checkout->visit_allows_processing_of_this_registration($registration)) {
 					// if NOT revisiting, then let's save the registration now, so that we have a REG_ID to use when generating other objects
-					if ( ! $this->checkout->revisit ) {
+					if ( ! $this->checkout->revisit) {
 						$registration->save();
 					}
 
@@ -700,41 +699,41 @@ 
 					 * @var bool   if TRUE is returned by the plugin then the
 					 *      		registration processing is halted.
 					 */
-					if ( apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___process_registrations__pre_registration_process', FALSE, $att_nmbr, $registration, $registrations, $valid_data, $this ) ) {
+					if (apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___process_registrations__pre_registration_process', FALSE, $att_nmbr, $registration, $registrations, $valid_data, $this)) {
 						return FALSE;
 					}
 
 					// Houston, we have a registration!
 					$att_nmbr++;
-					$this->_attendee_data[ $reg_url_link ] = array();
+					$this->_attendee_data[$reg_url_link] = array();
 					// unset( $valid_data[ $reg_url_link ]['additional_attendee_reg_info'] );
-					if ( isset( $valid_data[ $reg_url_link ] )) {
+					if (isset($valid_data[$reg_url_link])) {
 						// do we need to copy basic info from primary attendee ?
-						$copy_primary = isset( $valid_data[ $reg_url_link ]['additional_attendee_reg_info'] ) && absint( $valid_data[ $reg_url_link ]['additional_attendee_reg_info'] ) === 0 ? TRUE : FALSE;
+						$copy_primary = isset($valid_data[$reg_url_link]['additional_attendee_reg_info']) && absint($valid_data[$reg_url_link]['additional_attendee_reg_info']) === 0 ? TRUE : FALSE;
 						// filter form input data for this registration
-						$valid_data[ $reg_url_link ] = apply_filters( 'FHEE__EE_Single_Page_Checkout__process_attendee_information__valid_data_line_item', $valid_data[ $reg_url_link ] );
+						$valid_data[$reg_url_link] = apply_filters('FHEE__EE_Single_Page_Checkout__process_attendee_information__valid_data_line_item', $valid_data[$reg_url_link]);
 						//EEH_Debug_Tools::printr( $valid_data[ $reg_url_link ], '$valid_data[ $reg_url_link ]', __FILE__, __LINE__ );
-						if ( isset( $valid_data['primary_attendee'] )) {
-							$primary_registrant['line_item_id'] =  ! empty( $valid_data['primary_attendee'] ) ? $valid_data['primary_attendee'] : FALSE;
-							unset( $valid_data['primary_attendee'] );
+						if (isset($valid_data['primary_attendee'])) {
+							$primary_registrant['line_item_id'] = ! empty($valid_data['primary_attendee']) ? $valid_data['primary_attendee'] : FALSE;
+							unset($valid_data['primary_attendee']);
 						}
 						// now loop through our array of valid post data && process attendee reg forms
-						foreach ( $valid_data[ $reg_url_link ] as $form_section => $form_inputs ) {
-							if ( ! in_array( $form_section, $non_input_form_sections )) {
-								foreach ( $form_inputs as $form_input => $input_value ) {
+						foreach ($valid_data[$reg_url_link] as $form_section => $form_inputs) {
+							if ( ! in_array($form_section, $non_input_form_sections)) {
+								foreach ($form_inputs as $form_input => $input_value) {
 									// check for critical inputs
-									if ( ! $this->_verify_critical_attendee_details_are_set_and_validate_email( $form_input, $input_value )) {
+									if ( ! $this->_verify_critical_attendee_details_are_set_and_validate_email($form_input, $input_value)) {
 										return FALSE;
 									}
 									// store a bit of data about the primary attendee
-									if ( $att_nmbr == 1 && $reg_url_link == $primary_registrant['line_item_id'] && ! empty( $input_value )) {
-										$primary_registrant[ $form_input ] = $input_value;
-									} else if ( $copy_primary && isset( $primary_registrant[ $form_input ] ) && $input_value == NULL ) {
-										$input_value = $primary_registrant[ $form_input ];
+									if ($att_nmbr == 1 && $reg_url_link == $primary_registrant['line_item_id'] && ! empty($input_value)) {
+										$primary_registrant[$form_input] = $input_value;
+									} else if ($copy_primary && isset($primary_registrant[$form_input]) && $input_value == NULL) {
+										$input_value = $primary_registrant[$form_input];
 									}
 									// now attempt to save the input data
-									if ( ! $this->_save_registration_form_input( $registration, $form_input, $input_value ))  {
-										EE_Error::add_error( sprintf( __( 'Unable to save registration form data for the form input: "%1$s" with the submitted value: "%2$s"', 'event_espresso' ), $form_input, $input_value ), __FILE__, __FUNCTION__, __LINE__ );
+									if ( ! $this->_save_registration_form_input($registration, $form_input, $input_value)) {
+										EE_Error::add_error(sprintf(__('Unable to save registration form data for the form input: "%1$s" with the submitted value: "%2$s"', 'event_espresso'), $form_input, $input_value), __FILE__, __FUNCTION__, __LINE__);
 										return FALSE;
 									}
 								}
@@ -743,51 +742,51 @@ 
 					}
 					//EEH_Debug_Tools::printr( $this->_attendee_data, '$this->_attendee_data', __FILE__, __LINE__ );
 					// this registration does not require additional attendee information ?
-					if ( $copy_primary && $att_nmbr > 1 && $this->checkout->primary_attendee_obj instanceof EE_Attendee ) {
+					if ($copy_primary && $att_nmbr > 1 && $this->checkout->primary_attendee_obj instanceof EE_Attendee) {
 						// just copy the primary registrant
 						$attendee = $this->checkout->primary_attendee_obj;
 					} else {
 						// have we met before?
-						$attendee = $this->_find_existing_attendee( $registration, $this->_attendee_data[ $reg_url_link ] );
+						$attendee = $this->_find_existing_attendee($registration, $this->_attendee_data[$reg_url_link]);
 						// did we find an already existing record for this attendee ?
-						if ( $attendee instanceof EE_Attendee ) {
-							$attendee = $this->_update_existing_attendee_data( $attendee, $this->_attendee_data[ $reg_url_link ] );
+						if ($attendee instanceof EE_Attendee) {
+							$attendee = $this->_update_existing_attendee_data($attendee, $this->_attendee_data[$reg_url_link]);
 						} else {
 							// ensure critical details are set for additional attendees
-							$this->_attendee_data[ $reg_url_link ] = $att_nmbr > 1 ? $this->_copy_critical_attendee_details_from_primary_registrant( $this->_attendee_data[ $reg_url_link ] ) : $this->_attendee_data[ $reg_url_link ];
-							$attendee = $this->_create_new_attendee( $registration, $this->_attendee_data[ $reg_url_link ] );
+							$this->_attendee_data[$reg_url_link] = $att_nmbr > 1 ? $this->_copy_critical_attendee_details_from_primary_registrant($this->_attendee_data[$reg_url_link]) : $this->_attendee_data[$reg_url_link];
+							$attendee = $this->_create_new_attendee($registration, $this->_attendee_data[$reg_url_link]);
 						}
 						// who's #1 ?
-						if ( $att_nmbr == 1 ) {
+						if ($att_nmbr == 1) {
 							$this->checkout->primary_attendee_obj = $attendee;
 						}
 					}
 					//EEH_Debug_Tools::printr( $attendee, '$attendee', __FILE__, __LINE__ );
 					// add relation to registration, set attendee ID, and cache attendee
-					$this->_associate_attendee_with_registration( $registration, $attendee );
-					if ( ! $registration->attendee() instanceof EE_Attendee ) {
-						EE_Error::add_error( sprintf( __( 'Registration %s has an invalid or missing Attendee object.', 'event_espresso' ), $reg_url_link ), __FILE__, __FUNCTION__, __LINE__ );
+					$this->_associate_attendee_with_registration($registration, $attendee);
+					if ( ! $registration->attendee() instanceof EE_Attendee) {
+						EE_Error::add_error(sprintf(__('Registration %s has an invalid or missing Attendee object.', 'event_espresso'), $reg_url_link), __FILE__, __FUNCTION__, __LINE__);
 						return FALSE;
 					}
 					/** @type EE_Registration_Processor $registration_processor */
-					$registration_processor = EE_Registry::instance()->load_class( 'Registration_Processor' );
+					$registration_processor = EE_Registry::instance()->load_class('Registration_Processor');
 					// at this point, we should have enough details about the registrant to consider the registration NOT incomplete
-					$registration_processor->toggle_incomplete_registration_status_to_default( $registration, FALSE );
+					$registration_processor->toggle_incomplete_registration_status_to_default($registration, FALSE);
 					/** @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);
 					// if we've gotten this far, then let's save what we have
 					$registration->save();
 					// add relation between TXN and registration
-					$this->_associate_registration_with_transaction( $registration );
+					$this->_associate_registration_with_transaction($registration);
 
 				} // end of if ( ! $this->checkout->revisit || $this->checkout->primary_revisit || ( $this->checkout->revisit && $this->checkout->reg_url_link == $reg_url_link )) {
 
-			}  else {
-				EE_Error::add_error( __( 'An invalid or missing line item ID was encountered while attempting to process the registration form.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+			} else {
+				EE_Error::add_error(__('An invalid or missing line item ID was encountered while attempting to process the registration form.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				// remove malformed data
-				unset( $valid_data[ $reg_url_link ] );
+				unset($valid_data[$reg_url_link]);
 				return FALSE;
 			}
 
@@ -805,22 +804,22 @@ 
 	 * @param string           	$input_value
 	 * @return boolean
 	 */
-	private function _save_registration_form_input( EE_Registration $registration, $form_input = '', $input_value = '' ) {
+	private function _save_registration_form_input(EE_Registration $registration, $form_input = '', $input_value = '') {
 		//echo '<h3 style="color:#999;line-height:.9em;"><span style="color:#2EA2CC">' . __CLASS__ . '</span>::<span style="color:#E76700">' . __FUNCTION__ . '()</span><br/><span style="font-size:9px;font-weight:normal;">' . __FILE__ . '</span>    <b style="font-size:10px;">  ' . __LINE__ . ' </b></h3>';
 		//EEH_Debug_Tools::printr( $form_input, '$form_input', __FILE__, __LINE__ );
 		// allow for plugins to hook in and do their own processing of the form input.
 		// For plugins to bypass normal processing here, they just need to return a boolean value.
-		if ( apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___save_registration_form_input', FALSE, $registration, $form_input, $input_value, $this ) ) {
+		if (apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___save_registration_form_input', FALSE, $registration, $form_input, $input_value, $this)) {
 			return TRUE;
 		}
 
 		// grab related answer objects
 		$answers = $registration->answers();
 		// $answer_cache_id is the key used to find the EE_Answer we want
-		$answer_cache_id = $this->checkout->reg_url_link ? $form_input : $form_input . '-' . $registration->reg_url_link();
-		$answer_is_obj = isset( $answers[ $answer_cache_id ] ) && $answers[ $answer_cache_id ] instanceof EE_Answer ? TRUE : FALSE;
+		$answer_cache_id = $this->checkout->reg_url_link ? $form_input : $form_input.'-'.$registration->reg_url_link();
+		$answer_is_obj = isset($answers[$answer_cache_id]) && $answers[$answer_cache_id] instanceof EE_Answer ? TRUE : FALSE;
 		//rename form_inputs if they are EE_Attendee properties
-		switch( (string)$form_input ) {
+		switch ((string) $form_input) {
 
 			case 'state' :
 			case 'STA_ID' :
@@ -835,33 +834,33 @@ 
 				break;
 
 			default :
-				$ATT_input = 'ATT_' . $form_input;
+				$ATT_input = 'ATT_'.$form_input;
 				//EEH_Debug_Tools::printr( $ATT_input, '$ATT_input', __FILE__, __LINE__ );
-				$attendee_property = EEM_Attendee::instance()->has_field( $ATT_input ) ? TRUE : FALSE;
-				$form_input = $attendee_property ? 'ATT_' . $form_input : $form_input;
+				$attendee_property = EEM_Attendee::instance()->has_field($ATT_input) ? TRUE : FALSE;
+				$form_input = $attendee_property ? 'ATT_'.$form_input : $form_input;
 		}
 		//EEH_Debug_Tools::printr( $input_value, '$input_value', __FILE__, __LINE__ );
 		//EEH_Debug_Tools::printr( $answer_cache_id, '$answer_cache_id', __FILE__, __LINE__ );
 		//EEH_Debug_Tools::printr( $attendee_property, '$attendee_property', __FILE__, __LINE__ );
 		//EEH_Debug_Tools::printr( $answer_is_obj, '$answer_is_obj', __FILE__, __LINE__ );
 		// if this form input has a corresponding attendee property
-		if ( $attendee_property ) {
-			$this->_attendee_data[ $registration->reg_url_link() ][ $form_input ] = $input_value;
-			if (  $answer_is_obj ) {
+		if ($attendee_property) {
+			$this->_attendee_data[$registration->reg_url_link()][$form_input] = $input_value;
+			if ($answer_is_obj) {
 				// and delete the corresponding answer since we won't be storing this data in that object
-				$registration->_remove_relation_to( $answers[ $answer_cache_id ], 'Answer' );
-				$answers[ $answer_cache_id ]->delete_permanently();
+				$registration->_remove_relation_to($answers[$answer_cache_id], 'Answer');
+				$answers[$answer_cache_id]->delete_permanently();
 			}
 			return TRUE;
-		} elseif ( $answer_is_obj ) {
+		} elseif ($answer_is_obj) {
 			// save this data to the answer object
-			$answers[ $answer_cache_id ]->set_value( $input_value );
-			$result = $answers[ $answer_cache_id ]->save();
+			$answers[$answer_cache_id]->set_value($input_value);
+			$result = $answers[$answer_cache_id]->save();
 			return $result !== false ? true : false;
 		} else {
-			foreach ( $answers as $answer ) {
-				if ( $answer instanceof EE_Answer && $answer->question_ID() == $answer_cache_id ) {
-					$answer->set_value( $input_value );
+			foreach ($answers as $answer) {
+				if ($answer instanceof EE_Answer && $answer->question_ID() == $answer_cache_id) {
+					$answer->set_value($input_value);
 					$result = $answer->save();
 					return $result !== false ? true : false;
 				}
@@ -879,33 +878,33 @@ 
 	 * @param string $input_value
 	 * @return boolean
 	 */
-	private function _verify_critical_attendee_details_are_set_and_validate_email( $form_input = '', $input_value = '' ) {
-		if ( empty( $input_value )) {
+	private function _verify_critical_attendee_details_are_set_and_validate_email($form_input = '', $input_value = '') {
+		if (empty($input_value)) {
 			// if the form input isn't marked as being required, then just return
-			if ( ! isset( $this->_required_questions[ $form_input ]  ) || ! $this->_required_questions[ $form_input ] ) {
+			if ( ! isset($this->_required_questions[$form_input]) || ! $this->_required_questions[$form_input]) {
 				return true;
 			}
-			switch( $form_input ) {
+			switch ($form_input) {
 				case 'fname' :
-					EE_Error::add_error( __( 'First Name is a required value.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_error(__('First Name is a required value.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 					return FALSE;
 					break;
 				case 'lname' :
-					EE_Error::add_error( __( 'Last Name is a required value.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_error(__('Last Name is a required value.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 					return FALSE;
 					break;
 				case 'email' :
-					EE_Error::add_error( __( 'Email Address is a required value.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_error(__('Email Address is a required value.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 					return FALSE;
 					break;
 			}
-		} else if ( $form_input === 'email' ) {
+		} else if ($form_input === 'email') {
 			// clean the email address
-			$valid_email = sanitize_email( $input_value );
+			$valid_email = sanitize_email($input_value);
 			// check if it matches
-			if ( $input_value != $valid_email ) {
+			if ($input_value != $valid_email) {
 				// whoops!!!
-				EE_Error::add_error( __( 'Please enter a valid email address.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error(__('Please enter a valid email address.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				return FALSE;
 			}
 		}
@@ -933,14 +932,14 @@ 
 	 * @param array           $attendee_data
 	 * @return boolean
 	 */
-	private function _find_existing_attendee( EE_Registration $registration, $attendee_data = array() ) {
+	private function _find_existing_attendee(EE_Registration $registration, $attendee_data = array()) {
 		// does this attendee already exist in the db ? we're searching using a combination of first name, last name, AND email address
-		$ATT_fname = isset( $attendee_data['ATT_fname'] ) && ! empty( $attendee_data['ATT_fname'] ) ? $attendee_data['ATT_fname'] : '';
-		$ATT_lname = isset( $attendee_data['ATT_lname'] ) && ! empty( $attendee_data['ATT_lname'] ) ? $attendee_data['ATT_lname'] : '';
-		$ATT_email = isset( $attendee_data['ATT_email'] ) && ! empty( $attendee_data['ATT_email'] ) ? $attendee_data['ATT_email'] : '';
+		$ATT_fname = isset($attendee_data['ATT_fname']) && ! empty($attendee_data['ATT_fname']) ? $attendee_data['ATT_fname'] : '';
+		$ATT_lname = isset($attendee_data['ATT_lname']) && ! empty($attendee_data['ATT_lname']) ? $attendee_data['ATT_lname'] : '';
+		$ATT_email = isset($attendee_data['ATT_email']) && ! empty($attendee_data['ATT_email']) ? $attendee_data['ATT_email'] : '';
 		// but only if those have values
-		if ( $ATT_fname && $ATT_lname && $ATT_email ) {
-			$existing_attendee = EE_Registry::instance()->LIB->EEM_Attendee->find_existing_attendee( array(
+		if ($ATT_fname && $ATT_lname && $ATT_email) {
+			$existing_attendee = EE_Registry::instance()->LIB->EEM_Attendee->find_existing_attendee(array(
 				'ATT_fname' => $ATT_fname,
 				'ATT_lname' => $ATT_lname,
 				'ATT_email' => $ATT_email
@@ -948,7 +947,7 @@ 
 		} else {
 			$existing_attendee = NULL;
 		}
-		return apply_filters( 'FHEE_EE_Single_Page_Checkout__save_registration_items__find_existing_attendee', $existing_attendee, $registration, $attendee_data );
+		return apply_filters('FHEE_EE_Single_Page_Checkout__save_registration_items__find_existing_attendee', $existing_attendee, $registration, $attendee_data);
 	}
 
 
@@ -960,13 +959,13 @@ 
 	 * @param array           $attendee_data
 	 * @return \EE_Attendee
 	 */
-	private function _update_existing_attendee_data( EE_Attendee $existing_attendee, $attendee_data = array() ) {
+	private function _update_existing_attendee_data(EE_Attendee $existing_attendee, $attendee_data = array()) {
 		// first remove fname, lname, and email from attendee data
-		$dont_set = array( 'ATT_fname', 'ATT_lname', 'ATT_email' );
+		$dont_set = array('ATT_fname', 'ATT_lname', 'ATT_email');
 		// now loop thru what's left and add to attendee CPT
-		foreach ( $attendee_data as $property_name => $property_value ) {
-			if ( ! in_array( $property_name, $dont_set ) && EEM_Attendee::instance()->has_field( $property_name )) {
-				$existing_attendee->set( $property_name, $property_value );
+		foreach ($attendee_data as $property_name => $property_value) {
+			if ( ! in_array($property_name, $dont_set) && EEM_Attendee::instance()->has_field($property_name)) {
+				$existing_attendee->set($property_name, $property_value);
 			}
 		}
 		// better save that now
@@ -983,11 +982,11 @@ 
 	 * @param EE_Attendee     $attendee
 	 * @return void
 	 */
-	private function _associate_attendee_with_registration( EE_Registration $registration, EE_Attendee $attendee ) {
+	private function _associate_attendee_with_registration(EE_Registration $registration, EE_Attendee $attendee) {
 		// add relation to 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);
 	}
 
 
@@ -998,10 +997,10 @@ 
 	 * @param EE_Registration $registration
 	 * @return void
 	 */
-	private function _associate_registration_with_transaction( EE_Registration $registration ) {
+	private function _associate_registration_with_transaction(EE_Registration $registration) {
 		// add relation to attendee
-		$this->checkout->transaction->_add_relation_to( $registration, 'Registration' );
-		$this->checkout->transaction->update_cache_after_object_save( 'Registration', $registration );
+		$this->checkout->transaction->_add_relation_to($registration, 'Registration');
+		$this->checkout->transaction->update_cache_after_object_save('Registration', $registration);
 	}
 
 
@@ -1013,17 +1012,17 @@ 
 	 * @param array $attendee_data
 	 * @return array
 	 */
-	private function _copy_critical_attendee_details_from_primary_registrant( $attendee_data = array() ) {
+	private function _copy_critical_attendee_details_from_primary_registrant($attendee_data = array()) {
 		// bare minimum critical details include first name, last name, email address
-		$critical_attendee_details = array( 'ATT_fname', 'ATT_lname', 'ATT_email' );
+		$critical_attendee_details = array('ATT_fname', 'ATT_lname', 'ATT_email');
 		// add address info to critical details?
-		if ( apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information__merge_address_details_with_critical_attendee_details', FALSE )) {
-			$address_details = array( 'ATT_address', 'ATT_address2', 'ATT_city', 'STA_ID', 'CNT_ISO', 'ATT_zip', 'ATT_phone' );
-			$critical_attendee_details = array_merge( $critical_attendee_details, $address_details );
+		if (apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information__merge_address_details_with_critical_attendee_details', FALSE)) {
+			$address_details = array('ATT_address', 'ATT_address2', 'ATT_city', 'STA_ID', 'CNT_ISO', 'ATT_zip', 'ATT_phone');
+			$critical_attendee_details = array_merge($critical_attendee_details, $address_details);
 		}
-		foreach ( $critical_attendee_details as $critical_attendee_detail ) {
-			if ( ! isset( $attendee_data[ $critical_attendee_detail ] ) || empty( $attendee_data[ $critical_attendee_detail ] )) {
-				$attendee_data[ $critical_attendee_detail ] = $this->checkout->primary_attendee_obj->get( $critical_attendee_detail );
+		foreach ($critical_attendee_details as $critical_attendee_detail) {
+			if ( ! isset($attendee_data[$critical_attendee_detail]) || empty($attendee_data[$critical_attendee_detail])) {
+				$attendee_data[$critical_attendee_detail] = $this->checkout->primary_attendee_obj->get($critical_attendee_detail);
 			}
 		}
 		return $attendee_data;
@@ -1038,11 +1037,11 @@ 
 	 * @param array           $attendee_data
 	 * @return \EE_Attendee
 	 */
-	private function _create_new_attendee( EE_Registration $registration, $attendee_data = array() ) {
+	private function _create_new_attendee(EE_Registration $registration, $attendee_data = array()) {
 		// create new attendee object
-		$new_attendee = EE_Attendee::new_instance( $attendee_data );
+		$new_attendee = EE_Attendee::new_instance($attendee_data);
 		// set author to event creator
-		$new_attendee->set( 'ATT_author', $registration->event()->wp_user() );
+		$new_attendee->set('ATT_author', $registration->event()->wp_user());
 		$new_attendee->save();
 		return $new_attendee;
 	}
@@ -1058,7 +1057,7 @@ 
 	 */
 	public function update_reg_step() {
 		// save everything
-		if ( $this->process_reg_step() ) {
+		if ($this->process_reg_step()) {
 			$this->checkout->redirect = TRUE;
 			$this->checkout->redirect_url = add_query_arg(
 				array(
@@ -1067,7 +1066,7 @@ 
 				),
 				$this->checkout->thank_you_page_url
 			);
-			$this->checkout->json_response->set_redirect_url( $this->checkout->redirect_url );
+			$this->checkout->json_response->set_redirect_url($this->checkout->redirect_url);
 			return TRUE;
 		}
 		return FALSE;

caffeinated/admin/extend/registration_form/Registration_Form_Question_Groups_Admin_List_Table.class.php

Spacing +30 added lines, -30 removed lines

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

caffeinated/admin/new/pricing/templates/event_tickets_metabox_main.template.php

Indentation +14 added lines, -14 removed lines

@@ -99,17 +99,17 @@
 <?php echo $ticket_js_structure; ?>
 <?php
 /**
- * template vars in use
- *
- * $event_datetime_help_link
- * $existing_datetime_ids
- * $total_dtt_rows
- * $add_new_dtt_help_link
- * $datetime_rows
- * $show_tickets_container
- * $ticket_rows
- * $existing_ticket_ids
- * $total_ticket_rows
- * $ticket_js_structure
- * $ee_collapsible_status
- */
\ No newline at end of file
+					 * template vars in use
+					 *
+					 * $event_datetime_help_link
+					 * $existing_datetime_ids
+					 * $total_dtt_rows
+					 * $add_new_dtt_help_link
+					 * $datetime_rows
+					 * $show_tickets_container
+					 * $ticket_rows
+					 * $existing_ticket_ids
+					 * $total_ticket_rows
+					 * $ticket_js_structure
+					 * $ee_collapsible_status
+					 */
\ No newline at end of file

modules/ticket_selector/EED_Ticket_Selector.module.php

Indentation +33 added lines, -33 removed lines

@@ -1,29 +1,29 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
 /**
- * Event Espresso
- *
- * Event Registration and Management Plugin for WordPress
- *
- * @ package		Event Espresso
- * @ author			Seth Shoultes
- * @ copyright	(c) 2008-2011 Event Espresso  All Rights Reserved.
- * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
- * @ link				http://www.eventespresso.com
- * @ version		4.0
- *
- * ------------------------------------------------------------------------
- */
+	 * Event Espresso
+	 *
+	 * Event Registration and Management Plugin for WordPress
+	 *
+	 * @ package		Event Espresso
+	 * @ author			Seth Shoultes
+	 * @ copyright	(c) 2008-2011 Event Espresso  All Rights Reserved.
+	 * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
+	 * @ link				http://www.eventespresso.com
+	 * @ version		4.0
+	 *
+	 * ------------------------------------------------------------------------
+	 */
 /**
- * ------------------------------------------------------------------------
- *
- * Ticket Selector  class
- *
- * @package		Event Espresso
- * @subpackage	includes/classes/EE_Ticket_Selector.class.php
- * @author			Brent Christensen
- *
- * ------------------------------------------------------------------------
- */
+	 * ------------------------------------------------------------------------
+	 *
+	 * Ticket Selector  class
+	 *
+	 * @package		Event Espresso
+	 * @subpackage	includes/classes/EE_Ticket_Selector.class.php
+	 * @author			Brent Christensen
+	 *
+	 * ------------------------------------------------------------------------
+	 */
 class EED_Ticket_Selector extends  EED_Module {
 
 	/**
@@ -35,11 +35,11 @@ 
 	protected static $_event = NULL;
 
 	/**
-	* array of datetimes and the spaces available for them
-	*
-	* @access private
-	* @var array
-	*/
+	 * array of datetimes and the spaces available for them
+	 *
+	 * @access private
+	 * @var array
+	 */
 	private static $_available_spaces = array();
 
 
@@ -900,11 +900,11 @@ 
 
 
 	/**
-	* 	load js
-	*
-	* 	@access 		public
-	* 	@return 		void
-	*/
+	 * 	load js
+	 *
+	 * 	@access 		public
+	 * 	@return 		void
+	 */
 	public static function load_tckt_slctr_assets() {
 		// add some style
 		if ( apply_filters( 'FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', FALSE ) ) {

Spacing +232 added lines, -232 removed lines

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

payment_methods/Paypal_Standard/EEG_Paypal_Standard.gateway.php

Indentation +10 added lines, -10 removed lines

@@ -456,16 +456,16 @@
 
 		//might paypal have changed the taxes?
 		if( $this->_paypal_taxes && $payment_was_itemized ){
-                    //note that we're doing this BEFORE adding shipping; we actually want PayPal's shipping to remain non-taxable
-                    $this->_line_item->set_line_items_taxable( $transaction->total_line_item(), true, 'paypal_shipping' );
-                    $this->_line_item->set_total_tax_to(
-                            $transaction->total_line_item(),
-                            floatval( $update_info['tax'] ),
-                            __( 'Taxes', 'event_espresso' ),
-                            __( 'Calculated by Paypal', 'event_espresso' ),
-                            'paypal_tax'
-                    );
-                    $grand_total_needs_resaving = TRUE;
+					//note that we're doing this BEFORE adding shipping; we actually want PayPal's shipping to remain non-taxable
+					$this->_line_item->set_line_items_taxable( $transaction->total_line_item(), true, 'paypal_shipping' );
+					$this->_line_item->set_total_tax_to(
+							$transaction->total_line_item(),
+							floatval( $update_info['tax'] ),
+							__( 'Taxes', 'event_espresso' ),
+							__( 'Calculated by Paypal', 'event_espresso' ),
+							'paypal_tax'
+					);
+					$grand_total_needs_resaving = TRUE;
 		}
 
 		$shipping_amount = floatval( $update_info[ 'mc_shipping' ] );

Spacing +122 added lines, -122 removed lines

@@ -68,7 +68,7 @@ 
 	 * @return EEG_Paypal_Standard
 	 */
 	public function __construct() {
-		$this->set_uses_separate_IPN_request( true ) ;
+		$this->set_uses_separate_IPN_request(true);
 		parent::__construct();
 	}
 
@@ -78,11 +78,11 @@ 
 	 * Also sets the gateway url class variable based on whether debug mode is enabled or not
 	 * @param array $settings_array
 	 */
-	public function set_settings($settings_array){
+	public function set_settings($settings_array) {
 		parent::set_settings($settings_array);
-		if($this->_debug_mode){
+		if ($this->_debug_mode) {
 			$this->_gateway_url = 'https://www.sandbox.paypal.com/cgi-bin/webscr';
-		}else{
+		} else {
 			$this->_gateway_url = 'https://www.paypal.com/cgi-bin/webscr';
 		}
 	}
@@ -97,7 +97,7 @@ 
 	 * @param string      $cancel_url   URL to send the user to after a cancelled payment attempt on teh payment provider's website
 	 * @return EEI_Payment
 	 */
-	public function set_redirection_info( $payment, $billing_info = array(), $return_url = NULL, $notify_url = NULL, $cancel_url = NULL ){
+	public function set_redirection_info($payment, $billing_info = array(), $return_url = NULL, $notify_url = NULL, $cancel_url = NULL) {
 		$redirect_args = array();
 		$transaction = $payment->transaction();
 		$primary_registrant = $transaction->primary_registration();
@@ -107,42 +107,42 @@ 
 
 		$total_discounts_to_cart_total = $transaction->paid();
 		//only itemize the order if we're paying for the rest of the order's amount
-		if( $payment->amount() == $transaction->total() ) {
-			$payment->update_extra_meta( EEG_Paypal_Standard::itemized_payment_option_name, true );
+		if ($payment->amount() == $transaction->total()) {
+			$payment->update_extra_meta(EEG_Paypal_Standard::itemized_payment_option_name, true);
 			//this payment is for the remaining transaction amount,
 			//keep track of exactly how much the itemized order amount equals
 			$itemized_sum = 0;
 			$shipping_previously_added = 0;
 			//so let's show all the line items
-			foreach($total_line_item->get_items() as $line_item){
-				if ( $line_item instanceof EE_Line_Item ) {
+			foreach ($total_line_item->get_items() as $line_item) {
+				if ($line_item instanceof EE_Line_Item) {
 					//it's some kind of discount
-					if( $line_item->total() < 0 ) {
-						$total_discounts_to_cart_total += abs( $line_item->total() );
+					if ($line_item->total() < 0) {
+						$total_discounts_to_cart_total += abs($line_item->total());
 						$itemized_sum += $line_item->total();
 						continue;
 					}
 					//dont include shipping again.
-					if( strpos( $line_item->code(), 'paypal_shipping_') === 0 ) {
+					if (strpos($line_item->code(), 'paypal_shipping_') === 0) {
 						$shipping_previously_added = $line_item->total();
 						continue;
 					}
-					$redirect_args[ 'item_name_' . $item_num ] = substr(
-						sprintf( _x( '%1$s for %2$s', 'Ticket for Event', 'event_espresso' ), $line_item->name(), $line_item->ticket_event_name() ),
+					$redirect_args['item_name_'.$item_num] = substr(
+						sprintf(_x('%1$s for %2$s', 'Ticket for Event', 'event_espresso'), $line_item->name(), $line_item->ticket_event_name()),
 						0, 127
 					);
-					$redirect_args[ 'amount_' . $item_num ] = $line_item->unit_price();
-					$redirect_args[ 'quantity_' . $item_num ] = $line_item->quantity();
+					$redirect_args['amount_'.$item_num] = $line_item->unit_price();
+					$redirect_args['quantity_'.$item_num] = $line_item->quantity();
 					//if we're not letting PayPal calculate shipping, tell them its 0
-					if ( ! $this->_paypal_shipping ) {
-						$redirect_args[ 'shipping_' . $item_num ] = '0';
-						$redirect_args[ 'shipping2_' . $item_num ] = '0';
+					if ( ! $this->_paypal_shipping) {
+						$redirect_args['shipping_'.$item_num] = '0';
+						$redirect_args['shipping2_'.$item_num] = '0';
 					}
 					$item_num++;
 					$itemized_sum += $line_item->total();
 				}
 			}
-			$taxes_li = $this->_line_item->get_taxes_subtotal( $total_line_item );
+			$taxes_li = $this->_line_item->get_taxes_subtotal($total_line_item);
 			//ideally itemized sum equals the transaction total. but if not (which is weird)
 			//and the itemized sum is LESS than the transaction total
 			//add another line item
@@ -152,47 +152,47 @@ 
 					$transaction->total() - $itemized_sum - $taxes_li->total() - $shipping_previously_added,
 					2 
 				);
-			if( $itemized_sum_diff_from_txn_total < 0 ) {
+			if ($itemized_sum_diff_from_txn_total < 0) {
 				//itemized sum is too big
-				$total_discounts_to_cart_total += abs( $itemized_sum_diff_from_txn_total );
-			} elseif( $itemized_sum_diff_from_txn_total > 0 ) {
-				$redirect_args[ 'item_name_' . $item_num ] = substr(
-						__( 'Other charges', 'event_espresso' ), 0, 127 );
-				$redirect_args[ 'amount_' . $item_num ] = $this->format_currency( $itemized_sum_diff_from_txn_total );
-				$redirect_args[ 'quantity_' . $item_num ] = 1;
+				$total_discounts_to_cart_total += abs($itemized_sum_diff_from_txn_total);
+			} elseif ($itemized_sum_diff_from_txn_total > 0) {
+				$redirect_args['item_name_'.$item_num] = substr(
+						__('Other charges', 'event_espresso'), 0, 127 );
+				$redirect_args['amount_'.$item_num] = $this->format_currency($itemized_sum_diff_from_txn_total);
+				$redirect_args['quantity_'.$item_num] = 1;
 				$item_num++;
 			}
-			if( $total_discounts_to_cart_total > 0 ) {
-				$redirect_args[ 'discount_amount_cart' ] = $this->format_currency( $total_discounts_to_cart_total );
+			if ($total_discounts_to_cart_total > 0) {
+				$redirect_args['discount_amount_cart'] = $this->format_currency($total_discounts_to_cart_total);
 			}
 			//add our taxes to the order if we're NOT using PayPal's
-			if( ! $this->_paypal_taxes ){
+			if ( ! $this->_paypal_taxes) {
 				$redirect_args['tax_cart'] = $total_line_item->get_total_tax();
 			}
 		} else {
-			$payment->update_extra_meta( EEG_Paypal_Standard::itemized_payment_option_name, false );
+			$payment->update_extra_meta(EEG_Paypal_Standard::itemized_payment_option_name, false);
 			//partial payment that's not for the remaining amount, so we can't send an itemized list
-			$redirect_args['item_name_' . $item_num] = substr(
-				sprintf( __('Payment of %1$s for %2$s', "event_espresso"), $payment->amount(), $primary_registrant->reg_code() ),
+			$redirect_args['item_name_'.$item_num] = substr(
+				sprintf(__('Payment of %1$s for %2$s', "event_espresso"), $payment->amount(), $primary_registrant->reg_code()),
 				0, 127
 			);
-			$redirect_args['amount_' . $item_num] = $payment->amount();
-			$redirect_args['shipping_' . $item_num ] = '0';
-			$redirect_args['shipping2_' . $item_num ] = '0';
+			$redirect_args['amount_'.$item_num] = $payment->amount();
+			$redirect_args['shipping_'.$item_num] = '0';
+			$redirect_args['shipping2_'.$item_num] = '0';
 			$redirect_args['tax_cart'] = '0';
 			$item_num++;
 		}
 
-		if($this->_debug_mode){
-			$redirect_args['item_name_' . $item_num] = 'DEBUG INFO (this item only added in sandbox mode';
-			$redirect_args['amount_' . $item_num] = 0;
+		if ($this->_debug_mode) {
+			$redirect_args['item_name_'.$item_num] = 'DEBUG INFO (this item only added in sandbox mode';
+			$redirect_args['amount_'.$item_num] = 0;
 			$redirect_args['on0_'.$item_num] = 'NOTIFY URL';
-			$redirect_args['os0_' . $item_num] = $notify_url;
+			$redirect_args['os0_'.$item_num] = $notify_url;
 			$redirect_args['on1_'.$item_num] = 'RETURN URL';
-			$redirect_args['os1_' . $item_num] = $return_url;
+			$redirect_args['os1_'.$item_num] = $return_url;
 //			$redirect_args['option_index_' . $item_num] = 1; // <-- dunno if this is needed ?
-			$redirect_args['shipping_' . $item_num ] = '0';
-			$redirect_args['shipping2_' . $item_num ] = '0';
+			$redirect_args['shipping_'.$item_num] = '0';
+			$redirect_args['shipping2_'.$item_num] = '0';
 		}
 
 		$redirect_args['business'] = $this->_paypal_id;
@@ -202,14 +202,14 @@ 
 		$redirect_args['cmd'] = '_cart';
 		$redirect_args['upload'] = 1;
 		$redirect_args['currency_code'] = $payment->currency_code();
-		$redirect_args['rm'] = 2;//makes the user return with method=POST
-		if($this->_image_url){
+		$redirect_args['rm'] = 2; //makes the user return with method=POST
+		if ($this->_image_url) {
 			$redirect_args['image_url'] = $this->_image_url;
 		}
 		$redirect_args['no_shipping'] = $this->_shipping_details;
-		$redirect_args['bn'] = 'EventEspresso_SP';//EE will blow up if you change this
+		$redirect_args['bn'] = 'EventEspresso_SP'; //EE will blow up if you change this
 
-		$redirect_args = apply_filters( "FHEE__EEG_Paypal_Standard__set_redirection_info__arguments", $redirect_args, $this );
+		$redirect_args = apply_filters("FHEE__EEG_Paypal_Standard__set_redirection_info__arguments", $redirect_args, $this);
 
 		$payment->set_redirect_url($this->_gateway_url);
 		$payment->set_redirect_args($redirect_args);
@@ -230,55 +230,55 @@ 
 	 * @return \EEI_Payment updated
 	 * @throws \EE_Error
 	 */
-	public function handle_payment_update( $update_info, $transaction ){
+	public function handle_payment_update($update_info, $transaction) {
 		//verify there's payment data that's been sent
-		if ( empty( $update_info[ 'payment_status' ] ) || empty( $update_info[ 'txn_id' ] ) ) {
+		if (empty($update_info['payment_status']) || empty($update_info['txn_id'])) {
 			// waaaait... is this a PDT request? (see https://developer.paypal.com/docs/classic/products/payment-data-transfer/)
 			// indicated by the "tx" argument? If so, we don't need it. We'll just use the IPN data when it comes
-			if ( isset( $update_info[ 'tx' ] ) ) {
+			if (isset($update_info['tx'])) {
 				return $transaction->last_payment();
 			} else {
 				return null;
 			}
 		}
-		$payment = $this->_pay_model->get_payment_by_txn_id_chq_nmbr( $update_info[ 'txn_id' ] );
-		if ( ! $payment instanceof EEI_Payment ) {
+		$payment = $this->_pay_model->get_payment_by_txn_id_chq_nmbr($update_info['txn_id']);
+		if ( ! $payment instanceof EEI_Payment) {
 			$payment = $transaction->last_payment();
 		}
 		// ok, then validate the IPN. Even if we've already processed this payment,
 		// let PayPal know we don't want to hear from them anymore!
-		if ( ! $this->validate_ipn( $update_info, $payment ) ) {
+		if ( ! $this->validate_ipn($update_info, $payment)) {
 			return $payment;
 		}
 		//ok, well let's process this payment then!
-		switch ( $update_info[ 'payment_status' ] ) {
+		switch ($update_info['payment_status']) {
 
 			case 'Completed' :
 				$status = $this->_pay_model->approved_status();
-				$gateway_response = __( 'The payment is approved.', 'event_espresso' );
+				$gateway_response = __('The payment is approved.', 'event_espresso');
 				break;
 
 			case 'Pending' :
 				$status = $this->_pay_model->pending_status();
-				$gateway_response = __( 'The payment is in progress. Another message will be sent when payment is approved.', 'event_espresso' );
+				$gateway_response = __('The payment is in progress. Another message will be sent when payment is approved.', 'event_espresso');
 				break;
 
 			case 'Denied' :
 				$status = $this->_pay_model->declined_status();
-				$gateway_response = __( 'The payment has been declined.', 'event_espresso' );
+				$gateway_response = __('The payment has been declined.', 'event_espresso');
 				break;
 
 			case 'Expired' :
 			case 'Failed' :
 				$status = $this->_pay_model->failed_status();
-				$gateway_response = __( 'The payment failed for technical reasons or expired.', 'event_espresso' );
+				$gateway_response = __('The payment failed for technical reasons or expired.', 'event_espresso');
 				break;
 
 			case 'Refunded' :
 			case 'Partially_Refunded' :
 				// even though it's a refund, we consider the payment as approved, it just has a negative value
 				$status = $this->_pay_model->approved_status();
-				$gateway_response = __( 'The payment has been refunded. Please update registrations accordingly.', 'event_espresso' );
+				$gateway_response = __('The payment has been refunded. Please update registrations accordingly.', 'event_espresso');
 				break;
 
 			case 'Voided' :
@@ -286,25 +286,25 @@ 
 			case 'Canceled_Reversal' :
 			default :
 				$status = $this->_pay_model->cancelled_status();
-				$gateway_response = __( 'The payment was cancelled, reversed, or voided. Please update registrations accordingly.', 'event_espresso' );
+				$gateway_response = __('The payment was cancelled, reversed, or voided. Please update registrations accordingly.', 'event_espresso');
 				break;
 
 		}
 
 		//check if we've already processed this payment
-		if ( $payment instanceof EEI_Payment ) {
+		if ($payment instanceof EEI_Payment) {
 			//payment exists. if this has the exact same status and amount, don't bother updating. just return
-			if ( $payment->status() == $status && $payment->amount() == $update_info[ 'mc_gross' ] ) {
+			if ($payment->status() == $status && $payment->amount() == $update_info['mc_gross']) {
 				// DUPLICATED IPN! dont bother updating transaction foo!;
-				$message_log = sprintf( __( 'It appears we have received a duplicate IPN from PayPal for payment %d', 'event_espresso' ), $payment->ID() );
+				$message_log = sprintf(__('It appears we have received a duplicate IPN from PayPal for payment %d', 'event_espresso'), $payment->ID());
 			} else {
 				// new payment yippee !!!
-				$payment->set_status( $status );
-				$payment->set_amount( floatval( $update_info[ 'mc_gross' ] ) );
-				$payment->set_gateway_response( $gateway_response );
-				$payment->set_details( $update_info );
-				$payment->set_txn_id_chq_nmbr( $update_info[ 'txn_id' ] );
-				$message_log = sprintf( __( 'Updated payment either from IPN or as part of POST from PayPal', 'event_espresso' ) );
+				$payment->set_status($status);
+				$payment->set_amount(floatval($update_info['mc_gross']));
+				$payment->set_gateway_response($gateway_response);
+				$payment->set_details($update_info);
+				$payment->set_txn_id_chq_nmbr($update_info['txn_id']);
+				$message_log = sprintf(__('Updated payment either from IPN or as part of POST from PayPal', 'event_espresso'));
 			}
 			$this->log(
 				array(
@@ -316,11 +316,11 @@ 
 				$payment
 			);
 		}
-		do_action( 'FHEE__EEG_Paypal_Standard__handle_payment_update__payment_processed', $payment, $this );
+		do_action('FHEE__EEG_Paypal_Standard__handle_payment_update__payment_processed', $payment, $this);
 		// kill request here if this is a refund
-		if ( $update_info[ 'payment_status' ] == 'Refunded' || $update_info[ 'payment_status' ] == 'Partially_Refunded'   ) {
-			if ( apply_filters( 'FHEE__EEG_Paypal_Standard__handle_payment_update__kill_refund_request', true ) ) {
-				status_header( 200 );
+		if ($update_info['payment_status'] == 'Refunded' || $update_info['payment_status'] == 'Partially_Refunded') {
+			if (apply_filters('FHEE__EEG_Paypal_Standard__handle_payment_update__kill_refund_request', true)) {
+				status_header(200);
 				exit();
 			}
 		}
@@ -336,9 +336,9 @@ 
 	 * @param EE_Payment|EEI_Payment $payment
 	 * @return boolean
 	 */
-	public function validate_ipn( $update_info, $payment ) {
+	public function validate_ipn($update_info, $payment) {
 		//allow us to skip validating IPNs with PayPal (useful for testing)
-		if ( apply_filters( 'FHEE__EEG_Paypal_Standard__validate_ipn__skip', false ) ) {
+		if (apply_filters('FHEE__EEG_Paypal_Standard__validate_ipn__skip', false)) {
 			return true;
 		}
 		//...otherwise, we actually don't care what the $update_info is, we need to look
@@ -346,22 +346,22 @@ 
 		// Reading POSTed data directly from $_POST causes serialization issues with array data in the POST.
 		// Instead, read raw POST data from the input stream.
 		// @see https://gist.github.com/xcommerce-gists/3440401
-		$raw_post_data = file_get_contents( 'php://input' );
-		$raw_post_array = explode( '&', $raw_post_data );
+		$raw_post_data = file_get_contents('php://input');
+		$raw_post_array = explode('&', $raw_post_data);
 		$update_info = array();
-		foreach ( $raw_post_array as $keyval ) {
-			$keyval = explode( '=', $keyval );
-			if ( count( $keyval ) == 2 )
-				$update_info[ $keyval[ 0 ] ] = urldecode( $keyval[ 1 ] );
+		foreach ($raw_post_array as $keyval) {
+			$keyval = explode('=', $keyval);
+			if (count($keyval) == 2)
+				$update_info[$keyval[0]] = urldecode($keyval[1]);
 		}
 		// read the IPN message sent from PayPal and prepend 'cmd=_notify-validate'
 		$req = 'cmd=_notify-validate';
-		$get_magic_quotes_exists = function_exists( 'get_magic_quotes_gpc' ) ? true : false;
-		foreach ( $update_info as $key => $value ) {
-			if ( $get_magic_quotes_exists && get_magic_quotes_gpc() == 1 ) {
-				$value = urlencode( stripslashes( $value ) );
+		$get_magic_quotes_exists = function_exists('get_magic_quotes_gpc') ? true : false;
+		foreach ($update_info as $key => $value) {
+			if ($get_magic_quotes_exists && get_magic_quotes_gpc() == 1) {
+				$value = urlencode(stripslashes($value));
 			} else {
-				$value = urlencode( $value );
+				$value = urlencode($value);
 			}
 			$req .= "&$key=$value";
 		}
@@ -371,34 +371,34 @@ 
 			array(
 				'body' 				=> $req,
 				'sslverify' 		=> false,
-				'timeout' 		=> 60 ,
+				'timeout' 		=> 60,
 				// make sure to set a site specific unique "user-agent" string since the WordPres default gets declined by PayPal
 				// plz see: https://github.com/websharks/s2member/issues/610
-				'user-agent' 	=> 'Event Espresso v' . EVENT_ESPRESSO_VERSION . '; ' . home_url(),
+				'user-agent' 	=> 'Event Espresso v'.EVENT_ESPRESSO_VERSION.'; '.home_url(),
 				'httpversion' => '1.1'
 			)
 		);
 		// then check the response
-		if ( ! is_wp_error( $response ) && array_key_exists( 'body', $response ) && strcmp( $response[ 'body' ], "VERIFIED" ) == 0 ) {
+		if ( ! is_wp_error($response) && array_key_exists('body', $response) && strcmp($response['body'], "VERIFIED") == 0) {
 			return true;
 		} else {
 			// huh, something's wack... the IPN didn't validate. We must have replied to the IPN incorrectly,
 			// or their API must have changed: http://www.paypalobjects.com/en_US/ebook/PP_OrderManagement_IntegrationGuide/ipn.html
-			if( is_wp_error(  $response ) ) {
+			if (is_wp_error($response)) {
 				$error_msg = sprintf( 
-					__( 'WP Error. Code: "%1$s", Message: "%2$s", Data: "%3$s"', 'event_espresso' ),
+					__('WP Error. Code: "%1$s", Message: "%2$s", Data: "%3$s"', 'event_espresso'),
 					$response->get_error_code(),
 					$response->get_error_message(),
-					print_r( $response->get_error_data, true )
+					print_r($response->get_error_data, true)
 				);
-			} elseif( is_array( $response ) && isset( $response[ 'body' ] ) ) {
-				$error_msg = $response[ 'body' ];
+			} elseif (is_array($response) && isset($response['body'])) {
+				$error_msg = $response['body'];
 			} else {
-				$error_msg = print_r( $response, true );
+				$error_msg = print_r($response, true);
 			}
-			$payment->set_gateway_response( sprintf( __( "IPN Validation failed! Paypal responded with '%s'", "event_espresso" ), $error_msg ) );
-			$payment->set_details( array( 'REQUEST' => $update_info, 'VALIDATION_RESPONSE' => $response ) );
-			$payment->set_status( EEM_Payment::status_id_failed );
+			$payment->set_gateway_response(sprintf(__("IPN Validation failed! Paypal responded with '%s'", "event_espresso"), $error_msg));
+			$payment->set_details(array('REQUEST' => $update_info, 'VALIDATION_RESPONSE' => $response));
+			$payment->set_status(EEM_Payment::status_id_failed);
 			// log the results
 			$this->log(
 				array(
@@ -420,9 +420,9 @@ 
 	 */
 	protected function _process_response_url() {
 		EE_Registry::instance()->load_helper('URL');
-		if ( isset( $_SERVER[ 'HTTP_HOST' ], $_SERVER[ 'REQUEST_URI' ] ) ) {
+		if (isset($_SERVER['HTTP_HOST'], $_SERVER['REQUEST_URI'])) {
 			$url = is_ssl() ? 'https://' : 'http://';
-			$url .= EEH_URL::filter_input_server_url( 'HTTP_HOST' );
+			$url .= EEH_URL::filter_input_server_url('HTTP_HOST');
 			$url .= EEH_URL::filter_input_server_url();
 		} else {
 			$url = 'unknown';
@@ -438,30 +438,30 @@ 
 	 * like the taxes or shipping
 	 * @param EEI_Payment $payment
 	 */
-	public function update_txn_based_on_payment( $payment ) {
+	public function update_txn_based_on_payment($payment) {
 		$update_info = $payment->details();
 		$transaction = $payment->transaction();
-		$payment_was_itemized = $payment->get_extra_meta( EEG_Paypal_Standard::itemized_payment_option_name, true, false );
-		if( ! $transaction ){
-			$this->log( __( 'Payment with ID %d has no related transaction, and so update_txn_based_on_payment couldn\'t be executed properly', 'event_espresso' ), $payment );
+		$payment_was_itemized = $payment->get_extra_meta(EEG_Paypal_Standard::itemized_payment_option_name, true, false);
+		if ( ! $transaction) {
+			$this->log(__('Payment with ID %d has no related transaction, and so update_txn_based_on_payment couldn\'t be executed properly', 'event_espresso'), $payment);
 			return;
 		}
-		if( ! is_array( $update_info ) || ! isset( $update_info[ 'mc_shipping' ] ) || ! isset( $update_info[ 'tax' ] ) ) {
+		if ( ! is_array($update_info) || ! isset($update_info['mc_shipping']) || ! isset($update_info['tax'])) {
 			$this->log(
 				array(
 					'url' 				=> $this->_process_response_url(),
-					'message' 	=> __( 'Could not update transaction based on payment because the payment details have not yet been put on the payment. This normally happens during the IPN or returning from PayPal', 'event_espresso' ),
+					'message' 	=> __('Could not update transaction based on payment because the payment details have not yet been put on the payment. This normally happens during the IPN or returning from PayPal', 'event_espresso'),
 					'payment' 	=> $payment->model_field_array()
 				),
 				$payment
 			);
 			return;
 		}
-		if( $payment->status() !== $this->_pay_model->approved_status() ) {
+		if ($payment->status() !== $this->_pay_model->approved_status()) {
 			$this->log(
 				array(
 					'url' 				=> $this->_process_response_url(),
-					'message' 	=> __( 'We shouldn\'t update transactions taxes or shipping data from non-approved payments', 'event_espresso' ),
+					'message' 	=> __('We shouldn\'t update transactions taxes or shipping data from non-approved payments', 'event_espresso'),
 					'payment' 	=> $payment->model_field_array()
 				),
 				$payment
@@ -471,43 +471,43 @@ 
 		$grand_total_needs_resaving = false;
 
 		//might paypal have changed the taxes?
-		if( $this->_paypal_taxes && $payment_was_itemized ){
+		if ($this->_paypal_taxes && $payment_was_itemized) {
                     //note that we're doing this BEFORE adding shipping; we actually want PayPal's shipping to remain non-taxable
-                    $this->_line_item->set_line_items_taxable( $transaction->total_line_item(), true, 'paypal_shipping' );
+                    $this->_line_item->set_line_items_taxable($transaction->total_line_item(), true, 'paypal_shipping');
                     $this->_line_item->set_total_tax_to(
                             $transaction->total_line_item(),
-                            floatval( $update_info['tax'] ),
-                            __( 'Taxes', 'event_espresso' ),
-                            __( 'Calculated by Paypal', 'event_espresso' ),
+                            floatval($update_info['tax']),
+                            __('Taxes', 'event_espresso'),
+                            __('Calculated by Paypal', 'event_espresso'),
                             'paypal_tax'
                     );
                     $grand_total_needs_resaving = TRUE;
 		}
 
-		$shipping_amount = floatval( $update_info[ 'mc_shipping' ] );
+		$shipping_amount = floatval($update_info['mc_shipping']);
 		//might paypal have added shipping?
-		if( $this->_paypal_shipping && $shipping_amount && $payment_was_itemized ){
+		if ($this->_paypal_shipping && $shipping_amount && $payment_was_itemized) {
 			$this->_line_item->add_unrelated_item(
 				$transaction->total_line_item(),
-				sprintf( __('Shipping for transaction %1$s', 'event_espresso'), $transaction->ID() ),
+				sprintf(__('Shipping for transaction %1$s', 'event_espresso'), $transaction->ID()),
 				$shipping_amount,
 				__('Shipping charges calculated by Paypal', 'event_espresso'),
 				1,
 				false,
-				'paypal_shipping_' . $transaction->ID()
+				'paypal_shipping_'.$transaction->ID()
 			);
 			$grand_total_needs_resaving = true;
 		}
 
-		if( $grand_total_needs_resaving ){
-			$transaction->total_line_item()->save_this_and_descendants_to_txn( $transaction->ID() );
-			$registration_processor = EE_Registry::instance()->load_class( 'Registration_Processor' );
-			$registration_processor->update_registration_final_prices( $transaction );
+		if ($grand_total_needs_resaving) {
+			$transaction->total_line_item()->save_this_and_descendants_to_txn($transaction->ID());
+			$registration_processor = EE_Registry::instance()->load_class('Registration_Processor');
+			$registration_processor->update_registration_final_prices($transaction);
 		}
 		$this->log(
 			array(
 				'url' 													=> $this->_process_response_url(),
-				'message' 										=> __( 'Updated transaction related to payment', 'event_espresso' ),
+				'message' 										=> __('Updated transaction related to payment', 'event_espresso'),
 				'transaction (updated)' 					=> $transaction->model_field_array(),
 				'payment (updated)' 						=> $payment->model_field_array(),
 				'use_paypal_shipping' 					=> $this->_paypal_shipping,