eventespresso / event-espresso-core

admin_pages/support/Support_Admin_Page.core.php

Spacing +19 added lines, -19 removed lines

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

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

Braces +1 added lines, -1 removed lines

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

Spacing +249 added lines, -250 removed lines

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

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

Spacing +30 added lines, -30 removed lines

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

admin_pages/transactions/Transactions_Admin_Page.core.php

Indentation +79 added lines, -79 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
- *
- * ------------------------------------------------------------------------
- *
- * EE_Admin_Transactions class
- *
- * @package			Event Espresso
- * @subpackage	includes/core/admin/transactions/Transactions_Admin_Page.core.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
+	 *
+	 * ------------------------------------------------------------------------
+	 *
+	 * EE_Admin_Transactions class
+	 *
+	 * @package			Event Espresso
+	 * @subpackage	includes/core/admin/transactions/Transactions_Admin_Page.core.php
+	 * @author				Brent Christensen
+	 *
+	 * ------------------------------------------------------------------------
+	 */
 class Transactions_Admin_Page extends EE_Admin_Page {
 
 	/**
@@ -106,9 +106,9 @@ 
 
 	/**
 	 * 		grab url requests and route them
-	*		@access private
-	*		@return void
-	*/
+	 *		@access private
+	 *		@return void
+	 */
 	public function _set_page_routes() {
 
 		$this->_set_transaction_status_array();
@@ -247,10 +247,10 @@ 
 	/**
 	 * _set_transaction_status_array
 	 * sets list of transaction statuses
-	*
+	 *
 	 * @access private
-	*	@return void
-	*/
+	 *	@return void
+	 */
 	private function _set_transaction_status_array() {
 		self::$_txn_status = EEM_Transaction::instance()->status_array(TRUE);
 	}
@@ -272,10 +272,10 @@ 
 
 	/**
 	 * 	get list of payment statuses
-	*
+	 *
 	 * @access private
-	*	@return void
-	*/
+	 *	@return void
+	 */
 	private function _get_payment_status_array() {
 		self::$_pay_status = EEM_Payment::instance()->status_array(TRUE);
 		$this->_template_args['payment_status'] = self::$_pay_status;
@@ -383,18 +383,18 @@ 
 		if ( is_object( $this->_transaction) )
 			return; //get out we've already set the object
 
-	    $TXN = EEM_Transaction::instance();
+		$TXN = EEM_Transaction::instance();
 
-	    $TXN_ID = ( ! empty( $this->_req_data['TXN_ID'] )) ? absint( $this->_req_data['TXN_ID'] ) : FALSE;
+		$TXN_ID = ( ! empty( $this->_req_data['TXN_ID'] )) ? absint( $this->_req_data['TXN_ID'] ) : FALSE;
 
-	    //get transaction object
-	    $this->_transaction = $TXN->get_one_by_ID($TXN_ID);
-	    $this->_session = !empty( $this->_transaction ) ? $this->_transaction->get('TXN_session_data') : NULL;
+		//get transaction object
+		$this->_transaction = $TXN->get_one_by_ID($TXN_ID);
+		$this->_session = !empty( $this->_transaction ) ? $this->_transaction->get('TXN_session_data') : NULL;
 
 	 	if ( empty( $this->_transaction ) ) {
-	    	$error_msg = __('An error occurred and the details for Transaction ID #', 'event_espresso') . $TXN_ID .  __(' could not be retrieved.', 'event_espresso');
+			$error_msg = __('An error occurred and the details for Transaction ID #', 'event_espresso') . $TXN_ID .  __(' could not be retrieved.', 'event_espresso');
 			EE_Error::add_error( $error_msg, __FILE__, __FUNCTION__, __LINE__ );
-	    }
+		}
 	}
 
 
@@ -496,12 +496,12 @@ 
 
 
 	/**
-	* 	_transaction_details
+	 * 	_transaction_details
 	 * generates HTML for the View Transaction Details Admin page
-	*
+	 *
 	 * @access protected
-	*	@return void
-	*/
+	 *	@return void
+	 */
 	protected function _transaction_details() {
 		do_action( 'AHEE__Transactions_Admin_Page__transaction_details__start', $this->_transaction );
 		EE_Registry::instance()->load_helper( 'MSG_Template' );
@@ -624,10 +624,10 @@ 
 	/**
 	 * txn_details_meta_box
 	 * generates HTML for the Transaction main meta box
-	*
+	 *
 	 * @access public
-	*	@return void
-	*/
+	 *	@return void
+	 */
 	public function txn_details_meta_box() {
 
 		$this->_set_transaction_object();
@@ -968,10 +968,10 @@ 
 	/**
 	 * txn_billing_info_side_meta_box
 	 * 	generates HTML for the Edit Transaction side meta box
-	*
+	 *
 	 * @access public
-	*	@return void
-	*/
+	 *	@return void
+	 */
 	public function txn_billing_info_side_meta_box() {
 
 		$this->_template_args['billing_form'] = $this->_transaction->billing_info();
@@ -989,10 +989,10 @@ 
 	/**
 	 * apply_payments_or_refunds
 	 * 	registers a payment or refund made towards a transaction
-	*
+	 *
 	 * @access public
-	*	@return void
-	*/
+	 *	@return void
+	 */
 	public function apply_payments_or_refunds() {
 		$json_response_data = array( 'return_data' => FALSE );
 		$valid_data = $this->_validate_payment_request_data();
@@ -1140,9 +1140,9 @@ 
 							'default' => '',
 							'required' => false,
 							'html_label_text' => __( 'Transaction or Cheque Number', 'event_espresso' ),
-                                                        'validation_strategies' => array(
-                                                            new EE_Max_Length_Validation_Strategy( __('Input too long', 'event_espresso'), 100 ),
-                                                        )
+														'validation_strategies' => array(
+															new EE_Max_Length_Validation_Strategy( __('Input too long', 'event_espresso'), 100 ),
+														)
 						)
 					),
 					'po_number' => new EE_Text_Input(
@@ -1150,9 +1150,9 @@ 
 							'default' => '',
 							'required' => false,
 							'html_label_text' => __( 'Purchase Order Number', 'event_espresso' ),
-                                                        'validation_strategies' => array(
-                                                            new EE_Max_Length_Validation_Strategy( __('Input too long', 'event_espresso'), 100 ),
-                                                        )
+														'validation_strategies' => array(
+															new EE_Max_Length_Validation_Strategy( __('Input too long', 'event_espresso'), 100 ),
+														)
 						)
 					),
 					'accounting' => new EE_Text_Input(
@@ -1160,9 +1160,9 @@ 
 							'default' => '',
 							'required' => false,
 							'html_label_text' => __( 'Extra Field for Accounting', 'event_espresso' ),
-                                                        'validation_strategies' => array(
-                                                            new EE_Max_Length_Validation_Strategy( __('Input too long', 'event_espresso'), 100 ),
-                                                        )
+														'validation_strategies' => array(
+															new EE_Max_Length_Validation_Strategy( __('Input too long', 'event_espresso'), 100 ),
+														)
 						)
 					),
 				)
