eventespresso / event-espresso-core

caffeinated/admin/extend/registration_form/Extend_Registration_Form_Admin_Page.core.php

Indentation +87 added lines, -87 removed lines

@@ -245,13 +245,13 @@ 
 					'persistent' => FALSE
 					),
 				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array('_publish_post_box' ) ),
-                'help_tabs' => array(
+				'help_tabs' => array(
 					'registration_form_add_question_help_tab' => array(
 						'title' => esc_html__('Add Question', 'event_espresso'),
 						'filename' => 'registration_form_add_question'
 						),
 					),
-                'help_tour' => array( 'Registration_Form_Add_Question_Help_Tour'),
+				'help_tour' => array( 'Registration_Form_Add_Question_Help_Tour'),
 				'require_nonce' => FALSE
 				),
 
@@ -268,7 +268,7 @@ 
 						'filename' => 'registration_form_add_question_group'
 						),
 					),
-                'help_tour' => array( 'Registration_Form_Add_Question_Group_Help_Tour'),
+				'help_tour' => array( 'Registration_Form_Add_Question_Group_Help_Tour'),
 				'require_nonce' => FALSE
 				),
 
@@ -286,7 +286,7 @@ 
 						'filename' => 'registration_form_edit_question_group'
 						),
 					),
-                'help_tour' => array( 'Registration_Form_Edit_Question_Group_Help_Tour'),
+				'help_tour' => array( 'Registration_Form_Edit_Question_Group_Help_Tour'),
 				'require_nonce' => FALSE
 				),
 
@@ -305,7 +305,7 @@ 
 						'filename' => 'registration_form_reg_form_settings'
 						),
 					),
-                'help_tour' => array( 'Registration_Form_Settings_Help_Tour'),
+				'help_tour' => array( 'Registration_Form_Settings_Help_Tour'),
 				'require_nonce' => FALSE
 				)
 
@@ -933,7 +933,7 @@ 
 	 * @return EE_Form_Section_Proper
 	 */
 	protected function _email_validation_settings_form() {
-        return new EE_Form_Section_Proper(
+		return new EE_Form_Section_Proper(
 			array(
 				'name'            => 'email_validation_settings',
 				'html_id'         => 'email_validation_settings',
@@ -951,7 +951,7 @@ 
 						),
 						array(
 							'html_label_text' => esc_html__( 'Email Validation Level', 'event_espresso' )
-							                     . EEH_Template::get_help_tab_link( 'email_validation_info' ),
+												 . EEH_Template::get_help_tab_link( 'email_validation_info' ),
 							'html_help_text'  => esc_html__( 'These levels range from basic validation ( ie: text@text.text ) to more advanced checks against international email addresses (ie: üñîçøðé@example.com ) with additional MX and A record checks to confirm the domain actually exists. More information on on each level can be found within the help section.', 'event_espresso'),
 							'default' => isset( EE_Registry::instance()->CFG->registration->email_validation_level )
 								? EE_Registry::instance()->CFG->registration->email_validation_level
@@ -973,8 +973,8 @@ 
 	 * @return \EE_Registration_Config
 	 */
 	public function update_email_validation_settings_form( EE_Registration_Config $EE_Registration_Config ) {
-        $prev_email_validation_level = $EE_Registration_Config->email_validation_level;
-        try {
+		$prev_email_validation_level = $EE_Registration_Config->email_validation_level;
+		try {
 			$email_validation_settings_form = $this->_email_validation_settings_form();
 			// if not displaying a form, then check for form submission
 			if ( $email_validation_settings_form->was_submitted() ) {
@@ -985,38 +985,38 @@ 
 					// grab validated data from form
 					$valid_data = $email_validation_settings_form->valid_data();
 					if ( isset( $valid_data['email_validation_level'] ) ) {
-					    $email_validation_level = $valid_data['email_validation_level'];
-                        // now if they want to use international email addresses
-                        if ( $email_validation_level === 'i18n' || $email_validation_level === 'i18n_dns' ) {
-                            // in case we need to reset their email validation level,
-                            // make sure that the previous value wasn't already set to one of the i18n options.
-                            if ( $prev_email_validation_level === 'i18n' || $prev_email_validation_level === 'i18n_dns' ) {
-                                // if so, then reset it back to "basic" since that is the only other option that,
-                                // despite offering poor validation, supports i18n email addresses
-                                $prev_email_validation_level = 'basic';
-                            }
-                            // confirm our i18n email validation will work on the server
-                            if ( ! $this->_verify_pcre_support($EE_Registration_Config, $email_validation_level)) {
-                                // or reset email validation level to previous value
-                                $email_validation_level = $prev_email_validation_level;
-                            }
-                        }
-                        $EE_Registration_Config->email_validation_level = $email_validation_level;
-                    } else {
+						$email_validation_level = $valid_data['email_validation_level'];
+						// now if they want to use international email addresses
+						if ( $email_validation_level === 'i18n' || $email_validation_level === 'i18n_dns' ) {
+							// in case we need to reset their email validation level,
+							// make sure that the previous value wasn't already set to one of the i18n options.
+							if ( $prev_email_validation_level === 'i18n' || $prev_email_validation_level === 'i18n_dns' ) {
+								// if so, then reset it back to "basic" since that is the only other option that,
+								// despite offering poor validation, supports i18n email addresses
+								$prev_email_validation_level = 'basic';
+							}
+							// confirm our i18n email validation will work on the server
+							if ( ! $this->_verify_pcre_support($EE_Registration_Config, $email_validation_level)) {
+								// or reset email validation level to previous value
+								$email_validation_level = $prev_email_validation_level;
+							}
+						}
+						$EE_Registration_Config->email_validation_level = $email_validation_level;
+					} else {
 						EE_Error::add_error(
 							esc_html__(
 								'Invalid or missing Email Validation settings. Please refresh the form and try again.',
 								'event_espresso'
 							),
-                            __FILE__, __FUNCTION__, __LINE__
-                        );
+							__FILE__, __FUNCTION__, __LINE__
+						);
 					}
 				} else {
 					if ( $email_validation_settings_form->submission_error_message() !== '' ) {
 						EE_Error::add_error(
 							$email_validation_settings_form->submission_error_message(),
-                            __FILE__, __FUNCTION__, __LINE__
-                        );
+							__FILE__, __FUNCTION__, __LINE__
+						);
 					}
 				}
 			}
@@ -1028,61 +1028,61 @@ 
 
 
 
-    /**
-     * confirms that the server's PHP version has the PCRE module enabled,
-     * and that the PCRE version works with our i18n email validation
-     *
-     * @param \EE_Registration_Config $EE_Registration_Config
-     * @param string                  $email_validation_level
-     * @return bool
-     */
-    private function _verify_pcre_support(EE_Registration_Config $EE_Registration_Config, $email_validation_level)
-    {
-        // first check that PCRE is enabled
-        if ( ! defined('PREG_BAD_UTF8_ERROR')) {
-            EE_Error::add_error(
-                sprintf(
-                    esc_html__(
-                        'We\'re sorry, but it appears that your server\'s version of PHP was not compiled with PCRE unicode support.%1$sPlease contact your hosting company and ask them whether the PCRE compiled with your version of PHP on your server can be been built with the "--enable-unicode-properties" and "--enable-utf8" configuration switches to enable more complex regex expressions.%1$sIf they are unable, or unwilling to do so, then your server will not support international email addresses using UTF-8 unicode characters. This means you will either have to lower your email validation level to "Basic" or "WordPress Default", or switch to a hosting company that has/can enable PCRE unicode support on the server.',
-                        'event_espresso'
-                    ),
-                    '<br />'
-                ),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-            return false;
-        } else {
-            // PCRE support is enabled, but let's still
-            // perform a test to see if the server will support it.
-            // but first, save the updated validation level to the config,
-            // so that the validation strategy picks it up.
-            // this will get bumped back down if it doesn't work
-            $EE_Registration_Config->email_validation_level = $email_validation_level;
-            try {
-                $email_validator = new EE_Email_Validation_Strategy();
-                $i18n_email_address = apply_filters(
-                    'FHEE__Extend_Registration_Form_Admin_Page__update_email_validation_settings_form__i18n_email_address',
-                    'jägerjürgen@deutschland.com'
-                );
-                $email_validator->validate($i18n_email_address);
-            } catch (Exception $e) {
-                EE_Error::add_error(
-                    sprintf(
-                        esc_html__(
-                            'We\'re sorry, but it appears that your server\'s configuration will not support the "International" or "International + DNS Check" email validation levels.%1$sTo correct this issue, please consult with your hosting company regarding your server\'s PCRE settings.%1$sIt is recommended that your PHP version be configured to use PCRE 8.10 or newer.%1$sMore information regarding PCRE versions and installation can be found here: %2$s',
-                            'event_espresso'
-                        ),
-                        '<br />',
-                        '<a href="http://php.net/manual/en/pcre.installation.php" target="_blank">http://php.net/manual/en/pcre.installation.php</a>'
-                    ),
-                    __FILE__, __FUNCTION__, __LINE__
-                );
-                return false;
-            }
-        }
-        return true;
-    }
+	/**
+	 * confirms that the server's PHP version has the PCRE module enabled,
+	 * and that the PCRE version works with our i18n email validation
+	 *
+	 * @param \EE_Registration_Config $EE_Registration_Config
+	 * @param string                  $email_validation_level
+	 * @return bool
+	 */
+	private function _verify_pcre_support(EE_Registration_Config $EE_Registration_Config, $email_validation_level)
+	{
+		// first check that PCRE is enabled
+		if ( ! defined('PREG_BAD_UTF8_ERROR')) {
+			EE_Error::add_error(
+				sprintf(
+					esc_html__(
+						'We\'re sorry, but it appears that your server\'s version of PHP was not compiled with PCRE unicode support.%1$sPlease contact your hosting company and ask them whether the PCRE compiled with your version of PHP on your server can be been built with the "--enable-unicode-properties" and "--enable-utf8" configuration switches to enable more complex regex expressions.%1$sIf they are unable, or unwilling to do so, then your server will not support international email addresses using UTF-8 unicode characters. This means you will either have to lower your email validation level to "Basic" or "WordPress Default", or switch to a hosting company that has/can enable PCRE unicode support on the server.',
+						'event_espresso'
+					),
+					'<br />'
+				),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+			return false;
+		} else {
+			// PCRE support is enabled, but let's still
+			// perform a test to see if the server will support it.
+			// but first, save the updated validation level to the config,
+			// so that the validation strategy picks it up.
+			// this will get bumped back down if it doesn't work
+			$EE_Registration_Config->email_validation_level = $email_validation_level;
+			try {
+				$email_validator = new EE_Email_Validation_Strategy();
+				$i18n_email_address = apply_filters(
+					'FHEE__Extend_Registration_Form_Admin_Page__update_email_validation_settings_form__i18n_email_address',
+					'jägerjürgen@deutschland.com'
+				);
+				$email_validator->validate($i18n_email_address);
+			} catch (Exception $e) {
+				EE_Error::add_error(
+					sprintf(
+						esc_html__(
+							'We\'re sorry, but it appears that your server\'s configuration will not support the "International" or "International + DNS Check" email validation levels.%1$sTo correct this issue, please consult with your hosting company regarding your server\'s PCRE settings.%1$sIt is recommended that your PHP version be configured to use PCRE 8.10 or newer.%1$sMore information regarding PCRE versions and installation can be found here: %2$s',
+							'event_espresso'
+						),
+						'<br />',
+						'<a href="http://php.net/manual/en/pcre.installation.php" target="_blank">http://php.net/manual/en/pcre.installation.php</a>'
+					),
+					__FILE__, __FUNCTION__, __LINE__
+				);
+				return false;
+			}
+		}
+		return true;
+	}
 
 }

Spacing +187 added lines, -187 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') ){
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
 	exit('NO direct script access allowed');
 }
 /**
@@ -36,13 +36,13 @@ 
 	 * 		@param bool $routing indicate whether we want to just load the object and handle routing or just load the object.
 	 * 		@access public
 	 */
-	public function __construct( $routing = TRUE ) {
-		define( 'REGISTRATION_FORM_CAF_ADMIN', EE_CORE_CAF_ADMIN_EXTEND . 'registration_form' . DS );
-		define( 'REGISTRATION_FORM_CAF_ASSETS_PATH', REGISTRATION_FORM_CAF_ADMIN . 'assets' . DS );
-		define( 'REGISTRATION_FORM_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'registration_form/assets/' );
-		define( 'REGISTRATION_FORM_CAF_TEMPLATE_PATH', REGISTRATION_FORM_CAF_ADMIN . 'templates' . DS );
-		define( 'REGISTRATION_FORM_CAF_TEMPLATE_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'registration_form/templates/' );
-		parent::__construct( $routing );
+	public function __construct($routing = TRUE) {
+		define('REGISTRATION_FORM_CAF_ADMIN', EE_CORE_CAF_ADMIN_EXTEND.'registration_form'.DS);
+		define('REGISTRATION_FORM_CAF_ASSETS_PATH', REGISTRATION_FORM_CAF_ADMIN.'assets'.DS);
+		define('REGISTRATION_FORM_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL.'registration_form/assets/');
+		define('REGISTRATION_FORM_CAF_TEMPLATE_PATH', REGISTRATION_FORM_CAF_ADMIN.'templates'.DS);
+		define('REGISTRATION_FORM_CAF_TEMPLATE_URL', EE_CORE_CAF_ADMIN_EXTEND_URL.'registration_form/templates/');
+		parent::__construct($routing);
 	}
 
 
@@ -52,8 +52,8 @@ 
 
 	protected function _extend_page_config() {
 		$this->_admin_base_path = REGISTRATION_FORM_CAF_ADMIN;
-		$qst_id = ! empty( $this->_req_data['QST_ID'] ) && ! is_array( $this->_req_data['QST_ID'] ) ? $this->_req_data['QST_ID'] : 0;
-		$qsg_id = ! empty( $this->_req_data['QSG_ID'] ) && ! is_array( $this->_req_data['QSG_ID'] ) ? $this->_req_data['QSG_ID'] : 0;
+		$qst_id = ! empty($this->_req_data['QST_ID']) && ! is_array($this->_req_data['QST_ID']) ? $this->_req_data['QST_ID'] : 0;
+		$qsg_id = ! empty($this->_req_data['QSG_ID']) && ! is_array($this->_req_data['QSG_ID']) ? $this->_req_data['QSG_ID'] : 0;
 
 		$new_page_routes = array(
 			'question_groups' => array(
@@ -86,7 +86,7 @@ 
 				'func' => '_trash_or_restore_questions',
 				'capability' => 'ee_delete_question',
 				'obj_id' => $qst_id,
-				'args' => array( 'trash' => FALSE ),
+				'args' => array('trash' => FALSE),
 				'noheader' => TRUE
 				),
 
@@ -145,7 +145,7 @@ 
 
 			'trash_question_group' => array(
 				'func' => '_trash_or_restore_question_groups',
-				'args' => array( 'trash' => TRUE ),
+				'args' => array('trash' => TRUE),
 				'capability' => 'ee_delete_question_group',
 				'obj_id' => $qsg_id,
 				'noheader' => TRUE
@@ -153,7 +153,7 @@ 
 
 			'restore_question_group' => array(
 				'func' => '_trash_or_restore_question_groups',
-				'args' => array( 'trash' => FALSE ),
+				'args' => array('trash' => FALSE),
 				'capability' => 'ee_delete_question_group',
 				'obj_id' => $qsg_id,
 				'noheader' => TRUE
@@ -168,7 +168,7 @@ 
 
 			'update_question_group' => array(
 				'func' => '_insert_or_update_question_group',
-				'args' => array('new_question_group' => FALSE ),
+				'args' => array('new_question_group' => FALSE),
 				'capability' => 'ee_edit_question_group',
 				'obj_id' => $qsg_id,
 				'noheader' => TRUE,
@@ -206,7 +206,7 @@ 
 					'noheader' => TRUE
 				),
 			);
-		$this->_page_routes = array_merge( $this->_page_routes, $new_page_routes );
+		$this->_page_routes = array_merge($this->_page_routes, $new_page_routes);
 
 		$new_page_config = array(
 
@@ -230,7 +230,7 @@ 
 						'filename' => 'registration_form_question_groups_views_bulk_actions_search'
 						),
 					),
-				'help_tour' => array( 'Registration_Form_Question_Groups_Help_Tour'),
+				'help_tour' => array('Registration_Form_Question_Groups_Help_Tour'),
 				'metaboxes' => $this->_default_espresso_metaboxes,
 				'require_nonce' => FALSE,
 				'qtips' => array(
@@ -244,14 +244,14 @@ 
 					'order' => 5,
 					'persistent' => FALSE
 					),
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array('_publish_post_box' ) ),
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
                 'help_tabs' => array(
 					'registration_form_add_question_help_tab' => array(
 						'title' => esc_html__('Add Question', 'event_espresso'),
 						'filename' => 'registration_form_add_question'
 						),
 					),
-                'help_tour' => array( 'Registration_Form_Add_Question_Help_Tour'),
+                'help_tour' => array('Registration_Form_Add_Question_Help_Tour'),
 				'require_nonce' => FALSE
 				),
 
@@ -261,14 +261,14 @@ 
 					'order' => 5,
 					'persistent' => FALSE
 					),
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array('_publish_post_box' ) ),
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
 				'help_tabs' => array(
 					'registration_form_add_question_group_help_tab' => array(
 						'title' => esc_html__('Add Question Group', 'event_espresso'),
 						'filename' => 'registration_form_add_question_group'
 						),
 					),
-                'help_tour' => array( 'Registration_Form_Add_Question_Group_Help_Tour'),
+                'help_tour' => array('Registration_Form_Add_Question_Group_Help_Tour'),
 				'require_nonce' => FALSE
 				),
 
@@ -277,16 +277,16 @@ 
 					'label' => esc_html__('Edit Question Group', 'event_espresso'),
 					'order' => 5,
 					'persistent' => FALSE,
-					'url' => isset($this->_req_data['question_group_id']) ? add_query_arg(array('question_group_id' => $this->_req_data['question_group_id'] ), $this->_current_page_view_url )  : $this->_admin_base_url
+					'url' => isset($this->_req_data['question_group_id']) ? add_query_arg(array('question_group_id' => $this->_req_data['question_group_id']), $this->_current_page_view_url) : $this->_admin_base_url
 					),
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array('_publish_post_box' ) ),
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
 				'help_tabs' => array(
 					'registration_form_edit_question_group_help_tab' => array(
 						'title' => esc_html__('Edit Question Group', 'event_espresso'),
 						'filename' => 'registration_form_edit_question_group'
 						),
 					),
-                'help_tour' => array( 'Registration_Form_Edit_Question_Group_Help_Tour'),
+                'help_tour' => array('Registration_Form_Edit_Question_Group_Help_Tour'),
 				'require_nonce' => FALSE
 				),
 
@@ -298,19 +298,19 @@ 
 				'labels' => array(
 					'publishbox' => esc_html__('Update Settings', 'event_espresso')
 					),
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array( '_publish_post_box' ) ),
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
 				'help_tabs' => array(
 					'registration_form_reg_form_settings_help_tab' => array(
 						'title' => esc_html__('Registration Form Settings', 'event_espresso'),
 						'filename' => 'registration_form_reg_form_settings'
 						),
 					),
-                'help_tour' => array( 'Registration_Form_Settings_Help_Tour'),
+                'help_tour' => array('Registration_Form_Settings_Help_Tour'),
 				'require_nonce' => FALSE
 				)
 
 			);
-		$this->_page_config = array_merge( $this->_page_config, $new_page_config );
+		$this->_page_config = array_merge($this->_page_config, $new_page_config);
 
 		//change the list table we're going to use so it's the NEW list table!
 		$this->_page_config['default']['list_table'] = 'Extend_Registration_Form_Questions_Admin_List_Table';
@@ -324,7 +324,7 @@ 
 			'edit_question_group' => esc_html__('Edit Question Group', 'event_espresso'),
 			'delete_question_group' => esc_html__('Delete Question Group', 'event_espresso'),
 			);
-		$this->_labels['buttons'] = array_merge( $this->_labels['buttons'], $new_labels );
+		$this->_labels['buttons'] = array_merge($this->_labels['buttons'], $new_labels);
 
 	}
 
@@ -333,14 +333,14 @@ 
 
 
 	protected function _ajax_hooks() {
-		add_action('wp_ajax_espresso_update_question_group_order', array( $this, 'update_question_group_order' ));
+		add_action('wp_ajax_espresso_update_question_group_order', array($this, 'update_question_group_order'));
 	}
 
 
 
 
 	public function load_scripts_styles_question_groups() {
-		wp_enqueue_script( 'espresso_ajax_table_sorting' );
+		wp_enqueue_script('espresso_ajax_table_sorting');
 	}
 
 
@@ -361,7 +361,7 @@ 
 	 * @return void
 	 */
 	public function load_sortable_question_script() {
-		wp_register_script('ee-question-sortable', REGISTRATION_FORM_CAF_ASSETS_URL . 'ee_question_order.js', array('jquery-ui-sortable'), EVENT_ESPRESSO_VERSION, true);
+		wp_register_script('ee-question-sortable', REGISTRATION_FORM_CAF_ASSETS_URL.'ee_question_order.js', array('jquery-ui-sortable'), EVENT_ESPRESSO_VERSION, true);
 		wp_enqueue_script('ee-question-sortable');
 	}
 
@@ -380,7 +380,7 @@ 
 				)
 		);
 
