eventespresso / event-espresso-core

core/db_models/fields/EE_Maybe_Serialized_Simple_HTML_Field.php

Spacing +14 added lines, -14 removed lines

@@ -24,14 +24,14 @@ 
  * But either way, the string or the array's values can ONLY contain simple HTML tags.
  * If you want to allow Full HTML in the value, use EE_Maybe_Serialized_Text_Field
  */
-class EE_Maybe_Serialized_Simple_HTML_Field extends EE_Maybe_Serialized_Text_Field{
+class EE_Maybe_Serialized_Simple_HTML_Field extends EE_Maybe_Serialized_Text_Field {
 	/**
 	 * removes all non-basic tags when setting
 	 * @param string $value_inputted_for_field_on_model_object
 	 * @return string
 	 */
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
-		return parent::prepare_for_set( $this->_remove_tags(  $value_inputted_for_field_on_model_object ) );
+		return parent::prepare_for_set($this->_remove_tags($value_inputted_for_field_on_model_object));
 	}
 
 	/**
@@ -39,13 +39,13 @@ 
 	 * @param array|string $value
 	 * @return array|string
 	 */
-	protected function _remove_tags( $value ) {
-		if( is_array( $value ) ) {
-			foreach( $value as $key => $v ) {
-				$value[ $key ] = $this->_remove_tags( $v );
+	protected function _remove_tags($value) {
+		if (is_array($value)) {
+			foreach ($value as $key => $v) {
+				$value[$key] = $this->_remove_tags($v);
 			}
-		}elseif( is_string( $value ) ) {
-			$value = wp_kses("$value", $this->_get_allowed_tags() );
+		}elseif (is_string($value)) {
+			$value = wp_kses("$value", $this->_get_allowed_tags());
 		}
 		return $value;
 	}
@@ -56,7 +56,7 @@ 
 	 * @return array|string
 	 */
 	function prepare_for_set_from_db($value_found_in_db_for_model_object) {
-		return $this->_remove_tags( parent::prepare_for_set_from_db( $value_found_in_db_for_model_object ) );
+		return $this->_remove_tags(parent::prepare_for_set_from_db($value_found_in_db_for_model_object));
 	}
 
 
@@ -65,12 +65,12 @@ 
 	 * @global array $allowedtags
 	 * @return array
 	 */
-	function _get_allowed_tags(){
+	function _get_allowed_tags() {
 		global $allowedtags;
 		$tags_we_allow = $allowedtags;
-		$tags_we_allow['ol']=array();
-		$tags_we_allow['ul']=array();
-		$tags_we_allow['li']=array();
-		return apply_filters( 'FHEE__EE_Maybe_Serialized_Simple_HTML_Field___get_allowed_tags', $tags_we_allow, $this );
+		$tags_we_allow['ol'] = array();
+		$tags_we_allow['ul'] = array();
+		$tags_we_allow['li'] = array();
+		return apply_filters('FHEE__EE_Maybe_Serialized_Simple_HTML_Field___get_allowed_tags', $tags_we_allow, $this);
 	}
 }

core/db_models/EEM_Ticket.model.php

Spacing +36 added lines, -36 removed lines

@@ -21,8 +21,8 @@ 
  *
  * ------------------------------------------------------------------------
  */
-require_once ( EE_MODELS . 'EEM_Soft_Delete_Base.model.php' );
-require_once ( EE_CLASSES . 'EE_Ticket.class.php' );
+require_once (EE_MODELS.'EEM_Soft_Delete_Base.model.php');
+require_once (EE_CLASSES.'EE_Ticket.class.php');
 
 class EEM_Ticket extends EEM_Soft_Delete_Base {
 
@@ -35,35 +35,35 @@ 
 	 *		@access private
 	 *		@param string $timezone string representing the timezone we want to set for returned Date Time Strings (and any incoming timezone data that gets saved).  Note this just sends the timezone info to the date time model field objects.  Default is NULL (and will be assumed using the set timezone in the 'timezone_string' wp option)
 	 */
-	protected function __construct( $timezone ) {
-		$this->singular_item = __('Ticket','event_espresso');
-		$this->plural_item = __('Tickets','event_espresso');
+	protected function __construct($timezone) {
+		$this->singular_item = __('Ticket', 'event_espresso');
+		$this->plural_item = __('Tickets', 'event_espresso');
 
 		$this->_tables = array(
 			'Ticket'=> new EE_Primary_Table('esp_ticket', 'TKT_ID')
 		);
 		$this->_fields = array(
 			'Ticket'=>array(
-				'TKT_ID'=> new EE_Primary_Key_Int_Field('TKT_ID', __('Ticket ID','event_espresso')),
-				'TTM_ID'=>new EE_Foreign_Key_Int_Field('TTM_ID', __('Ticket Template ID','event_espresso'), false, 0, 'Ticket_Template'),
+				'TKT_ID'=> new EE_Primary_Key_Int_Field('TKT_ID', __('Ticket ID', 'event_espresso')),
+				'TTM_ID'=>new EE_Foreign_Key_Int_Field('TTM_ID', __('Ticket Template ID', 'event_espresso'), false, 0, 'Ticket_Template'),
 				'TKT_name'=>new EE_Plain_Text_Field('TKT_name', __('Ticket Name', 'event_espresso'), false, ''),
-				'TKT_description'=>new EE_Full_HTML_Field('TKT_description', __('Description of Ticket', 'event_espresso'), false, '' ),
-				'TKT_start_date'=>new EE_Datetime_Field('TKT_start_date', __('Start time/date of Ticket','event_espresso'), false, time(), $timezone ),
-				'TKT_end_date'=>new EE_Datetime_Field('TKT_end_date', __('End time/date of Ticket','event_espresso'), false, time(), $timezone ),
-				'TKT_min'=>new EE_Integer_Field('TKT_min', __('Minimum quantity of this ticket that must be purchased', 'event_espresso'), false, 0 ),
-				'TKT_max'=>new EE_Infinite_Integer_Field('TKT_max', __('Maximum quantity of this ticket that can be purchased in one transaction', 'event_espresso'), false, EE_INF ),
+				'TKT_description'=>new EE_Full_HTML_Field('TKT_description', __('Description of Ticket', 'event_espresso'), false, ''),
+				'TKT_start_date'=>new EE_Datetime_Field('TKT_start_date', __('Start time/date of Ticket', 'event_espresso'), false, time(), $timezone),
+				'TKT_end_date'=>new EE_Datetime_Field('TKT_end_date', __('End time/date of Ticket', 'event_espresso'), false, time(), $timezone),
+				'TKT_min'=>new EE_Integer_Field('TKT_min', __('Minimum quantity of this ticket that must be purchased', 'event_espresso'), false, 0),
+				'TKT_max'=>new EE_Infinite_Integer_Field('TKT_max', __('Maximum quantity of this ticket that can be purchased in one transaction', 'event_espresso'), false, EE_INF),
 				'TKT_price'=> new EE_Money_Field('TKT_price', 'Final calculated price for ticket', false, 0),
 				'TKT_sold' => new EE_Integer_Field('TKT_sold', __('Number of this ticket sold', 'event_espresso'), false, 0),
-				'TKT_qty'=>new EE_Infinite_Integer_Field('TKT_qty', __('Quantity of this ticket that is available','event_espresso'), false, EE_INF),
-				'TKT_uses'=>new EE_Infinite_Integer_Field('TKT_uses', __('Number of datetimes this ticket can be used at', 'event_espresso'), false, EE_INF ),
-				'TKT_required'=>new EE_Boolean_Field('TKT_required', __("Flag indicating whether this ticket must be purchased with a transaction", "event_espresso"), false, false ),
-				'TKT_taxable'=>new EE_Boolean_Field('TKT_taxable', __("Flag indicating whether there is tax applied on this ticket", "event_espresso"), false,false),
-				'TKT_is_default'=>new EE_Boolean_Field('TKT_is_default', __('Flag indicating that this ticket is a default ticket', 'event_espresso'), false, false ),
+				'TKT_qty'=>new EE_Infinite_Integer_Field('TKT_qty', __('Quantity of this ticket that is available', 'event_espresso'), false, EE_INF),
+				'TKT_uses'=>new EE_Infinite_Integer_Field('TKT_uses', __('Number of datetimes this ticket can be used at', 'event_espresso'), false, EE_INF),
+				'TKT_required'=>new EE_Boolean_Field('TKT_required', __("Flag indicating whether this ticket must be purchased with a transaction", "event_espresso"), false, false),
+				'TKT_taxable'=>new EE_Boolean_Field('TKT_taxable', __("Flag indicating whether there is tax applied on this ticket", "event_espresso"), false, false),
+				'TKT_is_default'=>new EE_Boolean_Field('TKT_is_default', __('Flag indicating that this ticket is a default ticket', 'event_espresso'), false, false),
 				'TKT_order' => new EE_Integer_Field('TKT_order', __('The order in which the Ticket is displayed in the editor (used for autosaves when the form doesn\'t have the ticket ID yet)', 'event_espresso'), false, 0),
-				'TKT_row' => new EE_Integer_Field('TKT_row', __('How tickets are displayed in the ui', 'event_espresso'), false, 0 ),
+				'TKT_row' => new EE_Integer_Field('TKT_row', __('How tickets are displayed in the ui', 'event_espresso'), false, 0),
 				'TKT_deleted' => new EE_Trashed_Flag_Field('TKT_deleted', __('Flag indicating if this has been archived or not', 'event_espresso'), false, false),
-				'TKT_wp_user' => new EE_WP_User_Field('TKT_wp_user', __('Ticket Creator ID', 'event_espresso'), FALSE ),
-				'TKT_parent' => new EE_Integer_Field('TKT_parent', __('Indicates what TKT_ID is the parent of this TKT_ID (used in autosaves/revisions)'), true, 0 )
+				'TKT_wp_user' => new EE_WP_User_Field('TKT_wp_user', __('Ticket Creator ID', 'event_espresso'), FALSE),
+				'TKT_parent' => new EE_Integer_Field('TKT_parent', __('Indicates what TKT_ID is the parent of this TKT_ID (used in autosaves/revisions)'), true, 0)
 			));
 		$this->_model_relations = array(
 			'Datetime'=>new EE_HABTM_Relation('Datetime_Ticket'),
@@ -75,12 +75,12 @@ 
 		);
 
 		//this model is generally available for reading
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Default_Public('TKT_is_default', 'Datetime.Event');
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Default_Public('TKT_is_default', 'Datetime.Event');
 		//account for default tickets in the caps
-		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Default_Protected( 'TKT_is_default', 'Datetime.Event' );
-		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Default_Protected( 'TKT_is_default', 'Datetime.Event' );
-		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Default_Protected( 'TKT_is_default', 'Datetime.Event' );
-		parent::__construct( $timezone );
+		$this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Default_Protected('TKT_is_default', 'Datetime.Event');
+		$this->_cap_restriction_generators[EEM_Base::caps_edit] = new EE_Restriction_Generator_Default_Protected('TKT_is_default', 'Datetime.Event');
+		$this->_cap_restriction_generators[EEM_Base::caps_delete] = new EE_Restriction_Generator_Default_Protected('TKT_is_default', 'Datetime.Event');
+		parent::__construct($timezone);
 	}
 
 
@@ -91,9 +91,9 @@ 
 	 */
 	public function get_all_default_tickets() {
 		/** @type EE_Ticket[] $tickets */
-		$tickets = $this->get_all( array( array('TKT_is_default' => 1), 'order_by' => array('TKT_ID' => 'ASC')) );
+		$tickets = $this->get_all(array(array('TKT_is_default' => 1), 'order_by' => array('TKT_ID' => 'ASC')));
 		//we need to set the start date and end date to today's date and the start of the default dtt
-		return $this->_set_default_dates( $tickets );
+		return $this->_set_default_dates($tickets);
 	}
 
 
@@ -103,11 +103,11 @@ 
 	 * @param EE_Ticket[] $tickets
 	 * @return EE_Ticket[]
 	 */
-	private function _set_default_dates( $tickets ) {
-		foreach ( $tickets as $ticket ) {
-			$ticket->set('TKT_start_date', $this->current_time_for_query('TKT_start_date', true) );
-			$ticket->set('TKT_end_date', $this->current_time_for_query( 'TKT_end_date', true ) + (60 * 60 * 24 * 30 ) );
-			$ticket->set_end_time( $this->convert_datetime_for_query( 'TKT_end_date', '11:59 pm', 'g:i a', $this->_timezone ) );
+	private function _set_default_dates($tickets) {
+		foreach ($tickets as $ticket) {
+			$ticket->set('TKT_start_date', $this->current_time_for_query('TKT_start_date', true));
+			$ticket->set('TKT_end_date', $this->current_time_for_query('TKT_end_date', true) + (60 * 60 * 24 * 30));
+			$ticket->set_end_time($this->convert_datetime_for_query('TKT_end_date', '11:59 pm', 'g:i a', $this->_timezone));
 		}
 
 		return $tickets;
@@ -122,8 +122,8 @@ 
 	 * @param array $query_params
 	 * @return int
 	 */
-	public function sum_tickets_currently_available_at_datetime($DTT_ID, $query_params = array()){
-		return EEM_Datetime::instance()->sum_tickets_currently_available_at_datetime( $DTT_ID, $query_params );
+	public function sum_tickets_currently_available_at_datetime($DTT_ID, $query_params = array()) {
+		return EEM_Datetime::instance()->sum_tickets_currently_available_at_datetime($DTT_ID, $query_params);
 	}
 
 
@@ -133,8 +133,8 @@ 
 	 * @param EE_Ticket[] $tickets
 	 * @return void
 	 */
-	public function update_tickets_sold($tickets){
-		foreach($tickets as $ticket){
+	public function update_tickets_sold($tickets) {
+		foreach ($tickets as $ticket) {
 			/* @var  $ticket EE_Ticket */
 			$ticket->update_tickets_sold();
 		}

caffeinated/admin/new/pricing/espresso_events_Pricing_Hooks.class.php

Spacing +383 added lines, -383 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -54,23 +54,23 @@ 
 		$this->_name = 'pricing';
 
 		//capability check
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_default_prices', 'advanced_ticket_datetime_metabox' ) ) {
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_default_prices', 'advanced_ticket_datetime_metabox')) {
 			return;
 		}
 
-		EE_Registry::instance()->load_helper( 'DTT_Helper' );
+		EE_Registry::instance()->load_helper('DTT_Helper');
 
 		//if we were going to add our own metaboxes we'd use the below.
 		$this->_metaboxes = array(
 			0 => array(
-				'page_route' => array('edit','create_new'),
+				'page_route' => array('edit', 'create_new'),
 				'func' => 'pricing_metabox',
 				'label' => __('Event Tickets & Datetimes', 'event_espresso'),
 				'priority' => 'high',
 				'context' => 'normal'
 				),
 
-			);/**/
+			); /**/
 
 		$this->_remove_metaboxes = array(
 			0 => array(
@@ -89,24 +89,24 @@ 
 		 *
 		 * @var array  Expected an array returned with 'date' and 'time' keys.
 		 */
-		$this->_date_format_strings = apply_filters( 'FHEE__espresso_events_Pricing_Hooks___set_hooks_properties__date_format_strings', array(
+		$this->_date_format_strings = apply_filters('FHEE__espresso_events_Pricing_Hooks___set_hooks_properties__date_format_strings', array(
 				'date' => 'Y-m-d',
 				'time' => 'h:i a'
 			));
 
 		//validate
-		$this->_date_format_strings['date'] = isset( $this->_date_format_strings['date'] ) ? $this->_date_format_strings['date'] : null;
-		$this->_date_format_strings['time'] = isset( $this->_date_format_strings['time'] ) ? $this->_date_format_strings['time'] : null;
+		$this->_date_format_strings['date'] = isset($this->_date_format_strings['date']) ? $this->_date_format_strings['date'] : null;
+		$this->_date_format_strings['time'] = isset($this->_date_format_strings['time']) ? $this->_date_format_strings['time'] : null;
 
 		//validate format strings
-		$format_validation = EEH_DTT_Helper::validate_format_string( $this->_date_format_strings['date'] . ' ' . $this->_date_format_strings['time'] );
-		if ( is_array( $format_validation ) ) {
-			$msg = '<p>' . sprintf( __( 'The format "%s" was likely added via a filter and is invalid for the following reasons:', 'event_espresso' ), $this->_date_format_strings['date'] . ' ' . $this->_date_format_strings['time'] ) . '</p><ul>';
-			foreach ( $format_validation as $error ) {
-				$msg .= '<li>' . $error . '</li>';
+		$format_validation = EEH_DTT_Helper::validate_format_string($this->_date_format_strings['date'].' '.$this->_date_format_strings['time']);
+		if (is_array($format_validation)) {
+			$msg = '<p>'.sprintf(__('The format "%s" was likely added via a filter and is invalid for the following reasons:', 'event_espresso'), $this->_date_format_strings['date'].' '.$this->_date_format_strings['time']).'</p><ul>';
+			foreach ($format_validation as $error) {
+				$msg .= '<li>'.$error.'</li>';
 			}
-			$msg .= '</ul></p><p>' . sprintf( __( '%sPlease note that your date and time formats have been reset to "Y-m-d" and "h:i a" respectively.%s', 'event_espresso' ), '<span style="color:#D54E21;">', '</span>' ) . '</p>';
-			EE_Error::add_attention( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			$msg .= '</ul></p><p>'.sprintf(__('%sPlease note that your date and time formats have been reset to "Y-m-d" and "h:i a" respectively.%s', 'event_espresso'), '<span style="color:#D54E21;">', '</span>').'</p>';
+			EE_Error::add_attention($msg, __FILE__, __FUNCTION__, __LINE__);
 			$this->_date_format_strings = array(
 				'date' => 'Y-m-d',
 				'time' => 'h:i a'
@@ -117,60 +117,60 @@ 
 		$this->_scripts_styles = array(
 			'registers' => array(
 				'ee-tickets-datetimes-css' => array(
-					'url' => PRICING_ASSETS_URL . 'event-tickets-datetimes.css',
+					'url' => PRICING_ASSETS_URL.'event-tickets-datetimes.css',
 					'type' => 'css'
 					),
 				'ee-dtt-ticket-metabox' => array(
-					'url' => PRICING_ASSETS_URL . 'ee-datetime-ticket-metabox.js',
+					'url' => PRICING_ASSETS_URL.'ee-datetime-ticket-metabox.js',
 					'depends' => array('ee-datepicker', 'ee-dialog', 'underscore')
 					)
 				),
 			'deregisters' => array(
-				'event-editor-css' => array('type' => 'css' ),
+				'event-editor-css' => array('type' => 'css'),
 				'event-datetime-metabox' => array('type' => 'js')
 				),
 			'enqueues' => array(
-				'ee-tickets-datetimes-css' => array( 'edit', 'create_new' ),
-				'ee-dtt-ticket-metabox' => array( 'edit', 'create_new' )
+				'ee-tickets-datetimes-css' => array('edit', 'create_new'),
+				'ee-dtt-ticket-metabox' => array('edit', 'create_new')
 				),
 			'localize' => array(
 				'ee-dtt-ticket-metabox' => array(
 					'DTT_TRASH_BLOCK' => array(
 						'main_warning' => __('The Datetime you are attempting to trash is the only datetime selected for the following ticket(s):', 'event_espresso'),
 						'after_warning' => __('In order to trash this datetime you must first make sure the above ticket(s) are assigned to other datetimes.', 'event_espresso'),
-						'cancel_button' => '<button class="button-secondary ee-modal-cancel">' . __('Cancel', 'event_espresso') . '</button>',
+						'cancel_button' => '<button class="button-secondary ee-modal-cancel">'.__('Cancel', 'event_espresso').'</button>',
 						'single_warning_from_tkt' => __('The Datetime you are attempting to unassign from this ticket is the only remaining datetime for this ticket. Tickets must always have at least one datetime assigned to them.', 'event_espresso'),
 						'single_warning_from_dtt' => __('The ticket you are attempting to unassign from this datetime cannot be unassigned because the datetime is the only remaining datetime for the ticket.  Tickets must always have at least one datetime assigned to them.', 'event_espresso'),
-						'dismiss_button' => '<button class="button-secondary ee-modal-cancel">' . __('Dismiss', 'event_espresso') . '</button>'
+						'dismiss_button' => '<button class="button-secondary ee-modal-cancel">'.__('Dismiss', 'event_espresso').'</button>'
 						),
 					'DTT_ERROR_MSG' => array(
 						'no_ticket_name' => __('General Admission', 'event_espresso'),
-						'dismiss_button' => '<div class="save-cancel-button-container"><button class="button-secondary ee-modal-cancel">' . __('Dismiss', 'event_espresso') . '</button></div>'
+						'dismiss_button' => '<div class="save-cancel-button-container"><button class="button-secondary ee-modal-cancel">'.__('Dismiss', 'event_espresso').'</button></div>'
 						),
 					'DTT_OVERSELL_WARNING' => array(
 						'datetime_ticket' => __('You cannot add this ticket to this datetime because it has a sold amount that is greater than the amount of spots remaining for this datetime.', 'event_espresso'),
 						'ticket_datetime' => __('You cannot add this datetime to this ticket because the ticket has a sold amount that is greater than the amount of spots remaining on the datetime.', 'event_espresso')
 						),
-					'DTT_CONVERTED_FORMATS' => EEH_DTT_Helper::convert_php_to_js_and_moment_date_formats( $this->_date_format_strings['date'], $this->_date_format_strings['time'] ),
-					'DTT_START_OF_WEEK' => array( 'dayValue' => (int) get_option( 'start_of_week' ) )
+					'DTT_CONVERTED_FORMATS' => EEH_DTT_Helper::convert_php_to_js_and_moment_date_formats($this->_date_format_strings['date'], $this->_date_format_strings['time']),
+					'DTT_START_OF_WEEK' => array('dayValue' => (int) get_option('start_of_week'))
 					)
 				)
 			);
 
 
-		add_action('AHEE__EE_Admin_Page_CPT__do_extra_autosave_stuff__after_Extend_Events_Admin_Page', array( $this, 'autosave_handling' ), 10 );
-		add_filter('FHEE__Events_Admin_Page___insert_update_cpt_item__event_update_callbacks', array( $this, 'caf_updates' ), 10 );
+		add_action('AHEE__EE_Admin_Page_CPT__do_extra_autosave_stuff__after_Extend_Events_Admin_Page', array($this, 'autosave_handling'), 10);
+		add_filter('FHEE__Events_Admin_Page___insert_update_cpt_item__event_update_callbacks', array($this, 'caf_updates'), 10);
 	}
 
 
 
-	public function caf_updates( $update_callbacks ) {
-		foreach ( $update_callbacks as $key => $callback ) {
-			if ( $callback[1] == '_default_tickets_update' )
-				unset( $update_callbacks[$key] );
+	public function caf_updates($update_callbacks) {
+		foreach ($update_callbacks as $key => $callback) {
+			if ($callback[1] == '_default_tickets_update')
+				unset($update_callbacks[$key]);
 		}
 
-		$update_callbacks[] = array( $this, 'dtt_and_tickets_caf_update' );
+		$update_callbacks[] = array($this, 'dtt_and_tickets_caf_update');
 		return $update_callbacks;
 	}
 
@@ -183,11 +183,11 @@ 
 	 * @param  array    $data   The request data from the form
 	 * @return bool             success or fail
 	 */
-	public function dtt_and_tickets_caf_update( $evtobj, $data ) {
+	public function dtt_and_tickets_caf_update($evtobj, $data) {
 		//first we need to start with datetimes cause they are the "root" items attached to events.
-		$saved_dtts = $this->_update_dtts( $evtobj, $data );
+		$saved_dtts = $this->_update_dtts($evtobj, $data);
 		//next tackle the tickets (and prices?)
-		$this->_update_tkts( $evtobj, $saved_dtts, $data );
+		$this->_update_tkts($evtobj, $saved_dtts, $data);
 	}
 
 
@@ -198,41 +198,41 @@ 
 	 * @param  array    	$data    the request data from the form
 	 * @return EE_Datetime[]
 	 */
-	protected function _update_dtts( $evt_obj, $data ) {
-		$timezone = isset( $data['timezone_string'] ) ? $data['timezone_string'] : NULL;
+	protected function _update_dtts($evt_obj, $data) {
+		$timezone = isset($data['timezone_string']) ? $data['timezone_string'] : NULL;
 		$saved_dtt_ids = array();
 		$saved_dtt_objs = array();
 
-		foreach ( $data['edit_event_datetimes'] as $row => $dtt ) {
+		foreach ($data['edit_event_datetimes'] as $row => $dtt) {
 			//trim all values to ensure any excess whitespace is removed.
 			$dtt = array_map(
-				function( $datetime_data ) {
-					return is_array( $datetime_data ) ? $datetime_data : trim( $datetime_data );
+				function($datetime_data) {
+					return is_array($datetime_data) ? $datetime_data : trim($datetime_data);
 				},
 				$dtt
 			);
-			$dtt['DTT_EVT_end'] = isset($dtt['DTT_EVT_end']) && ! empty( $dtt['DTT_EVT_end'] ) ? $dtt['DTT_EVT_end'] : $dtt['DTT_EVT_start'];
+			$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_name' 			=> ! empty( $dtt['DTT_name'] ) ? $dtt['DTT_name'] : '',
-				'DTT_description' 	=> ! empty( $dtt['DTT_description'] ) ? $dtt['DTT_description'] : '',
+				'DTT_ID' 			=> ! empty($dtt['DTT_ID']) ? $dtt['DTT_ID'] : NULL,
+				'DTT_name' 			=> ! empty($dtt['DTT_name']) ? $dtt['DTT_name'] : '',
+				'DTT_description' 	=> ! empty($dtt['DTT_description']) ? $dtt['DTT_description'] : '',
 				'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_order' 		=> ! isset( $dtt['DTT_order'] ) ? $row : $dtt['DTT_order'],
+				'DTT_reg_limit' 	=> empty($dtt['DTT_reg_limit']) ? EE_INF : $dtt['DTT_reg_limit'],
+				'DTT_order' 		=> ! isset($dtt['DTT_order']) ? $row : $dtt['DTT_order'],
 			);
 
 			//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($timezone) )->get_one_by_ID($dtt['DTT_ID'] );
+			if ( ! empty($dtt['DTT_ID'])) {
+				$DTM = EE_Registry::instance()->load_model('Datetime', array($timezone))->get_one_by_ID($dtt['DTT_ID']);
 
 				//set date and time format according to what is set in this class.
-				$DTM->set_date_format( $this->_date_format_strings['date'] );
-				$DTM->set_time_format( $this->_date_format_strings['time'] );
+				$DTM->set_date_format($this->_date_format_strings['date']);
+				$DTM->set_time_format($this->_date_format_strings['time']);
 
-				foreach ( $datetime_values as $field => $value ) {
-					$DTM->set( $field, $value );
+				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.
@@ -240,24 +240,24 @@ 
 				$saved_dtt_ids[$DTM->ID()] = $DTM->ID();
 
 			} else {
-				$DTM = EE_Registry::instance()->load_class('Datetime', array( $datetime_values, $timezone ), FALSE, FALSE );
+				$DTM = EE_Registry::instance()->load_class('Datetime', array($datetime_values, $timezone), FALSE, FALSE);
 
 				//reset date and times to match the format
-				$DTM->set_date_format( $this->_date_format_strings['date'] );
-				$DTM->set_time_format( $this->_date_format_strings['time'] );
-				foreach( $datetime_values as $field => $value ) {
-					$DTM->set( $field, $value );
+				$DTM->set_date_format($this->_date_format_strings['date']);
+				$DTM->set_time_format($this->_date_format_strings['time']);
+				foreach ($datetime_values as $field => $value) {
+					$DTM->set($field, $value);
 				}
 			}
 
 
 			$DTM->save();
-			$DTM = $evt_obj->_add_relation_to( $DTM, 'Datetime' );
+			$DTM = $evt_obj->_add_relation_to($DTM, 'Datetime');
 			$evt_obj->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( $DTM->get_raw('DTT_EVT_start') > $DTM->get_raw('DTT_EVT_end') ) {
-				$DTM->set('DTT_EVT_end', $DTM->get('DTT_EVT_start') );
+			if ($DTM->get_raw('DTT_EVT_start') > $DTM->get_raw('DTT_EVT_end')) {
+				$DTM->set('DTT_EVT_end', $DTM->get('DTT_EVT_start'));
 				EE_Registry::instance()->load_helper('DTT_Helper');
 				$DTM = EEH_DTT_Helper::date_time_add($DTM, 'DTT_EVT_end', 'days');
 				$DTM->save();
@@ -273,25 +273,25 @@ 
 		}
 
 		//now we need to REMOVE any dtts that got deleted.  Keep in mind that this process will only kick in for DTT's that don't have any DTT_sold on them. So its safe to permanently delete at this point.
-		$old_datetimes = explode(',', $data['datetime_IDs'] );
+		$old_datetimes = explode(',', $data['datetime_IDs']);
 		$old_datetimes = $old_datetimes[0] == '' ? array() : $old_datetimes;
 
-		if ( is_array( $old_datetimes ) ) {
-			$dtts_to_delete = array_diff( $old_datetimes, $saved_dtt_ids );
-			foreach ( $dtts_to_delete as $id ) {
-				$id = absint( $id );
-				if ( empty( $id ) )
+		if (is_array($old_datetimes)) {
+			$dtts_to_delete = array_diff($old_datetimes, $saved_dtt_ids);
+			foreach ($dtts_to_delete as $id) {
+				$id = absint($id);
+				if (empty($id))
 					continue;
 
 				$dtt_to_remove = EE_Registry::instance()->load_model('Datetime')->get_one_by_ID($id);
 
 				//remove tkt relationships.
 				$related_tickets = $dtt_to_remove->get_many_related('Ticket');
-				foreach ( $related_tickets as $tkt ) {
+				foreach ($related_tickets as $tkt) {
 					$dtt_to_remove->_remove_relation_to($tkt, 'Ticket');
 				}
 
-				$evt_obj->_remove_relation_to( $id, 'Datetime' );
+				$evt_obj->_remove_relation_to($id, 'Datetime');
 				$dtt_to_remove->refresh_cache_of_related_objects();
 
 			}
@@ -312,86 +312,86 @@ 
 	 * @param  array            $data       incoming request data
 	 * @return EE_Ticket[]
 	 */
-	protected function _update_tkts( $evtobj, $saved_dtts, $data ) {
+	protected function _update_tkts($evtobj, $saved_dtts, $data) {
 
 		$new_tkt = null;
 		$new_default = null;
 		//stripslashes because WP filtered the $_POST ($data) array to add slashes
 		$data = stripslashes_deep($data);
-		$timezone = isset( $data['timezone_string'] ) ? $data['timezone_string'] : NULL;
+		$timezone = isset($data['timezone_string']) ? $data['timezone_string'] : NULL;
 		$saved_tickets = $dtts_on_existing = array();
-		$old_tickets = isset( $data['ticket_IDs'] ) ? explode(',', $data['ticket_IDs'] ) : array();
+		$old_tickets = isset($data['ticket_IDs']) ? explode(',', $data['ticket_IDs']) : array();
 
 		//load money helper
-		EE_Registry::instance()->load_helper( 'Money' );
+		EE_Registry::instance()->load_helper('Money');
 
-		foreach ( $data['edit_tickets'] as $row => $tkt ) {
+		foreach ($data['edit_tickets'] as $row => $tkt) {
 
 			$update_prices = $create_new_TKT = FALSE;
 
 			//figure out what dtts were added to the ticket and what dtts were removed from the ticket in the session.
 
-			$starting_tkt_dtt_rows = explode(',',$data['starting_ticket_datetime_rows'][$row]);
-			$tkt_dtt_rows = explode(',', $data['ticket_datetime_rows'][$row] );
+			$starting_tkt_dtt_rows = explode(',', $data['starting_ticket_datetime_rows'][$row]);
+			$tkt_dtt_rows = explode(',', $data['ticket_datetime_rows'][$row]);
 			$dtts_added = array_diff($tkt_dtt_rows, $starting_tkt_dtt_rows);
 			$dtts_removed = array_diff($starting_tkt_dtt_rows, $tkt_dtt_rows);
 
 			// trim inputs to ensure any excess whitespace is removed.
 			$tkt = array_map(
-				function( $ticket_data ) {
-					return is_array( $ticket_data ) ? $ticket_data : trim( $ticket_data );
+				function($ticket_data) {
+					return is_array($ticket_data) ? $ticket_data : trim($ticket_data);
 				},
 				$tkt
 			);
 
 			//note we are doing conversions to floats here instead of allowing EE_Money_Field to handle because we're doing calcs prior to using the models.
 			//note incoming ['TKT_price'] value is already in standard notation (via js).
-			$ticket_price = isset( $tkt['TKT_price'] ) ?  round ( (float) $tkt['TKT_price'], 3 ) : 0;
+			$ticket_price = isset($tkt['TKT_price']) ? round((float) $tkt['TKT_price'], 3) : 0;
 
 			//note incoming base price needs converted from localized value.
-			$base_price = isset( $tkt['TKT_base_price'] ) ? EEH_Money::convert_to_float_from_localized_money( $tkt['TKT_base_price'] ) : 0;
+			$base_price = isset($tkt['TKT_base_price']) ? EEH_Money::convert_to_float_from_localized_money($tkt['TKT_base_price']) : 0;
 			//if ticket price == 0 and $base_price != 0 then ticket price == base_price
 			$ticket_price = $ticket_price === 0 && $base_price !== 0 ? $base_price : $ticket_price;
-			$base_price_id = isset( $tkt['TKT_base_price_ID'] ) ? $tkt['TKT_base_price_ID'] : 0;
+			$base_price_id = isset($tkt['TKT_base_price_ID']) ? $tkt['TKT_base_price_ID'] : 0;
 
 			$price_rows = is_array($data['edit_prices']) && isset($data['edit_prices'][$row]) ? $data['edit_prices'][$row] : array();
 
 			$now = null;
-			if ( empty( $tkt['TKT_start_date'] ) ) {
+			if (empty($tkt['TKT_start_date'])) {
 				//lets' use now in the set timezone.
-				$now = new DateTime( 'now', new DateTimeZone( $evtobj->get_timezone() ) );
-				$tkt['TKT_start_date'] = $now->format( $this->_date_format_strings['date'] . ' ' . $this->_date_format_strings['time'] );
+				$now = new DateTime('now', new DateTimeZone($evtobj->get_timezone()));
+				$tkt['TKT_start_date'] = $now->format($this->_date_format_strings['date'].' '.$this->_date_format_strings['time']);
 			}
 
-			if ( empty( $tkt['TKT_end_date'] ) ) {
+			if (empty($tkt['TKT_end_date'])) {
 				/**
 				 * set the TKT_end_date to the first datetime attached to the ticket.
 				 */
-				$first_dtt = $saved_dtts[reset( $tkt_dtt_rows )];
-				$tkt['TKT_end_date'] = $first_dtt->start_date_and_time( $this->_date_format_strings['date'] . ' ' . $this->_date_format_string['time'] );
+				$first_dtt = $saved_dtts[reset($tkt_dtt_rows)];
+				$tkt['TKT_end_date'] = $first_dtt->start_date_and_time($this->_date_format_strings['date'].' '.$this->_date_format_string['time']);
 			}
 
 			$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'] != __('You can modify this description', 'event_espresso') ? $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'] != __('You can modify this description', 'event_espresso') ? $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'] : 0,
-				'TKT_taxable' 		=> ! empty( $tkt['TKT_taxable'] ) ? 1 : 0,
-				'TKT_required' 		=> ! empty( $tkt['TKT_required'] ) ? 1 : 0,
+				'TKT_order' 		=> isset($tkt['TKT_order']) ? $tkt['TKT_order'] : 0,
+				'TKT_taxable' 		=> ! empty($tkt['TKT_taxable']) ? 1 : 0,
+				'TKT_required' 		=> ! empty($tkt['TKT_required']) ? 1 : 0,
 				'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;
 				$update_prices = TRUE;
@@ -403,21 +403,21 @@ 
 			// 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 ( absint( $TKT_values['TKT_ID'] ) ) {
-				$TKT = EE_Registry::instance()->load_model( 'Ticket', array( $timezone ) )->get_one_by_ID( $tkt['TKT_ID'] );
-				if ( $TKT instanceof EE_Ticket ) {
+			if (absint($TKT_values['TKT_ID'])) {
+				$TKT = EE_Registry::instance()->load_model('Ticket', array($timezone))->get_one_by_ID($tkt['TKT_ID']);
+				if ($TKT instanceof EE_Ticket) {
 
-					$TKT = $this->_update_ticket_datetimes( $TKT, $saved_dtts, $dtts_added, $dtts_removed );
+					$TKT = $this->_update_ticket_datetimes($TKT, $saved_dtts, $dtts_added, $dtts_removed);
 					// are there any registrations using this ticket ?
 					$tickets_sold = $TKT->count_related(
 						'Registration',
-						array( array(
-								'STS_ID' => array( 'NOT IN', array( EEM_Registration::status_id_incomplete ) )
-						) )
+						array(array(
+								'STS_ID' => array('NOT IN', array(EEM_Registration::status_id_incomplete))
+						))
 					);
 					//set ticket formats
-					$TKT->set_date_format( $this->_date_format_strings['date'] );
-					$TKT->set_time_format( $this->_date_format_strings['time'] );
+					$TKT->set_date_format($this->_date_format_strings['date']);
+					$TKT->set_time_format($this->_date_format_strings['time']);
 
 					// let's just check the total price for the existing ticket
 					// and determine if it matches the new total price.
@@ -427,17 +427,17 @@ 
 							? TRUE : FALSE;
 
 					//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 ) {
-						$new_tkt = $this->_duplicate_ticket( $TKT, $price_rows, $ticket_price, $base_price, $base_price_id );
+					if ($create_new_TKT) {
+						$new_tkt = $this->_duplicate_ticket($TKT, $price_rows, $ticket_price, $base_price, $base_price_id);
 					}
 				}
 
@@ -446,12 +446,12 @@ 
 				$TKT = EE_Ticket::new_instance(
 					$TKT_values,
 					$timezone,
-					array( $this->_date_format_strings[ 'date' ], $this->_date_format_strings[ 'time' ]  )
+					array($this->_date_format_strings['date'], $this->_date_format_strings['time'])
 				);
-				if ( $TKT instanceof EE_Ticket ) {
+				if ($TKT instanceof EE_Ticket) {
 					// make sure ticket has an ID of setting relations won't work
 					$TKT->save();
-					$TKT = $this->_update_ticket_datetimes( $TKT, $saved_dtts, $dtts_added, $dtts_removed );
+					$TKT = $this->_update_ticket_datetimes($TKT, $saved_dtts, $dtts_added, $dtts_removed);
 					$update_prices = TRUE;
 				}
 			}
@@ -459,38 +459,38 @@ 
 			//$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') );
+			if ($TKT->get_raw('TKT_start_date') > $TKT->get_raw('TKT_end_date')) {
+				$TKT->set('TKT_end_date', $TKT->get('TKT_start_date'));
 				EE_Registry::instance()->load_helper('DTT_Helper');
 				$TKT = EEH_DTT_Helper::date_time_add($TKT, 'TKT_end_date', 'days');
 			}
 
 			//let's make sure the base price is handled
-			$TKT = ! $create_new_TKT ? $this->_add_prices_to_ticket( array(), $TKT, $update_prices, $base_price, $base_price_id ) : $TKT;
+			$TKT = ! $create_new_TKT ? $this->_add_prices_to_ticket(array(), $TKT, $update_prices, $base_price, $base_price_id) : $TKT;
 
 			//add/update price_modifiers
-			$TKT = ! $create_new_TKT ? $this->_add_prices_to_ticket( $price_rows, $TKT, $update_prices ) : $TKT;
+			$TKT = ! $create_new_TKT ? $this->_add_prices_to_ticket($price_rows, $TKT, $update_prices) : $TKT;
 
 			//need to make sue that the TKT_price is accurate after saving the prices.
 			$TKT->ensure_TKT_Price_correct();
 
 			//handle CREATING a default tkt from the incoming tkt but ONLY if this isn't an autosave.
-			if ( ! defined('DOING_AUTOSAVE' ) ) {
-				if ( !empty($tkt['TKT_is_default_selector'] ) ) {
+			if ( ! defined('DOING_AUTOSAVE')) {
+				if ( ! empty($tkt['TKT_is_default_selector'])) {
 					$update_prices = TRUE;
 					$new_default = clone $TKT;
-					$new_default->set( 'TKT_ID', 0 );
-					$new_default->set( 'TKT_is_default', 1 );
-					$new_default->set( 'TKT_row', 1 );
-					$new_default->set( 'TKT_price', $ticket_price );
+					$new_default->set('TKT_ID', 0);
+					$new_default->set('TKT_is_default', 1);
+					$new_default->set('TKT_row', 1);
+					$new_default->set('TKT_price', $ticket_price);
 					//remove any dtt relations cause we DON'T want dtt relations attached (note this is just removing the cached relations in the object)
 					$new_default->_remove_relations('Datetime');
 					//todo we need to add the current attached prices as new prices to the new default ticket.
-					$new_default = $this->_add_prices_to_ticket( $price_rows, $new_default, $update_prices );
+					$new_default = $this->_add_prices_to_ticket($price_rows, $new_default, $update_prices);
 					//don't forget the base price!
-					$new_default = $this->_add_prices_to_ticket( array(), $new_default, $update_prices, $base_price, $base_price_id );
+					$new_default = $this->_add_prices_to_ticket(array(), $new_default, $update_prices, $base_price, $base_price_id);
 					$new_default->save();
-					do_action( 'AHEE__espresso_events_Pricing_Hooks___update_tkts_new_default_ticket', $new_default, $row, $TKT, $data );
+					do_action('AHEE__espresso_events_Pricing_Hooks___update_tkts_new_default_ticket', $new_default, $row, $TKT, $data);
 				}
 			}
 
@@ -501,19 +501,19 @@ 
 			//let's assign any tickets that have been setup to the saved_tickets tracker
 			//save existing TKT
 			$TKT->save();
-			if ( $create_new_TKT && $new_tkt instanceof EE_Ticket ) {
+			if ($create_new_TKT && $new_tkt instanceof EE_Ticket) {
 				//save new TKT
 				$new_tkt->save();
 				//add new ticket to array
-				$saved_tickets[ $new_tkt->ID() ] = $new_tkt;
+				$saved_tickets[$new_tkt->ID()] = $new_tkt;
 
-				do_action( 'AHEE__espresso_events_Pricing_Hooks___update_tkts_new_ticket', $new_tkt, $row, $tkt, $data );
+				do_action('AHEE__espresso_events_Pricing_Hooks___update_tkts_new_ticket', $new_tkt, $row, $tkt, $data);
 
 			} else {
 				//add tkt to saved tkts
-				$saved_tickets[ $TKT->ID() ] = $TKT;
+				$saved_tickets[$TKT->ID()] = $TKT;
 
-				do_action( 'AHEE__espresso_events_Pricing_Hooks___update_tkts_update_ticket', $TKT, $row, $tkt, $data );
+				do_action('AHEE__espresso_events_Pricing_Hooks___update_tkts_update_ticket', $TKT, $row, $tkt, $data);
 			}
 
 		}
@@ -523,22 +523,22 @@ 
 		// (i.e. autosaves are happening and then in between autosaves the user trashes a ticket).
 		// Or a draft event was saved and in the process of editing a ticket is trashed.
 		// No sense in keeping all the related data in the db!
-		$old_tickets = isset( $old_tickets[0] ) && $old_tickets[0] == '' ? array() : $old_tickets;
-		$tickets_removed = array_diff( $old_tickets, array_keys($saved_tickets) );
+		$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 );
+		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);
 
 			//if this tkt is a default tkt we leave it alone cause it won't be attached to the datetime
-			if ( $tkt_to_remove->get('TKT_is_default') )
+			if ($tkt_to_remove->get('TKT_is_default'))
 				continue;
 
 			// if this tkt has any registrations attached so then we just ARCHIVE
 			// because we don't actually permanently delete these tickets.
-			if ( $tkt_to_remove->count_related('Registration') > 0 ) {
+			if ($tkt_to_remove->count_related('Registration') > 0) {
 				$tkt_to_remove->delete();
 				continue;
 			}
@@ -547,7 +547,7 @@ 
 			// (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 ) {
+			foreach ($dtts as $dtt) {
 				$tkt_to_remove->_remove_relation_to($dtt, 'Datetime');
 			}
 
@@ -555,7 +555,7 @@ 
 			// 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');
 
-			do_action( 'AHEE__espresso_events_Pricing_Hooks___update_tkts_delete_ticket', $tkt_to_remove );
+			do_action('AHEE__espresso_events_Pricing_Hooks___update_tkts_delete_ticket', $tkt_to_remove);
 
 			// finally let's delete this ticket
 			// (which should not be blocked at this point b/c we've removed all our relationships)
@@ -587,39 +587,39 @@ 
 		// and removing the ticket from datetimes it got removed from.
 
 		// first let's add datetimes
-		if ( ! empty( $added_datetimes ) && is_array( $added_datetimes ) ) {
-			foreach ( $added_datetimes as $row_id ) {
-				$row_id = (int)$row_id;
-				if ( isset( $saved_datetimes[ $row_id ] ) && $saved_datetimes[ $row_id ] instanceof EE_Datetime ) {
-					$ticket->_add_relation_to( $saved_datetimes[ $row_id ], 'Datetime' );
+		if ( ! empty($added_datetimes) && is_array($added_datetimes)) {
+			foreach ($added_datetimes as $row_id) {
+				$row_id = (int) $row_id;
+				if (isset($saved_datetimes[$row_id]) && $saved_datetimes[$row_id] instanceof EE_Datetime) {
+					$ticket->_add_relation_to($saved_datetimes[$row_id], 'Datetime');
 					// Is this an existing ticket (has an ID) and does it have any sold?
 					// If so, then we need to add that to the DTT sold because this DTT is getting added.
-					if ( $ticket->ID() && $ticket->sold() > 0 ) {
-						$saved_datetimes[ $row_id ]->increase_sold( $ticket->sold() );
-						$saved_datetimes[ $row_id ]->save();
+					if ($ticket->ID() && $ticket->sold() > 0) {
+						$saved_datetimes[$row_id]->increase_sold($ticket->sold());
+						$saved_datetimes[$row_id]->save();
 					}
 				}
 			}
 		}
 		// then remove datetimes
-		if ( ! empty( $removed_datetimes ) && is_array( $removed_datetimes ) ) {
-			foreach ( $removed_datetimes as $row_id ) {
-				$row_id = (int)$row_id;
+		if ( ! empty($removed_datetimes) && is_array($removed_datetimes)) {
+			foreach ($removed_datetimes as $row_id) {
+				$row_id = (int) $row_id;
 				// its entirely possible that a datetime got deleted (instead of just removed from relationship.
 				// So make sure we skip over this if the dtt isn't in the $saved_datetimes array)
-				if ( isset( $saved_datetimes[ $row_id ] ) && $saved_datetimes[ $row_id ] instanceof EE_Datetime ) {
-					$ticket->_remove_relation_to( $saved_datetimes[ $row_id ], 'Datetime' );
+				if (isset($saved_datetimes[$row_id]) && $saved_datetimes[$row_id] instanceof EE_Datetime) {
+					$ticket->_remove_relation_to($saved_datetimes[$row_id], 'Datetime');
 					// Is this an existing ticket (has an ID) and does it have any sold?
 					// If so, then we need to remove it's sold from the DTT_sold.
-					if ( $ticket->ID() && $ticket->sold() > 0 ) {
-						$saved_datetimes[ $row_id ]->decrease_sold( $ticket->sold() );
-						$saved_datetimes[ $row_id ]->save();
+					if ($ticket->ID() && $ticket->sold() > 0) {
+						$saved_datetimes[$row_id]->decrease_sold($ticket->sold());
+						$saved_datetimes[$row_id]->save();
 					}
 				}
 			}
 		}
 		// cap ticket qty by datetime reg limits
-		$ticket->set_qty( min( $ticket->qty(), $ticket->qty( 'reg_limit' ) ) );
+		$ticket->set_qty(min($ticket->qty(), $ticket->qty('reg_limit')));
 		return $ticket;
 	}
 
@@ -640,39 +640,39 @@ 
 		EE_Ticket $ticket,
 		$price_rows = array(),
 		$ticket_price = 0,
-		$base_price = 0 ,
+		$base_price = 0,
 		$base_price_id = 0
 	) {
 
 		// 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.
-		$new_ticket = clone( $ticket );
-		$new_ticket->set( 'TKT_ID', 0 );
-		$new_ticket->set( 'TKT_deleted', 0 );
-		$new_ticket->set( 'TKT_price', $ticket_price );
-		$new_ticket->set( 'TKT_sold', 0 );
+		$new_ticket = clone($ticket);
+		$new_ticket->set('TKT_ID', 0);
+		$new_ticket->set('TKT_deleted', 0);
+		$new_ticket->set('TKT_price', $ticket_price);
+		$new_ticket->set('TKT_sold', 0);
 		// let's get a new ID for this ticket
 		$new_ticket->save();
 		// we also need to make sure this new ticket gets the same datetime attachments as the archived ticket
-		$datetimes_on_existing = $ticket->get_many_related( 'Datetime' );
+		$datetimes_on_existing = $ticket->get_many_related('Datetime');
 		$new_ticket = $this->_update_ticket_datetimes(
 			$new_ticket,
 			$datetimes_on_existing,
-			array_keys( $datetimes_on_existing )
+			array_keys($datetimes_on_existing)
 		);
 
 		// $ticket will get archived later b/c we are NOT adding it to the saved_tickets array.
 		// if existing $ticket has sold amount, then we need to adjust the qty for the new TKT to = the remaining
 		// available.
-		if ( $ticket->sold() > 0 ) {
+		if ($ticket->sold() > 0) {
 			$new_qty = $ticket->qty() - $ticket->sold();
-			$new_ticket->set_qty( $new_qty );
+			$new_ticket->set_qty($new_qty);
 		}
 		//now we update the prices just for this ticket
-		$new_ticket = $this->_add_prices_to_ticket( $price_rows, $new_ticket, true );
+		$new_ticket = $this->_add_prices_to_ticket($price_rows, $new_ticket, true);
 		//and we update the base price
-		$new_ticket = $this->_add_prices_to_ticket( array(), $new_ticket, true, $base_price, $base_price_id );
+		$new_ticket = $this->_add_prices_to_ticket(array(), $new_ticket, true, $base_price, $base_price_id);
 		return $new_ticket;
 	}
 
@@ -692,7 +692,7 @@ 
 	 * @param int|bool 		$base_price_id  if present then this is the base_price_id being updated.
 	 * @return EE_Ticket
 	 */
-	protected function  _add_prices_to_ticket( $prices = array(), EE_Ticket $ticket, $new_prices = FALSE, $base_price = FALSE, $base_price_id = FALSE ) {
+	protected function  _add_prices_to_ticket($prices = array(), EE_Ticket $ticket, $new_prices = FALSE, $base_price = FALSE, $base_price_id = FALSE) {
 
 		//let's just get any current prices that may exist on the given ticket so we can remove any prices that got trashed in this session.
 		$current_prices_on_ticket = $base_price !== FALSE ? $ticket->base_price(TRUE) : $ticket->price_modifiers();
@@ -700,7 +700,7 @@ 
 		$updated_prices = array();
 
 		// if $base_price ! FALSE then updating a base price.
-		if ( $base_price !== FALSE ) {
+		if ($base_price !== FALSE) {
 			$prices[1] = array(
 				'PRC_ID' => $new_prices || $base_price_id === 1 ? NULL : $base_price_id,
 				'PRT_ID' => 1,
@@ -711,47 +711,47 @@ 
 		}
 
 		//possibly need to save tkt
-		if ( ! $ticket->ID() )
+		if ( ! $ticket->ID())
 			$ticket->save();
 
-		foreach ( $prices as $row => $prc ) {
-			$prt_id = !empty( $prc['PRT_ID'] ) ? $prc['PRT_ID'] : NULL;
-			if ( empty($prt_id) )
+		foreach ($prices as $row => $prc) {
+			$prt_id = ! empty($prc['PRT_ID']) ? $prc['PRT_ID'] : NULL;
+			if (empty($prt_id))
 				continue; //prices MUST have a price type id.
 			$PRC_values = array(
-				'PRC_ID' => !empty( $prc['PRC_ID'] ) ? $prc['PRC_ID'] : NULL,
+				'PRC_ID' => ! empty($prc['PRC_ID']) ? $prc['PRC_ID'] : NULL,
 				'PRT_ID' => $prt_id,
-				'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_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' => false, //make sure we set PRC_is_default to false for all ticket saves from event_editor
 				'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();
 			$prcid = $PRC->ID();
 			$updated_prices[$prcid] = $PRC;
-			$ticket->_add_relation_to( $PRC, 'Price' );
+			$ticket->_add_relation_to($PRC, 'Price');
 		}
 
 		//now let's remove any prices that got removed from the ticket
-		if ( !empty ( $current_prices_on_ticket ) ) {
+		if ( ! empty ($current_prices_on_ticket)) {
 			$current = array_keys($current_prices_on_ticket);
 			$updated = array_keys($updated_prices);
 			$prices_to_remove = array_diff($current, $updated);
-			if ( !empty( $prices_to_remove ) ) {
-				foreach ( $prices_to_remove as $prc_id ) {
+			if ( ! empty($prices_to_remove)) {
+				foreach ($prices_to_remove as $prc_id) {
 					$p = $current_prices_on_ticket[$prc_id];
-					$ticket->_remove_relation_to( $p, 'Price' );
+					$ticket->_remove_relation_to($p, 'Price');
 
 					//delete permanently the price
 					$p->delete_permanently();
@@ -764,7 +764,7 @@ 
 
 
 
-	public function autosave_handling( $event_admin_obj ) {
+	public function autosave_handling($event_admin_obj) {
 		return $event_admin_obj; //doing nothing for the moment.
 		//todo when I get to this remember that I need to set the template args on the $event_admin_obj (use the set_template_args() method)
 
@@ -798,12 +798,12 @@ 
 
 		//default main template args
 		$main_template_args = array(
-			'event_datetime_help_link' => EEH_Template::get_help_tab_link('event_editor_event_datetimes_help_tab', $this->_adminpage_obj->page_slug, $this->_adminpage_obj->get_req_action(), FALSE, FALSE ), //todo need to add a filter to the template for the help text in the Events_Admin_Page core file so we can add further help
+			'event_datetime_help_link' => EEH_Template::get_help_tab_link('event_editor_event_datetimes_help_tab', $this->_adminpage_obj->page_slug, $this->_adminpage_obj->get_req_action(), FALSE, FALSE), //todo need to add a filter to the template for the help text in the Events_Admin_Page core file so we can add further help
 			'existing_datetime_ids' => '',
 			'total_dtt_rows' => 1,
-			'add_new_dtt_help_link' => EEH_Template::get_help_tab_link('add_new_dtt_info', $this->_adminpage_obj->page_slug, $this->_adminpage_obj->get_req_action(), FALSE, FALSE ), //todo need to add this help info id to the Events_Admin_Page core file so we can access it here.
+			'add_new_dtt_help_link' => EEH_Template::get_help_tab_link('add_new_dtt_info', $this->_adminpage_obj->page_slug, $this->_adminpage_obj->get_req_action(), FALSE, FALSE), //todo need to add this help info id to the Events_Admin_Page core file so we can access it here.
 			'datetime_rows' => '',
-			'show_tickets_container' => '',//$this->_adminpage_obj->get_cpt_model_obj()->ID() > 1 ? ' style="display:none;"' : '',
+			'show_tickets_container' => '', //$this->_adminpage_obj->get_cpt_model_obj()->ID() > 1 ? ' style="display:none;"' : '',
 			'ticket_rows' => '',
 			'existing_ticket_ids' => '',
 			'total_ticket_rows' => 1,
@@ -813,7 +813,7 @@ 
 
 		$timezone = $evtobj instanceof EE_Event ? $evtobj->timezone_string() : NULL;
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		/**
 		 * 1. Start with retrieving Datetimes
@@ -821,37 +821,37 @@ 
 		 * 3. For each ticket get related prices
 		 */
 
-		$DTM = EE_Registry::instance()->load_model('Datetime', array($timezone) );
-		$times = $DTM->get_all_event_dates( $evtID );
+		$DTM = EE_Registry::instance()->load_model('Datetime', array($timezone));
+		$times = $DTM->get_all_event_dates($evtID);
 
 
 
 		$main_template_args['total_dtt_rows'] = count($times);
-		foreach ( $times as $time ) {
+		foreach ($times as $time) {
 			$dttid = $time->get('DTT_ID');
 			$dttrow = $time->get('DTT_order');
 			$existing_datetime_ids[] = $dttid;
 
 			//tickets attached
-			$related_tickets = $time->ID() > 0 ? $time->get_many_related('Ticket', array( array( 'OR' => array( 'TKT_deleted' => 1, 'TKT_deleted*' => 0 ) ), 'default_where_conditions' => 'none', 'order_by' => array('TKT_order' => 'ASC' ) ) ) : array();
+			$related_tickets = $time->ID() > 0 ? $time->get_many_related('Ticket', array(array('OR' => array('TKT_deleted' => 1, 'TKT_deleted*' => 0)), 'default_where_conditions' => 'none', 'order_by' => array('TKT_order' => 'ASC'))) : array();
 
 			//if there are no related tickets this is likely a new event OR autodraft
 			// event so we need to generate the default tickets because dtts
 			// ALWAYS have at least one related ticket!!.  EXCEPT, we dont' do this if there is already more than one
 			// datetime on the event.
-			if ( empty ( $related_tickets ) && count( $times ) < 2 ) {
+			if (empty ($related_tickets) && count($times) < 2) {
 				$related_tickets = EE_Registry::instance()->load_model('Ticket')->get_all_default_tickets();
 
 				//this should be ordered by TKT_ID, so let's grab the first default ticket (which will be the main default) and ensure it has any default prices added to it (but do NOT save).
 				$default_prices = EEM_Price::instance()->get_all_default_prices();
 
-				$main_default_ticket = reset( $related_tickets );
-				if ( $main_default_ticket instanceof EE_Ticket ) {
-					foreach ( $default_prices as $default_price ) {
-						if ( $default_price->is_base_price() ) {
+				$main_default_ticket = reset($related_tickets);
+				if ($main_default_ticket instanceof EE_Ticket) {
+					foreach ($default_prices as $default_price) {
+						if ($default_price->is_base_price()) {
 							continue;
 						}
-						$main_default_ticket->cache( 'Price', $default_price );
+						$main_default_ticket->cache('Price', $default_price);
 					}
 				}
 			}
@@ -860,11 +860,11 @@ 
 			//we can't actually setup rows in this loop yet cause we don't know all the unique tickets for this event yet (tickets are linked through all datetimes). So we're going to temporarily cache some of that information.
 
 			//loop through and setup the ticket rows and make sure the order is set.
-			foreach ( $related_tickets as $ticket ) {
+			foreach ($related_tickets as $ticket) {
 				$tktid = $ticket->get('TKT_ID');
 				$tktrow = $ticket->get('TKT_row');
 				//we only want unique tickets in our final display!!
-				if ( !in_array( $tktid, $existing_ticket_ids ) ) {
+				if ( ! in_array($tktid, $existing_ticket_ids)) {
 					$existing_ticket_ids[] = $tktid;
 					$all_tickets[] = $ticket;
 				}
@@ -873,56 +873,56 @@ 
 				$datetime_tickets[$dttid][] = $tktrow;
 
 				//temporary cache of this datetime info for this ticket for later processing of ticket rows.
-				if ( !isset( $ticket_datetimes[$tktid] ) || ! in_array( $dttrow, $ticket_datetimes[$tktid] ) )
+				if ( ! isset($ticket_datetimes[$tktid]) || ! in_array($dttrow, $ticket_datetimes[$tktid]))
 					$ticket_datetimes[$tktid][] = $dttrow;
 			}
 		}
 
-		$main_template_args['total_ticket_rows'] = count( $existing_ticket_ids );
-		$main_template_args['existing_ticket_ids'] = implode( ',', $existing_ticket_ids );
-		$main_template_args['existing_datetime_ids'] = implode( ',', $existing_datetime_ids );
+		$main_template_args['total_ticket_rows'] = count($existing_ticket_ids);
+		$main_template_args['existing_ticket_ids'] = implode(',', $existing_ticket_ids);
+		$main_template_args['existing_datetime_ids'] = implode(',', $existing_datetime_ids);
 
 		//sort $all_tickets by order
-		usort( $all_tickets, function( $a, $b ) {
+		usort($all_tickets, function($a, $b) {
 			$a_order = (int) $a->get('TKT_order');
 			$b_order = (int) $b->get('TKT_order');
-			if ( $a_order == $b_order ) {
+			if ($a_order == $b_order) {
 				return 0;
 			}
-			return ( $a_order < $b_order ) ? -1 : 1;
+			return ($a_order < $b_order) ? -1 : 1;
 		});
 
 		//k NOW we have all the data we need for setting up the dtt rows and ticket rows so we start our dtt loop again.
 		$dttrow = 1;
-		foreach ( $times as $time ) {
-			$main_template_args['datetime_rows'] .= $this->_get_datetime_row( $dttrow, $time, $datetime_tickets, $all_tickets, FALSE, $times );
+		foreach ($times as $time) {
+			$main_template_args['datetime_rows'] .= $this->_get_datetime_row($dttrow, $time, $datetime_tickets, $all_tickets, FALSE, $times);
 			$dttrow++;
 		}
 
 		//then loop through all tickets for the ticket rows.
 		$tktrow = 1;
-		foreach ( $all_tickets as $ticket ) {
-			$main_template_args['ticket_rows'] .= $this->_get_ticket_row( $tktrow, $ticket, $ticket_datetimes, $times, FALSE, $all_tickets );
+		foreach ($all_tickets as $ticket) {
+			$main_template_args['ticket_rows'] .= $this->_get_ticket_row($tktrow, $ticket, $ticket_datetimes, $times, FALSE, $all_tickets);
 			$tktrow++;
 		}
 
 		$main_template_args['ticket_js_structure'] = $this->_get_ticket_js_structure($times, $all_tickets);
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_metabox_main.template.php';
-		EEH_Template::display_template( $template, $main_template_args );
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_metabox_main.template.php';
+		EEH_Template::display_template($template, $main_template_args);
 		return;
 	}
 
 
 
-	protected function _get_datetime_row( $dttrow, EE_Datetime $dtt, $datetime_tickets, $all_tickets, $default = FALSE, $all_dtts = array() ) {
+	protected function _get_datetime_row($dttrow, EE_Datetime $dtt, $datetime_tickets, $all_tickets, $default = FALSE, $all_dtts = array()) {
 
 		$dtt_display_template_args = array(
-			'dtt_edit_row' => $this->_get_dtt_edit_row( $dttrow, $dtt, $default, $all_dtts ),
-			'dtt_attached_tickets_row' => $this->_get_dtt_attached_tickets_row( $dttrow, $dtt, $datetime_tickets, $all_tickets, $default ),
+			'dtt_edit_row' => $this->_get_dtt_edit_row($dttrow, $dtt, $default, $all_dtts),
+			'dtt_attached_tickets_row' => $this->_get_dtt_attached_tickets_row($dttrow, $dtt, $datetime_tickets, $all_tickets, $default),
 			'dtt_row' => $default ? 'DTTNUM' : $dttrow
 			);
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_row_wrapper.template.php';
-		return EEH_Template::display_template( $template, $dtt_display_template_args, TRUE);
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_row_wrapper.template.php';
+		return EEH_Template::display_template($template, $dtt_display_template_args, TRUE);
 	}
 
 
@@ -940,7 +940,7 @@ 
 	 *
 	 * @return string Generated edit row.
 	 */
-	protected function _get_dtt_edit_row( $dttrow, $dtt, $default, $all_dtts ) {
+	protected function _get_dtt_edit_row($dttrow, $dtt, $default, $all_dtts) {
 
 		// if the incomign $dtt object is NOT an instance of EE_Datetime then force default to true.
 		$default = ! $dtt instanceof EE_Datetime ? true : false;
@@ -948,30 +948,30 @@ 
 		$template_args = array(
 			'dtt_row' => $default ? 'DTTNUM' : $dttrow,
 			'event_datetimes_name' => $default ? 'DTTNAMEATTR' : 'edit_event_datetimes',
-			'edit_dtt_expanded' => '',//$this->_adminpage_obj->get_cpt_model_obj()->ID() > 0 ? '' : ' ee-edit-editing',
+			'edit_dtt_expanded' => '', //$this->_adminpage_obj->get_cpt_model_obj()->ID() > 0 ? '' : ' ee-edit-editing',
 			'DTT_ID' => $default ? '' : $dtt->ID(),
 			'DTT_name' => $default ? '' : $dtt->name(),
 			'DTT_description' => $default ? '' : $dtt->description(),
-			'DTT_EVT_start' => $default ? '' : $dtt->start_date( $this->_date_format_strings['date'] . ' ' . $this->_date_format_strings['time'] ),
-			'DTT_EVT_end' => $default ? '' : $dtt->end_date( $this->_date_format_strings['date'] . ' ' . $this->_date_format_strings['time'] ),
-			'DTT_reg_limit' => $default ? '' : $dtt->get_pretty('DTT_reg_limit','input'),
+			'DTT_EVT_start' => $default ? '' : $dtt->start_date($this->_date_format_strings['date'].' '.$this->_date_format_strings['time']),
+			'DTT_EVT_end' => $default ? '' : $dtt->end_date($this->_date_format_strings['date'].' '.$this->_date_format_strings['time']),
+			'DTT_reg_limit' => $default ? '' : $dtt->get_pretty('DTT_reg_limit', 'input'),
 			'DTT_order' => $default ? 'DTTNUM' : $dttrow,
 			'dtt_sold' => $default ? '0' : $dtt->get('DTT_sold'),
-			'clone_icon' => !empty( $dtt ) && $dtt->get('DTT_sold') > 0 ? '' : 'clone-icon ee-icon ee-icon-clone clickable',
-			'trash_icon' => !empty( $dtt ) && $dtt->get('DTT_sold') > 0  ? 'ee-lock-icon' : 'trash-icon dashicons dashicons-post-trash clickable'
+			'clone_icon' => ! empty($dtt) && $dtt->get('DTT_sold') > 0 ? '' : 'clone-icon ee-icon ee-icon-clone clickable',
+			'trash_icon' => ! empty($dtt) && $dtt->get('DTT_sold') > 0 ? 'ee-lock-icon' : 'trash-icon dashicons dashicons-post-trash clickable'
 			);
 
-		$template_args['show_trash'] = count( $all_dtts ) === 1 && $template_args['trash_icon'] !== 'ee-lock-icon' ? ' style="display:none"' : '';
+		$template_args['show_trash'] = count($all_dtts) === 1 && $template_args['trash_icon'] !== 'ee-lock-icon' ? ' style="display:none"' : '';
 
 		//allow filtering of template args at this point.
-		$template_args = apply_filters( 'FHEE__espresso_events_Pricing_Hooks___get_dtt_edit_row__template_args', $template_args, $dttrow, $dtt, $default, $all_dtts, $this->_is_creating_event );
+		$template_args = apply_filters('FHEE__espresso_events_Pricing_Hooks___get_dtt_edit_row__template_args', $template_args, $dttrow, $dtt, $default, $all_dtts, $this->_is_creating_event);
 
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_edit_row.template.php';
-		return EEH_Template::display_template( $template, $template_args, TRUE );
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_edit_row.template.php';
+		return EEH_Template::display_template($template, $template_args, TRUE);
 	}
 
 
-	protected function _get_dtt_attached_tickets_row( $dttrow, $dtt, $datetime_tickets, $all_tickets, $default ) {
+	protected function _get_dtt_attached_tickets_row($dttrow, $dtt, $datetime_tickets, $all_tickets, $default) {
 
 		$template_args = array(
 			'dtt_row' => $default ? 'DTTNUM' : $dttrow,
@@ -979,47 +979,47 @@ 
 			'DTT_description' => $default ? '' : $dtt->description(),
 			'datetime_tickets_list' => $default ? '<li class="hidden"></li>' : '',
 			'show_tickets_row' => ' style="display:none;"', //$default || $this->_adminpage_obj->get_cpt_model_obj()->ID() > 0 ? ' style="display:none;"' : '',
-			'add_new_datetime_ticket_help_link' => EEH_Template::get_help_tab_link('add_new_ticket_via_datetime', $this->_adminpage_obj->page_slug, $this->_adminpage_obj->get_req_action(), FALSE, FALSE ), //todo need to add this help info id to the Events_Admin_Page core file so we can access it here.
+			'add_new_datetime_ticket_help_link' => EEH_Template::get_help_tab_link('add_new_ticket_via_datetime', $this->_adminpage_obj->page_slug, $this->_adminpage_obj->get_req_action(), FALSE, FALSE), //todo need to add this help info id to the Events_Admin_Page core file so we can access it here.
 			'DTT_ID' => $default ? '' : $dtt->ID()
 			);
 
 		//need to setup the list items (but only if this isnt' a default skeleton setup)
-		if ( !$default ) {
+		if ( ! $default) {
 			$tktrow = 1;
-			foreach ( $all_tickets as $ticket ) {
-				$template_args['datetime_tickets_list'] .= $this->_get_datetime_tickets_list_item( $dttrow, $tktrow, $dtt, $ticket, $datetime_tickets, $default );
+			foreach ($all_tickets as $ticket) {
+				$template_args['datetime_tickets_list'] .= $this->_get_datetime_tickets_list_item($dttrow, $tktrow, $dtt, $ticket, $datetime_tickets, $default);
 				$tktrow++;
 			}
 		}
 
 		//filter template args at this point
-		$template_args = apply_filters( 'FHEE__espresso_events_Pricing_Hooks___get_dtt_attached_ticket_row__template_args', $template_args, $dttrow, $dtt, $datetime_tickets, $all_tickets, $default, $this->_is_creating_event );
+		$template_args = apply_filters('FHEE__espresso_events_Pricing_Hooks___get_dtt_attached_ticket_row__template_args', $template_args, $dttrow, $dtt, $datetime_tickets, $all_tickets, $default, $this->_is_creating_event);
 
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_attached_tickets_row.template.php';
-		return EEH_Template::display_template( $template, $template_args, TRUE );
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_attached_tickets_row.template.php';
+		return EEH_Template::display_template($template, $template_args, TRUE);
 	}
 
 
 
-	protected function _get_datetime_tickets_list_item( $dttrow, $tktrow, $dtt, $ticket, $datetime_tickets, $default ) {
-		$tktid = !empty( $ticket ) ? $ticket->ID() : 0;
-		$dtt_tkts = $dtt instanceof EE_Datetime && isset( $datetime_tickets[$dtt->ID()] ) ? $datetime_tickets[$dtt->ID()] : array();
+	protected function _get_datetime_tickets_list_item($dttrow, $tktrow, $dtt, $ticket, $datetime_tickets, $default) {
+		$tktid = ! empty($ticket) ? $ticket->ID() : 0;
+		$dtt_tkts = $dtt instanceof EE_Datetime && isset($datetime_tickets[$dtt->ID()]) ? $datetime_tickets[$dtt->ID()] : array();
 
-		$displayrow = !empty( $ticket ) ? $ticket->get('TKT_row') : 0;
+		$displayrow = ! empty($ticket) ? $ticket->get('TKT_row') : 0;
 		$template_args = array(
 			'dtt_row' => $default ? 'DTTNUM' : $dttrow,
-			'tkt_row' => $default && empty( $ticket ) ? 'TICKETNUM' : $tktrow,
+			'tkt_row' => $default && empty($ticket) ? 'TICKETNUM' : $tktrow,
 			'datetime_ticket_checked' => in_array($displayrow, $dtt_tkts) ? ' checked="checked"' : '',
 			'ticket_selected' => in_array($displayrow, $dtt_tkts) ? ' ticket-selected' : '',
-			'TKT_name' => $default && empty( $ticket ) ? 'TKTNAME' : $ticket->get('TKT_name'),
-			'tkt_status_class' => ( $default && empty( $ticket ) ) || $this->_is_creating_event ? ' tkt-status-' . EE_Ticket::onsale : ' tkt-status-' . $ticket->ticket_status(),
+			'TKT_name' => $default && empty($ticket) ? 'TKTNAME' : $ticket->get('TKT_name'),
+			'tkt_status_class' => ($default && empty($ticket)) || $this->_is_creating_event ? ' tkt-status-'.EE_Ticket::onsale : ' tkt-status-'.$ticket->ticket_status(),
 			);
 
 		//filter template args
-		$template_args = apply_filters( 'FHEE__espresso_events_Pricing_Hooks___get_datetime_tickets_list_item__template_args', $template_args, $dttrow, $tktrow, $dtt, $ticket, $datetime_tickets, $default, $this->_is_creating_event );
+		$template_args = apply_filters('FHEE__espresso_events_Pricing_Hooks___get_datetime_tickets_list_item__template_args', $template_args, $dttrow, $tktrow, $dtt, $ticket, $datetime_tickets, $default, $this->_is_creating_event);
 
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_dtt_tickets_list.template.php';
-		return EEH_Template::display_template( $template, $template_args, TRUE );
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_dtt_tickets_list.template.php';
+		return EEH_Template::display_template($template, $template_args, TRUE);
 	}
 
 
@@ -1041,37 +1041,37 @@ 
 	 *
 	 * @return [type] [description]
 	 */
-	protected function _get_ticket_row( $tktrow, $ticket, $ticket_datetimes, $all_dtts, $default = FALSE, $all_tickets = array() ) {
+	protected function _get_ticket_row($tktrow, $ticket, $ticket_datetimes, $all_dtts, $default = FALSE, $all_tickets = array()) {
 
 		//if $ticket is not an instance of EE_Ticket then force default to true.
-		$default =  ! $ticket instanceof EE_Ticket ? true : false;
+		$default = ! $ticket instanceof EE_Ticket ? true : false;
 
-		$prices = ! empty( $ticket ) && ! $default ? $ticket->get_many_related('Price', array('default_where_conditions' => 'none', 'order_by' => array('PRC_order' => 'ASC') ) ) : array();
+		$prices = ! empty($ticket) && ! $default ? $ticket->get_many_related('Price', array('default_where_conditions' => 'none', 'order_by' => array('PRC_order' => 'ASC'))) : array();
 
 		//if there is only one price (which would be the base price) or NO prices and this ticket is a default ticket, let's just make sure there are no cached default prices on
 		//the object.  This is done by not including any query_params.
-		if ( $ticket instanceof EE_Ticket && $ticket->is_default() && ( count( $prices ) === 1  || empty( $prices ) ) ) {
-			$prices = $ticket->get_many_related( 'Price' );
+		if ($ticket instanceof EE_Ticket && $ticket->is_default() && (count($prices) === 1 || empty($prices))) {
+			$prices = $ticket->get_many_related('Price');
 		}
 
 		// check if we're dealing with a default ticket in which case we don't want any starting_ticket_datetime_row values set (otherwise there won't be any new relationships created for tickets based off of the default ticket).  This will future proof in case there is ever any behaviour change between what the primary_key defaults to.
-		$default_dtt = $default || ($ticket instanceof EE_Ticket && $ticket->get('TKT_is_default') ) ? TRUE : FALSE;
+		$default_dtt = $default || ($ticket instanceof EE_Ticket && $ticket->get('TKT_is_default')) ? TRUE : FALSE;
 
-		$tkt_dtts = $ticket instanceof EE_Ticket && isset( $ticket_datetimes[$ticket->ID()] ) ? $ticket_datetimes[$ticket->ID()] : array();
+		$tkt_dtts = $ticket instanceof EE_Ticket && isset($ticket_datetimes[$ticket->ID()]) ? $ticket_datetimes[$ticket->ID()] : array();
 
 		$ticket_subtotal = $default ? 0 : $ticket->get_ticket_subtotal();
-		$base_price = $default ? NULL :  $ticket->base_price();
+		$base_price = $default ? NULL : $ticket->base_price();
 		$count_price_mods = EEM_Price::instance()->get_all_default_prices(TRUE);
 
 		//breaking out complicated condition for ticket_status
-		if ( $default ) {
-			$ticket_status_class = ' tkt-status-' . EE_Ticket::onsale;
+		if ($default) {
+			$ticket_status_class = ' tkt-status-'.EE_Ticket::onsale;
 		} else {
-			$ticket_status_class =  $ticket->is_default() ? ' tkt-status-' . EE_Ticket::onsale : ' tkt-status-' . $ticket->ticket_status();
+			$ticket_status_class = $ticket->is_default() ? ' tkt-status-'.EE_Ticket::onsale : ' tkt-status-'.$ticket->ticket_status();
 		}
 
 		//breaking out complicated condition for TKT_taxable
-		if ( $default ) {
+		if ($default) {
 			$TKT_taxable = '';
 		} else {
 			$TKT_taxable = $ticket->get('TKT_taxable') ? ' checked="checked"' : '';
@@ -1086,19 +1086,19 @@ 
 			'edit_tkt_expanded' => '',
 			'edit_tickets_name' => $default ? 'TICKETNAMEATTR' : 'edit_tickets',
 			'TKT_name' => $default ? '' : $ticket->get('TKT_name'),
-			'TKT_start_date' => $default ? '' : $ticket->get_date('TKT_start_date', $this->_date_format_strings['date'] . ' ' . $this->_date_format_strings['time'] ),
-			'TKT_end_date' => $default ? '' : $ticket->get_date('TKT_end_date', $this->_date_format_strings['date'] . ' ' . $this->_date_format_strings['time']  ),
-			'TKT_status' => $default ? EEH_Template::pretty_status(EE_Ticket::onsale, FALSE, 'sentence') : $ticket->is_default() ? EEH_Template::pretty_status( EE_Ticket::onsale, FALSE, 'sentence') : $ticket->ticket_status(TRUE),
+			'TKT_start_date' => $default ? '' : $ticket->get_date('TKT_start_date', $this->_date_format_strings['date'].' '.$this->_date_format_strings['time']),
+			'TKT_end_date' => $default ? '' : $ticket->get_date('TKT_end_date', $this->_date_format_strings['date'].' '.$this->_date_format_strings['time']),
+			'TKT_status' => $default ? EEH_Template::pretty_status(EE_Ticket::onsale, FALSE, 'sentence') : $ticket->is_default() ? EEH_Template::pretty_status(EE_Ticket::onsale, FALSE, 'sentence') : $ticket->ticket_status(TRUE),
 			'TKT_price' => $default ? '' : EEH_Template::format_currency($ticket->get_ticket_total_with_taxes(), FALSE, FALSE),
 			'TKT_price_code' => EE_Registry::instance()->CFG->currency->code,
 			'TKT_price_amount' => $default ? 0 : $ticket_subtotal,
-			'TKT_qty' => $default ? '' : $ticket->get_pretty('TKT_qty','symbol'),
-			'TKT_qty_for_input'=> $default ? '' : $ticket->get_pretty('TKT_qty','input'),
-			'TKT_uses' => $default ? '' : $ticket->get_pretty('TKT_uses','input'),
-			'TKT_min' => $default ? '' : ( $ticket->get('TKT_min') === -1 || $ticket->get('TKT_min') === 0 ? '' : $ticket->get('TKT_min') ),
-			'TKT_max' => $default ? '' :  $ticket->get_pretty('TKT_max','input'),
+			'TKT_qty' => $default ? '' : $ticket->get_pretty('TKT_qty', 'symbol'),
+			'TKT_qty_for_input'=> $default ? '' : $ticket->get_pretty('TKT_qty', 'input'),
+			'TKT_uses' => $default ? '' : $ticket->get_pretty('TKT_uses', 'input'),
+			'TKT_min' => $default ? '' : ($ticket->get('TKT_min') === -1 || $ticket->get('TKT_min') === 0 ? '' : $ticket->get('TKT_min')),
+			'TKT_max' => $default ? '' : $ticket->get_pretty('TKT_max', 'input'),
 			'TKT_sold' => $default ? 0 : $ticket->tickets_sold('ticket'),
-			'TKT_registrations' => $default ? 0 : $ticket->count_registrations( array( array( 'STS_ID' => array( '!=', EEM_Registration::status_id_incomplete ) ) ) ),
+			'TKT_registrations' => $default ? 0 : $ticket->count_registrations(array(array('STS_ID' => array('!=', EEM_Registration::status_id_incomplete)))),
 			'TKT_ID' => $default ? 0 : $ticket->get('TKT_ID'),
 			'TKT_description' => $default ? '' : $ticket->get('TKT_description'),
 			'TKT_is_default' => $default ? 0 : $ticket->get('TKT_is_default'),
@@ -1107,99 +1107,99 @@ 
 			'ticket_price_rows' => '',
 			'TKT_base_price' => $default || ! $base_price instanceof EE_Price ? '' : $base_price->get_pretty('PRC_amount', 'localized_float'),
 			'TKT_base_price_ID' => $default || ! $base_price instanceof EE_Price ? 0 : $base_price->ID(),
-			'show_price_modifier' => count($prices) > 1 || ( $default && $count_price_mods > 0 ) ? '' : ' style="display:none;"',
-			'show_price_mod_button' => count($prices) > 1 || ( $default && $count_price_mods > 0 ) || ( !$default && $ticket->get('TKT_deleted') ) ? ' style="display:none;"' : '',
+			'show_price_modifier' => count($prices) > 1 || ($default && $count_price_mods > 0) ? '' : ' style="display:none;"',
+			'show_price_mod_button' => count($prices) > 1 || ($default && $count_price_mods > 0) || ( ! $default && $ticket->get('TKT_deleted')) ? ' style="display:none;"' : '',
 			'total_price_rows' => count($prices) > 1 ? count($prices) : 1,
 			'ticket_datetimes_list' => $default ? '<li class="hidden"></li>' : '',
 			'starting_ticket_datetime_rows' => $default || $default_dtt ? '' : implode(',', $tkt_dtts),
 			'ticket_datetime_rows' => $default ? '' : implode(',', $tkt_dtts),
-			'existing_ticket_price_ids' => $default, '', implode(',', array_keys( $prices) ),
+			'existing_ticket_price_ids' => $default, '', implode(',', array_keys($prices)),
 			'ticket_template_id' => $default ? 0 : $ticket->get('TTM_ID'),
 			'TKT_taxable' => $TKT_taxable,
 			'display_subtotal' => $ticket instanceof EE_Ticket && $ticket->get('TKT_taxable') ? '' : ' style="display:none"',
 			'price_currency_symbol' => EE_Registry::instance()->CFG->currency->sign,
-			'TKT_subtotal_amount_display' => EEH_Template::format_currency($ticket_subtotal, FALSE, FALSE ),
+			'TKT_subtotal_amount_display' => EEH_Template::format_currency($ticket_subtotal, FALSE, FALSE),
 			'TKT_subtotal_amount' => $ticket_subtotal,
-			'tax_rows' => $this->_get_tax_rows( $tktrow, $ticket ),
-			'disabled' => $ticket instanceof EE_Ticket && $ticket->get('TKT_deleted') ? TRUE: FALSE,
+			'tax_rows' => $this->_get_tax_rows($tktrow, $ticket),
+			'disabled' => $ticket instanceof EE_Ticket && $ticket->get('TKT_deleted') ? TRUE : FALSE,
 			'ticket_archive_class' => $ticket instanceof EE_Ticket && $ticket->get('TKT_deleted') ? ' ticket-archived' : '',
 			'trash_icon' => $ticket instanceof EE_Ticket && $ticket->get('TKT_deleted') ? 'ee-lock-icon ' : 'trash-icon dashicons dashicons-post-trash clickable',
 			'clone_icon' => $ticket instanceof EE_Ticket && $ticket->get('TKT_deleted') ? '' : 'clone-icon ee-icon ee-icon-clone clickable'
 			);
 
-		$template_args['trash_hidden'] = count( $all_tickets ) === 1 && $template_args['trash_icon'] != 'ee-lock-icon' ? ' style="display:none"' : '';
+		$template_args['trash_hidden'] = count($all_tickets) === 1 && $template_args['trash_icon'] != 'ee-lock-icon' ? ' style="display:none"' : '';
 
 		//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( $this->_date_format_strings['date'] . ' ' . $this->_date_format_strings['time'] , current_time('timestamp'));
-			$template_args['tkt_status_class'] = ' tkt-status-' . EE_Ticket::onsale;
+			$template_args['TKT_start_date'] = date($this->_date_format_strings['date'].' '.$this->_date_format_strings['time'], current_time('timestamp'));
+			$template_args['tkt_status_class'] = ' tkt-status-'.EE_Ticket::onsale;
 		}
 
-		if ( empty( $template_args['TKT_end_date'] ) ) {
+		if (empty($template_args['TKT_end_date'])) {
 
 			//get the earliest datetime (if present);
-			$earliest_dtt = $this->_adminpage_obj->get_cpt_model_obj()->ID() > 0 ? $this->_adminpage_obj->get_cpt_model_obj()->get_first_related('Datetime', array('order_by'=> array('DTT_EVT_start' => 'ASC' ) ) ) : NULL;
+			$earliest_dtt = $this->_adminpage_obj->get_cpt_model_obj()->ID() > 0 ? $this->_adminpage_obj->get_cpt_model_obj()->get_first_related('Datetime', 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', $this->_date_format_strings['date'] . ' ' . $this->_date_format_strings['time'] );
+			if ( ! empty($earliest_dtt)) {
+				$template_args['TKT_end_date'] = $earliest_dtt->get_datetime('DTT_EVT_start', $this->_date_format_strings['date'].' '.$this->_date_format_strings['time']);
 			} else {
 				//default so let's just use what's been set for the default date-time which is 30 days from now.
-				$template_args['TKT_end_date'] = date( $this->_date_format_strings['date'] . ' ' . $this->_date_format_strings['time'] , mktime(24, 0, 0, date("m"), date("d") + 29, date("Y") )  );
+				$template_args['TKT_end_date'] = date($this->_date_format_strings['date'].' '.$this->_date_format_strings['time'], mktime(24, 0, 0, date("m"), date("d") + 29, date("Y")));
 			}
-			$template_args['tkt_status_class'] = ' tkt-status-' . EE_Ticket::onsale;
+			$template_args['tkt_status_class'] = ' tkt-status-'.EE_Ticket::onsale;
 		}
 
 		//generate ticket_datetime items
-		if ( ! $default ) {
+		if ( ! $default) {
 			$dttrow = 1;
-			foreach ( $all_dtts as $dtt ) {
-				$template_args['ticket_datetimes_list'] .= $this->_get_ticket_datetime_list_item( $dttrow, $tktrow, $dtt, $ticket, $ticket_datetimes, $default );
+			foreach ($all_dtts as $dtt) {
+				$template_args['ticket_datetimes_list'] .= $this->_get_ticket_datetime_list_item($dttrow, $tktrow, $dtt, $ticket, $ticket_datetimes, $default);
 				$dttrow++;
 			}
 		}
 
 		$prcrow = 1;
-		foreach ( $prices as $price ) {
-			if ( $price->is_base_price() ) {
+		foreach ($prices as $price) {
+			if ($price->is_base_price()) {
 				$prcrow++;
 				continue;
 			}
-			$show_trash = ( count( $prices ) > 1 && $prcrow === 1 ) || count( $prices ) === 1  ? FALSE : TRUE;
-			$show_create = count( $prices ) > 1 && count( $prices ) !== $prcrow ? FALSE : TRUE;
-			$template_args['ticket_price_rows'] .= $this->_get_ticket_price_row( $tktrow, $prcrow, $price, $default, $ticket, $show_trash, $show_create );
+			$show_trash = (count($prices) > 1 && $prcrow === 1) || count($prices) === 1 ? FALSE : TRUE;
+			$show_create = count($prices) > 1 && count($prices) !== $prcrow ? FALSE : TRUE;
+			$template_args['ticket_price_rows'] .= $this->_get_ticket_price_row($tktrow, $prcrow, $price, $default, $ticket, $show_trash, $show_create);
 			$prcrow++;
 		}
 
 		//filter $template_args
-		$template_args = apply_filters( 'FHEE__espresso_events_Pricing_Hooks___get_ticket_row__template_args', $template_args, $tktrow, $ticket, $ticket_datetimes, $all_dtts, $default, $all_tickets, $this->_is_creating_event );
+		$template_args = apply_filters('FHEE__espresso_events_Pricing_Hooks___get_ticket_row__template_args', $template_args, $tktrow, $ticket, $ticket_datetimes, $all_dtts, $default, $all_tickets, $this->_is_creating_event);
 
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_ticket_row.template.php';
-		return EEH_Template::display_template( $template, $template_args, TRUE );
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_ticket_row.template.php';
+		return EEH_Template::display_template($template, $template_args, TRUE);
 	}
 
 
 
 
 
-	protected function _get_tax_rows( $tktrow, $ticket ) {
+	protected function _get_tax_rows($tktrow, $ticket) {
 		$tax_rows = '';
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_ticket_tax_row.template.php';
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_ticket_tax_row.template.php';
 		$template_args = array();
-		$taxes = empty( $ticket ) ? EE_Taxes::get_taxes_for_admin() : $ticket->get_ticket_taxes_for_admin();
-		foreach ( $taxes as $tax ) {
-			$tax_added = $this->_get_tax_added( $tax, $ticket );
+		$taxes = empty($ticket) ? EE_Taxes::get_taxes_for_admin() : $ticket->get_ticket_taxes_for_admin();
+		foreach ($taxes as $tax) {
+			$tax_added = $this->_get_tax_added($tax, $ticket);
 			$template_args = array(
-				'display_tax' => !empty( $ticket ) && $ticket->get('TKT_taxable') ? '' : ' style="display:none;"',
+				'display_tax' => ! empty($ticket) && $ticket->get('TKT_taxable') ? '' : ' style="display:none;"',
 				'tax_id' => $tax->ID(),
 				'tkt_row' => $tktrow,
 				'tax_label' => $tax->get('PRC_name'),
 				'tax_added' => $tax_added,
-				'tax_added_display' => EEH_Template::format_currency($tax_added, FALSE, FALSE ),
+				'tax_added_display' => EEH_Template::format_currency($tax_added, FALSE, FALSE),
 				'tax_amount' => $tax->get('PRC_amount')
 				);
-			$template_args = apply_filters( 'FHEE__espresso_events_Pricing_Hooks___get_tax_rows__template_args', $template_args, $tktrow, $ticket, $this->_is_creating_event  );
-			$tax_rows .= EEH_Template::display_template( $template, $template_args, TRUE );
+			$template_args = apply_filters('FHEE__espresso_events_Pricing_Hooks___get_tax_rows__template_args', $template_args, $tktrow, $ticket, $this->_is_creating_event);
+			$tax_rows .= EEH_Template::display_template($template, $template_args, TRUE);
 		}
 
 
@@ -1207,81 +1207,81 @@ 
 	}
 
 
-	protected function _get_tax_added( EE_Price $tax, $ticket ) {
-		$subtotal = empty( $ticket ) ? 0 : $ticket->get_ticket_subtotal();
+	protected function _get_tax_added(EE_Price $tax, $ticket) {
+		$subtotal = empty($ticket) ? 0 : $ticket->get_ticket_subtotal();
 		return $subtotal * $tax->get('PRC_amount') / 100;
 	}
 
 
 
 
-	protected function _get_ticket_price_row( $tktrow, $prcrow, $price, $default, $ticket, $show_trash = TRUE, $show_create = TRUE ) {
-		$send_disabled = !empty( $ticket ) && $ticket->get('TKT_deleted') ? TRUE : FALSE;
+	protected function _get_ticket_price_row($tktrow, $prcrow, $price, $default, $ticket, $show_trash = TRUE, $show_create = TRUE) {
+		$send_disabled = ! empty($ticket) && $ticket->get('TKT_deleted') ? TRUE : FALSE;
 		$template_args = array(
 			'tkt_row' => $default && empty($ticket) ? 'TICKETNUM' : $tktrow,
 			'PRC_order' => $default && empty($price) ? 'PRICENUM' : $prcrow,
 			'edit_prices_name' => $default && empty($price) ? 'PRICENAMEATTR' : 'edit_prices',
-			'price_type_selector' => $default && empty( $price ) ? $this->_get_base_price_template( $tktrow, $prcrow, $price, $default ) : $this->_get_price_type_selector( $tktrow, $prcrow, $price, $default, $send_disabled ),
+			'price_type_selector' => $default && empty($price) ? $this->_get_base_price_template($tktrow, $prcrow, $price, $default) : $this->_get_price_type_selector($tktrow, $prcrow, $price, $default, $send_disabled),
 			'PRC_ID' => $default && empty($price) ? 0 : $price->ID(),
 			'PRC_is_default' => $default && empty($price) ? 0 : $price->get('PRC_is_default'),
 			'PRC_name' => $default && empty($price) ? '' : $price->get('PRC_name'),
 			'price_currency_symbol' => EE_Registry::instance()->CFG->currency->sign,
 			'show_plus_or_minus' => $default && empty($price) ? '' : ' style="display:none;"',
-			'show_plus' => $default && empty( $price ) ? ' style="display:none;"' : ( $price->is_discount() || $price->is_base_price() ? ' style="display:none;"' : ''),
-			'show_minus' => $default && empty( $price ) ? ' style="display:none;"' : ($price->is_discount() ? '' : ' style="display:none;"'),
-			'show_currency_symbol' => $default && empty( $price ) ? ' style="display:none"' : ($price->is_percent() ? ' style="display:none"' : '' ),
-			'PRC_amount' => $default && empty( $price ) ? 0 : $price->get_pretty('PRC_amount', 'localized_float'),
-			'show_percentage' => $default && empty( $price ) ? ' style="display:none;"' : ( $price->is_percent() ? '' : ' style="display:none;"' ),
+			'show_plus' => $default && empty($price) ? ' style="display:none;"' : ($price->is_discount() || $price->is_base_price() ? ' style="display:none;"' : ''),
+			'show_minus' => $default && empty($price) ? ' style="display:none;"' : ($price->is_discount() ? '' : ' style="display:none;"'),
+			'show_currency_symbol' => $default && empty($price) ? ' style="display:none"' : ($price->is_percent() ? ' style="display:none"' : ''),
+			'PRC_amount' => $default && empty($price) ? 0 : $price->get_pretty('PRC_amount', 'localized_float'),
+			'show_percentage' => $default && empty($price) ? ' style="display:none;"' : ($price->is_percent() ? '' : ' style="display:none;"'),
 			'show_trash_icon' => $show_trash ? '' : ' style="display:none;"',
 			'show_create_button' => $show_create ? '' : ' style="display:none;"',
-			'PRC_desc' => $default && empty( $price ) ? '' : $price->get('PRC_desc'),
-			'disabled' => !empty( $ticket ) && $ticket->get('TKT_deleted') ? TRUE : FALSE
+			'PRC_desc' => $default && empty($price) ? '' : $price->get('PRC_desc'),
+			'disabled' => ! empty($ticket) && $ticket->get('TKT_deleted') ? TRUE : FALSE
 			);
 
-	$template_args = apply_filters( 'FHEE__espresso_events_Pricing_Hooks___get_ticket_price_row__template_args', $template_args, $tktrow, $prcrow, $price, $default, $ticket, $show_trash, $show_create, $this->_is_creating_event );
+	$template_args = apply_filters('FHEE__espresso_events_Pricing_Hooks___get_ticket_price_row__template_args', $template_args, $tktrow, $prcrow, $price, $default, $ticket, $show_trash, $show_create, $this->_is_creating_event);
 
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_ticket_price_row.template.php';
-		return EEH_Template::display_template( $template, $template_args, TRUE );
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_ticket_price_row.template.php';
+		return EEH_Template::display_template($template, $template_args, TRUE);
 	}
 
 
-	protected function _get_price_type_selector( $tktrow, $prcrow, $price, $default, $disabled = FALSE ) {
-		if ( $price->is_base_price() ) {
-			return $this->_get_base_price_template( $tktrow, $prcrow, $price, $default );
+	protected function _get_price_type_selector($tktrow, $prcrow, $price, $default, $disabled = FALSE) {
+		if ($price->is_base_price()) {
+			return $this->_get_base_price_template($tktrow, $prcrow, $price, $default);
 		} else {
-			return $this->_get_price_modifier_template( $tktrow, $prcrow, $price, $default, $disabled );
+			return $this->_get_price_modifier_template($tktrow, $prcrow, $price, $default, $disabled);
 		}
 
 	}
 
 
-	protected function _get_base_price_template( $tktrow, $prcrow, $price, $default ) {
+	protected function _get_base_price_template($tktrow, $prcrow, $price, $default) {
 		$template_args = array(
 				'tkt_row' => $default ? 'TICKETNUM' : $tktrow,
-				'PRC_order' => $default && empty( $price ) ? 'PRICENUM' : $prcrow,
-				'PRT_ID' => $default && empty( $price ) ? 1 : $price->get('PRT_ID'),
+				'PRC_order' => $default && empty($price) ? 'PRICENUM' : $prcrow,
+				'PRT_ID' => $default && empty($price) ? 1 : $price->get('PRT_ID'),
 				'PRT_name' => __('Price', 'event_espresso'),
 				'price_selected_operator' => '+',
 				'price_selected_is_percent' => 0
 			);
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_price_type_base.template.php';
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_price_type_base.template.php';
 
-		$template_args = apply_filters( 'FHEE__espresso_events_Pricing_Hooks___get_base_price_template__template_args', $template_args, $tktrow, $prcrow, $price, $default, $this->_is_creating_event );
+		$template_args = apply_filters('FHEE__espresso_events_Pricing_Hooks___get_base_price_template__template_args', $template_args, $tktrow, $prcrow, $price, $default, $this->_is_creating_event);
 
-		return EEH_Template::display_template( $template, $template_args, TRUE );
+		return EEH_Template::display_template($template, $template_args, TRUE);
 	}
 
 
 
-	protected function _get_price_modifier_template( $tktrow, $prcrow, $price, $default, $disabled = FALSE ) {
-		$select_name = $default && empty( $price ) ? 'edit_prices[TICKETNUM][PRICENUM][PRT_ID]' : 'edit_prices[' . $tktrow . '][' . $prcrow . '][PRT_ID]';
-		$price_types = EE_Registry::instance()->load_model('Price_Type')->get_all(array( array('OR' => array('PBT_ID' => '2', 'PBT_ID*' => '3' ) ) ) );
-		$price_option_span_template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_price_option_span.template.php';
-		$all_price_types = $default && empty( $price ) ? array(array('id' => 0, 'text' => __('Select Modifier', 'event_espresso')) ) : array();
-		$selected_price_type_id = $default && empty( $price ) ? 0 : $price->type();
+	protected function _get_price_modifier_template($tktrow, $prcrow, $price, $default, $disabled = FALSE) {
+		$select_name = $default && empty($price) ? 'edit_prices[TICKETNUM][PRICENUM][PRT_ID]' : 'edit_prices['.$tktrow.']['.$prcrow.'][PRT_ID]';
+		$price_types = EE_Registry::instance()->load_model('Price_Type')->get_all(array(array('OR' => array('PBT_ID' => '2', 'PBT_ID*' => '3'))));
+		$price_option_span_template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_price_option_span.template.php';
+		$all_price_types = $default && empty($price) ? array(array('id' => 0, 'text' => __('Select Modifier', 'event_espresso'))) : array();
+		$selected_price_type_id = $default && empty($price) ? 0 : $price->type();
 		$price_option_spans = '';
 		//setup pricetypes for selector
-		foreach ( $price_types as $price_type ) {
+		foreach ($price_types as $price_type) {
 			$all_price_types[] = array(
 				'id' => $price_type->ID(),
 				'text' => $price_type->get('PRT_name'),
@@ -1293,50 +1293,50 @@ 
 				'PRT_operator' => $price_type->is_discount() ? '-' : '+',
 				'PRT_is_percent' => $price_type->get('PRT_is_percent') ? 1 : 0
 				);
-			$price_option_spans .= EEH_Template::display_template($price_option_span_template, $spanargs, TRUE );
+			$price_option_spans .= EEH_Template::display_template($price_option_span_template, $spanargs, TRUE);
 		}
 
-		$select_params = $disabled ? 'style="width:auto;" disabled'  : 'style="width:auto;"';
+		$select_params = $disabled ? 'style="width:auto;" disabled' : 'style="width:auto;"';
 		$main_name = $select_name;
-		$select_name = $disabled ? 'archive_price[' . $tktrow . '][' . $prcrow . '][PRT_ID]' : $main_name;
+		$select_name = $disabled ? 'archive_price['.$tktrow.']['.$prcrow.'][PRT_ID]' : $main_name;
 
 		$template_args = array(
 			'tkt_row' => $default ? 'TICKETNUM' : $tktrow,
-			'PRC_order' => $default && empty( $price ) ? 'PRICENUM' : $prcrow,
-			'price_modifier_selector' => EEH_Form_Fields::select_input( $select_name, $all_price_types, $selected_price_type_id, $select_params, 'edit-price-PRT_ID' ),
+			'PRC_order' => $default && empty($price) ? 'PRICENUM' : $prcrow,
+			'price_modifier_selector' => EEH_Form_Fields::select_input($select_name, $all_price_types, $selected_price_type_id, $select_params, 'edit-price-PRT_ID'),
 			'main_name' => $main_name,
 			'selected_price_type_id' => $selected_price_type_id,
 			'price_option_spans' => $price_option_spans,
-			'price_selected_operator' => $default && empty( $price ) ? '' : ( $price->is_discount() ? '-' : '+' ),
-			'price_selected_is_percent' => $default && empty( $price ) ? '' : ( $price->is_percent() ? 1 : 0 ),
+			'price_selected_operator' => $default && empty($price) ? '' : ($price->is_discount() ? '-' : '+'),
+			'price_selected_is_percent' => $default && empty($price) ? '' : ($price->is_percent() ? 1 : 0),
 			'disabled' => $disabled
 			);
 
-		$template_args = apply_filters( 'FHEE__espresso_events_Pricing_Hooks___get_price_modifier_template__template_args', $template_args, $tktrow, $prcrow, $price, $default, $disabled, $this->_is_creating_event );
+		$template_args = apply_filters('FHEE__espresso_events_Pricing_Hooks___get_price_modifier_template__template_args', $template_args, $tktrow, $prcrow, $price, $default, $disabled, $this->_is_creating_event);
 
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_price_modifier_selector.template.php';
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_price_modifier_selector.template.php';
 
-		return EEH_Template::display_template( $template, $template_args, TRUE );
+		return EEH_Template::display_template($template, $template_args, TRUE);
 	}
 
 
 
-	protected function _get_ticket_datetime_list_item( $dttrow, $tktrow, $dtt, $ticket, $ticket_datetimes, $default ) {
-		$dttid = !empty($dtt) ? $dtt->ID() : 0;
-		$displayrow = !empty($dtt) ? $dtt->get('DTT_order') : 0;
-		$tkt_dtts = $ticket instanceof EE_Ticket && isset( $ticket_datetimes[$ticket->ID()] ) ? $ticket_datetimes[$ticket->ID()] : array();
+	protected function _get_ticket_datetime_list_item($dttrow, $tktrow, $dtt, $ticket, $ticket_datetimes, $default) {
+		$dttid = ! empty($dtt) ? $dtt->ID() : 0;
+		$displayrow = ! empty($dtt) ? $dtt->get('DTT_order') : 0;
+		$tkt_dtts = $ticket instanceof EE_Ticket && isset($ticket_datetimes[$ticket->ID()]) ? $ticket_datetimes[$ticket->ID()] : array();
 		$template_args = array(
-			'dtt_row' => $default && empty( $dtt ) ? 'DTTNUM' : $dttrow,
+			'dtt_row' => $default && empty($dtt) ? 'DTTNUM' : $dttrow,
 			'tkt_row' => $default ? 'TICKETNUM' : $tktrow,
-			'ticket_datetime_selected' => in_array( $displayrow, $tkt_dtts ) ? ' ticket-selected' : '',
-			'ticket_datetime_checked' => in_array( $displayrow, $tkt_dtts ) ? ' checked="checked"' : '',
-			'DTT_name' => $default && empty( $dtt ) ? 'DTTNAME' : $dtt->get_dtt_display_name( TRUE ),
+			'ticket_datetime_selected' => in_array($displayrow, $tkt_dtts) ? ' ticket-selected' : '',
+			'ticket_datetime_checked' => in_array($displayrow, $tkt_dtts) ? ' checked="checked"' : '',
+			'DTT_name' => $default && empty($dtt) ? 'DTTNAME' : $dtt->get_dtt_display_name(TRUE),
 			'tkt_status_class' => '',
 			);
 
-		$template_args = apply_filters( 'FHEE__espresso_events_Pricing_Hooks___get_ticket_datetime_list_item__template_args', $template_args, $dttrow, $tktrow, $dtt, $ticket, $ticket_datetimes, $default, $this->_is_creating_event );
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_ticket_datetimes_list_item.template.php';
-		return EEH_Template::display_template( $template, $template_args, TRUE );
+		$template_args = apply_filters('FHEE__espresso_events_Pricing_Hooks___get_ticket_datetime_list_item__template_args', $template_args, $dttrow, $tktrow, $dtt, $ticket, $ticket_datetimes, $default, $this->_is_creating_event);
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_ticket_datetimes_list_item.template.php';
+		return EEH_Template::display_template($template, $template_args, TRUE);
 	}
 
 
@@ -1344,53 +1344,53 @@ 
 	protected function _get_ticket_js_structure($all_dtts, $all_tickets) {
 		$template_args = array(
 			'default_datetime_edit_row' => $this->_get_dtt_edit_row('DTTNUM', NULL, TRUE, $all_dtts),
-			'default_ticket_row' => $this->_get_ticket_row( 'TICKETNUM', NULL, array(), array(), TRUE),
-			'default_price_row' => $this->_get_ticket_price_row( 'TICKETNUM', 'PRICENUM', NULL, TRUE, NULL ),
+			'default_ticket_row' => $this->_get_ticket_row('TICKETNUM', NULL, array(), array(), TRUE),
+			'default_price_row' => $this->_get_ticket_price_row('TICKETNUM', 'PRICENUM', NULL, TRUE, NULL),
 			'default_price_rows' => '',
 			'default_base_price_amount' => 0,
 			'default_base_price_name' => '',
 			'default_base_price_description' => '',
-			'default_price_modifier_selector_row' => $this->_get_price_modifier_template( 'TICKETNUM', 'PRICENUM', NULL, TRUE ),
-			'default_available_tickets_for_datetime' => $this->_get_dtt_attached_tickets_row( 'DTTNUM', NULL, array(), array(), TRUE ),
+			'default_price_modifier_selector_row' => $this->_get_price_modifier_template('TICKETNUM', 'PRICENUM', NULL, TRUE),
+			'default_available_tickets_for_datetime' => $this->_get_dtt_attached_tickets_row('DTTNUM', NULL, array(), array(), TRUE),
 			'existing_available_datetime_tickets_list' => '',
 			'existing_available_ticket_datetimes_list' => '',
-			'new_available_datetime_ticket_list_item' => $this->_get_datetime_tickets_list_item( 'DTTNUM', 'TICKETNUM', NULL, NULL, array(), TRUE ),
-			'new_available_ticket_datetime_list_item' => $this->_get_ticket_datetime_list_item( 'DTTNUM', 'TICKETNUM', NULL, NULL, array(), TRUE )
+			'new_available_datetime_ticket_list_item' => $this->_get_datetime_tickets_list_item('DTTNUM', 'TICKETNUM', NULL, NULL, array(), TRUE),
+			'new_available_ticket_datetime_list_item' => $this->_get_ticket_datetime_list_item('DTTNUM', 'TICKETNUM', NULL, NULL, array(), TRUE)
 			);
 
 		$tktrow = 1;
-		foreach ( $all_tickets as $ticket ) {
-			$template_args['existing_available_datetime_tickets_list'] .= $this->_get_datetime_tickets_list_item( 'DTTNUM', $tktrow, NULL, $ticket, array(), TRUE );
+		foreach ($all_tickets as $ticket) {
+			$template_args['existing_available_datetime_tickets_list'] .= $this->_get_datetime_tickets_list_item('DTTNUM', $tktrow, NULL, $ticket, array(), TRUE);
 			$tktrow++;
 		}
 
 
 		$dttrow = 1;
-		foreach ( $all_dtts as $dtt ) {
-			$template_args['existing_available_ticket_datetimes_list'] .= $this->_get_ticket_datetime_list_item( $dttrow, 'TICKETNUM', $dtt, NULL, array(), TRUE );
+		foreach ($all_dtts as $dtt) {
+			$template_args['existing_available_ticket_datetimes_list'] .= $this->_get_ticket_datetime_list_item($dttrow, 'TICKETNUM', $dtt, NULL, array(), TRUE);
 			$dttrow++;
 		}
 
 		$default_prices = EE_Registry::instance()->load_model('Price')->get_all_default_prices();
 		$prcrow = 1;
-		foreach ( $default_prices as $price ) {
-			if ( $price->is_base_price() ) {
+		foreach ($default_prices as $price) {
+			if ($price->is_base_price()) {
 				$template_args['default_base_price_amount'] = $price->get_pretty('PRC_amount', 'localized_float');
 				$template_args['default_base_price_name'] = $price->get('PRC_name');
 				$template_args['default_base_price_description'] = $price->get('PRC_desc');
 				$prcrow++;
 				continue;
 			}
-			$show_trash = ( count( $default_prices ) > 1 && $prcrow === 1 ) || count( $default_prices ) === 1  ? FALSE : TRUE;
-			$show_create = count( $default_prices ) > 1 && count( $default_prices ) !== $prcrow ? FALSE : TRUE;
-			$template_args['default_price_rows'] .= $this->_get_ticket_price_row( 'TICKETNUM', $prcrow, $price, TRUE, NULL, $show_trash, $show_create );
+			$show_trash = (count($default_prices) > 1 && $prcrow === 1) || count($default_prices) === 1 ? FALSE : TRUE;
+			$show_create = count($default_prices) > 1 && count($default_prices) !== $prcrow ? FALSE : TRUE;
+			$template_args['default_price_rows'] .= $this->_get_ticket_price_row('TICKETNUM', $prcrow, $price, TRUE, NULL, $show_trash, $show_create);
 			$prcrow++;
 		}
 
-		$template_args = apply_filters( 'FHEE__espresso_events_Pricing_Hooks___get_ticket_js_structure__template_args', $template_args, $all_dtts, $all_tickets, $this->_is_creating_event );
+		$template_args = apply_filters('FHEE__espresso_events_Pricing_Hooks___get_ticket_js_structure__template_args', $template_args, $all_dtts, $all_tickets, $this->_is_creating_event);
 
-		$template = PRICING_TEMPLATE_PATH . 'event_tickets_datetime_ticket_js_structure.template.php';
-		return EEH_Template::display_template( $template, $template_args, TRUE );
+		$template = PRICING_TEMPLATE_PATH.'event_tickets_datetime_ticket_js_structure.template.php';
+		return EEH_Template::display_template($template, $template_args, TRUE);
 	}
 
 

modules/gateways/Invoice/lib/templates/receipt_body.template.php

Spacing +64 added lines, -64 removed lines

@@ -36,53 +36,53 @@ 
 						<h2 id="invoice-hdr"><?php _e('Order Confirmation', 'event_espresso')?></h2>
 						<h3 id="invoice-date"><?php _e('Date:', 'event_espresso')?> <span class="plain-text">[registration_date]</span></h3>
 						<h3 id="invoice-txn-id"><?php _e('Transaction ID:', 'event_espresso')?> <span class="plain-text">[transaction_id]</span></h3>
-						<h3 id="invoice-txn-status"><?php _e('Status:', 'event_espresso')?> <span class="<?php echo $transaction->status_ID()?> plain-text"><?php echo $transaction->pretty_status();?></span></h3>
+						<h3 id="invoice-txn-status"><?php _e('Status:', 'event_espresso')?> <span class="<?php echo $transaction->status_ID()?> plain-text"><?php echo $transaction->pretty_status(); ?></span></h3>
 					</div>
 				</td>
 			</tr>
 		</table>
 		<div class="events">
-		<?php foreach($events_for_txn as $event_id => $event){
-			?><h3 class="section-title event-name"><img class="icon" src="<?php echo EE_IMAGES_URL.'calendar_year-24x24.png';?>"><?php _e("Event Name:","event_espresso")?> <span class="plain-text"><?php echo $event->name();?></span> <span class="small-text link">[ <a href='<?php echo $event->get_permalink()?>'><?php _e('view', 'event_espresso'); ?></a> ]</span></h3>
-			<?php if (strlen($event->description()>1)){?><p class="event-description"><?php $event->description()?></p><?php }?>
+		<?php foreach ($events_for_txn as $event_id => $event) {
+			?><h3 class="section-title event-name"><img class="icon" src="<?php echo EE_IMAGES_URL.'calendar_year-24x24.png'; ?>"><?php _e("Event Name:", "event_espresso")?> <span class="plain-text"><?php echo $event->name(); ?></span> <span class="small-text link">[ <a href='<?php echo $event->get_permalink()?>'><?php _e('view', 'event_espresso'); ?></a> ]</span></h3>
+			<?php if (strlen($event->description() > 1)) {?><p class="event-description"><?php $event->description()?></p><?php }?>
 			<ul class="tickets-per-event">
-			<?php foreach($ticket_line_items_per_event[$event_id] as $line_item_id => $line_item){
+			<?php foreach ($ticket_line_items_per_event[$event_id] as $line_item_id => $line_item) {
 				$ticket = $line_item->ticket();
-				$taxable_html = $ticket->taxable() ? '*': '';
+				$taxable_html = $ticket->taxable() ? '*' : '';
 				$subitems = $line_item->children();
-				$ticket_uses = $ticket->get_pretty('TKT_uses',  __("any", "event_espresso"));
+				$ticket_uses = $ticket->get_pretty('TKT_uses', __("any", "event_espresso"));
 			?>
 				<li class="event-ticket">
 					<div class="ticket-details">
 						<table class="invoice-amount">
 							<thead>
 								<tr class="header_row">
-									<th class="name-column"><?php _e("Ticket", "event_espresso");?></th>
-									<th colspan="2" class="desc-column"><?php _e("Description", "event_espresso");?></th>
-									<th class="number-column item_c"><?php _e("Quantity", "event_espresso");?></th>
-									<th class="number-column item_c"><?php _e("Price", "event_espresso");?></th>
-									<th class="number-column item_r"><?php _e("Total", "event_espresso");?></th>
+									<th class="name-column"><?php _e("Ticket", "event_espresso"); ?></th>
+									<th colspan="2" class="desc-column"><?php _e("Description", "event_espresso"); ?></th>
+									<th class="number-column item_c"><?php _e("Quantity", "event_espresso"); ?></th>
+									<th class="number-column item_c"><?php _e("Price", "event_espresso"); ?></th>
+									<th class="number-column item_r"><?php _e("Total", "event_espresso"); ?></th>
 								</tr>
 							</thead>
 							<tbody>
-								<?php if( count($subitems) < 2){?>
+								<?php if (count($subitems) < 2) {?>
 								<tr class="item">
 									<td><?php echo $line_item->name().$taxable_html?></td>
-									<td colspan="2"><?php echo $line_item->desc();?><p class="ticket-note"><?php echo sprintf(__('This ticket can be used once at %s of the dates/times below.', 'event_espresso'), $ticket_uses); ?></p></td>
+									<td colspan="2"><?php echo $line_item->desc(); ?><p class="ticket-note"><?php echo sprintf(__('This ticket can be used once at %s of the dates/times below.', 'event_espresso'), $ticket_uses); ?></p></td>
 									<td class="item_c"><?php echo $line_item->quantity()?></td>
 									<td class="item_c"><?php echo $line_item->unit_price_no_code()?></td>
 									<td class="item_r"><?php echo $line_item->total_no_code()?></td>
 								</tr>
-								<?php }else{?>
+								<?php } else {?>
 									<tr class="item">
 										<td class="aln-left"><?php echo $line_item->name().$taxable_html?></td>
-										<td colspan="2"><?php echo $line_item->desc();?><p class="ticket-note"><?php echo sprintf(__('This ticket can be used once at %s of the dates/times below.', 'event_espresso'), $ticket_uses); ?></p></td>
+										<td colspan="2"><?php echo $line_item->desc(); ?><p class="ticket-note"><?php echo sprintf(__('This ticket can be used once at %s of the dates/times below.', 'event_espresso'), $ticket_uses); ?></p></td>
 										<td class="item_c"><?php echo $line_item->quantity()?></td>
 										<td class="item_c"><?php echo $line_item->unit_price_no_code()?></td>
 										<td class="item_r"><?php echo $line_item->total_no_code()?></td>
 									</tr>
-									<?php foreach($subitems as $sub_line_item){
-										$is_percent = $sub_line_item->is_percent();?>
+									<?php foreach ($subitems as $sub_line_item) {
+										$is_percent = $sub_line_item->is_percent(); ?>
 										<tr class="subitem-row">
 											<td class="subitem"><?php echo $sub_line_item->name()?></td>
 											<td colspan="2"><?php echo $sub_line_item->desc()?></td>
@@ -93,7 +93,7 @@ 
 									<?php } ?>
 									<tr class="total_tr odd">
 										<td colspan="4"></td>
-										<td class="total" nowrap="nowrap"><?php _e("Ticket Total:", "event_espresso");?></td>
+										<td class="total" nowrap="nowrap"><?php _e("Ticket Total:", "event_espresso"); ?></td>
 										<td class="item_r"><?php echo $line_item->total_no_code()?></td>
 									</tr>
 								<?php }?>
@@ -104,22 +104,22 @@ 
 					<div class="reg-details-for-ticket">
 						<div class="ticket-time-and-place-details">
 							<div class="ticket-time-details">
-								<h4 class="sub-section-title no-bottom-margin"><img class="icon" src="<?php echo EE_IMAGES_URL.'clock-16x16.png';?>"><?php echo _n("Date/Time:","Dates/Times:",count($ticket->datetimes()), "event_espresso");?></h4>
+								<h4 class="sub-section-title no-bottom-margin"><img class="icon" src="<?php echo EE_IMAGES_URL.'clock-16x16.png'; ?>"><?php echo _n("Date/Time:", "Dates/Times:", count($ticket->datetimes()), "event_espresso"); ?></h4>
 								<ul class="event-dates">
-									<?php foreach($ticket->datetimes_ordered() as $datetime){
+									<?php foreach ($ticket->datetimes_ordered() as $datetime) {
 										/* @var $datetime EE_Datetime */ ?>
 									<li><?php
-										echo $datetime->name() ? '<b>'.$datetime->name().' </b>' : '' ;
-										echo sprintf(__("%s - %s (%s)", "event_espresso"),$datetime->start_date_and_time(),$datetime->end_date_and_time(),$datetime->get_timezone());
+										echo $datetime->name() ? '<b>'.$datetime->name().' </b>' : '';
+										echo sprintf(__("%s - %s (%s)", "event_espresso"), $datetime->start_date_and_time(), $datetime->end_date_and_time(), $datetime->get_timezone());
 										echo $datetime->description() ? '<p class="ticket-note">'.$datetime->description().'</p>' : '' ?></li>
 									<?php }?>
 								</ul>
 							</div>
-							<?php if ($event->venues()){?>
+							<?php if ($event->venues()) {?>
 							<div class="ticket-place-details">
-								<h4 class="sub-section-title no-bottom-margin"><img class="icon" src="<?php echo EE_IMAGES_URL.'location-pin-16x16.png';?>"><?php echo _n("Venue:","Venues:",count($event->venues()), "event_espresso");?></h4>
+								<h4 class="sub-section-title no-bottom-margin"><img class="icon" src="<?php echo EE_IMAGES_URL.'location-pin-16x16.png'; ?>"><?php echo _n("Venue:", "Venues:", count($event->venues()), "event_espresso"); ?></h4>
 								<ul class="event-venues">
-									<?php foreach($event->venues() as $venue){?>
+									<?php foreach ($event->venues() as $venue) {?>
 									<li><?php echo $venue->name()?> <span class="small-text">[ <a href='<?php echo $venue->get_permalink()?>'><?php _e('view', 'event_espresso'); ?></a> ]</span></li>
 									<?php } ?>
 								</ul>
@@ -127,34 +127,34 @@ 
 							<?php }?>
 						</div>
 						<div class="ticket-registrations-area">
-							<h4 class="sub-section-title"><img class="icon" src="<?php echo EE_IMAGES_URL.'users-16x16.png';?>"><?php echo __("Registration Details", "event_espresso");?> <span class="small-text link">[ <a class="print_button noPrint" href="<?php echo $edit_reg_info_url; ?>"><?php _e('edit', 'event_espresso'); ?></a> ]</span></h4>
+							<h4 class="sub-section-title"><img class="icon" src="<?php echo EE_IMAGES_URL.'users-16x16.png'; ?>"><?php echo __("Registration Details", "event_espresso"); ?> <span class="small-text link">[ <a class="print_button noPrint" href="<?php echo $edit_reg_info_url; ?>"><?php _e('edit', 'event_espresso'); ?></a> ]</span></h4>
 							<ul class="ticket-registrations-list">
-								<?php foreach($registrations_per_line_item[$line_item_id] as $registration){
+								<?php foreach ($registrations_per_line_item[$line_item_id] as $registration) {
 									/* @var $registration EE_Registration */
 									$attendee = $registration->attendee();
-									$answers = $registration->answers(array('order_by'=>array('Question.Question_Group_Question.QGQ_order'=>'ASC')));?>
+									$answers = $registration->answers(array('order_by'=>array('Question.Question_Group_Question.QGQ_order'=>'ASC'))); ?>
 								<li class="ticket-registration">
 									<table class="registration-details">
 										<tr class="odd">
-											<th><?php echo 	_e("Registration Code:", "event_espresso");?></th>
-											<td><?php echo $registration->reg_code();?> - <span class="<?php echo $registration->status_ID()?>"><?php echo $registration->pretty_status()?></span></td>
+											<th><?php echo 	_e("Registration Code:", "event_espresso"); ?></th>
+											<td><?php echo $registration->reg_code(); ?> - <span class="<?php echo $registration->status_ID()?>"><?php echo $registration->pretty_status()?></span></td>
 										</tr>
 										<?php
-										foreach($event->question_groups() as $question_group){
-											?><tr><th><?php $question_group->e('QSG_name');?></th><td></td></tr><?php
+										foreach ($event->question_groups() as $question_group) {
+											?><tr><th><?php $question_group->e('QSG_name'); ?></th><td></td></tr><?php
 											$has_personal_info = false;
-											foreach($question_group->questions() as $question){
-												if( in_array($question->system_ID(),$questions_to_skip)){
+											foreach ($question_group->questions() as $question) {
+												if (in_array($question->system_ID(), $questions_to_skip)) {
 													$has_personal_info = true;
 													continue;
 												}
 												?><tr>
 														<th><?php echo $question->display_text()?></th>
-														<td><?php echo $registration->answer_value_to_question($question);?></td>
+														<td><?php echo $registration->answer_value_to_question($question); ?></td>
 												</tr><?php
 											}
-											if($has_personal_info){
-												?><tr><th><?php	_e('Attendee', 'event_espresso');?></th><td><?php echo sprintf(__('%s (%s)', "event_espresso"),$attendee->full_name(),$attendee->email())?></td></tr><?php
+											if ($has_personal_info) {
+												?><tr><th><?php	_e('Attendee', 'event_espresso'); ?></th><td><?php echo sprintf(__('%s (%s)', "event_espresso"), $attendee->full_name(), $attendee->email())?></td></tr><?php
 											}
 										}
 										?>
@@ -171,21 +171,21 @@ 
 		<?php }?>
 		</div>
 		<div class="taxes">
-			<?php if ($tax_total_line_item && $tax_total_line_item->children()){?>
-				<h3 class="section-title"><?php _e("Taxes",'event_espresso')?></h3>
+			<?php if ($tax_total_line_item && $tax_total_line_item->children()) {?>
+				<h3 class="section-title"><?php _e("Taxes", 'event_espresso')?></h3>
 				<table class="invoice-amount">
 
 					<thead>
 						<tr class="header_row">
-							<th class="left ticket_th"><?php _e("Tax Name", "event_espresso");?></th>
-							<th class="left"><?php _e('Description', 'event_espresso');?></th>
+							<th class="left ticket_th"><?php _e("Tax Name", "event_espresso"); ?></th>
+							<th class="left"><?php _e('Description', 'event_espresso'); ?></th>
 							<th class="event_th item_c"><?php _e('Rate', 'event_espresso'); ?></th>
 							<th class="subtotal_th"><?php _e('Tax Amount', 'event_espresso'); ?></th>
 						</tr>
 					</thead>
 					<tbody>
 						<?php
-						foreach($tax_total_line_item->children() as $child_tax){?>
+						foreach ($tax_total_line_item->children() as $child_tax) {?>
 						<tr>
 							<td><?php echo $child_tax->name()?></td>
 							<td><?php echo $child_tax->desc()?></td>
@@ -195,26 +195,26 @@ 
 						<?php } ?>
 						<tr class="total_tr odd">
 							<td class="total_tr" colspan="2"></td>
-							<td class="total"><?php	_e("Tax Total:", "event_espresso");?></td>
+							<td class="total"><?php	_e("Tax Total:", "event_espresso"); ?></td>
 							<td class="item_r"><?php echo $tax_total_line_item->total_no_code()?></td>
 						</tr>
 					</tbody>
 
 				</table>
 			<?php }?>
-			<p><?php _e("* taxable items", "event_espresso");?></p>
+			<p><?php _e("* taxable items", "event_espresso"); ?></p>
 		</div>
 		<div class="grand-total-dv">
-		<h2 class="grand-total"><?php printf(__("Grand Total: %s", "event_espresso"),EEH_Template::format_currency($total_cost));?></h2>
+		<h2 class="grand-total"><?php printf(__("Grand Total: %s", "event_espresso"), EEH_Template::format_currency($total_cost)); ?></h2>
 		</div>
 		<div class="payment-dv">
-			<h3 class="section-title"><?php _e("Payments",'event_espresso')?></h3>
+			<h3 class="section-title"><?php _e("Payments", 'event_espresso')?></h3>
 			<p>[instructions]</p>
 			<table class="invoice-amount">
 				<thead>
 					<tr class="header_row">
 						<th><span class=""><?php _e('Payment Method', 'event_espresso'); ?></span></th>
-						<th class='left datetime_th'><?php _e("Date",'event_espresso')?></th>
+						<th class='left datetime_th'><?php _e("Date", 'event_espresso')?></th>
 						<th><span class=""><?php _e('Transaction Id / Cheque #', 'event_espresso'); ?></span></th>
 						<th><span class=""><?php _e('P.O. / S.O.#', 'event_espresso'); ?></span></th>
 						<th><span class=""><?php _e('Status', 'event_espresso'); ?></span></th>
@@ -224,11 +224,11 @@ 
 				<tbody>
 					<?php
 					$c = false;
-					if(!empty($payments)){
+					if ( ! empty($payments)) {
 
-						foreach($payments as $payment){
+						foreach ($payments as $payment) {
 							/* @var $payment EE_Payment */?>
-						<tr class='item <?php echo (($c = !$c) ? ' odd' : '')?>'>
+						<tr class='item <?php echo (($c = ! $c) ? ' odd' : '')?>'>
 							<td><?php $payment->e('PAY_gateway')?></td>
 							<td><?php echo $payment->timestamp()?></td>
 							<td><?php $payment->e('PAY_txn_id_chq_nmbr')?></td>
@@ -237,17 +237,17 @@ 
 							<td class='item_r'><?php echo $payment->amount_no_code()?></td>
 						</tr>
 						<?php }
-					}else{?>
+					} else {?>
 						<tr class='item'>
-							<td class='aln-cntr' colspan="6"><?php _e("No approved payments have been received.",'event_espresso')?> </td>
+							<td class='aln-cntr' colspan="6"><?php _e("No approved payments have been received.", 'event_espresso')?> </td>
 						</tr>
 					<?php }
-					?><tr class="item" ><td class='aln-cntr' colspan="6"><?php if($amount_owed){?><a class="noPrint" href='<?php echo $retry_payment_url?>'><?php _e("Please make a payment.", "event_espresso");}?></a></td></tr>
+					?><tr class="item" ><td class='aln-cntr' colspan="6"><?php if ($amount_owed) {?><a class="noPrint" href='<?php echo $retry_payment_url?>'><?php _e("Please make a payment.", "event_espresso"); }?></a></td></tr>
 				</tbody>
 				<tfoot>
 					<tr class='total_tr'><td colspan="4">&nbsp;</td>
-						<td class="item_r"><?php _e('Total Paid','event_espresso')?></td>
-						<td class="item_r"><?php echo EEH_Template::format_currency($amount_pd,false,false)?> </td>
+						<td class="item_r"><?php _e('Total Paid', 'event_espresso')?></td>
+						<td class="item_r"><?php echo EEH_Template::format_currency($amount_pd, false, false)?> </td>
 					</tr>
 					<?php //echo $discount; ?>
 					<tr class="total_tr odd">
@@ -259,20 +259,20 @@ 
 			</table>
 		</div>
 		<div class="additional-info-dv">
-			<h3 class="section-title"><?php _e("Additional Information:", "event_espresso");?></h3>
+			<h3 class="section-title"><?php _e("Additional Information:", "event_espresso"); ?></h3>
 			<div class="additional-info">
-				<?php if($venues_for_events){?>
-				<h2><?php echo _n("Venue Details:", "Venues Details:", "event_espresso",count($venues_for_events));?></h2>
+				<?php if ($venues_for_events) {?>
+				<h2><?php echo _n("Venue Details:", "Venues Details:", "event_espresso", count($venues_for_events)); ?></h2>
 				<table class="venue-list">
-					<?php foreach($venues_for_events as $venue){?>
+					<?php foreach ($venues_for_events as $venue) {?>
 						<tr class="venue-details">
 							<td class="venue-details-part venue-address-dv">
 								<h3><a href='<?php echo $venue->get_permalink()?>'><?php
 									echo $venue->name()
 								?></a></h3>
 								<p><?php echo $venue->description()?></p>
-								<?php echo  EEH_Address::format($venue);?></td>
-							<?php if($venue->enable_for_gmap()){?>
+								<?php echo  EEH_Address::format($venue); ?></td>
+							<?php if ($venue->enable_for_gmap()) {?>
 								<td class="venue-details-part venue-image-dv"><?php echo EEH_Venue_View::espresso_google_static_map($venue)?></td>
 							<?php } ?>
 						</tr>
@@ -280,9 +280,9 @@ 
 				</table>
 				<?php } ?>
 
-				<?php if($shameless_plug){?>
+				<?php if ($shameless_plug) {?>
 				<div class='aln-cntr'><?php
-					printf(__("Powered by %sEvent Espresso %s", "event_espresso"),"<a href='https://eventespresso.com'>","</a>");
+					printf(__("Powered by %sEvent Espresso %s", "event_espresso"), "<a href='https://eventespresso.com'>", "</a>");
 				?></div>
 				<?php } ?>
 			</div>

core/libraries/messages/defaults/default/html_receipt_content.template.php

Spacing +29 added lines, -29 removed lines

@@ -23,15 +23,15 @@ 
 			</td>
 			<td>
 				<div id="invoice-info">
-					<h2 id="invoice-hdr"><?php _e( 'Order Confirmation', 'event_espresso' ) ?></h2>
+					<h2 id="invoice-hdr"><?php _e('Order Confirmation', 'event_espresso') ?></h2>
 
-					<h3 id="invoice-date"><?php _e( 'Date:', 'event_espresso' ) ?>
+					<h3 id="invoice-date"><?php _e('Date:', 'event_espresso') ?>
 						<span class="plain-text">[PRIMARY_REGISTRANT_REGISTRATION_DATE]</span></h3>
 
-					<h3 id="invoice-txn-id"><?php _e( 'Transaction ID:', 'event_espresso' ) ?>
+					<h3 id="invoice-txn-id"><?php _e('Transaction ID:', 'event_espresso') ?>
 						<span class="plain-text">[TXN_ID]</span></h3>
 
-					<h3 id="invoice-txn-status"><?php _e( 'Status:', 'event_espresso' ) ?>
+					<h3 id="invoice-txn-status"><?php _e('Status:', 'event_espresso') ?>
 						<span class="[TXN_STATUS_ID] plain-text">[TXN_STATUS]</span></h3>
 				</div>
 			</td>
@@ -41,15 +41,15 @@ 
 		[EVENT_LIST]
 	</div>
 	<div class="taxes">
-		<h3 class="section-title"><?php _e( "Additional Charges/Discounts", 'event_espresso' ) ?></h3>
+		<h3 class="section-title"><?php _e("Additional Charges/Discounts", 'event_espresso') ?></h3>
 		<table class="invoice-amount">
 			<thead>
 				<tr class="header_row">
-					<th class="left ticket_th"><?php _e( "Name", "event_espresso" ); ?></th>
-					<th class="left"><?php _e( 'Description', 'event_espresso' ); ?></th>
-					<th class="event_th item_c"><?php _e( 'Quantity', 'event_espresso' ); ?></th>
-					<th class="event_th item_c"><?php _e( 'Unit Price', 'event_espresso' ); ?></th>
-					<th class="subtotal_th"><?php _e( 'Total', 'event_espresso' ); ?></th>
+					<th class="left ticket_th"><?php _e("Name", "event_espresso"); ?></th>
+					<th class="left"><?php _e('Description', 'event_espresso'); ?></th>
+					<th class="event_th item_c"><?php _e('Quantity', 'event_espresso'); ?></th>
+					<th class="event_th item_c"><?php _e('Unit Price', 'event_espresso'); ?></th>
+					<th class="subtotal_th"><?php _e('Total', 'event_espresso'); ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -60,15 +60,15 @@ 
 		</table>
 	</div>
 	<div class="taxes">
-		<h3 class="section-title"><?php _e( "Taxes", 'event_espresso' ) ?></h3>
-		<p><?php printf( __( '%s*%s Taxable items. The total amount collected for taxes is reflected in the total(s) below.', 'event_espresso' ), '<strong>', '</strong>' ); ?></p>
+		<h3 class="section-title"><?php _e("Taxes", 'event_espresso') ?></h3>
+		<p><?php printf(__('%s*%s Taxable items. The total amount collected for taxes is reflected in the total(s) below.', 'event_espresso'), '<strong>', '</strong>'); ?></p>
 		<table class="invoice-amount">
 			<thead>
 				<tr class="header_row">
-					<th class="left ticket_th"><?php _e( "Tax Name", "event_espresso" ); ?></th>
-					<th class="left"><?php _e( 'Description', 'event_espresso' ); ?></th>
-					<th class="event_th item_c"><?php _e( 'Rate', 'event_espresso' ); ?></th>
-					<th class="subtotal_th"><?php _e( 'Tax Amount', 'event_espresso' ); ?></th>
+					<th class="left ticket_th"><?php _e("Tax Name", "event_espresso"); ?></th>
+					<th class="left"><?php _e('Description', 'event_espresso'); ?></th>
+					<th class="event_th item_c"><?php _e('Rate', 'event_espresso'); ?></th>
+					<th class="subtotal_th"><?php _e('Tax Amount', 'event_espresso'); ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -79,19 +79,19 @@ 
 		</table>
 	</div>
 	<div class="grand-total-dv">
-		<h2 class="grand-total"><?php printf( __( "Grand Total: %s", "event_espresso" ), '[TOTAL_COST]' ); ?></h2>
+		<h2 class="grand-total"><?php printf(__("Grand Total: %s", "event_espresso"), '[TOTAL_COST]'); ?></h2>
 	</div>
 	<div class="payment-dv">
-		<h3 class="section-title"><?php _e( "Payments", 'event_espresso' ) ?></h3>
+		<h3 class="section-title"><?php _e("Payments", 'event_espresso') ?></h3>
 		<table class="invoice-amount">
 			<thead>
 				<tr class="header_row">
-					<th><span class=""><?php _e( 'Payment Method', 'event_espresso' ); ?></span></th>
-					<th class='left datetime_th'><?php _e( "Date", 'event_espresso' ) ?></th>
-					<th><span class=""><?php _e( 'Transaction Id / Cheque #', 'event_espresso' ); ?></span></th>
-					<th><span class=""><?php _e( 'P.O. / S.O.#', 'event_espresso' ); ?></span></th>
-					<th><span class=""><?php _e( 'Status', 'event_espresso' ); ?></span></th>
-					<th><?php _e( 'Amount', 'event_espresso' ); ?></th>
+					<th><span class=""><?php _e('Payment Method', 'event_espresso'); ?></span></th>
+					<th class='left datetime_th'><?php _e("Date", 'event_espresso') ?></th>
+					<th><span class=""><?php _e('Transaction Id / Cheque #', 'event_espresso'); ?></span></th>
+					<th><span class=""><?php _e('P.O. / S.O.#', 'event_espresso'); ?></span></th>
+					<th><span class=""><?php _e('Status', 'event_espresso'); ?></span></th>
+					<th><?php _e('Amount', 'event_espresso'); ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -105,21 +105,21 @@ 
 			<tfoot>
 				<tr class='total_tr'>
 					<td colspan="4">&nbsp;</td>
-					<td class="item_r"><?php _e( 'Total Paid', 'event_espresso' ) ?></td>
+					<td class="item_r"><?php _e('Total Paid', 'event_espresso') ?></td>
 					<td class="item_r">[TOTAL_AMOUNT_PAID]</td>
 				</tr>
 				<tr class="total_tr odd">
 					<td colspan="4">&nbsp;</td>
-					<td class="total" id="total_currency"><?php _e( 'Amount Owed:', 'event_espresso' ); ?></td>
+					<td class="total" id="total_currency"><?php _e('Amount Owed:', 'event_espresso'); ?></td>
 					<td class="total">[TOTAL_OWING]</td>
 				</tr>
 			</tfoot>
 		</table>
 	</div>
 	<div class="additional-info-dv">
-		<h3 class="section-title"><?php _e( "Additional Information:", "event_espresso" ); ?></h3>
+		<h3 class="section-title"><?php _e("Additional Information:", "event_espresso"); ?></h3>
 		<div class="additional-info">
-			<h2><?php _e( "Venue Details:", "event_espresso" ); ?></h2>
+			<h2><?php _e("Venue Details:", "event_espresso"); ?></h2>
 			<table class="venue-list">
 				<tr class="venue-details">
 					<td class="venue-details-part venue-address-dv">
@@ -131,7 +131,7 @@ 
 					<td class="venue-details-part venue-image-dv">[GOOGLE_MAP_IMAGE]</td>
 				</tr>
 			</table>
-			<div class='aln-cntr'><?php printf( __( "Powered by %sEvent Espresso %s", "event_espresso" ), "<a href='https://eventespresso.com'>", "</a>" ); ?></div>
+			<div class='aln-cntr'><?php printf(__("Powered by %sEvent Espresso %s", "event_espresso"), "<a href='https://eventespresso.com'>", "</a>"); ?></div>
 		</div>
 	</div>
 </div>

modules/event_single/EED_Event_Single.module.php

Spacing +78 added lines, -78 removed lines

@@ -40,7 +40,7 @@ 
 	 * @return EED_Event_Single
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -52,9 +52,9 @@ 
 	 *  @return 	void
 	 */
 	public static function set_hooks() {
-		add_filter( 'FHEE_run_EE_wp', '__return_true' );
-		add_action( 'wp_loaded', array( 'EED_Event_Single', 'set_definitions' ), 2 );
-		EE_Config::register_route( __( 'event', 'event_espresso' ), 'Event_Single', 'run' );
+		add_filter('FHEE_run_EE_wp', '__return_true');
+		add_action('wp_loaded', array('EED_Event_Single', 'set_definitions'), 2);
+		EE_Config::register_route(__('event', 'event_espresso'), 'Event_Single', 'run');
 	}
 
 	/**
@@ -64,7 +64,7 @@ 
 	 *  @return 	void
 	 */
 	public static function set_hooks_admin() {
-		add_action( 'wp_loaded', array( 'EED_Event_Single', 'set_definitions' ), 2 );
+		add_action('wp_loaded', array('EED_Event_Single', 'set_definitions'), 2);
 	}
 
 
@@ -78,8 +78,8 @@ 
 	 * @return void
 	 */
 	public static function set_definitions() {
-		define( 'EVENT_SINGLE_ASSETS_URL', plugin_dir_url( __FILE__ ) . 'assets' . DS );
-		define( 'EVENT_SINGLE_TEMPLATES_PATH', plugin_dir_path( __FILE__ ) . 'templates' . DS );
+		define('EVENT_SINGLE_ASSETS_URL', plugin_dir_url(__FILE__).'assets'.DS);
+		define('EVENT_SINGLE_TEMPLATES_PATH', plugin_dir_path(__FILE__).'templates'.DS);
 	}
 
 
@@ -89,10 +89,10 @@ 
 	 *
 	 * @void
 	 */
-	protected function set_config(){
-		$this->set_config_section( 'template_settings' );
-		$this->set_config_class( 'EE_Event_Single_Config' );
-		$this->set_config_name( 'EED_Event_Single' );
+	protected function set_config() {
+		$this->set_config_section('template_settings');
+		$this->set_config_class('EE_Event_Single_Config');
+		$this->set_config_name('EED_Event_Single');
 	}
 
 
@@ -105,35 +105,35 @@ 
 	 * @param \EE_Event_Single_Config $config
 	 * @return \EE_Template_Part_Manager
 	 */
-	public function initialize_template_parts( EE_Event_Single_Config $config = null ) {
+	public function initialize_template_parts(EE_Event_Single_Config $config = null) {
 		$config = $config instanceof EE_Event_Single_Config ? $config : $this->config();
 		EEH_Autoloader::instance()->register_template_part_autoloaders();
 		$template_parts = new EE_Template_Part_Manager();
 		$template_parts->add_template_part(
 			'tickets',
-			__( 'Ticket Selector', 'event_espresso' ),
+			__('Ticket Selector', 'event_espresso'),
 			'content-espresso_events-tickets.php',
 			$config->display_order_tickets
 		);
 		$template_parts->add_template_part(
 			'datetimes',
-			__( 'Dates and Times', 'event_espresso' ),
+			__('Dates and Times', 'event_espresso'),
 			'content-espresso_events-datetimes.php',
 			$config->display_order_datetimes
 		);
 		$template_parts->add_template_part(
 			'event',
-			__( 'Event Description', 'event_espresso' ),
+			__('Event Description', 'event_espresso'),
 			'content-espresso_events-details.php',
 			$config->display_order_event
 		);
 		$template_parts->add_template_part(
 			'venue',
-			__( 'Venue Information', 'event_espresso' ),
+			__('Venue Information', 'event_espresso'),
 			'content-espresso_events-venues.php',
 			$config->display_order_venue
 		);
-		do_action( 'AHEE__EED_Event_Single__initialize_template_parts', $template_parts );
+		do_action('AHEE__EED_Event_Single__initialize_template_parts', $template_parts);
 		return $template_parts;
 	}
 
@@ -147,15 +147,15 @@ 
 	 * @param WP $WP
 	 * @return    void
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
 		// ensure valid EE_Events_Single_Config() object exists
 		$this->set_config();
 		// check what template is loaded
-		add_filter( 'template_include',  array( $this, 'template_include' ), 999, 1 );
-		add_filter( 'FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', '__return_true' );
+		add_filter('template_include', array($this, 'template_include'), 999, 1);
+		add_filter('FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', '__return_true');
 		// load css
-		add_action('wp_enqueue_scripts', array( $this, 'wp_enqueue_scripts' ), 10 );
-		EE_Registry::instance()->load_helper( 'Venue_View' );
+		add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 10);
+		EE_Registry::instance()->load_helper('Venue_View');
 	}
 
 
@@ -167,27 +167,27 @@ 
 	 * @param 	string $template
 	 * @return 	string
 	 */
-	public function template_include( $template ) {
+	public function template_include($template) {
 		global $post;
 		/** @type EE_Event_Single_Config $config */
 		$config = $this->config();
-		if ( $config->display_status_banner_single ) {
-			add_filter( 'the_title', array( 'EED_Event_Single', 'the_title' ), 100, 2 );
+		if ($config->display_status_banner_single) {
+			add_filter('the_title', array('EED_Event_Single', 'the_title'), 100, 2);
 		}
 		// not a custom template?
 		if (
 			EE_Front_Controller::instance()->get_selected_template() != 'single-espresso_events.php'
-			|| apply_filters( 'FHEE__EED_Event_Single__template_include__allow_custom_selected_template', FALSE )
-			&& ! post_password_required( $post )
+			|| apply_filters('FHEE__EED_Event_Single__template_include__allow_custom_selected_template', FALSE)
+			&& ! post_password_required($post)
 		) {
 			EEH_Template::load_espresso_theme_functions();
 			// then add extra event data via hooks
-			add_action( 'loop_start', array( 'EED_Event_Single', 'loop_start' ));
-			add_filter( 'get_the_excerpt', array( 'EED_Event_Single', 'get_the_excerpt' ), 1, 1 );
-			add_filter( 'the_content', array( 'EED_Event_Single', 'event_details' ), 100 );
-			add_action( 'loop_end', array( 'EED_Event_Single', 'loop_end' ));
+			add_action('loop_start', array('EED_Event_Single', 'loop_start'));
+			add_filter('get_the_excerpt', array('EED_Event_Single', 'get_the_excerpt'), 1, 1);
+			add_filter('the_content', array('EED_Event_Single', 'event_details'), 100);
+			add_action('loop_end', array('EED_Event_Single', 'loop_end'));
 			// don't display entry meta because the existing theme will take car of that
-			add_filter( 'FHEE__content_espresso_events_details_template__display_entry_meta', '__return_false' );
+			add_filter('FHEE__content_espresso_events_details_template__display_entry_meta', '__return_false');
 		}
 		return $template;
 	}
@@ -201,9 +201,9 @@ 
 	 * @param 	array $wp_query_array an array containing the WP_Query object
 	 * @return 	void
 	 */
-	public static function loop_start( $wp_query_array ) {
+	public static function loop_start($wp_query_array) {
 		global $post;
-		do_action( 'AHEE_event_details_before_post', $post, $wp_query_array );
+		do_action('AHEE_event_details_before_post', $post, $wp_query_array);
 	}
 
 
@@ -216,9 +216,9 @@ 
 	 * @param 	int 	$id
 	 * @return 	string
 	 */
-	public static function the_title( $title = '', $id = 0 ) {
+	public static function the_title($title = '', $id = 0) {
 		global $post;
-		return in_the_loop() && $post->ID == $id ? espresso_event_status_banner( $post->ID ) . $title :  $title;
+		return in_the_loop() && $post->ID == $id ? espresso_event_status_banner($post->ID).$title : $title;
 	}
 
 
@@ -230,9 +230,9 @@ 
 	 * @param        string $excerpt
 	 * @return        string
 	 */
-	public static function get_the_excerpt( $excerpt = '' ) {
+	public static function get_the_excerpt($excerpt = '') {
 		EED_Event_Single::$using_get_the_excerpt = true;
-		add_filter( 'wp_trim_excerpt', array( 'EED_Event_Single', 'end_get_the_excerpt' ), 999, 1 );
+		add_filter('wp_trim_excerpt', array('EED_Event_Single', 'end_get_the_excerpt'), 999, 1);
 		return $excerpt;
 	}
 
@@ -245,7 +245,7 @@ 
 	 * @param  string $text
 	 * @return string
 	 */
-	public static function end_get_the_excerpt( $text = '' ) {
+	public static function end_get_the_excerpt($text = '') {
 		EED_Event_Single::$using_get_the_excerpt = false;
 		return $text;
 	}
@@ -259,7 +259,7 @@ 
 	 * @param 	string 	$content
 	 * @return 	string
 	 */
-	public static function event_details( $content ) {
+	public static function event_details($content) {
 		global $post;
 		static $current_post_ID = 0;
 		if (
@@ -274,15 +274,15 @@ 
 			// We want to allow those plugins to still do their thing and have access to our content, but depending on
 			// how your event content is being displayed (shortcode, CPT route, etc), this filter can get applied twice,
 			// so the following allows this filter to be applied multiple times, but only once for real
-			$current_post_ID = did_action( 'loop_start' ) ? $post->ID : 0;
-			if ( EE_Registry::instance()->CFG->template_settings->EED_Event_Single->use_sortable_display_order ) {
+			$current_post_ID = did_action('loop_start') ? $post->ID : 0;
+			if (EE_Registry::instance()->CFG->template_settings->EED_Event_Single->use_sortable_display_order) {
 				// we need to first remove this callback from being applied to the_content()
 				// (otherwise it will recurse and blow up the interweb)
-				remove_filter( 'the_content', array( 'EED_Event_Single', 'event_details' ), 100 );
+				remove_filter('the_content', array('EED_Event_Single', 'event_details'), 100);
 				EED_Event_Single::instance()->template_parts = EED_Event_Single::instance()->initialize_template_parts();
-				$content = EEH_Template::locate_template( 'content-espresso_events-details.php' );
-				$content = EED_Event_Single::instance()->template_parts->apply_template_part_filters( $content );
-				add_filter( 'the_content', array( 'EED_Event_Single', 'event_details' ), 100 );
+				$content = EEH_Template::locate_template('content-espresso_events-details.php');
+				$content = EED_Event_Single::instance()->template_parts->apply_template_part_filters($content);
+				add_filter('the_content', array('EED_Event_Single', 'event_details'), 100);
 			} else {
 				$content = EED_Event_Single::use_filterable_display_order();
 			}
@@ -303,19 +303,19 @@ 
 		// it uses the_content() for displaying the $post->post_content
 		// so in order to load a template that uses the_content() from within a callback being used to filter the_content(),
 		// we need to first remove this callback from being applied to the_content() (otherwise it will recurse and blow up the interweb)
-		remove_filter( 'the_content', array( 'EED_Event_Single', 'event_details' ), 100 );
+		remove_filter('the_content', array('EED_Event_Single', 'event_details'), 100);
 		//now add additional content
-		add_filter( 'the_content', array( 'EED_Event_Single', 'event_datetimes' ), 110, 1 );
-		add_filter( 'the_content', array( 'EED_Event_Single', 'event_tickets' ), 120, 1 );
-		add_filter( 'the_content', array( 'EED_Event_Single', 'event_venues' ), 130, 1 );
-		do_action( 'AHEE__EED_Event_Single__use_filterable_display_order__after_add_filters' );
+		add_filter('the_content', array('EED_Event_Single', 'event_datetimes'), 110, 1);
+		add_filter('the_content', array('EED_Event_Single', 'event_tickets'), 120, 1);
+		add_filter('the_content', array('EED_Event_Single', 'event_venues'), 130, 1);
+		do_action('AHEE__EED_Event_Single__use_filterable_display_order__after_add_filters');
 		// now load our template
-		$content = EEH_Template::locate_template( 'content-espresso_events-details.php' );
+		$content = EEH_Template::locate_template('content-espresso_events-details.php');
 		//now add our filter back in, plus some others
-		add_filter( 'the_content', array( 'EED_Event_Single', 'event_details' ), 100 );
-		remove_filter( 'the_content', array( 'EED_Event_Single', 'event_datetimes' ), 110 );
-		remove_filter( 'the_content', array( 'EED_Event_Single', 'event_tickets' ), 120 );
-		remove_filter( 'the_content', array( 'EED_Event_Single', 'event_venues' ), 130 );
+		add_filter('the_content', array('EED_Event_Single', 'event_details'), 100);
+		remove_filter('the_content', array('EED_Event_Single', 'event_datetimes'), 110);
+		remove_filter('the_content', array('EED_Event_Single', 'event_tickets'), 120);
+		remove_filter('the_content', array('EED_Event_Single', 'event_venues'), 130);
 		// we're not returning the $content directly because the template we are loading uses the_content (or the_excerpt)
 		return $content;
 	}
@@ -329,8 +329,8 @@ 
 	 * @param        string $content
 	 * @return        string
 	 */
-	public static function event_datetimes( $content ) {
-		return EEH_Template::locate_template( 'content-espresso_events-datetimes.php' ) . $content;
+	public static function event_datetimes($content) {
+		return EEH_Template::locate_template('content-espresso_events-datetimes.php').$content;
 	}
 
 
@@ -342,8 +342,8 @@ 
 	 * @param        string $content
 	 * @return        string
 	 */
-	public static function event_tickets( $content ) {
-		return EEH_Template::locate_template( 'content-espresso_events-tickets.php' ) . $content;
+	public static function event_tickets($content) {
+		return EEH_Template::locate_template('content-espresso_events-tickets.php').$content;
 	}
 
 
@@ -355,8 +355,8 @@ 
 	 * @param 	string $content
 	 * @return 	string
 	 */
-	public static function event_venue( $content ) {
-		return EED_Event_Single::event_venues( $content );
+	public static function event_venue($content) {
+		return EED_Event_Single::event_venues($content);
 	}
 
 
@@ -368,8 +368,8 @@ 
 	 * @param        string $content
 	 * @return        string
 	 */
-	public static function event_venues( $content ) {
-		return $content . EEH_Template::locate_template( 'content-espresso_events-venues.php' );
+	public static function event_venues($content) {
+		return $content.EEH_Template::locate_template('content-espresso_events-venues.php');
 	}
 
 
@@ -381,9 +381,9 @@ 
 	 * 	@param		array 	$wp_query_array an array containing the WP_Query object
 	 *  	@return 		void
 	 */
-	public static function loop_end( $wp_query_array ) {
+	public static function loop_end($wp_query_array) {
 		global $post;
-		do_action( 'AHEE_event_details_after_post', $post, $wp_query_array );
+		do_action('AHEE_event_details_after_post', $post, $wp_query_array);
 	}
 
 
@@ -396,18 +396,18 @@ 
 	 */
 	public function wp_enqueue_scripts() {
 		// get some style
-		if ( apply_filters( 'FHEE_enable_default_espresso_css', TRUE ) && apply_filters( 'FHEE__EED_Event_Single__wp_enqueue_scripts__enable_css', TRUE )) {
-			EE_Registry::instance()->load_helper( 'File' );
+		if (apply_filters('FHEE_enable_default_espresso_css', TRUE) && apply_filters('FHEE__EED_Event_Single__wp_enqueue_scripts__enable_css', TRUE)) {
+			EE_Registry::instance()->load_helper('File');
 			// first check uploads folder
-			if ( is_readable( get_stylesheet_directory() . $this->theme . DS . 'style.css' )) {
-				wp_register_style( $this->theme, get_stylesheet_directory_uri() . $this->theme . DS . 'style.css', array( 'dashicons', 'espresso_default' ));
+			if (is_readable(get_stylesheet_directory().$this->theme.DS.'style.css')) {
+				wp_register_style($this->theme, get_stylesheet_directory_uri().$this->theme.DS.'style.css', array('dashicons', 'espresso_default'));
 			} else {
-				wp_register_style( $this->theme, EE_TEMPLATES_URL . $this->theme . DS . 'style.css', array( 'dashicons', 'espresso_default' ));
+				wp_register_style($this->theme, EE_TEMPLATES_URL.$this->theme.DS.'style.css', array('dashicons', 'espresso_default'));
 			}
-			wp_enqueue_script( $this->theme );
-			if ( EE_Registry::instance()->CFG->map_settings->use_google_maps ) {
-				EE_Registry::instance()->load_helper( 'Maps' );
-				add_action('wp_enqueue_scripts', array( 'EEH_Maps', 'espresso_google_map_js' ), 11 );
+			wp_enqueue_script($this->theme);
+			if (EE_Registry::instance()->CFG->map_settings->use_google_maps) {
+				EE_Registry::instance()->load_helper('Maps');
+				add_action('wp_enqueue_scripts', array('EEH_Maps', 'espresso_google_map_js'), 11);
 			}
 		}
 	}
@@ -426,12 +426,12 @@ 
 	 *  @return 	bool
 	 */
 	public static function display_venue() {
-		EE_Registry::instance()->load_helper( 'Venue_View' );
+		EE_Registry::instance()->load_helper('Venue_View');
 		/** @type EE_Event_Single_Config $config */
 		$config = EED_Event_Single::instance()->config();
-		$display_venue= isset( $config->display_venue ) ? $config->display_venue : TRUE;
+		$display_venue = isset($config->display_venue) ? $config->display_venue : TRUE;
 		$venue_name = EEH_Venue_View::venue_name();
-		return $display_venue && ! empty( $venue_name ) ? TRUE : FALSE;
+		return $display_venue && ! empty($venue_name) ? TRUE : FALSE;
 	}
 
 

modules/events_archive/EED_Events_Archive.module.php

Spacing +191 added lines, -191 removed lines

@@ -43,7 +43,7 @@ 
 	 * @return EED_Events_Archive
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -55,9 +55,9 @@ 
 	 *  @return 	void
 	 */
 	public static function set_hooks() {
-		EE_Config::register_route( EE_Registry::instance()->CFG->core->event_cpt_slug, 'Events_Archive', 'run' );
-		EE_Config::register_route( 'event_list', 'Events_Archive', 'event_list' );
-		add_action( 'wp_loaded', array( 'EED_Events_Archive', 'set_definitions' ), 2 );
+		EE_Config::register_route(EE_Registry::instance()->CFG->core->event_cpt_slug, 'Events_Archive', 'run');
+		EE_Config::register_route('event_list', 'Events_Archive', 'event_list');
+		add_action('wp_loaded', array('EED_Events_Archive', 'set_definitions'), 2);
 	}
 
 	/**
@@ -67,7 +67,7 @@ 
 	 *  @return 	void
 	 */
 	public static function set_hooks_admin() {
-		add_action( 'wp_loaded', array( 'EED_Events_Archive', 'set_definitions' ), 2 );
+		add_action('wp_loaded', array('EED_Events_Archive', 'set_definitions'), 2);
 	}
 
 
@@ -80,8 +80,8 @@ 
 	 *  @return 	void
 	 */
 	public static function set_definitions() {
-		define( 'EVENTS_ARCHIVE_ASSETS_URL', plugin_dir_url( __FILE__ ) . 'assets' . DS );
-		define( 'EVENTS_ARCHIVE_TEMPLATES_PATH', str_replace( '\\', DS, plugin_dir_path( __FILE__ )) . 'templates' . DS );
+		define('EVENTS_ARCHIVE_ASSETS_URL', plugin_dir_url(__FILE__).'assets'.DS);
+		define('EVENTS_ARCHIVE_TEMPLATES_PATH', str_replace('\\', DS, plugin_dir_path(__FILE__)).'templates'.DS);
 	}
 
 
@@ -91,10 +91,10 @@ 
 	 *
 	 * @return \EE_Events_Archive_Config
 	 */
-	protected function set_config(){
-		$this->set_config_section( 'template_settings' );
-		$this->set_config_class( 'EE_Events_Archive_Config' );
-		$this->set_config_name( 'EED_Events_Archive' );
+	protected function set_config() {
+		$this->set_config_section('template_settings');
+		$this->set_config_class('EE_Events_Archive_Config');
+		$this->set_config_name('EED_Events_Archive');
 	}
 
 
@@ -106,35 +106,35 @@ 
 	 * @param \EE_Events_Archive_Config $config
 	 * @return \EE_Template_Part_Manager
 	 */
-	public function initialize_template_parts( EE_Events_Archive_Config $config = null ) {
+	public function initialize_template_parts(EE_Events_Archive_Config $config = null) {
 		$config = $config instanceof EE_Events_Archive_Config ? $config : $this->config();
 		EEH_Autoloader::instance()->register_template_part_autoloaders();
 		$template_parts = new EE_Template_Part_Manager();
 		$template_parts->add_template_part(
 			'tickets',
-			__( 'Ticket Selector', 'event_espresso' ),
+			__('Ticket Selector', 'event_espresso'),
 			'content-espresso_events-tickets.php',
 			$config->display_order_tickets
 		);
 		$template_parts->add_template_part(
 			'datetimes',
-			__( 'Dates and Times', 'event_espresso' ),
+			__('Dates and Times', 'event_espresso'),
 			'content-espresso_events-datetimes.php',
 			$config->display_order_datetimes
 		);
 		$template_parts->add_template_part(
 			'event',
-			__( 'Event Description', 'event_espresso' ),
+			__('Event Description', 'event_espresso'),
 			'content-espresso_events-details.php',
 			$config->display_order_event
 		);
 		$template_parts->add_template_part(
 			'venue',
-			__( 'Venue Information', 'event_espresso' ),
+			__('Venue Information', 'event_espresso'),
 			'content-espresso_events-venues.php',
 			$config->display_order_venue
 		);
-		do_action( 'AHEE__EED_Event_Archive__initialize_template_parts', $template_parts );
+		do_action('AHEE__EED_Event_Archive__initialize_template_parts', $template_parts);
 		return $template_parts;
 	}
 
@@ -147,8 +147,8 @@ 
 	 * @param WP $WP
 	 * @return    void
 	 */
-	public function run( $WP ) {
-		do_action( 'AHEE__EED_Events_Archive__before_run' );
+	public function run($WP) {
+		do_action('AHEE__EED_Events_Archive__before_run');
 		// ensure valid EE_Events_Archive_Config() object exists
 		$this->set_config();
 		/** @type EE_Events_Archive_Config $config */
@@ -156,19 +156,19 @@ 
 		// load other required components
 		$this->load_event_list_assets();
 		// filter the WP posts_join, posts_where, and posts_orderby SQL clauses
-		EE_Registry::instance()->load_helper( 'Event_Query' );
+		EE_Registry::instance()->load_helper('Event_Query');
 		//add query filters
 		EEH_Event_Query::add_query_filters();
 		// set params that will get used by the filters
 		EEH_Event_Query::set_query_params(
-			'', 	// month
-			'', 	// category
-			$config->display_expired_events, 	// show_expired
-			'start_date', 	// orderby
+			'', // month
+			'', // category
+			$config->display_expired_events, // show_expired
+			'start_date', // orderby
 			'ASC' 	// sort
 		);
 		// check what template is loaded
-		add_filter( 'template_include',  array( $this, 'template_include' ), 999, 1 );
+		add_filter('template_include', array($this, 'template_include'), 999, 1);
 	}
 
 
@@ -200,32 +200,32 @@ 
 	 * @param string $template
 	 * @return    string
 	 */
-	public function template_include( $template = '' ) {
+	public function template_include($template = '') {
 		// don't add content filter for dedicated EE child themes or private posts
-		EE_Registry::instance()->load_helper( 'Template' );
-		if ( ! EEH_Template::is_espresso_theme() ) {
+		EE_Registry::instance()->load_helper('Template');
+		if ( ! EEH_Template::is_espresso_theme()) {
 			/** @type EE_Events_Archive_Config $config */
 			$config = $this->config();
 			// add status banner ?
-			if ( $config->display_status_banner ) {
-				add_filter( 'the_title', array( 'EED_Events_Archive', 'the_title' ), 100, 2 );
+			if ($config->display_status_banner) {
+				add_filter('the_title', array('EED_Events_Archive', 'the_title'), 100, 2);
 			}
 			// if NOT a custom template
-			if ( EE_Front_Controller::instance()->get_selected_template() != 'archive-espresso_events.php'
-				|| apply_filters( 'FHEE__EED_Event_Archive__template_include__allow_custom_selected_template', FALSE )
+			if (EE_Front_Controller::instance()->get_selected_template() != 'archive-espresso_events.php'
+				|| apply_filters('FHEE__EED_Event_Archive__template_include__allow_custom_selected_template', FALSE)
 			) {
 				// don't display entry meta because the existing theme will take care of that
-				add_filter( 'FHEE__EED_Events_Archive__template_include__events_list_active', '__return_true' );
+				add_filter('FHEE__EED_Events_Archive__template_include__events_list_active', '__return_true');
 				// load functions.php file for the theme (loaded by WP if using child theme)
 				EEH_Template::load_espresso_theme_functions();
 				// because we don't know if the theme is using the_excerpt()
-				add_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_details' ), 100, 1 );
+				add_filter('the_excerpt', array('EED_Events_Archive', 'event_details'), 100, 1);
 				// or the_content
-				add_filter( 'the_content', array( 'EED_Events_Archive', 'event_details' ), 100, 1 );
+				add_filter('the_content', array('EED_Events_Archive', 'event_details'), 100, 1);
 				// and just in case they are running get_the_excerpt() which DESTROYS things
-				add_filter( 'get_the_excerpt', array( 'EED_Events_Archive', 'get_the_excerpt' ), 1, 1 );
+				add_filter('get_the_excerpt', array('EED_Events_Archive', 'get_the_excerpt'), 1, 1);
 				// don't display entry meta because the existing theme will take care of that
-				add_filter( 'FHEE__content_espresso_events_details_template__display_entry_meta', '__return_false' );
+				add_filter('FHEE__content_espresso_events_details_template__display_entry_meta', '__return_false');
 			}
 		}
 		return $template;
@@ -240,17 +240,17 @@ 
 	 * 	@param		string 	$excerpt
 	 * 	@return 		string
 	 */
-	public static function get_the_excerpt( $excerpt = '' ) {
-		if ( post_password_required() ) {
+	public static function get_the_excerpt($excerpt = '') {
+		if (post_password_required()) {
 			return $excerpt;
 		}
-		if ( apply_filters( 'FHEE__EED_Events_Archive__get_the_excerpt__theme_uses_get_the_excerpt', false ) ) {
-			remove_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_details' ), 100 );
-			remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_details' ), 100 );
-			$excerpt = EED_Events_Archive::event_details( $excerpt );
+		if (apply_filters('FHEE__EED_Events_Archive__get_the_excerpt__theme_uses_get_the_excerpt', false)) {
+			remove_filter('the_excerpt', array('EED_Events_Archive', 'event_details'), 100);
+			remove_filter('the_content', array('EED_Events_Archive', 'event_details'), 100);
+			$excerpt = EED_Events_Archive::event_details($excerpt);
 		} else {
 			EED_Events_Archive::$using_get_the_excerpt = true;
-			add_filter( 'wp_trim_excerpt', array( 'EED_Events_Archive', 'end_get_the_excerpt' ), 999, 1 );
+			add_filter('wp_trim_excerpt', array('EED_Events_Archive', 'end_get_the_excerpt'), 999, 1);
 		}
 		return $excerpt;
 	}
@@ -264,7 +264,7 @@ 
 	 * @param  string $text
 	 * @return string
 	 */
-	public static function end_get_the_excerpt( $text = '' ) {
+	public static function end_get_the_excerpt($text = '') {
 		EED_Events_Archive::$using_get_the_excerpt = false;
 		return $text;
 	}
@@ -279,10 +279,10 @@ 
 	 * @param 		string 		$id
 	 * @return 		string
 	 */
-	public static function the_title( $title = '', $id = '' ) {
+	public static function the_title($title = '', $id = '') {
 	global $post;
-	if ( $post instanceof WP_Post ) {
-		return in_the_loop() && $post->ID == $id ? espresso_event_status_banner( $post->ID  ) . $title :  $title;
+	if ($post instanceof WP_Post) {
+		return in_the_loop() && $post->ID == $id ? espresso_event_status_banner($post->ID).$title : $title;
 	}
 	return $title;
 }
@@ -296,7 +296,7 @@ 
 	 * 	@param		string 	$content
 	 * 	@return 		string
 	 */
-	public static function event_details( $content ) {
+	public static function event_details($content) {
 		global $post;
 		static $current_post_ID = 0;
 		if (
@@ -305,8 +305,8 @@ 
 			&& ! EED_Events_Archive::$using_get_the_excerpt
 			&& ! post_password_required()
 			&& (
-				apply_filters( 'FHEE__EES_Espresso_Events__process_shortcode__true', false )
-				|| ! apply_filters( 'FHEE__content_espresso_events__template_loaded', false )
+				apply_filters('FHEE__EES_Espresso_Events__process_shortcode__true', false)
+				|| ! apply_filters('FHEE__content_espresso_events__template_loaded', false)
 			)
 		) {
 			// Set current post ID to prevent showing content twice, but only if headers have definitely been sent.
@@ -315,8 +315,8 @@ 
 			// We want to allow those plugins to still do their thing and have access to our content, but depending on
 			// how your event content is being displayed (shortcode, CPT route, etc), this filter can get applied twice,
 			// so the following allows this filter to be applied multiple times, but only once for real
-			$current_post_ID = did_action( 'loop_start' ) ? $post->ID : 0;
-			if ( EE_Registry::instance()->CFG->template_settings->EED_Events_Archive->use_sortable_display_order ) {
+			$current_post_ID = did_action('loop_start') ? $post->ID : 0;
+			if (EE_Registry::instance()->CFG->template_settings->EED_Events_Archive->use_sortable_display_order) {
 				$content = \EED_Events_Archive::use_sortable_display_order();
 			} else {
 				$content = \EED_Events_Archive::use_filterable_display_order();
@@ -335,20 +335,20 @@ 
 	 */
 	protected static function use_sortable_display_order() {
 		// no further password checks required atm
-		add_filter( 'FHEE__EED_Events_Archive__event_details__no_post_password_required', '__return_true' );
+		add_filter('FHEE__EED_Events_Archive__event_details__no_post_password_required', '__return_true');
 		// we need to first remove this callback from being applied to the_content() or the_excerpt() (otherwise it will recurse and blow up the interweb)
-		remove_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_details' ), 100 );
-		remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_details' ), 100 );
-		remove_filter( 'get_the_excerpt', array( 'EED_Events_Archive', 'get_the_excerpt' ), 1 );
+		remove_filter('the_excerpt', array('EED_Events_Archive', 'event_details'), 100);
+		remove_filter('the_content', array('EED_Events_Archive', 'event_details'), 100);
+		remove_filter('get_the_excerpt', array('EED_Events_Archive', 'get_the_excerpt'), 1);
 		// now add additional content depending on whether event is using the_excerpt() or the_content()
 		EED_Events_Archive::instance()->template_parts = EED_Events_Archive::instance()->initialize_template_parts();
-		$content = EEH_Template::locate_template( 'content-espresso_events-details.php' );
-		$content = EED_Events_Archive::instance()->template_parts->apply_template_part_filters( $content );
+		$content = EEH_Template::locate_template('content-espresso_events-details.php');
+		$content = EED_Events_Archive::instance()->template_parts->apply_template_part_filters($content);
 		// re-add our main filters (or else the next event won't have them)
-		add_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_details' ), 100, 1 );
-		add_filter( 'the_content', array( 'EED_Events_Archive', 'event_details' ), 100, 1 );
-		add_filter( 'get_the_excerpt', array( 'EED_Events_Archive', 'get_the_excerpt' ), 1, 1 );
-		remove_filter( 'FHEE__EED_Events_Archive__event_details__no_post_password_required', '__return_true' );
+		add_filter('the_excerpt', array('EED_Events_Archive', 'event_details'), 100, 1);
+		add_filter('the_content', array('EED_Events_Archive', 'event_details'), 100, 1);
+		add_filter('get_the_excerpt', array('EED_Events_Archive', 'get_the_excerpt'), 1, 1);
+		remove_filter('FHEE__EED_Events_Archive__event_details__no_post_password_required', '__return_true');
 		return $content;
 	}
 
@@ -363,22 +363,22 @@ 
 	protected static function use_filterable_display_order() {
 		// we need to first remove this callback from being applied to the_content()
 		// (otherwise it will recurse and blow up the interweb)
-		remove_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_details' ), 100 );
-		remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_details' ), 100 );
-		remove_filter( 'get_the_excerpt', array( 'EED_Events_Archive', 'get_the_excerpt' ), 1 );
+		remove_filter('the_excerpt', array('EED_Events_Archive', 'event_details'), 100);
+		remove_filter('the_content', array('EED_Events_Archive', 'event_details'), 100);
+		remove_filter('get_the_excerpt', array('EED_Events_Archive', 'get_the_excerpt'), 1);
 		//now add additional content depending on whether event is using the_excerpt() or the_content()
 		EED_Events_Archive::_add_additional_excerpt_filters();
 		EED_Events_Archive::_add_additional_content_filters();
-		do_action( 'AHEE__EED_Events_Archive__use_filterable_display_order__after_add_filters' );
+		do_action('AHEE__EED_Events_Archive__use_filterable_display_order__after_add_filters');
 		// now load our template
-		$content = EEH_Template::locate_template( 'content-espresso_events-details.php' );
+		$content = EEH_Template::locate_template('content-espresso_events-details.php');
 		// re-add our main filters (or else the next event won't have them)
-		add_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_details' ), 100, 1 );
-		add_filter( 'the_content', array( 'EED_Events_Archive', 'event_details' ), 100, 1 );
-		add_filter( 'get_the_excerpt', array( 'EED_Events_Archive', 'get_the_excerpt' ), 1, 1 );
+		add_filter('the_excerpt', array('EED_Events_Archive', 'event_details'), 100, 1);
+		add_filter('the_content', array('EED_Events_Archive', 'event_details'), 100, 1);
+		add_filter('get_the_excerpt', array('EED_Events_Archive', 'get_the_excerpt'), 1, 1);
 		// but remove the other filters so that they don't get applied to the next post
 		EED_Events_Archive::_remove_additional_events_archive_filters();
-		do_action( 'AHEE__EED_Events_Archive__use_filterable_display_order__after_remove_filters' );
+		do_action('AHEE__EED_Events_Archive__use_filterable_display_order__after_remove_filters');
 		// we're not returning the $content directly because the template we are loading uses the_content (or the_excerpt)
 		//return ! empty( $template ) ? $template : $content;
 		return $content;
@@ -393,11 +393,11 @@ 
 	 * 	@param		string 	$content
 	 *  	@return 		string
 	 */
-	public static function event_datetimes( $content ) {
-		if ( post_password_required() ) {
+	public static function event_datetimes($content) {
+		if (post_password_required()) {
 			return $content;
 		}
-		return EEH_Template::locate_template( 'content-espresso_events-datetimes.php' ) . $content;
+		return EEH_Template::locate_template('content-espresso_events-datetimes.php').$content;
 	}
 
 	/**
@@ -407,11 +407,11 @@ 
 	 * 	@param		string 	$content
 	 *  	@return 		string
 	 */
-	public static function event_tickets( $content ) {
-		if ( post_password_required() ) {
+	public static function event_tickets($content) {
+		if (post_password_required()) {
 			return $content;
 		}
-		return EEH_Template::locate_template( 'content-espresso_events-tickets.php' ) . $content;
+		return EEH_Template::locate_template('content-espresso_events-tickets.php').$content;
 	}
 
 
@@ -423,8 +423,8 @@ 
 	 * @param    string $content
 	 * @return    string
 	 */
-	public static function event_venue( $content ) {
-		return EED_Events_Archive::event_venues( $content );
+	public static function event_venue($content) {
+		return EED_Events_Archive::event_venues($content);
 	}
 
 	/**
@@ -434,11 +434,11 @@ 
 	 * 	@param		string 	$content
 	 *  	@return 		string
 	 */
-	public static function event_venues( $content ) {
-		if ( post_password_required() ) {
+	public static function event_venues($content) {
+		if (post_password_required()) {
 			return $content;
 		}
-		return $content . EEH_Template::locate_template( 'content-espresso_events-venues.php' );
+		return $content.EEH_Template::locate_template('content-espresso_events-venues.php');
 	}
 
 
@@ -450,9 +450,9 @@ 
 	 * @return        void
 	 */
 	private static function _add_additional_excerpt_filters() {
-		add_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_datetimes' ), 110, 1 );
-		add_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_tickets' ), 120, 1 );
-		add_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_venues' ), 130, 1 );
+		add_filter('the_excerpt', array('EED_Events_Archive', 'event_datetimes'), 110, 1);
+		add_filter('the_excerpt', array('EED_Events_Archive', 'event_tickets'), 120, 1);
+		add_filter('the_excerpt', array('EED_Events_Archive', 'event_venues'), 130, 1);
 	}
 
 
@@ -464,9 +464,9 @@ 
 	 * @return        void
 	 */
 	private static function _add_additional_content_filters() {
-		add_filter( 'the_content', array( 'EED_Events_Archive', 'event_datetimes' ), 110, 1 );
-		add_filter( 'the_content', array( 'EED_Events_Archive', 'event_tickets' ), 120, 1 );
-		add_filter( 'the_content', array( 'EED_Events_Archive', 'event_venues' ), 130, 1 );
+		add_filter('the_content', array('EED_Events_Archive', 'event_datetimes'), 110, 1);
+		add_filter('the_content', array('EED_Events_Archive', 'event_tickets'), 120, 1);
+		add_filter('the_content', array('EED_Events_Archive', 'event_venues'), 130, 1);
 	}
 
 
@@ -478,12 +478,12 @@ 
 	 * @return        void
 	 */
 	private static function _remove_additional_events_archive_filters() {
-		remove_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_datetimes' ), 110 );
-		remove_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_tickets' ), 120 );
-		remove_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_venues' ), 130 );
-		remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_datetimes' ), 110 );
-		remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_tickets' ), 120 );
-		remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_venues' ), 130 );
+		remove_filter('the_excerpt', array('EED_Events_Archive', 'event_datetimes'), 110);
+		remove_filter('the_excerpt', array('EED_Events_Archive', 'event_tickets'), 120);
+		remove_filter('the_excerpt', array('EED_Events_Archive', 'event_venues'), 130);
+		remove_filter('the_content', array('EED_Events_Archive', 'event_datetimes'), 110);
+		remove_filter('the_content', array('EED_Events_Archive', 'event_tickets'), 120);
+		remove_filter('the_content', array('EED_Events_Archive', 'event_venues'), 130);
 	}
 
 
@@ -496,17 +496,17 @@ 
 	 */
 	public static function remove_all_events_archive_filters() {
 		//remove_filter( 'get_the_excerpt', array( 'EED_Events_Archive', 'get_the_excerpt' ), 1 );
-		remove_filter( 'the_title', array( 'EED_Events_Archive', 'the_title' ), 100 );
-		remove_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_details' ), 100 );
-		remove_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_datetimes' ), 110 );
-		remove_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_tickets' ), 120 );
-		remove_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_venues' ), 130 );
-		remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_details' ), 100 );
-		remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_datetimes' ), 110 );
-		remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_tickets' ), 120 );
-		remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_venues' ), 130 );
+		remove_filter('the_title', array('EED_Events_Archive', 'the_title'), 100);
+		remove_filter('the_excerpt', array('EED_Events_Archive', 'event_details'), 100);
+		remove_filter('the_excerpt', array('EED_Events_Archive', 'event_datetimes'), 110);
+		remove_filter('the_excerpt', array('EED_Events_Archive', 'event_tickets'), 120);
+		remove_filter('the_excerpt', array('EED_Events_Archive', 'event_venues'), 130);
+		remove_filter('the_content', array('EED_Events_Archive', 'event_details'), 100);
+		remove_filter('the_content', array('EED_Events_Archive', 'event_datetimes'), 110);
+		remove_filter('the_content', array('EED_Events_Archive', 'event_tickets'), 120);
+		remove_filter('the_content', array('EED_Events_Archive', 'event_venues'), 130);
 		// don't display entry meta because the existing theme will take care of that
-		remove_filter( 'FHEE__content_espresso_events_details_template__display_entry_meta', '__return_false' );
+		remove_filter('FHEE__content_espresso_events_details_template__display_entry_meta', '__return_false');
 	}
 
 
@@ -521,15 +521,15 @@ 
 	 *  @return 	void
 	 */
 	public function load_event_list_assets() {
-		do_action( 'AHEE__EED_Events_Archive__before_load_assets' );
-		add_filter( 'FHEE_load_EE_Session', '__return_true' );
-		add_filter( 'FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', '__return_true' );
-		add_action('wp_enqueue_scripts', array( $this, 'wp_enqueue_scripts' ), 10 );
-		if ( EE_Registry::instance()->CFG->map_settings->use_google_maps ) {
-			EE_Registry::instance()->load_helper( 'Maps' );
-			add_action('wp_enqueue_scripts', array( 'EEH_Maps', 'espresso_google_map_js' ), 11 );
+		do_action('AHEE__EED_Events_Archive__before_load_assets');
+		add_filter('FHEE_load_EE_Session', '__return_true');
+		add_filter('FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', '__return_true');
+		add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 10);
+		if (EE_Registry::instance()->CFG->map_settings->use_google_maps) {
+			EE_Registry::instance()->load_helper('Maps');
+			add_action('wp_enqueue_scripts', array('EEH_Maps', 'espresso_google_map_js'), 11);
 		}
-		EE_Registry::instance()->load_helper( 'Event_View' );
+		EE_Registry::instance()->load_helper('Event_View');
 	}
 
 
@@ -545,14 +545,14 @@ 
 	 */
 	public function wp_enqueue_scripts() {
 		// get some style
-		if ( apply_filters( 'FHEE_enable_default_espresso_css', FALSE ) ) {
+		if (apply_filters('FHEE_enable_default_espresso_css', FALSE)) {
 			// first check uploads folder
-			EE_Registry::instance()->load_helper( 'File' );
-			if ( EEH_File::is_readable( get_stylesheet_directory() . $this->theme . DS . 'style.css' )) {
-				wp_register_style( $this->theme, get_stylesheet_directory_uri() . $this->theme . DS . 'style.css', array( 'dashicons', 'espresso_default' ));
+			EE_Registry::instance()->load_helper('File');
+			if (EEH_File::is_readable(get_stylesheet_directory().$this->theme.DS.'style.css')) {
+				wp_register_style($this->theme, get_stylesheet_directory_uri().$this->theme.DS.'style.css', array('dashicons', 'espresso_default'));
 			} else {
 		}
-		wp_enqueue_style( $this->theme );
+		wp_enqueue_style($this->theme);
 
 	}
 }
@@ -570,8 +570,8 @@ 
 	 */
 	public static function template_settings_form() {
 	$template_settings = EE_Registry::instance()->CFG->template_settings;
-	$template_settings->EED_Events_Archive = isset( $template_settings->EED_Events_Archive ) ? $template_settings->EED_Events_Archive : new EE_Events_Archive_Config();
-	$template_settings->EED_Events_Archive = apply_filters( 'FHEE__EED_Events_Archive__template_settings_form__event_list_config', $template_settings->EED_Events_Archive );
+	$template_settings->EED_Events_Archive = isset($template_settings->EED_Events_Archive) ? $template_settings->EED_Events_Archive : new EE_Events_Archive_Config();
+	$template_settings->EED_Events_Archive = apply_filters('FHEE__EED_Events_Archive__template_settings_form__event_list_config', $template_settings->EED_Events_Archive);
 	$events_archive_settings = array(
 		'display_status_banner' => 0,
 		'display_description' => 1,
@@ -580,8 +580,8 @@ 
 		'display_venue' => 0,
 		'display_expired_events' => 0
 	);
-	$events_archive_settings = array_merge( $events_archive_settings, (array)$template_settings->EED_Events_Archive );
-	EEH_Template::display_template( EVENTS_ARCHIVE_TEMPLATES_PATH . 'admin-event-list-settings.template.php', $events_archive_settings );
+	$events_archive_settings = array_merge($events_archive_settings, (array) $template_settings->EED_Events_Archive);
+	EEH_Template::display_template(EVENTS_ARCHIVE_TEMPLATES_PATH.'admin-event-list-settings.template.php', $events_archive_settings);
 }
 
 
@@ -597,16 +597,16 @@ 
 	 *  @param 	EE_Request_Handler $REQ
 	 *  @return 	EE_Template_Config
 	 */
-	public static function update_template_settings( $CFG, $REQ ) {
+	public static function update_template_settings($CFG, $REQ) {
 		$CFG->EED_Events_Archive = new EE_Events_Archive_Config();
 		// unless we are resetting the config...
-		if ( ! isset( $REQ['EED_Events_Archive_reset_event_list_settings'] ) || absint( $REQ['EED_Events_Archive_reset_event_list_settings'] ) !== 1 ) {
-			$CFG->EED_Events_Archive->display_status_banner = isset( $REQ['EED_Events_Archive_display_status_banner'] ) ? absint( $REQ['EED_Events_Archive_display_status_banner'] ) : 0;
-			$CFG->EED_Events_Archive->display_description = isset( $REQ['EED_Events_Archive_display_description'] ) ? absint( $REQ['EED_Events_Archive_display_description'] ) : 1;
-			$CFG->EED_Events_Archive->display_ticket_selector = isset( $REQ['EED_Events_Archive_display_ticket_selector'] ) ? absint( $REQ['EED_Events_Archive_display_ticket_selector'] ) : 0;
-			$CFG->EED_Events_Archive->display_datetimes = isset( $REQ['EED_Events_Archive_display_datetimes'] ) ? absint( $REQ['EED_Events_Archive_display_datetimes'] ) : 1;
-			$CFG->EED_Events_Archive->display_venue = isset( $REQ['EED_Events_Archive_display_venue'] ) ? absint( $REQ['EED_Events_Archive_display_venue'] ) : 0;
-			$CFG->EED_Events_Archive->display_expired_events = isset( $REQ['EED_Events_Archive_display_expired_events'] ) ? absint( $REQ['EED_Events_Archive_display_expired_events'] ) : 0;			}
+		if ( ! isset($REQ['EED_Events_Archive_reset_event_list_settings']) || absint($REQ['EED_Events_Archive_reset_event_list_settings']) !== 1) {
+			$CFG->EED_Events_Archive->display_status_banner = isset($REQ['EED_Events_Archive_display_status_banner']) ? absint($REQ['EED_Events_Archive_display_status_banner']) : 0;
+			$CFG->EED_Events_Archive->display_description = isset($REQ['EED_Events_Archive_display_description']) ? absint($REQ['EED_Events_Archive_display_description']) : 1;
+			$CFG->EED_Events_Archive->display_ticket_selector = isset($REQ['EED_Events_Archive_display_ticket_selector']) ? absint($REQ['EED_Events_Archive_display_ticket_selector']) : 0;
+			$CFG->EED_Events_Archive->display_datetimes = isset($REQ['EED_Events_Archive_display_datetimes']) ? absint($REQ['EED_Events_Archive_display_datetimes']) : 1;
+			$CFG->EED_Events_Archive->display_venue = isset($REQ['EED_Events_Archive_display_venue']) ? absint($REQ['EED_Events_Archive_display_venue']) : 0;
+			$CFG->EED_Events_Archive->display_expired_events = isset($REQ['EED_Events_Archive_display_expired_events']) ? absint($REQ['EED_Events_Archive_display_expired_events']) : 0; }
 		return $CFG;
 	}
 
@@ -619,10 +619,10 @@ 
 	 * @param string $extra_class
 	 * @return    string
 	 */
-	public static function event_list_css( $extra_class = '' ) {
-		$event_list_css = ! empty( $extra_class ) ? array( $extra_class ) : array();
+	public static function event_list_css($extra_class = '') {
+		$event_list_css = ! empty($extra_class) ? array($extra_class) : array();
 		$event_list_css[] = 'espresso-event-list-event';
-		return implode( ' ', $event_list_css );
+		return implode(' ', $event_list_css);
 	}
 
 
@@ -649,9 +649,9 @@ 
 	 * @param $value
 	 * @return    bool
 	 */
-	public static function display_description( $value ) {
+	public static function display_description($value) {
 		$config = EE_Registry::instance()->CFG->template_settings->EED_Events_Archive;
-		$display_description= isset( $config->display_description ) ? $config->display_description : 1;
+		$display_description = isset($config->display_description) ? $config->display_description : 1;
 		return $display_description === $value ? TRUE : FALSE;
 	}
 
@@ -664,7 +664,7 @@ 
 	 */
 	public static function display_ticket_selector() {
 		$config = EE_Registry::instance()->CFG->template_settings->EED_Events_Archive;
-		return isset( $config->display_ticket_selector ) && $config->display_ticket_selector ? TRUE : FALSE;
+		return isset($config->display_ticket_selector) && $config->display_ticket_selector ? TRUE : FALSE;
 	}
 
 
@@ -676,9 +676,9 @@ 
 	 *  @return 	bool
 	 */
 	public static function display_venue() {
-		EE_Registry::instance()->load_helper( 'Venue_View' );
+		EE_Registry::instance()->load_helper('Venue_View');
 		$config = EE_Registry::instance()->CFG->template_settings->EED_Events_Archive;
-		return isset( $config->display_venue ) && $config->display_venue && EEH_Venue_View::venue_name() ? TRUE : FALSE;
+		return isset($config->display_venue) && $config->display_venue && EEH_Venue_View::venue_name() ? TRUE : FALSE;
 	}
 
 
@@ -690,7 +690,7 @@ 
 	 */
 	public static function display_datetimes() {
 		$config = EE_Registry::instance()->CFG->template_settings->EED_Events_Archive;
-		return isset( $config->display_datetimes ) && $config->display_datetimes ? TRUE : FALSE;
+		return isset($config->display_datetimes) && $config->display_datetimes ? TRUE : FALSE;
 }
 
 
@@ -705,7 +705,7 @@ 
 	 *  @return 	string
 	 */
 	public static function event_list_title() {
-		return apply_filters( 'FHEE__archive_espresso_events_template__upcoming_events_h1', __( 'Upcoming Events', 'event_espresso' ));
+		return apply_filters('FHEE__archive_espresso_events_template__upcoming_events_h1', __('Upcoming Events', 'event_espresso'));
 	}
 
 
@@ -714,11 +714,11 @@ 
 	/**
 	 * 	@since 4.4.0
 	 */
-	public static function _doing_it_wrong_notice( $function = '' ) {
+	public static function _doing_it_wrong_notice($function = '') {
 		EE_Error::doing_it_wrong(
 			__FUNCTION__,
 			sprintf(
-				__( 'EED_Events_Archive::%1$s was moved to EEH_Event_Query::%1$s:%2$sPlease update your existing code because the method it calls will be removed in version %3$s', 'event_espresso' ),
+				__('EED_Events_Archive::%1$s was moved to EEH_Event_Query::%1$s:%2$sPlease update your existing code because the method it calls will be removed in version %3$s', 'event_espresso'),
 				$function,
 				'<br />',
 				'4.6.0'
@@ -734,107 +734,107 @@ 
 	 * 	@since 4.4.0
 	 */
 	public function get_post_data() {
-		EE_Registry::instance()->load_helper( 'Event_Query' );
+		EE_Registry::instance()->load_helper('Event_Query');
 		EEH_Event_Query::set_query_params();
 	}
 	/**
 	 * 	@deprecated
 	 * 	@since 4.4.0
 	 */
-	public function posts_fields( $SQL, WP_Query $wp_query ) {
-		EE_Registry::instance()->load_helper( 'Event_Query' );
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
-		return EEH_Event_Query::posts_fields( $SQL, $wp_query );
+	public function posts_fields($SQL, WP_Query $wp_query) {
+		EE_Registry::instance()->load_helper('Event_Query');
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
+		return EEH_Event_Query::posts_fields($SQL, $wp_query);
 	}
 	/**
 	 * 	@deprecated
 	 * 	@since 4.4.0
 	 */
-	public static function posts_fields_sql_for_orderby( $orderby_params = array() ) {
-		EE_Registry::instance()->load_helper( 'Event_Query' );
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
-		return EEH_Event_Query::posts_fields_sql_for_orderby( $orderby_params );
+	public static function posts_fields_sql_for_orderby($orderby_params = array()) {
+		EE_Registry::instance()->load_helper('Event_Query');
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
+		return EEH_Event_Query::posts_fields_sql_for_orderby($orderby_params);
 	}
 	/**
 	 * 	@deprecated
 	 * 	@since 4.4.0
 	 */
-	public function posts_join( $SQL, WP_Query $wp_query ) {
-		EE_Registry::instance()->load_helper( 'Event_Query' );
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
-		return EEH_Event_Query::posts_join( $SQL, $wp_query );
+	public function posts_join($SQL, WP_Query $wp_query) {
+		EE_Registry::instance()->load_helper('Event_Query');
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
+		return EEH_Event_Query::posts_join($SQL, $wp_query);
 	}
 	/**
 	 * 	@deprecated
 	 * 	@since 4.4.0
 	 */
-	public static function posts_join_sql_for_terms( $join_terms = NULL ) {
-		EE_Registry::instance()->load_helper( 'Event_Query' );
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
-		return EEH_Event_Query::posts_join_sql_for_terms( $join_terms );
+	public static function posts_join_sql_for_terms($join_terms = NULL) {
+		EE_Registry::instance()->load_helper('Event_Query');
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
+		return EEH_Event_Query::posts_join_sql_for_terms($join_terms);
 	}
 	/**
 	 * 	@deprecated
 	 * 	@since 4.4.0
 	 */
-	public static function posts_join_for_orderby( $orderby_params = array() ) {
-		EE_Registry::instance()->load_helper( 'Event_Query' );
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
-		return EEH_Event_Query::posts_join_for_orderby( $orderby_params );
+	public static function posts_join_for_orderby($orderby_params = array()) {
+		EE_Registry::instance()->load_helper('Event_Query');
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
+		return EEH_Event_Query::posts_join_for_orderby($orderby_params);
 	}
 	/**
 	 * 	@deprecated
 	 * 	@since 4.4.0
 	 */
-	public function posts_where( $SQL, WP_Query $wp_query ) {
-		EE_Registry::instance()->load_helper( 'Event_Query' );
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
-		return EEH_Event_Query::posts_where( $SQL, $wp_query );
+	public function posts_where($SQL, WP_Query $wp_query) {
+		EE_Registry::instance()->load_helper('Event_Query');
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
+		return EEH_Event_Query::posts_where($SQL, $wp_query);
 	}
 	/**
 	 * 	@deprecated
 	 * 	@since 4.4.0
 	 */
-	public static function posts_where_sql_for_show_expired( $show_expired = FALSE ) {
-		EE_Registry::instance()->load_helper( 'Event_Query' );
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
-		return EEH_Event_Query::posts_where_sql_for_show_expired( $show_expired );
+	public static function posts_where_sql_for_show_expired($show_expired = FALSE) {
+		EE_Registry::instance()->load_helper('Event_Query');
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
+		return EEH_Event_Query::posts_where_sql_for_show_expired($show_expired);
 	}
 	/**
 	 * 	@deprecated
 	 * 	@since 4.4.0
 	 */
-	public static function posts_where_sql_for_event_category_slug( $event_category_slug = NULL ) {
-		EE_Registry::instance()->load_helper( 'Event_Query' );
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
-		return EEH_Event_Query::posts_where_sql_for_event_category_slug( $event_category_slug );
+	public static function posts_where_sql_for_event_category_slug($event_category_slug = NULL) {
+		EE_Registry::instance()->load_helper('Event_Query');
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
+		return EEH_Event_Query::posts_where_sql_for_event_category_slug($event_category_slug);
 	}
 	/**
 	 * 	@deprecated
 	 * 	@since 4.4.0
 	 */
-	public static function posts_where_sql_for_event_list_month( $month = NULL ) {
-		EE_Registry::instance()->load_helper( 'Event_Query' );
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
-		return EEH_Event_Query::posts_where_sql_for_event_list_month( $month );
+	public static function posts_where_sql_for_event_list_month($month = NULL) {
+		EE_Registry::instance()->load_helper('Event_Query');
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
+		return EEH_Event_Query::posts_where_sql_for_event_list_month($month);
 	}
 	/**
 	 * 	@deprecated
 	 * 	@since 4.4.0
 	 */
-	public function posts_orderby( $SQL, WP_Query $wp_query ) {
-		EE_Registry::instance()->load_helper( 'Event_Query' );
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
-		return EEH_Event_Query::posts_orderby( $SQL, $wp_query );
+	public function posts_orderby($SQL, WP_Query $wp_query) {
+		EE_Registry::instance()->load_helper('Event_Query');
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
+		return EEH_Event_Query::posts_orderby($SQL, $wp_query);
 	}
 	/**
 	 * 	@deprecated
 	 * 	@since 4.4.0
 	 */
-	public static function posts_orderby_sql( $orderby_params = array(), $sort = 'ASC' ) {
-		EE_Registry::instance()->load_helper( 'Event_Query' );
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
-		return EEH_Event_Query::posts_orderby_sql( $orderby_params, $sort );
+	public static function posts_orderby_sql($orderby_params = array(), $sort = 'ASC') {
+		EE_Registry::instance()->load_helper('Event_Query');
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
+		return EEH_Event_Query::posts_orderby_sql($orderby_params, $sort);
 	}
 
 
@@ -865,8 +865,8 @@ 
  * @param string $extra_class
  * @return string
  */
-function espresso_event_list_css( $extra_class = '' ) {
-	return EED_Events_Archive::event_list_css( $extra_class );
+function espresso_event_list_css($extra_class = '') {
+	return EED_Events_Archive::event_list_css($extra_class);
 }
 
 /**
@@ -880,14 +880,14 @@ 
  * @return bool
  */
 function espresso_display_full_description_in_event_list() {
-	return EED_Events_Archive::display_description( 2 );
+	return EED_Events_Archive::display_description(2);
 }
 
 /**
  * @return bool
  */
 function espresso_display_excerpt_in_event_list() {
-	return EED_Events_Archive::display_description( 1 );
+	return EED_Events_Archive::display_description(1);
 }
 
 /**

shortcodes/espresso_checkout/EES_Espresso_Checkout.shortcode.php

Spacing +6 added lines, -6 removed lines

@@ -51,17 +51,17 @@ 
 	 * @param WP $WP
 	 * @return    void
 	 */
-	public function run( WP $WP ) {
-		if ( did_action( 'pre_get_posts' ) && did_action( 'send_headers' ) ) {
+	public function run(WP $WP) {
+		if (did_action('pre_get_posts') && did_action('send_headers')) {
 			global $wp_query;
 			EED_Single_Page_Checkout::load_reg_steps();
-			EED_Single_Page_Checkout::init( $wp_query );
+			EED_Single_Page_Checkout::init($wp_query);
 		} else {
 			// hook into the top of pre_get_posts to set the reg step routing, which gives other modules or plugins a chance to modify the reg steps, but just before the routes get called
-			add_action( 'pre_get_posts', array( 'EED_Single_Page_Checkout', 'load_reg_steps' ), 1 );
+			add_action('pre_get_posts', array('EED_Single_Page_Checkout', 'load_reg_steps'), 1);
 			// this will trigger the EED_Single_Page_Checkout module's run() method during the pre_get_posts hook point,
 			// this allows us to initialize things, enqueue assets, etc,
-			add_action( 'pre_get_posts', array( 'EED_Single_Page_Checkout', 'init' ), 10, 1 );
+			add_action('pre_get_posts', array('EED_Single_Page_Checkout', 'init'), 10, 1);
 		}
 	}
 
@@ -74,7 +74,7 @@ 
 	 *  @param		array 	$attributes
 	 *  @return 	string
 	 */
-	public function process_shortcode( $attributes = array() ) {
+	public function process_shortcode($attributes = array()) {
 		return EE_Registry::instance()->REQ->get_output();
 	}
 

shortcodes/espresso_ticket_selector/EES_Espresso_Ticket_Selector.shortcode.php

Spacing +8 added lines, -8 removed lines

@@ -50,7 +50,7 @@ 
 	 * @access    public
 	 * @param \WP $WP
 	 */
-	public function run( WP $WP ) {
+	public function run(WP $WP) {
 	}
 
 	/**
@@ -60,14 +60,14 @@ 
 	 *  @param		array 	$attributes
 	 *  @return 	string
 	 */
-	public function process_shortcode( $attributes = array() ) {
-		extract( $attributes );
-		$event_id = isset( $event_id ) ? $event_id : 0;
-		$event = EE_Registry::instance()->load_model( 'Event' )->get_one_by_ID( $event_id );
+	public function process_shortcode($attributes = array()) {
+		extract($attributes);
+		$event_id = isset($event_id) ? $event_id : 0;
+		$event = EE_Registry::instance()->load_model('Event')->get_one_by_ID($event_id);
 		ob_start();
-		do_action( 'AHEE_event_details_before_post', $event_id );
-		espresso_ticket_selector( $event );
-		do_action( 'AHEE_event_details_after_post' );
+		do_action('AHEE_event_details_before_post', $event_id);
+		espresso_ticket_selector($event);
+		do_action('AHEE_event_details_after_post');
 		return ob_get_clean();
 	}