eventespresso / event-espresso-core

admin_pages/general_settings/General_Settings_Admin_Page.core.php

Doc Comments +6 added lines, -6 removed lines

@@ -545,7 +545,7 @@ 
 	 *
 	 * 		@access 	public
 	 * 		@param 	string 		$CNT_ISO
-	 * 		@return 		mixed		string | array
+	 * 		@return 		string|null		string | array
 	 */
 	public function display_country_settings( $CNT_ISO = '' ) {
 
@@ -708,7 +708,7 @@ 
 	 * 		delete_state
 	 *
 	 * 		@access 	public
-	 * 		@return 		boolean | void
+	 * 		@return 		false|null | void
 	 */
 	public function delete_state() {
 		$CNT_ISO = isset( $this->_req_data['CNT_ISO'] ) ? strtoupper( sanitize_text_field( $this->_req_data['CNT_ISO'] )) : FALSE;
@@ -938,10 +938,10 @@ 
 	/**
 	 * generates a dropdown of all parent pages - copied from WP core
 	 *
-	 * @param unknown_type $default
-	 * @param unknown_type $parent
-	 * @param unknown_type $level
-	 * @return unknown
+	 * @param integer $default
+	 * @param integer $parent
+	 * @param integer $level
+	 * @return null|false
 	 */
 	public static function page_settings_dropdown( $default = 0, $parent = 0, $level = 0 ) {
 		global $wpdb;

Indentation +4 added lines, -4 removed lines

@@ -154,7 +154,7 @@ 
 					'order' => 50
 					),
 				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array( '_publish_post_box' ) ),
-               			'help_tabs' => array(
+			   			'help_tabs' => array(
 					'general_settings_critical_pages_help_tab' => array(
 						'title' => __('Critical Pages', 'event_espresso'),
 						'filename' => 'general_settings_critical_pages'
@@ -168,7 +168,7 @@ 
 					'label' => __('Your Organization', 'event_espresso'),
 					'order' => 20
 				),
-                			'help_tabs' => array(
+							'help_tabs' => array(
 					'general_settings_your_organization_help_tab' => array(
 						'title' => __('Your Organization', 'event_espresso'),
 						'filename' => 'general_settings_your_organization'
@@ -184,7 +184,7 @@ 
 					'order' => 60
 					),
 				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array( '_publish_post_box' ) ),
-                			'help_tabs' => array(
+							'help_tabs' => array(
 					'general_settings_admin_options_help_tab' => array(
 						'title' => __('Admin Options', 'event_espresso'),
 						'filename' => 'general_settings_admin_options'
@@ -198,7 +198,7 @@ 
 					'label' => __('Countries', 'event_espresso'),
 					'order' => 70
 					),
-                'help_tabs' => array(
+				'help_tabs' => array(
 					'general_settings_countries_help_tab' => array(
 						'title' => __('Countries', 'event_espresso'),
 						'filename' => 'general_settings_countries'

Braces +10 added lines, -7 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -419,8 +420,9 @@ 
 	}
 
 	protected function _update_your_organization_settings() {
-		if ( is_main_site() )
-			EE_Registry::instance()->NET_CFG->core->site_license_key = isset( $this->_req_data['site_license_key'] ) ? sanitize_text_field( $this->_req_data['site_license_key'] ) : EE_Registry::instance()->NET_CFG->core->site_license_key;
+		if ( is_main_site() ) {
+					EE_Registry::instance()->NET_CFG->core->site_license_key = isset( $this->_req_data['site_license_key'] ) ? sanitize_text_field( $this->_req_data['site_license_key'] ) : EE_Registry::instance()->NET_CFG->core->site_license_key;
+		}
 		EE_Registry::instance()->CFG->organization->name = isset( $this->_req_data['organization_name'] ) ? sanitize_text_field( $this->_req_data['organization_name'] ) : EE_Registry::instance()->CFG->organization->name;
 		EE_Registry::instance()->CFG->organization->address_1 = isset( $this->_req_data['organization_address_1'] ) ? sanitize_text_field( $this->_req_data['organization_address_1'] ) : EE_Registry::instance()->CFG->organization->address_1;
 		EE_Registry::instance()->CFG->organization->address_2 = isset( $this->_req_data['organization_address_2'] ) ? sanitize_text_field( $this->_req_data['organization_address_2'] ) : EE_Registry::instance()->CFG->organization->address_2;
@@ -950,10 +952,11 @@ 
 		if ( $items ) {
 			foreach ( $items as $item ) {
 				$pad = str_repeat( '&nbsp;', $level * 3 );
-				if ( $item->ID == $default)
-					$current = ' selected="selected"';
-				else
-					$current = '';
+				if ( $item->ID == $default) {
+									$current = ' selected="selected"';
+				} else {
+									$current = '';
+				}
 
 				echo "\n\t<option class='level-$level' value='$item->ID'$current>$pad " . esc_html($item->post_title) . "</option>";
 				parent_dropdown( $default, $item->ID, $level +1 );

Spacing +285 added lines, -286 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -40,8 +40,8 @@ 
 
 
 
-	public function __construct( $routing = TRUE ) {
-		parent::__construct( $routing );
+	public function __construct($routing = TRUE) {
+		parent::__construct($routing);
 	}
 
 
@@ -57,10 +57,10 @@ 
 
 
 	protected function _ajax_hooks() {
-		add_action('wp_ajax_espresso_display_country_settings', array( $this, 'display_country_settings'));
-		add_action('wp_ajax_espresso_display_country_states', array( $this, 'display_country_states'));
-		add_action('wp_ajax_espresso_delete_state', array( $this, 'delete_state'), 10, 3 );
-		add_action('wp_ajax_espresso_add_new_state', array( $this, 'add_new_state'));
+		add_action('wp_ajax_espresso_display_country_settings', array($this, 'display_country_settings'));
+		add_action('wp_ajax_espresso_display_country_states', array($this, 'display_country_states'));
+		add_action('wp_ajax_espresso_delete_state', array($this, 'delete_state'), 10, 3);
+		add_action('wp_ajax_espresso_add_new_state', array($this, 'add_new_state'));
 	}
 
 
@@ -153,14 +153,14 @@ 
 					'label' => __('Critical Pages', 'event_espresso'),
 					'order' => 50
 					),
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array( '_publish_post_box' ) ),
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
                			'help_tabs' => array(
 					'general_settings_critical_pages_help_tab' => array(
 						'title' => __('Critical Pages', 'event_espresso'),
 						'filename' => 'general_settings_critical_pages'
 						)
 					),
-				'help_tour' => array( 'Critical_Pages_Help_Tour' ),
+				'help_tour' => array('Critical_Pages_Help_Tour'),
 				'require_nonce' => FALSE
 				),
 			'default' => array(
@@ -174,8 +174,8 @@ 
 						'filename' => 'general_settings_your_organization'
 						)
 					),
-				'help_tour' => array( 'Your_Organization_Help_Tour' ),
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array( '_publish_post_box' ) ),
+				'help_tour' => array('Your_Organization_Help_Tour'),
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
 				'require_nonce' => FALSE
 				),
 			'admin_option_settings' => array(
@@ -183,14 +183,14 @@ 
 					'label' => __('Admin Options', 'event_espresso'),
 					'order' => 60
 					),
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array( '_publish_post_box' ) ),
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
                 			'help_tabs' => array(
 					'general_settings_admin_options_help_tab' => array(
 						'title' => __('Admin Options', 'event_espresso'),
 						'filename' => 'general_settings_admin_options'
 						)
 					),
-				'help_tour' => array( 'Admin_Options_Help_Tour' ),
+				'help_tour' => array('Admin_Options_Help_Tour'),
 				'require_nonce' => FALSE
 				),
 			'country_settings' => array(
@@ -204,7 +204,7 @@ 
 						'filename' => 'general_settings_countries'
 						)
 					),
-				'help_tour' => array( 'Countries_Help_Tour' ),
+				'help_tour' => array('Countries_Help_Tour'),
 				'require_nonce' => FALSE
 				)
 			);
@@ -222,11 +222,11 @@ 
 	}
 
 	public function admin_init() {
-		EE_Registry::$i18n_js_strings[ 'invalid_server_response' ] = __( 'An error occurred! Your request may have been processed, but a valid response from the server was not received. Please refresh the page and try again.', 'event_espresso' );
-		EE_Registry::$i18n_js_strings[ 'error_occurred' ] = __( 'An error occurred! Please refresh the page and try again.', 'event_espresso' );
-		EE_Registry::$i18n_js_strings[ 'confirm_delete_state' ] = __( 'Are you sure you want to delete this State / Province?', 'event_espresso' );
-		$protocol = isset( $_SERVER[ 'HTTPS' ] ) ? 'https://' : 'http://';
-		EE_Registry::$i18n_js_strings[ 'ajax_url' ] = admin_url( 'admin-ajax.php?page=espresso_general_settings', $protocol );
+		EE_Registry::$i18n_js_strings['invalid_server_response'] = __('An error occurred! Your request may have been processed, but a valid response from the server was not received. Please refresh the page and try again.', 'event_espresso');
+		EE_Registry::$i18n_js_strings['error_occurred'] = __('An error occurred! Please refresh the page and try again.', 'event_espresso');
+		EE_Registry::$i18n_js_strings['confirm_delete_state'] = __('Are you sure you want to delete this State / Province?', 'event_espresso');
+		$protocol = isset($_SERVER['HTTPS']) ? 'https://' : 'http://';
+		EE_Registry::$i18n_js_strings['ajax_url'] = admin_url('admin-ajax.php?page=espresso_general_settings', $protocol);
 	}
 
 	public function admin_notices() {}
@@ -239,21 +239,21 @@ 
 		//scripts
 		wp_enqueue_script('media-upload');
 		wp_enqueue_script('thickbox');
-		wp_register_script( 'organization_settings', GEN_SET_ASSETS_URL . 'your_organization_settings.js', array( 'jquery','media-upload','thickbox' ), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_register_style( 'organization-css', GEN_SET_ASSETS_URL . 'organization.css', array(), EVENT_ESPRESSO_VERSION );
-		wp_enqueue_script( 'organization_settings' );
-		wp_enqueue_style( 'organization-css' );
-		$confirm_image_delete = array( 'text' => __('Do you really want to delete this image? Please remember to save your settings to complete the removal.', 'event_espresso'));
-		wp_localize_script( 'organization_settings', 'confirm_image_delete', $confirm_image_delete );
+		wp_register_script('organization_settings', GEN_SET_ASSETS_URL.'your_organization_settings.js', array('jquery', 'media-upload', 'thickbox'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_register_style('organization-css', GEN_SET_ASSETS_URL.'organization.css', array(), EVENT_ESPRESSO_VERSION);
+		wp_enqueue_script('organization_settings');
+		wp_enqueue_style('organization-css');
+		$confirm_image_delete = array('text' => __('Do you really want to delete this image? Please remember to save your settings to complete the removal.', 'event_espresso'));
+		wp_localize_script('organization_settings', 'confirm_image_delete', $confirm_image_delete);
 
 	}
 
 	public function load_scripts_styles_country_settings() {
 		//scripts
-		wp_register_script( 'gen_settings_countries', GEN_SET_ASSETS_URL . 'gen_settings_countries.js', array( 'ee_admin_js' ), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_register_style( 'organization-css', GEN_SET_ASSETS_URL . 'organization.css', array(), EVENT_ESPRESSO_VERSION );
-		wp_enqueue_script( 'gen_settings_countries' );
-		wp_enqueue_style( 'organization-css' );
+		wp_register_script('gen_settings_countries', GEN_SET_ASSETS_URL.'gen_settings_countries.js', array('ee_admin_js'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_register_style('organization-css', GEN_SET_ASSETS_URL.'organization.css', array(), EVENT_ESPRESSO_VERSION);
+		wp_enqueue_script('gen_settings_countries');
+		wp_enqueue_style('organization-css');
 
 	}
 
@@ -265,37 +265,37 @@ 
 
 		// Check to make sure all of the main pages are setup properly,
 		// if not create the default pages and display an admin notice
-		EE_Registry::instance()->load_helper( 'Activation' );
+		EE_Registry::instance()->load_helper('Activation');
 		EEH_Activation::verify_default_pages_exist();
 
 		$this->_transient_garbage_collection();
 		$this->_template_args['values'] = $this->_yes_no_values;
 
-		$this->_template_args['reg_page_id'] = isset(EE_Registry::instance()->CFG->core->reg_page_id ) ?EE_Registry::instance()->CFG->core->reg_page_id : NULL;
-		$this->_template_args['reg_page_obj'] = isset(EE_Registry::instance()->CFG->core->reg_page_id ) ? get_page(EE_Registry::instance()->CFG->core->reg_page_id ) : FALSE;
+		$this->_template_args['reg_page_id'] = isset(EE_Registry::instance()->CFG->core->reg_page_id) ? EE_Registry::instance()->CFG->core->reg_page_id : NULL;
+		$this->_template_args['reg_page_obj'] = isset(EE_Registry::instance()->CFG->core->reg_page_id) ? get_page(EE_Registry::instance()->CFG->core->reg_page_id) : FALSE;
 
-		$this->_template_args['txn_page_id'] = isset(EE_Registry::instance()->CFG->core->txn_page_id) ?EE_Registry::instance()->CFG->core->txn_page_id : NULL;
-		$this->_template_args['txn_page_obj'] = isset(EE_Registry::instance()->CFG->core->txn_page_id ) ? get_page(EE_Registry::instance()->CFG->core->txn_page_id ) : FALSE;
+		$this->_template_args['txn_page_id'] = isset(EE_Registry::instance()->CFG->core->txn_page_id) ? EE_Registry::instance()->CFG->core->txn_page_id : NULL;
+		$this->_template_args['txn_page_obj'] = isset(EE_Registry::instance()->CFG->core->txn_page_id) ? get_page(EE_Registry::instance()->CFG->core->txn_page_id) : FALSE;
 
-		$this->_template_args['thank_you_page_id'] = isset(EE_Registry::instance()->CFG->core->thank_you_page_id ) ?EE_Registry::instance()->CFG->core->thank_you_page_id : NULL;
-		$this->_template_args['thank_you_page_obj'] = isset(EE_Registry::instance()->CFG->core->thank_you_page_id ) ? get_page(EE_Registry::instance()->CFG->core->thank_you_page_id ) : FALSE;
+		$this->_template_args['thank_you_page_id'] = isset(EE_Registry::instance()->CFG->core->thank_you_page_id) ? EE_Registry::instance()->CFG->core->thank_you_page_id : NULL;
+		$this->_template_args['thank_you_page_obj'] = isset(EE_Registry::instance()->CFG->core->thank_you_page_id) ? get_page(EE_Registry::instance()->CFG->core->thank_you_page_id) : FALSE;
 
-		$this->_template_args['cancel_page_id'] = isset(EE_Registry::instance()->CFG->core->cancel_page_id ) ?EE_Registry::instance()->CFG->core->cancel_page_id : NULL;
-		$this->_template_args['cancel_page_obj'] = isset(EE_Registry::instance()->CFG->core->cancel_page_id ) ? get_page(EE_Registry::instance()->CFG->core->cancel_page_id ) : FALSE;
+		$this->_template_args['cancel_page_id'] = isset(EE_Registry::instance()->CFG->core->cancel_page_id) ? EE_Registry::instance()->CFG->core->cancel_page_id : NULL;
+		$this->_template_args['cancel_page_obj'] = isset(EE_Registry::instance()->CFG->core->cancel_page_id) ? get_page(EE_Registry::instance()->CFG->core->cancel_page_id) : FALSE;
 
-		$this->_set_add_edit_form_tags( 'update_espresso_page_settings' );
-		$this->_set_publish_post_box_vars( NULL, FALSE, FALSE, NULL, FALSE );
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( GEN_SET_TEMPLATE_PATH . 'espresso_page_settings.template.php', $this->_template_args, TRUE );
+		$this->_set_add_edit_form_tags('update_espresso_page_settings');
+		$this->_set_publish_post_box_vars(NULL, FALSE, FALSE, NULL, FALSE);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(GEN_SET_TEMPLATE_PATH.'espresso_page_settings.template.php', $this->_template_args, TRUE);
 		$this->display_admin_page_with_sidebar();
 
 	}
 
 	protected function _update_espresso_page_settings() {
 		// capture incoming request data
-		$reg_page_id = isset( $this->_req_data['reg_page_id'] ) ? absint( $this->_req_data['reg_page_id'] ) : EE_Registry::instance()->CFG->core->reg_page_id;
-		$txn_page_id = isset( $this->_req_data['txn_page_id'] ) ? absint( $this->_req_data['txn_page_id'] ) : EE_Registry::instance()->CFG->core->txn_page_id;
-		$thank_you_page_id = isset( $this->_req_data['thank_you_page_id'] ) ? absint( $this->_req_data['thank_you_page_id'] ) : EE_Registry::instance()->CFG->core->thank_you_page_id;
-		$cancel_page_id = isset( $this->_req_data['cancel_page_id'] ) ? absint( $this->_req_data['cancel_page_id'] ) : EE_Registry::instance()->CFG->core->cancel_page_id;
+		$reg_page_id = isset($this->_req_data['reg_page_id']) ? absint($this->_req_data['reg_page_id']) : EE_Registry::instance()->CFG->core->reg_page_id;
+		$txn_page_id = isset($this->_req_data['txn_page_id']) ? absint($this->_req_data['txn_page_id']) : EE_Registry::instance()->CFG->core->txn_page_id;
+		$thank_you_page_id = isset($this->_req_data['thank_you_page_id']) ? absint($this->_req_data['thank_you_page_id']) : EE_Registry::instance()->CFG->core->thank_you_page_id;
+		$cancel_page_id = isset($this->_req_data['cancel_page_id']) ? absint($this->_req_data['cancel_page_id']) : EE_Registry::instance()->CFG->core->cancel_page_id;
 		// pack critical_pages into an array
 		$critical_pages = array(
 			'reg_page_id' 				=> $reg_page_id,
@@ -303,17 +303,17 @@ 
 			'thank_you_page_id' 	=> $thank_you_page_id,
 			'cancel_page_id' 		=> $cancel_page_id
 		);
-		foreach ( $critical_pages as $critical_page_name => $critical_page_id ) {
+		foreach ($critical_pages as $critical_page_name => $critical_page_id) {
 			// has the page changed ?
-			if ( EE_Registry::instance()->CFG->core->$critical_page_name != $critical_page_id ) {
+			if (EE_Registry::instance()->CFG->core->$critical_page_name != $critical_page_id) {
 				// grab post object for old page
-				$post = get_post( EE_Registry::instance()->CFG->core->$critical_page_name );
+				$post = get_post(EE_Registry::instance()->CFG->core->$critical_page_name);
 				// update post shortcodes for old page
-				EE_Admin::parse_post_content_on_save( $critical_page_id, $post );
+				EE_Admin::parse_post_content_on_save($critical_page_id, $post);
 				// grab post object for new page
-				$post = get_post( $critical_page_id );
+				$post = get_post($critical_page_id);
 				// update post shortcodes for new page
-				EE_Admin::parse_post_content_on_save( $critical_page_id, $post );
+				EE_Admin::parse_post_content_on_save($critical_page_id, $post);
 			}
 		}
 		// set page IDs
@@ -322,14 +322,14 @@ 
 		EE_Registry::instance()->CFG->core->thank_you_page_id = $thank_you_page_id;
 		EE_Registry::instance()->CFG->core->cancel_page_id = $cancel_page_id;
 
-		EE_Registry::instance()->CFG->core = apply_filters( 'FHEE__General_Settings_Admin_Page___update_espresso_page_settings__CFG_core', EE_Registry::instance()->CFG->core, $this->_req_data );
+		EE_Registry::instance()->CFG->core = apply_filters('FHEE__General_Settings_Admin_Page___update_espresso_page_settings__CFG_core', EE_Registry::instance()->CFG->core, $this->_req_data);
 
 		$what = __('Critical Pages & Shortcodes', 'event_espresso');
-		$success = $this->_update_espresso_configuration( $what, EE_Registry::instance()->CFG->core, __FILE__, __FUNCTION__, __LINE__ );
+		$success = $this->_update_espresso_configuration($what, EE_Registry::instance()->CFG->core, __FILE__, __FUNCTION__, __LINE__);
 		$query_args = array(
 			'action' => 'critical_pages'
 			);
-		$this->_redirect_after_action( FALSE, '', '', $query_args, TRUE );
+		$this->_redirect_after_action(FALSE, '', '', $query_args, TRUE);
 
 	}
 
@@ -344,35 +344,35 @@ 
 
 	protected function _your_organization_settings() {
 
-		$this->_template_args['site_license_key'] = isset( EE_Registry::instance()->NET_CFG->core->site_license_key ) ? EE_Registry::instance()->NET_CFG->core->get_pretty( 'site_license_key' ) : '';
-		$this->_template_args['organization_name'] = isset( EE_Registry::instance()->CFG->organization->name ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'name' ) : '';
-		$this->_template_args['organization_address_1'] = isset( EE_Registry::instance()->CFG->organization->address_1 ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'address_1' ) : '';
-		$this->_template_args['organization_address_2'] = isset( EE_Registry::instance()->CFG->organization->address_2 ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'address_2' ) : '';
-		$this->_template_args['organization_city'] = isset( EE_Registry::instance()->CFG->organization->city ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'city' ) : '';
-		$this->_template_args['organization_zip'] = isset( EE_Registry::instance()->CFG->organization->zip ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'zip' ) : '';
-		$this->_template_args['organization_email'] = isset( EE_Registry::instance()->CFG->organization->email ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'email' ) : '';
-		$this->_template_args['organization_phone'] = isset( EE_Registry::instance()->CFG->organization->phone ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'phone' ) : '';
-		$this->_template_args['organization_vat'] = isset( EE_Registry::instance()->CFG->organization->vat ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'vat' ) : '';
-		$this->_template_args['currency_sign'] = isset( EE_Registry::instance()->CFG->currency->sign ) ? EE_Registry::instance()->CFG->currency->get_pretty( 'sign' ) : '$';
-		$this->_template_args['organization_logo_url'] = isset( EE_Registry::instance()->CFG->organization->logo_url ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'logo_url' ) : FALSE;
-		$this->_template_args['organization_facebook'] = isset( EE_Registry::instance()->CFG->organization->facebook ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'facebook' ) : '';
-		$this->_template_args['organization_twitter'] = isset( EE_Registry::instance()->CFG->organization->twitter ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'twitter' ) : '';
-		$this->_template_args['organization_linkedin'] = isset( EE_Registry::instance()->CFG->organization->linkedin ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'linkedin' ) : '';
-		$this->_template_args['organization_pinterest'] = isset( EE_Registry::instance()->CFG->organization->pinterest ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'pinterest' ) : '';
-		$this->_template_args['organization_google'] = isset( EE_Registry::instance()->CFG->organization->google ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'google' ) : '';
-		$this->_template_args['organization_instagram'] = isset( EE_Registry::instance()->CFG->organization->instagram ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'instagram' ) : '';
+		$this->_template_args['site_license_key'] = isset(EE_Registry::instance()->NET_CFG->core->site_license_key) ? EE_Registry::instance()->NET_CFG->core->get_pretty('site_license_key') : '';
+		$this->_template_args['organization_name'] = isset(EE_Registry::instance()->CFG->organization->name) ? EE_Registry::instance()->CFG->organization->get_pretty('name') : '';
+		$this->_template_args['organization_address_1'] = isset(EE_Registry::instance()->CFG->organization->address_1) ? EE_Registry::instance()->CFG->organization->get_pretty('address_1') : '';
+		$this->_template_args['organization_address_2'] = isset(EE_Registry::instance()->CFG->organization->address_2) ? EE_Registry::instance()->CFG->organization->get_pretty('address_2') : '';
+		$this->_template_args['organization_city'] = isset(EE_Registry::instance()->CFG->organization->city) ? EE_Registry::instance()->CFG->organization->get_pretty('city') : '';
+		$this->_template_args['organization_zip'] = isset(EE_Registry::instance()->CFG->organization->zip) ? EE_Registry::instance()->CFG->organization->get_pretty('zip') : '';
+		$this->_template_args['organization_email'] = isset(EE_Registry::instance()->CFG->organization->email) ? EE_Registry::instance()->CFG->organization->get_pretty('email') : '';
+		$this->_template_args['organization_phone'] = isset(EE_Registry::instance()->CFG->organization->phone) ? EE_Registry::instance()->CFG->organization->get_pretty('phone') : '';
+		$this->_template_args['organization_vat'] = isset(EE_Registry::instance()->CFG->organization->vat) ? EE_Registry::instance()->CFG->organization->get_pretty('vat') : '';
+		$this->_template_args['currency_sign'] = isset(EE_Registry::instance()->CFG->currency->sign) ? EE_Registry::instance()->CFG->currency->get_pretty('sign') : '$';
+		$this->_template_args['organization_logo_url'] = isset(EE_Registry::instance()->CFG->organization->logo_url) ? EE_Registry::instance()->CFG->organization->get_pretty('logo_url') : FALSE;
+		$this->_template_args['organization_facebook'] = isset(EE_Registry::instance()->CFG->organization->facebook) ? EE_Registry::instance()->CFG->organization->get_pretty('facebook') : '';
+		$this->_template_args['organization_twitter'] = isset(EE_Registry::instance()->CFG->organization->twitter) ? EE_Registry::instance()->CFG->organization->get_pretty('twitter') : '';
+		$this->_template_args['organization_linkedin'] = isset(EE_Registry::instance()->CFG->organization->linkedin) ? EE_Registry::instance()->CFG->organization->get_pretty('linkedin') : '';
+		$this->_template_args['organization_pinterest'] = isset(EE_Registry::instance()->CFG->organization->pinterest) ? EE_Registry::instance()->CFG->organization->get_pretty('pinterest') : '';
+		$this->_template_args['organization_google'] = isset(EE_Registry::instance()->CFG->organization->google) ? EE_Registry::instance()->CFG->organization->get_pretty('google') : '';
+		$this->_template_args['organization_instagram'] = isset(EE_Registry::instance()->CFG->organization->instagram) ? EE_Registry::instance()->CFG->organization->get_pretty('instagram') : '';
 		//UXIP settings
-		$this->_template_args['ee_ueip_optin'] = isset( EE_Registry::instance()->CFG->core->ee_ueip_optin ) ? EE_Registry::instance()->CFG->core->get_pretty( 'ee_ueip_optin' ) : TRUE;
+		$this->_template_args['ee_ueip_optin'] = isset(EE_Registry::instance()->CFG->core->ee_ueip_optin) ? EE_Registry::instance()->CFG->core->get_pretty('ee_ueip_optin') : TRUE;
 
-		EE_Registry::instance()->load_helper( 'Form_Fields' );
-		$STA_ID = isset( EE_Registry::instance()->CFG->organization->STA_ID ) ? EE_Registry::instance()->CFG->organization->STA_ID : 4;
+		EE_Registry::instance()->load_helper('Form_Fields');
+		$STA_ID = isset(EE_Registry::instance()->CFG->organization->STA_ID) ? EE_Registry::instance()->CFG->organization->STA_ID : 4;
 		$this->_template_args['states'] = new EE_Question_Form_Input(
-				EE_Question::new_instance ( array(
+				EE_Question::new_instance(array(
 					'QST_ID'=> 0,
 					'QST_display_text'=> __('State/Province', 'event_espresso'),
 					'QST_system'=>'admin-state'
 				)),
-				EE_Answer::new_instance ( array(
+				EE_Answer::new_instance(array(
 					'ANS_ID' => 0,
 					'ANS_value' => $STA_ID
 				)),
@@ -384,14 +384,14 @@ 
 				)
 			);
 
-		$CNT_ISO = isset( EE_Registry::instance()->CFG->organization->CNT_ISO ) ? EE_Registry::instance()->CFG->organization->CNT_ISO : 'US';
+		$CNT_ISO = isset(EE_Registry::instance()->CFG->organization->CNT_ISO) ? EE_Registry::instance()->CFG->organization->CNT_ISO : 'US';
 		$this->_template_args['countries'] = new EE_Question_Form_Input(
-				EE_Question::new_instance ( array(
+				EE_Question::new_instance(array(
 					'QST_ID'=> 0,
 					'QST_display_text'=> __('Country', 'event_espresso'),
 					'QST_system'=>'admin-country'
 				)),
-				EE_Answer::new_instance ( array(
+				EE_Answer::new_instance(array(
 					'ANS_ID' => 0,
 					'ANS_value' => $CNT_ISO
 				)),
@@ -403,51 +403,51 @@ 
 				)
 			);
 
-		add_filter( 'FHEE__EEH_Form_Fields__label_html', array( $this, 'country_form_field_label_wrap' ), 10, 2 );
-		add_filter( 'FHEE__EEH_Form_Fields__input_html', array( $this, 'country_form_field_input__wrap' ), 10, 2 );
+		add_filter('FHEE__EEH_Form_Fields__label_html', array($this, 'country_form_field_label_wrap'), 10, 2);
+		add_filter('FHEE__EEH_Form_Fields__input_html', array($this, 'country_form_field_input__wrap'), 10, 2);
 
 		//PUE verification stuff
-		$ver_option_key = 'puvererr_' . basename( EE_PLUGIN_BASENAME );
-		$verify_fail = get_option( $ver_option_key );
-		$this->_template_args['site_license_key_verified'] = $verify_fail || !empty( $verify_fail ) || ( empty( $this->_template_args['site_license_key'] ) && empty( $verify_fail ) )? '<span class="dashicons dashicons-admin-network ee-icon-color-ee-red ee-icon-size-20"></span>' : '<span class="dashicons dashicons-admin-network ee-icon-color-ee-green ee-icon-size-20"></span>';
+		$ver_option_key = 'puvererr_'.basename(EE_PLUGIN_BASENAME);
+		$verify_fail = get_option($ver_option_key);
+		$this->_template_args['site_license_key_verified'] = $verify_fail || ! empty($verify_fail) || (empty($this->_template_args['site_license_key']) && empty($verify_fail)) ? '<span class="dashicons dashicons-admin-network ee-icon-color-ee-red ee-icon-size-20"></span>' : '<span class="dashicons dashicons-admin-network ee-icon-color-ee-green ee-icon-size-20"></span>';
 
-		$this->_set_add_edit_form_tags( 'update_your_organization_settings' );
-		$this->_set_publish_post_box_vars( NULL, FALSE, FALSE, NULL, FALSE );
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( GEN_SET_TEMPLATE_PATH . 'your_organization_settings.template.php', $this->_template_args, TRUE );
+		$this->_set_add_edit_form_tags('update_your_organization_settings');
+		$this->_set_publish_post_box_vars(NULL, FALSE, FALSE, NULL, FALSE);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(GEN_SET_TEMPLATE_PATH.'your_organization_settings.template.php', $this->_template_args, TRUE);
 
 		$this->display_admin_page_with_sidebar();
 	}
 
 	protected function _update_your_organization_settings() {
-		if ( is_main_site() )
-			EE_Registry::instance()->NET_CFG->core->site_license_key = isset( $this->_req_data['site_license_key'] ) ? sanitize_text_field( $this->_req_data['site_license_key'] ) : EE_Registry::instance()->NET_CFG->core->site_license_key;
-		EE_Registry::instance()->CFG->organization->name = isset( $this->_req_data['organization_name'] ) ? sanitize_text_field( $this->_req_data['organization_name'] ) : EE_Registry::instance()->CFG->organization->name;
-		EE_Registry::instance()->CFG->organization->address_1 = isset( $this->_req_data['organization_address_1'] ) ? sanitize_text_field( $this->_req_data['organization_address_1'] ) : EE_Registry::instance()->CFG->organization->address_1;
-		EE_Registry::instance()->CFG->organization->address_2 = isset( $this->_req_data['organization_address_2'] ) ? sanitize_text_field( $this->_req_data['organization_address_2'] ) : EE_Registry::instance()->CFG->organization->address_2;
-		EE_Registry::instance()->CFG->organization->city = isset( $this->_req_data['organization_city'] ) ? sanitize_text_field( $this->_req_data['organization_city'] ) : EE_Registry::instance()->CFG->organization->city;
-		EE_Registry::instance()->CFG->organization->STA_ID = isset( $this->_req_data['organization_state'] ) ? absint( $this->_req_data['organization_state'] ) : EE_Registry::instance()->CFG->organization->STA_ID;
-		EE_Registry::instance()->CFG->organization->CNT_ISO = isset( $this->_req_data['organization_country'] ) ? sanitize_text_field( $this->_req_data['organization_country'] ) : EE_Registry::instance()->CFG->organization->CNT_ISO;
-		EE_Registry::instance()->CFG->organization->zip = isset( $this->_req_data['organization_zip'] ) ? sanitize_text_field( $this->_req_data['organization_zip'] ) : EE_Registry::instance()->CFG->organization->zip;
-		EE_Registry::instance()->CFG->organization->email = isset( $this->_req_data['organization_email'] ) ? sanitize_email( $this->_req_data['organization_email'] ) : EE_Registry::instance()->CFG->organization->email;
-		EE_Registry::instance()->CFG->organization->vat = isset( $this->_req_data['organization_vat'] ) ? sanitize_text_field( $this->_req_data['organization_vat'] ) : EE_Registry::instance()->CFG->organization->vat;
-		EE_Registry::instance()->CFG->organization->phone = isset( $this->_req_data['organization_phone'] ) ? sanitize_text_field( $this->_req_data['organization_phone'] ) : EE_Registry::instance()->CFG->organization->phone;
-		EE_Registry::instance()->CFG->organization->logo_url = isset( $this->_req_data['organization_logo_url'] ) ? esc_url_raw( $this->_req_data['organization_logo_url'] ) : EE_Registry::instance()->CFG->organization->logo_url;
-		EE_Registry::instance()->CFG->organization->facebook = isset( $this->_req_data['organization_facebook'] ) ? esc_url_raw( $this->_req_data['organization_facebook'] ) : EE_Registry::instance()->CFG->organization->facebook;
-		EE_Registry::instance()->CFG->organization->twitter = isset( $this->_req_data['organization_twitter'] ) ? esc_url_raw( $this->_req_data['organization_twitter'] ) : EE_Registry::instance()->CFG->organization->twitter;
-		EE_Registry::instance()->CFG->organization->linkedin = isset( $this->_req_data['organization_linkedin'] ) ? esc_url_raw( $this->_req_data['organization_linkedin'] ) : EE_Registry::instance()->CFG->organization->linkedin;
-		EE_Registry::instance()->CFG->organization->pinterest = isset( $this->_req_data['organization_pinterest'] ) ? esc_url_raw( $this->_req_data['organization_pinterest'] ) : EE_Registry::instance()->CFG->organization->pinterest;
-		EE_Registry::instance()->CFG->organization->google = isset( $this->_req_data['organization_google'] ) ? esc_url_raw( $this->_req_data['organization_google'] ) : EE_Registry::instance()->CFG->organization->google;
-		EE_Registry::instance()->CFG->organization->instagram = isset( $this->_req_data['organization_instagram'] ) ? esc_url_raw( $this->_req_data['organization_instagram'] ) : EE_Registry::instance()->CFG->organization->instagram;
-		EE_Registry::instance()->CFG->core->ee_ueip_optin = isset( $this->_req_data['ueip_optin'] ) && !empty( $this->_req_data['ueip_optin'] ) ? $this->_req_data['ueip_optin'] : EE_Registry::instance()->CFG->core->ee_ueip_optin;
-
-		EE_Registry::instance()->CFG->currency = new EE_Currency_Config( EE_Registry::instance()->CFG->organization->CNT_ISO );
-
-		EE_Registry::instance()->CFG = apply_filters( 'FHEE__General_Settings_Admin_Page___update_your_organization_settings__CFG', EE_Registry::instance()->CFG );
+		if (is_main_site())
+			EE_Registry::instance()->NET_CFG->core->site_license_key = isset($this->_req_data['site_license_key']) ? sanitize_text_field($this->_req_data['site_license_key']) : EE_Registry::instance()->NET_CFG->core->site_license_key;
+		EE_Registry::instance()->CFG->organization->name = isset($this->_req_data['organization_name']) ? sanitize_text_field($this->_req_data['organization_name']) : EE_Registry::instance()->CFG->organization->name;
+		EE_Registry::instance()->CFG->organization->address_1 = isset($this->_req_data['organization_address_1']) ? sanitize_text_field($this->_req_data['organization_address_1']) : EE_Registry::instance()->CFG->organization->address_1;
+		EE_Registry::instance()->CFG->organization->address_2 = isset($this->_req_data['organization_address_2']) ? sanitize_text_field($this->_req_data['organization_address_2']) : EE_Registry::instance()->CFG->organization->address_2;
+		EE_Registry::instance()->CFG->organization->city = isset($this->_req_data['organization_city']) ? sanitize_text_field($this->_req_data['organization_city']) : EE_Registry::instance()->CFG->organization->city;
+		EE_Registry::instance()->CFG->organization->STA_ID = isset($this->_req_data['organization_state']) ? absint($this->_req_data['organization_state']) : EE_Registry::instance()->CFG->organization->STA_ID;
+		EE_Registry::instance()->CFG->organization->CNT_ISO = isset($this->_req_data['organization_country']) ? sanitize_text_field($this->_req_data['organization_country']) : EE_Registry::instance()->CFG->organization->CNT_ISO;
+		EE_Registry::instance()->CFG->organization->zip = isset($this->_req_data['organization_zip']) ? sanitize_text_field($this->_req_data['organization_zip']) : EE_Registry::instance()->CFG->organization->zip;
+		EE_Registry::instance()->CFG->organization->email = isset($this->_req_data['organization_email']) ? sanitize_email($this->_req_data['organization_email']) : EE_Registry::instance()->CFG->organization->email;
+		EE_Registry::instance()->CFG->organization->vat = isset($this->_req_data['organization_vat']) ? sanitize_text_field($this->_req_data['organization_vat']) : EE_Registry::instance()->CFG->organization->vat;
+		EE_Registry::instance()->CFG->organization->phone = isset($this->_req_data['organization_phone']) ? sanitize_text_field($this->_req_data['organization_phone']) : EE_Registry::instance()->CFG->organization->phone;
+		EE_Registry::instance()->CFG->organization->logo_url = isset($this->_req_data['organization_logo_url']) ? esc_url_raw($this->_req_data['organization_logo_url']) : EE_Registry::instance()->CFG->organization->logo_url;
+		EE_Registry::instance()->CFG->organization->facebook = isset($this->_req_data['organization_facebook']) ? esc_url_raw($this->_req_data['organization_facebook']) : EE_Registry::instance()->CFG->organization->facebook;
+		EE_Registry::instance()->CFG->organization->twitter = isset($this->_req_data['organization_twitter']) ? esc_url_raw($this->_req_data['organization_twitter']) : EE_Registry::instance()->CFG->organization->twitter;
+		EE_Registry::instance()->CFG->organization->linkedin = isset($this->_req_data['organization_linkedin']) ? esc_url_raw($this->_req_data['organization_linkedin']) : EE_Registry::instance()->CFG->organization->linkedin;
+		EE_Registry::instance()->CFG->organization->pinterest = isset($this->_req_data['organization_pinterest']) ? esc_url_raw($this->_req_data['organization_pinterest']) : EE_Registry::instance()->CFG->organization->pinterest;
+		EE_Registry::instance()->CFG->organization->google = isset($this->_req_data['organization_google']) ? esc_url_raw($this->_req_data['organization_google']) : EE_Registry::instance()->CFG->organization->google;
+		EE_Registry::instance()->CFG->organization->instagram = isset($this->_req_data['organization_instagram']) ? esc_url_raw($this->_req_data['organization_instagram']) : EE_Registry::instance()->CFG->organization->instagram;
+		EE_Registry::instance()->CFG->core->ee_ueip_optin = isset($this->_req_data['ueip_optin']) && ! empty($this->_req_data['ueip_optin']) ? $this->_req_data['ueip_optin'] : EE_Registry::instance()->CFG->core->ee_ueip_optin;
+
+		EE_Registry::instance()->CFG->currency = new EE_Currency_Config(EE_Registry::instance()->CFG->organization->CNT_ISO);
+
+		EE_Registry::instance()->CFG = apply_filters('FHEE__General_Settings_Admin_Page___update_your_organization_settings__CFG', EE_Registry::instance()->CFG);
 
 		$what = 'Your Organization Settings';
-		$success = $this->_update_espresso_configuration( $what, EE_Registry::instance()->CFG, __FILE__, __FUNCTION__, __LINE__ );
+		$success = $this->_update_espresso_configuration($what, EE_Registry::instance()->CFG, __FILE__, __FUNCTION__, __LINE__);
 
-		$this->_redirect_after_action( $success, $what, 'updated', array( 'action' => 'default' ) );
+		$this->_redirect_after_action($success, $what, 'updated', array('action' => 'default'));
 
 	}
 
@@ -458,36 +458,36 @@ 
 	protected function _admin_option_settings() {
 
 		$this->_template_args['values'] = $this->_yes_no_values;
-		$this->_template_args['use_personnel_manager'] = isset( EE_Registry::instance()->CFG->admin->use_personnel_manager ) ? absint( EE_Registry::instance()->CFG->admin->use_personnel_manager ) : FALSE;
-		$this->_template_args['use_dashboard_widget'] = isset( EE_Registry::instance()->CFG->admin->use_dashboard_widget ) ? absint( EE_Registry::instance()->CFG->admin->use_dashboard_widget ) : TRUE;
-		$this->_template_args['events_in_dashboard'] = isset( EE_Registry::instance()->CFG->admin->events_in_dashboard ) ? absint( EE_Registry::instance()->CFG->admin->events_in_dashboard ) : 30;
-		$this->_template_args['use_event_timezones'] = isset( EE_Registry::instance()->CFG->admin->use_event_timezones ) ? absint( EE_Registry::instance()->CFG->admin->use_event_timezones ) : FALSE;
-		$this->_template_args['show_reg_footer'] = isset( EE_Registry::instance()->CFG->admin->show_reg_footer ) ? absint( EE_Registry::instance()->CFG->admin->show_reg_footer ) : TRUE;
-		$this->_template_args['affiliate_id'] = isset( EE_Registry::instance()->CFG->admin->affiliate_id ) ? EE_Registry::instance()->CFG->admin->get_pretty('affiliate_id') : '';
-		$this->_template_args['help_tour_activation'] = isset( EE_Registry::instance()->CFG->admin->help_tour_activation ) ? absint( EE_Registry::instance()->CFG->admin->help_tour_activation ): 1;
-
-		$this->_set_add_edit_form_tags( 'update_admin_option_settings' );
-		$this->_set_publish_post_box_vars( NULL, FALSE, FALSE, NULL, FALSE );
+		$this->_template_args['use_personnel_manager'] = isset(EE_Registry::instance()->CFG->admin->use_personnel_manager) ? absint(EE_Registry::instance()->CFG->admin->use_personnel_manager) : FALSE;
+		$this->_template_args['use_dashboard_widget'] = isset(EE_Registry::instance()->CFG->admin->use_dashboard_widget) ? absint(EE_Registry::instance()->CFG->admin->use_dashboard_widget) : TRUE;
+		$this->_template_args['events_in_dashboard'] = isset(EE_Registry::instance()->CFG->admin->events_in_dashboard) ? absint(EE_Registry::instance()->CFG->admin->events_in_dashboard) : 30;
+		$this->_template_args['use_event_timezones'] = isset(EE_Registry::instance()->CFG->admin->use_event_timezones) ? absint(EE_Registry::instance()->CFG->admin->use_event_timezones) : FALSE;
+		$this->_template_args['show_reg_footer'] = isset(EE_Registry::instance()->CFG->admin->show_reg_footer) ? absint(EE_Registry::instance()->CFG->admin->show_reg_footer) : TRUE;
+		$this->_template_args['affiliate_id'] = isset(EE_Registry::instance()->CFG->admin->affiliate_id) ? EE_Registry::instance()->CFG->admin->get_pretty('affiliate_id') : '';
+		$this->_template_args['help_tour_activation'] = isset(EE_Registry::instance()->CFG->admin->help_tour_activation) ? absint(EE_Registry::instance()->CFG->admin->help_tour_activation) : 1;
+
+		$this->_set_add_edit_form_tags('update_admin_option_settings');
+		$this->_set_publish_post_box_vars(NULL, FALSE, FALSE, NULL, FALSE);
 		$this->_template_args['template_args'] = $this->_template_args;
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( GEN_SET_TEMPLATE_PATH . 'admin_option_settings.template.php', $this->_template_args, TRUE );
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(GEN_SET_TEMPLATE_PATH.'admin_option_settings.template.php', $this->_template_args, TRUE);
 		$this->display_admin_page_with_sidebar();
 	}
 
 	protected function _update_admin_option_settings() {
-		EE_Registry::instance()->CFG->admin->use_personnel_manager = isset( $this->_req_data['use_personnel_manager'] ) ? absint( $this->_req_data['use_personnel_manager'] ) : EE_Registry::instance()->CFG->admin->use_personnel_manager;
-		EE_Registry::instance()->CFG->admin->use_dashboard_widget = isset( $this->_req_data['use_dashboard_widget'] ) ? absint( $this->_req_data['use_dashboard_widget'] ) : EE_Registry::instance()->CFG->admin->use_dashboard_widget;
-		EE_Registry::instance()->CFG->admin->events_in_dashboard = isset( $this->_req_data['events_in_dashboard'] ) ? absint( $this->_req_data['events_in_dashboard'] ) : EE_Registry::instance()->CFG->admin->events_in_dashboard;
-		EE_Registry::instance()->CFG->admin->use_event_timezones = isset( $this->_req_data['use_event_timezones'] ) ? absint( $this->_req_data['use_event_timezones'] ) : EE_Registry::instance()->CFG->admin->use_event_timezones;
-		EE_Registry::instance()->CFG->admin->show_reg_footer = isset( $this->_req_data['show_reg_footer'] ) ? absint( $this->_req_data['show_reg_footer'] ) : EE_Registry::instance()->CFG->admin->show_reg_footer;
-		EE_Registry::instance()->CFG->admin->affiliate_id = isset( $this->_req_data['affiliate_id'] ) ? sanitize_text_field( $this->_req_data['affiliate_id'] ) : EE_Registry::instance()->CFG->admin->affiliate_id;
-		EE_Registry::instance()->CFG->admin->help_tour_activation = isset( $this->_req_data['help_tour_activation'] ) ? absint( $this->_req_data['help_tour_activation'] ) : EE_Registry::instance()->CFG->admin->help_tour_activation;
+		EE_Registry::instance()->CFG->admin->use_personnel_manager = isset($this->_req_data['use_personnel_manager']) ? absint($this->_req_data['use_personnel_manager']) : EE_Registry::instance()->CFG->admin->use_personnel_manager;
+		EE_Registry::instance()->CFG->admin->use_dashboard_widget = isset($this->_req_data['use_dashboard_widget']) ? absint($this->_req_data['use_dashboard_widget']) : EE_Registry::instance()->CFG->admin->use_dashboard_widget;
+		EE_Registry::instance()->CFG->admin->events_in_dashboard = isset($this->_req_data['events_in_dashboard']) ? absint($this->_req_data['events_in_dashboard']) : EE_Registry::instance()->CFG->admin->events_in_dashboard;
+		EE_Registry::instance()->CFG->admin->use_event_timezones = isset($this->_req_data['use_event_timezones']) ? absint($this->_req_data['use_event_timezones']) : EE_Registry::instance()->CFG->admin->use_event_timezones;
+		EE_Registry::instance()->CFG->admin->show_reg_footer = isset($this->_req_data['show_reg_footer']) ? absint($this->_req_data['show_reg_footer']) : EE_Registry::instance()->CFG->admin->show_reg_footer;
+		EE_Registry::instance()->CFG->admin->affiliate_id = isset($this->_req_data['affiliate_id']) ? sanitize_text_field($this->_req_data['affiliate_id']) : EE_Registry::instance()->CFG->admin->affiliate_id;
+		EE_Registry::instance()->CFG->admin->help_tour_activation = isset($this->_req_data['help_tour_activation']) ? absint($this->_req_data['help_tour_activation']) : EE_Registry::instance()->CFG->admin->help_tour_activation;
 
-		EE_Registry::instance()->CFG->admin = apply_filters( 'FHEE__General_Settings_Admin_Page___update_admin_option_settings__CFG_admin', EE_Registry::instance()->CFG->admin );
+		EE_Registry::instance()->CFG->admin = apply_filters('FHEE__General_Settings_Admin_Page___update_admin_option_settings__CFG_admin', EE_Registry::instance()->CFG->admin);
 
 		$what = 'Admin Options';
-		$success = $this->_update_espresso_configuration( $what, EE_Registry::instance()->CFG->admin, __FILE__, __FUNCTION__, __LINE__ );
-		$success = apply_filters( 'FHEE__General_Settings_Admin_Page___update_admin_option_settings__success', $success );
-		$this->_redirect_after_action( $success, $what, 'updated', array( 'action' => 'admin_option_settings' ) );
+		$success = $this->_update_espresso_configuration($what, EE_Registry::instance()->CFG->admin, __FILE__, __FUNCTION__, __LINE__);
+		$success = apply_filters('FHEE__General_Settings_Admin_Page___update_admin_option_settings__success', $success);
+		$this->_redirect_after_action($success, $what, 'updated', array('action' => 'admin_option_settings'));
 
 	}
 
@@ -500,21 +500,21 @@ 
 
 	protected function _country_settings() {
 
-		$CNT_ISO = isset( EE_Registry::instance()->CFG->organization->CNT_ISO ) ? EE_Registry::instance()->CFG->organization->CNT_ISO : 'US';
-		$CNT_ISO = isset( $this->_req_data['country'] ) ? strtoupper( sanitize_text_field( $this->_req_data['country'] )) : $CNT_ISO;
+		$CNT_ISO = isset(EE_Registry::instance()->CFG->organization->CNT_ISO) ? EE_Registry::instance()->CFG->organization->CNT_ISO : 'US';
+		$CNT_ISO = isset($this->_req_data['country']) ? strtoupper(sanitize_text_field($this->_req_data['country'])) : $CNT_ISO;
 
 		//load field generator helper
-		EE_Registry::instance()->load_helper( 'Form_Fields' );
+		EE_Registry::instance()->load_helper('Form_Fields');
 
 		$this->_template_args['values'] = $this->_yes_no_values;
 
 		$this->_template_args['countries'] = new EE_Question_Form_Input(
-				EE_Question::new_instance ( array(
+				EE_Question::new_instance(array(
 					'QST_ID'=> 0,
 					'QST_display_text'=> __('Select Country', 'event_espresso'),
 					'QST_system'=>'admin-country'
 				)),
-				EE_Answer::new_instance ( array(
+				EE_Answer::new_instance(array(
 					'ANS_ID' => 0,
 					'ANS_value' => $CNT_ISO
 				)),
@@ -527,14 +527,14 @@ 
 			);
 //		EEH_Debug_Tools::printr( $this->_template_args['countries'], 'countries  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 
-		add_filter( 'FHEE__EEH_Form_Fields__label_html', array( $this, 'country_form_field_label_wrap' ), 10, 2 );
-		add_filter( 'FHEE__EEH_Form_Fields__input_html', array( $this, 'country_form_field_input__wrap' ), 10, 2 );
+		add_filter('FHEE__EEH_Form_Fields__label_html', array($this, 'country_form_field_label_wrap'), 10, 2);
+		add_filter('FHEE__EEH_Form_Fields__input_html', array($this, 'country_form_field_input__wrap'), 10, 2);
 		$this->_template_args['country_details_settings'] = $this->display_country_settings();
 		$this->_template_args['country_states_settings'] = $this->display_country_states();
 
-		$this->_set_add_edit_form_tags( 'update_country_settings' );
-		$this->_set_publish_post_box_vars( NULL, FALSE, FALSE, NULL, FALSE );
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( GEN_SET_TEMPLATE_PATH . 'countries_settings.template.php', $this->_template_args, TRUE );
+		$this->_set_add_edit_form_tags('update_country_settings');
+		$this->_set_publish_post_box_vars(NULL, FALSE, FALSE, NULL, FALSE);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(GEN_SET_TEMPLATE_PATH.'countries_settings.template.php', $this->_template_args, TRUE);
 		$this->display_admin_page_with_no_sidebar();
 	}
 
@@ -547,44 +547,44 @@ 
 	 * 		@param 	string 		$CNT_ISO
 	 * 		@return 		mixed		string | array
 	 */
-	public function display_country_settings( $CNT_ISO = '' ) {
+	public function display_country_settings($CNT_ISO = '') {
 
-		$CNT_ISO = isset( $this->_req_data['country'] ) ? strtoupper( sanitize_text_field( $this->_req_data['country'] )) : $CNT_ISO;
-		if ( ! $CNT_ISO ) {
+		$CNT_ISO = isset($this->_req_data['country']) ? strtoupper(sanitize_text_field($this->_req_data['country'])) : $CNT_ISO;
+		if ( ! $CNT_ISO) {
 			return '';
 		}
 
 		// for ajax
-		EE_Registry::instance()->load_helper( 'Form_Fields' );
-		remove_all_filters( 'FHEE__EEH_Form_Fields__label_html' );
-		remove_all_filters( 'FHEE__EEH_Form_Fields__input_html' );
-		add_filter( 'FHEE__EEH_Form_Fields__label_html', array( $this, 'country_form_field_label_wrap' ), 10, 2 );
-		add_filter( 'FHEE__EEH_Form_Fields__input_html', array( $this, 'country_form_field_input__wrap' ), 10, 2 );
-		$country = EEM_Country::instance()->get_one_by_ID( $CNT_ISO );
+		EE_Registry::instance()->load_helper('Form_Fields');
+		remove_all_filters('FHEE__EEH_Form_Fields__label_html');
+		remove_all_filters('FHEE__EEH_Form_Fields__input_html');
+		add_filter('FHEE__EEH_Form_Fields__label_html', array($this, 'country_form_field_label_wrap'), 10, 2);
+		add_filter('FHEE__EEH_Form_Fields__input_html', array($this, 'country_form_field_input__wrap'), 10, 2);
+		$country = EEM_Country::instance()->get_one_by_ID($CNT_ISO);
 		//EEH_Debug_Tools::printr( $country, '$country  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 		$country_input_types = array(
-			'CNT_active' => array( 'type' => 'RADIO_BTN', 'input_name' => 'cntry[' . $CNT_ISO . ']', 'class' => '', 'options' => $this->_yes_no_values, 'use_desc_4_label' => TRUE  ),
-			'CNT_ISO' => array( 'type' => 'TEXT', 'input_name' => 'cntry[' . $CNT_ISO . ']', 'class' => 'small-text' ),
-			'CNT_ISO3' => array( 'type' => 'TEXT', 'input_name' => 'cntry[' . $CNT_ISO . ']', 'class' => 'small-text' ),
-			'RGN_ID' => array( 'type' => 'TEXT', 'input_name' => 'cntry[' . $CNT_ISO . ']', 'class' => 'small-text' ),
-			'CNT_name' => array( 'type' => 'TEXT', 'input_name' => 'cntry[' . $CNT_ISO . ']', 'class' => 'regular-text' ),
-			'CNT_cur_code' => array( 'type' => 'TEXT', 'input_name' => 'cntry[' . $CNT_ISO . ']', 'class' => 'small-text' ),
-			'CNT_cur_single' => array( 'type' => 'TEXT', 'input_name' => 'cntry[' . $CNT_ISO . ']', 'class' => 'medium-text' ),
-			'CNT_cur_plural' => array( 'type' => 'TEXT', 'input_name' => 'cntry[' . $CNT_ISO . ']', 'class' => 'medium-text' ),
-			'CNT_cur_sign' => array( 'type' => 'TEXT', 'input_name' => 'cntry[' . $CNT_ISO . ']', 'class' => 'small-text', 'htmlentities' => FALSE ),
-			'CNT_cur_sign_b4' => array( 'type' => 'RADIO_BTN', 'input_name' => 'cntry[' . $CNT_ISO . ']', 'class' => '', 'options' => $this->_yes_no_values, 'use_desc_4_label' => TRUE ),
-			'CNT_cur_dec_plc' => array( 'type' => 'RADIO_BTN', 'input_name' => 'cntry[' . $CNT_ISO . ']', 'class' => '', 'options' => array( array( 'id' => 0, 'text' => '' ), array( 'id' => 1, 'text' => '' ), array( 'id' => 2, 'text' => '' ), array( 'id' => 3, 'text' => '' ))),
-			'CNT_cur_dec_mrk' => array( 'type' => 'RADIO_BTN', 'input_name' => 'cntry[' . $CNT_ISO . ']', 'class' => '', 'options' => array( array( 'id' => ',', 'text' => __(', (comma)', 'event_espresso')), array( 'id' => '.', 'text' => __('. (decimal)', 'event_espresso'))), 'use_desc_4_label' => TRUE ),
-			'CNT_cur_thsnds' => array( 'type' => 'RADIO_BTN', 'input_name' => 'cntry[' . $CNT_ISO . ']', 'class' => '', 'options' => array( array( 'id' => ',', 'text' => __(', (comma)', 'event_espresso')), array( 'id' => '.', 'text' => __('. (decimal)', 'event_espresso'))), 'use_desc_4_label' => TRUE ),
-			'CNT_tel_code' => array( 'type' => 'TEXT', 'input_name' => 'cntry[' . $CNT_ISO . ']', 'class' => 'small-text' ),
-			'CNT_is_EU' => array( 'type' => 'RADIO_BTN', 'input_name' => 'cntry[' . $CNT_ISO . ']', 'class' => '', 'options' => $this->_yes_no_values, 'use_desc_4_label' => TRUE  )
+			'CNT_active' => array('type' => 'RADIO_BTN', 'input_name' => 'cntry['.$CNT_ISO.']', 'class' => '', 'options' => $this->_yes_no_values, 'use_desc_4_label' => TRUE),
+			'CNT_ISO' => array('type' => 'TEXT', 'input_name' => 'cntry['.$CNT_ISO.']', 'class' => 'small-text'),
+			'CNT_ISO3' => array('type' => 'TEXT', 'input_name' => 'cntry['.$CNT_ISO.']', 'class' => 'small-text'),
+			'RGN_ID' => array('type' => 'TEXT', 'input_name' => 'cntry['.$CNT_ISO.']', 'class' => 'small-text'),
+			'CNT_name' => array('type' => 'TEXT', 'input_name' => 'cntry['.$CNT_ISO.']', 'class' => 'regular-text'),
+			'CNT_cur_code' => array('type' => 'TEXT', 'input_name' => 'cntry['.$CNT_ISO.']', 'class' => 'small-text'),
+			'CNT_cur_single' => array('type' => 'TEXT', 'input_name' => 'cntry['.$CNT_ISO.']', 'class' => 'medium-text'),
+			'CNT_cur_plural' => array('type' => 'TEXT', 'input_name' => 'cntry['.$CNT_ISO.']', 'class' => 'medium-text'),
+			'CNT_cur_sign' => array('type' => 'TEXT', 'input_name' => 'cntry['.$CNT_ISO.']', 'class' => 'small-text', 'htmlentities' => FALSE),
+			'CNT_cur_sign_b4' => array('type' => 'RADIO_BTN', 'input_name' => 'cntry['.$CNT_ISO.']', 'class' => '', 'options' => $this->_yes_no_values, 'use_desc_4_label' => TRUE),
+			'CNT_cur_dec_plc' => array('type' => 'RADIO_BTN', 'input_name' => 'cntry['.$CNT_ISO.']', 'class' => '', 'options' => array(array('id' => 0, 'text' => ''), array('id' => 1, 'text' => ''), array('id' => 2, 'text' => ''), array('id' => 3, 'text' => ''))),
+			'CNT_cur_dec_mrk' => array('type' => 'RADIO_BTN', 'input_name' => 'cntry['.$CNT_ISO.']', 'class' => '', 'options' => array(array('id' => ',', 'text' => __(', (comma)', 'event_espresso')), array('id' => '.', 'text' => __('. (decimal)', 'event_espresso'))), 'use_desc_4_label' => TRUE),
+			'CNT_cur_thsnds' => array('type' => 'RADIO_BTN', 'input_name' => 'cntry['.$CNT_ISO.']', 'class' => '', 'options' => array(array('id' => ',', 'text' => __(', (comma)', 'event_espresso')), array('id' => '.', 'text' => __('. (decimal)', 'event_espresso'))), 'use_desc_4_label' => TRUE),
+			'CNT_tel_code' => array('type' => 'TEXT', 'input_name' => 'cntry['.$CNT_ISO.']', 'class' => 'small-text'),
+			'CNT_is_EU' => array('type' => 'RADIO_BTN', 'input_name' => 'cntry['.$CNT_ISO.']', 'class' => '', 'options' => $this->_yes_no_values, 'use_desc_4_label' => TRUE)
 		);
-		$this->_template_args['inputs'] = EE_Question_Form_Input::generate_question_form_inputs_for_object( $country, $country_input_types );
-		$country_details_settings = EEH_Template::display_template( GEN_SET_TEMPLATE_PATH . 'country_details_settings.template.php', $this->_template_args, TRUE );
+		$this->_template_args['inputs'] = EE_Question_Form_Input::generate_question_form_inputs_for_object($country, $country_input_types);
+		$country_details_settings = EEH_Template::display_template(GEN_SET_TEMPLATE_PATH.'country_details_settings.template.php', $this->_template_args, TRUE);
 
-		if ( defined( 'DOING_AJAX' )) {
-			$notices = EE_Error::get_notices( FALSE, FALSE, FALSE );
-			echo json_encode( array( 'return_data' => $country_details_settings, 'success' => $notices['success'], 'errors' => $notices['errors'] ));
+		if (defined('DOING_AJAX')) {
+			$notices = EE_Error::get_notices(FALSE, FALSE, FALSE);
+			echo json_encode(array('return_data' => $country_details_settings, 'success' => $notices['success'], 'errors' => $notices['errors']));
 			die();
 		} else {
 			return $country_details_settings;
@@ -602,50 +602,50 @@ 
 	 * 		@param 	string 		$CNT_ISO
 	 * 		@return 		string
 	 */
-	public function display_country_states( $CNT_ISO = '' ) {
+	public function display_country_states($CNT_ISO = '') {
 
-		$CNT_ISO = isset( $this->_req_data['country'] ) ? sanitize_text_field( $this->_req_data['country'] ) : $CNT_ISO;
+		$CNT_ISO = isset($this->_req_data['country']) ? sanitize_text_field($this->_req_data['country']) : $CNT_ISO;
 
-		if ( ! $CNT_ISO ) {
+		if ( ! $CNT_ISO) {
 			return '';
 		}
 		// for ajax
-		EE_Registry::instance()->load_helper( 'Form_Fields' );
-		remove_all_filters( 'FHEE__EEH_Form_Fields__label_html' );
-		remove_all_filters( 'FHEE__EEH_Form_Fields__input_html' );
-		add_filter( 'FHEE__EEH_Form_Fields__label_html', array( $this, 'state_form_field_label_wrap' ), 10, 2 );
-		add_filter( 'FHEE__EEH_Form_Fields__input_html', array( $this, 'state_form_field_input__wrap' ), 10, 2 );
-		$states = EEM_State::instance()->get_all_states_for_these_countries( array( $CNT_ISO => $CNT_ISO ));
+		EE_Registry::instance()->load_helper('Form_Fields');
+		remove_all_filters('FHEE__EEH_Form_Fields__label_html');
+		remove_all_filters('FHEE__EEH_Form_Fields__input_html');
+		add_filter('FHEE__EEH_Form_Fields__label_html', array($this, 'state_form_field_label_wrap'), 10, 2);
+		add_filter('FHEE__EEH_Form_Fields__input_html', array($this, 'state_form_field_input__wrap'), 10, 2);
+		$states = EEM_State::instance()->get_all_states_for_these_countries(array($CNT_ISO => $CNT_ISO));
 
 //			echo '<h4>$CNT_ISO : ' . $CNT_ISO . '  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>';
 //			global $wpdb;
 //			echo '<h4>' . $wpdb->last_query . '  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>';
 //			EEH_Debug_Tools::printr( $states, '$states  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-		if ( $states ) {
-			foreach ( $states as $STA_ID => $state ) {
-				if ( $state instanceof EE_State ) {
+		if ($states) {
+			foreach ($states as $STA_ID => $state) {
+				if ($state instanceof EE_State) {
 					//STA_abbrev 	STA_name 	STA_active
 					$state_input_types = array(
-						'STA_abbrev' => array( 'type' => 'TEXT', 'input_name' => 'states[' . $STA_ID . ']', 'class' => 'mid-text' ),
-						'STA_name'   => array( 'type'       => 'TEXT', 'input_name' => 'states[' . $STA_ID . ']', 'class' => 'regular-text' ),
-						'STA_active' => array( 'type' => 'RADIO_BTN', 'input_name' => 'states[' . $STA_ID . ']', 'options' => $this->_yes_no_values, 'use_desc_4_label' => true )
+						'STA_abbrev' => array('type' => 'TEXT', 'input_name' => 'states['.$STA_ID.']', 'class' => 'mid-text'),
+						'STA_name'   => array('type'       => 'TEXT', 'input_name' => 'states['.$STA_ID.']', 'class' => 'regular-text'),
+						'STA_active' => array('type' => 'RADIO_BTN', 'input_name' => 'states['.$STA_ID.']', 'options' => $this->_yes_no_values, 'use_desc_4_label' => true)
 					);
-					$this->_template_args[ 'states' ][ $STA_ID ][ 'inputs' ] = EE_Question_Form_Input::generate_question_form_inputs_for_object( $state, $state_input_types );
-					$query_args = array( 'action'     => 'delete_state', 'STA_ID' => $STA_ID, 'CNT_ISO' => $CNT_ISO, 'STA_abbrev' => $state->abbrev() );
-					$this->_template_args[ 'states' ][ $STA_ID ][ 'delete_state_url' ] = EE_Admin_Page::add_query_args_and_nonce( $query_args, GEN_SET_ADMIN_URL );
+					$this->_template_args['states'][$STA_ID]['inputs'] = EE_Question_Form_Input::generate_question_form_inputs_for_object($state, $state_input_types);
+					$query_args = array('action'     => 'delete_state', 'STA_ID' => $STA_ID, 'CNT_ISO' => $CNT_ISO, 'STA_abbrev' => $state->abbrev());
+					$this->_template_args['states'][$STA_ID]['delete_state_url'] = EE_Admin_Page::add_query_args_and_nonce($query_args, GEN_SET_ADMIN_URL);
 				}
 			}
 		} else {
 			$this->_template_args['states'] = FALSE;
 		}
 //		EEH_Debug_Tools::printr( $this->_template_args['states'], 'states  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-		$this->_template_args['add_new_state_url'] = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'add_new_state' ),  GEN_SET_ADMIN_URL );
+		$this->_template_args['add_new_state_url'] = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'add_new_state'), GEN_SET_ADMIN_URL);
 
-		$state_details_settings = EEH_Template::display_template( GEN_SET_TEMPLATE_PATH . 'state_details_settings.template.php', $this->_template_args, TRUE );
+		$state_details_settings = EEH_Template::display_template(GEN_SET_TEMPLATE_PATH.'state_details_settings.template.php', $this->_template_args, TRUE);
 
-		if ( defined( 'DOING_AJAX' )) {
-			$notices = EE_Error::get_notices( FALSE, FALSE, FALSE );
-			echo json_encode( array( 'return_data' => $state_details_settings, 'success' => $notices['success'], 'errors' => $notices['errors'] ));
+		if (defined('DOING_AJAX')) {
+			$notices = EE_Error::get_notices(FALSE, FALSE, FALSE);
+			echo json_encode(array('return_data' => $state_details_settings, 'success' => $notices['success'], 'errors' => $notices['errors']));
 			die();
 		} else {
 			return $state_details_settings;
@@ -666,40 +666,39 @@ 
 
 		$success = TRUE;
 
-		$CNT_ISO = isset( $this->_req_data['CNT_ISO'] ) ? strtoupper( sanitize_text_field( $this->_req_data['CNT_ISO'] )) : FALSE;
-		if ( ! $CNT_ISO ) {
-			EE_Error::add_error( __( 'No Country ISO code or an invalid Country ISO code was received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		$CNT_ISO = isset($this->_req_data['CNT_ISO']) ? strtoupper(sanitize_text_field($this->_req_data['CNT_ISO'])) : FALSE;
+		if ( ! $CNT_ISO) {
+			EE_Error::add_error(__('No Country ISO code or an invalid Country ISO code was received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			$success = FALSE;
 		}
-		$STA_abbrev = isset( $this->_req_data['STA_abbrev'] ) ? sanitize_text_field( $this->_req_data['STA_abbrev'] ) : FALSE;
-		if ( ! $STA_abbrev ) {
-			EE_Error::add_error( __( 'No State ISO code or an invalid State ISO code was received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		$STA_abbrev = isset($this->_req_data['STA_abbrev']) ? sanitize_text_field($this->_req_data['STA_abbrev']) : FALSE;
+		if ( ! $STA_abbrev) {
+			EE_Error::add_error(__('No State ISO code or an invalid State ISO code was received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			$success = FALSE;
 		}
-		$STA_name = isset( $this->_req_data['STA_name'] ) ?  sanitize_text_field( $this->_req_data['STA_name'] ) :
-			FALSE;
-		if ( ! $STA_name ) {
-			EE_Error::add_error( __( 'No State name or an invalid State name was received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		$STA_name = isset($this->_req_data['STA_name']) ? sanitize_text_field($this->_req_data['STA_name']) : FALSE;
+		if ( ! $STA_name) {
+			EE_Error::add_error(__('No State name or an invalid State name was received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			$success = FALSE;
 		}
 
-		if ( $success ) {
+		if ($success) {
 			$cols_n_values = array(
 				'CNT_ISO' => $CNT_ISO,
 				'STA_abbrev' => $STA_abbrev,
 				'STA_name' => $STA_name,
 				'STA_active' => TRUE
 			);
-			$success = EEM_State::instance()->insert ( $cols_n_values );
-			EE_Error::add_success( __( 'The State was added successfully.', 'event_espresso' ) );
+			$success = EEM_State::instance()->insert($cols_n_values);
+			EE_Error::add_success(__('The State was added successfully.', 'event_espresso'));
 		}
 
-		if ( defined( 'DOING_AJAX' )) {
-			$notices = EE_Error::get_notices( FALSE, FALSE, FALSE );
-			echo json_encode( array_merge( $notices, array( 'return_data' => $CNT_ISO ) ) );
+		if (defined('DOING_AJAX')) {
+			$notices = EE_Error::get_notices(FALSE, FALSE, FALSE);
+			echo json_encode(array_merge($notices, array('return_data' => $CNT_ISO)));
 			die();
 		} else {
-			$this->_redirect_after_action( $success, 'State', 'added', array( 'action' => 'country_settings' ) );
+			$this->_redirect_after_action($success, 'State', 'added', array('action' => 'country_settings'));
 		}
 	}
 
@@ -712,25 +711,25 @@ 
 	 * 		@return 		boolean | void
 	 */
 	public function delete_state() {
-		$CNT_ISO = isset( $this->_req_data['CNT_ISO'] ) ? strtoupper( sanitize_text_field( $this->_req_data['CNT_ISO'] )) : FALSE;
-		$STA_ID = isset( $this->_req_data['STA_ID'] ) ? sanitize_text_field( $this->_req_data['STA_ID'] ) : FALSE;
-		$STA_abbrev = isset( $this->_req_data['STA_abbrev'] ) ? sanitize_text_field( $this->_req_data['STA_abbrev'] ) : FALSE;
-		if ( ! $STA_ID ) {
-			EE_Error::add_error( __( 'No State ID or an invalid State ID was received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		$CNT_ISO = isset($this->_req_data['CNT_ISO']) ? strtoupper(sanitize_text_field($this->_req_data['CNT_ISO'])) : FALSE;
+		$STA_ID = isset($this->_req_data['STA_ID']) ? sanitize_text_field($this->_req_data['STA_ID']) : FALSE;
+		$STA_abbrev = isset($this->_req_data['STA_abbrev']) ? sanitize_text_field($this->_req_data['STA_abbrev']) : FALSE;
+		if ( ! $STA_ID) {
+			EE_Error::add_error(__('No State ID or an invalid State ID was received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		$success = EEM_State::instance()->delete_by_ID( $STA_ID );
-		if ( $success !== FALSE ) {
-			do_action( 'AHEE__General_Settings_Admin_Page__delete_state__state_deleted', $CNT_ISO, $STA_ID, array( 'STA_abbrev' => $STA_abbrev ));
-			EE_Error::add_success( __( 'The State was deleted successfully.', 'event_espresso' ));
+		$success = EEM_State::instance()->delete_by_ID($STA_ID);
+		if ($success !== FALSE) {
+			do_action('AHEE__General_Settings_Admin_Page__delete_state__state_deleted', $CNT_ISO, $STA_ID, array('STA_abbrev' => $STA_abbrev));
+			EE_Error::add_success(__('The State was deleted successfully.', 'event_espresso'));
 		}
-		if ( defined( 'DOING_AJAX' )) {
-			$notices = EE_Error::get_notices( FALSE, FALSE );
+		if (defined('DOING_AJAX')) {
+			$notices = EE_Error::get_notices(FALSE, FALSE);
 			$notices['return_data'] = TRUE;
-			echo json_encode( $notices );
+			echo json_encode($notices);
 			die();
 		} else {
-			$this->_redirect_after_action( $success, 'State', 'deleted', array( 'action' => 'country_settings' ) );
+			$this->_redirect_after_action($success, 'State', 'deleted', array('action' => 'country_settings'));
 		}
 	}
 
@@ -746,63 +745,63 @@ 
 	protected function _update_country_settings() {
 //		EEH_Debug_Tools::printr( $this->_req_data, '$this->_req_data  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 		// grab the country ISO code
-		$CNT_ISO = isset( $this->_req_data['country'] ) ? strtoupper( sanitize_text_field( $this->_req_data['country'] )) : FALSE;
-		if ( ! $CNT_ISO ) {
-			EE_Error::add_error( __( 'No Country ISO code or an invalid Country ISO code was received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		$CNT_ISO = isset($this->_req_data['country']) ? strtoupper(sanitize_text_field($this->_req_data['country'])) : FALSE;
+		if ( ! $CNT_ISO) {
+			EE_Error::add_error(__('No Country ISO code or an invalid Country ISO code was received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return;
 		}
 		$cols_n_values = array();
-		$cols_n_values['CNT_ISO3'] = isset( $this->_req_data['cntry'][$CNT_ISO]['CNT_ISO3'] ) ? strtoupper( sanitize_text_field( $this->_req_data['cntry'][$CNT_ISO]['CNT_ISO3'] )) : FALSE;
-		$cols_n_values['RGN_ID'] = isset( $this->_req_data['cntry'][$CNT_ISO]['RGN_ID'] ) ? absint( $this->_req_data['cntry'][$CNT_ISO]['RGN_ID'] ) : NULL;
-		$cols_n_values['CNT_name'] = isset( $this->_req_data['cntry'][$CNT_ISO]['CNT_name'] ) ? sanitize_text_field( $this->_req_data['cntry'][$CNT_ISO]['CNT_name'] ) : NULL;
-		$cols_n_values['CNT_cur_code'] = isset( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_code'] ) ? strtoupper( sanitize_text_field( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_code'] )) : 'USD';
-		$cols_n_values['CNT_cur_single'] = isset( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_single'] ) ? sanitize_text_field( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_single'] ) : 'dollar';
-		$cols_n_values['CNT_cur_plural'] = isset( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_plural'] ) ? sanitize_text_field( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_plural'] ) : 'dollars';
-		$cols_n_values['CNT_cur_sign'] = isset( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_sign'] ) ? sanitize_text_field( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_sign'] ) : '$';
-		$cols_n_values['CNT_cur_sign_b4'] = isset( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_sign_b4'] ) ? absint( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_sign_b4'] ) : TRUE;
-		$cols_n_values['CNT_cur_dec_plc'] = isset( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_dec_plc'] ) ? absint( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_dec_plc'] ) : 2;
-		$cols_n_values['CNT_cur_dec_mrk'] = isset( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_dec_mrk'] ) ? sanitize_text_field( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_dec_mrk'] ) : '.';
-		$cols_n_values['CNT_cur_thsnds'] = isset( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_thsnds'] ) ? sanitize_text_field( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_thsnds'] ) : ',';
-		$cols_n_values['CNT_tel_code'] = isset( $this->_req_data['cntry'][$CNT_ISO]['CNT_tel_code'] ) ? sanitize_text_field( $this->_req_data['cntry'][$CNT_ISO]['CNT_tel_code'] ) : NULL;
-		$cols_n_values['CNT_is_EU'] = isset( $this->_req_data['cntry'][$CNT_ISO]['CNT_is_EU'] ) ? absint( $this->_req_data['cntry'][$CNT_ISO]['CNT_is_EU'] ) : FALSE;
-		$cols_n_values['CNT_active'] = isset( $this->_req_data['cntry'][$CNT_ISO]['CNT_active'] ) ? absint( $this->_req_data['cntry'][$CNT_ISO]['CNT_active'] ) : FALSE;
+		$cols_n_values['CNT_ISO3'] = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_ISO3']) ? strtoupper(sanitize_text_field($this->_req_data['cntry'][$CNT_ISO]['CNT_ISO3'])) : FALSE;
+		$cols_n_values['RGN_ID'] = isset($this->_req_data['cntry'][$CNT_ISO]['RGN_ID']) ? absint($this->_req_data['cntry'][$CNT_ISO]['RGN_ID']) : NULL;
+		$cols_n_values['CNT_name'] = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_name']) ? sanitize_text_field($this->_req_data['cntry'][$CNT_ISO]['CNT_name']) : NULL;
+		$cols_n_values['CNT_cur_code'] = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_code']) ? strtoupper(sanitize_text_field($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_code'])) : 'USD';
+		$cols_n_values['CNT_cur_single'] = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_single']) ? sanitize_text_field($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_single']) : 'dollar';
+		$cols_n_values['CNT_cur_plural'] = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_plural']) ? sanitize_text_field($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_plural']) : 'dollars';
+		$cols_n_values['CNT_cur_sign'] = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_sign']) ? sanitize_text_field($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_sign']) : '$';
+		$cols_n_values['CNT_cur_sign_b4'] = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_sign_b4']) ? absint($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_sign_b4']) : TRUE;
+		$cols_n_values['CNT_cur_dec_plc'] = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_dec_plc']) ? absint($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_dec_plc']) : 2;
+		$cols_n_values['CNT_cur_dec_mrk'] = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_dec_mrk']) ? sanitize_text_field($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_dec_mrk']) : '.';
+		$cols_n_values['CNT_cur_thsnds'] = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_thsnds']) ? sanitize_text_field($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_thsnds']) : ',';
+		$cols_n_values['CNT_tel_code'] = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_tel_code']) ? sanitize_text_field($this->_req_data['cntry'][$CNT_ISO]['CNT_tel_code']) : NULL;
+		$cols_n_values['CNT_is_EU'] = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_is_EU']) ? absint($this->_req_data['cntry'][$CNT_ISO]['CNT_is_EU']) : FALSE;
+		$cols_n_values['CNT_active'] = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_active']) ? absint($this->_req_data['cntry'][$CNT_ISO]['CNT_active']) : FALSE;
 		// allow filtering of country data
-		$cols_n_values = apply_filters( 'FHEE__General_Settings_Admin_Page___update_country_settings__cols_n_values', $cols_n_values );
+		$cols_n_values = apply_filters('FHEE__General_Settings_Admin_Page___update_country_settings__cols_n_values', $cols_n_values);
 		//EEH_Debug_Tools::printr( $cols_n_values, '$cols_n_values  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 		// where values
-		$where_cols_n_values = array( array( 'CNT_ISO' => $CNT_ISO ));
+		$where_cols_n_values = array(array('CNT_ISO' => $CNT_ISO));
 		// run the update
-		$success = EEM_Country::instance()->update( $cols_n_values, $where_cols_n_values );
+		$success = EEM_Country::instance()->update($cols_n_values, $where_cols_n_values);
 //		global $wpdb;
 //		echo '<h4>' . $wpdb->last_query . '  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>';
 //		echo '<h4>$success : ' . $success . '  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>';
-		if ( isset( $this->_req_data['states'] ) && is_array( $this->_req_data['states'] ) && $success !== FALSE ) {
+		if (isset($this->_req_data['states']) && is_array($this->_req_data['states']) && $success !== FALSE) {
 			// allow filtering of states data
-			$states = apply_filters( 'FHEE__General_Settings_Admin_Page___update_country_settings__states', $this->_req_data['states'] );
+			$states = apply_filters('FHEE__General_Settings_Admin_Page___update_country_settings__states', $this->_req_data['states']);
 //			EEH_Debug_Tools::printr( $states, '$states  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 			// loop thru state data ( looks like : states[75][STA_name] )
-			foreach( $states as $STA_ID => $state ) {
+			foreach ($states as $STA_ID => $state) {
 				$cols_n_values = array(
 					'CNT_ISO' 		=> $CNT_ISO,
-					'STA_abbrev' => sanitize_text_field( $state['STA_abbrev'] ),
-					'STA_name' 	=> sanitize_text_field( $state['STA_name'] ),
-					'STA_active' 	=> (bool)absint( $state['STA_active'] )
+					'STA_abbrev' => sanitize_text_field($state['STA_abbrev']),
+					'STA_name' 	=> sanitize_text_field($state['STA_name']),
+					'STA_active' 	=> (bool) absint($state['STA_active'])
 				);
 				// where values
-				$where_cols_n_values = array( array( 'STA_ID' => $STA_ID ));
+				$where_cols_n_values = array(array('STA_ID' => $STA_ID));
 				// run the update
-				$success = EEM_State::instance()->update( $cols_n_values, $where_cols_n_values );
-				if ( $success !== FALSE ) {
-					do_action( 'AHEE__General_Settings_Admin_Page__update_country_settings__state_saved', $CNT_ISO, $STA_ID, $cols_n_values );
+				$success = EEM_State::instance()->update($cols_n_values, $where_cols_n_values);
+				if ($success !== FALSE) {
+					do_action('AHEE__General_Settings_Admin_Page__update_country_settings__state_saved', $CNT_ISO, $STA_ID, $cols_n_values);
 				}
 			}
 		}
 		// check if country being edited matches org option country, and if so, then  update EE_Config with new settings
-		if ( isset( EE_Registry::instance()->CFG->organization->CNT_ISO ) && $CNT_ISO == EE_Registry::instance()->CFG->organization->CNT_ISO ) {
-			EE_Registry::instance()->CFG->currency = new EE_Currency_Config( $CNT_ISO );
+		if (isset(EE_Registry::instance()->CFG->organization->CNT_ISO) && $CNT_ISO == EE_Registry::instance()->CFG->organization->CNT_ISO) {
+			EE_Registry::instance()->CFG->currency = new EE_Currency_Config($CNT_ISO);
 			EE_Registry::instance()->CFG->update_espresso_config();
 		}
-		$this->_redirect_after_action( $success, 'Countries', 'updated', array( 'action' => 'country_settings', 'country' => $CNT_ISO ));
+		$this->_redirect_after_action($success, 'Countries', 'updated', array('action' => 'country_settings', 'country' => $CNT_ISO));
 	}
 
 
@@ -816,11 +815,11 @@ 
 	 * 		@param 		string 		$label
 	 * 		@return 		string
 	 */
-	public function country_form_field_label_wrap( $label, $required_text ) {
+	public function country_form_field_label_wrap($label, $required_text) {
 		return '
 			<tr>
 				<th>
-					' . $label  . '
+					' . $label.'
 				</th>';
 	}
 
@@ -834,10 +833,10 @@ 
 	 * 		@param 		string 		$label
 	 * 		@return 		string
 	 */
-	public function country_form_field_input__wrap( $input, $label ) {
+	public function country_form_field_input__wrap($input, $label) {
 		return '
 				<td class="general-settings-country-input-td">
-					' . $input . '
+					' . $input.'
 				</td>
 			</tr>';
 	}
@@ -853,7 +852,7 @@ 
 	 * 		@param 		string 		$required_text
 	 * 		@return 		string
 	 */
-	public function state_form_field_label_wrap( $label, $required_text  ) {
+	public function state_form_field_label_wrap($label, $required_text) {
 		return $required_text;
 	}
 
@@ -867,10 +866,10 @@ 
 	 * 		@param 		string 		$label
 	 * 		@return 		string
 	 */
-	public function state_form_field_input__wrap( $input, $label ) {
+	public function state_form_field_input__wrap($input, $label) {
 		return '
 				<td class="general-settings-country-state-input-td">
-					' . $input . '
+					' . $input.'
 				</td>';
 
 	}
@@ -893,10 +892,10 @@ 
 	 * @param int $ee_page_id
 	 * @return string
 	 */
-	public static function edit_view_links( $ee_page_id ) {
-		$links = '<a href="' . add_query_arg( array( 'post' => $ee_page_id, 'action' => 'edit' ),  admin_url( 'post.php' )) . '" >' . __('Edit', 'event_espresso') . '</a>';
+	public static function edit_view_links($ee_page_id) {
+		$links = '<a href="'.add_query_arg(array('post' => $ee_page_id, 'action' => 'edit'), admin_url('post.php')).'" >'.__('Edit', 'event_espresso').'</a>';
 		$links .= ' &nbsp;|&nbsp; ';
-		$links .= '<a href="' . get_permalink( $ee_page_id ) . '" >' . __('View', 'event_espresso') . '</a>';
+		$links .= '<a href="'.get_permalink($ee_page_id).'" >'.__('View', 'event_espresso').'</a>';
 		return $links;
 	}
 
@@ -909,27 +908,27 @@ 
 	 * @param WP page object $ee_page
 	 * @return string
 	 */
-	public static function page_and_shortcode_status( $ee_page, $shortcode ) {
+	public static function page_and_shortcode_status($ee_page, $shortcode) {
 
 		// page status
-		if ( isset( $ee_page->post_status ) && $ee_page->post_status == 'publish') {
+		if (isset($ee_page->post_status) && $ee_page->post_status == 'publish') {
 			$pg_colour = 'green';
-			$pg_status = sprintf( __('Page%sStatus%sOK', 'event_espresso'), '&nbsp;' , '&nbsp;' );
+			$pg_status = sprintf(__('Page%sStatus%sOK', 'event_espresso'), '&nbsp;', '&nbsp;');
 		 } else {
 			$pg_colour = 'red';
-			$pg_status = sprintf( __('Page%sVisibility%sProblem', 'event_espresso'), '&nbsp;', '&nbsp;'  );
+			$pg_status = sprintf(__('Page%sVisibility%sProblem', 'event_espresso'), '&nbsp;', '&nbsp;');
 		}
 
 		// shortcode status
-		if ( isset( $ee_page->post_content ) && strpos( $ee_page->post_content, $shortcode ) !== FALSE ) {
+		if (isset($ee_page->post_content) && strpos($ee_page->post_content, $shortcode) !== FALSE) {
 			$sc_colour = 'green';
-			$sc_status = sprintf( __('Shortcode%sOK', 'event_espresso'), '&nbsp;' );
+			$sc_status = sprintf(__('Shortcode%sOK', 'event_espresso'), '&nbsp;');
 		 } else {
 			$sc_colour = 'red';
-			$sc_status = sprintf( __('Shortcode%sProblem', 'event_espresso'), '&nbsp;' );
+			$sc_status = sprintf(__('Shortcode%sProblem', 'event_espresso'), '&nbsp;');
 		}
 
-		return '<span style="color:' . $pg_colour . '; margin-right:2em;"><strong>' . $pg_status . '</strong></span><span style="color:' . $sc_colour . '"><strong>' . $sc_status . '</strong></span>';
+		return '<span style="color:'.$pg_colour.'; margin-right:2em;"><strong>'.$pg_status.'</strong></span><span style="color:'.$sc_colour.'"><strong>'.$sc_status.'</strong></span>';
 
 	}
 
@@ -944,20 +943,20 @@ 
 	 * @param unknown_type $level
 	 * @return unknown
 	 */
-	public static function page_settings_dropdown( $default = 0, $parent = 0, $level = 0 ) {
+	public static function page_settings_dropdown($default = 0, $parent = 0, $level = 0) {
 		global $wpdb;
-		$items = $wpdb->get_results( $wpdb->prepare("SELECT ID, post_parent, post_title FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'page' AND post_status != 'trash' ORDER BY menu_order", $parent) );
+		$items = $wpdb->get_results($wpdb->prepare("SELECT ID, post_parent, post_title FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'page' AND post_status != 'trash' ORDER BY menu_order", $parent));
 
-		if ( $items ) {
-			foreach ( $items as $item ) {
-				$pad = str_repeat( '&nbsp;', $level * 3 );
-				if ( $item->ID == $default)
+		if ($items) {
+			foreach ($items as $item) {
+				$pad = str_repeat('&nbsp;', $level * 3);
+				if ($item->ID == $default)
 					$current = ' selected="selected"';
 				else
 					$current = '';
 
-				echo "\n\t<option class='level-$level' value='$item->ID'$current>$pad " . esc_html($item->post_title) . "</option>";
-				parent_dropdown( $default, $item->ID, $level +1 );
+				echo "\n\t<option class='level-$level' value='$item->ID'$current>$pad ".esc_html($item->post_title)."</option>";
+				parent_dropdown($default, $item->ID, $level + 1);
 			}
 		} else {
 			return false;

admin_pages/payments/Payments_Admin_Page.core.php

Doc Comments +4 added lines, -4 removed lines

@@ -421,7 +421,7 @@ 
 	 *
 	 * @access protected
 	 * @param \EE_Payment_Method $payment_method
-	 * @return \EE_Form_Section_Proper
+	 * @return EE_Form_Section_HTML
 	 */
 	protected function _pci_dss_compliance( EE_Payment_Method $payment_method ) {
 		if ( $payment_method->type_obj()->requires_https() ) {
@@ -451,7 +451,7 @@ 
 	 *
 	 * @access protected
 	 * @param \EE_Payment_Method $payment_method
-	 * @return \EE_Form_Section_Proper
+	 * @return EE_Form_Section_HTML
 	 */
 	protected function _currency_support( EE_Payment_Method $payment_method ) {
 		if ( ! $payment_method->usable_for_currency( EE_Config::instance()->currency->code )) {
@@ -483,7 +483,7 @@ 
 	 *
 	 * @access protected
 	 * @param \EE_Payment_Method $payment_method
-	 * @return \EE_Form_Section_HTML
+	 * @return EE_Payment_Method_Form
 	 */
 	protected function _payment_method_settings( EE_Payment_Method $payment_method ) {
 		//modify the form so we only have/show fields that will be implemented for this version
@@ -551,7 +551,7 @@ 
 	 *
 	 * @access protected
 	 * @param \EE_Payment_Method $payment_method
-	 * @return \EE_Form_Section_Proper
+	 * @return EE_Form_Section_HTML
 	 */
 	protected function _deactivate_payment_method_button( EE_Payment_Method $payment_method ) {
 		$link_text_and_title = sprintf( __( 'Deactivate %1$s Payments?', 'event_espresso'), $payment_method->admin_name() );

Indentation +4 added lines, -4 removed lines

@@ -83,7 +83,7 @@ 
 		 *
 		 * When cap mapping is implemented, some routes will need to use the singular form of
 		 * capability method and also include the $id of the payment method for the route.
-		**/
+		 **/
 		$this->_page_routes = array(
 			'default' => array(
 				'func'=>'_payment_methods_list',
@@ -747,9 +747,9 @@ 
 
 	/**
 	 * 		_update_payment_settings
-	*		@access protected
-	*		@return array
-	*/
+	 *		@access protected
+	 *		@return array
+	 */
 	protected function _update_payment_settings() {
 		EE_Registry::instance()->CFG->registration->show_pending_payment_options = isset( $this->_req_data['show_pending_payment_options'] ) ? $this->_req_data['show_pending_payment_options'] : FALSE;
 		EE_Registry::instance()->CFG = apply_filters( 'FHEE__Payments_Admin_Page___update_payment_settings__CFG', EE_Registry::instance()->CFG );

Braces +8 added lines, -7 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -655,7 +656,7 @@ 
 			$payment_method = EE_Payment_Method_Manager::instance()->activate_a_payment_method_of_type( $payment_method_type );
 
 			$this->_redirect_after_action(1, 'Payment Method', 'activated', array('action' => 'default','payment_method'=>$payment_method->slug()));
-		}else{
+		} else{
 			$this->_redirect_after_action(FALSE, 'Payment Method', 'activated', array('action' => 'default'));
 		}
 	}
@@ -670,7 +671,7 @@ 
 			EE_Registry::instance()->load_lib('Payment_Method_Manager');
 			$count_updated = EE_Payment_Method_Manager::instance()->deactivate_payment_method( $payment_method_slug );
 			$this->_redirect_after_action($count_updated, 'Payment Method', 'deactivated', array('action' => 'default','payment_method'=>$payment_method_slug));
-		}else{
+		} else{
 			$this->_redirect_after_action(FALSE, 'Payment Method', 'deactivated', array('action' => 'default'));
 		}
 	}
@@ -712,7 +713,7 @@ 
 				$pm = $correct_pmt_form_to_use->get_model_object();
 				/** @var $pm EE_Payment_Method */
 				$this->_redirect_after_action(TRUE, 'Payment Method', 'updated', array('action' => 'default','payment_method'=>$pm->slug()));
-			}else{
+			} else{
 				EE_Error::add_error(
 					sprintf(
 						__('Payment method of type %s was not saved because there were validation errors. They have been marked in the form', 'event_espresso'),
@@ -838,7 +839,7 @@ 
 		if(isset($this->_req_data['order'])){
 			$sort = ( isset( $this->_req_data['order'] ) && ! empty( $this->_req_data['order'] )) ? $this->_req_data['order'] : 'DESC';
 			$query_params['order_by'] = array('LOG_time' => $sort);
-		}else{
+		} else{
 				$query_params['order_by'] = array('LOG_time' => 'DESC');
 		}
 		$offset = ($current_page-1)*$per_page;
@@ -881,7 +882,7 @@ 
 		$comparison = $timeA < $timeB ? -1 : 1;
 		if(strtoupper($this->_sort_logs_again_direction) == 'DESC'){
 			return $comparison * -1;
-		}else{
+		} else{
 			return $comparison;
 		}
 	}
@@ -896,7 +897,7 @@ 
 			if( $payment_log->object() instanceof EE_Payment ){
 				$payment_method = $payment_log->object()->payment_method();
 				$transaction = $payment_log->object()->transaction();
-			}elseif($payment_log->object() instanceof EE_Payment_Method){
+			} elseif($payment_log->object() instanceof EE_Payment_Method){
 				$payment_method = $payment_log->object();
 			}
 		}

Spacing +168 added lines, -168 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -44,8 +44,8 @@ 
 	 * @param bool $routing indicate whether we want to just load the object and handle routing or just load the object.
 	 * @return \Payments_Admin_Page
 	 */
-	public function __construct( $routing = TRUE ) {
-		parent::__construct( $routing );
+	public function __construct($routing = TRUE) {
+		parent::__construct($routing);
 	}
 
 
@@ -130,19 +130,19 @@ 
 	protected function _set_page_config() {
 		$payment_method_list_config = array(
 			'nav'           => array(
-				'label' => __( 'Payment Methods', 'event_espresso' ),
+				'label' => __('Payment Methods', 'event_espresso'),
 				'order' => 10
 			),
 			'metaboxes'     => $this->_default_espresso_metaboxes,
 			'help_tabs'     => array_merge(
 				array(
 					'payment_methods_overview_help_tab' => array(
-						'title'    => __( 'Payment Methods Overview', 'event_espresso' ),
+						'title'    => __('Payment Methods Overview', 'event_espresso'),
 						'filename' => 'payment_methods_overview'
 					)
 				),
 				$this->_add_payment_method_help_tabs() ),
-			'help_tour'     => array( 'Payment_Methods_Selection_Help_Tour' ),
+			'help_tour'     => array('Payment_Methods_Selection_Help_Tour'),
 			'require_nonce' => false
 		);
 
@@ -160,7 +160,7 @@ 
 					)
 				),
 				//'help_tour' => array( 'Payment_Methods_Settings_Help_Tour' ),
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array( '_publish_post_box' ) ),
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
 				'require_nonce' => FALSE
 			),
 			'payment_log'=>array(
@@ -179,17 +179,17 @@ 
 	/**
 	 * @return array
 	 */
-	protected function _add_payment_method_help_tabs(){
+	protected function _add_payment_method_help_tabs() {
 		EE_Registry::instance()->load_lib('Payment_Method_Manager');
 		$payment_method_types = EE_Payment_Method_Manager::instance()->payment_method_types();
 		$all_pmt_help_tabs_config = array();
-		foreach( $payment_method_types as $payment_method_type ){
-			if ( ! EE_Registry::instance()->CAP->current_user_can( $payment_method_type->cap_name(), 'specific_payment_method_type_access' ) ) {
+		foreach ($payment_method_types as $payment_method_type) {
+			if ( ! EE_Registry::instance()->CAP->current_user_can($payment_method_type->cap_name(), 'specific_payment_method_type_access')) {
 				continue;
 			}
-			foreach( $payment_method_type->help_tabs_config() as $help_tab_name => $config ){
-				$template_args = isset( $config[ 'template_args' ] ) ? $config[ 'template_args' ] : array();
-				$template_args[ 'admin_page_obj' ] = $this;
+			foreach ($payment_method_type->help_tabs_config() as $help_tab_name => $config) {
+				$template_args = isset($config['template_args']) ? $config['template_args'] : array();
+				$template_args['admin_page_obj'] = $this;
 				$all_pmt_help_tabs_config[$help_tab_name] = array(
 					'title'=>$config['title'],
 					'content'=>EEH_Template::display_template( 
@@ -216,9 +216,9 @@ 
 
 
 	public function load_scripts_styles() {
-		wp_enqueue_script( 'ee_admin_js' );
-		wp_enqueue_script( 'ee-text-links' );
-		wp_enqueue_script( 'espresso_payments', EE_PAYMENTS_ASSETS_URL . 'espresso_payments_admin.js', array( 'espresso-ui-theme', 'ee-datepicker' ), EVENT_ESPRESSO_VERSION, TRUE );
+		wp_enqueue_script('ee_admin_js');
+		wp_enqueue_script('ee-text-links');
+		wp_enqueue_script('espresso_payments', EE_PAYMENTS_ASSETS_URL.'espresso_payments_admin.js', array('espresso-ui-theme', 'ee-datepicker'), EVENT_ESPRESSO_VERSION, TRUE);
 	}
 
 
@@ -227,9 +227,9 @@ 
 
 	public function load_scripts_styles_default() {
 		//styles
-		wp_register_style( 'espresso_payments', EE_PAYMENTS_ASSETS_URL . 'ee-payments.css', array(), EVENT_ESPRESSO_VERSION );
-		wp_enqueue_style( 'espresso_payments' );
-		wp_enqueue_style( 'ee-text-links' );
+		wp_register_style('espresso_payments', EE_PAYMENTS_ASSETS_URL.'ee-payments.css', array(), EVENT_ESPRESSO_VERSION);
+		wp_enqueue_style('espresso_payments');
+		wp_enqueue_style('ee-text-links');
 		//scripts
 	}
 
@@ -243,46 +243,46 @@ 
 		 * to the loading process.  However, people MUST setup the details for the payment method so its safe to do a
 		 * recheck here.
 		 */
-		EE_Registry::instance()->load_lib( 'Payment_Method_Manager' );
+		EE_Registry::instance()->load_lib('Payment_Method_Manager');
 		EEM_Payment_Method::instance()->verify_button_urls();
-		EE_Registry::instance()->load_helper( 'Tabbed_Content' );
-		EE_Registry::instance()->load_helper( 'HTML' );
+		EE_Registry::instance()->load_helper('Tabbed_Content');
+		EE_Registry::instance()->load_helper('HTML');
 		//setup tabs, one for each payment method type
 		$tabs = array();
 		$payment_methods = array();
-		foreach( EE_Payment_Method_Manager::instance()->payment_method_types() as $pmt_obj ) {
+		foreach (EE_Payment_Method_Manager::instance()->payment_method_types() as $pmt_obj) {
 			// we don't want to show admin-only PMTs for now
-			if ( $pmt_obj instanceof EE_PMT_Admin_Only ) {
+			if ($pmt_obj instanceof EE_PMT_Admin_Only) {
 				continue;
 			}
 			//check access
-			if ( ! EE_Registry::instance()->CAP->current_user_can( $pmt_obj->cap_name(), 'specific_payment_method_type_access' ) ) {
+			if ( ! EE_Registry::instance()->CAP->current_user_can($pmt_obj->cap_name(), 'specific_payment_method_type_access')) {
 				continue;
 			}
 			//check for any active pms of that type
-			$payment_method = EEM_Payment_Method::instance()->get_one_of_type( $pmt_obj->system_name() );
-			if ( ! $payment_method instanceof EE_Payment_Method ) {
+			$payment_method = EEM_Payment_Method::instance()->get_one_of_type($pmt_obj->system_name());
+			if ( ! $payment_method instanceof EE_Payment_Method) {
 				$payment_method = EE_Payment_Method::new_instance(
 					array(
-						'PMD_slug'					=>sanitize_key( $pmt_obj->system_name() ),
+						'PMD_slug'					=>sanitize_key($pmt_obj->system_name()),
 						'PMD_type'					=>$pmt_obj->system_name(),
 						'PMD_name'				=>$pmt_obj->pretty_name(),
 						'PMD_admin_name'	=>$pmt_obj->pretty_name()
 					)
 				);
 			}
-			$payment_methods[ $payment_method->slug() ] = $payment_method;
+			$payment_methods[$payment_method->slug()] = $payment_method;
 		}
-		$payment_methods = apply_filters( 'FHEE__Payments_Admin_Page___payment_methods_list__payment_methods', $payment_methods );
-		foreach( $payment_methods as $payment_method ) {
-			if ( $payment_method instanceof EE_Payment_Method ) {
+		$payment_methods = apply_filters('FHEE__Payments_Admin_Page___payment_methods_list__payment_methods', $payment_methods);
+		foreach ($payment_methods as $payment_method) {
+			if ($payment_method instanceof EE_Payment_Method) {
 				add_meta_box(
 					//html id
-					'espresso_' . $payment_method->slug() . '_payment_settings',
+					'espresso_'.$payment_method->slug().'_payment_settings',
 					//title
-					sprintf( __( '%s Settings', 'event_espresso' ), $payment_method->admin_name() ),
+					sprintf(__('%s Settings', 'event_espresso'), $payment_method->admin_name()),
 					//callback
-					array( $this, 'payment_method_settings_meta_box' ),
+					array($this, 'payment_method_settings_meta_box'),
 					//post type
 					null,
 					//context
@@ -290,19 +290,19 @@ 
 					//priority
 					'default',
 					//callback args
-					array( 'payment_method' => $payment_method )
+					array('payment_method' => $payment_method)
 				);
 				//setup for tabbed content
-				$tabs[ $payment_method->slug() ] = array(
+				$tabs[$payment_method->slug()] = array(
 					'label' => $payment_method->admin_name(),
 					'class' => $payment_method->active() ? 'gateway-active' : '',
-					'href'  => 'espresso_' . $payment_method->slug() . '_payment_settings',
-					'title' => __( 'Modify this Payment Method', 'event_espresso' ),
+					'href'  => 'espresso_'.$payment_method->slug().'_payment_settings',
+					'title' => __('Modify this Payment Method', 'event_espresso'),
 					'slug'  => $payment_method->slug()
 				);
 			}
 		}
-		$this->_template_args['admin_page_header'] = EEH_Tabbed_Content::tab_text_links( $tabs, 'payment_method_links', '|', $this->_get_active_payment_method_slug() );
+		$this->_template_args['admin_page_header'] = EEH_Tabbed_Content::tab_text_links($tabs, 'payment_method_links', '|', $this->_get_active_payment_method_slug());
 		$this->display_admin_page_with_sidebar();
 
 	}
@@ -313,20 +313,20 @@ 
 	 *   _get_active_payment_method_slug
 	 * 	@return string
 	 */
-	protected function _get_active_payment_method_slug(){
+	protected function _get_active_payment_method_slug() {
 		$payment_method_slug = FALSE;
 		//decide which payment method tab to open first, as dictated by the request's 'payment_method'
-		if ( isset( $this->_req_data['payment_method'] )) {
+		if (isset($this->_req_data['payment_method'])) {
 			// if they provided the current payment method, use it
-			$payment_method_slug = sanitize_key( $this->_req_data['payment_method'] );
+			$payment_method_slug = sanitize_key($this->_req_data['payment_method']);
 		}
-		$payment_method = EEM_Payment_Method::instance()->get_one( array( array( 'PMD_slug' => $payment_method_slug )));
+		$payment_method = EEM_Payment_Method::instance()->get_one(array(array('PMD_slug' => $payment_method_slug)));
 		// if that didn't work or wasn't provided, find another way to select the current pm
-		if ( ! $this->_verify_payment_method( $payment_method )) {
+		if ( ! $this->_verify_payment_method($payment_method)) {
 			// like, looking for an active one
-			$payment_method = EEM_Payment_Method::instance()->get_one_active( 'CART' );
+			$payment_method = EEM_Payment_Method::instance()->get_one_active('CART');
 			// test that one as well
-			if ( $this->_verify_payment_method( $payment_method )) {
+			if ($this->_verify_payment_method($payment_method)) {
 				$payment_method_slug = $payment_method->slug();
 			} else {
 				$payment_method_slug = 'paypal_standard';
@@ -344,11 +344,11 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return boolean
 	 */
-	protected function _verify_payment_method( $payment_method ){
+	protected function _verify_payment_method($payment_method) {
 		if (
 			$payment_method instanceof EE_Payment_Method &&
 			$payment_method->type_obj() instanceof EE_PMT_Base &&
-			EE_Registry::instance()->CAP->current_user_can( $payment_method->type_obj()->cap_name(), 'specific_payment_method_type_access' )
+			EE_Registry::instance()->CAP->current_user_can($payment_method->type_obj()->cap_name(), 'specific_payment_method_type_access')
 		) {
 			return TRUE;
 		}
@@ -365,21 +365,21 @@ 
 	 * @return string
 	 * @throws EE_Error
 	 */
-	public function payment_method_settings_meta_box( $post_obj_which_is_null, $metabox ){
-		$payment_method = isset( $metabox['args'], $metabox['args']['payment_method'] ) ? $metabox['args']['payment_method'] : NULL;
-		if ( ! $payment_method instanceof EE_Payment_Method ){
-			throw new EE_Error( sprintf( __( 'Payment method metabox setup incorrectly. No Payment method object was supplied', 'event_espresso' )));
+	public function payment_method_settings_meta_box($post_obj_which_is_null, $metabox) {
+		$payment_method = isset($metabox['args'], $metabox['args']['payment_method']) ? $metabox['args']['payment_method'] : NULL;
+		if ( ! $payment_method instanceof EE_Payment_Method) {
+			throw new EE_Error(sprintf(__('Payment method metabox setup incorrectly. No Payment method object was supplied', 'event_espresso')));
 		}
 		$payment_method_scopes = $payment_method->active();
 		// if the payment method really exists show its form, otherwise the activation template
-		if ( $payment_method->ID() && ! empty( $payment_method_scopes )) {
-				$form = $this->_generate_payment_method_settings_form( $payment_method );
-				if ( $form->form_data_present_in( $this->_req_data )) {
-					$form->receive_form_submission( $this->_req_data );
+		if ($payment_method->ID() && ! empty($payment_method_scopes)) {
+				$form = $this->_generate_payment_method_settings_form($payment_method);
+				if ($form->form_data_present_in($this->_req_data)) {
+					$form->receive_form_submission($this->_req_data);
 				}
-				echo $form->form_open() . $form->get_html_and_js() . $form->form_close();
+				echo $form->form_open().$form->get_html_and_js().$form->form_close();
 		} else {
-			echo $this->_activate_payment_method_button( $payment_method )->get_html_and_js();
+			echo $this->_activate_payment_method_button($payment_method)->get_html_and_js();
 		}
 	}
 
@@ -392,14 +392,14 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return \EE_Form_Section_Proper
 	 */
-	protected function _generate_payment_method_settings_form( EE_Payment_Method $payment_method ) {
-		if ( ! $payment_method instanceof EE_Payment_Method ){
+	protected function _generate_payment_method_settings_form(EE_Payment_Method $payment_method) {
+		if ( ! $payment_method instanceof EE_Payment_Method) {
 			return new EE_Form_Section_Proper();
 		}
 		return new EE_Form_Section_Proper(
 			array(
-				'name' 	=> $payment_method->slug() . '_settings_form',
-				'html_id' 	=> $payment_method->slug() . '_settings_form',
+				'name' 	=> $payment_method->slug().'_settings_form',
+				'html_id' 	=> $payment_method->slug().'_settings_form',
 				'action' 	=> EE_Admin_Page::add_query_args_and_nonce(
 					array(
 						'action' 						=> 'update_payment_method',
@@ -411,12 +411,12 @@ 
 				'subsections' 			=> apply_filters(
 					'FHEE__Payments_Admin_Page___generate_payment_method_settings_form__form_subsections',
 					array(
-						'pci_dss_compliance_' . $payment_method->slug() 				=> $this->_pci_dss_compliance( $payment_method ),
-						'currency_support_' . $payment_method->slug()					=> $this->_currency_support( $payment_method ),
-						'payment_method_settings_' . $payment_method->slug() 	=> $this->_payment_method_settings( $payment_method ),
-						'update_' . $payment_method->slug()										=> $this->_update_payment_method_button( $payment_method ),
-						'deactivate_' . $payment_method->slug()								=> $this->_deactivate_payment_method_button( $payment_method ),
-						'fine_print_' . $payment_method->slug()									=> $this->_fine_print()
+						'pci_dss_compliance_'.$payment_method->slug() 				=> $this->_pci_dss_compliance($payment_method),
+						'currency_support_'.$payment_method->slug()					=> $this->_currency_support($payment_method),
+						'payment_method_settings_'.$payment_method->slug() 	=> $this->_payment_method_settings($payment_method),
+						'update_'.$payment_method->slug()										=> $this->_update_payment_method_button($payment_method),
+						'deactivate_'.$payment_method->slug()								=> $this->_deactivate_payment_method_button($payment_method),
+						'fine_print_'.$payment_method->slug()									=> $this->_fine_print()
 					),
 					$payment_method
 				)
@@ -433,19 +433,19 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return \EE_Form_Section_Proper
 	 */
-	protected function _pci_dss_compliance( EE_Payment_Method $payment_method ) {
-		if ( $payment_method->type_obj()->requires_https() ) {
+	protected function _pci_dss_compliance(EE_Payment_Method $payment_method) {
+		if ($payment_method->type_obj()->requires_https()) {
 			return new EE_Form_Section_HTML(
 				EEH_HTML::tr(
 					EEH_HTML::th(
 						EEH_HTML::label(
-							EEH_HTML::strong( __( 'IMPORTANT', 'event_espresso' ), '', 'important-notice' )
+							EEH_HTML::strong(__('IMPORTANT', 'event_espresso'), '', 'important-notice')
 						)
-					) .
+					).
 					EEH_HTML::td(
-						EEH_HTML::strong( __( 'You are responsible for your own website security and Payment Card Industry Data Security Standards (PCI DSS) compliance.', 'event_espresso' )) .
-						EEH_HTML::br() .
-						__( 'Learn more about ', 'event_espresso' ) . EEH_HTML::link( 'https://www.pcisecuritystandards.org/merchants/index.php', __( 'PCI DSS compliance', 'event_espresso' ))
+						EEH_HTML::strong(__('You are responsible for your own website security and Payment Card Industry Data Security Standards (PCI DSS) compliance.', 'event_espresso')).
+						EEH_HTML::br().
+						__('Learn more about ', 'event_espresso').EEH_HTML::link('https://www.pcisecuritystandards.org/merchants/index.php', __('PCI DSS compliance', 'event_espresso'))
 					)
 				)
 			);
@@ -463,19 +463,19 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return \EE_Form_Section_Proper
 	 */
-	protected function _currency_support( EE_Payment_Method $payment_method ) {
-		if ( ! $payment_method->usable_for_currency( EE_Config::instance()->currency->code )) {
+	protected function _currency_support(EE_Payment_Method $payment_method) {
+		if ( ! $payment_method->usable_for_currency(EE_Config::instance()->currency->code)) {
 			return new EE_Form_Section_HTML(
 				EEH_HTML::tr(
 					EEH_HTML::th(
 						EEH_HTML::label(
-							EEH_HTML::strong( __( 'IMPORTANT', 'event_espresso' ), '', 'important-notice' )
+							EEH_HTML::strong(__('IMPORTANT', 'event_espresso'), '', 'important-notice')
 						)
-					) .
+					).
 					EEH_HTML::td(
 						EEH_HTML::strong(
 							sprintf(
-								__( 'This payment method does not support the currency set on your site (%1$s) and so will not appear as a payment option to registrants. Please activate a different payment method or change your site\'s country and associated currency.', 'event_espresso'),
+								__('This payment method does not support the currency set on your site (%1$s) and so will not appear as a payment option to registrants. Please activate a different payment method or change your site\'s country and associated currency.', 'event_espresso'),
 								EE_Config::instance()->currency->code
 							)
 						)
@@ -495,9 +495,9 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return \EE_Form_Section_HTML
 	 */
-	protected function _payment_method_settings( EE_Payment_Method $payment_method ) {
+	protected function _payment_method_settings(EE_Payment_Method $payment_method) {
 		//modify the form so we only have/show fields that will be implemented for this version
-		return $this->_simplify_form( $payment_method->type_obj()->settings_form(), $payment_method->name() );
+		return $this->_simplify_form($payment_method->type_obj()->settings_form(), $payment_method->name());
 	}
 
 
@@ -510,8 +510,8 @@ 
 	 * @return \EE_Payment_Method_Form
 	 * @throws \EE_Error
 	 */
-	protected function _simplify_form( $form_section, $payment_method_name = '' ){
-		if ( $form_section instanceof EE_Payment_Method_Form ) {
+	protected function _simplify_form($form_section, $payment_method_name = '') {
+		if ($form_section instanceof EE_Payment_Method_Form) {
 			$form_section->exclude(
 				array(
 					'PMD_type', //dont want them changing the type
@@ -522,7 +522,7 @@ 
 			);
 			return $form_section;
 		} else {
-			throw new EE_Error( sprintf( __( 'The EE_Payment_Method_Form for the "%1$s" payment method is missing or invalid.', 'event_espresso' ), $payment_method_name ));
+			throw new EE_Error(sprintf(__('The EE_Payment_Method_Form for the "%1$s" payment method is missing or invalid.', 'event_espresso'), $payment_method_name));
 		}
 	}
 
@@ -535,18 +535,18 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return \EE_Form_Section_HTML
 	 */
-	protected function _update_payment_method_button( EE_Payment_Method $payment_method ) {
+	protected function _update_payment_method_button(EE_Payment_Method $payment_method) {
 		$update_button = new EE_Submit_Input(
 			array(
-				'html_id' 		=> 'save_' . $payment_method->slug() . '_settings',
-				'default' 		=> sprintf( __( 'Update %s Payment Settings', 'event_espresso' ), $payment_method->admin_name() ),
+				'html_id' 		=> 'save_'.$payment_method->slug().'_settings',
+				'default' 		=> sprintf(__('Update %s Payment Settings', 'event_espresso'), $payment_method->admin_name()),
 				'html_label' => EEH_HTML::nbsp()
 			)
 		);
 		return new EE_Form_Section_HTML(
-			EEH_HTML::no_row( EEH_HTML::br(2) ) .
+			EEH_HTML::no_row(EEH_HTML::br(2)).
 			EEH_HTML::tr(
-				EEH_HTML::th( __( 'Update Settings', 'event_espresso') ) .
+				EEH_HTML::th(__('Update Settings', 'event_espresso')).
 				EEH_HTML::td(
 					$update_button->get_html_for_input()
 				)
@@ -563,11 +563,11 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return \EE_Form_Section_Proper
 	 */
-	protected function _deactivate_payment_method_button( EE_Payment_Method $payment_method ) {
-		$link_text_and_title = sprintf( __( 'Deactivate %1$s Payments?', 'event_espresso'), $payment_method->admin_name() );
+	protected function _deactivate_payment_method_button(EE_Payment_Method $payment_method) {
+		$link_text_and_title = sprintf(__('Deactivate %1$s Payments?', 'event_espresso'), $payment_method->admin_name());
 		return new EE_Form_Section_HTML(
 			EEH_HTML::tr(
-				EEH_HTML::th( __( 'Deactivate Payment Method', 'event_espresso') ) .
+				EEH_HTML::th(__('Deactivate Payment Method', 'event_espresso')).
 				EEH_HTML::td(
 					EEH_HTML::link(
 						EE_Admin_Page::add_query_args_and_nonce(
@@ -579,7 +579,7 @@ 
 						),
 						$link_text_and_title,
 						$link_text_and_title,
-						'deactivate_' . $payment_method->slug(),
+						'deactivate_'.$payment_method->slug(),
 						'espresso-button button-secondary'
 					)
 				)
@@ -595,12 +595,12 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return \EE_Form_Section_Proper
 	 */
-	protected function _activate_payment_method_button( EE_Payment_Method $payment_method ) {
-		$link_text_and_title = sprintf( __( 'Activate %1$s Payment Method?', 'event_espresso'), $payment_method->admin_name() );
+	protected function _activate_payment_method_button(EE_Payment_Method $payment_method) {
+		$link_text_and_title = sprintf(__('Activate %1$s Payment Method?', 'event_espresso'), $payment_method->admin_name());
 		return new EE_Form_Section_Proper(
 			array(
-				'name' 	=> 'activate_' . $payment_method->slug() . '_settings_form',
-				'html_id' 	=> 'activate_' . $payment_method->slug() . '_settings_form',
+				'name' 	=> 'activate_'.$payment_method->slug().'_settings_form',
+				'html_id' 	=> 'activate_'.$payment_method->slug().'_settings_form',
 				'action' 	=> '#',
 				'layout_strategy'		=> new EE_Admin_Two_Column_Layout(),
 				'subsections' 			=> apply_filters(
@@ -609,8 +609,8 @@ 
 						new EE_Form_Section_HTML(
 							EEH_HTML::tr(
 								EEH_HTML::th(
-									EEH_HTML::label( __( 'Click to Activate ', 'event_espresso' ))
-								) .
+									EEH_HTML::label(__('Click to Activate ', 'event_espresso'))
+								).
 								EEH_HTML::td(
 									EEH_HTML::link(
 										EE_Admin_Page::add_query_args_and_nonce(
@@ -622,7 +622,7 @@ 
 										),
 										$link_text_and_title,
 										$link_text_and_title,
-										'activate_' . $payment_method->slug(),
+										'activate_'.$payment_method->slug(),
 										'espresso-button-green button-primary'
 									)
 								)
@@ -644,9 +644,9 @@ 
 	protected function _fine_print() {
 		return new EE_Form_Section_HTML(
 			EEH_HTML::tr(
-				EEH_HTML::th() .
+				EEH_HTML::th().
 				EEH_HTML::td(
-					EEH_HTML::p( __( 'All fields marked with a * are required fields', 'event_espresso' ), '', 'grey-text' )
+					EEH_HTML::p(__('All fields marked with a * are required fields', 'event_espresso'), '', 'grey-text')
 				)
 			)
 		);
@@ -658,15 +658,15 @@ 
 	 * Activates a payment method of that type. Mostly assuming there is only 1 of that type (or none so far)
 	 * @global WP_User $current_user
 	 */
-	protected function _activate_payment_method(){
-		if(isset($this->_req_data['payment_method_type'])){
+	protected function _activate_payment_method() {
+		if (isset($this->_req_data['payment_method_type'])) {
 			$payment_method_type = sanitize_text_field($this->_req_data['payment_method_type']);
 			//see if one exists
-			EE_Registry::instance()->load_lib( 'Payment_Method_Manager' );
-			$payment_method = EE_Payment_Method_Manager::instance()->activate_a_payment_method_of_type( $payment_method_type );
+			EE_Registry::instance()->load_lib('Payment_Method_Manager');
+			$payment_method = EE_Payment_Method_Manager::instance()->activate_a_payment_method_of_type($payment_method_type);
 
-			$this->_redirect_after_action(1, 'Payment Method', 'activated', array('action' => 'default','payment_method'=>$payment_method->slug()));
-		}else{
+			$this->_redirect_after_action(1, 'Payment Method', 'activated', array('action' => 'default', 'payment_method'=>$payment_method->slug()));
+		} else {
 			$this->_redirect_after_action(FALSE, 'Payment Method', 'activated', array('action' => 'default'));
 		}
 	}
@@ -674,14 +674,14 @@ 
 	/**
 	 * Deactivates the payment method with the specified slug, and redirects.
 	 */
-	protected function _deactivate_payment_method(){
-		if(isset($this->_req_data['payment_method'])){
+	protected function _deactivate_payment_method() {
+		if (isset($this->_req_data['payment_method'])) {
 			$payment_method_slug = sanitize_key($this->_req_data['payment_method']);
 			//deactivate it
 			EE_Registry::instance()->load_lib('Payment_Method_Manager');
-			$count_updated = EE_Payment_Method_Manager::instance()->deactivate_payment_method( $payment_method_slug );
-			$this->_redirect_after_action($count_updated, 'Payment Method', 'deactivated', array('action' => 'default','payment_method'=>$payment_method_slug));
-		}else{
+			$count_updated = EE_Payment_Method_Manager::instance()->deactivate_payment_method($payment_method_slug);
+			$this->_redirect_after_action($count_updated, 'Payment Method', 'deactivated', array('action' => 'default', 'payment_method'=>$payment_method_slug));
+		} else {
 			$this->_redirect_after_action(FALSE, 'Payment Method', 'deactivated', array('action' => 'default'));
 		}
 	}
@@ -695,39 +695,39 @@ 
 	 * subsequently called 'headers_sent_func' which is _payment_methods_list)
 	 * @return void
 	 */
-	protected function _update_payment_method(){
-		if( $_SERVER['REQUEST_METHOD'] == 'POST'){
+	protected function _update_payment_method() {
+		if ($_SERVER['REQUEST_METHOD'] == 'POST') {
 			//ok let's find which gateway form to use based on the form input
 			EE_Registry::instance()->load_lib('Payment_Method_Manager');
 			/** @var $correct_pmt_form_to_use EE_Payment_Method_Form */
 			$correct_pmt_form_to_use = NULL;
 			$pmt_obj = NULL;
-			foreach(EE_Payment_Method_Manager::instance()->payment_method_types() as $pmt_obj){
+			foreach (EE_Payment_Method_Manager::instance()->payment_method_types() as $pmt_obj) {
 				/** @var $pmt_obj EE_PMT_Base */
 				//get the form and simplify it, like what we do when we display it
 				$pmt_form = $pmt_obj->settings_form();
 				$this->_simplify_form($pmt_form);
-				if($pmt_form->form_data_present_in($this->_req_data)){
+				if ($pmt_form->form_data_present_in($this->_req_data)) {
 					$correct_pmt_form_to_use = $pmt_form;
 					break;
 				}
 			}
 			//if we couldn't find the correct payment method type...
-			if( ! $correct_pmt_form_to_use ){
+			if ( ! $correct_pmt_form_to_use) {
 				EE_Error::add_error(__("We could not find which payment method type your form submission related to. Please contact support", 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				$this->_redirect_after_action(FALSE, 'Payment Method', 'activated', array('action' => 'default'));
 			}
 			$correct_pmt_form_to_use->receive_form_submission($this->_req_data);
-			if($correct_pmt_form_to_use->is_valid()){
+			if ($correct_pmt_form_to_use->is_valid()) {
 				$correct_pmt_form_to_use->save();
 				$pm = $correct_pmt_form_to_use->get_model_object();
 				/** @var $pm EE_Payment_Method */
-				$this->_redirect_after_action(TRUE, 'Payment Method', 'updated', array('action' => 'default','payment_method'=>$pm->slug()));
-			}else{
+				$this->_redirect_after_action(TRUE, 'Payment Method', 'updated', array('action' => 'default', 'payment_method'=>$pm->slug()));
+			} else {
 				EE_Error::add_error(
 					sprintf(
 						__('Payment method of type %s was not saved because there were validation errors. They have been marked in the form', 'event_espresso'),
-						$pmt_obj instanceof EE_PMT_Base ? $pmt_obj->pretty_name() : __( '"(unknown)"', 'event_espresso' )
+						$pmt_obj instanceof EE_PMT_Base ? $pmt_obj->pretty_name() : __('"(unknown)"', 'event_espresso')
 					),
 					__FILE__,
 					__FUNCTION__,
@@ -744,11 +744,11 @@ 
 	protected function _payment_settings() {
 
 		$this->_template_args['values'] = $this->_yes_no_values;
-		$this->_template_args['show_pending_payment_options'] = isset( EE_Registry::instance()->CFG->registration->show_pending_payment_options ) ? absint( EE_Registry::instance()->CFG->registration->show_pending_payment_options ) : FALSE;
+		$this->_template_args['show_pending_payment_options'] = isset(EE_Registry::instance()->CFG->registration->show_pending_payment_options) ? absint(EE_Registry::instance()->CFG->registration->show_pending_payment_options) : FALSE;
 
-		$this->_set_add_edit_form_tags( 'update_payment_settings' );
-		$this->_set_publish_post_box_vars( NULL, FALSE, FALSE, NULL, FALSE );
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( EE_PAYMENTS_TEMPLATE_PATH . 'payment_settings.template.php', $this->_template_args, TRUE );
+		$this->_set_add_edit_form_tags('update_payment_settings');
+		$this->_set_publish_post_box_vars(NULL, FALSE, FALSE, NULL, FALSE);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(EE_PAYMENTS_TEMPLATE_PATH.'payment_settings.template.php', $this->_template_args, TRUE);
 		$this->display_admin_page_with_sidebar();
 
 	}
@@ -762,13 +762,13 @@ 
 	*		@return array
 	*/
 	protected function _update_payment_settings() {
-		EE_Registry::instance()->CFG->registration->show_pending_payment_options = isset( $this->_req_data['show_pending_payment_options'] ) ? $this->_req_data['show_pending_payment_options'] : FALSE;
-		EE_Registry::instance()->CFG = apply_filters( 'FHEE__Payments_Admin_Page___update_payment_settings__CFG', EE_Registry::instance()->CFG );
+		EE_Registry::instance()->CFG->registration->show_pending_payment_options = isset($this->_req_data['show_pending_payment_options']) ? $this->_req_data['show_pending_payment_options'] : FALSE;
+		EE_Registry::instance()->CFG = apply_filters('FHEE__Payments_Admin_Page___update_payment_settings__CFG', EE_Registry::instance()->CFG);
 
 
-		$what = __('Payment Settings','event_espresso');
-		$success = $this->_update_espresso_configuration( $what, EE_Registry::instance()->CFG, __FILE__, __FUNCTION__, __LINE__ );
-		$this->_redirect_after_action( $success, $what, __('updated','event_espresso'), array( 'action' => 'payment_settings' ) );
+		$what = __('Payment Settings', 'event_espresso');
+		$success = $this->_update_espresso_configuration($what, EE_Registry::instance()->CFG, __FILE__, __FUNCTION__, __LINE__);
+		$this->_redirect_after_action($success, $what, __('updated', 'event_espresso'), array('action' => 'payment_settings'));
 
 	}
 	protected function _payment_log_overview_list_table() {
@@ -794,18 +794,18 @@ 
 	 * @param bool $count
 	 * @return array
 	 */
-	public function get_payment_logs($per_page = 50, $current_page = 0, $count = false){
-		EE_Registry::instance()->load_model( 'Change_Log' );
+	public function get_payment_logs($per_page = 50, $current_page = 0, $count = false) {
+		EE_Registry::instance()->load_model('Change_Log');
 		//we may need to do multiple queries (joining differently), so we actually wan tan array of query params
-		$query_params =  array(array('LOG_type'=>  EEM_Change_Log::type_gateway));
+		$query_params = array(array('LOG_type'=>  EEM_Change_Log::type_gateway));
 		//check if they've selected a specific payment method
-		if( isset($this->_req_data['_payment_method']) && $this->_req_data['_payment_method'] !== 'all'){
+		if (isset($this->_req_data['_payment_method']) && $this->_req_data['_payment_method'] !== 'all') {
 			$query_params[0]['OR*pm_or_pay_pm'] = array('Payment.Payment_Method.PMD_ID'=>$this->_req_data['_payment_method'],
 				'Payment_Method.PMD_ID'=>$this->_req_data['_payment_method']);
 		}
 		//take into account search
-		if(isset($this->_req_data['s']) && $this->_req_data['s']){
-			$similarity_string = array('LIKE','%'.str_replace("","%",$this->_req_data['s']) .'%');
+		if (isset($this->_req_data['s']) && $this->_req_data['s']) {
+			$similarity_string = array('LIKE', '%'.str_replace("", "%", $this->_req_data['s']).'%');
 			$query_params[0]['OR*s']['Payment.Transaction.Registration.Attendee.ATT_fname'] = $similarity_string;
 			$query_params[0]['OR*s']['Payment.Transaction.Registration.Attendee.ATT_lname'] = $similarity_string;
 			$query_params[0]['OR*s']['Payment.Transaction.Registration.Attendee.ATT_email'] = $similarity_string;
@@ -820,48 +820,48 @@ 
 			$query_params[0]['OR*s']['LOG_message'] = $similarity_string;
 
 		}
-		if(isset( $this->_req_data['payment-filter-start-date'] ) && isset( $this->_req_data['payment-filter-end-date'] )){
+		if (isset($this->_req_data['payment-filter-start-date']) && isset($this->_req_data['payment-filter-end-date'])) {
 			//add date
-			$start_date =wp_strip_all_tags( $this->_req_data['payment-filter-start-date'] );
-			$end_date = wp_strip_all_tags( $this->_req_data['payment-filter-end-date'] );
+			$start_date = wp_strip_all_tags($this->_req_data['payment-filter-start-date']);
+			$end_date = wp_strip_all_tags($this->_req_data['payment-filter-end-date']);
 			//make sure our timestamps start and end right at the boundaries for each day
-			$start_date = date( 'Y-m-d', strtotime( $start_date ) ) . ' 00:00:00';
-			$end_date = date( 'Y-m-d', strtotime( $end_date ) ) . ' 23:59:59';
+			$start_date = date('Y-m-d', strtotime($start_date)).' 00:00:00';
+			$end_date = date('Y-m-d', strtotime($end_date)).' 23:59:59';
 
 			//convert to timestamps
-			$start_date = strtotime( $start_date );
-			$end_date = strtotime( $end_date );
+			$start_date = strtotime($start_date);
+			$end_date = strtotime($end_date);
 
 			//makes sure start date is the lowest value and vice versa
-			$start_date = min( $start_date, $end_date );
-			$end_date = max( $start_date, $end_date );
+			$start_date = min($start_date, $end_date);
+			$end_date = max($start_date, $end_date);
 
 			//convert for query
-			$start_date = EEM_Change_Log::instance()->convert_datetime_for_query( 'LOG_time', date( 'Y-m-d H:i:s', $start_date ), 'Y-m-d H:i:s' );
-			$end_date = EEM_Change_Log::instance()->convert_datetime_for_query( 'LOG_time', date( 'Y-m-d H:i:s', $end_date ), 'Y-m-d H:i:s' );
+			$start_date = EEM_Change_Log::instance()->convert_datetime_for_query('LOG_time', date('Y-m-d H:i:s', $start_date), 'Y-m-d H:i:s');
+			$end_date = EEM_Change_Log::instance()->convert_datetime_for_query('LOG_time', date('Y-m-d H:i:s', $end_date), 'Y-m-d H:i:s');
 
-			$query_params[0]['LOG_time'] = array('BETWEEN',array($start_date,$end_date));
+			$query_params[0]['LOG_time'] = array('BETWEEN', array($start_date, $end_date));
 
 		}
-		if($count){
+		if ($count) {
 			return EEM_Change_Log::instance()->count($query_params);
 		}
-		if(isset($this->_req_data['order'])){
-			$sort = ( isset( $this->_req_data['order'] ) && ! empty( $this->_req_data['order'] )) ? $this->_req_data['order'] : 'DESC';
+		if (isset($this->_req_data['order'])) {
+			$sort = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order'] : 'DESC';
 			$query_params['order_by'] = array('LOG_time' => $sort);
-		}else{
+		} else {
 				$query_params['order_by'] = array('LOG_time' => 'DESC');
 		}
-		$offset = ($current_page-1)*$per_page;
+		$offset = ($current_page - 1) * $per_page;
 
-		if( ! isset($this->_req_data['download_results'])){
-			$query_params['limit'] = array( $offset, $per_page );
+		if ( ! isset($this->_req_data['download_results'])) {
+			$query_params['limit'] = array($offset, $per_page);
 		}
 
 
 
 		//now they've requested to instead just download the file instead of viewing it.
-		if(isset($this->_req_data['download_results'])){
+		if (isset($this->_req_data['download_results'])) {
 			$wpdb_results = EEM_Change_Log::instance()->get_all_efficiently($query_params);
 			header('Content-Disposition: attachment');
 			header("Content-Disposition: attachment; filename=ee_payment_logs_for_".sanitize_key(site_url()));
@@ -883,36 +883,36 @@ 
 	 * @param EE_Change_Log $logB
 	 * @return int
 	 */
-	protected function _sort_logs_again($logA,$logB){
+	protected function _sort_logs_again($logA, $logB) {
 		$timeA = $logA->get_raw('LOG_time');
 		$timeB = $logB->get_raw('LOG_time');
-		if($timeA == $timeB){
+		if ($timeA == $timeB) {
 			return 0;
 		}
 		$comparison = $timeA < $timeB ? -1 : 1;
-		if(strtoupper($this->_sort_logs_again_direction) == 'DESC'){
+		if (strtoupper($this->_sort_logs_again_direction) == 'DESC') {
 			return $comparison * -1;
-		}else{
+		} else {
 			return $comparison;
 		}
 	}
 
 	protected function _payment_log_details() {
-		EE_Registry::instance()->load_model( 'Change_Log' );
+		EE_Registry::instance()->load_model('Change_Log');
 		/** @var $payment_log EE_Change_Log */
 		$payment_log = EEM_Change_Log::instance()->get_one_by_ID($this->_req_data['ID']);
 		$payment_method = NULL;
 		$transaction = NULL;
-		if( $payment_log instanceof EE_Change_Log ){
-			if( $payment_log->object() instanceof EE_Payment ){
+		if ($payment_log instanceof EE_Change_Log) {
+			if ($payment_log->object() instanceof EE_Payment) {
 				$payment_method = $payment_log->object()->payment_method();
 				$transaction = $payment_log->object()->transaction();
-			}elseif($payment_log->object() instanceof EE_Payment_Method){
+			}elseif ($payment_log->object() instanceof EE_Payment_Method) {
 				$payment_method = $payment_log->object();
 			}
 		}
 		$this->_template_args['admin_page_content'] = EEH_Template::display_template(
-			EE_PAYMENTS_TEMPLATE_PATH . 'payment_log_details.template.php',
+			EE_PAYMENTS_TEMPLATE_PATH.'payment_log_details.template.php',
 			array(
 				'payment_log'=>$payment_log,
 				'payment_method'=>$payment_method,

admin_pages/registrations/Registrations_Admin_Page.core.php

Doc Comments +4 added lines, -2 removed lines

@@ -1565,8 +1565,6 @@ 
 	 * 		form_form_field_input__wrap
 	 *
 	 * 		@access 		public
-	 * 		@param 		string 		$label
-	 * 		@return 		string
 	 */
 	public function form_form_field_input__wrap( $input ) {
 		return '
@@ -1649,6 +1647,10 @@ 
 
 
 	//TODO: try changing this to use the model directly... not indirectly through creating a default object...
+
+	/**
+	 * @param boolean $REG_ID
+	 */
 	private function _save_new_answer( $REG_ID, $QST_ID, $ans ) {
 		$set_values = array(
 			'QST_ID' => $QST_ID,

Indentation +69 added lines, -69 removed lines

@@ -124,9 +124,9 @@ 
 
 	/**
 	 * 		grab url requests and route them
-	*		@access private
-	*		@return void
-	*/
+	 *		@access private
+	 *		@return void
+	 */
 	public function _set_page_routes() {
 
 		$this->_get_registration_status_array();
@@ -398,7 +398,7 @@ 
 						'title' => __('Registrations Other', 'event_espresso'),
 						'filename' => 'registrations_overview_other'
 					)
-                ),
+				),
 				'help_tour' => array( 'Registration_Overview_Help_Tour' ),
 				'qtips' => array('Registration_List_Table_Tips'),
 				'list_table' => 'EE_Registrations_List_Table',
@@ -412,7 +412,7 @@ 
 					'url' => isset($this->_req_data['_REG_ID']) ? add_query_arg(array('_REG_ID' => $this->_req_data['_REG_ID'] ), $this->_current_page_view_url )  : $this->_admin_base_url,
 					'persistent' => FALSE
 					),
-                'help_tabs' => array(
+				'help_tabs' => array(
 					'registrations_details_help_tab' => array(
 						'title' => __('Registration Details', 'event_espresso'),
 						'filename' => 'registrations_details'
@@ -476,7 +476,7 @@ 
 					'order' => 20
 					),
 				'list_table' => 'EE_Attendee_Contact_List_Table',
-                'help_tabs' => array(
+				'help_tabs' => array(
 					'registrations_contact_list_help_tab' => array(
 						'title' => __('Registrations Contact List', 'event_espresso'),
 						'filename' => 'registrations_contact_list'
@@ -493,7 +493,7 @@ 
 						'title' => __('Contact List Other', 'event_espresso'),
 						'filename' => 'registrations_contact_list_other'
 					)
-                ),
+				),
 				'help_tour' => array( 'Contact_List_Help_Tour' ),
 				'metaboxes' => array(),
 				'require_nonce' => FALSE
@@ -527,9 +527,9 @@ 
 
 	/**
 	 * 		get list of registration statuses
-	*		@access private
-	*		@return void
-	*/
+	 *		@access private
+	 *		@return void
+	 */
 	private function _get_registration_status_array() {
 		self::$_reg_status = EEM_Registration::reg_status_array( array(), TRUE);
 	}
@@ -830,7 +830,7 @@ 
 			return TRUE;
 		}
 
-	    $REG = EEM_Registration::instance();
+		$REG = EEM_Registration::instance();
 
 		$REG_ID = ( ! empty( $this->_req_data['_REG_ID'] )) ? absint( $this->_req_data['_REG_ID'] ) : FALSE;
 
@@ -1051,9 +1051,9 @@ 
 
 	/**
 	 * 		generates HTML for the View Registration Details Admin page
-	*		@access protected
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@return void
+	 */
 	protected function _registration_details() {
 
 		$this->_template_args = array();
@@ -1130,9 +1130,9 @@ 
 
 	/**
 	 * 		_set_approve_or_decline_reg_status_buttons
-	*		@access protected
-	*		@return string
-	*/
+	 *		@access protected
+	 *		@return string
+	 */
 	public function set_reg_status_buttons_metabox() {
 
 		//is registration for free event OR for a completed transaction? This will determine whether the set to pending option is shown.
@@ -1321,10 +1321,10 @@ 
 
 	/**
 	 * 		approve_registration
-	*		@access protected
-	*		@param bool $notify whether or not to notify the registrant about their approval.
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@param bool $notify whether or not to notify the registrant about their approval.
+	 *		@return void
+	 */
 	protected function approve_registration( $notify = false ) {
 		$this->_reg_status_change_return( EEM_Registration::status_id_approved, $notify );
 	}
@@ -1334,10 +1334,10 @@ 
 
 	/**
 	 * 		decline_registration
-	*		@access protected
-	*		@param bool $notify whether or not to notify the registrant about their approval.
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@param bool $notify whether or not to notify the registrant about their approval.
+	 *		@return void
+	 */
 	protected function decline_registration( $notify = false ) {
 		$this->_reg_status_change_return( EEM_Registration::status_id_declined, $notify );
 	}
@@ -1347,10 +1347,10 @@ 
 
 	/**
 	 * 		cancel_registration
-	*		@access protected
-	*		@param bool $notify whether or not to notify the registrant about their approval.
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@param bool $notify whether or not to notify the registrant about their approval.
+	 *		@return void
+	 */
 	protected function cancel_registration( $notify = false ) {
 		$this->_reg_status_change_return( EEM_Registration::status_id_cancelled, $notify );
 	}
@@ -1361,10 +1361,10 @@ 
 
 	/**
 	 * 		not_approve_registration
-	*		@access protected
-	*		@param bool $notify whether or not to notify the registrant about their approval.
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@param bool $notify whether or not to notify the registrant about their approval.
+	 *		@return void
+	 */
 	protected function not_approve_registration( $notify = false ) {
 		$this->_reg_status_change_return( EEM_Registration::status_id_not_approved, $notify );
 	}
@@ -1373,10 +1373,10 @@ 
 
 	/**
 	 * 		decline_registration
-	*		@access protected
-	*		@param bool $notify whether or not to notify the registrant about their approval.
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@param bool $notify whether or not to notify the registrant about their approval.
+	 *		@return void
+	 */
 	protected function pending_registration( $notify = false ) {
 		$this->_reg_status_change_return( EEM_Registration::status_id_pending_payment, $notify );
 	}
@@ -1386,9 +1386,9 @@ 
 
 	/**
 	 * 		generates HTML for the Registration main meta box
-	*		@access public
-	*		@return void
-	*/
+	 *		@access public
+	 *		@return void
+	 */
 	public function _reg_details_meta_box() {
 		EEH_Autoloader::register_line_item_display_autoloaders();
 		EEH_Autoloader::register_line_item_filter_autoloaders();
@@ -1471,9 +1471,9 @@ 
 
 	/**
 	 * 		generates HTML for the Registration Questions meta box
-	*		@access public
-	*		@return void
-	*/
+	 *		@access public
+	 *		@return void
+	 */
 	public function _reg_questions_meta_box() {
 
 		add_filter( 'FHEE__EEH_Form_Fields__generate_question_groups_html__before_question_group_questions', array( $this, 'form_before_question_group' ), 10, 1 );
@@ -1581,9 +1581,9 @@ 
 
 	/**
 	 * 		generates HTML for the Registration main meta box
-	*		@access protected
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@return void
+	 */
 	protected function _update_attendee_registration_form() {
 		$qstns = isset( $this->_req_data['qstn'] ) ? $this->_req_data['qstn'] : FALSE;
 		$REG_ID = isset( $this->_req_data['_REG_ID'] ) ? absint( $this->_req_data['_REG_ID'] ) : FALSE;
@@ -1665,12 +1665,12 @@ 
 
 	/**
 	 * 		generates HTML for the Registration main meta box
-	*		@access public
-	*		@return void
-	*/
+	 *		@access public
+	 *		@return void
+	 */
 	public function _reg_attendees_meta_box() {
 
-	    $REG = EEM_Registration::instance();
+		$REG = EEM_Registration::instance();
 		//get all other registrations on this transaction, and cache
 		//the attendees for them so we don't have to run another query using force_join
 		$registrations = $REG->get_all(array(
@@ -1723,9 +1723,9 @@ 
 
 	/**
 	 * 		generates HTML for the Edit Registration side meta box
-	*		@access public
-	*		@return void
-	*/
+	 *		@access public
+	 *		@return void
+	 */
 	public function _reg_registrant_side_meta_box() {
 
 		/*@var $attendee EE_Attendee */
@@ -2071,9 +2071,9 @@ 
 
 	/**
 	 * 		set_reg_event
-	*		@access private
-	*		@return boolean
-	*/
+	 *		@access private
+	 *		@return boolean
+	 */
 	private function _set_reg_event() {
 		if ( is_object( $this->_reg_event )) {
 			return TRUE;
@@ -2177,9 +2177,9 @@ 
 
 	/**
 	 * 		generates HTML for the Attendee Contact List
-	*		@access protected
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@return void
+	 */
 	protected function _attendee_contact_list_table() {
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
 		$this->_search_btn_label = __('Contacts', 'event_espresso');
@@ -2193,9 +2193,9 @@ 
 	/**
 	 * 		get_attendees
 	 * 		@param bool $count whether to return count or data.
-	*		@access public
-	*		@return array
-	*/
+	 *		@access public
+	 *		@return array
+	 */
 	public function get_attendees( $per_page, $count = FALSE, $trash = FALSE ) {
 
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
@@ -2513,9 +2513,9 @@ 
 
 	/**
 	 * 		_attendee_details
-	*		@access protected
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@return void
+	 */
 	public function attendee_registrations_meta_box( $post ) {
 
 		$this->_template_args['attendee'] = $this->_cpt_model_obj;
@@ -2548,10 +2548,10 @@ 
 
 	/**
 	 * 		_trash_or_restore_attendee
-	*		@param boolean 		$trash - whether to move item to trash (TRUE) or restore it (FALSE)
-	*		@access protected
-	*		@return void
-	*/
+	 *		@param boolean 		$trash - whether to move item to trash (TRUE) or restore it (FALSE)
+	 *		@access protected
+	 *		@return void
+	 */
 	protected function _trash_or_restore_attendees( $trash = TRUE ) {
 
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );

Braces +30 added lines, -21 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *
@@ -79,8 +81,9 @@ 
 	public function clear_comment_link( $link, $comment, $args ) {
 		//gotta make sure this only happens on this route
 		$post_type = get_post_type( $comment->comment_post_ID);
-		if ( $post_type == 'espresso_attendees' )
-			return '#commentsdiv';
+		if ( $post_type == 'espresso_attendees' ) {
+					return '#commentsdiv';
+		}
 		return $link;
 	}
 
@@ -834,9 +837,9 @@ 
 
 		$REG_ID = ( ! empty( $this->_req_data['_REG_ID'] )) ? absint( $this->_req_data['_REG_ID'] ) : FALSE;
 
-		if ( $this->_registration = $REG->get_one_by_ID( $REG_ID ))
-			return TRUE;
-		else {
+		if ( $this->_registration = $REG->get_one_by_ID( $REG_ID )) {
+					return TRUE;
+		} else {
 			$error_msg = sprintf( __('An error occurred and the details for Registration ID #%s could not be retrieved.', 'event_espresso'), $REG_ID );
 			EE_Error::add_error( $error_msg, __FILE__, __FUNCTION__, __LINE__ );
 			$this->_registration = NULL;
@@ -933,7 +936,7 @@ 
 					EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $curdate . $time_start, 'Y-m-d H:i:s' ),
 					EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $curdate . $time_end, 'Y-m-d H:i:s' ),
 			));
-		}elseif($this_month_a || $this_month){
+		} elseif($this_month_a || $this_month){
 			$this_month_r = date('m', current_time('timestamp'));
 			$days_this_month = date( 't', current_time('timestamp') );
 			$_where['REG_date']= array('BETWEEN',
@@ -941,18 +944,18 @@ 
 					EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $this_year_r . '-' . $this_month_r . '-01' . ' ' . $time_start, 'Y-m-d H:i:s' ),
 					EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $this_year_r . '-' . $this_month_r . '-' . $days_this_month . ' ' . $time_end, 'Y-m-d H:i:s' )
 			));
-		}elseif($month_range){
+		} elseif($month_range){
 			$pieces = explode(' ', $this->_req_data['month_range'], 3);
 			$month_r = !empty($pieces[0]) ? date('m', strtotime($pieces[0])) : '';
 			$year_r = !empty($pieces[1]) ? $pieces[1] : '';
 			$days_in_month = date('t', strtotime($year_r .  '-' . $month_r . '-' . '01') );
 			$_where['REG_date']= array('BETWEEN',
 				array(  EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $year_r . '-' . $month_r . '-01 00:00:00', 'Y-m-d H:i:s'), EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $year_r . '-' . $month_r . '-' . $days_in_month .  ' 23:59:59', 'Y-m-d H:i:s' ) ) );
-		}elseif($start_date && $end_date){
+		} elseif($start_date && $end_date){
 			throw new EE_Error("not yet supported");
-		}elseif($start_date){
+		} elseif($start_date){
 			throw new EE_Error("not yet supported");
-		}elseif($end_date){
+		} elseif($end_date){
 			throw new EE_Error("not yet supported");
 		}
 
@@ -1876,8 +1879,9 @@ 
 			// cycle thru checkboxes
 			while (list( $ind, $REG_ID ) = each($this->_req_data['_REG_ID'])) {
 				$REG = $REG_MDL->get_one_by_ID($REG_ID);
-				if ( ! $REG instanceof EE_Registration )
-					continue;
+				if ( ! $REG instanceof EE_Registration ) {
+									continue;
+				}
 				$deleted = $this->_delete_registration($REG);
 				if ( !$deleted ) {
 					$success = 0;
@@ -1916,8 +1920,9 @@ 
 
 		$all_trashed = TRUE;
 		foreach ( $REGS as $registration ) {
-			if ( ! $registration->get('REG_deleted') )
-				$all_trashed = FALSE;
+			if ( ! $registration->get('REG_deleted') ) {
+							$all_trashed = FALSE;
+			}
 		}
 
 		if ( ! $all_trashed ) {
@@ -1943,8 +1948,10 @@ 
 			//now delete permanently the checkins related to this registration.
 			$registration->delete_related_permanently('Checkin');
 
-			if ( $registration->ID() === $REG->ID() )
-				continue; //we don't want to delete permanently the existing registration just yet.
+			if ( $registration->ID() === $REG->ID() ) {
+							continue;
+			}
+			//we don't want to delete permanently the existing registration just yet.
 
 			//remove relation to transaction for these registrations if NOT the existing registrations
 			$registration->_remove_relations('Transaction');
@@ -1997,8 +2004,9 @@ 
 
 		$this->_template_args['step_content'] = $this->_get_registration_step_content();
 
-		if ( defined('DOING_AJAX' ) )
-			$this->_return_json();
+		if ( defined('DOING_AJAX' ) ) {
+					$this->_return_json();
+		}
 
 
 		// grab header
@@ -2412,8 +2420,9 @@ 
 			}
 		}
 
-		if ( $success === FALSE )
-			EE_Error::add_error(__('Something went wrong with updating the meta table data for the registration.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if ( $success === FALSE ) {
+					EE_Error::add_error(__('Something went wrong with updating the meta table data for the registration.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		}
 
 	}
 

Spacing +510 added lines, -510 removed lines

@@ -42,8 +42,8 @@ 
 	 * @param bool $routing
 	 * @return Registrations_Admin_Page
 	 */
-	public function __construct( $routing = TRUE ) {
-		parent::__construct( $routing );
+	public function __construct($routing = TRUE) {
+		parent::__construct($routing);
 	}
 
 
@@ -75,16 +75,16 @@ 
 				'trash' => 'post.php'
 			);
 
-		add_action('edit_form_after_title', array($this, 'after_title_form_fields'), 10 );
+		add_action('edit_form_after_title', array($this, 'after_title_form_fields'), 10);
 		//add filters so that the comment urls don't take users to a confusing 404 page
-		add_filter('get_comment_link', array( $this, 'clear_comment_link' ), 10, 3 );
+		add_filter('get_comment_link', array($this, 'clear_comment_link'), 10, 3);
 	}
 
 
-	public function clear_comment_link( $link, $comment, $args ) {
+	public function clear_comment_link($link, $comment, $args) {
 		//gotta make sure this only happens on this route
-		$post_type = get_post_type( $comment->comment_post_ID);
-		if ( $post_type == 'espresso_attendees' )
+		$post_type = get_post_type($comment->comment_post_ID);
+		if ($post_type == 'espresso_attendees')
 			return '#commentsdiv';
 		return $link;
 	}
@@ -92,7 +92,7 @@ 
 
 	protected function _ajax_hooks() {
 		//todo: all hooks for registrations ajax goes in here
-		add_action( 'wp_ajax_toggle_checkin_status', array( $this, 'toggle_checkin_status' ));
+		add_action('wp_ajax_toggle_checkin_status', array($this, 'toggle_checkin_status'));
 	}
 
 
@@ -107,8 +107,8 @@ 
 					'add-attendee' => __('Add Contact', 'event_espresso'),
 					'edit' => __('Edit Contact', 'event_espresso'),
 					'report'=>  __("Event Registrations CSV Report", "event_espresso"),
-					'report_all' => __( 'All Registrations CSV Report', 'event_espresso' ),
-					'contact_list_report' => __( 'Contact List Report', 'event_espresso' ),
+					'report_all' => __('All Registrations CSV Report', 'event_espresso'),
+					'contact_list_report' => __('Contact List Report', 'event_espresso'),
 					'contact_list_export'=>  __("Export Data", "event_espresso"),
 				),
 			'publishbox' => array(
@@ -136,9 +136,9 @@ 
 
 		$this->_get_registration_status_array();
 
-		$reg_id = ! empty( $this->_req_data['_REG_ID'] ) && ! is_array( $this->_req_data['_REG_ID'] ) ? $this->_req_data['_REG_ID'] : 0;
-		$att_id = ! empty( $this->_req_data[ 'ATT_ID' ] ) && ! is_array( $this->_req_data['ATT_ID'] ) ? $this->_req_data['ATT_ID'] : 0;
-		$att_id = ! empty( $this->_req_data['post'] ) && ! is_array( $this->_req_data['post'] ) ? $this->_req_data['post'] : $att_id;
+		$reg_id = ! empty($this->_req_data['_REG_ID']) && ! is_array($this->_req_data['_REG_ID']) ? $this->_req_data['_REG_ID'] : 0;
+		$att_id = ! empty($this->_req_data['ATT_ID']) && ! is_array($this->_req_data['ATT_ID']) ? $this->_req_data['ATT_ID'] : 0;
+		$att_id = ! empty($this->_req_data['post']) && ! is_array($this->_req_data['post']) ? $this->_req_data['post'] : $att_id;
 
 		$this->_page_routes = array(
 
@@ -155,7 +155,7 @@ 
 
 				'edit_registration'	=> array(
 						'func' => '_registration_details',
-						'args' => array( 'edit' ),
+						'args' => array('edit'),
 						'noheader' => TRUE,
 						'capability' => 'ee_edit_registration',
 						'obj_id' => $reg_id
@@ -170,7 +170,7 @@ 
 
 				'restore_registrations' => array(
 					'func' => '_trash_or_restore_registrations',
-					'args' => array( 'trash' => FALSE ),
+					'args' => array('trash' => FALSE),
 					'noheader' => TRUE,
 					'capability' => 'ee_delete_registrations'
 					),
@@ -404,7 +404,7 @@ 
 						'filename' => 'registrations_overview_other'
 					)
                 ),
-				'help_tour' => array( 'Registration_Overview_Help_Tour' ),
+				'help_tour' => array('Registration_Overview_Help_Tour'),
 				'qtips' => array('Registration_List_Table_Tips'),
 				'list_table' => 'EE_Registrations_List_Table',
 				'require_nonce' => FALSE
@@ -414,7 +414,7 @@ 
 				'nav' => array(
 					'label' => __('REG Details', 'event_espresso'),
 					'order' => 15,
-					'url' => isset($this->_req_data['_REG_ID']) ? add_query_arg(array('_REG_ID' => $this->_req_data['_REG_ID'] ), $this->_current_page_view_url )  : $this->_admin_base_url,
+					'url' => isset($this->_req_data['_REG_ID']) ? add_query_arg(array('_REG_ID' => $this->_req_data['_REG_ID']), $this->_current_page_view_url) : $this->_admin_base_url,
 					'persistent' => FALSE
 					),
                 'help_tabs' => array(
@@ -435,8 +435,8 @@ 
 						'filename' => 'registrations_details_registrant_details'
 						)
 					),
-				'help_tour' => array( 'Registration_Details_Help_Tour' ),
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array( '_registration_details_metaboxes' ) ),
+				'help_tour' => array('Registration_Details_Help_Tour'),
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_registration_details_metaboxes')),
 				'require_nonce' => FALSE
 				),
 
@@ -460,7 +460,7 @@ 
 					'order' => 15,
 					'persistent' => FALSE
 					),
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array('_publish_post_box', 'attendee_editor_metaboxes' ) ),
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box', 'attendee_editor_metaboxes')),
 				'require_nonce' => FALSE
 				),
 
@@ -469,7 +469,7 @@ 
 					'label' => __('Edit Contact', 'event_espresso'),
 					'order' => 15,
 					'persistent' => FALSE,
-					'url' => isset($this->_req_data['ATT_ID']) ? add_query_arg(array('ATT_ID' => $this->_req_data['ATT_ID'] ), $this->_current_page_view_url )  : $this->_admin_base_url
+					'url' => isset($this->_req_data['ATT_ID']) ? add_query_arg(array('ATT_ID' => $this->_req_data['ATT_ID']), $this->_current_page_view_url) : $this->_admin_base_url
 					),
 				'metaboxes' => array('attendee_editor_metaboxes'),
 				'require_nonce' => FALSE
@@ -499,7 +499,7 @@ 
 						'filename' => 'registrations_contact_list_other'
 					)
                 ),
-				'help_tour' => array( 'Contact_List_Help_Tour' ),
+				'help_tour' => array('Contact_List_Help_Tour'),
 				'metaboxes' => array(),
 				'require_nonce' => FALSE
 				),
@@ -518,7 +518,7 @@ 
 	protected function _add_screen_options() {}
 	protected function _add_feature_pointers() {}
 	public function admin_init() {
-		EE_Registry::$i18n_js_strings[ 'update_att_qstns' ] = __( 'click "Update Registration Questions" to save your changes', 'event_espresso' );
+		EE_Registry::$i18n_js_strings['update_att_qstns'] = __('click "Update Registration Questions" to save your changes', 'event_espresso');
 	}
 	public function admin_notices() {}
 	public function admin_footer_scripts() {}
@@ -536,7 +536,7 @@ 
 	*		@return void
 	*/
 	private function _get_registration_status_array() {
-		self::$_reg_status = EEM_Registration::reg_status_array( array(), TRUE);
+		self::$_reg_status = EEM_Registration::reg_status_array(array(), TRUE);
 	}
 
 
@@ -559,11 +559,11 @@ 
 	public function load_scripts_styles() {
 		//style
 		//wp_register_style('espresso_attendees', ATT_ASSETS_URL . 'espresso_attendees_admin.css', array(), EVENT_ESPRESSO_VERSION );
-		wp_register_style('espresso_reg', REG_ASSETS_URL . 'espresso_registrations_admin.css', array('ee-admin-css'), EVENT_ESPRESSO_VERSION );
+		wp_register_style('espresso_reg', REG_ASSETS_URL.'espresso_registrations_admin.css', array('ee-admin-css'), EVENT_ESPRESSO_VERSION);
 		wp_enqueue_style('espresso_reg');
 
 		//script
-		wp_register_script('espresso_reg', REG_ASSETS_URL . 'espresso_registrations_admin.js', array('jquery-ui-datepicker', 'jquery-ui-draggable', 'ee_admin_js'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_register_script('espresso_reg', REG_ASSETS_URL.'espresso_registrations_admin.js', array('jquery-ui-datepicker', 'jquery-ui-draggable', 'ee_admin_js'), EVENT_ESPRESSO_VERSION, TRUE);
 		wp_enqueue_script('espresso_reg');
 	}
 
@@ -572,9 +572,9 @@ 
 	public function load_scripts_styles_edit_attendee() {
 		//stuff to only show up on our attendee edit details page.
 		$attendee_details_translations = array(
-			'att_publish_text' => sprintf( __('Created on: <b>%1$s</b>', 'event_espresso'), $this->_cpt_model_obj->get_datetime('ATT_created') )
+			'att_publish_text' => sprintf(__('Created on: <b>%1$s</b>', 'event_espresso'), $this->_cpt_model_obj->get_datetime('ATT_created'))
 			);
-		wp_localize_script( 'espresso_reg', 'ATTENDEE_DETAILS', $attendee_details_translations );
+		wp_localize_script('espresso_reg', 'ATTENDEE_DETAILS', $attendee_details_translations);
 		wp_enqueue_script('jquery-validate');
 	}
 
@@ -592,7 +592,7 @@ 
 
 	public function load_scripts_styles_contact_list() {
 		wp_deregister_style('espresso_reg');
-		wp_register_style('espresso_att', REG_ASSETS_URL . 'espresso_attendees_admin.css', array('ee-admin-css'), EVENT_ESPRESSO_VERSION );
+		wp_register_style('espresso_att', REG_ASSETS_URL.'espresso_attendees_admin.css', array('ee-admin-css'), EVENT_ESPRESSO_VERSION);
 		wp_enqueue_style('espresso_att');
 	}
 
@@ -601,9 +601,9 @@ 
 
 
 	public function load_scripts_styles_new_registration() {
-		wp_register_script( 'ee-spco-for-admin', REG_ASSETS_URL . 'spco_for_admin.js', array('underscore', 'jquery'), EVENT_ESPRESSO_VERSION, TRUE );
+		wp_register_script('ee-spco-for-admin', REG_ASSETS_URL.'spco_for_admin.js', array('underscore', 'jquery'), EVENT_ESPRESSO_VERSION, TRUE);
 		wp_enqueue_script('ee-spco-for-admin');
-		add_filter('FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', '__return_true' );
+		add_filter('FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', '__return_true');
 		EE_Form_Section_Proper::wp_enqueue_scripts();
 		EED_Ticket_Selector::load_tckt_slctr_assets();
 		EE_Datepicker_Input::enqueue_styles_and_scripts();
@@ -642,23 +642,23 @@ 
 
 		/** setup reg status bulk actions **/
 		$def_reg_status_actions['approve_registration'] = __('Approve Registrations', 'event_espresso');
-		if ( in_array( $match_array['approve_registration'], $active_mts ) && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'batch_send_messages' ) ) {
+		if (in_array($match_array['approve_registration'], $active_mts) && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'batch_send_messages')) {
 			$def_reg_status_actions['approve_and_notify_registration'] = __('Approve and Notify Registrations', 'event_espresso');
 		}
 		$def_reg_status_actions['decline_registration'] = __('Decline Registrations', 'event_espresso');
-		if ( in_array( $match_array['decline_registration'], $active_mts ) && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'batch_send_messages' ) ) {
+		if (in_array($match_array['decline_registration'], $active_mts) && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'batch_send_messages')) {
 			$def_reg_status_actions['decline_and_notify_registration'] = __('Decline and Notify Registrations', 'event_espresso');
 		}
 		$def_reg_status_actions['pending_registration'] = __('Set Registrations to Pending Payment', 'event_espresso');
-		if ( in_array( $match_array['pending_registration'], $active_mts ) && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'batch_send_messages' ) ) {
+		if (in_array($match_array['pending_registration'], $active_mts) && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'batch_send_messages')) {
 			$def_reg_status_actions['pending_and_notify_registration'] = __('Set Registrations to Pending Payment and Notify', 'event_espresso');
 		}
 		$def_reg_status_actions['no_approve_registration'] = __('Set Registrations to Not Approved', 'event_espresso');
-		if ( in_array( $match_array['no_approve_registration'], $active_mts ) && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'batch_send_messages' ) ) {
+		if (in_array($match_array['no_approve_registration'], $active_mts) && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'batch_send_messages')) {
 			$def_reg_status_actions['no_approve_and_notify_registration'] = __('Set Registrations to Not Approved and Notify', 'event_espresso');
 		}
 		$def_reg_status_actions['cancel_registration'] = __('Cancel Registrations', 'event_espresso');
-		if ( in_array( $match_array['cancel_registration'], $active_mts ) && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'batch_send_messages' ) ) {
+		if (in_array($match_array['cancel_registration'], $active_mts) && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'batch_send_messages')) {
 			$def_reg_status_actions['cancel_and_notify_registration'] = __('Cancel Registrations and Notify', 'event_espresso');
 		}
 
@@ -667,29 +667,29 @@ 
 				'slug' => 'all',
 				'label' => __('View All Registrations', 'event_espresso'),
 				'count' => 0,
-				'bulk_action' => array_merge( $def_reg_status_actions, array(
+				'bulk_action' => array_merge($def_reg_status_actions, array(
 					'trash_registrations' => __('Trash Registrations', 'event_espresso')
-					) )
+					))
 				),
 			'month' => array(
 				'slug' => 'month',
 				'label' => __('This Month', 'event_espresso'),
 				'count' => 0,
-				'bulk_action' => array_merge( $def_reg_status_actions, array(
+				'bulk_action' => array_merge($def_reg_status_actions, array(
 					'trash_registrations' => __('Trash Registrations', 'event_espresso')
 					))
 				),
 			'today' => array(
 				'slug' => 'today',
-				'label' => sprintf( __('Today - %s', 'event_espresso'), date('M d, Y', current_time('timestamp' ) ) ),
+				'label' => sprintf(__('Today - %s', 'event_espresso'), date('M d, Y', current_time('timestamp'))),
 				'count' => 0,
-				'bulk_action' => array_merge( $def_reg_status_actions,  array(
+				'bulk_action' => array_merge($def_reg_status_actions, array(
 					'trash_registrations' => __('Trash Registrations', 'event_espresso')
 					))
 				)
 			);
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_registrations', 'espresso_registrations_delete_registration' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_registrations', 'espresso_registrations_delete_registration')) {
 			$this->_views['incomplete'] = array(
 				'slug' => 'incomplete',
 				'label' => __('Incomplete', 'event_espresso'),
@@ -725,7 +725,7 @@ 
 				)
 			);
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_contacts', 'espresso_registrations_trash_attendees' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_contacts', 'espresso_registrations_trash_attendees')) {
 			$this->_views['trash'] = array(
 				'slug' => 'trash',
 				'label' => __('Trash', 'event_espresso'),
@@ -764,42 +764,42 @@ 
 				'desc' => __('View Transaction Invoice', 'event_espresso')
 				),
  			);
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'espresso_registrations_resend_registration' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'espresso_registrations_resend_registration')) {
 			$fc_items['resend_registration'] = array(
 				'class' => 'dashicons dashicons-email-alt',
 				'desc' => __('Resend Registration Details', 'event_espresso')
 				);
 		} else {
-			$fc_items['blank'] = array( 'class' => 'blank', 'desc' => '' );
+			$fc_items['blank'] = array('class' => 'blank', 'desc' => '');
 		}
 
 		$sc_items = array(
 			'approved_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_approved,
-				'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_approved, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_approved,
+				'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_approved, FALSE, 'sentence')
 				),
 			'pending_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_pending_payment,
-				'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_pending_payment, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_pending_payment,
+				'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_pending_payment, FALSE, 'sentence')
 				),
 			'incomplete_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_incomplete,
-				'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_incomplete, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_incomplete,
+				'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_incomplete, FALSE, 'sentence')
 			),
 			'not_approved' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_not_approved,
-				'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_not_approved, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_not_approved,
+				'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_not_approved, FALSE, 'sentence')
 				),
 			'declined_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_declined,
-				'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_declined, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_declined,
+				'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_declined, FALSE, 'sentence')
 				),
 			'cancelled_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_cancelled,
-				'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_cancelled, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_cancelled,
+				'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_cancelled, FALSE, 'sentence')
 				)
 			);
-		return array_merge( $fc_items, $sc_items );
+		return array_merge($fc_items, $sc_items);
 	}
 
 
@@ -812,15 +812,15 @@ 
 
 
 	protected function _registrations_overview_list_table() {
-		$EVT_ID = ( ! empty( $this->_req_data['event_id'] )) ? absint( $this->_req_data['event_id'] ) : FALSE;
-		if ( $EVT_ID ) {
-			if ( EE_Registry::instance()->CAP->current_user_can( 'ee_edit_registrations', 'espresso_registrations_new_registration', $EVT_ID ) ) {
-				$this->_admin_page_title .= $this->get_action_link_or_button( 'new_registration', 'add-registrant', array( 'event_id' => $EVT_ID ), 'add-new-h2' );
+		$EVT_ID = ( ! empty($this->_req_data['event_id'])) ? absint($this->_req_data['event_id']) : FALSE;
+		if ($EVT_ID) {
+			if (EE_Registry::instance()->CAP->current_user_can('ee_edit_registrations', 'espresso_registrations_new_registration', $EVT_ID)) {
+				$this->_admin_page_title .= $this->get_action_link_or_button('new_registration', 'add-registrant', array('event_id' => $EVT_ID), 'add-new-h2');
 			}
-			$event = EEM_Event::instance()->get_one_by_ID( $EVT_ID );
-			$this->_template_args['admin_page_header'] = $event instanceof EE_Event ? sprintf( __('%s Viewing registrations for the event: %s%s', 'event_espresso'), '<h2>', '<a href="' . EE_Admin_Page::add_query_args_and_nonce( array('action' => 'edit', 'post' => $event->ID() ), EVENTS_ADMIN_URL ) . '">' . $event->get('EVT_name') . '</a>', '</h2>' ) : '';
+			$event = EEM_Event::instance()->get_one_by_ID($EVT_ID);
+			$this->_template_args['admin_page_header'] = $event instanceof EE_Event ? sprintf(__('%s Viewing registrations for the event: %s%s', 'event_espresso'), '<h2>', '<a href="'.EE_Admin_Page::add_query_args_and_nonce(array('action' => 'edit', 'post' => $event->ID()), EVENTS_ADMIN_URL).'">'.$event->get('EVT_name').'</a>', '</h2>') : '';
 		}
-		$this->_template_args['after_list_table'] = $this->_display_legend( $this->_registration_legend_items() );
+		$this->_template_args['after_list_table'] = $this->_display_legend($this->_registration_legend_items());
 		$this->display_admin_list_table_page_with_no_sidebar();
 	}
 
@@ -835,19 +835,19 @@ 
 	 */
 	private function _set_registration_object() {
 		//get out if we've already set the object
-		if ( is_object( $this->_registration )) {
+		if (is_object($this->_registration)) {
 			return TRUE;
 		}
 
 	    $REG = EEM_Registration::instance();
 
-		$REG_ID = ( ! empty( $this->_req_data['_REG_ID'] )) ? absint( $this->_req_data['_REG_ID'] ) : FALSE;
+		$REG_ID = ( ! empty($this->_req_data['_REG_ID'])) ? absint($this->_req_data['_REG_ID']) : FALSE;
 
-		if ( $this->_registration = $REG->get_one_by_ID( $REG_ID ))
+		if ($this->_registration = $REG->get_one_by_ID($REG_ID))
 			return TRUE;
 		else {
-			$error_msg = sprintf( __('An error occurred and the details for Registration ID #%s could not be retrieved.', 'event_espresso'), $REG_ID );
-			EE_Error::add_error( $error_msg, __FILE__, __FUNCTION__, __LINE__ );
+			$error_msg = sprintf(__('An error occurred and the details for Registration ID #%s could not be retrieved.', 'event_espresso'), $REG_ID);
+			EE_Error::add_error($error_msg, __FILE__, __FUNCTION__, __LINE__);
 			$this->_registration = NULL;
 			return FALSE;
 		}
@@ -866,25 +866,25 @@ 
 	 * @internal param bool $all whether to ignore all query params and just return ALL registrations (or count if count is set)
 	 * @return mixed (int|array)  int = count || array of registration objects
 	 */
-	public function get_registrations( $per_page = 10, $count = FALSE, $this_month = FALSE, $today = FALSE ) {
-
-		$EVT_ID = ! empty( $this->_req_data['event_id'] ) && $this->_req_data['event_id'] > 0 ? absint( $this->_req_data['event_id'] ) : FALSE;
-		$CAT_ID = ! empty( $this->_req_data['EVT_CAT'] ) && (int) $this->_req_data['EVT_CAT'] > 0? absint( $this->_req_data['EVT_CAT'] ) : FALSE;
-		$reg_status = ! empty( $this->_req_data['_reg_status'] ) ? sanitize_text_field( $this->_req_data['_reg_status'] ) : FALSE;
-		$month_range = ! empty( $this->_req_data['month_range'] ) ? sanitize_text_field( $this->_req_data['month_range'] ) : FALSE;//should be like 2013-april
-		$today_a = ! empty( $this->_req_data['status'] ) && $this->_req_data['status'] == 'today' ? TRUE : FALSE;
-		$this_month_a = ! empty( $this->_req_data['status'] ) && $this->_req_data['status'] == 'month' ? TRUE  : FALSE;
+	public function get_registrations($per_page = 10, $count = FALSE, $this_month = FALSE, $today = FALSE) {
+
+		$EVT_ID = ! empty($this->_req_data['event_id']) && $this->_req_data['event_id'] > 0 ? absint($this->_req_data['event_id']) : FALSE;
+		$CAT_ID = ! empty($this->_req_data['EVT_CAT']) && (int) $this->_req_data['EVT_CAT'] > 0 ? absint($this->_req_data['EVT_CAT']) : FALSE;
+		$reg_status = ! empty($this->_req_data['_reg_status']) ? sanitize_text_field($this->_req_data['_reg_status']) : FALSE;
+		$month_range = ! empty($this->_req_data['month_range']) ? sanitize_text_field($this->_req_data['month_range']) : FALSE; //should be like 2013-april
+		$today_a = ! empty($this->_req_data['status']) && $this->_req_data['status'] == 'today' ? TRUE : FALSE;
+		$this_month_a = ! empty($this->_req_data['status']) && $this->_req_data['status'] == 'month' ? TRUE : FALSE;
 		$start_date = FALSE;
 		$end_date = FALSE;
 		$_where = array();
-		$trash = ! empty( $this->_req_data['status'] ) && $this->_req_data['status'] == 'trash' ? TRUE : FALSE;
-		$incomplete = ! empty( $this->_req_data['status'] ) && $this->_req_data['status'] == 'incomplete' ? TRUE : FALSE;
+		$trash = ! empty($this->_req_data['status']) && $this->_req_data['status'] == 'trash' ? TRUE : FALSE;
+		$incomplete = ! empty($this->_req_data['status']) && $this->_req_data['status'] == 'incomplete' ? TRUE : FALSE;
 
 		//set orderby
 		$this->_req_data['orderby'] = ! empty($this->_req_data['orderby']) ? $this->_req_data['orderby'] : '';
 
 
-		switch ( $this->_req_data['orderby'] ) {
+		switch ($this->_req_data['orderby']) {
 			case '_REG_ID':
 				$orderby = 'REG_ID';
 				break;
@@ -904,26 +904,26 @@ 
 				$orderby = 'REG_date';
 		}
 
-		$sort = ( isset( $this->_req_data['order'] ) && ! empty( $this->_req_data['order'] )) ? $this->_req_data['order'] : 'DESC';
-		$current_page = isset( $this->_req_data['paged'] ) && !empty( $this->_req_data['paged'] ) ? $this->_req_data['paged'] : 1;
-		$per_page = isset( $this->_req_data['perpage'] ) && !empty( $this->_req_data['perpage'] ) ? $this->_req_data['perpage'] : $per_page;
+		$sort = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order'] : 'DESC';
+		$current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged']) ? $this->_req_data['paged'] : 1;
+		$per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage']) ? $this->_req_data['perpage'] : $per_page;
 
 
-		$offset = ($current_page-1)*$per_page;
-		$limit = $count  ? NULL : array( $offset, $per_page );
+		$offset = ($current_page - 1) * $per_page;
+		$limit = $count ? NULL : array($offset, $per_page);
 
-		if($EVT_ID){
-			$_where['EVT_ID']=$EVT_ID;
+		if ($EVT_ID) {
+			$_where['EVT_ID'] = $EVT_ID;
 		}
-		if($CAT_ID){
+		if ($CAT_ID) {
 			$_where['Event.Term_Taxonomy.term_id'] = $CAT_ID;
 		}
-		if ( $incomplete ) {
+		if ($incomplete) {
 			$_where['STS_ID'] = EEM_Registration::status_id_incomplete;
 		} else if ( ! $trash) {
-			$_where['STS_ID'] = array( '!=', EEM_Registration::status_id_incomplete );
+			$_where['STS_ID'] = array('!=', EEM_Registration::status_id_incomplete);
 		}
-		if($reg_status){
+		if ($reg_status) {
 			$_where['STS_ID'] = $reg_status;
 		}
 
@@ -935,105 +935,105 @@ 
 		$time_start = ' 00:00:00';
 		$time_end = ' 23:59:59';
 
-		if($today_a || $today ){
+		if ($today_a || $today) {
 			$curdate = date('Y-m-d', current_time('timestamp'));
-			$_where['REG_date']= array('BETWEEN',
+			$_where['REG_date'] = array('BETWEEN',
 				array(
-					EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $curdate . $time_start, 'Y-m-d H:i:s' ),
-					EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $curdate . $time_end, 'Y-m-d H:i:s' ),
+					EEM_Registration::instance()->convert_datetime_for_query('REG_date', $curdate.$time_start, 'Y-m-d H:i:s'),
+					EEM_Registration::instance()->convert_datetime_for_query('REG_date', $curdate.$time_end, 'Y-m-d H:i:s'),
 			));
-		}elseif($this_month_a || $this_month){
+		}elseif ($this_month_a || $this_month) {
 			$this_month_r = date('m', current_time('timestamp'));
-			$days_this_month = date( 't', current_time('timestamp') );
-			$_where['REG_date']= array('BETWEEN',
+			$days_this_month = date('t', current_time('timestamp'));
+			$_where['REG_date'] = array('BETWEEN',
 				array(
-					EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $this_year_r . '-' . $this_month_r . '-01' . ' ' . $time_start, 'Y-m-d H:i:s' ),
-					EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $this_year_r . '-' . $this_month_r . '-' . $days_this_month . ' ' . $time_end, 'Y-m-d H:i:s' )
+					EEM_Registration::instance()->convert_datetime_for_query('REG_date', $this_year_r.'-'.$this_month_r.'-01'.' '.$time_start, 'Y-m-d H:i:s'),
+					EEM_Registration::instance()->convert_datetime_for_query('REG_date', $this_year_r.'-'.$this_month_r.'-'.$days_this_month.' '.$time_end, 'Y-m-d H:i:s')
 			));
-		}elseif($month_range){
+		}elseif ($month_range) {
 			$pieces = explode(' ', $this->_req_data['month_range'], 3);
-			$month_r = !empty($pieces[0]) ? date('m', strtotime($pieces[0])) : '';
-			$year_r = !empty($pieces[1]) ? $pieces[1] : '';
-			$days_in_month = date('t', strtotime($year_r .  '-' . $month_r . '-' . '01') );
-			$_where['REG_date']= array('BETWEEN',
-				array(  EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $year_r . '-' . $month_r . '-01 00:00:00', 'Y-m-d H:i:s'), EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $year_r . '-' . $month_r . '-' . $days_in_month .  ' 23:59:59', 'Y-m-d H:i:s' ) ) );
-		}elseif($start_date && $end_date){
+			$month_r = ! empty($pieces[0]) ? date('m', strtotime($pieces[0])) : '';
+			$year_r = ! empty($pieces[1]) ? $pieces[1] : '';
+			$days_in_month = date('t', strtotime($year_r.'-'.$month_r.'-'.'01'));
+			$_where['REG_date'] = array('BETWEEN',
+				array(EEM_Registration::instance()->convert_datetime_for_query('REG_date', $year_r.'-'.$month_r.'-01 00:00:00', 'Y-m-d H:i:s'), EEM_Registration::instance()->convert_datetime_for_query('REG_date', $year_r.'-'.$month_r.'-'.$days_in_month.' 23:59:59', 'Y-m-d H:i:s')));
+		}elseif ($start_date && $end_date) {
 			throw new EE_Error("not yet supported");
-		}elseif($start_date){
+		}elseif ($start_date) {
 			throw new EE_Error("not yet supported");
-		}elseif($end_date){
+		}elseif ($end_date) {
 			throw new EE_Error("not yet supported");
 		}
 
-		if ( ! empty( $this->_req_data['s'] ) ) {
-			$sstr = '%' . $this->_req_data['s'] . '%';
+		if ( ! empty($this->_req_data['s'])) {
+			$sstr = '%'.$this->_req_data['s'].'%';
 			$_where['OR'] = array(
-				'Event.EVT_name' => array( 'LIKE', $sstr),
-				'Event.EVT_desc' => array( 'LIKE', $sstr ),
-				'Event.EVT_short_desc' => array( 'LIKE' , $sstr ),
-				'Attendee.ATT_full_name' => array( 'LIKE', $sstr ),
-				'Attendee.ATT_fname' => array( 'LIKE', $sstr ),
-				'Attendee.ATT_lname' => array( 'LIKE', $sstr ),
-				'Attendee.ATT_short_bio' => array( 'LIKE', $sstr ),
-				'Attendee.ATT_email' => array('LIKE', $sstr ),
-				'Attendee.ATT_address' => array( 'LIKE', $sstr ),
-				'Attendee.ATT_address2' => array( 'LIKE', $sstr ),
-				'Attendee.ATT_city' => array( 'LIKE', $sstr ),
-				'REG_final_price' => array( 'LIKE', $sstr ),
-				'REG_code' => array( 'LIKE', $sstr ),
-				'REG_count' => array( 'LIKE' , $sstr ),
-				'REG_group_size' => array( 'LIKE' , $sstr ),
-				'Ticket.TKT_name' => array( 'LIKE', $sstr ),
-				'Ticket.TKT_description' => array( 'LIKE', $sstr ),
-				'Transaction.Payment.PAY_txn_id_chq_nmbr' => array( 'LIKE', $sstr )
+				'Event.EVT_name' => array('LIKE', $sstr),
+				'Event.EVT_desc' => array('LIKE', $sstr),
+				'Event.EVT_short_desc' => array('LIKE', $sstr),
+				'Attendee.ATT_full_name' => array('LIKE', $sstr),
+				'Attendee.ATT_fname' => array('LIKE', $sstr),
+				'Attendee.ATT_lname' => array('LIKE', $sstr),
+				'Attendee.ATT_short_bio' => array('LIKE', $sstr),
+				'Attendee.ATT_email' => array('LIKE', $sstr),
+				'Attendee.ATT_address' => array('LIKE', $sstr),
+				'Attendee.ATT_address2' => array('LIKE', $sstr),
+				'Attendee.ATT_city' => array('LIKE', $sstr),
+				'REG_final_price' => array('LIKE', $sstr),
+				'REG_code' => array('LIKE', $sstr),
+				'REG_count' => array('LIKE', $sstr),
+				'REG_group_size' => array('LIKE', $sstr),
+				'Ticket.TKT_name' => array('LIKE', $sstr),
+				'Ticket.TKT_description' => array('LIKE', $sstr),
+				'Transaction.Payment.PAY_txn_id_chq_nmbr' => array('LIKE', $sstr)
 				);
 		}
 
 		//capability checks
-		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'get_registrations' ) ) {
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'get_registrations')) {
 			$_where['AND'] = array(
 				'Event.EVT_wp_user' => get_current_user_id()
 				);
 		}
 
 
-		if( $count ){
-			if ( $trash ) {
-				return EEM_Registration::instance()->count_deleted( array( $_where ));
-			} else if ( $incomplete ) {
-				return EEM_Registration::instance()->count( array( $_where ));
+		if ($count) {
+			if ($trash) {
+				return EEM_Registration::instance()->count_deleted(array($_where));
+			} else if ($incomplete) {
+				return EEM_Registration::instance()->count(array($_where));
 			} else {
-				return EEM_Registration::instance()->count( array( $_where, 'default_where_conditions' => 'this_model_only' ));
+				return EEM_Registration::instance()->count(array($_where, 'default_where_conditions' => 'this_model_only'));
 			}
 		} else {
 			//make sure we remove default where conditions cause all registrations matching query are returned
-			$query_params = array( $_where, 'order_by' => array( $orderby => $sort ), 'default_where_conditions' => 'this_model_only' );
-			if ( $per_page !== -1 ) {
+			$query_params = array($_where, 'order_by' => array($orderby => $sort), 'default_where_conditions' => 'this_model_only');
+			if ($per_page !== -1) {
 				$query_params['limit'] = $limit;
 			}
-			$registrations =  $trash ? EEM_Registration::instance()->get_all_deleted($query_params) : EEM_Registration::instance()->get_all($query_params);
+			$registrations = $trash ? EEM_Registration::instance()->get_all_deleted($query_params) : EEM_Registration::instance()->get_all($query_params);
 
 
-			if ( $EVT_ID && isset( $registrations[0] ) && $registrations[0] instanceof EE_Registration &&  $registrations[0]->event_obj()) {
+			if ($EVT_ID && isset($registrations[0]) && $registrations[0] instanceof EE_Registration && $registrations[0]->event_obj()) {
 				$first_registration = $registrations[0];
 				//EEH_Debug_Tools::printr( $registrations[0], '$registrations  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 				$event_name = $first_registration->event_obj()->name();
-				$event_date = $first_registration->date_obj()->start_date_and_time('l F j, Y,', 'g:i:s a');// isset( $registrations[0]->DTT_EVT_start ) ? date( 'l F j, Y,    g:i:s a', $registrations[0]->DTT_EVT_start ) : '';
+				$event_date = $first_registration->date_obj()->start_date_and_time('l F j, Y,', 'g:i:s a'); // isset( $registrations[0]->DTT_EVT_start ) ? date( 'l F j, Y,    g:i:s a', $registrations[0]->DTT_EVT_start ) : '';
 				// edit event link
-				if ( $event_name != '' ) {
-					$edit_event_url = self::add_query_args_and_nonce( array( 'action'=>'edit_event', 'EVT_ID'=>$EVT_ID ), EVENTS_ADMIN_URL );
-					$edit_event_lnk = '<a href="'.$edit_event_url.'" title="' . esc_attr__( 'Edit ', 'event_espresso' ) . $event_name . '">' . __( 'Edit Event', 'event_espresso' ) . '</a>';
-					$event_name .= ' <span class="admin-page-header-edit-lnk not-bold">' . $edit_event_lnk . '</span>' ;
+				if ($event_name != '') {
+					$edit_event_url = self::add_query_args_and_nonce(array('action'=>'edit_event', 'EVT_ID'=>$EVT_ID), EVENTS_ADMIN_URL);
+					$edit_event_lnk = '<a href="'.$edit_event_url.'" title="'.esc_attr__('Edit ', 'event_espresso').$event_name.'">'.__('Edit Event', 'event_espresso').'</a>';
+					$event_name .= ' <span class="admin-page-header-edit-lnk not-bold">'.$edit_event_lnk.'</span>';
 				}
 
-				$back_2_reg_url = self::add_query_args_and_nonce( array( 'action'=>'default' ), REG_ADMIN_URL );
-				$back_2_reg_lnk = '<a href="'.$back_2_reg_url.'" title="' . esc_attr__( 'click to return to viewing all registrations ', 'event_espresso' ) . '">&laquo; ' . __( 'Back to All Registrations', 'event_espresso' ) . '</a>';
+				$back_2_reg_url = self::add_query_args_and_nonce(array('action'=>'default'), REG_ADMIN_URL);
+				$back_2_reg_lnk = '<a href="'.$back_2_reg_url.'" title="'.esc_attr__('click to return to viewing all registrations ', 'event_espresso').'">&laquo; '.__('Back to All Registrations', 'event_espresso').'</a>';
 
 				$this->_template_args['before_admin_page_content'] = '
 			<div id="admin-page-header">
-				<h1><span class="small-text not-bold">'.__( 'Event: ', 'event_espresso' ).'</span>'. $event_name .'</h1>
-				<h3><span class="small-text not-bold">'.__( 'Date: ', 'event_espresso' ). '</span>'. $event_date .'</h3>
-				<span class="admin-page-header-go-back-lnk not-bold">' . $back_2_reg_lnk . '</span>
+				<h1><span class="small-text not-bold">'.__('Event: ', 'event_espresso').'</span>'.$event_name.'</h1>
+				<h3><span class="small-text not-bold">'.__('Date: ', 'event_espresso').'</span>'.$event_date.'</h3>
+				<span class="admin-page-header-go-back-lnk not-bold">' . $back_2_reg_lnk.'</span>
 			</div>
 			';
 
@@ -1071,7 +1071,7 @@ 
 
 		$this->_set_registration_object();
 
-		if ( is_object( $this->_registration )) {
+		if (is_object($this->_registration)) {
 			$transaction = $this->_registration->transaction() ? $this->_registration->transaction() : EE_Transaction::new_instance();
 			$this->_session = $transaction->session_data();
 
@@ -1079,10 +1079,10 @@ 
 
 
 			$this->_template_args['reg_nmbr']['value'] = $this->_registration->ID();
-			$this->_template_args['reg_nmbr']['label'] = __( 'Registration Number', 'event_espresso' );
+			$this->_template_args['reg_nmbr']['label'] = __('Registration Number', 'event_espresso');
 
-			$this->_template_args['reg_datetime']['value'] =  $this->_registration->pretty_date('l F j, Y','g:i:s a') ;
-			$this->_template_args['reg_datetime']['label'] = __( 'Date', 'event_espresso' );
+			$this->_template_args['reg_datetime']['value'] = $this->_registration->pretty_date('l F j, Y', 'g:i:s a');
+			$this->_template_args['reg_datetime']['label'] = __('Date', 'event_espresso');
 
 			$this->_template_args['grand_total'] = $transaction->total();
 
@@ -1090,19 +1090,19 @@ 
 			// link back to overview
 			$this->_template_args['reg_overview_url'] = REG_ADMIN_URL;
 			$this->_template_args['registration'] = $this->_registration;
-			$this->_template_args['filtered_registrations_link'] = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'default', 'event_id' => $event_id ), REG_ADMIN_URL );
-			$this->_template_args['filtered_transactions_link'] = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'default', 'EVT_ID' => $event_id, 'page' => 'espresso_transactions' ), admin_url( 'admin.php' ) );
-			$this->_template_args['event_link'] = EE_Admin_Page::add_query_args_and_nonce( array( 'page' => 'espresso_events', 'action' => 'edit', 'post' => $event_id ), admin_url( 'admin.php' ) );
+			$this->_template_args['filtered_registrations_link'] = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'default', 'event_id' => $event_id), REG_ADMIN_URL);
+			$this->_template_args['filtered_transactions_link'] = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'default', 'EVT_ID' => $event_id, 'page' => 'espresso_transactions'), admin_url('admin.php'));
+			$this->_template_args['event_link'] = EE_Admin_Page::add_query_args_and_nonce(array('page' => 'espresso_events', 'action' => 'edit', 'post' => $event_id), admin_url('admin.php'));
 
 			//next and previous links
-			$next_reg = $this->_registration->next(null, array(), 'REG_ID' );
-			$this->_template_args['next_registration'] = $next_reg ? $this->_next_link( EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'view_registration', '_REG_ID' => $next_reg['REG_ID'] ), REG_ADMIN_URL ), 'dashicons dashicons-arrow-right ee-icon-size-22' ) : '';
-			$previous_reg = $this->_registration->previous( null, array(), 'REG_ID' );
-			$this->_template_args['previous_registration'] = $previous_reg ? $this->_previous_link( EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'view_registration', '_REG_ID' => $previous_reg['REG_ID'] ), REG_ADMIN_URL ), 'dashicons dashicons-arrow-left ee-icon-size-22' ) : '';
+			$next_reg = $this->_registration->next(null, array(), 'REG_ID');
+			$this->_template_args['next_registration'] = $next_reg ? $this->_next_link(EE_Admin_Page::add_query_args_and_nonce(array('action' => 'view_registration', '_REG_ID' => $next_reg['REG_ID']), REG_ADMIN_URL), 'dashicons dashicons-arrow-right ee-icon-size-22') : '';
+			$previous_reg = $this->_registration->previous(null, array(), 'REG_ID');
+			$this->_template_args['previous_registration'] = $previous_reg ? $this->_previous_link(EE_Admin_Page::add_query_args_and_nonce(array('action' => 'view_registration', '_REG_ID' => $previous_reg['REG_ID']), REG_ADMIN_URL), 'dashicons dashicons-arrow-left ee-icon-size-22') : '';
 
 			// grab header
-			$template_path = REG_TEMPLATE_PATH . 'reg_admin_details_header.template.php';
-			$this->_template_args['admin_page_header'] = EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
+			$template_path = REG_TEMPLATE_PATH.'reg_admin_details_header.template.php';
+			$this->_template_args['admin_page_header'] = EEH_Template::display_template($template_path, $this->_template_args, TRUE);
 
 		} else {
 
@@ -1123,14 +1123,14 @@ 
 	protected function _registration_details_metaboxes() {
 		$this->_set_registration_object();
 		$attendee = $this->_registration instanceof EE_Registration ? $this->_registration->attendee() : null;
-		add_meta_box( 'edit-reg-status-mbox', __( 'Registration Status', 'event_espresso' ), array( $this, 'set_reg_status_buttons_metabox' ), $this->wp_page_slug, 'normal', 'high' );
-		add_meta_box( 'edit-reg-details-mbox', __( 'Registration Details', 'event_espresso' ), array( $this, '_reg_details_meta_box' ), $this->wp_page_slug, 'normal', 'high' );
-		if ( $attendee instanceof EE_Attendee && EE_Registry::instance()->CAP->current_user_can('ee_edit_registration', 'edit-reg-questions-mbox' ) ) {
-			add_meta_box( 'edit-reg-questions-mbox', __( 'Registration Form Answers', 'event_espresso' ), array( $this, '_reg_questions_meta_box' ), $this->wp_page_slug, 'normal', 'high' );
+		add_meta_box('edit-reg-status-mbox', __('Registration Status', 'event_espresso'), array($this, 'set_reg_status_buttons_metabox'), $this->wp_page_slug, 'normal', 'high');
+		add_meta_box('edit-reg-details-mbox', __('Registration Details', 'event_espresso'), array($this, '_reg_details_meta_box'), $this->wp_page_slug, 'normal', 'high');
+		if ($attendee instanceof EE_Attendee && EE_Registry::instance()->CAP->current_user_can('ee_edit_registration', 'edit-reg-questions-mbox')) {
+			add_meta_box('edit-reg-questions-mbox', __('Registration Form Answers', 'event_espresso'), array($this, '_reg_questions_meta_box'), $this->wp_page_slug, 'normal', 'high');
 		}
-		add_meta_box( 'edit-reg-registrant-mbox', __( 'Contact Details', 'event_espresso' ), array( $this, '_reg_registrant_side_meta_box' ), $this->wp_page_slug, 'side', 'high' );
-		if ( $this->_registration->group_size() > 1 ) {
-			add_meta_box( 'edit-reg-attendees-mbox', __( 'Other Registrations in this Transaction', 'event_espresso' ), array( $this, '_reg_attendees_meta_box' ), $this->wp_page_slug, 'normal', 'high' );
+		add_meta_box('edit-reg-registrant-mbox', __('Contact Details', 'event_espresso'), array($this, '_reg_registrant_side_meta_box'), $this->wp_page_slug, 'side', 'high');
+		if ($this->_registration->group_size() > 1) {
+			add_meta_box('edit-reg-attendees-mbox', __('Other Registrations in this Transaction', 'event_espresso'), array($this, '_reg_attendees_meta_box'), $this->wp_page_slug, 'normal', 'high');
 		}
 	}
 
@@ -1151,23 +1151,23 @@ 
 
 		//let's get an array of all possible buttons that we can just reference
 		$status_buttons = $this->_get_reg_status_buttons();
-		$template_args[ 'reg_status_value' ] = $this->_registration->pretty_status();
-		$template_args[ 'reg_status_class' ] = 'status-' . $this->_registration->status_ID();
+		$template_args['reg_status_value'] = $this->_registration->pretty_status();
+		$template_args['reg_status_class'] = 'status-'.$this->_registration->status_ID();
 		$template_args['attendee'] = $this->_registration->attendee();
-		$template = REG_TEMPLATE_PATH . 'reg_status_change_buttons.template.php';
-		if ( $this->_set_registration_object() ) {
+		$template = REG_TEMPLATE_PATH.'reg_status_change_buttons.template.php';
+		if ($this->_set_registration_object()) {
 			$current_status = $this->_registration->status_ID();
-			unset( $status_buttons[$current_status] );
-			if ( $current_status != EEM_Registration::status_id_pending_payment && $is_complete ) {
-				unset( $status_buttons[EEM_Registration::status_id_pending_payment] );
+			unset($status_buttons[$current_status]);
+			if ($current_status != EEM_Registration::status_id_pending_payment && $is_complete) {
+				unset($status_buttons[EEM_Registration::status_id_pending_payment]);
 			}
-			$template_args['status_buttons'] = implode( "\n", $status_buttons );
+			$template_args['status_buttons'] = implode("\n", $status_buttons);
 		}
 		$template_args['form_url'] = REG_ADMIN_URL;
 		$template_args['REG_ID'] = $this->_registration->ID();
-		$template_args['nonce'] = wp_nonce_field( 'change_reg_status_nonce',  'change_reg_status_nonce', FALSE, FALSE );
+		$template_args['nonce'] = wp_nonce_field('change_reg_status_nonce', 'change_reg_status_nonce', FALSE, FALSE);
 
-		EEH_Template::display_template( $template, $template_args );
+		EEH_Template::display_template($template, $template_args);
 
 	}
 
@@ -1181,11 +1181,11 @@ 
 	private function _get_reg_status_buttons() {
 
 		$buttons = array(
-			EEM_Registration::status_id_approved => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-' . EEM_Registration::status_id_approved . '" value="' . EEH_Template::pretty_status( EEM_Registration::status_id_approved, FALSE, 'sentence' ) . '">',
-			EEM_Registration::status_id_pending_payment => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-' . EEM_Registration::status_id_pending_payment . '" value="' . EEH_Template::pretty_status( EEM_Registration::status_id_pending_payment, FALSE, 'sentence' ) . '">',
-			EEM_Registration::status_id_not_approved => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-' . EEM_Registration::status_id_not_approved . '" value="' . EEH_Template::pretty_status( EEM_Registration::status_id_not_approved, FALSE, 'sentence' ) . '">',
-			EEM_Registration::status_id_declined => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-' . EEM_Registration::status_id_declined . '" value="' . EEH_Template::pretty_status( EEM_Registration::status_id_declined, FALSE, 'sentence' ) . '">',
-			EEM_Registration::status_id_cancelled =>'<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-' . EEM_Registration::status_id_cancelled . '" value="' . EEH_Template::pretty_status( EEM_Registration::status_id_cancelled, FALSE, 'sentence' ) . '">',
+			EEM_Registration::status_id_approved => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-'.EEM_Registration::status_id_approved.'" value="'.EEH_Template::pretty_status(EEM_Registration::status_id_approved, FALSE, 'sentence').'">',
+			EEM_Registration::status_id_pending_payment => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-'.EEM_Registration::status_id_pending_payment.'" value="'.EEH_Template::pretty_status(EEM_Registration::status_id_pending_payment, FALSE, 'sentence').'">',
+			EEM_Registration::status_id_not_approved => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-'.EEM_Registration::status_id_not_approved.'" value="'.EEH_Template::pretty_status(EEM_Registration::status_id_not_approved, FALSE, 'sentence').'">',
+			EEM_Registration::status_id_declined => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-'.EEM_Registration::status_id_declined.'" value="'.EEH_Template::pretty_status(EEM_Registration::status_id_declined, FALSE, 'sentence').'">',
+			EEM_Registration::status_id_cancelled =>'<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-'.EEM_Registration::status_id_cancelled.'" value="'.EEH_Template::pretty_status(EEM_Registration::status_id_cancelled, FALSE, 'sentence').'">',
 			);
 		return $buttons;
 	}
@@ -1199,13 +1199,13 @@ 
 	 *
 	 * @return array  (array with reg_id(s) updated and whether update was successful.
 	 */
-	protected function _set_registration_status_from_request( $status = false, $notify = false ) {
-		$REG_ID = isset( $this->_req_data['_REG_ID'] ) ? (array) $this->_req_data['_REG_ID'] : array();
+	protected function _set_registration_status_from_request($status = false, $notify = false) {
+		$REG_ID = isset($this->_req_data['_REG_ID']) ? (array) $this->_req_data['_REG_ID'] : array();
 
-		$success = $this->_set_registration_status( $REG_ID, $status );
+		$success = $this->_set_registration_status($REG_ID, $status);
 
 		//notify?
-		if ( $success && $notify && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'espresso_registrations_resend_registration' ) ) {
+		if ($success && $notify && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'espresso_registrations_resend_registration')) {
 			$this->_process_resend_registration();
 		}
 
@@ -1223,19 +1223,19 @@ 
 	 * @param bool $status
 	 * @return array (an array with 'success' key representing whether status change was successful, and 'REG_ID' as the array of updated registrations).
 	 */
-	protected function _set_registration_status( $REG_ID, $status = false ) {
+	protected function _set_registration_status($REG_ID, $status = false) {
 		$success = true;
 		// set default status if none is passed
 		$status = $status ? $status : EEM_Registration::status_id_pending_payment;
 
 		//typecast and sanitize reg_id
-		$reg_ids = array_filter( (array) $REG_ID, 'absint' );
+		$reg_ids = array_filter((array) $REG_ID, 'absint');
 
 		//loop through REG_ID's and change status
-		foreach ( $reg_ids as $r_id ) {
-			$registration = EEM_Registration::instance()->get_one_by_ID( $r_id );
-			if ( $registration instanceof EE_Registration ) {
-				$registration->set_status( $status );
+		foreach ($reg_ids as $r_id) {
+			$registration = EEM_Registration::instance()->get_one_by_ID($r_id);
+			if ($registration instanceof EE_Registration) {
+				$registration->set_status($status);
 				$result = $registration->save();
 
 				//verifying explicit fails because update *may* just return 0 for 0 rows affected
@@ -1247,7 +1247,7 @@ 
 		$this->_req_data['_REG_ID'] = $reg_ids;
 
 		//return $success and processed registrations
-		return array( 'REG_ID' => $reg_ids, 'success' => $success );
+		return array('REG_ID' => $reg_ids, 'success' => $success);
 	}
 
 
@@ -1259,37 +1259,37 @@ 
 	 * @param   bool    $notify indicates whether the _set_registration_status_from_request does notifications or not.
 	 * @return void
 	 */
-	protected function _reg_status_change_return( $STS_ID, $notify = false ) {
+	protected function _reg_status_change_return($STS_ID, $notify = false) {
 
-		$result = ! empty( $STS_ID ) ? $this->_set_registration_status_from_request( $STS_ID, $notify ) : array( 'success' => false );
+		$result = ! empty($STS_ID) ? $this->_set_registration_status_from_request($STS_ID, $notify) : array('success' => false);
 
 
-		$success = isset( $result['success'] ) && $result['success'];
+		$success = isset($result['success']) && $result['success'];
 
 		//setup success message
-		if ( $success ) {
-			$msg = is_array( $result['REG_ID'] ) && count( $result['REG_ID'] ) > 1  ? sprintf( __('Registration status has been set to %s', 'event_espresso'), EEH_Template::pretty_status($STS_ID, false, 'lower' ) ) :  sprintf( __('Registrations have been set to %s.', 'event_espresso'), EEH_Template::pretty_status($STS_ID, false, 'lower' ) ) ;
-			EE_Error::add_success( $msg );
+		if ($success) {
+			$msg = is_array($result['REG_ID']) && count($result['REG_ID']) > 1 ? sprintf(__('Registration status has been set to %s', 'event_espresso'), EEH_Template::pretty_status($STS_ID, false, 'lower')) : sprintf(__('Registrations have been set to %s.', 'event_espresso'), EEH_Template::pretty_status($STS_ID, false, 'lower'));
+			EE_Error::add_success($msg);
 		} else {
-			EE_Error::add_error( __('Something went wrong, and the status was not changed', 'event_espresso' ), __FILE__, __LINE__, __FUNCTION__ );
+			EE_Error::add_error(__('Something went wrong, and the status was not changed', 'event_espresso'), __FILE__, __LINE__, __FUNCTION__);
 		}
 
-		$route = isset( $this->_req_data['return'] ) && $this->_req_data['return'] == 'view_registration' ? array( 'action' => 'view_registration', '_REG_ID' => $result['REG_ID'][0] ) : array( 'action' => 'default' );
+		$route = isset($this->_req_data['return']) && $this->_req_data['return'] == 'view_registration' ? array('action' => 'view_registration', '_REG_ID' => $result['REG_ID'][0]) : array('action' => 'default');
 		//unset nonces
-		foreach ( $this->_req_data as $ref => $value ) {
-			if ( strpos( $ref, 'nonce' ) !== false ) {
-				unset( $this->_req_data[$ref] );
+		foreach ($this->_req_data as $ref => $value) {
+			if (strpos($ref, 'nonce') !== false) {
+				unset($this->_req_data[$ref]);
 				continue;
 			}
 
-			$value = is_array( $value ) ? array_map( 'urlencode', $value ) : urlencode( $value );
+			$value = is_array($value) ? array_map('urlencode', $value) : urlencode($value);
 			$this->_req_data[$ref] = $value;
 		}
 
 		//merge request vars so that the reloaded list table contains any existing filter query params
-		$route = array_merge( $this->_req_data, $route );
+		$route = array_merge($this->_req_data, $route);
 
-		$this->_redirect_after_action( $success, '', '', $route, true );
+		$this->_redirect_after_action($success, '', '', $route, true);
 
 		}
 
@@ -1302,29 +1302,29 @@ 
 	protected function _change_reg_status() {
 		$this->_req_data['return'] = 'view_registration';
 		//set notify based on whether the send notifications toggle is set or not
-		$notify = ! empty( $this->_req_data['txn_reg_status_change']['send_notifications'] );
-		$this->_req_data[ '_reg_status_id' ] = isset( $this->_req_data[ '_reg_status_id' ] ) ? $this->_req_data[ '_reg_status_id' ] : '';
+		$notify = ! empty($this->_req_data['txn_reg_status_change']['send_notifications']);
+		$this->_req_data['_reg_status_id'] = isset($this->_req_data['_reg_status_id']) ? $this->_req_data['_reg_status_id'] : '';
 
-		switch ( $this->_req_data['_reg_status_id'] ) {
-			case EEH_Template::pretty_status( EEM_Registration::status_id_approved, false, 'sentence' ) :
-				$this->approve_registration( $notify );
+		switch ($this->_req_data['_reg_status_id']) {
+			case EEH_Template::pretty_status(EEM_Registration::status_id_approved, false, 'sentence') :
+				$this->approve_registration($notify);
 				break;
-			case EEH_Template::pretty_status( EEM_Registration::status_id_pending_payment, false, 'sentence' ) :
-				$this->pending_registration( $notify );
+			case EEH_Template::pretty_status(EEM_Registration::status_id_pending_payment, false, 'sentence') :
+				$this->pending_registration($notify);
 				break;
-			case EEH_Template::pretty_status( EEM_Registration::status_id_not_approved, false, 'sentence' ) :
-				$this->not_approve_registration( $notify );
+			case EEH_Template::pretty_status(EEM_Registration::status_id_not_approved, false, 'sentence') :
+				$this->not_approve_registration($notify);
 				break;
-			case EEH_Template::pretty_status( EEM_Registration::status_id_declined, false, 'sentence' ) :
-				$this->decline_registration( $notify );
+			case EEH_Template::pretty_status(EEM_Registration::status_id_declined, false, 'sentence') :
+				$this->decline_registration($notify);
 				break;
-			case EEH_Template::pretty_status( EEM_Registration::status_id_cancelled, false, 'sentence' ) :
-				$this->cancel_registration( $notify );
+			case EEH_Template::pretty_status(EEM_Registration::status_id_cancelled, false, 'sentence') :
+				$this->cancel_registration($notify);
 				break;
 			default :
 				$result['success'] = false;
-				unset( $this->_req_data['return'] );
-				$this->_reg_status_change_return( '', false );
+				unset($this->_req_data['return']);
+				$this->_reg_status_change_return('', false);
 				break;
 		}
 	}
@@ -1337,8 +1337,8 @@ 
 	*		@param bool $notify whether or not to notify the registrant about their approval.
 	*		@return void
 	*/
-	protected function approve_registration( $notify = false ) {
-		$this->_reg_status_change_return( EEM_Registration::status_id_approved, $notify );
+	protected function approve_registration($notify = false) {
+		$this->_reg_status_change_return(EEM_Registration::status_id_approved, $notify);
 	}
 
 
@@ -1350,8 +1350,8 @@ 
 	*		@param bool $notify whether or not to notify the registrant about their approval.
 	*		@return void
 	*/
-	protected function decline_registration( $notify = false ) {
-		$this->_reg_status_change_return( EEM_Registration::status_id_declined, $notify );
+	protected function decline_registration($notify = false) {
+		$this->_reg_status_change_return(EEM_Registration::status_id_declined, $notify);
 	}
 
 
@@ -1363,8 +1363,8 @@ 
 	*		@param bool $notify whether or not to notify the registrant about their approval.
 	*		@return void
 	*/
-	protected function cancel_registration( $notify = false ) {
-		$this->_reg_status_change_return( EEM_Registration::status_id_cancelled, $notify );
+	protected function cancel_registration($notify = false) {
+		$this->_reg_status_change_return(EEM_Registration::status_id_cancelled, $notify);
 	}
 
 
@@ -1377,8 +1377,8 @@ 
 	*		@param bool $notify whether or not to notify the registrant about their approval.
 	*		@return void
 	*/
-	protected function not_approve_registration( $notify = false ) {
-		$this->_reg_status_change_return( EEM_Registration::status_id_not_approved, $notify );
+	protected function not_approve_registration($notify = false) {
+		$this->_reg_status_change_return(EEM_Registration::status_id_not_approved, $notify);
 	}
 
 
@@ -1389,8 +1389,8 @@ 
 	*		@param bool $notify whether or not to notify the registrant about their approval.
 	*		@return void
 	*/
-	protected function pending_registration( $notify = false ) {
-		$this->_reg_status_change_return( EEM_Registration::status_id_pending_payment, $notify );
+	protected function pending_registration($notify = false) {
+		$this->_reg_status_change_return(EEM_Registration::status_id_pending_payment, $notify);
 	}
 
 
@@ -1404,75 +1404,75 @@ 
 	public function _reg_details_meta_box() {
 		EEH_Autoloader::register_line_item_display_autoloaders();
 		EEH_Autoloader::register_line_item_filter_autoloaders();
-		EE_Registry::instance()->load_Helper( 'Line_Item' );
+		EE_Registry::instance()->load_Helper('Line_Item');
 		$transaction = $this->_registration->transaction() ? $this->_registration->transaction() : EE_Transaction::new_instance();
 		$this->_session = $transaction->session_data();
 
 		$filters = new EE_Line_Item_Filter_Collection();
-		$filters->add( new EE_Single_Registration_Line_Item_Filter( $this->_registration ) );
-		$filters->add( new EE_Non_Zero_Line_Item_Filter() );
-		$line_item_filter_processor = new EE_Line_Item_Filter_Processor( $filters, $transaction->total_line_item() );
+		$filters->add(new EE_Single_Registration_Line_Item_Filter($this->_registration));
+		$filters->add(new EE_Non_Zero_Line_Item_Filter());
+		$line_item_filter_processor = new EE_Line_Item_Filter_Processor($filters, $transaction->total_line_item());
 		$filtered_line_item_tree = $line_item_filter_processor->process();
 
 		$this->_template_args['REG_ID'] = $this->_registration->ID();
-		$line_item_display = new EE_Line_Item_Display( 'reg_admin_table', 'EE_Admin_Table_Registration_Line_Item_Display_Strategy' );
-		$this->_template_args['line_item_table'] = $line_item_display->display_line_item( $filtered_line_item_tree, array( 'EE_Registration' => $this->_registration ) );
+		$line_item_display = new EE_Line_Item_Display('reg_admin_table', 'EE_Admin_Table_Registration_Line_Item_Display_Strategy');
+		$this->_template_args['line_item_table'] = $line_item_display->display_line_item($filtered_line_item_tree, array('EE_Registration' => $this->_registration));
 
 
 		$attendee = $this->_registration->attendee();
 
 
-		$this->_template_args['view_transaction_button'] = EE_Registry::instance()->CAP->current_user_can( 'ee_read_transaction', 'espresso_transactions_view_transaction' ) ?EEH_Template::get_button_or_link( EE_Admin_Page::add_query_args_and_nonce( array('action'=> 'view_transaction', 'TXN_ID' => $transaction->ID() ), TXN_ADMIN_URL ), __(' View Transaction'), 'button secondary-button right', 'dashicons dashicons-cart' ) : '';
-		$this->_template_args['resend_registration_button'] = $attendee instanceof EE_Attendee && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'espresso_registrations_resend_registration' ) ?EEH_Template::get_button_or_link( EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'resend_registration', '_REG_ID'=>$this->_registration->ID(), 'redirect_to' => 'view_registration' ), REG_ADMIN_URL ), __(' Resend Registration'), 'button secondary-button right', 'dashicons dashicons-email-alt' ) : '';
+		$this->_template_args['view_transaction_button'] = EE_Registry::instance()->CAP->current_user_can('ee_read_transaction', 'espresso_transactions_view_transaction') ? EEH_Template::get_button_or_link(EE_Admin_Page::add_query_args_and_nonce(array('action'=> 'view_transaction', 'TXN_ID' => $transaction->ID()), TXN_ADMIN_URL), __(' View Transaction'), 'button secondary-button right', 'dashicons dashicons-cart') : '';
+		$this->_template_args['resend_registration_button'] = $attendee instanceof EE_Attendee && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'espresso_registrations_resend_registration') ? EEH_Template::get_button_or_link(EE_Admin_Page::add_query_args_and_nonce(array('action'=>'resend_registration', '_REG_ID'=>$this->_registration->ID(), 'redirect_to' => 'view_registration'), REG_ADMIN_URL), __(' Resend Registration'), 'button secondary-button right', 'dashicons dashicons-email-alt') : '';
 
 
 		$this->_template_args['currency_sign'] = EE_Registry::instance()->CFG->currency->sign;
-		$payment = $transaction->get_first_related( 'Payment' );
+		$payment = $transaction->get_first_related('Payment');
 		$payment = ! $payment instanceof EE_Payment ? EE_Payment::new_instance() : $payment;
-		$payment_method = $payment->get_first_related( 'Payment_Method' );
+		$payment_method = $payment->get_first_related('Payment_Method');
 		$payment_method = ! $payment_method instanceof EE_Payment_Method ? EE_Payment_Method::new_instance() : $payment_method;
-		$reg_status_class = 'status-' . $this->_registration->status_ID();
+		$reg_status_class = 'status-'.$this->_registration->status_ID();
 		$reg_details = array(
 			'payment_method' => $payment_method->name(),
 			'response_msg' => $payment->gateway_response(),
-			'registration_id' => $this->_registration->get( 'REG_code' ),
+			'registration_id' => $this->_registration->get('REG_code'),
 			'registration_session' => $this->_registration->session_ID(),
-			'ip_address' => isset( $this->_session['ip_address'] ) ? $this->_session['ip_address'] : '',
-			'user_agent' => isset( $this->_session['user_agent'] ) ? $this->_session['user_agent'] : '',
+			'ip_address' => isset($this->_session['ip_address']) ? $this->_session['ip_address'] : '',
+			'user_agent' => isset($this->_session['user_agent']) ? $this->_session['user_agent'] : '',
 			);
 
 
-		if ( isset( $reg_details['registration_id'] )) {
+		if (isset($reg_details['registration_id'])) {
 			$this->_template_args['reg_details']['registration_id']['value'] = $reg_details['registration_id'];
-			$this->_template_args['reg_details']['registration_id']['label'] = __( 'Registration ID', 'event_espresso' );
+			$this->_template_args['reg_details']['registration_id']['label'] = __('Registration ID', 'event_espresso');
 			$this->_template_args['reg_details']['registration_id']['class'] = 'regular-text';
 		}
 
-		if ( isset( $reg_details['payment_method'] ) ) {
+		if (isset($reg_details['payment_method'])) {
 			$this->_template_args['reg_details']['payment_method']['value'] = $reg_details['payment_method'];
-			$this->_template_args['reg_details']['payment_method']['label'] = __( 'Most Recent Payment Method', 'event_espresso' );
+			$this->_template_args['reg_details']['payment_method']['label'] = __('Most Recent Payment Method', 'event_espresso');
 			$this->_template_args['reg_details']['payment_method']['class'] = 'regular-text';
 			$this->_template_args['reg_details']['response_msg']['value'] = $reg_details['response_msg'];
-			$this->_template_args['reg_details']['response_msg']['label'] = __( 'Payment method response', 'event_espresso' );
+			$this->_template_args['reg_details']['response_msg']['label'] = __('Payment method response', 'event_espresso');
 			$this->_template_args['reg_details']['response_msg']['class'] = 'regular-text';
 		}
 
 		$this->_template_args['reg_details']['registration_session']['value'] = $reg_details['registration_session'];
-		$this->_template_args['reg_details']['registration_session']['label'] = __( 'Registration Session', 'event_espresso' );
+		$this->_template_args['reg_details']['registration_session']['label'] = __('Registration Session', 'event_espresso');
 		$this->_template_args['reg_details']['registration_session']['class'] = 'regular-text';
 
 		$this->_template_args['reg_details']['ip_address']['value'] = $reg_details['ip_address'];
-		$this->_template_args['reg_details']['ip_address']['label'] = __( 'Registration placed from IP', 'event_espresso' );
+		$this->_template_args['reg_details']['ip_address']['label'] = __('Registration placed from IP', 'event_espresso');
 		$this->_template_args['reg_details']['ip_address']['class'] = 'regular-text';
 
 		$this->_template_args['reg_details']['user_agent']['value'] = $reg_details['user_agent'];
-		$this->_template_args['reg_details']['user_agent']['label'] = __( 'Registrant User Agent', 'event_espresso' );
+		$this->_template_args['reg_details']['user_agent']['label'] = __('Registrant User Agent', 'event_espresso');
 		$this->_template_args['reg_details']['user_agent']['class'] = 'large-text';
 
-		$this->_template_args['event_link'] = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'default', 'event_id' => $this->_registration->event_ID()), REG_ADMIN_URL );
+		$this->_template_args['event_link'] = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'default', 'event_id' => $this->_registration->event_ID()), REG_ADMIN_URL);
 
-		$template_path = REG_TEMPLATE_PATH . 'reg_admin_details_main_meta_box_reg_details.template.php';
-		echo EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
+		$template_path = REG_TEMPLATE_PATH.'reg_admin_details_main_meta_box_reg_details.template.php';
+		echo EEH_Template::display_template($template_path, $this->_template_args, TRUE);
 
 	}
 
@@ -1488,23 +1488,23 @@ 
 	*/
 	public function _reg_questions_meta_box() {
 
-		add_filter( 'FHEE__EEH_Form_Fields__generate_question_groups_html__before_question_group_questions', array( $this, 'form_before_question_group' ), 10, 1 );
-		add_filter( 'FHEE__EEH_Form_Fields__generate_question_groups_html__after_question_group_questions', array( $this, 'form_after_question_group' ), 10, 1 );
-		add_filter( 'FHEE__EEH_Form_Fields__label_html', array( $this, 'form_form_field_label_wrap' ), 10, 1 );
-		add_filter( 'FHEE__EEH_Form_Fields__input_html', array( $this, 'form_form_field_input__wrap' ), 10, 1 );
+		add_filter('FHEE__EEH_Form_Fields__generate_question_groups_html__before_question_group_questions', array($this, 'form_before_question_group'), 10, 1);
+		add_filter('FHEE__EEH_Form_Fields__generate_question_groups_html__after_question_group_questions', array($this, 'form_after_question_group'), 10, 1);
+		add_filter('FHEE__EEH_Form_Fields__label_html', array($this, 'form_form_field_label_wrap'), 10, 1);
+		add_filter('FHEE__EEH_Form_Fields__input_html', array($this, 'form_form_field_input__wrap'), 10, 1);
 
-		$question_groups = EEM_Event::instance()->assemble_array_of_groups_questions_and_options( $this->_registration, $this->_registration->get('EVT_ID') );
+		$question_groups = EEM_Event::instance()->assemble_array_of_groups_questions_and_options($this->_registration, $this->_registration->get('EVT_ID'));
 
 		//EEH_Debug_Tools::printr( $question_groups, '$question_groups  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 
-		EE_Registry::instance()->load_helper( 'Form_Fields' );
-		$this->_template_args['att_questions'] = EEH_Form_Fields::generate_question_groups_html( $question_groups );
+		EE_Registry::instance()->load_helper('Form_Fields');
+		$this->_template_args['att_questions'] = EEH_Form_Fields::generate_question_groups_html($question_groups);
 
 		$this->_template_args['reg_questions_form_action'] = 'update_attendee_registration_form';
 		$this->_template_args['REG_ID'] = $this->_registration->ID();
 
-		$template_path = REG_TEMPLATE_PATH . 'reg_admin_details_main_meta_box_reg_questions.template.php';
-		echo EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
+		$template_path = REG_TEMPLATE_PATH.'reg_admin_details_main_meta_box_reg_questions.template.php';
+		echo EEH_Template::display_template($template_path, $this->_template_args, TRUE);
 
 	}
 
@@ -1519,7 +1519,7 @@ 
 	 * 		@param 		string 		$output
 	 * 		@return 		string
 	 */
-	public function form_before_question_group( $output ) {
+	public function form_before_question_group($output) {
 		return '
 	<table class="form-table ee-width-100">
 		<tbody>
@@ -1536,13 +1536,13 @@ 
 	 * 		@param 		string 		$output
 	 * 		@return 		string
 	 */
-	public function form_after_question_group( $output ) {
+	public function form_after_question_group($output) {
 		return  '
 			<tr class="hide-if-no-js">
 				<th> </th>
 				<td class="reg-admin-edit-attendee-question-td">
-					<a class="reg-admin-edit-attendee-question-lnk" href="#" title="' . esc_attr__( 'click to edit question', 'event_espresso' ) . '">
-						<span class="reg-admin-edit-question-group-spn lt-grey-txt">' . __( 'edit the above question group', 'event_espresso' ) . '</span>
+					<a class="reg-admin-edit-attendee-question-lnk" href="#" title="' . esc_attr__('click to edit question', 'event_espresso').'">
+						<span class="reg-admin-edit-question-group-spn lt-grey-txt">' . __('edit the above question group', 'event_espresso').'</span>
 						<div class="dashicons dashicons-edit"></div>
 					</a>
 				</td>
@@ -1562,11 +1562,11 @@ 
 	 * 		@param 		string 		$label
 	 * 		@return 		string
 	 */
-	public function form_form_field_label_wrap( $label ) {
+	public function form_form_field_label_wrap($label) {
 		return '
 			<tr>
 				<th>
-					' . $label  . '
+					' . $label.'
 				</th>';
 	}
 
@@ -1580,10 +1580,10 @@ 
 	 * 		@param 		string 		$label
 	 * 		@return 		string
 	 */
-	public function form_form_field_input__wrap( $input ) {
+	public function form_form_field_input__wrap($input) {
 		return '
 				<td class="reg-admin-attendee-questions-input-td disabled-input">
-					' . $input . '
+					' . $input.'
 				</td>
 			</tr>';
 	}
@@ -1597,13 +1597,13 @@ 
 	*		@return void
 	*/
 	protected function _update_attendee_registration_form() {
-		$qstns = isset( $this->_req_data['qstn'] ) ? $this->_req_data['qstn'] : FALSE;
-		$REG_ID = isset( $this->_req_data['_REG_ID'] ) ? absint( $this->_req_data['_REG_ID'] ) : FALSE;
-		$qstns = apply_filters( 'FHEE__Registrations_Admin_Page___update_attendee_registration_form__qstns', $qstns );
-		$success = $this->_save_attendee_registration_form( $REG_ID, $qstns );
+		$qstns = isset($this->_req_data['qstn']) ? $this->_req_data['qstn'] : FALSE;
+		$REG_ID = isset($this->_req_data['_REG_ID']) ? absint($this->_req_data['_REG_ID']) : FALSE;
+		$qstns = apply_filters('FHEE__Registrations_Admin_Page___update_attendee_registration_form__qstns', $qstns);
+		$success = $this->_save_attendee_registration_form($REG_ID, $qstns);
 		$what = __('Registration Form', 'event_espresso');
-		$route = $REG_ID ? array( 'action' => 'view_registration', '_REG_ID' => $REG_ID ) : array( 'action' => 'default' );
-		$this->_redirect_after_action( $success, $what, __('updated', 'event_espresso'), $route );
+		$route = $REG_ID ? array('action' => 'view_registration', '_REG_ID' => $REG_ID) : array('action' => 'default');
+		$this->_redirect_after_action($success, $what, __('updated', 'event_espresso'), $route);
 
 	}
 
@@ -1616,26 +1616,26 @@ 
 	 * @param bool $qstns
 	 * @return bool
 	 */
-	private function _save_attendee_registration_form( $REG_ID = FALSE, $qstns = FALSE ) {
+	private function _save_attendee_registration_form($REG_ID = FALSE, $qstns = FALSE) {
 
-		if ( ! $REG_ID || ! $qstns ) {
-			EE_Error::add_error( __('An error occurred. No registration ID and/or registration questions were received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $REG_ID || ! $qstns) {
+			EE_Error::add_error(__('An error occurred. No registration ID and/or registration questions were received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
 		$success = TRUE;
 
 		// allow others to get in on this awesome fun   :D
-		do_action( 'AHEE__Registrations_Admin_Page___save_attendee_registration_form__after_reg_and_attendee_save', $REG_ID, $qstns );
+		do_action('AHEE__Registrations_Admin_Page___save_attendee_registration_form__after_reg_and_attendee_save', $REG_ID, $qstns);
 		// loop thru questions... FINALLY!!!
 
-		foreach ( $qstns as $QST_ID => $qstn ) {
+		foreach ($qstns as $QST_ID => $qstn) {
 			//if $qstn isn't an array then it doesn't already have an answer, so let's create the answer
-			if ( !is_array($qstn) ) {
-				$success = $this->_save_new_answer( $REG_ID, $QST_ID, $qstn);
+			if ( ! is_array($qstn)) {
+				$success = $this->_save_new_answer($REG_ID, $QST_ID, $qstn);
 				continue;
 			}
 
 
-			foreach ( $qstn as $ANS_ID => $ANS_value ) {
+			foreach ($qstn as $ANS_ID => $ANS_value) {
 				//get answer
 				$query_params = array(
 					0 => array(
@@ -1646,8 +1646,8 @@ 
 					);
 				$answer = EEM_Answer::instance()->get_one($query_params);
 				//this MAY be an array but NOT have an answer because its multi select.  If so then we need to create the answer
-				if ( ! $answer instanceof EE_Answer ) {
-					$success = $this->_save_new_answer( $REG_ID, $QST_ID, $qstn);
+				if ( ! $answer instanceof EE_Answer) {
+					$success = $this->_save_new_answer($REG_ID, $QST_ID, $qstn);
 					continue 2;
 				}
 
@@ -1661,7 +1661,7 @@ 
 
 
 	//TODO: try changing this to use the model directly... not indirectly through creating a default object...
-	private function _save_new_answer( $REG_ID, $QST_ID, $ans ) {
+	private function _save_new_answer($REG_ID, $QST_ID, $ans) {
 		$set_values = array(
 			'QST_ID' => $QST_ID,
 			'REG_ID' => $REG_ID,
@@ -1688,30 +1688,30 @@ 
 		$registrations = $REG->get_all(array(
 			array(
 				'TXN_ID'=>$this->_registration->transaction_ID(),
-				'REG_ID'=>array('!=',$this->_registration->ID())
+				'REG_ID'=>array('!=', $this->_registration->ID())
 			),
 			'force_join'=>array('Attendee')));
 
 		$this->_template_args['attendees'] = array();
 		$this->_template_args['attendee_notice'] = '';
 		EE_Registry::instance()->load_helper('Array');
-		if ( empty( $registrations)  || ( is_array($registrations) &&  ! EEH_Array::get_one_item_from_array($registrations) ) ) {
-			EE_Error::add_error( __('There are no records attached to this registration. Something may have gone wrong with the registration', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($registrations) || (is_array($registrations) && ! EEH_Array::get_one_item_from_array($registrations))) {
+			EE_Error::add_error(__('There are no records attached to this registration. Something may have gone wrong with the registration', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			$this->_template_args['attendee_notice'] = EE_Error::get_notices();
 		} else {
 
 			$att_nmbr = 1;
-			foreach ( $registrations as $registration ) {
+			foreach ($registrations as $registration) {
 				/* @var $registration EE_Registration */
 				$attendee = $registration->attendee() ? $registration->attendee() : EEM_Attendee::instance()->create_default_object();
-				$this->_template_args['attendees'][ $att_nmbr ]['fname'] = $attendee->fname();//( isset( $registration->ATT_fname ) & ! empty( $registration->ATT_fname ) ) ? $registration->ATT_fname : '';
-				$this->_template_args['attendees'][ $att_nmbr ]['lname'] = $attendee->lname();//( isset( $registration->ATT_lname ) & ! empty( $registration->ATT_lname ) ) ? $registration->ATT_lname : '';
-				$this->_template_args['attendees'][ $att_nmbr ]['email'] = $attendee->email();//( isset( $registration->ATT_email ) & ! empty( $registration->ATT_email ) ) ? $registration->ATT_email : '';
-				$this->_template_args['attendees'][ $att_nmbr ]['final_price'] = $registration->final_price();//( isset( $registration->REG_final_price ) & ! empty( $registration->REG_final_price ) ) ? $registration->REG_final_price : '';
+				$this->_template_args['attendees'][$att_nmbr]['fname'] = $attendee->fname(); //( isset( $registration->ATT_fname ) & ! empty( $registration->ATT_fname ) ) ? $registration->ATT_fname : '';
+				$this->_template_args['attendees'][$att_nmbr]['lname'] = $attendee->lname(); //( isset( $registration->ATT_lname ) & ! empty( $registration->ATT_lname ) ) ? $registration->ATT_lname : '';
+				$this->_template_args['attendees'][$att_nmbr]['email'] = $attendee->email(); //( isset( $registration->ATT_email ) & ! empty( $registration->ATT_email ) ) ? $registration->ATT_email : '';
+				$this->_template_args['attendees'][$att_nmbr]['final_price'] = $registration->final_price(); //( isset( $registration->REG_final_price ) & ! empty( $registration->REG_final_price ) ) ? $registration->REG_final_price : '';
 
-				$this->_template_args['attendees'][ $att_nmbr ]['address'] = implode( ', ', $attendee->full_address_as_array() );
+				$this->_template_args['attendees'][$att_nmbr]['address'] = implode(', ', $attendee->full_address_as_array());
 
-				$this->_template_args['attendees'][ $att_nmbr ]['att_link'] = self::add_query_args_and_nonce( array( 'action'=>'edit_attendee', 'post'=>$attendee->ID() ), REG_ADMIN_URL );
+				$this->_template_args['attendees'][$att_nmbr]['att_link'] = self::add_query_args_and_nonce(array('action'=>'edit_attendee', 'post'=>$attendee->ID()), REG_ADMIN_URL);
 
 				$att_nmbr++;
 			}
@@ -1723,8 +1723,8 @@ 
 
 	//			$this->_template_args['registration_form_url'] = add_query_arg( array( 'action' => 'edit_registration', 'process' => 'attendees'  ), REG_ADMIN_URL );
 		}
-		$template_path = REG_TEMPLATE_PATH . 'reg_admin_details_main_meta_box_attendees.template.php';
-		echo EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
+		$template_path = REG_TEMPLATE_PATH.'reg_admin_details_main_meta_box_attendees.template.php';
+		echo EEH_Template::display_template($template_path, $this->_template_args, TRUE);
 
 	}
 
@@ -1745,11 +1745,11 @@ 
 		$attendee = $att_check instanceof EE_Attendee ? $att_check : EEM_Attendee::instance()->create_default_object();
 
 		//now let's determine if this is not the primary registration.  If it isn't then we set the primary_registration object for reference BUT ONLY if the Attendee object loaded is not the same as the primary registration object (that way we know if we need to show cereate button or not)
-		if ( ! $this->_registration->is_primary_registrant() ) {
+		if ( ! $this->_registration->is_primary_registrant()) {
 			$primary_registration = $this->_registration->get_primary_registration();
 			$primary_attendee = $primary_registration->attendee();
 
-			if ( ! $primary_attendee instanceof EE_Attendee || $attendee->ID() !== $primary_attendee->ID() ) {
+			if ( ! $primary_attendee instanceof EE_Attendee || $attendee->ID() !== $primary_attendee->ID()) {
 				//in here?  This means the displayed registration is not the primary registrant but ALREADY HAS its own custom attendee object so let's not worry about the primary reg.
 				$primary_registration = NULL;
 			}
@@ -1758,28 +1758,28 @@ 
 		}
 
 		$this->_template_args['ATT_ID'] = $attendee->ID();
-		$this->_template_args['fname'] = $attendee->fname();//$this->_registration->ATT_fname;
-		$this->_template_args['lname'] = $attendee->lname();//$this->_registration->ATT_lname;
-		$this->_template_args['email'] = $attendee->email();//$this->_registration->ATT_email;
+		$this->_template_args['fname'] = $attendee->fname(); //$this->_registration->ATT_fname;
+		$this->_template_args['lname'] = $attendee->lname(); //$this->_registration->ATT_lname;
+		$this->_template_args['email'] = $attendee->email(); //$this->_registration->ATT_email;
 		$this->_template_args['phone'] = $attendee->phone();
 
-		EE_Registry::instance()->load_helper( 'Formatter' );
-		$this->_template_args[ 'formatted_address' ] = EEH_Address::format( $attendee );
+		EE_Registry::instance()->load_helper('Formatter');
+		$this->_template_args['formatted_address'] = EEH_Address::format($attendee);
 
 
 		//edit link
-		$this->_template_args['att_edit_link'] = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'edit_attendee', 'post'=>$attendee->ID() ), REG_ADMIN_URL );
-		$this->_template_args['att_edit_label'] = __('View/Edit Contact' );
+		$this->_template_args['att_edit_link'] = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'edit_attendee', 'post'=>$attendee->ID()), REG_ADMIN_URL);
+		$this->_template_args['att_edit_label'] = __('View/Edit Contact');
 
 		//create link
-		$this->_template_args['create_link'] = $primary_registration instanceof EE_Registration ? EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'duplicate_attendee',  '_REG_ID' => $this->_registration->ID() ), REG_ADMIN_URL ): '';
+		$this->_template_args['create_link'] = $primary_registration instanceof EE_Registration ? EE_Admin_Page::add_query_args_and_nonce(array('action' => 'duplicate_attendee', '_REG_ID' => $this->_registration->ID()), REG_ADMIN_URL) : '';
 		$this->_template_args['create_label'] = __('Create Contact', 'event_espresso');
 
 		$this->_template_args['att_check'] = $att_check;
 
 
-		$template_path = REG_TEMPLATE_PATH . 'reg_admin_details_side_meta_box_registrant.template.php';
-		echo EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
+		$template_path = REG_TEMPLATE_PATH.'reg_admin_details_side_meta_box_registrant.template.php';
+		echo EEH_Template::display_template($template_path, $this->_template_args, TRUE);
 	}
 
 
@@ -1792,7 +1792,7 @@ 
 	 * @access protected
 	 * @return void
 	 */
-	protected function _trash_or_restore_registrations( $trash = TRUE ) {
+	protected function _trash_or_restore_registrations($trash = TRUE) {
 		$REGM = EEM_Registration::instance();
 
 		$success = 1;
@@ -1802,26 +1802,26 @@ 
 		$dtts = array();
 
 		//if empty _REG_ID then get out because there's nothing to do
-		if ( empty( $this->_req_data['_REG_ID'] ) ) {
+		if (empty($this->_req_data['_REG_ID'])) {
 			$msg = $trash ? __('In order to trash registrations you must select which ones you wish to trash by clicking the checkboxes.', 'event_espresso') : __('In order to restore registrations you must select which ones you wish to restore by clicking the checkboxes.', 'event_espresso');
-			EE_Error::add_error( $msg, __FILE__, __LINE__, __FUNCTION__ );
-			$this->_redirect_after_action(FALSE, '', '', array(), TRUE );
+			EE_Error::add_error($msg, __FILE__, __LINE__, __FUNCTION__);
+			$this->_redirect_after_action(FALSE, '', '', array(), TRUE);
 		}
 
 		//Checkboxes
-		if (!empty($this->_req_data['_REG_ID']) && is_array($this->_req_data['_REG_ID'])) {
+		if ( ! empty($this->_req_data['_REG_ID']) && is_array($this->_req_data['_REG_ID'])) {
 			// if array has more than one element than success message should be plural
-			$success = count( $this->_req_data['_REG_ID'] ) > 1 ? 2 : 1;
+			$success = count($this->_req_data['_REG_ID']) > 1 ? 2 : 1;
 			// cycle thru checkboxes
-			while (list( $ind, $REG_ID ) = each($this->_req_data['_REG_ID'])) {
+			while (list($ind, $REG_ID) = each($this->_req_data['_REG_ID'])) {
 
 				$REG = $REGM->get_one_by_ID($REG_ID);
 				$payment_count = $REG->get_first_related('Transaction')->count_related('Payment');
-				if ( $payment_count > 0 ) {
-					$name = $REG->attendee() instanceof EE_Attendee ? $REG->attendee()->full_name() : __( 'Unknown Attendee', 'event_espresso' );
+				if ($payment_count > 0) {
+					$name = $REG->attendee() instanceof EE_Attendee ? $REG->attendee()->full_name() : __('Unknown Attendee', 'event_espresso');
 					$error = 1;
 					$success = 0;
-					EE_Error::add_error( sprintf( __('The registration for %s could not be trashed because it has payments attached to the related transaction.  If you wish to trash this registration you must first delete the payments on the related transaction.', 'event_espresso'), $name ), __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_error(sprintf(__('The registration for %s could not be trashed because it has payments attached to the related transaction.  If you wish to trash this registration you must first delete the payments on the related transaction.', 'event_espresso'), $name), __FILE__, __FUNCTION__, __LINE__);
 					continue; //can't trash this registration because it has payments.
 				}
 				$ticket = $REG->get_first_related('Ticket');
@@ -1830,7 +1830,7 @@ 
 				$dtts = array_merge($dtts, $dtt);
 
 				$updated = $trash ? $REG->delete() : $REG->restore();
-				if ( !$updated ) {
+				if ( ! $updated) {
 					$success = 0;
 				} else {
 					$success = 2;
@@ -1845,7 +1845,7 @@ 
 			$tickets[$ticket->ID()] = $ticket;
 			$dtts = $ticket->get_many_related('Datetime');
 			$updated = $trash ? $REG->delete() : $REG->restore();
-			if ( ! $updated ) {
+			if ( ! $updated) {
 				$success = 0;
 			}
 
@@ -1855,10 +1855,10 @@ 
 		EEM_Ticket::instance()->update_tickets_sold($tickets);
 		EEM_Datetime::instance()->update_sold($dtts);
 
-		$what = $success > 1 ? __( 'Registrations', 'event_espresso' ) : __( 'Registration', 'event_espresso' );
-		$action_desc = $trash ? __( 'moved to the trash', 'event_espresso' ) : __( 'restored', 'event_espresso' );
+		$what = $success > 1 ? __('Registrations', 'event_espresso') : __('Registration', 'event_espresso');
+		$action_desc = $trash ? __('moved to the trash', 'event_espresso') : __('restored', 'event_espresso');
 		$overwrite_msgs = $error ? TRUE : FALSE;
-		$this->_redirect_after_action( $success, $what, $action_desc, array( 'action' => 'default' ), $overwrite_msgs );
+		$this->_redirect_after_action($success, $what, $action_desc, array('action' => 'default'), $overwrite_msgs);
 	}
 
 
@@ -1882,16 +1882,16 @@ 
 		$success = 1;
 
 		//Checkboxes
-		if (!empty($this->_req_data['_REG_ID']) && is_array($this->_req_data['_REG_ID'])) {
+		if ( ! empty($this->_req_data['_REG_ID']) && is_array($this->_req_data['_REG_ID'])) {
 			// if array has more than one element than success message should be plural
-			$success = count( $this->_req_data['_REG_ID'] ) > 1 ? 2 : 1;
+			$success = count($this->_req_data['_REG_ID']) > 1 ? 2 : 1;
 			// cycle thru checkboxes
-			while (list( $ind, $REG_ID ) = each($this->_req_data['_REG_ID'])) {
+			while (list($ind, $REG_ID) = each($this->_req_data['_REG_ID'])) {
 				$REG = $REG_MDL->get_one_by_ID($REG_ID);
-				if ( ! $REG instanceof EE_Registration )
+				if ( ! $REG instanceof EE_Registration)
 					continue;
 				$deleted = $this->_delete_registration($REG);
-				if ( !$deleted ) {
+				if ( ! $deleted) {
 					$success = 0;
 				}
 			}
@@ -1901,15 +1901,15 @@ 
 			$REG_ID = $this->_req_data['_REG_ID'];
 			$REG = $REG_MDL->get_one_by_ID($REG_ID);
 			$deleted = $this->_delete_registration($REG);
-			if ( ! $deleted ) {
+			if ( ! $deleted) {
 				$success = 0;
 			}
 
 		}
 
-		$what = $success > 1 ? __( 'Registrations', 'event_espresso' ) : __( 'Registration', 'event_espresso' );
-		$action_desc = __( 'permanently deleted.', 'event_espresso' );
-		$this->_redirect_after_action( $success, $what, $action_desc, array( 'action' => 'default' ), TRUE );
+		$what = $success > 1 ? __('Registrations', 'event_espresso') : __('Registration', 'event_espresso');
+		$action_desc = __('permanently deleted.', 'event_espresso');
+		$this->_redirect_after_action($success, $what, $action_desc, array('action' => 'default'), TRUE);
 	}
 
 
@@ -1921,31 +1921,31 @@ 
 	 * @param  EE_Registration $REG registration to be deleted permenantly
 	 * @return boolean              true = successful deletion, false = fail.
 	 */
-	protected function _delete_registration( EE_Registration $REG ) {
+	protected function _delete_registration(EE_Registration $REG) {
 		//first we start with the transaction... ultimately, we WILL not delete permanently if there are any related registrations on the transaction that are NOT trashed.
 		$TXN = $REG->get_first_related('Transaction');
 		$REGS = $TXN->get_many_related('Registration');
 
 		$all_trashed = TRUE;
-		foreach ( $REGS as $registration ) {
-			if ( ! $registration->get('REG_deleted') )
+		foreach ($REGS as $registration) {
+			if ( ! $registration->get('REG_deleted'))
 				$all_trashed = FALSE;
 		}
 
-		if ( ! $all_trashed ) {
-			EE_Error::add_error( __('Unable to permanently delete this registration. Before this registration can be permanently deleted, all registrations made in the same transaction must be trashed as well.  These registrations will be permanently deleted in the same action.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $all_trashed) {
+			EE_Error::add_error(__('Unable to permanently delete this registration. Before this registration can be permanently deleted, all registrations made in the same transaction must be trashed as well.  These registrations will be permanently deleted in the same action.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 
 		//k made it here so that means we can delete all the related transactions and their answers (but let's do them separately from THIS one).
-		foreach ( $REGS as $registration ) {
+		foreach ($REGS as $registration) {
 
 			//delete related answers
 			$registration->delete_related_permanently('Answer');
 
 			//remove relationship to EE_Attendee (but we ALWAYS leave the contact record intact)
 			$attendee = $registration->get_first_related('Attendee');
-			if ( $attendee instanceof EE_Attendee ) {
+			if ($attendee instanceof EE_Attendee) {
 				$registration->_remove_relation_to($attendee, 'Attendee');
 			}
 
@@ -1955,7 +1955,7 @@ 
 			//now delete permanently the checkins related to this registration.
 			$registration->delete_related_permanently('Checkin');
 
-			if ( $registration->ID() === $REG->ID() )
+			if ($registration->ID() === $REG->ID())
 				continue; //we don't want to delete permanently the existing registration just yet.
 
 			//remove relation to transaction for these registrations if NOT the existing registrations
@@ -1988,34 +1988,34 @@ 
 	 * @return void
 	 */
 	public function new_registration() {
-		if ( ! $this->_set_reg_event() ) {
-			throw new EE_Error(__('Unable to continue with registering because there is no Event ID in the request', 'event_espresso') );
+		if ( ! $this->_set_reg_event()) {
+			throw new EE_Error(__('Unable to continue with registering because there is no Event ID in the request', 'event_espresso'));
 		}
-		EE_Registry::instance()->REQ->set_espresso_page( TRUE );
+		EE_Registry::instance()->REQ->set_espresso_page(TRUE);
 
 		// gotta start with a clean slate if we're not coming here via ajax
-		if ( ! defined('DOING_AJAX' ) && ( ! isset( $this->_req_data['processing_registration'] ) || isset( $this->_req_data['step_error'] ))) {
-			EE_Registry::instance()->SSN->clear_session( __CLASS__, __FUNCTION__ );
+		if ( ! defined('DOING_AJAX') && ( ! isset($this->_req_data['processing_registration']) || isset($this->_req_data['step_error']))) {
+			EE_Registry::instance()->SSN->clear_session(__CLASS__, __FUNCTION__);
 		}
 
-		$this->_template_args['event_name'] = '' ;
+		$this->_template_args['event_name'] = '';
 		// event name
-		if ( $this->_reg_event ) {
+		if ($this->_reg_event) {
 			$this->_template_args['event_name'] = $this->_reg_event->name();
-			$edit_event_url = self::add_query_args_and_nonce( array( 'action'=>'edit', 'post'=>$this->_reg_event->ID() ), EVENTS_ADMIN_URL );
-			$edit_event_lnk = '<a href="'.$edit_event_url.'" title="' . esc_attr__( 'Edit ', 'event_espresso' ) . $this->_reg_event->name() . '">' . __( 'Edit Event', 'event_espresso' ) . '</a>';
-			$this->_template_args['event_name'] .= ' <span class="admin-page-header-edit-lnk not-bold">' . $edit_event_lnk . '</span>' ;
+			$edit_event_url = self::add_query_args_and_nonce(array('action'=>'edit', 'post'=>$this->_reg_event->ID()), EVENTS_ADMIN_URL);
+			$edit_event_lnk = '<a href="'.$edit_event_url.'" title="'.esc_attr__('Edit ', 'event_espresso').$this->_reg_event->name().'">'.__('Edit Event', 'event_espresso').'</a>';
+			$this->_template_args['event_name'] .= ' <span class="admin-page-header-edit-lnk not-bold">'.$edit_event_lnk.'</span>';
 		}
 
 		$this->_template_args['step_content'] = $this->_get_registration_step_content();
 
-		if ( defined('DOING_AJAX' ) )
+		if (defined('DOING_AJAX'))
 			$this->_return_json();
 
 
 		// grab header
-		$template_path = REG_TEMPLATE_PATH . 'reg_admin_register_new_attendee.template.php';
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
+		$template_path = REG_TEMPLATE_PATH.'reg_admin_register_new_attendee.template.php';
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, $this->_template_args, TRUE);
 
 		//$this->_set_publish_post_box_vars( NULL, FALSE, FALSE, NULL, FALSE );
 		// the details template wrapper
@@ -2033,7 +2033,7 @@ 
 	 */
 	protected function _get_registration_step_content() {
 
-		$template_path = REG_TEMPLATE_PATH . 'reg_admin_register_new_attendee_step_content.template.php';
+		$template_path = REG_TEMPLATE_PATH.'reg_admin_register_new_attendee_step_content.template.php';
 		$template_args = array(
 			'title' => '',
 			'content' => '',
@@ -2054,11 +2054,11 @@ 
 
 		//if the cart is empty then we know we're at step one so we'll display ticket selector
 		$cart = EE_Registry::instance()->SSN->get_session_data('cart');
-		$step = empty( $cart ) ? 'ticket' : 'questions';
-		switch ( $step ) {
+		$step = empty($cart) ? 'ticket' : 'questions';
+		switch ($step) {
 			case 'ticket' :
 				$template_args['title'] = __('Step One: Select the Ticket for this registration', 'event_espresso');
-				$template_args['content'] = EED_Ticket_Selector::instance()->display_ticket_selector( $this->_reg_event );
+				$template_args['content'] = EED_Ticket_Selector::instance()->display_ticket_selector($this->_reg_event);
 				$template_args['step_button_text'] = __('Add Tickets and Continue to Registrant Details', 'event_espresso');
 				$template_args['show_notification_toggle'] = FALSE;
 				break;
@@ -2071,9 +2071,9 @@ 
 				break;
 		}
 
-		$this->_set_add_edit_form_tags( 'process_reg_step', $hidden_fields ); //we come back to the process_registration_step route.
+		$this->_set_add_edit_form_tags('process_reg_step', $hidden_fields); //we come back to the process_registration_step route.
 
-		return EEH_Template::display_template( $template_path, $template_args, TRUE );
+		return EEH_Template::display_template($template_path, $template_args, TRUE);
 	}
 
 
@@ -2087,11 +2087,11 @@ 
 	*		@return boolean
 	*/
 	private function _set_reg_event() {
-		if ( is_object( $this->_reg_event )) {
+		if (is_object($this->_reg_event)) {
 			return TRUE;
 		}
-		$EVT_ID = ( ! empty( $this->_req_data['event_id'] )) ? absint( $this->_req_data['event_id'] ) : FALSE;
-		if ( ! $EVT_ID ) {
+		$EVT_ID = ( ! empty($this->_req_data['event_id'])) ? absint($this->_req_data['event_id']) : FALSE;
+		if ( ! $EVT_ID) {
 			return FALSE;
 		}
 
@@ -2112,62 +2112,62 @@ 
 	public function process_reg_step() {
 
 		$this->_set_reg_event();
-		EE_Registry::instance()->REQ->set_espresso_page( TRUE );
+		EE_Registry::instance()->REQ->set_espresso_page(TRUE);
 
 		//what step are we on?
-		$cart = EE_Registry::instance()->SSN->get_session_data( 'cart' );
-		$step = empty( $cart ) ? 'ticket' : 'questions';
+		$cart = EE_Registry::instance()->SSN->get_session_data('cart');
+		$step = empty($cart) ? 'ticket' : 'questions';
 
 		//if doing ajax then we need to verify the nonce
-		if ( 'DOING_AJAX' ) {
-			$nonce = isset( $this->_req_data[$this->_req_nonce] ) ? sanitize_text_field( $this->_req_data[$this->_req_nonce] ) : '';
-			$this->_verify_nonce( $nonce, $this->_req_nonce );
+		if ('DOING_AJAX') {
+			$nonce = isset($this->_req_data[$this->_req_nonce]) ? sanitize_text_field($this->_req_data[$this->_req_nonce]) : '';
+			$this->_verify_nonce($nonce, $this->_req_nonce);
 		}
 
-		switch ( $step ) {
+		switch ($step) {
 			case 'ticket' :
 				//process ticket selection
 				$success = EED_Ticket_Selector::instance()->process_ticket_selections();
-				if ( $success ) {
-					EE_Error::add_success( __('Tickets Selected. Now complete the registration.'), 'event_espresso');
+				if ($success) {
+					EE_Error::add_success(__('Tickets Selected. Now complete the registration.'), 'event_espresso');
 				} else {
 					$query_args['step_error'] = $this->_req_data['step_error'] = TRUE;
 				}
-				if ( defined('DOING_AJAX') ) {
+				if (defined('DOING_AJAX')) {
 					$this->new_registration(); //display next step
 				} else {
 					$query_args['action'] = 'new_registration';
 					$query_args['processing_registration'] = true;
 					$query_args['event_id'] = $this->_reg_event->ID();
-					$this->_redirect_after_action( FALSE, '', '', $query_args, TRUE );
+					$this->_redirect_after_action(FALSE, '', '', $query_args, TRUE);
 				}
 				break;
 			case 'questions' :
-				if( ! isset( $this->_req_data[ 'txn_reg_status_change' ], $this->_req_data[ 'txn_reg_status_change' ][ 'send_notifications' ] ) ) {
-					add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_false', 15 );
+				if ( ! isset($this->_req_data['txn_reg_status_change'], $this->_req_data['txn_reg_status_change']['send_notifications'])) {
+					add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_false', 15);
 				}
 				//process registration
 				$transaction = EED_Single_Page_Checkout::instance()->process_registration_from_admin();
-				if ( ! $transaction instanceof EE_Transaction ) {
+				if ( ! $transaction instanceof EE_Transaction) {
 					$query_args = array(
 						'action' => 'new_registration',
 						'processing_registration' => true,
 						'event_id' => $this->_reg_event->ID()
 					);
 
-					if ( defined('DOING_AJAX' )) {
+					if (defined('DOING_AJAX')) {
 						//display registration form again because there are errors (maybe validation?)
 						$this->new_registration();
 						return;
 					} else {
-						$this->_redirect_after_action( FALSE, '', '', $query_args, TRUE );
+						$this->_redirect_after_action(FALSE, '', '', $query_args, TRUE);
 						return;
 					}
 				}
 				/** @type EE_Transaction_Payments $transaction_payments */
-				$transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' );
+				$transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments');
 				// maybe update status, and make sure to save transaction if not done already
-				if ( ! $transaction_payments->update_transaction_status_based_on_total_paid( $transaction )) {
+				if ( ! $transaction_payments->update_transaction_status_based_on_total_paid($transaction)) {
 					$transaction->save();
 				}
 				$query_args = array(
@@ -2175,8 +2175,8 @@ 
 					'TXN_ID' => $transaction->ID(),
 					'page' => 'espresso_transactions'
 				);
-				EE_Error::add_success( __('Registration Created.  Please review the transaction and add any payments as necessary', 'event_espresso') );
-				$this->_redirect_after_action( FALSE, '', '', $query_args, TRUE );
+				EE_Error::add_success(__('Registration Created.  Please review the transaction and add any payments as necessary', 'event_espresso'));
+				$this->_redirect_after_action(FALSE, '', '', $query_args, TRUE);
 				break;
 			}
 
@@ -2196,7 +2196,7 @@ 
 	*		@return void
 	*/
 	protected function _attendee_contact_list_table() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		$this->_search_btn_label = __('Contacts', 'event_espresso');
 		$this->display_admin_list_table_page_with_no_sidebar();
 	}
@@ -2211,10 +2211,10 @@ 
 	*		@access public
 	*		@return array
 	*/
-	public function get_attendees( $per_page, $count = FALSE, $trash = FALSE ) {
+	public function get_attendees($per_page, $count = FALSE, $trash = FALSE) {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		require_once( REG_ADMIN . 'EE_Attendee_Contact_List_Table.class.php' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		require_once(REG_ADMIN.'EE_Attendee_Contact_List_Table.class.php');
 		$ATT_MDL = EEM_Attendee::instance();
 
 		$this->_req_data['orderby'] = ! empty($this->_req_data['orderby']) ? $this->_req_data['orderby'] : '';
@@ -2242,47 +2242,47 @@ 
 				$orderby = 'ATT_lname';
 		}
 
-		$sort = ( isset( $this->_req_data['order'] ) && ! empty( $this->_req_data['order'] )) ? $this->_req_data['order'] : 'ASC';
+		$sort = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order'] : 'ASC';
 
-		$current_page = isset( $this->_req_data['paged'] ) && !empty( $this->_req_data['paged'] ) ? $this->_req_data['paged'] : 1;
-		$per_page = isset( $per_page ) && !empty( $per_page ) ? $per_page : 10;
-		$per_page = isset( $this->_req_data['perpage'] ) && !empty( $this->_req_data['perpage'] ) ? $this->_req_data['perpage'] : $per_page;
+		$current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged']) ? $this->_req_data['paged'] : 1;
+		$per_page = isset($per_page) && ! empty($per_page) ? $per_page : 10;
+		$per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage']) ? $this->_req_data['perpage'] : $per_page;
 
 		$_where = array();
 
-		if ( isset( $this->_req_data['s'] ) ) {
-			$sstr = '%' . $this->_req_data['s'] . '%';
+		if (isset($this->_req_data['s'])) {
+			$sstr = '%'.$this->_req_data['s'].'%';
 			$_where['OR'] = array(
-				'Registration.Event.EVT_name' => array( 'LIKE', $sstr),
-				'Registration.Event.EVT_desc' => array( 'LIKE', $sstr ),
-				'Registration.Event.EVT_short_desc' => array( 'LIKE' , $sstr ),
-				'ATT_fname' => array( 'LIKE', $sstr ),
-				'ATT_lname' => array( 'LIKE', $sstr ),
-				'ATT_short_bio' => array( 'LIKE', $sstr ),
-				'ATT_email' => array('LIKE', $sstr ),
-				'ATT_address' => array( 'LIKE', $sstr ),
-				'ATT_address2' => array( 'LIKE', $sstr ),
-				'ATT_city' => array( 'LIKE', $sstr ),
-				'Country.CNT_name' => array( 'LIKE', $sstr ),
-				'State.STA_name' => array('LIKE', $sstr ),
-				'ATT_phone' => array( 'LIKE', $sstr ),
-				'Registration.REG_final_price' => array( 'LIKE', $sstr ),
-				'Registration.REG_code' => array( 'LIKE', $sstr ),
-				'Registration.REG_count' => array( 'LIKE' , $sstr ),
-				'Registration.REG_group_size' => array( 'LIKE' , $sstr )
+				'Registration.Event.EVT_name' => array('LIKE', $sstr),
+				'Registration.Event.EVT_desc' => array('LIKE', $sstr),
+				'Registration.Event.EVT_short_desc' => array('LIKE', $sstr),
+				'ATT_fname' => array('LIKE', $sstr),
+				'ATT_lname' => array('LIKE', $sstr),
+				'ATT_short_bio' => array('LIKE', $sstr),
+				'ATT_email' => array('LIKE', $sstr),
+				'ATT_address' => array('LIKE', $sstr),
+				'ATT_address2' => array('LIKE', $sstr),
+				'ATT_city' => array('LIKE', $sstr),
+				'Country.CNT_name' => array('LIKE', $sstr),
+				'State.STA_name' => array('LIKE', $sstr),
+				'ATT_phone' => array('LIKE', $sstr),
+				'Registration.REG_final_price' => array('LIKE', $sstr),
+				'Registration.REG_code' => array('LIKE', $sstr),
+				'Registration.REG_count' => array('LIKE', $sstr),
+				'Registration.REG_group_size' => array('LIKE', $sstr)
 				);
 		}
 
 
-		$offset = ($current_page-1)*$per_page;
-		$limit = $count ? NULL : array( $offset, $per_page );
+		$offset = ($current_page - 1) * $per_page;
+		$limit = $count ? NULL : array($offset, $per_page);
 
-		if ( $trash ) {
-			$_where['status'] = array( '!=', 'publish' );
-			$all_attendees = $count ? $ATT_MDL->count( array($_where,'order_by'=>array($orderby=>$sort), 'limit'=>$limit)): $ATT_MDL->get_all( array($_where,'order_by'=>array($orderby=>$sort), 'limit'=>$limit));
+		if ($trash) {
+			$_where['status'] = array('!=', 'publish');
+			$all_attendees = $count ? $ATT_MDL->count(array($_where, 'order_by'=>array($orderby=>$sort), 'limit'=>$limit)) : $ATT_MDL->get_all(array($_where, 'order_by'=>array($orderby=>$sort), 'limit'=>$limit));
 		} else {
-			$_where['status'] = array( 'IN', array( 'publish' ) );
-			$all_attendees = $count ? $ATT_MDL->count( array($_where, 'order_by'=>array($orderby=>$sort),'limit'=>$limit)) : $ATT_MDL->get_all( array($_where, 'order_by'=>array($orderby=>$sort), 'limit'=>$limit) );
+			$_where['status'] = array('IN', array('publish'));
+			$all_attendees = $count ? $ATT_MDL->count(array($_where, 'order_by'=>array($orderby=>$sort), 'limit'=>$limit)) : $ATT_MDL->get_all(array($_where, 'order_by'=>array($orderby=>$sort), 'limit'=>$limit));
 		}
 
 		return $all_attendees;
@@ -2299,10 +2299,10 @@ 
 	 */
 	protected function _resend_registration() {
 		$this->_process_resend_registration();
-		$query_args = isset($this->_req_data['redirect_to'] ) ? array('action' => $this->_req_data['redirect_to'], '_REG_ID' => $this->_req_data['_REG_ID'] ) : array(
+		$query_args = isset($this->_req_data['redirect_to']) ? array('action' => $this->_req_data['redirect_to'], '_REG_ID' => $this->_req_data['_REG_ID']) : array(
 			'action' => 'default'
 		);
-		$this->_redirect_after_action(FALSE, '', '', $query_args, TRUE );
+		$this->_redirect_after_action(FALSE, '', '', $query_args, TRUE);
 	}
 
 
@@ -2310,27 +2310,27 @@ 
 
 
 
-	public function _registrations_report(){
-		if( ! defined( 'EE_USE_OLD_CSV_REPORT_CLASS' ) ) {
-			wp_redirect( EE_Admin_Page::add_query_args_and_nonce( 
+	public function _registrations_report() {
+		if ( ! defined('EE_USE_OLD_CSV_REPORT_CLASS')) {
+			wp_redirect(EE_Admin_Page::add_query_args_and_nonce( 
 				array(
 					'page' => 'espresso_batch',
 					'batch' => 'file',
-					'EVT_ID' => isset( $this->_req_data[ 'EVT_ID'] ) ? $this->_req_data[ 'EVT_ID' ] : NULL,
-					'job_handler' => urlencode( 'EventEspressoBatchRequest\JobHandlers\RegistrationsReport' ),
-					'return_url' => urlencode( $this->_req_data[ 'return_url' ] ),
-				)) );
+					'EVT_ID' => isset($this->_req_data['EVT_ID']) ? $this->_req_data['EVT_ID'] : NULL,
+					'job_handler' => urlencode('EventEspressoBatchRequest\JobHandlers\RegistrationsReport'),
+					'return_url' => urlencode($this->_req_data['return_url']),
+				)));
 		} else {
-			EE_Registry::instance()->load_helper( 'File' );
+			EE_Registry::instance()->load_helper('File');
 			$new_request_args = array(
 				'export' => 'report',
 				'action' => 'registrations_report_for_event',
-				'EVT_ID' => isset( $this->_req_data[ 'EVT_ID'] ) ? $this->_req_data[ 'EVT_ID' ] : NULL,
+				'EVT_ID' => isset($this->_req_data['EVT_ID']) ? $this->_req_data['EVT_ID'] : NULL,
 			);
 			$this->_req_data = array_merge($this->_req_data, $new_request_args);
 
-			if ( is_readable(EE_CLASSES . 'EE_Export.class.php')) {
-				require_once(EE_CLASSES . 'EE_Export.class.php');
+			if (is_readable(EE_CLASSES.'EE_Export.class.php')) {
+				require_once(EE_CLASSES.'EE_Export.class.php');
 				$EE_Export = EE_Export::instance($this->_req_data);
 				$EE_Export->export();
 			}
@@ -2339,28 +2339,28 @@ 
 
 
 
-	public function _contact_list_export(){
-		EE_Registry::instance()->load_helper( 'File' );
-		if ( is_readable(EE_CLASSES . 'EE_Export.class.php')) {
-			require_once(EE_CLASSES . 'EE_Export.class.php');
+	public function _contact_list_export() {
+		EE_Registry::instance()->load_helper('File');
+		if (is_readable(EE_CLASSES.'EE_Export.class.php')) {
+			require_once(EE_CLASSES.'EE_Export.class.php');
 			$EE_Export = EE_Export::instance($this->_req_data);
 			$EE_Export->export_attendees();
 		}
 	}
 
-	public function _contact_list_report(){
-		if( ! defined( 'EE_USE_OLD_CSV_REPORT_CLASS' ) ) {
-			wp_redirect( EE_Admin_Page::add_query_args_and_nonce( 
+	public function _contact_list_report() {
+		if ( ! defined('EE_USE_OLD_CSV_REPORT_CLASS')) {
+			wp_redirect(EE_Admin_Page::add_query_args_and_nonce( 
 				array(
 					'page' => 'espresso_batch',
 					'batch' => 'file',
-					'job_handler' => urlencode( 'EventEspressoBatchRequest\JobHandlers\AttendeesReport' ),
-					'return_url' => urlencode( $this->_req_data[ 'return_url' ] ),
-				)) );
+					'job_handler' => urlencode('EventEspressoBatchRequest\JobHandlers\AttendeesReport'),
+					'return_url' => urlencode($this->_req_data['return_url']),
+				)));
 		} else {
-			EE_Registry::instance()->load_helper( 'File' );
-			if ( is_readable(EE_CLASSES . 'EE_Export.class.php')) {
-				require_once(EE_CLASSES . 'EE_Export.class.php');
+			EE_Registry::instance()->load_helper('File');
+			if (is_readable(EE_CLASSES.'EE_Export.class.php')) {
+				require_once(EE_CLASSES.'EE_Export.class.php');
 				$EE_Export = EE_Export::instance($this->_req_data);
 				$EE_Export->report_attendees();
 			}
@@ -2380,73 +2380,73 @@ 
 	 * @return void
 	 */
 	protected function _duplicate_attendee() {
-		$action = !empty( $this->_req_data['return'] ) ? $this->_req_data['return'] : 'default';
+		$action = ! empty($this->_req_data['return']) ? $this->_req_data['return'] : 'default';
 		//verify we have necessary info
-		if ( empty($this->_req_data['_REG_ID'] )  ) {
-			EE_Error::add_error( __('Unable to create the contact for the registration because the required paramaters are not present (_REG_ID )', 'event_espresso'),  __FILE__, __LINE__, __FUNCTION__ );
-			$query_args = array( 'action' => $action );
+		if (empty($this->_req_data['_REG_ID'])) {
+			EE_Error::add_error(__('Unable to create the contact for the registration because the required paramaters are not present (_REG_ID )', 'event_espresso'), __FILE__, __LINE__, __FUNCTION__);
+			$query_args = array('action' => $action);
 			$this->_redirect_after_action('', '', '', $query_args, TRUE);
 		}
 
 		//okay necessary deets present... let's dupe the incoming attendee and attach to incoming registration.
-		$registration = EEM_Registration::instance()->get_one_by_ID( $this->_req_data['_REG_ID'] );
+		$registration = EEM_Registration::instance()->get_one_by_ID($this->_req_data['_REG_ID']);
 		$attendee = $registration->attendee();
 
 		//remove relation of existing attendee on registration
-		$registration->_remove_relation_to($attendee, 'Attendee' );
+		$registration->_remove_relation_to($attendee, 'Attendee');
 		//new attendee
 		$new_attendee = clone $attendee;
-		$new_attendee->set( 'ATT_ID', 0 );
+		$new_attendee->set('ATT_ID', 0);
 		$new_attendee->save();
 
 		//add new attendee to reg
-		$registration->_add_relation_to( $new_attendee, 'Attendee');
+		$registration->_add_relation_to($new_attendee, 'Attendee');
 
-		EE_Error::add_success( __('New Contact record created.  Now make any edits you wish to make for this contact.', 'event_espresso') );
+		EE_Error::add_success(__('New Contact record created.  Now make any edits you wish to make for this contact.', 'event_espresso'));
 
 		//redirect to edit page for attendee
-		$query_args = array( 'post' => $new_attendee->ID(), 'action' => 'edit_attendee' );
+		$query_args = array('post' => $new_attendee->ID(), 'action' => 'edit_attendee');
 
-		$this->_redirect_after_action( '', '', '', $query_args, TRUE );
+		$this->_redirect_after_action('', '', '', $query_args, TRUE);
 	}
 
 
 	//related to cpt routes
 	protected function _insert_update_cpt_item($post_id, $post) {
 		$success = true;
-		$attendee = EEM_Attendee::instance()->get_one_by_ID( $post_id );
+		$attendee = EEM_Attendee::instance()->get_one_by_ID($post_id);
 		//for attendee updates
-		if ( $post->post_type = 'espresso_attendees' && !empty( $attendee ) ) {
+		if ($post->post_type = 'espresso_attendees' && ! empty($attendee)) {
 			//note we should only be UPDATING attendees at this point.
 			$updated_fields = array(
 				'ATT_fname' => $this->_req_data['ATT_fname'],
 				'ATT_lname' => $this->_req_data['ATT_lname'],
-				'ATT_full_name'=> $this->_req_data['ATT_fname'] . ' ' . $this->_req_data['ATT_lname'],
+				'ATT_full_name'=> $this->_req_data['ATT_fname'].' '.$this->_req_data['ATT_lname'],
 				'ATT_address' => isset($this->_req_data['ATT_address']) ? $this->_req_data['ATT_address'] : '',
 				'ATT_address2' => isset($this->_req_data['ATT_address2']) ? $this->_req_data['ATT_address2'] : '',
-				'ATT_city' => isset( $this->_req_data['ATT_city'] ) ? $this->_req_data['ATT_city'] : '',
-				'STA_ID' => isset( $this->_req_data['STA_ID'] ) ? $this->_req_data['STA_ID'] : '',
-				'CNT_ISO' => isset( $this->_req_data['CNT_ISO'] ) ? $this->_req_data['CNT_ISO'] : '',
-				'ATT_zip' => isset( $this->_req_data['ATT_zip'] ) ? $this->_req_data['ATT_zip'] : '',
-				'ATT_email' => isset( $this->_req_data['ATT_email'] ) ? $this->_req_data['ATT_email'] : '',
-				'ATT_phone' => isset( $this->_req_data['ATT_phone'] ) ? $this->_req_data['ATT_phone'] : ''
+				'ATT_city' => isset($this->_req_data['ATT_city']) ? $this->_req_data['ATT_city'] : '',
+				'STA_ID' => isset($this->_req_data['STA_ID']) ? $this->_req_data['STA_ID'] : '',
+				'CNT_ISO' => isset($this->_req_data['CNT_ISO']) ? $this->_req_data['CNT_ISO'] : '',
+				'ATT_zip' => isset($this->_req_data['ATT_zip']) ? $this->_req_data['ATT_zip'] : '',
+				'ATT_email' => isset($this->_req_data['ATT_email']) ? $this->_req_data['ATT_email'] : '',
+				'ATT_phone' => isset($this->_req_data['ATT_phone']) ? $this->_req_data['ATT_phone'] : ''
 				);
-			foreach ( $updated_fields as $field => $value ) {
+			foreach ($updated_fields as $field => $value) {
 				$attendee->set($field, $value);
 			}
 
 			$success = $attendee->save();
 
-			$attendee_update_callbacks = apply_filters( 'FHEE__Registrations_Admin_Page__insert_update_cpt_item__attendee_update', array() );
-			foreach ( $attendee_update_callbacks as $a_callback ) {
-				if ( FALSE === call_user_func_array( $a_callback, array($attendee, $this->_req_data ) ) ) {
-					throw new EE_Error( sprintf( __('The %s callback given for the "FHEE__Registrations_Admin_Page__insert_update_cpt_item__attendee_update" filter is not a valid callback.  Please check the spelling.', 'event_espresso'), $a_callback ) );
+			$attendee_update_callbacks = apply_filters('FHEE__Registrations_Admin_Page__insert_update_cpt_item__attendee_update', array());
+			foreach ($attendee_update_callbacks as $a_callback) {
+				if (FALSE === call_user_func_array($a_callback, array($attendee, $this->_req_data))) {
+					throw new EE_Error(sprintf(__('The %s callback given for the "FHEE__Registrations_Admin_Page__insert_update_cpt_item__attendee_update" filter is not a valid callback.  Please check the spelling.', 'event_espresso'), $a_callback));
 				}
 			}
 		}
 
-		if ( $success === FALSE )
-			EE_Error::add_error(__('Something went wrong with updating the meta table data for the registration.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if ($success === FALSE)
+			EE_Error::add_error(__('Something went wrong with updating the meta table data for the registration.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 
 	}
 
@@ -2466,17 +2466,17 @@ 
 		remove_meta_box('postexcerpt', __('Excerpt'), 'post_excerpt_meta_box', $this->_cpt_routes[$this->_req_action], 'normal', 'core');
 		remove_meta_box('commentstatusdiv', $this->_cpt_routes[$this->_req_action], 'normal', 'core');
 
-		if ( post_type_supports( 'espresso_attendees', 'excerpt') ) {
-			add_meta_box('postexcerpt', __('Short Biography', 'event_espresso'), 'post_excerpt_meta_box', $this->_cpt_routes[$this->_req_action], 'normal' );
+		if (post_type_supports('espresso_attendees', 'excerpt')) {
+			add_meta_box('postexcerpt', __('Short Biography', 'event_espresso'), 'post_excerpt_meta_box', $this->_cpt_routes[$this->_req_action], 'normal');
 		}
 
-		if ( post_type_supports( 'espresso_attendees', 'comments') ) {
+		if (post_type_supports('espresso_attendees', 'comments')) {
 			add_meta_box('commentsdiv', __('Notes on the Contact', 'event_espresso'), 'post_comment_meta_box', $this->_cpt_routes[$this->_req_action], 'normal', 'core');
 		}
 
-		add_meta_box('attendee_contact_info', __('Contact Info', 'event_espresso'), array( $this, 'attendee_contact_info'), $this->_cpt_routes[$this->_req_action], 'side', 'core' );
-		add_meta_box('attendee_details_address', __('Address Details', 'event_espresso'), array($this, 'attendee_address_details'), $this->_cpt_routes[$this->_req_action], 'normal', 'core' );
-		add_meta_box('attendee_registrations', __('Registrations for this Contact', 'event_espresso'), array( $this, 'attendee_registrations_meta_box'), $this->_cpt_routes[$this->_req_action], 'normal', 'high');
+		add_meta_box('attendee_contact_info', __('Contact Info', 'event_espresso'), array($this, 'attendee_contact_info'), $this->_cpt_routes[$this->_req_action], 'side', 'core');
+		add_meta_box('attendee_details_address', __('Address Details', 'event_espresso'), array($this, 'attendee_address_details'), $this->_cpt_routes[$this->_req_action], 'normal', 'core');
+		add_meta_box('attendee_registrations', __('Registrations for this Contact', 'event_espresso'), array($this, 'attendee_registrations_meta_box'), $this->_cpt_routes[$this->_req_action], 'normal', 'high');
 	}
 
 
@@ -2485,10 +2485,10 @@ 
 	 * @param  WP_Post $post wp post object
 	 * @return string        attendee contact info ( and form )
 	 */
-	public function attendee_contact_info( $post ) {
+	public function attendee_contact_info($post) {
 		//get attendee object ( should already have it )
 		$this->_template_args['attendee'] = $this->_cpt_model_obj;
-		$template = REG_TEMPLATE_PATH . 'attendee_contact_info_metabox_content.template.php';
+		$template = REG_TEMPLATE_PATH.'attendee_contact_info_metabox_content.template.php';
 		EEH_Template::display_template($template, $this->_template_args);
 	}
 
@@ -2504,12 +2504,12 @@ 
 		$this->_template_args['attendee'] = $this->_cpt_model_obj;
 		$this->_template_args['state_html'] = EEH_Form_Fields::generate_form_input(
 				new EE_Question_Form_Input(
-				EE_Question::new_instance( array(
+				EE_Question::new_instance(array(
 					'QST_ID' => 0,
 					'QST_display_text' => __('State/Province', 'event_espresso'),
 					'QST_system' => 'admin-state'
 					)),
-				EE_Answer::new_instance( array(
+				EE_Answer::new_instance(array(
 					'ANS_ID' => 0,
 					'ANS_value' => $this->_cpt_model_obj->state_ID()
 					)),
@@ -2522,12 +2522,12 @@ 
 			));
 		$this->_template_args['country_html'] = EEH_Form_Fields::generate_form_input(
 				new EE_Question_Form_Input(
-				EE_Question::new_instance( array(
+				EE_Question::new_instance(array(
 					'QST_ID' => 0,
 					'QST_display_text' => __('Country', 'event_espresso'),
 					'QST_system' => 'admin-country'
 					)),
-				EE_Answer::new_instance( array(
+				EE_Answer::new_instance(array(
 					'ANS_ID' => 0,
 					'ANS_value' => $this->_cpt_model_obj->country_ID()
 					)),
@@ -2538,8 +2538,8 @@ 
 					'append_qstn_id' => FALSE
 					)
 				));
-		$template = REG_TEMPLATE_PATH . 'attendee_address_details_metabox_content.template.php';
-		EEH_Template::display_template($template, $this->_template_args );
+		$template = REG_TEMPLATE_PATH.'attendee_address_details_metabox_content.template.php';
+		EEH_Template::display_template($template, $this->_template_args);
 
 	}
 
@@ -2549,11 +2549,11 @@ 
 	*		@access protected
 	*		@return void
 	*/
-	public function attendee_registrations_meta_box( $post ) {
+	public function attendee_registrations_meta_box($post) {
 
 		$this->_template_args['attendee'] = $this->_cpt_model_obj;
 		$this->_template_args['registrations'] = $this->_cpt_model_obj->get_many_related('Registration');
-		$template = REG_TEMPLATE_PATH . 'attendee_registrations_main_meta_box.template.php';
+		$template = REG_TEMPLATE_PATH.'attendee_registrations_main_meta_box.template.php';
 		EEH_Template::display_template($template, $this->_template_args);
 
 	}
@@ -2567,8 +2567,8 @@ 
 	 * @return string        html for new form.
 	 */
 	public function after_title_form_fields($post) {
-		if ( $post->post_type == 'espresso_attendees' ) {
-			$template = REG_TEMPLATE_PATH . 'attendee_details_after_title_form_fields.template.php';
+		if ($post->post_type == 'espresso_attendees') {
+			$template = REG_TEMPLATE_PATH.'attendee_details_after_title_form_fields.template.php';
 			$template_args['attendee'] = $this->_cpt_model_obj;
 			EEH_Template::display_template($template, $template_args);
 		}
@@ -2585,21 +2585,21 @@ 
 	*		@access protected
 	*		@return void
 	*/
-	protected function _trash_or_restore_attendees( $trash = TRUE ) {
+	protected function _trash_or_restore_attendees($trash = TRUE) {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		$ATT_MDL = EEM_Attendee::instance();
 
 		$success = 1;
 		//Checkboxes
-		if (!empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
+		if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
 			// if array has more than one element than success message should be plural
-			$success = count( $this->_req_data['checkbox'] ) > 1 ? 2 : 1;
+			$success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
 			// cycle thru checkboxes
-			while (list( $ATT_ID, $value ) = each($this->_req_data['checkbox'])) {
-				$updated = $trash ? $ATT_MDL->update_by_ID(array( 'status' => 'trash' ), $ATT_ID) : $ATT_MDL->update_by_ID( array('status' => 'publish' ), $ATT_ID);
-				if ( !$updated ) {
+			while (list($ATT_ID, $value) = each($this->_req_data['checkbox'])) {
+				$updated = $trash ? $ATT_MDL->update_by_ID(array('status' => 'trash'), $ATT_ID) : $ATT_MDL->update_by_ID(array('status' => 'publish'), $ATT_ID);
+				if ( ! $updated) {
 					$success = 0;
 				}
 			}
@@ -2608,18 +2608,18 @@ 
 			// grab single id and delete
 			$ATT_ID = absint($this->_req_data['ATT_ID']);
 			//get attendee
-			$att = $ATT_MDL->get_one_by_ID( $ATT_ID );
+			$att = $ATT_MDL->get_one_by_ID($ATT_ID);
 			$updated = $trash ? $att->set_status('trash') : $att->set_status('publish');
 			$updated = $att->save();
-			if ( ! $updated ) {
+			if ( ! $updated) {
 				$success = 0;
 			}
 
 		}
 
-		$what = $success > 1 ? __( 'Contacts', 'event_espresso' ) : __( 'Contact', 'event_espresso' );
-		$action_desc = $trash ? __( 'moved to the trash', 'event_espresso' ) : __( 'restored', 'event_espresso' );
-		$this->_redirect_after_action( $success, $what, $action_desc, array( 'action' => 'contact_list' ) );
+		$what = $success > 1 ? __('Contacts', 'event_espresso') : __('Contact', 'event_espresso');
+		$action_desc = $trash ? __('moved to the trash', 'event_espresso') : __('restored', 'event_espresso');
+		$this->_redirect_after_action($success, $what, $action_desc, array('action' => 'contact_list'));
 
 	}
 

admin_pages/transactions/EE_Admin_Transactions_List_Table.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -93,7 +93,7 @@
 	 *
 	 * @abstract
 	 * @access protected
-	 * @return array
+	 * @return string[]
 	 */
 	protected function _get_table_filters() {
 		$filters = array();

Braces +8 added lines, -5 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *
@@ -244,10 +246,11 @@ 
 	 */
 	function column_ATT_email( EE_Transaction $item ){
 		$attendee = $item->primary_registration()->get_first_related('Attendee');
-		if ( !empty( $attendee ) )
-			return '<a href="mailto:' . $attendee->get('ATT_email') . '">' . $attendee->get('ATT_email') . '</a>';
-		else
-			return $item->failed() || $item->is_abandoned() ? __('no contact record.', 'event_espresso') : __('No contact record, because the transaction was abandoned or the registration process failed.', 'event_espresso');
+		if ( !empty( $attendee ) ) {
+					return '<a href="mailto:' . $attendee->get('ATT_email') . '">' . $attendee->get('ATT_email') . '</a>';
+		} else {
+					return $item->failed() || $item->is_abandoned() ? __('no contact record.', 'event_espresso') : __('No contact record, because the transaction was abandoned or the registration process failed.', 'event_espresso');
+		}
 		;
 	}
 

Indentation +34 added lines, -34 removed lines

@@ -1,26 +1,26 @@ 
 <?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	{@link http://eventespresso.com/support/terms-conditions/}   * see Plugin Licensing *
- * @ link		{@link http://www.eventespresso.com}
- * @ since		4.0
- *
- * ------------------------------------------------------------------------
- *
- * Transactions Table class
- *
- * @package				Event Espresso
- * @subpackage			includes/admin_screens/Transactions_List_Table.class.php
- * @author					Brent Christensen
- *
- * ------------------------------------------------------------------------
- */
+	 * 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	{@link http://eventespresso.com/support/terms-conditions/}   * see Plugin Licensing *
+	 * @ link		{@link http://www.eventespresso.com}
+	 * @ since		4.0
+	 *
+	 * ------------------------------------------------------------------------
+	 *
+	 * Transactions Table class
+	 *
+	 * @package				Event Espresso
+	 * @subpackage			includes/admin_screens/Transactions_List_Table.class.php
+	 * @author					Brent Christensen
+	 *
+	 * ------------------------------------------------------------------------
+	 */
 
 
 class EE_Admin_Transactions_List_Table extends EE_Admin_List_Table {
@@ -140,7 +140,7 @@ 
 	 * @return string
 	 */
    function column_TXN_ID( EE_Transaction $item ){
-    	$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_transaction', 'TXN_ID'=>$item->ID() ), TXN_ADMIN_URL );
+		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_transaction', 'TXN_ID'=>$item->ID() ), TXN_ADMIN_URL );
 	   $content = '<a href="' . $view_lnk_url . '" title="' . esc_attr__( 'Go to Transaction Details', 'event_espresso' ) . '">' . $item->ID() . '</a>';
 
 	   //txn timestamp
@@ -275,8 +275,8 @@ 
 	 * @param \EE_Transaction $item
 	 * @return string|void
 	 */
-    function column_event_name( EE_Transaction $item ){
-    	$actions = array();
+	function column_event_name( EE_Transaction $item ){
+		$actions = array();
 		$event = $item->primary_registration()->get_first_related('Event');
 		if ( !empty( $event ) ) {
 			$edit_event_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'edit', 'post'=>$event->ID() ), EVENTS_ADMIN_URL );
@@ -300,21 +300,21 @@ 
 	 * @param \EE_Transaction $item
 	 * @return string
 	 */
-    function column_actions( EE_Transaction $item ){
+	function column_actions( EE_Transaction $item ){
 
-    	$registration = $item->primary_registration();
-    	$attendee = $registration->attendee();
+		$registration = $item->primary_registration();
+		$attendee = $registration->attendee();
 		EE_Registry::instance()->load_helper( 'MSG_Template' );
 
-        //Build row actions
+		//Build row actions
 		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_transaction', 'TXN_ID'=>$item->ID() ), TXN_ADMIN_URL );
 		$dl_invoice_lnk_url = $registration->invoice_url();
 		$dl_receipt_lnk_url = $registration->receipt_url();
 		$view_reg_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_registration', '_REG_ID'=>$registration->ID() ), REG_ADMIN_URL );
 		$send_pay_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'send_payment_reminder', 'TXN_ID'=>$item->ID() ), TXN_ADMIN_URL );
-	    $related_messages_link = EEH_MSG_Template::get_message_action_link( 'see_notifications_for', null, array(
-		    'TXN_ID' => $item->ID()
-	    ));
+		$related_messages_link = EEH_MSG_Template::get_message_action_link( 'see_notifications_for', null, array(
+			'TXN_ID' => $item->ID()
+		));
 
 		//Build row actions
 		$view_lnk = '
@@ -349,8 +349,8 @@ 
 		$dl_receipt_lnk = '';
 	}
 
-      		//only show payment reminder link if the message type is active.
-      		if ( EEH_MSG_Template::is_mt_active( 'payment_reminder' ) ) {
+	  		//only show payment reminder link if the message type is active.
+	  		if ( EEH_MSG_Template::is_mt_active( 'payment_reminder' ) ) {
 		$send_pay_lnk = $attendee instanceof EE_Attendee && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'espresso_transactions_send_payment_reminder' ) ? '
 			<li>
 				<a href="'.$send_pay_lnk_url.'" title="' . esc_attr__( 'Send Payment Reminder', 'event_espresso' ) . '" class="tiny-text">
@@ -376,7 +376,7 @@ 
 		}
 
 		return $this->_action_string( $view_lnk . $dl_invoice_lnk . $dl_receipt_lnk . $view_reg_lnk . $send_pay_lnk . $view_related_messages_lnk, $item, 'ul', 'txn-overview-actions-ul' );
-    }
+	}
 
 
 }

Spacing +87 added lines, -87 removed lines

@@ -33,8 +33,8 @@ 
 	 * @param \EE_Admin_Page $admin_page
 	 * @return EE_Admin_Transactions_List_Table
 	 */
-	function __construct( EE_Admin_Page $admin_page ){
-   		parent::__construct( $admin_page );
+	function __construct(EE_Admin_Page $admin_page) {
+   		parent::__construct($admin_page);
    		$this->_status = $this->_admin_page->get_transaction_status_array();
 
 	}
@@ -44,9 +44,9 @@ 
 
 
 	protected function _setup_data() {
-		$this->_data = $this->_admin_page->get_transactions( $this->_per_page );
-		$status = ! empty( $this->_req_data['status'] )? $this->_req_data['status'] : 'all';
-		$this->_all_data_count = $this->_admin_page->get_transactions( $this->_per_page, TRUE, $status );
+		$this->_data = $this->_admin_page->get_transactions($this->_per_page);
+		$status = ! empty($this->_req_data['status']) ? $this->_req_data['status'] : 'all';
+		$this->_all_data_count = $this->_admin_page->get_transactions($this->_per_page, TRUE, $status);
 	}
 
 
@@ -65,20 +65,20 @@ 
 			);
 
 		$this->_columns = array(
-			'TXN_ID' => __( 'ID', 'event_espresso' ),
-			'TXN_timestamp'	=> __( 'Transaction Date', 'event_espresso' ),
-			'TXN_total' => __( 'Total', 'event_espresso' ),
-			'TXN_paid' => __( 'Paid', 'event_espresso' ),
-			'ATT_fname' => __( 'Primary Registrant', 'event_espresso' ),
-			'event_name' => __( 'Event', 'event_espresso' ),
-			'actions' => __( 'Actions', 'event_espresso' )
+			'TXN_ID' => __('ID', 'event_espresso'),
+			'TXN_timestamp'	=> __('Transaction Date', 'event_espresso'),
+			'TXN_total' => __('Total', 'event_espresso'),
+			'TXN_paid' => __('Paid', 'event_espresso'),
+			'ATT_fname' => __('Primary Registrant', 'event_espresso'),
+			'event_name' => __('Event', 'event_espresso'),
+			'actions' => __('Actions', 'event_espresso')
 		);
 
 		$this->_sortable_columns = array(
-			'TXN_ID' => array( 'TXN_ID' => FALSE ),
-			'event_name' => array( 'event_name'=> FALSE ),
-			'ATT_fname'	=> array( 'ATT_fname'=> FALSE ),
-			'TXN_timestamp'	=> array( 'TXN_timestamp'=> TRUE ) //true means its already sorted
+			'TXN_ID' => array('TXN_ID' => FALSE),
+			'event_name' => array('event_name'=> FALSE),
+			'ATT_fname'	=> array('ATT_fname'=> FALSE),
+			'TXN_timestamp'	=> array('TXN_timestamp'=> TRUE) //true means its already sorted
 		);
 
 		$this->_primary_column = 'TXN_ID';
@@ -88,11 +88,11 @@ 
 
 
 
-	protected function _get_row_class( $item ) {
-		$class = parent::_get_row_class( $item );
+	protected function _get_row_class($item) {
+		$class = parent::_get_row_class($item);
 		//add status class
-		$class .= ' ee-status-strip txn-status-' . $item->status_ID();
-		if ( $this->_has_checkbox_column ) {
+		$class .= ' ee-status-strip txn-status-'.$item->status_ID();
+		if ($this->_has_checkbox_column) {
 			$class .= ' has-checkbox-column';
 		}
 		return $class;
@@ -109,8 +109,8 @@ 
 	 */
 	protected function _get_table_filters() {
 		$filters = array();
-		$start_date = isset( $this->_req_data['txn-filter-start-date'] ) ? wp_strip_all_tags( $this->_req_data['txn-filter-start-date'] ) : date( 'm/d/Y', strtotime( '-10 year' ));
-		$end_date = isset( $this->_req_data['txn-filter-end-date'] ) ? wp_strip_all_tags( $this->_req_data['txn-filter-end-date'] ) : date( 'm/d/Y' );
+		$start_date = isset($this->_req_data['txn-filter-start-date']) ? wp_strip_all_tags($this->_req_data['txn-filter-start-date']) : date('m/d/Y', strtotime('-10 year'));
+		$end_date = isset($this->_req_data['txn-filter-end-date']) ? wp_strip_all_tags($this->_req_data['txn-filter-end-date']) : date('m/d/Y');
 		ob_start();
 		?>
 		<label for="txn-filter-start-date">Display Transactions from </label>
@@ -128,9 +128,9 @@ 
 
 
 	protected function _add_view_counts() {
-		$this->_views['all']['count'] = $this->_admin_page->get_transactions( $this->_per_page, TRUE, 'all' );
-		$this->_views['abandoned']['count'] = $this->_admin_page->get_transactions( $this->_per_page, TRUE, 'abandoned' );
-		$this->_views['failed']['count'] = $this->_admin_page->get_transactions( $this->_per_page, TRUE, 'failed' );
+		$this->_views['all']['count'] = $this->_admin_page->get_transactions($this->_per_page, TRUE, 'all');
+		$this->_views['abandoned']['count'] = $this->_admin_page->get_transactions($this->_per_page, TRUE, 'abandoned');
+		$this->_views['failed']['count'] = $this->_admin_page->get_transactions($this->_per_page, TRUE, 'failed');
 	}
 
 
@@ -139,29 +139,29 @@ 
 	 * @param \EE_Transaction $item
 	 * @return string
 	 */
-   function column_TXN_ID( EE_Transaction $item ){
-    	$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_transaction', 'TXN_ID'=>$item->ID() ), TXN_ADMIN_URL );
-	   $content = '<a href="' . $view_lnk_url . '" title="' . esc_attr__( 'Go to Transaction Details', 'event_espresso' ) . '">' . $item->ID() . '</a>';
+   function column_TXN_ID(EE_Transaction $item) {
+    	$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_transaction', 'TXN_ID'=>$item->ID()), TXN_ADMIN_URL);
+	   $content = '<a href="'.$view_lnk_url.'" title="'.esc_attr__('Go to Transaction Details', 'event_espresso').'">'.$item->ID().'</a>';
 
 	   //txn timestamp
-	   $content .= '  <span class="show-on-mobile-view-only">' . $this->_get_txn_timestamp( $item ) . '</span>';
+	   $content .= '  <span class="show-on-mobile-view-only">'.$this->_get_txn_timestamp($item).'</span>';
 	   return $content;
 	}
 
 
 
-	protected function _get_txn_timestamp( EE_Transaction $item ) {
+	protected function _get_txn_timestamp(EE_Transaction $item) {
 		//txn timestamp
 		// is TXN less than 2 hours old ?
 		if (
-			( ( time() - EE_Registry::instance()->SSN->lifespan() )
-			< $item->datetime( false, true )
+			((time() - EE_Registry::instance()->SSN->lifespan())
+			< $item->datetime(false, true)
 			)
-		&& ( $item->failed() || $item->is_abandoned() )
+		&& ($item->failed() || $item->is_abandoned())
 		) {
-			$timestamp = __( 'TXN in progress...', 'event_espresso' );
+			$timestamp = __('TXN in progress...', 'event_espresso');
 	   } else {
-			$timestamp = $item->get_i18n_datetime( 'TXN_timestamp' );
+			$timestamp = $item->get_i18n_datetime('TXN_timestamp');
 		}
 		return $timestamp;
 	}
@@ -173,8 +173,8 @@ 
 	 * @param \EE_Transaction $item
 	 * @return string
 	 */
-	function column_cb($item ){
-		return sprintf( '<input type="checkbox" name="%1$s[]" value="%2$s" />', $this->_wp_list_args['singular'],  $item->ID());
+	function column_cb($item) {
+		return sprintf('<input type="checkbox" name="%1$s[]" value="%2$s" />', $this->_wp_list_args['singular'], $item->ID());
 	}
 
 
@@ -185,11 +185,11 @@ 
 	 * @param \EE_Transaction $item
 	 * @return string
 	 */
-	function column_TXN_timestamp( EE_Transaction $item ){
-		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_transaction', 'TXN_ID'=>$item->ID() ), TXN_ADMIN_URL );
-		$txn_date = '<a href="'.$view_lnk_url.'" title="' . esc_attr__( 'View Transaction Details for TXN #', 'event_espresso' ) . $item->ID() . '">' . $this->_get_txn_timestamp( $item ) . '</a>';
+	function column_TXN_timestamp(EE_Transaction $item) {
+		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_transaction', 'TXN_ID'=>$item->ID()), TXN_ADMIN_URL);
+		$txn_date = '<a href="'.$view_lnk_url.'" title="'.esc_attr__('View Transaction Details for TXN #', 'event_espresso').$item->ID().'">'.$this->_get_txn_timestamp($item).'</a>';
 		//status
-		$txn_date .= '<br><span class="ee-status-text-small">' . EEH_Template::pretty_status( $item->status_ID(), false, 'sentence' ) . '</span>';
+		$txn_date .= '<br><span class="ee-status-text-small">'.EEH_Template::pretty_status($item->status_ID(), false, 'sentence').'</span>';
 		return $txn_date;
 	}
 
@@ -199,11 +199,11 @@ 
 	 * @param \EE_Transaction $item
 	 * @return string
 	 */
-	function column_TXN_total( EE_Transaction $item ){
-		if ( $item->get('TXN_total') > 0 ) {
-			return '<span class="txn-pad-rght">' . apply_filters( 'FHEE__EE_Admin_Transactions_List_Table__column_TXN_total__TXN_total', $item->get_pretty('TXN_total'), $item ) . '</span>';
+	function column_TXN_total(EE_Transaction $item) {
+		if ($item->get('TXN_total') > 0) {
+			return '<span class="txn-pad-rght">'.apply_filters('FHEE__EE_Admin_Transactions_List_Table__column_TXN_total__TXN_total', $item->get_pretty('TXN_total'), $item).'</span>';
 		} else {
-			return '<span class="txn-overview-free-event-spn">' . __( 'free', 'event_espresso' ) . '</span>';
+			return '<span class="txn-overview-free-event-spn">'.__('free', 'event_espresso').'</span>';
 		}
 	}
 
@@ -213,19 +213,19 @@ 
 	 * @param \EE_Transaction $item
 	 * @return mixed|string
 	 */
-	function column_TXN_paid( EE_Transaction $item ){
+	function column_TXN_paid(EE_Transaction $item) {
 		$transaction_total = $item->get('TXN_total');
 		$transaction_paid = $item->get('TXN_paid');
 
-		if (( $transaction_total > 0 ) && ( $transaction_paid >= $transaction_total )) {
+		if (($transaction_total > 0) && ($transaction_paid >= $transaction_total)) {
 			// paid in full
 			$span_class = 'txn-overview-full-payment-spn';
 
-		} elseif (( $transaction_total > 0 ) && ( $transaction_paid > 0 )) {
+		} elseif (($transaction_total > 0) && ($transaction_paid > 0)) {
 			// monies owing
 			$span_class = 'txn-overview-part-payment-spn';
 
-		} elseif (( $transaction_total > 0 ) && ( $transaction_paid == 0 )) {
+		} elseif (($transaction_total > 0) && ($transaction_paid == 0)) {
 			// no payments made
 			$span_class = 'txn-overview-no-payment-spn';
 
@@ -235,11 +235,11 @@ 
 		}
 
 		$payment_method = $item->payment_method();
-		$payment_method_name = $payment_method instanceof EE_Payment_Method ? $payment_method->admin_name() : __( 'Unknown', 'event_espresso' );
+		$payment_method_name = $payment_method instanceof EE_Payment_Method ? $payment_method->admin_name() : __('Unknown', 'event_espresso');
 
-		$content = '<span class="' . $span_class . ' txn-pad-rght">' . $transaction_paid !== 0 ? $item->get_pretty('TXN_paid') : $transaction_paid . '</span>';
-		if ( $transaction_paid > 0 ) {
-			$content .= '<br><span class="ee-status-text-small">' . sprintf( __( '...via %s', 'event_espresso' ), $payment_method_name ) . '</span>';
+		$content = '<span class="'.$span_class.' txn-pad-rght">'.$transaction_paid !== 0 ? $item->get_pretty('TXN_paid') : $transaction_paid.'</span>';
+		if ($transaction_paid > 0) {
+			$content .= '<br><span class="ee-status-text-small">'.sprintf(__('...via %s', 'event_espresso'), $payment_method_name).'</span>';
 		}
 		return $content;
 	}
@@ -250,13 +250,13 @@ 
 	 * @param \EE_Transaction $item
 	 * @return string|void
 	 */
-	function column_ATT_fname( EE_Transaction $item ){
+	function column_ATT_fname(EE_Transaction $item) {
 		$primary_reg = $item->primary_registration();
 		$attendee = $primary_reg->get_first_related('Attendee');
-		if ( $attendee instanceof EE_Attendee ) {
-			$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_registration', '_REG_ID'=>$primary_reg->ID() ), REG_ADMIN_URL );
-			$content = EE_Registry::instance()->CAP->current_user_can( 'ee_read_registration', 'espresso_registrations_view_registration', $primary_reg->ID() ) ? '<a href="'.$edit_lnk_url.'" title="' . esc_attr__( 'View Registration Details', 'event_espresso' ) . '">' . $attendee->full_name() . '</a>' : $attendee->full_name();
-			$content .= '<br>' . $attendee->email();
+		if ($attendee instanceof EE_Attendee) {
+			$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_registration', '_REG_ID'=>$primary_reg->ID()), REG_ADMIN_URL);
+			$content = EE_Registry::instance()->CAP->current_user_can('ee_read_registration', 'espresso_registrations_view_registration', $primary_reg->ID()) ? '<a href="'.$edit_lnk_url.'" title="'.esc_attr__('View Registration Details', 'event_espresso').'">'.$attendee->full_name().'</a>' : $attendee->full_name();
+			$content .= '<br>'.$attendee->email();
 			return $content;
 		}
 		return $item->failed() || $item->is_abandoned() ? __('no contact record.', 'event_espresso') : __('No contact record, because the transaction was abandoned or the registration process failed.', 'event_espresso');
@@ -268,10 +268,10 @@ 
 	 * @param \EE_Transaction $item
 	 * @return string|void
 	 */
-	function column_ATT_email( EE_Transaction $item ){
+	function column_ATT_email(EE_Transaction $item) {
 		$attendee = $item->primary_registration()->get_first_related('Attendee');
-		if ( !empty( $attendee ) )
-			return '<a href="mailto:' . $attendee->get('ATT_email') . '">' . $attendee->get('ATT_email') . '</a>';
+		if ( ! empty($attendee))
+			return '<a href="mailto:'.$attendee->get('ATT_email').'">'.$attendee->get('ATT_email').'</a>';
 		else
 			return $item->failed() || $item->is_abandoned() ? __('no contact record.', 'event_espresso') : __('No contact record, because the transaction was abandoned or the registration process failed.', 'event_espresso');
 		;
@@ -283,20 +283,20 @@ 
 	 * @param \EE_Transaction $item
 	 * @return string|void
 	 */
-    function column_event_name( EE_Transaction $item ){
+    function column_event_name(EE_Transaction $item) {
     	$actions = array();
 		$event = $item->primary_registration()->get_first_related('Event');
-		if ( !empty( $event ) ) {
-			$edit_event_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'edit', 'post'=>$event->ID() ), EVENTS_ADMIN_URL );
+		if ( ! empty($event)) {
+			$edit_event_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'edit', 'post'=>$event->ID()), EVENTS_ADMIN_URL);
 			$event_name = $event->get('EVT_name');
 
 			//filter this view by transactions for this event
-			$txn_by_event_lnk = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'default', 'EVT_ID' => $event->ID() ) );
-			if ( EE_Registry::instance()->CAP->current_user_can( 'ee_edit_event', 'espresso_events_edit', $event->ID() ) ) {
-				$actions['filter_by_event'] = '<a href="' . $txn_by_event_lnk . '" title="' . esc_attr__('Filter transactions by this event', 'event_espresso') . '">' . __('View Transactions for this event', 'event_espresso') . '</a>';
+			$txn_by_event_lnk = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'default', 'EVT_ID' => $event->ID()));
+			if (EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'espresso_events_edit', $event->ID())) {
+				$actions['filter_by_event'] = '<a href="'.$txn_by_event_lnk.'" title="'.esc_attr__('Filter transactions by this event', 'event_espresso').'">'.__('View Transactions for this event', 'event_espresso').'</a>';
 			}
 
-			return sprintf('%1$s %2$s', EE_Registry::instance()->CAP->current_user_can( 'ee_edit_event', 'espresso_events_edit', $event->ID() ) ? '<a href="' . $edit_event_url . '" title="' . sprintf( esc_attr__( 'Edit Event: %s', 'event_espresso' ), $event->get('EVT_name') ) .'">' .  wp_trim_words( $event_name, 30, '...' ) . '</a>' : wp_trim_words( $event_name, 30, '...' ), $this->row_actions($actions) );
+			return sprintf('%1$s %2$s', EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'espresso_events_edit', $event->ID()) ? '<a href="'.$edit_event_url.'" title="'.sprintf(esc_attr__('Edit Event: %s', 'event_espresso'), $event->get('EVT_name')).'">'.wp_trim_words($event_name, 30, '...').'</a>' : wp_trim_words($event_name, 30, '...'), $this->row_actions($actions));
 		} else {
 			return __('The event associated with this transaction via the primary registration cannot be retrieved.', 'event_espresso');
 		}
@@ -308,36 +308,36 @@ 
 	 * @param \EE_Transaction $item
 	 * @return string
 	 */
-    function column_actions( EE_Transaction $item ){
+    function column_actions(EE_Transaction $item) {
 
     	$registration = $item->primary_registration();
     	$attendee = $registration->attendee();
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
+		EE_Registry::instance()->load_helper('MSG_Template');
 
         //Build row actions
-		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_transaction', 'TXN_ID'=>$item->ID() ), TXN_ADMIN_URL );
+		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_transaction', 'TXN_ID'=>$item->ID()), TXN_ADMIN_URL);
 		$dl_invoice_lnk_url = $registration->invoice_url();
 		$dl_receipt_lnk_url = $registration->receipt_url();
-		$view_reg_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_registration', '_REG_ID'=>$registration->ID() ), REG_ADMIN_URL );
-		$send_pay_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'send_payment_reminder', 'TXN_ID'=>$item->ID() ), TXN_ADMIN_URL );
-	    $related_messages_link = EEH_MSG_Template::get_message_action_link( 'see_notifications_for', null, array(
+		$view_reg_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_registration', '_REG_ID'=>$registration->ID()), REG_ADMIN_URL);
+		$send_pay_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'send_payment_reminder', 'TXN_ID'=>$item->ID()), TXN_ADMIN_URL);
+	    $related_messages_link = EEH_MSG_Template::get_message_action_link('see_notifications_for', null, array(
 		    'TXN_ID' => $item->ID()
 	    ));
 
 		//Build row actions
 		$view_lnk = '
 			<li>
-				<a href="'.$view_lnk_url.'" title="' . esc_attr__( 'View Transaction Details', 'event_espresso' ) . '" class="tiny-text">
+				<a href="'.$view_lnk_url.'" title="'.esc_attr__('View Transaction Details', 'event_espresso').'" class="tiny-text">
 					<span class="dashicons dashicons-cart"></span>
 				</a>
 			</li>';
 
 
 	//only show invoice link if message type is active.
-	if ( $attendee instanceof EE_Attendee && EEH_MSG_Template::is_mt_active( 'invoice' ) ) {
+	if ($attendee instanceof EE_Attendee && EEH_MSG_Template::is_mt_active('invoice')) {
 		$dl_invoice_lnk = '
 		<li>
-			<a title="' . esc_attr__( 'View Transaction Invoice', 'event_espresso' ) . '" target="_blank" href="'.$dl_invoice_lnk_url.'" class="tiny-text">
+			<a title="' . esc_attr__('View Transaction Invoice', 'event_espresso').'" target="_blank" href="'.$dl_invoice_lnk_url.'" class="tiny-text">
 				<span class="dashicons dashicons-media-spreadsheet ee-icon-size-18"></span>
 			</a>
 		</li>';
@@ -346,10 +346,10 @@ 
 	}
 
 	//only show receipt link if message type is active.
-	if ( $attendee instanceof EE_Attendee && EEH_MSG_Template::is_mt_active( 'receipt' ) ) {
+	if ($attendee instanceof EE_Attendee && EEH_MSG_Template::is_mt_active('receipt')) {
 		$dl_receipt_lnk = '
 		<li>
-			<a title="' . esc_attr__( 'View Transaction Receipt', 'event_espresso' ) . '" target="_blank" href="'.$dl_receipt_lnk_url.'" class="tiny-text">
+			<a title="' . esc_attr__('View Transaction Receipt', 'event_espresso').'" target="_blank" href="'.$dl_receipt_lnk_url.'" class="tiny-text">
 				<span class="dashicons dashicons-media-default ee-icon-size-18"></span>
 			</a>
 		</li>';
@@ -358,10 +358,10 @@ 
 	}
 
       		//only show payment reminder link if the message type is active.
-      		if ( EEH_MSG_Template::is_mt_active( 'payment_reminder' ) ) {
-		$send_pay_lnk = $attendee instanceof EE_Attendee && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'espresso_transactions_send_payment_reminder' ) ? '
+      		if (EEH_MSG_Template::is_mt_active('payment_reminder')) {
+		$send_pay_lnk = $attendee instanceof EE_Attendee && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'espresso_transactions_send_payment_reminder') ? '
 			<li>
-				<a href="'.$send_pay_lnk_url.'" title="' . esc_attr__( 'Send Payment Reminder', 'event_espresso' ) . '" class="tiny-text">
+				<a href="'.$send_pay_lnk_url.'" title="'.esc_attr__('Send Payment Reminder', 'event_espresso').'" class="tiny-text">
 					<span class="dashicons dashicons-email-alt"></span>
 				</a>
 			</li>' : '';
@@ -370,20 +370,20 @@ 
 			$send_pay_lnk = '';
 		}
 
-		$view_reg_lnk = EE_Registry::instance()->CAP->current_user_can( 'ee_read_registration', 'espresso_registrations_view_registration', $registration->ID() ) ? '
+		$view_reg_lnk = EE_Registry::instance()->CAP->current_user_can('ee_read_registration', 'espresso_registrations_view_registration', $registration->ID()) ? '
 			<li>
-				<a href="'.$view_reg_lnk_url.'" title="' . esc_attr__( 'View Registration Details', 'event_espresso' ) . '" class="tiny-text">
+				<a href="'.$view_reg_lnk_url.'" title="'.esc_attr__('View Registration Details', 'event_espresso').'" class="tiny-text">
 					<span class="dashicons dashicons-clipboard"></span>
 				</a>
 			</li>' : '';
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_messages', 'view_filtered_messages' ) ) {
-			$view_related_messages_lnk = '<li>' . $related_messages_link . '</li>';
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_messages', 'view_filtered_messages')) {
+			$view_related_messages_lnk = '<li>'.$related_messages_link.'</li>';
 		} else {
 			$view_related_messages_lnk = '';
 		}
 
-		return $this->_action_string( $view_lnk . $dl_invoice_lnk . $dl_receipt_lnk . $view_reg_lnk . $send_pay_lnk . $view_related_messages_lnk, $item, 'ul', 'txn-overview-actions-ul' );
+		return $this->_action_string($view_lnk.$dl_invoice_lnk.$dl_receipt_lnk.$view_reg_lnk.$send_pay_lnk.$view_related_messages_lnk, $item, 'ul', 'txn-overview-actions-ul');
     }
 
 

caffeinated/admin/extend/messages/espresso_events_Messages_Hooks_Extend.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
 	 * Handles attaching Message Templates to the Event on save.
 	 * @param  EE_Event $evtobj EE event object
 	 * @param  array       $data   The request data from the form
-	 * @return bool         success or fail
+	 * @return integer         success or fail
 	 */
 	public function attach_evt_message_templates( $evtobj, $data ) {
 		//first we remove all existing relations on the Event for message types.

Spacing +41 added lines, -41 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -30,15 +30,15 @@ 
 class espresso_events_Messages_Hooks_Extend extends espresso_events_Messages_Hooks {
 
 
-	public function __construct( EE_Admin_Page $adminpage ) {
+	public function __construct(EE_Admin_Page $adminpage) {
 		/**
 		 * Add cap restriction ... metaboxes should not show if user does not have the ability to edit_custom_messages
 		 */
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_edit_messages', 'messages_events_editor_metabox' ) ) {
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_edit_messages', 'messages_events_editor_metabox')) {
 			return;
 		}
-		add_filter('FHEE__Events_Admin_Page___insert_update_cpt_item__event_update_callbacks', array( $this, 'caf_updates' ), 10 );
-		parent::__construct( $adminpage );
+		add_filter('FHEE__Events_Admin_Page___insert_update_cpt_item__event_update_callbacks', array($this, 'caf_updates'), 10);
+		parent::__construct($adminpage);
 	}
 
 	/**
@@ -49,13 +49,13 @@ 
 	 */
 	protected function _extend_properties() {
 
-		define( 'EE_MSGS_EXTEND_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'messages/assets/' );
+		define('EE_MSGS_EXTEND_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL.'messages/assets/');
 		$this->_ajax_func = array(
 			'ee_msgs_create_new_custom' => 'create_new_custom'
 			);
 		$this->_metaboxes = array(
 			0 => array(
-				'page_route' => array('edit','create_new'),
+				'page_route' => array('edit', 'create_new'),
 				'func' => 'messages_metabox',
 				'label' => __('Notifications', 'event_espresso'),
 				'priority' => 'high'
@@ -66,11 +66,11 @@ 
 		$this->_scripts_styles = array(
 			'registers' => array(
 				'events_msg_admin' => array(
-					'url' => EE_MSGS_EXTEND_ASSETS_URL . 'events_messages_admin.js',
+					'url' => EE_MSGS_EXTEND_ASSETS_URL.'events_messages_admin.js',
 					'depends' => array('ee-dialog', 'ee-parse-uri', 'ee-serialize-full-array')
 					),
 				'events_msg_admin_css' => array(
-					'url' => EE_MSGS_EXTEND_ASSETS_URL . 'ee_msg_events_admin.css',
+					'url' => EE_MSGS_EXTEND_ASSETS_URL.'ee_msg_events_admin.css',
 					'type' => 'css'
 					)
 				),
@@ -82,8 +82,8 @@ 
 	}
 
 
-	public function caf_updates( $update_callbacks ) {
-		$update_callbacks[] = array( $this, 'attach_evt_message_templates' );
+	public function caf_updates($update_callbacks) {
+		$update_callbacks[] = array($this, 'attach_evt_message_templates');
 		return $update_callbacks;
 	}
 
@@ -96,13 +96,13 @@ 
 	 * @param  array       $data   The request data from the form
 	 * @return bool         success or fail
 	 */
-	public function attach_evt_message_templates( $evtobj, $data ) {
+	public function attach_evt_message_templates($evtobj, $data) {
 		//first we remove all existing relations on the Event for message types.
 		$evtobj->_remove_relations('Message_Template_Group');
 
 		//now let's just loop throught the selected templates and add relations!
-		foreach( $data['event_message_templates_relation'] as $grp_ID ) {
-			$evtobj->_add_relation_to( $grp_ID, 'Message_Template_Group' );
+		foreach ($data['event_message_templates_relation'] as $grp_ID) {
+			$evtobj->_add_relation_to($grp_ID, 'Message_Template_Group');
 		}
 
 		//now save
@@ -115,10 +115,10 @@ 
 
 		//let's get the active messengers (b/c messenger objects have the active message templates)
 		//convert 'evt_id' to 'EVT_ID'
-		$this->_req_data['EVT_ID'] = isset( $this->_req_data['EVT_ID'] ) ? $this->_req_data['EVT_ID'] : NULL;
-		$this->_req_data['EVT_ID'] = isset( $this->_req_data['post'] ) && empty( $this->_req_data['EVT_ID'] ) ? $this->_req_data['post'] : $this->_req_data['EVT_ID'];
+		$this->_req_data['EVT_ID'] = isset($this->_req_data['EVT_ID']) ? $this->_req_data['EVT_ID'] : NULL;
+		$this->_req_data['EVT_ID'] = isset($this->_req_data['post']) && empty($this->_req_data['EVT_ID']) ? $this->_req_data['post'] : $this->_req_data['EVT_ID'];
 
-		$this->_req_data['EVT_ID'] = empty($this->_req_data['EVT_ID'] ) && isset($this->_req_data['evt_id'] ) ? $this->_req_data['evt_id'] : $this->_req_data['EVT_ID'];
+		$this->_req_data['EVT_ID'] = empty($this->_req_data['EVT_ID']) && isset($this->_req_data['evt_id']) ? $this->_req_data['evt_id'] : $this->_req_data['EVT_ID'];
 
 
 		$EEM_controller = new EE_messages;
@@ -127,11 +127,11 @@ 
 
 		//empty messengers?
 		//Note message types will always have at least one available because every messenger has a default message type associated with it (payment) if no other message types are selected.
-		if ( empty( $active_messengers ) ) {
-			$msg_activate_url = EE_Admin_Page::add_query_args_and_nonce( array('action' => 'settings'), EE_MSG_ADMIN_URL );
-			$error_msg = sprintf( __('There are no active messengers. So no notifications will go out for <strong>any</strong> events.  You will want to %sActivate a Messenger%s.', 'event_espresso'), '<a href="' . $msg_activate_url . '">', '</a>');
-			$error_content = '<div class="error"><p>' . $error_msg . '</p></div>';
-			$internal_content = '<div id="messages-error"><p>' . $error_msg . '</p></div>';
+		if (empty($active_messengers)) {
+			$msg_activate_url = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'settings'), EE_MSG_ADMIN_URL);
+			$error_msg = sprintf(__('There are no active messengers. So no notifications will go out for <strong>any</strong> events.  You will want to %sActivate a Messenger%s.', 'event_espresso'), '<a href="'.$msg_activate_url.'">', '</a>');
+			$error_content = '<div class="error"><p>'.$error_msg.'</p></div>';
+			$internal_content = '<div id="messages-error"><p>'.$error_msg.'</p></div>';
 
 			echo $error_content;
 			echo $internal_content;
@@ -140,39 +140,39 @@ 
 
 		$event_id = isset($this->_req_data['EVT_ID']) ? $this->_req_data['EVT_ID'] : NULL;
 		//get content for active messengers
-		foreach ( $active_messengers as $name => $messenger ) {
+		foreach ($active_messengers as $name => $messenger) {
 			//first check if there are any active message types for this messenger.
-			$active_mts = $EEM_controller->get_active_message_types_per_messenger( $name );
-			if ( empty( $active_mts ) ) {
+			$active_mts = $EEM_controller->get_active_message_types_per_messenger($name);
+			if (empty($active_mts)) {
 				continue;
 			}
 
-			$tcont = $messenger->get_messenger_admin_page_content('events', 'edit', array('event' => $event_id) );
+			$tcont = $messenger->get_messenger_admin_page_content('events', 'edit', array('event' => $event_id));
 
-			if ( ! empty( $tcont ) ) {
+			if ( ! empty($tcont)) {
 				$tabs[$name] = $tcont;
 			}
 		}
 
 
-		EE_Registry::instance()->load_helper( 'Tabbed_Content' );
+		EE_Registry::instance()->load_helper('Tabbed_Content');
 		//we want this to be tabbed content so let's use the EEH_Tabbed_Content::display helper.
 		$tabbed_content = EEH_Tabbed_Content::display($tabs);
-		if ( is_wp_error($tabbed_content) ) {
+		if (is_wp_error($tabbed_content)) {
 			$tabbed_content = $tabbed_content->get_error_message();
 		}
 
 		$notices = '<div id="espresso-ajax-loading" class="ajax-loader-grey">
-				<span class="ee-spinner ee-spin"></span><span class="hidden">' . __('loading...', 'event_espresso') . '</span>
+				<span class="ee-spinner ee-spin"></span><span class="hidden">' . __('loading...', 'event_espresso').'</span>
 			</div><div class="ee-notices"></div>';
 
-		if ( defined('DOING_AJAX' ) ) {
+		if (defined('DOING_AJAX')) {
 			return $tabbed_content;
 		}
 
-		do_action( 'AHEE__espresso_events_Messages_Hooks_Extend__messages_metabox__before_content' );
-		echo $notices . '<div class="messages-tabs-content">' . $tabbed_content . '</div>';
-		do_action( 'AHEE__espresso_events_Messages_Hooks_Extend__messages_metabox__after_content' );
+		do_action('AHEE__espresso_events_Messages_Hooks_Extend__messages_metabox__before_content');
+		echo $notices.'<div class="messages-tabs-content">'.$tabbed_content.'</div>';
+		do_action('AHEE__espresso_events_Messages_Hooks_Extend__messages_metabox__after_content');
 
 	}
 
@@ -186,22 +186,22 @@ 
 	 */
 	public function create_new_custom() {
 
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_edit_messages', 'create_new_custom_ajax' ) ) {
-			wp_die( __('You don\'t have privileges to do this action', 'event_espresso' ) );
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_edit_messages', 'create_new_custom_ajax')) {
+			wp_die(__('You don\'t have privileges to do this action', 'event_espresso'));
 		}
 
 		//let's clean up the _POST global a bit for downstream usage of name and description.
-		$_POST['templateName'] = !empty( $this->_req_data['custom_template_args']['MTP_name'] ) ? $this->_req_data['custom_template_args']['MTP_name'] : '';
-		$_POST['templateDescription'] = !empty( $this->_req_data['custom_template_args']['MTP_description'] ) ? $this->_req_data['custom_template_args']['MTP_description'] : '';
+		$_POST['templateName'] = ! empty($this->_req_data['custom_template_args']['MTP_name']) ? $this->_req_data['custom_template_args']['MTP_name'] : '';
+		$_POST['templateDescription'] = ! empty($this->_req_data['custom_template_args']['MTP_description']) ? $this->_req_data['custom_template_args']['MTP_description'] : '';
 
 
 		//set EE_Admin_Page object (see method details in EE_Admin_Hooks parent
 		$this->_set_page_object();
 
 		//is this a template switch if so EE_Admin_Page child needs this object
-		$this->_page_object->set_hook_object( $this );
+		$this->_page_object->set_hook_object($this);
 
-		$this->_page_object->add_message_template( $this->_req_data['messageType'], $this->_req_data['messenger'], $this->_req_data['group_ID'] );
+		$this->_page_object->add_message_template($this->_req_data['messageType'], $this->_req_data['messenger'], $this->_req_data['group_ID']);
 	}
 
 
@@ -216,7 +216,7 @@ 
 	 * @return string (admin_footer contents)
 	 */
 	public function edit_admin_footer() {
-		$template_path = EE_CORE_CAF_ADMIN_EXTEND . 'messages/templates/create_custom_template_form.template.php';
+		$template_path = EE_CORE_CAF_ADMIN_EXTEND.'messages/templates/create_custom_template_form.template.php';
 		EEH_Template::display_template($template_path, array());
 	}
 

Braces +2 added lines, -1 removed lines

@@ -6,8 +6,9 @@
  * @package Event Espresso
  * @subpackage messages
  */
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  *

caffeinated/admin/extend/registrations/Extend_Registrations_Admin_Page.core.php

Doc Comments +2 added lines, -4 removed lines

@@ -478,7 +478,7 @@ 
 	/**
 	 * 		generates Business Report showing total registratiopns per day
 	*		@access private
-	*		@return void
+	*		@return string
 	*/
 	private function _registrations_per_day_report( $period = '-1 month' ) {
 
@@ -535,7 +535,7 @@ 
 	/**
 	 * 		generates Business Report showing total registratiopns per event
 	*		@access private
-	*		@return void
+	*		@return string
 	*/
 	private function _get_registrations_per_event_report( $period = '-1 month' ) {
 
@@ -650,8 +650,6 @@ 
 	/**
 	 * 		handles toggleing the checkin status for the registration,
 	*		@access protected
-	*		@param boolean 	$check_in
-	*		@return void
 	*/
 	protected function _toggle_checkin_status() {
 		//first let's get the query args out of the way for the redirect

Indentation +21 added lines, -21 removed lines

@@ -447,9 +447,9 @@ 
 
 	/**
 	 * 		generates Business Reports regarding Registrations
-	*		@access protected
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@return void
+	 */
 	protected function _registration_reports() {
 
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
@@ -477,9 +477,9 @@ 
 
 	/**
 	 * 		generates Business Report showing total registratiopns per day
-	*		@access private
-	*		@return void
-	*/
+	 *		@access private
+	 *		@return void
+	 */
 	private function _registrations_per_day_report( $period = '-1 month' ) {
 
 		$report_ID = 'reg-admin-registrations-per-day-report-dv';
@@ -534,9 +534,9 @@ 
 
 	/**
 	 * 		generates Business Report showing total registratiopns per event
-	*		@access private
-	*		@return void
-	*/
+	 *		@access private
+	 *		@return void
+	 */
 	private function _get_registrations_per_event_report( $period = '-1 month' ) {
 
 		$report_ID = 'reg-admin-registrations-per-event-report-dv';
@@ -649,10 +649,10 @@ 
 
 	/**
 	 * 		handles toggleing the checkin status for the registration,
-	*		@access protected
-	*		@param boolean 	$check_in
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@param boolean 	$check_in
+	 *		@return void
+	 */
 	protected function _toggle_checkin_status() {
 		//first let's get the query args out of the way for the redirect
 		$query_args = array(
@@ -773,9 +773,9 @@ 
 
 	/**
 	 * 		generates HTML for the Event Registrations List Table
-	*		@access protected
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@return void
+	 */
 	protected function _event_registrations_list_table() {
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
 		$this->_admin_page_title .= isset( $this->_req_data['event_id'] ) ? $this->get_action_link_or_button('new_registration', 'add-registrant', array('event_id' => $this->_req_data['event_id']), 'add-new-h2') : '';
@@ -805,11 +805,11 @@ 
 				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_approved,
 				'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_approved, FALSE, 'sentence' )
 				),
-            'cancelled_status' => array(
+			'cancelled_status' => array(
 				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_cancelled,
 				'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_cancelled, FALSE, 'sentence' )
 				),
-            'declined_status' => array(
+			'declined_status' => array(
 				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_declined,
 				'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_declined, FALSE, 'sentence' )
 				),
@@ -837,9 +837,9 @@ 
 	/**
 	 * 		get_attendees
 	 * 		@param bool $count whether to return count or data.
-	*		@access public
-	*		@return array
-	*/
+	 *		@access public
+	 *		@return array
+	 */
 	public function get_event_attendees( $per_page = 10, $count = FALSE, $trash = FALSE, $orderby = '' ) {
 
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );

Braces +6 added lines, -4 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -679,8 +680,9 @@ 
 			EE_Error::add_error(__('Missing some required data to toggle the Check-in', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__  );
 		}
 
-		if ( defined('DOING_AJAX' ) )
-			return $new_status;
+		if ( defined('DOING_AJAX' ) ) {
+					return $new_status;
+		}
 
 		$this->_redirect_after_action( FALSE,'', '', $query_args, TRUE );
 
@@ -918,7 +920,7 @@ 
 		$query_params['force_join'] = array('Attendee');//force join to attendee model so that it gets cached, because we're going to need the attendee for each registration
 		if($count){
 			$registrations = EEM_Registration::instance()->count(array($query_params[0]));
-		}else{
+		} else{
 			$registrations = EEM_Registration::instance()->get_all($query_params);
 
 

Spacing +217 added lines, -217 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -29,11 +29,11 @@ 
  */
 class Extend_Registrations_Admin_Page extends Registrations_Admin_Page {
 
-	public function __construct( $routing = TRUE ) {
-		parent::__construct( $routing );
-		define( 'REG_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'registrations/templates/');
-		define( 'REG_CAF_ASSETS', EE_CORE_CAF_ADMIN_EXTEND . 'registrations/assets/');
-		define( 'REG_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'registrations/assets/');
+	public function __construct($routing = TRUE) {
+		parent::__construct($routing);
+		define('REG_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND.'registrations/templates/');
+		define('REG_CAF_ASSETS', EE_CORE_CAF_ADMIN_EXTEND.'registrations/assets/');
+		define('REG_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL.'registrations/assets/');
 	}
 
 
@@ -42,11 +42,11 @@ 
 
 
 	protected function _extend_page_config() {
-		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'registrations';
+		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND.'registrations';
 
-		$reg_id = ! empty( $this->_req_data['_REG_ID'] ) && ! is_array( $this->_req_data['_REG_ID'] ) ? $this->_req_data['_REG_ID'] : 0;
-		$att_id = ! empty( $this->_req_data[ 'ATT_ID' ] ) ? ! is_array( $this->_req_data['ATT_ID'] ) : 0;
-		$att_id = ! empty( $this->_req_data['post'] ) && ! is_array( $this->_req_data['post'] ) ? $this->_req_data['post'] : $att_id;
+		$reg_id = ! empty($this->_req_data['_REG_ID']) && ! is_array($this->_req_data['_REG_ID']) ? $this->_req_data['_REG_ID'] : 0;
+		$att_id = ! empty($this->_req_data['ATT_ID']) ? ! is_array($this->_req_data['ATT_ID']) : 0;
+		$att_id = ! empty($this->_req_data['post']) && ! is_array($this->_req_data['post']) ? $this->_req_data['post'] : $att_id;
 
 		$new_page_routes = array(
 			'reports' => array(
@@ -85,7 +85,7 @@ 
 				)
 			);
 
-		$this->_page_routes = array_merge( $this->_page_routes, $new_page_routes );
+		$this->_page_routes = array_merge($this->_page_routes, $new_page_routes);
 
 		$new_page_config = array(
 			'reports' => array(
@@ -99,7 +99,7 @@ 
 						'filename' => 'registrations_reports'
 						)
 					),
-				'help_tour' => array( 'Registration_Reports_Help_Tour' ),
+				'help_tour' => array('Registration_Reports_Help_Tour'),
 				'require_nonce' => FALSE
 				),
 			'event_registrations' => array(
@@ -130,8 +130,8 @@ 
 						'filename' => 'registrations_event_checkin_other'
 					)
 				),
-				'help_tour' => array( 'Event_Checkin_Help_Tour' ),
-				'qtips' => array('Registration_List_Table_Tips' ),
+				'help_tour' => array('Event_Checkin_Help_Tour'),
+				'qtips' => array('Registration_List_Table_Tips'),
 				'list_table' => 'EE_Event_Registrations_List_Table',
 				'metaboxes' => array(),
 				'require_nonce' => FALSE
@@ -152,7 +152,7 @@ 
 		// var_dump($this->_req_data);
 		// exit();
 
-		$this->_page_config = array_merge( $this->_page_config, $new_page_config );
+		$this->_page_config = array_merge($this->_page_config, $new_page_config);
 		$this->_page_config['contact_list']['list_table'] = 'Extend_EE_Attendee_Contact_List_Table';
 		$this->_page_config['default']['list_table'] = 'Extend_EE_Registrations_List_Table';
 	}
@@ -161,7 +161,7 @@ 
 
 	protected function _ajax_hooks() {
 		parent::_ajax_hooks();
-		add_action('wp_ajax_get_newsletter_form_content', array( $this, 'get_newsletter_form_content') );
+		add_action('wp_ajax_get_newsletter_form_content', array($this, 'get_newsletter_form_content'));
 	}
 
 
@@ -171,12 +171,12 @@ 
 
 		//if newsletter message type is active then let's add filter and load js for it.
 		EE_Registry::instance()->load_helper('MSG_Template');
-		if ( EEH_MSG_Template::is_mt_active('newsletter') ) {
+		if (EEH_MSG_Template::is_mt_active('newsletter')) {
 			//enqueue newsletter js
-			wp_enqueue_script( 'ee-newsletter-trigger', REG_CAF_ASSETS_URL . 'ee-newsletter-trigger.js', array( 'ee-dialog'), EVENT_ESPRESSO_VERSION, TRUE );
-			wp_enqueue_style( 'ee-newsletter-trigger-css', REG_CAF_ASSETS_URL . 'ee-newsletter-trigger.css', array(), EVENT_ESPRESSO_VERSION );
+			wp_enqueue_script('ee-newsletter-trigger', REG_CAF_ASSETS_URL.'ee-newsletter-trigger.js', array('ee-dialog'), EVENT_ESPRESSO_VERSION, TRUE);
+			wp_enqueue_style('ee-newsletter-trigger-css', REG_CAF_ASSETS_URL.'ee-newsletter-trigger.css', array(), EVENT_ESPRESSO_VERSION);
 			//hook in buttons for newsletter message type trigger.
-			add_action('AHEE__EE_Admin_List_Table__extra_tablenav__after_bottom_buttons', array( $this, 'add_newsletter_action_buttons'), 10 );
+			add_action('AHEE__EE_Admin_List_Table__extra_tablenav__after_bottom_buttons', array($this, 'add_newsletter_action_buttons'), 10);
 		}
 	}
 
@@ -188,12 +188,12 @@ 
 
 		//scripts
 		global $is_IE;
-		if ( $is_IE ) {
-			wp_enqueue_script( 'excanvas' );
+		if ($is_IE) {
+			wp_enqueue_script('excanvas');
 		}
 
-		wp_register_script('espresso_reg_admin_regs_per_day', REG_CAF_ASSETS_URL  . 'espresso_reg_admin_regs_per_day_report.js', array('jqplot-all'), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_register_script('espresso_reg_admin_regs_per_event', REG_CAF_ASSETS_URL . 'espresso_reg_admin_regs_per_event_report.js', array('jqplot-all'), EVENT_ESPRESSO_VERSION, TRUE );
+		wp_register_script('espresso_reg_admin_regs_per_day', REG_CAF_ASSETS_URL.'espresso_reg_admin_regs_per_day_report.js', array('jqplot-all'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_register_script('espresso_reg_admin_regs_per_event', REG_CAF_ASSETS_URL.'espresso_reg_admin_regs_per_event_report.js', array('jqplot-all'), EVENT_ESPRESSO_VERSION, TRUE);
 	}
 
 
@@ -224,7 +224,7 @@ 
 				'slug' => 'all',
 				'label' => __('All', 'event_espresso'),
 				'count' => 0,
-				'bulk_action' => !isset( $this->_req_data['event_id'] ) ? array() : array(
+				'bulk_action' => ! isset($this->_req_data['event_id']) ? array() : array(
 					'toggle_checkin_status' => __('Toggle Check-In', 'event_espresso'),
 					//'trash_registrations' => __('Trash Registrations', 'event_espresso')
 					)
@@ -242,7 +242,7 @@ 
 				'slug' => 'all',
 				'label' => __('All', 'event_espresso'),
 				'count' => 0,
-				'bulk_action' => array( 'delete_checkin_rows' => __('Delete Check-In Rows', 'event_espresso') )
+				'bulk_action' => array('delete_checkin_rows' => __('Delete Check-In Rows', 'event_espresso'))
 				),
 			);
 	}
@@ -258,20 +258,20 @@ 
 	 */
 	public function get_newsletter_form_content() {
 		//do a nonce check cause we're not coming in from an normal route here.
-		$nonce = isset( $this->_req_data['get_newsletter_form_content_nonce'] ) ? sanitize_text_field( $this->_req_data['get_newsletter_form_content_nonce'] ) : '';
+		$nonce = isset($this->_req_data['get_newsletter_form_content_nonce']) ? sanitize_text_field($this->_req_data['get_newsletter_form_content_nonce']) : '';
 		$nonce_ref = 'get_newsletter_form_content_nonce';
 
-		$this->_verify_nonce( $nonce, $nonce_ref );
+		$this->_verify_nonce($nonce, $nonce_ref);
 		//let's get the mtp for the incoming MTP_ ID
-		if ( !isset( $this->_req_data['GRP_ID'] ) ) {
-			EE_Error::add_error( __('There must be something broken with the js or html structure because the required data for getting a message template group is not present (need an GRP_ID).', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! isset($this->_req_data['GRP_ID'])) {
+			EE_Error::add_error(__('There must be something broken with the js or html structure because the required data for getting a message template group is not present (need an GRP_ID).', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			$this->_template_args['success'] = FALSE;
 			$this->_template_args['error'] = TRUE;
 			$this->_return_json();
 		}
-		$MTPG = EEM_Message_Template_Group::instance()->get_one_by_ID( $this->_req_data['GRP_ID'] );
-		if ( ! $MTPG instanceof EE_Message_Template_Group ) {
-			EE_Error::add_error( sprintf( __('The GRP_ID given (%d) does not appear to have a corresponding row in the database.', 'event_espresso'), $this->_req_data['GRP_ID'] ), __FILE__, __FUNCTION__, __LINE__  );
+		$MTPG = EEM_Message_Template_Group::instance()->get_one_by_ID($this->_req_data['GRP_ID']);
+		if ( ! $MTPG instanceof EE_Message_Template_Group) {
+			EE_Error::add_error(sprintf(__('The GRP_ID given (%d) does not appear to have a corresponding row in the database.', 'event_espresso'), $this->_req_data['GRP_ID']), __FILE__, __FUNCTION__, __LINE__);
 			$this->_template_args['success'] = FALSE;
 			$this->_template_args['error'] = TRUE;
 			$this->_return_json();
@@ -280,11 +280,11 @@ 
 		$MTPs = $MTPG->context_templates();
 		$MTPs = $MTPs['attendee'];
 		$template_fields = array();
-		foreach ( $MTPs as $MTP ) {
+		foreach ($MTPs as $MTP) {
 			$field = $MTP->get('MTP_template_field');
-			if ( $field == 'content'  ) {
+			if ($field == 'content') {
 				$content = $MTP->get('MTP_content');
-				if ( !empty( $content['newsletter_content'] ) ) {
+				if ( ! empty($content['newsletter_content'])) {
 					$template_fields['newsletter_content'] = $content['newsletter_content'];
 					}
 				continue;
@@ -297,7 +297,7 @@ 
 		$this->_template_args['data'] = array(
 			'batch_message_from' => isset($template_fields['from']) ? $template_fields['from'] : '',
 			'batch_message_subject' => isset($template_fields['subject']) ? $template_fields['subject'] : '',
-			'batch_message_content' => isset( $template_fields['newsletter_content'] ) ? $template_fields['newsletter_content'] : ''
+			'batch_message_content' => isset($template_fields['newsletter_content']) ? $template_fields['newsletter_content'] : ''
 			);
 		$this->_return_json();
 	}
@@ -313,8 +313,8 @@ 
 	 * @param EE_Admin_List_Table $list_table
 	 * @return string html string for extra buttons
 	 */
-	public function add_newsletter_action_buttons( EE_Admin_List_Table $list_table ) {
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'espresso_registrations_newsletter_selected_send' ) ) {
+	public function add_newsletter_action_buttons(EE_Admin_List_Table $list_table) {
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'espresso_registrations_newsletter_selected_send')) {
 			return '';
 		}
 
@@ -323,13 +323,13 @@ 
 			'event_registrations',
 			'default'
 			);
-		if ( $this->_current_page == 'espresso_registrations' && in_array( $this->_req_action, $routes_to_add_to )  ) {
-			if ( ( $this->_req_action == 'event_registrations' && empty( $this->_req_data['event_id'] ) ) || ( isset( $this->_req_data['status'] ) && $this->_req_data['status'] == 'trash' ) ) {
+		if ($this->_current_page == 'espresso_registrations' && in_array($this->_req_action, $routes_to_add_to)) {
+			if (($this->_req_action == 'event_registrations' && empty($this->_req_data['event_id'])) || (isset($this->_req_data['status']) && $this->_req_data['status'] == 'trash')) {
 				echo '';
 			} else {
-				$button_text = sprintf( __('Send Batch Message (%s selected)', 'event_espresso'), '<span class="send-selected-newsletter-count">0</span>' );
-				echo '<button id="selected-batch-send-trigger" class="button secondary-button"><span class="dashicons dashicons-email "></span>' . $button_text . '</button>';
-				add_action('admin_footer', array( $this, 'newsletter_send_form_skeleton') );
+				$button_text = sprintf(__('Send Batch Message (%s selected)', 'event_espresso'), '<span class="send-selected-newsletter-count">0</span>');
+				echo '<button id="selected-batch-send-trigger" class="button secondary-button"><span class="dashicons dashicons-email "></span>'.$button_text.'</button>';
+				add_action('admin_footer', array($this, 'newsletter_send_form_skeleton'));
 			}
 		}
 	}
@@ -341,38 +341,38 @@ 
 		$list_table = $this->_list_table_object;
 		$codes = array();
 		//need to templates for the newsletter message type for the template selector.
-		$values[] = array( 'text' => __('Select Template to Use', 'event_espresso'), 'id' => 0 );
-		$mtps = EEM_Message_Template_Group::instance()->get_all( array( array( 'MTP_message_type' => 'newsletter', 'MTP_messenger' => 'email' ) ) );
-		foreach ( $mtps as $mtp ) {
+		$values[] = array('text' => __('Select Template to Use', 'event_espresso'), 'id' => 0);
+		$mtps = EEM_Message_Template_Group::instance()->get_all(array(array('MTP_message_type' => 'newsletter', 'MTP_messenger' => 'email')));
+		foreach ($mtps as $mtp) {
 			$name = $mtp->name();
 			$values[] = array(
-				'text' => empty( $name ) ? __('Global', 'event_espresso') : $name,
+				'text' => empty($name) ? __('Global', 'event_espresso') : $name,
 				'id' => $mtp->ID()
 				);
 		}
 
 		//need to get a list of shortcodes that are available for the newsletter message type.
 		EE_Registry::instance()->load_helper('MSG_Template');
-		$shortcodes = EEH_MSG_Template::get_shortcodes( 'newsletter', 'email', array(), 'attendee', FALSE );
-		foreach ( $shortcodes as $field => $shortcode_array ) {
-			$codes[$field] = implode(', ', array_keys($shortcode_array ) );
+		$shortcodes = EEH_MSG_Template::get_shortcodes('newsletter', 'email', array(), 'attendee', FALSE);
+		foreach ($shortcodes as $field => $shortcode_array) {
+			$codes[$field] = implode(', ', array_keys($shortcode_array));
 		}
 
 		$shortcodes = $codes;
 
-		$form_template = REG_CAF_TEMPLATE_PATH . 'newsletter-send-form.template.php';
+		$form_template = REG_CAF_TEMPLATE_PATH.'newsletter-send-form.template.php';
 		$form_template_args = array(
 			'form_action' => admin_url('admin.php?page=espresso_registrations'),
 			'form_route' => 'newsletter_selected_send',
 			'form_nonce_name' => 'newsletter_selected_send_nonce',
-			'form_nonce' => wp_create_nonce( 'newsletter_selected_send_nonce' ),
+			'form_nonce' => wp_create_nonce('newsletter_selected_send_nonce'),
 			'redirect_back_to' => $this->_req_action,
-			'ajax_nonce' => wp_create_nonce( 'get_newsletter_form_content_nonce'),
-			'template_selector' => EEH_Form_Fields::select_input('newsletter_mtp_selected', $values ),
+			'ajax_nonce' => wp_create_nonce('get_newsletter_form_content_nonce'),
+			'template_selector' => EEH_Form_Fields::select_input('newsletter_mtp_selected', $values),
 			'shortcodes' => $shortcodes,
 			'id_type' => $list_table instanceof EE_Attendee_Contact_List_Table ? 'contact' : 'registration'
 			);
-		EEH_Template::display_template( $form_template, $form_template_args );
+		EEH_Template::display_template($form_template, $form_template_args);
 	}
 
 
@@ -387,35 +387,35 @@ 
 	protected function _newsletter_selected_send() {
 		$success = TRUE;
 		//first we need to make sure we have a GRP_ID so we know what template we're sending and updating!
-		if ( empty( $this->_req_data['newsletter_mtp_selected'] ) ) {
-			EE_Error::add_error( __('In order to send a message, a Message Template GRP_ID is needed. It was not provided so messages were not sent.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($this->_req_data['newsletter_mtp_selected'])) {
+			EE_Error::add_error(__('In order to send a message, a Message Template GRP_ID is needed. It was not provided so messages were not sent.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			$success = FALSE;
 		}
 
-		if ( $success ) {
+		if ($success) {
 			//update Message template in case there are any changes
-			$MTPG = EEM_Message_Template_Group::instance()->get_one_by_ID( $this->_req_data['newsletter_mtp_selected'] );
+			$MTPG = EEM_Message_Template_Group::instance()->get_one_by_ID($this->_req_data['newsletter_mtp_selected']);
 			$MTPs = $MTPG instanceof EE_Message_Template_Group ? $MTPG->context_templates() : array();
-			if ( empty( $MTPs ) ) {
-				EE_Error::add_error( __('Unable to retrieve message template fields from the db. Messages not sent.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+			if (empty($MTPs)) {
+				EE_Error::add_error(__('Unable to retrieve message template fields from the db. Messages not sent.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				$success = FALSE;
 			}
 
 			//let's just update the specific fields
-			foreach ( $MTPs['attendee'] as $MTP ) {
+			foreach ($MTPs['attendee'] as $MTP) {
 				$field = $MTP->get('MTP_template_field');
 				$content = $MTP->get('MTP_content');
 				$new_content = $content;
-				switch( $field ) {
+				switch ($field) {
 					case 'from' :
-						$new_content = !empty( $this->_req_data['batch_message']['from'] ) ? $this->_req_data['batch_message']['from'] : $content;
+						$new_content = ! empty($this->_req_data['batch_message']['from']) ? $this->_req_data['batch_message']['from'] : $content;
 						break;
 					case 'subject' :
-						$new_content = !empty( $this->_req_data['batch_message']['subject'] ) ? $this->_req_data['batch_message']['subject'] : $content;
+						$new_content = ! empty($this->_req_data['batch_message']['subject']) ? $this->_req_data['batch_message']['subject'] : $content;
 						break;
 					case 'content' :
 						$new_content = $content;
-						$new_content['newsletter_content'] = !empty( $this->_req_data['batch_message']['content'] ) ? $this->_req_data['batch_message']['content'] : $content['newsletter_content'];
+						$new_content['newsletter_content'] = ! empty($this->_req_data['batch_message']['content']) ? $this->_req_data['batch_message']['content'] : $content['newsletter_content'];
 						break;
 					default :
 						continue;
@@ -426,20 +426,20 @@ 
 			}
 
 			//great fields are updated!  now let's make sure we just have contact objects (EE_Attendee).
-			$id_type = !empty( $this->_req_data['batch_message']['id_type'] ) ? $this->_req_data['batch_message']['id_type'] : 'registration';
+			$id_type = ! empty($this->_req_data['batch_message']['id_type']) ? $this->_req_data['batch_message']['id_type'] : 'registration';
 
 			//id_type will affect how we assemble the ids.
-			$ids = !empty( $this->_req_data['batch_message']['ids'] ) ? json_decode( stripslashes($this->_req_data['batch_message']['ids']) ) : array();
+			$ids = ! empty($this->_req_data['batch_message']['ids']) ? json_decode(stripslashes($this->_req_data['batch_message']['ids'])) : array();
 
-			$contacts = $id_type == 'registration' ? EEM_Attendee::instance()->get_array_of_contacts_from_reg_ids( $ids ) : EEM_Attendee::instance()->get_all( array( array( 'ATT_ID' => array('in', $ids ) ) ) );
+			$contacts = $id_type == 'registration' ? EEM_Attendee::instance()->get_array_of_contacts_from_reg_ids($ids) : EEM_Attendee::instance()->get_all(array(array('ATT_ID' => array('in', $ids))));
 
 			//we do _action because ALL triggers are handled in EED_Messages.
-			do_action('AHEE__Extend_Registrations_Admin_Page___newsletter_selected_send', $contacts, $MTPG->ID() );
+			do_action('AHEE__Extend_Registrations_Admin_Page___newsletter_selected_send', $contacts, $MTPG->ID());
 		}
 		$query_args = array(
-			'action' => !empty( $this->_req_data['redirect_back_to'] ) ? $this->_req_data['redirect_back_to'] : 'default'
+			'action' => ! empty($this->_req_data['redirect_back_to']) ? $this->_req_data['redirect_back_to'] : 'default'
 			);
-		$this->_redirect_after_action( FALSE, '', '', $query_args, TRUE );
+		$this->_redirect_after_action(FALSE, '', '', $query_args, TRUE);
 	}
 
 
@@ -452,16 +452,16 @@ 
 	*/
 	protected function _registration_reports() {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		$page_args = array();
 
-		$page_args['admin_reports'][] = $this->_registrations_per_day_report( '-1 month' );  //  option: '-1 week', '-2 weeks' defaults to '-1 month'
-		$page_args['admin_reports'][] = $this->_get_registrations_per_event_report( '-1 month' ); //  option: '-1 week', '-2 weeks' defaults to '-1 month'
+		$page_args['admin_reports'][] = $this->_registrations_per_day_report('-1 month'); //  option: '-1 week', '-2 weeks' defaults to '-1 month'
+		$page_args['admin_reports'][] = $this->_get_registrations_per_event_report('-1 month'); //  option: '-1 week', '-2 weeks' defaults to '-1 month'
 //		$page_args['admin_reports'][] = 'chart1';
 
-		$template_path = EE_ADMIN_TEMPLATE . 'admin_reports.template.php';
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, $page_args, TRUE );
+		$template_path = EE_ADMIN_TEMPLATE.'admin_reports.template.php';
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, $page_args, TRUE);
 
 //		EEH_Debug_Tools::printr( $page_args, '$page_args' );
 
@@ -480,36 +480,36 @@ 
 	*		@access private
 	*		@return void
 	*/
-	private function _registrations_per_day_report( $period = '-1 month' ) {
+	private function _registrations_per_day_report($period = '-1 month') {
 
 		$report_ID = 'reg-admin-registrations-per-day-report-dv';
 		$report_JS = 'espresso_reg_admin_regs_per_day';
 
-		wp_enqueue_script( $report_JS );
+		wp_enqueue_script($report_JS);
 
 		$REG = EEM_Registration::instance();
 
-		$results = $REG->get_registrations_per_day_report( $period );
+		$results = $REG->get_registrations_per_day_report($period);
 
 		//EEH_Debug_Tools::printr( $results, '$registrations_per_day' );
 		$regs = array();
-		$xmin = date( 'Y-m-d', strtotime( '+1 year' ));
+		$xmin = date('Y-m-d', strtotime('+1 year'));
 		$xmax = 0;
 		$ymax = 0;
 		$results = (array) $results;
-		foreach ( $results as $result ) {
-			$regs[] = array( $result->regDate, (int)$result->total );
-			$xmin = strtotime( $result->regDate ) < strtotime( $xmin ) ? $result->regDate : $xmin;
-			$xmax = strtotime( $result->regDate ) > strtotime( $xmax ) ? $result->regDate : $xmax;
+		foreach ($results as $result) {
+			$regs[] = array($result->regDate, (int) $result->total);
+			$xmin = strtotime($result->regDate) < strtotime($xmin) ? $result->regDate : $xmin;
+			$xmax = strtotime($result->regDate) > strtotime($xmax) ? $result->regDate : $xmax;
 			$ymax = $result->total > $ymax ? $result->total : $ymax;
 		}
 
-		$xmin = date( 'Y-m-d', strtotime( date( 'Y-m-d', strtotime($xmin)) . ' -1 day' ));
-		$xmax = date( 'Y-m-d', strtotime( date( 'Y-m-d', strtotime($xmax)) . ' +1 day' ));
+		$xmin = date('Y-m-d', strtotime(date('Y-m-d', strtotime($xmin)).' -1 day'));
+		$xmax = date('Y-m-d', strtotime(date('Y-m-d', strtotime($xmax)).' +1 day'));
 		// calculate # days between our min and max dates
-		$span = floor( (strtotime($xmax) - strtotime($xmin)) / (60*60*24)) + 1;
+		$span = floor((strtotime($xmax) - strtotime($xmin)) / (60 * 60 * 24)) + 1;
 
-		$report_title = __( 'Total Registrations per Day', 'event_espresso' );
+		$report_title = __('Total Registrations per Day', 'event_espresso');
 
 		$report_params = array(
 				'title' 	=> $report_title,
@@ -520,9 +520,9 @@ 
 				'ymax' 	=> ceil($ymax * 1.25),
 				'span' 	=> $span,
 				'width'	=> ceil(900 / $span),
-				'noRegsMsg' => sprintf( __('<h2>%s</h2><p>There are currently no registration records in the last month for this report.</p>', 'event_espresso'), $report_title )
+				'noRegsMsg' => sprintf(__('<h2>%s</h2><p>There are currently no registration records in the last month for this report.</p>', 'event_espresso'), $report_title)
 			);
-		wp_localize_script( $report_JS, 'regPerDay', $report_params );
+		wp_localize_script($report_JS, 'regPerDay', $report_params);
 
 		return $report_ID;
 	}
@@ -537,29 +537,29 @@ 
 	*		@access private
 	*		@return void
 	*/
-	private function _get_registrations_per_event_report( $period = '-1 month' ) {
+	private function _get_registrations_per_event_report($period = '-1 month') {
 
 		$report_ID = 'reg-admin-registrations-per-event-report-dv';
 		$report_JS = 'espresso_reg_admin_regs_per_event';
 
-		wp_enqueue_script( $report_JS );
+		wp_enqueue_script($report_JS);
 
-		require_once ( EE_MODELS . 'EEM_Registration.model.php' );
+		require_once (EE_MODELS.'EEM_Registration.model.php');
 		$REG = EEM_Registration::instance();
 
-		$results = $REG->get_registrations_per_event_report( $period );
+		$results = $REG->get_registrations_per_event_report($period);
 		//EEH_Debug_Tools::printr( $results, '$registrations_per_event' );
 		$regs = array();
 		$ymax = 0;
 		$results = (array) $results;
-		foreach ( $results as $result ) {
-			$regs[] = array( wp_trim_words( $result->event_name, 4, '...' ), (int)$result->total );
+		foreach ($results as $result) {
+			$regs[] = array(wp_trim_words($result->event_name, 4, '...'), (int) $result->total);
 			$ymax = $result->total > $ymax ? $result->total : $ymax;
 		}
 
 		$span = $period == 'week' ? 9 : 33;
 
-		$report_title = __( 'Total Registrations per Event', 'event_espresso' );
+		$report_title = __('Total Registrations per Event', 'event_espresso');
 
 		$report_params = array(
 			'title' 	=> $report_title,
@@ -568,9 +568,9 @@ 
 			'ymax' 	=> ceil($ymax * 1.25),
 			'span' 	=> $span,
 			'width'	=> ceil(900 / $span),
-			'noRegsMsg' => sprintf( __('<h2>%s</h2><p>There are currently no registration records in the last month for this report.</p>', 'event_espresso'), $report_title )
+			'noRegsMsg' => sprintf(__('<h2>%s</h2><p>There are currently no registration records in the last month for this report.</p>', 'event_espresso'), $report_title)
 		);
-		wp_localize_script( $report_JS, 'regPerEvent', $report_params );
+		wp_localize_script($report_JS, 'regPerEvent', $report_params);
 
 		return $report_ID;
 	}
@@ -584,8 +584,8 @@ 
 	 * @return void
 	 */
 	protected function _registration_checkin_list_table() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		$reg_id = isset( $this->_req_data['_REGID'] ) ? $this->_req_data['_REGID'] : null;
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$reg_id = isset($this->_req_data['_REGID']) ? $this->_req_data['_REGID'] : null;
 		$reg = EEM_Registration::instance()->get_one_by_ID($reg_id);
 		$this->_admin_page_title .= $this->get_action_link_or_button('new_registration', 'add-registrant', array('event_id' => $reg->event_ID()), 'add-new-h2');
 
@@ -599,15 +599,15 @@ 
 				'desc' => __('This indicates the attendee has been checked out', 'event_espresso')
 				)
 			);
-		$this->_template_args['after_list_table'] = $this->_display_legend( $legend_items );
+		$this->_template_args['after_list_table'] = $this->_display_legend($legend_items);
 
 
-		$dtt_id = isset(  $this->_req_data['DTT_ID'] ) ? $this->_req_data['DTT_ID'] : NULL;
-		$go_back_url = !empty( $reg_id )  ? EE_Admin_Page::add_query_args_and_nonce(array('action' => 'event_registrations', 'event_id' => EEM_Registration::instance()->get_one_by_ID($reg_id)->get_first_related('Event')->ID(), 'DTT_ID' => $dtt_id ), $this->_admin_base_url ) : '';
+		$dtt_id = isset($this->_req_data['DTT_ID']) ? $this->_req_data['DTT_ID'] : NULL;
+		$go_back_url = ! empty($reg_id) ? EE_Admin_Page::add_query_args_and_nonce(array('action' => 'event_registrations', 'event_id' => EEM_Registration::instance()->get_one_by_ID($reg_id)->get_first_related('Event')->ID(), 'DTT_ID' => $dtt_id), $this->_admin_base_url) : '';
 
-		$this->_template_args['before_list_table'] = !empty( $reg_id ) && !empty( $dtt_id ) ? '<h2>' . sprintf(__("%s's check in records for %s at the event, %s", 'event_espresso'), '<span id="checkin-attendee-name">' . EEM_Registration::instance()->get_one_by_ID($reg_id)->get_first_related('Attendee')->full_name() . '</span>', '<span id="checkin-dtt"><a href="' . $go_back_url . '">' . EEM_Datetime::instance()->get_one_by_ID($dtt_id)->start_date_and_time() . ' - ' . EEM_Datetime::instance()->get_one_by_ID($dtt_id)->end_date_and_time() . '</a></span>', '<span id="checkin-event-name">' . EEM_Datetime::instance()->get_one_by_ID($dtt_id)->get_first_related('Event')->get('EVT_name') . '</span>' ) . '</h2>' : '';
-		$this->_template_args['list_table_hidden_fields'] = !empty( $reg_id ) ? '<input type="hidden" name="_REGID" value="' . $reg_id . '">' : '';
-		$this->_template_args['list_table_hidden_fields'] .= !empty( $dtt_id ) ? '<input type="hidden" name="DTT_ID" value="' . $dtt_id . '">' : '';
+		$this->_template_args['before_list_table'] = ! empty($reg_id) && ! empty($dtt_id) ? '<h2>'.sprintf(__("%s's check in records for %s at the event, %s", 'event_espresso'), '<span id="checkin-attendee-name">'.EEM_Registration::instance()->get_one_by_ID($reg_id)->get_first_related('Attendee')->full_name().'</span>', '<span id="checkin-dtt"><a href="'.$go_back_url.'">'.EEM_Datetime::instance()->get_one_by_ID($dtt_id)->start_date_and_time().' - '.EEM_Datetime::instance()->get_one_by_ID($dtt_id)->end_date_and_time().'</a></span>', '<span id="checkin-event-name">'.EEM_Datetime::instance()->get_one_by_ID($dtt_id)->get_first_related('Event')->get('EVT_name').'</span>').'</h2>' : '';
+		$this->_template_args['list_table_hidden_fields'] = ! empty($reg_id) ? '<input type="hidden" name="_REGID" value="'.$reg_id.'">' : '';
+		$this->_template_args['list_table_hidden_fields'] .= ! empty($dtt_id) ? '<input type="hidden" name="DTT_ID" value="'.$dtt_id.'">' : '';
 
 		$this->display_admin_list_table_page_with_no_sidebar();
 	}
@@ -620,24 +620,24 @@ 
 	 */
 	public function toggle_checkin_status() {
 		//first make sure we have the necessary data
-		if ( !isset( $this->_req_data['_regid'] ) ) {
-			EE_Error::add_error( __('There must be something broken with the html structure because the required data for toggling the Check-in status is not being sent via ajax', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! isset($this->_req_data['_regid'])) {
+			EE_Error::add_error(__('There must be something broken with the html structure because the required data for toggling the Check-in status is not being sent via ajax', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			$this->_template_args['success'] = FALSE;
 			$this->_template_args['error'] = TRUE;
 			$this->_return_json();
 		};
 
 		//do a nonce check cause we're not coming in from an normal route here.
-		$nonce = isset( $this->_req_data['checkinnonce'] ) ? sanitize_text_field( $this->_req_data['checkinnonce'] ) : '';
+		$nonce = isset($this->_req_data['checkinnonce']) ? sanitize_text_field($this->_req_data['checkinnonce']) : '';
 		$nonce_ref = 'checkin_nonce';
 
-		$this->_verify_nonce( $nonce, $nonce_ref );
+		$this->_verify_nonce($nonce, $nonce_ref);
 
 		//beautiful! Made it this far so let's get the status.
 		$new_status = $this->_toggle_checkin_status();
 
 		//setup new class to return via ajax
-		$this->_template_args['admin_page_content'] = 'clickable trigger-checkin checkin-icons checkedin-status-' . $new_status;
+		$this->_template_args['admin_page_content'] = 'clickable trigger-checkin checkin-icons checkedin-status-'.$new_status;
 		$this->_template_args['success'] = TRUE;
 		$this->_return_json();
 	}
@@ -657,32 +657,32 @@ 
 		//first let's get the query args out of the way for the redirect
 		$query_args = array(
 			'action' => 'event_registrations',
-			'event_id' => isset( $this->_req_data['event_id'] ) ? $this->_req_data['event_id'] : NULL,
-			'DTT_ID' => isset( $this->_req_data['DTT_ID'] ) ? $this->_req_data['DTT_ID'] : NULL
+			'event_id' => isset($this->_req_data['event_id']) ? $this->_req_data['event_id'] : NULL,
+			'DTT_ID' => isset($this->_req_data['DTT_ID']) ? $this->_req_data['DTT_ID'] : NULL
 			);
 		$new_status = FALSE;
 
 		// bulk action check in toggle
-		if ( ! empty( $this->_req_data['checkbox'] ) && is_array( $this->_req_data['checkbox'] )) {
+		if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
 			// cycle thru checkboxes
-			while ( list( $REG_ID, $value ) = each($this->_req_data['checkbox'])) {
-				$DTT_ID = isset( $this->_req_data['DTT_ID'] ) ? $this->_req_data['DTT_ID'] : NULL;
+			while (list($REG_ID, $value) = each($this->_req_data['checkbox'])) {
+				$DTT_ID = isset($this->_req_data['DTT_ID']) ? $this->_req_data['DTT_ID'] : NULL;
 				$new_status = $this->_toggle_checkin($REG_ID, $DTT_ID);
 			}
 
-		} elseif ( isset( $this->_req_data['_regid'] ) ) {
+		} elseif (isset($this->_req_data['_regid'])) {
 			//coming from ajax request
-			$DTT_ID = isset( $this->_req_data['dttid'] ) ? $this->_req_data['dttid'] : NULL;
+			$DTT_ID = isset($this->_req_data['dttid']) ? $this->_req_data['dttid'] : NULL;
 			$query_args['DTT_ID'] = $DTT_ID;
 			$new_status = $this->_toggle_checkin($this->_req_data['_regid'], $DTT_ID);
 		} else {
-			EE_Error::add_error(__('Missing some required data to toggle the Check-in', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__  );
+			EE_Error::add_error(__('Missing some required data to toggle the Check-in', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
 
-		if ( defined('DOING_AJAX' ) )
+		if (defined('DOING_AJAX'))
 			return $new_status;
 
-		$this->_redirect_after_action( FALSE,'', '', $query_args, TRUE );
+		$this->_redirect_after_action(FALSE, '', '', $query_args, TRUE);
 
 	}
 
@@ -698,11 +698,11 @@ 
 	 */
 	private function _toggle_checkin($REG_ID, $DTT_ID) {
 		$REG = EEM_Registration::instance()->get_one_by_ID($REG_ID);
-		$new_status = $REG->toggle_checkin_status( $DTT_ID );
-		if ( $new_status !== FALSE ) {
-			EE_Error::add_success($REG->get_checkin_msg($DTT_ID) );
+		$new_status = $REG->toggle_checkin_status($DTT_ID);
+		if ($new_status !== FALSE) {
+			EE_Error::add_success($REG->get_checkin_msg($DTT_ID));
 		} else {
-			EE_Error::add_error($REG->get_checkin_msg($DTT_ID, TRUE), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($REG->get_checkin_msg($DTT_ID, TRUE), __FILE__, __FUNCTION__, __LINE__);
 			$new_status = FALSE;
 		}
 		return $new_status;
@@ -718,28 +718,28 @@ 
 	protected function _delete_checkin_rows() {
 		$query_args = array(
 			'action' => 'registration_checkins',
-			'DTT_ID' => isset( $this->_req_data['DTT_ID'] ) ? $this->_req_data['DTT_ID'] : 0,
-			'_REGID' => isset( $this->_req_data['_REGID'] ) ? $this->_req_data['_REGID'] : 0
+			'DTT_ID' => isset($this->_req_data['DTT_ID']) ? $this->_req_data['DTT_ID'] : 0,
+			'_REGID' => isset($this->_req_data['_REGID']) ? $this->_req_data['_REGID'] : 0
 			);
-		if ( !empty( $this->_req_data['checkbox'] ) && is_array( $this->_req_data['checkbox'] ) ) {
-			while ( list( $CHK_ID, $value ) = each( $this->_req_data['checkbox'] ) ) {
+		if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
+			while (list($CHK_ID, $value) = each($this->_req_data['checkbox'])) {
 				$errors = 0;
-				if ( ! EEM_Checkin::instance()->delete_by_ID($CHK_ID ) ) {
+				if ( ! EEM_Checkin::instance()->delete_by_ID($CHK_ID)) {
 					$errors++;
 				}
 			}
 		} else {
-			EE_Error::add_error(__('So, something went wrong with the bulk delete because there was no data received for instructions on WHAT to delete!', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
-			$this->_redirect_after_action( FALSE, '', '', $query_args, TRUE );
+			EE_Error::add_error(__('So, something went wrong with the bulk delete because there was no data received for instructions on WHAT to delete!', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
+			$this->_redirect_after_action(FALSE, '', '', $query_args, TRUE);
 		}
 
-		if ( $errors > 0 ) {
-			EE_Error::add_error( sprintf( __('There were %d records that did not delete successfully', 'event_espresso'), $errors ), __FILE__, __FUNCTION__, __LINE__ );
+		if ($errors > 0) {
+			EE_Error::add_error(sprintf(__('There were %d records that did not delete successfully', 'event_espresso'), $errors), __FILE__, __FUNCTION__, __LINE__);
 		} else {
-			EE_Error::add_success( __('Records were successfully deleted', 'event_espresso') );
+			EE_Error::add_success(__('Records were successfully deleted', 'event_espresso'));
 		}
 
-		$this->_redirect_after_action( FALSE, '', '', $query_args, TRUE );
+		$this->_redirect_after_action(FALSE, '', '', $query_args, TRUE);
 	}
 
 
@@ -751,20 +751,20 @@ 
 	protected function _delete_checkin_row() {
 		$query_args = array(
 			'action' => 'registration_checkins',
-			'DTT_ID' => isset( $this->_req_data['DTT_ID'] ) ? $this->_req_data['DTT_ID'] : 0,
-			'_REGID' => isset( $this->_req_data['_REGID'] ) ? $this->_req_data['_REGID'] : 0
+			'DTT_ID' => isset($this->_req_data['DTT_ID']) ? $this->_req_data['DTT_ID'] : 0,
+			'_REGID' => isset($this->_req_data['_REGID']) ? $this->_req_data['_REGID'] : 0
 			);
 
-		if ( !empty( $this->_req_data['CHK_ID'] ) ) {
-			if ( ! EEM_Checkin::instance()->delete_by_ID($this->_req_data['CHK_ID'] ) ) {
-				EE_Error::add_error(__('Something went wrong and this check-in record was not deleted', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! empty($this->_req_data['CHK_ID'])) {
+			if ( ! EEM_Checkin::instance()->delete_by_ID($this->_req_data['CHK_ID'])) {
+				EE_Error::add_error(__('Something went wrong and this check-in record was not deleted', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			} else {
-				EE_Error::add_success( __('Check-In record successfully deleted', 'event_espresso') );
+				EE_Error::add_success(__('Check-In record successfully deleted', 'event_espresso'));
 			}
 		} else {
-			EE_Error::add_error(__('In order to delete a Check-in record, there must be a Check-In ID available. There is not. It is not your fault, there is just a gremlin living in the code', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error(__('In order to delete a Check-in record, there must be a Check-In ID available. There is not. It is not your fault, there is just a gremlin living in the code', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
-		$this->_redirect_after_action( FALSE, '', '', $query_args, TRUE );
+		$this->_redirect_after_action(FALSE, '', '', $query_args, TRUE);
 	}
 
 
@@ -777,8 +777,8 @@ 
 	*		@return void
 	*/
 	protected function _event_registrations_list_table() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		$this->_admin_page_title .= isset( $this->_req_data['event_id'] ) ? $this->get_action_link_or_button('new_registration', 'add-registrant', array('event_id' => $this->_req_data['event_id']), 'add-new-h2') : '';
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$this->_admin_page_title .= isset($this->_req_data['event_id']) ? $this->get_action_link_or_button('new_registration', 'add-registrant', array('event_id' => $this->_req_data['event_id']), 'add-new-h2') : '';
 
 		$legend_items = array(
 			'star-icon' => array(
@@ -802,31 +802,31 @@ 
 				'desc' => __('View All Check-in Records for this Registrant', 'event_espresso')
 				),
 			'approved_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_approved,
-				'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_approved, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_approved,
+				'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_approved, FALSE, 'sentence')
 				),
             'cancelled_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_cancelled,
-				'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_cancelled, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_cancelled,
+				'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_cancelled, FALSE, 'sentence')
 				),
             'declined_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_declined,
-				'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_declined, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_declined,
+				'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_declined, FALSE, 'sentence')
 				),
 			'not_approved' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_not_approved,
-				'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_not_approved, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_not_approved,
+				'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_not_approved, FALSE, 'sentence')
 				),
 			'pending_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_pending_payment,
-				'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_pending_payment, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_pending_payment,
+				'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_pending_payment, FALSE, 'sentence')
 				)/**/
 			);
-		$this->_template_args['after_list_table'] = $this->_display_legend( $legend_items );
+		$this->_template_args['after_list_table'] = $this->_display_legend($legend_items);
 
-		$event_id = isset( $this->_req_data['event_id'] ) ? $this->_req_data['event_id'] : null;
-		$this->_template_args['before_list_table'] = !empty( $event_id ) ? '<h2>' . sprintf(__('Viewing Registrations for Event: %s', 'event_espresso'), EEM_Event::instance()->get_one_by_ID($event_id)->get('EVT_name') ) . '</h2>' : '';
-		$this->_template_args['list_table_hidden_fields'] = !empty( $event_id ) ? '<input type="hidden" name="event_id" value="' . $event_id . '">' : '';
+		$event_id = isset($this->_req_data['event_id']) ? $this->_req_data['event_id'] : null;
+		$this->_template_args['before_list_table'] = ! empty($event_id) ? '<h2>'.sprintf(__('Viewing Registrations for Event: %s', 'event_espresso'), EEM_Event::instance()->get_one_by_ID($event_id)->get('EVT_name')).'</h2>' : '';
+		$this->_template_args['list_table_hidden_fields'] = ! empty($event_id) ? '<input type="hidden" name="event_id" value="'.$event_id.'">' : '';
 
 		$this->display_admin_list_table_page_with_no_sidebar();
 	}
@@ -840,15 +840,15 @@ 
 	*		@access public
 	*		@return array
 	*/
-	public function get_event_attendees( $per_page = 10, $count = FALSE, $trash = FALSE, $orderby = '' ) {
+	public function get_event_attendees($per_page = 10, $count = FALSE, $trash = FALSE, $orderby = '') {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		require_once(EE_MODELS . 'EEM_Attendee.model.php');
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		require_once(EE_MODELS.'EEM_Attendee.model.php');
 		//$ATT_MDL = EEM_Attendee::instance();
 
-		$EVT_ID = isset($this->_req_data['event_id']) ? absint( $this->_req_data['event_id'] ) : FALSE;
-		$CAT_ID = isset($this->_req_data['category_id']) ? absint( $this->_req_data['category_id'] ) : FALSE;
-		$DTT_ID = isset( $this->_req_data['DTT_ID'] ) ? $this->_req_data['DTT_ID'] : NULL;
+		$EVT_ID = isset($this->_req_data['event_id']) ? absint($this->_req_data['event_id']) : FALSE;
+		$CAT_ID = isset($this->_req_data['category_id']) ? absint($this->_req_data['category_id']) : FALSE;
+		$DTT_ID = isset($this->_req_data['DTT_ID']) ? $this->_req_data['DTT_ID'] : NULL;
 
 		$this->_req_data['orderby'] = ! empty($this->_req_data['orderby']) ? $this->_req_data['orderby'] : $orderby;
 
@@ -861,94 +861,94 @@ 
 //				$orderby = 'reg.REG_final_price';
 		}
 
-		$sort = ( isset( $this->_req_data['order'] ) && ! empty( $this->_req_data['order'] )) ? $this->_req_data['order'] : 'ASC';
+		$sort = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order'] : 'ASC';
 
-		$current_page = isset( $this->_req_data['paged'] ) && !empty( $this->_req_data['paged'] ) ? $this->_req_data['paged'] : 1;
-		$per_page = isset( $this->_req_data['perpage'] ) && !empty( $this->_req_data['perpage'] ) ? $this->_req_data['perpage'] : $per_page;
+		$current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged']) ? $this->_req_data['paged'] : 1;
+		$per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage']) ? $this->_req_data['perpage'] : $per_page;
 
 
-		$offset = ($current_page-1)*$per_page;
-		$limit = $count ? NULL : array( $offset, $per_page );
-		$query_params = array(array('Event.status'=>array('IN',  array_keys(EEM_Event::instance()->get_status_array()))));
-		if ($EVT_ID){
-			$query_params[0]['EVT_ID']=$EVT_ID;
+		$offset = ($current_page - 1) * $per_page;
+		$limit = $count ? NULL : array($offset, $per_page);
+		$query_params = array(array('Event.status'=>array('IN', array_keys(EEM_Event::instance()->get_status_array()))));
+		if ($EVT_ID) {
+			$query_params[0]['EVT_ID'] = $EVT_ID;
 		}
-		if($CAT_ID){
+		if ($CAT_ID) {
 			throw new EE_Error("You specified a Category Id for this query. Thats odd because we are now using terms and taxonomies. So did you mean the term taxonomy id o rthe term id?");
 		}
 
 		//if DTT is included we do multiple datetimes.
-		if ( $DTT_ID ) {
+		if ($DTT_ID) {
 			$query_params[0]['Ticket.Datetime.DTT_ID'] = $DTT_ID;
 		}
 
 		//make sure we only have default where on the current regs
 		$query_params['default_where_conditions'] = 'this_model_only';
 
-		$status_ids_array = apply_filters( 'FHEE__Extend_Registrations_Admin_Page__get_event_attendees__status_ids_array', array( EEM_Registration::status_id_pending_payment, EEM_Registration::status_id_approved ) );
+		$status_ids_array = apply_filters('FHEE__Extend_Registrations_Admin_Page__get_event_attendees__status_ids_array', array(EEM_Registration::status_id_pending_payment, EEM_Registration::status_id_approved));
 
-		$query_params[0]['STS_ID']= array('IN', $status_ids_array );
+		$query_params[0]['STS_ID'] = array('IN', $status_ids_array);
 
-		if($trash){
-			$query_params[0]['Attendee.status']=  EEM_CPT_Base::post_status_trashed;
+		if ($trash) {
+			$query_params[0]['Attendee.status'] = EEM_CPT_Base::post_status_trashed;
 		}
 
-		if ( isset( $this->_req_data['s'] ) ) {
-			$sstr = '%' . $this->_req_data['s'] . '%';
+		if (isset($this->_req_data['s'])) {
+			$sstr = '%'.$this->_req_data['s'].'%';
 			$query_params[0]['OR'] = array(
-				'Event.EVT_name' => array( 'LIKE', $sstr),
-				'Event.EVT_desc' => array( 'LIKE', $sstr ),
-				'Event.EVT_short_desc' => array( 'LIKE' , $sstr ),
-				'Attendee.ATT_fname' => array( 'LIKE', $sstr ),
-				'Attendee.ATT_lname' => array( 'LIKE', $sstr ),
-				'Attendee.ATT_short_bio' => array( 'LIKE', $sstr ),
-				'Attendee.ATT_email' => array('LIKE', $sstr ),
-				'Attendee.ATT_address' => array( 'LIKE', $sstr ),
-				'Attendee.ATT_address2' => array( 'LIKE', $sstr ),
-				'Attendee.ATT_city' => array( 'LIKE', $sstr ),
-				'REG_final_price' => array( 'LIKE', $sstr ),
-				'REG_code' => array( 'LIKE', $sstr ),
-				'REG_count' => array( 'LIKE' , $sstr ),
-				'REG_group_size' => array( 'LIKE' , $sstr ),
-				'Ticket.TKT_name' => array( 'LIKE', $sstr ),
-				'Ticket.TKT_description' => array( 'LIKE', $sstr )
+				'Event.EVT_name' => array('LIKE', $sstr),
+				'Event.EVT_desc' => array('LIKE', $sstr),
+				'Event.EVT_short_desc' => array('LIKE', $sstr),
+				'Attendee.ATT_fname' => array('LIKE', $sstr),
+				'Attendee.ATT_lname' => array('LIKE', $sstr),
+				'Attendee.ATT_short_bio' => array('LIKE', $sstr),
+				'Attendee.ATT_email' => array('LIKE', $sstr),
+				'Attendee.ATT_address' => array('LIKE', $sstr),
+				'Attendee.ATT_address2' => array('LIKE', $sstr),
+				'Attendee.ATT_city' => array('LIKE', $sstr),
+				'REG_final_price' => array('LIKE', $sstr),
+				'REG_code' => array('LIKE', $sstr),
+				'REG_count' => array('LIKE', $sstr),
+				'REG_group_size' => array('LIKE', $sstr),
+				'Ticket.TKT_name' => array('LIKE', $sstr),
+				'Ticket.TKT_description' => array('LIKE', $sstr)
 				);
 		}
 
 		$query_params['order_by'][$orderby] = $sort;
 		$query_params['limit'] = $limit;
-		$query_params['force_join'] = array('Attendee');//force join to attendee model so that it gets cached, because we're going to need the attendee for each registration
-		if($count){
-			$registrations = EEM_Registration::instance()->count(array($query_params[0], 'default_where_conditions' => 'this_model_only' ));
-		}else{
+		$query_params['force_join'] = array('Attendee'); //force join to attendee model so that it gets cached, because we're going to need the attendee for each registration
+		if ($count) {
+			$registrations = EEM_Registration::instance()->count(array($query_params[0], 'default_where_conditions' => 'this_model_only'));
+		} else {
 			$registrations = EEM_Registration::instance()->get_all($query_params);
 
 
 	//		$registrations = EEM_Registration::instance();
 	//		$all_attendees = EEM_Attendee::instance()->get_event_attendees( $EVT_ID, $CAT_ID, $reg_status, $trash, $orderby, $sort, $limit, $output );
-			if ( isset( $registrations[0] ) && $registrations[0] instanceof EE_Registration ) {
+			if (isset($registrations[0]) && $registrations[0] instanceof EE_Registration) {
 				//EEH_Debug_Tools::printr( $all_attendees[0], '$all_attendees[0]  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 				// name
 				$first_registration = $registrations[0];
 				$event_obj = $first_registration->event_obj();
-				if($event_obj){
+				if ($event_obj) {
 					$event_name = $first_registration->event_obj()->name();
-					$event_date = 'TODO: we need to get date from earliest price date or should this be the actual event date?';//$first_registration->date_obj()->reg_start_date_and_time('l F j, Y,', ' g:i:s a');// isset( $registrations[0]->DTT_EVT_start ) ? date( 'l F j, Y,    g:i:s a', $registrations[0]->DTT_EVT_start ) : '';
+					$event_date = 'TODO: we need to get date from earliest price date or should this be the actual event date?'; //$first_registration->date_obj()->reg_start_date_and_time('l F j, Y,', ' g:i:s a');// isset( $registrations[0]->DTT_EVT_start ) ? date( 'l F j, Y,    g:i:s a', $registrations[0]->DTT_EVT_start ) : '';
 					// edit event link
-					if ( $event_name != '' ) {
-						$edit_event_url = self::add_query_args_and_nonce( array( 'action'=>'edit_event', 'EVT_ID'=>$EVT_ID ), EVENTS_ADMIN_URL );
-						$edit_event_lnk = '<a href="'.$edit_event_url.'" title="' . esc_attr__( 'Edit ', 'event_espresso' ) . $event_name . '">' . __( 'Edit Event', 'event_espresso' ) . '</a>';
-						$event_name .= ' <span class="admin-page-header-edit-lnk not-bold">' . $edit_event_lnk . '</span>' ;
+					if ($event_name != '') {
+						$edit_event_url = self::add_query_args_and_nonce(array('action'=>'edit_event', 'EVT_ID'=>$EVT_ID), EVENTS_ADMIN_URL);
+						$edit_event_lnk = '<a href="'.$edit_event_url.'" title="'.esc_attr__('Edit ', 'event_espresso').$event_name.'">'.__('Edit Event', 'event_espresso').'</a>';
+						$event_name .= ' <span class="admin-page-header-edit-lnk not-bold">'.$edit_event_lnk.'</span>';
 					}
 
-					$back_2_reg_url = self::add_query_args_and_nonce( array( 'action'=>'default' ), REG_ADMIN_URL );
-					$back_2_reg_lnk = '<a href="'.$back_2_reg_url.'" title="' . esc_attr__( 'click to return to viewing all registrations ', 'event_espresso' ) . '">&laquo; ' . __( 'Back to All Registrations', 'event_espresso' ) . '</a>';
+					$back_2_reg_url = self::add_query_args_and_nonce(array('action'=>'default'), REG_ADMIN_URL);
+					$back_2_reg_lnk = '<a href="'.$back_2_reg_url.'" title="'.esc_attr__('click to return to viewing all registrations ', 'event_espresso').'">&laquo; '.__('Back to All Registrations', 'event_espresso').'</a>';
 
 					$this->_template_args['before_admin_page_content'] = '
 				<div id="admin-page-header">
-					<h1><span class="small-text not-bold">'.__( 'Event: ', 'event_espresso' ).'</span>'. $event_name .'</h1>
-					<h3><span class="small-text not-bold">'.__( 'Date: ', 'event_espresso' ). '</span>'. $event_date .'</h3>
-					<span class="admin-page-header-go-back-lnk not-bold">' . $back_2_reg_lnk . '</span>
+					<h1><span class="small-text not-bold">'.__('Event: ', 'event_espresso').'</span>'.$event_name.'</h1>
+					<h3><span class="small-text not-bold">'.__('Date: ', 'event_espresso').'</span>'.$event_date.'</h3>
+					<span class="admin-page-header-go-back-lnk not-bold">' . $back_2_reg_lnk.'</span>
 				</div>
 				';
 				}

caffeinated/admin/extend/transactions/Extend_Transactions_Admin_Page.core.php

Doc Comments +2 added lines, -2 removed lines

@@ -135,7 +135,7 @@ 
 	 *
 	 * @access private
 	 * @param string $period
-	 * @return int
+	 * @return string
 	 */
 	private function _revenue_per_day_report( $period = '-1 month' ) {
 
@@ -193,7 +193,7 @@ 
 	 *
 	 * @access private
 	 * @param string $period
-	 * @return int
+	 * @return string
 	 */
 	private function _revenue_per_event_report( $period = '-1 month' ) {
 

Indentation +3 added lines, -3 removed lines

@@ -105,10 +105,10 @@
 	/**
 	 * _transaction_reports
 	 * 	generates Business Reports regarding Transactions
-	*
+	 *
 	 * @access protected
-	*	@return void
-	*/
+	 *	@return void
+	 */
 	protected function _transaction_reports() {
 
 		$page_args = array();

Spacing +40 added lines, -40 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -35,11 +35,11 @@ 
 	 * @param bool $routing
 	 * @return \Extend_Transactions_Admin_Page
 	 */
-	public function __construct( $routing = TRUE ) {
-		parent::__construct( $routing );
-		define( 'TXN_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'transactions/templates/');
-		define( 'TXN_CAF_ASSETS', EE_CORE_CAF_ADMIN_EXTEND . 'transactions/assets/');
-		define( 'TXN_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'transactions/assets/');
+	public function __construct($routing = TRUE) {
+		parent::__construct($routing);
+		define('TXN_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND.'transactions/templates/');
+		define('TXN_CAF_ASSETS', EE_CORE_CAF_ADMIN_EXTEND.'transactions/assets/');
+		define('TXN_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL.'transactions/assets/');
 	}
 
 
@@ -51,7 +51,7 @@ 
 	 * @return void
 	 */
 	protected function _extend_page_config() {
-		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'transactions';
+		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND.'transactions';
 
 		$new_page_routes = array(
 			'reports' => array(
@@ -60,7 +60,7 @@ 
 			)
 		);
 
-		$this->_page_routes = array_merge( $this->_page_routes, $new_page_routes );
+		$this->_page_routes = array_merge($this->_page_routes, $new_page_routes);
 
 		$new_page_config = array(
 			'reports' => array(
@@ -74,11 +74,11 @@ 
 						'filename' => 'transactions_reports'
 					)
 				),
-				'help_tour' => array( 'Transaction_Reports_Help_Tour' ),
+				'help_tour' => array('Transaction_Reports_Help_Tour'),
 				'require_nonce' => FALSE
 			)
 		);
-		$this->_page_config = array_merge( $this->_page_config, $new_page_config );
+		$this->_page_config = array_merge($this->_page_config, $new_page_config);
 	}
 
 
@@ -94,8 +94,8 @@ 
 		wp_enqueue_style('jquery-jqplot-css');
 		//scripts
 		global $is_IE;
-		if ( $is_IE ) {
-			wp_enqueue_script( 'excanvas' );
+		if ($is_IE) {
+			wp_enqueue_script('excanvas');
 		}
 		wp_enqueue_script('jqplot-all');
 	}
@@ -113,13 +113,13 @@ 
 
 		$page_args = array();
 
-		$page_args['admin_reports'][] = $this->_revenue_per_day_report( '-1 month' );  //  option: '-1 week', '-2 weeks' defaults to '-1 month'
-		$page_args['admin_reports'][] = $this->_revenue_per_event_report( '-1 month' ); //  option: '-1 week', '-2 weeks' defaults to '-1 month'
+		$page_args['admin_reports'][] = $this->_revenue_per_day_report('-1 month'); //  option: '-1 week', '-2 weeks' defaults to '-1 month'
+		$page_args['admin_reports'][] = $this->_revenue_per_event_report('-1 month'); //  option: '-1 week', '-2 weeks' defaults to '-1 month'
 //		$page_args['admin_reports'][] = 'chart1';
 
-		$template_path = EE_ADMIN_TEMPLATE . 'admin_reports.template.php';
+		$template_path = EE_ADMIN_TEMPLATE.'admin_reports.template.php';
 		$this->_admin_page_title = __('Transactions', 'event_espresso');
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, $page_args, TRUE );
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, $page_args, TRUE);
 
 
 		// the final template wrapper
@@ -137,37 +137,37 @@ 
 	 * @param string $period
 	 * @return int
 	 */
-	private function _revenue_per_day_report( $period = '-1 month' ) {
+	private function _revenue_per_day_report($period = '-1 month') {
 
 		$report_ID = 'txn-admin-revenue-per-day-report-dv';
 		$report_JS = 'espresso_txn_admin_revenue_per_day';
 
-		wp_enqueue_script( $report_JS, TXN_CAF_ASSETS_URL . $report_JS . '_report.js', array('jqplot-all'), '1.0', TRUE);
+		wp_enqueue_script($report_JS, TXN_CAF_ASSETS_URL.$report_JS.'_report.js', array('jqplot-all'), '1.0', TRUE);
 
 		$TXN = EEM_Transaction::instance();
 
-		$results = $TXN->get_revenue_per_day_report( $period );
+		$results = $TXN->get_revenue_per_day_report($period);
 		//EEH_Debug_Tools::printr( $results, '$registrations_per_day' );
 		$revenue = array();
-		$xmin = date( 'Y-m-d', strtotime( '+1 year' ));
+		$xmin = date('Y-m-d', strtotime('+1 year'));
 		$xmax = 0;
 		$ymax = 0;
 
 		$results = (array) $results;
 
-		foreach ( $results as $result ) {
-			$revenue[] = array( $result->txnDate, (float)$result->revenue );
-			$xmin = strtotime( $result->txnDate ) < strtotime( $xmin ) ? $result->txnDate : $xmin;
-			$xmax = strtotime( $result->txnDate ) > strtotime( $xmax ) ? $result->txnDate : $xmax;
+		foreach ($results as $result) {
+			$revenue[] = array($result->txnDate, (float) $result->revenue);
+			$xmin = strtotime($result->txnDate) < strtotime($xmin) ? $result->txnDate : $xmin;
+			$xmax = strtotime($result->txnDate) > strtotime($xmax) ? $result->txnDate : $xmax;
 			$ymax = $result->revenue > $ymax ? $result->revenue : $ymax;
 		}
 
-		$xmin = date( 'Y-m-d', strtotime( date( 'Y-m-d', strtotime($xmin)) . ' -1 day' ));
-		$xmax = date( 'Y-m-d', strtotime( date( 'Y-m-d', strtotime($xmax)) . ' +1 day' ));
+		$xmin = date('Y-m-d', strtotime(date('Y-m-d', strtotime($xmin)).' -1 day'));
+		$xmax = date('Y-m-d', strtotime(date('Y-m-d', strtotime($xmax)).' +1 day'));
 		// calculate # days between our min and max dates
-		$span = floor( (strtotime($xmax) - strtotime($xmin)) / (60*60*24)) + 1;
+		$span = floor((strtotime($xmax) - strtotime($xmin)) / (60 * 60 * 24)) + 1;
 
-		$report_title = __( 'Total Revenue per Day' );
+		$report_title = __('Total Revenue per Day');
 
 		$report_params = array(
 			'title' 		=> $report_title,
@@ -178,9 +178,9 @@ 
 			'ymax' 		=> ceil($ymax * 1.25),
 			'span' 		=> $span,
 			'width'		=> ceil(900 / $span),
-			'noTxnMsg'	=> sprintf( __('<h2>%s</h2><p>There are currently no transaction records in the last month for this report.</p>', 'event_espresso'), $report_title )
+			'noTxnMsg'	=> sprintf(__('<h2>%s</h2><p>There are currently no transaction records in the last month for this report.</p>', 'event_espresso'), $report_title)
 		);
-		wp_localize_script( $report_JS, 'txnRevPerDay', $report_params );
+		wp_localize_script($report_JS, 'txnRevPerDay', $report_params);
 
 		return $report_ID;
 	}
@@ -195,29 +195,29 @@ 
 	 * @param string $period
 	 * @return int
 	 */
-	private function _revenue_per_event_report( $period = '-1 month' ) {
+	private function _revenue_per_event_report($period = '-1 month') {
 
 		$report_ID = 'txn-admin-revenue-per-event-report-dv';
 		$report_JS = 'espresso_txn_admin_revenue_per_event';
 
-		wp_enqueue_script( $report_JS, TXN_CAF_ASSETS_URL . $report_JS . '_report.js', array('jqplot-all'), '1.0', TRUE);
+		wp_enqueue_script($report_JS, TXN_CAF_ASSETS_URL.$report_JS.'_report.js', array('jqplot-all'), '1.0', TRUE);
 
 		$TXN = EEM_Transaction::instance();
 
-		$results = $TXN->get_revenue_per_event_report( $period );
+		$results = $TXN->get_revenue_per_event_report($period);
 
 		//EEH_Debug_Tools::printr( $results, '$registrations_per_event' );
 		$revenue = array();
 		$results = (array) $results;
-		foreach ( $results as $result ) {
-			$event_name = stripslashes( html_entity_decode( $result->event_name, ENT_QUOTES, 'UTF-8' ));
-			$event_name = wp_trim_words( $event_name, 5, '...' );
-			$revenue[] = array( $event_name, (float)$result->revenue );
+		foreach ($results as $result) {
+			$event_name = stripslashes(html_entity_decode($result->event_name, ENT_QUOTES, 'UTF-8'));
+			$event_name = wp_trim_words($event_name, 5, '...');
+			$revenue[] = array($event_name, (float) $result->revenue);
 		}
 
 		$span = $period == 'week' ? 9 : 33;
 
-		$report_title = __( 'Total Revenue per Event' );
+		$report_title = __('Total Revenue per Event');
 
 		$report_params = array(
 			'title' 		=> $report_title,
@@ -225,9 +225,9 @@ 
 			'revenue'	=> $revenue,
 			'span' 		=> $span,
 			'width'		=> ceil(900 / $span),
-			'noTxnMsg'	=> sprintf( __('<h2>%s</h2><p>There are currently no transaction records in the last month for this report.</p>', 'event_espresso'), $report_title )
+			'noTxnMsg'	=> sprintf(__('<h2>%s</h2><p>There are currently no transaction records in the last month for this report.</p>', 'event_espresso'), $report_title)
 		);
-		wp_localize_script( $report_JS, 'revenuePerEvent', $report_params );
+		wp_localize_script($report_JS, 'revenuePerEvent', $report_params);
 
 		return $report_ID;
 	}

Braces +2 added lines, -1 removed lines

@@ -6,8 +6,9 @@
  * @package Event Espresso
  * @subpackage messages
  */
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  *

caffeinated/brewing_regular.php

Doc Comments +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
 	/**
 	 * callback for the FHEE__EE_Registry__load_helper__helper_paths filter to add the caffeinated paths
 	 * @param array  $paths original helper paths array
-	 * @return array             new array of paths
+	 * @return string[]             new array of paths
 	 */
 	public function caf_helper_paths( $paths ) {
 		$paths[] = EE_CAF_CORE . 'helpers' . DS;

Spacing +59 added lines, -59 removed lines

@@ -25,30 +25,30 @@ 
  * ------------------------------------------------------------------------
  */
 // defined some new constants related to caffeinated folder
-define('EE_CAF_URL', EE_PLUGIN_DIR_URL . 'caffeinated/' );
-define('EE_CAF_CORE', EE_CAFF_PATH . 'core' . DS);
-define('EE_CAF_LIBRARIES', EE_CAF_CORE . 'libraries' . DS);
-define('EE_CAF_PAYMENT_METHODS', EE_CAFF_PATH . 'payment_methods' . DS );
+define('EE_CAF_URL', EE_PLUGIN_DIR_URL.'caffeinated/');
+define('EE_CAF_CORE', EE_CAFF_PATH.'core'.DS);
+define('EE_CAF_LIBRARIES', EE_CAF_CORE.'libraries'.DS);
+define('EE_CAF_PAYMENT_METHODS', EE_CAFF_PATH.'payment_methods'.DS);
 class EE_Brewing_Regular extends EE_Base {
 
 	public function __construct() {
-		if ( defined( 'EE_CAFF_PATH' )) {
+		if (defined('EE_CAFF_PATH')) {
 			// activation
-			add_action( 'AHEE__EEH_Activation__initialize_db_content', array( $this, 'initialize_caf_db_content' ));
+			add_action('AHEE__EEH_Activation__initialize_db_content', array($this, 'initialize_caf_db_content'));
 			// load caff init
-			add_action( 'AHEE__EE_System__set_hooks_for_core', array( $this, 'caffeinated_init' ));
+			add_action('AHEE__EE_System__set_hooks_for_core', array($this, 'caffeinated_init'));
 			// make it so the PDF receipt doesn't show our shameless plug
-			add_filter( 'FHEE_Invoice__send_invoice__shameless_plug', '__return_false' );
+			add_filter('FHEE_Invoice__send_invoice__shameless_plug', '__return_false');
 			// add caffeinated modules
-			add_filter( 'FHEE__EE_Config__register_modules__modules_to_register', array( $this, 'caffeinated_modules_to_register' ));
+			add_filter('FHEE__EE_Config__register_modules__modules_to_register', array($this, 'caffeinated_modules_to_register'));
 			// load caff scripts
-			add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_caffeinated_scripts'), 10 );
+			add_action('wp_enqueue_scripts', array($this, 'enqueue_caffeinated_scripts'), 10);
 
-			add_filter( 'FHEE__EE_Registry__load_helper__helper_paths', array( $this, 'caf_helper_paths' ), 10 );
+			add_filter('FHEE__EE_Registry__load_helper__helper_paths', array($this, 'caf_helper_paths'), 10);
 
-			add_filter( 'FHEE__EE_Payment_Method_Manager__register_payment_methods__payment_methods_to_register', array( $this, 'caf_payment_methods' ) );
+			add_filter('FHEE__EE_Payment_Method_Manager__register_payment_methods__payment_methods_to_register', array($this, 'caf_payment_methods'));
 			// caffeinated constructed
-			do_action( 'AHEE__EE_Brewing_Regular__construct__complete' );
+			do_action('AHEE__EE_Brewing_Regular__construct__complete');
 		}
 	}
 
@@ -58,8 +58,8 @@ 
 	 * @param array  $paths original helper paths array
 	 * @return array             new array of paths
 	 */
-	public function caf_helper_paths( $paths ) {
-		$paths[] = EE_CAF_CORE . 'helpers' . DS;
+	public function caf_helper_paths($paths) {
+		$paths[] = EE_CAF_CORE.'helpers'.DS;
 		return $paths;
 	}
 
@@ -75,22 +75,22 @@ 
 	 * Right now, we ASSUME the only price types in the system are default ones
 	 * @global type $wpdb
 	 */
-	function initialize_caf_db_content(){
+	function initialize_caf_db_content() {
 //		echo "initialize caf db content!";
 		global $wpdb;
 
 		//use same method of getting creator id as the version introducing the change
-		$default_creator_id = apply_filters('FHEE__EE_DMS_Core_4_5_0__get_default_creator_id',get_current_user_id());
+		$default_creator_id = apply_filters('FHEE__EE_DMS_Core_4_5_0__get_default_creator_id', get_current_user_id());
 
 		$price_type_table = $wpdb->prefix."esp_price_type";
 		$price_table = $wpdb->prefix."esp_price";
 
 		if ($wpdb->get_var("SHOW TABLES LIKE '$price_type_table'") == $price_type_table) {
 
-			$SQL = 'SELECT COUNT(PRT_ID) FROM ' . $price_type_table . ' WHERE PBT_ID=4';//include trashed price types
-			$tax_price_type_count = $wpdb->get_var( $SQL );
+			$SQL = 'SELECT COUNT(PRT_ID) FROM '.$price_type_table.' WHERE PBT_ID=4'; //include trashed price types
+			$tax_price_type_count = $wpdb->get_var($SQL);
 
-			if ( $tax_price_type_count <= 1) {
+			if ($tax_price_type_count <= 1) {
 				$result = $wpdb->insert($price_type_table,
 						array(
 							'PRT_name'=>  __("Regional Tax", "event_espresso"),
@@ -101,11 +101,11 @@ 
 							'PRT_wp_user' => $default_creator_id
 						),
 						array(
-							'%s',//PRT_name
-							'%d',//PBT_id
-							'%d',//PRT_is_percent
-							'%d',//PRT_order
-							'%d',//PRT_deleted
+							'%s', //PRT_name
+							'%d', //PBT_id
+							'%d', //PRT_is_percent
+							'%d', //PRT_order
+							'%d', //PRT_deleted
 							'%d', //PRT_wp_user
 						));
 				//federal tax
@@ -119,14 +119,14 @@ 
 							'PRT_wp_user' => $default_creator_id,
 						),
 						array(
-							'%s',//PRT_name
-							'%d',//PBT_id
-							'%d',//PRT_is_percent
-							'%d',//PRT_order
-							'%d',//PRT_deleted
+							'%s', //PRT_name
+							'%d', //PBT_id
+							'%d', //PRT_is_percent
+							'%d', //PRT_order
+							'%d', //PRT_deleted
 							'%d' //PRT_wp_user
 						));
-				if( $result){
+				if ($result) {
 					$wpdb->insert($price_table,
 							array(
 								'PRT_ID'=>$wpdb->insert_id,
@@ -141,15 +141,15 @@ 
 								'PRC_wp_user' => $default_creator_id
 							),
 							array(
-								'%d',//PRT_id
-								'%f',//PRC_amount
-								'%s',//PRC_name
-								'%s',//PRC_desc
-								'%d',//PRC_is_default
-								'%d',//PRC_overrides
-								'%d',//PRC_deleted
-								'%d',//PRC_order
-								'%d',//PRC_parent
+								'%d', //PRT_id
+								'%f', //PRC_amount
+								'%s', //PRC_name
+								'%s', //PRC_desc
+								'%d', //PRC_is_default
+								'%d', //PRC_overrides
+								'%d', //PRC_deleted
+								'%d', //PRC_order
+								'%d', //PRC_parent
 								'%d' //PRC_wp_user
 							));
 				}
@@ -169,11 +169,11 @@ 
 	 *  	@param array $modules_to_register
 	 *  	@return array
 	 */
-	public function caffeinated_modules_to_register( $modules_to_register = array() ){
-		if ( is_readable( EE_CAFF_PATH . 'modules' )) {
-			$caffeinated_modules_to_register = glob( EE_CAFF_PATH . 'modules' . DS . '*', GLOB_ONLYDIR );
-			if ( is_array( $caffeinated_modules_to_register ) && ! empty( $caffeinated_modules_to_register )) {
-				$modules_to_register = array_merge( $modules_to_register, $caffeinated_modules_to_register );
+	public function caffeinated_modules_to_register($modules_to_register = array()) {
+		if (is_readable(EE_CAFF_PATH.'modules')) {
+			$caffeinated_modules_to_register = glob(EE_CAFF_PATH.'modules'.DS.'*', GLOB_ONLYDIR);
+			if (is_array($caffeinated_modules_to_register) && ! empty($caffeinated_modules_to_register)) {
+				$modules_to_register = array_merge($modules_to_register, $caffeinated_modules_to_register);
 			}
 		}
 		return $modules_to_register;
@@ -181,19 +181,19 @@ 
 
 
 
-	public function caffeinated_init(){
+	public function caffeinated_init() {
 		// EE_Register_CPTs hooks
-		add_filter('FHEE__EE_Register_CPTs__get_taxonomies__taxonomies', array( $this, 'filter_taxonomies' ), 10 );
-		add_filter('FHEE__EE_Register_CPTs__get_CPTs__cpts', array( $this, 'filter_cpts' ), 10 );
-		add_filter('FHEE__EE_Admin__get_extra_nav_menu_pages_items', array( $this, 'nav_metabox_items' ), 10 );
-		EE_Registry::instance()->load_file( EE_CAFF_PATH, 'EE_Caf_Messages', 'class', array(), FALSE );
+		add_filter('FHEE__EE_Register_CPTs__get_taxonomies__taxonomies', array($this, 'filter_taxonomies'), 10);
+		add_filter('FHEE__EE_Register_CPTs__get_CPTs__cpts', array($this, 'filter_cpts'), 10);
+		add_filter('FHEE__EE_Admin__get_extra_nav_menu_pages_items', array($this, 'nav_metabox_items'), 10);
+		EE_Registry::instance()->load_file(EE_CAFF_PATH, 'EE_Caf_Messages', 'class', array(), FALSE);
 		// caffeinated_init__complete hook
-		do_action( 'AHEE__EE_Brewing_Regular__caffeinated_init__complete' );
+		do_action('AHEE__EE_Brewing_Regular__caffeinated_init__complete');
 	}
 
 
 
-	public function enqueue_caffeinated_scripts(){
+	public function enqueue_caffeinated_scripts() {
 		// sound of crickets...
 	}
 
@@ -202,23 +202,23 @@ 
 	 * callbacks below here
 	 */
 
-	public function filter_taxonomies( $taxonomy_array ) {
+	public function filter_taxonomies($taxonomy_array) {
 		$taxonomy_array['espresso_venue_categories']['args']['show_in_nav_menus'] = TRUE;
 		return $taxonomy_array;
 	}
 
 
 
-	public function filter_cpts( $cpt_array ) {
+	public function filter_cpts($cpt_array) {
 		$cpt_array['espresso_venues']['args']['show_in_nav_menus'] = TRUE;
 		return $cpt_array;
 	}
 
 
-	public function nav_metabox_items( $menuitems ) {
+	public function nav_metabox_items($menuitems) {
 		$menuitems[] = array(
 			'title' => __('Venue List', 'event_espresso'),
-			'url' => get_post_type_archive_link( 'espresso_venues' ),
+			'url' => get_post_type_archive_link('espresso_venues'),
 			'description' => __('Archive page for all venues.', 'event_espresso')
 			);
 		return $menuitems;
@@ -229,9 +229,9 @@ 
 	 * @param array $payment_method_paths
 	 * @return array values are folder paths to payment method folders
 	 */
-	public function caf_payment_methods( $payment_method_paths ) {
-		$caf_payment_methods_paths = glob( EE_CAF_PAYMENT_METHODS . '*', GLOB_ONLYDIR );
-		$payment_method_paths = array_merge( $payment_method_paths, $caf_payment_methods_paths );
+	public function caf_payment_methods($payment_method_paths) {
+		$caf_payment_methods_paths = glob(EE_CAF_PAYMENT_METHODS.'*', GLOB_ONLYDIR);
+		$payment_method_paths = array_merge($payment_method_paths, $caf_payment_methods_paths);
 		return $payment_method_paths;
 	}
 }

Braces +3 added lines, -1 removed lines

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

Indentation +23 added lines, -23 removed lines

@@ -1,29 +1,29 @@
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
 /**
- * the purpose of this file is to simply contain any action/filter hook callbacks etc for specific aspects of EE related to caffeinated (regular) use.  Before putting any code in here, First be certain that it isn't better to define and use the hook in a specific caffeinated/whatever class or file.
- */
+	 * the purpose of this file is to simply contain any action/filter hook callbacks etc for specific aspects of EE related to caffeinated (regular) use.  Before putting any code in here, First be certain that it isn't better to define and use the hook in a specific caffeinated/whatever class or file.
+	 */
 /**
- * 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
- *
- * ------------------------------------------------------------------------
- *
- * EE_Brewing_Regular class.  Just a wrapper to help namespace activity for the functionality of this file.
- *
- * @package		Event Espresso
- * @subpackage	/caffeinated/brewing_regular.php
- * @author		Darren Ethier
- *
- * ------------------------------------------------------------------------
- */
+	 * 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
+	 *
+	 * ------------------------------------------------------------------------
+	 *
+	 * EE_Brewing_Regular class.  Just a wrapper to help namespace activity for the functionality of this file.
+	 *
+	 * @package		Event Espresso
+	 * @subpackage	/caffeinated/brewing_regular.php
+	 * @author		Darren Ethier
+	 *
+	 * ------------------------------------------------------------------------
+	 */
 // defined some new constants related to caffeinated folder
 define('EE_CAF_URL', EE_PLUGIN_DIR_URL . 'caffeinated/' );
 define('EE_CAF_CORE', EE_CAFF_PATH . 'core' . DS);

caffeinated/EE_Caf_Messages.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
 	/**
 	 * This just allows us to add additional paths to the autoloader (EED_Messages::autoload_messages()) for the messages system.
 	 * @param  array  $dir_ref original array of paths
-	 * @return array           appended paths
+	 * @return string[]           appended paths
 	 */
 	public function messages_autoload_paths( $dir_ref ) {
 		$dir_ref[] = EE_CAF_LIBRARIES . 'shortcodes/';

Spacing +142 added lines, -142 removed lines

@@ -15,7 +15,7 @@ 
  * @since            4.3.2
  * @author          Darren Ethier
  */
-class EE_Caf_Messages  {
+class EE_Caf_Messages {
 
 
 	/**
@@ -34,36 +34,36 @@ 
 	 * @return void
 	 */
 	private function _caf_hooks() {
-		add_filter('FHEE__EED_Messages___set_messages_paths___MSG_PATHS', array( $this, 'messages_autoload_paths'), 5 );
-		add_filter('FHEE__EE_Email_messenger__get_validator_config', array( $this, 'email_messenger_validator_config'), 5, 2 );
-		add_filter('FHEE__EE_Email_messenger__get_template_fields', array( $this, 'email_messenger_template_fields'), 5, 2 );
-		add_filter( 'FHEE__EE_Html_messenger__get_template_fields', array( $this, 'html_messenger_template_fields' ), 5, 2 );
-		add_filter( 'FHEE__EE_Html_messenger__get_validator_config', array( $this, 'html_messenger_validator_config' ), 5, 2 );
-		add_filter( 'FHEE__EE_Pdf_messenger__get_template_fields', array( $this, 'pdf_messenger_template_fields' ), 5, 2 );
-		add_filter( 'FHEE__EE_Pdf_messenger__get_validator_config', array( $this, 'pdf_messenger_validator_config' ), 5, 2 );
-		add_filter('FHEE__EE_Messages_Template_Pack__get_specific_template__contents', array( $this, 'new_default_templates'), 5, 7 );
-		add_filter('FHEE__EE_Messages_Base__get_valid_shortcodes', array( $this, 'message_types_valid_shortcodes'), 5, 2 );
+		add_filter('FHEE__EED_Messages___set_messages_paths___MSG_PATHS', array($this, 'messages_autoload_paths'), 5);
+		add_filter('FHEE__EE_Email_messenger__get_validator_config', array($this, 'email_messenger_validator_config'), 5, 2);
+		add_filter('FHEE__EE_Email_messenger__get_template_fields', array($this, 'email_messenger_template_fields'), 5, 2);
+		add_filter('FHEE__EE_Html_messenger__get_template_fields', array($this, 'html_messenger_template_fields'), 5, 2);
+		add_filter('FHEE__EE_Html_messenger__get_validator_config', array($this, 'html_messenger_validator_config'), 5, 2);
+		add_filter('FHEE__EE_Pdf_messenger__get_template_fields', array($this, 'pdf_messenger_template_fields'), 5, 2);
+		add_filter('FHEE__EE_Pdf_messenger__get_validator_config', array($this, 'pdf_messenger_validator_config'), 5, 2);
+		add_filter('FHEE__EE_Messages_Template_Pack__get_specific_template__contents', array($this, 'new_default_templates'), 5, 7);
+		add_filter('FHEE__EE_Messages_Base__get_valid_shortcodes', array($this, 'message_types_valid_shortcodes'), 5, 2);
 
 		//shortcode parsers
-		add_filter('FHEE__EE_Attendee_Shortcodes__shortcodes', array( $this, 'additional_attendee_shortcodes'), 5, 2 );
-		add_filter('FHEE__EE_Attendee_Shortcodes__parser_after', array( $this, 'additional_attendee_parser'), 5, 5 );
-		add_filter('FHEE__EE_Recipient_List_Shortcodes__shortcodes', array( $this, 'additional_recipient_details_shortcodes'), 5, 2 );
-		add_filter('FHEE__EE_Recipient_List_Shortcodes__parser_after', array( $this, 'additional_recipient_details_parser'), 5, 5 );
-		add_filter('FHEE__EE_Primary_Registration_List_Shortcodes__shortcodes', array( $this, 'additional_primary_registration_details_shortcodes'), 5, 2 );
-		add_filter('FHEE__EE_Primary_Registration_List_Shortcodes__parser_after', array( $this, 'additional_primary_registration_details_parser'), 5, 5 );
+		add_filter('FHEE__EE_Attendee_Shortcodes__shortcodes', array($this, 'additional_attendee_shortcodes'), 5, 2);
+		add_filter('FHEE__EE_Attendee_Shortcodes__parser_after', array($this, 'additional_attendee_parser'), 5, 5);
+		add_filter('FHEE__EE_Recipient_List_Shortcodes__shortcodes', array($this, 'additional_recipient_details_shortcodes'), 5, 2);
+		add_filter('FHEE__EE_Recipient_List_Shortcodes__parser_after', array($this, 'additional_recipient_details_parser'), 5, 5);
+		add_filter('FHEE__EE_Primary_Registration_List_Shortcodes__shortcodes', array($this, 'additional_primary_registration_details_shortcodes'), 5, 2);
+		add_filter('FHEE__EE_Primary_Registration_List_Shortcodes__parser_after', array($this, 'additional_primary_registration_details_parser'), 5, 5);
 
 		/**
 		 * @since 4.2.0
 		 */
-		add_filter( 'FHEE__EE_Datetime_Shortcodes__shortcodes', array( $this, 'additional_datetime_shortcodes'), 10, 2 );
-		add_filter( 'FHEE__EE_Datetime_Shortcodes__parser_after', array( $this, 'additional_datetime_parser'), 10, 5 );
+		add_filter('FHEE__EE_Datetime_Shortcodes__shortcodes', array($this, 'additional_datetime_shortcodes'), 10, 2);
+		add_filter('FHEE__EE_Datetime_Shortcodes__parser_after', array($this, 'additional_datetime_parser'), 10, 5);
 
 		/**
 		 * @since 4.3.0
 		 */
 		//eat our own dog food!
-		add_action('EE_Brewing_Regular___messages_caf', array( $this, 'register_caf_message_types' ) );
-		add_action('EE_Brewing_Regular___messages_caf', array( $this, 'register_caf_shortcodes' ) );
+		add_action('EE_Brewing_Regular___messages_caf', array($this, 'register_caf_message_types'));
+		add_action('EE_Brewing_Regular___messages_caf', array($this, 'register_caf_shortcodes'));
 		do_action('EE_Brewing_Regular___messages_caf');
 	}
 
@@ -74,14 +74,14 @@ 
 	 * @param  array  $dir_ref original array of paths
 	 * @return array           appended paths
 	 */
-	public function messages_autoload_paths( $dir_ref ) {
-		$dir_ref[] = EE_CAF_LIBRARIES . 'shortcodes/';
+	public function messages_autoload_paths($dir_ref) {
+		$dir_ref[] = EE_CAF_LIBRARIES.'shortcodes/';
 		return $dir_ref;
 	}
 
 
 
-	public function email_messenger_validator_config( $validator_config, EE_Email_messenger $messenger ) {
+	public function email_messenger_validator_config($validator_config, EE_Email_messenger $messenger) {
 		$validator_config['attendee_list'] = array(
 				'shortcodes' => array('attendee', 'event_list', 'ticket_list', 'question_list'),
 				'required' => array('[ATTENDEE_LIST]')
@@ -95,7 +95,7 @@ 
 
 
 
-	public function html_messenger_validator_config( $validator_config, EE_Html_messenger $messenger ) {
+	public function html_messenger_validator_config($validator_config, EE_Html_messenger $messenger) {
 		$validator_config['attendee_list'] = array(
 			'shortcodes' => array('attendee', 'question_list'),
 			'required' => array('[ATTENDEE_LIST]')
@@ -109,7 +109,7 @@ 
 
 
 
-	public function pdf_messenger_validator_config( $validator_config, EE_Pdf_messenger $messenger ) {
+	public function pdf_messenger_validator_config($validator_config, EE_Pdf_messenger $messenger) {
 		$validator_config['attendee_list'] = array(
 			'shortcodes' => array('attendee', 'event_list', 'ticket_list', 'question_list'),
 			'required' => array('[ATTENDEE_LIST]')
@@ -124,7 +124,7 @@ 
 
 
 
-	public function email_messenger_template_fields( $template_fields, EE_Email_messenger $messenger ) {
+	public function email_messenger_template_fields($template_fields, EE_Email_messenger $messenger) {
 		$template_fields['extra']['content']['question_list'] = array(
 						'input' => 'textarea',
 						'label' => '[QUESTION_LIST]',
@@ -140,7 +140,7 @@ 
 	}
 
 
-	public function html_messenger_template_fields( $template_fields, EE_Html_messenger $messenger ) {
+	public function html_messenger_template_fields($template_fields, EE_Html_messenger $messenger) {
 		$template_fields['extra']['content']['question_list'] = array(
 			'input' => 'textarea',
 			'label' => '[QUESTION_LIST]',
@@ -157,7 +157,7 @@ 
 
 
 
-	public function pdf_messenger_template_fields( $template_fields, EE_Pdf_messenger $messenger ) {
+	public function pdf_messenger_template_fields($template_fields, EE_Pdf_messenger $messenger) {
 		$template_fields['extra']['content']['question_list'] = array(
 			'input' => 'textarea',
 			'label' => '[QUESTION_LIST]',
@@ -174,39 +174,39 @@ 
 
 
 
-	public function new_default_templates( $contents, $actual_path, EE_messenger $messenger, EE_message_type $message_type, $field, $context, EE_Messages_Template_Pack $template_pack  ) {
+	public function new_default_templates($contents, $actual_path, EE_messenger $messenger, EE_message_type $message_type, $field, $context, EE_Messages_Template_Pack $template_pack) {
 
 		//we're only modifying templates for the default template pack
-		if ( ! $template_pack instanceof EE_Messages_Template_Pack_Default ) {
+		if ( ! $template_pack instanceof EE_Messages_Template_Pack_Default) {
 			return $contents;
 		}
 
 		//the template file name we're replacing contents for.
-		$template_file_prefix = $field . '_' . $context;
-		$msg_prefix = $messenger->name . '_' . $message_type->name . '_' ;
+		$template_file_prefix = $field.'_'.$context;
+		$msg_prefix = $messenger->name.'_'.$message_type->name.'_';
 
-		$base_path = EE_CAF_LIBRARIES . 'messages/defaults/default/';
+		$base_path = EE_CAF_LIBRARIES.'messages/defaults/default/';
 
-		if ( $messenger->name == 'email' && $message_type->name == 'registration' ) {
+		if ($messenger->name == 'email' && $message_type->name == 'registration') {
 
-			switch ( $template_file_prefix ) {
+			switch ($template_file_prefix) {
 
 				case 'question_list_admin' :
 				case 'question_list_attendee' :
 				case 'question_list_primary_attendee' :
-					$path = $base_path . $msg_prefix . 'question_list.template.php';
-					$contents = EEH_Template::display_template( $path, array(), true );
+					$path = $base_path.$msg_prefix.'question_list.template.php';
+					$contents = EEH_Template::display_template($path, array(), true);
 					break;
 
 				case 'attendee_list_primary_attendee' :
-					$path = $base_path . $msg_prefix . 'attendee_list.template.php';
-					$contents = EEH_Template::display_template( $path, array(), true );
+					$path = $base_path.$msg_prefix.'attendee_list.template.php';
+					$contents = EEH_Template::display_template($path, array(), true);
 					break;
 
 				case 'attendee_list_admin' :
-					$path = $base_path . $msg_prefix . 'attendee_list_admin.template.php';
-					$contents = EEH_Template::display_template( $path,
-						array(), true );
+					$path = $base_path.$msg_prefix.'attendee_list_admin.template.php';
+					$contents = EEH_Template::display_template($path,
+						array(), true);
 					break;
 
 				case 'attendee_list_attendee' :
@@ -214,33 +214,33 @@ 
 					break;
 
 				case 'event_list_attendee' :
-					$path = $base_path . $msg_prefix . 'event_list_attendee.template.php';
-					$contents = EEH_Template::display_template( $path, array(), true );
+					$path = $base_path.$msg_prefix.'event_list_attendee.template.php';
+					$contents = EEH_Template::display_template($path, array(), true);
 					break;
 			}
-		} elseif ( $messenger->name == 'email' && $message_type->name == 'newsletter' ) {
-			switch( $template_file_prefix ) {
+		} elseif ($messenger->name == 'email' && $message_type->name == 'newsletter') {
+			switch ($template_file_prefix) {
 
 				case 'content_attendee' :
-					$path = $base_path . $msg_prefix . 'content.template.php';
-					$contents = EEH_Template::display_template( $path, array(), true );
+					$path = $base_path.$msg_prefix.'content.template.php';
+					$contents = EEH_Template::display_template($path, array(), true);
 					break;
 
 				case 'newsletter_content_attendee' :
-					$path = $base_path . $msg_prefix . 'newsletter_content.template.php';
-					$contents = EEH_Template::display_template( $path, array(), true );
+					$path = $base_path.$msg_prefix.'newsletter_content.template.php';
+					$contents = EEH_Template::display_template($path, array(), true);
 					break;
 
 				case 'newsletter_subject_attendee' :
-					$path = $base_path . $msg_prefix . 'subject.template.php';
-					$contents = EEH_Template::display_template( $path, array(), true );
+					$path = $base_path.$msg_prefix.'subject.template.php';
+					$contents = EEH_Template::display_template($path, array(), true);
 					break;
 			}
-		} elseif ( $messenger->name == 'html' && $message_type->name == 'receipt' ) {
-			switch  ( $template_file_prefix ) {
+		} elseif ($messenger->name == 'html' && $message_type->name == 'receipt') {
+			switch ($template_file_prefix) {
 				case 'attendee_list_purchaser' :
-					$path = $base_path . $msg_prefix . 'attendee_list.template.php';
-					$contents = EEH_Template::display_template( $path, array(), true );
+					$path = $base_path.$msg_prefix.'attendee_list.template.php';
+					$contents = EEH_Template::display_template($path, array(), true);
 					break;
 			}
 		}
@@ -251,7 +251,7 @@ 
 
 
 
-	public function message_types_valid_shortcodes( $valid_shortcodes, EE_Messages_Base $msg ) {
+	public function message_types_valid_shortcodes($valid_shortcodes, EE_Messages_Base $msg) {
 		//make sure question_list and question are ONLY added for the core message types.  Any other message types will have to explicitly set question_list as a valid shortcode.
 		$include_with = array(
 			'registration',
@@ -268,9 +268,9 @@ 
 			'invoice',
 			'receipt'
 			);
-		if ( $msg instanceof EE_message_type && in_array( $msg->name, $include_with )) {
+		if ($msg instanceof EE_message_type && in_array($msg->name, $include_with)) {
 			$contexts = array_keys($msg->get_contexts());
-				foreach ( $contexts as $context ) {
+				foreach ($contexts as $context) {
 					$valid_shortcodes[$context][] = 'question_list';
 					$valid_shortcodes[$context][] = 'question';
 				}
@@ -282,35 +282,35 @@ 
 
 
 
-	public function additional_attendee_shortcodes( $shortcodes, $shortcode_parser ) {
+	public function additional_attendee_shortcodes($shortcodes, $shortcode_parser) {
 		$shortcodes['[ANSWER_*]'] = __('This is a special dynamic shortcode. Right after the "*", add the exact text of a existing question, and if there is an answer for that question for this registrant, that will take the place of this shortcode.', 'event_espresso');
 		return $shortcodes;
 	}
 
 
 
-	public function additional_attendee_parser( $parsed, $shortcode, $data, $extra_data, $shortcode_parser ) {
+	public function additional_attendee_parser($parsed, $shortcode, $data, $extra_data, $shortcode_parser) {
 
-		if ( strpos( $shortcode, '[ANSWER_*' ) === FALSE || !isset( $extra_data['data']->questions) || !isset( $extra_data['data']->registrations) )
+		if (strpos($shortcode, '[ANSWER_*') === FALSE || ! isset($extra_data['data']->questions) || ! isset($extra_data['data']->registrations))
 			return $parsed;
 
 		//let's get the question from the code.
 		$shortcode = str_replace('[ANSWER_*', '', $shortcode);
-		$shortcode = trim( str_replace(']', '', $shortcode) );
+		$shortcode = trim(str_replace(']', '', $shortcode));
 
 		$registration = $data instanceof EE_Registration ? $data : null;
-		$registration = ! $registration instanceof EE_Registration && is_array( $extra_data ) && isset( $extra_data['data'] ) && $extra_data['data'] instanceof EE_Registration ? $extra_data['data'] : $registration;
+		$registration = ! $registration instanceof EE_Registration && is_array($extra_data) && isset($extra_data['data']) && $extra_data['data'] instanceof EE_Registration ? $extra_data['data'] : $registration;
 
 		$aee = $data instanceof EE_Messages_Addressee ? $data : null;
-		$aee = ! $aee instanceof EE_Messages_Addressee && is_array( $extra_data ) && isset( $extra_data['data'] ) ? $extra_data['data'] : $aee;
+		$aee = ! $aee instanceof EE_Messages_Addressee && is_array($extra_data) && isset($extra_data['data']) ? $extra_data['data'] : $aee;
 
-		if ( ! $registration instanceof EE_Registration || ! $aee instanceof EE_Messages_Addressee ) {
+		if ( ! $registration instanceof EE_Registration || ! $aee instanceof EE_Messages_Addressee) {
 			return $parsed;
 		}
 
 		//now let's figure out which question has this text.
-		foreach ( $aee->questions as $ansid => $question ) {
-			if ( $question instanceof EE_Question && $question->display_text() == $shortcode && isset($aee->registrations[$registration->ID()]['ans_objs'][$ansid]) ) {
+		foreach ($aee->questions as $ansid => $question) {
+			if ($question instanceof EE_Question && $question->display_text() == $shortcode && isset($aee->registrations[$registration->ID()]['ans_objs'][$ansid])) {
 				return $aee->registrations[$registration->ID()]['ans_objs'][$ansid]->get_pretty('ANS_value', 'no_wpautop');
 			}
 		}
@@ -332,7 +332,7 @@ 
 	 * @return array                   						array of shortcodes and
 	 *                                             			descriptions
 	 */
-	public function additional_datetime_shortcodes( $shortcodes, $shortcode_parser ) {
+	public function additional_datetime_shortcodes($shortcodes, $shortcode_parser) {
 		$shortcodes['[DTT_NAME]'] = __('This will be parsed to the Title given for a Datetime', 'event_espresso');
 		$shortcodes['[DTT_DESCRIPTION]'] = __('This will be parsed to the description for a Datetime', 'event_espresso');
 		$shortcodes['[DTT_NAME_OR_DATES]'] = __('When parsed, if the Datetime has a name, it is used, otherwise a formatted string including the start date and end date will be used.', 'event_espresso');
@@ -354,13 +354,13 @@ 
 	 * @param  EE_Datetime_Shortcodes $shortcode_parser
 	 * @return string                   The new parsed string.
 	 */
-	public function additional_datetime_parser( $parsed, $shortcode, $data, $extra_data, $shortcode_parser ) {
+	public function additional_datetime_parser($parsed, $shortcode, $data, $extra_data, $shortcode_parser) {
 
-		if ( ! $data instanceof EE_Datetime ) {
+		if ( ! $data instanceof EE_Datetime) {
 			return ''; //get out because we can only parse with the datetime object.
 		}
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 			case '[DTT_NAME]' :
 				return $data->name();
 				break;
@@ -368,7 +368,7 @@ 
 				return $data->description();
 				break;
 			case '[DTT_NAME_OR_DATES]' :
-				return $data->get_dtt_display_name( TRUE );
+				return $data->get_dtt_display_name(TRUE);
 				break;
 			default :
 				return $parsed;
@@ -380,40 +380,40 @@ 
 
 
 
-	public function additional_recipient_details_shortcodes( $shortcodes, $shortcode_parser ) {
+	public function additional_recipient_details_shortcodes($shortcodes, $shortcode_parser) {
 		$shortcodes['[RECIPIENT_QUESTION_LIST]'] = __('This is used to indicate where you want the list of questions and answers to show for the person receiving the message.', 'event_espresso');
 		return $shortcodes;
 	}
 
 
-	public function additional_recipient_details_parser( $parsed, $shortcode, $data, $extra_data, $shortcode_parser ) {
+	public function additional_recipient_details_parser($parsed, $shortcode, $data, $extra_data, $shortcode_parser) {
 
-		if ( array($data) && ! isset( $data['data'] ) )
+		if (array($data) && ! isset($data['data']))
 			return $parsed;
 
 		$recipient = $data['data'] instanceof EE_Messages_Addressee ? $data['data'] : NULL;
-		$recipient = ! $recipient instanceof EE_Messages_Addressee && array($extra_data) && isset( $extra_data['data'] ) && $extra_data['data'] instanceof EE_Messages_Addressee ? $extra_data['data'] : $recipient;
+		$recipient = ! $recipient instanceof EE_Messages_Addressee && array($extra_data) && isset($extra_data['data']) && $extra_data['data'] instanceof EE_Messages_Addressee ? $extra_data['data'] : $recipient;
 
-		if ( ! $recipient instanceof EE_Messages_Addressee )
+		if ( ! $recipient instanceof EE_Messages_Addressee)
 			return $parsed;
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 			case '[RECIPIENT_QUESTION_LIST]' :
 				$att = $recipient->att_obj;
 				$registrations_on_attendee = $att instanceof EE_Attendee ? $recipient->attendees[$att->ID()]['reg_objs'] : array();
-				$registrations_on_attendee = empty( $registrations_on_attendee ) && $recipient->reg_obj instanceof EE_Registration ? array( $recipient->reg_obj ) : $registrations_on_attendee;
+				$registrations_on_attendee = empty($registrations_on_attendee) && $recipient->reg_obj instanceof EE_Registration ? array($recipient->reg_obj) : $registrations_on_attendee;
 				$answers = array();
 
-				$template = is_array($data['template'] ) && isset($data['template']['question_list']) ? $data['template']['question_list'] : $extra_data['template']['question_list'];
+				$template = is_array($data['template']) && isset($data['template']['question_list']) ? $data['template']['question_list'] : $extra_data['template']['question_list'];
 				$valid_shortcodes = array('question');
 
 				//if the context is main_content then get all answers for all registrations on this attendee
-				if ( $data['data'] instanceof EE_Messages_Addressee ) {
-					foreach ( $registrations_on_attendee as $reg ) {
-						if ( $reg instanceof EE_Registration ) {
-							$anss = !empty($recipient->registrations[$reg->ID()]['ans_objs']) ? $recipient->registrations[$reg->ID()]['ans_objs'] : array();
-							foreach( $anss as $ans ) {
-								if ( $ans instanceof EE_Answer ) {
+				if ($data['data'] instanceof EE_Messages_Addressee) {
+					foreach ($registrations_on_attendee as $reg) {
+						if ($reg instanceof EE_Registration) {
+							$anss = ! empty($recipient->registrations[$reg->ID()]['ans_objs']) ? $recipient->registrations[$reg->ID()]['ans_objs'] : array();
+							foreach ($anss as $ans) {
+								if ($ans instanceof EE_Answer) {
 									$answers[$ans->ID()] = $ans;
 								}
 							}
@@ -422,13 +422,13 @@ 
 				}
 
 				//if the context is the event list parser, then let's return just the answers for all registrations attached to the recipient for that event.
-				if ( $data['data'] instanceof EE_Event ) {
+				if ($data['data'] instanceof EE_Event) {
 					$event = $data['data'];
-					foreach( $registrations_on_attendee as $reg ) {
-						if ( $reg instanceof EE_Registration && $reg->event_ID() == $event->ID() ) {
-							$anss = !empty($recipient->registrations[$reg->ID()]['ans_objs']) ? $recipient->registrations[$reg->ID()]['ans_objs'] : array();
-							foreach( $anss as $ans ) {
-								if ( $ans instanceof EE_Answer ) {
+					foreach ($registrations_on_attendee as $reg) {
+						if ($reg instanceof EE_Registration && $reg->event_ID() == $event->ID()) {
+							$anss = ! empty($recipient->registrations[$reg->ID()]['ans_objs']) ? $recipient->registrations[$reg->ID()]['ans_objs'] : array();
+							foreach ($anss as $ans) {
+								if ($ans instanceof EE_Answer) {
 									$answers[$ans->ID()] = $ans;
 								}
 							}
@@ -438,13 +438,13 @@ 
 
 				$question_list = '';
 				$shortcode_helper = $shortcode_parser->get_shortcode_helper();
-				foreach ( $answers as $answer ) {
-					if ( $answer instanceof EE_Answer ) {
+				foreach ($answers as $answer) {
+					if ($answer instanceof EE_Answer) {
 						$question = $answer->question();
-						if ( ! $question instanceof EE_Question || ( $question instanceof EE_Question && $question->admin_only() ) ) {
+						if ( ! $question instanceof EE_Question || ($question instanceof EE_Question && $question->admin_only())) {
 							continue;
 						}
-						$question_list .= $shortcode_helper->parse_question_list_template( $template, $answer, $valid_shortcodes, $extra_data);
+						$question_list .= $shortcode_helper->parse_question_list_template($template, $answer, $valid_shortcodes, $extra_data);
 					}
 				}
 				return $question_list;
@@ -457,41 +457,41 @@ 
 	}
 
 
-	public function additional_primary_registration_details_shortcodes( $shortcodes, $shortcode_parser ) {
+	public function additional_primary_registration_details_shortcodes($shortcodes, $shortcode_parser) {
 		$shortcodes['[PRIMARY_REGISTRANT_QUESTION_LIST]'] = __('This is used to indicate the questions and answers for the primary_registrant. It should be placed in the "[attendee_list]" field', 'event_espresso');
 		return $shortcodes;
 	}
 
 
-	public function additional_primary_registration_details_parser( $parsed, $shortcode, $data, $extra_data, $shortcode_parser ) {
-		if ( array($data) && ! isset( $data['data'] ) )
+	public function additional_primary_registration_details_parser($parsed, $shortcode, $data, $extra_data, $shortcode_parser) {
+		if (array($data) && ! isset($data['data']))
 			return $parsed;
 
 		$recipient = $data['data'] instanceof EE_Messages_Addressee ? $data['data'] : NULL;
-		$recipient = ! $recipient instanceof EE_Messages_Addressee && array($extra_data) && isset( $extra_data['data'] ) && $extra_data['data'] instanceof EE_Messages_Addressee ? $extra_data['data'] : $recipient;
+		$recipient = ! $recipient instanceof EE_Messages_Addressee && array($extra_data) && isset($extra_data['data']) && $extra_data['data'] instanceof EE_Messages_Addressee ? $extra_data['data'] : $recipient;
 
-		if ( ! $recipient instanceof EE_Messages_Addressee )
+		if ( ! $recipient instanceof EE_Messages_Addressee)
 			return $parsed;
 
 		$send_data = ! $data['data'] instanceof EE_Messages_Addressee ? $extra_data : $data;
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 			case '[RECIPIENT_QUESTION_LIST]' :
-				if ( ! $recipient->primary_att_obj instanceof EE_Attendee || ! $recipient->primary_reg_obj instanceof EE_Registration )
+				if ( ! $recipient->primary_att_obj instanceof EE_Attendee || ! $recipient->primary_reg_obj instanceof EE_Registration)
 					return '';
 				$registration = $recipient->primary_reg_obj;
-				$template = is_array($data['template'] ) && isset($data['template']['question_list']) ? $data['template']['question_list'] : $extra_data['template']['question_list'];
+				$template = is_array($data['template']) && isset($data['template']['question_list']) ? $data['template']['question_list'] : $extra_data['template']['question_list'];
 				$valid_shortcodes = array('question');
 				$shortcode_helper = $shortcode_parser->get_shortcode_helper();
 				$answers = $recipient->registrations[$registration->ID()]['ans_objs'];
 				$question_list = '';
-				foreach ( $answers as $answer ) {
-					if ( $answer instanceof EE_Answer ) {
+				foreach ($answers as $answer) {
+					if ($answer instanceof EE_Answer) {
 						$question = $answer->question();
-						if ( $question instanceof EE_Question and $question->admin_only() ) {
+						if ($question instanceof EE_Question and $question->admin_only()) {
 							continue;
 						}
-						$question_list .= $shortcode_helper->parse_question_list_template( $template, $answer, $valid_shortcodes, $send_data);
+						$question_list .= $shortcode_helper->parse_question_list_template($template, $answer, $valid_shortcodes, $send_data);
 					}
 				}
 				return $question_list;
@@ -517,67 +517,67 @@ 
 		$setup_args = array(
 			'mtfilename' => 'EE_Newsletter_message_type.class.php',
 			'autoloadpaths' => array(
-				EE_CAF_LIBRARIES . 'messages/message_type/newsletter/'
+				EE_CAF_LIBRARIES.'messages/message_type/newsletter/'
 				),
-			'messengers_to_activate_with' => array( 'email' ),
-			'messengers_to_validate_with' => array( 'email' )
+			'messengers_to_activate_with' => array('email'),
+			'messengers_to_validate_with' => array('email')
 			);
-		EE_Register_Message_Type::register( 'newsletter', $setup_args );
+		EE_Register_Message_Type::register('newsletter', $setup_args);
 
 		//register payment reminder message type
 		$setup_args = array(
 			'mtfilename' => 'EE_Payment_Reminder_message_type.class.php',
-			'autoloadpaths' => array( EE_CAF_LIBRARIES . 'messages/message_type/payment_reminder/' ),
-			'messengers_to_activate_with' => array( 'email' ),
-			'messengers_to_validate_with' => array( 'email' )
+			'autoloadpaths' => array(EE_CAF_LIBRARIES.'messages/message_type/payment_reminder/'),
+			'messengers_to_activate_with' => array('email'),
+			'messengers_to_validate_with' => array('email')
 			);
-		EE_Register_Message_Type::register( 'payment_reminder', $setup_args );
+		EE_Register_Message_Type::register('payment_reminder', $setup_args);
 
 		//register payment declined message type
 		$setup_args = array(
 			'mtfilename' => 'EE_Payment_Declined_message_type.class.php',
-			'autoloadpaths' => array( EE_CAF_LIBRARIES . 'messages/message_type/payment_declined/' ),
-			'messengers_to_activate_with' => array( 'email' ),
-			'messengers_to_validate_with' => array( 'email' )
+			'autoloadpaths' => array(EE_CAF_LIBRARIES.'messages/message_type/payment_declined/'),
+			'messengers_to_activate_with' => array('email'),
+			'messengers_to_validate_with' => array('email')
 			);
-		EE_Register_Message_Type::register( 'payment_declined', $setup_args );
+		EE_Register_Message_Type::register('payment_declined', $setup_args);
 
 		//register registration declined message type
 		$setup_args = array(
 			'mtfilename' => 'EE_Declined_Registration_message_type.class.php',
-			'autoloadpaths' => array( EE_CAF_LIBRARIES . 'messages/message_type/declined_registration/' ),
-			'messengers_to_activate_with' => array( 'email' ),
-			'messengers_to_validate_with' => array( 'email' )
+			'autoloadpaths' => array(EE_CAF_LIBRARIES.'messages/message_type/declined_registration/'),
+			'messengers_to_activate_with' => array('email'),
+			'messengers_to_validate_with' => array('email')
 			);
-		EE_Register_Message_Type::register( 'declined_registration', $setup_args );
+		EE_Register_Message_Type::register('declined_registration', $setup_args);
 
 		//register registration cancelled message type
 		$setup_args = array(
 			'mtfilename' => 'EE_Cancelled_Registration_message_type.class.php',
-			'autoloadpaths' => array( EE_CAF_LIBRARIES . 'messages/message_type/cancelled_registration/' ),
-			'messengers_to_activate_with' => array( 'email' ),
-			'messengers_to_validate_with' => array( 'email' )
+			'autoloadpaths' => array(EE_CAF_LIBRARIES.'messages/message_type/cancelled_registration/'),
+			'messengers_to_activate_with' => array('email'),
+			'messengers_to_validate_with' => array('email')
 			);
-		EE_Register_Message_Type::register( 'cancelled_registration', $setup_args );
+		EE_Register_Message_Type::register('cancelled_registration', $setup_args);
 
 
 		//register payment failed message type
 		$setup_args = array(
 			'mtfilename' => 'EE_Payment_Failed_message_type.class.php',
-			'autoloadpaths' => array( EE_CAF_LIBRARIES . 'messages/message_type/payment_failed/' ),
-			'messengers_to_activate_with' => array( 'email' ),
-			'messengers_to_validate_with' => array( 'email' )
+			'autoloadpaths' => array(EE_CAF_LIBRARIES.'messages/message_type/payment_failed/'),
+			'messengers_to_activate_with' => array('email'),
+			'messengers_to_validate_with' => array('email')
 			);
-		EE_Register_Message_Type::register( 'payment_failed', $setup_args );
+		EE_Register_Message_Type::register('payment_failed', $setup_args);
 
 		//register payment declined message type
 		$setup_args = array(
 			'mtfilename' => 'EE_Payment_Cancelled_message_type.class.php',
-			'autoloadpaths' => array( EE_CAF_LIBRARIES . 'messages/message_type/payment_cancelled/' ),
-			'messengers_to_activate_with' => array( 'email' ),
-			'messengers_to_validate_with' => array( 'email' )
+			'autoloadpaths' => array(EE_CAF_LIBRARIES.'messages/message_type/payment_cancelled/'),
+			'messengers_to_activate_with' => array('email'),
+			'messengers_to_validate_with' => array('email')
 			);
-		EE_Register_Message_Type::register( 'payment_cancelled', $setup_args );
+		EE_Register_Message_Type::register('payment_cancelled', $setup_args);
 	}
 
 
@@ -593,12 +593,12 @@ 
 	public function register_caf_shortcodes() {
 		$setup_args = array(
 			'autoloadpaths' => array(
-				EE_CAF_LIBRARIES . 'shortcodes/'
+				EE_CAF_LIBRARIES.'shortcodes/'
 				),
-			'msgr_validator_callback' => array( 'EE_Newsletter_Shortcodes', 'messenger_validator_config' ),
-			'msgr_template_fields_callback' => array( 'EE_Newsletter_Shortcodes', 'messenger_template_fields' ),
-			'list_type_shortcodes' => array( '[NEWSLETTER_CONTENT]' )
+			'msgr_validator_callback' => array('EE_Newsletter_Shortcodes', 'messenger_validator_config'),
+			'msgr_template_fields_callback' => array('EE_Newsletter_Shortcodes', 'messenger_template_fields'),
+			'list_type_shortcodes' => array('[NEWSLETTER_CONTENT]')
 			);
-		EE_Register_Messages_Shortcode_Library::register( 'newsletter', $setup_args );
+		EE_Register_Messages_Shortcode_Library::register('newsletter', $setup_args);
 	}
 }

Braces +21 added lines, -13 removed lines

@@ -5,7 +5,9 @@ 
  * @subpackage plugin api, messages
  * @since           4.3.2
  */
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 
 /**
  * Used to initialize all EE messages caffeinated functionality.
@@ -291,8 +293,9 @@ 
 
 	public function additional_attendee_parser( $parsed, $shortcode, $data, $extra_data, $shortcode_parser ) {
 
-		if ( strpos( $shortcode, '[ANSWER_*' ) === FALSE || !isset( $extra_data['data']->questions) || !isset( $extra_data['data']->registrations) )
-			return $parsed;
+		if ( strpos( $shortcode, '[ANSWER_*' ) === FALSE || !isset( $extra_data['data']->questions) || !isset( $extra_data['data']->registrations) ) {
+					return $parsed;
+		}
 
 		//let's get the question from the code.
 		$shortcode = str_replace('[ANSWER_*', '', $shortcode);
@@ -388,14 +391,16 @@ 
 
 	public function additional_recipient_details_parser( $parsed, $shortcode, $data, $extra_data, $shortcode_parser ) {
 
-		if ( array($data) && ! isset( $data['data'] ) )
-			return $parsed;
+		if ( array($data) && ! isset( $data['data'] ) ) {
+					return $parsed;
+		}
 
 		$recipient = $data['data'] instanceof EE_Messages_Addressee ? $data['data'] : NULL;
 		$recipient = ! $recipient instanceof EE_Messages_Addressee && array($extra_data) && isset( $extra_data['data'] ) && $extra_data['data'] instanceof EE_Messages_Addressee ? $extra_data['data'] : $recipient;
 
-		if ( ! $recipient instanceof EE_Messages_Addressee )
-			return $parsed;
+		if ( ! $recipient instanceof EE_Messages_Addressee ) {
+					return $parsed;
+		}
 
 		switch ( $shortcode ) {
 			case '[RECIPIENT_QUESTION_LIST]' :
@@ -464,21 +469,24 @@ 
 
 
 	public function additional_primary_registration_details_parser( $parsed, $shortcode, $data, $extra_data, $shortcode_parser ) {
-		if ( array($data) && ! isset( $data['data'] ) )
-			return $parsed;
+		if ( array($data) && ! isset( $data['data'] ) ) {
+					return $parsed;
+		}
 
 		$recipient = $data['data'] instanceof EE_Messages_Addressee ? $data['data'] : NULL;
 		$recipient = ! $recipient instanceof EE_Messages_Addressee && array($extra_data) && isset( $extra_data['data'] ) && $extra_data['data'] instanceof EE_Messages_Addressee ? $extra_data['data'] : $recipient;
 
-		if ( ! $recipient instanceof EE_Messages_Addressee )
-			return $parsed;
+		if ( ! $recipient instanceof EE_Messages_Addressee ) {
+					return $parsed;
+		}
 
 		$send_data = ! $data['data'] instanceof EE_Messages_Addressee ? $extra_data : $data;
 
 		switch ( $shortcode ) {
 			case '[RECIPIENT_QUESTION_LIST]' :
-				if ( ! $recipient->primary_att_obj instanceof EE_Attendee || ! $recipient->primary_reg_obj instanceof EE_Registration )
-					return '';
+				if ( ! $recipient->primary_att_obj instanceof EE_Attendee || ! $recipient->primary_reg_obj instanceof EE_Registration ) {
+									return '';
+				}
 				$registration = $recipient->primary_reg_obj;
 				$template = is_array($data['template'] ) && isset($data['template']['question_list']) ? $data['template']['question_list'] : $extra_data['template']['question_list'];
 				$valid_shortcodes = array('question');