eventespresso / event-espresso-core

core/libraries/messages/EE_messenger.lib.php

Spacing +101 added lines, -101 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 use \EventEspresso\core\exceptions\SendMessageException;
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -279,7 +279,7 @@ 
 	 * @return void
 	 */
 	public function enqueue_scripts_styles() {
-		do_action( 'AHEE__EE_messenger__enqueue_scripts_styles');
+		do_action('AHEE__EE_messenger__enqueue_scripts_styles');
 	}
 
 
@@ -349,7 +349,7 @@ 
 
 		$this->_supports_labels->template_variation_description = __('These are different styles to choose from for the selected template structure.  Usually these affect things like font style, color, borders etc.  In some cases the styles will also make minor layout changes.');
 
-		$this->_supports_labels = apply_filters( 'FHEE__EE_messenger___set_supports_labels_defaults___supports_labels', $this->_supports_labels, $this );
+		$this->_supports_labels = apply_filters('FHEE__EE_messenger___set_supports_labels_defaults___supports_labels', $this->_supports_labels, $this);
 	}
 
 
@@ -364,10 +364,10 @@ 
 	 * @return stdClass
 	 */
 	public function get_supports_labels() {
-		if ( empty( $this->_supports_labels->template_pack ) || empty( $this->_supports_labels->template_variation) ) {
+		if (empty($this->_supports_labels->template_pack) || empty($this->_supports_labels->template_variation)) {
 			$this->_set_supports_labels_defaults();
 		}
-		return apply_filters( 'FHEE__EE_messenger__get_supports_labels', $this->_supports_labels, $this );
+		return apply_filters('FHEE__EE_messenger__get_supports_labels', $this->_supports_labels, $this);
 	}
 
 
@@ -387,10 +387,10 @@ 
 	 *
 	 * @return string                    path or url for the requested variation.
 	 */
-	public function get_variation( EE_Messages_Template_Pack $pack, $message_type_name, $url = FALSE, $type = 'main', $variation = 'default', $skip_filters = FALSE ) {
+	public function get_variation(EE_Messages_Template_Pack $pack, $message_type_name, $url = FALSE, $type = 'main', $variation = 'default', $skip_filters = FALSE) {
 		$this->_tmp_pack = $pack;
-		$variation_path = apply_filters( 'EE_messenger__get_variation__variation', false, $pack, $this->name, $message_type_name, $url, $type, $variation, $skip_filters );
-		$variation_path = empty( $variation_path ) ? $this->_tmp_pack->get_variation( $this->name, $message_type_name, $type, $variation, $url, '.css', $skip_filters ) : $variation_path;
+		$variation_path = apply_filters('EE_messenger__get_variation__variation', false, $pack, $this->name, $message_type_name, $url, $type, $variation, $skip_filters);
+		$variation_path = empty($variation_path) ? $this->_tmp_pack->get_variation($this->name, $message_type_name, $type, $variation, $url, '.css', $skip_filters) : $variation_path;
 		return $variation_path;
 
 	}
@@ -408,13 +408,13 @@ 
 	 * @return array
 	 */
 	public function get_default_message_types() {
-		$class = get_class( $this );
+		$class = get_class($this);
 
 		//messenger specific filter
-		$default_types = apply_filters( 'FHEE__' . $class . '__get_default_message_types__default_types', $this->_default_message_types, $this );
+		$default_types = apply_filters('FHEE__'.$class.'__get_default_message_types__default_types', $this->_default_message_types, $this);
 
 		//all messengers filter
-		$default_types = apply_filters( 'FHEE__EE_messenger__get_default_message_types__default_types', $default_types, $this );
+		$default_types = apply_filters('FHEE__EE_messenger__get_default_message_types__default_types', $default_types, $this);
 		return $default_types;
 	}
 
@@ -429,14 +429,14 @@ 
 	 * @return array
 	 */
 	public function get_valid_message_types() {
-		$class = get_class( $this );
+		$class = get_class($this);
 
 		//messenger specific filter
 		//messenger specific filter
-		$valid_types = apply_filters( 'FHEE__' . $class . '__get_valid_message_types__valid_types', $this->_valid_message_types, $this );
+		$valid_types = apply_filters('FHEE__'.$class.'__get_valid_message_types__valid_types', $this->_valid_message_types, $this);
 
 		//all messengers filter
-		$valid_types = apply_filters( 'FHEE__EE_messenger__get_valid_message_types__valid_types', $valid_types, $this );
+		$valid_types = apply_filters('FHEE__EE_messenger__get_valid_message_types__valid_types', $valid_types, $this);
 		return $valid_types;
 	}
 
@@ -450,7 +450,7 @@ 
 	 * @access public
 	 * @param array $new_config Whatever is put in here will reset the _validator_config property
 	 */
-	public function set_validator_config( $new_config ) {
+	public function set_validator_config($new_config) {
 		$this->_validator_config = $new_config;
 	}
 
@@ -466,8 +466,8 @@ 
 	public function get_validator_config() {
 		$class = get_class($this);
 
-		$config = apply_filters( 'FHEE__' . $class . '__get_validator_config', $this->_validator_config, $this );
-		$config = apply_filters( 'FHEE__EE_messenger__get_validator_config', $config, $this );
+		$config = apply_filters('FHEE__'.$class.'__get_validator_config', $this->_validator_config, $this);
+		$config = apply_filters('FHEE__EE_messenger__get_validator_config', $config, $this);
 		return $config;
 	}
 
@@ -484,8 +484,8 @@ 
 	 * @access public
 	 * @return string content for page
 	 */
-	public function get_messenger_admin_page_content( $page, $action = null, $extra = array(), $message_types = array() ) {
-		return $this->_get_admin_page_content( $page, $action, $extra, $message_types );
+	public function get_messenger_admin_page_content($page, $action = null, $extra = array(), $message_types = array()) {
+		return $this->_get_admin_page_content($page, $action, $extra, $message_types);
 	}
 
 
@@ -495,20 +495,20 @@ 
 	 * @param array $extra
 	 * @return mixed|string
 	 */
-	protected function _get_admin_content_events_edit( $message_types, $extra ) {
+	protected function _get_admin_content_events_edit($message_types, $extra) {
 		//defaults
 		$template_args = array();
 		$selector_rows = '';
 
 		//we don't need message types here so we're just going to ignore. we do, however, expect the event id here. The event id is needed to provide a link to setup a custom template for this event.
-		$event_id = isset( $extra['event'] ) ? $extra['event'] : NULL;
+		$event_id = isset($extra['event']) ? $extra['event'] : NULL;
 
-		$template_wrapper_path = EE_LIBRARIES . 'messages/messenger/admin_templates/event_switcher_wrapper.template.php';
-		$template_row_path = EE_LIBRARIES . 'messages/messenger/admin_templates/event_switcher_row.template.php';
+		$template_wrapper_path = EE_LIBRARIES.'messages/messenger/admin_templates/event_switcher_wrapper.template.php';
+		$template_row_path = EE_LIBRARIES.'messages/messenger/admin_templates/event_switcher_row.template.php';
 
 		//array of template objects for global and custom (non-trashed) (but remember just for this messenger!)
 		$global_templates = EEM_Message_Template_Group::instance()->get_all(
-			array( array( 'MTP_messenger' => $this->name, 'MTP_is_global' => true, 'MTP_is_active' => true ) )
+			array(array('MTP_messenger' => $this->name, 'MTP_is_global' => true, 'MTP_is_active' => true))
 		);
 		$templates_for_event = EEM_Message_Template_Group::instance()->get_all_custom_templates_by_event(
 			$event_id,
@@ -517,55 +517,55 @@ 
 				'MTP_is_active' => true
 			)
 		);
-		$templates_for_event = !empty( $templates_for_event ) ? $templates_for_event : array();
+		$templates_for_event = ! empty($templates_for_event) ? $templates_for_event : array();
 
 		//so we need to setup the rows for the selectors and we use the global mtpgs (cause those will the active message template groups)
-		foreach ( $global_templates as $mtpgID => $mtpg ) {
-			if ( $mtpg instanceof EE_Message_Template_Group ) {
+		foreach ($global_templates as $mtpgID => $mtpg) {
+			if ($mtpg instanceof EE_Message_Template_Group) {
 				//verify this message type is supposed to show on this page
 				$mtp_obj = $mtpg->message_type_obj();
-				if ( ! $mtp_obj instanceof EE_message_type ) {
+				if ( ! $mtp_obj instanceof EE_message_type) {
 					continue;
 				}
-				$mtp_obj->admin_registered_pages = (array)$mtp_obj->admin_registered_pages;
-				if ( ! in_array( 'events_edit', $mtp_obj->admin_registered_pages ) ) {
+				$mtp_obj->admin_registered_pages = (array) $mtp_obj->admin_registered_pages;
+				if ( ! in_array('events_edit', $mtp_obj->admin_registered_pages)) {
 					continue;
 				}
 				$select_values = array();
-				$select_values[ $mtpgID ] = __( 'Global', 'event_espresso' );
-				$default_value = array_key_exists( $mtpgID, $templates_for_event ) && ! $mtpg->get( 'MTP_is_override' ) ? $mtpgID : null;
+				$select_values[$mtpgID] = __('Global', 'event_espresso');
+				$default_value = array_key_exists($mtpgID, $templates_for_event) && ! $mtpg->get('MTP_is_override') ? $mtpgID : null;
 				//if the override has been set for the global template, then that means even if there are custom templates already created we ignore them because of the set override.
-				if ( ! $mtpg->get( 'MTP_is_override' ) ) {
+				if ( ! $mtpg->get('MTP_is_override')) {
 					//any custom templates for this message type?
-					$custom_templates = EEM_Message_Template_Group::instance()->get_custom_message_template_by_m_and_mt( $this->name, $mtpg->message_type() );
-					foreach ( $custom_templates as $cmtpgID => $cmtpg ) {
-						$select_values[ $cmtpgID ] = $cmtpg->name();
-						$default_value = array_key_exists( $cmtpgID, $templates_for_event ) ? $cmtpgID : $default_value;
+					$custom_templates = EEM_Message_Template_Group::instance()->get_custom_message_template_by_m_and_mt($this->name, $mtpg->message_type());
+					foreach ($custom_templates as $cmtpgID => $cmtpg) {
+						$select_values[$cmtpgID] = $cmtpg->name();
+						$default_value = array_key_exists($cmtpgID, $templates_for_event) ? $cmtpgID : $default_value;
 					}
 				}
 				//if there is no $default_value then we set it as the global
-				$default_value = empty( $default_value ) ? $mtpgID : $default_value;
-				$edit_url = EEH_URL::add_query_args_and_nonce( array( 'page' => 'espresso_messages', 'action' => 'edit_message_template', 'id' => $default_value ), admin_url( 'admin.php' ) );
-				$create_url = EEH_URL::add_query_args_and_nonce( array( 'page' => 'espresso_messages', 'action' => 'add_new_message_template', 'GRP_ID' => $default_value ), admin_url( 'admin.php' ) );
-				$st_args[ 'mt_name' ] = ucwords( $mtp_obj->label[ 'singular' ] );
-				$st_args[ 'mt_slug' ] = $mtpg->message_type();
-				$st_args[ 'messenger_slug' ] = $this->name;
-				$st_args[ 'selector' ] = EEH_Form_Fields::select_input( 'event_message_templates_relation[' . $mtpgID . ']', $select_values, $default_value, 'data-messenger="' . $this->name . '" data-messagetype="' . $mtpg->message_type() . '"', 'message-template-selector' );
+				$default_value = empty($default_value) ? $mtpgID : $default_value;
+				$edit_url = EEH_URL::add_query_args_and_nonce(array('page' => 'espresso_messages', 'action' => 'edit_message_template', 'id' => $default_value), admin_url('admin.php'));
+				$create_url = EEH_URL::add_query_args_and_nonce(array('page' => 'espresso_messages', 'action' => 'add_new_message_template', 'GRP_ID' => $default_value), admin_url('admin.php'));
+				$st_args['mt_name'] = ucwords($mtp_obj->label['singular']);
+				$st_args['mt_slug'] = $mtpg->message_type();
+				$st_args['messenger_slug'] = $this->name;
+				$st_args['selector'] = EEH_Form_Fields::select_input('event_message_templates_relation['.$mtpgID.']', $select_values, $default_value, 'data-messenger="'.$this->name.'" data-messagetype="'.$mtpg->message_type().'"', 'message-template-selector');
 				//note that  message template group that has override_all_custom set will remove the ability to set a custom message template based off of the global (and that also in turn overrides any other custom templates).
-				$st_args[ 'create_button' ] = $mtpg->get( 'MTP_is_override' ) ? '' : '<a data-messenger="' . $this->name . '" data-messagetype="' . $mtpg->message_type() . '" data-grpid="' . $default_value . '" target="_blank" href="' . $create_url . '" class="button button-small create-mtpg-button">' . __( 'Create New Custom', 'event_espresso' ) . '</a>';
-				$st_args[ 'create_button' ] = EE_Registry::instance()->CAP->current_user_can( 'ee_edit_messages', 'espresso_messages_add_new_message_template' ) ? $st_args[ 'create_button' ] : '';
-				$st_args[ 'edit_button' ] = EE_Registry::instance()->CAP->current_user_can( 'ee_edit_message', 'espresso_messages_edit_message_template', $mtpgID ) ? '<a data-messagetype="' . $mtpg->message_type() . '" data-grpid="' . $default_value . '" target="_blank" href="' . $edit_url . '" class="button button-small edit-mtpg-button">' . __( 'Edit', 'event_espresso' ) . '</a>' : '';
-				$selector_rows .= EEH_Template::display_template( $template_row_path, $st_args, true );
+				$st_args['create_button'] = $mtpg->get('MTP_is_override') ? '' : '<a data-messenger="'.$this->name.'" data-messagetype="'.$mtpg->message_type().'" data-grpid="'.$default_value.'" target="_blank" href="'.$create_url.'" class="button button-small create-mtpg-button">'.__('Create New Custom', 'event_espresso').'</a>';
+				$st_args['create_button'] = EE_Registry::instance()->CAP->current_user_can('ee_edit_messages', 'espresso_messages_add_new_message_template') ? $st_args['create_button'] : '';
+				$st_args['edit_button'] = EE_Registry::instance()->CAP->current_user_can('ee_edit_message', 'espresso_messages_edit_message_template', $mtpgID) ? '<a data-messagetype="'.$mtpg->message_type().'" data-grpid="'.$default_value.'" target="_blank" href="'.$edit_url.'" class="button button-small edit-mtpg-button">'.__('Edit', 'event_espresso').'</a>' : '';
+				$selector_rows .= EEH_Template::display_template($template_row_path, $st_args, true);
 			}
 		}
 
 		//if no selectors present then get out.
-		if ( empty( $selector_rows ) ) {
+		if (empty($selector_rows)) {
 			return '';
 		}
 
 		$template_args['selector_rows'] = $selector_rows;
-		return EEH_Template::display_template( $template_wrapper_path, $template_args, TRUE );
+		return EEH_Template::display_template($template_wrapper_path, $template_args, TRUE);
 	}
 
 
@@ -580,8 +580,8 @@ 
 	 * @return array $this->_template_fields
 	 */
 	public function get_template_fields() {
-		$template_fields = apply_filters( 'FHEE__' . get_class($this) . '__get_template_fields', $this->_template_fields, $this );
-		$template_fields = apply_filters( 'FHEE__EE_messenger__get_template_fields', $template_fields, $this );
+		$template_fields = apply_filters('FHEE__'.get_class($this).'__get_template_fields', $this->_template_fields, $this);
+		$template_fields = apply_filters('FHEE__EE_messenger__get_template_fields', $template_fields, $this);
 		return $template_fields;
 	}
 
@@ -595,9 +595,9 @@ 
 	 * @param mixed $value
 	 */
 	protected function _set_template_value($item, $value) {
-		if ( array_key_exists($item, $this->_template_fields) ) {
-			$prop = '_' . $item;
-			$this->{$prop}= $value;
+		if (array_key_exists($item, $this->_template_fields)) {
+			$prop = '_'.$item;
+			$this->{$prop} = $value;
 		}
 	}
 
@@ -615,18 +615,18 @@ 
 	 *
 	 * @throws SendMessageException
 	 */
-	final public function send_message( $message, EE_message_type $message_type ) {
+	final public function send_message($message, EE_message_type $message_type) {
 		try {
-			$this->_validate_and_setup( $message );
+			$this->_validate_and_setup($message);
 			$this->_incoming_message_type = $message_type;
 			$response = $this->_send_message();
-			if ( $response instanceof WP_Error ) {
-				EE_Error::add_error( $response->get_error_message(), __FILE__, __FUNCTION__, __LINE__ );
+			if ($response instanceof WP_Error) {
+				EE_Error::add_error($response->get_error_message(), __FILE__, __FUNCTION__, __LINE__);
 				$response = false;
 			}
-		} catch ( \Exception $e ) {
+		} catch (\Exception $e) {
 			//convert to an instance of SendMessageException
-			throw new SendMessageException( $e->getMessage() );
+			throw new SendMessageException($e->getMessage());
 		}
 		return $response;
 	}
@@ -640,28 +640,28 @@ 
 	 * @param  bool   $send    true we will actually use the _send method (for test sends). FALSE we just return preview
 	 * @return string          return the message html content
 	 */
-	public function get_preview( EE_Message $message, EE_message_type $message_type, $send = false ) {
-		$this->_validate_and_setup( $message );
+	public function get_preview(EE_Message $message, EE_message_type $message_type, $send = false) {
+		$this->_validate_and_setup($message);
 
 		$this->_incoming_message_type = $message_type;
 
-		if ( $send ) {
+		if ($send) {
 			//are we overriding any existing template fields?
 			$settings = $this->get_existing_test_settings();
-			if ( ! empty( $settings ) ) {
-				foreach ( $settings as $field => $value ) {
-					$this->_set_template_value( $field, $value );
+			if ( ! empty($settings)) {
+				foreach ($settings as $field => $value) {
+					$this->_set_template_value($field, $value);
 				}
 			}
 		}
 
 		//enqueue preview js so that any links/buttons on the page are disabled.
-		if ( ! $send ) {
+		if ( ! $send) {
 			// the below may seem like duplication.  However, typically if a messenger enqueues scripts/styles,
 			// it deregisters all existing wp scripts and styles first.  So the second hook ensures our previewer still gets setup.
-			add_action( 'admin_enqueue_scripts', array( $this, 'add_preview_script' ), 10 );
-			add_action( 'wp_enqueue_scripts', array( $this, 'add_preview_script' ), 10 );
-			add_action( 'AHEE__EE_messenger__enqueue_scripts_styles', array( $this, 'add_preview_script' ), 10 );
+			add_action('admin_enqueue_scripts', array($this, 'add_preview_script'), 10);
+			add_action('wp_enqueue_scripts', array($this, 'add_preview_script'), 10);
+			add_action('AHEE__EE_messenger__enqueue_scripts_styles', array($this, 'add_preview_script'), 10);
 		}
 
 		return $send ? $this->_send_message() : $this->_preview();
@@ -679,10 +679,10 @@ 
 	 */
 	public function add_preview_script() {
 		//error message
-		EE_Registry::$i18n_js_strings[ 'links_disabled' ] = __( 'All the links on this page have been disabled because this is a generated preview message for the purpose of ensuring layout, style, and content setup.  To test generated links, you must trigger an actual message notification.', 'event_espresso' );
-		wp_register_script( 'ee-messages-preview-js', EE_LIBRARIES_URL . 'messages/messenger/assets/js/ee-messages-preview.js', array( 'jquery' ), EVENT_ESPRESSO_VERSION, true );
-		wp_localize_script( 'ee-messages-preview-js', 'eei18n', EE_Registry::$i18n_js_strings );
-		wp_enqueue_script( 'ee-messages-preview-js' );
+		EE_Registry::$i18n_js_strings['links_disabled'] = __('All the links on this page have been disabled because this is a generated preview message for the purpose of ensuring layout, style, and content setup.  To test generated links, you must trigger an actual message notification.', 'event_espresso');
+		wp_register_script('ee-messages-preview-js', EE_LIBRARIES_URL.'messages/messenger/assets/js/ee-messages-preview.js', array('jquery'), EVENT_ESPRESSO_VERSION, true);
+		wp_localize_script('ee-messages-preview-js', 'eei18n', EE_Registry::$i18n_js_strings);
+		wp_enqueue_script('ee-messages-preview-js');
 	}
 
 
@@ -693,13 +693,13 @@ 
 	 * @param  EE_Message $message
 	 * @throws EE_Error
 	 */
-	protected function _validate_and_setup( EE_Message $message ) {
+	protected function _validate_and_setup(EE_Message $message) {
 		$template_pack = $message->get_template_pack();
 		$variation = $message->get_template_pack_variation();
 
 		//verify we have the required template pack value on the $message object.
-		if ( ! $template_pack instanceof EE_Messages_Template_Pack ) {
-			throw new EE_Error( __('Incoming $message object must have an EE_Messages_Template_Pack object available.', 'event_espresso' ) );
+		if ( ! $template_pack instanceof EE_Messages_Template_Pack) {
+			throw new EE_Error(__('Incoming $message object must have an EE_Messages_Template_Pack object available.', 'event_espresso'));
 		}
 
 		$this->_tmp_pack = $template_pack;
@@ -708,11 +708,11 @@ 
 
 		$template_fields = $this->get_template_fields();
 
-		foreach ( $template_fields as $template => $value ) {
-			if ( $template !== 'extra' ) {
-				$column_value = $message->get_field_or_extra_meta( 'MSG_' . $template );
+		foreach ($template_fields as $template => $value) {
+			if ($template !== 'extra') {
+				$column_value = $message->get_field_or_extra_meta('MSG_'.$template);
 				$message_template_value = $column_value ? $column_value : null;
-				$this->_set_template_value( $template, $message_template_value );
+				$this->_set_template_value($template, $message_template_value);
 			}
 		}
 	}
@@ -727,19 +727,19 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	protected function _get_main_template( $preview = FALSE ) {
+	protected function _get_main_template($preview = FALSE) {
 		$type = $preview ? 'preview' : 'main';
 
-		$wrapper_template = $this->_tmp_pack->get_wrapper( $this->name, $type );
+		$wrapper_template = $this->_tmp_pack->get_wrapper($this->name, $type);
 
 		//check file exists and is readable
-		if ( !is_readable( $wrapper_template ) )
-			throw new EE_Error( sprintf( __('Unable to access the template file for the %s messenger main content wrapper.  The location being attempted is %s.', 'event_espresso' ), ucwords($this->label['singular']) , $wrapper_template ) );
+		if ( ! is_readable($wrapper_template))
+			throw new EE_Error(sprintf(__('Unable to access the template file for the %s messenger main content wrapper.  The location being attempted is %s.', 'event_espresso'), ucwords($this->label['singular']), $wrapper_template));
 
 		//add message type to template args
 		$this->_template_args['message_type'] = $this->_incoming_message_type;
 
-		return EEH_Template::display_template( $wrapper_template, $this->_template_args, TRUE );
+		return EEH_Template::display_template($wrapper_template, $this->_template_args, TRUE);
 	}
 
 
@@ -775,9 +775,9 @@ 
 	 */
 	public function get_existing_test_settings() {
 		/** @var 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');
 		$settings = $Message_Resource_Manager->get_active_messengers_option();
-		return isset( $settings[ $this->name ]['test_settings'] ) ? $settings[ $this->name ]['test_settings'] : array();
+		return isset($settings[$this->name]['test_settings']) ? $settings[$this->name]['test_settings'] : array();
 	}
 
 
@@ -789,12 +789,12 @@ 
 	 * @param $settings
 	 * @return bool success/fail
 	 */
-	public function set_existing_test_settings( $settings ) {
+	public function set_existing_test_settings($settings) {
 		/** @var 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');
 		$existing = $Message_Resource_Manager->get_active_messengers_option();
-		$existing[ $this->name ]['test_settings'] = $settings;
-		return $Message_Resource_Manager->update_active_messengers_option( $existing );
+		$existing[$this->name]['test_settings'] = $settings;
+		return $Message_Resource_Manager->update_active_messengers_option($existing);
 	}
 
 
@@ -807,21 +807,21 @@ 
 	 * @param string $field The field to retrieve the label for
 	 * @return string        	  The label
 	 */
-	public function get_field_label( $field ) {
+	public function get_field_label($field) {
 		//first let's see if the field requests is in the top level array.
-		if ( isset( $this->_template_fields[$field] ) && !empty( $this->_template_fields[$field]['label'] ) )
+		if (isset($this->_template_fields[$field]) && ! empty($this->_template_fields[$field]['label']))
 			return $this->_template[$field]['label'];
 
 		//nope so let's look in the extra array to see if it's there HOWEVER if the field exists as a top level index in the extra array then we know the label is in the 'main' index.
-		if ( isset( $this->_template_fields['extra'] ) && !empty( $this->_template_fields['extra'][$field] ) && !empty( $this->_template_fields['extra'][$field]['main']['label'] )  )
+		if (isset($this->_template_fields['extra']) && ! empty($this->_template_fields['extra'][$field]) && ! empty($this->_template_fields['extra'][$field]['main']['label']))
 			return $this->_template_fields['extra'][$field]['main']['label'];
 
 		//now it's possible this field may just be existing in any of the extra array items.
-		if ( !empty( $this->_template_fields['extra'] ) && is_array( $this->_template_fields['extra'] ) ) {
-			foreach ( $this->_template_fields['extra'] as $main_field => $subfields ) {
-				if ( !is_array( $subfields ) )
+		if ( ! empty($this->_template_fields['extra']) && is_array($this->_template_fields['extra'])) {
+			foreach ($this->_template_fields['extra'] as $main_field => $subfields) {
+				if ( ! is_array($subfields))
 					continue;
-				if ( isset( $subfields[$field] ) && !empty( $subfields[$field]['label'] ) )
+				if (isset($subfields[$field]) && ! empty($subfields[$field]['label']))
 					return $subfields[$field]['label'];
 			}
 		}
@@ -842,7 +842,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function do_secondary_messenger_hooks( $sending_messenger_name ) {
+	public function do_secondary_messenger_hooks($sending_messenger_name) {
 		return;
 	}
 

admin_pages/events/Events_Admin_Page.core.php

Doc Comments +2 added lines, -2 removed lines

@@ -1321,7 +1321,7 @@ 
 	 * This just returns whatever is set as the _event object property
 	 *
 	 * //todo this will become obsolete once the models are in place
-	 * @return object
+	 * @return EE_Event
 	 */
 	public function get_event_object() {
 		return $this->_cpt_model_obj;
@@ -2198,7 +2198,7 @@ 
 
 
 	/**
-	 * @return mixed
+	 * @return string
 	 */
 	protected function _category_details_content() {
 		$editor_args['category_desc'] = array(

Indentation +19 added lines, -19 removed lines

@@ -829,11 +829,11 @@ 
 		if ( ! empty( $id ) ) {
 			$post = get_post( $id );
 			$return .= '<a class="button button-small" onclick="prompt(\'Shortcode:\', jQuery(\'#shortcode\').val()); return false;" href="#"  tabindex="-1">'
-			           . esc_html__( 'Shortcode', 'event_espresso' )
-			           . '</a> ';
+					   . esc_html__( 'Shortcode', 'event_espresso' )
+					   . '</a> ';
 			$return .= '<input id="shortcode" type="hidden" value="[ESPRESSO_TICKET_SELECTOR event_id='
-			           . $post->ID
-			           . ']">';
+					   . $post->ID
+					   . ']">';
 		}
 		return $return;
 	}
@@ -1045,8 +1045,8 @@ 
 			//if we have an id then let's get existing object first and then set the new values.  Otherwise we instantiate a new object for save.
 			if ( ! empty( $dtt['DTT_ID'] ) ) {
 				$DTM = EE_Registry::instance()
-				                  ->load_model( 'Datetime', array( $evtobj->get_timezone() ) )
-				                  ->get_one_by_ID( $dtt['DTT_ID'] );
+								  ->load_model( 'Datetime', array( $evtobj->get_timezone() ) )
+								  ->get_one_by_ID( $dtt['DTT_ID'] );
 				$DTM->set_date_format( $incoming_date_formats[0] );
 				$DTM->set_time_format( $incoming_date_formats[1] );
 				foreach ( $datetime_values as $field => $value ) {
@@ -1144,7 +1144,7 @@ 
 					) > 0 ? true : false;
 					//let's just check the total price for the existing ticket and determine if it matches the new total price.  if they are different then we create a new ticket (if tkts sold) if they aren't different then we go ahead and modify existing ticket.
 					$create_new_TKT = $ticket_sold && $ticket_price != $TKT->get( 'TKT_price' )
-					                  && ! $TKT->get(
+									  && ! $TKT->get(
 						'TKT_deleted'
 					) ? true : false;
 					$TKT->set_date_format( $incoming_date_formats[0] );
@@ -1454,7 +1454,7 @@ 
 		$first_datetime = reset( $times );
 		//do we get related tickets?
 		if ( $first_datetime instanceof EE_Datetime
-		     && $first_datetime->ID() !== 0
+			 && $first_datetime->ID() !== 0
 		) {
 			$existing_datetime_ids[] = $first_datetime->get( 'DTT_ID' );
 			$template_args['time'] = $first_datetime;
@@ -1529,7 +1529,7 @@ 
 			'edit_ticketrow_name' => $skeleton ? 'TICKETNAMEATTR' : 'edit_tickets',
 			'TKT_sold'            => $skeleton ? 0 : $ticket->get( 'TKT_sold' ),
 			'trash_icon'          => ( $skeleton || ( ! empty( $ticket ) && ! $ticket->get( 'TKT_deleted' ) ) )
-			                         && ( ! empty( $ticket ) && $ticket->get( 'TKT_sold' ) === 0 )
+									 && ( ! empty( $ticket ) && $ticket->get( 'TKT_sold' ) === 0 )
 				? 'trash-icon dashicons dashicons-post-trash clickable' : 'ee-lock-icon',
 			'disabled'            => $skeleton || ( ! empty( $ticket ) && ! $ticket->get( 'TKT_deleted' ) ) ? ''
 				: ' disabled=disabled',
@@ -1695,8 +1695,8 @@ 
 			$DateTime = new DateTime( $now, new DateTimeZone( EEM_Event::instance()->get_timezone() ) );
 			$start = $DateTime->setTime( 0, 0, 0 )->format( implode( ' ', $start_formats ) );
 			$end = $DateTime->setDate( date( 'Y' ), date( 'm' ), $DateTime->format( 't' ) )
-			                ->setTime( 23, 59, 59 )
-			                ->format( implode( ' ', $start_formats ) );
+							->setTime( 23, 59, 59 )
+							->format( implode( ' ', $start_formats ) );
 			$where['Datetime.DTT_EVT_start'] = array( 'BETWEEN', array( $start, $end ) );
 		}
 		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_events', 'get_events' ) ) {
@@ -1716,7 +1716,7 @@ 
 		}
 		if ( isset( $this->_req_data['EVT_wp_user'] ) ) {
 			if ( $this->_req_data['EVT_wp_user'] != get_current_user_id()
-			     && EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_events', 'get_events' )
+				 && EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_events', 'get_events' )
 			) {
 				$where['EVT_wp_user'] = $this->_req_data['EVT_wp_user'];
 			}
@@ -2213,13 +2213,13 @@ 
 	protected function _template_settings() {
 		$this->_admin_page_title = esc_html__( 'Template Settings (Preview)', 'event_espresso' );
 		$this->_template_args['preview_img'] = '<img src="'
-		                                       . EVENTS_ASSETS_URL
-		                                       . DS
-		                                       . 'images'
-		                                       . DS
-		                                       . 'caffeinated_template_features.jpg" alt="'
-		                                       . esc_attr__( 'Template Settings Preview screenshot', 'event_espresso' )
-		                                       . '" />';
+											   . EVENTS_ASSETS_URL
+											   . DS
+											   . 'images'
+											   . DS
+											   . 'caffeinated_template_features.jpg" alt="'
+											   . esc_attr__( 'Template Settings Preview screenshot', 'event_espresso' )
+											   . '" />';
 		$this->_template_args['preview_text'] = '<strong>' . esc_html__(
 				'Template Settings is a feature that is only available in the Caffeinated version of Event Espresso. Template Settings allow you to configure some of the appearance options for both the Event List and Event Details pages.',
 				'event_espresso'

Spacing +591 added lines, -591 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'NO direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('NO direct script access allowed');
 }
 
 
@@ -63,7 +63,7 @@ 
 		);
 		add_action(
 			'AHEE__EE_Admin_Page_CPT__set_model_object__after_set_object',
-			array( $this, 'verify_event_edit' )
+			array($this, 'verify_event_edit')
 		);
 	}
 
@@ -79,22 +79,22 @@ 
 		$this->_admin_page_title = EVENTS_LABEL;
 		$this->_labels = array(
 			'buttons'      => array(
-				'add'             => esc_html__( 'Add New Event', 'event_espresso' ),
-				'edit'            => esc_html__( 'Edit Event', 'event_espresso' ),
-				'delete'          => esc_html__( 'Delete Event', 'event_espresso' ),
-				'add_category'    => esc_html__( 'Add New Category', 'event_espresso' ),
-				'edit_category'   => esc_html__( 'Edit Category', 'event_espresso' ),
-				'delete_category' => esc_html__( 'Delete Category', 'event_espresso' ),
+				'add'             => esc_html__('Add New Event', 'event_espresso'),
+				'edit'            => esc_html__('Edit Event', 'event_espresso'),
+				'delete'          => esc_html__('Delete Event', 'event_espresso'),
+				'add_category'    => esc_html__('Add New Category', 'event_espresso'),
+				'edit_category'   => esc_html__('Edit Category', 'event_espresso'),
+				'delete_category' => esc_html__('Delete Category', 'event_espresso'),
 			),
 			'editor_title' => array(
-				'espresso_events' => esc_html__( 'Enter event title here', 'event_espresso' ),
+				'espresso_events' => esc_html__('Enter event title here', 'event_espresso'),
 			),
 			'publishbox'   => array(
-				'create_new'        => esc_html__( 'Save New Event', 'event_espresso' ),
-				'edit'              => esc_html__( 'Update Event', 'event_espresso' ),
-				'add_category'      => esc_html__( 'Save New Category', 'event_espresso' ),
-				'edit_category'     => esc_html__( 'Update Category', 'event_espresso' ),
-				'template_settings' => esc_html__( 'Update Settings', 'event_espresso' ),
+				'create_new'        => esc_html__('Save New Event', 'event_espresso'),
+				'edit'              => esc_html__('Update Event', 'event_espresso'),
+				'add_category'      => esc_html__('Save New Category', 'event_espresso'),
+				'edit_category'     => esc_html__('Update Category', 'event_espresso'),
+				'template_settings' => esc_html__('Update Settings', 'event_espresso'),
 			),
 		);
 	}
@@ -105,9 +105,9 @@ 
 		//load formatter helper
 		//load field generator helper
 		//is there a evt_id in the request?
-		$evt_id = ! empty( $this->_req_data['EVT_ID'] ) && ! is_array( $this->_req_data['EVT_ID'] )
+		$evt_id = ! empty($this->_req_data['EVT_ID']) && ! is_array($this->_req_data['EVT_ID'])
 			? $this->_req_data['EVT_ID'] : 0;
-		$evt_id = ! empty( $this->_req_data['post'] ) ? $this->_req_data['post'] : $evt_id;
+		$evt_id = ! empty($this->_req_data['post']) ? $this->_req_data['post'] : $evt_id;
 		$this->_page_routes = array(
 			'default'                       => array(
 				'func'       => '_events_overview_list_table',
@@ -130,27 +130,27 @@ 
 			),
 			'trash_event'                   => array(
 				'func'       => '_trash_or_restore_event',
-				'args'       => array( 'event_status' => 'trash' ),
+				'args'       => array('event_status' => 'trash'),
 				'capability' => 'ee_delete_event',
 				'obj_id'     => $evt_id,
 				'noheader'   => true,
 			),
 			'trash_events'                  => array(
 				'func'       => '_trash_or_restore_events',
-				'args'       => array( 'event_status' => 'trash' ),
+				'args'       => array('event_status' => 'trash'),
 				'capability' => 'ee_delete_events',
 				'noheader'   => true,
 			),
 			'restore_event'                 => array(
 				'func'       => '_trash_or_restore_event',
-				'args'       => array( 'event_status' => 'draft' ),
+				'args'       => array('event_status' => 'draft'),
 				'capability' => 'ee_delete_event',
 				'obj_id'     => $evt_id,
 				'noheader'   => true,
 			),
 			'restore_events'                => array(
 				'func'       => '_trash_or_restore_events',
-				'args'       => array( 'event_status' => 'draft' ),
+				'args'       => array('event_status' => 'draft'),
 				'capability' => 'ee_delete_events',
 				'noheader'   => true,
 			),
@@ -186,12 +186,12 @@ 
 			'add_category'                  => array(
 				'func'       => '_category_details',
 				'capability' => 'ee_edit_event_category',
-				'args'       => array( 'add' ),
+				'args'       => array('add'),
 			),
 			'edit_category'                 => array(
 				'func'       => '_category_details',
 				'capability' => 'ee_edit_event_category',
-				'args'       => array( 'edit' ),
+				'args'       => array('edit'),
 			),
 			'delete_categories'             => array(
 				'func'       => '_delete_categories',
@@ -205,13 +205,13 @@ 
 			),
 			'insert_category' => array(
 				'func'       => '_insert_or_update_category',
-				'args'       => array( 'new_category' => true ),
+				'args'       => array('new_category' => true),
 				'capability' => 'ee_edit_event_category',
 				'noheader'   => true,
 			),
 			'update_category' => array(
 				'func'       => '_insert_or_update_category',
-				'args'       => array( 'new_category' => false ),
+				'args'       => array('new_category' => false),
 				'capability' => 'ee_edit_event_category',
 				'noheader'   => true,
 			),
@@ -228,29 +228,29 @@ 
 		$this->_page_config = array(
 			'default'                => array(
 				'nav'           => array(
-					'label' => esc_html__( 'Overview', 'event_espresso' ),
+					'label' => esc_html__('Overview', 'event_espresso'),
 					'order' => 10,
 				),
 				'list_table'    => 'Events_Admin_List_Table',
 				'help_tabs'     => array(
 					'events_overview_help_tab'                       => array(
-						'title'    => esc_html__( 'Events Overview', 'event_espresso' ),
+						'title'    => esc_html__('Events Overview', 'event_espresso'),
 						'filename' => 'events_overview',
 					),
 					'events_overview_table_column_headings_help_tab' => array(
-						'title'    => esc_html__( 'Events Overview Table Column Headings', 'event_espresso' ),
+						'title'    => esc_html__('Events Overview Table Column Headings', 'event_espresso'),
 						'filename' => 'events_overview_table_column_headings',
 					),
 					'events_overview_filters_help_tab'               => array(
-						'title'    => esc_html__( 'Events Overview Filters', 'event_espresso' ),
+						'title'    => esc_html__('Events Overview Filters', 'event_espresso'),
 						'filename' => 'events_overview_filters',
 					),
 					'events_overview_view_help_tab'                  => array(
-						'title'    => esc_html__( 'Events Overview Views', 'event_espresso' ),
+						'title'    => esc_html__('Events Overview Views', 'event_espresso'),
 						'filename' => 'events_overview_views',
 					),
 					'events_overview_other_help_tab'                 => array(
-						'title'    => esc_html__( 'Events Overview Other', 'event_espresso' ),
+						'title'    => esc_html__('Events Overview Other', 'event_espresso'),
 						'filename' => 'events_overview_other',
 					),
 				),
@@ -265,218 +265,218 @@ 
 			),
 			'create_new'             => array(
 				'nav'           => array(
-					'label'      => esc_html__( 'Add Event', 'event_espresso' ),
+					'label'      => esc_html__('Add Event', 'event_espresso'),
 					'order'      => 5,
 					'persistent' => false,
 				),
-				'metaboxes'     => array( '_register_event_editor_meta_boxes' ),
+				'metaboxes'     => array('_register_event_editor_meta_boxes'),
 				'help_tabs'     => array(
 					'event_editor_help_tab'                            => array(
-						'title'    => esc_html__( 'Event Editor', 'event_espresso' ),
+						'title'    => esc_html__('Event Editor', 'event_espresso'),
 						'filename' => 'event_editor',
 					),
 					'event_editor_title_richtexteditor_help_tab'       => array(
-						'title'    => esc_html__( 'Event Title & Rich Text Editor', 'event_espresso' ),
+						'title'    => esc_html__('Event Title & Rich Text Editor', 'event_espresso'),
 						'filename' => 'event_editor_title_richtexteditor',
 					),
 					'event_editor_venue_details_help_tab'              => array(
-						'title'    => esc_html__( 'Event Venue Details', 'event_espresso' ),
+						'title'    => esc_html__('Event Venue Details', 'event_espresso'),
 						'filename' => 'event_editor_venue_details',
 					),
 					'event_editor_event_datetimes_help_tab'            => array(
-						'title'    => esc_html__( 'Event Datetimes', 'event_espresso' ),
+						'title'    => esc_html__('Event Datetimes', 'event_espresso'),
 						'filename' => 'event_editor_event_datetimes',
 					),
 					'event_editor_event_tickets_help_tab'              => array(
-						'title'    => esc_html__( 'Event Tickets', 'event_espresso' ),
+						'title'    => esc_html__('Event Tickets', 'event_espresso'),
 						'filename' => 'event_editor_event_tickets',
 					),
 					'event_editor_event_registration_options_help_tab' => array(
-						'title'    => esc_html__( 'Event Registration Options', 'event_espresso' ),
+						'title'    => esc_html__('Event Registration Options', 'event_espresso'),
 						'filename' => 'event_editor_event_registration_options',
 					),
 					'event_editor_tags_categories_help_tab'            => array(
-						'title'    => esc_html__( 'Event Tags & Categories', 'event_espresso' ),
+						'title'    => esc_html__('Event Tags & Categories', 'event_espresso'),
 						'filename' => 'event_editor_tags_categories',
 					),
 					'event_editor_questions_registrants_help_tab'      => array(
-						'title'    => esc_html__( 'Questions for Registrants', 'event_espresso' ),
+						'title'    => esc_html__('Questions for Registrants', 'event_espresso'),
 						'filename' => 'event_editor_questions_registrants',
 					),
 					'event_editor_save_new_event_help_tab'             => array(
-						'title'    => esc_html__( 'Save New Event', 'event_espresso' ),
+						'title'    => esc_html__('Save New Event', 'event_espresso'),
 						'filename' => 'event_editor_save_new_event',
 					),
 					'event_editor_other_help_tab'                      => array(
-						'title'    => esc_html__( 'Event Other', 'event_espresso' ),
+						'title'    => esc_html__('Event Other', 'event_espresso'),
 						'filename' => 'event_editor_other',
 					),
 				),
 				'help_tour'     => array(
 					'Event_Editor_Help_Tour',
 				),
-				'qtips'         => array( 'EE_Event_Editor_Decaf_Tips' ),
+				'qtips'         => array('EE_Event_Editor_Decaf_Tips'),
 				'require_nonce' => false,
 			),
 			'edit'                   => array(
 				'nav'           => array(
-					'label'      => esc_html__( 'Edit Event', 'event_espresso' ),
+					'label'      => esc_html__('Edit Event', 'event_espresso'),
 					'order'      => 5,
 					'persistent' => false,
-					'url'        => isset( $this->_req_data['post'] )
+					'url'        => isset($this->_req_data['post'])
 						? EE_Admin_Page::add_query_args_and_nonce(
-							array( 'post' => $this->_req_data['post'], 'action' => 'edit' ),
+							array('post' => $this->_req_data['post'], 'action' => 'edit'),
 							$this->_current_page_view_url
 						)
 						: $this->_admin_base_url,
 				),
-				'metaboxes'     => array( '_register_event_editor_meta_boxes' ),
+				'metaboxes'     => array('_register_event_editor_meta_boxes'),
 				'help_tabs'     => array(
 					'event_editor_help_tab'                            => array(
-						'title'    => esc_html__( 'Event Editor', 'event_espresso' ),
+						'title'    => esc_html__('Event Editor', 'event_espresso'),
 						'filename' => 'event_editor',
 					),
 					'event_editor_title_richtexteditor_help_tab'       => array(
-						'title'    => esc_html__( 'Event Title & Rich Text Editor', 'event_espresso' ),
+						'title'    => esc_html__('Event Title & Rich Text Editor', 'event_espresso'),
 						'filename' => 'event_editor_title_richtexteditor',
 					),
 					'event_editor_venue_details_help_tab'              => array(
-						'title'    => esc_html__( 'Event Venue Details', 'event_espresso' ),
+						'title'    => esc_html__('Event Venue Details', 'event_espresso'),
 						'filename' => 'event_editor_venue_details',
 					),
 					'event_editor_event_datetimes_help_tab'            => array(
-						'title'    => esc_html__( 'Event Datetimes', 'event_espresso' ),
+						'title'    => esc_html__('Event Datetimes', 'event_espresso'),
 						'filename' => 'event_editor_event_datetimes',
 					),
 					'event_editor_event_tickets_help_tab'              => array(
-						'title'    => esc_html__( 'Event Tickets', 'event_espresso' ),
+						'title'    => esc_html__('Event Tickets', 'event_espresso'),
 						'filename' => 'event_editor_event_tickets',
 					),
 					'event_editor_event_registration_options_help_tab' => array(
-						'title'    => esc_html__( 'Event Registration Options', 'event_espresso' ),
+						'title'    => esc_html__('Event Registration Options', 'event_espresso'),
 						'filename' => 'event_editor_event_registration_options',
 					),
 					'event_editor_tags_categories_help_tab'            => array(
-						'title'    => esc_html__( 'Event Tags & Categories', 'event_espresso' ),
+						'title'    => esc_html__('Event Tags & Categories', 'event_espresso'),
 						'filename' => 'event_editor_tags_categories',
 					),
 					'event_editor_questions_registrants_help_tab'      => array(
-						'title'    => esc_html__( 'Questions for Registrants', 'event_espresso' ),
+						'title'    => esc_html__('Questions for Registrants', 'event_espresso'),
 						'filename' => 'event_editor_questions_registrants',
 					),
 					'event_editor_save_new_event_help_tab'             => array(
-						'title'    => esc_html__( 'Save New Event', 'event_espresso' ),
+						'title'    => esc_html__('Save New Event', 'event_espresso'),
 						'filename' => 'event_editor_save_new_event',
 					),
 					'event_editor_other_help_tab'                      => array(
-						'title'    => esc_html__( 'Event Other', 'event_espresso' ),
+						'title'    => esc_html__('Event Other', 'event_espresso'),
 						'filename' => 'event_editor_other',
 					),
 				),
 				/*'help_tour' => array(
 					'Event_Edit_Help_Tour'
 				),*/
-				'qtips'         => array( 'EE_Event_Editor_Decaf_Tips' ),
+				'qtips'         => array('EE_Event_Editor_Decaf_Tips'),
 				'require_nonce' => false,
 			),
 			'default_event_settings' => array(
 				'nav'           => array(
-					'label' => esc_html__( 'Default Settings', 'event_espresso' ),
+					'label' => esc_html__('Default Settings', 'event_espresso'),
 					'order' => 40,
 				),
-				'metaboxes'     => array_merge( $this->_default_espresso_metaboxes, array( '_publish_post_box' ) ),
+				'metaboxes'     => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
 				'labels'        => array(
-					'publishbox' => esc_html__( 'Update Settings', 'event_espresso' ),
+					'publishbox' => esc_html__('Update Settings', 'event_espresso'),
 				),
 				'help_tabs'     => array(
 					'default_settings_help_tab'        => array(
-						'title'    => esc_html__( 'Default Event Settings', 'event_espresso' ),
+						'title'    => esc_html__('Default Event Settings', 'event_espresso'),
 						'filename' => 'events_default_settings',
 					),
 					'default_settings_status_help_tab' => array(
-						'title'    => esc_html__( 'Default Registration Status', 'event_espresso' ),
+						'title'    => esc_html__('Default Registration Status', 'event_espresso'),
 						'filename' => 'events_default_settings_status',
 					),
 				),
-				'help_tour'     => array( 'Event_Default_Settings_Help_Tour' ),
+				'help_tour'     => array('Event_Default_Settings_Help_Tour'),
 				'require_nonce' => false,
 			),
 			//template settings
 			'template_settings'      => array(
 				'nav'           => array(
-					'label' => esc_html__( 'Templates', 'event_espresso' ),
+					'label' => esc_html__('Templates', 'event_espresso'),
 					'order' => 30,
 				),
 				'metaboxes'     => $this->_default_espresso_metaboxes,
 				'help_tabs'     => array(
 					'general_settings_templates_help_tab' => array(
-						'title'    => esc_html__( 'Templates', 'event_espresso' ),
+						'title'    => esc_html__('Templates', 'event_espresso'),
 						'filename' => 'general_settings_templates',
 					),
 				),
-				'help_tour'     => array( 'Templates_Help_Tour' ),
+				'help_tour'     => array('Templates_Help_Tour'),
 				'require_nonce' => false,
 			),
 			//event category stuff
 			'add_category'           => array(
 				'nav'           => array(
-					'label'      => esc_html__( 'Add Category', 'event_espresso' ),
+					'label'      => esc_html__('Add Category', 'event_espresso'),
 					'order'      => 15,
 					'persistent' => false,
 				),
 				'help_tabs'     => array(
 					'add_category_help_tab' => array(
-						'title'    => esc_html__( 'Add New Event Category', 'event_espresso' ),
+						'title'    => esc_html__('Add New Event Category', 'event_espresso'),
 						'filename' => 'events_add_category',
 					),
 				),
-				'help_tour'     => array( 'Event_Add_Category_Help_Tour' ),
-				'metaboxes'     => array( '_publish_post_box' ),
+				'help_tour'     => array('Event_Add_Category_Help_Tour'),
+				'metaboxes'     => array('_publish_post_box'),
 				'require_nonce' => false,
 			),
 			'edit_category'          => array(
 				'nav'           => array(
-					'label'      => esc_html__( 'Edit Category', 'event_espresso' ),
+					'label'      => esc_html__('Edit Category', 'event_espresso'),
 					'order'      => 15,
 					'persistent' => false,
-					'url'        => isset( $this->_req_data['EVT_CAT_ID'] )
+					'url'        => isset($this->_req_data['EVT_CAT_ID'])
 						? add_query_arg(
-							array( 'EVT_CAT_ID' => $this->_req_data['EVT_CAT_ID'] ),
+							array('EVT_CAT_ID' => $this->_req_data['EVT_CAT_ID']),
 							$this->_current_page_view_url
 						)
 						: $this->_admin_base_url,
 				),
 				'help_tabs'     => array(
 					'edit_category_help_tab' => array(
-						'title'    => esc_html__( 'Edit Event Category', 'event_espresso' ),
+						'title'    => esc_html__('Edit Event Category', 'event_espresso'),
 						'filename' => 'events_edit_category',
 					),
 				),
 				/*'help_tour' => array('Event_Edit_Category_Help_Tour'),*/
-				'metaboxes'     => array( '_publish_post_box' ),
+				'metaboxes'     => array('_publish_post_box'),
 				'require_nonce' => false,
 			),
 			'category_list'          => array(
 				'nav'           => array(
-					'label' => esc_html__( 'Categories', 'event_espresso' ),
+					'label' => esc_html__('Categories', 'event_espresso'),
 					'order' => 20,
 				),
 				'list_table'    => 'Event_Categories_Admin_List_Table',
 				'help_tabs'     => array(
 					'events_categories_help_tab'                       => array(
-						'title'    => esc_html__( 'Event Categories', 'event_espresso' ),
+						'title'    => esc_html__('Event Categories', 'event_espresso'),
 						'filename' => 'events_categories',
 					),
 					'events_categories_table_column_headings_help_tab' => array(
-						'title'    => esc_html__( 'Event Categories Table Column Headings', 'event_espresso' ),
+						'title'    => esc_html__('Event Categories Table Column Headings', 'event_espresso'),
 						'filename' => 'events_categories_table_column_headings',
 					),
 					'events_categories_view_help_tab'                  => array(
-						'title'    => esc_html__( 'Event Categories Views', 'event_espresso' ),
+						'title'    => esc_html__('Event Categories Views', 'event_espresso'),
 						'filename' => 'events_categories_views',
 					),
 					'events_categories_other_help_tab'                 => array(
-						'title'    => esc_html__( 'Event Categories Other', 'event_espresso' ),
+						'title'    => esc_html__('Event Categories Other', 'event_espresso'),
 						'filename' => 'events_categories_other',
 					),
 				),
@@ -505,7 +505,7 @@ 
 
 	protected function _add_screen_options_category_list() {
 		$page_title = $this->_admin_page_title;
-		$this->_admin_page_title = esc_html__( 'Categories', 'event_espresso' );
+		$this->_admin_page_title = esc_html__('Categories', 'event_espresso');
 		$this->_per_page_screen_option();
 		$this->_admin_page_title = $page_title;
 	}
@@ -521,20 +521,20 @@ 
 	public function load_scripts_styles() {
 		wp_register_style(
 			'events-admin-css',
-			EVENTS_ASSETS_URL . 'events-admin-page.css',
+			EVENTS_ASSETS_URL.'events-admin-page.css',
 			array(),
 			EVENT_ESPRESSO_VERSION
 		);
-		wp_register_style( 'ee-cat-admin', EVENTS_ASSETS_URL . 'ee-cat-admin.css', array(), EVENT_ESPRESSO_VERSION );
-		wp_enqueue_style( 'events-admin-css' );
-		wp_enqueue_style( 'ee-cat-admin' );
+		wp_register_style('ee-cat-admin', EVENTS_ASSETS_URL.'ee-cat-admin.css', array(), EVENT_ESPRESSO_VERSION);
+		wp_enqueue_style('events-admin-css');
+		wp_enqueue_style('ee-cat-admin');
 		//todo note: we also need to load_scripts_styles per view (i.e. default/view_report/event_details
 		//registers for all views
 		//scripts
 		wp_register_script(
 			'event_editor_js',
-			EVENTS_ASSETS_URL . 'event_editor.js',
-			array( 'ee_admin_js', 'jquery-ui-slider', 'jquery-ui-timepicker-addon' ),
+			EVENTS_ASSETS_URL.'event_editor.js',
+			array('ee_admin_js', 'jquery-ui-slider', 'jquery-ui-timepicker-addon'),
 			EVENT_ESPRESSO_VERSION,
 			true
 		);
@@ -560,22 +560,22 @@ 
 	 */
 	public function load_scripts_styles_edit() {
 		//styles
-		wp_enqueue_style( 'espresso-ui-theme' );
+		wp_enqueue_style('espresso-ui-theme');
 		wp_register_style(
 			'event-editor-css',
-			EVENTS_ASSETS_URL . 'event-editor.css',
-			array( 'ee-admin-css' ),
+			EVENTS_ASSETS_URL.'event-editor.css',
+			array('ee-admin-css'),
 			EVENT_ESPRESSO_VERSION
 		);
-		wp_enqueue_style( 'event-editor-css' );
+		wp_enqueue_style('event-editor-css');
 		//scripts
 		wp_register_script(
 			'event-datetime-metabox',
-			EVENTS_ASSETS_URL . 'event-datetime-metabox.js',
-			array( 'event_editor_js', 'ee-datepicker' ),
+			EVENTS_ASSETS_URL.'event-datetime-metabox.js',
+			array('event_editor_js', 'ee-datepicker'),
 			EVENT_ESPRESSO_VERSION
 		);
-		wp_enqueue_script( 'event-datetime-metabox' );
+		wp_enqueue_script('event-datetime-metabox');
 	}
 
 
@@ -595,10 +595,10 @@ 
 		$this->_views = array(
 			'all' => array(
 				'slug'        => 'all',
-				'label'       => esc_html__( 'All', 'event_espresso' ),
+				'label'       => esc_html__('All', 'event_espresso'),
 				'count'       => 0,
 				'bulk_action' => array(
-					'delete_categories' => esc_html__( 'Delete Permanently', 'event_espresso' ),
+					'delete_categories' => esc_html__('Delete Permanently', 'event_espresso'),
 				),
 			),
 		);
@@ -634,14 +634,14 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public function verify_event_edit( $event = null ) {
+	public function verify_event_edit($event = null) {
 		// no event?
-		if ( empty( $event ) ) {
+		if (empty($event)) {
 			// set event
 			$event = $this->_cpt_model_obj;
 		}
 		// STILL no event?
-		if ( empty ( $event ) ) {
+		if (empty ($event)) {
 			return;
 		}
 		$orig_status = $event->status();
@@ -655,32 +655,32 @@ 
 			return;
 		}
 		//made it here so it IS active... next check that any of the tickets are sold.
-		if ( $event->is_sold_out( true ) ) {
-			if ( $orig_status !== EEM_Event::sold_out && $event->status() !== $orig_status ) {
+		if ($event->is_sold_out(true)) {
+			if ($orig_status !== EEM_Event::sold_out && $event->status() !== $orig_status) {
 				EE_Error::add_attention(
 					sprintf(
 						esc_html__(
 							'Please note that the Event Status has automatically been changed to %s because there are no more spaces available for this event.  However, this change is not permanent until you update the event.  You can change the status back to something else before updating if you wish.',
 							'event_espresso'
 						),
-						EEH_Template::pretty_status( EEM_Event::sold_out, false, 'sentence' )
+						EEH_Template::pretty_status(EEM_Event::sold_out, false, 'sentence')
 					)
 				);
 			}
 			return;
-		} else if ( $orig_status === EEM_Event::sold_out ) {
+		} else if ($orig_status === EEM_Event::sold_out) {
 			EE_Error::add_attention(
 				sprintf(
 					esc_html__(
 						'Please note that the Event Status has automatically been changed to %s because more spaces have become available for this event, most likely due to abandoned transactions freeing up reserved tickets.  However, this change is not permanent until you update the event. If you wish, you can change the status back to something else before updating.',
 						'event_espresso'
 					),
-					EEH_Template::pretty_status( $event->status(), false, 'sentence' )
+					EEH_Template::pretty_status($event->status(), false, 'sentence')
 				)
 			);
 		}
 		//now we need to determine if the event has any tickets on sale.  If not then we dont' show the error
-		if ( ! $event->tickets_on_sale() ) {
+		if ( ! $event->tickets_on_sale()) {
 			return;
 		}
 		//made it here so show warning
@@ -698,7 +698,7 @@ 
 	 */
 	protected function _edit_event_warning() {
 		// we don't want to add warnings during these requests
-		if ( isset( $this->_req_data['action'] ) && $this->_req_data['action'] === 'editpost' ) {
+		if (isset($this->_req_data['action']) && $this->_req_data['action'] === 'editpost') {
 			return;
 		}
 		EE_Error::add_attention(
@@ -715,29 +715,29 @@ 
 		$this->_views = array(
 			'all'   => array(
 				'slug'        => 'all',
-				'label'       => esc_html__( 'View All Events', 'event_espresso' ),
+				'label'       => esc_html__('View All Events', 'event_espresso'),
 				'count'       => 0,
 				'bulk_action' => array(
-					'trash_events' => esc_html__( 'Move to Trash', 'event_espresso' ),
+					'trash_events' => esc_html__('Move to Trash', 'event_espresso'),
 				),
 			),
 			'draft' => array(
 				'slug'        => 'draft',
-				'label'       => esc_html__( 'Draft', 'event_espresso' ),
+				'label'       => esc_html__('Draft', 'event_espresso'),
 				'count'       => 0,
 				'bulk_action' => array(
-					'trash_events' => esc_html__( 'Move to Trash', 'event_espresso' ),
+					'trash_events' => esc_html__('Move to Trash', 'event_espresso'),
 				),
 			),
 		);
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_events', 'espresso_events_trash_events' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_events', 'espresso_events_trash_events')) {
 			$this->_views['trash'] = array(
 				'slug'        => 'trash',
-				'label'       => esc_html__( 'Trash', 'event_espresso' ),
+				'label'       => esc_html__('Trash', 'event_espresso'),
 				'count'       => 0,
 				'bulk_action' => array(
-					'restore_events' => esc_html__( 'Restore From Trash', 'event_espresso' ),
-					'delete_events'  => esc_html__( 'Delete Permanently', 'event_espresso' ),
+					'restore_events' => esc_html__('Restore From Trash', 'event_espresso'),
+					'delete_events'  => esc_html__('Delete Permanently', 'event_espresso'),
 				),
 			);
 		}
@@ -752,50 +752,50 @@ 
 		$items = array(
 			'view_details'   => array(
 				'class' => 'dashicons dashicons-search',
-				'desc'  => esc_html__( 'View Event', 'event_espresso' ),
+				'desc'  => esc_html__('View Event', 'event_espresso'),
 			),
 			'edit_event'     => array(
 				'class' => 'ee-icon ee-icon-calendar-edit',
-				'desc'  => esc_html__( 'Edit Event Details', 'event_espresso' ),
+				'desc'  => esc_html__('Edit Event Details', 'event_espresso'),
 			),
 			'view_attendees' => array(
 				'class' => 'dashicons dashicons-groups',
-				'desc'  => esc_html__( 'View Registrations for Event', 'event_espresso' ),
+				'desc'  => esc_html__('View Registrations for Event', 'event_espresso'),
 			),
 		);
-		$items = apply_filters( 'FHEE__Events_Admin_Page___event_legend_items__items', $items );
+		$items = apply_filters('FHEE__Events_Admin_Page___event_legend_items__items', $items);
 		$statuses = array(
 			'sold_out_status'  => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::sold_out,
-				'desc'  => EEH_Template::pretty_status( EE_Datetime::sold_out, false, 'sentence' ),
+				'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::sold_out,
+				'desc'  => EEH_Template::pretty_status(EE_Datetime::sold_out, false, 'sentence'),
 			),
 			'active_status'    => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::active,
-				'desc'  => EEH_Template::pretty_status( EE_Datetime::active, false, 'sentence' ),
+				'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::active,
+				'desc'  => EEH_Template::pretty_status(EE_Datetime::active, false, 'sentence'),
 			),
 			'upcoming_status'  => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::upcoming,
-				'desc'  => EEH_Template::pretty_status( EE_Datetime::upcoming, false, 'sentence' ),
+				'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::upcoming,
+				'desc'  => EEH_Template::pretty_status(EE_Datetime::upcoming, false, 'sentence'),
 			),
 			'postponed_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::postponed,
-				'desc'  => EEH_Template::pretty_status( EE_Datetime::postponed, false, 'sentence' ),
+				'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::postponed,
+				'desc'  => EEH_Template::pretty_status(EE_Datetime::postponed, false, 'sentence'),
 			),
 			'cancelled_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::cancelled,
-				'desc'  => EEH_Template::pretty_status( EE_Datetime::cancelled, false, 'sentence' ),
+				'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::cancelled,
+				'desc'  => EEH_Template::pretty_status(EE_Datetime::cancelled, false, 'sentence'),
 			),
 			'expired_status'   => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::expired,
-				'desc'  => EEH_Template::pretty_status( EE_Datetime::expired, false, 'sentence' ),
+				'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::expired,
+				'desc'  => EEH_Template::pretty_status(EE_Datetime::expired, false, 'sentence'),
 			),
 			'inactive_status'  => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::inactive,
-				'desc'  => EEH_Template::pretty_status( EE_Datetime::inactive, false, 'sentence' ),
+				'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::inactive,
+				'desc'  => EEH_Template::pretty_status(EE_Datetime::inactive, false, 'sentence'),
 			),
 		);
-		$statuses = apply_filters( 'FHEE__Events_Admin_Page__event_legend_items__statuses', $statuses );
-		return array_merge( $items, $statuses );
+		$statuses = apply_filters('FHEE__Events_Admin_Page__event_legend_items__statuses', $statuses);
+		return array_merge($items, $statuses);
 	}
 
 
@@ -806,8 +806,8 @@ 
 	 * @return EEM_Event
 	 */
 	private function _event_model() {
-		if ( ! $this->_event_model instanceof EEM_Event ) {
-			$this->_event_model = EE_Registry::instance()->load_model( 'Event' );
+		if ( ! $this->_event_model instanceof EEM_Event) {
+			$this->_event_model = EE_Registry::instance()->load_model('Event');
 		}
 		return $this->_event_model;
 	}
@@ -824,12 +824,12 @@ 
 	 * @param  string $new_slug  what the slug is
 	 * @return string            The new html string for the permalink area
 	 */
-	public function extra_permalink_field_buttons( $return, $id, $new_title, $new_slug ) {
+	public function extra_permalink_field_buttons($return, $id, $new_title, $new_slug) {
 		//make sure this is only when editing
-		if ( ! empty( $id ) ) {
-			$post = get_post( $id );
+		if ( ! empty($id)) {
+			$post = get_post($id);
 			$return .= '<a class="button button-small" onclick="prompt(\'Shortcode:\', jQuery(\'#shortcode\').val()); return false;" href="#"  tabindex="-1">'
-			           . esc_html__( 'Shortcode', 'event_espresso' )
+			           . esc_html__('Shortcode', 'event_espresso')
 			           . '</a> ';
 			$return .= '<input id="shortcode" type="hidden" value="[ESPRESSO_TICKET_SELECTOR event_id='
 			           . $post->ID
@@ -848,14 +848,14 @@ 
 	 * @return void
 	 */
 	protected function _events_overview_list_table() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		$this->_template_args['after_list_table'] = EEH_Template::get_button_or_link(
-			get_post_type_archive_link( 'espresso_events' ),
-			esc_html__( "View Event Archive Page", "event_espresso" ),
+			get_post_type_archive_link('espresso_events'),
+			esc_html__("View Event Archive Page", "event_espresso"),
 			'button'
 		);
-		$this->_template_args['after_list_table'] .= $this->_display_legend( $this->_event_legend_items() );
-		$this->_admin_page_title .= ' ' . $this->get_action_link_or_button(
+		$this->_template_args['after_list_table'] .= $this->_display_legend($this->_event_legend_items());
+		$this->_admin_page_title .= ' '.$this->get_action_link_or_button(
 				'create_new',
 				'add',
 				array(),
@@ -881,48 +881,48 @@ 
 	 * @param string $post_id
 	 * @param object $post
 	 */
-	protected function _insert_update_cpt_item( $post_id, $post ) {
-		if ( $post instanceof WP_Post && $post->post_type !== 'espresso_events' ) {
+	protected function _insert_update_cpt_item($post_id, $post) {
+		if ($post instanceof WP_Post && $post->post_type !== 'espresso_events') {
 			//get out we're not processing an event save.
 			return;
 		}
 		$event_values = array(
-			'EVT_display_desc'                => ! empty( $this->_req_data['display_desc'] ) ? 1 : 0,
-			'EVT_display_ticket_selector'     => ! empty( $this->_req_data['display_ticket_selector'] ) ? 1 : 0,
+			'EVT_display_desc'                => ! empty($this->_req_data['display_desc']) ? 1 : 0,
+			'EVT_display_ticket_selector'     => ! empty($this->_req_data['display_ticket_selector']) ? 1 : 0,
 			'EVT_additional_limit'            => min(
-				apply_filters( 'FHEE__EE_Events_Admin__insert_update_cpt_item__EVT_additional_limit_max', 255 ),
-				! empty( $this->_req_data['additional_limit'] ) ? $this->_req_data['additional_limit'] : null
+				apply_filters('FHEE__EE_Events_Admin__insert_update_cpt_item__EVT_additional_limit_max', 255),
+				! empty($this->_req_data['additional_limit']) ? $this->_req_data['additional_limit'] : null
 			),
-			'EVT_default_registration_status' => ! empty( $this->_req_data['EVT_default_registration_status'] )
+			'EVT_default_registration_status' => ! empty($this->_req_data['EVT_default_registration_status'])
 				? $this->_req_data['EVT_default_registration_status']
 				: EE_Registry::instance()->CFG->registration->default_STS_ID,
-			'EVT_member_only'                 => ! empty( $this->_req_data['member_only'] ) ? 1 : 0,
-			'EVT_allow_overflow'              => ! empty( $this->_req_data['EVT_allow_overflow'] ) ? 1 : 0,
-			'EVT_timezone_string'             => ! empty( $this->_req_data['timezone_string'] )
+			'EVT_member_only'                 => ! empty($this->_req_data['member_only']) ? 1 : 0,
+			'EVT_allow_overflow'              => ! empty($this->_req_data['EVT_allow_overflow']) ? 1 : 0,
+			'EVT_timezone_string'             => ! empty($this->_req_data['timezone_string'])
 				? $this->_req_data['timezone_string'] : null,
-			'EVT_external_URL'                => ! empty( $this->_req_data['externalURL'] )
+			'EVT_external_URL'                => ! empty($this->_req_data['externalURL'])
 				? $this->_req_data['externalURL'] : null,
-			'EVT_phone'                       => ! empty( $this->_req_data['event_phone'] )
+			'EVT_phone'                       => ! empty($this->_req_data['event_phone'])
 				? $this->_req_data['event_phone'] : null,
 		);
 		//update event
-		$success = $this->_event_model()->update_by_ID( $event_values, $post_id );
+		$success = $this->_event_model()->update_by_ID($event_values, $post_id);
 		//get event_object for other metaboxes... though it would seem to make sense to just use $this->_event_model()->get_one_by_ID( $post_id ).. i have to setup where conditions to override the filters in the model that filter out autodraft and inherit statuses so we GET the inherit id!
-		$get_one_where = array( $this->_event_model()->primary_key_name() => $post_id, 'status' => $post->post_status );
-		$event = $this->_event_model()->get_one( array( $get_one_where ) );
+		$get_one_where = array($this->_event_model()->primary_key_name() => $post_id, 'status' => $post->post_status);
+		$event = $this->_event_model()->get_one(array($get_one_where));
 		//the following are default callbacks for event attachment updates that can be overridden by caffeinated functionality and/or addons.
 		$event_update_callbacks = apply_filters(
 			'FHEE__Events_Admin_Page___insert_update_cpt_item__event_update_callbacks',
-			array( array( $this, '_default_venue_update' ), array( $this, '_default_tickets_update' ) )
+			array(array($this, '_default_venue_update'), array($this, '_default_tickets_update'))
 		);
 		$att_success = true;
-		foreach ( $event_update_callbacks as $e_callback ) {
-			$_succ = call_user_func_array( $e_callback, array( $event, $this->_req_data ) );
+		foreach ($event_update_callbacks as $e_callback) {
+			$_succ = call_user_func_array($e_callback, array($event, $this->_req_data));
 			$att_success = ! $att_success ? $att_success
 				: $_succ; //if ANY of these updates fail then we want the appropriate global error message
 		}
 		//any errors?
-		if ( $success && false === $att_success ) {
+		if ($success && false === $att_success) {
 			EE_Error::add_error(
 				esc_html__(
 					'Event Details saved successfully but something went wrong with saving attachments.',
@@ -932,9 +932,9 @@ 
 				__FUNCTION__,
 				__LINE__
 			);
-		} else if ( $success === false ) {
+		} else if ($success === false) {
 			EE_Error::add_error(
-				esc_html__( 'Event Details did not save successfully.', 'event_espresso' ),
+				esc_html__('Event Details did not save successfully.', 'event_espresso'),
 				__FILE__,
 				__FUNCTION__,
 				__LINE__
@@ -949,14 +949,14 @@ 
 	 * @param int $post_id
 	 * @param int $revision_id
 	 */
-	protected function _restore_cpt_item( $post_id, $revision_id ) {
+	protected function _restore_cpt_item($post_id, $revision_id) {
 		//copy existing event meta to new post
-		$post_evt = $this->_event_model()->get_one_by_ID( $post_id );
-		if ( $post_evt instanceof EE_Event ) {
+		$post_evt = $this->_event_model()->get_one_by_ID($post_id);
+		if ($post_evt instanceof EE_Event) {
 			//meta revision restore
-			$post_evt->restore_revision( $revision_id );
+			$post_evt->restore_revision($revision_id);
 			//related objs restore
-			$post_evt->restore_revision( $revision_id, array( 'Venue', 'Datetime', 'Price' ) );
+			$post_evt->restore_revision($revision_id, array('Venue', 'Datetime', 'Price'));
 		}
 	}
 
@@ -969,49 +969,49 @@ 
 	 * @param  array     $data   The request data from the form
 	 * @return bool           Success or fail.
 	 */
-	protected function _default_venue_update( \EE_Event $evtobj, $data ) {
-		require_once( EE_MODELS . 'EEM_Venue.model.php' );
-		$venue_model = EE_Registry::instance()->load_model( 'Venue' );
+	protected function _default_venue_update(\EE_Event $evtobj, $data) {
+		require_once(EE_MODELS.'EEM_Venue.model.php');
+		$venue_model = EE_Registry::instance()->load_model('Venue');
 		$rows_affected = null;
-		$venue_id = ! empty( $data['venue_id'] ) ? $data['venue_id'] : null;
+		$venue_id = ! empty($data['venue_id']) ? $data['venue_id'] : null;
 		// very important.  If we don't have a venue name...
 		// then we'll get out because not necessary to create empty venue
-		if ( empty( $data['venue_title'] ) ) {
+		if (empty($data['venue_title'])) {
 			return false;
 		}
 		$venue_array = array(
-			'VNU_wp_user'         => $evtobj->get( 'EVT_wp_user' ),
-			'VNU_name'            => ! empty( $data['venue_title'] ) ? $data['venue_title'] : null,
-			'VNU_desc'            => ! empty( $data['venue_description'] ) ? $data['venue_description'] : null,
-			'VNU_identifier'      => ! empty( $data['venue_identifier'] ) ? $data['venue_identifier'] : null,
-			'VNU_short_desc'      => ! empty( $data['venue_short_description'] ) ? $data['venue_short_description']
+			'VNU_wp_user'         => $evtobj->get('EVT_wp_user'),
+			'VNU_name'            => ! empty($data['venue_title']) ? $data['venue_title'] : null,
+			'VNU_desc'            => ! empty($data['venue_description']) ? $data['venue_description'] : null,
+			'VNU_identifier'      => ! empty($data['venue_identifier']) ? $data['venue_identifier'] : null,
+			'VNU_short_desc'      => ! empty($data['venue_short_description']) ? $data['venue_short_description']
 				: null,
-			'VNU_address'         => ! empty( $data['address'] ) ? $data['address'] : null,
-			'VNU_address2'        => ! empty( $data['address2'] ) ? $data['address2'] : null,
-			'VNU_city'            => ! empty( $data['city'] ) ? $data['city'] : null,
-			'STA_ID'              => ! empty( $data['state'] ) ? $data['state'] : null,
-			'CNT_ISO'             => ! empty( $data['countries'] ) ? $data['countries'] : null,
-			'VNU_zip'             => ! empty( $data['zip'] ) ? $data['zip'] : null,
-			'VNU_phone'           => ! empty( $data['venue_phone'] ) ? $data['venue_phone'] : null,
-			'VNU_capacity'        => ! empty( $data['venue_capacity'] ) ? $data['venue_capacity'] : null,
-			'VNU_url'             => ! empty( $data['venue_url'] ) ? $data['venue_url'] : null,
-			'VNU_virtual_phone'   => ! empty( $data['virtual_phone'] ) ? $data['virtual_phone'] : null,
-			'VNU_virtual_url'     => ! empty( $data['virtual_url'] ) ? $data['virtual_url'] : null,
-			'VNU_enable_for_gmap' => isset( $data['enable_for_gmap'] ) ? 1 : 0,
+			'VNU_address'         => ! empty($data['address']) ? $data['address'] : null,
+			'VNU_address2'        => ! empty($data['address2']) ? $data['address2'] : null,
+			'VNU_city'            => ! empty($data['city']) ? $data['city'] : null,
+			'STA_ID'              => ! empty($data['state']) ? $data['state'] : null,
+			'CNT_ISO'             => ! empty($data['countries']) ? $data['countries'] : null,
+			'VNU_zip'             => ! empty($data['zip']) ? $data['zip'] : null,
+			'VNU_phone'           => ! empty($data['venue_phone']) ? $data['venue_phone'] : null,
+			'VNU_capacity'        => ! empty($data['venue_capacity']) ? $data['venue_capacity'] : null,
+			'VNU_url'             => ! empty($data['venue_url']) ? $data['venue_url'] : null,
+			'VNU_virtual_phone'   => ! empty($data['virtual_phone']) ? $data['virtual_phone'] : null,
+			'VNU_virtual_url'     => ! empty($data['virtual_url']) ? $data['virtual_url'] : null,
+			'VNU_enable_for_gmap' => isset($data['enable_for_gmap']) ? 1 : 0,
 			'status'              => 'publish',
 		);
 		//if we've got the venue_id then we're just updating the existing venue so let's do that and then get out.
-		if ( ! empty( $venue_id ) ) {
-			$update_where = array( $venue_model->primary_key_name() => $venue_id );
-			$rows_affected = $venue_model->update( $venue_array, array( $update_where ) );
+		if ( ! empty($venue_id)) {
+			$update_where = array($venue_model->primary_key_name() => $venue_id);
+			$rows_affected = $venue_model->update($venue_array, array($update_where));
 			//we've gotta make sure that the venue is always attached to a revision.. add_relation_to should take care of making sure that the relation is already present.
-			$evtobj->_add_relation_to( $venue_id, 'Venue' );
+			$evtobj->_add_relation_to($venue_id, 'Venue');
 			return $rows_affected > 0 ? true : false;
 		} else {
 			//we insert the venue
-			$venue_id = $venue_model->insert( $venue_array );
-			$evtobj->_add_relation_to( $venue_id, 'Venue' );
-			return ! empty( $venue_id ) ? true : false;
+			$venue_id = $venue_model->insert($venue_array);
+			$evtobj->_add_relation_to($venue_id, 'Venue');
+			return ! empty($venue_id) ? true : false;
 		}
 		//when we have the ancestor come in it's already been handled by the revision save.
 	}
@@ -1025,51 +1025,51 @@ 
 	 * @param  array    $data   The request data from the form
 	 * @return array
 	 */
-	protected function _default_tickets_update( EE_Event $evtobj, $data ) {
+	protected function _default_tickets_update(EE_Event $evtobj, $data) {
 		$success = true;
 		$saved_dtt = null;
 		$saved_tickets = array();
-		$incoming_date_formats = array( 'Y-m-d', 'h:i a' );
-		foreach ( $data['edit_event_datetimes'] as $row => $dtt ) {
+		$incoming_date_formats = array('Y-m-d', 'h:i a');
+		foreach ($data['edit_event_datetimes'] as $row => $dtt) {
 			//trim all values to ensure any excess whitespace is removed.
-			$dtt = array_map( 'trim', $dtt );
-			$dtt['DTT_EVT_end'] = isset( $dtt['DTT_EVT_end'] ) && ! empty( $dtt['DTT_EVT_end'] ) ? $dtt['DTT_EVT_end']
+			$dtt = array_map('trim', $dtt);
+			$dtt['DTT_EVT_end'] = isset($dtt['DTT_EVT_end']) && ! empty($dtt['DTT_EVT_end']) ? $dtt['DTT_EVT_end']
 				: $dtt['DTT_EVT_start'];
 			$datetime_values = array(
-				'DTT_ID'        => ! empty( $dtt['DTT_ID'] ) ? $dtt['DTT_ID'] : null,
+				'DTT_ID'        => ! empty($dtt['DTT_ID']) ? $dtt['DTT_ID'] : null,
 				'DTT_EVT_start' => $dtt['DTT_EVT_start'],
 				'DTT_EVT_end'   => $dtt['DTT_EVT_end'],
-				'DTT_reg_limit' => empty( $dtt['DTT_reg_limit'] ) ? EE_INF : $dtt['DTT_reg_limit'],
+				'DTT_reg_limit' => empty($dtt['DTT_reg_limit']) ? EE_INF : $dtt['DTT_reg_limit'],
 				'DTT_order'     => $row,
 			);
 			//if we have an id then let's get existing object first and then set the new values.  Otherwise we instantiate a new object for save.
-			if ( ! empty( $dtt['DTT_ID'] ) ) {
+			if ( ! empty($dtt['DTT_ID'])) {
 				$DTM = EE_Registry::instance()
-				                  ->load_model( 'Datetime', array( $evtobj->get_timezone() ) )
-				                  ->get_one_by_ID( $dtt['DTT_ID'] );
-				$DTM->set_date_format( $incoming_date_formats[0] );
-				$DTM->set_time_format( $incoming_date_formats[1] );
-				foreach ( $datetime_values as $field => $value ) {
-					$DTM->set( $field, $value );
+				                  ->load_model('Datetime', array($evtobj->get_timezone()))
+				                  ->get_one_by_ID($dtt['DTT_ID']);
+				$DTM->set_date_format($incoming_date_formats[0]);
+				$DTM->set_time_format($incoming_date_formats[1]);
+				foreach ($datetime_values as $field => $value) {
+					$DTM->set($field, $value);
 				}
 				//make sure the $dtt_id here is saved just in case after the add_relation_to() the autosave replaces it.  We need to do this so we dont' TRASH the parent DTT.
-				$saved_dtts[ $DTM->ID() ] = $DTM;
+				$saved_dtts[$DTM->ID()] = $DTM;
 			} else {
-				$DTM = EE_Registry::instance()->load_class( 'Datetime', array( $datetime_values ), false, false );
-				$DTM->set_date_format( $incoming_date_formats[0] );
-				$DTM->set_time_format( $incoming_date_formats[1] );
-				$DTM->set_timezone( $evtobj->get_timezone() );
-				foreach ( $datetime_values as $field => $value ) {
-					$DTM->set( $field, $value );
+				$DTM = EE_Registry::instance()->load_class('Datetime', array($datetime_values), false, false);
+				$DTM->set_date_format($incoming_date_formats[0]);
+				$DTM->set_time_format($incoming_date_formats[1]);
+				$DTM->set_timezone($evtobj->get_timezone());
+				foreach ($datetime_values as $field => $value) {
+					$DTM->set($field, $value);
 				}
 			}
 			$DTM->save();
-			$DTT = $evtobj->_add_relation_to( $DTM, 'Datetime' );
+			$DTT = $evtobj->_add_relation_to($DTM, 'Datetime');
 			//load DTT helper
 			//before going any further make sure our dates are setup correctly so that the end date is always equal or greater than the start date.
-			if ( $DTT->get_raw( 'DTT_EVT_start' ) > $DTT->get_raw( 'DTT_EVT_end' ) ) {
-				$DTT->set( 'DTT_EVT_end', $DTT->get( 'DTT_EVT_start' ) );
-				$DTT = EEH_DTT_Helper::date_time_add( $DTT, 'DTT_EVT_end', 'days' );
+			if ($DTT->get_raw('DTT_EVT_start') > $DTT->get_raw('DTT_EVT_end')) {
+				$DTT->set('DTT_EVT_end', $DTT->get('DTT_EVT_start'));
+				$DTT = EEH_DTT_Helper::date_time_add($DTT, 'DTT_EVT_end', 'days');
 				$DTT->save();
 			}
 			//now we got to make sure we add the new DTT_ID to the $saved_dtts array  because it is possible there was a new one created for the autosave.
@@ -1080,20 +1080,20 @@ 
 		}
 		//no dtts get deleted so we don't do any of that logic here.
 		//update tickets next
-		$old_tickets = isset( $data['ticket_IDs'] ) ? explode( ',', $data['ticket_IDs'] ) : array();
-		foreach ( $data['edit_tickets'] as $row => $tkt ) {
-			$incoming_date_formats = array( 'Y-m-d', 'h:i a' );
+		$old_tickets = isset($data['ticket_IDs']) ? explode(',', $data['ticket_IDs']) : array();
+		foreach ($data['edit_tickets'] as $row => $tkt) {
+			$incoming_date_formats = array('Y-m-d', 'h:i a');
 			$update_prices = false;
-			$ticket_price = isset( $data['edit_prices'][ $row ][1]['PRC_amount'] )
-				? $data['edit_prices'][ $row ][1]['PRC_amount'] : 0;
+			$ticket_price = isset($data['edit_prices'][$row][1]['PRC_amount'])
+				? $data['edit_prices'][$row][1]['PRC_amount'] : 0;
 			// trim inputs to ensure any excess whitespace is removed.
-			$tkt = array_map( 'trim', $tkt );
-			if ( empty( $tkt['TKT_start_date'] ) ) {
+			$tkt = array_map('trim', $tkt);
+			if (empty($tkt['TKT_start_date'])) {
 				//let's use now in the set timezone.
-				$now = new DateTime( 'now', new DateTimeZone( $evtobj->get_timezone() ) );
-				$tkt['TKT_start_date'] = $now->format( $incoming_date_formats[0] . ' ' . $incoming_date_formats[1] );
+				$now = new DateTime('now', new DateTimeZone($evtobj->get_timezone()));
+				$tkt['TKT_start_date'] = $now->format($incoming_date_formats[0].' '.$incoming_date_formats[1]);
 			}
-			if ( empty( $tkt['TKT_end_date'] ) ) {
+			if (empty($tkt['TKT_end_date'])) {
 				//use the start date of the first datetime
 				$dtt = $evtobj->first_datetime();
 				$tkt['TKT_end_date'] = $dtt->start_date_and_time(
@@ -1102,22 +1102,22 @@ 
 				);
 			}
 			$TKT_values = array(
-				'TKT_ID'          => ! empty( $tkt['TKT_ID'] ) ? $tkt['TKT_ID'] : null,
-				'TTM_ID'          => ! empty( $tkt['TTM_ID'] ) ? $tkt['TTM_ID'] : 0,
-				'TKT_name'        => ! empty( $tkt['TKT_name'] ) ? $tkt['TKT_name'] : '',
-				'TKT_description' => ! empty( $tkt['TKT_description'] ) ? $tkt['TKT_description'] : '',
+				'TKT_ID'          => ! empty($tkt['TKT_ID']) ? $tkt['TKT_ID'] : null,
+				'TTM_ID'          => ! empty($tkt['TTM_ID']) ? $tkt['TTM_ID'] : 0,
+				'TKT_name'        => ! empty($tkt['TKT_name']) ? $tkt['TKT_name'] : '',
+				'TKT_description' => ! empty($tkt['TKT_description']) ? $tkt['TKT_description'] : '',
 				'TKT_start_date'  => $tkt['TKT_start_date'],
 				'TKT_end_date'    => $tkt['TKT_end_date'],
-				'TKT_qty'         => ! isset( $tkt['TKT_qty'] ) || $tkt['TKT_qty'] === '' ? EE_INF : $tkt['TKT_qty'],
-				'TKT_uses'        => ! isset( $tkt['TKT_uses'] ) || $tkt['TKT_uses'] === '' ? EE_INF : $tkt['TKT_uses'],
-				'TKT_min'         => empty( $tkt['TKT_min'] ) ? 0 : $tkt['TKT_min'],
-				'TKT_max'         => empty( $tkt['TKT_max'] ) ? EE_INF : $tkt['TKT_max'],
+				'TKT_qty'         => ! isset($tkt['TKT_qty']) || $tkt['TKT_qty'] === '' ? EE_INF : $tkt['TKT_qty'],
+				'TKT_uses'        => ! isset($tkt['TKT_uses']) || $tkt['TKT_uses'] === '' ? EE_INF : $tkt['TKT_uses'],
+				'TKT_min'         => empty($tkt['TKT_min']) ? 0 : $tkt['TKT_min'],
+				'TKT_max'         => empty($tkt['TKT_max']) ? EE_INF : $tkt['TKT_max'],
 				'TKT_row'         => $row,
-				'TKT_order'       => isset( $tkt['TKT_order'] ) ? $tkt['TKT_order'] : $row,
+				'TKT_order'       => isset($tkt['TKT_order']) ? $tkt['TKT_order'] : $row,
 				'TKT_price'       => $ticket_price,
 			);
 			//if this is a default TKT, then we need to set the TKT_ID to 0 and update accordingly, which means in turn that the prices will become new prices as well.
-			if ( isset( $tkt['TKT_is_default'] ) && $tkt['TKT_is_default'] ) {
+			if (isset($tkt['TKT_is_default']) && $tkt['TKT_is_default']) {
 				$TKT_values['TKT_ID'] = 0;
 				$TKT_values['TKT_is_default'] = 0;
 				$TKT_values['TKT_price'] = $ticket_price;
@@ -1126,110 +1126,110 @@ 
 			//if we have a TKT_ID then we need to get that existing TKT_obj and update it
 			//we actually do our saves a head of doing any add_relations to because its entirely possible that this ticket didn't removed or added to any datetime in the session but DID have it's items modified.
 			//keep in mind that if the TKT has been sold (and we have changed pricing information), then we won't be updating the tkt but instead a new tkt will be created and the old one archived.
-			if ( ! empty( $tkt['TKT_ID'] ) ) {
+			if ( ! empty($tkt['TKT_ID'])) {
 				$TKT = EE_Registry::instance()
-						->load_model( 'Ticket', array( $evtobj->get_timezone() ) )
-						->get_one_by_ID( $tkt['TKT_ID'] );
-				if ( $TKT instanceof EE_Ticket ) {
+						->load_model('Ticket', array($evtobj->get_timezone()))
+						->get_one_by_ID($tkt['TKT_ID']);
+				if ($TKT instanceof EE_Ticket) {
 					$ticket_sold = $TKT->count_related(
 						'Registration',
 						array(
 							array(
 								'STS_ID' => array(
 									'NOT IN',
-									array( EEM_Registration::status_id_incomplete ),
+									array(EEM_Registration::status_id_incomplete),
 								),
 							),
 						)
 					) > 0 ? true : false;
 					//let's just check the total price for the existing ticket and determine if it matches the new total price.  if they are different then we create a new ticket (if tkts sold) if they aren't different then we go ahead and modify existing ticket.
-					$create_new_TKT = $ticket_sold && $ticket_price != $TKT->get( 'TKT_price' )
+					$create_new_TKT = $ticket_sold && $ticket_price != $TKT->get('TKT_price')
 					                  && ! $TKT->get(
 						'TKT_deleted'
 					) ? true : false;
-					$TKT->set_date_format( $incoming_date_formats[0] );
-					$TKT->set_time_format( $incoming_date_formats[1] );
+					$TKT->set_date_format($incoming_date_formats[0]);
+					$TKT->set_time_format($incoming_date_formats[1]);
 					//set new values
-					foreach ( $TKT_values as $field => $value ) {
-						if ( $field == 'TKT_qty' ) {
-							$TKT->set_qty( $value );
+					foreach ($TKT_values as $field => $value) {
+						if ($field == 'TKT_qty') {
+							$TKT->set_qty($value);
 						} else {
-							$TKT->set( $field, $value );
+							$TKT->set($field, $value);
 						}
 					}
 					//if $create_new_TKT is false then we can safely update the existing ticket.  Otherwise we have to create a new ticket.
-					if ( $create_new_TKT ) {
+					if ($create_new_TKT) {
 						//archive the old ticket first
-						$TKT->set( 'TKT_deleted', 1 );
+						$TKT->set('TKT_deleted', 1);
 						$TKT->save();
 						//make sure this ticket is still recorded in our saved_tkts so we don't run it through the regular trash routine.
-						$saved_tickets[ $TKT->ID() ] = $TKT;
+						$saved_tickets[$TKT->ID()] = $TKT;
 						//create new ticket that's a copy of the existing except a new id of course (and not archived) AND has the new TKT_price associated with it.
 						$TKT = clone $TKT;
-						$TKT->set( 'TKT_ID', 0 );
-						$TKT->set( 'TKT_deleted', 0 );
-						$TKT->set( 'TKT_price', $ticket_price );
-						$TKT->set( 'TKT_sold', 0 );
+						$TKT->set('TKT_ID', 0);
+						$TKT->set('TKT_deleted', 0);
+						$TKT->set('TKT_price', $ticket_price);
+						$TKT->set('TKT_sold', 0);
 						//now we need to make sure that $new prices are created as well and attached to new ticket.
 						$update_prices = true;
 					}
 					//make sure price is set if it hasn't been already
-					$TKT->set( 'TKT_price', $ticket_price );
+					$TKT->set('TKT_price', $ticket_price);
 				}
 			} else {
 				//no TKT_id so a new TKT
 				$TKT_values['TKT_price'] = $ticket_price;
-				$TKT = EE_Registry::instance()->load_class( 'Ticket', array( $TKT_values ), false, false );
-				if ( $TKT instanceof EE_Ticket ) {
+				$TKT = EE_Registry::instance()->load_class('Ticket', array($TKT_values), false, false);
+				if ($TKT instanceof EE_Ticket) {
 					//need to reset values to properly account for the date formats
-					$TKT->set_date_format( $incoming_date_formats[0] );
-					$TKT->set_time_format( $incoming_date_formats[1] );
-					$TKT->set_timezone( $evtobj->get_timezone() );
+					$TKT->set_date_format($incoming_date_formats[0]);
+					$TKT->set_time_format($incoming_date_formats[1]);
+					$TKT->set_timezone($evtobj->get_timezone());
 					//set new values
-					foreach ( $TKT_values as $field => $value ) {
-						if ( $field == 'TKT_qty' ) {
-							$TKT->set_qty( $value );
+					foreach ($TKT_values as $field => $value) {
+						if ($field == 'TKT_qty') {
+							$TKT->set_qty($value);
 						} else {
-							$TKT->set( $field, $value );
+							$TKT->set($field, $value);
 						}
 					}
 					$update_prices = true;
 				}
 			}
 			// cap ticket qty by datetime reg limits
-			$TKT->set_qty( min( $TKT->qty(), $TKT->qty( 'reg_limit' ) ) );
+			$TKT->set_qty(min($TKT->qty(), $TKT->qty('reg_limit')));
 			//update ticket.
 			$TKT->save();
 			//before going any further make sure our dates are setup correctly so that the end date is always equal or greater than the start date.
-			if ( $TKT->get_raw( 'TKT_start_date' ) > $TKT->get_raw( 'TKT_end_date' ) ) {
-				$TKT->set( 'TKT_end_date', $TKT->get( 'TKT_start_date' ) );
-				$TKT = EEH_DTT_Helper::date_time_add( $TKT, 'TKT_end_date', 'days' );
+			if ($TKT->get_raw('TKT_start_date') > $TKT->get_raw('TKT_end_date')) {
+				$TKT->set('TKT_end_date', $TKT->get('TKT_start_date'));
+				$TKT = EEH_DTT_Helper::date_time_add($TKT, 'TKT_end_date', 'days');
 				$TKT->save();
 			}
 			//initially let's add the ticket to the dtt
-			$saved_dtt->_add_relation_to( $TKT, 'Ticket' );
-			$saved_tickets[ $TKT->ID() ] = $TKT;
+			$saved_dtt->_add_relation_to($TKT, 'Ticket');
+			$saved_tickets[$TKT->ID()] = $TKT;
 			//add prices to ticket
-			$this->_add_prices_to_ticket( $data['edit_prices'][ $row ], $TKT, $update_prices );
+			$this->_add_prices_to_ticket($data['edit_prices'][$row], $TKT, $update_prices);
 		}
 		//however now we need to handle permanently deleting tickets via the ui.  Keep in mind that the ui does not allow deleting/archiving tickets that have ticket sold.  However, it does allow for deleting tickets that have no tickets sold, in which case we want to get rid of permanently because there is no need to save in db.
-		$old_tickets = isset( $old_tickets[0] ) && $old_tickets[0] == '' ? array() : $old_tickets;
-		$tickets_removed = array_diff( $old_tickets, array_keys( $saved_tickets ) );
-		foreach ( $tickets_removed as $id ) {
-			$id = absint( $id );
+		$old_tickets = isset($old_tickets[0]) && $old_tickets[0] == '' ? array() : $old_tickets;
+		$tickets_removed = array_diff($old_tickets, array_keys($saved_tickets));
+		foreach ($tickets_removed as $id) {
+			$id = absint($id);
 			//get the ticket for this id
-			$tkt_to_remove = EE_Registry::instance()->load_model( 'Ticket' )->get_one_by_ID( $id );
+			$tkt_to_remove = EE_Registry::instance()->load_model('Ticket')->get_one_by_ID($id);
 			//need to get all the related datetimes on this ticket and remove from every single one of them (remember this process can ONLY kick off if there are NO tkts_sold)
-			$dtts = $tkt_to_remove->get_many_related( 'Datetime' );
-			foreach ( $dtts as $dtt ) {
-				$tkt_to_remove->_remove_relation_to( $dtt, 'Datetime' );
+			$dtts = $tkt_to_remove->get_many_related('Datetime');
+			foreach ($dtts as $dtt) {
+				$tkt_to_remove->_remove_relation_to($dtt, 'Datetime');
 			}
 			//need to do the same for prices (except these prices can also be deleted because again, tickets can only be trashed if they don't have any TKTs sold (otherwise they are just archived))
-			$tkt_to_remove->delete_related_permanently( 'Price' );
+			$tkt_to_remove->delete_related_permanently('Price');
 			//finally let's delete this ticket (which should not be blocked at this point b/c we've removed all our relationships)
 			$tkt_to_remove->delete_permanently();
 		}
-		return array( $saved_dtt, $saved_tickets );
+		return array($saved_dtt, $saved_tickets);
 	}
 
 
@@ -1246,29 +1246,29 @@ 
 	 * @param bool      $new_prices Whether attach existing incoming prices or create new ones.
 	 * @return  void
 	 */
-	private function _add_prices_to_ticket( $prices, EE_Ticket $ticket, $new_prices = false ) {
-		foreach ( $prices as $row => $prc ) {
+	private function _add_prices_to_ticket($prices, EE_Ticket $ticket, $new_prices = false) {
+		foreach ($prices as $row => $prc) {
 			$PRC_values = array(
-				'PRC_ID'         => ! empty( $prc['PRC_ID'] ) ? $prc['PRC_ID'] : null,
-				'PRT_ID'         => ! empty( $prc['PRT_ID'] ) ? $prc['PRT_ID'] : null,
-				'PRC_amount'     => ! empty( $prc['PRC_amount'] ) ? $prc['PRC_amount'] : 0,
-				'PRC_name'       => ! empty( $prc['PRC_name'] ) ? $prc['PRC_name'] : '',
-				'PRC_desc'       => ! empty( $prc['PRC_desc'] ) ? $prc['PRC_desc'] : '',
+				'PRC_ID'         => ! empty($prc['PRC_ID']) ? $prc['PRC_ID'] : null,
+				'PRT_ID'         => ! empty($prc['PRT_ID']) ? $prc['PRT_ID'] : null,
+				'PRC_amount'     => ! empty($prc['PRC_amount']) ? $prc['PRC_amount'] : 0,
+				'PRC_name'       => ! empty($prc['PRC_name']) ? $prc['PRC_name'] : '',
+				'PRC_desc'       => ! empty($prc['PRC_desc']) ? $prc['PRC_desc'] : '',
 				'PRC_is_default' => 0, //make sure prices are NOT set as default from this context
 				'PRC_order'      => $row,
 			);
-			if ( $new_prices || empty( $PRC_values['PRC_ID'] ) ) {
+			if ($new_prices || empty($PRC_values['PRC_ID'])) {
 				$PRC_values['PRC_ID'] = 0;
-				$PRC = EE_Registry::instance()->load_class( 'Price', array( $PRC_values ), false, false );
+				$PRC = EE_Registry::instance()->load_class('Price', array($PRC_values), false, false);
 			} else {
-				$PRC = EE_Registry::instance()->load_model( 'Price' )->get_one_by_ID( $prc['PRC_ID'] );
+				$PRC = EE_Registry::instance()->load_model('Price')->get_one_by_ID($prc['PRC_ID']);
 				//update this price with new values
-				foreach ( $PRC_values as $field => $newprc ) {
-					$PRC->set( $field, $newprc );
+				foreach ($PRC_values as $field => $newprc) {
+					$PRC->set($field, $newprc);
 				}
 				$PRC->save();
 			}
-			$ticket->_add_relation_to( $PRC, 'Price' );
+			$ticket->_add_relation_to($PRC, 'Price');
 		}
 	}
 
@@ -1300,7 +1300,7 @@ 
 	private function _generate_publish_box_extra_content() {
 		//load formatter helper
 		//args for getting related registrations
-		$approved_query_args = array( array( 'REG_deleted' => 0, 'STS_ID' => EEM_Registration::status_id_approved ) );
+		$approved_query_args = array(array('REG_deleted' => 0, 'STS_ID' => EEM_Registration::status_id_approved));
 		$not_approved_query_args = array(
 			array(
 				'REG_deleted' => 0,
@@ -1371,7 +1371,7 @@ 
 		$publish_box_extra_args['event_editor_overview_add'] = ob_get_clean();
 		// load template
 		EEH_Template::display_template(
-			EVENTS_TEMPLATE_PATH . 'event_publish_box_extras.template.php',
+			EVENTS_TEMPLATE_PATH.'event_publish_box_extras.template.php',
 			$publish_box_extra_args
 		);
 	}
@@ -1405,16 +1405,16 @@ 
 		$this->verify_cpt_object();
 		add_meta_box(
 			'espresso_event_editor_tickets',
-			esc_html__( 'Event Datetime & Ticket', 'event_espresso' ),
-			array( $this, 'ticket_metabox' ),
+			esc_html__('Event Datetime & Ticket', 'event_espresso'),
+			array($this, 'ticket_metabox'),
 			$this->page_slug,
 			'normal',
 			'high'
 		);
 		add_meta_box(
 			'espresso_event_editor_event_options',
-			esc_html__( 'Event Registration Options', 'event_espresso' ),
-			array( $this, 'registration_options_meta_box' ),
+			esc_html__('Event Registration Options', 'event_espresso'),
+			array($this, 'registration_options_meta_box'),
 			$this->page_slug,
 			'side',
 			'default'
@@ -1442,65 +1442,65 @@ 
 			'trash_icon'               => 'ee-lock-icon',
 			'disabled'                 => '',
 		);
-		$event_id = is_object( $this->_cpt_model_obj ) ? $this->_cpt_model_obj->ID() : null;
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		$event_id = is_object($this->_cpt_model_obj) ? $this->_cpt_model_obj->ID() : null;
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		/**
 		 * 1. Start with retrieving Datetimes
 		 * 2. Fore each datetime get related tickets
 		 * 3. For each ticket get related prices
 		 */
-		$times = EE_Registry::instance()->load_model( 'Datetime' )->get_all_event_dates( $event_id );
+		$times = EE_Registry::instance()->load_model('Datetime')->get_all_event_dates($event_id);
 		/** @type EE_Datetime $first_datetime */
-		$first_datetime = reset( $times );
+		$first_datetime = reset($times);
 		//do we get related tickets?
-		if ( $first_datetime instanceof EE_Datetime
+		if ($first_datetime instanceof EE_Datetime
 		     && $first_datetime->ID() !== 0
 		) {
-			$existing_datetime_ids[] = $first_datetime->get( 'DTT_ID' );
+			$existing_datetime_ids[] = $first_datetime->get('DTT_ID');
 			$template_args['time'] = $first_datetime;
 			$related_tickets = $first_datetime->tickets(
 				array(
-					array( 'OR' => array( 'TKT_deleted' => 1, 'TKT_deleted*' => 0 ) ),
+					array('OR' => array('TKT_deleted' => 1, 'TKT_deleted*' => 0)),
 					'default_where_conditions' => 'none',
 				)
 			);
-			if ( ! empty( $related_tickets ) ) {
-				$template_args['total_ticket_rows'] = count( $related_tickets );
+			if ( ! empty($related_tickets)) {
+				$template_args['total_ticket_rows'] = count($related_tickets);
 				$row = 0;
-				foreach ( $related_tickets as $ticket ) {
-					$existing_ticket_ids[] = $ticket->get( 'TKT_ID' );
-					$template_args['ticket_rows'] .= $this->_get_ticket_row( $ticket, false, $row );
+				foreach ($related_tickets as $ticket) {
+					$existing_ticket_ids[] = $ticket->get('TKT_ID');
+					$template_args['ticket_rows'] .= $this->_get_ticket_row($ticket, false, $row);
 					$row++;
 				}
 			} else {
 				$template_args['total_ticket_rows'] = 1;
 				/** @type EE_Ticket $ticket */
-				$ticket = EE_Registry::instance()->load_model( 'Ticket' )->create_default_object();
-				$template_args['ticket_rows'] .= $this->_get_ticket_row( $ticket );
+				$ticket = EE_Registry::instance()->load_model('Ticket')->create_default_object();
+				$template_args['ticket_rows'] .= $this->_get_ticket_row($ticket);
 			}
 		} else {
 			$template_args['time'] = $times[0];
 			/** @type EE_Ticket $ticket */
-			$ticket = EE_Registry::instance()->load_model( 'Ticket' )->get_all_default_tickets();
-			$template_args['ticket_rows'] .= $this->_get_ticket_row( $ticket[1] );
+			$ticket = EE_Registry::instance()->load_model('Ticket')->get_all_default_tickets();
+			$template_args['ticket_rows'] .= $this->_get_ticket_row($ticket[1]);
 			// NOTE: we're just sending the first default row
 			// (decaf can't manage default tickets so this should be sufficient);
 		}
 		$template_args['event_datetime_help_link'] = $this->_get_help_tab_link(
 			'event_editor_event_datetimes_help_tab'
 		);
-		$template_args['ticket_options_help_link'] = $this->_get_help_tab_link( 'ticket_options_info' );
-		$template_args['existing_datetime_ids'] = implode( ',', $existing_datetime_ids );
-		$template_args['existing_ticket_ids'] = implode( ',', $existing_ticket_ids );
+		$template_args['ticket_options_help_link'] = $this->_get_help_tab_link('ticket_options_info');
+		$template_args['existing_datetime_ids'] = implode(',', $existing_datetime_ids);
+		$template_args['existing_ticket_ids'] = implode(',', $existing_ticket_ids);
 		$template_args['ticket_js_structure'] = $this->_get_ticket_row(
-			EE_Registry::instance()->load_model( 'Ticket' )->create_default_object(),
+			EE_Registry::instance()->load_model('Ticket')->create_default_object(),
 			true
 		);
 		$template = apply_filters(
 			'FHEE__Events_Admin_Page__ticket_metabox__template',
-			EVENTS_TEMPLATE_PATH . 'event_tickets_metabox_main.template.php'
+			EVENTS_TEMPLATE_PATH.'event_tickets_metabox_main.template.php'
 		);
-		EEH_Template::display_template( $template, $template_args );
+		EEH_Template::display_template($template, $template_args);
 	}
 
 
@@ -1514,74 +1514,74 @@ 
 	 * @param int        $row
 	 * @return string generated html for the ticket row.
 	 */
-	private function _get_ticket_row( $ticket, $skeleton = false, $row = 0 ) {
+	private function _get_ticket_row($ticket, $skeleton = false, $row = 0) {
 		$template_args = array(
-			'tkt_status_class'    => ' tkt-status-' . $ticket->ticket_status(),
+			'tkt_status_class'    => ' tkt-status-'.$ticket->ticket_status(),
 			'tkt_archive_class'   => $ticket->ticket_status() === EE_Ticket::archived && ! $skeleton ? ' tkt-archived'
 				: '',
 			'ticketrow'           => $skeleton ? 'TICKETNUM' : $row,
-			'TKT_ID'              => $ticket->get( 'TKT_ID' ),
-			'TKT_name'            => $ticket->get( 'TKT_name' ),
-			'TKT_start_date'      => $skeleton ? '' : $ticket->get_date( 'TKT_start_date', 'Y-m-d h:i a' ),
-			'TKT_end_date'        => $skeleton ? '' : $ticket->get_date( 'TKT_end_date', 'Y-m-d h:i a' ),
-			'TKT_is_default'      => $ticket->get( 'TKT_is_default' ),
-			'TKT_qty'             => $ticket->get_pretty( 'TKT_qty', 'input' ),
+			'TKT_ID'              => $ticket->get('TKT_ID'),
+			'TKT_name'            => $ticket->get('TKT_name'),
+			'TKT_start_date'      => $skeleton ? '' : $ticket->get_date('TKT_start_date', 'Y-m-d h:i a'),
+			'TKT_end_date'        => $skeleton ? '' : $ticket->get_date('TKT_end_date', 'Y-m-d h:i a'),
+			'TKT_is_default'      => $ticket->get('TKT_is_default'),
+			'TKT_qty'             => $ticket->get_pretty('TKT_qty', 'input'),
 			'edit_ticketrow_name' => $skeleton ? 'TICKETNAMEATTR' : 'edit_tickets',
-			'TKT_sold'            => $skeleton ? 0 : $ticket->get( 'TKT_sold' ),
-			'trash_icon'          => ( $skeleton || ( ! empty( $ticket ) && ! $ticket->get( 'TKT_deleted' ) ) )
-			                         && ( ! empty( $ticket ) && $ticket->get( 'TKT_sold' ) === 0 )
+			'TKT_sold'            => $skeleton ? 0 : $ticket->get('TKT_sold'),
+			'trash_icon'          => ($skeleton || ( ! empty($ticket) && ! $ticket->get('TKT_deleted')))
+			                         && ( ! empty($ticket) && $ticket->get('TKT_sold') === 0)
 				? 'trash-icon dashicons dashicons-post-trash clickable' : 'ee-lock-icon',
-			'disabled'            => $skeleton || ( ! empty( $ticket ) && ! $ticket->get( 'TKT_deleted' ) ) ? ''
+			'disabled'            => $skeleton || ( ! empty($ticket) && ! $ticket->get('TKT_deleted')) ? ''
 				: ' disabled=disabled',
 		);
 		$price = $ticket->ID() !== 0
-			? $ticket->get_first_related( 'Price', array( 'default_where_conditions' => 'none' ) )
-			: EE_Registry::instance()->load_model( 'Price' )->create_default_object();
+			? $ticket->get_first_related('Price', array('default_where_conditions' => 'none'))
+			: EE_Registry::instance()->load_model('Price')->create_default_object();
 		$price_args = array(
 			'price_currency_symbol' => EE_Registry::instance()->CFG->currency->sign,
-			'PRC_amount'            => $price->get( 'PRC_amount' ),
-			'PRT_ID'                => $price->get( 'PRT_ID' ),
-			'PRC_ID'                => $price->get( 'PRC_ID' ),
-			'PRC_is_default'        => $price->get( 'PRC_is_default' ),
+			'PRC_amount'            => $price->get('PRC_amount'),
+			'PRT_ID'                => $price->get('PRT_ID'),
+			'PRC_ID'                => $price->get('PRC_ID'),
+			'PRC_is_default'        => $price->get('PRC_is_default'),
 		);
 		//make sure we have default start and end dates if skeleton
 		//handle rows that should NOT be empty
-		if ( empty( $template_args['TKT_start_date'] ) ) {
+		if (empty($template_args['TKT_start_date'])) {
 			//if empty then the start date will be now.
-			$template_args['TKT_start_date'] = date( 'Y-m-d h:i a', current_time( 'timestamp' ) );
+			$template_args['TKT_start_date'] = date('Y-m-d h:i a', current_time('timestamp'));
 		}
-		if ( empty( $template_args['TKT_end_date'] ) ) {
+		if (empty($template_args['TKT_end_date'])) {
 			//get the earliest datetime (if present);
 			$earliest_dtt = $this->_cpt_model_obj->ID() > 0
 				? $this->_cpt_model_obj->get_first_related(
 					'Datetime',
-					array( 'order_by' => array( 'DTT_EVT_start' => 'ASC' ) )
+					array('order_by' => array('DTT_EVT_start' => 'ASC'))
 				)
 				: null;
-			if ( ! empty( $earliest_dtt ) ) {
-				$template_args['TKT_end_date'] = $earliest_dtt->get_datetime( 'DTT_EVT_start', 'Y-m-d', 'h:i a' );
+			if ( ! empty($earliest_dtt)) {
+				$template_args['TKT_end_date'] = $earliest_dtt->get_datetime('DTT_EVT_start', 'Y-m-d', 'h:i a');
 			} else {
 				$template_args['TKT_end_date'] = date(
 					'Y-m-d h:i a',
-					mktime( 0, 0, 0, date( "m" ), date( "d" ) + 7, date( "Y" ) )
+					mktime(0, 0, 0, date("m"), date("d") + 7, date("Y"))
 				);
 			}
 		}
-		$template_args = array_merge( $template_args, $price_args );
+		$template_args = array_merge($template_args, $price_args);
 		$template = apply_filters(
 			'FHEE__Events_Admin_Page__get_ticket_row__template',
-			EVENTS_TEMPLATE_PATH . 'event_tickets_metabox_ticket_row.template.php',
+			EVENTS_TEMPLATE_PATH.'event_tickets_metabox_ticket_row.template.php',
 			$ticket
 		);
-		return EEH_Template::display_template( $template, $template_args, true );
+		return EEH_Template::display_template($template, $template_args, true);
 	}
 
 
 
 	public function registration_options_meta_box() {
 		$yes_no_values = array(
-			array( 'id' => true, 'text' => esc_html__( 'Yes', 'event_espresso' ) ),
-			array( 'id' => false, 'text' => esc_html__( 'No', 'event_espresso' ) ),
+			array('id' => true, 'text' => esc_html__('Yes', 'event_espresso')),
+			array('id' => false, 'text' => esc_html__('No', 'event_espresso')),
 		);
 		$default_reg_status_values = EEM_Registration::reg_status_array(
 			array(
@@ -1593,7 +1593,7 @@ 
 		);
 		//$template_args['is_active_select'] = EEH_Form_Fields::select_input('is_active', $yes_no_values, $this->_cpt_model_obj->is_active());
 		$template_args['_event'] = $this->_cpt_model_obj;
-		$template_args['active_status'] = $this->_cpt_model_obj->pretty_active_status( false );
+		$template_args['active_status'] = $this->_cpt_model_obj->pretty_active_status(false);
 		$template_args['additional_limit'] = $this->_cpt_model_obj->additional_limit();
 		$template_args['default_registration_status'] = EEH_Form_Fields::select_input(
 			'default_reg_status',
@@ -1621,7 +1621,7 @@ 
 			$default_reg_status_values
 		);
 		EEH_Template::display_template(
-			EVENTS_TEMPLATE_PATH . 'event_registration_options.template.php',
+			EVENTS_TEMPLATE_PATH.'event_registration_options.template.php',
 			$template_args
 		);
 	}
@@ -1640,97 +1640,97 @@ 
 	 *                           that match the given _view and paging parameters.
 	 * @return array an array of event objects.
 	 */
-	public function get_events( $per_page = 10, $current_page = 1, $count = false ) {
+	public function get_events($per_page = 10, $current_page = 1, $count = false) {
 		$EEME = $this->_event_model();
-		$offset = ( $current_page - 1 ) * $per_page;
-		$limit = $count ? null : $offset . ',' . $per_page;
-		$orderby = isset( $this->_req_data['orderby'] ) ? $this->_req_data['orderby'] : 'EVT_ID';
-		$order = isset( $this->_req_data['order'] ) ? $this->_req_data['order'] : "DESC";
-		if ( isset( $this->_req_data['month_range'] ) ) {
-			$pieces = explode( ' ', $this->_req_data['month_range'], 3 );
-			$month_r = ! empty( $pieces[0] ) ? date( 'm', strtotime( $pieces[0] ) ) : '';
-			$year_r = ! empty( $pieces[1] ) ? $pieces[1] : '';
+		$offset = ($current_page - 1) * $per_page;
+		$limit = $count ? null : $offset.','.$per_page;
+		$orderby = isset($this->_req_data['orderby']) ? $this->_req_data['orderby'] : 'EVT_ID';
+		$order = isset($this->_req_data['order']) ? $this->_req_data['order'] : "DESC";
+		if (isset($this->_req_data['month_range'])) {
+			$pieces = explode(' ', $this->_req_data['month_range'], 3);
+			$month_r = ! empty($pieces[0]) ? date('m', strtotime($pieces[0])) : '';
+			$year_r = ! empty($pieces[1]) ? $pieces[1] : '';
 		}
 		$where = array();
-		$status = isset( $this->_req_data['status'] ) ? $this->_req_data['status'] : null;
+		$status = isset($this->_req_data['status']) ? $this->_req_data['status'] : null;
 		//determine what post_status our condition will have for the query.
-		switch ( $status ) {
+		switch ($status) {
 			case 'month' :
 			case 'today' :
 			case null :
 			case 'all' :
 				break;
 			case 'draft' :
-				$where['status'] = array( 'IN', array( 'draft', 'auto-draft' ) );
+				$where['status'] = array('IN', array('draft', 'auto-draft'));
 				break;
 			default :
 				$where['status'] = $status;
 		}
 		//categories?
-		$category = isset( $this->_req_data['EVT_CAT'] ) && $this->_req_data['EVT_CAT'] > 0
+		$category = isset($this->_req_data['EVT_CAT']) && $this->_req_data['EVT_CAT'] > 0
 			? $this->_req_data['EVT_CAT'] : null;
-		if ( ! empty ( $category ) ) {
+		if ( ! empty ($category)) {
 			$where['Term_Taxonomy.taxonomy'] = 'espresso_event_categories';
 			$where['Term_Taxonomy.term_id'] = $category;
 		}
 		//date where conditions
-		$start_formats = EEM_Datetime::instance()->get_formats_for( 'DTT_EVT_start' );
-		if ( isset( $this->_req_data['month_range'] ) && $this->_req_data['month_range'] != '' ) {
+		$start_formats = EEM_Datetime::instance()->get_formats_for('DTT_EVT_start');
+		if (isset($this->_req_data['month_range']) && $this->_req_data['month_range'] != '') {
 			$DateTime = new DateTime(
-				$year_r . '-' . $month_r . '-01 00:00:00',
-				new DateTimeZone( EEM_Datetime::instance()->get_timezone() )
+				$year_r.'-'.$month_r.'-01 00:00:00',
+				new DateTimeZone(EEM_Datetime::instance()->get_timezone())
 			);
-			$start = $DateTime->format( implode( ' ', $start_formats ) );
-			$end = $DateTime->setDate( $year_r, $month_r, $DateTime->format( 't' ) )->setTime( 23, 59, 59 )->format(
-				implode( ' ', $start_formats )
+			$start = $DateTime->format(implode(' ', $start_formats));
+			$end = $DateTime->setDate($year_r, $month_r, $DateTime->format('t'))->setTime(23, 59, 59)->format(
+				implode(' ', $start_formats)
 			);
-			$where['Datetime.DTT_EVT_start'] = array( 'BETWEEN', array( $start, $end ) );
-		} else if ( isset( $this->_req_data['status'] ) && $this->_req_data['status'] == 'today' ) {
-			$DateTime = new DateTime( 'now', new DateTimeZone( EEM_Event::instance()->get_timezone() ) );
-			$start = $DateTime->setTime( 0, 0, 0 )->format( implode( ' ', $start_formats ) );
-			$end = $DateTime->setTime( 23, 59, 59 )->format( implode( ' ', $start_formats ) );
-			$where['Datetime.DTT_EVT_start'] = array( 'BETWEEN', array( $start, $end ) );
-		} else if ( isset( $this->_req_data['status'] ) && $this->_req_data['status'] == 'month' ) {
-			$now = date( 'Y-m-01' );
-			$DateTime = new DateTime( $now, new DateTimeZone( EEM_Event::instance()->get_timezone() ) );
-			$start = $DateTime->setTime( 0, 0, 0 )->format( implode( ' ', $start_formats ) );
-			$end = $DateTime->setDate( date( 'Y' ), date( 'm' ), $DateTime->format( 't' ) )
-			                ->setTime( 23, 59, 59 )
-			                ->format( implode( ' ', $start_formats ) );
-			$where['Datetime.DTT_EVT_start'] = array( 'BETWEEN', array( $start, $end ) );
+			$where['Datetime.DTT_EVT_start'] = array('BETWEEN', array($start, $end));
+		} else if (isset($this->_req_data['status']) && $this->_req_data['status'] == 'today') {
+			$DateTime = new DateTime('now', new DateTimeZone(EEM_Event::instance()->get_timezone()));
+			$start = $DateTime->setTime(0, 0, 0)->format(implode(' ', $start_formats));
+			$end = $DateTime->setTime(23, 59, 59)->format(implode(' ', $start_formats));
+			$where['Datetime.DTT_EVT_start'] = array('BETWEEN', array($start, $end));
+		} else if (isset($this->_req_data['status']) && $this->_req_data['status'] == 'month') {
+			$now = date('Y-m-01');
+			$DateTime = new DateTime($now, new DateTimeZone(EEM_Event::instance()->get_timezone()));
+			$start = $DateTime->setTime(0, 0, 0)->format(implode(' ', $start_formats));
+			$end = $DateTime->setDate(date('Y'), date('m'), $DateTime->format('t'))
+			                ->setTime(23, 59, 59)
+			                ->format(implode(' ', $start_formats));
+			$where['Datetime.DTT_EVT_start'] = array('BETWEEN', array($start, $end));
 		}
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_events', 'get_events' ) ) {
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_events', 'get_events')) {
 			$where['EVT_wp_user'] = get_current_user_id();
 		} else {
-			if ( ! isset( $where['status'] ) ) {
-				if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_private_events', 'get_events' ) ) {
+			if ( ! isset($where['status'])) {
+				if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_private_events', 'get_events')) {
 					$where['OR'] = array(
-						'status*restrict_private' => array( '!=', 'private' ),
+						'status*restrict_private' => array('!=', 'private'),
 						'AND'                     => array(
-							'status*inclusive' => array( '=', 'private' ),
+							'status*inclusive' => array('=', 'private'),
 							'EVT_wp_user'      => get_current_user_id(),
 						),
 					);
 				}
 			}
 		}
-		if ( isset( $this->_req_data['EVT_wp_user'] ) ) {
-			if ( $this->_req_data['EVT_wp_user'] != get_current_user_id()
-			     && EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_events', 'get_events' )
+		if (isset($this->_req_data['EVT_wp_user'])) {
+			if ($this->_req_data['EVT_wp_user'] != get_current_user_id()
+			     && EE_Registry::instance()->CAP->current_user_can('ee_read_others_events', 'get_events')
 			) {
 				$where['EVT_wp_user'] = $this->_req_data['EVT_wp_user'];
 			}
 		}
 		//search query handling
-		if ( isset( $this->_req_data['s'] ) ) {
-			$search_string = '%' . $this->_req_data['s'] . '%';
+		if (isset($this->_req_data['s'])) {
+			$search_string = '%'.$this->_req_data['s'].'%';
 			$where['OR'] = array(
-				'EVT_name'       => array( 'LIKE', $search_string ),
-				'EVT_desc'       => array( 'LIKE', $search_string ),
-				'EVT_short_desc' => array( 'LIKE', $search_string ),
+				'EVT_name'       => array('LIKE', $search_string),
+				'EVT_desc'       => array('LIKE', $search_string),
+				'EVT_short_desc' => array('LIKE', $search_string),
 			);
 		}
-		$where = apply_filters( 'FHEE__Events_Admin_Page__get_events__where', $where, $this->_req_data );
+		$where = apply_filters('FHEE__Events_Admin_Page__get_events__where', $where, $this->_req_data);
 		$query_params = apply_filters(
 			'FHEE__Events_Admin_Page__get_events__query_params',
 			array(
@@ -1743,23 +1743,23 @@ 
 			$this->_req_data
 		);
 		//let's first check if we have special requests coming in.
-		if ( isset( $this->_req_data['active_status'] ) ) {
-			switch ( $this->_req_data['active_status'] ) {
+		if (isset($this->_req_data['active_status'])) {
+			switch ($this->_req_data['active_status']) {
 				case 'upcoming' :
-					return $EEME->get_upcoming_events( $query_params, $count );
+					return $EEME->get_upcoming_events($query_params, $count);
 					break;
 				case 'expired' :
-					return $EEME->get_expired_events( $query_params, $count );
+					return $EEME->get_expired_events($query_params, $count);
 					break;
 				case 'active' :
-					return $EEME->get_active_events( $query_params, $count );
+					return $EEME->get_active_events($query_params, $count);
 					break;
 				case 'inactive' :
-					return $EEME->get_inactive_events( $query_params, $count );
+					return $EEME->get_inactive_events($query_params, $count);
 					break;
 			}
 		}
-		$events = $count ? $EEME->count( array( $where ), 'EVT_ID', true ) : $EEME->get_all( $query_params );
+		$events = $count ? $EEME->count(array($where), 'EVT_ID', true) : $EEME->get_all($query_params);
 		return $events;
 	}
 
@@ -1770,9 +1770,9 @@ 
 	 *
 	 * @param string $post_id
 	 */
-	public function trash_cpt_item( $post_id ) {
+	public function trash_cpt_item($post_id) {
 		$this->_req_data['EVT_ID'] = $post_id;
-		$this->_trash_or_restore_event( 'trash', false );
+		$this->_trash_or_restore_event('trash', false);
 	}
 
 
@@ -1780,9 +1780,9 @@ 
 	/**
 	 * @param string $post_id
 	 */
-	public function restore_cpt_item( $post_id ) {
+	public function restore_cpt_item($post_id) {
 		$this->_req_data['EVT_ID'] = $post_id;
-		$this->_trash_or_restore_event( 'draft', false );
+		$this->_trash_or_restore_event('draft', false);
 	}
 
 
@@ -1790,9 +1790,9 @@ 
 	/**
 	 * @param string $post_id
 	 */
-	public function delete_cpt_item( $post_id ) {
+	public function delete_cpt_item($post_id) {
 		$this->_req_data['EVT_ID'] = $post_id;
-		$this->_delete_event( false );
+		$this->_delete_event(false);
 	}
 
 
@@ -1804,23 +1804,23 @@ 
 	 * @param  string $event_status
 	 * @param bool    $redirect_after
 	 */
-	protected function _trash_or_restore_event( $event_status = 'trash', $redirect_after = true ) {
+	protected function _trash_or_restore_event($event_status = 'trash', $redirect_after = true) {
 		//determine the event id and set to array.
-		$EVT_ID = isset( $this->_req_data['EVT_ID'] ) ? absint( $this->_req_data['EVT_ID'] ) : false;
+		$EVT_ID = isset($this->_req_data['EVT_ID']) ? absint($this->_req_data['EVT_ID']) : false;
 		// loop thru events
-		if ( $EVT_ID ) {
+		if ($EVT_ID) {
 			// clean status
-			$event_status = sanitize_key( $event_status );
+			$event_status = sanitize_key($event_status);
 			// grab status
-			if ( ! empty( $event_status ) ) {
-				$success = $this->_change_event_status( $EVT_ID, $event_status );
+			if ( ! empty($event_status)) {
+				$success = $this->_change_event_status($EVT_ID, $event_status);
 			} else {
 				$success = false;
 				$msg = esc_html__(
 					'An error occurred. The event could not be moved to the trash because a valid event status was not not supplied.',
 					'event_espresso'
 				);
-				EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			}
 		} else {
 			$success = false;
@@ -1828,11 +1828,11 @@ 
 				'An error occurred. The event could not be moved to the trash because a valid event ID was not not supplied.',
 				'event_espresso'
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		}
 		$action = $event_status == 'trash' ? 'moved to the trash' : 'restored from the trash';
-		if ( $redirect_after ) {
-			$this->_redirect_after_action( $success, 'Event', $action, array( 'action' => 'default' ) );
+		if ($redirect_after) {
+			$this->_redirect_after_action($success, 'Event', $action, array('action' => 'default'));
 		}
 	}
 
@@ -1845,18 +1845,18 @@ 
 	 * @param  string $event_status
 	 * @return void
 	 */
-	protected function _trash_or_restore_events( $event_status = 'trash' ) {
+	protected function _trash_or_restore_events($event_status = 'trash') {
 		// clean status
-		$event_status = sanitize_key( $event_status );
+		$event_status = sanitize_key($event_status);
 		// grab status
-		if ( ! empty( $event_status ) ) {
+		if ( ! empty($event_status)) {
 			$success = true;
 			//determine the event id and set to array.
-			$EVT_IDs = isset( $this->_req_data['EVT_IDs'] ) ? (array) $this->_req_data['EVT_IDs'] : array();
+			$EVT_IDs = isset($this->_req_data['EVT_IDs']) ? (array) $this->_req_data['EVT_IDs'] : array();
 			// loop thru events
-			foreach ( $EVT_IDs as $EVT_ID ) {
-				if ( $EVT_ID = absint( $EVT_ID ) ) {
-					$results = $this->_change_event_status( $EVT_ID, $event_status );
+			foreach ($EVT_IDs as $EVT_ID) {
+				if ($EVT_ID = absint($EVT_ID)) {
+					$results = $this->_change_event_status($EVT_ID, $event_status);
 					$success = $results !== false ? $success : false;
 				} else {
 					$msg = sprintf(
@@ -1866,7 +1866,7 @@ 
 						),
 						$EVT_ID
 					);
-					EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 					$success = false;
 				}
 			}
@@ -1876,12 +1876,12 @@ 
 				'An error occurred. The event could not be moved to the trash because a valid event status was not not supplied.',
 				'event_espresso'
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		}
 		// in order to force a pluralized result message we need to send back a success status greater than 1
 		$success = $success ? 2 : false;
 		$action = $event_status == 'trash' ? 'moved to the trash' : 'restored from the trash';
-		$this->_redirect_after_action( $success, 'Events', $action, array( 'action' => 'default' ) );
+		$this->_redirect_after_action($success, 'Events', $action, array('action' => 'default'));
 	}
 
 
@@ -1894,30 +1894,30 @@ 
 	 * @param  string $event_status
 	 * @return bool
 	 */
-	private function _change_event_status( $EVT_ID = 0, $event_status = '' ) {
+	private function _change_event_status($EVT_ID = 0, $event_status = '') {
 		// grab event id
-		if ( ! $EVT_ID ) {
+		if ( ! $EVT_ID) {
 			$msg = esc_html__(
 				'An error occurred. No Event ID or an invalid Event ID was received.',
 				'event_espresso'
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
-		$this->_cpt_model_obj = EEM_Event::instance()->get_one_by_ID( $EVT_ID );
+		$this->_cpt_model_obj = EEM_Event::instance()->get_one_by_ID($EVT_ID);
 		// clean status
-		$event_status = sanitize_key( $event_status );
+		$event_status = sanitize_key($event_status);
 		// grab status
-		if ( empty( $event_status ) ) {
+		if (empty($event_status)) {
 			$msg = esc_html__(
 				'An error occurred. No Event Status or an invalid Event Status was received.',
 				'event_espresso'
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		// was event trashed or restored ?
-		switch ( $event_status ) {
+		switch ($event_status) {
 			case 'draft' :
 				$action = 'restored from the trash';
 				$hook = 'AHEE_event_restored_from_trash';
@@ -1931,15 +1931,15 @@ 
 				$hook = false;
 		}
 		//use class to change status
-		$this->_cpt_model_obj->set_status( $event_status );
+		$this->_cpt_model_obj->set_status($event_status);
 		$success = $this->_cpt_model_obj->save();
-		if ( $success === false ) {
-			$msg = sprintf( esc_html__( 'An error occurred. The event could not be %s.', 'event_espresso' ), $action );
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ($success === false) {
+			$msg = sprintf(esc_html__('An error occurred. The event could not be %s.', 'event_espresso'), $action);
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
-		if ( $hook ) {
-			do_action( $hook );
+		if ($hook) {
+			do_action($hook);
 		}
 		return true;
 	}
@@ -1952,34 +1952,34 @@ 
 	 * @access protected
 	 * @param bool $redirect_after
 	 */
-	protected function _delete_event( $redirect_after = true ) {
+	protected function _delete_event($redirect_after = true) {
 		//determine the event id and set to array.
-		$EVT_ID = isset( $this->_req_data['EVT_ID'] ) ? absint( $this->_req_data['EVT_ID'] ) : null;
-		$EVT_ID = isset( $this->_req_data['post'] ) ? absint( $this->_req_data['post'] ) : $EVT_ID;
+		$EVT_ID = isset($this->_req_data['EVT_ID']) ? absint($this->_req_data['EVT_ID']) : null;
+		$EVT_ID = isset($this->_req_data['post']) ? absint($this->_req_data['post']) : $EVT_ID;
 		// loop thru events
-		if ( $EVT_ID ) {
-			$success = $this->_permanently_delete_event( $EVT_ID );
+		if ($EVT_ID) {
+			$success = $this->_permanently_delete_event($EVT_ID);
 			// get list of events with no prices
-			$espresso_no_ticket_prices = get_option( 'ee_no_ticket_prices', array() );
+			$espresso_no_ticket_prices = get_option('ee_no_ticket_prices', array());
 			// remove this event from the list of events with no prices
-			if ( isset( $espresso_no_ticket_prices[ $EVT_ID ] ) ) {
-				unset( $espresso_no_ticket_prices[ $EVT_ID ] );
+			if (isset($espresso_no_ticket_prices[$EVT_ID])) {
+				unset($espresso_no_ticket_prices[$EVT_ID]);
 			}
-			update_option( 'ee_no_ticket_prices', $espresso_no_ticket_prices );
+			update_option('ee_no_ticket_prices', $espresso_no_ticket_prices);
 		} else {
 			$success = false;
 			$msg = esc_html__(
 				'An error occurred. An event could not be deleted because a valid event ID was not not supplied.',
 				'event_espresso'
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		}
-		if ( $redirect_after ) {
+		if ($redirect_after) {
 			$this->_redirect_after_action(
 				$success,
 				'Event',
 				'deleted',
-				array( 'action' => 'default', 'status' => 'trash' )
+				array('action' => 'default', 'status' => 'trash')
 			);
 		}
 	}
@@ -1995,30 +1995,30 @@ 
 	protected function _delete_events() {
 		$success = true;
 		// get list of events with no prices
-		$espresso_no_ticket_prices = get_option( 'ee_no_ticket_prices', array() );
+		$espresso_no_ticket_prices = get_option('ee_no_ticket_prices', array());
 		//determine the event id and set to array.
-		$EVT_IDs = isset( $this->_req_data['EVT_IDs'] ) ? (array) $this->_req_data['EVT_IDs'] : array();
+		$EVT_IDs = isset($this->_req_data['EVT_IDs']) ? (array) $this->_req_data['EVT_IDs'] : array();
 		// loop thru events
-		foreach ( $EVT_IDs as $EVT_ID ) {
-			$EVT_ID = absint( $EVT_ID );
-			if ( $EVT_ID ) {
-				$results = $this->_permanently_delete_event( $EVT_ID );
+		foreach ($EVT_IDs as $EVT_ID) {
+			$EVT_ID = absint($EVT_ID);
+			if ($EVT_ID) {
+				$results = $this->_permanently_delete_event($EVT_ID);
 				$success = $results !== false ? $success : false;
 				// remove this event from the list of events with no prices
-				unset( $espresso_no_ticket_prices[ $EVT_ID ] );
+				unset($espresso_no_ticket_prices[$EVT_ID]);
 			} else {
 				$success = false;
 				$msg = esc_html__(
 					'An error occurred. An event could not be deleted because a valid event ID was not not supplied.',
 					'event_espresso'
 				);
-				EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			}
 		}
-		update_option( 'ee_no_ticket_prices', $espresso_no_ticket_prices );
+		update_option('ee_no_ticket_prices', $espresso_no_ticket_prices);
 		// in order to force a pluralized result message we need to send back a success status greater than 1
 		$success = $success ? 2 : false;
-		$this->_redirect_after_action( $success, 'Events', 'deleted', array( 'action' => 'default' ) );
+		$this->_redirect_after_action($success, 'Events', 'deleted', array('action' => 'default'));
 	}
 
 
@@ -2030,70 +2030,70 @@ 
 	 * @param  int $EVT_ID
 	 * @return bool
 	 */
-	private function _permanently_delete_event( $EVT_ID = 0 ) {
+	private function _permanently_delete_event($EVT_ID = 0) {
 		// grab event id
-		if ( ! $EVT_ID ) {
+		if ( ! $EVT_ID) {
 			$msg = esc_html__(
 				'An error occurred. No Event ID or an invalid Event ID was received.',
 				'event_espresso'
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		if (
 			! $this->_cpt_model_obj instanceof EE_Event
 			|| $this->_cpt_model_obj->ID() !== $EVT_ID
 		) {
-			$this->_cpt_model_obj = EEM_Event::instance()->get_one_by_ID( $EVT_ID );
+			$this->_cpt_model_obj = EEM_Event::instance()->get_one_by_ID($EVT_ID);
 		}
-		if ( ! $this->_cpt_model_obj instanceof EE_Event ) {
+		if ( ! $this->_cpt_model_obj instanceof EE_Event) {
 			return false;
 		}
 		//need to delete related tickets and prices first.
-		$datetimes = $this->_cpt_model_obj->get_many_related( 'Datetime' );
-		foreach ( $datetimes as $datetime ) {
-			$this->_cpt_model_obj->_remove_relation_to( $datetime, 'Datetime' );
-			$tickets = $datetime->get_many_related( 'Ticket' );
-			foreach ( $tickets as $ticket ) {
-				$ticket->_remove_relation_to( $datetime, 'Datetime' );
-				$ticket->delete_related_permanently( 'Price' );
+		$datetimes = $this->_cpt_model_obj->get_many_related('Datetime');
+		foreach ($datetimes as $datetime) {
+			$this->_cpt_model_obj->_remove_relation_to($datetime, 'Datetime');
+			$tickets = $datetime->get_many_related('Ticket');
+			foreach ($tickets as $ticket) {
+				$ticket->_remove_relation_to($datetime, 'Datetime');
+				$ticket->delete_related_permanently('Price');
 				$ticket->delete_permanently();
 			}
 			$datetime->delete();
 		}
 		//what about related venues or terms?
-		$venues = $this->_cpt_model_obj->get_many_related( 'Venue' );
-		foreach ( $venues as $venue ) {
-			$this->_cpt_model_obj->_remove_relation_to( $venue, 'Venue' );
+		$venues = $this->_cpt_model_obj->get_many_related('Venue');
+		foreach ($venues as $venue) {
+			$this->_cpt_model_obj->_remove_relation_to($venue, 'Venue');
 		}
 		//any attached question groups?
-		$question_groups = $this->_cpt_model_obj->get_many_related( 'Question_Group' );
-		if ( ! empty( $question_groups ) ) {
-			foreach ( $question_groups as $question_group ) {
-				$this->_cpt_model_obj->_remove_relation_to( $question_group, 'Question_Group' );
+		$question_groups = $this->_cpt_model_obj->get_many_related('Question_Group');
+		if ( ! empty($question_groups)) {
+			foreach ($question_groups as $question_group) {
+				$this->_cpt_model_obj->_remove_relation_to($question_group, 'Question_Group');
 			}
 		}
 		//Message Template Groups
-		$this->_cpt_model_obj->_remove_relations( 'Message_Template_Group' );
+		$this->_cpt_model_obj->_remove_relations('Message_Template_Group');
 		/** @type EE_Term_Taxonomy[] $term_taxonomies */
 		$term_taxonomies = $this->_cpt_model_obj->term_taxonomies();
-		foreach ( $term_taxonomies as $term_taxonomy ) {
-			$this->_cpt_model_obj->remove_relation_to_term_taxonomy( $term_taxonomy );
+		foreach ($term_taxonomies as $term_taxonomy) {
+			$this->_cpt_model_obj->remove_relation_to_term_taxonomy($term_taxonomy);
 		}
 		$success = $this->_cpt_model_obj->delete_permanently();
 		// did it all go as planned ?
-		if ( $success ) {
-			$msg = sprintf( esc_html__( 'Event ID # %d has been deleted.', 'event_espresso' ), $EVT_ID );
-			EE_Error::add_success( $msg );
+		if ($success) {
+			$msg = sprintf(esc_html__('Event ID # %d has been deleted.', 'event_espresso'), $EVT_ID);
+			EE_Error::add_success($msg);
 		} else {
 			$msg = sprintf(
-				esc_html__( 'An error occurred. Event ID # %d could not be deleted.', 'event_espresso' ),
+				esc_html__('An error occurred. Event ID # %d could not be deleted.', 'event_espresso'),
 				$EVT_ID
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
-		do_action( 'AHEE__Events_Admin_Page___permanently_delete_event__after_event_deleted', $EVT_ID );
+		do_action('AHEE__Events_Admin_Page___permanently_delete_event__after_event_deleted', $EVT_ID);
 		return true;
 	}
 
@@ -2106,7 +2106,7 @@ 
 	 * @return int
 	 */
 	public function total_events() {
-		$count = EEM_Event::instance()->count( array( 'caps' => 'read_admin' ), 'EVT_ID', true );
+		$count = EEM_Event::instance()->count(array('caps' => 'read_admin'), 'EVT_ID', true);
 		return $count;
 	}
 
@@ -2120,9 +2120,9 @@ 
 	 */
 	public function total_events_draft() {
 		$where = array(
-			'status' => array( 'IN', array( 'draft', 'auto-draft' ) ),
+			'status' => array('IN', array('draft', 'auto-draft')),
 		);
-		$count = EEM_Event::instance()->count( array( $where, 'caps' => 'read_admin' ), 'EVT_ID', true );
+		$count = EEM_Event::instance()->count(array($where, 'caps' => 'read_admin'), 'EVT_ID', true);
 		return $count;
 	}
 
@@ -2138,7 +2138,7 @@ 
 		$where = array(
 			'status' => 'trash',
 		);
-		$count = EEM_Event::instance()->count( array( $where, 'caps' => 'read_admin' ), 'EVT_ID', true );
+		$count = EEM_Event::instance()->count(array($where, 'caps' => 'read_admin'), 'EVT_ID', true);
 		return $count;
 	}
 
@@ -2169,12 +2169,12 @@ 
 			EE_Registry::instance()->CFG->registration->default_STS_ID,
 			$this->_template_args['reg_status_array']
 		)
-			? sanitize_text_field( EE_Registry::instance()->CFG->registration->default_STS_ID )
+			? sanitize_text_field(EE_Registry::instance()->CFG->registration->default_STS_ID)
 			: EEM_Registration::status_id_pending_payment;
-		$this->_set_add_edit_form_tags( 'update_default_event_settings' );
-		$this->_set_publish_post_box_vars( null, false, false, null, false );
+		$this->_set_add_edit_form_tags('update_default_event_settings');
+		$this->_set_publish_post_box_vars(null, false, false, null, false);
 		$this->_template_args['admin_page_content'] = EEH_Template::display_template(
-			EVENTS_TEMPLATE_PATH . 'event_settings.template.php',
+			EVENTS_TEMPLATE_PATH.'event_settings.template.php',
 			$this->_template_args,
 			true
 		);
@@ -2190,8 +2190,8 @@ 
 	 * @return void
 	 */
 	protected function _update_default_event_settings() {
-		EE_Config::instance()->registration->default_STS_ID = isset( $this->_req_data['default_reg_status'] )
-			? sanitize_text_field( $this->_req_data['default_reg_status'] )
+		EE_Config::instance()->registration->default_STS_ID = isset($this->_req_data['default_reg_status'])
+			? sanitize_text_field($this->_req_data['default_reg_status'])
 			: EEM_Registration::status_id_pending_payment;
 		$what = 'Default Event Settings';
 		$success = $this->_update_espresso_configuration(
@@ -2201,7 +2201,7 @@ 
 			__FUNCTION__,
 			__LINE__
 		);
-		$this->_redirect_after_action( $success, $what, 'updated', array( 'action' => 'default_event_settings' ) );
+		$this->_redirect_after_action($success, $what, 'updated', array('action' => 'default_event_settings'));
 	}
 
 
@@ -2211,20 +2211,20 @@ 
 
 
 	protected function _template_settings() {
-		$this->_admin_page_title = esc_html__( 'Template Settings (Preview)', 'event_espresso' );
+		$this->_admin_page_title = esc_html__('Template Settings (Preview)', 'event_espresso');
 		$this->_template_args['preview_img'] = '<img src="'
 		                                       . EVENTS_ASSETS_URL
 		                                       . DS
 		                                       . 'images'
 		                                       . DS
 		                                       . 'caffeinated_template_features.jpg" alt="'
-		                                       . esc_attr__( 'Template Settings Preview screenshot', 'event_espresso' )
+		                                       . esc_attr__('Template Settings Preview screenshot', 'event_espresso')
 		                                       . '" />';
-		$this->_template_args['preview_text'] = '<strong>' . esc_html__(
+		$this->_template_args['preview_text'] = '<strong>'.esc_html__(
 				'Template Settings is a feature that is only available in the Caffeinated version of Event Espresso. Template Settings allow you to configure some of the appearance options for both the Event List and Event Details pages.',
 				'event_espresso'
-			) . '</strong>';
-		$this->display_admin_caf_preview_page( 'template_settings_tab' );
+			).'</strong>';
+		$this->display_admin_caf_preview_page('template_settings_tab');
 	}
 
 
@@ -2236,18 +2236,18 @@ 
 	 * @return void
 	 */
 	private function _set_category_object() {
-		if ( isset( $this->_category->id ) && ! empty( $this->_category->id ) ) {
+		if (isset($this->_category->id) && ! empty($this->_category->id)) {
 			return;
 		} //already have the category object so get out.
 		//set default category object
 		$this->_set_empty_category_object();
 		//only set if we've got an id
-		if ( ! isset( $this->_req_data['EVT_CAT_ID'] ) ) {
+		if ( ! isset($this->_req_data['EVT_CAT_ID'])) {
 			return;
 		}
-		$category_id = absint( $this->_req_data['EVT_CAT_ID'] );
-		$term = get_term( $category_id, 'espresso_event_categories' );
-		if ( ! empty( $term ) ) {
+		$category_id = absint($this->_req_data['EVT_CAT_ID']);
+		$term = get_term($category_id, 'espresso_event_categories');
+		if ( ! empty($term)) {
 			$this->_category->category_name = $term->name;
 			$this->_category->category_identifier = $term->slug;
 			$this->_category->category_desc = $term->description;
@@ -2267,9 +2267,9 @@ 
 
 
 	protected function _category_list_table() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		$this->_search_btn_label = esc_html__( 'Categories', 'event_espresso' );
-		$this->_admin_page_title .= ' ' . $this->get_action_link_or_button(
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$this->_search_btn_label = esc_html__('Categories', 'event_espresso');
+		$this->_admin_page_title .= ' '.$this->get_action_link_or_button(
 				'add_category',
 				'add_category',
 				array(),
@@ -2283,20 +2283,20 @@ 
 	/**
 	 * @param $view
 	 */
-	protected function _category_details( $view ) {
+	protected function _category_details($view) {
 		//load formatter helper
 		//load field generator helper
 		$route = $view == 'edit' ? 'update_category' : 'insert_category';
-		$this->_set_add_edit_form_tags( $route );
+		$this->_set_add_edit_form_tags($route);
 		$this->_set_category_object();
-		$id = ! empty( $this->_category->id ) ? $this->_category->id : '';
+		$id = ! empty($this->_category->id) ? $this->_category->id : '';
 		$delete_action = 'delete_category';
 		//custom redirect
 		$redirect = EE_Admin_Page::add_query_args_and_nonce(
-			array( 'action' => 'category_list' ),
+			array('action' => 'category_list'),
 			$this->_admin_base_url
 		);
-		$this->_set_publish_post_box_vars( 'EVT_CAT_ID', $id, $delete_action, $redirect );
+		$this->_set_publish_post_box_vars('EVT_CAT_ID', $id, $delete_action, $redirect);
 		//take care of contents
 		$this->_template_args['admin_page_content'] = $this->_category_details_content();
 		$this->display_admin_page_with_sidebar();
@@ -2310,21 +2310,21 @@ 
 	protected function _category_details_content() {
 		$editor_args['category_desc'] = array(
 			'type'          => 'wp_editor',
-			'value'         => EEH_Formatter::admin_format_content( $this->_category->category_desc ),
+			'value'         => EEH_Formatter::admin_format_content($this->_category->category_desc),
 			'class'         => 'my_editor_custom',
-			'wpeditor_args' => array( 'media_buttons' => false ),
+			'wpeditor_args' => array('media_buttons' => false),
 		);
-		$_wp_editor = $this->_generate_admin_form_fields( $editor_args, 'array' );
+		$_wp_editor = $this->_generate_admin_form_fields($editor_args, 'array');
 		$all_terms = get_terms(
-			array( 'espresso_event_categories' ),
-			array( 'hide_empty' => 0, 'exclude' => array( $this->_category->id ) )
+			array('espresso_event_categories'),
+			array('hide_empty' => 0, 'exclude' => array($this->_category->id))
 		);
 		//setup category select for term parents.
 		$category_select_values[] = array(
-			'text' => esc_html__( 'No Parent', 'event_espresso' ),
+			'text' => esc_html__('No Parent', 'event_espresso'),
 			'id'   => 0,
 		);
-		foreach ( $all_terms as $term ) {
+		foreach ($all_terms as $term) {
 			$category_select_values[] = array(
 				'text' => $term->name,
 				'id'   => $term->term_id,
@@ -2338,28 +2338,28 @@ 
 		$template_args = array(
 			'category'                 => $this->_category,
 			'category_select'          => $category_select,
-			'unique_id_info_help_link' => $this->_get_help_tab_link( 'unique_id_info' ),
+			'unique_id_info_help_link' => $this->_get_help_tab_link('unique_id_info'),
 			'category_desc_editor'     => $_wp_editor['category_desc']['field'],
 			'disable'                  => '',
 			'disabled_message'         => false,
 		);
-		$template = EVENTS_TEMPLATE_PATH . 'event_category_details.template.php';
-		return EEH_Template::display_template( $template, $template_args, true );
+		$template = EVENTS_TEMPLATE_PATH.'event_category_details.template.php';
+		return EEH_Template::display_template($template, $template_args, true);
 	}
 
 
 
 	protected function _delete_categories() {
-		$cat_ids = isset( $this->_req_data['EVT_CAT_ID'] ) ? (array) $this->_req_data['EVT_CAT_ID']
+		$cat_ids = isset($this->_req_data['EVT_CAT_ID']) ? (array) $this->_req_data['EVT_CAT_ID']
 			: (array) $this->_req_data['category_id'];
-		foreach ( $cat_ids as $cat_id ) {
-			$this->_delete_category( $cat_id );
+		foreach ($cat_ids as $cat_id) {
+			$this->_delete_category($cat_id);
 		}
 		//doesn't matter what page we're coming from... we're going to the same place after delete.
 		$query_args = array(
 			'action' => 'category_list',
 		);
-		$this->_redirect_after_action( 0, '', '', $query_args );
+		$this->_redirect_after_action(0, '', '', $query_args);
 	}
 
 
@@ -2367,9 +2367,9 @@ 
 	/**
 	 * @param $cat_id
 	 */
-	protected function _delete_category( $cat_id ) {
-		$cat_id = absint( $cat_id );
-		wp_delete_term( $cat_id, 'espresso_event_categories' );
+	protected function _delete_category($cat_id) {
+		$cat_id = absint($cat_id);
+		wp_delete_term($cat_id, 'espresso_event_categories');
 	}
 
 
@@ -2377,18 +2377,18 @@ 
 	/**
 	 * @param $new_category
 	 */
-	protected function _insert_or_update_category( $new_category ) {
-		$cat_id = $new_category ? $this->_insert_category() : $this->_insert_category( true );
+	protected function _insert_or_update_category($new_category) {
+		$cat_id = $new_category ? $this->_insert_category() : $this->_insert_category(true);
 		$success = 0; //we already have a success message so lets not send another.
-		if ( $cat_id ) {
+		if ($cat_id) {
 			$query_args = array(
 				'action'     => 'edit_category',
 				'EVT_CAT_ID' => $cat_id,
 			);
 		} else {
-			$query_args = array( 'action' => 'add_category' );
+			$query_args = array('action' => 'add_category');
 		}
-		$this->_redirect_after_action( $success, '', '', $query_args, true );
+		$this->_redirect_after_action($success, '', '', $query_args, true);
 	}
 
 
@@ -2397,14 +2397,14 @@ 
 	 * @param bool $update
 	 * @return bool|mixed|string
 	 */
-	private function _insert_category( $update = false ) {
+	private function _insert_category($update = false) {
 		$cat_id = $update ? $this->_req_data['EVT_CAT_ID'] : '';
-		$category_name = isset( $this->_req_data['category_name'] ) ? $this->_req_data['category_name'] : '';
-		$category_desc = isset( $this->_req_data['category_desc'] ) ? $this->_req_data['category_desc'] : '';
-		$category_parent = isset( $this->_req_data['category_parent'] ) ? $this->_req_data['category_parent'] : 0;
-		if ( empty( $category_name ) ) {
-			$msg = esc_html__( 'You must add a name for the category.', 'event_espresso' );
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+		$category_name = isset($this->_req_data['category_name']) ? $this->_req_data['category_name'] : '';
+		$category_desc = isset($this->_req_data['category_desc']) ? $this->_req_data['category_desc'] : '';
+		$category_parent = isset($this->_req_data['category_parent']) ? $this->_req_data['category_parent'] : 0;
+		if (empty($category_name)) {
+			$msg = esc_html__('You must add a name for the category.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		$term_args = array(
@@ -2413,22 +2413,22 @@ 
 			'parent'      => $category_parent,
 		);
 		//was the category_identifier input disabled?
-		if ( isset( $this->_req_data['category_identifier'] ) ) {
+		if (isset($this->_req_data['category_identifier'])) {
 			$term_args['slug'] = $this->_req_data['category_identifier'];
 		}
 		$insert_ids = $update
-			? wp_update_term( $cat_id, 'espresso_event_categories', $term_args )
-			: wp_insert_term( $category_name, 'espresso_event_categories', $term_args );
-		if ( ! is_array( $insert_ids ) ) {
+			? wp_update_term($cat_id, 'espresso_event_categories', $term_args)
+			: wp_insert_term($category_name, 'espresso_event_categories', $term_args);
+		if ( ! is_array($insert_ids)) {
 			$msg = esc_html__(
 				'An error occurred and the category has not been saved to the database.',
 				'event_espresso'
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		} else {
 			$cat_id = $insert_ids['term_id'];
-			$msg = sprintf( esc_html__( 'The category %s was successfully saved', 'event_espresso' ), $category_name );
-			EE_Error::add_success( $msg );
+			$msg = sprintf(esc_html__('The category %s was successfully saved', 'event_espresso'), $category_name);
+			EE_Error::add_success($msg);
 		}
 		return $cat_id;
 	}
@@ -2441,28 +2441,28 @@ 
 	 * @param bool $count
 	 * @return \EE_Base_Class[]|int
 	 */
-	public function get_categories( $per_page = 10, $current_page = 1, $count = false ) {
+	public function get_categories($per_page = 10, $current_page = 1, $count = false) {
 		//testing term stuff
-		$orderby = isset( $this->_req_data['orderby'] ) ? $this->_req_data['orderby'] : 'Term.term_id';
-		$order = isset( $this->_req_data['order'] ) ? $this->_req_data['order'] : 'DESC';
-		$limit = ( $current_page - 1 ) * $per_page;
-		$where = array( 'taxonomy' => 'espresso_event_categories' );
-		if ( isset( $this->_req_data['s'] ) ) {
-			$sstr = '%' . $this->_req_data['s'] . '%';
+		$orderby = isset($this->_req_data['orderby']) ? $this->_req_data['orderby'] : 'Term.term_id';
+		$order = isset($this->_req_data['order']) ? $this->_req_data['order'] : 'DESC';
+		$limit = ($current_page - 1) * $per_page;
+		$where = array('taxonomy' => 'espresso_event_categories');
+		if (isset($this->_req_data['s'])) {
+			$sstr = '%'.$this->_req_data['s'].'%';
 			$where['OR'] = array(
-				'Term.name'   => array( 'LIKE', $sstr ),
-				'description' => array( 'LIKE', $sstr ),
+				'Term.name'   => array('LIKE', $sstr),
+				'description' => array('LIKE', $sstr),
 			);
 		}
 		$query_params = array(
 			$where,
-			'order_by'   => array( $orderby => $order ),
-			'limit'      => $limit . ',' . $per_page,
-			'force_join' => array( 'Term' ),
+			'order_by'   => array($orderby => $order),
+			'limit'      => $limit.','.$per_page,
+			'force_join' => array('Term'),
 		);
 		$categories = $count
-			? EEM_Term_Taxonomy::instance()->count( $query_params, 'term_id' )
-			: EEM_Term_Taxonomy::instance()->get_all( $query_params );
+			? EEM_Term_Taxonomy::instance()->count($query_params, 'term_id')
+			: EEM_Term_Taxonomy::instance()->get_all($query_params);
 		return $categories;
 	}
 

caffeinated/admin/extend/events/Extend_Events_Admin_Page.core.php

Doc Comments +3 added lines, -3 removed lines

@@ -55,7 +55,7 @@ 
 	/**
 	 * @param EE_Line_Item $line_item
 	 * @param array        $options
-	 * @return mixed
+	 * @return string
 	 */
 	public function display_line_item( EE_Line_Item $line_item, $options = array() ) {
 
@@ -135,7 +135,7 @@ 
 	 *
 	 * @param EE_Line_Item $line_item
 	 * @param array        $options
-	 * @return mixed
+	 * @return string
 	 */
 	private function _item_row( EE_Line_Item $line_item, $options = array() ) {
 		// start of row
@@ -178,7 +178,7 @@ 
 	 *
 	 * @param EE_Line_Item $line_item
 	 * @param array        $options
-	 * @return mixed
+	 * @return string
 	 */
 	private function _sub_item_row( EE_Line_Item $line_item, $options = array() ) {
 		// start of row

Indentation +11 added lines, -11 removed lines

@@ -284,12 +284,12 @@ 
 			);
 			$title = esc_attr__( 'Duplicate Event', 'event_espresso' );
 			$return .= '<a href="'
-			           . $href
-			           . '" title="'
-			           . $title
-			           . '" id="ee-duplicate-event-button" class="button button-small"  value="duplicate_event">'
-			           . $title
-			           . '</button>';
+					   . $href
+					   . '" title="'
+					   . $title
+					   . '" id="ee-duplicate-event-button" class="button button-small"  value="duplicate_event">'
+					   . $title
+					   . '</button>';
 		}
 		return $return;
 	}
@@ -450,11 +450,11 @@ 
 			);
 			$reports_link = EE_Admin_Page::add_query_args_and_nonce( $reports_query_args, REG_ADMIN_URL );
 			$action_links[] = '<a href="'
-			                  . $reports_link
-			                  . '" title="'
-			                  . esc_attr__( 'View Report', 'event_espresso' )
-			                  . '"><div class="dashicons dashicons-chart-bar"></div></a>'
-			                  . "\n\t";
+							  . $reports_link
+							  . '" title="'
+							  . esc_attr__( 'View Report', 'event_espresso' )
+							  . '"><div class="dashicons dashicons-chart-bar"></div></a>'
+							  . "\n\t";
 		}
 		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_global_messages', 'view_filtered_messages' ) ) {
 			EE_Registry::instance()->load_helper( 'MSG_Template' );

Spacing +232 added lines, -232 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'NO direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('NO direct script access allowed');
 }
 
 
@@ -21,26 +21,26 @@ 
 	 *
 	 * @param bool $routing
 	 */
-	public function __construct( $routing = true ) {
-		parent::__construct( $routing );
-		if ( ! defined( 'EVENTS_CAF_TEMPLATE_PATH' ) ) {
-			define( 'EVENTS_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'events/templates/' );
-			define( 'EVENTS_CAF_ASSETS', EE_CORE_CAF_ADMIN_EXTEND . 'events/assets/' );
-			define( 'EVENTS_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'events/assets/' );
+	public function __construct($routing = true) {
+		parent::__construct($routing);
+		if ( ! defined('EVENTS_CAF_TEMPLATE_PATH')) {
+			define('EVENTS_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND.'events/templates/');
+			define('EVENTS_CAF_ASSETS', EE_CORE_CAF_ADMIN_EXTEND.'events/assets/');
+			define('EVENTS_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL.'events/assets/');
 		}
 	}
 
 
 
 	protected function _extend_page_config() {
-		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'events';
+		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND.'events';
 		//is there a evt_id in the request?
-		$evt_id = ! empty( $this->_req_data['EVT_ID'] ) && ! is_array( $this->_req_data['EVT_ID'] )
+		$evt_id = ! empty($this->_req_data['EVT_ID']) && ! is_array($this->_req_data['EVT_ID'])
 			? $this->_req_data['EVT_ID']
 			: 0;
-		$evt_id = ! empty( $this->_req_data['post'] ) ? $this->_req_data['post'] : $evt_id;
+		$evt_id = ! empty($this->_req_data['post']) ? $this->_req_data['post'] : $evt_id;
 		//tkt_id?
-		$tkt_id = ! empty( $this->_req_data['TKT_ID'] ) && ! is_array( $this->_req_data['TKT_ID'] )
+		$tkt_id = ! empty($this->_req_data['TKT_ID']) && ! is_array($this->_req_data['TKT_ID'])
 			? $this->_req_data['TKT_ID']
 			: 0;
 		$new_page_routes = array(
@@ -59,13 +59,13 @@ 
 				'capability' => 'ee_delete_default_ticket',
 				'obj_id'     => $tkt_id,
 				'noheader'   => true,
-				'args'       => array( 'trash' => true ),
+				'args'       => array('trash' => true),
 			),
 			'trash_tickets'            => array(
 				'func'       => '_trash_or_restore_ticket',
 				'capability' => 'ee_delete_default_tickets',
 				'noheader'   => true,
-				'args'       => array( 'trash' => true ),
+				'args'       => array('trash' => true),
 			),
 			'restore_ticket'           => array(
 				'func'       => '_trash_or_restore_ticket',
@@ -124,7 +124,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);
 		//partial route/config override
 		$this->_page_config['import_events']['metaboxes'] = $this->_default_espresso_metaboxes;
 		$this->_page_config['create_new']['metaboxes'][] = '_premium_event_editor_meta_boxes';
@@ -134,15 +134,15 @@ 
 		$this->_page_config['default']['list_table'] = 'Extend_Events_Admin_List_Table';
 		//add tickets tab but only if there are more than one default ticket!
 		$tkt_count = EEM_Ticket::instance()->count_deleted_and_undeleted(
-			array( array( 'TKT_is_default' => 1 ) ),
+			array(array('TKT_is_default' => 1)),
 			'TKT_ID',
 			true
 		);
-		if ( $tkt_count > 1 ) {
+		if ($tkt_count > 1) {
 			$new_page_config = array(
 				'ticket_list_table' => array(
 					'nav'           => array(
-						'label' => esc_html__( 'Default Tickets', 'event_espresso' ),
+						'label' => esc_html__('Default Tickets', 'event_espresso'),
 						'order' => 60,
 					),
 					'list_table'    => 'Tickets_List_Table',
@@ -153,53 +153,53 @@ 
 		//template settings
 		$new_page_config['template_settings'] = array(
 			'nav'           => array(
-				'label' => esc_html__( 'Templates', 'event_espresso' ),
+				'label' => esc_html__('Templates', 'event_espresso'),
 				'order' => 30,
 			),
-			'metaboxes'     => array_merge( $this->_default_espresso_metaboxes, array( '_publish_post_box' ) ),
+			'metaboxes'     => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
 			'help_tabs'     => array(
 				'general_settings_templates_help_tab' => array(
-					'title'    => esc_html__( 'Templates', 'event_espresso' ),
+					'title'    => esc_html__('Templates', 'event_espresso'),
 					'filename' => 'general_settings_templates',
 				),
 			),
-			'help_tour'     => array( 'Templates_Help_Tour' ),
+			'help_tour'     => array('Templates_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);
 		//add filters and actions
 		//modifying _views
 		add_filter(
 			'FHEE_event_datetime_metabox_add_additional_date_time_template',
-			array( $this, 'add_additional_datetime_button' ),
+			array($this, 'add_additional_datetime_button'),
 			10,
 			2
 		);
 		add_filter(
 			'FHEE_event_datetime_metabox_clone_button_template',
-			array( $this, 'add_datetime_clone_button' ),
+			array($this, 'add_datetime_clone_button'),
 			10,
 			2
 		);
 		add_filter(
 			'FHEE_event_datetime_metabox_timezones_template',
-			array( $this, 'datetime_timezones_template' ),
+			array($this, 'datetime_timezones_template'),
 			10,
 			2
 		);
 		//filters for event list table
-		add_filter( 'FHEE__Extend_Events_Admin_List_Table__filters', array( $this, 'list_table_filters' ), 10, 2 );
+		add_filter('FHEE__Extend_Events_Admin_List_Table__filters', array($this, 'list_table_filters'), 10, 2);
 		add_filter(
 			'FHEE__Events_Admin_List_Table__column_actions__action_links',
-			array( $this, 'extra_list_table_actions' ),
+			array($this, 'extra_list_table_actions'),
 			10,
 			2
 		);
 		//legend item
-		add_filter( 'FHEE__Events_Admin_Page___event_legend_items__items', array( $this, 'additional_legend_items' ) );
-		add_action( 'admin_init', array( $this, 'admin_init' ) );
+		add_filter('FHEE__Events_Admin_Page___event_legend_items__items', array($this, 'additional_legend_items'));
+		add_action('admin_init', array($this, 'admin_init'));
 		//heartbeat stuff
-		add_filter( 'heartbeat_received', array( $this, 'heartbeat_response' ), 10, 2 );
+		add_filter('heartbeat_received', array($this, 'heartbeat_response'), 10, 2);
 	}
 
 
@@ -215,11 +215,11 @@ 
 					'Do you really want to delete this image? Please remember to update your event to complete the removal.',
 					'event_espresso'
 				),
-				'event_starts_on'        => esc_html__( 'Event Starts on', 'event_espresso' ),
-				'event_ends_on'          => esc_html__( 'Event Ends on', 'event_espresso' ),
-				'event_datetime_actions' => esc_html__( 'Actions', 'event_espresso' ),
-				'event_clone_dt_msg'     => esc_html__( 'Clone this Event Date and Time', 'event_espresso' ),
-				'remove_event_dt_msg'    => esc_html__( 'Remove this Event Time', 'event_espresso' ),
+				'event_starts_on'        => esc_html__('Event Starts on', 'event_espresso'),
+				'event_ends_on'          => esc_html__('Event Ends on', 'event_espresso'),
+				'event_datetime_actions' => esc_html__('Actions', 'event_espresso'),
+				'event_clone_dt_msg'     => esc_html__('Clone this Event Date and Time', 'event_espresso'),
+				'remove_event_dt_msg'    => esc_html__('Remove this Event Time', 'event_espresso'),
 			)
 		);
 	}
@@ -234,12 +234,12 @@ 
 	 * @param array $data     The incoming data package.
 	 * @return array  possibly appended response.
 	 */
-	public function heartbeat_response( $response, $data ) {
+	public function heartbeat_response($response, $data) {
 		/**
 		 * check whether count of tickets is approaching the potential
 		 * limits for the server.
 		 */
-		if ( ! empty( $data['input_count'] ) ) {
+		if ( ! empty($data['input_count'])) {
 			$response['max_input_vars_check'] = EE_Registry::instance()->CFG->environment->max_input_vars_limit_check(
 				$data['input_count']
 			);
@@ -262,15 +262,15 @@ 
 	 * @param string $new_slug
 	 * @return string
 	 */
-	public function extra_permalink_field_buttons( $return, $id, $new_title, $new_slug ) {
-		$return = parent::extra_permalink_field_buttons( $return, $id, $new_title, $new_slug );
+	public function extra_permalink_field_buttons($return, $id, $new_title, $new_slug) {
+		$return = parent::extra_permalink_field_buttons($return, $id, $new_title, $new_slug);
 		//make sure this is only when editing
-		if ( ! empty( $id ) ) {
+		if ( ! empty($id)) {
 			$href = EE_Admin_Page::add_query_args_and_nonce(
-				array( 'action' => 'duplicate_event', 'EVT_ID' => $id ),
+				array('action' => 'duplicate_event', 'EVT_ID' => $id),
 				$this->_admin_base_url
 			);
-			$title = esc_attr__( 'Duplicate Event', 'event_espresso' );
+			$title = esc_attr__('Duplicate Event', 'event_espresso');
 			$return .= '<a href="'
 			           . $href
 			           . '" title="'
@@ -288,19 +288,19 @@ 
 		$this->_views = array(
 			'all'     => array(
 				'slug'        => 'all',
-				'label'       => esc_html__( 'All', 'event_espresso' ),
+				'label'       => esc_html__('All', 'event_espresso'),
 				'count'       => 0,
 				'bulk_action' => array(
-					'trash_tickets' => esc_html__( 'Move to Trash', 'event_espresso' ),
+					'trash_tickets' => esc_html__('Move to Trash', 'event_espresso'),
 				),
 			),
 			'trashed' => array(
 				'slug'        => 'trashed',
-				'label'       => esc_html__( 'Trash', 'event_espresso' ),
+				'label'       => esc_html__('Trash', 'event_espresso'),
 				'count'       => 0,
 				'bulk_action' => array(
-					'restore_tickets' => esc_html__( 'Restore from Trash', 'event_espresso' ),
-					'delete_tickets'  => esc_html__( 'Delete Permanently', 'event_espresso' ),
+					'restore_tickets' => esc_html__('Restore from Trash', 'event_espresso'),
+					'delete_tickets'  => esc_html__('Delete Permanently', 'event_espresso'),
 				),
 			),
 		);
@@ -311,19 +311,19 @@ 
 	public function load_scripts_styles_edit() {
 		wp_register_script(
 			'ee-event-editor-heartbeat',
-			EVENTS_CAF_ASSETS_URL . 'event-editor-heartbeat.js',
-			array( 'ee_admin_js', 'heartbeat' ),
+			EVENTS_CAF_ASSETS_URL.'event-editor-heartbeat.js',
+			array('ee_admin_js', 'heartbeat'),
 			EVENT_ESPRESSO_VERSION,
 			true
 		);
 		/**
 		 * load accounting js.
 		 */
-		add_filter( 'FHEE_load_accounting_js', '__return_true' );
+		add_filter('FHEE_load_accounting_js', '__return_true');
 		//styles
-		wp_enqueue_style( 'espresso-ui-theme' );
-		wp_enqueue_script( 'event_editor_js' );
-		wp_enqueue_script( 'ee-event-editor-heartbeat' );
+		wp_enqueue_style('espresso-ui-theme');
+		wp_enqueue_script('event_editor_js');
+		wp_enqueue_script('ee-event-editor-heartbeat');
 	}
 
 
@@ -333,9 +333,9 @@ 
 	 * @param $template_args
 	 * @return mixed
 	 */
-	public function add_additional_datetime_button( $template, $template_args ) {
+	public function add_additional_datetime_button($template, $template_args) {
 		return EEH_Template::display_template(
-			EVENTS_CAF_TEMPLATE_PATH . 'event_datetime_add_additional_time.template.php',
+			EVENTS_CAF_TEMPLATE_PATH.'event_datetime_add_additional_time.template.php',
 			$template_args,
 			true
 		);
@@ -348,9 +348,9 @@ 
 	 * @param $template_args
 	 * @return mixed
 	 */
-	public function add_datetime_clone_button( $template, $template_args ) {
+	public function add_datetime_clone_button($template, $template_args) {
 		return EEH_Template::display_template(
-			EVENTS_CAF_TEMPLATE_PATH . 'event_datetime_metabox_clone_button.template.php',
+			EVENTS_CAF_TEMPLATE_PATH.'event_datetime_metabox_clone_button.template.php',
 			$template_args,
 			true
 		);
@@ -363,9 +363,9 @@ 
 	 * @param $template_args
 	 * @return mixed
 	 */
-	public function datetime_timezones_template( $template, $template_args ) {
+	public function datetime_timezones_template($template, $template_args) {
 		return EEH_Template::display_template(
-			EVENTS_CAF_TEMPLATE_PATH . 'event_datetime_timezones.template.php',
+			EVENTS_CAF_TEMPLATE_PATH.'event_datetime_timezones.template.php',
 			$template_args,
 			true
 		);
@@ -378,22 +378,22 @@ 
 		$new_views = array(
 			'today' => array(
 				'slug'        => 'today',
-				'label'       => esc_html__( 'Today', 'event_espresso' ),
+				'label'       => esc_html__('Today', 'event_espresso'),
 				'count'       => $this->total_events_today(),
 				'bulk_action' => array(
-					'trash_events' => esc_html__( 'Move to Trash', 'event_espresso' ),
+					'trash_events' => esc_html__('Move to Trash', 'event_espresso'),
 				),
 			),
 			'month' => array(
 				'slug'        => 'month',
-				'label'       => esc_html__( 'This Month', 'event_espresso' ),
+				'label'       => esc_html__('This Month', 'event_espresso'),
 				'count'       => $this->total_events_this_month(),
 				'bulk_action' => array(
-					'trash_events' => esc_html__( 'Move to Trash', 'event_espresso' ),
+					'trash_events' => esc_html__('Move to Trash', 'event_espresso'),
 				),
 			),
 		);
-		$this->_views = array_merge( $this->_views, $new_views );
+		$this->_views = array_merge($this->_views, $new_views);
 	}
 
 
@@ -403,7 +403,7 @@ 
 	 * @param \EE_Event $event
 	 * @return array
 	 */
-	public function extra_list_table_actions( array $action_links, \EE_Event $event ) {
+	public function extra_list_table_actions(array $action_links, \EE_Event $event) {
 		if (
 			EE_Registry::instance()->CAP->current_user_can(
 				'ee_read_registrations',
@@ -415,20 +415,20 @@ 
 				'action' => 'reports',
 				'EVT_ID' => $event->ID(),
 			);
-			$reports_link = EE_Admin_Page::add_query_args_and_nonce( $reports_query_args, REG_ADMIN_URL );
+			$reports_link = EE_Admin_Page::add_query_args_and_nonce($reports_query_args, REG_ADMIN_URL);
 			$action_links[] = '<a href="'
 			                  . $reports_link
 			                  . '" title="'
-			                  . esc_attr__( 'View Report', 'event_espresso' )
+			                  . esc_attr__('View Report', 'event_espresso')
 			                  . '"><div class="dashicons dashicons-chart-bar"></div></a>'
 			                  . "\n\t";
 		}
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_global_messages', 'view_filtered_messages' ) ) {
-			EE_Registry::instance()->load_helper( 'MSG_Template' );
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_global_messages', 'view_filtered_messages')) {
+			EE_Registry::instance()->load_helper('MSG_Template');
 			$action_links[] = EEH_MSG_Template::get_message_action_link(
 				'see_notifications_for',
 				null,
-				array( 'EVT_ID' => $event->ID() )
+				array('EVT_ID' => $event->ID())
 			);
 		}
 		return $action_links;
@@ -440,7 +440,7 @@ 
 	 * @param $items
 	 * @return mixed
 	 */
-	public function additional_legend_items( $items ) {
+	public function additional_legend_items($items) {
 		if (
 			EE_Registry::instance()->CAP->current_user_can(
 				'ee_read_registrations',
@@ -449,12 +449,12 @@ 
 		) {
 			$items['reports'] = array(
 				'class' => 'dashicons dashicons-chart-bar',
-				'desc'  => esc_html__( 'Event Reports', 'event_espresso' ),
+				'desc'  => esc_html__('Event Reports', 'event_espresso'),
 			);
 		}
-		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'])) {
 				$items['view_related_messages'] = array(
 					'class' => $related_for_icon['css_class'],
 					'desc'  => $related_for_icon['label'],
@@ -480,7 +480,7 @@ 
 	protected function _duplicate_event() {
 		// first make sure the ID for the event is in the request.
 		//  If it isn't then we need to bail and redirect back to overview list table (cause how did we get here?)
-		if ( ! isset( $this->_req_data['EVT_ID'] ) ) {
+		if ( ! isset($this->_req_data['EVT_ID'])) {
 			EE_Error::add_error(
 				esc_html__(
 					'In order to duplicate an event an Event ID is required.  None was given.',
@@ -490,15 +490,15 @@ 
 				__FUNCTION__,
 				__LINE__
 			);
-			$this->_redirect_after_action( false, '', '', array(), true );
+			$this->_redirect_after_action(false, '', '', array(), true);
 			return;
 		}
 		//k we've got EVT_ID so let's use that to get the event we'll duplicate
-		$orig_event = EEM_Event::instance()->get_one_by_ID( $this->_req_data['EVT_ID'] );
-		if ( ! $orig_event instanceof EE_Event ) {
+		$orig_event = EEM_Event::instance()->get_one_by_ID($this->_req_data['EVT_ID']);
+		if ( ! $orig_event instanceof EE_Event) {
 			throw new EE_Error(
 				sprintf(
-					esc_html__( 'An EE_Event object could not be retrieved for the given ID (%s)', 'event_espresso' ),
+					esc_html__('An EE_Event object could not be retrieved for the given ID (%s)', 'event_espresso'),
 					$this->_req_data['EVT_ID']
 				)
 			);
@@ -506,56 +506,56 @@ 
 		//k now let's clone the $orig_event before getting relations
 		$new_event = clone $orig_event;
 		//original datetimes
-		$orig_datetimes = $orig_event->get_many_related( 'Datetime' );
+		$orig_datetimes = $orig_event->get_many_related('Datetime');
 		//other original relations
-		$orig_ven = $orig_event->get_many_related( 'Venue' );
+		$orig_ven = $orig_event->get_many_related('Venue');
 		//reset the ID and modify other details to make it clear this is a dupe
-		$new_event->set( 'EVT_ID', 0 );
-		$new_name = $new_event->name() . ' ' . esc_html__( '**DUPLICATE**', 'event_espresso' );
-		$new_event->set( 'EVT_name', $new_name );
+		$new_event->set('EVT_ID', 0);
+		$new_name = $new_event->name().' '.esc_html__('**DUPLICATE**', 'event_espresso');
+		$new_event->set('EVT_name', $new_name);
 		$new_event->set(
 			'EVT_slug',
 			wp_unique_post_slug(
-				sanitize_title( $orig_event->name() ),
+				sanitize_title($orig_event->name()),
 				0,
 				'publish',
 				'espresso_events',
 				0
 			)
 		);
-		$new_event->set( 'status', 'draft' );
+		$new_event->set('status', 'draft');
 		//duplicate discussion settings
-		$new_event->set( 'comment_status', $orig_event->get( 'comment_status' ) );
-		$new_event->set( 'ping_status', $orig_event->get( 'ping_status' ) );
+		$new_event->set('comment_status', $orig_event->get('comment_status'));
+		$new_event->set('ping_status', $orig_event->get('ping_status'));
 		//save the new event
 		$new_event->save();
 		//venues
-		foreach ( $orig_ven as $ven ) {
-			$new_event->_add_relation_to( $ven, 'Venue' );
+		foreach ($orig_ven as $ven) {
+			$new_event->_add_relation_to($ven, 'Venue');
 		}
 		$new_event->save();
 		//now we need to get the question group relations and handle that
 		//first primary question groups
 		$orig_primary_qgs = $orig_event->get_many_related(
 			'Question_Group',
-			array( array( 'Event_Question_Group.EQG_primary' => 1 ) )
+			array(array('Event_Question_Group.EQG_primary' => 1))
 		);
-		if ( ! empty( $orig_primary_qgs ) ) {
-			foreach ( $orig_primary_qgs as $id => $obj ) {
-				if ( $obj instanceof EE_Question_Group ) {
-					$new_event->_add_relation_to( $obj, 'Question_Group', array( 'EQG_primary' => 1 ) );
+		if ( ! empty($orig_primary_qgs)) {
+			foreach ($orig_primary_qgs as $id => $obj) {
+				if ($obj instanceof EE_Question_Group) {
+					$new_event->_add_relation_to($obj, 'Question_Group', array('EQG_primary' => 1));
 				}
 			}
 		}
 		//next additional attendee question groups
 		$orig_additional_qgs = $orig_event->get_many_related(
 			'Question_Group',
-			array( array( 'Event_Question_Group.EQG_primary' => 0 ) )
+			array(array('Event_Question_Group.EQG_primary' => 0))
 		);
-		if ( ! empty( $orig_additional_qgs ) ) {
-			foreach ( $orig_additional_qgs as $id => $obj ) {
-				if ( $obj instanceof EE_Question_Group ) {
-					$new_event->_add_relation_to( $obj, 'Question_Group', array( 'EQG_primary' => 0 ) );
+		if ( ! empty($orig_additional_qgs)) {
+			foreach ($orig_additional_qgs as $id => $obj) {
+				if ($obj instanceof EE_Question_Group) {
+					$new_event->_add_relation_to($obj, 'Question_Group', array('EQG_primary' => 0));
 				}
 			}
 		}
@@ -563,32 +563,32 @@ 
 		$new_event->save();
 		//k now that we have the new event saved we can loop through the datetimes and start adding relations.
 		$cloned_tickets = array();
-		foreach ( $orig_datetimes as $orig_dtt ) {
-			if ( ! $orig_dtt instanceof EE_Datetime ) {
+		foreach ($orig_datetimes as $orig_dtt) {
+			if ( ! $orig_dtt instanceof EE_Datetime) {
 				continue;
 			}
 			$new_dtt = clone $orig_dtt;
 			$orig_tkts = $orig_dtt->tickets();
 			//save new dtt then add to event
-			$new_dtt->set( 'DTT_ID', 0 );
-			$new_dtt->set( 'DTT_sold', 0 );
+			$new_dtt->set('DTT_ID', 0);
+			$new_dtt->set('DTT_sold', 0);
 			$new_dtt->save();
-			$new_event->_add_relation_to( $new_dtt, 'Datetime' );
+			$new_event->_add_relation_to($new_dtt, 'Datetime');
 			$new_event->save();
 			//now let's get the ticket relations setup.
-			foreach ( (array) $orig_tkts as $orig_tkt ) {
+			foreach ((array) $orig_tkts as $orig_tkt) {
 				//it's possible a datetime will have no tickets so let's verify we HAVE a ticket first.
-				if ( ! $orig_tkt instanceof EE_Ticket ) {
+				if ( ! $orig_tkt instanceof EE_Ticket) {
 					continue;
 				}
 				//is this ticket archived?  If it is then let's skip
-				if ( $orig_tkt->get( 'TKT_deleted' ) ) {
+				if ($orig_tkt->get('TKT_deleted')) {
 					continue;
 				}
 				// does this original ticket already exist in the clone_tickets cache?
 				//  If so we'll just use the new ticket from it.
-				if ( isset( $cloned_tickets[ $orig_tkt->ID() ] ) ) {
-					$new_tkt = $cloned_tickets[ $orig_tkt->ID() ];
+				if (isset($cloned_tickets[$orig_tkt->ID()])) {
+					$new_tkt = $cloned_tickets[$orig_tkt->ID()];
 				} else {
 					$new_tkt = clone $orig_tkt;
 					//get relations on the $orig_tkt that we need to setup.
@@ -599,36 +599,36 @@ 
 
 					$new_tkt->save(); //make sure new ticket has ID.
 					//price relations on new ticket need to be setup.
-					foreach ( $orig_prices as $orig_price ) {
+					foreach ($orig_prices as $orig_price) {
 						$new_price = clone $orig_price;
-						$new_price->set( 'PRC_ID', 0 );
+						$new_price->set('PRC_ID', 0);
 						$new_price->save();
-						$new_tkt->_add_relation_to( $new_price, 'Price' );
+						$new_tkt->_add_relation_to($new_price, 'Price');
 						$new_tkt->save();
 					}
 				}
 				// k now we can add the new ticket as a relation to the new datetime
 				// and make sure its added to our cached $cloned_tickets array
 				// for use with later datetimes that have the same ticket.
-				$new_dtt->_add_relation_to( $new_tkt, 'Ticket' );
+				$new_dtt->_add_relation_to($new_tkt, 'Ticket');
 				$new_dtt->save();
-				$cloned_tickets[ $orig_tkt->ID() ] = $new_tkt;
+				$cloned_tickets[$orig_tkt->ID()] = $new_tkt;
 			}
 		}
 		//clone taxonomy information
 		$taxonomies_to_clone_with = apply_filters(
 			'FHEE__Extend_Events_Admin_Page___duplicate_event__taxonomies_to_clone',
-			array( 'espresso_event_categories', 'espresso_event_type', 'post_tag' )
+			array('espresso_event_categories', 'espresso_event_type', 'post_tag')
 		);
 		//get terms for original event (notice)
-		$orig_terms = wp_get_object_terms( $orig_event->ID(), $taxonomies_to_clone_with );
+		$orig_terms = wp_get_object_terms($orig_event->ID(), $taxonomies_to_clone_with);
 		//loop through terms and add them to new event.
-		foreach ( $orig_terms as $term ) {
-			wp_set_object_terms( $new_event->ID(), $term->term_id, $term->taxonomy, true );
+		foreach ($orig_terms as $term) {
+			wp_set_object_terms($new_event->ID(), $term->term_id, $term->taxonomy, true);
 		}
-		do_action( 'AHEE__Extend_Events_Admin_Page___duplicate_event__after', $new_event, $orig_event );
+		do_action('AHEE__Extend_Events_Admin_Page___duplicate_event__after', $new_event, $orig_event);
 		//now let's redirect to the edit page for this duplicated event if we have a new event id.
-		if ( $new_event->ID() ) {
+		if ($new_event->ID()) {
 			$redirect_args = array(
 				'post'   => $new_event->ID(),
 				'action' => 'edit',
@@ -644,19 +644,19 @@ 
 				'action' => 'default',
 			);
 			EE_Error::add_error(
-				esc_html__( 'Not able to duplicate event.  Something went wrong.', 'event_espresso' ),
+				esc_html__('Not able to duplicate event.  Something went wrong.', 'event_espresso'),
 				__FILE__,
 				__FUNCTION__,
 				__LINE__
 			);
 		}
-		$this->_redirect_after_action( false, '', '', $redirect_args, true );
+		$this->_redirect_after_action(false, '', '', $redirect_args, true);
 	}
 
 
 
 	protected function _import_page() {
-		$title = esc_html__( 'Import', 'event_espresso' );
+		$title = esc_html__('Import', 'event_espresso');
 		$intro = esc_html__(
 			'If you have a previously exported Event Espresso 4 information in a Comma Separated Value (CSV) file format, you can upload the file here: ',
 			'event_espresso'
@@ -664,13 +664,13 @@ 
 		$form_url = EVENTS_ADMIN_URL;
 		$action = 'import_events';
 		$type = 'csv';
-		$this->_template_args['form'] = EE_Import::instance()->upload_form( $title, $intro, $form_url, $action, $type );
+		$this->_template_args['form'] = EE_Import::instance()->upload_form($title, $intro, $form_url, $action, $type);
 		$this->_template_args['sample_file_link'] = EE_Admin_Page::add_query_args_and_nonce(
-			array( 'action' => 'sample_export_file' ),
+			array('action' => 'sample_export_file'),
 			$this->_admin_base_url
 		);
 		$content = EEH_Template::display_template(
-			EVENTS_CAF_TEMPLATE_PATH . 'import_page.template.php',
+			EVENTS_CAF_TEMPLATE_PATH.'import_page.template.php',
 			$this->_template_args,
 			true
 		);
@@ -687,9 +687,9 @@ 
 	 * @return void
 	 */
 	protected function _import_events() {
-		require_once( EE_CLASSES . 'EE_Import.class.php' );
+		require_once(EE_CLASSES.'EE_Import.class.php');
 		$success = EE_Import::instance()->import();
-		$this->_redirect_after_action( $success, 'Import File', 'ran', array( 'action' => 'import_page' ), true );
+		$this->_redirect_after_action($success, 'Import File', 'ran', array('action' => 'import_page'), true);
 	}
 
 
@@ -702,9 +702,9 @@ 
 	 * @return void
 	 */
 	protected function _events_export() {
-		if ( isset( $this->_req_data['EVT_ID'] ) ) {
+		if (isset($this->_req_data['EVT_ID'])) {
 			$event_ids = $this->_req_data['EVT_ID'];
-		} elseif ( isset( $this->_req_data['EVT_IDs'] ) ) {
+		} elseif (isset($this->_req_data['EVT_IDs'])) {
 			$event_ids = $this->_req_data['EVT_IDs'];
 		} else {
 			$event_ids = null;
@@ -715,10 +715,10 @@ 
 			'action' => 'all_event_data',
 			'EVT_ID' => $event_ids,
 		);
-		$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' );
-			$EE_Export = EE_Export::instance( $this->_req_data );
+		$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');
+			$EE_Export = EE_Export::instance($this->_req_data);
 			$EE_Export->export();
 		}
 	}
@@ -737,10 +737,10 @@ 
 			'action'       => 'categories',
 			'category_ids' => $this->_req_data['EVT_CAT_ID'],
 		);
-		$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' );
-			$EE_Export = EE_Export::instance( $this->_req_data );
+		$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');
+			$EE_Export = EE_Export::instance($this->_req_data);
 			$EE_Export->export();
 		}
 	}
@@ -768,10 +768,10 @@ 
 			'FHEE__General_Settings_Admin_Page__template_settings__template_args',
 			$this->_template_args
 		);
-		$this->_set_add_edit_form_tags( 'update_template_settings' );
-		$this->_set_publish_post_box_vars( null, false, false, null, false );
+		$this->_set_add_edit_form_tags('update_template_settings');
+		$this->_set_publish_post_box_vars(null, false, false, null, false);
 		$this->_template_args['admin_page_content'] = EEH_Template::display_template(
-			EVENTS_CAF_TEMPLATE_PATH . 'template_settings.template.php',
+			EVENTS_CAF_TEMPLATE_PATH.'template_settings.template.php',
 			$this->_template_args,
 			true
 		);
@@ -792,9 +792,9 @@ 
 		);
 		//update custom post type slugs and detect if we need to flush rewrite rules
 		$old_slug = EE_Registry::instance()->CFG->core->event_cpt_slug;
-		EE_Registry::instance()->CFG->core->event_cpt_slug = empty( $this->_req_data['event_cpt_slug'] )
+		EE_Registry::instance()->CFG->core->event_cpt_slug = empty($this->_req_data['event_cpt_slug'])
 			? EE_Registry::instance()->CFG->core->event_cpt_slug
-			: sanitize_title_with_dashes( $this->_req_data['event_cpt_slug'] );
+			: sanitize_title_with_dashes($this->_req_data['event_cpt_slug']);
 		$what = 'Template Settings';
 		$success = $this->_update_espresso_configuration(
 			$what,
@@ -803,10 +803,10 @@ 
 			__FUNCTION__,
 			__LINE__
 		);
-		if ( EE_Registry::instance()->CFG->core->event_cpt_slug != $old_slug ) {
-			update_option( 'ee_flush_rewrite_rules', true );
+		if (EE_Registry::instance()->CFG->core->event_cpt_slug != $old_slug) {
+			update_option('ee_flush_rewrite_rules', true);
 		}
-		$this->_redirect_after_action( $success, $what, 'updated', array( 'action' => 'template_settings' ) );
+		$this->_redirect_after_action($success, $what, 'updated', array('action' => 'template_settings'));
 	}
 
 
@@ -822,8 +822,8 @@ 
 		$this->verify_cpt_object();
 		add_meta_box(
 			'espresso_event_editor_event_options',
-			esc_html__( 'Event Registration Options', 'event_espresso' ),
-			array( $this, 'registration_options_meta_box' ),
+			esc_html__('Event Registration Options', 'event_espresso'),
+			array($this, 'registration_options_meta_box'),
 			$this->page_slug,
 			'side',
 			'core'
@@ -839,8 +839,8 @@ 
 	 */
 	public function registration_options_meta_box() {
 		$yes_no_values = array(
-			array( 'id' => true, 'text' => esc_html__( 'Yes', 'event_espresso' ) ),
-			array( 'id' => false, 'text' => esc_html__( 'No', 'event_espresso' ) ),
+			array('id' => true, 'text' => esc_html__('Yes', 'event_espresso')),
+			array('id' => false, 'text' => esc_html__('No', 'event_espresso')),
 		);
 		$default_reg_status_values = EEM_Registration::reg_status_array(
 			array(
@@ -851,7 +851,7 @@ 
 			),
 			true
 		);
-		$template_args['active_status'] = $this->_cpt_model_obj->pretty_active_status( false );
+		$template_args['active_status'] = $this->_cpt_model_obj->pretty_active_status(false);
 		$template_args['_event'] = $this->_cpt_model_obj;
 		$template_args['additional_limit'] = $this->_cpt_model_obj->additional_limit();
 		$template_args['default_registration_status'] = EEH_Form_Fields::select_input(
@@ -885,7 +885,7 @@ 
 			$default_reg_status_values
 		);
 		EEH_Template::display_template(
-			EVENTS_CAF_TEMPLATE_PATH . 'event_registration_options.template.php',
+			EVENTS_CAF_TEMPLATE_PATH.'event_registration_options.template.php',
 			$template_args
 		);
 	}
@@ -903,20 +903,20 @@ 
 	 * @param  array $list_table_obj the list table object
 	 * @return array                  new filters
 	 */
-	public function list_table_filters( $old_filters, $list_table_obj ) {
+	public function list_table_filters($old_filters, $list_table_obj) {
 		$filters = array();
 		//first month/year filters
 		$filters[] = $this->espresso_event_months_dropdown();
-		$status = isset( $this->_req_data['status'] ) ? $this->_req_data['status'] : null;
+		$status = isset($this->_req_data['status']) ? $this->_req_data['status'] : null;
 		//active status dropdown
-		if ( $status !== 'draft' ) {
+		if ($status !== 'draft') {
 			$filter[] = $this->active_status_dropdown(
-				isset( $this->_req_data['active_status'] ) ? $this->_req_data['active_status'] : ''
+				isset($this->_req_data['active_status']) ? $this->_req_data['active_status'] : ''
 			);
 		}
 		//category filter
 		$filters[] = $this->category_dropdown();
-		return array_merge( $old_filters, $filters );
+		return array_merge($old_filters, $filters);
 	}
 
 
@@ -930,15 +930,15 @@ 
 	public function espresso_event_months_dropdown() {
 		// what we need to do is get all PRIMARY datetimes for all events to filter on.
 		// Note we need to include any other filters that are set!
-		$status = isset( $this->_req_data['status'] ) ? $this->_req_data['status'] : null;
+		$status = isset($this->_req_data['status']) ? $this->_req_data['status'] : null;
 		//categories?
-		$category = isset( $this->_req_data['EVT_CAT'] ) && $this->_req_data['EVT_CAT'] > 0
+		$category = isset($this->_req_data['EVT_CAT']) && $this->_req_data['EVT_CAT'] > 0
 			? $this->_req_data['EVT_CAT']
 			: null;
 		//active status?
-		$active_status = isset( $this->_req_data['active_status'] ) ? $this->_req_data['active_status'] : null;
-		$cur_date = isset( $this->_req_data['month_range'] ) ? $this->_req_data['month_range'] : '';
-		return EEH_Form_Fields::generate_event_months_dropdown( $cur_date, $status, $category, $active_status );
+		$active_status = isset($this->_req_data['active_status']) ? $this->_req_data['active_status'] : null;
+		$cur_date = isset($this->_req_data['month_range']) ? $this->_req_data['month_range'] : '';
+		return EEH_Form_Fields::generate_event_months_dropdown($cur_date, $status, $category, $active_status);
 	}
 
 
@@ -949,18 +949,18 @@ 
 	 * @param  string $current_value whatever the current active status is
 	 * @return string
 	 */
-	public function active_status_dropdown( $current_value = '' ) {
+	public function active_status_dropdown($current_value = '') {
 		$select_name = 'active_status';
 		$values = array(
-			'none'     => esc_html__( 'Show Active/Inactive', 'event_espresso' ),
-			'active'   => esc_html__( 'Active', 'event_espresso' ),
-			'upcoming' => esc_html__( 'Upcoming', 'event_espresso' ),
-			'expired'  => esc_html__( 'Expired', 'event_espresso' ),
-			'inactive' => esc_html__( 'Inactive', 'event_espresso' ),
+			'none'     => esc_html__('Show Active/Inactive', 'event_espresso'),
+			'active'   => esc_html__('Active', 'event_espresso'),
+			'upcoming' => esc_html__('Upcoming', 'event_espresso'),
+			'expired'  => esc_html__('Expired', 'event_espresso'),
+			'inactive' => esc_html__('Inactive', 'event_espresso'),
 		);
 		$id = 'id="espresso-active-status-dropdown-filter"';
 		$class = 'wide';
-		return EEH_Form_Fields::select_input( $select_name, $values, $current_value, $id, $class );
+		return EEH_Form_Fields::select_input($select_name, $values, $current_value, $id, $class);
 	}
 
 
@@ -972,8 +972,8 @@ 
 	 * @return string html
 	 */
 	public function category_dropdown() {
-		$cur_cat = isset( $this->_req_data['EVT_CAT'] ) ? $this->_req_data['EVT_CAT'] : -1;
-		return EEH_Form_Fields::generate_event_category_dropdown( $cur_cat );
+		$cur_cat = isset($this->_req_data['EVT_CAT']) ? $this->_req_data['EVT_CAT'] : -1;
+		return EEH_Form_Fields::generate_event_category_dropdown($cur_cat);
 	}
 
 
@@ -987,20 +987,20 @@ 
 	public function total_events_today() {
 		$start = EEM_Datetime::instance()->convert_datetime_for_query(
 			'DTT_EVT_start',
-			date( 'Y-m-d' ) . ' 00:00:00',
+			date('Y-m-d').' 00:00:00',
 			'Y-m-d H:i:s',
 			'UTC'
 		);
 		$end = EEM_Datetime::instance()->convert_datetime_for_query(
 			'DTT_EVT_start',
-			date( 'Y-m-d' ) . ' 23:59:59',
+			date('Y-m-d').' 23:59:59',
 			'Y-m-d H:i:s',
 			'UTC'
 		);
 		$where = array(
-			'Datetime.DTT_EVT_start' => array( 'BETWEEN', array( $start, $end ) ),
+			'Datetime.DTT_EVT_start' => array('BETWEEN', array($start, $end)),
 		);
-		$count = EEM_Event::instance()->count( array( $where, 'caps' => 'read_admin' ), 'EVT_ID', true );
+		$count = EEM_Event::instance()->count(array($where, 'caps' => 'read_admin'), 'EVT_ID', true);
 		return $count;
 	}
 
@@ -1014,25 +1014,25 @@ 
 	 */
 	public function total_events_this_month() {
 		//Dates
-		$this_year_r = date( 'Y' );
-		$this_month_r = date( 'm' );
-		$days_this_month = date( 't' );
+		$this_year_r = date('Y');
+		$this_month_r = date('m');
+		$days_this_month = date('t');
 		$start = EEM_Datetime::instance()->convert_datetime_for_query(
 			'DTT_EVT_start',
-			$this_year_r . '-' . $this_month_r . '-01 00:00:00',
+			$this_year_r.'-'.$this_month_r.'-01 00:00:00',
 			'Y-m-d H:i:s',
 			'UTC'
 		);
 		$end = EEM_Datetime::instance()->convert_datetime_for_query(
 			'DTT_EVT_start',
-			$this_year_r . '-' . $this_month_r . '-' . $days_this_month . ' 23:59:59',
+			$this_year_r.'-'.$this_month_r.'-'.$days_this_month.' 23:59:59',
 			'Y-m-d H:i:s',
 			'UTC'
 		);
 		$where = array(
-			'Datetime.DTT_EVT_start' => array( 'BETWEEN', array( $start, $end ) ),
+			'Datetime.DTT_EVT_start' => array('BETWEEN', array($start, $end)),
 		);
-		$count = EEM_Event::instance()->count( array( $where, 'caps' => 'read_admin' ), 'EVT_ID', true );
+		$count = EEM_Event::instance()->count(array($where, 'caps' => 'read_admin'), 'EVT_ID', true);
 		return $count;
 	}
 
@@ -1040,7 +1040,7 @@ 
 
 	/** DEFAULT TICKETS STUFF **/
 	public function _tickets_overview_list_table() {
-		$this->_search_btn_label = esc_html__( 'Tickets', 'event_espresso' );
+		$this->_search_btn_label = esc_html__('Tickets', 'event_espresso');
 		$this->display_admin_list_table_page_with_no_sidebar();
 	}
 
@@ -1052,46 +1052,46 @@ 
 	 * @param bool $trashed
 	 * @return \EE_Soft_Delete_Base_Class[]|int
 	 */
-	public function get_default_tickets( $per_page = 10, $count = false, $trashed = false ) {
-		$orderby = empty( $this->_req_data['orderby'] ) ? 'TKT_name' : $this->_req_data['orderby'];
-		$order = empty( $this->_req_data['order'] ) ? 'ASC' : $this->_req_data['order'];
-		switch ( $orderby ) {
+	public function get_default_tickets($per_page = 10, $count = false, $trashed = false) {
+		$orderby = empty($this->_req_data['orderby']) ? 'TKT_name' : $this->_req_data['orderby'];
+		$order = empty($this->_req_data['order']) ? 'ASC' : $this->_req_data['order'];
+		switch ($orderby) {
 			case 'TKT_name' :
-				$orderby = array( 'TKT_name' => $order );
+				$orderby = array('TKT_name' => $order);
 				break;
 			case 'TKT_price' :
-				$orderby = array( 'TKT_price' => $order );
+				$orderby = array('TKT_price' => $order);
 				break;
 			case 'TKT_uses' :
-				$orderby = array( 'TKT_uses' => $order );
+				$orderby = array('TKT_uses' => $order);
 				break;
 			case 'TKT_min' :
-				$orderby = array( 'TKT_min' => $order );
+				$orderby = array('TKT_min' => $order);
 				break;
 			case 'TKT_max' :
-				$orderby = array( 'TKT_max' => $order );
+				$orderby = array('TKT_max' => $order);
 				break;
 			case 'TKT_qty' :
-				$orderby = array( 'TKT_qty' => $order );
+				$orderby = array('TKT_qty' => $order);
 				break;
 		}
-		$current_page = isset( $this->_req_data['paged'] ) && ! empty( $this->_req_data['paged'] )
+		$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'] )
+		$per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage'])
 			? $this->_req_data['perpage']
 			: $per_page;
 		$_where = array(
 			'TKT_is_default' => 1,
 			'TKT_deleted'    => $trashed,
 		);
-		$offset = ( $current_page - 1 ) * $per_page;
-		$limit = array( $offset, $per_page );
-		if ( isset( $this->_req_data['s'] ) ) {
-			$sstr = '%' . $this->_req_data['s'] . '%';
+		$offset = ($current_page - 1) * $per_page;
+		$limit = array($offset, $per_page);
+		if (isset($this->_req_data['s'])) {
+			$sstr = '%'.$this->_req_data['s'].'%';
 			$_where['OR'] = array(
-				'TKT_name'        => array( 'LIKE', $sstr ),
-				'TKT_description' => array( 'LIKE', $sstr ),
+				'TKT_name'        => array('LIKE', $sstr),
+				'TKT_description' => array('LIKE', $sstr),
 			);
 		}
 		$query_params = array(
@@ -1100,10 +1100,10 @@ 
 			'limit'    => $limit,
 			'group_by' => 'TKT_ID',
 		);
-		if ( $count ) {
-			return EEM_Ticket::instance()->count_deleted_and_undeleted( array( $_where ) );
+		if ($count) {
+			return EEM_Ticket::instance()->count_deleted_and_undeleted(array($_where));
 		} else {
-			return EEM_Ticket::instance()->get_all_deleted_and_undeleted( $query_params );
+			return EEM_Ticket::instance()->get_all_deleted_and_undeleted($query_params);
 		}
 	}
 
@@ -1112,34 +1112,34 @@ 
 	/**
 	 * @param bool $trash
 	 */
-	protected function _trash_or_restore_ticket( $trash = false ) {
+	protected function _trash_or_restore_ticket($trash = false) {
 		$success = 1;
 		$TKT = EEM_Ticket::instance();
 		//checkboxes?
-		if ( ! empty( $this->_req_data['checkbox'] ) && is_array( $this->_req_data['checkbox'] ) ) {
+		if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
 			//if array has more than one element then success message should be plural
-			$success = count( $this->_req_data['checkbox'] ) > 1 ? 2 : 1;
+			$success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
 			//cycle thru the boxes
-			while ( list( $TKT_ID, $value ) = each( $this->_req_data['checkbox'] ) ) {
-				if ( $trash ) {
-					if ( ! $TKT->delete_by_ID( $TKT_ID ) ) {
+			while (list($TKT_ID, $value) = each($this->_req_data['checkbox'])) {
+				if ($trash) {
+					if ( ! $TKT->delete_by_ID($TKT_ID)) {
 						$success = 0;
 					}
 				} else {
-					if ( ! $TKT->restore_by_ID( $TKT_ID ) ) {
+					if ( ! $TKT->restore_by_ID($TKT_ID)) {
 						$success = 0;
 					}
 				}
 			}
 		} else {
 			//grab single id and trash
-			$TKT_ID = absint( $this->_req_data['TKT_ID'] );
-			if ( $trash ) {
-				if ( ! $TKT->delete_by_ID( $TKT_ID ) ) {
+			$TKT_ID = absint($this->_req_data['TKT_ID']);
+			if ($trash) {
+				if ( ! $TKT->delete_by_ID($TKT_ID)) {
 					$success = 0;
 				}
 			} else {
-				if ( ! $TKT->restore_by_ID( $TKT_ID ) ) {
+				if ( ! $TKT->restore_by_ID($TKT_ID)) {
 					$success = 0;
 				}
 			}
@@ -1149,7 +1149,7 @@ 
 			'action' => 'ticket_list_table',
 			'status' => $trash ? '' : 'trashed',
 		);
-		$this->_redirect_after_action( $success, 'Tickets', $action_desc, $query_args );
+		$this->_redirect_after_action($success, 'Tickets', $action_desc, $query_args);
 	}
 
 
@@ -1157,20 +1157,20 @@ 
 	protected function _delete_ticket() {
 		$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 then success message should be plural
-			$success = count( $this->_req_data['checkbox'] ) > 1 ? 2 : 1;
+			$success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
 			//cycle thru the boxes
-			while ( list( $TKT_ID, $value ) = each( $this->_req_data['checkbox'] ) ) {
+			while (list($TKT_ID, $value) = each($this->_req_data['checkbox'])) {
 				//delete
-				if ( ! $this->_delete_the_ticket( $TKT_ID ) ) {
+				if ( ! $this->_delete_the_ticket($TKT_ID)) {
 					$success = 0;
 				}
 			}
 		} else {
 			//grab single id and trash
-			$TKT_ID = absint( $this->_req_data['TKT_ID'] );
-			if ( ! $this->_delete_the_ticket( $TKT_ID ) ) {
+			$TKT_ID = absint($this->_req_data['TKT_ID']);
+			if ( ! $this->_delete_the_ticket($TKT_ID)) {
 				$success = 0;
 			}
 		}
@@ -1180,15 +1180,15 @@ 
 			'status' => 'trashed',
 		);
 		//fail safe.  If the default ticket count === 1 then we need to redirect to event overview.
-		if ( EEM_Ticket::instance()->count_deleted_and_undeleted(
-			array( array( 'TKT_is_default' => 1 ) ),
+		if (EEM_Ticket::instance()->count_deleted_and_undeleted(
+			array(array('TKT_is_default' => 1)),
 			'TKT_ID',
 			true
 		)
 		) {
 			$query_args = array();
 		}
-		$this->_redirect_after_action( $success, 'Tickets', $action_desc, $query_args );
+		$this->_redirect_after_action($success, 'Tickets', $action_desc, $query_args);
 	}
 
 
@@ -1197,11 +1197,11 @@ 
 	 * @param int $TKT_ID
 	 * @return bool|int
 	 */
-	protected function _delete_the_ticket( $TKT_ID ) {
-		$tkt = EEM_Ticket::instance()->get_one_by_ID( $TKT_ID );
-		$tkt->_remove_relations( 'Datetime' );
+	protected function _delete_the_ticket($TKT_ID) {
+		$tkt = EEM_Ticket::instance()->get_one_by_ID($TKT_ID);
+		$tkt->_remove_relations('Datetime');
 		//delete all related prices first
-		$tkt->delete_related_permanently( 'Price' );
+		$tkt->delete_related_permanently('Price');
 		return $tkt->delete_permanently();
 	}
 

admin_pages/registrations/Registrations_Admin_Page.core.php

Spacing +581 added lines, -581 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,35 +827,35 @@ 
 
 		$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')
 				),
 			'wait_list' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_wait_list,
-				'desc'  => EEH_Template::pretty_status( EEM_Registration::status_id_wait_list, false, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_wait_list,
+				'desc'  => EEH_Template::pretty_status(EEM_Registration::status_id_wait_list, 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);
 	}
 
 
@@ -869,45 +869,45 @@ 
 	 */
 	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
 				)
 			) {
-				$this->_admin_page_title .= ' ' . $this->get_action_link_or_button(
+				$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();
 	}
 
@@ -922,19 +922,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;
 		}
@@ -952,25 +952,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;
@@ -990,30 +990,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;
 		}
 
@@ -1025,103 +1025,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>
 			';
 
@@ -1159,7 +1159,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();
 
@@ -1167,10 +1167,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();
 
@@ -1178,19 +1178,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 {
 
@@ -1209,17 +1209,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');
 		}
 	}
 
@@ -1261,25 +1261,25 @@ 
 				'html_id'         => 'reg-status-change-form',
 				'layout_strategy' => new EE_Admin_Two_Column_Layout(),
 				'subsections'     => array(
-					'return' => new EE_Hidden_Input( array(
+					'return' => new EE_Hidden_Input(array(
 						'name'    => 'return',
 						'default' => 'view_registration'
-					) ),
-					'REG_ID' => new EE_Hidden_Input( array(
+					)),
+					'REG_ID' => new EE_Hidden_Input(array(
 						'name'    => 'REG_ID',
 						'default' => $this->_registration->ID()
-					) ),
+					)),
 					'current_status' => new EE_Form_Section_HTML(
 						EEH_HTML::tr(
 							EEH_HTML::th(
 								EEH_HTML::label(
-									EEH_HTML::strong( __( 'Current Registration Status', 'event_espresso' ) )
+									EEH_HTML::strong(__('Current Registration Status', 'event_espresso'))
 								)
-							) .
+							).
 							EEH_HTML::td(
 								EEH_HTML::strong(
 									$this->_registration->pretty_status(),
-									'', 'status-' . $this->_registration->status_ID(), 'line-height: 1em; font-size: 1.5em; font-weight: bold;'
+									'', 'status-'.$this->_registration->status_ID(), 'line-height: 1em; font-size: 1.5em; font-weight: bold;'
 								)
 							)
 						)
@@ -1287,22 +1287,22 @@ 
 					'reg_status' => new EE_Select_Input(
 						$this->_get_reg_statuses(),
 						array(
-							'html_label_text' => __( 'Change Registration Status to', 'event_espresso' ),
+							'html_label_text' => __('Change Registration Status to', 'event_espresso'),
 							'default'         => $this->_registration->status_ID(),
 						)
 					),
 					'send_notifications' => new EE_Yes_No_Input(
 						array(
-							'html_label_text' => __( 'Send Related Messages', 'event_espresso' ),
+							'html_label_text' => __('Send Related Messages', 'event_espresso'),
 							'default'         => false,
-							'html_help_text'  => __( 'If set to "Yes", then the related messages will be sent to the registrant.', 'event_espresso' ),
+							'html_help_text'  => __('If set to "Yes", then the related messages will be sent to the registrant.', 'event_espresso'),
 						)
 					),
-					'submit' => new EE_Submit_Input( array(
+					'submit' => new EE_Submit_Input(array(
 						'html_class'      => 'button-primary',
 						'html_label_text' => '&nbsp;',
-						'default'         => __( 'Update Registration Status', 'event_espresso' )
-					) ),
+						'default'         => __('Update Registration Status', 'event_espresso')
+					)),
 				),
 			)
 		);
@@ -1315,7 +1315,7 @@ 
 	 * Returns an array of all the buttons for the various statuses and switch status actions
 	 * @return string
 	 */
-	protected function _get_current_reg_status_help_text( $STS_ID = '' ) {
+	protected function _get_current_reg_status_help_text($STS_ID = '') {
 		//$reg_status_help_text = array(
 		//	'RAP' => __( 'XXXXXXXXXXX', 'event_espresso' ),
 		//	'RAP' => __( 'XXXXXXXXXXX', 'event_espresso' ),
@@ -1348,14 +1348,14 @@ 
 	 */
 	protected function _get_reg_statuses() {
 		$reg_status_array = EEM_Registration::instance()->reg_status_array();
-		unset ( $reg_status_array[ EEM_Registration::status_id_incomplete ] );
+		unset ($reg_status_array[EEM_Registration::status_id_incomplete]);
 		// get current reg status
 		$current_status = $this->_registration->status_ID();
 		// is registration for free event? This will determine whether to display the pending payment option
-		if ( $current_status != EEM_Registration::status_id_pending_payment && $this->_registration->transaction()->is_free() ) {
-			unset( $reg_status_array[ EEM_Registration::status_id_pending_payment ] );
+		if ($current_status != EEM_Registration::status_id_pending_payment && $this->_registration->transaction()->is_free()) {
+			unset($reg_status_array[EEM_Registration::status_id_pending_payment]);
 		}
-		return EEM_Status::instance()->localized_status( $reg_status_array, false, 'sentence' );
+		return EEM_Status::instance()->localized_status($reg_status_array, false, 'sentence');
 	}
 
 
@@ -1368,15 +1368,15 @@ 
 	 *
 	 * @return array  (array with reg_id(s) updated and whether update was successful.
 	 */
-	protected function _set_registration_status_from_request( $status = false, $notify = false ) {
-		if ( isset( $this->_req_data[ 'reg_status_change_form' ] ) ) {
-			$REG_IDs = isset( $this->_req_data[ 'reg_status_change_form' ][ 'REG_ID' ] )
-				? (array)$this->_req_data[ 'reg_status_change_form' ][ 'REG_ID' ]
+	protected function _set_registration_status_from_request($status = false, $notify = false) {
+		if (isset($this->_req_data['reg_status_change_form'])) {
+			$REG_IDs = isset($this->_req_data['reg_status_change_form']['REG_ID'])
+				? (array) $this->_req_data['reg_status_change_form']['REG_ID']
 				: array();
 		} else {
-			$REG_IDs = isset( $this->_req_data[ '_REG_ID' ] ) ? (array)$this->_req_data[ '_REG_ID' ] : array();
+			$REG_IDs = isset($this->_req_data['_REG_ID']) ? (array) $this->_req_data['_REG_ID'] : array();
 		}
-		$success = $this->_set_registration_status( $REG_IDs, $status );
+		$success = $this->_set_registration_status($REG_IDs, $status);
 		//notify?
 		if (
 			$success
@@ -1403,21 +1403,21 @@ 
 	 * @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_IDs = array(), $status = false ) {
+	protected function _set_registration_status($REG_IDs = array(), $status = false) {
 		$success = false;
 		// typecast $REG_IDs
-		$REG_IDs = (array)$REG_IDs;
-		if ( ! empty( $REG_IDs ) ) {
+		$REG_IDs = (array) $REG_IDs;
+		if ( ! empty($REG_IDs)) {
 			$success = true;
 			// set default status if none is passed
 			$status = $status ? $status : EEM_Registration::status_id_pending_payment;
 			// sanitize $REG_IDs
-			$REG_IDs = array_filter( $REG_IDs, 'absint' );
+			$REG_IDs = array_filter($REG_IDs, 'absint');
 			//loop through REG_ID's and change status
-			foreach ( $REG_IDs as $REG_ID ) {
-				$registration = EEM_Registration::instance()->get_one_by_ID( $REG_ID );
-				if ( $registration instanceof EE_Registration ) {
-					$registration->set_status( $status );
+			foreach ($REG_IDs as $REG_ID) {
+				$registration = EEM_Registration::instance()->get_one_by_ID($REG_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
 					$success = $result !== false ? $success : false;
@@ -1427,7 +1427,7 @@ 
 		//reset _req_data['_REG_ID'] for any potential future messages notifications
 		$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);
 	}
 
 
@@ -1439,49 +1439,49 @@ 
 	 * @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 ) {
-		$result = ! empty( $STS_ID )
-            ? $this->_set_registration_status_from_request( $STS_ID, $notify )
-            : array( 'success' => false );
-		$success = isset( $result['success'] ) && $result['success'];
+	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);
+		$success = isset($result['success']) && $result['success'];
 		//setup success message
-		if ( $success ) {
-			if ( is_array( $result[ 'REG_ID' ] ) && count( $result[ 'REG_ID' ] ) === 1 ) {
+		if ($success) {
+			if (is_array($result['REG_ID']) && count($result['REG_ID']) === 1) {
 				$msg = sprintf(
-					__( 'Registration status has been set to %s', 'event_espresso' ),
-					EEH_Template::pretty_status( $STS_ID, false, 'lower' )
+					__('Registration status has been set to %s', 'event_espresso'),
+					EEH_Template::pretty_status($STS_ID, false, 'lower')
 				);
 			} else {
 				$msg = sprintf(
-					__( 'Registrations have been set to %s.', 'event_espresso' ),
-					EEH_Template::pretty_status( $STS_ID, false, 'lower' )
+					__('Registrations have been set to %s.', 'event_espresso'),
+					EEH_Template::pretty_status($STS_ID, false, 'lower')
 				);
 			}
-			EE_Error::add_success( $msg );
+			EE_Error::add_success($msg);
 		} else {
 			EE_Error::add_error(
-				__( 'Something went wrong, and the status was not changed', 'event_espresso' ),
+				__('Something went wrong, and the status was not changed', 'event_espresso'),
 				__FILE__, __LINE__, __FUNCTION__
 			);
 		}
-		if ( isset( $this->_req_data[ 'return' ] ) && $this->_req_data[ 'return' ] == 'view_registration' ) {
-			$route = array( 'action' => 'view_registration', '_REG_ID' => reset( $result[ 'REG_ID' ] ) );
+		if (isset($this->_req_data['return']) && $this->_req_data['return'] == 'view_registration') {
+			$route = array('action' => 'view_registration', '_REG_ID' => reset($result['REG_ID']));
 		} else {
-			$route = array( 'action' => 'default' );
+			$route = 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 );
-		$this->_redirect_after_action( $success, '', '', $route, true );
+		$route = array_merge($this->_req_data, $route);
+		$this->_redirect_after_action($success, '', '', $route, true);
 	}
 
 
@@ -1492,51 +1492,51 @@ 
 	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['reg_status_change_form']['send_notifications'] );
+		$notify = ! empty($this->_req_data['reg_status_change_form']['send_notifications']);
 		//$notify = ! empty( $this->_req_data['txn_reg_status_change']['send_notifications'] );
-		$this->_req_data[ 'reg_status_change_form' ][ 'reg_status' ] = isset(
-			$this->_req_data[ 'reg_status_change_form' ][ 'reg_status' ]
+		$this->_req_data['reg_status_change_form']['reg_status'] = isset(
+			$this->_req_data['reg_status_change_form']['reg_status']
 		)
-			? $this->_req_data[ 'reg_status_change_form' ][ 'reg_status' ]
+			? $this->_req_data['reg_status_change_form']['reg_status']
 			: '';
 
-		switch ( $this->_req_data[ 'reg_status_change_form' ]['reg_status'] ) {
+		switch ($this->_req_data['reg_status_change_form']['reg_status']) {
 
 			case EEM_Registration::status_id_approved :
-			case EEH_Template::pretty_status( EEM_Registration::status_id_approved, false, 'sentence' ) :
-				$this->approve_registration( $notify );
+			case EEH_Template::pretty_status(EEM_Registration::status_id_approved, false, 'sentence') :
+				$this->approve_registration($notify);
 				break;
 
 			case EEM_Registration::status_id_pending_payment :
-			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 EEM_Registration::status_id_not_approved :
-			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 EEM_Registration::status_id_declined :
-			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 EEM_Registration::status_id_cancelled :
-			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;
 
 			case EEM_Registration::status_id_wait_list :
-			case EEH_Template::pretty_status( EEM_Registration::status_id_wait_list, false, 'sentence' ) :
-				$this->waitlist_registration( $notify );
+			case EEH_Template::pretty_status(EEM_Registration::status_id_wait_list, false, 'sentence') :
+				$this->waitlist_registration($notify);
 				break;
 
 			case EEM_Registration::status_id_incomplete :
 			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;
 		}
 	}
@@ -1550,8 +1550,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);
 	}
 
 
@@ -1563,8 +1563,8 @@ 
 	 * @param bool $notify whether or not to notify the registrant about their status change.
 	 * @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);
 	}
 
 
@@ -1576,8 +1576,8 @@ 
 	 * @param bool $notify whether or not to notify the registrant about their status change.
 	 * @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);
 	}
 
 
@@ -1589,8 +1589,8 @@ 
 	 * @param bool $notify whether or not to notify the registrant about their status change.
 	 * @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);
 	}
 
 
@@ -1602,8 +1602,8 @@ 
 	 * @param bool $notify whether or not to notify the registrant about their status change.
 	 * @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);
 	}
 
 
@@ -1615,8 +1615,8 @@ 
 	 * @param bool $notify whether or not to notify the registrant about their status change.
 	 * @return void
 	 */
-	protected function waitlist_registration( $notify = false ) {
-		$this->_reg_status_change_return( EEM_Registration::status_id_wait_list, $notify );
+	protected function waitlist_registration($notify = false) {
+		$this->_reg_status_change_return(EEM_Registration::status_id_wait_list, $notify);
 	}
 
 
@@ -1630,14 +1630,14 @@ 
 	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_Non_Zero_Line_Item_Filter() );
-		$filters->add( new EE_Single_Registration_Line_Item_Filter( $this->_registration ) );
-		$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));
+		$line_item_filter_processor = new EE_Line_Item_Filter_Processor($filters, $transaction->total_line_item());
 		$filtered_line_item_tree = $line_item_filter_processor->process();
 		$line_item_display = new EE_Line_Item_Display(
 			'reg_admin_table',
@@ -1645,7 +1645,7 @@ 
 		);
 		$this->_template_args['line_item_table'] = $line_item_display->display_line_item(
 			$filtered_line_item_tree,
-			array( 'EE_Registration' => $this->_registration )
+			array('EE_Registration' => $this->_registration)
 		);
 		$attendee = $this->_registration->attendee();
 
@@ -1655,7 +1655,7 @@ 
 				'espresso_transactions_view_transaction'
 			)
 		) {
-			$this->_template_args[ 'view_transaction_button' ] =  EEH_Template::get_button_or_link(
+			$this->_template_args['view_transaction_button'] = EEH_Template::get_button_or_link(
 				EE_Admin_Page::add_query_args_and_nonce(
 					array(
 						'action' => 'view_transaction',
@@ -1663,12 +1663,12 @@ 
 					),
 					TXN_ADMIN_URL
 				),
-				esc_html__( ' View Transaction' ),
+				esc_html__(' View Transaction'),
 				'button secondary-button right',
 				'dashicons dashicons-cart'
 			);
 		} else {
-			$this->_template_args[ 'view_transaction_button' ] = '';
+			$this->_template_args['view_transaction_button'] = '';
 		}
 
 		if (
@@ -1678,7 +1678,7 @@ 
 				'espresso_registrations_resend_registration'
 			)
 		) {
-			$this->_template_args[ 'resend_registration_button' ] = EEH_Template::get_button_or_link(
+			$this->_template_args['resend_registration_button'] = EEH_Template::get_button_or_link(
 				EE_Admin_Page::add_query_args_and_nonce(
 					array(
 						'action' 		=> 'resend_registration',
@@ -1687,55 +1687,55 @@ 
 					),
 					REG_ADMIN_URL
 				),
-				esc_html__( ' Resend Registration' ),
+				esc_html__(' Resend Registration'),
 				'button secondary-button right',
 				'dashicons dashicons-email-alt'
 			);
 		} else {
-			$this->_template_args[ 'resend_registration_button' ] = '';
+			$this->_template_args['resend_registration_button'] = '';
 		}
 
 		$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_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(
@@ -1748,8 +1748,8 @@ 
 		$this->_template_args['REG_ID'] = $this->_registration->ID();
 		$this->_template_args['event_id'] = $this->_registration->event_ID();
 
-		$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);
 
 	}
 
@@ -1763,14 +1763,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);
 		}
 	}
 
@@ -1784,12 +1784,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 '
@@ -1808,20 +1808,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>
@@ -1841,18 +1841,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>';
 	}
 
@@ -1866,17 +1866,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>';
 	}
@@ -1890,14 +1890,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);
 			}
 		}
 	}
@@ -1908,11 +1908,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;
 	}
@@ -1925,17 +1925,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
@@ -1943,19 +1943,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;
 	}
@@ -1973,31 +1973,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++;
 			}
@@ -2007,8 +2007,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);
 
 	}
 
@@ -2029,14 +2029,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;
 			}
@@ -2045,27 +2045,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);
 	}
 
 
@@ -2078,7 +2078,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;
@@ -2088,26 +2088,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');
@@ -2116,7 +2116,7 @@ 
 				$dtts = array_merge($dtts, $dtt);
 
 				$updated = $trash ? $REG->delete() : $REG->restore();
-				if ( !$updated ) {
+				if ( ! $updated) {
 					$success = 0;
 				} else {
 					$success = 2;
@@ -2131,7 +2131,7 @@ 
 			$tickets[$ticket->ID()] = $ticket;
 			$dtts = $ticket->get_many_related('Datetime');
 			$updated = $trash ? $REG->delete() : $REG->restore();
-			if ( ! $updated ) {
+			if ( ! $updated) {
 				$success = 0;
 			}
 
@@ -2141,10 +2141,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);
 	}
 
 
@@ -2168,16 +2168,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;
 				}
 			}
@@ -2187,15 +2187,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);
 	}
 
 
@@ -2207,31 +2207,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');
 			}
 
@@ -2241,7 +2241,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
@@ -2278,35 +2278,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
@@ -2323,7 +2323,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',
@@ -2339,7 +2339,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 !!!
@@ -2374,16 +2374,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();
@@ -2392,10 +2392,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
 		);
 	}
 
@@ -2410,11 +2410,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;
 		}
 
@@ -2435,82 +2435,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( esc_html__( 'Tickets Selected. Now complete the registration.', 'event_espresso' ) );
+				if ($success) {
+					EE_Error::add_success(esc_html__('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;
 		}
 
@@ -2527,21 +2527,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);
 	}
 
 
@@ -2552,7 +2552,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();
 	}
@@ -2567,10 +2567,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'] : '';
@@ -2598,47 +2598,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 ( ! empty( $this->_req_data['s'] ) ) {
-			$sstr = '%' . $this->_req_data['s'] . '%';
+		if ( ! empty($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_ID', true ): $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_ID', true) : $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_ID' , true ) : $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_ID', true) : $ATT_MDL->get_all(array($_where, 'order_by'=>array($orderby=>$sort), 'limit'=>$limit));
 		}
 
 		return $all_attendees;
@@ -2655,10 +2655,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);
 	}
 
 
@@ -2666,26 +2666,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();
 			}
@@ -2694,26 +2694,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();
 			}
@@ -2732,73 +2732,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__);
 
 	}
 
@@ -2818,17 +2818,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');
 	}
 
 
@@ -2837,10 +2837,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);
 	}
 
@@ -2856,12 +2856,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()
 					)),
@@ -2874,12 +2874,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()
 					)),
@@ -2890,8 +2890,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);
 
 	}
 
@@ -2901,11 +2901,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);
 
 	}
@@ -2919,8 +2919,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);
 		}
@@ -2937,21 +2937,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;
 				}
 			}
@@ -2960,18 +2960,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'));
 
 	}
 

modules/ticket_selector/EED_Ticket_Selector.module.php

Indentation +43 added lines, -43 removed lines

@@ -26,9 +26,9 @@ 
  */
 class EED_Ticket_Selector extends  EED_Module {
 
-    const debug = false;    //	true false
+	const debug = false;    //	true false
 
-    /**
+	/**
 	 * event that ticket selector is being generated for
 	 *
 	 * @access protected
@@ -37,19 +37,19 @@ 
 	protected static $_event = NULL;
 
 	/**
-	* array of datetimes and the spaces available for them
-	*
-	* @access private
-	* @var array
-	*/
+	 * array of datetimes and the spaces available for them
+	 *
+	 * @access private
+	 * @var array
+	 */
 	private static $_available_spaces = array();
 
 	/**
-	* max attendees that can register for event at one time
-	*
-	* @access private
-	* @var int
-	*/
+	 * max attendees that can register for event at one time
+	 *
+	 * @access private
+	 * @var int
+	 */
 	private static $_max_atndz = EE_INF;
 
 
@@ -219,8 +219,8 @@ 
 				return $permalink_string;
 			}
 			$permalink_string .= '<a id="js-ticket-selector-embed-trigger" class="button button-small" href="#"  tabindex="-1">'
-			                     . __( 'Embed', 'event_espresso' )
-			                     . '</a> ';
+								 . __( 'Embed', 'event_espresso' )
+								 . '</a> ';
 			$ticket_selector_url = add_query_arg( array( 'ticket_selector' => 'iframe', 'event' => $id ), site_url() );
 			$iframe_string = esc_html(
 				'<iframe src="' . $ticket_selector_url . '" width="100%" height="100%"></iframe>'
@@ -649,7 +649,7 @@ 
 	 * 	@return array|boolean
 	 */
 	public function process_ticket_selections() {
-        do_action( 'EED_Ticket_Selector__process_ticket_selections__before' );
+		do_action( 'EED_Ticket_Selector__process_ticket_selections__before' );
 		// check nonce
 		if ( ! EED_Ticket_Selector::process_ticket_selector_nonce( 'process_ticket_selections_nonce' ) ) {
 			return false;
@@ -720,20 +720,20 @@ 
 					}
 				}
 				do_action(
-				    'AHEE__EE_Ticket_Selector__process_ticket_selections__after_tickets_added_to_cart',
-                    EE_Registry::instance()->CART,
-                    $this
-                );
+					'AHEE__EE_Ticket_Selector__process_ticket_selections__after_tickets_added_to_cart',
+					EE_Registry::instance()->CART,
+					$this
+				);
 				//d( EE_Registry::instance()->CART );
 				//die(); // <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< KILL REDIRECT HERE BEFORE CART UPDATE
 
 				if ( apply_filters( 'FHEE__EED_Ticket_Selector__process_ticket_selections__tckts_slctd', $tckts_slctd ) ) {
 					if ( apply_filters( 'FHEE__EED_Ticket_Selector__process_ticket_selections__success', $tickets_added ) ) {
 						do_action(
-						    'FHEE__EE_Ticket_Selector__process_ticket_selections__before_redirecting_to_checkout',
-                            EE_Registry::instance()->CART,
-                            $this
-                        );
+							'FHEE__EE_Ticket_Selector__process_ticket_selections__before_redirecting_to_checkout',
+							EE_Registry::instance()->CART,
+							$this
+						);
 						EE_Registry::instance()->CART->recalculate_all_cart_totals();
 						EE_Registry::instance()->CART->save_cart( FALSE );
 						EE_Registry::instance()->SSN->update();
@@ -746,20 +746,20 @@ 
 
 						EE_Error::get_notices( false, true );
 						wp_safe_redirect(
-						    apply_filters(
-						        'FHEE__EE_Ticket_Selector__process_ticket_selections__success_redirect_url',
-                                EE_Registry::instance()->CFG->core->reg_page_url()
-                            )
-                        );
+							apply_filters(
+								'FHEE__EE_Ticket_Selector__process_ticket_selections__success_redirect_url',
+								EE_Registry::instance()->CFG->core->reg_page_url()
+							)
+						);
 						exit();
 
 					} else {
 						if ( ! EE_Error::has_error() && ! EE_Error::has_error(true, 'attention') ) {
 							// nothing added to cart
 							EE_Error::add_attention(
-							    __( 'No tickets were added for the event.', 'event_espresso' ),
-                                __FILE__, __FUNCTION__, __LINE__
-                            );
+								__( 'No tickets were added for the event.', 'event_espresso' ),
+								__FILE__, __FUNCTION__, __LINE__
+							);
 						}
 					}
 
@@ -926,13 +926,13 @@ 
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
 		// get the number of spaces left for this datetime ticket
 		$available_spaces = self::_ticket_datetime_availability( $ticket );
-        if (self::debug) {
-            echo "<br /><br /> " . __LINE__ . ") " . __METHOD__ . "()";
-            echo "<br /> . ticket->ID(): " . $ticket->ID();
-            echo "<br /> . requested qty: " . $qty;
-            echo "<br /> . available_spaces: " . $available_spaces;
-        }
-        // compare available spaces against the number of tickets being purchased
+		if (self::debug) {
+			echo "<br /><br /> " . __LINE__ . ") " . __METHOD__ . "()";
+			echo "<br /> . ticket->ID(): " . $ticket->ID();
+			echo "<br /> . requested qty: " . $qty;
+			echo "<br /> . available_spaces: " . $available_spaces;
+		}
+		// compare available spaces against the number of tickets being purchased
 		if ( $available_spaces >= $qty ) {
 			// allow addons to prevent a ticket from being added to cart
 			if (
@@ -1113,11 +1113,11 @@ 
 
 
 	/**
-	* 	load js
-	*
-	* 	@access 		public
-	* 	@return 		void
-	*/
+	 * 	load js
+	 *
+	 * 	@access 		public
+	 * 	@return 		void
+	 */
 	public static function load_tckt_slctr_assets() {
 		// add some style
 		if ( apply_filters( 'FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', FALSE ) ) {

Spacing +230 added lines, -230 removed lines

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

modules/ticket_selector/templates/ticket_selector_chart.template.php

Spacing +144 added lines, -144 removed lines

@@ -8,31 +8,31 @@ 
 
 $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 )
+$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 ) {
-		$remaining = max( $ticket->remaining(), 0 );
+foreach ($tickets as $TKT_ID => $ticket) {
+	if ($ticket instanceof EE_Ticket) {
+		$remaining = max($ticket->remaining(), 0);
 		// max tickets or $max_atndz, whichever is smaller
-		$max = min( $ticket->max(), $max_atndz );;
+		$max = min($ticket->max(), $max_atndz); ;
 		// offer the number of $tickets_remaining or $max, whichever is smaller
-		$max = min( $remaining, $max );
+		$max = min($remaining, $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;
-		if ( ! $ticket->is_on_sale() || $remaining < $min ) {
+		$min = $ticket->required() ? max($min, 1) : $min;
+		if ( ! $ticket->is_on_sale() || $remaining < $min) {
 			// 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;
 		}
@@ -40,42 +40,42 @@ 
 		$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);
 		$is_remaining = $remaining > 0 ? true : false;
 		// 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( false, $is_remaining );
+		$tkt_status = $required_ticket_sold_out !== FALSE && $required_ticket_sold_out === $ticket->start_date() ? EE_Ticket::sold_out : $ticket->ticket_status(false, $is_remaining);
 		$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, $is_remaining ) . '</span>';
+				$ticket_status = '<span class="ticket-sales-sold-out">'.$ticket->ticket_status(TRUE, $is_remaining).'</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, $is_remaining ) . '</span>';
+				$ticket_status = '<span class="ticket-sales-expired">'.$ticket->ticket_status(true, $is_remaining).'</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, $is_remaining ) . '</span>';
+				$ticket_status = '<span class="archived-ticket">'.$ticket->ticket_status(true, $is_remaining).'</span>';
 				$status_class = 'archived-ticket hidden';
 			break;
 			// pending
 			case EE_Ticket::pending :
-				$ticket_status = '<span class="ticket-pending">' . $ticket->ticket_status( true, $is_remaining ) . '</span>';
+				$ticket_status = '<span class="ticket-pending">'.$ticket->ticket_status(true, $is_remaining).'</span>';
 				$status_class = 'ticket-pending';
 			break;
 			// onsale
 			case EE_Ticket::onsale :
 			default :
-				$ticket_status = '<span class="ticket-on-sale">' . $ticket->ticket_status( true, $is_remaining ) . '</span>';
+				$ticket_status = '<span class="ticket-on-sale">'.$ticket->ticket_status(true, $is_remaining).'</span>';
 				$status_class = 'ticket-on-sale';
 			break;
 		}
@@ -115,7 +115,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
@@ -127,24 +127,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>';
@@ -158,63 +158,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 } ?>
@@ -224,7 +224,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
@@ -234,33 +234,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();
@@ -268,44 +268,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>
@@ -315,106 +315,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 $remaining === EE_INF ? '<span class="smaller-text">' .  __( 'unlimited ', 'event_espresso' ) . '</span>' : $remaining; ?>
+														<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 $remaining === EE_INF ? '<span class="smaller-text">'.__('unlimited ', 'event_espresso').'</span>' : $remaining; ?>
 														</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>
@@ -432,7 +432,7 @@ 
 							</div>
 						</td>
 					</tr>
-				<?php endif;  //end template_settings->show_ticket_details check?>
+				<?php endif; //end template_settings->show_ticket_details check?>
 	<?php
 			$row++;
 		}
@@ -441,32 +441,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_atndz == 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
 						/**
@@ -477,7 +477,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 } ?>
@@ -491,24 +491,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',
 			''
@@ -516,10 +516,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"/>
@@ -528,27 +528,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);
 	}
 }
 ?>

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
@@ -42,7 +42,7 @@ 
  *
  */
 
-if ( function_exists( 'espresso_version' ) ) {
+if (function_exists('espresso_version')) {
 
 	/**
 	 *    espresso_duplicate_plugin_error
@@ -51,12 +51,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 {
 
@@ -67,103 +67,103 @@ 
 	 * @return string
 	 */
 	function espresso_version() {
-		return apply_filters( 'FHEE__espresso__espresso_version', '4.9.12.rc.004' );
+		return apply_filters('FHEE__espresso__espresso_version', '4.9.12.rc.004');
 	}
 
 	// 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');
 
 
 
@@ -177,7 +177,7 @@ 
 		//	}
 		//
 	}
-	register_deactivation_hook( EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_deactivation' );
+	register_deactivation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_deactivation');
 
 
 
@@ -187,15 +187,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'));
 		}
 	}
 
@@ -209,25 +209,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();
 
 
@@ -236,7 +236,7 @@ 
 
 
 
-if ( ! function_exists( 'espresso_deactivate_plugin' ) ) {
+if ( ! function_exists('espresso_deactivate_plugin')) {
 	/**
 	*    deactivate_plugin
 	* usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
@@ -245,11 +245,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);
 	}
 }