-		if ( EE_Registry::instance()->CAP->current_user_can('ee_delete_questions', 'espresso_registration_form_trash_questions' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_questions', 'espresso_registration_form_trash_questions')) {
 			$this->_views['trash'] = array(
 				'slug' => 'trash',
 				'label' => esc_html__('Trash', 'event_espresso'),
@@ -410,7 +410,7 @@ 
 				)
 		);
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_question_groups', 'espresso_registration_form_trash_question_groups' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_question_groups', 'espresso_registration_form_trash_question_groups')) {
 			$this->_views['trash'] = array(
 				'slug' => 'trash',
 				'label' => esc_html__('Trash', 'event_espresso'),
@@ -446,24 +446,24 @@ 
 
 
 
-	protected function _delete_question(){
-		$success = $this->_delete_items( $this->_question_model );
+	protected function _delete_question() {
+		$success = $this->_delete_items($this->_question_model);
 		$this->_redirect_after_action(
 			$success,
-			$this->_question_model->item_name( $success ),
+			$this->_question_model->item_name($success),
 			'deleted',
-			array( 'action' => 'default', 'status' => 'all' )
+			array('action' => 'default', 'status' => 'all')
 		);
 	}
 
 
 	protected function _delete_questions() {
-		$success = $this->_delete_items( $this->_question_model );
+		$success = $this->_delete_items($this->_question_model);
 		$this->_redirect_after_action(
 			$success,
-			$this->_question_model->item_name( $success ),
+			$this->_question_model->item_name($success),
 			'deleted permanently',
-			array( 'action' => 'default', 'status' => 'trash' )
+			array('action' => 'default', 'status' => 'trash')
 		);
 	}
 
@@ -474,26 +474,26 @@ 
  * @param EEM_Soft_Delete_Base $model
  * @return int number of items deleted permanently
  */
-	private function _delete_items(EEM_Soft_Delete_Base $model){
+	private function _delete_items(EEM_Soft_Delete_Base $model) {
 		$success = 0;
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		if (!empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
 			// if array has more than one element than success message should be plural
-			$success = count( $this->_req_data['checkbox'] ) > 1 ? 2 : 1;
+			$success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
 			// cycle thru bulk action checkboxes
-			while (list( $ID, $value ) = each($this->_req_data['checkbox'])) {
-				if ( ! $this->_delete_item( $ID, $model ) ) {
+			while (list($ID, $value) = each($this->_req_data['checkbox'])) {
+				if ( ! $this->_delete_item($ID, $model)) {
 					$success = 0;
 				}
 			}
 
-		}elseif( !empty($this->_req_data['QSG_ID'])){
-			$success = $this->_delete_item( $this->_req_data['QSG_ID'], $model );
+		}elseif ( ! empty($this->_req_data['QSG_ID'])) {
+			$success = $this->_delete_item($this->_req_data['QSG_ID'], $model);
 
-		}elseif( !empty($this->_req_data['QST_ID'])){
-			$success = $this->_delete_item( $this->_req_data['QST_ID'], $model );
-		}else{
-			EE_Error::add_error( sprintf(esc_html__("No Questions or Question Groups were selected for deleting. This error usually shows when you've attempted to delete via bulk action but there were no selections.", "event_espresso")), __FILE__, __FUNCTION__, __LINE__ );
+		}elseif ( ! empty($this->_req_data['QST_ID'])) {
+			$success = $this->_delete_item($this->_req_data['QST_ID'], $model);
+		} else {
+			EE_Error::add_error(sprintf(esc_html__("No Questions or Question Groups were selected for deleting. This error usually shows when you've attempted to delete via bulk action but there were no selections.", "event_espresso")), __FILE__, __FUNCTION__, __LINE__);
 		}
 		return $success;
 	}
@@ -504,11 +504,11 @@ 
 	 * @param EEM_Soft_Delete_Base $model
 	 * @return boolean
 	 */
-	protected function _delete_item( $id, $model ) {
-		if( $model instanceof EEM_Question ) {
-			EEM_Question_Option::instance()->delete_permanently( array( array( 'QST_ID' => absint( $id ) ) ) );
+	protected function _delete_item($id, $model) {
+		if ($model instanceof EEM_Question) {
+			EEM_Question_Option::instance()->delete_permanently(array(array('QST_ID' => absint($id))));
 		}
-		return $model->delete_permanently_by_ID( absint( $id ) );
+		return $model->delete_permanently_by_ID(absint($id));
 	}
 
 
@@ -520,41 +520,41 @@ 
 
 
 
-	protected function _edit_question_group( $type = 'add' ) {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		$ID=isset( $this->_req_data['QSG_ID'] ) && ! empty( $this->_req_data['QSG_ID'] ) ? absint( $this->_req_data['QSG_ID'] ) : FALSE;
+	protected function _edit_question_group($type = 'add') {
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$ID = isset($this->_req_data['QSG_ID']) && ! empty($this->_req_data['QSG_ID']) ? absint($this->_req_data['QSG_ID']) : FALSE;
 
-		switch( $this->_req_action ) {
+		switch ($this->_req_action) {
 			case 'add_question_group' :
-				$this->_admin_page_title = esc_html__( 'Add Question Group', 'event_espresso' );
+				$this->_admin_page_title = esc_html__('Add Question Group', 'event_espresso');
 				break;
 			case 'edit_question_group' :
-				$this->_admin_page_title = esc_html__( 'Edit Question Group', 'event_espresso' );
+				$this->_admin_page_title = esc_html__('Edit Question Group', 'event_espresso');
 				break;
 			default :
-				$this->_admin_page_title = ucwords( str_replace( '_', ' ', $this->_req_action ));
+				$this->_admin_page_title = ucwords(str_replace('_', ' ', $this->_req_action));
 		}
 		// add ID to title if editing
-		$this->_admin_page_title = $ID ? $this->_admin_page_title . ' # ' . $ID : $this->_admin_page_title;
-		if($ID){
+		$this->_admin_page_title = $ID ? $this->_admin_page_title.' # '.$ID : $this->_admin_page_title;
+		if ($ID) {
 			/** @var EE_Question_Group $questionGroup */
-			$questionGroup=$this->_question_group_model->get_one_by_ID( $ID);
-			$additional_hidden_fields=array('QSG_ID'=>array('type'=>'hidden','value'=>$ID));
+			$questionGroup = $this->_question_group_model->get_one_by_ID($ID);
+			$additional_hidden_fields = array('QSG_ID'=>array('type'=>'hidden', 'value'=>$ID));
 			$this->_set_add_edit_form_tags('update_question_group', $additional_hidden_fields);
-		}else{
+		} else {
 			/** @var EE_Question_Group $questionGroup */
 			$questionGroup = EEM_Question_Group::instance()->create_default_object();
 			$questionGroup->set_order_to_latest();
 			$this->_set_add_edit_form_tags('insert_question_group');
 		}
 		$this->_template_args['values'] = $this->_yes_no_values;
-		$this->_template_args['all_questions']=$questionGroup->questions_in_and_not_in_group();
-		$this->_template_args['QSG_ID']=$ID ? $ID : TRUE;
-		$this->_template_args['question_group']=$questionGroup;
+		$this->_template_args['all_questions'] = $questionGroup->questions_in_and_not_in_group();
+		$this->_template_args['QSG_ID'] = $ID ? $ID : TRUE;
+		$this->_template_args['question_group'] = $questionGroup;
 
-		$redirect_URL = add_query_arg( array( 'action' => 'question_groups'), $this->_admin_base_url );
-		$this->_set_publish_post_box_vars( 'id', $ID, FALSE, $redirect_URL  );
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( REGISTRATION_FORM_CAF_TEMPLATE_PATH . 'question_groups_main_meta_box.template.php', $this->_template_args, TRUE );
+		$redirect_URL = add_query_arg(array('action' => 'question_groups'), $this->_admin_base_url);
+		$this->_set_publish_post_box_vars('id', $ID, FALSE, $redirect_URL);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(REGISTRATION_FORM_CAF_TEMPLATE_PATH.'question_groups_main_meta_box.template.php', $this->_template_args, TRUE);
 
 		// the details template wrapper
 		$this->display_admin_page_with_sidebar();
@@ -565,7 +565,7 @@ 
 
 	protected function _delete_question_groups() {
 		$success = $this->_delete_items($this->_question_group_model);
-		$this->_redirect_after_action( $success, $this->_question_group_model->item_name($success), 'deleted permanently', array( 'action'=>'question_groups', 'status'=>'trash' ));
+		$this->_redirect_after_action($success, $this->_question_group_model->item_name($success), 'deleted permanently', array('action'=>'question_groups', 'status'=>'trash'));
 	}
 
 
@@ -573,71 +573,71 @@ 
 	/**
 	 * @param bool $new_question_group
 	 */
-	protected function _insert_or_update_question_group( $new_question_group = TRUE) {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		$set_column_values=$this->_set_column_values_for($this->_question_group_model);
-		if ( $new_question_group ){
+	protected function _insert_or_update_question_group($new_question_group = TRUE) {
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$set_column_values = $this->_set_column_values_for($this->_question_group_model);
+		if ($new_question_group) {
 			$QSG_ID = $this->_question_group_model->insert($set_column_values);
 			$success = $QSG_ID ? 1 : 0;
 		} else {
 			$QSG_ID = absint($this->_req_data['QSG_ID']);
-			unset( $set_column_values[ 'QSG_ID' ] );
-			$success= $this->_question_group_model->update( $set_column_values, array( array( 'QSG_ID' => $QSG_ID )));
+			unset($set_column_values['QSG_ID']);
+			$success = $this->_question_group_model->update($set_column_values, array(array('QSG_ID' => $QSG_ID)));
 		}
-		$phone_question_id = EEM_Question::instance()->get_Question_ID_from_system_string( EEM_Attendee::system_question_phone );
+		$phone_question_id = EEM_Question::instance()->get_Question_ID_from_system_string(EEM_Attendee::system_question_phone);
 		// update the existing related questions
 		// BUT FIRST...  delete the phone question from the Question_Group_Question if it is being added to this question group (therefore removed from the existing group)
-		if ( isset( $this->_req_data['questions'], $this->_req_data['questions'][ $phone_question_id ] )) {
+		if (isset($this->_req_data['questions'], $this->_req_data['questions'][$phone_question_id])) {
 			// delete where QST ID = system phone question ID and Question Group ID is NOT this group
-			EEM_Question_Group_Question::instance()->delete( array( array( 'QST_ID' => $phone_question_id, 'QSG_ID' => array( '!=', $QSG_ID ))));
+			EEM_Question_Group_Question::instance()->delete(array(array('QST_ID' => $phone_question_id, 'QSG_ID' => array('!=', $QSG_ID))));
 		}
 		/** @type EE_Question_Group $question_group */
-		$question_group=$this->_question_group_model->get_one_by_ID( $QSG_ID );
+		$question_group = $this->_question_group_model->get_one_by_ID($QSG_ID);
 		$questions = $question_group->questions();
 		// make sure system phone question is added to list of questions for this group
-		if ( ! isset( $questions[$phone_question_id ] )) {
-			$questions[ $phone_question_id ] = EEM_Question::instance()->get_one_by_ID( $phone_question_id );
+		if ( ! isset($questions[$phone_question_id])) {
+			$questions[$phone_question_id] = EEM_Question::instance()->get_one_by_ID($phone_question_id);
 		}
 
-		foreach( $questions as $question_ID => $question ){
+		foreach ($questions as $question_ID => $question) {
 			// first we always check for order.
-			if ( ! empty( $this->_req_data['question_orders'][ $question_ID ] ) ){
+			if ( ! empty($this->_req_data['question_orders'][$question_ID])) {
 				//update question order
-				$question_group->update_question_order( $question_ID, $this->_req_data['question_orders'][ $question_ID ] );
+				$question_group->update_question_order($question_ID, $this->_req_data['question_orders'][$question_ID]);
 			}
 
 			// then we always check if adding or removing.
-			if ( isset( $this->_req_data['questions'], $this->_req_data['questions'][ $question_ID ] )) {
-				$question_group->add_question( $question_ID );
+			if (isset($this->_req_data['questions'], $this->_req_data['questions'][$question_ID])) {
+				$question_group->add_question($question_ID);
 			} else {
 				// not found, remove it (but only if not a system question for the personal group with the exception of lname system question - we allow removal of it)
 				if (
 					in_array(
 						$question->system_ID(),
-						EEM_Question::instance()->required_system_questions_in_system_question_group( $question_group->system_group() )
+						EEM_Question::instance()->required_system_questions_in_system_question_group($question_group->system_group())
 					)
 				) {
 					continue;
 				} else {
-					$question_group->remove_question( $question_ID );
+					$question_group->remove_question($question_ID);
 				}
 			}
 		}
 		// save new related questions
-		if ( isset( $this->_req_data['questions'] )) {
-			foreach( $this->_req_data['questions'] as $QST_ID ){
-				$question_group->add_question( $QST_ID );
-				if ( isset( $this->_req_data['question_orders'][ $QST_ID ] )) {
-					$question_group->update_question_order( $QST_ID, $this->_req_data['question_orders'][ $QST_ID ] );
+		if (isset($this->_req_data['questions'])) {
+			foreach ($this->_req_data['questions'] as $QST_ID) {
+				$question_group->add_question($QST_ID);
+				if (isset($this->_req_data['question_orders'][$QST_ID])) {
+					$question_group->update_question_order($QST_ID, $this->_req_data['question_orders'][$QST_ID]);
 				}
 			}
 		}
 
-		if ( $success !== FALSE ) {
-			$msg = $new_question_group ? sprintf( esc_html__('The %s has been created', 'event_espresso'), $this->_question_group_model->item_name() ) : sprintf( esc_html__('The %s has been updated', 'event_espresso' ), $this->_question_group_model->item_name() );
-			EE_Error::add_success( $msg );
+		if ($success !== FALSE) {
+			$msg = $new_question_group ? sprintf(esc_html__('The %s has been created', 'event_espresso'), $this->_question_group_model->item_name()) : sprintf(esc_html__('The %s has been updated', 'event_espresso'), $this->_question_group_model->item_name());
+			EE_Error::add_success($msg);
 		}
-		$this->_redirect_after_action(FALSE, '', '', array('action'=>'edit_question_group','QSG_ID'=>$QSG_ID), TRUE);
+		$this->_redirect_after_action(FALSE, '', '', array('action'=>'edit_question_group', 'QSG_ID'=>$QSG_ID), TRUE);
 
 	}
 
@@ -645,20 +645,20 @@ 
 	 * duplicates a question and all its question options and redirects to the new question.
 	 */
 	public function _duplicate_question() {
-		$question_ID = (int)$this->_req_data[ 'QST_ID' ];
-		$question = EEM_Question::instance()->get_one_by_ID( $question_ID );
-		if( $question instanceof EE_Question ) {
+		$question_ID = (int) $this->_req_data['QST_ID'];
+		$question = EEM_Question::instance()->get_one_by_ID($question_ID);
+		if ($question instanceof EE_Question) {
 			$new_question = $question->duplicate();
-			if( $new_question instanceof EE_Question ) {
-				$this->_redirect_after_action( true, esc_html__( 'Question', 'event_espresso' ), esc_html__( 'Duplicated', 'event_espresso' ), array('action'=>'edit_question', 'QST_ID' => $new_question->ID() ), TRUE);
+			if ($new_question instanceof EE_Question) {
+				$this->_redirect_after_action(true, esc_html__('Question', 'event_espresso'), esc_html__('Duplicated', 'event_espresso'), array('action'=>'edit_question', 'QST_ID' => $new_question->ID()), TRUE);
 			} else {
 				global $wpdb;
-				EE_Error::add_error( sprintf( esc_html__( 'Could not duplicate question with ID %1$d because: %2$s', 'event_espresso' ), $question_ID, $wpdb->last_error ), __FILE__, __FUNCTION__, __LINE__ );
-			$this->_redirect_after_action(false, '', '', array('action'=>'default'), false );
+				EE_Error::add_error(sprintf(esc_html__('Could not duplicate question with ID %1$d because: %2$s', 'event_espresso'), $question_ID, $wpdb->last_error), __FILE__, __FUNCTION__, __LINE__);
+			$this->_redirect_after_action(false, '', '', array('action'=>'default'), false);
 			}
 		} else {
-			EE_Error::add_error( sprintf( esc_html__( 'Could not duplicate question with ID %d because it didn\'t exist!', 'event_espresso' ), $question_ID ), __FILE__, __FUNCTION__, __LINE__ );
-			$this->_redirect_after_action( false, '', '', array( 'action' => 'default' ), false );
+			EE_Error::add_error(sprintf(esc_html__('Could not duplicate question with ID %d because it didn\'t exist!', 'event_espresso'), $question_ID), __FILE__, __FUNCTION__, __LINE__);
+			$this->_redirect_after_action(false, '', '', array('action' => 'default'), false);
 		}
 	}
 
@@ -667,8 +667,8 @@ 
 	/**
 	 * @param bool $trash
 	 */
-	protected function _trash_or_restore_question_groups( $trash = TRUE) {
-		$this->_trash_or_restore_items( $this->_question_group_model, $trash );
+	protected function _trash_or_restore_question_groups($trash = TRUE) {
+		$this->_trash_or_restore_items($this->_question_group_model, $trash);
 	}
 
 
@@ -676,9 +676,9 @@ 
 	/**
 	 *_trash_question
 	 */
-	protected function _trash_question(){
-		$success=$this->_question_model->delete_by_ID( (int)$this->_req_data['QST_ID'] );
-		$query_args=array('action'=>'default','status'=>'all');
+	protected function _trash_question() {
+		$success = $this->_question_model->delete_by_ID((int) $this->_req_data['QST_ID']);
+		$query_args = array('action'=>'default', 'status'=>'all');
 		$this->_redirect_after_action($success, $this->_question_model->item_name($success), 'trashed', $query_args);
 	}
 
@@ -687,8 +687,8 @@ 
 	/**
 	 * @param bool $trash
 	 */
-	protected function _trash_or_restore_questions( $trash=TRUE){
-		$this->_trash_or_restore_items( $this->_question_model, $trash );
+	protected function _trash_or_restore_questions($trash = TRUE) {
+		$this->_trash_or_restore_items($this->_question_model, $trash);
 	}
 
 
@@ -700,21 +700,21 @@ 
 *@param EEM_Soft_Delete_Base $model
 	 * @param boolean $trash whether to trash or restore
 	 */
-	private function _trash_or_restore_items( EEM_Soft_Delete_Base $model, $trash = TRUE ) {
+	private function _trash_or_restore_items(EEM_Soft_Delete_Base $model, $trash = TRUE) {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		$success = 1;
 		//Checkboxes
 		//echo "trash $trash";
 		//var_dump($this->_req_data['checkbox']);die;
-		if ( isset( $this->_req_data['checkbox'] )) {
-			if ( ! empty( $this->_req_data['checkbox'] ) && is_array( $this->_req_data['checkbox'] )) {
+		if (isset($this->_req_data['checkbox'])) {
+			if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
 				// if array has more than one element than success message should be plural
-				$success = count( $this->_req_data['checkbox'] ) > 1 ? 2 : 1;
+				$success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
 				// cycle thru bulk action checkboxes
-				while (list( $ID, $value ) = each($this->_req_data['checkbox'])) {
-					if ( ! $model->delete_or_restore_by_ID($trash,absint($ID))) {
+				while (list($ID, $value) = each($this->_req_data['checkbox'])) {
+					if ( ! $model->delete_or_restore_by_ID($trash, absint($ID))) {
 						$success = 0;
 					}
 				}
@@ -722,7 +722,7 @@ 
 			} else {
 				// grab single id and delete
 				$ID = absint($this->_req_data['checkbox']);
-				if ( ! $model->delete_or_restore_by_ID($trash,$ID)) {
+				if ( ! $model->delete_or_restore_by_ID($trash, $ID)) {
 					$success = 0;
 				}
 			}
@@ -730,25 +730,25 @@ 
 		} else {
 			// delete via trash link
 			// grab single id and delete
-			$ID = absint($this->_req_data[ $model->primary_key_name() ]);
-			if ( ! $model->delete_or_restore_by_ID($trash,$ID)) {
+			$ID = absint($this->_req_data[$model->primary_key_name()]);
+			if ( ! $model->delete_or_restore_by_ID($trash, $ID)) {
 				$success = 0;
 			}
 
 		}
 
 
-		$action = $model instanceof EEM_Question ? 'default' : 'question_groups';//strtolower( $model->item_name(2) );
+		$action = $model instanceof EEM_Question ? 'default' : 'question_groups'; //strtolower( $model->item_name(2) );
 		//echo "action :$action";
 		//$action = 'questions' ? 'default' : $action;
-		if($trash){
+		if ($trash) {
 			$action_desc = 'trashed';
 			$status = 'trash';
-		}else{
+		} else {
 			$action_desc = 'restored';
 			$status = 'all';
 		}
-		$this->_redirect_after_action( $success, $model->item_name($success), $action_desc, array( 'action' => $action, 'status'=>$status ) );
+		$this->_redirect_after_action($success, $model->item_name($success), $action_desc, array('action' => $action, 'status'=>$status));
 	}
 
 
@@ -759,16 +759,16 @@ 
 	 * @param bool|false $count
 	 * @return \EE_Soft_Delete_Base_Class[]|int
 	 */
-	public function get_trashed_questions( $per_page, $current_page = 1, $count = FALSE ) {
+	public function get_trashed_questions($per_page, $current_page = 1, $count = FALSE) {
 		$query_params = $this->get_query_params(EEM_Question::instance(), $per_page, $current_page);
 
-		if( $count ){
+		if ($count) {
 			//note: this a subclass of EEM_Soft_Delete_Base, so this is actually only getting non-trashed items
-			$where = isset( $query_params[0] ) ? array( $query_params[0] ) : array();
-			$results=$this->_question_model->count_deleted($where);
-		}else{
+			$where = isset($query_params[0]) ? array($query_params[0]) : array();
+			$results = $this->_question_model->count_deleted($where);
+		} else {
 			//note: this a subclass of EEM_Soft_Delete_Base, so this is actually only getting non-trashed items
-			$results=$this->_question_model->get_all_deleted($query_params);
+			$results = $this->_question_model->get_all_deleted($query_params);
 		}
 		return $results;
 	}
@@ -781,13 +781,13 @@ 
 	 * @param bool|false $count
 	 * @return \EE_Soft_Delete_Base_Class[]
 	 */
-	public function get_question_groups( $per_page, $current_page = 1, $count = FALSE ) {
-		$questionGroupModel=EEM_Question_Group::instance();
-		$query_params=$this->get_query_params($questionGroupModel,$per_page,$current_page);
-		if ($count){
-			$where = isset( $query_params[0] ) ? array( $query_params[0] ) : array();
+	public function get_question_groups($per_page, $current_page = 1, $count = FALSE) {
+		$questionGroupModel = EEM_Question_Group::instance();
+		$query_params = $this->get_query_params($questionGroupModel, $per_page, $current_page);
+		if ($count) {
+			$where = isset($query_params[0]) ? array($query_params[0]) : array();
 			$results = $questionGroupModel->count($where);
-		}else{
+		} else {
 			$results = $questionGroupModel->get_all($query_params);
 		}
 		return $results;
@@ -801,14 +801,14 @@ 
 	 * @param bool $count
 	 * @return \EE_Soft_Delete_Base_Class[]|int
 	 */
-	public function get_trashed_question_groups( $per_page, $current_page = 1, $count = FALSE ) {
-		$questionGroupModel=EEM_Question_Group::instance();
-		$query_params=$this->get_query_params($questionGroupModel,$per_page,$current_page);
-		if($count){
-			$where = isset( $query_params[0] ) ? array($query_params[0]) : array();
+	public function get_trashed_question_groups($per_page, $current_page = 1, $count = FALSE) {
+		$questionGroupModel = EEM_Question_Group::instance();
+		$query_params = $this->get_query_params($questionGroupModel, $per_page, $current_page);
+		if ($count) {
+			$where = isset($query_params[0]) ? array($query_params[0]) : array();
 			$query_params['limit'] = NULL;
 			$results = $questionGroupModel->count_deleted($where);
-		}else{
+		} else {
 			$results = $questionGroupModel->get_all_deleted($query_params);
 		}
 		return $results;
@@ -821,32 +821,32 @@ 
 	 */
 	public function update_question_group_order() {
 
-		$success = esc_html__( 'Question group order was updated successfully.', 'event_espresso' );
+		$success = esc_html__('Question group order was updated successfully.', 'event_espresso');
 
 		// grab our row IDs
-		$row_ids = isset( $this->_req_data['row_ids'] ) && ! empty( $this->_req_data['row_ids'] )
-			? explode( ',', rtrim( $this->_req_data['row_ids'], ',' ))
+		$row_ids = isset($this->_req_data['row_ids']) && ! empty($this->_req_data['row_ids'])
+			? explode(',', rtrim($this->_req_data['row_ids'], ','))
 			: array();
 
-		$perpage = !empty( $this->_req_data['perpage'] )
+		$perpage = ! empty($this->_req_data['perpage'])
 			? (int) $this->_req_data['perpage']
 			: NULL;
-		$curpage = !empty( $this->_req_data['curpage'] )
+		$curpage = ! empty($this->_req_data['curpage'])
 			? (int) $this->_req_data['curpage']
 			: NULL;
 
-		if ( ! empty( $row_ids ) ) {
+		if ( ! empty($row_ids)) {
 			//figure out where we start the row_id count at for the current page.
-			$qsgcount = empty( $curpage ) ? 0 : ($curpage - 1 ) * $perpage;
+			$qsgcount = empty($curpage) ? 0 : ($curpage - 1) * $perpage;
 
-			$row_count = count( $row_ids );
-			for( $i = 0; $i < $row_count; $i++ ) {
+			$row_count = count($row_ids);
+			for ($i = 0; $i < $row_count; $i++) {
 				//Update the questions when re-ordering
 				$updated = EEM_Question_Group::instance()->update(
-					array( 'QSG_order' => $qsgcount ),
-					array( array( 'QSG_ID' => $row_ids[ $i ] ) )
+					array('QSG_order' => $qsgcount),
+					array(array('QSG_ID' => $row_ids[$i]))
 				);
-				if ( $updated === false ) {
+				if ($updated === false) {
 					$success = false;
 				}
 				$qsgcount++;
@@ -856,10 +856,10 @@ 
 		}
 
 		$errors = ! $success
-			? esc_html__( 'An error occurred. The question group order was not updated.', 'event_espresso' )
+			? esc_html__('An error occurred. The question group order was not updated.', 'event_espresso')
 			: false;
 
-		echo json_encode( array( 'return_data' => false, 'success' => $success, 'errors' => $errors ));
+		echo json_encode(array('return_data' => false, 'success' => $success, 'errors' => $errors));
 		die();
 
 	}
@@ -878,17 +878,17 @@ 
 		$this->_template_args['values'] = $this->_yes_no_values;
 		add_action(
 			'AHEE__Extend_Registration_Form_Admin_Page___reg_form_settings_template',
-			array( $this, 'email_validation_settings_form' ),
+			array($this, 'email_validation_settings_form'),
 			2
 		);
-		$this->_template_args = (array)apply_filters(
+		$this->_template_args = (array) apply_filters(
 			'FHEE__Extend_Registration_Form_Admin_Page___reg_form_settings___template_args',
 			$this->_template_args
 		);
-		$this->_set_add_edit_form_tags( 'update_reg_form_settings' );
-		$this->_set_publish_post_box_vars( NULL, FALSE, FALSE, NULL, FALSE );
+		$this->_set_add_edit_form_tags('update_reg_form_settings');
+		$this->_set_publish_post_box_vars(NULL, FALSE, FALSE, NULL, FALSE);
 		$this->_template_args['admin_page_content'] = EEH_Template::display_template(
-			REGISTRATION_FORM_CAF_TEMPLATE_PATH . 'reg_form_settings.template.php',
+			REGISTRATION_FORM_CAF_TEMPLATE_PATH.'reg_form_settings.template.php',
 			$this->_template_args,
 			TRUE
 		);
@@ -909,7 +909,7 @@ 
 			EE_Registry::instance()->CFG,
 			__FILE__, __FUNCTION__, __LINE__
 		);
-		$this->_redirect_after_action( $success, esc_html__('Registration Form Options', 'event_espresso'), 'updated', array( 'action' => 'view_reg_form_settings' ) );
+		$this->_redirect_after_action($success, esc_html__('Registration Form Options', 'event_espresso'), 'updated', array('action' => 'view_reg_form_settings'));
 	}
 
 
@@ -940,20 +940,20 @@ 
 				'layout_strategy' => new EE_Admin_Two_Column_Layout(),
 				'subsections'     => array(
 					'email_validation_hdr'           => new EE_Form_Section_HTML(
-						EEH_HTML::h2( esc_html__( 'Email Validation Settings', 'event_espresso' ) )
+						EEH_HTML::h2(esc_html__('Email Validation Settings', 'event_espresso'))
 					),
 					'email_validation_level' => new EE_Select_Input(
 						array(
-							'basic'      => esc_html__( 'Basic', 'event_espresso' ),
-							'wp_default' => esc_html__( 'WordPress Default', 'event_espresso' ),
-							'i18n'       => esc_html__( 'International', 'event_espresso' ),
-							'i18n_dns'   => esc_html__( 'International + DNS Check', 'event_espresso' ),
+							'basic'      => esc_html__('Basic', 'event_espresso'),
+							'wp_default' => esc_html__('WordPress Default', 'event_espresso'),
+							'i18n'       => esc_html__('International', 'event_espresso'),
+							'i18n_dns'   => esc_html__('International + DNS Check', 'event_espresso'),
 						),
 						array(
-							'html_label_text' => esc_html__( 'Email Validation Level', 'event_espresso' )
-							                     . EEH_Template::get_help_tab_link( 'email_validation_info' ),
-							'html_help_text'  => esc_html__( 'These levels range from basic validation ( ie: text@text.text ) to more advanced checks against international email addresses (ie: üñîçøðé@example.com ) with additional MX and A record checks to confirm the domain actually exists. More information on on each level can be found within the help section.', 'event_espresso'),
-							'default' => isset( EE_Registry::instance()->CFG->registration->email_validation_level )
+							'html_label_text' => esc_html__('Email Validation Level', 'event_espresso')
+							                     . EEH_Template::get_help_tab_link('email_validation_info'),
+							'html_help_text'  => esc_html__('These levels range from basic validation ( ie: text@text.text ) to more advanced checks against international email addresses (ie: üñîçøðé@example.com ) with additional MX and A record checks to confirm the domain actually exists. More information on on each level can be found within the help section.', 'event_espresso'),
+							'default' => isset(EE_Registry::instance()->CFG->registration->email_validation_level)
 								? EE_Registry::instance()->CFG->registration->email_validation_level
 								: 'wp_default',
 							'required'        => false
@@ -972,25 +972,25 @@ 
 	 * @param \EE_Registration_Config $EE_Registration_Config
 	 * @return \EE_Registration_Config
 	 */
-	public function update_email_validation_settings_form( EE_Registration_Config $EE_Registration_Config ) {
+	public function update_email_validation_settings_form(EE_Registration_Config $EE_Registration_Config) {
         $prev_email_validation_level = $EE_Registration_Config->email_validation_level;
         try {
 			$email_validation_settings_form = $this->_email_validation_settings_form();
 			// if not displaying a form, then check for form submission
-			if ( $email_validation_settings_form->was_submitted() ) {
+			if ($email_validation_settings_form->was_submitted()) {
 				// capture form data
 				$email_validation_settings_form->receive_form_submission();
 				// validate form data
-				if ( $email_validation_settings_form->is_valid() ) {
+				if ($email_validation_settings_form->is_valid()) {
 					// grab validated data from form
 					$valid_data = $email_validation_settings_form->valid_data();
-					if ( isset( $valid_data['email_validation_level'] ) ) {
+					if (isset($valid_data['email_validation_level'])) {
 					    $email_validation_level = $valid_data['email_validation_level'];
                         // now if they want to use international email addresses
-                        if ( $email_validation_level === 'i18n' || $email_validation_level === 'i18n_dns' ) {
+                        if ($email_validation_level === 'i18n' || $email_validation_level === 'i18n_dns') {
                             // in case we need to reset their email validation level,
                             // make sure that the previous value wasn't already set to one of the i18n options.
-                            if ( $prev_email_validation_level === 'i18n' || $prev_email_validation_level === 'i18n_dns' ) {
+                            if ($prev_email_validation_level === 'i18n' || $prev_email_validation_level === 'i18n_dns') {
                                 // if so, then reset it back to "basic" since that is the only other option that,
                                 // despite offering poor validation, supports i18n email addresses
                                 $prev_email_validation_level = 'basic';
@@ -1012,7 +1012,7 @@ 
                         );
 					}
 				} else {
-					if ( $email_validation_settings_form->submission_error_message() !== '' ) {
+					if ($email_validation_settings_form->submission_error_message() !== '') {
 						EE_Error::add_error(
 							$email_validation_settings_form->submission_error_message(),
                             __FILE__, __FUNCTION__, __LINE__
@@ -1020,7 +1020,7 @@ 
 					}
 				}
 			}
-		} catch ( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$e->get_error();
 		}
 		return $EE_Registration_Config;

modules/ticket_selector/templates/ticket_selector_chart.template.php

Indentation +10 added lines, -10 removed lines

@@ -96,9 +96,9 @@ 
 		}
 
 		$ticket_details_css_id = apply_filters(
-            'FHEE__ticket_selector_chart_template__ticket_details_css_id',
-            "tckt-slctr-tkt-details-{$EVT_ID}-{$TKT_ID}"
-        );
+			'FHEE__ticket_selector_chart_template__ticket_details_css_id',
+			"tckt-slctr-tkt-details-{$EVT_ID}-{$TKT_ID}"
+		);
 	?>
 				<tr class="tckt-slctr-tbl-tr <?php echo $status_class . ' ' . espresso_get_object_css_class( $ticket ); ?>">
 		<?php
@@ -469,13 +469,13 @@ 
 				<th scope="col" class="ee-ticket-selector-ticket-qty-th cntr">
 					<?php
 						/**
-						* Filters the text printed for the header of the quantity column in the ticket selector table
-						*
-						* @since 4.7.2
-						*
-						* @param string 'Qty*' The translatable text to display in the table header for the Quantity of tickets
-						* @param int $EVT_ID The Event ID
-						*/
+						 * Filters the text printed for the header of the quantity column in the ticket selector table
+						 *
+						 * @since 4.7.2
+						 *
+						 * @param string 'Qty*' The translatable text to display in the table header for the Quantity of tickets
+						 * @param int $EVT_ID The Event ID
+						 */
 						echo esc_html( apply_filters( 'FHEE__ticket_selector_chart_template__table_header_qty', __( 'Qty*', 'event_espresso' ), $EVT_ID ) );
 					?>
 				</th>

Spacing +144 added lines, -144 removed lines

@@ -8,32 +8,32 @@ 
 
 $row = 1;
 $max = 1;
-$ticket_count = count( $tickets );
+$ticket_count = count($tickets);
 
-if ( ! $ticket_count ) {
+if ( ! $ticket_count) {
 	return;
 }
 
 $required_ticket_sold_out = FALSE;
-$template_settings = isset ( EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector ) ? EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector : new EE_Ticket_Selector_Config();
+$template_settings = isset (EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector) ? EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector : new EE_Ticket_Selector_Config();
 ob_start();
 
-foreach ( $tickets as $TKT_ID => $ticket ) {
-	if ( $ticket instanceof EE_Ticket ) {
+foreach ($tickets as $TKT_ID => $ticket) {
+	if ($ticket instanceof EE_Ticket) {
 		//	d( $ticket );
-		$max =$ticket->max();
+		$max = $ticket->max();
 		$min = 0;
 		$remaining = $ticket->remaining();
-		if ( $ticket->is_on_sale() && $ticket->is_remaining() ) {
+		if ($ticket->is_on_sale() && $ticket->is_remaining()) {
 			// offer the number of $tickets_remaining or $max_atndz, whichever is smaller
-			$max = min( $remaining, $max_atndz );
+			$max = min($remaining, $max_atndz);
 			// but... we also want to restrict the number of tickets by the ticket max setting,
 			// however, the max still can't be higher than what was just set above
-			$max = $ticket->max() > 0 ? min( $ticket->max(), $max ) : $max;
+			$max = $ticket->max() > 0 ? min($ticket->max(), $max) : $max;
 			// and we also want to restrict the minimum number of tickets by the ticket min setting
 			$min = $ticket->min() > 0 ? $ticket->min() : 0;
 			// and if the ticket is required, then make sure that min qty is at least 1
-			$min = $ticket->required() ? max( $min, 1 ) : $min;
+			$min = $ticket->required() ? max($min, 1) : $min;
 		} else {
 			// set flag if ticket is required (flag is set to start date so that future tickets are not blocked)
 			$required_ticket_sold_out = $ticket->required() && ! $remaining ? $ticket->start_date() : $required_ticket_sold_out;
@@ -42,40 +42,40 @@ 
 		$ticket_price = $ticket->get_ticket_total_with_taxes();
 		$ticket_bundle = FALSE;
 		// for ticket bundles, set min and max qty the same
-		if ( $ticket->min() != 0 && $ticket->min() == $ticket->max() ) {
+		if ($ticket->min() != 0 && $ticket->min() == $ticket->max()) {
 			$ticket_price = $ticket_price * $ticket->min();
 			$ticket_bundle = TRUE;
 		}
-		$ticket_price = apply_filters( 'FHEE__ticket_selector_chart_template__ticket_price', $ticket_price, $ticket );
+		$ticket_price = apply_filters('FHEE__ticket_selector_chart_template__ticket_price', $ticket_price, $ticket);
 		// if a previous required ticket with the same sale start date is sold out, then mark this ticket as sold out as well.
 		// tickets that go on sale at a later date than the required ticket  will NOT be affected
 		$tkt_status = $required_ticket_sold_out !== FALSE && $required_ticket_sold_out === $ticket->start_date() ? EE_Ticket::sold_out : $ticket->ticket_status();
 		$tkt_status = $event_status === EE_Datetime::sold_out ? EE_Ticket::sold_out : $tkt_status;
 		// check ticket status
-		switch ( $tkt_status ) {
+		switch ($tkt_status) {
 			// sold_out
 			case EE_Ticket::sold_out :
-				$ticket_status = '<span class="ticket-sales-sold-out">' . $ticket->ticket_status( TRUE ) . '</span>';
+				$ticket_status = '<span class="ticket-sales-sold-out">'.$ticket->ticket_status(TRUE).'</span>';
 				$status_class = 'ticket-sales-sold-out lt-grey-text';
 			break;
 			// expired
 			case EE_Ticket::expired :
-				$ticket_status = '<span class="ticket-sales-expired">' . $ticket->ticket_status( TRUE ) . '</span>';
+				$ticket_status = '<span class="ticket-sales-expired">'.$ticket->ticket_status(TRUE).'</span>';
 				$status_class = 'ticket-sales-expired lt-grey-text';
 			break;
 			// archived
 			case EE_Ticket::archived :
-				$ticket_status = '<span class="archived-ticket">' . $ticket->ticket_status( TRUE ) . '</span>';
+				$ticket_status = '<span class="archived-ticket">'.$ticket->ticket_status(TRUE).'</span>';
 				$status_class = 'archived-ticket hidden';
 			break;
 			// pending
 			case EE_Ticket::pending :
-				$ticket_status = '<span class="ticket-pending">' . $ticket->ticket_status( TRUE ) . '</span>';
+				$ticket_status = '<span class="ticket-pending">'.$ticket->ticket_status(TRUE).'</span>';
 				$status_class = 'ticket-pending';
 			break;
 			// onsale
 			case EE_Ticket::onsale :
-				$ticket_status = '<span class="ticket-on-sale">' . $ticket->ticket_status( TRUE ) . '</span>';
+				$ticket_status = '<span class="ticket-on-sale">'.$ticket->ticket_status(TRUE).'</span>';
 				$status_class = 'ticket-on-sale';
 			break;
 		}
@@ -90,7 +90,7 @@ 
 		 *
 		 * @var string|bool
 		 */
-		if ( false !== ( $new_row_content = apply_filters( 'FHEE__ticket_selector_chart_template__do_ticket_entire_row', false, $ticket, $max, $min, $required_ticket_sold_out, $ticket_price, $ticket_bundle, $ticket_status, $status_class ) ) ) {
+		if (false !== ($new_row_content = apply_filters('FHEE__ticket_selector_chart_template__do_ticket_entire_row', false, $ticket, $max, $min, $required_ticket_sold_out, $ticket_price, $ticket_bundle, $ticket_status, $status_class))) {
 			echo $new_row_content;
 			continue;
 		}
@@ -100,7 +100,7 @@ 
             "tckt-slctr-tkt-details-{$EVT_ID}-{$TKT_ID}"
         );
 	?>
-				<tr class="tckt-slctr-tbl-tr <?php echo $status_class . ' ' . espresso_get_object_css_class( $ticket ); ?>">
+				<tr class="tckt-slctr-tbl-tr <?php echo $status_class.' '.espresso_get_object_css_class($ticket); ?>">
 		<?php
 		/**
 		 * Allow plugins to hook in and abort the generation and display of the contents of this
@@ -112,24 +112,24 @@ 
 		 *
 		 * @var string|bool
 		 */
-		if ( false !== ( $new_row_cells_content = apply_filters( 'FHEE__ticket_selector_chart_template__do_ticket_inside_row', false, $ticket, $max, $min, $required_ticket_sold_out, $ticket_price, $ticket_bundle, $ticket_status, $status_class ) ) ) {
+		if (false !== ($new_row_cells_content = apply_filters('FHEE__ticket_selector_chart_template__do_ticket_inside_row', false, $ticket, $max, $min, $required_ticket_sold_out, $ticket_price, $ticket_bundle, $ticket_status, $status_class))) {
 			echo $new_row_cells_content;
 			echo '</tr>';
 			continue;
 		}
 		?>
 					<td class="tckt-slctr-tbl-td-name">
-						<b><?php echo $ticket->get_pretty('TKT_name');?></b>
-						<?php if ( $template_settings->show_ticket_details ) : ?>
-							<a id="display-<?php echo $ticket_details_css_id; ?>" class="display-tckt-slctr-tkt-details display-the-hidden lt-grey-text smaller-text hide-if-no-js" rel="<?php echo $ticket_details_css_id; ?>" title="<?php echo esc_attr( apply_filters( 'FHEE__ticket_selector_chart_template__show_ticket_details_link_title', __( 'click to show additional ticket details', 'event_espresso' )) ); ?>">
-								<?php echo sprintf( __( 'show%1$sdetails%1$s+', 'event_espresso' ), '&nbsp;' ); ?>
+						<b><?php echo $ticket->get_pretty('TKT_name'); ?></b>
+						<?php if ($template_settings->show_ticket_details) : ?>
+							<a id="display-<?php echo $ticket_details_css_id; ?>" class="display-tckt-slctr-tkt-details display-the-hidden lt-grey-text smaller-text hide-if-no-js" rel="<?php echo $ticket_details_css_id; ?>" title="<?php echo esc_attr(apply_filters('FHEE__ticket_selector_chart_template__show_ticket_details_link_title', __('click to show additional ticket details', 'event_espresso'))); ?>">
+								<?php echo sprintf(__('show%1$sdetails%1$s+', 'event_espresso'), '&nbsp;'); ?>
 							</a>
-							<a id="hide-<?php echo $ticket_details_css_id; ?>" class="hide-tckt-slctr-tkt-details hide-the-displayed lt-grey-text smaller-text hide-if-no-js" rel="<?php echo $ticket_details_css_id; ?>" title="<?php echo esc_attr( apply_filters( 'FHEE__ticket_selector_chart_template__hide_ticket_details_link_title', __( 'click to hide additional ticket details', 'event_espresso' )) ); ?>" style="display:none;">
-								<?php echo sprintf( __( 'hide%1$sdetails%1$s-', 'event_espresso' ), '&nbsp;' ); ?>
+							<a id="hide-<?php echo $ticket_details_css_id; ?>" class="hide-tckt-slctr-tkt-details hide-the-displayed lt-grey-text smaller-text hide-if-no-js" rel="<?php echo $ticket_details_css_id; ?>" title="<?php echo esc_attr(apply_filters('FHEE__ticket_selector_chart_template__hide_ticket_details_link_title', __('click to hide additional ticket details', 'event_espresso'))); ?>" style="display:none;">
+								<?php echo sprintf(__('hide%1$sdetails%1$s-', 'event_espresso'), '&nbsp;'); ?>
 							</a>
 						<?php endif; //end show details check ?>
-					<?php if ( $ticket->required() ) { ?>
-						<p class="ticket-required-pg"><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_required_message', __( 'This ticket is required and must be purchased.', 'event_espresso' )); ?></p>
+					<?php if ($ticket->required()) { ?>
+						<p class="ticket-required-pg"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_required_message', __('This ticket is required and must be purchased.', 'event_espresso')); ?></p>
 					<?php } ?>
 					<?php
 //	echo '<br/><b>$max_atndz : ' . $max_atndz . '</b>';
@@ -143,63 +143,63 @@ 
 //	echo '<br/><b> $ticket->required() : ' .  $ticket->uses() . '</b>';
 					?>
 					</td>
-					<?php if ( apply_filters( 'FHEE__ticket_selector_chart_template__display_ticket_price_details', TRUE )) { ?>
-					<td class="tckt-slctr-tbl-td-price jst-rght"><?php echo EEH_Template::format_currency( $ticket_price ); ?>&nbsp;<span class="smaller-text no-bold"><?php
-						if ( $ticket_bundle ) {
-							echo apply_filters( 'FHEE__ticket_selector_chart_template__per_ticket_bundle_text', __( ' / bundle', 'event_espresso' ));
+					<?php if (apply_filters('FHEE__ticket_selector_chart_template__display_ticket_price_details', TRUE)) { ?>
+					<td class="tckt-slctr-tbl-td-price jst-rght"><?php echo EEH_Template::format_currency($ticket_price); ?>&nbsp;<span class="smaller-text no-bold"><?php
+						if ($ticket_bundle) {
+							echo apply_filters('FHEE__ticket_selector_chart_template__per_ticket_bundle_text', __(' / bundle', 'event_espresso'));
 						} else {
-							echo apply_filters( 'FHEE__ticket_selector_chart_template__per_ticket_text', __( '', 'event_espresso' ));
+							echo apply_filters('FHEE__ticket_selector_chart_template__per_ticket_text', __('', 'event_espresso'));
 						}?></span>&nbsp;</td>
 					<?php } ?>
 					<td class="tckt-slctr-tbl-td-qty cntr">
 					<?php
 					$hidden_input_qty = $max_atndz > 1 ? TRUE : FALSE;
 					// sold out or other status ?
-					if ( $tkt_status == EE_Ticket::sold_out || $remaining == 0 ) {
+					if ($tkt_status == EE_Ticket::sold_out || $remaining == 0) {
 					?>
-						<span class="sold-out"><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_sold_out_msg', __( 'Sold&nbsp;Out', 'event_espresso' ));?></span>
+						<span class="sold-out"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_sold_out_msg', __('Sold&nbsp;Out', 'event_espresso')); ?></span>
 					<?php
-					} else if ( $tkt_status == EE_Ticket::expired || $tkt_status == EE_Ticket::archived ) {
+					} else if ($tkt_status == EE_Ticket::expired || $tkt_status == EE_Ticket::archived) {
 						echo $ticket_status;
-					} else if ( $tkt_status == EE_Ticket::pending ) {
+					} else if ($tkt_status == EE_Ticket::pending) {
 					?>
 					<div class="ticket-pending-pg">
-						<span class="ticket-pending"><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_goes_on_sale_msg', __( 'Goes&nbsp;On&nbsp;Sale', 'event_espresso' )); ?></span><br/>
-						<span class="small-text"><?php echo $ticket->get_i18n_datetime( 'TKT_start_date', apply_filters( 'FHEE__EED_Ticket_Selector__display_goes_on_sale__date_format', $date_format ) ); ?></span>
+						<span class="ticket-pending"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_goes_on_sale_msg', __('Goes&nbsp;On&nbsp;Sale', 'event_espresso')); ?></span><br/>
+						<span class="small-text"><?php echo $ticket->get_i18n_datetime('TKT_start_date', apply_filters('FHEE__EED_Ticket_Selector__display_goes_on_sale__date_format', $date_format)); ?></span>
 					</div>
 					<?php
 					// min qty purchasable is less than tickets available
-					} else if ( $ticket->min() > $remaining ) {
+					} else if ($ticket->min() > $remaining) {
 					?>
 					<div class="archived-ticket-pg">
-						<span class="archived-ticket small-text"><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_not_available_msg', __( 'Not Available', 'event_espresso' )); ?></span><br/>
+						<span class="archived-ticket small-text"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_not_available_msg', __('Not Available', 'event_espresso')); ?></span><br/>
 					</div>
 					<?php
 					// if only one attendee is allowed to register at a time
-					} else if ( $max_atndz  == 1 ) {
+					} else if ($max_atndz == 1) {
 						// display submit button since we have tickets available
-						add_filter( 'FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true' );
+						add_filter('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true');
 				?>
-					<input type="radio" name="tkt-slctr-qty-<?php echo $EVT_ID; ?>" id="ticket-selector-tbl-qty-slct-<?php echo $EVT_ID . '-' . $row; ?>" class="ticket-selector-tbl-qty-slct" value="<?php echo $row . '-'; ?>1" <?php echo $row == 1 ? ' checked="checked"' : ''; ?>  title=""/>
+					<input type="radio" name="tkt-slctr-qty-<?php echo $EVT_ID; ?>" id="ticket-selector-tbl-qty-slct-<?php echo $EVT_ID.'-'.$row; ?>" class="ticket-selector-tbl-qty-slct" value="<?php echo $row.'-'; ?>1" <?php echo $row == 1 ? ' checked="checked"' : ''; ?>  title=""/>
 			<?php
 						$hidden_input_qty = FALSE;
 
-					} else if ( $max_atndz  == 0 ) {
-						echo '<span class="sold-out">' . apply_filters( 'FHEE__ticket_selector_chart_template__ticket_closed_msg', __( 'Closed', 'event_espresso' )) . '</span>';
-					} elseif ( $max > 0 ) {
+					} else if ($max_atndz == 0) {
+						echo '<span class="sold-out">'.apply_filters('FHEE__ticket_selector_chart_template__ticket_closed_msg', __('Closed', 'event_espresso')).'</span>';
+					} elseif ($max > 0) {
 						// display submit button since we have tickets available
-						add_filter( 'FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true' );
+						add_filter('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true');
 
 				?>
-					<select name="tkt-slctr-qty-<?php echo $EVT_ID; ?>[]" id="ticket-selector-tbl-qty-slct-<?php echo $EVT_ID . '-' . $row; ?>" class="ticket-selector-tbl-qty-slct" title="">
+					<select name="tkt-slctr-qty-<?php echo $EVT_ID; ?>[]" id="ticket-selector-tbl-qty-slct-<?php echo $EVT_ID.'-'.$row; ?>" class="ticket-selector-tbl-qty-slct" title="">
 					<?php
 						// this ensures that non-required tickets with non-zero MIN QTYs don't HAVE to be purchased
-						if ( ! $ticket->required() && $min !== 0 ) {
+						if ( ! $ticket->required() && $min !== 0) {
 					?>
 						<option value="0">&nbsp;0&nbsp;</option>
 					<?php }
 						// offer ticket quantities from the min to the max
-						for ( $i = $min; $i <= $max; $i++) {
+						for ($i = $min; $i <= $max; $i++) {
 					?>
 						<option value="<?php echo $i; ?>">&nbsp;<?php echo $i; ?>&nbsp;</option>
 					<?php } ?>
@@ -209,7 +209,7 @@ 
 
 					}
 					// depending on group reg we need to change the format for qty
-					if ( $hidden_input_qty ) {
+					if ($hidden_input_qty) {
 					?>
 					<input type="hidden" name="tkt-slctr-qty-<?php echo $EVT_ID; ?>[]" value="0" />
 					<?php
@@ -219,33 +219,33 @@ 
 
 					</td>
 				</tr>
-				<?php if ( $template_settings->show_ticket_details ) : ?>
-					<tr class="tckt-slctr-tkt-details-tr <?php echo espresso_get_object_css_class( $ticket, '', 'details' );?>">
+				<?php if ($template_settings->show_ticket_details) : ?>
+					<tr class="tckt-slctr-tkt-details-tr <?php echo espresso_get_object_css_class($ticket, '', 'details'); ?>">
 						<td class="tckt-slctr-tkt-details-td" colspan="3" >
 							<div id="<?php echo $ticket_details_css_id; ?>-dv" class="tckt-slctr-tkt-details-dv" style="display: none;">
 
 								<section class="tckt-slctr-tkt-details-sctn">
-									<h3><?php _e( 'Details', 'event_espresso' ); ?></h3>
+									<h3><?php _e('Details', 'event_espresso'); ?></h3>
 									<p><?php echo $ticket->description(); ?></p>
 
-									<?php if ( $ticket_price != 0 && apply_filters( 'FHEE__ticket_selector_chart_template__display_ticket_price_details', TRUE )) { ?>
+									<?php if ($ticket_price != 0 && apply_filters('FHEE__ticket_selector_chart_template__display_ticket_price_details', TRUE)) { ?>
 									<section class="tckt-slctr-tkt-price-sctn">
-										<h5><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_price_breakdown_heading', __( 'Price', 'event_espresso' )); ?></h5>
+										<h5><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_price_breakdown_heading', __('Price', 'event_espresso')); ?></h5>
 										<div class="tckt-slctr-tkt-details-tbl-wrap-dv">
 											<table class="tckt-slctr-tkt-details-tbl">
 												<thead>
 													<tr>
-														<th class="ee-third-width"><span class="small-text"><?php _e( 'Name', 'event_espresso' ); ?></span></th>
-														<th class="jst-cntr"><span class="small-text"><?php _e( 'Description', 'event_espresso' ); ?></span></th>
-														<th class="ee-fourth-width jst-rght"><span class="small-text"><?php _e( 'Amount', 'event_espresso' ); ?></span></th>
+														<th class="ee-third-width"><span class="small-text"><?php _e('Name', 'event_espresso'); ?></span></th>
+														<th class="jst-cntr"><span class="small-text"><?php _e('Description', 'event_espresso'); ?></span></th>
+														<th class="ee-fourth-width jst-rght"><span class="small-text"><?php _e('Amount', 'event_espresso'); ?></span></th>
 													</tr>
 												</thead>
 												<tbody>
-										<?php if ( $ticket->base_price() instanceof EE_Price ) { ?>
+										<?php if ($ticket->base_price() instanceof EE_Price) { ?>
 													<tr>
-														<td data-th="<?php _e( 'Name', 'event_espresso' ); ?>" class="small-text"><b><?php echo $ticket->base_price()->name(); ?></b></td>
-														<td data-th="<?php _e( 'Description', 'event_espresso' ); ?>" class="small-text"><?php echo $ticket->base_price()->desc(); ?></td>
-														<td data-th="<?php _e( 'Amount', 'event_espresso' ); ?>" class="jst-rght small-text"><?php echo $ticket->base_price()->pretty_price(); ?></td>
+														<td data-th="<?php _e('Name', 'event_espresso'); ?>" class="small-text"><b><?php echo $ticket->base_price()->name(); ?></b></td>
+														<td data-th="<?php _e('Description', 'event_espresso'); ?>" class="small-text"><?php echo $ticket->base_price()->desc(); ?></td>
+														<td data-th="<?php _e('Amount', 'event_espresso'); ?>" class="jst-rght small-text"><?php echo $ticket->base_price()->pretty_price(); ?></td>
 													</tr>
 													<?php
 															$running_total = $ticket->base_price()->amount();
@@ -253,44 +253,44 @@ 
 															$running_total = 0;
 														}
 														// now add price modifiers
-														foreach ( $ticket->price_modifiers() as $price_mod ) { ?>
+														foreach ($ticket->price_modifiers() as $price_mod) { ?>
 													<tr>
-														<td data-th="<?php _e( 'Name', 'event_espresso' ); ?>" class="jst-rght small-text"><?php echo $price_mod->name(); ?></td>
-													<?php if ( $price_mod->is_percent() ) { ?>
-														<td data-th="<?php _e( 'Description', 'event_espresso' ); ?>" class="small-text"><?php echo $price_mod->desc(); ?> <?php echo $price_mod->amount(); ?>%</td>
+														<td data-th="<?php _e('Name', 'event_espresso'); ?>" class="jst-rght small-text"><?php echo $price_mod->name(); ?></td>
+													<?php if ($price_mod->is_percent()) { ?>
+														<td data-th="<?php _e('Description', 'event_espresso'); ?>" class="small-text"><?php echo $price_mod->desc(); ?> <?php echo $price_mod->amount(); ?>%</td>
 														<?php
-															$new_sub_total = $running_total * ( $price_mod->amount() / 100 );
+															$new_sub_total = $running_total * ($price_mod->amount() / 100);
 															$new_sub_total = $price_mod->is_discount() ? $new_sub_total * -1 : $new_sub_total;
 														?>
 													<?php } else { ?>
 														<?php $new_sub_total = $price_mod->is_discount() ? $price_mod->amount() * -1 : $price_mod->amount(); ?>
-														<td data-th="<?php _e( 'Description', 'event_espresso' ); ?>" class="small-text"><?php echo $price_mod->desc(); ?></td>
+														<td data-th="<?php _e('Description', 'event_espresso'); ?>" class="small-text"><?php echo $price_mod->desc(); ?></td>
 														<?php $new_sub_total = $price_mod->is_discount() ? $price_mod->amount() * -1 : $price_mod->amount(); ?>
 													<?php } ?>
-														<td data-th="<?php _e( 'Amount', 'event_espresso' ); ?>" class="jst-rght small-text"><?php echo EEH_Template::format_currency( $new_sub_total ); ?></td>
+														<td data-th="<?php _e('Amount', 'event_espresso'); ?>" class="jst-rght small-text"><?php echo EEH_Template::format_currency($new_sub_total); ?></td>
 														<?php $running_total += $new_sub_total; ?>
 													</tr>
 												<?php } ?>
-												<?php if ( $ticket->taxable() ) { ?>
+												<?php if ($ticket->taxable()) { ?>
 													<?php //$ticket_subtotal =$ticket->get_ticket_subtotal(); ?>
 													<tr>
-														<td colspan="2" class="jst-rght small-text sbttl"><b><?php _e( 'subtotal', 'event_espresso' ); ?></b></td>
-														<td data-th="<?php _e( 'subtotal', 'event_espresso' ); ?>" class="jst-rght small-text"><b><?php echo  EEH_Template::format_currency( $running_total ); ?></b></td>
+														<td colspan="2" class="jst-rght small-text sbttl"><b><?php _e('subtotal', 'event_espresso'); ?></b></td>
+														<td data-th="<?php _e('subtotal', 'event_espresso'); ?>" class="jst-rght small-text"><b><?php echo  EEH_Template::format_currency($running_total); ?></b></td>
 													</tr>
 
-													<?php foreach ( $ticket->get_ticket_taxes_for_admin() as $tax ) { ?>
+													<?php foreach ($ticket->get_ticket_taxes_for_admin() as $tax) { ?>
 													<tr>
-														<td data-th="<?php _e( 'Name', 'event_espresso' ); ?>" class="jst-rght small-text"><?php echo $tax->name(); ?></td>
-														<td data-th="<?php _e( 'Description', 'event_espresso' ); ?>" class="jst-rght small-text"><?php echo $tax->amount(); ?>%</td>
-														<?php $tax_amount = $running_total * ( $tax->amount() / 100 ); ?>
-														<td data-th="<?php _e( 'Amount', 'event_espresso' ); ?>" class="jst-rght small-text"><?php echo EEH_Template::format_currency( $tax_amount ); ?></td>
+														<td data-th="<?php _e('Name', 'event_espresso'); ?>" class="jst-rght small-text"><?php echo $tax->name(); ?></td>
+														<td data-th="<?php _e('Description', 'event_espresso'); ?>" class="jst-rght small-text"><?php echo $tax->amount(); ?>%</td>
+														<?php $tax_amount = $running_total * ($tax->amount() / 100); ?>
+														<td data-th="<?php _e('Amount', 'event_espresso'); ?>" class="jst-rght small-text"><?php echo EEH_Template::format_currency($tax_amount); ?></td>
 														<?php $running_total += $tax_amount; ?>
 													</tr>
 													<?php } ?>
 												<?php } ?>
 													<tr>
-														<td colspan="2" class="jst-rght small-text ttl-lbl-td"><b><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_total_price', __( 'Total', 'event_espresso' )); ?></b></td>
-														<td data-th="<?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_total_price', __( 'Total', 'event_espresso' )); ?>" class="jst-rght small-text"><b><?php echo EEH_Template::format_currency( $running_total ); ?></b></td>
+														<td colspan="2" class="jst-rght small-text ttl-lbl-td"><b><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_total_price', __('Total', 'event_espresso')); ?></b></td>
+														<td data-th="<?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_total_price', __('Total', 'event_espresso')); ?>" class="jst-rght small-text"><b><?php echo EEH_Template::format_currency($running_total); ?></b></td>
 													</tr>
 												</tbody>
 											</table>
@@ -300,106 +300,106 @@ 
 									<?php } ?>
 
 									<section class="tckt-slctr-tkt-sale-dates-sctn">
-										<h5><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_sales_date_heading', __( 'Sale Dates', 'event_espresso' )); ?></h5>
-										<span class="drk-grey-text small-text no-bold"> - <?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_dates_available_message', __( 'The dates when this option is available for purchase.', 'event_espresso' )); ?></span><br/>
-										<span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_goes_on_sale', __( 'Goes On Sale:', 'event_espresso' )); ?></span><span class="dashicons dashicons-calendar"></span><?php echo $ticket->get_i18n_datetime( 'TKT_start_date', $date_format) . ' &nbsp; '; ?><span class="dashicons dashicons-clock"></span><?php echo $ticket->get_i18n_datetime( 'TKT_start_date',  $time_format ) ; ?><br/>
-										<span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_sales_end', __( 'Sales End:', 'event_espresso' )); ?></span><span class="dashicons dashicons-calendar"></span><?php echo $ticket->get_i18n_datetime( 'TKT_end_date', $date_format ) . ' &nbsp; '; ?><span class="dashicons dashicons-clock"></span><?php echo $ticket->get_i18n_datetime( 'TKT_end_date', $time_format ) ; ?><br/>
+										<h5><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_sales_date_heading', __('Sale Dates', 'event_espresso')); ?></h5>
+										<span class="drk-grey-text small-text no-bold"> - <?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_dates_available_message', __('The dates when this option is available for purchase.', 'event_espresso')); ?></span><br/>
+										<span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_goes_on_sale', __('Goes On Sale:', 'event_espresso')); ?></span><span class="dashicons dashicons-calendar"></span><?php echo $ticket->get_i18n_datetime('TKT_start_date', $date_format).' &nbsp; '; ?><span class="dashicons dashicons-clock"></span><?php echo $ticket->get_i18n_datetime('TKT_start_date', $time_format); ?><br/>
+										<span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_sales_end', __('Sales End:', 'event_espresso')); ?></span><span class="dashicons dashicons-calendar"></span><?php echo $ticket->get_i18n_datetime('TKT_end_date', $date_format).' &nbsp; '; ?><span class="dashicons dashicons-clock"></span><?php echo $ticket->get_i18n_datetime('TKT_end_date', $time_format); ?><br/>
 									</section>
 									<br/>
 
-									<?php do_action( 'AHEE__ticket_selector_chart_template__after_ticket_date', $ticket ); ?>
+									<?php do_action('AHEE__ticket_selector_chart_template__after_ticket_date', $ticket); ?>
 
-									<?php if ( $ticket->min() &&$ticket->max() ) { ?>
+									<?php if ($ticket->min() && $ticket->max()) { ?>
 									<section class="tckt-slctr-tkt-quantities-sctn">
-										<h5><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_heading', __( 'Purchasable Quantities', 'event_espresso' )); ?></h5>
-										<span class="drk-grey-text small-text no-bold"> - <?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_message', __( 'The number of tickets that can be purchased per transaction (if available).', 'event_espresso' )); ?></span><br/>
-										<span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_min_qty', __( 'Minimum Qty:', 'event_espresso' )); ?></span><?php echo $ticket->min() > 0 ? $ticket->min() : 0; ?>
-										<?php if ( $ticket->min() > $remaining ) { ?> &nbsp; <span class="important-notice small-text"><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_min_qty_message', __( 'The Minimum Quantity purchasable for this ticket exceeds the number of spaces remaining', 'event_espresso' )); ?></span><?php } ?><br/>
+										<h5><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_heading', __('Purchasable Quantities', 'event_espresso')); ?></h5>
+										<span class="drk-grey-text small-text no-bold"> - <?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_message', __('The number of tickets that can be purchased per transaction (if available).', 'event_espresso')); ?></span><br/>
+										<span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_min_qty', __('Minimum Qty:', 'event_espresso')); ?></span><?php echo $ticket->min() > 0 ? $ticket->min() : 0; ?>
+										<?php if ($ticket->min() > $remaining) { ?> &nbsp; <span class="important-notice small-text"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_min_qty_message', __('The Minimum Quantity purchasable for this ticket exceeds the number of spaces remaining', 'event_espresso')); ?></span><?php } ?><br/>
 										<?php //$max = min( $max, $max_atndz );?>
-										<span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_max_qty', __( 'Maximum Qty:', 'event_espresso' )); ?></span><?php echo $ticket->max() === EE_INF ? __( 'no limit', 'event_espresso' ) : max( $ticket->max(), 1 ); ?><br/>
+										<span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_max_qty', __('Maximum Qty:', 'event_espresso')); ?></span><?php echo $ticket->max() === EE_INF ? __('no limit', 'event_espresso') : max($ticket->max(), 1); ?><br/>
 									</section>
 									<br/>
 									<?php } ?>
 
-									<?php if ( $ticket->uses() !== EE_INF && ( ! defined( 'EE_DECAF' ) || EE_DECAF !== TRUE )) { ?>
+									<?php if ($ticket->uses() !== EE_INF && ( ! defined('EE_DECAF') || EE_DECAF !== TRUE)) { ?>
 									<section class="tckt-slctr-tkt-uses-sctn">
-										<h5><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_event_date_ticket_uses_heading', __( 'Event Date Ticket Uses', 'event_espresso' )); ?></h5>
+										<h5><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_date_ticket_uses_heading', __('Event Date Ticket Uses', 'event_espresso')); ?></h5>
 										<span class="drk-grey-text small-text no-bold"> - <?php
 											echo apply_filters(
 												'FHEE__ticket_selector_chart_template__ticket_details_event_date_ticket_uses_message',
 												sprintf(
-													__( 'The number of separate event datetimes (see table below) that this ticket can be used to gain admittance to.%1$s%2$sAdmission is always one person per ticket.%3$s', 'event_espresso' ),
+													__('The number of separate event datetimes (see table below) that this ticket can be used to gain admittance to.%1$s%2$sAdmission is always one person per ticket.%3$s', 'event_espresso'),
 													'<br/>',
 													'<strong>',
 													'</strong>'
 												)
 											);
 											?></span><br/>
-										<span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_event_date_number_datetimes', __( '# Datetimes:', 'event_espresso' )); ?></span><?php  echo $ticket->uses();?><br/>
+										<span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_date_number_datetimes', __('# Datetimes:', 'event_espresso')); ?></span><?php  echo $ticket->uses(); ?><br/>
 									</section>
 									<?php } ?>
 
 									<?php
-									$datetimes = $ticket->datetimes_ordered( $event_is_expired, FALSE );
+									$datetimes = $ticket->datetimes_ordered($event_is_expired, FALSE);
 									$chart_column_width = $template_settings->show_ticket_sale_columns ? ' ee-fourth-width' : ' ee-half-width';
-									if ( ! empty( $datetimes )) { ?>
+									if ( ! empty($datetimes)) { ?>
 									<section class="tckt-slctr-tkt-datetimes-sctn">
-										<h5><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_event_access_heading', __( 'Access', 'event_espresso' )); ?></h5>
-										<span class="drk-grey-text small-text no-bold"> - <?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_event_access_message', __( 'This option allows access to the following dates and times.', 'event_espresso' )); ?></span>
+										<h5><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_access_heading', __('Access', 'event_espresso')); ?></h5>
+										<span class="drk-grey-text small-text no-bold"> - <?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_access_message', __('This option allows access to the following dates and times.', 'event_espresso')); ?></span>
 										<div class="tckt-slctr-tkt-details-tbl-wrap-dv">
 											<table class="tckt-slctr-tkt-details-tbl">
 												<thead>
 													<tr>
 														<th class="tckt-slctr-tkt-details-date-th">
-															<span class="dashicons dashicons-calendar"></span><span class="small-text"><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_event_date', __( 'Date ', 'event_espresso' )); ?></span>
+															<span class="dashicons dashicons-calendar"></span><span class="small-text"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_access_table_event_date', __('Date ', 'event_espresso')); ?></span>
 														</th>
 														<th class="tckt-slctr-tkt-details-time-th <?php echo $chart_column_width; ?>">
-															<span class="dashicons dashicons-clock"></span><span class="small-text"><?php _e( 'Time ', 'event_espresso' ); ?></span>
+															<span class="dashicons dashicons-clock"></span><span class="small-text"><?php _e('Time ', 'event_espresso'); ?></span>
 														</th>
-														<?php if ( $template_settings->show_ticket_sale_columns ) : ?>
+														<?php if ($template_settings->show_ticket_sale_columns) : ?>
 															<th class="tckt-slctr-tkt-details-this-ticket-sold-th ee-fourth-width cntr">
-																<span class="smaller-text"><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_sold', sprintf( __( 'Sold', 'event_espresso' ), '<br/>' )); ?></span>
+																<span class="smaller-text"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_sold', sprintf(__('Sold', 'event_espresso'), '<br/>')); ?></span>
 															</th>
 															<th class="tckt-slctr-tkt-details-this-ticket-left-th ee-fourth-width cntr">
-																<span class="smaller-text"><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_left', sprintf( __( 'Remaining', 'event_espresso' ), '<br/>' )); ?></span>
+																<span class="smaller-text"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_left', sprintf(__('Remaining', 'event_espresso'), '<br/>')); ?></span>
 															</th>
 															<th class="tckt-slctr-tkt-details-total-tickets-sold-th ee-fourth-width cntr">
-																<span class="smaller-text"><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_sold', sprintf( __( 'Total%sSold', 'event_espresso' ), '<br/>' )); ?></span>
+																<span class="smaller-text"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_sold', sprintf(__('Total%sSold', 'event_espresso'), '<br/>')); ?></span>
 															</th>
 															<th class="tckt-slctr-tkt-details-total-tickets-left-th ee-fourth-width cntr">
-																<span class="smaller-text"><?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_left', sprintf( __( 'Total Spaces%sLeft', 'event_espresso' ), '<br/>' )); ?></span>
+																<span class="smaller-text"><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_left', sprintf(__('Total Spaces%sLeft', 'event_espresso'), '<br/>')); ?></span>
 															</th>
 														<?php endif; //end $template_settings->show_ticket_sale_columns conditional ?>
 													</tr>
 												</thead>
 												<tbody>
 											<?php
-												foreach ( $datetimes as $datetime ) {
-													if ( $datetime instanceof EE_Datetime ) {
+												foreach ($datetimes as $datetime) {
+													if ($datetime instanceof EE_Datetime) {
 											?>
 
 												<tr>
-													<td data-th="<?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_event_date', __( 'Event Date ', 'event_espresso' )); ?>" class="small-text">
+													<td data-th="<?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_access_table_event_date', __('Event Date ', 'event_espresso')); ?>" class="small-text">
 														<?php $datetime_name = $datetime->name(); ?>
-														<?php echo ! empty( $datetime_name ) ? '<b>' . $datetime_name . '</b><br/>' : ''; ?>
-														<?php echo $datetime->date_range( $date_format, __( ' to  ', 'event_espresso' )); ?>
+														<?php echo ! empty($datetime_name) ? '<b>'.$datetime_name.'</b><br/>' : ''; ?>
+														<?php echo $datetime->date_range($date_format, __(' to  ', 'event_espresso')); ?>
 													</td>
-													<td data-th="<?php _e( 'Time ', 'event_espresso' ); ?>" class="cntr small-text">
-														<?php echo $datetime->time_range( $time_format, __( ' to  ', 'event_espresso' )); ?>
+													<td data-th="<?php _e('Time ', 'event_espresso'); ?>" class="cntr small-text">
+														<?php echo $datetime->time_range($time_format, __(' to  ', 'event_espresso')); ?>
 													</td>
-													<?php if ( $template_settings->show_ticket_sale_columns ) : ?>
-														<td data-th="<?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_sold', __( 'Sold', 'event_espresso' )); ?>" class="cntr small-text">
+													<?php if ($template_settings->show_ticket_sale_columns) : ?>
+														<td data-th="<?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_sold', __('Sold', 'event_espresso')); ?>" class="cntr small-text">
 															<?php echo $ticket->sold(); ?>
 														</td>
-														<td data-th="<?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_left', __( 'Remaining', 'event_espresso' )); ?>" class="cntr small-text">
-															<?php echo $ticket->qty() === EE_INF ? '<span class="smaller-text">' .  __( 'unlimited ', 'event_espresso' ) . '</span>' : $ticket->qty() - $ticket->sold(); ?>
+														<td data-th="<?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_left', __('Remaining', 'event_espresso')); ?>" class="cntr small-text">
+															<?php echo $ticket->qty() === EE_INF ? '<span class="smaller-text">'.__('unlimited ', 'event_espresso').'</span>' : $ticket->qty() - $ticket->sold(); ?>
 														</td>
-														<td data-th="<?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_sold', __( 'Total Sold', 'event_espresso' )); ?>" class="cntr small-text">
+														<td data-th="<?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_sold', __('Total Sold', 'event_espresso')); ?>" class="cntr small-text">
 															<?php echo $datetime->sold(); ?>
 														</td>
-												<?php $tkts_left = $datetime->sold_out() ? '<span class="sold-out smaller-text">' . __( 'Sold&nbsp;Out', 'event_espresso' ) . '</span>' : $datetime->spaces_remaining(); ?>
-														<td data-th="<?php echo apply_filters( 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_left', __( 'Total Spaces Left', 'event_espresso' )); ?>" class="cntr small-text">
-															<?php echo $tkts_left === EE_INF ? '<span class="smaller-text">' .  __( 'unlimited ', 'event_espresso' ) . '</span>' : $tkts_left; ?>
+												<?php $tkts_left = $datetime->sold_out() ? '<span class="sold-out smaller-text">'.__('Sold&nbsp;Out', 'event_espresso').'</span>' : $datetime->spaces_remaining(); ?>
+														<td data-th="<?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_left', __('Total Spaces Left', 'event_espresso')); ?>" class="cntr small-text">
+															<?php echo $tkts_left === EE_INF ? '<span class="smaller-text">'.__('unlimited ', 'event_espresso').'</span>' : $tkts_left; ?>
 														</td>
 													<?php endif; //end $template_settings->show_ticket_sale_columns conditional ?>
 												</tr>
@@ -417,7 +417,7 @@ 
 							</div>
 						</td>
 					</tr>
-				<?php endif;  //end template_settings->show_ticket_details check?>
+				<?php endif; //end template_settings->show_ticket_details check?>
 	<?php
 			$row++;
 		}
@@ -426,32 +426,32 @@ 
 $ticket_row_html = ob_get_clean();
 // if there is only ONE ticket with a max qty of ONE, and it is free... then not much need for the ticket selector
 $hide_ticket_selector = $ticket_count == 1 && $max == 1 && $ticket->is_free() ? true : false;
-$hide_ticket_selector = apply_filters( 'FHEE__ticket_selector_chart_template__hide_ticket_selector', $hide_ticket_selector, $EVT_ID );
+$hide_ticket_selector = apply_filters('FHEE__ticket_selector_chart_template__hide_ticket_selector', $hide_ticket_selector, $EVT_ID);
 //EEH_Debug_Tools::printr( $ticket_count, '$ticket_count', __FILE__, __LINE__ );
 //EEH_Debug_Tools::printr( $max, '$max', __FILE__, __LINE__ );
 //EEH_Debug_Tools::printr( $hide_ticket_selector, '$hide_ticket_selector', __FILE__, __LINE__ );
 //EEH_Debug_Tools::printr( $table_style, '$table_style', __FILE__, __LINE__ );
 remove_filter(
 	'FHEE__EE_Ticket_Selector__after_ticket_selector_submit',
-	array( 'EED_Ticket_Selector', 'no_tkt_slctr_end_dv' )
+	array('EED_Ticket_Selector', 'no_tkt_slctr_end_dv')
 );
 remove_filter(
 	'FHEE__EE_Ticket_Selector__after_view_details_btn',
-	array( 'EED_Ticket_Selector', 'no_tkt_slctr_end_dv' )
+	array('EED_Ticket_Selector', 'no_tkt_slctr_end_dv')
 );
-if ( ! $hide_ticket_selector ) {
+if ( ! $hide_ticket_selector) {
 ?>
 <div id="tkt-slctr-tbl-wrap-dv-<?php echo $EVT_ID; ?>" class="tkt-slctr-tbl-wrap-dv">
 
-	<?php do_action( 'AHEE__ticket_selector_chart__template__before_ticket_selector', $event ); ?>
+	<?php do_action('AHEE__ticket_selector_chart__template__before_ticket_selector', $event); ?>
 
 	<table id="tkt-slctr-tbl-<?php echo $EVT_ID; ?>" class="tkt-slctr-tbl">
 		<thead>
 			<tr>
 				<th scope="col" class="ee-ticket-selector-ticket-details-th">
-					<?php echo esc_html( apply_filters( 'FHEE__ticket_selector_chart_template__table_header_available_tickets', '', $EVT_ID ) ); ?>
+					<?php echo esc_html(apply_filters('FHEE__ticket_selector_chart_template__table_header_available_tickets', '', $EVT_ID)); ?>
 				</th>
-				<?php if ( apply_filters( 'FHEE__ticket_selector_chart_template__display_ticket_price_details', TRUE )) { ?>
+				<?php if (apply_filters('FHEE__ticket_selector_chart_template__display_ticket_price_details', TRUE)) { ?>
 				<th scope="col" class="ee-ticket-selector-ticket-price-th cntr">
 					<?php
 						/**
@@ -462,7 +462,7 @@ 
 						 * @param string 'Price' The translatable text to display in the table header for price
 						 * @param int $EVT_ID The Event ID
 						 */
-						echo esc_html( apply_filters( 'FHEE__ticket_selector_chart_template__table_header_price', __( 'Price', 'event_espresso' ), $EVT_ID ) );
+						echo esc_html(apply_filters('FHEE__ticket_selector_chart_template__table_header_price', __('Price', 'event_espresso'), $EVT_ID));
 					?>
 				</th>
 				<?php } ?>
@@ -476,24 +476,24 @@ 
 						* @param string 'Qty*' The translatable text to display in the table header for the Quantity of tickets
 						* @param int $EVT_ID The Event ID
 						*/
-						echo esc_html( apply_filters( 'FHEE__ticket_selector_chart_template__table_header_qty', __( 'Qty*', 'event_espresso' ), $EVT_ID ) );
+						echo esc_html(apply_filters('FHEE__ticket_selector_chart_template__table_header_qty', __('Qty*', 'event_espresso'), $EVT_ID));
 					?>
 				</th>
 			</tr>
 		</thead>
 		<tbody>
-			<?php echo $ticket_row_html;?>
+			<?php echo $ticket_row_html; ?>
 		</tbody>
 	</table>
 
 	<input type="hidden" name="noheader" value="true" />
-	<input type="hidden" name="tkt-slctr-return-url-<?php echo $EVT_ID ?>" value="<?php echo EEH_URL::filter_input_server_url();?>" />
+	<input type="hidden" name="tkt-slctr-return-url-<?php echo $EVT_ID ?>" value="<?php echo EEH_URL::filter_input_server_url(); ?>" />
 	<input type="hidden" name="tkt-slctr-rows-<?php echo $EVT_ID; ?>" value="<?php echo $row - 1; ?>" />
 	<input type="hidden" name="tkt-slctr-max-atndz-<?php echo $EVT_ID; ?>" value="<?php echo $max_atndz; ?>" />
 	<input type="hidden" name="tkt-slctr-event-id" value="<?php echo $EVT_ID; ?>" />
 
 <?php
-if ( $max_atndz > 0 && ! $hide_ticket_selector ) {
+if ($max_atndz > 0 && ! $hide_ticket_selector) {
 	echo apply_filters(
 		'FHEE__ticket_selector_chart_template__maximum_tickets_purchased_footnote',
 		''
@@ -501,10 +501,10 @@ 
 }
 ?>
 
-	<?php do_action( 'AHEE__ticket_selector_chart__template__after_ticket_selector', $EVT_ID, $event ); ?>
+	<?php do_action('AHEE__ticket_selector_chart__template__after_ticket_selector', $EVT_ID, $event); ?>
 
 </div>
-<?php } else if ( isset( $TKT_ID ) ) { ?>
+<?php } else if (isset($TKT_ID)) { ?>
 <input type="hidden" name="tkt-slctr-qty-<?php echo $EVT_ID; ?>[]" value="1"/>
 <input type="hidden" name="tkt-slctr-ticket-id-<?php echo $EVT_ID; ?>[]" value="<?php echo $TKT_ID; ?>"/>
 <input type="hidden" name="noheader" value="true"/>
@@ -513,27 +513,27 @@ 
 <input type="hidden" name="tkt-slctr-max-atndz-<?php echo $EVT_ID; ?>" value="<?php echo $max_atndz; ?>"/>
 <input type="hidden" name="tkt-slctr-event-id" value="<?php echo $EVT_ID; ?>"/>
 <?php
-	if ( $ticket instanceof EE_Ticket ) {
-		do_action( 'AHEE__ticket_selector_chart__template__before_ticket_selector', $event );
+	if ($ticket instanceof EE_Ticket) {
+		do_action('AHEE__ticket_selector_chart__template__before_ticket_selector', $event);
 		$ticket_description = $ticket->description();
 ?>
 <div id="no-tkt-slctr-ticket-dv-<?php echo $EVT_ID; ?>" class="no-tkt-slctr-ticket-dv">
 	<div class="no-tkt-slctr-ticket-content-dv">
 		<h5><?php echo $ticket->name(); ?></h5>
-		<?php if ( ! empty( $ticket_description ) ) { ?>
+		<?php if ( ! empty($ticket_description)) { ?>
 		<p><?php echo $ticket_description; ?></p>
 		<?php } ?>
 	</div>
 <?php
 		add_filter(
 			'FHEE__EE_Ticket_Selector__after_ticket_selector_submit',
-			array( 'EED_Ticket_Selector', 'no_tkt_slctr_end_dv' )
+			array('EED_Ticket_Selector', 'no_tkt_slctr_end_dv')
 		);
 		add_filter(
 			'FHEE__EE_Ticket_Selector__after_view_details_btn',
-			array( 'EED_Ticket_Selector', 'no_tkt_slctr_end_dv' )
+			array('EED_Ticket_Selector', 'no_tkt_slctr_end_dv')
 		);
-		do_action( 'AHEE__ticket_selector_chart__template__after_ticket_selector', $EVT_ID, $event );
+		do_action('AHEE__ticket_selector_chart__template__after_ticket_selector', $EVT_ID, $event);
 	}
 }
 ?>

modules/single_page_checkout/reg_steps/payment_options/payment_options_main.template.php

Spacing +12 added lines, -12 removed lines

@@ -1,36 +1,36 @@
 
 	<h4 id="reg-page-totals-hdr" class="">
-		<span class="drk-grey-text"><?php _e('Registrations:', 'event_espresso'); ?></span> <?php echo $reg_count;?>
+		<span class="drk-grey-text"><?php _e('Registrations:', 'event_espresso'); ?></span> <?php echo $reg_count; ?>
 	</h4>
 
 	<div class="spco-payment-info-dv">
 		<table id="spco-payment-info-table">
 			<thead>
 				<tr>
-					<th scope="col" width=""><?php _e('Name and Description', 'event_espresso');?></th>
-					<th scope="col" width="15%" class="jst-cntr"><?php _e('Price', 'event_espresso');?></th>
-					<th scope="col" width="5%" class="jst-cntr"><?php _e( 'Qty', 'event_espresso' ); ?></th>
-					<th scope="col" width="15%" class="jst-cntr"><?php _e('Total', 'event_espresso');?></th>
-					<?php	do_action( 'AHEE__registration_page_payment_options__payment_info_table_thead_row_end' ); ?>
+					<th scope="col" width=""><?php _e('Name and Description', 'event_espresso'); ?></th>
+					<th scope="col" width="15%" class="jst-cntr"><?php _e('Price', 'event_espresso'); ?></th>
+					<th scope="col" width="5%" class="jst-cntr"><?php _e('Qty', 'event_espresso'); ?></th>
+					<th scope="col" width="15%" class="jst-cntr"><?php _e('Total', 'event_espresso'); ?></th>
+					<?php	do_action('AHEE__registration_page_payment_options__payment_info_table_thead_row_end'); ?>
 				</tr>
 			</thead>
 			<tbody>
-			<?php echo $transaction_details;?>
-			<?php	do_action( 'AHEE__registration_page_payment_options__payment_info_table_tbody_end' ); ?>
+			<?php echo $transaction_details; ?>
+			<?php	do_action('AHEE__registration_page_payment_options__payment_info_table_tbody_end'); ?>
 			</tbody>
 		</table>
 	</div>
 	<div class="clear-float"> </div>
 
-	<?php  echo $before_payment_options;  ?>
+	<?php  echo $before_payment_options; ?>
 
 	<div id="methods-of-payment">
 		<?php echo $payment_options; ?>
 	</div>
 	<!-- end #methods-of-payment -->
 
-	<?php  echo $after_payment_options;  ?>
+	<?php  echo $after_payment_options; ?>
 
-	<?php  echo $default_hidden_inputs;  ?>
-	<?php  echo $extra_hidden_inputs;  ?>
+	<?php  echo $default_hidden_inputs; ?>
+	<?php  echo $extra_hidden_inputs; ?>
 

admin_pages/registrations/Registrations_Admin_Page.core.php

Indentation +64 added lines, -64 removed lines

@@ -163,9 +163,9 @@ 
 
 	/**
 	 * 		grab url requests and route them
-	*		@access private
-	*		@return void
-	*/
+	 *		@access private
+	 *		@return void
+	 */
 	public function _set_page_routes() {
 
 		$this->_get_registration_status_array();
@@ -437,7 +437,7 @@ 
 						'title' => __('Registrations Other', 'event_espresso'),
 						'filename' => 'registrations_overview_other'
 					)
-                ),
+				),
 				'help_tour' => array( 'Registration_Overview_Help_Tour' ),
 				'qtips' => array('Registration_List_Table_Tips'),
 				'list_table' => 'EE_Registrations_List_Table',
@@ -456,7 +456,7 @@ 
 						: $this->_admin_base_url,
 					'persistent' => FALSE
 				),
-                'help_tabs' => array(
+				'help_tabs' => array(
 					'registrations_details_help_tab' => array(
 						'title' => __('Registration Details', 'event_espresso'),
 						'filename' => 'registrations_details'
@@ -520,7 +520,7 @@ 
 					'order' => 20
 				),
 				'list_table' => 'EE_Attendee_Contact_List_Table',
-                'help_tabs' => array(
+				'help_tabs' => array(
 					'registrations_contact_list_help_tab' => array(
 						'title' => __('Registrations Contact List', 'event_espresso'),
 						'filename' => 'registrations_contact_list'
@@ -537,7 +537,7 @@ 
 						'title' => __('Contact List Other', 'event_espresso'),
 						'filename' => 'registrations_contact_list_other'
 					)
-                ),
+				),
 				'help_tour' => array( 'Contact_List_Help_Tour' ),
 				'metaboxes' => array(),
 				'require_nonce' => FALSE
@@ -571,9 +571,9 @@ 
 
 	/**
 	 * 		get list of registration statuses
-	*		@access private
-	*		@return void
-	*/
+	 *		@access private
+	 *		@return void
+	 */
 	private function _get_registration_status_array() {
 		self::$_reg_status = EEM_Registration::reg_status_array( array(), TRUE);
 	}
@@ -861,8 +861,8 @@ 
 
 
 	 /**
-	 * @throws \EE_Error
-	 */
+	  * @throws \EE_Error
+	  */
 	protected function _registrations_overview_list_table() {
 		$this->_template_args['admin_page_header'] = '';
 		$EVT_ID = ! empty( $this->_req_data['event_id'] ) ? absint( $this->_req_data['event_id'] ) : 0;
@@ -922,7 +922,7 @@ 
 			return TRUE;
 		}
 
-	    $REG = EEM_Registration::instance();
+		$REG = EEM_Registration::instance();
 
 		$REG_ID = ( ! empty( $this->_req_data['_REG_ID'] )) ? absint( $this->_req_data['_REG_ID'] ) : FALSE;
 
@@ -1146,9 +1146,9 @@ 
 
 	/**
 	 * 		generates HTML for the View Registration Details Admin page
-	*		@access protected
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@return void
+	 */
 	protected function _registration_details() {
 
 		$this->_template_args = array();
@@ -1414,10 +1414,10 @@ 
 
 	/**
 	 * 		approve_registration
-	*		@access protected
-	*		@param bool $notify whether or not to notify the registrant about their approval.
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@param bool $notify whether or not to notify the registrant about their approval.
+	 *		@return void
+	 */
 	protected function approve_registration( $notify = false ) {
 		$this->_reg_status_change_return( EEM_Registration::status_id_approved, $notify );
 	}
@@ -1427,10 +1427,10 @@ 
 
 	/**
 	 * 		decline_registration
-	*		@access protected
-	*		@param bool $notify whether or not to notify the registrant about their approval.
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@param bool $notify whether or not to notify the registrant about their approval.
+	 *		@return void
+	 */
 	protected function decline_registration( $notify = false ) {
 		$this->_reg_status_change_return( EEM_Registration::status_id_declined, $notify );
 	}
@@ -1440,10 +1440,10 @@ 
 
 	/**
 	 * 		cancel_registration
-	*		@access protected
-	*		@param bool $notify whether or not to notify the registrant about their approval.
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@param bool $notify whether or not to notify the registrant about their approval.
+	 *		@return void
+	 */
 	protected function cancel_registration( $notify = false ) {
 		$this->_reg_status_change_return( EEM_Registration::status_id_cancelled, $notify );
 	}
@@ -1454,10 +1454,10 @@ 
 
 	/**
 	 * 		not_approve_registration
-	*		@access protected
-	*		@param bool $notify whether or not to notify the registrant about their approval.
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@param bool $notify whether or not to notify the registrant about their approval.
+	 *		@return void
+	 */
 	protected function not_approve_registration( $notify = false ) {
 		$this->_reg_status_change_return( EEM_Registration::status_id_not_approved, $notify );
 	}
@@ -1466,10 +1466,10 @@ 
 
 	/**
 	 * 		decline_registration
-	*		@access protected
-	*		@param bool $notify whether or not to notify the registrant about their approval.
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@param bool $notify whether or not to notify the registrant about their approval.
+	 *		@return void
+	 */
 	protected function pending_registration( $notify = false ) {
 		$this->_reg_status_change_return( EEM_Registration::status_id_pending_payment, $notify );
 	}
@@ -1479,9 +1479,9 @@ 
 
 	/**
 	 * 		generates HTML for the Registration main meta box
-	*		@access public
-	*		@return void
-	*/
+	 *		@access public
+	 *		@return void
+	 */
 	public function _reg_details_meta_box() {
 		EEH_Autoloader::register_line_item_display_autoloaders();
 		EEH_Autoloader::register_line_item_filter_autoloaders();
@@ -1518,7 +1518,7 @@ 
 			: '';
 
 		$this->_template_args['resend_registration_button'] = $attendee instanceof EE_Attendee
-		                                                      && EE_Registry::instance()->CAP->current_user_can(
+															  && EE_Registry::instance()->CAP->current_user_can(
 			'ee_send_message',
 			'espresso_registrations_resend_registration'
 		)
@@ -1594,7 +1594,7 @@ 
 	 *
 	 * @access public
 	 * @return void
-	*/
+	 */
 	public function _reg_questions_meta_box() {
 		//allow someone to override this method entirely
 		if( apply_filters( 'FHEE__Registrations_Admin_Page___reg_questions_meta_box__do_default', true, $this, $this->_registration ) ) {
@@ -1796,12 +1796,12 @@ 
 
 	/**
 	 * 		generates HTML for the Registration main meta box
-	*		@access public
-	*		@return void
-	*/
+	 *		@access public
+	 *		@return void
+	 */
 	public function _reg_attendees_meta_box() {
 
-	    $REG = EEM_Registration::instance();
+		$REG = EEM_Registration::instance();
 		//get all other registrations on this transaction, and cache
 		//the attendees for them so we don't have to run another query using force_join
 		$registrations = $REG->get_all(array(
@@ -1853,9 +1853,9 @@ 
 
 	/**
 	 * 		generates HTML for the Edit Registration side meta box
-	*		@access public
-	*		@return void
-	*/
+	 *		@access public
+	 *		@return void
+	 */
 	public function _reg_registrant_side_meta_box() {
 
 		/*@var $attendee EE_Attendee */
@@ -2236,9 +2236,9 @@ 
 
 	/**
 	 * 		set_reg_event
-	*		@access private
-	*		@return boolean
-	*/
+	 *		@access private
+	 *		@return boolean
+	 */
 	private function _set_reg_event() {
 		if ( is_object( $this->_reg_event )) {
 			return TRUE;
@@ -2378,9 +2378,9 @@ 
 
 	/**
 	 * 		generates HTML for the Attendee Contact List
-	*		@access protected
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@return void
+	 */
 	protected function _attendee_contact_list_table() {
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
 		$this->_search_btn_label = __('Contacts', 'event_espresso');
@@ -2394,9 +2394,9 @@ 
 	/**
 	 * 		get_attendees
 	 * 		@param bool $count whether to return count or data.
-	*		@access public
-	*		@return array
-	*/
+	 *		@access public
+	 *		@return array
+	 */
 	public function get_attendees( $per_page, $count = FALSE, $trash = FALSE ) {
 
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
@@ -2728,9 +2728,9 @@ 
 
 	/**
 	 * 		_attendee_details
-	*		@access protected
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@return void
+	 */
 	public function attendee_registrations_meta_box( $post ) {
 
 		$this->_template_args['attendee'] = $this->_cpt_model_obj;
@@ -2763,10 +2763,10 @@ 
 
 	/**
 	 * 		_trash_or_restore_attendee
-	*		@param boolean 		$trash - whether to move item to trash (TRUE) or restore it (FALSE)
-	*		@access protected
-	*		@return void
-	*/
+	 *		@param boolean 		$trash - whether to move item to trash (TRUE) or restore it (FALSE)
+	 *		@access protected
+	 *		@return void
+	 */
 	protected function _trash_or_restore_attendees( $trash = TRUE ) {
 
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );

Spacing +558 added lines, -558 removed lines

@@ -56,26 +56,26 @@ 
 	 * @param bool $routing
 	 * @return Registrations_Admin_Page
 	 */
-	public function __construct( $routing = TRUE ) {
-		parent::__construct( $routing );
-		add_action( 'wp_loaded', array( $this, 'wp_loaded' ));
+	public function __construct($routing = TRUE) {
+		parent::__construct($routing);
+		add_action('wp_loaded', array($this, 'wp_loaded'));
 	}
 
 
 
 	public function wp_loaded() {
 		// when adding a new registration...
-		if ( isset( $this->_req_data[ 'action' ] ) && $this->_req_data[ 'action' ] == 'new_registration' ) {
+		if (isset($this->_req_data['action']) && $this->_req_data['action'] == 'new_registration') {
 			EE_System::do_not_cache();
 			if (
-				! isset( $this->_req_data[ 'processing_registration' ] )
-				|| absint( $this->_req_data[ 'processing_registration' ] ) !== 1
+				! isset($this->_req_data['processing_registration'])
+				|| absint($this->_req_data['processing_registration']) !== 1
 			) {
 				// and it's NOT the attendee information reg step
 				// force cookie expiration by setting time to last week
-				setcookie( 'ee_registration_added', 0, time() - WEEK_IN_SECONDS, '/' );
+				setcookie('ee_registration_added', 0, time() - WEEK_IN_SECONDS, '/');
 				// and update the global
-				$_COOKIE[ 'ee_registration_added' ] = 0;
+				$_COOKIE['ee_registration_added'] = 0;
 			}
 		}
 	}
@@ -109,16 +109,16 @@ 
 				'trash' => 'post.php'
 			);
 
-		add_action('edit_form_after_title', array($this, 'after_title_form_fields'), 10 );
+		add_action('edit_form_after_title', array($this, 'after_title_form_fields'), 10);
 		//add filters so that the comment urls don't take users to a confusing 404 page
-		add_filter('get_comment_link', array( $this, 'clear_comment_link' ), 10, 3 );
+		add_filter('get_comment_link', array($this, 'clear_comment_link'), 10, 3);
 	}
 
 
-	public function clear_comment_link( $link, $comment, $args ) {
+	public function clear_comment_link($link, $comment, $args) {
 		//gotta make sure this only happens on this route
-		$post_type = get_post_type( $comment->comment_post_ID);
-		if ( $post_type == 'espresso_attendees' )
+		$post_type = get_post_type($comment->comment_post_ID);
+		if ($post_type == 'espresso_attendees')
 			return '#commentsdiv';
 		return $link;
 	}
@@ -126,7 +126,7 @@ 
 
 	protected function _ajax_hooks() {
 		//todo: all hooks for registrations ajax goes in here
-		add_action( 'wp_ajax_toggle_checkin_status', array( $this, 'toggle_checkin_status' ));
+		add_action('wp_ajax_toggle_checkin_status', array($this, 'toggle_checkin_status'));
 	}
 
 
@@ -141,8 +141,8 @@ 
 				'add-attendee' => __('Add Contact', 'event_espresso'),
 				'edit' => __('Edit Contact', 'event_espresso'),
 				'report'=>  __("Event Registrations CSV Report", "event_espresso"),
-				'report_all' => __( 'All Registrations CSV Report', 'event_espresso' ),
-				'contact_list_report' => __( 'Contact List Report', 'event_espresso' ),
+				'report_all' => __('All Registrations CSV Report', 'event_espresso'),
+				'contact_list_report' => __('Contact List Report', 'event_espresso'),
 				'contact_list_export'=>  __("Export Data", "event_espresso"),
 			),
 			'publishbox' => array(
@@ -170,9 +170,9 @@ 
 
 		$this->_get_registration_status_array();
 
-		$reg_id = ! empty( $this->_req_data['_REG_ID'] ) && ! is_array( $this->_req_data['_REG_ID'] ) ? $this->_req_data['_REG_ID'] : 0;
-		$att_id = ! empty( $this->_req_data[ 'ATT_ID' ] ) && ! is_array( $this->_req_data['ATT_ID'] ) ? $this->_req_data['ATT_ID'] : 0;
-		$att_id = ! empty( $this->_req_data['post'] ) && ! is_array( $this->_req_data['post'] ) ? $this->_req_data['post'] : $att_id;
+		$reg_id = ! empty($this->_req_data['_REG_ID']) && ! is_array($this->_req_data['_REG_ID']) ? $this->_req_data['_REG_ID'] : 0;
+		$att_id = ! empty($this->_req_data['ATT_ID']) && ! is_array($this->_req_data['ATT_ID']) ? $this->_req_data['ATT_ID'] : 0;
+		$att_id = ! empty($this->_req_data['post']) && ! is_array($this->_req_data['post']) ? $this->_req_data['post'] : $att_id;
 
 		$this->_page_routes = array(
 
@@ -205,7 +205,7 @@ 
 
 				'restore_registrations' => array(
 					'func' => '_trash_or_restore_registrations',
-					'args' => array( 'trash' => FALSE ),
+					'args' => array('trash' => FALSE),
 					'noheader' => TRUE,
 					'capability' => 'ee_delete_registrations'
 					),
@@ -438,7 +438,7 @@ 
 						'filename' => 'registrations_overview_other'
 					)
                 ),
-				'help_tour' => array( 'Registration_Overview_Help_Tour' ),
+				'help_tour' => array('Registration_Overview_Help_Tour'),
 				'qtips' => array('Registration_List_Table_Tips'),
 				'list_table' => 'EE_Registrations_List_Table',
 				'require_nonce' => FALSE
@@ -450,7 +450,7 @@ 
 					'order' => 15,
 					'url' => isset($this->_req_data['_REG_ID'])
 						? add_query_arg(
-							array('_REG_ID' => $this->_req_data['_REG_ID'] ),
+							array('_REG_ID' => $this->_req_data['_REG_ID']),
 							$this->_current_page_view_url
 						)
 						: $this->_admin_base_url,
@@ -474,8 +474,8 @@ 
 						'filename' => 'registrations_details_registrant_details'
 					)
 				),
-				'help_tour' => array( 'Registration_Details_Help_Tour' ),
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array( '_registration_details_metaboxes' ) ),
+				'help_tour' => array('Registration_Details_Help_Tour'),
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_registration_details_metaboxes')),
 				'require_nonce' => FALSE
 			),
 
@@ -499,7 +499,7 @@ 
 					'order' => 15,
 					'persistent' => FALSE
 				),
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array('_publish_post_box', 'attendee_editor_metaboxes' ) ),
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box', 'attendee_editor_metaboxes')),
 				'require_nonce' => FALSE
 			),
 
@@ -508,7 +508,7 @@ 
 					'label' => __('Edit Contact', 'event_espresso'),
 					'order' => 15,
 					'persistent' => FALSE,
-					'url' => isset($this->_req_data['ATT_ID']) ? add_query_arg(array('ATT_ID' => $this->_req_data['ATT_ID'] ), $this->_current_page_view_url )  : $this->_admin_base_url
+					'url' => isset($this->_req_data['ATT_ID']) ? add_query_arg(array('ATT_ID' => $this->_req_data['ATT_ID']), $this->_current_page_view_url) : $this->_admin_base_url
 				),
 				'metaboxes' => array('attendee_editor_metaboxes'),
 				'require_nonce' => FALSE
@@ -538,7 +538,7 @@ 
 						'filename' => 'registrations_contact_list_other'
 					)
                 ),
-				'help_tour' => array( 'Contact_List_Help_Tour' ),
+				'help_tour' => array('Contact_List_Help_Tour'),
 				'metaboxes' => array(),
 				'require_nonce' => FALSE
 			),
@@ -557,7 +557,7 @@ 
 	protected function _add_screen_options() {}
 	protected function _add_feature_pointers() {}
 	public function admin_init() {
-		EE_Registry::$i18n_js_strings[ 'update_att_qstns' ] = __( 'click "Update Registration Questions" to save your changes', 'event_espresso' );
+		EE_Registry::$i18n_js_strings['update_att_qstns'] = __('click "Update Registration Questions" to save your changes', 'event_espresso');
 	}
 	public function admin_notices() {}
 	public function admin_footer_scripts() {}
@@ -575,7 +575,7 @@ 
 	*		@return void
 	*/
 	private function _get_registration_status_array() {
-		self::$_reg_status = EEM_Registration::reg_status_array( array(), TRUE);
+		self::$_reg_status = EEM_Registration::reg_status_array(array(), TRUE);
 	}
 
 
@@ -598,11 +598,11 @@ 
 	public function load_scripts_styles() {
 		//style
 		//wp_register_style('espresso_attendees', ATT_ASSETS_URL . 'espresso_attendees_admin.css', array(), EVENT_ESPRESSO_VERSION );
-		wp_register_style('espresso_reg', REG_ASSETS_URL . 'espresso_registrations_admin.css', array('ee-admin-css'), EVENT_ESPRESSO_VERSION );
+		wp_register_style('espresso_reg', REG_ASSETS_URL.'espresso_registrations_admin.css', array('ee-admin-css'), EVENT_ESPRESSO_VERSION);
 		wp_enqueue_style('espresso_reg');
 
 		//script
-		wp_register_script('espresso_reg', REG_ASSETS_URL . 'espresso_registrations_admin.js', array('jquery-ui-datepicker', 'jquery-ui-draggable', 'ee_admin_js'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_register_script('espresso_reg', REG_ASSETS_URL.'espresso_registrations_admin.js', array('jquery-ui-datepicker', 'jquery-ui-draggable', 'ee_admin_js'), EVENT_ESPRESSO_VERSION, TRUE);
 		wp_enqueue_script('espresso_reg');
 	}
 
@@ -611,9 +611,9 @@ 
 	public function load_scripts_styles_edit_attendee() {
 		//stuff to only show up on our attendee edit details page.
 		$attendee_details_translations = array(
-			'att_publish_text' => sprintf( __('Created on: <b>%1$s</b>', 'event_espresso'), $this->_cpt_model_obj->get_datetime('ATT_created') )
+			'att_publish_text' => sprintf(__('Created on: <b>%1$s</b>', 'event_espresso'), $this->_cpt_model_obj->get_datetime('ATT_created'))
 			);
-		wp_localize_script( 'espresso_reg', 'ATTENDEE_DETAILS', $attendee_details_translations );
+		wp_localize_script('espresso_reg', 'ATTENDEE_DETAILS', $attendee_details_translations);
 		wp_enqueue_script('jquery-validate');
 	}
 
@@ -622,8 +622,8 @@ 
 		//styles
 		wp_enqueue_style('espresso-ui-theme');
 		//scripts
-		$this->_get_reg_custom_questions_form( $this->_registration->ID() );
-		$this->_reg_custom_questions_form->wp_enqueue_scripts( true );
+		$this->_get_reg_custom_questions_form($this->_registration->ID());
+		$this->_reg_custom_questions_form->wp_enqueue_scripts(true);
 	}
 
 
@@ -633,7 +633,7 @@ 
 
 	public function load_scripts_styles_contact_list() {
 		wp_deregister_style('espresso_reg');
-		wp_register_style('espresso_att', REG_ASSETS_URL . 'espresso_attendees_admin.css', array('ee-admin-css'), EVENT_ESPRESSO_VERSION );
+		wp_register_style('espresso_att', REG_ASSETS_URL.'espresso_attendees_admin.css', array('ee-admin-css'), EVENT_ESPRESSO_VERSION);
 		wp_enqueue_style('espresso_att');
 	}
 
@@ -642,9 +642,9 @@ 
 
 
 	public function load_scripts_styles_new_registration() {
-		wp_register_script( 'ee-spco-for-admin', REG_ASSETS_URL . 'spco_for_admin.js', array('underscore', 'jquery'), EVENT_ESPRESSO_VERSION, TRUE );
+		wp_register_script('ee-spco-for-admin', REG_ASSETS_URL.'spco_for_admin.js', array('underscore', 'jquery'), EVENT_ESPRESSO_VERSION, TRUE);
 		wp_enqueue_script('ee-spco-for-admin');
-		add_filter('FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', '__return_true' );
+		add_filter('FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', '__return_true');
 		EE_Form_Section_Proper::wp_enqueue_scripts();
 		EED_Ticket_Selector::load_tckt_slctr_assets();
 		EE_Datepicker_Input::enqueue_styles_and_scripts();
@@ -671,7 +671,7 @@ 
 		//for notification related bulk actions we need to make sure only active messengers have an option.
 		EED_Messages::set_autoloaders();
 		/** @type EE_Message_Resource_Manager $message_resource_manager */
-		$message_resource_manager = EE_Registry::instance()->load_lib( 'Message_Resource_Manager' );
+		$message_resource_manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
 		$active_mts = $message_resource_manager->list_of_active_message_types();
 		//key= bulk_action_slug, value= message type.
 		$match_array = array(
@@ -684,23 +684,23 @@ 
 
 		/** setup reg status bulk actions **/
 		$def_reg_status_actions['approve_registration'] = __('Approve Registrations', 'event_espresso');
-		if ( in_array( $match_array['approve_registration'], $active_mts ) && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'batch_send_messages' ) ) {
+		if (in_array($match_array['approve_registration'], $active_mts) && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'batch_send_messages')) {
 			$def_reg_status_actions['approve_and_notify_registration'] = __('Approve and Notify Registrations', 'event_espresso');
 		}
 		$def_reg_status_actions['decline_registration'] = __('Decline Registrations', 'event_espresso');
-		if ( in_array( $match_array['decline_registration'], $active_mts ) && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'batch_send_messages' ) ) {
+		if (in_array($match_array['decline_registration'], $active_mts) && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'batch_send_messages')) {
 			$def_reg_status_actions['decline_and_notify_registration'] = __('Decline and Notify Registrations', 'event_espresso');
 		}
 		$def_reg_status_actions['pending_registration'] = __('Set Registrations to Pending Payment', 'event_espresso');
-		if ( in_array( $match_array['pending_registration'], $active_mts ) && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'batch_send_messages' ) ) {
+		if (in_array($match_array['pending_registration'], $active_mts) && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'batch_send_messages')) {
 			$def_reg_status_actions['pending_and_notify_registration'] = __('Set Registrations to Pending Payment and Notify', 'event_espresso');
 		}
 		$def_reg_status_actions['no_approve_registration'] = __('Set Registrations to Not Approved', 'event_espresso');
-		if ( in_array( $match_array['no_approve_registration'], $active_mts ) && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'batch_send_messages' ) ) {
+		if (in_array($match_array['no_approve_registration'], $active_mts) && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'batch_send_messages')) {
 			$def_reg_status_actions['no_approve_and_notify_registration'] = __('Set Registrations to Not Approved and Notify', 'event_espresso');
 		}
 		$def_reg_status_actions['cancel_registration'] = __('Cancel Registrations', 'event_espresso');
-		if ( in_array( $match_array['cancel_registration'], $active_mts ) && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'batch_send_messages' ) ) {
+		if (in_array($match_array['cancel_registration'], $active_mts) && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'batch_send_messages')) {
 			$def_reg_status_actions['cancel_and_notify_registration'] = __('Cancel Registrations and Notify', 'event_espresso');
 		}
 
@@ -709,29 +709,29 @@ 
 				'slug' => 'all',
 				'label' => __('View All Registrations', 'event_espresso'),
 				'count' => 0,
-				'bulk_action' => array_merge( $def_reg_status_actions, array(
+				'bulk_action' => array_merge($def_reg_status_actions, array(
 					'trash_registrations' => __('Trash Registrations', 'event_espresso')
-					) )
+					))
 				),
 			'month' => array(
 				'slug' => 'month',
 				'label' => __('This Month', 'event_espresso'),
 				'count' => 0,
-				'bulk_action' => array_merge( $def_reg_status_actions, array(
+				'bulk_action' => array_merge($def_reg_status_actions, array(
 					'trash_registrations' => __('Trash Registrations', 'event_espresso')
 					))
 				),
 			'today' => array(
 				'slug' => 'today',
-				'label' => sprintf( __('Today - %s', 'event_espresso'), date('M d, Y', current_time('timestamp' ) ) ),
+				'label' => sprintf(__('Today - %s', 'event_espresso'), date('M d, Y', current_time('timestamp'))),
 				'count' => 0,
-				'bulk_action' => array_merge( $def_reg_status_actions,  array(
+				'bulk_action' => array_merge($def_reg_status_actions, array(
 					'trash_registrations' => __('Trash Registrations', 'event_espresso')
 					))
 				)
 			);
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_registrations', 'espresso_registrations_delete_registration' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_registrations', 'espresso_registrations_delete_registration')) {
 			$this->_views['incomplete'] = array(
 				'slug' => 'incomplete',
 				'label' => __('Incomplete', 'event_espresso'),
@@ -767,7 +767,7 @@ 
 				)
 			);
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_contacts', 'espresso_registrations_trash_attendees' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_contacts', 'espresso_registrations_trash_attendees')) {
 			$this->_views['trash'] = array(
 				'slug' => 'trash',
 				'label' => __('Trash', 'event_espresso'),
@@ -806,18 +806,18 @@ 
 				'desc' => __('View Transaction Invoice', 'event_espresso')
 				),
  			);
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'espresso_registrations_resend_registration' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'espresso_registrations_resend_registration')) {
 			$fc_items['resend_registration'] = array(
 				'class' => 'dashicons dashicons-email-alt',
 				'desc' => __('Resend Registration Details', 'event_espresso')
 				);
 		} else {
-			$fc_items['blank'] = array( 'class' => 'blank', 'desc' => '' );
+			$fc_items['blank'] = array('class' => 'blank', 'desc' => '');
 		}
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_global_messages', 'view_filtered_messages' ) ) {
-			$related_for_icon = EEH_MSG_Template::get_message_action_icon( 'see_notifications_for' );
-			if ( isset( $related_for_icon['css_class']) && isset( $related_for_icon['label'] ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_global_messages', 'view_filtered_messages')) {
+			$related_for_icon = EEH_MSG_Template::get_message_action_icon('see_notifications_for');
+			if (isset($related_for_icon['css_class']) && isset($related_for_icon['label'])) {
 				$fc_items['view_related_messages'] = array(
 					'class' => $related_for_icon['css_class'],
 					'desc' => $related_for_icon['label'],
@@ -827,31 +827,31 @@ 
 
 		$sc_items = array(
 			'approved_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_approved,
-				'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_approved, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_approved,
+				'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_approved, FALSE, 'sentence')
 				),
 			'pending_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_pending_payment,
-				'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_pending_payment, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_pending_payment,
+				'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_pending_payment, FALSE, 'sentence')
 				),
 			'incomplete_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_incomplete,
-				'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_incomplete, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_incomplete,
+				'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_incomplete, FALSE, 'sentence')
 			),
 			'not_approved' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_not_approved,
-				'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_not_approved, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_not_approved,
+				'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_not_approved, FALSE, 'sentence')
 				),
 			'declined_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_declined,
-				'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_declined, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_declined,
+				'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_declined, FALSE, 'sentence')
 				),
 			'cancelled_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_cancelled,
-				'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_cancelled, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_cancelled,
+				'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_cancelled, FALSE, 'sentence')
 				)
 			);
-		return array_merge( $fc_items, $sc_items );
+		return array_merge($fc_items, $sc_items);
 	}
 
 
@@ -865,9 +865,9 @@ 
 	 */
 	protected function _registrations_overview_list_table() {
 		$this->_template_args['admin_page_header'] = '';
-		$EVT_ID = ! empty( $this->_req_data['event_id'] ) ? absint( $this->_req_data['event_id'] ) : 0;
-		if ( $EVT_ID ) {
-			if ( EE_Registry::instance()->CAP->current_user_can(
+		$EVT_ID = ! empty($this->_req_data['event_id']) ? absint($this->_req_data['event_id']) : 0;
+		if ($EVT_ID) {
+			if (EE_Registry::instance()->CAP->current_user_can(
 				'ee_edit_registrations',
 				'espresso_registrations_new_registration',
 				$EVT_ID
@@ -876,34 +876,34 @@ 
 				$this->_admin_page_title .= $this->get_action_link_or_button(
 					'new_registration',
 					'add-registrant',
-					array( 'event_id' => $EVT_ID ),
+					array('event_id' => $EVT_ID),
 					'add-new-h2'
 				);
 			}
-			$event = EEM_Event::instance()->get_one_by_ID( $EVT_ID );
-			if ( $event instanceof EE_Event ) {
+			$event = EEM_Event::instance()->get_one_by_ID($EVT_ID);
+			if ($event instanceof EE_Event) {
 				$this->_template_args['admin_page_header'] = sprintf(
-					__( '%s Viewing registrations for the event: %s%s', 'event_espresso' ),
+					__('%s Viewing registrations for the event: %s%s', 'event_espresso'),
 					'<h3 style="line-height:1.5em;">',
-					'<br /><a href="' . EE_Admin_Page::add_query_args_and_nonce(
-						array( 'action' => 'edit', 'post' => $event->ID() ),
+					'<br /><a href="'.EE_Admin_Page::add_query_args_and_nonce(
+						array('action' => 'edit', 'post' => $event->ID()),
 						EVENTS_ADMIN_URL
-					) . '">&nbsp;' . $event->get( 'EVT_name' ) . '&nbsp;</a>&nbsp;',
+					).'">&nbsp;'.$event->get('EVT_name').'&nbsp;</a>&nbsp;',
 					'</h3>'
 				);
 			}
-			$DTT_ID = ! empty( $this->_req_data['datetime_id'] ) ? absint( $this->_req_data['datetime_id'] ) : 0;
-			$datetime = EEM_Datetime::instance()->get_one_by_ID( $DTT_ID );
-			if ( $datetime instanceof EE_Datetime && $this->_template_args['admin_page_header'] !== '' ) {
-				$this->_template_args['admin_page_header'] = substr( $this->_template_args['admin_page_header'], 0, -5 );
+			$DTT_ID = ! empty($this->_req_data['datetime_id']) ? absint($this->_req_data['datetime_id']) : 0;
+			$datetime = EEM_Datetime::instance()->get_one_by_ID($DTT_ID);
+			if ($datetime instanceof EE_Datetime && $this->_template_args['admin_page_header'] !== '') {
+				$this->_template_args['admin_page_header'] = substr($this->_template_args['admin_page_header'], 0, -5);
 				$this->_template_args['admin_page_header'] .= ' &nbsp;<span class="drk-grey-text">';
 				$this->_template_args['admin_page_header'] .= '<span class="dashicons dashicons-calendar"></span>';
 				$this->_template_args['admin_page_header'] .= $datetime->name();
-				$this->_template_args['admin_page_header'] .= ' ( ' . $datetime->start_date() . ' )';
+				$this->_template_args['admin_page_header'] .= ' ( '.$datetime->start_date().' )';
 				$this->_template_args['admin_page_header'] .= '</span></h3>';
 			}
 		}
-		$this->_template_args['after_list_table'] = $this->_display_legend( $this->_registration_legend_items() );
+		$this->_template_args['after_list_table'] = $this->_display_legend($this->_registration_legend_items());
 		$this->display_admin_list_table_page_with_no_sidebar();
 	}
 
@@ -918,19 +918,19 @@ 
 	 */
 	private function _set_registration_object() {
 		//get out if we've already set the object
-		if ( is_object( $this->_registration )) {
+		if (is_object($this->_registration)) {
 			return TRUE;
 		}
 
 	    $REG = EEM_Registration::instance();
 
-		$REG_ID = ( ! empty( $this->_req_data['_REG_ID'] )) ? absint( $this->_req_data['_REG_ID'] ) : FALSE;
+		$REG_ID = ( ! empty($this->_req_data['_REG_ID'])) ? absint($this->_req_data['_REG_ID']) : FALSE;
 
-		if ( $this->_registration = $REG->get_one_by_ID( $REG_ID ))
+		if ($this->_registration = $REG->get_one_by_ID($REG_ID))
 			return TRUE;
 		else {
-			$error_msg = sprintf( __('An error occurred and the details for Registration ID #%s could not be retrieved.', 'event_espresso'), $REG_ID );
-			EE_Error::add_error( $error_msg, __FILE__, __FUNCTION__, __LINE__ );
+			$error_msg = sprintf(__('An error occurred and the details for Registration ID #%s could not be retrieved.', 'event_espresso'), $REG_ID);
+			EE_Error::add_error($error_msg, __FILE__, __FUNCTION__, __LINE__);
 			$this->_registration = NULL;
 			return FALSE;
 		}
@@ -948,25 +948,25 @@ 
 	 * @throws \EE_Error
 	 * @return mixed (int|array)  int = count || array of registration objects
 	 */
-	public function get_registrations( $per_page = 10, $count = FALSE, $this_month = FALSE, $today = FALSE ) {
-		$EVT_ID = ! empty( $this->_req_data['event_id'] ) && $this->_req_data['event_id'] > 0 ? absint( $this->_req_data['event_id'] ) : FALSE;
-		$CAT_ID = ! empty( $this->_req_data['EVT_CAT'] ) && (int) $this->_req_data['EVT_CAT'] > 0? absint( $this->_req_data['EVT_CAT'] ) : FALSE;
-		$DTT_ID = isset( $this->_req_data['datetime_id'] ) ? absint( $this->_req_data['datetime_id'] ) : null;
-		$reg_status = ! empty( $this->_req_data['_reg_status'] ) ? sanitize_text_field( $this->_req_data['_reg_status'] ) : FALSE;
-		$month_range = ! empty( $this->_req_data['month_range'] ) ? sanitize_text_field( $this->_req_data['month_range'] ) : FALSE;//should be like 2013-april
-		$today_a = ! empty( $this->_req_data['status'] ) && $this->_req_data['status'] === 'today' ? TRUE : FALSE;
-		$this_month_a = ! empty( $this->_req_data['status'] ) && $this->_req_data['status'] === 'month' ? TRUE  : FALSE;
+	public function get_registrations($per_page = 10, $count = FALSE, $this_month = FALSE, $today = FALSE) {
+		$EVT_ID = ! empty($this->_req_data['event_id']) && $this->_req_data['event_id'] > 0 ? absint($this->_req_data['event_id']) : FALSE;
+		$CAT_ID = ! empty($this->_req_data['EVT_CAT']) && (int) $this->_req_data['EVT_CAT'] > 0 ? absint($this->_req_data['EVT_CAT']) : FALSE;
+		$DTT_ID = isset($this->_req_data['datetime_id']) ? absint($this->_req_data['datetime_id']) : null;
+		$reg_status = ! empty($this->_req_data['_reg_status']) ? sanitize_text_field($this->_req_data['_reg_status']) : FALSE;
+		$month_range = ! empty($this->_req_data['month_range']) ? sanitize_text_field($this->_req_data['month_range']) : FALSE; //should be like 2013-april
+		$today_a = ! empty($this->_req_data['status']) && $this->_req_data['status'] === 'today' ? TRUE : FALSE;
+		$this_month_a = ! empty($this->_req_data['status']) && $this->_req_data['status'] === 'month' ? TRUE : FALSE;
 		$start_date = FALSE;
 		$end_date = FALSE;
 		$_where = array();
-		$trash = ! empty( $this->_req_data['status'] ) && $this->_req_data['status'] === 'trash' ? TRUE : FALSE;
-		$incomplete = ! empty( $this->_req_data['status'] ) && $this->_req_data['status'] === 'incomplete' ? TRUE : FALSE;
+		$trash = ! empty($this->_req_data['status']) && $this->_req_data['status'] === 'trash' ? TRUE : FALSE;
+		$incomplete = ! empty($this->_req_data['status']) && $this->_req_data['status'] === 'incomplete' ? TRUE : FALSE;
 
 		//set orderby
 		$this->_req_data['orderby'] = ! empty($this->_req_data['orderby']) ? $this->_req_data['orderby'] : '';
 
 
-		switch ( $this->_req_data['orderby'] ) {
+		switch ($this->_req_data['orderby']) {
 			case '_REG_ID':
 				$orderby = 'REG_ID';
 				break;
@@ -986,30 +986,30 @@ 
 				$orderby = 'REG_date';
 		}
 
-		$sort = ( isset( $this->_req_data['order'] ) && ! empty( $this->_req_data['order'] )) ? $this->_req_data['order'] : 'DESC';
-		$current_page = isset( $this->_req_data['paged'] ) && !empty( $this->_req_data['paged'] ) ? $this->_req_data['paged'] : 1;
-		$per_page = isset( $this->_req_data['perpage'] ) && !empty( $this->_req_data['perpage'] ) ? $this->_req_data['perpage'] : $per_page;
+		$sort = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order'] : 'DESC';
+		$current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged']) ? $this->_req_data['paged'] : 1;
+		$per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage']) ? $this->_req_data['perpage'] : $per_page;
 
 
-		$offset = ($current_page-1)*$per_page;
-		$limit = $count  ? NULL : array( $offset, $per_page );
+		$offset = ($current_page - 1) * $per_page;
+		$limit = $count ? NULL : array($offset, $per_page);
 
-		if($EVT_ID){
-			$_where['EVT_ID']=$EVT_ID;
+		if ($EVT_ID) {
+			$_where['EVT_ID'] = $EVT_ID;
 		}
-		if($CAT_ID){
+		if ($CAT_ID) {
 			$_where['Event.Term_Taxonomy.term_id'] = $CAT_ID;
 		}
 		//if DTT is included we filter by that datetime.
-		if ( $DTT_ID ) {
+		if ($DTT_ID) {
 			$_where['Ticket.Datetime.DTT_ID'] = $DTT_ID;
 		}
-		if ( $incomplete ) {
+		if ($incomplete) {
 			$_where['STS_ID'] = EEM_Registration::status_id_incomplete;
 		} else if ( ! $trash) {
-			$_where['STS_ID'] = array( '!=', EEM_Registration::status_id_incomplete );
+			$_where['STS_ID'] = array('!=', EEM_Registration::status_id_incomplete);
 		}
-		if($reg_status){
+		if ($reg_status) {
 			$_where['STS_ID'] = $reg_status;
 		}
 
@@ -1021,103 +1021,103 @@ 
 		$time_start = ' 00:00:00';
 		$time_end = ' 23:59:59';
 
-		if($today_a || $today ){
+		if ($today_a || $today) {
 			$curdate = date('Y-m-d', current_time('timestamp'));
-			$_where['REG_date']= array('BETWEEN',
+			$_where['REG_date'] = array('BETWEEN',
 				array(
-					EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $curdate . $time_start, 'Y-m-d H:i:s' ),
-					EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $curdate . $time_end, 'Y-m-d H:i:s' ),
+					EEM_Registration::instance()->convert_datetime_for_query('REG_date', $curdate.$time_start, 'Y-m-d H:i:s'),
+					EEM_Registration::instance()->convert_datetime_for_query('REG_date', $curdate.$time_end, 'Y-m-d H:i:s'),
 			));
-		}elseif($this_month_a || $this_month){
+		}elseif ($this_month_a || $this_month) {
 			$this_month_r = date('m', current_time('timestamp'));
-			$days_this_month = date( 't', current_time('timestamp') );
-			$_where['REG_date']= array('BETWEEN',
+			$days_this_month = date('t', current_time('timestamp'));
+			$_where['REG_date'] = array('BETWEEN',
 				array(
-					EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $this_year_r . '-' . $this_month_r . '-01' . ' ' . $time_start, 'Y-m-d H:i:s' ),
-					EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $this_year_r . '-' . $this_month_r . '-' . $days_this_month . ' ' . $time_end, 'Y-m-d H:i:s' )
+					EEM_Registration::instance()->convert_datetime_for_query('REG_date', $this_year_r.'-'.$this_month_r.'-01'.' '.$time_start, 'Y-m-d H:i:s'),
+					EEM_Registration::instance()->convert_datetime_for_query('REG_date', $this_year_r.'-'.$this_month_r.'-'.$days_this_month.' '.$time_end, 'Y-m-d H:i:s')
 			));
-		}elseif($month_range){
+		}elseif ($month_range) {
 			$pieces = explode(' ', $this->_req_data['month_range'], 3);
-			$month_r = !empty($pieces[0]) ? date('m', strtotime( $month_range ) ) : '';
-			$year_r = !empty($pieces[1]) ? $pieces[1] : '';
-			$days_in_month = date('t', strtotime($year_r .  '-' . $month_r . '-' . '01') );
-			$_where['REG_date']= array('BETWEEN',
-				array(  EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $year_r . '-' . $month_r . '-01 00:00:00', 'Y-m-d H:i:s'), EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $year_r . '-' . $month_r . '-' . $days_in_month .  ' 23:59:59', 'Y-m-d H:i:s' ) ) );
-		}elseif($start_date && $end_date){
+			$month_r = ! empty($pieces[0]) ? date('m', strtotime($month_range)) : '';
+			$year_r = ! empty($pieces[1]) ? $pieces[1] : '';
+			$days_in_month = date('t', strtotime($year_r.'-'.$month_r.'-'.'01'));
+			$_where['REG_date'] = array('BETWEEN',
+				array(EEM_Registration::instance()->convert_datetime_for_query('REG_date', $year_r.'-'.$month_r.'-01 00:00:00', 'Y-m-d H:i:s'), EEM_Registration::instance()->convert_datetime_for_query('REG_date', $year_r.'-'.$month_r.'-'.$days_in_month.' 23:59:59', 'Y-m-d H:i:s')));
+		}elseif ($start_date && $end_date) {
 			throw new EE_Error("not yet supported");
-		}elseif($start_date){
+		}elseif ($start_date) {
 			throw new EE_Error("not yet supported");
-		}elseif($end_date){
+		}elseif ($end_date) {
 			throw new EE_Error("not yet supported");
 		}
 
-		if ( ! empty( $this->_req_data['s'] ) ) {
-			$sstr = '%' . $this->_req_data['s'] . '%';
+		if ( ! empty($this->_req_data['s'])) {
+			$sstr = '%'.$this->_req_data['s'].'%';
 			$_where['OR'] = array(
-				'Event.EVT_name' => array( 'LIKE', $sstr),
-				'Event.EVT_desc' => array( 'LIKE', $sstr ),
-				'Event.EVT_short_desc' => array( 'LIKE' , $sstr ),
-				'Attendee.ATT_full_name' => array( 'LIKE', $sstr ),
-				'Attendee.ATT_fname' => array( 'LIKE', $sstr ),
-				'Attendee.ATT_lname' => array( 'LIKE', $sstr ),
-				'Attendee.ATT_short_bio' => array( 'LIKE', $sstr ),
-				'Attendee.ATT_email' => array('LIKE', $sstr ),
-				'Attendee.ATT_address' => array( 'LIKE', $sstr ),
-				'Attendee.ATT_address2' => array( 'LIKE', $sstr ),
-				'Attendee.ATT_city' => array( 'LIKE', $sstr ),
-				'REG_final_price' => array( 'LIKE', $sstr ),
-				'REG_code' => array( 'LIKE', $sstr ),
-				'REG_count' => array( 'LIKE' , $sstr ),
-				'REG_group_size' => array( 'LIKE' , $sstr ),
-				'Ticket.TKT_name' => array( 'LIKE', $sstr ),
-				'Ticket.TKT_description' => array( 'LIKE', $sstr ),
-				'Transaction.Payment.PAY_txn_id_chq_nmbr' => array( 'LIKE', $sstr )
+				'Event.EVT_name' => array('LIKE', $sstr),
+				'Event.EVT_desc' => array('LIKE', $sstr),
+				'Event.EVT_short_desc' => array('LIKE', $sstr),
+				'Attendee.ATT_full_name' => array('LIKE', $sstr),
+				'Attendee.ATT_fname' => array('LIKE', $sstr),
+				'Attendee.ATT_lname' => array('LIKE', $sstr),
+				'Attendee.ATT_short_bio' => array('LIKE', $sstr),
+				'Attendee.ATT_email' => array('LIKE', $sstr),
+				'Attendee.ATT_address' => array('LIKE', $sstr),
+				'Attendee.ATT_address2' => array('LIKE', $sstr),
+				'Attendee.ATT_city' => array('LIKE', $sstr),
+				'REG_final_price' => array('LIKE', $sstr),
+				'REG_code' => array('LIKE', $sstr),
+				'REG_count' => array('LIKE', $sstr),
+				'REG_group_size' => array('LIKE', $sstr),
+				'Ticket.TKT_name' => array('LIKE', $sstr),
+				'Ticket.TKT_description' => array('LIKE', $sstr),
+				'Transaction.Payment.PAY_txn_id_chq_nmbr' => array('LIKE', $sstr)
 			);
 		}
 
 		//capability checks
-		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'get_registrations' ) ) {
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'get_registrations')) {
 			$_where['AND'] = array(
 				'Event.EVT_wp_user' => get_current_user_id()
 				);
 		}
 
-		if( $count ){
-			if ( $trash ) {
-				return EEM_Registration::instance()->count_deleted( array( $_where ));
-			} else if ( $incomplete ) {
-				return EEM_Registration::instance()->count( array( $_where ));
+		if ($count) {
+			if ($trash) {
+				return EEM_Registration::instance()->count_deleted(array($_where));
+			} else if ($incomplete) {
+				return EEM_Registration::instance()->count(array($_where));
 			} else {
-				return EEM_Registration::instance()->count( array( $_where, 'default_where_conditions' => 'this_model_only' ));
+				return EEM_Registration::instance()->count(array($_where, 'default_where_conditions' => 'this_model_only'));
 			}
 		} else {
 			//make sure we remove default where conditions cause all registrations matching query are returned
-			$query_params = array( $_where, 'order_by' => array( $orderby => $sort ), 'default_where_conditions' => 'this_model_only' );
-			if ( $per_page !== -1 ) {
+			$query_params = array($_where, 'order_by' => array($orderby => $sort), 'default_where_conditions' => 'this_model_only');
+			if ($per_page !== -1) {
 				$query_params['limit'] = $limit;
 			}
-			$registrations =  $trash ? EEM_Registration::instance()->get_all_deleted($query_params) : EEM_Registration::instance()->get_all($query_params);
+			$registrations = $trash ? EEM_Registration::instance()->get_all_deleted($query_params) : EEM_Registration::instance()->get_all($query_params);
 
-			if ( $EVT_ID && isset( $registrations[0] ) && $registrations[0] instanceof EE_Registration &&  $registrations[0]->event_obj()) {
+			if ($EVT_ID && isset($registrations[0]) && $registrations[0] instanceof EE_Registration && $registrations[0]->event_obj()) {
 				$first_registration = $registrations[0];
 				//EEH_Debug_Tools::printr( $registrations[0], '$registrations  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 				$event_name = $first_registration->event_obj()->name();
-				$event_date = $first_registration->date_obj()->start_date_and_time('l F j, Y,', 'g:i:s a');// isset( $registrations[0]->DTT_EVT_start ) ? date( 'l F j, Y,    g:i:s a', $registrations[0]->DTT_EVT_start ) : '';
+				$event_date = $first_registration->date_obj()->start_date_and_time('l F j, Y,', 'g:i:s a'); // isset( $registrations[0]->DTT_EVT_start ) ? date( 'l F j, Y,    g:i:s a', $registrations[0]->DTT_EVT_start ) : '';
 				// edit event link
-				if ( $event_name != '' ) {
-					$edit_event_url = self::add_query_args_and_nonce( array( 'action'=>'edit_event', 'EVT_ID'=>$EVT_ID ), EVENTS_ADMIN_URL );
-					$edit_event_lnk = '<a href="'.$edit_event_url.'" title="' . esc_attr__( 'Edit ', 'event_espresso' ) . $event_name . '">' . __( 'Edit Event', 'event_espresso' ) . '</a>';
-					$event_name .= ' <span class="admin-page-header-edit-lnk not-bold">' . $edit_event_lnk . '</span>' ;
+				if ($event_name != '') {
+					$edit_event_url = self::add_query_args_and_nonce(array('action'=>'edit_event', 'EVT_ID'=>$EVT_ID), EVENTS_ADMIN_URL);
+					$edit_event_lnk = '<a href="'.$edit_event_url.'" title="'.esc_attr__('Edit ', 'event_espresso').$event_name.'">'.__('Edit Event', 'event_espresso').'</a>';
+					$event_name .= ' <span class="admin-page-header-edit-lnk not-bold">'.$edit_event_lnk.'</span>';
 				}
 
-				$back_2_reg_url = self::add_query_args_and_nonce( array( 'action'=>'default' ), REG_ADMIN_URL );
-				$back_2_reg_lnk = '<a href="'.$back_2_reg_url.'" title="' . esc_attr__( 'click to return to viewing all registrations ', 'event_espresso' ) . '">&laquo; ' . __( 'Back to All Registrations', 'event_espresso' ) . '</a>';
+				$back_2_reg_url = self::add_query_args_and_nonce(array('action'=>'default'), REG_ADMIN_URL);
+				$back_2_reg_lnk = '<a href="'.$back_2_reg_url.'" title="'.esc_attr__('click to return to viewing all registrations ', 'event_espresso').'">&laquo; '.__('Back to All Registrations', 'event_espresso').'</a>';
 
 				$this->_template_args['before_admin_page_content'] = '
 			<div id="admin-page-header">
-				<h1><span class="small-text not-bold">'.__( 'Event: ', 'event_espresso' ).'</span>'. $event_name .'</h1>
-				<h3><span class="small-text not-bold">'.__( 'Date: ', 'event_espresso' ). '</span>'. $event_date .'</h3>
-				<span class="admin-page-header-go-back-lnk not-bold">' . $back_2_reg_lnk . '</span>
+				<h1><span class="small-text not-bold">'.__('Event: ', 'event_espresso').'</span>'.$event_name.'</h1>
+				<h3><span class="small-text not-bold">'.__('Date: ', 'event_espresso').'</span>'.$event_date.'</h3>
+				<span class="admin-page-header-go-back-lnk not-bold">' . $back_2_reg_lnk.'</span>
 			</div>
 			';
 
@@ -1155,7 +1155,7 @@ 
 
 		$this->_set_registration_object();
 
-		if ( is_object( $this->_registration )) {
+		if (is_object($this->_registration)) {
 			$transaction = $this->_registration->transaction() ? $this->_registration->transaction() : EE_Transaction::new_instance();
 			$this->_session = $transaction->session_data();
 
@@ -1163,10 +1163,10 @@ 
 
 
 			$this->_template_args['reg_nmbr']['value'] = $this->_registration->ID();
-			$this->_template_args['reg_nmbr']['label'] = __( 'Registration Number', 'event_espresso' );
+			$this->_template_args['reg_nmbr']['label'] = __('Registration Number', 'event_espresso');
 
-			$this->_template_args['reg_datetime']['value'] =  $this->_registration->get_i18n_datetime( 'REG_date' );
-			$this->_template_args['reg_datetime']['label'] = __( 'Date', 'event_espresso' );
+			$this->_template_args['reg_datetime']['value'] = $this->_registration->get_i18n_datetime('REG_date');
+			$this->_template_args['reg_datetime']['label'] = __('Date', 'event_espresso');
 
 			$this->_template_args['grand_total'] = $transaction->total();
 
@@ -1174,19 +1174,19 @@ 
 			// link back to overview
 			$this->_template_args['reg_overview_url'] = REG_ADMIN_URL;
 			$this->_template_args['registration'] = $this->_registration;
-			$this->_template_args['filtered_registrations_link'] = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'default', 'event_id' => $event_id ), REG_ADMIN_URL );
-			$this->_template_args['filtered_transactions_link'] = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'default', 'EVT_ID' => $event_id, 'page' => 'espresso_transactions' ), admin_url( 'admin.php' ) );
-			$this->_template_args['event_link'] = EE_Admin_Page::add_query_args_and_nonce( array( 'page' => 'espresso_events', 'action' => 'edit', 'post' => $event_id ), admin_url( 'admin.php' ) );
+			$this->_template_args['filtered_registrations_link'] = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'default', 'event_id' => $event_id), REG_ADMIN_URL);
+			$this->_template_args['filtered_transactions_link'] = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'default', 'EVT_ID' => $event_id, 'page' => 'espresso_transactions'), admin_url('admin.php'));
+			$this->_template_args['event_link'] = EE_Admin_Page::add_query_args_and_nonce(array('page' => 'espresso_events', 'action' => 'edit', 'post' => $event_id), admin_url('admin.php'));
 
 			//next and previous links
-			$next_reg = $this->_registration->next(null, array(), 'REG_ID' );
-			$this->_template_args['next_registration'] = $next_reg ? $this->_next_link( EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'view_registration', '_REG_ID' => $next_reg['REG_ID'] ), REG_ADMIN_URL ), 'dashicons dashicons-arrow-right ee-icon-size-22' ) : '';
-			$previous_reg = $this->_registration->previous( null, array(), 'REG_ID' );
-			$this->_template_args['previous_registration'] = $previous_reg ? $this->_previous_link( EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'view_registration', '_REG_ID' => $previous_reg['REG_ID'] ), REG_ADMIN_URL ), 'dashicons dashicons-arrow-left ee-icon-size-22' ) : '';
+			$next_reg = $this->_registration->next(null, array(), 'REG_ID');
+			$this->_template_args['next_registration'] = $next_reg ? $this->_next_link(EE_Admin_Page::add_query_args_and_nonce(array('action' => 'view_registration', '_REG_ID' => $next_reg['REG_ID']), REG_ADMIN_URL), 'dashicons dashicons-arrow-right ee-icon-size-22') : '';
+			$previous_reg = $this->_registration->previous(null, array(), 'REG_ID');
+			$this->_template_args['previous_registration'] = $previous_reg ? $this->_previous_link(EE_Admin_Page::add_query_args_and_nonce(array('action' => 'view_registration', '_REG_ID' => $previous_reg['REG_ID']), REG_ADMIN_URL), 'dashicons dashicons-arrow-left ee-icon-size-22') : '';
 
 			// grab header
-			$template_path = REG_TEMPLATE_PATH . 'reg_admin_details_header.template.php';
-			$this->_template_args['admin_page_header'] = EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
+			$template_path = REG_TEMPLATE_PATH.'reg_admin_details_header.template.php';
+			$this->_template_args['admin_page_header'] = EEH_Template::display_template($template_path, $this->_template_args, TRUE);
 
 		} else {
 
@@ -1205,17 +1205,17 @@ 
 
 
 	protected function _registration_details_metaboxes() {
-		do_action( 'AHEE__Registrations_Admin_Page___registration_details_metabox__start', $this );
+		do_action('AHEE__Registrations_Admin_Page___registration_details_metabox__start', $this);
 		$this->_set_registration_object();
 		$attendee = $this->_registration instanceof EE_Registration ? $this->_registration->attendee() : null;
-		add_meta_box( 'edit-reg-status-mbox', __( 'Registration Status', 'event_espresso' ), array( $this, 'set_reg_status_buttons_metabox' ), $this->wp_page_slug, 'normal', 'high' );
-		add_meta_box( 'edit-reg-details-mbox', __( 'Registration Details', 'event_espresso' ), array( $this, '_reg_details_meta_box' ), $this->wp_page_slug, 'normal', 'high' );
-		if ( $attendee instanceof EE_Attendee && EE_Registry::instance()->CAP->current_user_can('ee_edit_registration', 'edit-reg-questions-mbox' ) ) {
-			add_meta_box( 'edit-reg-questions-mbox', __( 'Registration Form Answers', 'event_espresso' ), array( $this, '_reg_questions_meta_box' ), $this->wp_page_slug, 'normal', 'high' );
+		add_meta_box('edit-reg-status-mbox', __('Registration Status', 'event_espresso'), array($this, 'set_reg_status_buttons_metabox'), $this->wp_page_slug, 'normal', 'high');
+		add_meta_box('edit-reg-details-mbox', __('Registration Details', 'event_espresso'), array($this, '_reg_details_meta_box'), $this->wp_page_slug, 'normal', 'high');
+		if ($attendee instanceof EE_Attendee && EE_Registry::instance()->CAP->current_user_can('ee_edit_registration', 'edit-reg-questions-mbox')) {
+			add_meta_box('edit-reg-questions-mbox', __('Registration Form Answers', 'event_espresso'), array($this, '_reg_questions_meta_box'), $this->wp_page_slug, 'normal', 'high');
 		}
-		add_meta_box( 'edit-reg-registrant-mbox', __( 'Contact Details', 'event_espresso' ), array( $this, '_reg_registrant_side_meta_box' ), $this->wp_page_slug, 'side', 'high' );
-		if ( $this->_registration->group_size() > 1 ) {
-			add_meta_box( 'edit-reg-attendees-mbox', __( 'Other Registrations in this Transaction', 'event_espresso' ), array( $this, '_reg_attendees_meta_box' ), $this->wp_page_slug, 'normal', 'high' );
+		add_meta_box('edit-reg-registrant-mbox', __('Contact Details', 'event_espresso'), array($this, '_reg_registrant_side_meta_box'), $this->wp_page_slug, 'side', 'high');
+		if ($this->_registration->group_size() > 1) {
+			add_meta_box('edit-reg-attendees-mbox', __('Other Registrations in this Transaction', 'event_espresso'), array($this, '_reg_attendees_meta_box'), $this->wp_page_slug, 'normal', 'high');
 		}
 	}
 
@@ -1234,22 +1234,22 @@ 
 		$is_complete = $this->_registration->transaction()->is_completed();
 		//let's get an array of all possible buttons that we can just reference
 		$status_buttons = $this->_get_reg_status_buttons();
-		$template_args[ 'reg_status_value' ] = $this->_registration->pretty_status();
-		$template_args[ 'reg_status_class' ] = 'status-' . $this->_registration->status_ID();
+		$template_args['reg_status_value'] = $this->_registration->pretty_status();
+		$template_args['reg_status_class'] = 'status-'.$this->_registration->status_ID();
 		$template_args['attendee'] = $this->_registration->attendee();
-		$template = REG_TEMPLATE_PATH . 'reg_status_change_buttons.template.php';
-		if ( $this->_set_registration_object() ) {
+		$template = REG_TEMPLATE_PATH.'reg_status_change_buttons.template.php';
+		if ($this->_set_registration_object()) {
 			$current_status = $this->_registration->status_ID();
-			unset( $status_buttons[$current_status] );
-			if ( $current_status != EEM_Registration::status_id_pending_payment && $is_complete ) {
-				unset( $status_buttons[EEM_Registration::status_id_pending_payment] );
+			unset($status_buttons[$current_status]);
+			if ($current_status != EEM_Registration::status_id_pending_payment && $is_complete) {
+				unset($status_buttons[EEM_Registration::status_id_pending_payment]);
 			}
-			$template_args['status_buttons'] = implode( "\n", $status_buttons );
+			$template_args['status_buttons'] = implode("\n", $status_buttons);
 		}
 		$template_args['form_url'] = REG_ADMIN_URL;
 		$template_args['REG_ID'] = $this->_registration->ID();
-		$template_args['nonce'] = wp_nonce_field( 'change_reg_status_nonce',  'change_reg_status_nonce', FALSE, FALSE );
-		EEH_Template::display_template( $template, $template_args );
+		$template_args['nonce'] = wp_nonce_field('change_reg_status_nonce', 'change_reg_status_nonce', FALSE, FALSE);
+		EEH_Template::display_template($template, $template_args);
 
 	}
 
@@ -1263,11 +1263,11 @@ 
 	private function _get_reg_status_buttons() {
 
 		$buttons = array(
-			EEM_Registration::status_id_approved => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-' . EEM_Registration::status_id_approved . '" value="' . EEH_Template::pretty_status( EEM_Registration::status_id_approved, FALSE, 'sentence' ) . '">',
-			EEM_Registration::status_id_pending_payment => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-' . EEM_Registration::status_id_pending_payment . '" value="' . EEH_Template::pretty_status( EEM_Registration::status_id_pending_payment, FALSE, 'sentence' ) . '">',
-			EEM_Registration::status_id_not_approved => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-' . EEM_Registration::status_id_not_approved . '" value="' . EEH_Template::pretty_status( EEM_Registration::status_id_not_approved, FALSE, 'sentence' ) . '">',
-			EEM_Registration::status_id_declined => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-' . EEM_Registration::status_id_declined . '" value="' . EEH_Template::pretty_status( EEM_Registration::status_id_declined, FALSE, 'sentence' ) . '">',
-			EEM_Registration::status_id_cancelled =>'<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-' . EEM_Registration::status_id_cancelled . '" value="' . EEH_Template::pretty_status( EEM_Registration::status_id_cancelled, FALSE, 'sentence' ) . '">',
+			EEM_Registration::status_id_approved => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-'.EEM_Registration::status_id_approved.'" value="'.EEH_Template::pretty_status(EEM_Registration::status_id_approved, FALSE, 'sentence').'">',
+			EEM_Registration::status_id_pending_payment => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-'.EEM_Registration::status_id_pending_payment.'" value="'.EEH_Template::pretty_status(EEM_Registration::status_id_pending_payment, FALSE, 'sentence').'">',
+			EEM_Registration::status_id_not_approved => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-'.EEM_Registration::status_id_not_approved.'" value="'.EEH_Template::pretty_status(EEM_Registration::status_id_not_approved, FALSE, 'sentence').'">',
+			EEM_Registration::status_id_declined => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-'.EEM_Registration::status_id_declined.'" value="'.EEH_Template::pretty_status(EEM_Registration::status_id_declined, FALSE, 'sentence').'">',
+			EEM_Registration::status_id_cancelled =>'<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-'.EEM_Registration::status_id_cancelled.'" value="'.EEH_Template::pretty_status(EEM_Registration::status_id_cancelled, FALSE, 'sentence').'">',
 			);
 		return $buttons;
 	}
@@ -1281,13 +1281,13 @@ 
 	 *
 	 * @return array  (array with reg_id(s) updated and whether update was successful.
 	 */
-	protected function _set_registration_status_from_request( $status = false, $notify = false ) {
-		$REG_ID = isset( $this->_req_data['_REG_ID'] ) ? (array) $this->_req_data['_REG_ID'] : array();
+	protected function _set_registration_status_from_request($status = false, $notify = false) {
+		$REG_ID = isset($this->_req_data['_REG_ID']) ? (array) $this->_req_data['_REG_ID'] : array();
 
-		$success = $this->_set_registration_status( $REG_ID, $status );
+		$success = $this->_set_registration_status($REG_ID, $status);
 
 		//notify?
-		if ( $success && $notify && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'espresso_registrations_resend_registration' ) ) {
+		if ($success && $notify && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'espresso_registrations_resend_registration')) {
 			$this->_process_resend_registration();
 		}
 
@@ -1305,19 +1305,19 @@ 
 	 * @param bool $status
 	 * @return array (an array with 'success' key representing whether status change was successful, and 'REG_ID' as the array of updated registrations).
 	 */
-	protected function _set_registration_status( $REG_ID, $status = false ) {
+	protected function _set_registration_status($REG_ID, $status = false) {
 		$success = true;
 		// set default status if none is passed
 		$status = $status ? $status : EEM_Registration::status_id_pending_payment;
 
 		//typecast and sanitize reg_id
-		$reg_ids = array_filter( (array) $REG_ID, 'absint' );
+		$reg_ids = array_filter((array) $REG_ID, 'absint');
 
 		//loop through REG_ID's and change status
-		foreach ( $reg_ids as $r_id ) {
-			$registration = EEM_Registration::instance()->get_one_by_ID( $r_id );
-			if ( $registration instanceof EE_Registration ) {
-				$registration->set_status( $status );
+		foreach ($reg_ids as $r_id) {
+			$registration = EEM_Registration::instance()->get_one_by_ID($r_id);
+			if ($registration instanceof EE_Registration) {
+				$registration->set_status($status);
 				$result = $registration->save();
 
 				//verifying explicit fails because update *may* just return 0 for 0 rows affected
@@ -1329,7 +1329,7 @@ 
 		$this->_req_data['_REG_ID'] = $reg_ids;
 
 		//return $success and processed registrations
-		return array( 'REG_ID' => $reg_ids, 'success' => $success );
+		return array('REG_ID' => $reg_ids, 'success' => $success);
 	}
 
 
@@ -1341,37 +1341,37 @@ 
 	 * @param   bool    $notify indicates whether the _set_registration_status_from_request does notifications or not.
 	 * @return void
 	 */
-	protected function _reg_status_change_return( $STS_ID, $notify = false ) {
+	protected function _reg_status_change_return($STS_ID, $notify = false) {
 
-		$result = ! empty( $STS_ID ) ? $this->_set_registration_status_from_request( $STS_ID, $notify ) : array( 'success' => false );
+		$result = ! empty($STS_ID) ? $this->_set_registration_status_from_request($STS_ID, $notify) : array('success' => false);
 
 
-		$success = isset( $result['success'] ) && $result['success'];
+		$success = isset($result['success']) && $result['success'];
 
 		//setup success message
-		if ( $success ) {
-			$msg = is_array( $result['REG_ID'] ) && count( $result['REG_ID'] ) > 1  ? sprintf( __('Registration status has been set to %s', 'event_espresso'), EEH_Template::pretty_status($STS_ID, false, 'lower' ) ) :  sprintf( __('Registrations have been set to %s.', 'event_espresso'), EEH_Template::pretty_status($STS_ID, false, 'lower' ) ) ;
-			EE_Error::add_success( $msg );
+		if ($success) {
+			$msg = is_array($result['REG_ID']) && count($result['REG_ID']) > 1 ? sprintf(__('Registration status has been set to %s', 'event_espresso'), EEH_Template::pretty_status($STS_ID, false, 'lower')) : sprintf(__('Registrations have been set to %s.', 'event_espresso'), EEH_Template::pretty_status($STS_ID, false, 'lower'));
+			EE_Error::add_success($msg);
 		} else {
-			EE_Error::add_error( __('Something went wrong, and the status was not changed', 'event_espresso' ), __FILE__, __LINE__, __FUNCTION__ );
+			EE_Error::add_error(__('Something went wrong, and the status was not changed', 'event_espresso'), __FILE__, __LINE__, __FUNCTION__);
 		}
 
-		$route = isset( $this->_req_data['return'] ) && $this->_req_data['return'] == 'view_registration' ? array( 'action' => 'view_registration', '_REG_ID' => $result['REG_ID'][0] ) : array( 'action' => 'default' );
+		$route = isset($this->_req_data['return']) && $this->_req_data['return'] == 'view_registration' ? array('action' => 'view_registration', '_REG_ID' => $result['REG_ID'][0]) : array('action' => 'default');
 		//unset nonces
-		foreach ( $this->_req_data as $ref => $value ) {
-			if ( strpos( $ref, 'nonce' ) !== false ) {
-				unset( $this->_req_data[$ref] );
+		foreach ($this->_req_data as $ref => $value) {
+			if (strpos($ref, 'nonce') !== false) {
+				unset($this->_req_data[$ref]);
 				continue;
 			}
 
-			$value = is_array( $value ) ? array_map( 'urlencode', $value ) : urlencode( $value );
+			$value = is_array($value) ? array_map('urlencode', $value) : urlencode($value);
 			$this->_req_data[$ref] = $value;
 		}
 
 		//merge request vars so that the reloaded list table contains any existing filter query params
-		$route = array_merge( $this->_req_data, $route );
+		$route = array_merge($this->_req_data, $route);
 
-		$this->_redirect_after_action( false, '', '', $route, true );
+		$this->_redirect_after_action(false, '', '', $route, true);
 	}
 
 
@@ -1383,29 +1383,29 @@ 
 	protected function _change_reg_status() {
 		$this->_req_data['return'] = 'view_registration';
 		//set notify based on whether the send notifications toggle is set or not
-		$notify = ! empty( $this->_req_data['txn_reg_status_change']['send_notifications'] );
-		$this->_req_data[ '_reg_status_id' ] = isset( $this->_req_data[ '_reg_status_id' ] ) ? $this->_req_data[ '_reg_status_id' ] : '';
+		$notify = ! empty($this->_req_data['txn_reg_status_change']['send_notifications']);
+		$this->_req_data['_reg_status_id'] = isset($this->_req_data['_reg_status_id']) ? $this->_req_data['_reg_status_id'] : '';
 
-		switch ( $this->_req_data['_reg_status_id'] ) {
-			case EEH_Template::pretty_status( EEM_Registration::status_id_approved, false, 'sentence' ) :
-				$this->approve_registration( $notify );
+		switch ($this->_req_data['_reg_status_id']) {
+			case EEH_Template::pretty_status(EEM_Registration::status_id_approved, false, 'sentence') :
+				$this->approve_registration($notify);
 				break;
-			case EEH_Template::pretty_status( EEM_Registration::status_id_pending_payment, false, 'sentence' ) :
-				$this->pending_registration( $notify );
+			case EEH_Template::pretty_status(EEM_Registration::status_id_pending_payment, false, 'sentence') :
+				$this->pending_registration($notify);
 				break;
-			case EEH_Template::pretty_status( EEM_Registration::status_id_not_approved, false, 'sentence' ) :
-				$this->not_approve_registration( $notify );
+			case EEH_Template::pretty_status(EEM_Registration::status_id_not_approved, false, 'sentence') :
+				$this->not_approve_registration($notify);
 				break;
-			case EEH_Template::pretty_status( EEM_Registration::status_id_declined, false, 'sentence' ) :
-				$this->decline_registration( $notify );
+			case EEH_Template::pretty_status(EEM_Registration::status_id_declined, false, 'sentence') :
+				$this->decline_registration($notify);
 				break;
-			case EEH_Template::pretty_status( EEM_Registration::status_id_cancelled, false, 'sentence' ) :
-				$this->cancel_registration( $notify );
+			case EEH_Template::pretty_status(EEM_Registration::status_id_cancelled, false, 'sentence') :
+				$this->cancel_registration($notify);
 				break;
 			default :
 				$result['success'] = false;
-				unset( $this->_req_data['return'] );
-				$this->_reg_status_change_return( '', false );
+				unset($this->_req_data['return']);
+				$this->_reg_status_change_return('', false);
 				break;
 		}
 	}
@@ -1418,8 +1418,8 @@ 
 	*		@param bool $notify whether or not to notify the registrant about their approval.
 	*		@return void
 	*/
-	protected function approve_registration( $notify = false ) {
-		$this->_reg_status_change_return( EEM_Registration::status_id_approved, $notify );
+	protected function approve_registration($notify = false) {
+		$this->_reg_status_change_return(EEM_Registration::status_id_approved, $notify);
 	}
 
 
@@ -1431,8 +1431,8 @@ 
 	*		@param bool $notify whether or not to notify the registrant about their approval.
 	*		@return void
 	*/
-	protected function decline_registration( $notify = false ) {
-		$this->_reg_status_change_return( EEM_Registration::status_id_declined, $notify );
+	protected function decline_registration($notify = false) {
+		$this->_reg_status_change_return(EEM_Registration::status_id_declined, $notify);
 	}
 
 
@@ -1444,8 +1444,8 @@ 
 	*		@param bool $notify whether or not to notify the registrant about their approval.
 	*		@return void
 	*/
-	protected function cancel_registration( $notify = false ) {
-		$this->_reg_status_change_return( EEM_Registration::status_id_cancelled, $notify );
+	protected function cancel_registration($notify = false) {
+		$this->_reg_status_change_return(EEM_Registration::status_id_cancelled, $notify);
 	}
 
 
@@ -1458,8 +1458,8 @@ 
 	*		@param bool $notify whether or not to notify the registrant about their approval.
 	*		@return void
 	*/
-	protected function not_approve_registration( $notify = false ) {
-		$this->_reg_status_change_return( EEM_Registration::status_id_not_approved, $notify );
+	protected function not_approve_registration($notify = false) {
+		$this->_reg_status_change_return(EEM_Registration::status_id_not_approved, $notify);
 	}
 
 
@@ -1470,8 +1470,8 @@ 
 	*		@param bool $notify whether or not to notify the registrant about their approval.
 	*		@return void
 	*/
-	protected function pending_registration( $notify = false ) {
-		$this->_reg_status_change_return( EEM_Registration::status_id_pending_payment, $notify );
+	protected function pending_registration($notify = false) {
+		$this->_reg_status_change_return(EEM_Registration::status_id_pending_payment, $notify);
 	}
 
 
@@ -1485,19 +1485,19 @@ 
 	public function _reg_details_meta_box() {
 		EEH_Autoloader::register_line_item_display_autoloaders();
 		EEH_Autoloader::register_line_item_filter_autoloaders();
-		EE_Registry::instance()->load_helper( 'Line_Item' );
+		EE_Registry::instance()->load_helper('Line_Item');
 		$transaction = $this->_registration->transaction() ? $this->_registration->transaction() : EE_Transaction::new_instance();
 		$this->_session = $transaction->session_data();
 
 		$filters = new EE_Line_Item_Filter_Collection();
-		$filters->add( new EE_Single_Registration_Line_Item_Filter( $this->_registration ) );
-		$filters->add( new EE_Non_Zero_Line_Item_Filter() );
-		$line_item_filter_processor = new EE_Line_Item_Filter_Processor( $filters, $transaction->total_line_item() );
+		$filters->add(new EE_Single_Registration_Line_Item_Filter($this->_registration));
+		$filters->add(new EE_Non_Zero_Line_Item_Filter());
+		$line_item_filter_processor = new EE_Line_Item_Filter_Processor($filters, $transaction->total_line_item());
 		$filtered_line_item_tree = $line_item_filter_processor->process();
 
 		$this->_template_args['REG_ID'] = $this->_registration->ID();
-		$line_item_display = new EE_Line_Item_Display( 'reg_admin_table', 'EE_Admin_Table_Registration_Line_Item_Display_Strategy' );
-		$this->_template_args['line_item_table'] = $line_item_display->display_line_item( $filtered_line_item_tree, array( 'EE_Registration' => $this->_registration ) );
+		$line_item_display = new EE_Line_Item_Display('reg_admin_table', 'EE_Admin_Table_Registration_Line_Item_Display_Strategy');
+		$this->_template_args['line_item_table'] = $line_item_display->display_line_item($filtered_line_item_tree, array('EE_Registration' => $this->_registration));
 
 
 		$attendee = $this->_registration->attendee();
@@ -1508,10 +1508,10 @@ 
 		)
 			? EEH_Template::get_button_or_link(
 				EE_Admin_Page::add_query_args_and_nonce(
-					array( 'action' => 'view_transaction', 'TXN_ID' => $transaction->ID() ),
+					array('action' => 'view_transaction', 'TXN_ID' => $transaction->ID()),
 					TXN_ADMIN_URL
 				),
-				esc_html__( ' View Transaction' ),
+				esc_html__(' View Transaction'),
 				'button secondary-button right',
 				'dashicons dashicons-cart'
 			)
@@ -1531,59 +1531,59 @@ 
 					),
 					REG_ADMIN_URL
 				),
-				esc_html__( ' Resend Registration' ),
+				esc_html__(' Resend Registration'),
 				'button secondary-button right',
 				'dashicons dashicons-email-alt'
 			)
 			: '';
 
 		$this->_template_args['currency_sign'] = EE_Registry::instance()->CFG->currency->sign;
-		$payment = $transaction->get_first_related( 'Payment' );
+		$payment = $transaction->get_first_related('Payment');
 		$payment = ! $payment instanceof EE_Payment ? EE_Payment::new_instance() : $payment;
-		$payment_method = $payment->get_first_related( 'Payment_Method' );
+		$payment_method = $payment->get_first_related('Payment_Method');
 		$payment_method = ! $payment_method instanceof EE_Payment_Method ? EE_Payment_Method::new_instance() : $payment_method;
-		$reg_status_class = 'status-' . $this->_registration->status_ID();
+		$reg_status_class = 'status-'.$this->_registration->status_ID();
 		$reg_details = array(
 			'payment_method' => $payment_method->name(),
 			'response_msg' => $payment->gateway_response(),
-			'registration_id' => $this->_registration->get( 'REG_code' ),
+			'registration_id' => $this->_registration->get('REG_code'),
 			'registration_session' => $this->_registration->session_ID(),
-			'ip_address' => isset( $this->_session['ip_address'] ) ? $this->_session['ip_address'] : '',
-			'user_agent' => isset( $this->_session['user_agent'] ) ? $this->_session['user_agent'] : '',
+			'ip_address' => isset($this->_session['ip_address']) ? $this->_session['ip_address'] : '',
+			'user_agent' => isset($this->_session['user_agent']) ? $this->_session['user_agent'] : '',
 			);
 
 
-		if ( isset( $reg_details['registration_id'] )) {
+		if (isset($reg_details['registration_id'])) {
 			$this->_template_args['reg_details']['registration_id']['value'] = $reg_details['registration_id'];
-			$this->_template_args['reg_details']['registration_id']['label'] = __( 'Registration ID', 'event_espresso' );
+			$this->_template_args['reg_details']['registration_id']['label'] = __('Registration ID', 'event_espresso');
 			$this->_template_args['reg_details']['registration_id']['class'] = 'regular-text';
 		}
 
-		if ( isset( $reg_details['payment_method'] ) ) {
+		if (isset($reg_details['payment_method'])) {
 			$this->_template_args['reg_details']['payment_method']['value'] = $reg_details['payment_method'];
-			$this->_template_args['reg_details']['payment_method']['label'] = __( 'Most Recent Payment Method', 'event_espresso' );
+			$this->_template_args['reg_details']['payment_method']['label'] = __('Most Recent Payment Method', 'event_espresso');
 			$this->_template_args['reg_details']['payment_method']['class'] = 'regular-text';
 			$this->_template_args['reg_details']['response_msg']['value'] = $reg_details['response_msg'];
-			$this->_template_args['reg_details']['response_msg']['label'] = __( 'Payment method response', 'event_espresso' );
+			$this->_template_args['reg_details']['response_msg']['label'] = __('Payment method response', 'event_espresso');
 			$this->_template_args['reg_details']['response_msg']['class'] = 'regular-text';
 		}
 
 		$this->_template_args['reg_details']['registration_session']['value'] = $reg_details['registration_session'];
-		$this->_template_args['reg_details']['registration_session']['label'] = __( 'Registration Session', 'event_espresso' );
+		$this->_template_args['reg_details']['registration_session']['label'] = __('Registration Session', 'event_espresso');
 		$this->_template_args['reg_details']['registration_session']['class'] = 'regular-text';
 
 		$this->_template_args['reg_details']['ip_address']['value'] = $reg_details['ip_address'];
-		$this->_template_args['reg_details']['ip_address']['label'] = __( 'Registration placed from IP', 'event_espresso' );
+		$this->_template_args['reg_details']['ip_address']['label'] = __('Registration placed from IP', 'event_espresso');
 		$this->_template_args['reg_details']['ip_address']['class'] = 'regular-text';
 
 		$this->_template_args['reg_details']['user_agent']['value'] = $reg_details['user_agent'];
-		$this->_template_args['reg_details']['user_agent']['label'] = __( 'Registrant User Agent', 'event_espresso' );
+		$this->_template_args['reg_details']['user_agent']['label'] = __('Registrant User Agent', 'event_espresso');
 		$this->_template_args['reg_details']['user_agent']['class'] = 'large-text';
 
-		$this->_template_args['event_link'] = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'default', 'event_id' => $this->_registration->event_ID()), REG_ADMIN_URL );
+		$this->_template_args['event_link'] = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'default', 'event_id' => $this->_registration->event_ID()), REG_ADMIN_URL);
 
-		$template_path = REG_TEMPLATE_PATH . 'reg_admin_details_main_meta_box_reg_details.template.php';
-		echo EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
+		$template_path = REG_TEMPLATE_PATH.'reg_admin_details_main_meta_box_reg_details.template.php';
+		echo EEH_Template::display_template($template_path, $this->_template_args, TRUE);
 
 	}
 
@@ -1597,14 +1597,14 @@ 
 	*/
 	public function _reg_questions_meta_box() {
 		//allow someone to override this method entirely
-		if( apply_filters( 'FHEE__Registrations_Admin_Page___reg_questions_meta_box__do_default', true, $this, $this->_registration ) ) {
-			$form = $this->_get_reg_custom_questions_form( $this->_registration->ID() );
-			$this->_template_args[ 'att_questions' ] = count( $form->subforms() ) > 0 ? $form->get_html_and_js() : '';
+		if (apply_filters('FHEE__Registrations_Admin_Page___reg_questions_meta_box__do_default', true, $this, $this->_registration)) {
+			$form = $this->_get_reg_custom_questions_form($this->_registration->ID());
+			$this->_template_args['att_questions'] = count($form->subforms()) > 0 ? $form->get_html_and_js() : '';
 			$this->_template_args['reg_questions_form_action'] = 'edit_registration';
 			$this->_template_args['REG_ID'] = $this->_registration->ID();
 
-			$template_path = REG_TEMPLATE_PATH . 'reg_admin_details_main_meta_box_reg_questions.template.php';
-			echo EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
+			$template_path = REG_TEMPLATE_PATH.'reg_admin_details_main_meta_box_reg_questions.template.php';
+			echo EEH_Template::display_template($template_path, $this->_template_args, TRUE);
 		}
 	}
 
@@ -1618,12 +1618,12 @@ 
 	 * @param        string $output
 	 * @return        string
 	 */
-	public function form_before_question_group( $output ) {
+	public function form_before_question_group($output) {
 		EE_Error::doing_it_wrong(
-			__CLASS__ . '::' . __FUNCTION__,
-			__( 'This method would have been protected but was used on a filter callback'
+			__CLASS__.'::'.__FUNCTION__,
+			__('This method would have been protected but was used on a filter callback'
 				. 'so needed to be public. Please discontinue usage as it will be removed soon.',
-				'event_espresso' ),
+				'event_espresso'),
 			'4.8.32.rc.000'
 		);
 		return '
@@ -1642,20 +1642,20 @@ 
 	 * @param        string $output
 	 * @return        string
 	 */
-	public function form_after_question_group( $output ) {
+	public function form_after_question_group($output) {
 		EE_Error::doing_it_wrong(
-			__CLASS__ . '::' . __FUNCTION__,
-			__( 'This method would have been protected but was used on a filter callback'
+			__CLASS__.'::'.__FUNCTION__,
+			__('This method would have been protected but was used on a filter callback'
 				. 'so needed to be public. Please discontinue usage as it will be removed soon.',
-				'event_espresso' ),
+				'event_espresso'),
 			'4.8.32.rc.000'
 		);
 		return  '
 			<tr class="hide-if-no-js">
 				<th> </th>
 				<td class="reg-admin-edit-attendee-question-td">
-					<a class="reg-admin-edit-attendee-question-lnk" href="#" title="' . esc_attr__( 'click to edit question', 'event_espresso' ) . '">
-						<span class="reg-admin-edit-question-group-spn lt-grey-txt">' . __( 'edit the above question group', 'event_espresso' ) . '</span>
+					<a class="reg-admin-edit-attendee-question-lnk" href="#" title="' . esc_attr__('click to edit question', 'event_espresso').'">
+						<span class="reg-admin-edit-question-group-spn lt-grey-txt">' . __('edit the above question group', 'event_espresso').'</span>
 						<div class="dashicons dashicons-edit"></div>
 					</a>
 				</td>
@@ -1675,18 +1675,18 @@ 
 	 * @param        string $label
 	 * @return        string
 	 */
-	public function form_form_field_label_wrap( $label ) {
+	public function form_form_field_label_wrap($label) {
 		EE_Error::doing_it_wrong(
-			__CLASS__ . '::' . __FUNCTION__,
-			__( 'This method would have been protected but was used on a filter callback'
+			__CLASS__.'::'.__FUNCTION__,
+			__('This method would have been protected but was used on a filter callback'
 				. 'so needed to be public. Please discontinue usage as it will be removed soon.',
-				'event_espresso' ),
+				'event_espresso'),
 			'4.8.32.rc.000'
 		);
 		return '
 			<tr>
 				<th>
-					' . $label  . '
+					' . $label.'
 				</th>';
 	}
 
@@ -1700,17 +1700,17 @@ 
 	 * @param        string $input
 	 * @return        string
 	 */
-	public function form_form_field_input__wrap( $input ) {
+	public function form_form_field_input__wrap($input) {
 		EE_Error::doing_it_wrong(
-			__CLASS__ . '::' . __FUNCTION__,
-			__( 'This method would have been protected but was used on a filter callback'
+			__CLASS__.'::'.__FUNCTION__,
+			__('This method would have been protected but was used on a filter callback'
 				. 'so needed to be public. Please discontinue usage as it will be removed soon.',
-				'event_espresso' ),
+				'event_espresso'),
 			'4.8.32.rc.000'
 		);
 		return '
 				<td class="reg-admin-attendee-questions-input-td disabled-input">
-					' . $input . '
+					' . $input.'
 				</td>
 			</tr>';
 	}
@@ -1724,14 +1724,14 @@ 
 	 * @return void
 	 */
 	protected function _update_attendee_registration_form() {
-		do_action( 'AHEE__Registrations_Admin_Page___update_attendee_registration_form__start', $this );
-		if( $_SERVER['REQUEST_METHOD'] == 'POST'){
-			$REG_ID = isset( $this->_req_data['_REG_ID'] ) ? absint( $this->_req_data['_REG_ID'] ) : FALSE;
-			$success = $this->_save_reg_custom_questions_form( $REG_ID );
-			if( $success ) {
+		do_action('AHEE__Registrations_Admin_Page___update_attendee_registration_form__start', $this);
+		if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+			$REG_ID = isset($this->_req_data['_REG_ID']) ? absint($this->_req_data['_REG_ID']) : FALSE;
+			$success = $this->_save_reg_custom_questions_form($REG_ID);
+			if ($success) {
 				$what = __('Registration Form', 'event_espresso');
-				$route = $REG_ID ? array( 'action' => 'view_registration', '_REG_ID' => $REG_ID ) : array( 'action' => 'default' );
-				$this->_redirect_after_action( $success, $what, __('updated', 'event_espresso'), $route );
+				$route = $REG_ID ? array('action' => 'view_registration', '_REG_ID' => $REG_ID) : array('action' => 'default');
+				$this->_redirect_after_action($success, $what, __('updated', 'event_espresso'), $route);
 			}
 		}
 	}
@@ -1742,11 +1742,11 @@ 
 	 * @param int $REG_ID
 	 * @return EE_Registration_Custom_Questions_Form
 	 */
-	protected function _get_reg_custom_questions_form( $REG_ID ) {
-		if( ! $this->_reg_custom_questions_form ) {
-			require_once( REG_ADMIN . 'form_sections' . DS . 'EE_Registration_Custom_Questions_Form.form.php' );
-			$this->_reg_custom_questions_form = new EE_Registration_Custom_Questions_Form( EEM_Registration::instance()->get_one_by_ID( $REG_ID ) );
-			$this->_reg_custom_questions_form->_construct_finalize( null, null );
+	protected function _get_reg_custom_questions_form($REG_ID) {
+		if ( ! $this->_reg_custom_questions_form) {
+			require_once(REG_ADMIN.'form_sections'.DS.'EE_Registration_Custom_Questions_Form.form.php');
+			$this->_reg_custom_questions_form = new EE_Registration_Custom_Questions_Form(EEM_Registration::instance()->get_one_by_ID($REG_ID));
+			$this->_reg_custom_questions_form->_construct_finalize(null, null);
 		}
 		return $this->_reg_custom_questions_form;
 	}
@@ -1759,17 +1759,17 @@ 
 	 * @param bool $REG_ID
 	 * @return bool
 	 */
-	private function _save_reg_custom_questions_form( $REG_ID = FALSE ) {
+	private function _save_reg_custom_questions_form($REG_ID = FALSE) {
 
 		if ( ! $REG_ID) {
-			EE_Error::add_error( __('An error occurred. No registration ID was received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error(__('An error occurred. No registration ID was received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
-		$form = $this->_get_reg_custom_questions_form( $REG_ID );
-		$form->receive_form_submission( $this->_req_data );
+		$form = $this->_get_reg_custom_questions_form($REG_ID);
+		$form->receive_form_submission($this->_req_data);
 		$success = false;
-		if( $form->is_valid() ) {
-			foreach( $form->subforms() as $question_group_id => $question_group_form ) {
-				foreach( $question_group_form->inputs() as $question_id => $input ) {
+		if ($form->is_valid()) {
+			foreach ($form->subforms() as $question_group_id => $question_group_form) {
+				foreach ($question_group_form->inputs() as $question_id => $input) {
 					$where_conditions = array(
 							'QST_ID' => $question_id,
 							'REG_ID' => $REG_ID
@@ -1777,19 +1777,19 @@ 
 					$possibly_new_values = array(
 							'ANS_value' => $input->normalized_value()
 						);
-					$answer = EEM_Answer::instance()->get_one( array( $where_conditions ) );
-					if( $answer instanceof EE_Answer ) {
-						$success = $answer->save( $possibly_new_values );
+					$answer = EEM_Answer::instance()->get_one(array($where_conditions));
+					if ($answer instanceof EE_Answer) {
+						$success = $answer->save($possibly_new_values);
 					} else {
 						//insert it then
-						$cols_n_vals = array_merge( $where_conditions, $possibly_new_values );
-						$answer = EE_Answer::new_instance( $cols_n_vals );
+						$cols_n_vals = array_merge($where_conditions, $possibly_new_values);
+						$answer = EE_Answer::new_instance($cols_n_vals);
 						$success = $answer->save();
 					}
 				}
 			}
 		} else {
-			EE_Error::add_error( $form->get_validation_error_string(), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($form->get_validation_error_string(), __FILE__, __FUNCTION__, __LINE__);
 		}
 		return $success;
 	}
@@ -1807,31 +1807,31 @@ 
 		$registrations = $REG->get_all(array(
 			array(
 				'TXN_ID'=>$this->_registration->transaction_ID(),
-				'REG_ID'=>array('!=',$this->_registration->ID())
+				'REG_ID'=>array('!=', $this->_registration->ID())
 			),
 			'force_join'=>array('Attendee')));
 
 		$this->_template_args['attendees'] = array();
 		$this->_template_args['attendee_notice'] = '';
-		if ( empty( $registrations)  || ( is_array($registrations) &&  ! EEH_Array::get_one_item_from_array($registrations) ) ) {
-			EE_Error::add_error( __('There are no records attached to this registration. Something may have gone wrong with the registration', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($registrations) || (is_array($registrations) && ! EEH_Array::get_one_item_from_array($registrations))) {
+			EE_Error::add_error(__('There are no records attached to this registration. Something may have gone wrong with the registration', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			$this->_template_args['attendee_notice'] = EE_Error::get_notices();
 		} else {
 
 			$att_nmbr = 1;
-			foreach ( $registrations as $registration ) {
+			foreach ($registrations as $registration) {
 				/* @var $registration EE_Registration */
 				$attendee = $registration->attendee() ? $registration->attendee() : EEM_Attendee::instance()->create_default_object();
-				$this->_template_args['attendees'][ $att_nmbr ]['STS_ID'] = $registration->status_ID();
-				$this->_template_args['attendees'][ $att_nmbr ]['fname'] = $attendee->fname();//( isset( $registration->ATT_fname ) & ! empty( $registration->ATT_fname ) ) ? $registration->ATT_fname : '';
-				$this->_template_args['attendees'][ $att_nmbr ]['lname'] = $attendee->lname();//( isset( $registration->ATT_lname ) & ! empty( $registration->ATT_lname ) ) ? $registration->ATT_lname : '';
-				$this->_template_args['attendees'][ $att_nmbr ]['email'] = $attendee->email();//( isset( $registration->ATT_email ) & ! empty( $registration->ATT_email ) ) ? $registration->ATT_email : '';
-				$this->_template_args['attendees'][ $att_nmbr ]['final_price'] = $registration->final_price();//( isset( $registration->REG_final_price ) & ! empty( $registration->REG_final_price ) ) ? $registration->REG_final_price : '';
+				$this->_template_args['attendees'][$att_nmbr]['STS_ID'] = $registration->status_ID();
+				$this->_template_args['attendees'][$att_nmbr]['fname'] = $attendee->fname(); //( isset( $registration->ATT_fname ) & ! empty( $registration->ATT_fname ) ) ? $registration->ATT_fname : '';
+				$this->_template_args['attendees'][$att_nmbr]['lname'] = $attendee->lname(); //( isset( $registration->ATT_lname ) & ! empty( $registration->ATT_lname ) ) ? $registration->ATT_lname : '';
+				$this->_template_args['attendees'][$att_nmbr]['email'] = $attendee->email(); //( isset( $registration->ATT_email ) & ! empty( $registration->ATT_email ) ) ? $registration->ATT_email : '';
+				$this->_template_args['attendees'][$att_nmbr]['final_price'] = $registration->final_price(); //( isset( $registration->REG_final_price ) & ! empty( $registration->REG_final_price ) ) ? $registration->REG_final_price : '';
 
-				$this->_template_args['attendees'][ $att_nmbr ]['address'] = implode( ', ', $attendee->full_address_as_array() );
+				$this->_template_args['attendees'][$att_nmbr]['address'] = implode(', ', $attendee->full_address_as_array());
 
-				$this->_template_args['attendees'][ $att_nmbr ]['att_link'] = self::add_query_args_and_nonce( array( 'action'=>'edit_attendee', 'post'=>$attendee->ID() ), REG_ADMIN_URL );
-				$this->_template_args['attendees'][ $att_nmbr ]['event_name'] = $registration->event_obj()->name();
+				$this->_template_args['attendees'][$att_nmbr]['att_link'] = self::add_query_args_and_nonce(array('action'=>'edit_attendee', 'post'=>$attendee->ID()), REG_ADMIN_URL);
+				$this->_template_args['attendees'][$att_nmbr]['event_name'] = $registration->event_obj()->name();
 
 				$att_nmbr++;
 			}
@@ -1841,8 +1841,8 @@ 
 
 	//			$this->_template_args['registration_form_url'] = add_query_arg( array( 'action' => 'edit_registration', 'process' => 'attendees'  ), REG_ADMIN_URL );
 		}
-		$template_path = REG_TEMPLATE_PATH . 'reg_admin_details_main_meta_box_attendees.template.php';
-		echo EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
+		$template_path = REG_TEMPLATE_PATH.'reg_admin_details_main_meta_box_attendees.template.php';
+		echo EEH_Template::display_template($template_path, $this->_template_args, TRUE);
 
 	}
 
@@ -1863,14 +1863,14 @@ 
 		$attendee = $att_check instanceof EE_Attendee ? $att_check : EEM_Attendee::instance()->create_default_object();
 
 		//now let's determine if this is not the primary registration.  If it isn't then we set the primary_registration object for reference BUT ONLY if the Attendee object loaded is not the same as the primary registration object (that way we know if we need to show create button or not)
-		if ( ! $this->_registration->is_primary_registrant() ) {
+		if ( ! $this->_registration->is_primary_registrant()) {
 
 			$primary_registration = $this->_registration->get_primary_registration();
 			$primary_attendee = $primary_registration instanceof EE_Registration
 				? $primary_registration->attendee()
 				: null;
 
-			if ( ! $primary_attendee instanceof EE_Attendee || $attendee->ID() !== $primary_attendee->ID() ) {
+			if ( ! $primary_attendee instanceof EE_Attendee || $attendee->ID() !== $primary_attendee->ID()) {
 				//in here?  This means the displayed registration is not the primary registrant but ALREADY HAS its own custom attendee object so let's not worry about the primary reg.
 				$primary_registration = NULL;
 			}
@@ -1879,27 +1879,27 @@ 
 		}
 
 		$this->_template_args['ATT_ID'] = $attendee->ID();
-		$this->_template_args['fname'] = $attendee->fname();//$this->_registration->ATT_fname;
-		$this->_template_args['lname'] = $attendee->lname();//$this->_registration->ATT_lname;
-		$this->_template_args['email'] = $attendee->email();//$this->_registration->ATT_email;
+		$this->_template_args['fname'] = $attendee->fname(); //$this->_registration->ATT_fname;
+		$this->_template_args['lname'] = $attendee->lname(); //$this->_registration->ATT_lname;
+		$this->_template_args['email'] = $attendee->email(); //$this->_registration->ATT_email;
 		$this->_template_args['phone'] = $attendee->phone();
 
-		$this->_template_args[ 'formatted_address' ] = EEH_Address::format( $attendee );
+		$this->_template_args['formatted_address'] = EEH_Address::format($attendee);
 
 
 		//edit link
-		$this->_template_args['att_edit_link'] = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'edit_attendee', 'post'=>$attendee->ID() ), REG_ADMIN_URL );
+		$this->_template_args['att_edit_link'] = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'edit_attendee', 'post'=>$attendee->ID()), REG_ADMIN_URL);
 		$this->_template_args['att_edit_label'] = __('View/Edit Contact', 'event_espresso');
 
 		//create link
-		$this->_template_args['create_link'] = $primary_registration instanceof EE_Registration ? EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'duplicate_attendee',  '_REG_ID' => $this->_registration->ID() ), REG_ADMIN_URL ): '';
+		$this->_template_args['create_link'] = $primary_registration instanceof EE_Registration ? EE_Admin_Page::add_query_args_and_nonce(array('action' => 'duplicate_attendee', '_REG_ID' => $this->_registration->ID()), REG_ADMIN_URL) : '';
 		$this->_template_args['create_label'] = __('Create Contact', 'event_espresso');
 
 		$this->_template_args['att_check'] = $att_check;
 
 
-		$template_path = REG_TEMPLATE_PATH . 'reg_admin_details_side_meta_box_registrant.template.php';
-		echo EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
+		$template_path = REG_TEMPLATE_PATH.'reg_admin_details_side_meta_box_registrant.template.php';
+		echo EEH_Template::display_template($template_path, $this->_template_args, TRUE);
 	}
 
 
@@ -1912,7 +1912,7 @@ 
 	 * @access protected
 	 * @return void
 	 */
-	protected function _trash_or_restore_registrations( $trash = TRUE ) {
+	protected function _trash_or_restore_registrations($trash = TRUE) {
 		$REGM = EEM_Registration::instance();
 
 		$success = 1;
@@ -1922,26 +1922,26 @@ 
 		$dtts = array();
 
 		//if empty _REG_ID then get out because there's nothing to do
-		if ( empty( $this->_req_data['_REG_ID'] ) ) {
+		if (empty($this->_req_data['_REG_ID'])) {
 			$msg = $trash ? __('In order to trash registrations you must select which ones you wish to trash by clicking the checkboxes.', 'event_espresso') : __('In order to restore registrations you must select which ones you wish to restore by clicking the checkboxes.', 'event_espresso');
-			EE_Error::add_error( $msg, __FILE__, __LINE__, __FUNCTION__ );
-			$this->_redirect_after_action(FALSE, '', '', array(), TRUE );
+			EE_Error::add_error($msg, __FILE__, __LINE__, __FUNCTION__);
+			$this->_redirect_after_action(FALSE, '', '', array(), TRUE);
 		}
 
 		//Checkboxes
-		if (!empty($this->_req_data['_REG_ID']) && is_array($this->_req_data['_REG_ID'])) {
+		if ( ! empty($this->_req_data['_REG_ID']) && is_array($this->_req_data['_REG_ID'])) {
 			// if array has more than one element than success message should be plural
-			$success = count( $this->_req_data['_REG_ID'] ) > 1 ? 2 : 1;
+			$success = count($this->_req_data['_REG_ID']) > 1 ? 2 : 1;
 			// cycle thru checkboxes
-			while (list( $ind, $REG_ID ) = each($this->_req_data['_REG_ID'])) {
+			while (list($ind, $REG_ID) = each($this->_req_data['_REG_ID'])) {
 				/** @var EE_Registration $REG */
-				$REG = $REGM->get_one_by_ID( $REG_ID);
+				$REG = $REGM->get_one_by_ID($REG_ID);
 				$payment_count = $REG->get_first_related('Transaction')->count_related('Payment');
-				if ( $payment_count > 0 ) {
-					$name = $REG->attendee() instanceof EE_Attendee ? $REG->attendee()->full_name() : __( 'Unknown Attendee', 'event_espresso' );
+				if ($payment_count > 0) {
+					$name = $REG->attendee() instanceof EE_Attendee ? $REG->attendee()->full_name() : __('Unknown Attendee', 'event_espresso');
 					$error = 1;
 					$success = 0;
-					EE_Error::add_error( sprintf( __('The registration for %s could not be trashed because it has payments attached to the related transaction.  If you wish to trash this registration you must first delete the payments on the related transaction.', 'event_espresso'), $name ), __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_error(sprintf(__('The registration for %s could not be trashed because it has payments attached to the related transaction.  If you wish to trash this registration you must first delete the payments on the related transaction.', 'event_espresso'), $name), __FILE__, __FUNCTION__, __LINE__);
 					continue; //can't trash this registration because it has payments.
 				}
 				$ticket = $REG->get_first_related('Ticket');
@@ -1950,7 +1950,7 @@ 
 				$dtts = array_merge($dtts, $dtt);
 
 				$updated = $trash ? $REG->delete() : $REG->restore();
-				if ( !$updated ) {
+				if ( ! $updated) {
 					$success = 0;
 				} else {
 					$success = 2;
@@ -1965,7 +1965,7 @@ 
 			$tickets[$ticket->ID()] = $ticket;
 			$dtts = $ticket->get_many_related('Datetime');
 			$updated = $trash ? $REG->delete() : $REG->restore();
-			if ( ! $updated ) {
+			if ( ! $updated) {
 				$success = 0;
 			}
 
@@ -1975,10 +1975,10 @@ 
 		EEM_Ticket::instance()->update_tickets_sold($tickets);
 		EEM_Datetime::instance()->update_sold($dtts);
 
-		$what = $success > 1 ? __( 'Registrations', 'event_espresso' ) : __( 'Registration', 'event_espresso' );
-		$action_desc = $trash ? __( 'moved to the trash', 'event_espresso' ) : __( 'restored', 'event_espresso' );
+		$what = $success > 1 ? __('Registrations', 'event_espresso') : __('Registration', 'event_espresso');
+		$action_desc = $trash ? __('moved to the trash', 'event_espresso') : __('restored', 'event_espresso');
 		$overwrite_msgs = $error ? TRUE : FALSE;
-		$this->_redirect_after_action( $success, $what, $action_desc, array( 'action' => 'default' ), $overwrite_msgs );
+		$this->_redirect_after_action($success, $what, $action_desc, array('action' => 'default'), $overwrite_msgs);
 	}
 
 
@@ -2002,16 +2002,16 @@ 
 		$success = 1;
 
 		//Checkboxes
-		if (!empty($this->_req_data['_REG_ID']) && is_array($this->_req_data['_REG_ID'])) {
+		if ( ! empty($this->_req_data['_REG_ID']) && is_array($this->_req_data['_REG_ID'])) {
 			// if array has more than one element than success message should be plural
-			$success = count( $this->_req_data['_REG_ID'] ) > 1 ? 2 : 1;
+			$success = count($this->_req_data['_REG_ID']) > 1 ? 2 : 1;
 			// cycle thru checkboxes
-			while (list( $ind, $REG_ID ) = each($this->_req_data['_REG_ID'])) {
+			while (list($ind, $REG_ID) = each($this->_req_data['_REG_ID'])) {
 				$REG = $REG_MDL->get_one_by_ID($REG_ID);
-				if ( ! $REG instanceof EE_Registration )
+				if ( ! $REG instanceof EE_Registration)
 					continue;
 				$deleted = $this->_delete_registration($REG);
-				if ( !$deleted ) {
+				if ( ! $deleted) {
 					$success = 0;
 				}
 			}
@@ -2021,15 +2021,15 @@ 
 			$REG_ID = $this->_req_data['_REG_ID'];
 			$REG = $REG_MDL->get_one_by_ID($REG_ID);
 			$deleted = $this->_delete_registration($REG);
-			if ( ! $deleted ) {
+			if ( ! $deleted) {
 				$success = 0;
 			}
 
 		}
 
-		$what = $success > 1 ? __( 'Registrations', 'event_espresso' ) : __( 'Registration', 'event_espresso' );
-		$action_desc = __( 'permanently deleted.', 'event_espresso' );
-		$this->_redirect_after_action( $success, $what, $action_desc, array( 'action' => 'default' ), TRUE );
+		$what = $success > 1 ? __('Registrations', 'event_espresso') : __('Registration', 'event_espresso');
+		$action_desc = __('permanently deleted.', 'event_espresso');
+		$this->_redirect_after_action($success, $what, $action_desc, array('action' => 'default'), TRUE);
 	}
 
 
@@ -2041,31 +2041,31 @@ 
 	 * @param  EE_Registration $REG registration to be deleted permenantly
 	 * @return boolean              true = successful deletion, false = fail.
 	 */
-	protected function _delete_registration( EE_Registration $REG ) {
+	protected function _delete_registration(EE_Registration $REG) {
 		//first we start with the transaction... ultimately, we WILL not delete permanently if there are any related registrations on the transaction that are NOT trashed.
 		$TXN = $REG->get_first_related('Transaction');
 		$REGS = $TXN->get_many_related('Registration');
 
 		$all_trashed = TRUE;
-		foreach ( $REGS as $registration ) {
-			if ( ! $registration->get('REG_deleted') )
+		foreach ($REGS as $registration) {
+			if ( ! $registration->get('REG_deleted'))
 				$all_trashed = FALSE;
 		}
 
-		if ( ! $all_trashed ) {
-			EE_Error::add_error( __('Unable to permanently delete this registration. Before this registration can be permanently deleted, all registrations made in the same transaction must be trashed as well.  These registrations will be permanently deleted in the same action.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $all_trashed) {
+			EE_Error::add_error(__('Unable to permanently delete this registration. Before this registration can be permanently deleted, all registrations made in the same transaction must be trashed as well.  These registrations will be permanently deleted in the same action.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 
 		//k made it here so that means we can delete all the related transactions and their answers (but let's do them separately from THIS one).
-		foreach ( $REGS as $registration ) {
+		foreach ($REGS as $registration) {
 
 			//delete related answers
 			$registration->delete_related_permanently('Answer');
 
 			//remove relationship to EE_Attendee (but we ALWAYS leave the contact record intact)
 			$attendee = $registration->get_first_related('Attendee');
-			if ( $attendee instanceof EE_Attendee ) {
+			if ($attendee instanceof EE_Attendee) {
 				$registration->_remove_relation_to($attendee, 'Attendee');
 			}
 
@@ -2075,7 +2075,7 @@ 
 			//now delete permanently the checkins related to this registration.
 			$registration->delete_related_permanently('Checkin');
 
-			if ( $registration->ID() === $REG->ID() )
+			if ($registration->ID() === $REG->ID())
 				continue; //we don't want to delete permanently the existing registration just yet.
 
 			//remove relation to transaction for these registrations if NOT the existing registrations
@@ -2108,35 +2108,35 @@ 
 	 * @return void
 	 */
 	public function new_registration() {
-		if ( ! $this->_set_reg_event() ) {
-			throw new EE_Error(__('Unable to continue with registering because there is no Event ID in the request', 'event_espresso') );
+		if ( ! $this->_set_reg_event()) {
+			throw new EE_Error(__('Unable to continue with registering because there is no Event ID in the request', 'event_espresso'));
 		}
-		EE_Registry::instance()->REQ->set_espresso_page( TRUE );
+		EE_Registry::instance()->REQ->set_espresso_page(TRUE);
 		// gotta start with a clean slate if we're not coming here via ajax
 		if (
-			! defined('DOING_AJAX' )
-			&& ( ! isset( $this->_req_data['processing_registration'] ) || isset( $this->_req_data['step_error'] ) )
+			! defined('DOING_AJAX')
+			&& ( ! isset($this->_req_data['processing_registration']) || isset($this->_req_data['step_error']))
 		) {
-			EE_Registry::instance()->SSN->clear_session( __CLASS__, __FUNCTION__ );
+			EE_Registry::instance()->SSN->clear_session(__CLASS__, __FUNCTION__);
 		}
 
-		$this->_template_args['event_name'] = '' ;
+		$this->_template_args['event_name'] = '';
 		// event name
-		if ( $this->_reg_event ) {
+		if ($this->_reg_event) {
 			$this->_template_args['event_name'] = $this->_reg_event->name();
-			$edit_event_url = self::add_query_args_and_nonce( array( 'action'=>'edit', 'post'=>$this->_reg_event->ID() ), EVENTS_ADMIN_URL );
-			$edit_event_lnk = '<a href="'.$edit_event_url.'" title="' . esc_attr__( 'Edit ', 'event_espresso' ) . $this->_reg_event->name() . '">' . __( 'Edit Event', 'event_espresso' ) . '</a>';
-			$this->_template_args['event_name'] .= ' <span class="admin-page-header-edit-lnk not-bold">' . $edit_event_lnk . '</span>' ;
+			$edit_event_url = self::add_query_args_and_nonce(array('action'=>'edit', 'post'=>$this->_reg_event->ID()), EVENTS_ADMIN_URL);
+			$edit_event_lnk = '<a href="'.$edit_event_url.'" title="'.esc_attr__('Edit ', 'event_espresso').$this->_reg_event->name().'">'.__('Edit Event', 'event_espresso').'</a>';
+			$this->_template_args['event_name'] .= ' <span class="admin-page-header-edit-lnk not-bold">'.$edit_event_lnk.'</span>';
 		}
 
 		$this->_template_args['step_content'] = $this->_get_registration_step_content();
 
-		if ( defined('DOING_AJAX' ) ) {
+		if (defined('DOING_AJAX')) {
 			$this->_return_json();
 		}
 		// grab header
-		$template_path = REG_TEMPLATE_PATH . 'reg_admin_register_new_attendee.template.php';
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
+		$template_path = REG_TEMPLATE_PATH.'reg_admin_register_new_attendee.template.php';
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, $this->_template_args, TRUE);
 
 		//$this->_set_publish_post_box_vars( NULL, FALSE, FALSE, NULL, FALSE );
 		// the details template wrapper
@@ -2153,7 +2153,7 @@ 
 	 * @return string html
 	 */
 	protected function _get_registration_step_content() {
-		if ( isset( $_COOKIE[ 'ee_registration_added' ] ) && $_COOKIE[ 'ee_registration_added' ] ) {
+		if (isset($_COOKIE['ee_registration_added']) && $_COOKIE['ee_registration_added']) {
 			$warning_msg = sprintf(
 				__(
 					'%2$sWARNING!!!%3$s%1$sPlease do not use the back button to return to this page for the purpose of adding another registration.%1$sThis can result in lost and/or corrupted data.%1$sIf you wish to add another registration, then please click the%1$s%7$s"Add Another New Registration to Event"%8$s button%1$son the Transaction details page, after you are redirected.%1$s%1$s%4$s redirecting in %5$s seconds %6$s',
@@ -2169,7 +2169,7 @@ 
 				'</b>'
 			);
 			return '
-	<div id="ee-add-reg-back-button-dv"><p>' . $warning_msg . '</p></div>
+	<div id="ee-add-reg-back-button-dv"><p>' . $warning_msg.'</p></div>
 	<script >
 		// WHOAH !!! it appears that someone is using the back button from the Transaction admin page
 		// after just adding a new registration... we gotta try to put a stop to that !!!
@@ -2204,16 +2204,16 @@ 
 		$cart = EE_Registry::instance()->SSN->cart();
 		$step = ! $cart instanceof EE_Cart ? 'ticket' : 'questions';
 
-		switch ( $step ) {
+		switch ($step) {
 			case 'ticket' :
 				$hidden_fields['processing_registration']['value'] = 1;
 				$template_args['title'] = __('Step One: Select the Ticket for this registration', 'event_espresso');
-				$template_args['content'] = EED_Ticket_Selector::instance()->display_ticket_selector( $this->_reg_event );
+				$template_args['content'] = EED_Ticket_Selector::instance()->display_ticket_selector($this->_reg_event);
 				$template_args['step_button_text'] = __('Add Tickets and Continue to Registrant Details', 'event_espresso');
 				$template_args['show_notification_toggle'] = FALSE;
 				break;
 			case 'questions' :
-				$hidden_fields[ 'processing_registration' ][ 'value' ] = 2;
+				$hidden_fields['processing_registration']['value'] = 2;
 				$template_args['title'] = __('Step Two: Add Registrant Details for this Registration', 'event_espresso');
 				//in theory we should be able to run EED_SPCO at this point because the cart should have been setup properly by the first process_reg_step run.
 				$template_args['content'] = EED_Single_Page_Checkout::registration_checkout_for_admin();
@@ -2222,10 +2222,10 @@ 
 				break;
 		}
 
-		$this->_set_add_edit_form_tags( 'process_reg_step', $hidden_fields ); //we come back to the process_registration_step route.
+		$this->_set_add_edit_form_tags('process_reg_step', $hidden_fields); //we come back to the process_registration_step route.
 
 		return EEH_Template::display_template(
-			REG_TEMPLATE_PATH . 'reg_admin_register_new_attendee_step_content.template.php', $template_args, TRUE
+			REG_TEMPLATE_PATH.'reg_admin_register_new_attendee_step_content.template.php', $template_args, TRUE
 		);
 	}
 
@@ -2240,11 +2240,11 @@ 
 	*		@return boolean
 	*/
 	private function _set_reg_event() {
-		if ( is_object( $this->_reg_event )) {
+		if (is_object($this->_reg_event)) {
 			return TRUE;
 		}
-		$EVT_ID = ( ! empty( $this->_req_data['event_id'] )) ? absint( $this->_req_data['event_id'] ) : FALSE;
-		if ( ! $EVT_ID ) {
+		$EVT_ID = ( ! empty($this->_req_data['event_id'])) ? absint($this->_req_data['event_id']) : FALSE;
+		if ( ! $EVT_ID) {
 			return FALSE;
 		}
 
@@ -2265,82 +2265,82 @@ 
 	public function process_reg_step() {
 		EE_System::do_not_cache();
 		$this->_set_reg_event();
-		EE_Registry::instance()->REQ->set_espresso_page( TRUE );
+		EE_Registry::instance()->REQ->set_espresso_page(TRUE);
 
 		//what step are we on?
 		$cart = EE_Registry::instance()->SSN->cart();
 		$step = ! $cart instanceof EE_Cart ? 'ticket' : 'questions';
 
 		//if doing ajax then we need to verify the nonce
-		if ( defined( 'DOING_AJAX' ) ) {
-			$nonce = isset( $this->_req_data[$this->_req_nonce] ) ? sanitize_text_field( $this->_req_data[$this->_req_nonce] ) : '';
-			$this->_verify_nonce( $nonce, $this->_req_nonce );
+		if (defined('DOING_AJAX')) {
+			$nonce = isset($this->_req_data[$this->_req_nonce]) ? sanitize_text_field($this->_req_data[$this->_req_nonce]) : '';
+			$this->_verify_nonce($nonce, $this->_req_nonce);
 		}
 
-		switch ( $step ) {
+		switch ($step) {
 
 			case 'ticket' :
 				//process ticket selection
 				$success = EED_Ticket_Selector::instance()->process_ticket_selections();
-				if ( $success ) {
-					EE_Error::add_success( __('Tickets Selected. Now complete the registration.'), 'event_espresso');
+				if ($success) {
+					EE_Error::add_success(__('Tickets Selected. Now complete the registration.'), 'event_espresso');
 				} else {
 					$query_args['step_error'] = $this->_req_data['step_error'] = TRUE;
 				}
-				if ( defined('DOING_AJAX') ) {
+				if (defined('DOING_AJAX')) {
 					$this->new_registration(); //display next step
 				} else {
 					$query_args['action'] = 'new_registration';
 					$query_args['processing_registration'] = 1;
 					$query_args['event_id'] = $this->_reg_event->ID();
-					$this->_redirect_after_action( FALSE, '', '', $query_args, TRUE );
+					$this->_redirect_after_action(FALSE, '', '', $query_args, TRUE);
 				}
 				break;
 
 			case 'questions' :
-				if( ! isset( $this->_req_data[ 'txn_reg_status_change' ], $this->_req_data[ 'txn_reg_status_change' ][ 'send_notifications' ] ) ) {
-					add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_false', 15 );
+				if ( ! isset($this->_req_data['txn_reg_status_change'], $this->_req_data['txn_reg_status_change']['send_notifications'])) {
+					add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_false', 15);
 				}
 				//process registration
 				$transaction = EED_Single_Page_Checkout::instance()->process_registration_from_admin();
-				if ( $cart instanceof EE_Cart ) {
+				if ($cart instanceof EE_Cart) {
 					$grand_total = $cart->get_cart_grand_total();
-					if ( $grand_total instanceof EE_Line_Item ) {
+					if ($grand_total instanceof EE_Line_Item) {
 						$grand_total->save_this_and_descendants_to_txn();
 					}
 				}
-				if ( ! $transaction instanceof EE_Transaction ) {
+				if ( ! $transaction instanceof EE_Transaction) {
 					$query_args = array(
 						'action' => 'new_registration',
 						'processing_registration' => 2,
 						'event_id' => $this->_reg_event->ID()
 					);
 
-					if ( defined('DOING_AJAX' )) {
+					if (defined('DOING_AJAX')) {
 						//display registration form again because there are errors (maybe validation?)
 						$this->new_registration();
 						return;
 					} else {
-						$this->_redirect_after_action( FALSE, '', '', $query_args, TRUE );
+						$this->_redirect_after_action(FALSE, '', '', $query_args, TRUE);
 						return;
 					}
 				}
 				/** @type EE_Transaction_Payments $transaction_payments */
-				$transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' );
+				$transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments');
 				// maybe update status, and make sure to save transaction if not done already
-				if ( ! $transaction_payments->update_transaction_status_based_on_total_paid( $transaction )) {
+				if ( ! $transaction_payments->update_transaction_status_based_on_total_paid($transaction)) {
 					$transaction->save();
 				}
-				EE_Registry::instance()->SSN->clear_session( __CLASS__, __FUNCTION__ );
+				EE_Registry::instance()->SSN->clear_session(__CLASS__, __FUNCTION__);
 				$this->_req_data = array();
 				$query_args = array(
 					'action'        => 'redirect_to_txn',
 					'TXN_ID'        => $transaction->ID(),
 					'EVT_ID'        => $this->_reg_event->ID(),
-					'event_name'    => urlencode( $this->_reg_event->name() ),
+					'event_name'    => urlencode($this->_reg_event->name()),
 					'redirect_from' => 'new_registration'
 				);
-				$this->_redirect_after_action( false, '', '', $query_args, true );
+				$this->_redirect_after_action(false, '', '', $query_args, true);
 				break;
 		}
 
@@ -2357,21 +2357,21 @@ 
 	 */
 	public function redirect_to_txn() {
 		EE_System::do_not_cache();
-		EE_Registry::instance()->SSN->clear_session( __CLASS__, __FUNCTION__ );
+		EE_Registry::instance()->SSN->clear_session(__CLASS__, __FUNCTION__);
 		$query_args = array(
 			'action' => 'view_transaction',
-			'TXN_ID' => isset( $this->_req_data['TXN_ID'] ) ? absint( $this->_req_data[ 'TXN_ID' ] )  : 0,
+			'TXN_ID' => isset($this->_req_data['TXN_ID']) ? absint($this->_req_data['TXN_ID']) : 0,
 			'page'   => 'espresso_transactions'
 		);
-		if ( isset( $this->_req_data[ 'EVT_ID' ], $this->_req_data[ 'redirect_from' ] ) ) {
-			$query_args['EVT_ID'] = $this->_req_data[ 'EVT_ID' ];
-			$query_args['event_name'] = urlencode( $this->_req_data[ 'event_name' ] );
-			$query_args['redirect_from'] = $this->_req_data[ 'redirect_from' ];
+		if (isset($this->_req_data['EVT_ID'], $this->_req_data['redirect_from'])) {
+			$query_args['EVT_ID'] = $this->_req_data['EVT_ID'];
+			$query_args['event_name'] = urlencode($this->_req_data['event_name']);
+			$query_args['redirect_from'] = $this->_req_data['redirect_from'];
 		}
 		EE_Error::add_success(
-			__( 'Registration Created.  Please review the transaction and add any payments as necessary', 'event_espresso' )
+			__('Registration Created.  Please review the transaction and add any payments as necessary', 'event_espresso')
 		);
-		$this->_redirect_after_action( false, '', '', $query_args, true );
+		$this->_redirect_after_action(false, '', '', $query_args, true);
 	}
 
 
@@ -2382,7 +2382,7 @@ 
 	*		@return void
 	*/
 	protected function _attendee_contact_list_table() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		$this->_search_btn_label = __('Contacts', 'event_espresso');
 		$this->display_admin_list_table_page_with_no_sidebar();
 	}
@@ -2397,10 +2397,10 @@ 
 	*		@access public
 	*		@return array
 	*/
-	public function get_attendees( $per_page, $count = FALSE, $trash = FALSE ) {
+	public function get_attendees($per_page, $count = FALSE, $trash = FALSE) {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		require_once( REG_ADMIN . 'EE_Attendee_Contact_List_Table.class.php' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		require_once(REG_ADMIN.'EE_Attendee_Contact_List_Table.class.php');
 		$ATT_MDL = EEM_Attendee::instance();
 
 		$this->_req_data['orderby'] = ! empty($this->_req_data['orderby']) ? $this->_req_data['orderby'] : '';
@@ -2428,47 +2428,47 @@ 
 				$orderby = 'ATT_lname';
 		}
 
-		$sort = ( isset( $this->_req_data['order'] ) && ! empty( $this->_req_data['order'] )) ? $this->_req_data['order'] : 'ASC';
+		$sort = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order'] : 'ASC';
 
-		$current_page = isset( $this->_req_data['paged'] ) && !empty( $this->_req_data['paged'] ) ? $this->_req_data['paged'] : 1;
-		$per_page = isset( $per_page ) && !empty( $per_page ) ? $per_page : 10;
-		$per_page = isset( $this->_req_data['perpage'] ) && !empty( $this->_req_data['perpage'] ) ? $this->_req_data['perpage'] : $per_page;
+		$current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged']) ? $this->_req_data['paged'] : 1;
+		$per_page = isset($per_page) && ! empty($per_page) ? $per_page : 10;
+		$per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage']) ? $this->_req_data['perpage'] : $per_page;
 
 		$_where = array();
 
-		if ( isset( $this->_req_data['s'] ) ) {
-			$sstr = '%' . $this->_req_data['s'] . '%';
+		if (isset($this->_req_data['s'])) {
+			$sstr = '%'.$this->_req_data['s'].'%';
 			$_where['OR'] = array(
-				'Registration.Event.EVT_name' => array( 'LIKE', $sstr),
-				'Registration.Event.EVT_desc' => array( 'LIKE', $sstr ),
-				'Registration.Event.EVT_short_desc' => array( 'LIKE' , $sstr ),
-				'ATT_fname' => array( 'LIKE', $sstr ),
-				'ATT_lname' => array( 'LIKE', $sstr ),
-				'ATT_short_bio' => array( 'LIKE', $sstr ),
-				'ATT_email' => array('LIKE', $sstr ),
-				'ATT_address' => array( 'LIKE', $sstr ),
-				'ATT_address2' => array( 'LIKE', $sstr ),
-				'ATT_city' => array( 'LIKE', $sstr ),
-				'Country.CNT_name' => array( 'LIKE', $sstr ),
-				'State.STA_name' => array('LIKE', $sstr ),
-				'ATT_phone' => array( 'LIKE', $sstr ),
-				'Registration.REG_final_price' => array( 'LIKE', $sstr ),
-				'Registration.REG_code' => array( 'LIKE', $sstr ),
-				'Registration.REG_count' => array( 'LIKE' , $sstr ),
-				'Registration.REG_group_size' => array( 'LIKE' , $sstr )
+				'Registration.Event.EVT_name' => array('LIKE', $sstr),
+				'Registration.Event.EVT_desc' => array('LIKE', $sstr),
+				'Registration.Event.EVT_short_desc' => array('LIKE', $sstr),
+				'ATT_fname' => array('LIKE', $sstr),
+				'ATT_lname' => array('LIKE', $sstr),
+				'ATT_short_bio' => array('LIKE', $sstr),
+				'ATT_email' => array('LIKE', $sstr),
+				'ATT_address' => array('LIKE', $sstr),
+				'ATT_address2' => array('LIKE', $sstr),
+				'ATT_city' => array('LIKE', $sstr),
+				'Country.CNT_name' => array('LIKE', $sstr),
+				'State.STA_name' => array('LIKE', $sstr),
+				'ATT_phone' => array('LIKE', $sstr),
+				'Registration.REG_final_price' => array('LIKE', $sstr),
+				'Registration.REG_code' => array('LIKE', $sstr),
+				'Registration.REG_count' => array('LIKE', $sstr),
+				'Registration.REG_group_size' => array('LIKE', $sstr)
 				);
 		}
 
 
-		$offset = ($current_page-1)*$per_page;
-		$limit = $count ? NULL : array( $offset, $per_page );
+		$offset = ($current_page - 1) * $per_page;
+		$limit = $count ? NULL : array($offset, $per_page);
 
-		if ( $trash ) {
-			$_where['status'] = array( '!=', 'publish' );
-			$all_attendees = $count ? $ATT_MDL->count( array($_where,'order_by'=>array($orderby=>$sort), 'limit'=>$limit)): $ATT_MDL->get_all( array($_where,'order_by'=>array($orderby=>$sort), 'limit'=>$limit));
+		if ($trash) {
+			$_where['status'] = array('!=', 'publish');
+			$all_attendees = $count ? $ATT_MDL->count(array($_where, 'order_by'=>array($orderby=>$sort), 'limit'=>$limit)) : $ATT_MDL->get_all(array($_where, 'order_by'=>array($orderby=>$sort), 'limit'=>$limit));
 		} else {
-			$_where['status'] = array( 'IN', array( 'publish' ) );
-			$all_attendees = $count ? $ATT_MDL->count( array($_where, 'order_by'=>array($orderby=>$sort),'limit'=>$limit)) : $ATT_MDL->get_all( array($_where, 'order_by'=>array($orderby=>$sort), 'limit'=>$limit) );
+			$_where['status'] = array('IN', array('publish'));
+			$all_attendees = $count ? $ATT_MDL->count(array($_where, 'order_by'=>array($orderby=>$sort), 'limit'=>$limit)) : $ATT_MDL->get_all(array($_where, 'order_by'=>array($orderby=>$sort), 'limit'=>$limit));
 		}
 
 		return $all_attendees;
@@ -2485,10 +2485,10 @@ 
 	 */
 	protected function _resend_registration() {
 		$this->_process_resend_registration();
-		$query_args = isset($this->_req_data['redirect_to'] ) ? array('action' => $this->_req_data['redirect_to'], '_REG_ID' => $this->_req_data['_REG_ID'] ) : array(
+		$query_args = isset($this->_req_data['redirect_to']) ? array('action' => $this->_req_data['redirect_to'], '_REG_ID' => $this->_req_data['_REG_ID']) : array(
 			'action' => 'default'
 		);
-		$this->_redirect_after_action(FALSE, '', '', $query_args, TRUE );
+		$this->_redirect_after_action(FALSE, '', '', $query_args, TRUE);
 	}
 
 
@@ -2496,26 +2496,26 @@ 
 
 
 
-	public function _registrations_report(){
-		if( ! defined( 'EE_USE_OLD_CSV_REPORT_CLASS' ) ) {
-			wp_redirect( EE_Admin_Page::add_query_args_and_nonce(
+	public function _registrations_report() {
+		if ( ! defined('EE_USE_OLD_CSV_REPORT_CLASS')) {
+			wp_redirect(EE_Admin_Page::add_query_args_and_nonce(
 				array(
 					'page' => 'espresso_batch',
 					'batch' => 'file',
-					'EVT_ID' => isset( $this->_req_data[ 'EVT_ID'] ) ? $this->_req_data[ 'EVT_ID' ] : NULL,
-					'job_handler' => urlencode( 'EventEspressoBatchRequest\JobHandlers\RegistrationsReport' ),
-					'return_url' => urlencode( $this->_req_data[ 'return_url' ] ),
-				)) );
+					'EVT_ID' => isset($this->_req_data['EVT_ID']) ? $this->_req_data['EVT_ID'] : NULL,
+					'job_handler' => urlencode('EventEspressoBatchRequest\JobHandlers\RegistrationsReport'),
+					'return_url' => urlencode($this->_req_data['return_url']),
+				)));
 		} else {
 			$new_request_args = array(
 				'export' => 'report',
 				'action' => 'registrations_report_for_event',
-				'EVT_ID' => isset( $this->_req_data[ 'EVT_ID'] ) ? $this->_req_data[ 'EVT_ID' ] : NULL,
+				'EVT_ID' => isset($this->_req_data['EVT_ID']) ? $this->_req_data['EVT_ID'] : NULL,
 			);
 			$this->_req_data = array_merge($this->_req_data, $new_request_args);
 
-			if ( is_readable(EE_CLASSES . 'EE_Export.class.php')) {
-				require_once(EE_CLASSES . 'EE_Export.class.php');
+			if (is_readable(EE_CLASSES.'EE_Export.class.php')) {
+				require_once(EE_CLASSES.'EE_Export.class.php');
 				$EE_Export = EE_Export::instance($this->_req_data);
 				$EE_Export->export();
 			}
@@ -2524,26 +2524,26 @@ 
 
 
 
-	public function _contact_list_export(){
-		if ( is_readable(EE_CLASSES . 'EE_Export.class.php')) {
-			require_once(EE_CLASSES . 'EE_Export.class.php');
+	public function _contact_list_export() {
+		if (is_readable(EE_CLASSES.'EE_Export.class.php')) {
+			require_once(EE_CLASSES.'EE_Export.class.php');
 			$EE_Export = EE_Export::instance($this->_req_data);
 			$EE_Export->export_attendees();
 		}
 	}
 
-	public function _contact_list_report(){
-		if( ! defined( 'EE_USE_OLD_CSV_REPORT_CLASS' ) ) {
-			wp_redirect( EE_Admin_Page::add_query_args_and_nonce(
+	public function _contact_list_report() {
+		if ( ! defined('EE_USE_OLD_CSV_REPORT_CLASS')) {
+			wp_redirect(EE_Admin_Page::add_query_args_and_nonce(
 				array(
 					'page' => 'espresso_batch',
 					'batch' => 'file',
-					'job_handler' => urlencode( 'EventEspressoBatchRequest\JobHandlers\AttendeesReport' ),
-					'return_url' => urlencode( $this->_req_data[ 'return_url' ] ),
-				)) );
+					'job_handler' => urlencode('EventEspressoBatchRequest\JobHandlers\AttendeesReport'),
+					'return_url' => urlencode($this->_req_data['return_url']),
+				)));
 		} else {
-			if ( is_readable(EE_CLASSES . 'EE_Export.class.php')) {
-				require_once(EE_CLASSES . 'EE_Export.class.php');
+			if (is_readable(EE_CLASSES.'EE_Export.class.php')) {
+				require_once(EE_CLASSES.'EE_Export.class.php');
 				$EE_Export = EE_Export::instance($this->_req_data);
 				$EE_Export->report_attendees();
 			}
@@ -2562,73 +2562,73 @@ 
 	 * @return void
 	 */
 	protected function _duplicate_attendee() {
-		$action = !empty( $this->_req_data['return'] ) ? $this->_req_data['return'] : 'default';
+		$action = ! empty($this->_req_data['return']) ? $this->_req_data['return'] : 'default';
 		//verify we have necessary info
-		if ( empty($this->_req_data['_REG_ID'] )  ) {
-			EE_Error::add_error( __('Unable to create the contact for the registration because the required parameters are not present (_REG_ID )', 'event_espresso'),  __FILE__, __LINE__, __FUNCTION__ );
-			$query_args = array( 'action' => $action );
+		if (empty($this->_req_data['_REG_ID'])) {
+			EE_Error::add_error(__('Unable to create the contact for the registration because the required parameters are not present (_REG_ID )', 'event_espresso'), __FILE__, __LINE__, __FUNCTION__);
+			$query_args = array('action' => $action);
 			$this->_redirect_after_action('', '', '', $query_args, TRUE);
 		}
 
 		//okay necessary deets present... let's dupe the incoming attendee and attach to incoming registration.
-		$registration = EEM_Registration::instance()->get_one_by_ID( $this->_req_data['_REG_ID'] );
+		$registration = EEM_Registration::instance()->get_one_by_ID($this->_req_data['_REG_ID']);
 		$attendee = $registration->attendee();
 
 		//remove relation of existing attendee on registration
-		$registration->_remove_relation_to($attendee, 'Attendee' );
+		$registration->_remove_relation_to($attendee, 'Attendee');
 		//new attendee
 		$new_attendee = clone $attendee;
-		$new_attendee->set( 'ATT_ID', 0 );
+		$new_attendee->set('ATT_ID', 0);
 		$new_attendee->save();
 
 		//add new attendee to reg
-		$registration->_add_relation_to( $new_attendee, 'Attendee');
+		$registration->_add_relation_to($new_attendee, 'Attendee');
 
-		EE_Error::add_success( __('New Contact record created.  Now make any edits you wish to make for this contact.', 'event_espresso') );
+		EE_Error::add_success(__('New Contact record created.  Now make any edits you wish to make for this contact.', 'event_espresso'));
 
 		//redirect to edit page for attendee
-		$query_args = array( 'post' => $new_attendee->ID(), 'action' => 'edit_attendee' );
+		$query_args = array('post' => $new_attendee->ID(), 'action' => 'edit_attendee');
 
-		$this->_redirect_after_action( '', '', '', $query_args, TRUE );
+		$this->_redirect_after_action('', '', '', $query_args, TRUE);
 	}
 
 
 	//related to cpt routes
 	protected function _insert_update_cpt_item($post_id, $post) {
 		$success = true;
-		$attendee = EEM_Attendee::instance()->get_one_by_ID( $post_id );
+		$attendee = EEM_Attendee::instance()->get_one_by_ID($post_id);
 		//for attendee updates
-		if ( $post->post_type = 'espresso_attendees' && !empty( $attendee ) ) {
+		if ($post->post_type = 'espresso_attendees' && ! empty($attendee)) {
 			//note we should only be UPDATING attendees at this point.
 			$updated_fields = array(
 				'ATT_fname' => $this->_req_data['ATT_fname'],
 				'ATT_lname' => $this->_req_data['ATT_lname'],
-				'ATT_full_name'=> $this->_req_data['ATT_fname'] . ' ' . $this->_req_data['ATT_lname'],
+				'ATT_full_name'=> $this->_req_data['ATT_fname'].' '.$this->_req_data['ATT_lname'],
 				'ATT_address' => isset($this->_req_data['ATT_address']) ? $this->_req_data['ATT_address'] : '',
 				'ATT_address2' => isset($this->_req_data['ATT_address2']) ? $this->_req_data['ATT_address2'] : '',
-				'ATT_city' => isset( $this->_req_data['ATT_city'] ) ? $this->_req_data['ATT_city'] : '',
-				'STA_ID' => isset( $this->_req_data['STA_ID'] ) ? $this->_req_data['STA_ID'] : '',
-				'CNT_ISO' => isset( $this->_req_data['CNT_ISO'] ) ? $this->_req_data['CNT_ISO'] : '',
-				'ATT_zip' => isset( $this->_req_data['ATT_zip'] ) ? $this->_req_data['ATT_zip'] : '',
-				'ATT_email' => isset( $this->_req_data['ATT_email'] ) ? $this->_req_data['ATT_email'] : '',
-				'ATT_phone' => isset( $this->_req_data['ATT_phone'] ) ? $this->_req_data['ATT_phone'] : ''
+				'ATT_city' => isset($this->_req_data['ATT_city']) ? $this->_req_data['ATT_city'] : '',
+				'STA_ID' => isset($this->_req_data['STA_ID']) ? $this->_req_data['STA_ID'] : '',
+				'CNT_ISO' => isset($this->_req_data['CNT_ISO']) ? $this->_req_data['CNT_ISO'] : '',
+				'ATT_zip' => isset($this->_req_data['ATT_zip']) ? $this->_req_data['ATT_zip'] : '',
+				'ATT_email' => isset($this->_req_data['ATT_email']) ? $this->_req_data['ATT_email'] : '',
+				'ATT_phone' => isset($this->_req_data['ATT_phone']) ? $this->_req_data['ATT_phone'] : ''
 				);
-			foreach ( $updated_fields as $field => $value ) {
+			foreach ($updated_fields as $field => $value) {
 				$attendee->set($field, $value);
 			}
 
 			$success = $attendee->save();
 
-			$attendee_update_callbacks = apply_filters( 'FHEE__Registrations_Admin_Page__insert_update_cpt_item__attendee_update', array() );
-			foreach ( $attendee_update_callbacks as $a_callback ) {
-				if ( FALSE === call_user_func_array( $a_callback, array($attendee, $this->_req_data ) ) ) {
-					throw new EE_Error( sprintf( __('The %s callback given for the "FHEE__Registrations_Admin_Page__insert_update_cpt_item__attendee_update" filter is not a valid callback.  Please check the spelling.', 'event_espresso'), $a_callback ) );
+			$attendee_update_callbacks = apply_filters('FHEE__Registrations_Admin_Page__insert_update_cpt_item__attendee_update', array());
+			foreach ($attendee_update_callbacks as $a_callback) {
+				if (FALSE === call_user_func_array($a_callback, array($attendee, $this->_req_data))) {
+					throw new EE_Error(sprintf(__('The %s callback given for the "FHEE__Registrations_Admin_Page__insert_update_cpt_item__attendee_update" filter is not a valid callback.  Please check the spelling.', 'event_espresso'), $a_callback));
 				}
 			}
 		}
 
-		if ( $success === FALSE )
-			EE_Error::add_error(__('Something went wrong with updating the meta table data for the registration.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if ($success === FALSE)
+			EE_Error::add_error(__('Something went wrong with updating the meta table data for the registration.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 
 	}
 
@@ -2648,17 +2648,17 @@ 
 		remove_meta_box('postexcerpt', __('Excerpt'), 'post_excerpt_meta_box', $this->_cpt_routes[$this->_req_action], 'normal', 'core');
 		remove_meta_box('commentstatusdiv', $this->_cpt_routes[$this->_req_action], 'normal', 'core');
 
-		if ( post_type_supports( 'espresso_attendees', 'excerpt') ) {
-			add_meta_box('postexcerpt', __('Short Biography', 'event_espresso'), 'post_excerpt_meta_box', $this->_cpt_routes[$this->_req_action], 'normal' );
+		if (post_type_supports('espresso_attendees', 'excerpt')) {
+			add_meta_box('postexcerpt', __('Short Biography', 'event_espresso'), 'post_excerpt_meta_box', $this->_cpt_routes[$this->_req_action], 'normal');
 		}
 
-		if ( post_type_supports( 'espresso_attendees', 'comments') ) {
+		if (post_type_supports('espresso_attendees', 'comments')) {
 			add_meta_box('commentsdiv', __('Notes on the Contact', 'event_espresso'), 'post_comment_meta_box', $this->_cpt_routes[$this->_req_action], 'normal', 'core');
 		}
 
-		add_meta_box('attendee_contact_info', __('Contact Info', 'event_espresso'), array( $this, 'attendee_contact_info'), $this->_cpt_routes[$this->_req_action], 'side', 'core' );
-		add_meta_box('attendee_details_address', __('Address Details', 'event_espresso'), array($this, 'attendee_address_details'), $this->_cpt_routes[$this->_req_action], 'normal', 'core' );
-		add_meta_box('attendee_registrations', __('Registrations for this Contact', 'event_espresso'), array( $this, 'attendee_registrations_meta_box'), $this->_cpt_routes[$this->_req_action], 'normal', 'high');
+		add_meta_box('attendee_contact_info', __('Contact Info', 'event_espresso'), array($this, 'attendee_contact_info'), $this->_cpt_routes[$this->_req_action], 'side', 'core');
+		add_meta_box('attendee_details_address', __('Address Details', 'event_espresso'), array($this, 'attendee_address_details'), $this->_cpt_routes[$this->_req_action], 'normal', 'core');
+		add_meta_box('attendee_registrations', __('Registrations for this Contact', 'event_espresso'), array($this, 'attendee_registrations_meta_box'), $this->_cpt_routes[$this->_req_action], 'normal', 'high');
 	}
 
 
@@ -2667,10 +2667,10 @@ 
 	 * @param  WP_Post $post wp post object
 	 * @return string        attendee contact info ( and form )
 	 */
-	public function attendee_contact_info( $post ) {
+	public function attendee_contact_info($post) {
 		//get attendee object ( should already have it )
 		$this->_template_args['attendee'] = $this->_cpt_model_obj;
-		$template = REG_TEMPLATE_PATH . 'attendee_contact_info_metabox_content.template.php';
+		$template = REG_TEMPLATE_PATH.'attendee_contact_info_metabox_content.template.php';
 		EEH_Template::display_template($template, $this->_template_args);
 	}
 
@@ -2686,12 +2686,12 @@ 
 		$this->_template_args['attendee'] = $this->_cpt_model_obj;
 		$this->_template_args['state_html'] = EEH_Form_Fields::generate_form_input(
 				new EE_Question_Form_Input(
-				EE_Question::new_instance( array(
+				EE_Question::new_instance(array(
 					'QST_ID' => 0,
 					'QST_display_text' => __('State/Province', 'event_espresso'),
 					'QST_system' => 'admin-state'
 					)),
-				EE_Answer::new_instance( array(
+				EE_Answer::new_instance(array(
 					'ANS_ID' => 0,
 					'ANS_value' => $this->_cpt_model_obj->state_ID()
 					)),
@@ -2704,12 +2704,12 @@ 
 			));
 		$this->_template_args['country_html'] = EEH_Form_Fields::generate_form_input(
 				new EE_Question_Form_Input(
-				EE_Question::new_instance( array(
+				EE_Question::new_instance(array(
 					'QST_ID' => 0,
 					'QST_display_text' => __('Country', 'event_espresso'),
 					'QST_system' => 'admin-country'
 					)),
-				EE_Answer::new_instance( array(
+				EE_Answer::new_instance(array(
 					'ANS_ID' => 0,
 					'ANS_value' => $this->_cpt_model_obj->country_ID()
 					)),
@@ -2720,8 +2720,8 @@ 
 					'append_qstn_id' => FALSE
 					)
 				));
-		$template = REG_TEMPLATE_PATH . 'attendee_address_details_metabox_content.template.php';
-		EEH_Template::display_template($template, $this->_template_args );
+		$template = REG_TEMPLATE_PATH.'attendee_address_details_metabox_content.template.php';
+		EEH_Template::display_template($template, $this->_template_args);
 
 	}
 
@@ -2731,11 +2731,11 @@ 
 	*		@access protected
 	*		@return void
 	*/
-	public function attendee_registrations_meta_box( $post ) {
+	public function attendee_registrations_meta_box($post) {
 
 		$this->_template_args['attendee'] = $this->_cpt_model_obj;
 		$this->_template_args['registrations'] = $this->_cpt_model_obj->get_many_related('Registration');
-		$template = REG_TEMPLATE_PATH . 'attendee_registrations_main_meta_box.template.php';
+		$template = REG_TEMPLATE_PATH.'attendee_registrations_main_meta_box.template.php';
 		EEH_Template::display_template($template, $this->_template_args);
 
 	}
@@ -2749,8 +2749,8 @@ 
 	 * @return string        html for new form.
 	 */
 	public function after_title_form_fields($post) {
-		if ( $post->post_type == 'espresso_attendees' ) {
-			$template = REG_TEMPLATE_PATH . 'attendee_details_after_title_form_fields.template.php';
+		if ($post->post_type == 'espresso_attendees') {
+			$template = REG_TEMPLATE_PATH.'attendee_details_after_title_form_fields.template.php';
 			$template_args['attendee'] = $this->_cpt_model_obj;
 			EEH_Template::display_template($template, $template_args);
 		}
@@ -2767,21 +2767,21 @@ 
 	*		@access protected
 	*		@return void
 	*/
-	protected function _trash_or_restore_attendees( $trash = TRUE ) {
+	protected function _trash_or_restore_attendees($trash = TRUE) {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		$ATT_MDL = EEM_Attendee::instance();
 
 		$success = 1;
 		//Checkboxes
-		if (!empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
+		if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
 			// if array has more than one element than success message should be plural
-			$success = count( $this->_req_data['checkbox'] ) > 1 ? 2 : 1;
+			$success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
 			// cycle thru checkboxes
-			while (list( $ATT_ID, $value ) = each($this->_req_data['checkbox'])) {
-				$updated = $trash ? $ATT_MDL->update_by_ID(array( 'status' => 'trash' ), $ATT_ID) : $ATT_MDL->update_by_ID( array('status' => 'publish' ), $ATT_ID);
-				if ( !$updated ) {
+			while (list($ATT_ID, $value) = each($this->_req_data['checkbox'])) {
+				$updated = $trash ? $ATT_MDL->update_by_ID(array('status' => 'trash'), $ATT_ID) : $ATT_MDL->update_by_ID(array('status' => 'publish'), $ATT_ID);
+				if ( ! $updated) {
 					$success = 0;
 				}
 			}
@@ -2790,18 +2790,18 @@ 
 			// grab single id and delete
 			$ATT_ID = absint($this->_req_data['ATT_ID']);
 			//get attendee
-			$att = $ATT_MDL->get_one_by_ID( $ATT_ID );
+			$att = $ATT_MDL->get_one_by_ID($ATT_ID);
 			$updated = $trash ? $att->set_status('trash') : $att->set_status('publish');
 			$updated = $att->save();
-			if ( ! $updated ) {
+			if ( ! $updated) {
 				$success = 0;
 			}
 
 		}
 
-		$what = $success > 1 ? __( 'Contacts', 'event_espresso' ) : __( 'Contact', 'event_espresso' );
-		$action_desc = $trash ? __( 'moved to the trash', 'event_espresso' ) : __( 'restored', 'event_espresso' );
-		$this->_redirect_after_action( $success, $what, $action_desc, array( 'action' => 'contact_list' ) );
+		$what = $success > 1 ? __('Contacts', 'event_espresso') : __('Contact', 'event_espresso');
+		$action_desc = $trash ? __('moved to the trash', 'event_espresso') : __('restored', 'event_espresso');
+		$this->_redirect_after_action($success, $what, $action_desc, array('action' => 'contact_list'));
 
 	}
 

espresso.php

Spacing +93 added lines, -93 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( ! defined( 'ABSPATH' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('ABSPATH')) {
+	exit('No direct script access allowed');
 }
 /*
   Plugin Name:		Event Espresso
@@ -41,7 +41,7 @@ 
  *
  */
 
-if ( function_exists( 'espresso_version' ) ) {
+if (function_exists('espresso_version')) {
 
 	/**
 	 *    espresso_duplicate_plugin_error
@@ -50,12 +50,12 @@ 
 	function espresso_duplicate_plugin_error() {
 		?>
 		<div class="error">
-			<p><?php _e( 'Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.', 'event_espresso' ); ?></p>
+			<p><?php _e('Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.', 'event_espresso'); ?></p>
 		</div>
 		<?php
-		espresso_deactivate_plugin( plugin_basename( __FILE__ ) );
+		espresso_deactivate_plugin(plugin_basename(__FILE__));
 	}
-	add_action( 'admin_notices', 'espresso_duplicate_plugin_error', 1 );
+	add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
 
 } else {
 
@@ -66,103 +66,103 @@ 
 	 * @return string
 	 */
 	function espresso_version() {
-		return apply_filters( 'FHEE__espresso__espresso_version', '4.9.8.rc.008' );
+		return apply_filters('FHEE__espresso__espresso_version', '4.9.8.rc.008');
 	}
 
 	// define versions
-	define( 'EVENT_ESPRESSO_VERSION', espresso_version() );
-	define( 'EE_MIN_WP_VER_REQUIRED', '4.1' );
-	define( 'EE_MIN_WP_VER_RECOMMENDED', '4.4.2' );
-	define( 'EE_MIN_PHP_VER_REQUIRED', '5.3.0' );
-	define( 'EE_MIN_PHP_VER_RECOMMENDED', '5.4.44' );
-	define( 'EVENT_ESPRESSO_POWERED_BY', 'Event Espresso - ' . EVENT_ESPRESSO_VERSION );
-	define( 'EVENT_ESPRESSO_MAIN_FILE', __FILE__ );
+	define('EVENT_ESPRESSO_VERSION', espresso_version());
+	define('EE_MIN_WP_VER_REQUIRED', '4.1');
+	define('EE_MIN_WP_VER_RECOMMENDED', '4.4.2');
+	define('EE_MIN_PHP_VER_REQUIRED', '5.3.0');
+	define('EE_MIN_PHP_VER_RECOMMENDED', '5.4.44');
+	define('EVENT_ESPRESSO_POWERED_BY', 'Event Espresso - '.EVENT_ESPRESSO_VERSION);
+	define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
 	//used to be DIRECTORY_SEPARATOR, but that caused issues on windows
-	if ( ! defined( 'DS' ) ) {
-		define( 'DS', '/' );
+	if ( ! defined('DS')) {
+		define('DS', '/');
 	}
-	if ( ! defined( 'PS' ) ) {
-		define( 'PS', PATH_SEPARATOR );
+	if ( ! defined('PS')) {
+		define('PS', PATH_SEPARATOR);
 	}
-	if ( ! defined( 'SP' ) ) {
-		define( 'SP', ' ' );
+	if ( ! defined('SP')) {
+		define('SP', ' ');
 	}
-	if ( ! defined( 'EENL' ) ) {
-		define( 'EENL', "\n" );
+	if ( ! defined('EENL')) {
+		define('EENL', "\n");
 	}
-	define( 'EE_SUPPORT_EMAIL', 'support@eventespresso.com' );
+	define('EE_SUPPORT_EMAIL', 'support@eventespresso.com');
 	// define the plugin directory and URL
-	define( 'EE_PLUGIN_BASENAME', plugin_basename( EVENT_ESPRESSO_MAIN_FILE ) );
-	define( 'EE_PLUGIN_DIR_PATH', plugin_dir_path( EVENT_ESPRESSO_MAIN_FILE ) );
-	define( 'EE_PLUGIN_DIR_URL', plugin_dir_url( EVENT_ESPRESSO_MAIN_FILE ) );
+	define('EE_PLUGIN_BASENAME', plugin_basename(EVENT_ESPRESSO_MAIN_FILE));
+	define('EE_PLUGIN_DIR_PATH', plugin_dir_path(EVENT_ESPRESSO_MAIN_FILE));
+	define('EE_PLUGIN_DIR_URL', plugin_dir_url(EVENT_ESPRESSO_MAIN_FILE));
 	// main root folder paths
-	define( 'EE_ADMIN_PAGES', EE_PLUGIN_DIR_PATH . 'admin_pages' . DS );
-	define( 'EE_CORE', EE_PLUGIN_DIR_PATH . 'core' . DS );
-	define( 'EE_MODULES', EE_PLUGIN_DIR_PATH . 'modules' . DS );
-	define( 'EE_PUBLIC', EE_PLUGIN_DIR_PATH . 'public' . DS );
-	define( 'EE_SHORTCODES', EE_PLUGIN_DIR_PATH . 'shortcodes' . DS );
-	define( 'EE_WIDGETS', EE_PLUGIN_DIR_PATH . 'widgets' . DS );
-	define( 'EE_PAYMENT_METHODS', EE_PLUGIN_DIR_PATH . 'payment_methods' . DS );
-	define( 'EE_CAFF_PATH', EE_PLUGIN_DIR_PATH . 'caffeinated' . DS );
+	define('EE_ADMIN_PAGES', EE_PLUGIN_DIR_PATH.'admin_pages'.DS);
+	define('EE_CORE', EE_PLUGIN_DIR_PATH.'core'.DS);
+	define('EE_MODULES', EE_PLUGIN_DIR_PATH.'modules'.DS);
+	define('EE_PUBLIC', EE_PLUGIN_DIR_PATH.'public'.DS);
+	define('EE_SHORTCODES', EE_PLUGIN_DIR_PATH.'shortcodes'.DS);
+	define('EE_WIDGETS', EE_PLUGIN_DIR_PATH.'widgets'.DS);
+	define('EE_PAYMENT_METHODS', EE_PLUGIN_DIR_PATH.'payment_methods'.DS);
+	define('EE_CAFF_PATH', EE_PLUGIN_DIR_PATH.'caffeinated'.DS);
 	// core system paths
-	define( 'EE_ADMIN', EE_CORE . 'admin' . DS );
-	define( 'EE_CPTS', EE_CORE . 'CPTs' . DS );
-	define( 'EE_CLASSES', EE_CORE . 'db_classes' . DS );
-	define( 'EE_INTERFACES', EE_CORE . 'interfaces' . DS );
-	define( 'EE_BUSINESS', EE_CORE . 'business' . DS );
-	define( 'EE_MODELS', EE_CORE . 'db_models' . DS );
-	define( 'EE_HELPERS', EE_CORE . 'helpers' . DS );
-	define( 'EE_LIBRARIES', EE_CORE . 'libraries' . DS );
-	define( 'EE_TEMPLATES', EE_CORE . 'templates' . DS );
-	define( 'EE_THIRD_PARTY', EE_CORE . 'third_party_libs' . DS );
-	define( 'EE_GLOBAL_ASSETS', EE_TEMPLATES . 'global_assets' . DS );
-	define( 'EE_FORM_SECTIONS', EE_LIBRARIES . 'form_sections' . DS );
+	define('EE_ADMIN', EE_CORE.'admin'.DS);
+	define('EE_CPTS', EE_CORE.'CPTs'.DS);
+	define('EE_CLASSES', EE_CORE.'db_classes'.DS);
+	define('EE_INTERFACES', EE_CORE.'interfaces'.DS);
+	define('EE_BUSINESS', EE_CORE.'business'.DS);
+	define('EE_MODELS', EE_CORE.'db_models'.DS);
+	define('EE_HELPERS', EE_CORE.'helpers'.DS);
+	define('EE_LIBRARIES', EE_CORE.'libraries'.DS);
+	define('EE_TEMPLATES', EE_CORE.'templates'.DS);
+	define('EE_THIRD_PARTY', EE_CORE.'third_party_libs'.DS);
+	define('EE_GLOBAL_ASSETS', EE_TEMPLATES.'global_assets'.DS);
+	define('EE_FORM_SECTIONS', EE_LIBRARIES.'form_sections'.DS);
 	// gateways
-	define( 'EE_GATEWAYS', EE_MODULES . 'gateways' . DS );
-	define( 'EE_GATEWAYS_URL', EE_PLUGIN_DIR_URL . 'modules' . DS . 'gateways' . DS );
+	define('EE_GATEWAYS', EE_MODULES.'gateways'.DS);
+	define('EE_GATEWAYS_URL', EE_PLUGIN_DIR_URL.'modules'.DS.'gateways'.DS);
 	// asset URL paths
-	define( 'EE_TEMPLATES_URL', EE_PLUGIN_DIR_URL . 'core' . DS . 'templates' . DS );
-	define( 'EE_GLOBAL_ASSETS_URL', EE_TEMPLATES_URL . 'global_assets' . DS );
-	define( 'EE_IMAGES_URL', EE_GLOBAL_ASSETS_URL . 'images' . DS );
-	define( 'EE_THIRD_PARTY_URL', EE_PLUGIN_DIR_URL . 'core' . DS . 'third_party_libs' . DS );
-	define( 'EE_HELPERS_ASSETS', EE_PLUGIN_DIR_URL . 'core/helpers/assets/' );
-	define( 'EE_LIBRARIES_URL', EE_PLUGIN_DIR_URL . 'core/libraries/' );
+	define('EE_TEMPLATES_URL', EE_PLUGIN_DIR_URL.'core'.DS.'templates'.DS);
+	define('EE_GLOBAL_ASSETS_URL', EE_TEMPLATES_URL.'global_assets'.DS);
+	define('EE_IMAGES_URL', EE_GLOBAL_ASSETS_URL.'images'.DS);
+	define('EE_THIRD_PARTY_URL', EE_PLUGIN_DIR_URL.'core'.DS.'third_party_libs'.DS);
+	define('EE_HELPERS_ASSETS', EE_PLUGIN_DIR_URL.'core/helpers/assets/');
+	define('EE_LIBRARIES_URL', EE_PLUGIN_DIR_URL.'core/libraries/');
 	// define upload paths
 	$uploads = wp_upload_dir();
 	// define the uploads directory and URL
-	define( 'EVENT_ESPRESSO_UPLOAD_DIR', $uploads[ 'basedir' ] . DS . 'espresso' . DS );
-	define( 'EVENT_ESPRESSO_UPLOAD_URL', $uploads[ 'baseurl' ] . DS . 'espresso' . DS );
+	define('EVENT_ESPRESSO_UPLOAD_DIR', $uploads['basedir'].DS.'espresso'.DS);
+	define('EVENT_ESPRESSO_UPLOAD_URL', $uploads['baseurl'].DS.'espresso'.DS);
 	// define the templates directory and URL
-	define( 'EVENT_ESPRESSO_TEMPLATE_DIR', $uploads[ 'basedir' ] . DS . 'espresso' . DS . 'templates' . DS );
-	define( 'EVENT_ESPRESSO_TEMPLATE_URL', $uploads[ 'baseurl' ] . DS . 'espresso' . DS . 'templates' . DS );
+	define('EVENT_ESPRESSO_TEMPLATE_DIR', $uploads['basedir'].DS.'espresso'.DS.'templates'.DS);
+	define('EVENT_ESPRESSO_TEMPLATE_URL', $uploads['baseurl'].DS.'espresso'.DS.'templates'.DS);
 	// define the gateway directory and URL
-	define( 'EVENT_ESPRESSO_GATEWAY_DIR', $uploads[ 'basedir' ] . DS . 'espresso' . DS . 'gateways' . DS );
-	define( 'EVENT_ESPRESSO_GATEWAY_URL', $uploads[ 'baseurl' ] . DS . 'espresso' . DS . 'gateways' . DS );
+	define('EVENT_ESPRESSO_GATEWAY_DIR', $uploads['basedir'].DS.'espresso'.DS.'gateways'.DS);
+	define('EVENT_ESPRESSO_GATEWAY_URL', $uploads['baseurl'].DS.'espresso'.DS.'gateways'.DS);
 	// languages folder/path
-	define( 'EE_LANGUAGES_SAFE_LOC', '..' . DS . 'uploads' . DS . 'espresso' . DS . 'languages' . DS );
-	define( 'EE_LANGUAGES_SAFE_DIR', EVENT_ESPRESSO_UPLOAD_DIR . 'languages' . DS );
+	define('EE_LANGUAGES_SAFE_LOC', '..'.DS.'uploads'.DS.'espresso'.DS.'languages'.DS);
+	define('EE_LANGUAGES_SAFE_DIR', EVENT_ESPRESSO_UPLOAD_DIR.'languages'.DS);
 	//check for dompdf fonts in uploads
-	if ( file_exists( EVENT_ESPRESSO_UPLOAD_DIR . 'fonts' . DS ) ) {
-		define( 'DOMPDF_FONT_DIR', EVENT_ESPRESSO_UPLOAD_DIR . 'fonts' . DS );
+	if (file_exists(EVENT_ESPRESSO_UPLOAD_DIR.'fonts'.DS)) {
+		define('DOMPDF_FONT_DIR', EVENT_ESPRESSO_UPLOAD_DIR.'fonts'.DS);
 	}
 	//ajax constants
-	define( 'EE_FRONT_AJAX', isset( $_REQUEST[ 'ee_front_ajax' ] ) || isset( $_REQUEST[ 'data' ][ 'ee_front_ajax' ] ) ? true : false );
-	define( 'EE_ADMIN_AJAX', isset( $_REQUEST[ 'ee_admin_ajax' ] ) || isset( $_REQUEST[ 'data' ][ 'ee_admin_ajax' ] ) ? true : false );
+	define('EE_FRONT_AJAX', isset($_REQUEST['ee_front_ajax']) || isset($_REQUEST['data']['ee_front_ajax']) ? true : false);
+	define('EE_ADMIN_AJAX', isset($_REQUEST['ee_admin_ajax']) || isset($_REQUEST['data']['ee_admin_ajax']) ? true : false);
 	//just a handy constant occasionally needed for finding values representing infinity in the DB
 	//you're better to use this than its straight value (currently -1) in case you ever
 	//want to change its default value! or find when -1 means infinity
-	define( 'EE_INF_IN_DB', -1 );
-	define( 'EE_INF', INF > (float)PHP_INT_MAX ? INF : PHP_INT_MAX );
-	define( 'EE_DEBUG', false );
+	define('EE_INF_IN_DB', -1);
+	define('EE_INF', INF > (float) PHP_INT_MAX ? INF : PHP_INT_MAX);
+	define('EE_DEBUG', false);
 
 	/**
 	 *    espresso_plugin_activation
 	 *    adds a wp-option to indicate that EE has been activated via the WP admin plugins page
 	 */
 	function espresso_plugin_activation() {
-		update_option( 'ee_espresso_activation', true );
+		update_option('ee_espresso_activation', true);
 	}
-	register_activation_hook( EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation' );
+	register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
 
 
 
@@ -176,7 +176,7 @@ 
 		//	}
 		//
 	}
-	register_deactivation_hook( EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_deactivation' );
+	register_deactivation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_deactivation');
 
 
 
@@ -186,15 +186,15 @@ 
 	 */
 	function espresso_load_error_handling() {
 		// load debugging tools
-		if ( WP_DEBUG === true && is_readable( EE_HELPERS . 'EEH_Debug_Tools.helper.php' ) ) {
-			require_once( EE_HELPERS . 'EEH_Debug_Tools.helper.php' );
+		if (WP_DEBUG === true && is_readable(EE_HELPERS.'EEH_Debug_Tools.helper.php')) {
+			require_once(EE_HELPERS.'EEH_Debug_Tools.helper.php');
 			EEH_Debug_Tools::instance();
 		}
 		// load error handling
-		if ( is_readable( EE_CORE . 'EE_Error.core.php' ) ) {
-			require_once( EE_CORE . 'EE_Error.core.php' );
+		if (is_readable(EE_CORE.'EE_Error.core.php')) {
+			require_once(EE_CORE.'EE_Error.core.php');
 		} else {
-			wp_die( __( 'The EE_Error core class could not be loaded.', 'event_espresso' ) );
+			wp_die(__('The EE_Error core class could not be loaded.', 'event_espresso'));
 		}
 	}
 
@@ -208,25 +208,25 @@ 
 	 * @param    string $full_path_to_file
 	 * @throws    EE_Error
 	 */
-	function espresso_load_required( $classname, $full_path_to_file ) {
+	function espresso_load_required($classname, $full_path_to_file) {
 		static $error_handling_loaded = false;
-		if ( ! $error_handling_loaded ) {
+		if ( ! $error_handling_loaded) {
 			espresso_load_error_handling();
 			$error_handling_loaded = true;
 		}
-		if ( is_readable( $full_path_to_file ) ) {
-			require_once( $full_path_to_file );
+		if (is_readable($full_path_to_file)) {
+			require_once($full_path_to_file);
 		} else {
-			throw new EE_Error ( sprintf(
-				__( 'The %s class file could not be located or is not readable due to file permissions.', 'event_espresso' ),
+			throw new EE_Error(sprintf(
+				__('The %s class file could not be located or is not readable due to file permissions.', 'event_espresso'),
 				$classname
-			) );
+			));
 		}
 	}
 
-	espresso_load_required( 'EEH_Base', EE_CORE . 'helpers' . DS . 'EEH_Base.helper.php' );
-	espresso_load_required( 'EEH_File', EE_CORE . 'helpers' . DS . 'EEH_File.helper.php' );
-	espresso_load_required( 'EE_Bootstrap', EE_CORE . 'EE_Bootstrap.core.php' );
+	espresso_load_required('EEH_Base', EE_CORE.'helpers'.DS.'EEH_Base.helper.php');
+	espresso_load_required('EEH_File', EE_CORE.'helpers'.DS.'EEH_File.helper.php');
+	espresso_load_required('EE_Bootstrap', EE_CORE.'EE_Bootstrap.core.php');
 	new EE_Bootstrap();
 
 
@@ -235,7 +235,7 @@ 
 
 
 
-if ( ! function_exists( 'espresso_deactivate_plugin' ) ) {
+if ( ! function_exists('espresso_deactivate_plugin')) {
 	/**
 	*    deactivate_plugin
 	* usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
@@ -244,11 +244,11 @@ 
 	* @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file
 	* @return    void
 	*/
-	function espresso_deactivate_plugin( $plugin_basename = '' ) {
-		if ( ! function_exists( 'deactivate_plugins' ) ) {
-			require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+	function espresso_deactivate_plugin($plugin_basename = '') {
+		if ( ! function_exists('deactivate_plugins')) {
+			require_once(ABSPATH.'wp-admin/includes/plugin.php');
 		}
-		unset( $_GET[ 'activate' ], $_REQUEST[ 'activate' ] );
-		deactivate_plugins( $plugin_basename );
+		unset($_GET['activate'], $_REQUEST['activate']);
+		deactivate_plugins($plugin_basename);
 	}
 }