@@ -1454,10 +1454,10 @@ 
 	/**
 	 * delete_payment
 	 * 	delete a payment or refund made towards a transaction
-	*
+	 *
 	 * @access public
-	*	@return void
-	*/
+	 *	@return void
+	 */
 	public function delete_payment() {
 		$json_response_data = array( 'return_data' => FALSE );
 		$PAY_ID = isset( $this->_req_data['delete_txn_admin_payment'], $this->_req_data['delete_txn_admin_payment']['PAY_ID'] ) ? absint( $this->_req_data['delete_txn_admin_payment']['PAY_ID'] ) : 0;
@@ -1572,12 +1572,12 @@ 
 	/**
 	 * _send_payment_reminder
 	 * 	generates HTML for the View Transaction Details Admin page
-	*
+	 *
 	 * @access protected
-	*	@return void
-	*/
+	 *	@return void
+	 */
 	protected function _send_payment_reminder() {
-	    $TXN_ID = ( ! empty( $this->_req_data['TXN_ID'] )) ? absint( $this->_req_data['TXN_ID'] ) : FALSE;
+		$TXN_ID = ( ! empty( $this->_req_data['TXN_ID'] )) ? absint( $this->_req_data['TXN_ID'] ) : FALSE;
 		$transaction = EEM_Transaction::instance()->get_one_by_ID( $TXN_ID );
 		$query_args = isset($this->_req_data['redirect_to'] ) ? array('action' => $this->_req_data['redirect_to'], 'TXN_ID' => $this->_req_data['TXN_ID'] ) : array();
 		do_action( 'AHEE__Transactions_Admin_Page___send_payment_reminder__process_admin_payment_reminder', $transaction );
@@ -1599,29 +1599,29 @@ 
 
 		$TXN = EEM_Transaction::instance();
 
-	    $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' );
 
-	    //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';
+		//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';
 
 
-	    //convert to timestamps
-	    $start_date = strtotime( $start_date );
-	    $end_date = strtotime( $end_date );
+		//convert to timestamps
+		$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 );
+		//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 );
 
-	    //convert to correct format for query
+		//convert to correct format for query
 	$start_date = EEM_Transaction::instance()->convert_datetime_for_query( 'TXN_timestamp', date( 'Y-m-d H:i:s', $start_date ), 'Y-m-d H:i:s' );
 	$end_date = EEM_Transaction::instance()->convert_datetime_for_query( 'TXN_timestamp', date( 'Y-m-d H:i:s', $end_date ), 'Y-m-d H:i:s' );
 
 
 
-	    //set orderby
+		//set orderby
 		$this->_req_data['orderby'] = ! empty($this->_req_data['orderby']) ? $this->_req_data['orderby'] : '';
 
 		switch ( $this->_req_data['orderby'] ) {

Doc Comments +2 added lines, -1 removed lines

@@ -1455,7 +1455,7 @@ 
 	 * @param  EE_Transaction $transaction
 	 * @param \EE_Payment $payment
 	 * @param array $REG_IDs
-	 * @return bool
+	 * @return boolean|null
 	 */
 	protected function _update_registration_payments( EE_Transaction $transaction, EE_Payment $payment, $REG_IDs = array() ) {
 		// we can pass our own custom set of registrations to EE_Payment_Processor::process_registration_payments()
@@ -1647,6 +1647,7 @@ 
 	 *
 	 * @access protected
 	 * @param \EE_Payment | null $payment
+	 * @param EE_Payment $payment
 	 */
 	protected function _maybe_send_notifications( $payment = null ) {
 		switch ( $payment instanceof EE_Payment ) {

Spacing +396 added lines, -396 removed lines

@@ -56,8 +56,8 @@ 
 	 * @param bool $routing
 	 * @return Transactions_Admin_Page
 	 */
-	public function __construct( $routing = TRUE ) {
-		parent::__construct( $routing );
+	public function __construct($routing = TRUE) {
+		parent::__construct($routing);
 	}
 
 
@@ -80,9 +80,9 @@ 
 	 * @return void
 	 */
 	protected function _ajax_hooks() {
-		add_action('wp_ajax_espresso_apply_payment', array( $this, 'apply_payments_or_refunds'));
-		add_action('wp_ajax_espresso_apply_refund', array( $this, 'apply_payments_or_refunds'));
-		add_action('wp_ajax_espresso_delete_payment', array( $this, 'delete_payment'));
+		add_action('wp_ajax_espresso_apply_payment', array($this, 'apply_payments_or_refunds'));
+		add_action('wp_ajax_espresso_apply_refund', array($this, 'apply_payments_or_refunds'));
+		add_action('wp_ajax_espresso_delete_payment', array($this, 'delete_payment'));
 	}
 
 
@@ -97,7 +97,7 @@ 
 			'buttons' => array(
 				'add' => __('Add New Transaction', 'event_espresso'),
 				'edit' => __('Edit Transaction', 'event_espresso'),
-				'delete' => __('Delete Transaction','event_espresso')
+				'delete' => __('Delete Transaction', 'event_espresso')
 				)
 			);
 	}
@@ -113,7 +113,7 @@ 
 
 		$this->_set_transaction_status_array();
 
-		$txn_id = ! empty( $this->_req_data['TXN_ID'] ) && ! is_array( $this->_req_data['TXN_ID'] ) ? $this->_req_data['TXN_ID'] : 0;
+		$txn_id = ! empty($this->_req_data['TXN_ID']) && ! is_array($this->_req_data['TXN_ID']) ? $this->_req_data['TXN_ID'] : 0;
 
 		$this->_page_routes = array(
 
@@ -185,7 +185,7 @@ 
 						'filename' => 'transactions_overview_views_filters_search'
 					),
 				),
-				'help_tour' => array( 'Transactions_Overview_Help_Tour' ),
+				'help_tour' => array('Transactions_Overview_Help_Tour'),
 				/**
 				 * commented out because currently we are not displaying tips for transaction list table status but this
 				 * may change in a later iteration so want to keep the code for then.
@@ -197,7 +197,7 @@ 
 				'nav' => array(
 					'label' => __('View Transaction', 'event_espresso'),
 					'order' => 5,
-					'url' => isset($this->_req_data['TXN_ID']) ? add_query_arg(array('TXN_ID' => $this->_req_data['TXN_ID'] ), $this->_current_page_view_url )  : $this->_admin_base_url,
+					'url' => isset($this->_req_data['TXN_ID']) ? add_query_arg(array('TXN_ID' => $this->_req_data['TXN_ID']), $this->_current_page_view_url) : $this->_admin_base_url,
 					'persistent' => FALSE
 					),
 				'help_tabs' => array(
@@ -218,8 +218,8 @@ 
 						'filename' => 'transactions_view_transaction_primary_registrant_billing_information'
 					),
 				),
-				'qtips' => array( 'Transaction_Details_Tips' ),
-				'help_tour' => array( 'Transaction_Details_Help_Tour' ),
+				'qtips' => array('Transaction_Details_Tips'),
+				'help_tour' => array('Transaction_Details_Help_Tour'),
 				'metaboxes' => array('_transaction_details_metaboxes'),
 
 				'require_nonce' => FALSE
@@ -234,10 +234,10 @@ 
 	protected function _add_screen_options() {}
 	protected function _add_feature_pointers() {}
 	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[ 'txn_status_array' ] = self::$_txn_status;
-		EE_Registry::$i18n_js_strings[ 'pay_status_array' ] = self::$_pay_status;
+		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['txn_status_array'] = self::$_txn_status;
+		EE_Registry::$i18n_js_strings['pay_status_array'] = self::$_pay_status;
 	}
 	public function admin_notices() {}
 	public function admin_footer_scripts() {}
@@ -304,14 +304,14 @@ 
 	 */
 	public function load_scripts_styles() {
 		//enqueue style
-		wp_register_style( 'espresso_txn', TXN_ASSETS_URL . 'espresso_transactions_admin.css', array(), EVENT_ESPRESSO_VERSION );
+		wp_register_style('espresso_txn', TXN_ASSETS_URL.'espresso_transactions_admin.css', array(), EVENT_ESPRESSO_VERSION);
 		wp_enqueue_style('espresso_txn');
 
 		//scripts
 		add_filter('FHEE_load_accounting_js', '__return_true');
 
 		//scripts
-		wp_register_script('espresso_txn', TXN_ASSETS_URL . 'espresso_transactions_admin.js', array('ee_admin_js', 'ee-datepicker', 'jquery-ui-datepicker', 'jquery-ui-draggable', 'ee-dialog', 'ee-accounting', 'ee-serialize-full-array'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_register_script('espresso_txn', TXN_ASSETS_URL.'espresso_transactions_admin.js', array('ee_admin_js', 'ee-datepicker', 'jquery-ui-datepicker', 'jquery-ui-draggable', 'ee-dialog', 'ee-accounting', 'ee-serialize-full-array'), EVENT_ESPRESSO_VERSION, TRUE);
 		wp_enqueue_script('espresso_txn');
 
 	}
@@ -351,8 +351,8 @@ 
 	 *	@return void
 	 */
 	protected function _set_list_table_views_default() {
-		$this->_views = array (
-			'all' => array (
+		$this->_views = array(
+			'all' => array(
 				'slug' 		=> 'all',
 				'label' 		=> __('View All Transactions', 'event_espresso'),
 				'count' 	=> 0
@@ -380,20 +380,20 @@ 
 	 *	@return void
 	 */
 	private function _set_transaction_object() {
-		if ( is_object( $this->_transaction) )
+		if (is_object($this->_transaction))
 			return; //get out we've already set the object
 
 	    $TXN = EEM_Transaction::instance();
 
-	    $TXN_ID = ( ! empty( $this->_req_data['TXN_ID'] )) ? absint( $this->_req_data['TXN_ID'] ) : FALSE;
+	    $TXN_ID = ( ! empty($this->_req_data['TXN_ID'])) ? absint($this->_req_data['TXN_ID']) : FALSE;
 
 	    //get transaction object
 	    $this->_transaction = $TXN->get_one_by_ID($TXN_ID);
-	    $this->_session = !empty( $this->_transaction ) ? $this->_transaction->get('TXN_session_data') : NULL;
+	    $this->_session = ! empty($this->_transaction) ? $this->_transaction->get('TXN_session_data') : NULL;
 
-	 	if ( empty( $this->_transaction ) ) {
-	    	$error_msg = __('An error occurred and the details for Transaction ID #', 'event_espresso') . $TXN_ID .  __(' could not be retrieved.', 'event_espresso');
-			EE_Error::add_error( $error_msg, __FILE__, __FUNCTION__, __LINE__ );
+	 	if (empty($this->_transaction)) {
+	    	$error_msg = __('An error occurred and the details for Transaction ID #', 'event_espresso').$TXN_ID.__(' could not be retrieved.', 'event_espresso');
+			EE_Error::add_error($error_msg, __FILE__, __FUNCTION__, __LINE__);
 	    }
 	}
 
@@ -419,7 +419,7 @@ 
 				),
 				'view_receipt' => array(
 					'class' => 'dashicons dashicons-media-default',
-					'desc' => __('View Transaction Receipt', 'event_espresso' )
+					'desc' => __('View Transaction Receipt', 'event_espresso')
 				),
 				'view_registration' => array(
 					'class' => 'dashicons dashicons-clipboard',
@@ -428,10 +428,10 @@ 
 			)
 		);
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'espresso_transactions_send_payment_reminder' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'espresso_transactions_send_payment_reminder')) {
 
-			EE_Registry::instance()->load_helper( 'MSG_Template' );
-			if ( EEH_MSG_Template::is_mt_active( 'payment_reminder' ) ) {
+			EE_Registry::instance()->load_helper('MSG_Template');
+			if (EEH_MSG_Template::is_mt_active('payment_reminder')) {
 				$items['send_payment_reminder'] = array(
 					'class' => 'dashicons dashicons-email-alt',
 					'desc' => __('Send Payment Reminder', 'event_espresso')
@@ -452,29 +452,29 @@ 
 			'FHEE__Transactions_Admin_Page___transaction_legend_items__more_items',
 			array(
 				'overpaid'   => array(
-					'class' => 'ee-status-legend ee-status-legend-' . EEM_Transaction::overpaid_status_code,
-					'desc'  => EEH_Template::pretty_status( EEM_Transaction::overpaid_status_code, FALSE, 'sentence' )
+					'class' => 'ee-status-legend ee-status-legend-'.EEM_Transaction::overpaid_status_code,
+					'desc'  => EEH_Template::pretty_status(EEM_Transaction::overpaid_status_code, FALSE, 'sentence')
 				),
 				'complete'   => array(
-					'class' => 'ee-status-legend ee-status-legend-' . EEM_Transaction::complete_status_code,
-					'desc'  => EEH_Template::pretty_status( EEM_Transaction::complete_status_code, FALSE, 'sentence' )
+					'class' => 'ee-status-legend ee-status-legend-'.EEM_Transaction::complete_status_code,
+					'desc'  => EEH_Template::pretty_status(EEM_Transaction::complete_status_code, FALSE, 'sentence')
 				),
 				'incomplete' => array(
-					'class' => 'ee-status-legend ee-status-legend-' . EEM_Transaction::incomplete_status_code,
-					'desc'  => EEH_Template::pretty_status( EEM_Transaction::incomplete_status_code, FALSE, 'sentence' )
+					'class' => 'ee-status-legend ee-status-legend-'.EEM_Transaction::incomplete_status_code,
+					'desc'  => EEH_Template::pretty_status(EEM_Transaction::incomplete_status_code, FALSE, 'sentence')
 				),
 				'abandoned'  => array(
-					'class' => 'ee-status-legend ee-status-legend-' . EEM_Transaction::abandoned_status_code,
-					'desc'  => EEH_Template::pretty_status( EEM_Transaction::abandoned_status_code, FALSE, 'sentence' )
+					'class' => 'ee-status-legend ee-status-legend-'.EEM_Transaction::abandoned_status_code,
+					'desc'  => EEH_Template::pretty_status(EEM_Transaction::abandoned_status_code, FALSE, 'sentence')
 				),
 				'failed'     => array(
-					'class' => 'ee-status-legend ee-status-legend-' . EEM_Transaction::failed_status_code,
-					'desc'  => EEH_Template::pretty_status( EEM_Transaction::failed_status_code, FALSE, 'sentence' )
+					'class' => 'ee-status-legend ee-status-legend-'.EEM_Transaction::failed_status_code,
+					'desc'  => EEH_Template::pretty_status(EEM_Transaction::failed_status_code, FALSE, 'sentence')
 				)
 			)
 		);
 
-		return array_merge( $items, $more_items);
+		return array_merge($items, $more_items);
 	}
 
 
@@ -487,9 +487,9 @@ 
 	 */
 	protected function _transactions_overview_list_table() {
 		$this->_admin_page_title = __('Transactions', 'event_espresso');
-		$event = isset($this->_req_data['EVT_ID']) ? EEM_Event::instance()->get_one_by_ID($this->_req_data['EVT_ID'] ) : NULL;
-		$this->_template_args['admin_page_header'] = $event instanceof EE_Event ? sprintf( __('%sViewing Transactions for the Event: %s%s', 'event_espresso'), '<h3>', '<a href="' . EE_Admin_Page::add_query_args_and_nonce(array('action' => 'edit', 'post' => $event->ID()), EVENTS_ADMIN_URL ) . '" title="' . esc_attr__('Click to Edit event', 'event_espresso') . '">' . $event->get('EVT_name') . '</a>', '</h3>' ) : '';
-		$this->_template_args['after_list_table'] = $this->_display_legend( $this->_transaction_legend_items() );
+		$event = isset($this->_req_data['EVT_ID']) ? EEM_Event::instance()->get_one_by_ID($this->_req_data['EVT_ID']) : NULL;
+		$this->_template_args['admin_page_header'] = $event instanceof EE_Event ? sprintf(__('%sViewing Transactions for the Event: %s%s', 'event_espresso'), '<h3>', '<a href="'.EE_Admin_Page::add_query_args_and_nonce(array('action' => 'edit', 'post' => $event->ID()), EVENTS_ADMIN_URL).'" title="'.esc_attr__('Click to Edit event', 'event_espresso').'">'.$event->get('EVT_name').'</a>', '</h3>') : '';
+		$this->_template_args['after_list_table'] = $this->_display_legend($this->_transaction_legend_items());
 		$this->display_admin_list_table_page_with_no_sidebar();
 	}
 
@@ -503,8 +503,8 @@ 
 	*	@return void
 	*/
 	protected function _transaction_details() {
-		do_action( 'AHEE__Transactions_Admin_Page__transaction_details__start', $this->_transaction );
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
+		do_action('AHEE__Transactions_Admin_Page__transaction_details__start', $this->_transaction);
+		EE_Registry::instance()->load_helper('MSG_Template');
 
 		$this->_set_transaction_status_array();
 
@@ -517,75 +517,75 @@ 
 		$attendee = $primary_registration instanceof EE_Registration ? $primary_registration->attendee() : NULL;
 
 		$this->_template_args['txn_nmbr']['value'] = $this->_transaction->ID();
-		$this->_template_args['txn_nmbr']['label'] = __( 'Transaction Number', 'event_espresso' );
+		$this->_template_args['txn_nmbr']['label'] = __('Transaction Number', 'event_espresso');
 
-		$this->_template_args['txn_datetime']['value'] = $this->_transaction->get_datetime('TXN_timestamp', 'l F j, Y', 'g:i:s a' );
-		$this->_template_args['txn_datetime']['label'] = __( 'Date', 'event_espresso' );
+		$this->_template_args['txn_datetime']['value'] = $this->_transaction->get_datetime('TXN_timestamp', 'l F j, Y', 'g:i:s a');
+		$this->_template_args['txn_datetime']['label'] = __('Date', 'event_espresso');
 
-		$this->_template_args['txn_status']['value'] = self::$_txn_status[ $this->_transaction->get('STS_ID') ];
-		$this->_template_args['txn_status']['label'] = __( 'Transaction Status', 'event_espresso' );
-		$this->_template_args['txn_status']['class'] = 'status-' . $this->_transaction->get('STS_ID');
+		$this->_template_args['txn_status']['value'] = self::$_txn_status[$this->_transaction->get('STS_ID')];
+		$this->_template_args['txn_status']['label'] = __('Transaction Status', 'event_espresso');
+		$this->_template_args['txn_status']['class'] = 'status-'.$this->_transaction->get('STS_ID');
 
 		$this->_template_args['grand_total'] = $this->_transaction->get('TXN_total');
 		$this->_template_args['total_paid'] = $this->_transaction->get('TXN_paid');
 
-		if ( $attendee instanceof EE_Attendee && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'espresso_transactions_send_payment_reminder' ) ) {
-			EE_Registry::instance()->load_helper( 'MSG_Template' );
-			$this->_template_args['send_payment_reminder_button'] = EEH_MSG_Template::is_mt_active( 'payment_reminder' )
+		if ($attendee instanceof EE_Attendee && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'espresso_transactions_send_payment_reminder')) {
+			EE_Registry::instance()->load_helper('MSG_Template');
+			$this->_template_args['send_payment_reminder_button'] = EEH_MSG_Template::is_mt_active('payment_reminder')
 				 && $this->_transaction->get('STS_ID') != EEM_Transaction::complete_status_code
 				 && $this->_transaction->get('STS_ID') != EEM_Transaction::overpaid_status_code
-				 ? EEH_Template::get_button_or_link( EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'send_payment_reminder', 'TXN_ID'=>$this->_transaction->ID(), 'redirect_to' => 'view_transaction' ), TXN_ADMIN_URL ), __(' Send Payment Reminder'), 'button secondary-button right',  'dashicons dashicons-email-alt' )
+				 ? EEH_Template::get_button_or_link(EE_Admin_Page::add_query_args_and_nonce(array('action'=>'send_payment_reminder', 'TXN_ID'=>$this->_transaction->ID(), 'redirect_to' => 'view_transaction'), TXN_ADMIN_URL), __(' Send Payment Reminder'), 'button secondary-button right', 'dashicons dashicons-email-alt')
 				 : '';
 		} else {
 			$this->_template_args['send_payment_reminder_button'] = '';
 		}
 
 		$amount_due = $this->_transaction->get('TXN_total') - $this->_transaction->get('TXN_paid');
-		$this->_template_args['amount_due'] = EEH_Template::format_currency( $amount_due, TRUE );
-		if ( EE_Registry::instance()->CFG->currency->sign_b4 ) {
-			$this->_template_args['amount_due'] = EE_Registry::instance()->CFG->currency->sign . $this->_template_args['amount_due'];
+		$this->_template_args['amount_due'] = EEH_Template::format_currency($amount_due, TRUE);
+		if (EE_Registry::instance()->CFG->currency->sign_b4) {
+			$this->_template_args['amount_due'] = EE_Registry::instance()->CFG->currency->sign.$this->_template_args['amount_due'];
 		} else {
-			$this->_template_args['amount_due'] = $this->_template_args['amount_due'] . EE_Registry::instance()->CFG->currency->sign;
+			$this->_template_args['amount_due'] = $this->_template_args['amount_due'].EE_Registry::instance()->CFG->currency->sign;
 		}
-		$this->_template_args['amount_due_class'] =  '';
+		$this->_template_args['amount_due_class'] = '';
 
-		if ( $this->_transaction->get('TXN_paid') == $this->_transaction->get('TXN_total') ) {
+		if ($this->_transaction->get('TXN_paid') == $this->_transaction->get('TXN_total')) {
 			// paid in full
-			$this->_template_args['amount_due'] =  FALSE;
-		} elseif ( $this->_transaction->get('TXN_paid') > $this->_transaction->get('TXN_total') ) {
+			$this->_template_args['amount_due'] = FALSE;
+		} elseif ($this->_transaction->get('TXN_paid') > $this->_transaction->get('TXN_total')) {
 			// overpaid
-			$this->_template_args['amount_due_class'] =  'txn-overview-no-payment-spn';
-		} elseif (( $this->_transaction->get('TXN_total') > 0 ) && ( $this->_transaction->get('TXN_paid') > 0 )) {
+			$this->_template_args['amount_due_class'] = 'txn-overview-no-payment-spn';
+		} elseif (($this->_transaction->get('TXN_total') > 0) && ($this->_transaction->get('TXN_paid') > 0)) {
 			// monies owing
-			$this->_template_args['amount_due_class'] =  'txn-overview-part-payment-spn';
-		} elseif (( $this->_transaction->get('TXN_total') > 0 ) && ( $this->_transaction->get('TXN_paid') == 0 )) {
+			$this->_template_args['amount_due_class'] = 'txn-overview-part-payment-spn';
+		} elseif (($this->_transaction->get('TXN_total') > 0) && ($this->_transaction->get('TXN_paid') == 0)) {
 			// no payments made yet
-			$this->_template_args['amount_due_class'] =  'txn-overview-no-payment-spn';
-		} elseif ( $this->_transaction->get('TXN_total') == 0 ) {
+			$this->_template_args['amount_due_class'] = 'txn-overview-no-payment-spn';
+		} elseif ($this->_transaction->get('TXN_total') == 0) {
 			// free event
-			$this->_template_args['amount_due'] =  FALSE;
+			$this->_template_args['amount_due'] = FALSE;
 		}
 
 		$payment_method = $this->_transaction->payment_method();
 
-		$this->_template_args['method_of_payment_name'] = $payment_method instanceof EE_Payment_Method ? $payment_method->admin_name() : __( 'Unknown', 'event_espresso' );
+		$this->_template_args['method_of_payment_name'] = $payment_method instanceof EE_Payment_Method ? $payment_method->admin_name() : __('Unknown', 'event_espresso');
 		$this->_template_args['currency_sign'] = EE_Registry::instance()->CFG->currency->sign;
 		// link back to overview
-		$this->_template_args['txn_overview_url'] = ! empty ( $_SERVER['HTTP_REFERER'] ) ? $_SERVER['HTTP_REFERER'] : TXN_ADMIN_URL;
+		$this->_template_args['txn_overview_url'] = ! empty ($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : TXN_ADMIN_URL;
 
 
 		//next and previous links
-		$next_txn = $this->_transaction->next(null, array( array( 'STS_ID' => array( '!=', EEM_Transaction::failed_status_code ) ) ), 'TXN_ID' );
-		$this->_template_args['next_transaction'] = $next_txn ? $this->_next_link( EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'view_transaction', 'TXN_ID' => $next_txn['TXN_ID'] ), TXN_ADMIN_URL ), 'dashicons dashicons-arrow-right ee-icon-size-22' ) : '';
-		$previous_txn = $this->_transaction->previous( null, array( array( 'STS_ID' => array( '!=', EEM_Transaction::failed_status_code ) ) ), 'TXN_ID' );
-		$this->_template_args['previous_transaction'] = $previous_txn ? $this->_previous_link( EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'view_transaction', 'TXN_ID' => $previous_txn['TXN_ID'] ), TXN_ADMIN_URL ), 'dashicons dashicons-arrow-left ee-icon-size-22' ) : '';
+		$next_txn = $this->_transaction->next(null, array(array('STS_ID' => array('!=', EEM_Transaction::failed_status_code))), 'TXN_ID');
+		$this->_template_args['next_transaction'] = $next_txn ? $this->_next_link(EE_Admin_Page::add_query_args_and_nonce(array('action' => 'view_transaction', 'TXN_ID' => $next_txn['TXN_ID']), TXN_ADMIN_URL), 'dashicons dashicons-arrow-right ee-icon-size-22') : '';
+		$previous_txn = $this->_transaction->previous(null, array(array('STS_ID' => array('!=', EEM_Transaction::failed_status_code))), 'TXN_ID');
+		$this->_template_args['previous_transaction'] = $previous_txn ? $this->_previous_link(EE_Admin_Page::add_query_args_and_nonce(array('action' => 'view_transaction', 'TXN_ID' => $previous_txn['TXN_ID']), TXN_ADMIN_URL), 'dashicons dashicons-arrow-left ee-icon-size-22') : '';
 
 
 		// grab messages at the last second
 		$this->_template_args['notices'] = EE_Error::get_notices();
 		// path to template
-		$template_path = TXN_TEMPLATE_PATH . 'txn_admin_details_header.template.php';
-		$this->_template_args['admin_page_header'] = EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
+		$template_path = TXN_TEMPLATE_PATH.'txn_admin_details_header.template.php';
+		$this->_template_args['admin_page_header'] = EEH_Template::display_template($template_path, $this->_template_args, TRUE);
 
 		// the details template wrapper
 		$this->display_admin_page_with_sidebar();
@@ -604,18 +604,18 @@ 
 
 		$this->_set_transaction_object();
 
-		add_meta_box( 'edit-txn-details-mbox', __( 'Transaction Details', 'event_espresso' ), array( $this, 'txn_details_meta_box' ), $this->_wp_page_slug, 'normal', 'high' );
+		add_meta_box('edit-txn-details-mbox', __('Transaction Details', 'event_espresso'), array($this, 'txn_details_meta_box'), $this->_wp_page_slug, 'normal', 'high');
 		add_meta_box(
 			'edit-txn-attendees-mbox',
-			__( 'Attendees Registered in this Transaction', 'event_espresso' ),
-			array( $this, 'txn_attendees_meta_box' ),
+			__('Attendees Registered in this Transaction', 'event_espresso'),
+			array($this, 'txn_attendees_meta_box'),
 			$this->_wp_page_slug,
 			'normal',
 			'high',
-			array( 'TXN_ID' => $this->_transaction->ID() )
+			array('TXN_ID' => $this->_transaction->ID())
 		);
-		add_meta_box( 'edit-txn-registrant-mbox', __( 'Primary Contact', 'event_espresso' ), array( $this, 'txn_registrant_side_meta_box' ), $this->_wp_page_slug, 'side', 'high' );
-		add_meta_box( 'edit-txn-billing-info-mbox', __( 'Billing Information', 'event_espresso' ), array( $this, 'txn_billing_info_side_meta_box' ), $this->_wp_page_slug, 'side', 'high' );
+		add_meta_box('edit-txn-registrant-mbox', __('Primary Contact', 'event_espresso'), array($this, 'txn_registrant_side_meta_box'), $this->_wp_page_slug, 'side', 'high');
+		add_meta_box('edit-txn-billing-info-mbox', __('Billing Information', 'event_espresso'), array($this, 'txn_billing_info_side_meta_box'), $this->_wp_page_slug, 'side', 'high');
 
 	}
 
@@ -636,15 +636,15 @@ 
 
 		//get line table
 		EEH_Autoloader::register_line_item_display_autoloaders();
-		$Line_Item_Display = new EE_Line_Item_Display( 'admin_table', 'EE_Admin_Table_Line_Item_Display_Strategy' );
-		$this->_template_args['line_item_table'] = $Line_Item_Display->display_line_item( $this->_transaction->total_line_item() );
+		$Line_Item_Display = new EE_Line_Item_Display('admin_table', 'EE_Admin_Table_Line_Item_Display_Strategy');
+		$this->_template_args['line_item_table'] = $Line_Item_Display->display_line_item($this->_transaction->total_line_item());
 		$this->_template_args['REG_code'] = $this->_transaction->get_first_related('Registration')->get('REG_code');
 
 		// process taxes
-		$taxes = $this->_transaction->get_many_related( 'Line_Item', array( array( 'LIN_type' => EEM_Line_Item::type_tax )));
-		$this->_template_args['taxes'] = ! empty( $taxes ) ? $taxes : FALSE;
+		$taxes = $this->_transaction->get_many_related('Line_Item', array(array('LIN_type' => EEM_Line_Item::type_tax)));
+		$this->_template_args['taxes'] = ! empty($taxes) ? $taxes : FALSE;
 
-		$this->_template_args['grand_total'] = EEH_Template::format_currency($this->_transaction->get('TXN_total'), FALSE, FALSE );
+		$this->_template_args['grand_total'] = EEH_Template::format_currency($this->_transaction->get('TXN_total'), FALSE, FALSE);
 		$this->_template_args['grand_raw_total'] = $this->_transaction->get('TXN_total');
 		$this->_template_args['TXN_status'] = $this->_transaction->get('STS_ID');
 
@@ -652,63 +652,63 @@ 
 
 		// process payment details
 		$payments = $this->_transaction->get_many_related('Payment');
-		if( ! empty(  $payments ) ) {
-			$this->_template_args[ 'payments' ] = $payments;
-			$this->_template_args[ 'existing_reg_payments' ] = $this->_get_registration_payment_IDs( $payments );
+		if ( ! empty($payments)) {
+			$this->_template_args['payments'] = $payments;
+			$this->_template_args['existing_reg_payments'] = $this->_get_registration_payment_IDs($payments);
 		} else {
-			$this->_template_args[ 'payments' ] = false;
-			$this->_template_args[ 'existing_reg_payments' ] = array();
+			$this->_template_args['payments'] = false;
+			$this->_template_args['existing_reg_payments'] = array();
 		}
 
-		$this->_template_args['edit_payment_url'] = add_query_arg( array( 'action' => 'edit_payment'  ), TXN_ADMIN_URL );
-		$this->_template_args['delete_payment_url'] = add_query_arg( array( 'action' => 'espresso_delete_payment' ), TXN_ADMIN_URL );
+		$this->_template_args['edit_payment_url'] = add_query_arg(array('action' => 'edit_payment'), TXN_ADMIN_URL);
+		$this->_template_args['delete_payment_url'] = add_query_arg(array('action' => 'espresso_delete_payment'), TXN_ADMIN_URL);
 
-		if ( isset( $txn_details['invoice_number'] )) {
+		if (isset($txn_details['invoice_number'])) {
 			$this->_template_args['txn_details']['invoice_number']['value'] = $this->_template_args['REG_code'];
-			$this->_template_args['txn_details']['invoice_number']['label'] = __( 'Invoice Number', 'event_espresso' );
+			$this->_template_args['txn_details']['invoice_number']['label'] = __('Invoice Number', 'event_espresso');
 		}
 
 		$this->_template_args['txn_details']['registration_session']['value'] = $this->_transaction->get_first_related('Registration')->get('REG_session');
-		$this->_template_args['txn_details']['registration_session']['label'] = __( 'Registration Session', 'event_espresso' );
+		$this->_template_args['txn_details']['registration_session']['label'] = __('Registration Session', 'event_espresso');
 
-		$this->_template_args['txn_details']['ip_address']['value'] = isset( $this->_session['ip_address'] ) ? $this->_session['ip_address'] : '';
-		$this->_template_args['txn_details']['ip_address']['label'] = __( 'Transaction placed from IP', 'event_espresso' );
+		$this->_template_args['txn_details']['ip_address']['value'] = isset($this->_session['ip_address']) ? $this->_session['ip_address'] : '';
+		$this->_template_args['txn_details']['ip_address']['label'] = __('Transaction placed from IP', 'event_espresso');
 
-		$this->_template_args['txn_details']['user_agent']['value'] = isset( $this->_session['user_agent'] ) ? $this->_session['user_agent'] : '';
-		$this->_template_args['txn_details']['user_agent']['label'] = __( 'Registrant User Agent', 'event_espresso' );
+		$this->_template_args['txn_details']['user_agent']['value'] = isset($this->_session['user_agent']) ? $this->_session['user_agent'] : '';
+		$this->_template_args['txn_details']['user_agent']['label'] = __('Registrant User Agent', 'event_espresso');
 
 		$reg_steps = '<ul>';
-		foreach ( $this->_transaction->reg_steps() as $reg_step => $reg_step_status ) {
-			if ( $reg_step_status === true ) {
-				$reg_steps .= '<li style="color:#70cc50">' . sprintf( __( '%1$s : Completed', 'event_espresso' ), ucwords( str_replace( '_', ' ', $reg_step ) ) ) . '</li>';
-			} else if ( is_numeric( $reg_step_status ) && $reg_step_status !== false ) {
-					$reg_steps .= '<li style="color:#2EA2CC">' . sprintf(
-							__( '%1$s : Initiated %2$s', 'event_espresso' ),
-							ucwords( str_replace( '_', ' ', $reg_step ) ),
-							gmdate( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ), ( $reg_step_status + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS ) ) )
-						) . '</li>';
+		foreach ($this->_transaction->reg_steps() as $reg_step => $reg_step_status) {
+			if ($reg_step_status === true) {
+				$reg_steps .= '<li style="color:#70cc50">'.sprintf(__('%1$s : Completed', 'event_espresso'), ucwords(str_replace('_', ' ', $reg_step))).'</li>';
+			} else if (is_numeric($reg_step_status) && $reg_step_status !== false) {
+					$reg_steps .= '<li style="color:#2EA2CC">'.sprintf(
+							__('%1$s : Initiated %2$s', 'event_espresso'),
+							ucwords(str_replace('_', ' ', $reg_step)),
+							gmdate(get_option('date_format').' '.get_option('time_format'), ($reg_step_status + (get_option('gmt_offset') * HOUR_IN_SECONDS)))
+						).'</li>';
 				} else {
-				$reg_steps .= '<li style="color:#E76700">' . sprintf( __( '%1$s : Never Initiated', 'event_espresso' ), ucwords( str_replace( '_', ' ', $reg_step ) ) ) . '</li>';
+				$reg_steps .= '<li style="color:#E76700">'.sprintf(__('%1$s : Never Initiated', 'event_espresso'), ucwords(str_replace('_', ' ', $reg_step))).'</li>';
 			}
 		}
 		$reg_steps .= '</ul>';
 		$this->_template_args['txn_details']['reg_steps']['value'] = $reg_steps;
-		$this->_template_args['txn_details']['reg_steps']['label'] = __( 'Registration Step Progress', 'event_espresso' );
+		$this->_template_args['txn_details']['reg_steps']['label'] = __('Registration Step Progress', 'event_espresso');
 
 
 		$this->_get_registrations_to_apply_payment_to();
-		$this->_get_payment_methods( $payments );
+		$this->_get_payment_methods($payments);
 		$this->_get_payment_status_array();
 		$this->_get_reg_status_selection(); //sets up the template args for the reg status array for the transaction.
 
-		$this->_template_args['transaction_form_url'] = add_query_arg( array( 'action' => 'edit_transaction', 'process' => 'transaction'  ), TXN_ADMIN_URL );
-		$this->_template_args['apply_payment_form_url'] = add_query_arg( array( 'page' => 'espresso_transactions', 'action' => 'espresso_apply_payment' ), WP_AJAX_URL );
-		$this->_template_args['delete_payment_form_url'] = add_query_arg( array( 'page' => 'espresso_transactions', 'action' => 'espresso_delete_payment' ), WP_AJAX_URL );
+		$this->_template_args['transaction_form_url'] = add_query_arg(array('action' => 'edit_transaction', 'process' => 'transaction'), TXN_ADMIN_URL);
+		$this->_template_args['apply_payment_form_url'] = add_query_arg(array('page' => 'espresso_transactions', 'action' => 'espresso_apply_payment'), WP_AJAX_URL);
+		$this->_template_args['delete_payment_form_url'] = add_query_arg(array('page' => 'espresso_transactions', 'action' => 'espresso_delete_payment'), WP_AJAX_URL);
 
 		// 'espresso_delete_payment_nonce'
 
-		$template_path = TXN_TEMPLATE_PATH . 'txn_admin_details_main_meta_box_txn_details.template.php';
-		echo EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
+		$template_path = TXN_TEMPLATE_PATH.'txn_admin_details_main_meta_box_txn_details.template.php';
+		echo EEH_Template::display_template($template_path, $this->_template_args, TRUE);
 
 	}
 
@@ -723,27 +723,27 @@ 
 	 * @param EE_Payment[] $payments
 	 * @return array
 	 */
-	protected function _get_registration_payment_IDs( $payments = array() ) {
+	protected function _get_registration_payment_IDs($payments = array()) {
 		$existing_reg_payments = array();
 		// get all reg payments for these payments
-		$reg_payments = EEM_Registration_Payment::instance()->get_all( array(
+		$reg_payments = EEM_Registration_Payment::instance()->get_all(array(
 			array(
 				'PAY_ID' => array(
 					'IN',
-					array_keys( $payments )
+					array_keys($payments)
 				)
 			)
-		) );
-		if ( ! empty( $reg_payments ) ) {
-			foreach ( $payments as $payment ) {
-				if ( ! $payment instanceof EE_Payment ) {
+		));
+		if ( ! empty($reg_payments)) {
+			foreach ($payments as $payment) {
+				if ( ! $payment instanceof EE_Payment) {
 					continue;
-				} else if ( ! isset( $existing_reg_payments[ $payment->ID() ] ) ) {
-					$existing_reg_payments[ $payment->ID() ] = array();
+				} else if ( ! isset($existing_reg_payments[$payment->ID()])) {
+					$existing_reg_payments[$payment->ID()] = array();
 				}
-				foreach ( $reg_payments as $reg_payment ) {
-					if ( $reg_payment instanceof EE_Registration_Payment && $reg_payment->payment_ID() === $payment->ID() ) {
-						$existing_reg_payments[ $payment->ID() ][ ] = $reg_payment->registration_ID();
+				foreach ($reg_payments as $reg_payment) {
+					if ($reg_payment instanceof EE_Registration_Payment && $reg_payment->payment_ID() === $payment->ID()) {
+						$existing_reg_payments[$payment->ID()][] = $reg_payment->registration_ID();
 					}
 				}
 			}
@@ -780,39 +780,39 @@ 
 		$registrations_to_apply_payment_to .= '<br /><div class="admin-primary-mbox-tbl-wrap">';
 		$registrations_to_apply_payment_to .= '<table class="admin-primary-mbox-tbl">';
 		$registrations_to_apply_payment_to .= '<thead><tr>';
-		$registrations_to_apply_payment_to .= '<td>' . __( 'ID', 'event_espresso' ) . '</td>';
-		$registrations_to_apply_payment_to .= '<td>' . __( 'Registrant', 'event_espresso' ) . '</td>';
-		$registrations_to_apply_payment_to .= '<td>' . __( 'Ticket', 'event_espresso' ) . '</td>';
-		$registrations_to_apply_payment_to .= '<td>' . __( 'Event', 'event_espresso' ) . '</td>';
-		$registrations_to_apply_payment_to .= '<td class="txn-admin-payment-paid-td jst-cntr">' . __( 'Paid', 'event_espresso' ) . '</td>';
-		$registrations_to_apply_payment_to .= '<td class="txn-admin-payment-owing-td jst-cntr">' . __( 'Owing', 'event_espresso' ) . '</td>';
-		$registrations_to_apply_payment_to .= '<td class="jst-cntr">' . __( 'Apply', 'event_espresso' ) . '</td>';
+		$registrations_to_apply_payment_to .= '<td>'.__('ID', 'event_espresso').'</td>';
+		$registrations_to_apply_payment_to .= '<td>'.__('Registrant', 'event_espresso').'</td>';
+		$registrations_to_apply_payment_to .= '<td>'.__('Ticket', 'event_espresso').'</td>';
+		$registrations_to_apply_payment_to .= '<td>'.__('Event', 'event_espresso').'</td>';
+		$registrations_to_apply_payment_to .= '<td class="txn-admin-payment-paid-td jst-cntr">'.__('Paid', 'event_espresso').'</td>';
+		$registrations_to_apply_payment_to .= '<td class="txn-admin-payment-owing-td jst-cntr">'.__('Owing', 'event_espresso').'</td>';
+		$registrations_to_apply_payment_to .= '<td class="jst-cntr">'.__('Apply', 'event_espresso').'</td>';
 		$registrations_to_apply_payment_to .= '</tr></thead><tbody>';
 		// get registrations for TXN
-		$registrations = $this->_transaction->registrations( $query_params );
-		foreach ( $registrations as $registration ) {
-			if ( $registration instanceof EE_Registration ) {
+		$registrations = $this->_transaction->registrations($query_params);
+		foreach ($registrations as $registration) {
+			if ($registration instanceof EE_Registration) {
 				$owing = $registration->final_price() - $registration->paid();
-				$taxable = $registration->ticket()->taxable() ? ' <span class="smaller-text lt-grey-text"> ' . __( '+ tax', 'event_espresso' ) . '</span>' : '';
-				$checked = empty( $existing_reg_payments ) || in_array( $registration->ID(), $existing_reg_payments ) ? ' checked="checked"' : '';
-				$registrations_to_apply_payment_to .= '<tr id="apply-payment-registration-row-' . $registration->ID() . '">';
+				$taxable = $registration->ticket()->taxable() ? ' <span class="smaller-text lt-grey-text"> '.__('+ tax', 'event_espresso').'</span>' : '';
+				$checked = empty($existing_reg_payments) || in_array($registration->ID(), $existing_reg_payments) ? ' checked="checked"' : '';
+				$registrations_to_apply_payment_to .= '<tr id="apply-payment-registration-row-'.$registration->ID().'">';
 				// add html for checkbox input and label
-				$registrations_to_apply_payment_to .= '<td>' . $registration->ID() . '</td>';
-				$registrations_to_apply_payment_to .= '<td>' . $registration->attendee() instanceof EE_Attendee ? $registration->attendee()->full_name() : __( 'Unknown Attendee', 'event_espresso' ) . '</td>';
-				$registrations_to_apply_payment_to .= '<td>' . $registration->ticket()->name() . ' : ' . $registration->ticket()->pretty_price() . $taxable . '</td>';
-				$registrations_to_apply_payment_to .= '<td>' . $registration->event_name() . '</td>';
-				$registrations_to_apply_payment_to .= '<td class="txn-admin-payment-paid-td jst-rght">' . $registration->pretty_paid() . '</td>';
-				$registrations_to_apply_payment_to .= '<td class="txn-admin-payment-owing-td jst-rght">' . EEH_Template::format_currency( $owing ) . '</td>';
+				$registrations_to_apply_payment_to .= '<td>'.$registration->ID().'</td>';
+				$registrations_to_apply_payment_to .= '<td>'.$registration->attendee() instanceof EE_Attendee ? $registration->attendee()->full_name() : __('Unknown Attendee', 'event_espresso').'</td>';
+				$registrations_to_apply_payment_to .= '<td>'.$registration->ticket()->name().' : '.$registration->ticket()->pretty_price().$taxable.'</td>';
+				$registrations_to_apply_payment_to .= '<td>'.$registration->event_name().'</td>';
+				$registrations_to_apply_payment_to .= '<td class="txn-admin-payment-paid-td jst-rght">'.$registration->pretty_paid().'</td>';
+				$registrations_to_apply_payment_to .= '<td class="txn-admin-payment-owing-td jst-rght">'.EEH_Template::format_currency($owing).'</td>';
 				$registrations_to_apply_payment_to .= '<td class="jst-cntr">';
 				$disabled = $registration->final_price() > 0 ? '' : ' disabled';
-				$registrations_to_apply_payment_to .= '<input type="checkbox" value="' . $registration->ID() . '" name="txn_admin_payment[registrations]"' . $checked . $disabled . '>';
+				$registrations_to_apply_payment_to .= '<input type="checkbox" value="'.$registration->ID().'" name="txn_admin_payment[registrations]"'.$checked.$disabled.'>';
 				$registrations_to_apply_payment_to .= '</td>';
 				$registrations_to_apply_payment_to .= '</tr>';
 			}
 		}
 		$registrations_to_apply_payment_to .= '</tbody></table></div>';
-		$registrations_to_apply_payment_to .= '<p class="clear description">' . __( 'The payment will only be applied to the registrations that have a check mark in their corresponding check box. Checkboxes for free registrations have been disabled.', 'event_espresso' ) . '</p></div>';
-		$this->_template_args[ 'registrations_to_apply_payment_to' ] = $registrations_to_apply_payment_to;
+		$registrations_to_apply_payment_to .= '<p class="clear description">'.__('The payment will only be applied to the registrations that have a check mark in their corresponding check box. Checkboxes for free registrations have been disabled.', 'event_espresso').'</p></div>';
+		$this->_template_args['registrations_to_apply_payment_to'] = $registrations_to_apply_payment_to;
 	}
 
 
@@ -829,9 +829,9 @@ 
 		$statuses = EEM_Registration::reg_status_array(array(), TRUE);
 		//let's add a "don't change" option.
 		$status_array['NAN'] = __('Leave the Same', 'event_espresso');
-		$status_array = array_merge( $status_array, $statuses );
-		$this->_template_args['status_change_select'] = EEH_Form_Fields::select_input( 'txn_reg_status_change[reg_status]', $status_array, 'NAN', 'id="txn-admin-payment-reg-status-inp"', 'txn-reg-status-change-reg-status' );
-		$this->_template_args['delete_status_change_select'] = EEH_Form_Fields::select_input( 'delete_txn_reg_status_change[reg_status]', $status_array, 'NAN', 'delete-txn-admin-payment-reg-status-inp', 'delete-txn-reg-status-change-reg-status' );
+		$status_array = array_merge($status_array, $statuses);
+		$this->_template_args['status_change_select'] = EEH_Form_Fields::select_input('txn_reg_status_change[reg_status]', $status_array, 'NAN', 'id="txn-admin-payment-reg-status-inp"', 'txn-reg-status-change-reg-status');
+		$this->_template_args['delete_status_change_select'] = EEH_Form_Fields::select_input('delete_txn_reg_status_change[reg_status]', $status_array, 'NAN', 'delete-txn-admin-payment-reg-status-inp', 'delete-txn-reg-status-change-reg-status');
 
 	}
 
@@ -846,21 +846,21 @@ 
 	 * @param EE_Payment[] to show on this page
 	 *	@return void
 	 */
-	private function _get_payment_methods( $payments = array() ) {
+	private function _get_payment_methods($payments = array()) {
 		$payment_methods_of_payments = array();
-		foreach( $payments as $payment ){
-			if( $payment instanceof EE_Payment ){
-				$payment_methods_of_payments[] = $payment->get( 'PMD_ID' );
+		foreach ($payments as $payment) {
+			if ($payment instanceof EE_Payment) {
+				$payment_methods_of_payments[] = $payment->get('PMD_ID');
 			}
 		}
-		if( $payment_methods_of_payments ){
-			$query_args = array( array( 'OR*payment_method_for_payment' => array(
-					'PMD_ID' => array( 'IN', $payment_methods_of_payments ),
-					'PMD_scope' => array( 'LIKE', '%' . EEM_Payment_Method::scope_admin . '%' ) ) ) );
-		}else{
-			$query_args = array( array( 'PMD_scope' => array( 'LIKE', '%' . EEM_Payment_Method::scope_admin . '%' ) ) );
+		if ($payment_methods_of_payments) {
+			$query_args = array(array('OR*payment_method_for_payment' => array(
+					'PMD_ID' => array('IN', $payment_methods_of_payments),
+					'PMD_scope' => array('LIKE', '%'.EEM_Payment_Method::scope_admin.'%') )));
+		} else {
+			$query_args = array(array('PMD_scope' => array('LIKE', '%'.EEM_Payment_Method::scope_admin.'%')));
 		}
-		$this->_template_args['payment_methods'] = EEM_Payment_Method::instance()->get_all( $query_args );
+		$this->_template_args['payment_methods'] = EEM_Payment_Method::instance()->get_all($query_args);
 	}
 
 
@@ -874,46 +874,46 @@ 
 	 * @param array $metabox
 	 * @return void
 	 */
-	public function txn_attendees_meta_box( $post, $metabox = array( 'args' => array() )) {
+	public function txn_attendees_meta_box($post, $metabox = array('args' => array())) {
 
-		extract( $metabox['args'] );
+		extract($metabox['args']);
 		$this->_template_args['post'] = $post;
 		$this->_template_args['event_attendees'] = array();
 		// process items in cart
-		$line_items = $this->_transaction->get_many_related('Line_Item', array( array( 'LIN_type' => 'line-item' ) ) );
-		if ( ! empty( $line_items )) {
-			foreach ( $line_items as $item ) {
-				if ( $item instanceof EE_Line_Item ) {
-					switch( $item->OBJ_type() ) {
+		$line_items = $this->_transaction->get_many_related('Line_Item', array(array('LIN_type' => 'line-item')));
+		if ( ! empty($line_items)) {
+			foreach ($line_items as $item) {
+				if ($item instanceof EE_Line_Item) {
+					switch ($item->OBJ_type()) {
 
 						case 'Event' :
 							break;
 
 						case 'Ticket' :
 							$ticket = $item->ticket();
-							if ( empty( $ticket )) {
+							if (empty($ticket)) {
 								continue; //right now we're only handling tickets here.  Cause its expected that only tickets will have attendees right?
 							}
-							$ticket_price = EEH_Template::format_currency( $item->get( 'LIN_unit_price' ));
+							$ticket_price = EEH_Template::format_currency($item->get('LIN_unit_price'));
 							$event = $ticket->get_first_related('Registration')->get_first_related('Event');
-							$event_name = $event instanceof EE_Event ? $event->get('EVT_name') . ' - ' . $item->get('LIN_name') : '';
+							$event_name = $event instanceof EE_Event ? $event->get('EVT_name').' - '.$item->get('LIN_name') : '';
 
-							$registrations = $ticket->get_many_related('Registration', array( array('TXN_ID' => $this->_transaction->ID() )));
-							foreach( $registrations as $registration ) {
-								$this->_template_args['event_attendees'][$registration->ID()]['att_num'] 						= $registration->get('REG_count');
-								$this->_template_args['event_attendees'][$registration->ID()]['event_ticket_name'] 	= $event_name;
-								$this->_template_args['event_attendees'][$registration->ID()]['ticket_price'] 				= $ticket_price;
+							$registrations = $ticket->get_many_related('Registration', array(array('TXN_ID' => $this->_transaction->ID())));
+							foreach ($registrations as $registration) {
+								$this->_template_args['event_attendees'][$registration->ID()]['att_num'] = $registration->get('REG_count');
+								$this->_template_args['event_attendees'][$registration->ID()]['event_ticket_name'] = $event_name;
+								$this->_template_args['event_attendees'][$registration->ID()]['ticket_price'] = $ticket_price;
 								// attendee info
 								$attendee = $registration->get_first_related('Attendee');
-								if ( $attendee instanceof EE_Attendee ) {
+								if ($attendee instanceof EE_Attendee) {
 									$this->_template_args['event_attendees'][$registration->ID()]['att_id'] 			= $attendee->ID();
 									$this->_template_args['event_attendees'][$registration->ID()]['attendee'] 	= $attendee->full_name();
-									$this->_template_args['event_attendees'][$registration->ID()]['email'] 			= '<a href="mailto:' . $attendee->email() . '?subject=' . $event->get('EVT_name') . __(' Event', 'event_espresso') . '">' . $attendee->email() . '</a>';
-									$this->_template_args['event_attendees'][$registration->ID()]['address'] 		=  implode(',<br>', $attendee->full_address_as_array() );
+									$this->_template_args['event_attendees'][$registration->ID()]['email'] = '<a href="mailto:'.$attendee->email().'?subject='.$event->get('EVT_name').__(' Event', 'event_espresso').'">'.$attendee->email().'</a>';
+									$this->_template_args['event_attendees'][$registration->ID()]['address'] 		= implode(',<br>', $attendee->full_address_as_array());
 								} else {
 									$this->_template_args['event_attendees'][$registration->ID()]['att_id'] 			= '';
 									$this->_template_args['event_attendees'][$registration->ID()]['attendee'] 	= '';
-									$this->_template_args['event_attendees'][$registration->ID()]['email'] 			= '';
+									$this->_template_args['event_attendees'][$registration->ID()]['email'] = '';
 									$this->_template_args['event_attendees'][$registration->ID()]['address'] 		= '';
 								}
 							}
@@ -923,12 +923,12 @@ 
 				}
 			}
 
-			$this->_template_args['transaction_form_url'] = add_query_arg( array( 'action' => 'edit_transaction', 'process' => 'attendees'  ), TXN_ADMIN_URL );
-			echo EEH_Template::display_template( TXN_TEMPLATE_PATH . 'txn_admin_details_main_meta_box_attendees.template.php', $this->_template_args, TRUE );
+			$this->_template_args['transaction_form_url'] = add_query_arg(array('action' => 'edit_transaction', 'process' => 'attendees'), TXN_ADMIN_URL);
+			echo EEH_Template::display_template(TXN_TEMPLATE_PATH.'txn_admin_details_main_meta_box_attendees.template.php', $this->_template_args, TRUE);
 
 		} else {
 			echo sprintf(
-				__( '%1$sFor some reason, there are no attendees registered for this transaction. Likely the registration was abandoned in process.%2$s', 'event_espresso' ),
+				__('%1$sFor some reason, there are no attendees registered for this transaction. Likely the registration was abandoned in process.%2$s', 'event_espresso'),
 				'<p class="important-notice">',
 				'</p>'
 			);
@@ -947,20 +947,20 @@ 
 	 */
 	public function txn_registrant_side_meta_box() {
 		$primary_att = $this->_transaction->primary_registration() instanceof EE_Registration ? $this->_transaction->primary_registration()->get_first_related('Attendee') : null;
-		if ( ! $primary_att instanceof EE_Attendee ) {
+		if ( ! $primary_att instanceof EE_Attendee) {
 			$this->_template_args['no_attendee_message'] = __('There is no attached contact for this transaction.  The transaction either failed due to an error or was abandoned.', 'event_espresso');
 			$primary_att = EEM_Attendee::instance()->create_default_object();
 		}
-		$this->_template_args['ATT_ID'] 						= $primary_att->ID();
+		$this->_template_args['ATT_ID'] = $primary_att->ID();
 		$this->_template_args['prime_reg_fname']		= $primary_att->fname();
 		$this->_template_args['prime_reg_lname']		= $primary_att->lname();
-		$this->_template_args['prime_reg_email'] 		= $primary_att->email();
+		$this->_template_args['prime_reg_email'] = $primary_att->email();
 		$this->_template_args['prime_reg_phone'] 	= $primary_att->phone();
-		$this->_template_args['edit_attendee_url'] 	= EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'edit_attendee', 'post' => $primary_att->ID()  ), REG_ADMIN_URL );
+		$this->_template_args['edit_attendee_url'] = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'edit_attendee', 'post' => $primary_att->ID()), REG_ADMIN_URL);
 		// get formatted address for registrant
-		EE_Registry::instance()->load_helper( 'Formatter' );
-		$this->_template_args[ 'formatted_address' ] = EEH_Address::format( $primary_att );
-		echo EEH_Template::display_template( TXN_TEMPLATE_PATH . 'txn_admin_details_side_meta_box_registrant.template.php', $this->_template_args, TRUE );
+		EE_Registry::instance()->load_helper('Formatter');
+		$this->_template_args['formatted_address'] = EEH_Address::format($primary_att);
+		echo EEH_Template::display_template(TXN_TEMPLATE_PATH.'txn_admin_details_side_meta_box_registrant.template.php', $this->_template_args, TRUE);
 	}
 
 
@@ -976,12 +976,12 @@ 
 
 		$this->_template_args['billing_form'] = $this->_transaction->billing_info();
 		$this->_template_args['billing_form_url'] = add_query_arg(
-			array( 'action' => 'edit_transaction', 'process' => 'billing'  ),
+			array('action' => 'edit_transaction', 'process' => 'billing'),
 			TXN_ADMIN_URL
 		);
 
-		$template_path = TXN_TEMPLATE_PATH . 'txn_admin_details_side_meta_box_billing_info.template.php';
-		echo EEH_Template::display_template( $template_path, $this->_template_args, TRUE );/**/
+		$template_path = TXN_TEMPLATE_PATH.'txn_admin_details_side_meta_box_billing_info.template.php';
+		echo EEH_Template::display_template($template_path, $this->_template_args, TRUE); /**/
 	}
 
 
@@ -994,43 +994,43 @@ 
 	*	@return void
 	*/
 	public function apply_payments_or_refunds() {
-		$json_response_data = array( 'return_data' => FALSE );
+		$json_response_data = array('return_data' => FALSE);
 		$valid_data = $this->_validate_payment_request_data();
-		if ( ! empty( $valid_data ) ) {
-			$PAY_ID = $valid_data[ 'PAY_ID' ];
+		if ( ! empty($valid_data)) {
+			$PAY_ID = $valid_data['PAY_ID'];
 			//save  the new payment
-			$payment = $this->_create_payment_from_request_data( $valid_data );
+			$payment = $this->_create_payment_from_request_data($valid_data);
 			// get the TXN for this payment
 			$transaction = $payment->transaction();
 			// verify transaction
-			if ( $transaction instanceof EE_Transaction ) {
+			if ($transaction instanceof EE_Transaction) {
 				// calculate_total_payments_and_update_status
-				$this->_process_transaction_payments( $transaction );
-				$REG_IDs = $this->_get_REG_IDs_to_apply_payment_to( $payment );
-				$this->_remove_existing_registration_payments( $payment, $PAY_ID );
+				$this->_process_transaction_payments($transaction);
+				$REG_IDs = $this->_get_REG_IDs_to_apply_payment_to($payment);
+				$this->_remove_existing_registration_payments($payment, $PAY_ID);
 				// apply payment to registrations (if applicable)
-				if ( ! empty( $REG_IDs ) ) {
-					$this->_update_registration_payments( $transaction, $payment, $REG_IDs );
+				if ( ! empty($REG_IDs)) {
+					$this->_update_registration_payments($transaction, $payment, $REG_IDs);
 					$this->_maybe_send_notifications();
 					// now process status changes for the same registrations
-					$this->_process_registration_status_change( $transaction, $REG_IDs );
+					$this->_process_registration_status_change($transaction, $REG_IDs);
 				}
-				$this->_maybe_send_notifications( $payment );
+				$this->_maybe_send_notifications($payment);
 				//prepare to render page
-				$json_response_data[ 'return_data' ] = $this->_build_payment_json_response( $payment, $REG_IDs );
-				do_action( 'AHEE__Transactions_Admin_Page__apply_payments_or_refund__after_recording', $transaction, $payment );
+				$json_response_data['return_data'] = $this->_build_payment_json_response($payment, $REG_IDs);
+				do_action('AHEE__Transactions_Admin_Page__apply_payments_or_refund__after_recording', $transaction, $payment);
 			} else {
 				EE_Error::add_error(
-					__( 'A valid Transaction for this payment could not be retrieved.', 'event_espresso' ),
+					__('A valid Transaction for this payment could not be retrieved.', 'event_espresso'),
 					__FILE__, __FUNCTION__, __LINE__
 				);
 			}
 		} else {
-			EE_Error::add_error( __( 'The payment form data could not be processed. Please try again.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error(__('The payment form data could not be processed. Please try again.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
 
-		$notices = EE_Error::get_notices( FALSE, FALSE, FALSE );
-		echo json_encode( array_merge( $json_response_data, $notices ));
+		$notices = EE_Error::get_notices(FALSE, FALSE, FALSE);
+		echo json_encode(array_merge($json_response_data, $notices));
 		die();
 	}
 
@@ -1042,30 +1042,30 @@ 
 	 * @return array
 	 */
 	protected function _validate_payment_request_data() {
-		if ( ! isset( $this->_req_data[ 'txn_admin_payment' ] ) ) {
+		if ( ! isset($this->_req_data['txn_admin_payment'])) {
 			return false;
 		}
 		$payment_form = $this->_generate_payment_form_section();
 		try {
-			if ( $payment_form->was_submitted() ) {
+			if ($payment_form->was_submitted()) {
 				$payment_form->receive_form_submission();
-				if ( ! $payment_form->is_valid() ) {
+				if ( ! $payment_form->is_valid()) {
 					$submission_error_messages = array();
-					foreach ( $payment_form->get_validation_errors_accumulated() as $validation_error ) {
-						if ( $validation_error instanceof EE_Validation_Error ) {
+					foreach ($payment_form->get_validation_errors_accumulated() as $validation_error) {
+						if ($validation_error instanceof EE_Validation_Error) {
 							$submission_error_messages[] = sprintf(
-								_x( '%s : %s', 'Form Section Name : Form Validation Error', 'event_espresso' ),
+								_x('%s : %s', 'Form Section Name : Form Validation Error', 'event_espresso'),
 								$validation_error->get_form_section()->html_label_text(),
 								$validation_error->getMessage()
 							);
 						}
 					}
-					EE_Error::add_error( join( '<br />', $submission_error_messages ), __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_error(join('<br />', $submission_error_messages), __FILE__, __FUNCTION__, __LINE__);
 					return array();
 				}
 			}
-		} catch ( EE_Error $e ) {
-			EE_Error::add_error( $e->getMessage(), __FILE__, __FUNCTION__, __LINE__ );
+		} catch (EE_Error $e) {
+			EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
 			return array();
 		}
 		return $payment_form->valid_data();
@@ -1087,63 +1087,63 @@ 
 						array(
 							'default' => 0,
 							'required' => false,
-							'html_label_text' => __( 'Payment ID', 'event_espresso' ),
-							'validation_strategies' => array( new EE_Int_Normalization() )
+							'html_label_text' => __('Payment ID', 'event_espresso'),
+							'validation_strategies' => array(new EE_Int_Normalization())
 						)
 					),
 					'TXN_ID' => new EE_Text_Input(
 						array(
 							'default' => 0,
 							'required' => true,
-							'html_label_text' => __( 'Transaction ID', 'event_espresso' ),
-							'validation_strategies' => array( new EE_Int_Normalization() )
+							'html_label_text' => __('Transaction ID', 'event_espresso'),
+							'validation_strategies' => array(new EE_Int_Normalization())
 						)
 					),
 					'type' => new EE_Text_Input(
 						array(
 							'default' => 1,
 							'required' => true,
-							'html_label_text' => __( 'Payment or Refund', 'event_espresso' ),
-							'validation_strategies' => array( new EE_Int_Normalization() )
+							'html_label_text' => __('Payment or Refund', 'event_espresso'),
+							'validation_strategies' => array(new EE_Int_Normalization())
 						)
 					),
 					'amount' => new EE_Text_Input(
 						array(
 							'default' => 0,
 							'required' => true,
-							'html_label_text' => __( 'Payment amount', 'event_espresso' ),
-							'validation_strategies' => array( new EE_Float_Normalization() )
+							'html_label_text' => __('Payment amount', 'event_espresso'),
+							'validation_strategies' => array(new EE_Float_Normalization())
 						)
 					),
 					'status' => new EE_Text_Input(
 						array(
 							'default' => EEM_Payment::status_id_approved,
 							'required' => true,
-							'html_label_text' => __( 'Payment status', 'event_espresso' ),
+							'html_label_text' => __('Payment status', 'event_espresso'),
 						)
 					),
 					'PMD_ID' => new EE_Text_Input(
 						array(
 							'default' => 2,
 							'required' => true,
-							'html_label_text' => __( 'Payment Method', 'event_espresso' ),
-							'validation_strategies' => array( new EE_Int_Normalization() )
+							'html_label_text' => __('Payment Method', 'event_espresso'),
+							'validation_strategies' => array(new EE_Int_Normalization())
 						)
 					),
 					'date' => new EE_Text_Input(
 						array(
 							'default' => time(),
 							'required' => true,
-							'html_label_text' => __( 'Payment date', 'event_espresso' ),
+							'html_label_text' => __('Payment date', 'event_espresso'),
 						)
 					),
 					'txn_id_chq_nmbr' => new EE_Text_Input(
 						array(
 							'default' => '',
 							'required' => false,
-							'html_label_text' => __( 'Transaction or Cheque Number', 'event_espresso' ),
+							'html_label_text' => __('Transaction or Cheque Number', 'event_espresso'),
                                                         'validation_strategies' => array(
-                                                            new EE_Max_Length_Validation_Strategy( __('Input too long', 'event_espresso'), 100 ),
+                                                            new EE_Max_Length_Validation_Strategy(__('Input too long', 'event_espresso'), 100),
                                                         )
 						)
 					),
@@ -1151,9 +1151,9 @@ 
 						array(
 							'default' => '',
 							'required' => false,
-							'html_label_text' => __( 'Purchase Order Number', 'event_espresso' ),
+							'html_label_text' => __('Purchase Order Number', 'event_espresso'),
                                                         'validation_strategies' => array(
-                                                            new EE_Max_Length_Validation_Strategy( __('Input too long', 'event_espresso'), 100 ),
+                                                            new EE_Max_Length_Validation_Strategy(__('Input too long', 'event_espresso'), 100),
                                                         )
 						)
 					),
@@ -1161,9 +1161,9 @@ 
 						array(
 							'default' => '',
 							'required' => false,
-							'html_label_text' => __( 'Extra Field for Accounting', 'event_espresso' ),
+							'html_label_text' => __('Extra Field for Accounting', 'event_espresso'),
                                                         'validation_strategies' => array(
-                                                            new EE_Max_Length_Validation_Strategy( __('Input too long', 'event_espresso'), 100 ),
+                                                            new EE_Max_Length_Validation_Strategy(__('Input too long', 'event_espresso'), 100),
                                                         )
 						)
 					),
@@ -1180,37 +1180,37 @@ 
 	 * @param array $valid_data
 	 * @return EE_Payment
 	 */
-	protected function _create_payment_from_request_data( $valid_data ) {
-		$PAY_ID = $valid_data[ 'PAY_ID' ];
+	protected function _create_payment_from_request_data($valid_data) {
+		$PAY_ID = $valid_data['PAY_ID'];
 		// get payment amount
-		$amount = $valid_data[ 'amount' ] ? abs( $valid_data[ 'amount' ] ) : 0;
+		$amount = $valid_data['amount'] ? abs($valid_data['amount']) : 0;
 		// payments have a type value of 1 and refunds have a type value of -1
 		// so multiplying amount by type will give a positive value for payments, and negative values for refunds
-		$amount = $valid_data[ 'type' ] < 0 ? $amount * -1 : $amount;
+		$amount = $valid_data['type'] < 0 ? $amount * -1 : $amount;
 		// for some reason the date string coming in has extra spaces between the date and time.  This fixes that.
-		$date = $valid_data['date'] ? preg_replace( '/\s+/', ' ', $valid_data['date'] ) : date( 'Y-m-d g:i a', current_time( 'timestamp' ) );
+		$date = $valid_data['date'] ? preg_replace('/\s+/', ' ', $valid_data['date']) : date('Y-m-d g:i a', current_time('timestamp'));
 		$payment = EE_Payment::new_instance(
 			array(
-				'TXN_ID' 								=> $valid_data[ 'TXN_ID' ],
-				'STS_ID' 								=> $valid_data[ 'status' ],
+				'TXN_ID' 								=> $valid_data['TXN_ID'],
+				'STS_ID' 								=> $valid_data['status'],
 				'PAY_timestamp' 				=> $date,
 				'PAY_source'           			=> EEM_Payment_Method::scope_admin,
-				'PMD_ID'               				=> $valid_data[ 'PMD_ID' ],
+				'PMD_ID'               				=> $valid_data['PMD_ID'],
 				'PAY_amount'           			=> $amount,
-				'PAY_txn_id_chq_nmbr'  	=> $valid_data[ 'txn_id_chq_nmbr' ],
-				'PAY_po_number'        		=> $valid_data[ 'po_number' ],
-				'PAY_extra_accntng'    		=> $valid_data[ 'accounting' ],
+				'PAY_txn_id_chq_nmbr'  	=> $valid_data['txn_id_chq_nmbr'],
+				'PAY_po_number'        		=> $valid_data['po_number'],
+				'PAY_extra_accntng'    		=> $valid_data['accounting'],
 				'PAY_details'          				=> $valid_data,
 				'PAY_ID'               				=> $PAY_ID
 			),
 			'',
-			array( 'Y-m-d', 'g:i a' )
+			array('Y-m-d', 'g:i a')
 		);
 
-		if ( ! $payment->save() ) {
+		if ( ! $payment->save()) {
 			EE_Error::add_error(
 				sprintf(
-					__( 'Payment %1$d has not been successfully saved to the database.', 'event_espresso' ),
+					__('Payment %1$d has not been successfully saved to the database.', 'event_espresso'),
 					$payment->ID()
 				),
 				__FILE__, __FUNCTION__, __LINE__
@@ -1227,15 +1227,15 @@ 
 	 * @param \EE_Transaction $transaction
 	 * @return array
 	 */
-	protected function _process_transaction_payments( EE_Transaction $transaction ) {
+	protected function _process_transaction_payments(EE_Transaction $transaction) {
 		/** @type EE_Transaction_Payments $transaction_payments */
-		$transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' );
+		$transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments');
 		//update the transaction with this payment
-		if ( $transaction_payments->calculate_total_payments_and_update_status( $transaction ) ) {
-			EE_Error::add_success( __( 'The payment has been processed successfully.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if ($transaction_payments->calculate_total_payments_and_update_status($transaction)) {
+			EE_Error::add_success(__('The payment has been processed successfully.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		} else {
 			EE_Error::add_error(
-				__( 'The payment was processed successfully but the amount paid for the transaction was not updated.', 'event_espresso' )
+				__('The payment was processed successfully but the amount paid for the transaction was not updated.', 'event_espresso')
 				, __FILE__, __FUNCTION__, __LINE__
 			);
 		}
@@ -1251,19 +1251,19 @@ 
 	 * @param \EE_Payment $payment
 	 * @return array
 	 */
-	protected function _get_REG_IDs_to_apply_payment_to( EE_Payment $payment ) {
+	protected function _get_REG_IDs_to_apply_payment_to(EE_Payment $payment) {
 		$REG_IDs = array();
 		// grab array of IDs for specific registrations to apply changes to
-		if ( isset( $this->_req_data[ 'txn_admin_payment' ][ 'registrations' ] ) ) {
-			$REG_IDs = (array)$this->_req_data[ 'txn_admin_payment' ][ 'registrations' ];
+		if (isset($this->_req_data['txn_admin_payment']['registrations'])) {
+			$REG_IDs = (array) $this->_req_data['txn_admin_payment']['registrations'];
 		}
 		//nothing specified ? then get all reg IDs
-		if ( empty( $REG_IDs ) ) {
+		if (empty($REG_IDs)) {
 			$registrations = $payment->transaction()->registrations();
-			$REG_IDs = ! empty( $registrations ) ? array_keys( $registrations ) : $this->_get_existing_reg_payment_REG_IDs( $payment );
+			$REG_IDs = ! empty($registrations) ? array_keys($registrations) : $this->_get_existing_reg_payment_REG_IDs($payment);
 		}
 		// ensure that REG_IDs are integers and NOT strings
-		return array_map( 'intval', $REG_IDs );
+		return array_map('intval', $REG_IDs);
 	}
 
 
@@ -1280,7 +1280,7 @@ 
 	/**
 	 * @param array $existing_reg_payment_REG_IDs
 	 */
-	public function set_existing_reg_payment_REG_IDs( $existing_reg_payment_REG_IDs = null ) {
+	public function set_existing_reg_payment_REG_IDs($existing_reg_payment_REG_IDs = null) {
 		$this->_existing_reg_payment_REG_IDs = $existing_reg_payment_REG_IDs;
 	}
 
@@ -1295,13 +1295,13 @@ 
 	 * @param \EE_Payment $payment
 	 * @return array
 	 */
-	protected function _get_existing_reg_payment_REG_IDs( EE_Payment $payment ) {
-		if ( $this->existing_reg_payment_REG_IDs() === null ) {
+	protected function _get_existing_reg_payment_REG_IDs(EE_Payment $payment) {
+		if ($this->existing_reg_payment_REG_IDs() === null) {
 			// let's get any existing reg payment records for this payment
-			$existing_reg_payment_REG_IDs = $payment->get_many_related( 'Registration' );
+			$existing_reg_payment_REG_IDs = $payment->get_many_related('Registration');
 			// but we only want the REG IDs, so grab the array keys
-			$existing_reg_payment_REG_IDs = ! empty( $existing_reg_payment_REG_IDs ) ? array_keys( $existing_reg_payment_REG_IDs ) : array();
-			$this->set_existing_reg_payment_REG_IDs( $existing_reg_payment_REG_IDs );
+			$existing_reg_payment_REG_IDs = ! empty($existing_reg_payment_REG_IDs) ? array_keys($existing_reg_payment_REG_IDs) : array();
+			$this->set_existing_reg_payment_REG_IDs($existing_reg_payment_REG_IDs);
 		}
 		return $this->existing_reg_payment_REG_IDs();
 	}
@@ -1320,23 +1320,23 @@ 
 	 * @param int         $PAY_ID
 	 * @return bool;
 	 */
-	protected function _remove_existing_registration_payments( EE_Payment $payment, $PAY_ID = 0 ) {
+	protected function _remove_existing_registration_payments(EE_Payment $payment, $PAY_ID = 0) {
 		// newly created payments will have nothing recorded for $PAY_ID
-		if ( $PAY_ID == 0 ) {
+		if ($PAY_ID == 0) {
 			return false;
 		}
-		$existing_reg_payment_REG_IDs = $this->_get_existing_reg_payment_REG_IDs( $payment );
-		if ( empty( $existing_reg_payment_REG_IDs )) {
+		$existing_reg_payment_REG_IDs = $this->_get_existing_reg_payment_REG_IDs($payment);
+		if (empty($existing_reg_payment_REG_IDs)) {
 			return false;
 		}
 		/** @type EE_Transaction_Payments $transaction_payments */
-		$transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' );
+		$transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments');
 		return $transaction_payments->delete_registration_payments_and_update_registrations(
 			$payment,
 			array(
 				array(
 					'PAY_ID' => $payment->ID(),
-					'REG_ID' => array( 'IN', $existing_reg_payment_REG_IDs ),
+					'REG_ID' => array('IN', $existing_reg_payment_REG_IDs),
 				)
 			)
 		);
@@ -1355,25 +1355,25 @@ 
 	 * @param array $REG_IDs
 	 * @return bool
 	 */
-	protected function _update_registration_payments( EE_Transaction $transaction, EE_Payment $payment, $REG_IDs = array() ) {
+	protected function _update_registration_payments(EE_Transaction $transaction, EE_Payment $payment, $REG_IDs = array()) {
 		// we can pass our own custom set of registrations to EE_Payment_Processor::process_registration_payments()
 		// so let's do that using our set of REG_IDs from the form
 		$registration_query_where_params = array(
-			'REG_ID' => array( 'IN', $REG_IDs )
+			'REG_ID' => array('IN', $REG_IDs)
 		);
 		// but add in some conditions regarding payment,
 		// so that we don't apply payments to registrations that are free or have already been paid for
 		// but ONLY if the payment is NOT a refund ( ie: the payment amount is not negative )
-		if ( ! $payment->is_a_refund() ) {
-			$registration_query_where_params[ 'REG_final_price' ]  = array( '!=', 0 );
-			$registration_query_where_params[ 'REG_final_price*' ]  = array( '!=', 'REG_paid', true );
+		if ( ! $payment->is_a_refund()) {
+			$registration_query_where_params['REG_final_price'] = array('!=', 0);
+			$registration_query_where_params['REG_final_price*'] = array('!=', 'REG_paid', true);
 		}
 		//EEH_Debug_Tools::printr( $registration_query_where_params, '$registration_query_where_params', __FILE__, __LINE__ );
-		$registrations = $transaction->registrations( array( $registration_query_where_params ) );
-		if ( ! empty( $registrations ) ) {
+		$registrations = $transaction->registrations(array($registration_query_where_params));
+		if ( ! empty($registrations)) {
 			/** @type EE_Payment_Processor $payment_processor */
-			$payment_processor = EE_Registry::instance()->load_core( 'Payment_Processor' );
-			$payment_processor->process_registration_payments( $transaction, $payment, $registrations );
+			$payment_processor = EE_Registry::instance()->load_core('Payment_Processor');
+			$payment_processor->process_registration_payments($transaction, $payment, $registrations);
 		}
 	}
 
@@ -1389,22 +1389,22 @@ 
 	 * @param array $REG_IDs
 	 * @return bool
 	 */
-	protected function _process_registration_status_change( EE_Transaction $transaction, $REG_IDs = array() ) {
+	protected function _process_registration_status_change(EE_Transaction $transaction, $REG_IDs = array()) {
 		// first if there is no change in status then we get out.
 		if (
-			! isset( $this->_req_data['txn_reg_status_change'], $this->_req_data[ 'txn_reg_status_change' ][ 'reg_status' ] )
+			! isset($this->_req_data['txn_reg_status_change'], $this->_req_data['txn_reg_status_change']['reg_status'])
 			|| $this->_req_data['txn_reg_status_change']['reg_status'] == 'NAN'
 		) {
 			//no error message, no change requested, just nothing to do man.
 			return FALSE;
 		}
 		/** @type EE_Transaction_Processor $transaction_processor */
-		$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+		$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 		// made it here dude?  Oh WOW.  K, let's take care of changing the statuses
 		return $transaction_processor->manually_update_registration_statuses(
 			$transaction,
-			sanitize_text_field( $this->_req_data[ 'txn_reg_status_change' ][ 'reg_status' ] ),
-			array( array( 'REG_ID' => array( 'IN', $REG_IDs ) ) )
+			sanitize_text_field($this->_req_data['txn_reg_status_change']['reg_status']),
+			array(array('REG_ID' => array('IN', $REG_IDs)))
 		);
 	}
 
@@ -1419,16 +1419,16 @@ 
 	 * @param bool | null        $delete_txn_reg_status_change
 	 * @return array
 	 */
-	protected function _build_payment_json_response( EE_Payment $payment, $REG_IDs = array(), $delete_txn_reg_status_change = null ) {
+	protected function _build_payment_json_response(EE_Payment $payment, $REG_IDs = array(), $delete_txn_reg_status_change = null) {
 		// was the payment deleted ?
-		if ( is_bool( $delete_txn_reg_status_change )) {
+		if (is_bool($delete_txn_reg_status_change)) {
 			return array(
 				'PAY_ID' 				=> $payment->ID(),
 				'amount' 			=> $payment->amount(),
 				'total_paid' 			=> $payment->transaction()->paid(),
 				'txn_status' 			=> $payment->transaction()->status_ID(),
 				'pay_status' 		=> $payment->STS_ID(),
-				'registrations' 	=> $this->_registration_payment_data_array( $REG_IDs ),
+				'registrations' 	=> $this->_registration_payment_data_array($REG_IDs),
 				'delete_txn_reg_status_change' => $delete_txn_reg_status_change,
 			);
 		} else {
@@ -1440,16 +1440,16 @@ 
 				'pay_status' 	=> $payment->STS_ID(),
 				'PAY_ID'           => $payment->ID(),
 				'STS_ID' 			=> $payment->STS_ID(),
-				'status' 			=> self::$_pay_status[ $payment->STS_ID() ],
-				'date' 				=> $payment->timestamp( 'Y-m-d', 'h:i a' ),
-				'method' 		=> strtoupper( $payment->source() ),
+				'status' 			=> self::$_pay_status[$payment->STS_ID()],
+				'date' 				=> $payment->timestamp('Y-m-d', 'h:i a'),
+				'method' 		=> strtoupper($payment->source()),
 				'PM_ID' 			=> $payment->payment_method() ? $payment->payment_method()->ID() : 1,
-				'gateway' 		=> $payment->payment_method() ? $payment->payment_method()->admin_name() : __( "Unknown", 'event_espresso' ),
+				'gateway' 		=> $payment->payment_method() ? $payment->payment_method()->admin_name() : __("Unknown", 'event_espresso'),
 				'gateway_response' 	=> $payment->gateway_response(),
 				'txn_id_chq_nmbr'  	=> $payment->txn_id_chq_nmbr(),
 				'po_number'        		=> $payment->po_number(),
 				'extra_accntng'    		=> $payment->extra_accntng(),
-				'registrations'    			=> $this->_registration_payment_data_array( $REG_IDs ),
+				'registrations'    			=> $this->_registration_payment_data_array($REG_IDs),
 			);
 		}
 	}
@@ -1464,42 +1464,42 @@ 
 	*	@return void
 	*/
 	public function delete_payment() {
-		$json_response_data = array( 'return_data' => FALSE );
-		$PAY_ID = isset( $this->_req_data['delete_txn_admin_payment'], $this->_req_data['delete_txn_admin_payment']['PAY_ID'] ) ? absint( $this->_req_data['delete_txn_admin_payment']['PAY_ID'] ) : 0;
-		if ( $PAY_ID ) {
-			$delete_txn_reg_status_change = isset( $this->_req_data[ 'delete_txn_reg_status_change' ] ) ? $this->_req_data[ 'delete_txn_reg_status_change' ] : false;
-			$payment = EEM_Payment::instance()->get_one_by_ID( $PAY_ID );
-			if ( $payment instanceof EE_Payment ) {
-				$REG_IDs = $this->_get_existing_reg_payment_REG_IDs( $payment );
+		$json_response_data = array('return_data' => FALSE);
+		$PAY_ID = isset($this->_req_data['delete_txn_admin_payment'], $this->_req_data['delete_txn_admin_payment']['PAY_ID']) ? absint($this->_req_data['delete_txn_admin_payment']['PAY_ID']) : 0;
+		if ($PAY_ID) {
+			$delete_txn_reg_status_change = isset($this->_req_data['delete_txn_reg_status_change']) ? $this->_req_data['delete_txn_reg_status_change'] : false;
+			$payment = EEM_Payment::instance()->get_one_by_ID($PAY_ID);
+			if ($payment instanceof EE_Payment) {
+				$REG_IDs = $this->_get_existing_reg_payment_REG_IDs($payment);
 				/** @type EE_Transaction_Payments $transaction_payments */
-				$transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' );
-				if ( $transaction_payments->delete_payment_and_update_transaction( $payment )) {
-					EE_Error::add_success( __( 'The Payment was successfully deleted.', 'event_espresso' ) );
-					$json_response_data['return_data'] = $this->_build_payment_json_response( $payment, $REG_IDs, $delete_txn_reg_status_change );
-					if ( $delete_txn_reg_status_change ) {
+				$transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments');
+				if ($transaction_payments->delete_payment_and_update_transaction($payment)) {
+					EE_Error::add_success(__('The Payment was successfully deleted.', 'event_espresso'));
+					$json_response_data['return_data'] = $this->_build_payment_json_response($payment, $REG_IDs, $delete_txn_reg_status_change);
+					if ($delete_txn_reg_status_change) {
 						$this->_req_data['txn_reg_status_change'] = $delete_txn_reg_status_change;
 						//MAKE sure we also add the delete_txn_req_status_change to the
 						//$_REQUEST global because that's how messages will be looking for it.
 						$_REQUEST['txn_reg_status_change'] = $delete_txn_reg_status_change;
 						$this->_maybe_send_notifications();
-						$this->_process_registration_status_change( $payment->transaction(), $REG_IDs );
+						$this->_process_registration_status_change($payment->transaction(), $REG_IDs);
 						//$this->_maybe_send_notifications( $payment );
 					}
 				}
 			} else {
 				EE_Error::add_error(
-					__( 'Valid Payment data could not be retrieved from the database.', 'event_espresso' ),
+					__('Valid Payment data could not be retrieved from the database.', 'event_espresso'),
 					__FILE__, __FUNCTION__, __LINE__
 				);
 			}
 		} else {
 			EE_Error::add_error(
-				__( 'A valid Payment ID was not received, therefore payment form data could not be loaded.', 'event_espresso' ),
+				__('A valid Payment ID was not received, therefore payment form data could not be loaded.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 		}
-		$notices = EE_Error::get_notices( FALSE, FALSE, FALSE );
-		echo json_encode( array_merge( $json_response_data, $notices ));
+		$notices = EE_Error::get_notices(FALSE, FALSE, FALSE);
+		echo json_encode(array_merge($json_response_data, $notices));
 		die();
 	}
 
@@ -1513,17 +1513,17 @@ 
 	 * @param array $REG_IDs
 	 * @return array
 	 */
-	protected function _registration_payment_data_array( $REG_IDs ) {
+	protected function _registration_payment_data_array($REG_IDs) {
 		$registration_payment_data = array();
 		//if non empty reg_ids lets get an array of registrations and update the values for the apply_payment/refund rows.
-		if ( ! empty( $REG_IDs ) ) {
-			EE_Registry::instance()->load_helper( 'Template' );
-			$registrations = EEM_Registration::instance()->get_all( array( array( 'REG_ID' => array( 'IN', $REG_IDs ) ) ) );
-			foreach ( $registrations as $registration ) {
-				if ( $registration instanceof EE_Registration ) {
-					$registration_payment_data[ $registration->ID() ] = array(
+		if ( ! empty($REG_IDs)) {
+			EE_Registry::instance()->load_helper('Template');
+			$registrations = EEM_Registration::instance()->get_all(array(array('REG_ID' => array('IN', $REG_IDs))));
+			foreach ($registrations as $registration) {
+				if ($registration instanceof EE_Registration) {
+					$registration_payment_data[$registration->ID()] = array(
 						'paid' => $registration->pretty_paid(),
-						'owing' => EEH_Template::format_currency( $registration->final_price() - $registration->paid() ),
+						'owing' => EEH_Template::format_currency($registration->final_price() - $registration->paid()),
 					);
 				}
 			}
@@ -1543,30 +1543,30 @@ 
 	 * @access protected
 	 * @param \EE_Payment | null $payment
 	 */
-	protected function _maybe_send_notifications( $payment = null ) {
-		switch ( $payment instanceof EE_Payment ) {
+	protected function _maybe_send_notifications($payment = null) {
+		switch ($payment instanceof EE_Payment) {
 			// payment notifications
 			case true :
 				if (
 					isset(
-						$this->_req_data[ 'txn_payments' ],
-						$this->_req_data[ 'txn_payments' ][ 'send_notifications' ]
+						$this->_req_data['txn_payments'],
+						$this->_req_data['txn_payments']['send_notifications']
 					) &&
-					filter_var( $this->_req_data[ 'txn_payments' ][ 'send_notifications' ], FILTER_VALIDATE_BOOLEAN )
+					filter_var($this->_req_data['txn_payments']['send_notifications'], FILTER_VALIDATE_BOOLEAN)
 				) {
-					$this->_process_payment_notification( $payment );
+					$this->_process_payment_notification($payment);
 				}
 				break;
 			// registration notifications
 			case false :
 				if (
 					isset(
-						$this->_req_data[ 'txn_reg_status_change' ],
-						$this->_req_data[ 'txn_reg_status_change' ][ 'send_notifications' ]
+						$this->_req_data['txn_reg_status_change'],
+						$this->_req_data['txn_reg_status_change']['send_notifications']
 					) &&
-					filter_var( $this->_req_data[ 'txn_reg_status_change' ][ 'send_notifications' ], FILTER_VALIDATE_BOOLEAN )
+					filter_var($this->_req_data['txn_reg_status_change']['send_notifications'], FILTER_VALIDATE_BOOLEAN)
 				) {
-					add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true' );
+					add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true');
 				}
 				break;
 		}
@@ -1582,11 +1582,11 @@ 
 	*	@return void
 	*/
 	protected function _send_payment_reminder() {
-	    $TXN_ID = ( ! empty( $this->_req_data['TXN_ID'] )) ? absint( $this->_req_data['TXN_ID'] ) : FALSE;
-		$transaction = EEM_Transaction::instance()->get_one_by_ID( $TXN_ID );
-		$query_args = isset($this->_req_data['redirect_to'] ) ? array('action' => $this->_req_data['redirect_to'], 'TXN_ID' => $this->_req_data['TXN_ID'] ) : array();
-		do_action( 'AHEE__Transactions_Admin_Page___send_payment_reminder__process_admin_payment_reminder', $transaction );
-		$this->_redirect_after_action( FALSE, __('payment reminder', 'event_espresso'), __('sent', 'event_espresso'), $query_args, TRUE );
+	    $TXN_ID = ( ! empty($this->_req_data['TXN_ID'])) ? absint($this->_req_data['TXN_ID']) : FALSE;
+		$transaction = EEM_Transaction::instance()->get_one_by_ID($TXN_ID);
+		$query_args = isset($this->_req_data['redirect_to']) ? array('action' => $this->_req_data['redirect_to'], 'TXN_ID' => $this->_req_data['TXN_ID']) : array();
+		do_action('AHEE__Transactions_Admin_Page___send_payment_reminder__process_admin_payment_reminder', $transaction);
+		$this->_redirect_after_action(FALSE, __('payment reminder', 'event_espresso'), __('sent', 'event_espresso'), $query_args, TRUE);
 	}
 
 
@@ -1600,36 +1600,36 @@ 
 	 * @param string   $view
 	 * @return mixed int = count || array of transaction objects
 	 */
-	public function get_transactions( $perpage, $count = FALSE, $view = '' ) {
+	public function get_transactions($perpage, $count = FALSE, $view = '') {
 
 		$TXN = EEM_Transaction::instance();
 
-	    $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');
 
 	    //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 to correct format for query
-	$start_date = EEM_Transaction::instance()->convert_datetime_for_query( 'TXN_timestamp', date( 'Y-m-d H:i:s', $start_date ), 'Y-m-d H:i:s' );
-	$end_date = EEM_Transaction::instance()->convert_datetime_for_query( 'TXN_timestamp', date( 'Y-m-d H:i:s', $end_date ), 'Y-m-d H:i:s' );
+	$start_date = EEM_Transaction::instance()->convert_datetime_for_query('TXN_timestamp', date('Y-m-d H:i:s', $start_date), 'Y-m-d H:i:s');
+	$end_date = EEM_Transaction::instance()->convert_datetime_for_query('TXN_timestamp', date('Y-m-d H:i:s', $end_date), 'Y-m-d H:i:s');
 
 
 
 	    //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 'TXN_ID':
 				$orderby = 'TXN_ID';
 				break;
@@ -1643,66 +1643,66 @@ 
 				$orderby = 'TXN_timestamp';
 		}
 
-		$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( $perpage ) && !empty( $perpage ) ? $perpage : 10;
-		$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($perpage) && ! empty($perpage) ? $perpage : 10;
+		$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 = array( $offset, $per_page );
+		$offset = ($current_page - 1) * $per_page;
+		$limit = array($offset, $per_page);
 
 		$_where = array(
-			'TXN_timestamp' => array('BETWEEN', array($start_date, $end_date) ),
+			'TXN_timestamp' => array('BETWEEN', array($start_date, $end_date)),
 			'Registration.REG_count' => 1
 		);
 
-		if ( isset( $this->_req_data['EVT_ID'] ) ) {
+		if (isset($this->_req_data['EVT_ID'])) {
 			$_where['Registration.EVT_ID'] = $this->_req_data['EVT_ID'];
 		}
 
-		if ( isset( $this->_req_data['s'] ) ) {
-			$search_string = '%' . $this->_req_data['s'] . '%';
+		if (isset($this->_req_data['s'])) {
+			$search_string = '%'.$this->_req_data['s'].'%';
 			$_where['OR'] = array(
-				'Registration.Event.EVT_name' => array( 'LIKE', $search_string ),
-				'Registration.Event.EVT_desc' => array( 'LIKE', $search_string ),
-				'Registration.Event.EVT_short_desc' => array( 'LIKE' , $search_string ),
-				'Registration.Attendee.ATT_full_name' => array( 'LIKE', $search_string ),
-				'Registration.Attendee.ATT_fname' => array( 'LIKE', $search_string ),
-				'Registration.Attendee.ATT_lname' => array( 'LIKE', $search_string ),
-				'Registration.Attendee.ATT_short_bio' => array( 'LIKE', $search_string ),
-				'Registration.Attendee.ATT_email' => array('LIKE', $search_string ),
-				'Registration.Attendee.ATT_address' => array( 'LIKE', $search_string ),
-				'Registration.Attendee.ATT_address2' => array( 'LIKE', $search_string ),
-				'Registration.Attendee.ATT_city' => array( 'LIKE', $search_string ),
-				'Registration.REG_final_price' => array( 'LIKE', $search_string ),
-				'Registration.REG_code' => array( 'LIKE', $search_string ),
-				'Registration.REG_count' => array( 'LIKE' , $search_string ),
-				'Registration.REG_group_size' => array( 'LIKE' , $search_string ),
-				'Registration.Ticket.TKT_name' => array( 'LIKE', $search_string ),
-				'Registration.Ticket.TKT_description' => array( 'LIKE', $search_string ),
-				'Payment.PAY_source' => array('LIKE', $search_string ),
-				'Payment.Payment_Method.PMD_name' => array('LIKE', $search_string ),
-				'TXN_session_data' => array( 'LIKE', $search_string ),
-				'Payment.PAY_txn_id_chq_nmbr' => array( 'LIKE', $search_string )
+				'Registration.Event.EVT_name' => array('LIKE', $search_string),
+				'Registration.Event.EVT_desc' => array('LIKE', $search_string),
+				'Registration.Event.EVT_short_desc' => array('LIKE', $search_string),
+				'Registration.Attendee.ATT_full_name' => array('LIKE', $search_string),
+				'Registration.Attendee.ATT_fname' => array('LIKE', $search_string),
+				'Registration.Attendee.ATT_lname' => array('LIKE', $search_string),
+				'Registration.Attendee.ATT_short_bio' => array('LIKE', $search_string),
+				'Registration.Attendee.ATT_email' => array('LIKE', $search_string),
+				'Registration.Attendee.ATT_address' => array('LIKE', $search_string),
+				'Registration.Attendee.ATT_address2' => array('LIKE', $search_string),
+				'Registration.Attendee.ATT_city' => array('LIKE', $search_string),
+				'Registration.REG_final_price' => array('LIKE', $search_string),
+				'Registration.REG_code' => array('LIKE', $search_string),
+				'Registration.REG_count' => array('LIKE', $search_string),
+				'Registration.REG_group_size' => array('LIKE', $search_string),
+				'Registration.Ticket.TKT_name' => array('LIKE', $search_string),
+				'Registration.Ticket.TKT_description' => array('LIKE', $search_string),
+				'Payment.PAY_source' => array('LIKE', $search_string),
+				'Payment.Payment_Method.PMD_name' => array('LIKE', $search_string),
+				'TXN_session_data' => array('LIKE', $search_string),
+				'Payment.PAY_txn_id_chq_nmbr' => array('LIKE', $search_string)
 				);
 		}
 
 		//failed transactions
-		$failed = ( ! empty( $this->_req_data['status'] ) && $this->_req_data['status'] == 'failed' && ! $count ) || ( $count && $view == 'failed' ) ? TRUE: FALSE;
-		$abandoned = ( ! empty( $this->_req_data['status'] ) && $this->_req_data['status'] == 'abandoned' && ! $count ) || ( $count && $view == 'abandoned' ) ? TRUE: FALSE;
+		$failed = ( ! empty($this->_req_data['status']) && $this->_req_data['status'] == 'failed' && ! $count) || ($count && $view == 'failed') ? TRUE : FALSE;
+		$abandoned = ( ! empty($this->_req_data['status']) && $this->_req_data['status'] == 'abandoned' && ! $count) || ($count && $view == 'abandoned') ? TRUE : FALSE;
 
-		if ( $failed ) {
-			$_where[ 'STS_ID' ] = EEM_Transaction::failed_status_code;
-		} else if ( $abandoned ) {
+		if ($failed) {
+			$_where['STS_ID'] = EEM_Transaction::failed_status_code;
+		} else if ($abandoned) {
 				$_where['STS_ID'] = EEM_Transaction::abandoned_status_code;
 		} else {
-				$_where['STS_ID'] = array( '!=', EEM_Transaction::failed_status_code );
-				$_where['STS_ID*'] = array( '!=', EEM_Transaction::abandoned_status_code );
+				$_where['STS_ID'] = array('!=', EEM_Transaction::failed_status_code);
+				$_where['STS_ID*'] = array('!=', EEM_Transaction::abandoned_status_code);
 		}
 
-		$query_params = array( $_where, 'order_by' => array( $orderby => $sort ), 'limit' => $limit );
+		$query_params = array($_where, 'order_by' => array($orderby => $sort), 'limit' => $limit);
 
-		$transactions = $count ? $TXN->count( array($_where), 'TXN_ID', TRUE ) : $TXN->get_all($query_params);
+		$transactions = $count ? $TXN->count(array($_where), 'TXN_ID', TRUE) : $TXN->get_all($query_params);
 
 
 		return $transactions;

core/libraries/plugin_api/EE_Register_Addon.lib.php

Indentation +4 added lines, -4 removed lines

@@ -138,10 +138,10 @@
 	 *       		 An array of message types with the key as the message type name and the values as below:
 	 *        		@type string $mtfilename The filename of the message type being registered.  This will be the main
 	 *                                       EE_{Messagetype_Name}_message_type class. (eg. EE_Declined_Registration_message_type.class.php). Required.
-	*               @type array $autoloadpaths An array of paths to add to the messages autoloader for the new message type. Required.
-	*               @type array $messengers_to_activate_with An array of messengers that this message
-	*                           type should activate with. Each value in the array should match the name property of a EE_messenger. Optional.
-	*               @type array $messengers_to_validate_with An array of messengers that this message
+	 *               @type array $autoloadpaths An array of paths to add to the messages autoloader for the new message type. Required.
+	 *               @type array $messengers_to_activate_with An array of messengers that this message
+	 *                           type should activate with. Each value in the array should match the name property of a EE_messenger. Optional.
+	 *               @type array $messengers_to_validate_with An array of messengers that this message
 	 *                          type should validate with. Each value in the array should match the name property of an EE_messenger. Optional.
 	 *       	}
 	 *			@type array $custom_post_types

Spacing +170 added lines, -170 removed lines

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

modules/ticket_selector/EED_Ticket_Selector.module.php

Indentation +33 added lines, -33 removed lines

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

Spacing +210 added lines, -210 removed lines

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

core/EE_Request_Handler.core.php

Spacing +77 added lines, -77 removed lines

@@ -65,13 +65,13 @@ 
 	 * @param WP $wp
 	 * @return \EE_Request_Handler
 	 */
-	public function __construct( $wp = null ) {
+	public function __construct($wp = null) {
 		// grab request vars
 		$this->_params = $_REQUEST;
 		// AJAX ???
-		$this->ajax = defined( 'DOING_AJAX' ) ? true : false;
-		$this->front_ajax = $this->is_set( 'ee_front_ajax' ) && $this->get( 'ee_front_ajax' ) == 1 ? true : false;
-		do_action( 'AHEE__EE_Request_Handler__construct__complete' );
+		$this->ajax = defined('DOING_AJAX') ? true : false;
+		$this->front_ajax = $this->is_set('ee_front_ajax') && $this->get('ee_front_ajax') == 1 ? true : false;
+		do_action('AHEE__EE_Request_Handler__construct__complete');
 	}
 
 
@@ -83,12 +83,12 @@ 
 	 * @param WP $wp
 	 * @return void
 	 */
-	public function parse_request( $wp = null ) {
+	public function parse_request($wp = null) {
 		//if somebody forgot to provide us with WP, that's ok because its global
-		if ( ! $wp instanceof WP ) {
+		if ( ! $wp instanceof WP) {
 			global $wp;
 		}
-		$this->set_request_vars( $wp );
+		$this->set_request_vars($wp);
 	}
 
 
@@ -100,14 +100,14 @@ 
 	 * @param WP $wp
 	 * @return void
 	 */
-	public function set_request_vars( $wp = null ) {
-		if ( ! is_admin() ) {
+	public function set_request_vars($wp = null) {
+		if ( ! is_admin()) {
 			// set request post_id
-			$this->set( 'post_id', $this->get_post_id_from_request( $wp ));
+			$this->set('post_id', $this->get_post_id_from_request($wp));
 			// set request post name
-			$this->set( 'post_name', $this->get_post_name_from_request( $wp ));
+			$this->set('post_name', $this->get_post_name_from_request($wp));
 			// set request post_type
-			$this->set( 'post_type', $this->get_post_type_from_request( $wp ));
+			$this->set('post_type', $this->get_post_type_from_request($wp));
 			// true or false ? is this page being used by EE ?
 			$this->set_espresso_page();
 		}
@@ -122,20 +122,20 @@ 
 	 * @param WP $wp
 	 * @return int
 	 */
-	public function get_post_id_from_request( $wp = null ) {
-		if ( ! $wp instanceof WP ){
+	public function get_post_id_from_request($wp = null) {
+		if ( ! $wp instanceof WP) {
 			global $wp;
 		}
 		$post_id = null;
-		if ( isset( $wp->query_vars['p'] )) {
+		if (isset($wp->query_vars['p'])) {
 			$post_id = $wp->query_vars['p'];
 		}
-		if ( ! $post_id && isset( $wp->query_vars['page_id'] )) {
+		if ( ! $post_id && isset($wp->query_vars['page_id'])) {
 			$post_id = $wp->query_vars['page_id'];
 		}
-		if ( ! $post_id && isset( $wp->request )) {
-			if ( is_numeric( basename( $wp->request ))) {
-				$post_id = basename( $wp->request );
+		if ( ! $post_id && isset($wp->request)) {
+			if (is_numeric(basename($wp->request))) {
+				$post_id = basename($wp->request);
 			}
 		}
 		return $post_id;
@@ -150,35 +150,35 @@ 
 	 * @param WP $wp
 	 * @return string
 	 */
-	public function get_post_name_from_request( $wp = null ) {
-		if ( ! $wp instanceof WP ){
+	public function get_post_name_from_request($wp = null) {
+		if ( ! $wp instanceof WP) {
 			global $wp;
 		}
 		$post_name = null;
-		if ( isset( $wp->query_vars['name'] ) && ! empty( $wp->query_vars['name'] )) {
+		if (isset($wp->query_vars['name']) && ! empty($wp->query_vars['name'])) {
 			$post_name = $wp->query_vars['name'];
 		}
-		if ( ! $post_name && isset( $wp->query_vars['pagename'] ) && ! empty( $wp->query_vars['pagename'] )) {
+		if ( ! $post_name && isset($wp->query_vars['pagename']) && ! empty($wp->query_vars['pagename'])) {
 			$post_name = $wp->query_vars['pagename'];
 		}
-		if ( ! $post_name && isset( $wp->request ) && ! empty( $wp->request )) {
-			$possible_post_name = basename( $wp->request );
-			if ( ! is_numeric( $possible_post_name )) {
+		if ( ! $post_name && isset($wp->request) && ! empty($wp->request)) {
+			$possible_post_name = basename($wp->request);
+			if ( ! is_numeric($possible_post_name)) {
 				/** @type WPDB $wpdb */
 				global $wpdb;
 				$SQL = "SELECT ID from $wpdb->posts WHERE post_status='publish' AND post_name=%s";
-				$possible_post_name = $wpdb->get_var( $wpdb->prepare( $SQL, $possible_post_name ));
-				if ( $possible_post_name ) {
+				$possible_post_name = $wpdb->get_var($wpdb->prepare($SQL, $possible_post_name));
+				if ($possible_post_name) {
 					$post_name = $possible_post_name;
 				}
 			}
 		}
-		if ( ! $post_name && $this->get( 'post_id' )) {
+		if ( ! $post_name && $this->get('post_id')) {
 			/** @type WPDB $wpdb */
 			global $wpdb;
 			$SQL = "SELECT post_name from $wpdb->posts WHERE post_status='publish' AND ID=%d";
-			$possible_post_name = $wpdb->get_var( $wpdb->prepare( $SQL, $this->get( 'post_id' )));
-			if( $possible_post_name ) {
+			$possible_post_name = $wpdb->get_var($wpdb->prepare($SQL, $this->get('post_id')));
+			if ($possible_post_name) {
 				$post_name = $possible_post_name;
 			}
 		}
@@ -194,11 +194,11 @@ 
 	 * @param WP $wp
 	 * @return mixed
 	 */
-	public function get_post_type_from_request( $wp = null ) {
-		if ( ! $wp instanceof WP ){
+	public function get_post_type_from_request($wp = null) {
+		if ( ! $wp instanceof WP) {
 			global $wp;
 		}
-		return isset( $wp->query_vars['post_type'] ) ? $wp->query_vars['post_type'] : null;
+		return isset($wp->query_vars['post_type']) ? $wp->query_vars['post_type'] : null;
 	}
 
 
@@ -208,18 +208,18 @@ 
 	 * @param  WP $wp
 	 * @return bool|string|void
 	 */
-	public function get_current_page_permalink( $wp = null ) {
-		$post_id = $this->get_post_id_from_request( $wp );
-		if ( $post_id ) {
-			$current_page_permalink = get_permalink( $post_id );
+	public function get_current_page_permalink($wp = null) {
+		$post_id = $this->get_post_id_from_request($wp);
+		if ($post_id) {
+			$current_page_permalink = get_permalink($post_id);
 		} else {
-			if ( ! $wp instanceof WP ) {
+			if ( ! $wp instanceof WP) {
 				global $wp;
 			}
-			if ( $wp->request ) {
-				$current_page_permalink = site_url( $wp->request );
+			if ($wp->request) {
+				$current_page_permalink = site_url($wp->request);
 			} else {
-				$current_page_permalink = esc_url( site_url( $_SERVER[ 'REQUEST_URI' ] ) );
+				$current_page_permalink = esc_url(site_url($_SERVER['REQUEST_URI']));
 			}
 		}
 		return $current_page_permalink;
@@ -236,41 +236,41 @@ 
 	public function test_for_espresso_page() {
 		global $wp;
 		/** @type EE_CPT_Strategy $EE_CPT_Strategy */
-		$EE_CPT_Strategy = EE_Registry::instance()->load_core( 'CPT_Strategy' );
+		$EE_CPT_Strategy = EE_Registry::instance()->load_core('CPT_Strategy');
 		$espresso_CPT_taxonomies = $EE_CPT_Strategy->get_CPT_taxonomies();
-		if ( is_array( $espresso_CPT_taxonomies ) ) {
-			foreach ( $espresso_CPT_taxonomies as $espresso_CPT_taxonomy =>$details ) {
-				if ( isset( $wp->query_vars, $wp->query_vars[ $espresso_CPT_taxonomy ] ) ) {
+		if (is_array($espresso_CPT_taxonomies)) {
+			foreach ($espresso_CPT_taxonomies as $espresso_CPT_taxonomy =>$details) {
+				if (isset($wp->query_vars, $wp->query_vars[$espresso_CPT_taxonomy])) {
 					return true;
 				}
 			}
 		}
 		// load espresso CPT endpoints
 		$espresso_CPT_endpoints = $EE_CPT_Strategy->get_CPT_endpoints();
-		$post_type_CPT_endpoints = array_flip( $espresso_CPT_endpoints );
-		$post_types = (array)$this->get( 'post_type' );
-		foreach ( $post_types as $post_type ) {
+		$post_type_CPT_endpoints = array_flip($espresso_CPT_endpoints);
+		$post_types = (array) $this->get('post_type');
+		foreach ($post_types as $post_type) {
 			// was a post name passed ?
-			if ( isset( $post_type_CPT_endpoints[ $post_type ] ) ) {
+			if (isset($post_type_CPT_endpoints[$post_type])) {
 				// kk we know this is an espresso page, but is it a specific post ?
-				if ( ! $this->get( 'post_name' ) ) {
+				if ( ! $this->get('post_name')) {
 					// there's no specific post name set, so maybe it's one of our endpoints like www.domain.com/events
-					$post_name = isset( $post_type_CPT_endpoints[ $this->get( 'post_type' ) ] ) ? $post_type_CPT_endpoints[ $this->get( 'post_type' ) ] : null;
+					$post_name = isset($post_type_CPT_endpoints[$this->get('post_type')]) ? $post_type_CPT_endpoints[$this->get('post_type')] : null;
 					// if the post type matches on of our then set the endpoint
-					if ( $post_name ) {
-						$this->set( 'post_name', $post_name );
+					if ($post_name) {
+						$this->set('post_name', $post_name);
 					}
 				}
 				return true;
 			}
 		}
-		if ( $this->get( 'post_name' )) {
+		if ($this->get('post_name')) {
 			// load all pages using espresso shortcodes
-			$post_shortcodes = isset( EE_Registry::instance()->CFG->core->post_shortcodes ) ? EE_Registry::instance()->CFG->core->post_shortcodes : array();
+			$post_shortcodes = isset(EE_Registry::instance()->CFG->core->post_shortcodes) ? EE_Registry::instance()->CFG->core->post_shortcodes : array();
 			// make sure core pages are included
-			$espresso_pages = array_merge( $espresso_CPT_endpoints, $post_shortcodes );
+			$espresso_pages = array_merge($espresso_CPT_endpoints, $post_shortcodes);
 			// was a post name passed ?
-			if (  isset( $espresso_pages[ $this->get( 'post_name' ) ] )) {
+			if (isset($espresso_pages[$this->get('post_name')])) {
 				 return true;
 			}
 		}
@@ -286,7 +286,7 @@ 
 	 * @param null $value
 	 * @return    mixed
 	 */
-	public function set_espresso_page( $value = null ) {
+	public function set_espresso_page($value = null) {
 		$value = $value ? $value : $this->test_for_espresso_page();
 		$this->_params['is_espresso_page'] = $value;
 	}
@@ -300,7 +300,7 @@ 
 	 *  @return 	mixed
 	 */
 	public function is_espresso_page() {
-		return isset( $this->_params['is_espresso_page'] ) ? $this->_params['is_espresso_page'] : false;
+		return isset($this->_params['is_espresso_page']) ? $this->_params['is_espresso_page'] : false;
 	}
 
 
@@ -324,10 +324,10 @@ 
 	 * @param bool $override_ee
 	 * @return    void
 	 */
-	public function set( $key, $value, $override_ee = false ) {
+	public function set($key, $value, $override_ee = false) {
 		// don't allow "ee" to be overwritten unless explicitly instructed to do so
-		if ( $key != 'ee' || ( $key == 'ee' && empty( $this->_params['ee'] )) || ( $key == 'ee' && ! empty( $this->_params['ee'] ) && $override_ee )) {
-			$this->_params[ $key ] = $value;
+		if ($key != 'ee' || ($key == 'ee' && empty($this->_params['ee'])) || ($key == 'ee' && ! empty($this->_params['ee']) && $override_ee)) {
+			$this->_params[$key] = $value;
 		}
 	}
 
@@ -341,8 +341,8 @@ 
 	 * @param null $default
 	 * @return    mixed
 	 */
-	public function get( $key, $default = null ) {
-		return isset( $this->_params[ $key ] ) ? $this->_params[ $key ] : $default;
+	public function get($key, $default = null) {
+		return isset($this->_params[$key]) ? $this->_params[$key] : $default;
 	}
 
 
@@ -354,8 +354,8 @@ 
 	 * @param $key
 	 * @return    boolean
 	 */
-	public function is_set( $key ) {
-		return isset( $this->_params[ $key ] ) ? true : false;
+	public function is_set($key) {
+		return isset($this->_params[$key]) ? true : false;
 	}
 
 
@@ -367,8 +367,8 @@ 
 	 * @param $key
 	 * @return    void
 	 */
-	public function un_set( $key ) {
-		unset( $this->_params[ $key ] );
+	public function un_set($key) {
+		unset($this->_params[$key]);
 	}
 
 
@@ -381,8 +381,8 @@ 
 	 * @param $value
 	 * @return    void
 	 */
-	public function set_notice( $key, $value ) {
-		$this->_notice[ $key ] = $value;
+	public function set_notice($key, $value) {
+		$this->_notice[$key] = $value;
 	}
 
 
@@ -394,8 +394,8 @@ 
 	 * @param $key
 	 * @return    mixed
 	 */
-	public function get_notice( $key ) {
-		return isset( $this->_notice[ $key ] ) ? $this->_notice[ $key ] : null;
+	public function get_notice($key) {
+		return isset($this->_notice[$key]) ? $this->_notice[$key] : null;
 	}
 
 
@@ -407,7 +407,7 @@ 
 	 * @param $string
 	 * @return    void
 	 */
-	public function add_output( $string ) {
+	public function add_output($string) {
 		$this->_output .= $string;
 	}
 
@@ -429,8 +429,8 @@ 
 	 * @param $item
 	 * @param $key
 	 */
-	function sanitize_text_field_for_array_walk( &$item, &$key ) {
-		$item = strpos( $item, 'email' ) !== false ? sanitize_email( $item ) : sanitize_text_field( $item );
+	function sanitize_text_field_for_array_walk(&$item, &$key) {
+		$item = strpos($item, 'email') !== false ? sanitize_email($item) : sanitize_text_field($item);
 	}
 
 
@@ -440,7 +440,7 @@ 
 	 * @param $b
 	 * @return bool
 	 */
-	public function __set($a,$b) { return false; }
+	public function __set($a, $b) { return false; }
 
 
 

core/EE_Config.core.php

Indentation +161 added lines, -161 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				Event Espresso
- * @ 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_Config
- *
- * @package			Event Espresso
- * @subpackage		core/
- * @author				Brent Christensen
- *
- * ------------------------------------------------------------------------
- */
+	 * Event Espresso
+	 *
+	 * Event Registration and Management Plugin for WordPress
+	 *
+	 * @ package			Event Espresso
+	 * @ author				Event Espresso
+	 * @ 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_Config
+	 *
+	 * @package			Event Espresso
+	 * @subpackage		core/
+	 * @author				Brent Christensen
+	 *
+	 * ------------------------------------------------------------------------
+	 */
 final class EE_Config {
 
 
@@ -89,10 +89,10 @@ 
 	public $map_settings = null;
 
 	/**
-	*
-	* @deprecated
-	* @var EE_Gateway_Config
-	*/
+	 *
+	 * @deprecated
+	 * @var EE_Gateway_Config
+	 */
 	public $gateway = null;
 
 	/**
@@ -582,7 +582,7 @@ 
 
 	/**
 	 *    update_config
-         * Important: the config object must ALREADY be set, otherwise this will produce an error.
+	 * Important: the config object must ALREADY be set, otherwise this will produce an error.
 	 *
 	 * @access    public
 	 * @param    string                 $section
@@ -1606,51 +1606,51 @@ 
 class EE_Organization_Config extends EE_Config_Base {
 
 	/**
-	* @var string  $name
-	* eg EE4.1
-	*/
+	 * @var string  $name
+	 * eg EE4.1
+	 */
 	public $name;
 
 	/**
-	* @var string $address_1
-	* eg 123 Onna Road
-	*/
+	 * @var string $address_1
+	 * eg 123 Onna Road
+	 */
 	public $address_1;
 
 	/**
-	* @var string $address_2
-	* eg PO Box 123
-	*/
+	 * @var string $address_2
+	 * eg PO Box 123
+	 */
 	public $address_2;
 
 	/**
-	* @var string $city
-	* eg Inna City
-	*/
+	 * @var string $city
+	 * eg Inna City
+	 */
 	public $city;
 
 	/**
-	* @var int $STA_ID
-	* eg 4
-	*/
+	 * @var int $STA_ID
+	 * eg 4
+	 */
 	public $STA_ID;
 
 	/**
-	* @var string  $CNT_ISO
-	* eg US
-	*/
+	 * @var string  $CNT_ISO
+	 * eg US
+	 */
 	public $CNT_ISO;
 
 	/**
-	* @var string $zip
-	* eg 12345  or V1A 2B3
-	*/
+	 * @var string $zip
+	 * eg 12345  or V1A 2B3
+	 */
 	public $zip;
 
 	/**
-	* @var string  $email
-	* eg support@eventespresso.com
-	*/
+	 * @var string  $email
+	 * eg support@eventespresso.com
+	 */
 	public $email;
 
 
@@ -1669,9 +1669,9 @@ 
 	public $vat;
 
 	/**
-	* @var string  $logo_url
-	* eg http://www.somedomain.com/wp-content/uploads/kittehs.jpg
-	*/
+	 * @var string  $logo_url
+	 * eg http://www.somedomain.com/wp-content/uploads/kittehs.jpg
+	 */
 	public $logo_url;
 
 
@@ -1765,55 +1765,55 @@ 
 class EE_Currency_Config extends EE_Config_Base {
 
 	/**
-	* @var string  $code
-	* eg 'US'
-	*/
+	 * @var string  $code
+	 * eg 'US'
+	 */
 	public $code;
 
 	/**
-	* @var string $name
-	* eg 'Dollar'
-	*/
+	 * @var string $name
+	 * eg 'Dollar'
+	 */
 	public $name;
 
 	/**
-	* plural name
-	* @var string $plural
-	* eg 'Dollars'
-	*/
+	 * plural name
+	 * @var string $plural
+	 * eg 'Dollars'
+	 */
 	public $plural;
 
 	/**
-	* currency sign
-	* @var string  $sign
-	* eg '$'
-	*/
+	 * currency sign
+	 * @var string  $sign
+	 * eg '$'
+	 */
 	public $sign;
 
 	/**
-	* Whether the currency sign should come before the number or not
-	* @var boolean $sign_b4
-	*/
+	 * Whether the currency sign should come before the number or not
+	 * @var boolean $sign_b4
+	 */
 	public $sign_b4;
 
 	/**
-	* How many digits should come after the decimal place
-	* @var int $dec_plc
-	*/
+	 * How many digits should come after the decimal place
+	 * @var int $dec_plc
+	 */
 	public $dec_plc;
 
 	/**
-	* Symbol to use for decimal mark
-	* @var string $dec_mrk
-	* eg '.'
-	*/
+	 * Symbol to use for decimal mark
+	 * @var string $dec_mrk
+	 * eg '.'
+	 */
 	public $dec_mrk;
 
 	/**
-	* Symbol to use for thousands
-	* @var string $thsnds
-	* eg ','
-	*/
+	 * Symbol to use for thousands
+	 * @var string $thsnds
+	 * eg ','
+	 */
 	public $thsnds;
 
 
@@ -1881,13 +1881,13 @@ 
 	 * 	whether or not to show alternate payment options during the reg process if payment status is pending
 	 * @var boolean $show_pending_payment_options
 	 */
-      public $show_pending_payment_options;
+	  public $show_pending_payment_options;
 
 	/**
 	 * Whether to skip the registration confirmation page
 	 * @var boolean $skip_reg_confirmation
 	 */
-      public $skip_reg_confirmation;
+	  public $skip_reg_confirmation;
 
 	/**
 	 * an array of SPCO reg steps where:
@@ -1898,64 +1898,64 @@ 
 	 * 			"slug" => the URL param used to trigger the reg step
 	 * @var array $reg_steps
 	 */
-      public $reg_steps;
+	  public $reg_steps;
 
 	/**
 	 * Whether registration confirmation should be the last page of SPCO
 	 * @var boolean $reg_confirmation_last
 	 */
-      public $reg_confirmation_last;
+	  public $reg_confirmation_last;
 
 	  /**
 	   * Whether or not to enable the EE Bot Trap
 	   * @var boolean $use_bot_trap
 	   */
-      public $use_bot_trap;
+	  public $use_bot_trap;
 
 	  /**
 	   * Whether or not to encrypt some data sent by the EE Bot Trap
 	   * @var boolean $use_encryption
 	   */
-      public $use_encryption;
+	  public $use_encryption;
 
 	  /**
 	   * Whether or not to use ReCaptcha
 	   * @var boolean $use_captcha
 	   */
-      public $use_captcha;
+	  public $use_captcha;
 
 	  /**
 	   * ReCaptcha Theme
 	   * @var string $recaptcha_theme
 	   * 	options: 'dark	', 'light'
 	   */
-      public $recaptcha_theme;
+	  public $recaptcha_theme;
 
 	  /**
 	   * ReCaptcha Type
 	   * @var string $recaptcha_type
 	   * 	options: 'audio', 'image'
 	   */
-      public $recaptcha_type;
+	  public $recaptcha_type;
 
 	  /**
 	   * ReCaptcha language
 	   * @var string $recaptcha_language
 	   * eg 'en'
 	   */
-      public $recaptcha_language;
+	  public $recaptcha_language;
 
 	  /**
 	   * ReCaptcha public key
 	   * @var string $recaptcha_publickey
 	   */
-      public $recaptcha_publickey;
+	  public $recaptcha_publickey;
 
 	  /**
 	   * ReCaptcha private key
 	   * @var string $recaptcha_privatekey
 	   */
-      public $recaptcha_privatekey;
+	  public $recaptcha_privatekey;
 
 	/**
 	 * ReCaptcha width
@@ -2021,58 +2021,58 @@ 
 class EE_Admin_Config extends EE_Config_Base {
 
 	/**
-	* @var boolean $use_personnel_manager
-	*/
+	 * @var boolean $use_personnel_manager
+	 */
 	public $use_personnel_manager;
 
 	/**
-	* @var boolean $use_dashboard_widget
-	*/
+	 * @var boolean $use_dashboard_widget
+	 */
 	public $use_dashboard_widget;
 
 	/**
-	* @var int $events_in_dashboard
-	*/
+	 * @var int $events_in_dashboard
+	 */
 	public $events_in_dashboard;
 
 	/**
-	* @var boolean $use_event_timezones
-	*/
+	 * @var boolean $use_event_timezones
+	 */
 	public $use_event_timezones;
 
 	/**
-	* @var boolean $use_full_logging
-	*/
+	 * @var boolean $use_full_logging
+	 */
 	public $use_full_logging;
 
 	/**
-	* @var string $log_file_name
-	*/
+	 * @var string $log_file_name
+	 */
 	public $log_file_name;
 
 	/**
-	* @var string $debug_file_name
-	*/
+	 * @var string $debug_file_name
+	 */
 	public $debug_file_name;
 
 	/**
-	* @var boolean $use_remote_logging
-	*/
+	 * @var boolean $use_remote_logging
+	 */
 	public $use_remote_logging;
 
 	/**
-	* @var string $remote_logging_url
-	*/
+	 * @var string $remote_logging_url
+	 */
 	public $remote_logging_url;
 
 	/**
-	* @var boolean $show_reg_footer
-	*/
+	 * @var boolean $show_reg_footer
+	 */
 	public $show_reg_footer;
 
 	/**
-	* @var string $affiliate_id
-	*/
+	 * @var string $affiliate_id
+	 */
 	public $affiliate_id;
 
 
@@ -2146,43 +2146,43 @@ 
 class EE_Template_Config extends EE_Config_Base {
 
 	/**
-	* @var boolean $enable_default_style
-	*/
+	 * @var boolean $enable_default_style
+	 */
 	public $enable_default_style;
 
 	/**
-	* @var string $custom_style_sheet
-	*/
+	 * @var string $custom_style_sheet
+	 */
 	public $custom_style_sheet;
 
 	/**
-	* @var boolean $display_address_in_regform
-	*/
+	 * @var boolean $display_address_in_regform
+	 */
 	public $display_address_in_regform;
 
 	/**
-	* @var int $display_description_on_multi_reg_page
-	*/
+	 * @var int $display_description_on_multi_reg_page
+	 */
 	public $display_description_on_multi_reg_page;
 
 	/**
-	* @var boolean $use_custom_templates
-	*/
+	 * @var boolean $use_custom_templates
+	 */
 	public $use_custom_templates;
 
 	/**
-	* @var string $current_espresso_theme
-	*/
+	 * @var string $current_espresso_theme
+	 */
 	public $current_espresso_theme;
 
 	/**
-	* @var EE_Event_Single_Config $EED_Event_Single
-	*/
+	 * @var EE_Event_Single_Config $EED_Event_Single
+	 */
 	public $EED_Event_Single;
 
 	/**
-	* @var EE_Events_Archive_Config $EED_Events_Archive
-	*/
+	 * @var EE_Events_Archive_Config $EED_Events_Archive
+	 */
 	public $EED_Events_Archive;
 
 
@@ -2215,78 +2215,78 @@ 
 class EE_Map_Config extends EE_Config_Base {
 
 	/**
-	* @var boolean $use_google_maps
-	*/
+	 * @var boolean $use_google_maps
+	 */
 	public $use_google_maps;
 
 	/**
-	* @var int $event_details_map_width
-	*/
+	 * @var int $event_details_map_width
+	 */
 	public $event_details_map_width;
 
 	/**
-	* @var int $event_details_map_height
-	*/
+	 * @var int $event_details_map_height
+	 */
 	public $event_details_map_height;
 
 	/**
-	* @var int $event_details_map_zoom
-	*/
+	 * @var int $event_details_map_zoom
+	 */
 	public $event_details_map_zoom;
 
 	/**
-	* @var boolean $event_details_display_nav
-	*/
+	 * @var boolean $event_details_display_nav
+	 */
 	public $event_details_display_nav;
 
 	/**
-	* @var boolean $event_details_nav_size
-	*/
+	 * @var boolean $event_details_nav_size
+	 */
 	public $event_details_nav_size;
 
 	/**
-	* @var string $event_details_control_type
-	*/
+	 * @var string $event_details_control_type
+	 */
 	public $event_details_control_type;
 
 	/**
-	* @var string $event_details_map_align
-	*/
+	 * @var string $event_details_map_align
+	 */
 	public $event_details_map_align;
 
 	/**
-	* @var int $event_list_map_width
-	*/
+	 * @var int $event_list_map_width
+	 */
 	public $event_list_map_width;
 
 	/**
-	* @var int $event_list_map_height
-	*/
+	 * @var int $event_list_map_height
+	 */
 	public $event_list_map_height;
 
 	/**
-	* @var int $event_list_map_zoom
-	*/
+	 * @var int $event_list_map_zoom
+	 */
 	public $event_list_map_zoom;
 
 	/**
-	* @var boolean $event_list_display_nav
-	*/
+	 * @var boolean $event_list_display_nav
+	 */
 	public $event_list_display_nav;
 
 	/**
-	* @var boolean $event_list_nav_size
-	*/
+	 * @var boolean $event_list_nav_size
+	 */
 	public $event_list_nav_size;
 
 	/**
-	* @var string $event_list_control_type
-	*/
+	 * @var string $event_list_control_type
+	 */
 	public $event_list_control_type;
 
 	/**
-	* @var string $event_list_map_align
-	*/
+	 * @var string $event_list_map_align
+	 */
 	public $event_list_map_align;
 
 

Spacing +400 added lines, -400 removed lines

@@ -128,7 +128,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated, and instantiated properly
-		if ( ! self::$_instance instanceof EE_Config ) {
+		if ( ! self::$_instance instanceof EE_Config) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -145,22 +145,22 @@ 
 	 * not be ready to instantiate EE_Config currently (eg if the site was put into maintenance mode)
 	 * @return EE_Config
 	 */
-	public static function reset( $hard_reset = FALSE, $reinstantiate = TRUE ){
-		if ( $hard_reset ) {
+	public static function reset($hard_reset = FALSE, $reinstantiate = TRUE) {
+		if ($hard_reset) {
 			self::$_instance->_config_option_names = array();
 			self::$_instance->_initialize_config();
 			self::$_instance->update_espresso_config();
 		}
-		if( self::$_instance instanceof EE_Config ){
+		if (self::$_instance instanceof EE_Config) {
 			self::$_instance->shutdown();
 		}
 		self::$_instance = NULL;
 		//we don't need to reset the static properties imo because those should
 		//only change when a module is added or removed. Currently we don't
 		//support removing a module during a request when it previously existed
-		if( $reinstantiate ){
+		if ($reinstantiate) {
 			return self::instance();
-		}else{
+		} else {
 			return NULL;
 		}
 	}
@@ -174,8 +174,8 @@ 
 	 * @return \EE_Config
 	 */
 	private function __construct() {
-		do_action( 'AHEE__EE_Config__construct__begin',$this );
-		$this->_config_option_names = get_option( 'ee_config_option_names', array() );
+		do_action('AHEE__EE_Config__construct__begin', $this);
+		$this->_config_option_names = get_option('ee_config_option_names', array());
 		// setup empty config classes
 		$this->_initialize_config();
 		// load existing EE site settings
@@ -183,15 +183,15 @@ 
 		// confirm everything loaded correctly and set filtered defaults if not
 		$this->_verify_config();
 		//  register shortcodes and modules
-		add_action( 'AHEE__EE_System__register_shortcodes_modules_and_widgets', array( $this, 'register_shortcodes_and_modules' ), 999 );
+		add_action('AHEE__EE_System__register_shortcodes_modules_and_widgets', array($this, 'register_shortcodes_and_modules'), 999);
 		//  initialize shortcodes and modules
-		add_action( 'AHEE__EE_System__core_loaded_and_ready', array( $this, 'initialize_shortcodes_and_modules' ));
+		add_action('AHEE__EE_System__core_loaded_and_ready', array($this, 'initialize_shortcodes_and_modules'));
 		// register widgets
-		add_action( 'widgets_init', array( $this, 'widgets_init' ), 10 );
+		add_action('widgets_init', array($this, 'widgets_init'), 10);
 		// shutdown
-		add_action( 'shutdown', array( $this, 'shutdown' ), 10 );
+		add_action('shutdown', array($this, 'shutdown'), 10);
 		// construct__end hook
-		do_action( 'AHEE__EE_Config__construct__end',$this );
+		do_action('AHEE__EE_Config__construct__end', $this);
 		// hardcoded hack
 		$this->template_settings->current_espresso_theme = 'Espresso_Arabica_2014';
 	}
@@ -204,7 +204,7 @@ 
 	 * @return string current theme set.
 	 */
 	public static function get_current_theme() {
-		return isset( self::$_instance->template_settings->current_espresso_theme ) ? self::$_instance->template_settings->current_espresso_theme : 'Espresso_Arabica_2014';
+		return isset(self::$_instance->template_settings->current_espresso_theme) ? self::$_instance->template_settings->current_espresso_theme : 'Espresso_Arabica_2014';
 	}
 
 
@@ -238,27 +238,27 @@ 
 	 */
 	private function _load_core_config() {
 		// load_core_config__start hook
-		do_action( 'AHEE__EE_Config___load_core_config__start', $this );
+		do_action('AHEE__EE_Config___load_core_config__start', $this);
 		$espresso_config = $this->get_espresso_config();
-		foreach ( $espresso_config as $config => $settings ) {
+		foreach ($espresso_config as $config => $settings) {
 			// load_core_config__start hook
-			$settings = apply_filters( 'FHEE__EE_Config___load_core_config__config_settings', $settings, $config, $this );
-			if ( is_object( $settings ) && property_exists( $this, $config ) ) {
-				$this->{$config} = apply_filters( 'FHEE__EE_Config___load_core_config__' . $config, $settings );
+			$settings = apply_filters('FHEE__EE_Config___load_core_config__config_settings', $settings, $config, $this);
+			if (is_object($settings) && property_exists($this, $config)) {
+				$this->{$config} = apply_filters('FHEE__EE_Config___load_core_config__'.$config, $settings);
 				//call configs populate method to ensure any defaults are set for empty values.
-				if ( method_exists( $settings, 'populate' ) ) {
+				if (method_exists($settings, 'populate')) {
 					$this->{$config}->populate();
 				}
-				if ( method_exists( $settings, 'do_hooks' ) ) {
+				if (method_exists($settings, 'do_hooks')) {
 					$this->{$config}->do_hooks();
 				}
 			}
 		}
-		if ( apply_filters( 'FHEE__EE_Config___load_core_config__update_espresso_config', FALSE ) ) {
+		if (apply_filters('FHEE__EE_Config___load_core_config__update_espresso_config', FALSE)) {
 			$this->update_espresso_config();
 		}
 		// load_core_config__end hook
-		do_action( 'AHEE__EE_Config___load_core_config__end', $this );
+		do_action('AHEE__EE_Config___load_core_config__end', $this);
 	}
 
 
@@ -272,40 +272,40 @@ 
 	protected function _verify_config() {
 
 		$this->core = $this->core instanceof EE_Core_Config
-			? $this->core  : new EE_Core_Config();
-		$this->core = apply_filters( 'FHEE__EE_Config___initialize_config__core', $this->core );
+			? $this->core : new EE_Core_Config();
+		$this->core = apply_filters('FHEE__EE_Config___initialize_config__core', $this->core);
 
 		$this->organization = $this->organization instanceof EE_Organization_Config
-			? $this->organization  : new EE_Organization_Config();
-		$this->organization = apply_filters( 'FHEE__EE_Config___initialize_config__organization', $this->organization );
+			? $this->organization : new EE_Organization_Config();
+		$this->organization = apply_filters('FHEE__EE_Config___initialize_config__organization', $this->organization);
 
 		$this->currency = $this->currency instanceof EE_Currency_Config
 			? $this->currency : new EE_Currency_Config();
-		$this->currency = apply_filters( 'FHEE__EE_Config___initialize_config__currency', $this->currency );
+		$this->currency = apply_filters('FHEE__EE_Config___initialize_config__currency', $this->currency);
 
 		$this->registration = $this->registration instanceof EE_Registration_Config
 			? $this->registration : new EE_Registration_Config();
-		$this->registration = apply_filters( 'FHEE__EE_Config___initialize_config__registration', $this->registration );
+		$this->registration = apply_filters('FHEE__EE_Config___initialize_config__registration', $this->registration);
 
 		$this->admin = $this->admin instanceof EE_Admin_Config
 			? $this->admin : new EE_Admin_Config();
-		$this->admin = apply_filters( 'FHEE__EE_Config___initialize_config__admin', $this->admin );
+		$this->admin = apply_filters('FHEE__EE_Config___initialize_config__admin', $this->admin);
 
 		$this->template_settings = $this->template_settings instanceof EE_Template_Config
 			? $this->template_settings : new EE_Template_Config();
-		$this->template_settings = apply_filters( 'FHEE__EE_Config___initialize_config__template_settings', $this->template_settings );
+		$this->template_settings = apply_filters('FHEE__EE_Config___initialize_config__template_settings', $this->template_settings);
 
 		$this->map_settings = $this->map_settings instanceof EE_Map_Config
 			? $this->map_settings : new EE_Map_Config();
-		$this->map_settings = apply_filters( 'FHEE__EE_Config___initialize_config__map_settings', $this->map_settings );
+		$this->map_settings = apply_filters('FHEE__EE_Config___initialize_config__map_settings', $this->map_settings);
 
 		$this->environment = $this->environment instanceof EE_Environment_Config
 			? $this->environment : new EE_Environment_Config();
-		$this->environment = apply_filters( 'FHEE__EE_Config___initialize_config__environment', $this->environment );
+		$this->environment = apply_filters('FHEE__EE_Config___initialize_config__environment', $this->environment);
 
 		$this->gateway = $this->gateway instanceof EE_Gateway_Config
 			? $this->gateway : new EE_Gateway_Config();
-		$this->gateway = apply_filters( 'FHEE__EE_Config___initialize_config__gateway', $this->gateway );
+		$this->gateway = apply_filters('FHEE__EE_Config___initialize_config__gateway', $this->gateway);
 
 	}
 
@@ -319,7 +319,7 @@ 
 	 */
 	public function get_espresso_config() {
 		// grab espresso configuration
-		return apply_filters( 'FHEE__EE_Config__get_espresso_config__CFG', get_option( 'ee_config', array() ));
+		return apply_filters('FHEE__EE_Config__get_espresso_config__CFG', get_option('ee_config', array()));
 	}
 
 
@@ -332,12 +332,12 @@ 
 	 * @param        $old_value
 	 * @param        $value
 	 */
-	public function double_check_config_comparison( $option = '', $old_value, $value ) {
+	public function double_check_config_comparison($option = '', $old_value, $value) {
 		// make sure we're checking the ee config
-		if ( $option == 'ee_config' ) {
+		if ($option == 'ee_config') {
 			// run a loose comparison of the old value against the new value for type and properties,
 			// but NOT exact instance like WP update_option does
-			if ( $value != $old_value ) {
+			if ($value != $old_value) {
 				// if they are NOT the same, then remove the hook,
 				// which means the subsequent update results will be based solely on the update query results
 				// the reason we do this is because, as stated above,
@@ -352,7 +352,7 @@ 
 				// the string it sees in the db looks the same as the new one it has been passed!!!
 				// This results in the query returning an "affected rows" value of ZERO,
 				// which gets returned immediately by WP update_option and looks like an error.
-				remove_action( 'update_option', array( $this, 'check_config_updated' ));
+				remove_action('update_option', array($this, 'check_config_updated'));
 			}
 		}
 	}
@@ -367,11 +367,11 @@ 
 	 */
 	protected function  _reset_espresso_addon_config() {
 		$this->_config_option_names = array();
-		foreach( $this->addons as $addon_name => $addon_config_obj ) {
-			$addon_config_obj = maybe_unserialize( $addon_config_obj );
-			$config_class = get_class( $addon_config_obj );
-			if ( $addon_config_obj instanceof $config_class && ! $addon_config_obj instanceof __PHP_Incomplete_Class ) {
-				$this->update_config( 'addons', $addon_name, $addon_config_obj, FALSE );
+		foreach ($this->addons as $addon_name => $addon_config_obj) {
+			$addon_config_obj = maybe_unserialize($addon_config_obj);
+			$config_class = get_class($addon_config_obj);
+			if ($addon_config_obj instanceof $config_class && ! $addon_config_obj instanceof __PHP_Incomplete_Class) {
+				$this->update_config('addons', $addon_name, $addon_config_obj, FALSE);
 			}
 			$this->addons->{$addon_name} = NULL;
 		}
@@ -387,17 +387,17 @@ 
 	 * @param   bool $add_error
 	 * @return   bool
 	 */
-	public function  update_espresso_config( $add_success = FALSE, $add_error = TRUE ) {
+	public function  update_espresso_config($add_success = FALSE, $add_error = TRUE) {
 		// commented out the following re: https://events.codebasehq.com/projects/event-espresso/tickets/8197
 		//$clone = clone( self::$_instance );
 		//self::$_instance = NULL;
-		do_action( 'AHEE__EE_Config__update_espresso_config__begin',$this );
+		do_action('AHEE__EE_Config__update_espresso_config__begin', $this);
 		$this->_reset_espresso_addon_config();
 		// hook into update_option because that happens AFTER the ( $value === $old_value ) conditional
 		// but BEFORE the actual update occurs
-		add_action( 'update_option', array( $this, 'double_check_config_comparison' ), 1, 3 );
+		add_action('update_option', array($this, 'double_check_config_comparison'), 1, 3);
 		// now update "ee_config"
-		$saved = update_option( 'ee_config', $this );
+		$saved = update_option('ee_config', $this);
 		// if not saved... check if the hook we just added still exists;
 		// if it does, it means one of two things:
 		// 		that update_option bailed at the ( $value === $old_value ) conditional,
@@ -408,25 +408,25 @@ 
 		// but just means no update occurred, so don't display an error to the user.
 		// BUT... if update_option returns FALSE, AND the hook is missing,
 		// then it means that something truly went wrong
-		$saved = ! $saved ? has_action( 'update_option', array( $this, 'double_check_config_comparison' )) : $saved;
+		$saved = ! $saved ? has_action('update_option', array($this, 'double_check_config_comparison')) : $saved;
 		// remove our action since we don't want it in the system anymore
-		remove_action( 'update_option', array( $this, 'double_check_config_comparison' ), 1 );
-		do_action( 'AHEE__EE_Config__update_espresso_config__end', $this, $saved );
+		remove_action('update_option', array($this, 'double_check_config_comparison'), 1);
+		do_action('AHEE__EE_Config__update_espresso_config__end', $this, $saved);
 		//self::$_instance = $clone;
 		//unset( $clone );
 		// if config remains the same or was updated successfully
-		if ( $saved ) {
-			if ( $add_success ) {
+		if ($saved) {
+			if ($add_success) {
 				EE_Error::add_success(
-					__( 'The Event Espresso Configuration Settings have been successfully updated.', 'event_espresso' ),
+					__('The Event Espresso Configuration Settings have been successfully updated.', 'event_espresso'),
 					__FILE__, __FUNCTION__, __LINE__
 				);
 			}
 			return TRUE;
 		} else {
-			if ( $add_error ) {
+			if ($add_error) {
 				EE_Error::add_error(
-					__( 'The Event Espresso Configuration Settings were not updated.', 'event_espresso' ),
+					__('The Event Espresso Configuration Settings were not updated.', 'event_espresso'),
 					__FILE__, __FUNCTION__, __LINE__
 				);
 			}
@@ -452,20 +452,20 @@ 
 		$name = '',
 		$config_class = '',
 		$config_obj = NULL,
-		$tests_to_run = array( 1, 2, 3, 4, 5, 6, 7, 8 ),
+		$tests_to_run = array(1, 2, 3, 4, 5, 6, 7, 8),
 		$display_errors = TRUE
 	) {
 		try {
-			foreach ( $tests_to_run as $test ) {
-				switch ( $test ) {
+			foreach ($tests_to_run as $test) {
+				switch ($test) {
 
 					// TEST #1 : check that section was set
 					case 1 :
-						if ( empty( $section ) ) {
-							if ( $display_errors ) {
+						if (empty($section)) {
+							if ($display_errors) {
 								throw new EE_Error(
 									sprintf(
-										__( 'No configuration section has been provided while attempting to save "%s".', 'event_espresso' ),
+										__('No configuration section has been provided while attempting to save "%s".', 'event_espresso'),
 										$config_class
 									)
 								);
@@ -476,11 +476,11 @@ 
 
 					// TEST #2 : check that settings section exists
 					case 2 :
-						if ( ! isset( $this->{$section} ) ) {
-							if ( $display_errors ) {
+						if ( ! isset($this->{$section} )) {
+							if ($display_errors) {
 								throw new EE_Error(
-									sprintf( __( 'The "%s" configuration section does not exist.', 'event_espresso' ),
-											 $section )
+									sprintf(__('The "%s" configuration section does not exist.', 'event_espresso'),
+											 $section)
 								);
 							}
 							return false;
@@ -490,12 +490,12 @@ 
 					// TEST #3 : check that section is the proper format
 					case 3 :
 						if (
-							! ( $this->{$section} instanceof EE_Config_Base || $this->{$section} instanceof stdClass )
+							! ($this->{$section} instanceof EE_Config_Base || $this->{$section} instanceof stdClass)
 						) {
-							if ( $display_errors ) {
+							if ($display_errors) {
 								throw new EE_Error(
 									sprintf(
-										__( 'The "%s" configuration settings have not been formatted correctly.', 'event_espresso' ),
+										__('The "%s" configuration settings have not been formatted correctly.', 'event_espresso'),
 										$section
 									)
 								);
@@ -506,10 +506,10 @@ 
 
 					// TEST #4 : check that config section name has been set
 					case 4 :
-						if ( empty( $name ) ) {
-							if ( $display_errors ) {
+						if (empty($name)) {
+							if ($display_errors) {
 								throw new EE_Error(
-									__( 'No name has been provided for the specific configuration section.', 'event_espresso' )
+									__('No name has been provided for the specific configuration section.', 'event_espresso')
 								);
 							}
 							return false;
@@ -518,10 +518,10 @@ 
 
 					// TEST #5 : check that a config class name has been set
 					case 5 :
-						if ( empty( $config_class ) ) {
-							if ( $display_errors ) {
+						if (empty($config_class)) {
+							if ($display_errors) {
 								throw new EE_Error(
-									__( 'No class name has been provided for the specific configuration section.', 'event_espresso' )
+									__('No class name has been provided for the specific configuration section.', 'event_espresso')
 								);
 							}
 							return false;
@@ -530,11 +530,11 @@ 
 
 					// TEST #6 : verify config class is accessible
 					case 6 :
-						if ( ! class_exists( $config_class ) ) {
-							if ( $display_errors ) {
+						if ( ! class_exists($config_class)) {
+							if ($display_errors) {
 								throw new EE_Error(
 									sprintf(
-										__( 'The "%s" class does not exist. Please ensure that an autoloader has been set for it.', 'event_espresso' ),
+										__('The "%s" class does not exist. Please ensure that an autoloader has been set for it.', 'event_espresso'),
 										$config_class
 									)
 								);
@@ -545,11 +545,11 @@ 
 
 					// TEST #7 : check that config has even been set
 					case 7 :
-						if ( ! isset( $this->{$section}->{$name} ) ) {
-							if ( $display_errors ) {
+						if ( ! isset($this->{$section}->{$name} )) {
+							if ($display_errors) {
 								throw new EE_Error(
 									sprintf(
-										__( 'No configuration has been set for "%1$s->%2$s".', 'event_espresso' ),
+										__('No configuration has been set for "%1$s->%2$s".', 'event_espresso'),
 										$section,
 										$name
 									)
@@ -558,17 +558,17 @@ 
 							return false;
 						} else {
 							// and make sure it's not serialized
-							$this->{$section}->{$name} = maybe_unserialize( $this->{$section}->{$name} );
+							$this->{$section}->{$name} = maybe_unserialize($this->{$section}->{$name} );
 						}
 						break;
 
 					// TEST #8 : check that config is the requested type
 					case 8 :
-						if ( ! $this->{$section}->{$name} instanceof $config_class ) {
-							if ( $display_errors ) {
+						if ( ! $this->{$section}->{$name} instanceof $config_class) {
+							if ($display_errors) {
 								throw new EE_Error(
 									sprintf(
-										__( 'The configuration for "%1$s->%2$s" is not of the "%3$s" class.', 'event_espresso' ),
+										__('The configuration for "%1$s->%2$s" is not of the "%3$s" class.', 'event_espresso'),
 										$section,
 										$name,
 										$config_class
@@ -581,12 +581,12 @@ 
 
 					// TEST #9 : verify config object
 					case 9 :
-						if ( ! $config_obj instanceof EE_Config_Base ) {
-							if ( $display_errors ) {
+						if ( ! $config_obj instanceof EE_Config_Base) {
+							if ($display_errors) {
 								throw new EE_Error(
 									sprintf(
-										__( 'The "%s" class is not an instance of EE_Config_Base.', 'event_espresso' ),
-										print_r( $config_obj, true )
+										__('The "%s" class is not an instance of EE_Config_Base.', 'event_espresso'),
+										print_r($config_obj, true)
 									)
 								);
 							}
@@ -597,7 +597,7 @@ 
 				}
 			}
 
-		} catch( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$e->get_error();
 		}
 		// you have successfully run the gauntlet
@@ -614,8 +614,8 @@ 
 	 * @param        string          $name
 	 * @return        string
 	 */
-	private function _generate_config_option_name( $section = '', $name = '' ) {
-		return 'ee_config-' . strtolower( $section . '-' . str_replace( array( 'EE_', 'EED_' ), '', $name ) );
+	private function _generate_config_option_name($section = '', $name = '') {
+		return 'ee_config-'.strtolower($section.'-'.str_replace(array('EE_', 'EED_'), '', $name));
 	}
 
 
@@ -629,10 +629,10 @@ 
 	 * @param 	string $name
 	 * @return 	string
 	 */
-	private function _set_config_class( $config_class = '', $name = '' ) {
-		return ! empty( $config_class )
+	private function _set_config_class($config_class = '', $name = '') {
+		return ! empty($config_class)
 			? $config_class
-			: str_replace( ' ', '_', ucwords( str_replace( '_', ' ', $name ) ) ) . '_Config';
+			: str_replace(' ', '_', ucwords(str_replace('_', ' ', $name))).'_Config';
 	}
 
 
@@ -646,34 +646,34 @@ 
 	 * @param 	EE_Config_Base $config_obj
 	 * @return 	EE_Config_Base
 	 */
-	public function set_config( $section = '', $name = '', $config_class = '', EE_Config_Base $config_obj = null ) {
+	public function set_config($section = '', $name = '', $config_class = '', EE_Config_Base $config_obj = null) {
 		// ensure config class is set to something
-		$config_class = $this->_set_config_class( $config_class, $name );
+		$config_class = $this->_set_config_class($config_class, $name);
 		// run tests 1-4, 6, and 7 to verify all config params are set and valid
-		if ( ! $this->_verify_config_params( $section, $name, $config_class, null, array( 1, 2, 3, 4, 5, 6 ))) {
+		if ( ! $this->_verify_config_params($section, $name, $config_class, null, array(1, 2, 3, 4, 5, 6))) {
 			return null;
 		}
-		$config_option_name = $this->_generate_config_option_name( $section, $name );
+		$config_option_name = $this->_generate_config_option_name($section, $name);
 		// if the config option name hasn't been added yet to the list of option names we're tracking, then do so now
-		if ( ! isset( $this->_config_option_names[ $config_option_name ] )) {
-			$this->_config_option_names[ $config_option_name ] = $config_class;
+		if ( ! isset($this->_config_option_names[$config_option_name])) {
+			$this->_config_option_names[$config_option_name] = $config_class;
 		}
 		// verify the incoming config object but suppress errors
-		if ( ! $this->_verify_config_params( $section, $name, $config_class, $config_obj, array( 9 ), false )) {
+		if ( ! $this->_verify_config_params($section, $name, $config_class, $config_obj, array(9), false)) {
 			$config_obj = new $config_class();
 		}
-		if ( get_option( $config_option_name ) ) {
-			update_option( $config_option_name, $config_obj );
+		if (get_option($config_option_name)) {
+			update_option($config_option_name, $config_obj);
 			$this->{$section}->{$name} = $config_obj;
 			return $this->{$section}->{$name};
 		} else {
 			// create a wp-option for this config
-			if ( add_option( $config_option_name, $config_obj, '', 'no' )) {
-				$this->{$section}->{$name} = maybe_unserialize( $config_obj );
+			if (add_option($config_option_name, $config_obj, '', 'no')) {
+				$this->{$section}->{$name} = maybe_unserialize($config_obj);
 				return $this->{$section}->{$name};
 			} else {
 				EE_Error::add_error(
-					sprintf( __( 'The "%s" could not be saved to the database.', 'event_espresso' ), $config_class ),
+					sprintf(__('The "%s" could not be saved to the database.', 'event_espresso'), $config_class),
 					__FILE__, __FUNCTION__, __LINE__
 				);
 				return null;
@@ -694,37 +694,37 @@ 
 	 * @param 	bool 					$throw_errors
 	 * @return 	bool
 	 */
-	public function update_config( $section = '', $name = '', $config_obj = '', $throw_errors = true ) {
-		$config_obj = maybe_unserialize( $config_obj );
+	public function update_config($section = '', $name = '', $config_obj = '', $throw_errors = true) {
+		$config_obj = maybe_unserialize($config_obj);
 		// get class name of the incoming object
-		$config_class = get_class( $config_obj );
+		$config_class = get_class($config_obj);
 		// run tests 1-5 and 9 to verify config
-		if ( ! $this->_verify_config_params( $section, $name, $config_class, $config_obj, array( 1, 2, 3, 4, 7, 9 ))) {
+		if ( ! $this->_verify_config_params($section, $name, $config_class, $config_obj, array(1, 2, 3, 4, 7, 9))) {
 			return false;
 		}
-		$config_option_name = $this->_generate_config_option_name( $section, $name );
+		$config_option_name = $this->_generate_config_option_name($section, $name);
 		// check if config object has been added to db by seeing if config option name is in $this->_config_option_names array
-		if ( ! isset( $this->_config_option_names[ $config_option_name ] )) {
+		if ( ! isset($this->_config_option_names[$config_option_name])) {
 			// save new config to db
-			return $this->set_config( $section, $name, $config_class, $config_obj );
+			return $this->set_config($section, $name, $config_class, $config_obj);
 		} else {
 			// first check if the record already exists
-			$existing_config = get_option( $config_option_name );
-			$config_obj = serialize( $config_obj );
+			$existing_config = get_option($config_option_name);
+			$config_obj = serialize($config_obj);
 			// just return if db record is already up to date
-			if ( $existing_config == $config_obj ) {
+			if ($existing_config == $config_obj) {
 				$this->{$section}->{$name} = $config_obj;
 				return true;
-			} else if ( update_option( $config_option_name, $config_obj )) {
+			} else if (update_option($config_option_name, $config_obj)) {
 				// update wp-option for this config class
 				$this->{$section}->{$name} = $config_obj;
 				return true;
-			} elseif ( $throw_errors ) {
+			} elseif ($throw_errors) {
 				EE_Error::add_error(
 					sprintf(
-						__( 'The "%1$s" object stored at"%2$s" was not successfully updated in the database.', 'event_espresso' ),
+						__('The "%1$s" object stored at"%2$s" was not successfully updated in the database.', 'event_espresso'),
 						$config_class,
-						'EE_Config->' . $section . '->' . $name
+						'EE_Config->'.$section.'->'.$name
 					),
 					__FILE__, __FUNCTION__, __LINE__
 				);
@@ -744,34 +744,34 @@ 
 	 * @param 	string 	$config_class
 	 * @return 	mixed EE_Config_Base | NULL
 	 */
-	public function get_config( $section = '', $name = '', $config_class = '' ) {
+	public function get_config($section = '', $name = '', $config_class = '') {
 		// ensure config class is set to something
-		$config_class = $this->_set_config_class( $config_class, $name );
+		$config_class = $this->_set_config_class($config_class, $name);
 		// run tests 1-4, 6 and 7 to verify that all params have been set
-		if ( ! $this->_verify_config_params( $section, $name, $config_class, NULL, array( 1, 2, 3, 4, 5, 6 ))) {
+		if ( ! $this->_verify_config_params($section, $name, $config_class, NULL, array(1, 2, 3, 4, 5, 6))) {
 			return NULL;
 		}
 		// now test if the requested config object exists, but suppress errors
-		if ( $this->_verify_config_params( $section, $name, $config_class, NULL, array( 7, 8 ), FALSE )) {
+		if ($this->_verify_config_params($section, $name, $config_class, NULL, array(7, 8), FALSE)) {
 			// config already exists, so pass it back
 			return $this->{$section}->{$name};
 		}
 		// load config option from db if it exists
-		$config_obj = $this->get_config_option( $this->_generate_config_option_name( $section, $name ));
+		$config_obj = $this->get_config_option($this->_generate_config_option_name($section, $name));
 		// verify the newly retrieved config object, but suppress errors
-		if ( $this->_verify_config_params( $section, $name, $config_class, $config_obj, array( 9 ), FALSE )) {
+		if ($this->_verify_config_params($section, $name, $config_class, $config_obj, array(9), FALSE)) {
 			// config is good, so set it and pass it back
 			$this->{$section}->{$name} = $config_obj;
 			return $this->{$section}->{$name};
 		}
 		// oops! $config_obj is not already set and does not exist in the db, so create a new one
-		$config_obj =$this->set_config( $section, $name, $config_class );
+		$config_obj = $this->set_config($section, $name, $config_class);
 		// verify the newly created config object
-		if ( $this->_verify_config_params( $section, $name, $config_class, $config_obj, array( 9 ))) {
+		if ($this->_verify_config_params($section, $name, $config_class, $config_obj, array(9))) {
 			return $this->{$section}->{$name};
 		} else {
 			EE_Error::add_error(
-				sprintf( __( 'The "%s" could not be retrieved from the database.', 'event_espresso' ), $config_class ),
+				sprintf(__('The "%s" could not be retrieved from the database.', 'event_espresso'), $config_class),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 		}
@@ -786,9 +786,9 @@ 
 	 * @param 	string 	$config_option_name
 	 * @return 	mixed EE_Config_Base | FALSE
 	 */
-	public function get_config_option( $config_option_name = '' ) {
+	public function get_config_option($config_option_name = '') {
 		// retrieve the wp-option for this config class.
-		return maybe_unserialize( get_option( $config_option_name ));
+		return maybe_unserialize(get_option($config_option_name));
 	}
 
 
@@ -801,45 +801,45 @@ 
 	 * @param $page_for_posts
 	 * @return    void
 	 */
-	public function update_post_shortcodes( $page_for_posts = '' ) {
+	public function update_post_shortcodes($page_for_posts = '') {
 		// make sure page_for_posts is set
-		$page_for_posts = ! empty( $page_for_posts ) ? $page_for_posts : EE_Config::get_page_for_posts();
+		$page_for_posts = ! empty($page_for_posts) ? $page_for_posts : EE_Config::get_page_for_posts();
 		// critical page shortcodes that we do NOT want added to the Posts page (blog)
 		$critical_shortcodes = $this->core->get_critical_pages_shortcodes_array();
 		// allow others to mess stuff up :D
-		do_action( 'AHEE__EE_Config__update_post_shortcodes', $this->core->post_shortcodes, $page_for_posts );
+		do_action('AHEE__EE_Config__update_post_shortcodes', $this->core->post_shortcodes, $page_for_posts);
 		// verify that post_shortcodes is set
-		$this->core->post_shortcodes = isset( $this->core->post_shortcodes ) && is_array( $this->core->post_shortcodes ) ? $this->core->post_shortcodes : array();
+		$this->core->post_shortcodes = isset($this->core->post_shortcodes) && is_array($this->core->post_shortcodes) ? $this->core->post_shortcodes : array();
 		// cycle thru post_shortcodes
-		foreach( $this->core->post_shortcodes as $post_name => $shortcodes ){
+		foreach ($this->core->post_shortcodes as $post_name => $shortcodes) {
 			// are there any shortcodes to track ?
-			if ( ! empty( $shortcodes )) {
+			if ( ! empty($shortcodes)) {
 				// loop thru list of tracked shortcodes
-				foreach( $shortcodes as $shortcode => $post_id ) {
+				foreach ($shortcodes as $shortcode => $post_id) {
 					// if shortcode is for a critical page, BUT this is NOT the corresponding critical page for that shortcode
-					if ( isset( $critical_shortcodes[ $post_id ] ) && $post_name == $page_for_posts ) {
+					if (isset($critical_shortcodes[$post_id]) && $post_name == $page_for_posts) {
 						// then remove this shortcode, because we don't want critical page shortcodes like ESPRESSO_TXN_PAGE running on the "Posts Page" (blog)
-						unset( $this->core->post_shortcodes[ $post_name ][ $shortcode ] );
+						unset($this->core->post_shortcodes[$post_name][$shortcode]);
 					}
 					// skip the posts page, because we want all shortcodes registered for it
-					if ( $post_name == $page_for_posts ) {
+					if ($post_name == $page_for_posts) {
 						continue;
 					}
 					// make sure post still exists
-					$post = get_post( $post_id );
-					if ( $post ) {
+					$post = get_post($post_id);
+					if ($post) {
 						// check that the post name matches what we have saved
-						if ( $post->post_name == $post_name ) {
+						if ($post->post_name == $post_name) {
 							// if so, then break before hitting the unset below
 							continue;
 						}
 					}
 					// we don't like missing posts around here >:(
-					unset( $this->core->post_shortcodes[ $post_name ] );
+					unset($this->core->post_shortcodes[$post_name]);
 				}
 			} else {
 				// you got no shortcodes to keep track of !
-				unset( $this->core->post_shortcodes[ $post_name ] );
+				unset($this->core->post_shortcodes[$post_name]);
 			}
 		}
 		//only show errors
@@ -858,14 +858,14 @@ 
 	 *  @return 	string
 	 */
 	public static function get_page_for_posts() {
-		$page_for_posts = get_option( 'page_for_posts' );
-		if ( ! $page_for_posts ) {
+		$page_for_posts = get_option('page_for_posts');
+		if ( ! $page_for_posts) {
 			return 'posts';
 		}
 		/** @type WPDB $wpdb */
 		global $wpdb;
 		$SQL = "SELECT post_name from $wpdb->posts WHERE post_type='posts' OR post_type='page' AND post_status='publish' AND ID=%d";
-		return $wpdb->get_var( $wpdb->prepare( $SQL, $page_for_posts ));
+		return $wpdb->get_var($wpdb->prepare($SQL, $page_for_posts));
 	}
 
 
@@ -881,11 +881,11 @@ 
 	 *  @return 	void
 	 */
 	public function register_shortcodes_and_modules() {
-		if ( EE_Maintenance_Mode::disable_frontend_for_maintenance() ) {
+		if (EE_Maintenance_Mode::disable_frontend_for_maintenance()) {
 			return;
 		}
 		// allow shortcodes to register with WP and to set hooks for the rest of the system
-		EE_Registry::instance()->shortcodes =$this->_register_shortcodes();
+		EE_Registry::instance()->shortcodes = $this->_register_shortcodes();
 		// allow modules to set hooks for the rest of the system
 		EE_Registry::instance()->modules = $this->_register_modules();
 	}
@@ -899,7 +899,7 @@ 
 	 *  @return 	void
 	 */
 	public function initialize_shortcodes_and_modules() {
-		if ( EE_Maintenance_Mode::disable_frontend_for_maintenance() ) {
+		if (EE_Maintenance_Mode::disable_frontend_for_maintenance()) {
 			return;
 		}
 		// allow shortcodes to set hooks for the rest of the system
@@ -918,26 +918,26 @@ 
 	 * 	@return void
 	 */
 	public function widgets_init() {
-		if ( EE_Maintenance_Mode::disable_frontend_for_maintenance() ) {
+		if (EE_Maintenance_Mode::disable_frontend_for_maintenance()) {
 			return;
 		}
 		//only init widgets on admin pages when not in complete maintenance, and
 		//on frontend when not in any maintenance mode
-		if (( is_admin() && EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance)  || ! EE_Maintenance_Mode::instance()->level() ) {
+		if ((is_admin() && EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance) || ! EE_Maintenance_Mode::instance()->level()) {
 			// grab list of installed widgets
-			$widgets_to_register = glob( EE_WIDGETS . '*', GLOB_ONLYDIR );
+			$widgets_to_register = glob(EE_WIDGETS.'*', GLOB_ONLYDIR);
 			// filter list of modules to register
-			$widgets_to_register = apply_filters( 'FHEE__EE_Config__register_widgets__widgets_to_register', $widgets_to_register );
+			$widgets_to_register = apply_filters('FHEE__EE_Config__register_widgets__widgets_to_register', $widgets_to_register);
 
-			if ( ! empty( $widgets_to_register ) ) {
+			if ( ! empty($widgets_to_register)) {
 				// cycle thru widget folders
-				foreach ( $widgets_to_register as $widget_path ) {
+				foreach ($widgets_to_register as $widget_path) {
 					// add to list of installed widget modules
-					EE_Config::register_ee_widget( $widget_path );
+					EE_Config::register_ee_widget($widget_path);
 				}
 			}
 			// filter list of installed modules
-			EE_Registry::instance()->widgets = apply_filters( 'FHEE__EE_Config__register_widgets__installed_widgets', EE_Registry::instance()->widgets );
+			EE_Registry::instance()->widgets = apply_filters('FHEE__EE_Config__register_widgets__installed_widgets', EE_Registry::instance()->widgets);
 		}
 	}
 
@@ -950,54 +950,54 @@ 
 	 *  @param 	string 	$widget_path - full path up to and including widget folder
 	 *  @return 	void
 	 */
-	public static function register_ee_widget( $widget_path = NULL ) {
-		do_action( 'AHEE__EE_Config__register_widget__begin', $widget_path );
+	public static function register_ee_widget($widget_path = NULL) {
+		do_action('AHEE__EE_Config__register_widget__begin', $widget_path);
 		$widget_ext = '.widget.php';
 		// make all separators match
-		$widget_path = rtrim( str_replace( '/\\', DS, $widget_path ), DS );
+		$widget_path = rtrim(str_replace('/\\', DS, $widget_path), DS);
 		// does the file path INCLUDE the actual file name as part of the path ?
-		if ( strpos( $widget_path, $widget_ext ) !== FALSE ) {
+		if (strpos($widget_path, $widget_ext) !== FALSE) {
 			// grab and shortcode file name from directory name and break apart at dots
-			$file_name = explode( '.', basename( $widget_path ));
+			$file_name = explode('.', basename($widget_path));
 			// take first segment from file name pieces and remove class prefix if it exists
-			$widget = strpos( $file_name[0], 'EEW_' ) === 0 ? substr( $file_name[0], 4 ) : $file_name[0];
+			$widget = strpos($file_name[0], 'EEW_') === 0 ? substr($file_name[0], 4) : $file_name[0];
 			// sanitize shortcode directory name
-			$widget = sanitize_key( $widget );
+			$widget = sanitize_key($widget);
 			// now we need to rebuild the shortcode path
-			$widget_path = explode( DS, $widget_path );
+			$widget_path = explode(DS, $widget_path);
 			// remove last segment
-			array_pop( $widget_path );
+			array_pop($widget_path);
 			// glue it back together
-			$widget_path = implode( DS, $widget_path );
+			$widget_path = implode(DS, $widget_path);
 		} else {
 			// grab and sanitize widget directory name
-			$widget = sanitize_key( basename( $widget_path ));
+			$widget = sanitize_key(basename($widget_path));
 		}
 		// create classname from widget directory name
-		$widget = str_replace( ' ', '_', ucwords( str_replace( '_', ' ', $widget )));
+		$widget = str_replace(' ', '_', ucwords(str_replace('_', ' ', $widget)));
 		// add class prefix
-		$widget_class = 'EEW_' . $widget;
+		$widget_class = 'EEW_'.$widget;
 		// does the widget exist ?
-		if ( ! is_readable( $widget_path . DS . $widget_class . $widget_ext )) {
+		if ( ! is_readable($widget_path.DS.$widget_class.$widget_ext)) {
 			$msg = sprintf(
-				__( 'The requested %s widget file could not be found or is not readable due to file permissions. Please ensure the following path is correct: %s', 'event_espresso' ),
+				__('The requested %s widget file could not be found or is not readable due to file permissions. Please ensure the following path is correct: %s', 'event_espresso'),
 				$widget_class,
-				$widget_path . DS . $widget_class . $widget_ext
+				$widget_path.DS.$widget_class.$widget_ext
 			);
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return;
 		}
 		// load the widget class file
-		require_once( $widget_path . DS . $widget_class . $widget_ext );
+		require_once($widget_path.DS.$widget_class.$widget_ext);
 		// verify that class exists
-		if ( ! class_exists( $widget_class )) {
-			$msg = sprintf( __( 'The requested %s widget class does not exist.', 'event_espresso' ), $widget_class );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! class_exists($widget_class)) {
+			$msg = sprintf(__('The requested %s widget class does not exist.', 'event_espresso'), $widget_class);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return;
 		}
-		register_widget( $widget_class );
+		register_widget($widget_class);
 		// add to array of registered widgets
-		EE_Registry::instance()->widgets->{$widget_class} = $widget_path . DS . $widget_class . $widget_ext;
+		EE_Registry::instance()->widgets->{$widget_class} = $widget_path.DS.$widget_class.$widget_ext;
 	}
 
 
@@ -1010,18 +1010,18 @@ 
 	 */
 	private function _register_shortcodes() {
 		// grab list of installed shortcodes
-		$shortcodes_to_register = glob( EE_SHORTCODES . '*', GLOB_ONLYDIR );
+		$shortcodes_to_register = glob(EE_SHORTCODES.'*', GLOB_ONLYDIR);
 		// filter list of modules to register
-		$shortcodes_to_register = apply_filters( 'FHEE__EE_Config__register_shortcodes__shortcodes_to_register', $shortcodes_to_register );
-		if ( ! empty( $shortcodes_to_register ) ) {
+		$shortcodes_to_register = apply_filters('FHEE__EE_Config__register_shortcodes__shortcodes_to_register', $shortcodes_to_register);
+		if ( ! empty($shortcodes_to_register)) {
 			// cycle thru shortcode folders
-			foreach ( $shortcodes_to_register as $shortcode_path ) {
+			foreach ($shortcodes_to_register as $shortcode_path) {
 				// add to list of installed shortcode modules
-				EE_Config::register_shortcode( $shortcode_path );
+				EE_Config::register_shortcode($shortcode_path);
 			}
 		}
 		// filter list of installed modules
-		return apply_filters( 'FHEE__EE_Config___register_shortcodes__installed_shortcodes', EE_Registry::instance()->shortcodes );
+		return apply_filters('FHEE__EE_Config___register_shortcodes__installed_shortcodes', EE_Registry::instance()->shortcodes);
 	}
 
 
@@ -1033,56 +1033,56 @@ 
 	 *  @param 	string 		$shortcode_path - full path up to and including shortcode folder
 	 *  @return 	bool
 	 */
-	public static function register_shortcode( $shortcode_path = NULL ) {
-		do_action( 'AHEE__EE_Config__register_shortcode__begin',$shortcode_path );
+	public static function register_shortcode($shortcode_path = NULL) {
+		do_action('AHEE__EE_Config__register_shortcode__begin', $shortcode_path);
 		$shortcode_ext = '.shortcode.php';
 		// make all separators match
-		$shortcode_path = str_replace( array( '\\', '/' ), DS, $shortcode_path );
+		$shortcode_path = str_replace(array('\\', '/'), DS, $shortcode_path);
 		// does the file path INCLUDE the actual file name as part of the path ?
-		if ( strpos( $shortcode_path, $shortcode_ext ) !== FALSE ) {
+		if (strpos($shortcode_path, $shortcode_ext) !== FALSE) {
 			// grab shortcode file name from directory name and break apart at dots
-			$shortcode_file = explode( '.', basename( $shortcode_path ));
+			$shortcode_file = explode('.', basename($shortcode_path));
 			// take first segment from file name pieces and remove class prefix if it exists
-			$shortcode = strpos( $shortcode_file[0], 'EES_' ) === 0 ? substr( $shortcode_file[0], 4 ) : $shortcode_file[0];
+			$shortcode = strpos($shortcode_file[0], 'EES_') === 0 ? substr($shortcode_file[0], 4) : $shortcode_file[0];
 			// sanitize shortcode directory name
-			$shortcode = sanitize_key( $shortcode );
+			$shortcode = sanitize_key($shortcode);
 			// now we need to rebuild the shortcode path
-			$shortcode_path = explode( DS, $shortcode_path );
+			$shortcode_path = explode(DS, $shortcode_path);
 			// remove last segment
-			array_pop( $shortcode_path );
+			array_pop($shortcode_path);
 			// glue it back together
-			$shortcode_path = implode( DS, $shortcode_path ) . DS;
+			$shortcode_path = implode(DS, $shortcode_path).DS;
 		} else {
 			// we need to generate the filename based off of the folder name
 			// grab and sanitize shortcode directory name
-			$shortcode = sanitize_key( basename( $shortcode_path ));
-			$shortcode_path = rtrim( $shortcode_path, DS ) . DS;
+			$shortcode = sanitize_key(basename($shortcode_path));
+			$shortcode_path = rtrim($shortcode_path, DS).DS;
 		}
 		// create classname from shortcode directory or file name
-		$shortcode = str_replace( ' ', '_', ucwords( str_replace( '_', ' ', $shortcode )));
+		$shortcode = str_replace(' ', '_', ucwords(str_replace('_', ' ', $shortcode)));
 		// add class prefix
-		$shortcode_class = 'EES_' . $shortcode;
+		$shortcode_class = 'EES_'.$shortcode;
 		// does the shortcode exist ?
-		if ( ! is_readable( $shortcode_path . DS . $shortcode_class . $shortcode_ext )) {
+		if ( ! is_readable($shortcode_path.DS.$shortcode_class.$shortcode_ext)) {
 			$msg = sprintf(
-				__( 'The requested %s shortcode file could not be found or is not readable due to file permissions. It should be in %s', 'event_espresso' ),
+				__('The requested %s shortcode file could not be found or is not readable due to file permissions. It should be in %s', 'event_espresso'),
 				$shortcode_class,
-				$shortcode_path . DS . $shortcode_class . $shortcode_ext
+				$shortcode_path.DS.$shortcode_class.$shortcode_ext
 			);
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		// load the shortcode class file
-		require_once( $shortcode_path . $shortcode_class . $shortcode_ext );
+		require_once($shortcode_path.$shortcode_class.$shortcode_ext);
 		// verify that class exists
-		if ( ! class_exists( $shortcode_class )) {
-			$msg = sprintf( __( 'The requested %s shortcode class does not exist.', 'event_espresso' ), $shortcode_class );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! class_exists($shortcode_class)) {
+			$msg = sprintf(__('The requested %s shortcode class does not exist.', 'event_espresso'), $shortcode_class);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		$shortcode = strtoupper( $shortcode );
+		$shortcode = strtoupper($shortcode);
 		// add to array of registered shortcodes
-		EE_Registry::instance()->shortcodes->{$shortcode} = $shortcode_path . $shortcode_class . $shortcode_ext;
+		EE_Registry::instance()->shortcodes->{$shortcode} = $shortcode_path.$shortcode_class.$shortcode_ext;
 		return TRUE;
 	}
 
@@ -1097,23 +1097,23 @@ 
 	 */
 	private function _register_modules() {
 		// grab list of installed modules
-		$modules_to_register = glob( EE_MODULES . '*', GLOB_ONLYDIR );
+		$modules_to_register = glob(EE_MODULES.'*', GLOB_ONLYDIR);
 		// filter list of modules to register
-		$modules_to_register = apply_filters( 'FHEE__EE_Config__register_modules__modules_to_register', $modules_to_register );
+		$modules_to_register = apply_filters('FHEE__EE_Config__register_modules__modules_to_register', $modules_to_register);
 
 
-		if ( ! empty( $modules_to_register ) ) {
+		if ( ! empty($modules_to_register)) {
 			// loop through folders
-			foreach ( $modules_to_register as $module_path ) {
+			foreach ($modules_to_register as $module_path) {
 				/**TEMPORARILY EXCLUDE gateways from modules for time being**/
-				if ( $module_path != EE_MODULES . 'zzz-copy-this-module-template' && $module_path != EE_MODULES . 'gateways' ) {
+				if ($module_path != EE_MODULES.'zzz-copy-this-module-template' && $module_path != EE_MODULES.'gateways') {
 					// add to list of installed modules
-					EE_Config::register_module( $module_path );
+					EE_Config::register_module($module_path);
 				}
 			}
 		}
 		// filter list of installed modules
-		return apply_filters( 'FHEE__EE_Config___register_modules__installed_modules', EE_Registry::instance()->modules );
+		return apply_filters('FHEE__EE_Config___register_modules__installed_modules', EE_Registry::instance()->modules);
 	}
 
 
@@ -1126,54 +1126,54 @@ 
 	 *  @param 	string 		$module_path - full path up to and including module folder
 	 *  @return 	bool
 	 */
-	public static function register_module( $module_path = NULL ) {
-		do_action( 'AHEE__EE_Config__register_module__begin', $module_path );
+	public static function register_module($module_path = NULL) {
+		do_action('AHEE__EE_Config__register_module__begin', $module_path);
 		$module_ext = '.module.php';
 		// make all separators match
-		$module_path = str_replace( array( '\\', '/' ), DS, $module_path );
+		$module_path = str_replace(array('\\', '/'), DS, $module_path);
 		// does the file path INCLUDE the actual file name as part of the path ?
-		if ( strpos( $module_path, $module_ext ) !== FALSE ) {
+		if (strpos($module_path, $module_ext) !== FALSE) {
 			// grab and shortcode file name from directory name and break apart at dots
-			$module_file = explode( '.', basename( $module_path ));
+			$module_file = explode('.', basename($module_path));
 			// now we need to rebuild the shortcode path
-			$module_path = explode( DS, $module_path );
+			$module_path = explode(DS, $module_path);
 			// remove last segment
-			array_pop( $module_path );
+			array_pop($module_path);
 			// glue it back together
-			$module_path = implode( DS, $module_path ) . DS;
+			$module_path = implode(DS, $module_path).DS;
 			// take first segment from file name pieces and sanitize it
-			$module = preg_replace( '/[^a-zA-Z0-9_\-]/', '', $module_file[0] );
+			$module = preg_replace('/[^a-zA-Z0-9_\-]/', '', $module_file[0]);
 			// ensure class prefix is added
-			$module_class = strpos( $module, 'EED_' ) !== 0 ? 'EED_' . $module : $module;
+			$module_class = strpos($module, 'EED_') !== 0 ? 'EED_'.$module : $module;
 		} else {
 			// we need to generate the filename based off of the folder name
 			// grab and sanitize module name
-			$module = strtolower( basename( $module_path ));
-			$module = preg_replace( '/[^a-z0-9_\-]/', '', $module);
+			$module = strtolower(basename($module_path));
+			$module = preg_replace('/[^a-z0-9_\-]/', '', $module);
 			// like trailingslashit()
-			$module_path = rtrim( $module_path, DS ) . DS;
+			$module_path = rtrim($module_path, DS).DS;
 			// create classname from module directory name
-			$module = str_replace( ' ', '_', ucwords( str_replace( '_', ' ', $module )));
+			$module = str_replace(' ', '_', ucwords(str_replace('_', ' ', $module)));
 			// add class prefix
-			$module_class = 'EED_' . $module;
+			$module_class = 'EED_'.$module;
 		}
 		// does the module exist ?
-		if ( ! is_readable( $module_path . DS . $module_class . $module_ext )) {
-			$msg = sprintf( __( 'The requested %s module file could not be found or is not readable due to file permissions.', 'event_espresso' ), $module );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! is_readable($module_path.DS.$module_class.$module_ext)) {
+			$msg = sprintf(__('The requested %s module file could not be found or is not readable due to file permissions.', 'event_espresso'), $module);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		// load the module class file
-		require_once( $module_path . $module_class . $module_ext );
+		require_once($module_path.$module_class.$module_ext);
 		// verify that class exists
-		if ( ! class_exists( $module_class )) {
-			$msg = sprintf( __( 'The requested %s module class does not exist.', 'event_espresso' ), $module_class );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! class_exists($module_class)) {
+			$msg = sprintf(__('The requested %s module class does not exist.', 'event_espresso'), $module_class);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		// add to array of registered modules
-		EE_Registry::instance()->modules->{$module_class} = $module_path . $module_class . $module_ext;
-		do_action( 'AHEE__EE_Config__register_module__complete', $module_class, EE_Registry::instance()->modules->{$module_class} );
+		EE_Registry::instance()->modules->{$module_class} = $module_path.$module_class.$module_ext;
+		do_action('AHEE__EE_Config__register_module__complete', $module_class, EE_Registry::instance()->modules->{$module_class} );
 		return TRUE;
 	}
 
@@ -1187,23 +1187,23 @@ 
 	 */
 	private function _initialize_shortcodes() {
 		// cycle thru shortcode folders
-		foreach ( EE_Registry::instance()->shortcodes as $shortcode => $shortcode_path ) {
+		foreach (EE_Registry::instance()->shortcodes as $shortcode => $shortcode_path) {
 			// add class prefix
-			$shortcode_class = 'EES_' . $shortcode;
+			$shortcode_class = 'EES_'.$shortcode;
 			// fire the shortcode class's set_hooks methods in case it needs to hook into other parts of the system
 			// which set hooks ?
-			if ( is_admin() ) {
+			if (is_admin()) {
 				// fire immediately
-				call_user_func( array( $shortcode_class, 'set_hooks_admin' ));
+				call_user_func(array($shortcode_class, 'set_hooks_admin'));
 			} else {
 				// delay until other systems are online
-				add_action( 'AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons', array( $shortcode_class,'set_hooks' ));
+				add_action('AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons', array($shortcode_class, 'set_hooks'));
 				// convert classname to UPPERCASE and create WP shortcode.
-				$shortcode_tag = strtoupper( $shortcode );
+				$shortcode_tag = strtoupper($shortcode);
 				// but first check if the shortcode has already been added before assigning 'fallback_shortcode_processor'
-				if ( ! shortcode_exists( $shortcode_tag )) {
+				if ( ! shortcode_exists($shortcode_tag)) {
 					// NOTE: this shortcode declaration will get overridden if the shortcode is successfully detected in the post content in EE_Front_Controller->_initialize_shortcodes()
-					add_shortcode( $shortcode_tag, array( $shortcode_class, 'fallback_shortcode_processor' ));
+					add_shortcode($shortcode_tag, array($shortcode_class, 'fallback_shortcode_processor'));
 				}
 			}
 		}
@@ -1220,15 +1220,15 @@ 
 	 */
 	private function _initialize_modules() {
 		// cycle thru shortcode folders
-		foreach ( EE_Registry::instance()->modules as $module_class => $module_path ) {
+		foreach (EE_Registry::instance()->modules as $module_class => $module_path) {
 			// fire the shortcode class's set_hooks methods in case it needs to hook into other parts of the system
 			// which set hooks ?
-			if ( is_admin() ) {
+			if (is_admin()) {
 				// fire immediately
-				call_user_func( array( $module_class, 'set_hooks_admin' ));
+				call_user_func(array($module_class, 'set_hooks_admin'));
 			} else {
 				// delay until other systems are online
-				add_action( 'AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons', array( $module_class,'set_hooks' ));
+				add_action('AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons', array($module_class, 'set_hooks'));
 			}
 		}
 	}
@@ -1246,26 +1246,26 @@ 
 	 *  @param 	string 		$key - url param key indicating a route is being called
 	 *  @return 	bool
 	 */
-	public static function register_route( $route = NULL, $module = NULL, $method_name = NULL, $key = 'ee' ) {
-		do_action( 'AHEE__EE_Config__register_route__begin', $route, $module, $method_name );
-		$module = str_replace( 'EED_', '', $module );
-		$module_class = 'EED_' . $module;
-		if ( ! isset( EE_Registry::instance()->modules->{$module_class} )) {
-			$msg = sprintf( __( 'The module %s has not been registered.', 'event_espresso' ), $module );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+	public static function register_route($route = NULL, $module = NULL, $method_name = NULL, $key = 'ee') {
+		do_action('AHEE__EE_Config__register_route__begin', $route, $module, $method_name);
+		$module = str_replace('EED_', '', $module);
+		$module_class = 'EED_'.$module;
+		if ( ! isset(EE_Registry::instance()->modules->{$module_class} )) {
+			$msg = sprintf(__('The module %s has not been registered.', 'event_espresso'), $module);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		if ( empty( $route )) {
-			$msg = sprintf( __( 'No route has been supplied.', 'event_espresso' ), $route );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($route)) {
+			$msg = sprintf(__('No route has been supplied.', 'event_espresso'), $route);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		if ( ! method_exists ( 'EED_' . $module, $method_name )) {
-			$msg = sprintf( __( 'A valid class method for the %s route has not been supplied.', 'event_espresso' ), $route );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! method_exists('EED_'.$module, $method_name)) {
+			$msg = sprintf(__('A valid class method for the %s route has not been supplied.', 'event_espresso'), $route);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		EE_Config::$_module_route_map[ $key ][ $route ] = array( 'EED_' . $module, $method_name );
+		EE_Config::$_module_route_map[$key][$route] = array('EED_'.$module, $method_name);
 		return TRUE;
 	}
 
@@ -1279,11 +1279,11 @@ 
 	 *  @param 	string 		$key - url param key indicating a route is being called
 	 *  @return 	string
 	 */
-	public static function get_route( $route = NULL, $key = 'ee' ) {
-		do_action( 'AHEE__EE_Config__get_route__begin',$route );
-		$route = apply_filters( 'FHEE__EE_Config__get_route',$route );
-		if ( isset( EE_Config::$_module_route_map[ $key ][ $route ] )) {
-			return EE_Config::$_module_route_map[ $key ][ $route ];
+	public static function get_route($route = NULL, $key = 'ee') {
+		do_action('AHEE__EE_Config__get_route__begin', $route);
+		$route = apply_filters('FHEE__EE_Config__get_route', $route);
+		if (isset(EE_Config::$_module_route_map[$key][$route])) {
+			return EE_Config::$_module_route_map[$key][$route];
 		}
 		return NULL;
 	}
@@ -1312,35 +1312,35 @@ 
 	 * @param    string 		$key - url param key indicating a route is being called
 	 * @return    bool
 	 */
-	public static function register_forward( $route = NULL, $status = 0, $forward = NULL, $key = 'ee' ) {
-		do_action( 'AHEE__EE_Config__register_forward',$route,$status,$forward );
-		if ( ! isset( EE_Config::$_module_route_map[ $key ][ $route ] ) ||  empty( $route )) {
-			$msg = sprintf( __( 'The module route %s for this forward has not been registered.', 'event_espresso' ), $route );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+	public static function register_forward($route = NULL, $status = 0, $forward = NULL, $key = 'ee') {
+		do_action('AHEE__EE_Config__register_forward', $route, $status, $forward);
+		if ( ! isset(EE_Config::$_module_route_map[$key][$route]) || empty($route)) {
+			$msg = sprintf(__('The module route %s for this forward has not been registered.', 'event_espresso'), $route);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		if ( empty( $forward )) {
-			$msg = sprintf( __( 'No forwarding route has been supplied.', 'event_espresso' ), $route );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($forward)) {
+			$msg = sprintf(__('No forwarding route has been supplied.', 'event_espresso'), $route);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		if ( is_array( $forward )) {
-			if ( ! isset( $forward[1] )) {
-				$msg = sprintf( __( 'A class method for the %s forwarding route has not been supplied.', 'event_espresso' ), $route );
-				EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if (is_array($forward)) {
+			if ( ! isset($forward[1])) {
+				$msg = sprintf(__('A class method for the %s forwarding route has not been supplied.', 'event_espresso'), $route);
+				EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 				return FALSE;
 			}
-			if ( ! method_exists( $forward[0], $forward[1] )) {
-				$msg = sprintf( __( 'The class method %s for the %s forwarding route is in invalid.', 'event_espresso' ), $forward[1], $route );
-				EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+			if ( ! method_exists($forward[0], $forward[1])) {
+				$msg = sprintf(__('The class method %s for the %s forwarding route is in invalid.', 'event_espresso'), $forward[1], $route);
+				EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 				return FALSE;
 			}
-		} else if ( ! function_exists( $forward )) {
-			$msg = sprintf( __( 'The function %s for the %s forwarding route is in invalid.', 'event_espresso' ), $forward, $route );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		} else if ( ! function_exists($forward)) {
+			$msg = sprintf(__('The function %s for the %s forwarding route is in invalid.', 'event_espresso'), $forward, $route);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		EE_Config::$_module_forward_map[ $key ][ $route ][ absint( $status ) ] = $forward;
+		EE_Config::$_module_forward_map[$key][$route][absint($status)] = $forward;
 		return TRUE;
 	}
 
@@ -1355,10 +1355,10 @@ 
 	 *  @param    string 		$key - url param key indicating a route is being called
 	 *  @return 	string
 	 */
-	public static function get_forward( $route = NULL, $status = 0, $key = 'ee' ) {
-		do_action( 'AHEE__EE_Config__get_forward__begin',$route,$status );
-		if ( isset( EE_Config::$_module_forward_map[ $key ][ $route ][ $status ] )) {
-			return apply_filters( 'FHEE__EE_Config__get_forward', EE_Config::$_module_forward_map[ $key ][ $route ][ $status ], $route,$status );
+	public static function get_forward($route = NULL, $status = 0, $key = 'ee') {
+		do_action('AHEE__EE_Config__get_forward__begin', $route, $status);
+		if (isset(EE_Config::$_module_forward_map[$key][$route][$status])) {
+			return apply_filters('FHEE__EE_Config__get_forward', EE_Config::$_module_forward_map[$key][$route][$status], $route, $status);
 		}
 		return NULL;
 	}
@@ -1375,19 +1375,19 @@ 
 	 * @param    string 		$key - url param key indicating a route is being called
 	 * @return    bool
 	 */
-	public static function register_view( $route = NULL, $status = 0, $view = NULL, $key = 'ee' ) {
-		do_action( 'AHEE__EE_Config__register_view__begin',$route,$status,$view );
-		if ( ! isset( EE_Config::$_module_route_map[ $key ][ $route ] ) ||  empty( $route )) {
-			$msg = sprintf( __( 'The module route %s for this view has not been registered.', 'event_espresso' ), $route );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+	public static function register_view($route = NULL, $status = 0, $view = NULL, $key = 'ee') {
+		do_action('AHEE__EE_Config__register_view__begin', $route, $status, $view);
+		if ( ! isset(EE_Config::$_module_route_map[$key][$route]) || empty($route)) {
+			$msg = sprintf(__('The module route %s for this view has not been registered.', 'event_espresso'), $route);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		if ( ! is_readable( $view )) {
-			$msg = sprintf( __( 'The %s view file could not be found or is not readable due to file permissions.', 'event_espresso' ), $view );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! is_readable($view)) {
+			$msg = sprintf(__('The %s view file could not be found or is not readable due to file permissions.', 'event_espresso'), $view);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		EE_Config::$_module_view_map[ $key ][ $route ][ absint( $status ) ] = $view;
+		EE_Config::$_module_view_map[$key][$route][absint($status)] = $view;
 		return TRUE;
 	}
 
@@ -1404,10 +1404,10 @@ 
 	 *  @param    string 		$key - url param key indicating a route is being called
 	 *  @return 	string
 	 */
-	public static function get_view( $route = NULL, $status = 0, $key = 'ee' ) {
-		do_action( 'AHEE__EE_Config__get_view__begin',$route,$status );
-		if ( isset( EE_Config::$_module_view_map[ $key ][ $route ][ $status ] )) {
-			return apply_filters( 'FHEE__EE_Config__get_view', EE_Config::$_module_view_map[ $key ][ $route ][ $status ], $route,$status );
+	public static function get_view($route = NULL, $status = 0, $key = 'ee') {
+		do_action('AHEE__EE_Config__get_view__begin', $route, $status);
+		if (isset(EE_Config::$_module_view_map[$key][$route][$status])) {
+			return apply_filters('FHEE__EE_Config__get_view', EE_Config::$_module_view_map[$key][$route][$status], $route, $status);
 		}
 		return NULL;
 	}
@@ -1415,7 +1415,7 @@ 
 
 
 	public function shutdown() {
-		update_option( 'ee_config_option_names', $this->_config_option_names );
+		update_option('ee_config_option_names', $this->_config_option_names);
 	}
 
 
@@ -1431,7 +1431,7 @@ 
  * magic functions in use, except we'll allow them to magically set and get stuff...
  * basically, they should just be well-defined stdClasses
  */
-class EE_Config_Base{
+class EE_Config_Base {
 
 	/**
 	 * Utility function for escaping the value of a property and returning.
@@ -1440,13 +1440,13 @@ 
 	 * @return mixed if a detected type found return the escaped value, otherwise just the raw value is returned.
 	 * @throws \EE_Error
 	 */
-	public function get_pretty( $property ) {
-		if ( ! property_exists( $this, $property ) ) {
-			throw new EE_Error( sprintf( __('%1$s::get_pretty() has been called with the property %2$s which does not exist on the %1$s config class.', 'event_espresso' ), get_class( $this ), $property ) );
+	public function get_pretty($property) {
+		if ( ! property_exists($this, $property)) {
+			throw new EE_Error(sprintf(__('%1$s::get_pretty() has been called with the property %2$s which does not exist on the %1$s config class.', 'event_espresso'), get_class($this), $property));
 		}
 		//just handling escaping of strings for now.
-		if ( is_string( $this->{$property} ) ) {
-			return stripslashes( $this->{$property} );
+		if (is_string($this->{$property} )) {
+			return stripslashes($this->{$property} );
 		}
 		return $this->{$property};
 	}
@@ -1455,19 +1455,19 @@ 
 
 	public function populate() {
 		//grab defaults via a new instance of this class.
-		$class_name = get_class( $this );
+		$class_name = get_class($this);
 		$defaults = new $class_name;
 
 		//loop through the properties for this class and see if they are set.  If they are NOT, then grab the
 		//default from our $defaults object.
-		foreach ( get_object_vars( $defaults ) as $property => $value ) {
-			if ( is_null( $this->{$property} ) ) {
+		foreach (get_object_vars($defaults) as $property => $value) {
+			if (is_null($this->{$property} )) {
 				$this->{$property} = $value;
 			}
 		}
 
 		//cleanup
-		unset( $defaults );
+		unset($defaults);
 	}
 
 
@@ -1559,12 +1559,12 @@ 
 	 */
 	public function __construct() {
 		$current_network_main_site = is_multisite() ? get_current_site() : NULL;
-		$current_main_site_id = !empty( $current_network_main_site ) ? $current_network_main_site->blog_id : 1;
+		$current_main_site_id = ! empty($current_network_main_site) ? $current_network_main_site->blog_id : 1;
 		// set default organization settings
 		$this->current_blog_id = get_current_blog_id();
 		$this->current_blog_id = $this->current_blog_id === NULL ? 1 : $this->current_blog_id;
-		$this->ee_ueip_optin = is_main_site() ? get_option( 'ee_ueip_optin', TRUE ) : get_blog_option( $current_main_site_id, 'ee_ueip_optin', TRUE );
-		$this->ee_ueip_has_notified = is_main_site() ? get_option( 'ee_ueip_has_notified', FALSE ) : TRUE;
+		$this->ee_ueip_optin = is_main_site() ? get_option('ee_ueip_optin', TRUE) : get_blog_option($current_main_site_id, 'ee_ueip_optin', TRUE);
+		$this->ee_ueip_has_notified = is_main_site() ? get_option('ee_ueip_has_notified', FALSE) : TRUE;
 		$this->post_shortcodes = array();
 		$this->module_route_map = array();
 		$this->module_forward_map = array();
@@ -1583,7 +1583,7 @@ 
 		$this->event_cpt_slug = __('events', 'event_espresso');
 
 		//ueip constant check
-		if ( defined( 'EE_DISABLE_UXIP' ) && EE_DISABLE_UXIP ) {
+		if (defined('EE_DISABLE_UXIP') && EE_DISABLE_UXIP) {
 			$this->ee_ueip_optin = FALSE;
 			$this->ee_ueip_has_notified = TRUE;
 		}
@@ -1623,8 +1623,8 @@ 
 	 *  @return 	string
 	 */
 	public function reg_page_url() {
-		if ( ! $this->reg_page_url ) {
-			$this->reg_page_url = get_permalink( $this->reg_page_id ) . '#checkout';
+		if ( ! $this->reg_page_url) {
+			$this->reg_page_url = get_permalink($this->reg_page_id).'#checkout';
 		}
 		return $this->reg_page_url;
 	}
@@ -1637,12 +1637,12 @@ 
 	 *  @return 	string
 	 */
 	public function txn_page_url($query_args = array()) {
-		if ( ! $this->txn_page_url ) {
-			$this->txn_page_url = get_permalink( $this->txn_page_id );
+		if ( ! $this->txn_page_url) {
+			$this->txn_page_url = get_permalink($this->txn_page_id);
 		}
-		if($query_args){
-			return add_query_arg($query_args,$this->txn_page_url);
-		}else{
+		if ($query_args) {
+			return add_query_arg($query_args, $this->txn_page_url);
+		} else {
 			return $this->txn_page_url;
 		}
 	}
@@ -1654,12 +1654,12 @@ 
 	 *  @return 	string
 	 */
 	public function thank_you_page_url($query_args = array()) {
-		if ( ! $this->thank_you_page_url ) {
-			$this->thank_you_page_url = get_permalink( $this->thank_you_page_id );
+		if ( ! $this->thank_you_page_url) {
+			$this->thank_you_page_url = get_permalink($this->thank_you_page_id);
 		}
-		if($query_args){
-			return add_query_arg($query_args,$this->thank_you_page_url);
-		}else{
+		if ($query_args) {
+			return add_query_arg($query_args, $this->thank_you_page_url);
+		} else {
 			return $this->thank_you_page_url;
 		}
 	}
@@ -1670,8 +1670,8 @@ 
 	 *  @return 	string
 	 */
 	public function cancel_page_url() {
-		if ( ! $this->cancel_page_url ) {
-			$this->cancel_page_url = get_permalink( $this->cancel_page_id );
+		if ( ! $this->cancel_page_url) {
+			$this->cancel_page_url = get_permalink($this->cancel_page_id);
 		}
 		return $this->cancel_page_url;
 	}
@@ -1699,7 +1699,7 @@ 
 		//reset all url properties
 		$this->_reset_urls();
 		//return what to save to db
-		return array_keys( get_object_vars( $this ) );
+		return array_keys(get_object_vars($this));
 	}
 
 }
@@ -1931,39 +1931,39 @@ 
 	 * @param null $CNT_ISO
 	 * @return \EE_Currency_Config
 	 */
-	public function __construct( $CNT_ISO = NULL ) {
+	public function __construct($CNT_ISO = NULL) {
 
 		// get country code from organization settings or use default
-		$ORG_CNT = isset( EE_Registry::instance()->CFG->organization ) && EE_Registry::instance()->CFG->organization instanceof EE_Organization_Config ? EE_Registry::instance()->CFG->organization->CNT_ISO : NULL;
+		$ORG_CNT = isset(EE_Registry::instance()->CFG->organization) && EE_Registry::instance()->CFG->organization instanceof EE_Organization_Config ? EE_Registry::instance()->CFG->organization->CNT_ISO : NULL;
 		// but override if requested
-		$CNT_ISO = ! empty( $CNT_ISO ) ? $CNT_ISO : $ORG_CNT;
-		EE_Registry::instance()->load_helper( 'Activation' );
+		$CNT_ISO = ! empty($CNT_ISO) ? $CNT_ISO : $ORG_CNT;
+		EE_Registry::instance()->load_helper('Activation');
 		// so if that all went well, and we are not in M-Mode (cuz you can't query the db in M-Mode) and double-check the countries table exists
-		if ( ! empty( $CNT_ISO ) && EE_Maintenance_Mode::instance()->models_can_query() && EEH_Activation::table_exists( EE_Registry::instance()->load_model( 'Country' )->table() ) ) {
+		if ( ! empty($CNT_ISO) && EE_Maintenance_Mode::instance()->models_can_query() && EEH_Activation::table_exists(EE_Registry::instance()->load_model('Country')->table())) {
 			// retrieve the country settings from the db, just in case they have been customized
-			$country = EE_Registry::instance()->load_model( 'Country' )->get_one_by_ID( $CNT_ISO );
-			if ( $country instanceof EE_Country ) {
-				$this->code = $country->currency_code(); 	// currency code: USD, CAD, EUR
-				$this->name = $country->currency_name_single();	// Dollar
-				$this->plural = $country->currency_name_plural(); 	// Dollars
-				$this->sign =  $country->currency_sign(); 			// currency sign: $
-				$this->sign_b4 = $country->currency_sign_before(); 		// currency sign before or after: $TRUE  or  FALSE$
-				$this->dec_plc = $country->currency_decimal_places();	// decimal places: 2 = 0.00  3 = 0.000
-				$this->dec_mrk = $country->currency_decimal_mark();	// decimal mark: (comma) ',' = 0,01   or (decimal) '.' = 0.01
-				$this->thsnds = $country->currency_thousands_separator();	// thousands separator: (comma) ',' = 1,000   or (decimal) '.' = 1.000
+			$country = EE_Registry::instance()->load_model('Country')->get_one_by_ID($CNT_ISO);
+			if ($country instanceof EE_Country) {
+				$this->code = $country->currency_code(); // currency code: USD, CAD, EUR
+				$this->name = $country->currency_name_single(); // Dollar
+				$this->plural = $country->currency_name_plural(); // Dollars
+				$this->sign = $country->currency_sign(); // currency sign: $
+				$this->sign_b4 = $country->currency_sign_before(); // currency sign before or after: $TRUE  or  FALSE$
+				$this->dec_plc = $country->currency_decimal_places(); // decimal places: 2 = 0.00  3 = 0.000
+				$this->dec_mrk = $country->currency_decimal_mark(); // decimal mark: (comma) ',' = 0,01   or (decimal) '.' = 0.01
+				$this->thsnds = $country->currency_thousands_separator(); // thousands separator: (comma) ',' = 1,000   or (decimal) '.' = 1.000
 			}
 		}
 		// fallback to hardcoded defaults, in case the above failed
-		if ( empty( $this->code )) {
+		if (empty($this->code)) {
 			// set default currency settings
-			$this->code = 'USD'; 	// currency code: USD, CAD, EUR
-			$this->name = __( 'Dollar', 'event_espresso' ); 	// Dollar
-			$this->plural = __( 'Dollars', 'event_espresso' ); 	// Dollars
-			$this->sign =  '$'; 	// currency sign: $
-			$this->sign_b4 = TRUE; 	// currency sign before or after: $TRUE  or  FALSE$
-			$this->dec_plc = 2; 	// decimal places: 2 = 0.00  3 = 0.000
-			$this->dec_mrk = '.'; 	// decimal mark: (comma) ',' = 0,01   or (decimal) '.' = 0.01
-			$this->thsnds = ','; 	// thousands separator: (comma) ',' = 1,000   or (decimal) '.' = 1.000
+			$this->code = 'USD'; // currency code: USD, CAD, EUR
+			$this->name = __('Dollar', 'event_espresso'); // Dollar
+			$this->plural = __('Dollars', 'event_espresso'); // Dollars
+			$this->sign = '$'; // currency sign: $
+			$this->sign_b4 = TRUE; // currency sign before or after: $TRUE  or  FALSE$
+			$this->dec_plc = 2; // decimal places: 2 = 0.00  3 = 0.000
+			$this->dec_mrk = '.'; // decimal mark: (comma) ',' = 0,01   or (decimal) '.' = 0.01
+			$this->thsnds = ','; // thousands separator: (comma) ',' = 1,000   or (decimal) '.' = 1.000
 		}
 	}
 }
@@ -2103,7 +2103,7 @@ 
 	 * @since 4.8.8.rc.019
 	 */
 	public function do_hooks() {
-		add_action( 'AHEE__EE_Config___load_core_config__end', array( $this, 'set_default_reg_status_on_EEM_Event' ));
+		add_action('AHEE__EE_Config___load_core_config__end', array($this, 'set_default_reg_status_on_EEM_Event'));
 	}
 
 
@@ -2111,7 +2111,7 @@ 
 	 * @return void
 	 */
 	public function set_default_reg_status_on_EEM_Event() {
-		EEM_Event::set_default_reg_status( $this->default_STS_ID );
+		EEM_Event::set_default_reg_status($this->default_STS_ID);
 	}
 
 
@@ -2216,10 +2216,10 @@ 
 	 * @param bool $reset
 	 * @return string
 	 */
-	public function log_file_name( $reset = FALSE ) {
-		if ( empty( $this->log_file_name ) || $reset ) {
-			$this->log_file_name = sanitize_key( 'espresso_log_' . md5( uniqid( '', TRUE ))) . '.txt';
-			EE_Config::instance()->update_espresso_config( FALSE, FALSE );
+	public function log_file_name($reset = FALSE) {
+		if (empty($this->log_file_name) || $reset) {
+			$this->log_file_name = sanitize_key('espresso_log_'.md5(uniqid('', TRUE))).'.txt';
+			EE_Config::instance()->update_espresso_config(FALSE, FALSE);
 		}
 		return $this->log_file_name;
 	}
@@ -2231,10 +2231,10 @@ 
 	 * @param bool $reset
 	 * @return string
 	 */
-	public function debug_file_name( $reset = FALSE ) {
-		if ( empty( $this->debug_file_name ) || $reset ) {
-			$this->debug_file_name = sanitize_key( 'espresso_debug_' . md5( uniqid( '', TRUE ))) . '.txt';
-			EE_Config::instance()->update_espresso_config( FALSE, FALSE );
+	public function debug_file_name($reset = FALSE) {
+		if (empty($this->debug_file_name) || $reset) {
+			$this->debug_file_name = sanitize_key('espresso_debug_'.md5(uniqid('', TRUE))).'.txt';
+			EE_Config::instance()->update_espresso_config(FALSE, FALSE);
 		}
 		return $this->debug_file_name;
 	}
@@ -2407,21 +2407,21 @@ 
 		// set default map settings
 		$this->use_google_maps = TRUE;
 		// for event details pages (reg page)
-		$this->event_details_map_width = 585; 			// ee_map_width_single
-		$this->event_details_map_height = 362; 			// ee_map_height_single
-		$this->event_details_map_zoom = 14; 			// ee_map_zoom_single
-		$this->event_details_display_nav = TRUE; 			// ee_map_nav_display_single
-		$this->event_details_nav_size = FALSE; 			// ee_map_nav_size_single
-		$this->event_details_control_type = 'default'; 		// ee_map_type_control_single
-		$this->event_details_map_align = 'center'; 			// ee_map_align_single
+		$this->event_details_map_width = 585; // ee_map_width_single
+		$this->event_details_map_height = 362; // ee_map_height_single
+		$this->event_details_map_zoom = 14; // ee_map_zoom_single
+		$this->event_details_display_nav = TRUE; // ee_map_nav_display_single
+		$this->event_details_nav_size = FALSE; // ee_map_nav_size_single
+		$this->event_details_control_type = 'default'; // ee_map_type_control_single
+		$this->event_details_map_align = 'center'; // ee_map_align_single
 		// for event list pages
-		$this->event_list_map_width = 300; 			// ee_map_width
-		$this->event_list_map_height = 185; 		// ee_map_height
-		$this->event_list_map_zoom = 12; 			// ee_map_zoom
-		$this->event_list_display_nav = FALSE; 		// ee_map_nav_display
-		$this->event_list_nav_size = TRUE; 			// ee_map_nav_size
-		$this->event_list_control_type = 'dropdown'; 		// ee_map_type_control
-		$this->event_list_map_align = 'center'; 			// ee_map_align
+		$this->event_list_map_width = 300; // ee_map_width
+		$this->event_list_map_height = 185; // ee_map_height
+		$this->event_list_map_zoom = 12; // ee_map_zoom
+		$this->event_list_display_nav = FALSE; // ee_map_nav_display
+		$this->event_list_nav_size = TRUE; // ee_map_nav_size
+		$this->event_list_control_type = 'dropdown'; // ee_map_type_control
+		$this->event_list_map_align = 'center'; // ee_map_align
 	}
 
 }
@@ -2432,7 +2432,7 @@ 
 /**
  * stores Events_Archive settings
  */
-class EE_Events_Archive_Config extends EE_Config_Base{
+class EE_Events_Archive_Config extends EE_Config_Base {
 
 	public $display_status_banner;
 	public $display_description;
@@ -2451,7 +2451,7 @@ 
 	/**
 	 *	class constructor
 	 */
-	public function __construct(){
+	public function __construct() {
 		$this->display_status_banner = 0;
 		$this->display_description = 1;
 		$this->display_ticket_selector = 0;
@@ -2471,7 +2471,7 @@ 
 /**
  * Stores Event_Single_Config settings
  */
-class EE_Event_Single_Config extends EE_Config_Base{
+class EE_Event_Single_Config extends EE_Config_Base {
 
 	public $display_status_banner_single;
 	public $display_venue;
@@ -2500,7 +2500,7 @@ 
 /**
  * Stores Ticket_Selector_Config settings
  */
-class EE_Ticket_Selector_Config extends EE_Config_Base{
+class EE_Ticket_Selector_Config extends EE_Config_Base {
 	public $show_ticket_sale_columns;
 	public $show_ticket_details;
 	public $show_expired_tickets;
@@ -2554,7 +2554,7 @@ 
 	 * @return void
 	 */
 	protected function _set_php_values() {
-		$this->php->max_input_vars = ini_get( 'max_input_vars' );
+		$this->php->max_input_vars = ini_get('max_input_vars');
 		$this->php->version = phpversion();
 	}
 
@@ -2573,8 +2573,8 @@ 
 	 *         @type string $msg 		Any message to be displayed.
 	 * }
 	 */
-	public function max_input_vars_limit_check( $input_count = 0 ) {
-		if ( ( $input_count >= $this->php->max_input_vars ) && ( PHP_MAJOR_VERSION >= 5 && PHP_MINOR_VERSION >= 3 && PHP_RELEASE_VERSION >=9 ) ) {
+	public function max_input_vars_limit_check($input_count = 0) {
+		if (($input_count >= $this->php->max_input_vars) && (PHP_MAJOR_VERSION >= 5 && PHP_MINOR_VERSION >= 3 && PHP_RELEASE_VERSION >= 9)) {
 			return  __('The number of inputs on this page has been exceeded.  You cannot add anymore items (i.e. tickets, datetimes, custom fields) on this page because of your servers PHP "max_input_vars" setting.', 'event_espresso');
 		} else {
 			return '';
@@ -2610,7 +2610,7 @@ 
  * stores payment gateway info
  * @deprecated
  */
-class EE_Gateway_Config extends EE_Config_Base{
+class EE_Gateway_Config extends EE_Config_Base {
 
 	/**
 	 * Array with keys that are payment gateways slugs, and values are arrays
@@ -2632,9 +2632,9 @@ 
 	 *	class constructor
 	 * @deprecated
 	 */
-	public function __construct(){
+	public function __construct() {
 		$this->payment_settings = array();
-		$this->active_gateways = array( 'Invoice' => FALSE );
+		$this->active_gateways = array('Invoice' => FALSE);
 	}
 }
 

core/helpers/EEH_Debug_Tools.helper.php

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
 /**
- * Class EEH_Debug_Tools
- *
- * @package 			Event Espresso
- * @subpackage 	core
- * @author 				Brent Christensen, Michael Nelson
- * @since 				4.0
- *
- */
+	 * Class EEH_Debug_Tools
+	 *
+	 * @package 			Event Espresso
+	 * @subpackage 	core
+	 * @author 				Brent Christensen, Michael Nelson
+	 * @since 				4.0
+	 *
+	 */
 class EEH_Debug_Tools{
 
 	/**

Doc Comments +1 added lines, -1 removed lines

@@ -392,7 +392,7 @@
 	 *    @ access public
 	 *    @ return void
 	 *
-	 * @param mixed $var
+	 * @param string $var
 	 * @param bool $var_name
 	 * @param string $file
 	 * @param int $line

Spacing +137 added lines, -137 removed lines

@@ -8,7 +8,7 @@ 
  * @since 				4.0
  *
  */
-class EEH_Debug_Tools{
+class EEH_Debug_Tools {
 
 	/**
 	 * 	instance of the EEH_Autoloader object
@@ -41,7 +41,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated, and instantiated properly
-		if ( ! self::$_instance instanceof EEH_Debug_Tools ) {
+		if ( ! self::$_instance instanceof EEH_Debug_Tools) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -57,21 +57,21 @@ 
 	 */
 	private function __construct() {
 		// load Kint PHP debugging library
-		if ( ! class_exists( 'Kint' ) &&  file_exists( EE_PLUGIN_DIR_PATH . 'tests' . DS . 'kint' . DS . 'Kint.class.php' )){
+		if ( ! class_exists('Kint') && file_exists(EE_PLUGIN_DIR_PATH.'tests'.DS.'kint'.DS.'Kint.class.php')) {
 			// despite EE4 having a check for an existing copy of the Kint debugging class,
 			// if another plugin was loaded AFTER EE4 and they did NOT perform a similar check,
 			// then hilarity would ensue as PHP throws a "Cannot redeclare class Kint" error
 			// so we've moved it to our test folder so that it is not included with production releases
 			// plz use https://wordpress.org/plugins/kint-debugger/  if testing production versions of EE
-			require_once( EE_PLUGIN_DIR_PATH . 'tests' . DS . 'kint' . DS . 'Kint.class.php' );
+			require_once(EE_PLUGIN_DIR_PATH.'tests'.DS.'kint'.DS.'Kint.class.php');
 		}
-		if ( ! defined('DOING_AJAX') || ! isset( $_REQUEST['noheader'] ) || $_REQUEST['noheader'] != 'true' || ! isset( $_REQUEST['TB_iframe'] )) {
+		if ( ! defined('DOING_AJAX') || ! isset($_REQUEST['noheader']) || $_REQUEST['noheader'] != 'true' || ! isset($_REQUEST['TB_iframe'])) {
 			//add_action( 'shutdown', array($this,'espresso_session_footer_dump') );
 		}
-		$plugin = basename( EE_PLUGIN_DIR_PATH );
-		add_action( "activate_{$plugin}", array( 'EEH_Debug_Tools', 'ee_plugin_activation_errors' ));
-		add_action( 'activated_plugin', array( 'EEH_Debug_Tools', 'ee_plugin_activation_errors' ));
-		add_action( 'shutdown', array( 'EEH_Debug_Tools', 'show_db_name' ));
+		$plugin = basename(EE_PLUGIN_DIR_PATH);
+		add_action("activate_{$plugin}", array('EEH_Debug_Tools', 'ee_plugin_activation_errors'));
+		add_action('activated_plugin', array('EEH_Debug_Tools', 'ee_plugin_activation_errors'));
+		add_action('shutdown', array('EEH_Debug_Tools', 'show_db_name'));
 	}
 
 
@@ -82,8 +82,8 @@ 
 	 * 	@return void
 	 */
 	public static function show_db_name() {
-		if ( ! defined( 'DOING_AJAX' ) && ( defined( 'EE_ERROR_EMAILS' ) && EE_ERROR_EMAILS )) {
-			echo '<p style="font-size:10px;font-weight:normal;color:#E76700;margin: 1em 2em; text-align: right;">DB_NAME: '. DB_NAME .'</p>';
+		if ( ! defined('DOING_AJAX') && (defined('EE_ERROR_EMAILS') && EE_ERROR_EMAILS)) {
+			echo '<p style="font-size:10px;font-weight:normal;color:#E76700;margin: 1em 2em; text-align: right;">DB_NAME: '.DB_NAME.'</p>';
 		}
 	}
 
@@ -95,9 +95,9 @@ 
 	 * 	@return void
 	 */
 	public function espresso_session_footer_dump() {
-		if ( class_exists('Kint') && function_exists( 'wp_get_current_user' ) && current_user_can('update_core') && ( defined('WP_DEBUG') && WP_DEBUG ) &&  ! defined('DOING_AJAX') && class_exists( 'EE_Registry' )) {
-			Kint::dump(  EE_Registry::instance()->SSN->id() );
-			Kint::dump( EE_Registry::instance()->SSN );
+		if (class_exists('Kint') && function_exists('wp_get_current_user') && current_user_can('update_core') && (defined('WP_DEBUG') && WP_DEBUG) && ! defined('DOING_AJAX') && class_exists('EE_Registry')) {
+			Kint::dump(EE_Registry::instance()->SSN->id());
+			Kint::dump(EE_Registry::instance()->SSN);
 			//			Kint::dump( EE_Registry::instance()->SSN->get_session_data('cart')->get_tickets() );
 			$this->espresso_list_hooked_functions();
 			$this->show_times();
@@ -114,27 +114,27 @@ 
 	 * @param bool $tag
 	 * @return void
 	 */
-	public function espresso_list_hooked_functions( $tag=FALSE ){
+	public function espresso_list_hooked_functions($tag = FALSE) {
 		global $wp_filter;
 		echo '<br/><br/><br/><h3>Hooked Functions</h3>';
-		if ( $tag ) {
-			$hook[$tag]=$wp_filter[$tag];
-			if ( ! is_array( $hook[$tag] )) {
-				trigger_error( "Nothing found for '$tag' hook", E_USER_WARNING );
+		if ($tag) {
+			$hook[$tag] = $wp_filter[$tag];
+			if ( ! is_array($hook[$tag])) {
+				trigger_error("Nothing found for '$tag' hook", E_USER_WARNING);
 				return;
 			}
-			echo '<h5>For Tag: '. $tag .'</h5>';
+			echo '<h5>For Tag: '.$tag.'</h5>';
 		}
 		else {
-			$hook=$wp_filter;
-			ksort( $hook );
+			$hook = $wp_filter;
+			ksort($hook);
 		}
-		foreach( $hook as $tag => $priorities ) {
+		foreach ($hook as $tag => $priorities) {
 			echo "<br />&gt;&gt;&gt;&gt;&gt;\t<strong>$tag</strong><br />";
-			ksort( $priorities );
-			foreach( $priorities as $priority => $function ){
+			ksort($priorities);
+			foreach ($priorities as $priority => $function) {
 				echo $priority;
-				foreach( $function as $name => $properties ) {
+				foreach ($function as $name => $properties) {
 					echo "\t$name<br />";
 				}
 			}
@@ -150,15 +150,15 @@ 
 	 * @param string $hook_name
 	 * @return array
 	 */
-	public static function registered_filter_callbacks( $hook_name = '' ) {
+	public static function registered_filter_callbacks($hook_name = '') {
 		$filters = array();
 		global $wp_filter;
-		if ( isset( $wp_filter[ $hook_name ] ) ) {
-			$filters[ $hook_name ] = array();
-			foreach ( $wp_filter[ $hook_name ] as $priority => $callbacks ) {
-				$filters[ $hook_name ][ $priority ] = array();
-				foreach ( $callbacks as $callback ) {
-					$filters[ $hook_name ][ $priority ][] = $callback['function'];
+		if (isset($wp_filter[$hook_name])) {
+			$filters[$hook_name] = array();
+			foreach ($wp_filter[$hook_name] as $priority => $callbacks) {
+				$filters[$hook_name][$priority] = array();
+				foreach ($callbacks as $callback) {
+					$filters[$hook_name][$priority][] = $callback['function'];
 				}
 			}
 		}
@@ -171,8 +171,8 @@ 
 	 * 	start_timer
 	 * @param null $timer_name
 	 */
-	public function start_timer( $timer_name = NULL ){
-		$this->_start_times[$timer_name] = microtime( TRUE );
+	public function start_timer($timer_name = NULL) {
+		$this->_start_times[$timer_name] = microtime(TRUE);
 	}
 
 
@@ -181,15 +181,15 @@ 
 	 * stop_timer
 	 * @param string $timer_name
 	 */
-	public function stop_timer($timer_name = 'default'){
-		if( isset( $this->_start_times[ $timer_name ] ) ){
-			$start_time = $this->_start_times[ $timer_name ];
-			unset( $this->_start_times[ $timer_name ] );
-		}else{
-			$start_time = array_pop( $this->_start_times );
+	public function stop_timer($timer_name = 'default') {
+		if (isset($this->_start_times[$timer_name])) {
+			$start_time = $this->_start_times[$timer_name];
+			unset($this->_start_times[$timer_name]);
+		} else {
+			$start_time = array_pop($this->_start_times);
 		}
-		$total_time = microtime( TRUE ) - $start_time;
-		switch ( $total_time ) {
+		$total_time = microtime(TRUE) - $start_time;
+		switch ($total_time) {
 			case $total_time < 0.00001 :
 				$color = '#8A549A';
 				$bold = 'normal';
@@ -215,7 +215,7 @@ 
 				$bold = 'bold';
 				break;
 		}
-		$this->_times[] = '<hr /><div style="display: inline-block; min-width: 10px; margin:0 1em; color:'.$color.'; font-weight:'.$bold.'; font-size:1.2em;">' . number_format( $total_time, 8 ) . '</div> ' . $timer_name;
+		$this->_times[] = '<hr /><div style="display: inline-block; min-width: 10px; margin:0 1em; color:'.$color.'; font-weight:'.$bold.'; font-size:1.2em;">'.number_format($total_time, 8).'</div> '.$timer_name;
 	}
 	/**
 	 * Measure the memory usage by PHP so far.
@@ -223,10 +223,10 @@ 
 	 * @param boolean $output_now whether to echo now, or wait until EEH_Debug_Tools::show_times() is called
 	 * @return void
 	 */
-	public function measure_memory( $label, $output_now = false ) {
-		$memory_used = $this->convert( memory_get_peak_usage( true ) );
-		$this->_memory_usage_points[ $label ] = $memory_used;
-		if( $output_now ) {
+	public function measure_memory($label, $output_now = false) {
+		$memory_used = $this->convert(memory_get_peak_usage(true));
+		$this->_memory_usage_points[$label] = $memory_used;
+		if ($output_now) {
 			echo "\r\n<br>$label : $memory_used";
 		}
 	}
@@ -236,9 +236,9 @@ 
 	 * @param int $size
 	 * @return string
 	 */
-	public function convert( $size ) {
-		$unit=array('b','kb','mb','gb','tb','pb');
-		return @round($size/pow(1024,($i=floor(log($size,1024)))),2).' '.$unit[ absint( $i ) ];
+	public function convert($size) {
+		$unit = array('b', 'kb', 'mb', 'gb', 'tb', 'pb');
+		return @round($size / pow(1024, ($i = floor(log($size, 1024)))), 2).' '.$unit[absint($i)];
 	}
 
 
@@ -248,9 +248,9 @@ 
 	 * @param bool $output_now
 	 * @return string
 	 */
-	public function show_times($output_now=true){
-		$output = '<h2>Times:</h2>' . implode("<br>",$this->_times) . '<h2>Memory</h2>' . implode('<br>', $this->_memory_usage_points );
-		if($output_now){
+	public function show_times($output_now = true) {
+		$output = '<h2>Times:</h2>'.implode("<br>", $this->_times).'<h2>Memory</h2>'.implode('<br>', $this->_memory_usage_points);
+		if ($output_now) {
 			echo $output;
 			return '';
 		}
@@ -265,25 +265,25 @@ 
 	 * 	@return void
 	 */
 	public static function ee_plugin_activation_errors() {
-		if ( WP_DEBUG ) {
+		if (WP_DEBUG) {
 			$activation_errors = ob_get_contents();
-			if ( ! empty( $activation_errors ) ) {
-				$activation_errors = date( 'Y-m-d H:i:s' ) . "\n" . $activation_errors;
+			if ( ! empty($activation_errors)) {
+				$activation_errors = date('Y-m-d H:i:s')."\n".$activation_errors;
 			}
-			espresso_load_required( 'EEH_File', EE_HELPERS . 'EEH_File.helper.php' );
-			if ( class_exists( 'EEH_File' )) {
+			espresso_load_required('EEH_File', EE_HELPERS.'EEH_File.helper.php');
+			if (class_exists('EEH_File')) {
 				try {
-					EEH_File::ensure_file_exists_and_is_writable( EVENT_ESPRESSO_UPLOAD_DIR . 'logs' . DS . 'espresso_plugin_activation_errors.html' );
-					EEH_File::write_to_file( EVENT_ESPRESSO_UPLOAD_DIR . 'logs' . DS . 'espresso_plugin_activation_errors.html', $activation_errors );
-				} catch( EE_Error $e ){
-					EE_Error::add_error( sprintf( __(  'The Event Espresso activation errors file could not be setup because: %s', 'event_espresso' ), $e->getMessage() ), __FILE__, __FUNCTION__, __LINE__ );
+					EEH_File::ensure_file_exists_and_is_writable(EVENT_ESPRESSO_UPLOAD_DIR.'logs'.DS.'espresso_plugin_activation_errors.html');
+					EEH_File::write_to_file(EVENT_ESPRESSO_UPLOAD_DIR.'logs'.DS.'espresso_plugin_activation_errors.html', $activation_errors);
+				} catch (EE_Error $e) {
+					EE_Error::add_error(sprintf(__('The Event Espresso activation errors file could not be setup because: %s', 'event_espresso'), $e->getMessage()), __FILE__, __FUNCTION__, __LINE__);
 				}
 			} else {
 				// old school attempt
-				file_put_contents( EVENT_ESPRESSO_UPLOAD_DIR . 'logs' . DS . 'espresso_plugin_activation_errors.html', $activation_errors );
+				file_put_contents(EVENT_ESPRESSO_UPLOAD_DIR.'logs'.DS.'espresso_plugin_activation_errors.html', $activation_errors);
 			}
-			$activation_errors = get_option( 'ee_plugin_activation_errors', '' ) . $activation_errors;
-			update_option( 'ee_plugin_activation_errors', $activation_errors );
+			$activation_errors = get_option('ee_plugin_activation_errors', '').$activation_errors;
+			update_option('ee_plugin_activation_errors', $activation_errors);
 		}
 	}
 
@@ -299,22 +299,22 @@ 
 	 * @param int     $error_type
 	 * @uses trigger_error()
 	 */
-	public function doing_it_wrong( $function, $message, $version, $error_type = E_USER_NOTICE ) {
-		do_action( 'AHEE__EEH_Debug_Tools__doing_it_wrong_run', $function, $message, $version);
-		$version = is_null( $version ) ? '' : sprintf( __('(This message was added in version %s of Event Espresso.', 'event_espresso' ), $version );
-		$error_message = sprintf( esc_html__('%1$s was called %2$sincorrectly%3$s. %4$s %5$s','event_espresso' ), $function, '<strong>', '</strong>', $message, $version );
+	public function doing_it_wrong($function, $message, $version, $error_type = E_USER_NOTICE) {
+		do_action('AHEE__EEH_Debug_Tools__doing_it_wrong_run', $function, $message, $version);
+		$version = is_null($version) ? '' : sprintf(__('(This message was added in version %s of Event Espresso.', 'event_espresso'), $version);
+		$error_message = sprintf(esc_html__('%1$s was called %2$sincorrectly%3$s. %4$s %5$s', 'event_espresso'), $function, '<strong>', '</strong>', $message, $version);
 
 		//don't trigger error if doing ajax, instead we'll add a transient EE_Error notice that in theory should show on the next request.
-		if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
-			$error_message .= esc_html__( 'This is a doing_it_wrong message that was triggered during an ajax request.  The request params on this request were: ', 'event_espresso' );
+		if (defined('DOING_AJAX') && DOING_AJAX) {
+			$error_message .= esc_html__('This is a doing_it_wrong message that was triggered during an ajax request.  The request params on this request were: ', 'event_espresso');
 			$error_message .= '<ul><li>';
-			$error_message .= implode( '</li><li>', EE_Registry::instance()->REQ->params() );
+			$error_message .= implode('</li><li>', EE_Registry::instance()->REQ->params());
 			$error_message .= '</ul>';
-			EE_Error::add_error( $error_message, 'debug::doing_it_wrong', $function, '42' );
+			EE_Error::add_error($error_message, 'debug::doing_it_wrong', $function, '42');
 			//now we set this on the transient so it shows up on the next request.
-			EE_Error::get_notices( is_admin(), true );
+			EE_Error::get_notices(is_admin(), true);
 		} else {
-			trigger_error( $error_message, $error_type );
+			trigger_error($error_message, $error_type);
 		}
 	}
 
@@ -336,22 +336,22 @@ 
 	 * @param string $debug_index
 	 * @param string $debug_key
 	 */
-	public static function log( $class='', $func = '', $line = '', $info = array(), $display_request = false,  $debug_index = '', $debug_key = 'EE_DEBUG_SPCO' ) {
-		if ( WP_DEBUG && false ) {
-			$debug_key = $debug_key . '_' . EE_Session::instance()->id();
-			$debug_data = get_option( $debug_key, array() );
+	public static function log($class = '', $func = '', $line = '', $info = array(), $display_request = false, $debug_index = '', $debug_key = 'EE_DEBUG_SPCO') {
+		if (WP_DEBUG && false) {
+			$debug_key = $debug_key.'_'.EE_Session::instance()->id();
+			$debug_data = get_option($debug_key, array());
 			$default_data = array(
-				$class => $func . '() : ' . $line,
+				$class => $func.'() : '.$line,
 				'REQ'  => $display_request ? $_REQUEST : '',
 			);
 			// don't serialize objects
-			$info = self::strip_objects( $info );
-			$index = ! empty( $debug_index ) ? $debug_index : 0;
-			if ( ! isset( $debug_data[$index] ) ) {
+			$info = self::strip_objects($info);
+			$index = ! empty($debug_index) ? $debug_index : 0;
+			if ( ! isset($debug_data[$index])) {
 				$debug_data[$index] = array();
 			}
-			$debug_data[$index][microtime()] = array_merge( $default_data, $info );
-			update_option( $debug_key, $debug_data );
+			$debug_data[$index][microtime()] = array_merge($default_data, $info);
+			update_option($debug_key, $debug_data);
 		}
 	}
 
@@ -363,26 +363,26 @@ 
 	 * @param array $info
 	 * @return array
 	 */
-	public static function strip_objects( $info = array() ) {
-		foreach ( $info as $key => $value ) {
-			if ( is_array( $value ) ) {
-				$info[ $key ] = self::strip_objects( $value );
-			} else if ( is_object( $value ) ) {
-				$object_class = get_class( $value );
-				$info[ $object_class ] = array();
-				$info[ $object_class ][ 'ID' ] = method_exists( $value, 'ID' ) ? $value->ID() : spl_object_hash( $value );
-				if ( method_exists( $value, 'ID' ) ) {
-					$info[ $object_class ][ 'ID' ] = $value->ID();
+	public static function strip_objects($info = array()) {
+		foreach ($info as $key => $value) {
+			if (is_array($value)) {
+				$info[$key] = self::strip_objects($value);
+			} else if (is_object($value)) {
+				$object_class = get_class($value);
+				$info[$object_class] = array();
+				$info[$object_class]['ID'] = method_exists($value, 'ID') ? $value->ID() : spl_object_hash($value);
+				if (method_exists($value, 'ID')) {
+					$info[$object_class]['ID'] = $value->ID();
 				}
-				if ( method_exists( $value, 'status' ) ) {
-					$info[ $object_class ][ 'status' ] = $value->status();
-				} else if ( method_exists( $value, 'status_ID' ) ) {
-					$info[ $object_class ][ 'status' ] = $value->status_ID();
+				if (method_exists($value, 'status')) {
+					$info[$object_class]['status'] = $value->status();
+				} else if (method_exists($value, 'status_ID')) {
+					$info[$object_class]['status'] = $value->status_ID();
 				}
-				unset( $info[ $key ] );
+				unset($info[$key]);
 			}
 		}
-		return (array)$info;
+		return (array) $info;
 	}
 
 
@@ -399,24 +399,24 @@ 
 	 * @param int $header
 	 * @param bool $die
 	 */
-	public static function printv( $var, $var_name = false, $file = __FILE__, $line = __LINE__, $header = 5, $die = false ) {
+	public static function printv($var, $var_name = false, $file = __FILE__, $line = __LINE__, $header = 5, $die = false) {
 		$var_name = ! $var_name ? 'string' : $var_name;
 		$heading_tag = 'h';
-		$heading_tag .= is_int( $header ) ? $header : 5;
-		$var_name = ucwords( str_replace( '$', '', $var_name ) );
-		$is_method = method_exists( $var_name, $var );
-		$var_name = ucwords( str_replace( '_', ' ', $var_name ) );
+		$heading_tag .= is_int($header) ? $header : 5;
+		$var_name = ucwords(str_replace('$', '', $var_name));
+		$is_method = method_exists($var_name, $var);
+		$var_name = ucwords(str_replace('_', ' ', $var_name));
 		ob_start();
-		echo '<' . $heading_tag . ' style="color:#2EA2CC; margin:25px 0 0;"><b>' . $var_name . '</b>';
+		echo '<'.$heading_tag.' style="color:#2EA2CC; margin:25px 0 0;"><b>'.$var_name.'</b>';
 		echo $is_method
-			? '<span style="color:#999">::</span><span style="color:#E76700">' . $var . '()</span><br />'
-			: '<span style="color:#999"> : </span><span style="color:#E76700">' . $var . '</span><br />';
-		echo '<span style="font-size:9px;font-weight:normal;color:#666;line-height: 12px;">' . $file;
-		echo '<br />line no: ' . $line . '</span>';
-		echo '</' . $heading_tag . '>';
+			? '<span style="color:#999">::</span><span style="color:#E76700">'.$var.'()</span><br />'
+			: '<span style="color:#999"> : </span><span style="color:#E76700">'.$var.'</span><br />';
+		echo '<span style="font-size:9px;font-weight:normal;color:#666;line-height: 12px;">'.$file;
+		echo '<br />line no: '.$line.'</span>';
+		echo '</'.$heading_tag.'>';
 		$result = ob_get_clean();
-		if ( $die ) {
-			die( $result );
+		if ($die) {
+			die($result);
 		} else {
 			echo $result;
 		}
@@ -435,35 +435,35 @@ 
 	 * @param int $header
 	 * @param bool $die
 	 */
-	public static function printr( $var, $var_name = false, $file = __FILE__, $line = __LINE__, $header = 5, $die = false ) {
-		$file = str_replace( rtrim( ABSPATH, '\\/' ), '', $file );
+	public static function printr($var, $var_name = false, $file = __FILE__, $line = __LINE__, $header = 5, $die = false) {
+		$file = str_replace(rtrim(ABSPATH, '\\/'), '', $file);
 		//$print_r = false;
-		if ( is_string( $var ) ) {
-			EEH_Debug_Tools::printv( $var, $var_name, $file, $line, $header, $die );
+		if (is_string($var)) {
+			EEH_Debug_Tools::printv($var, $var_name, $file, $line, $header, $die);
 			return;
-		} else if ( is_object( $var ) ) {
+		} else if (is_object($var)) {
 			$var_name = ! $var_name ? 'object' : $var_name;
 			//$print_r = true;
-		} else if ( is_array( $var ) ) {
+		} else if (is_array($var)) {
 			$var_name = ! $var_name ? 'array' : $var_name;
 			//$print_r = true;
-		} else if ( is_numeric( $var ) ) {
+		} else if (is_numeric($var)) {
 			$var_name = ! $var_name ? 'numeric' : $var_name;
-		} else if ( is_null( $var ) ) {
+		} else if (is_null($var)) {
 			$var_name = ! $var_name ? 'null' : $var_name;
 		}
 		$heading_tag = 'h';
-		$heading_tag .= is_int( $header ) ? $header : 5;
-		$var_name = ucwords( str_replace( array( '$', '_' ), array( '', ' ' ), $var_name ) );
+		$heading_tag .= is_int($header) ? $header : 5;
+		$var_name = ucwords(str_replace(array('$', '_'), array('', ' '), $var_name));
 		ob_start();
-		echo '<' . $heading_tag . ' style="color:#2EA2CC; margin:25px 0 0;"><b>' . $var_name . '</b>';
+		echo '<'.$heading_tag.' style="color:#2EA2CC; margin:25px 0 0;"><b>'.$var_name.'</b>';
 		echo '<span style="color:#999"> : </span><span style="color:#E76700">';
-		var_dump( $var );
-		echo '</span><br /><span style="font-size:9px;font-weight:normal;color:#666;line-height: 12px;">' . $file;
-		echo '<br />line no: ' . $line . '</span></' . $heading_tag . '>';
+		var_dump($var);
+		echo '</span><br /><span style="font-size:9px;font-weight:normal;color:#666;line-height: 12px;">'.$file;
+		echo '<br />line no: '.$line.'</span></'.$heading_tag.'>';
 		$result = ob_get_clean();
-		if ( $die ) {
-			die( $result );
+		if ($die) {
+			die($result);
 		} else {
 			echo $result;
 		}
@@ -480,8 +480,8 @@ 
  * borrowed from Kint Debugger
  * Plugin URI: http://upthemes.com/plugins/kint-debugger/
  */
-if ( class_exists('Kint') && ! function_exists( 'dump_wp_query' ) ) {
-	function dump_wp_query(){
+if (class_exists('Kint') && ! function_exists('dump_wp_query')) {
+	function dump_wp_query() {
 		global $wp_query;
 		d($wp_query);
 	}
@@ -491,8 +491,8 @@ 
  * borrowed from Kint Debugger
  * Plugin URI: http://upthemes.com/plugins/kint-debugger/
  */
-if ( class_exists('Kint') && ! function_exists( 'dump_wp' ) ) {
-	function dump_wp(){
+if (class_exists('Kint') && ! function_exists('dump_wp')) {
+	function dump_wp() {
 		global $wp;
 		d($wp);
 	}
@@ -502,8 +502,8 @@ 
  * borrowed from Kint Debugger
  * Plugin URI: http://upthemes.com/plugins/kint-debugger/
  */
-if ( class_exists('Kint') && ! function_exists( 'dump_post' ) ) {
-	function dump_post(){
+if (class_exists('Kint') && ! function_exists('dump_post')) {
+	function dump_post() {
 		global $post;
 		d($post);
 	}