eventespresso / event-espresso-core

public/Espresso_Arabica_2014/content-espresso_events-header.php

Spacing +2 added lines, -2 removed lines

@@ -5,9 +5,9 @@
 ?>
 <header class="event-header">
 	<?php echo "<{$tag}  id=\"event-details-{$tag}-{$post->ID}\" class=\"entry-title\">"; ?>
-		<a class="ee-event-header-lnk" href="<?php the_permalink(); ?>"<?php echo \EED_Events_Archive::link_target();?>>
+		<a class="ee-event-header-lnk" href="<?php the_permalink(); ?>"<?php echo \EED_Events_Archive::link_target(); ?>>
             <?php the_title(); ?>
         </a>
 	<?php echo "</{$tag}"; ?>
-	<?php if ( ! is_archive() && has_excerpt( $post->ID )): the_excerpt(); endif;?>
+	<?php if ( ! is_archive() && has_excerpt($post->ID)): the_excerpt(); endif; ?>
 </header>

core/db_classes/EE_Ticket.class.php

Doc Comments +2 added lines, -1 removed lines

@@ -128,7 +128,8 @@
      *
      * @param bool        $display   true = we'll return a localized string, otherwise we just return the value of the relevant status const
      * @param bool | null $remaining if it is already known that tickets are available, then simply pass a bool to save further processing
-     * @return mixed status int if the display string isn't requested
+     * @param boolean $remaining
+     * @return string status int if the display string isn't requested
      * @throws \EE_Error
      */
 	public function ticket_status( $display = FALSE, $remaining = null ) {

Indentation +566 added lines, -566 removed lines

@@ -61,15 +61,15 @@ 
 
 
 
-    /**
-     * @param array  $props_n_values          incoming values
-     * @param string $timezone                incoming timezone (if not set the timezone set for the website will be
-     *                                        used.)
-     * @param array  $date_formats            incoming date_formats in an array where the first value is the
-     *                                        date_format and the second value is the time format
-     * @return EE_Ticket
-     * @throws \EE_Error
-     */
+	/**
+	 * @param array  $props_n_values          incoming values
+	 * @param string $timezone                incoming timezone (if not set the timezone set for the website will be
+	 *                                        used.)
+	 * @param array  $date_formats            incoming date_formats in an array where the first value is the
+	 *                                        date_format and the second value is the time format
+	 * @return EE_Ticket
+	 * @throws \EE_Error
+	 */
 	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
 		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone, $date_formats );
 		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
@@ -77,36 +77,36 @@ 
 
 
 
-    /**
-     * @param array  $props_n_values  incoming values from the database
-     * @param string $timezone        incoming timezone as set by the model.  If not set the timezone for
-     *                                the website will be used.
-     * @return EE_Ticket
-     * @throws \EE_Error
-     */
+	/**
+	 * @param array  $props_n_values  incoming values from the database
+	 * @param string $timezone        incoming timezone as set by the model.  If not set the timezone for
+	 *                                the website will be used.
+	 * @return EE_Ticket
+	 * @throws \EE_Error
+	 */
 	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
 		return new self( $props_n_values, TRUE, $timezone );
 	}
 
 
 
-    /**
-     * @return bool
-     * @throws \EE_Error
-     */
+	/**
+	 * @return bool
+	 * @throws \EE_Error
+	 */
 	public function parent() {
 		return $this->get( 'TKT_parent' );
 	}
 
 
 
-    /**
-     * return if a ticket has quantities available for purchase
-     *
-     * @param  int $DTT_ID the primary key for a particular datetime
-     * @return boolean
-     * @throws \EE_Error
-     */
+	/**
+	 * return if a ticket has quantities available for purchase
+	 *
+	 * @param  int $DTT_ID the primary key for a particular datetime
+	 * @return boolean
+	 * @throws \EE_Error
+	 */
 	public function available( $DTT_ID = 0 ) {
 		// are we checking availability for a particular datetime ?
 		if ( $DTT_ID ) {
@@ -123,14 +123,14 @@ 
 
 
 
-    /**
-     * Using the start date and end date this method calculates whether the ticket is On Sale, Pending, or Expired
-     *
-     * @param bool        $display   true = we'll return a localized string, otherwise we just return the value of the relevant status const
-     * @param bool | null $remaining if it is already known that tickets are available, then simply pass a bool to save further processing
-     * @return mixed status int if the display string isn't requested
-     * @throws \EE_Error
-     */
+	/**
+	 * Using the start date and end date this method calculates whether the ticket is On Sale, Pending, or Expired
+	 *
+	 * @param bool        $display   true = we'll return a localized string, otherwise we just return the value of the relevant status const
+	 * @param bool | null $remaining if it is already known that tickets are available, then simply pass a bool to save further processing
+	 * @return mixed status int if the display string isn't requested
+	 * @throws \EE_Error
+	 */
 	public function ticket_status( $display = FALSE, $remaining = null ) {
 		$remaining = is_bool( $remaining ) ? $remaining : $this->is_remaining();
 		if ( ! $remaining ) {
@@ -153,14 +153,14 @@ 
 
 
 
-    /**
-     * The purpose of this method is to simply return a boolean for whether there are any tickets remaining for sale considering ALL the factors used for figuring that out.
-     *
-     * @access public
-     * @param  int $DTT_ID if an int above 0 is included here then we get a specific dtt.
-     * @return boolean         true = tickets remaining, false not.
-     * @throws \EE_Error
-     */
+	/**
+	 * The purpose of this method is to simply return a boolean for whether there are any tickets remaining for sale considering ALL the factors used for figuring that out.
+	 *
+	 * @access public
+	 * @param  int $DTT_ID if an int above 0 is included here then we get a specific dtt.
+	 * @return boolean         true = tickets remaining, false not.
+	 * @throws \EE_Error
+	 */
 	public function is_remaining( $DTT_ID = 0 ) {
 		$num_remaining = $this->remaining( $DTT_ID );
 		if ( $num_remaining === 0 ) {
@@ -174,76 +174,76 @@ 
 
 
 
-    /**
-     * return the total number of tickets available for purchase
-     *
-     * @param  int $DTT_ID the primary key for a particular datetime.
-     *                     set to 0 for all related datetimes
-     * @return int
-     * @throws \EE_Error
-     */
+	/**
+	 * return the total number of tickets available for purchase
+	 *
+	 * @param  int $DTT_ID the primary key for a particular datetime.
+	 *                     set to 0 for all related datetimes
+	 * @return int
+	 * @throws \EE_Error
+	 */
 	public function remaining( $DTT_ID = 0 ) {
 		return $this->real_quantity_on_ticket('saleable', $DTT_ID );
 	}
 
 
 
-    /**
-     * Gets min
-     *
-     * @return int
-     * @throws \EE_Error
-     */
+	/**
+	 * Gets min
+	 *
+	 * @return int
+	 * @throws \EE_Error
+	 */
 	public function min() {
 		return $this->get( 'TKT_min' );
 	}
 
 
 
-    /**
-     * return if a ticket is no longer available cause its available dates have expired.
-     *
-     * @return boolean
-     * @throws \EE_Error
-     */
+	/**
+	 * return if a ticket is no longer available cause its available dates have expired.
+	 *
+	 * @return boolean
+	 * @throws \EE_Error
+	 */
 	public function is_expired() {
 		return ( $this->get_raw( 'TKT_end_date' ) < time() );
 	}
 
 
 
-    /**
-     * Return if a ticket is yet to go on sale or not
-     *
-     * @return boolean
-     * @throws \EE_Error
-     */
+	/**
+	 * Return if a ticket is yet to go on sale or not
+	 *
+	 * @return boolean
+	 * @throws \EE_Error
+	 */
 	public function is_pending() {
 		return ( $this->get_raw( 'TKT_start_date' ) > time() );
 	}
 
 
 
-    /**
-     * Return if a ticket is on sale or not
-     *
-     * @return boolean
-     * @throws \EE_Error
-     */
+	/**
+	 * Return if a ticket is on sale or not
+	 *
+	 * @return boolean
+	 * @throws \EE_Error
+	 */
 	public function is_on_sale() {
 		return ( $this->get_raw( 'TKT_start_date' ) < time() && $this->get_raw( 'TKT_end_date' ) > time() );
 	}
 
 
 
-    /**
-     * This returns the chronologically last datetime that this ticket is associated with
-     *
-     * @param string $dt_frmt
-     * @param string $conjunction - conjunction junction what's your function ? this string joins the start date with the end date ie: Jan 01 "to" Dec 31
-     * @return string
-     * @throws \EE_Error
-     */
+	/**
+	 * This returns the chronologically last datetime that this ticket is associated with
+	 *
+	 * @param string $dt_frmt
+	 * @param string $conjunction - conjunction junction what's your function ? this string joins the start date with the end date ie: Jan 01 "to" Dec 31
+	 * @return string
+	 * @throws \EE_Error
+	 */
 	public function date_range( $dt_frmt = '', $conjunction = ' - ' ) {
 		$first_date = $this->first_datetime() instanceof EE_Datetime ? $this->first_datetime()->start_date( $dt_frmt ) : '';
 		$last_date = $this->last_datetime() instanceof EE_Datetime ? $this->last_datetime()->end_date( $dt_frmt ) : '';
@@ -253,12 +253,12 @@ 
 
 
 
-    /**
-     * This returns the chronologically first datetime that this ticket is associated with
-     *
-     * @return EE_Datetime
-     * @throws \EE_Error
-     */
+	/**
+	 * This returns the chronologically first datetime that this ticket is associated with
+	 *
+	 * @return EE_Datetime
+	 * @throws \EE_Error
+	 */
 	public function first_datetime() {
 		$datetimes = $this->datetimes( array( 'limit' => 1 ) );
 		return reset( $datetimes );
@@ -266,14 +266,14 @@ 
 
 
 
-    /**
-     * Gets all the datetimes this ticket can be used for attending.
-     * Unless otherwise specified, orders datetimes by start date.
-     *
-     * @param array $query_params see EEM_Base::get_all()
-     * @return EE_Datetime[]|EE_Base_Class[]
-     * @throws \EE_Error
-     */
+	/**
+	 * Gets all the datetimes this ticket can be used for attending.
+	 * Unless otherwise specified, orders datetimes by start date.
+	 *
+	 * @param array $query_params see EEM_Base::get_all()
+	 * @return EE_Datetime[]|EE_Base_Class[]
+	 * @throws \EE_Error
+	 */
 	public function datetimes( $query_params = array() ) {
 		if ( ! isset( $query_params[ 'order_by' ] ) ) {
 			$query_params[ 'order_by' ][ 'DTT_order' ] = 'ASC';
@@ -283,12 +283,12 @@ 
 
 
 
-    /**
-     * This returns the chronologically last datetime that this ticket is associated with
-     *
-     * @return EE_Datetime
-     * @throws \EE_Error
-     */
+	/**
+	 * This returns the chronologically last datetime that this ticket is associated with
+	 *
+	 * @return EE_Datetime
+	 * @throws \EE_Error
+	 */
 	public function last_datetime() {
 		$datetimes = $this->datetimes( array( 'limit' => 1, 'order_by' => array( 'DTT_EVT_start' => 'DESC' ) ) );
 		return end( $datetimes );
@@ -296,19 +296,19 @@ 
 
 
 
-    /**
-     * This returns the total tickets sold depending on the given parameters.
-     *
-     * @param  string $what   Can be one of two options: 'ticket', 'datetime'.
-     *                        'ticket' = total ticket sales for all datetimes this ticket is related to
-     *                        'datetime' = total ticket sales for a specified datetime (required $dtt_id)
-     *                        'datetime' = total ticket sales in the datetime_ticket table.
-     *                        If $dtt_id is not given then we return an array of sales indexed by datetime.
-     *                        If $dtt_id IS given then we return the tickets sold for that given datetime.
-     * @param  int    $dtt_id [optional] include the dtt_id with $what = 'datetime'.
-     * @return mixed (array|int)          how many tickets have sold
-     * @throws \EE_Error
-     */
+	/**
+	 * This returns the total tickets sold depending on the given parameters.
+	 *
+	 * @param  string $what   Can be one of two options: 'ticket', 'datetime'.
+	 *                        'ticket' = total ticket sales for all datetimes this ticket is related to
+	 *                        'datetime' = total ticket sales for a specified datetime (required $dtt_id)
+	 *                        'datetime' = total ticket sales in the datetime_ticket table.
+	 *                        If $dtt_id is not given then we return an array of sales indexed by datetime.
+	 *                        If $dtt_id IS given then we return the tickets sold for that given datetime.
+	 * @param  int    $dtt_id [optional] include the dtt_id with $what = 'datetime'.
+	 * @return mixed (array|int)          how many tickets have sold
+	 * @throws \EE_Error
+	 */
 	public function tickets_sold( $what = 'ticket', $dtt_id = NULL ) {
 		$total = 0;
 		$tickets_sold = $this->_all_tickets_sold();
@@ -333,12 +333,12 @@ 
 
 
 
-    /**
-     * This returns an array indexed by datetime_id for tickets sold with this ticket.
-     *
-     * @return EE_Ticket[]
-     * @throws \EE_Error
-     */
+	/**
+	 * This returns an array indexed by datetime_id for tickets sold with this ticket.
+	 *
+	 * @return EE_Ticket[]
+	 * @throws \EE_Error
+	 */
 	protected function _all_tickets_sold() {
 		$datetimes = $this->get_many_related( 'Datetime' );
 		$tickets_sold = array();
@@ -354,29 +354,29 @@ 
 
 
 
-    /**
-     * This returns the base price object for the ticket.
-     *
-     * @param  bool $return_array whether to return as an array indexed by price id or just the object.
-     * @return EE_Price|EE_Base_Class|EE_Price[]|EE_Base_Class[]
-     * @throws \EE_Error
-     */
+	/**
+	 * This returns the base price object for the ticket.
+	 *
+	 * @param  bool $return_array whether to return as an array indexed by price id or just the object.
+	 * @return EE_Price|EE_Base_Class|EE_Price[]|EE_Base_Class[]
+	 * @throws \EE_Error
+	 */
 	public function base_price( $return_array = FALSE ) {
 		$_where = array( 'Price_Type.PBT_ID' => EEM_Price_Type::base_type_base_price );
 		return $return_array
-            ? $this->get_many_related( 'Price', array( $_where ) )
-            : $this->get_first_related( 'Price', array( $_where ) );
+			? $this->get_many_related( 'Price', array( $_where ) )
+			: $this->get_first_related( 'Price', array( $_where ) );
 	}
 
 
 
-    /**
-     * This returns ONLY the price modifiers for the ticket (i.e. no taxes or base price)
-     *
-     * @access public
-     * @return EE_Price[]
-     * @throws \EE_Error
-     */
+	/**
+	 * This returns ONLY the price modifiers for the ticket (i.e. no taxes or base price)
+	 *
+	 * @access public
+	 * @return EE_Price[]
+	 * @throws \EE_Error
+	 */
 	public function price_modifiers() {
 		$query_params = array( 0 => array( 'Price_Type.PBT_ID' => array( 'NOT IN', array( EEM_Price_Type::base_type_base_price, EEM_Price_Type::base_type_tax ) ) ) );
 		return $this->prices( $query_params );
@@ -384,132 +384,132 @@ 
 
 
 
-    /**
-     * Gets all the prices that combine to form the final price of this ticket
-     *
-     * @param array $query_params like EEM_Base::get_all
-     * @return EE_Price[]|EE_Base_Class[]
-     * @throws \EE_Error
-     */
+	/**
+	 * Gets all the prices that combine to form the final price of this ticket
+	 *
+	 * @param array $query_params like EEM_Base::get_all
+	 * @return EE_Price[]|EE_Base_Class[]
+	 * @throws \EE_Error
+	 */
 	public function prices( $query_params = array() ) {
 		return $this->get_many_related( 'Price', $query_params );
 	}
 
 
 
-    /**
-     * Gets all the ticket applicabilities (ie, relations between datetimes and tickets)
-     *
-     * @param array $query_params see EEM_Base::get_all()
-     * @return EE_Datetime_Ticket|EE_Base_Class[]
-     * @throws \EE_Error
-     */
+	/**
+	 * Gets all the ticket applicabilities (ie, relations between datetimes and tickets)
+	 *
+	 * @param array $query_params see EEM_Base::get_all()
+	 * @return EE_Datetime_Ticket|EE_Base_Class[]
+	 * @throws \EE_Error
+	 */
 	public function datetime_tickets( $query_params = array() ) {
 		return $this->get_many_related( 'Datetime_Ticket', $query_params );
 	}
 
 
 
-    /**
-     * Gets all the datetimes from the db ordered by DTT_order
-     *
-     * @param boolean $show_expired
-     * @param boolean $show_deleted
-     * @return EE_Datetime[]
-     * @throws \EE_Error
-     */
+	/**
+	 * Gets all the datetimes from the db ordered by DTT_order
+	 *
+	 * @param boolean $show_expired
+	 * @param boolean $show_deleted
+	 * @return EE_Datetime[]
+	 * @throws \EE_Error
+	 */
 	public function datetimes_ordered( $show_expired = TRUE, $show_deleted = FALSE ) {
 		return EEM_Datetime::instance( $this->_timezone )->get_datetimes_for_ticket_ordered_by_DTT_order( $this->ID(), $show_expired, $show_deleted );
 	}
 
 
 
-    /**
-     * Gets ID
-     *
-     * @return string
-     * @throws \EE_Error
-     */
+	/**
+	 * Gets ID
+	 *
+	 * @return string
+	 * @throws \EE_Error
+	 */
 	public function ID() {
 		return $this->get( 'TKT_ID' );
 	}
 
 
 
-    /**
-     * get the author of the ticket.
-     *
-     * @since 4.5.0
-     * @return int
-     * @throws \EE_Error
-     */
+	/**
+	 * get the author of the ticket.
+	 *
+	 * @since 4.5.0
+	 * @return int
+	 * @throws \EE_Error
+	 */
 	public function wp_user() {
 		return $this->get('TKT_wp_user');
 	}
 
 
 
-    /**
-     * Gets the template for the ticket
-     *
-     * @return EE_Ticket_Template|EE_Base_Class
-     * @throws \EE_Error
-     */
+	/**
+	 * Gets the template for the ticket
+	 *
+	 * @return EE_Ticket_Template|EE_Base_Class
+	 * @throws \EE_Error
+	 */
 	public function template() {
 		return $this->get_first_related( 'Ticket_Template' );
 	}
 
 
 
-    /**
-     * Simply returns an array of EE_Price objects that are taxes.
-     *
-     * @return EE_Price[]
-     * @throws \EE_Error
-     */
+	/**
+	 * Simply returns an array of EE_Price objects that are taxes.
+	 *
+	 * @return EE_Price[]
+	 * @throws \EE_Error
+	 */
 	public function get_ticket_taxes_for_admin() {
 		return EE_Taxes::get_taxes_for_admin();
 	}
 
 
 
-    /**
-     * @return float
-     * @throws \EE_Error
-     */
+	/**
+	 * @return float
+	 * @throws \EE_Error
+	 */
 	public function ticket_price() {
 		return $this->get( 'TKT_price' );
 	}
 
 
 
-    /**
-     * @return mixed
-     * @throws \EE_Error
-     */
+	/**
+	 * @return mixed
+	 * @throws \EE_Error
+	 */
 	public function pretty_price() {
 		return $this->get_pretty( 'TKT_price' );
 	}
 
 
 
-    /**
-     * @return bool
-     * @throws \EE_Error
-     */
+	/**
+	 * @return bool
+	 * @throws \EE_Error
+	 */
 	public function is_free() {
 		return $this->get_ticket_total_with_taxes() === 0;
 	}
 
 
 
-    /**
-     * get_ticket_total_with_taxes
-     *
-     * @param bool $no_cache
-     * @return float
-     * @throws \EE_Error
-     */
+	/**
+	 * get_ticket_total_with_taxes
+	 *
+	 * @param bool $no_cache
+	 * @return float
+	 * @throws \EE_Error
+	 */
 	public function get_ticket_total_with_taxes( $no_cache = FALSE ) {
 		if ($this->_ticket_total_with_taxes === null || $no_cache ) {
 			$this->_ticket_total_with_taxes = $this->get_ticket_subtotal() + $this->get_ticket_taxes_total_for_admin();
@@ -526,201 +526,201 @@ 
 
 
 
-    /**
-     * @return float
-     * @throws \EE_Error
-     */
+	/**
+	 * @return float
+	 * @throws \EE_Error
+	 */
 	public function get_ticket_subtotal() {
 		return EE_Taxes::get_subtotal_for_admin( $this );
 	}
 
 
 
-    /**
-     * Returns the total taxes applied to this ticket
-     *
-     * @return float
-     * @throws \EE_Error
-     */
+	/**
+	 * Returns the total taxes applied to this ticket
+	 *
+	 * @return float
+	 * @throws \EE_Error
+	 */
 	public function get_ticket_taxes_total_for_admin() {
 		return EE_Taxes::get_total_taxes_for_admin( $this );
 	}
 
 
 
-    /**
-     * Sets name
-     *
-     * @param string $name
-     * @throws \EE_Error
-     */
+	/**
+	 * Sets name
+	 *
+	 * @param string $name
+	 * @throws \EE_Error
+	 */
 	public function set_name( $name ) {
 		$this->set( 'TKT_name', $name );
 	}
 
 
 
-    /**
-     * Gets description
-     *
-     * @return string
-     * @throws \EE_Error
-     */
+	/**
+	 * Gets description
+	 *
+	 * @return string
+	 * @throws \EE_Error
+	 */
 	public function description() {
 		return $this->get( 'TKT_description' );
 	}
 
 
 
-    /**
-     * Sets description
-     *
-     * @param string $description
-     * @throws \EE_Error
-     */
+	/**
+	 * Sets description
+	 *
+	 * @param string $description
+	 * @throws \EE_Error
+	 */
 	public function set_description( $description ) {
 		$this->set( 'TKT_description', $description );
 	}
 
 
 
-    /**
-     * Gets start_date
-     *
-     * @param string $dt_frmt
-     * @param string $tm_frmt
-     * @return string
-     * @throws \EE_Error
-     */
+	/**
+	 * Gets start_date
+	 *
+	 * @param string $dt_frmt
+	 * @param string $tm_frmt
+	 * @return string
+	 * @throws \EE_Error
+	 */
 	public function start_date( $dt_frmt = '', $tm_frmt = '' ) {
 		return $this->_get_datetime( 'TKT_start_date', $dt_frmt, $tm_frmt );
 	}
 
 
 
-    /**
-     * Sets start_date
-     *
-     * @param string $start_date
-     * @return void
-     * @throws \EE_Error
-     */
+	/**
+	 * Sets start_date
+	 *
+	 * @param string $start_date
+	 * @return void
+	 * @throws \EE_Error
+	 */
 	public function set_start_date( $start_date ) {
 		$this->_set_date_time( 'B', $start_date, 'TKT_start_date' );
 	}
 
 
 
-    /**
-     * Gets end_date
-     *
-     * @param string $dt_frmt
-     * @param string $tm_frmt
-     * @return string
-     * @throws \EE_Error
-     */
+	/**
+	 * Gets end_date
+	 *
+	 * @param string $dt_frmt
+	 * @param string $tm_frmt
+	 * @return string
+	 * @throws \EE_Error
+	 */
 	public function end_date( $dt_frmt = '', $tm_frmt = '' ) {
 		return $this->_get_datetime( 'TKT_end_date', $dt_frmt, $tm_frmt );
 	}
 
 
 
-    /**
-     * Sets end_date
-     *
-     * @param string $end_date
-     * @return void
-     * @throws \EE_Error
-     */
+	/**
+	 * Sets end_date
+	 *
+	 * @param string $end_date
+	 * @return void
+	 * @throws \EE_Error
+	 */
 	public function set_end_date( $end_date ) {
 		$this->_set_date_time( 'B', $end_date, 'TKT_end_date' );
 	}
 
 
 
-    /**
-     * Sets sell until time
-     *
-     * @since 4.5.0
-     * @param string $time a string representation of the sell until time (ex 9am or 7:30pm)
-     * @throws \EE_Error
-     */
+	/**
+	 * Sets sell until time
+	 *
+	 * @since 4.5.0
+	 * @param string $time a string representation of the sell until time (ex 9am or 7:30pm)
+	 * @throws \EE_Error
+	 */
 	public function set_end_time( $time ) {
 		$this->_set_time_for( $time, 'TKT_end_date' );
 	}
 
 
 
-    /**
-     * Sets min
-     *
-     * @param int $min
-     * @return void
-     * @throws \EE_Error
-     */
+	/**
+	 * Sets min
+	 *
+	 * @param int $min
+	 * @return void
+	 * @throws \EE_Error
+	 */
 	public function set_min( $min ) {
 		$this->set( 'TKT_min', $min );
 	}
 
 
 
-    /**
-     * Gets max
-     *
-     * @return int
-     * @throws \EE_Error
-     */
+	/**
+	 * Gets max
+	 *
+	 * @return int
+	 * @throws \EE_Error
+	 */
 	public function max() {
 		return $this->get( 'TKT_max' );
 	}
 
 
 
-    /**
-     * Sets max
-     *
-     * @param int $max
-     * @return void
-     * @throws \EE_Error
-     */
+	/**
+	 * Sets max
+	 *
+	 * @param int $max
+	 * @return void
+	 * @throws \EE_Error
+	 */
 	public function set_max( $max ) {
 		$this->set( 'TKT_max', $max );
 	}
 
 
 
-    /**
-     * Sets price
-     *
-     * @param float $price
-     * @return void
-     * @throws \EE_Error
-     */
+	/**
+	 * Sets price
+	 *
+	 * @param float $price
+	 * @return void
+	 * @throws \EE_Error
+	 */
 	public function set_price( $price ) {
 		$this->set( 'TKT_price', $price );
 	}
 
 
 
-    /**
-     * Gets sold
-     *
-     * @return int
-     * @throws \EE_Error
-     */
+	/**
+	 * Gets sold
+	 *
+	 * @return int
+	 * @throws \EE_Error
+	 */
 	public function sold() {
 		return $this->get_raw( 'TKT_sold' );
 	}
 
 
 
-    /**
-     * Sets sold
-     *
-     * @param int $sold
-     * @return void
-     * @throws \EE_Error
-     */
+	/**
+	 * Sets sold
+	 *
+	 * @param int $sold
+	 * @return void
+	 * @throws \EE_Error
+	 */
 	public function set_sold( $sold ) {
 		// sold can not go below zero
 		$sold = max( 0, $sold );
@@ -729,13 +729,13 @@ 
 
 
 
-    /**
-     * increments sold by amount passed by $qty
-     *
-     * @param int $qty
-     * @return void
-     * @throws \EE_Error
-     */
+	/**
+	 * increments sold by amount passed by $qty
+	 *
+	 * @param int $qty
+	 * @return void
+	 * @throws \EE_Error
+	 */
 	public function increase_sold( $qty = 1 ) {
 		$sold = $this->sold() + $qty;
 		// remove ticket reservation, but don't adjust datetime reservations,  because that will happen
@@ -747,13 +747,13 @@ 
 
 
 
-    /**
-     * Increases sold on related datetimes
-     *
-     * @param int $qty
-     * @return void
-     * @throws \EE_Error
-     */
+	/**
+	 * Increases sold on related datetimes
+	 *
+	 * @param int $qty
+	 * @return void
+	 * @throws \EE_Error
+	 */
 	protected function _increase_sold_for_datetimes( $qty = 1 ) {
 		$datetimes = $this->datetimes();
 		if ( is_array( $datetimes ) ) {
@@ -768,13 +768,13 @@ 
 
 
 
-    /**
-     * decrements (subtracts) sold by amount passed by $qty
-     *
-     * @param int $qty
-     * @return void
-     * @throws \EE_Error
-     */
+	/**
+	 * decrements (subtracts) sold by amount passed by $qty
+	 *
+	 * @param int $qty
+	 * @return void
+	 * @throws \EE_Error
+	 */
 	public function decrease_sold( $qty = 1 ) {
 		$sold = $this->sold() - $qty;
 		$this->_decrease_sold_for_datetimes( $qty );
@@ -783,13 +783,13 @@ 
 
 
 
-    /**
-     * Decreases sold on related datetimes
-     *
-     * @param int $qty
-     * @return void
-     * @throws \EE_Error
-     */
+	/**
+	 * Decreases sold on related datetimes
+	 *
+	 * @param int $qty
+	 * @return void
+	 * @throws \EE_Error
+	 */
 	protected function _decrease_sold_for_datetimes( $qty = 1 ) {
 		$datetimes = $this->datetimes();
 		if ( is_array( $datetimes ) ) {
@@ -804,25 +804,25 @@ 
 
 
 
-    /**
-     * Gets qty of reserved tickets
-     *
-     * @return int
-     * @throws \EE_Error
-     */
+	/**
+	 * Gets qty of reserved tickets
+	 *
+	 * @return int
+	 * @throws \EE_Error
+	 */
 	public function reserved() {
 		return $this->get_raw( 'TKT_reserved' );
 	}
 
 
 
-    /**
-     * Sets reserved
-     *
-     * @param int $reserved
-     * @return void
-     * @throws \EE_Error
-     */
+	/**
+	 * Sets reserved
+	 *
+	 * @param int $reserved
+	 * @return void
+	 * @throws \EE_Error
+	 */
 	public function set_reserved( $reserved ) {
 		// reserved can not go below zero
 		$reserved = max( 0, (int) $reserved );
@@ -831,13 +831,13 @@ 
 
 
 
-    /**
-     * increments reserved by amount passed by $qty
-     *
-     * @param int $qty
-     * @return void
-     * @throws \EE_Error
-     */
+	/**
+	 * increments reserved by amount passed by $qty
+	 *
+	 * @param int $qty
+	 * @return void
+	 * @throws \EE_Error
+	 */
 	public function increase_reserved( $qty = 1 ) {
 		$qty = absint( $qty );
 		$reserved = $this->reserved() + $qty;
@@ -847,13 +847,13 @@ 
 
 
 
-    /**
-     * Increases sold on related datetimes
-     *
-     * @param int $qty
-     * @return void
-     * @throws \EE_Error
-     */
+	/**
+	 * Increases sold on related datetimes
+	 *
+	 * @param int $qty
+	 * @return void
+	 * @throws \EE_Error
+	 */
 	protected function _increase_reserved_for_datetimes( $qty = 1 ) {
 		$datetimes = $this->datetimes();
 		if ( is_array( $datetimes ) ) {
@@ -868,14 +868,14 @@ 
 
 
 
-    /**
-     * decrements (subtracts) reserved by amount passed by $qty
-     *
-     * @param int  $qty
-     * @param bool $adjust_datetimes
-     * @return void
-     * @throws \EE_Error
-     */
+	/**
+	 * decrements (subtracts) reserved by amount passed by $qty
+	 *
+	 * @param int  $qty
+	 * @param bool $adjust_datetimes
+	 * @return void
+	 * @throws \EE_Error
+	 */
 	public function decrease_reserved( $qty = 1, $adjust_datetimes = true ) {
 		$reserved = $this->reserved() - absint( $qty );
 		if ( $adjust_datetimes ) {
@@ -886,13 +886,13 @@ 
 
 
 
-    /**
-     * Increases sold on related datetimes
-     *
-     * @param int $qty
-     * @return void
-     * @throws \EE_Error
-     */
+	/**
+	 * Increases sold on related datetimes
+	 *
+	 * @param int $qty
+	 * @return void
+	 * @throws \EE_Error
+	 */
 	protected function _decrease_reserved_for_datetimes( $qty = 1 ) {
 		$datetimes = $this->datetimes();
 		if ( is_array( $datetimes ) ) {
@@ -907,18 +907,18 @@ 
 
 
 
-    /**
-     * Gets ticket quantity
-     *
-     * @param string $context     ticket quantity is somewhat subjective depending on the exact information sought
-     *                            therefore $context can be one of three values: '', 'reg_limit', or 'saleable'
-     *                            '' (default) quantity is the actual db value for TKT_qty, unaffected by other objects
-     *                            REG LIMIT: caps qty based on DTT_reg_limit for ALL related datetimes
-     *                            SALEABLE: also considers datetime sold and returns zero if ANY DTT is sold out, and
-     *                            is therefore the truest measure of tickets that can be purchased at the moment
-     * @return int
-     * @throws \EE_Error
-     */
+	/**
+	 * Gets ticket quantity
+	 *
+	 * @param string $context     ticket quantity is somewhat subjective depending on the exact information sought
+	 *                            therefore $context can be one of three values: '', 'reg_limit', or 'saleable'
+	 *                            '' (default) quantity is the actual db value for TKT_qty, unaffected by other objects
+	 *                            REG LIMIT: caps qty based on DTT_reg_limit for ALL related datetimes
+	 *                            SALEABLE: also considers datetime sold and returns zero if ANY DTT is sold out, and
+	 *                            is therefore the truest measure of tickets that can be purchased at the moment
+	 * @return int
+	 * @throws \EE_Error
+	 */
 	public function qty( $context = '' ) {
 		switch ( $context ) {
 			case 'reg_limit' :
@@ -932,19 +932,19 @@ 
 
 
 
-    /**
-     * Gets ticket quantity
-     *
-     * @param string $context     ticket quantity is somewhat subjective depending on the exact information sought
-     *                            therefore $context can be one of two values: 'reg_limit', or 'saleable'
-     *                            REG LIMIT: caps qty based on DTT_reg_limit for ALL related datetimes
-     *                            SALEABLE: also considers datetime sold and returns zero if ANY DTT is sold out, and
-     *                            is therefore the truest measure of tickets that can be purchased at the moment
-     * @param  int   $DTT_ID      the primary key for a particular datetime.
-     *                            set to 0 for all related datetimes
-     * @return int
-     * @throws \EE_Error
-     */
+	/**
+	 * Gets ticket quantity
+	 *
+	 * @param string $context     ticket quantity is somewhat subjective depending on the exact information sought
+	 *                            therefore $context can be one of two values: 'reg_limit', or 'saleable'
+	 *                            REG LIMIT: caps qty based on DTT_reg_limit for ALL related datetimes
+	 *                            SALEABLE: also considers datetime sold and returns zero if ANY DTT is sold out, and
+	 *                            is therefore the truest measure of tickets that can be purchased at the moment
+	 * @param  int   $DTT_ID      the primary key for a particular datetime.
+	 *                            set to 0 for all related datetimes
+	 * @return int
+	 * @throws \EE_Error
+	 */
 	public function real_quantity_on_ticket( $context = 'reg_limit', $DTT_ID = 0 ) {
 		$raw = $this->get_raw( 'TKT_qty' );
 		// return immediately if it's zero
@@ -1027,212 +1027,212 @@ 
 
 
 
-    /**
-     * Gets uses
-     *
-     * @return int
-     * @throws \EE_Error
-     */
+	/**
+	 * Gets uses
+	 *
+	 * @return int
+	 * @throws \EE_Error
+	 */
 	public function uses() {
 		return $this->get( 'TKT_uses' );
 	}
 
 
 
-    /**
-     * Sets uses
-     *
-     * @param int $uses
-     * @return void
-     * @throws \EE_Error
-     */
+	/**
+	 * Sets uses
+	 *
+	 * @param int $uses
+	 * @return void
+	 * @throws \EE_Error
+	 */
 	public function set_uses( $uses ) {
 		$this->set( 'TKT_uses', $uses );
 	}
 
 
 
-    /**
-     * returns whether ticket is required or not.
-     *
-     * @return boolean
-     * @throws \EE_Error
-     */
+	/**
+	 * returns whether ticket is required or not.
+	 *
+	 * @return boolean
+	 * @throws \EE_Error
+	 */
 	public function required() {
 		return $this->get( 'TKT_required' );
 	}
 
 
 
-    /**
-     * sets the TKT_required property
-     *
-     * @param boolean $required
-     * @return void
-     * @throws \EE_Error
-     */
+	/**
+	 * sets the TKT_required property
+	 *
+	 * @param boolean $required
+	 * @return void
+	 * @throws \EE_Error
+	 */
 	public function set_required( $required ) {
 		$this->set( 'TKT_required', $required );
 	}
 
 
 
-    /**
-     * Gets taxable
-     *
-     * @return boolean
-     * @throws \EE_Error
-     */
+	/**
+	 * Gets taxable
+	 *
+	 * @return boolean
+	 * @throws \EE_Error
+	 */
 	public function taxable() {
 		return $this->get( 'TKT_taxable' );
 	}
 
 
 
-    /**
-     * Sets taxable
-     *
-     * @param boolean $taxable
-     * @return void
-     * @throws \EE_Error
-     */
+	/**
+	 * Sets taxable
+	 *
+	 * @param boolean $taxable
+	 * @return void
+	 * @throws \EE_Error
+	 */
 	public function set_taxable( $taxable ) {
 		$this->set( 'TKT_taxable', $taxable );
 	}
 
 
 
-    /**
-     * Gets is_default
-     *
-     * @return boolean
-     * @throws \EE_Error
-     */
+	/**
+	 * Gets is_default
+	 *
+	 * @return boolean
+	 * @throws \EE_Error
+	 */
 	public function is_default() {
 		return $this->get( 'TKT_is_default' );
 	}
 
 
 
-    /**
-     * Sets is_default
-     *
-     * @param boolean $is_default
-     * @return void
-     * @throws \EE_Error
-     */
+	/**
+	 * Sets is_default
+	 *
+	 * @param boolean $is_default
+	 * @return void
+	 * @throws \EE_Error
+	 */
 	public function set_is_default( $is_default ) {
 		$this->set( 'TKT_is_default', $is_default );
 	}
 
 
 
-    /**
-     * Gets order
-     *
-     * @return int
-     * @throws \EE_Error
-     */
+	/**
+	 * Gets order
+	 *
+	 * @return int
+	 * @throws \EE_Error
+	 */
 	public function order() {
 		return $this->get( 'TKT_order' );
 	}
 
 
 
-    /**
-     * Sets order
-     *
-     * @param int $order
-     * @return void
-     * @throws \EE_Error
-     */
+	/**
+	 * Sets order
+	 *
+	 * @param int $order
+	 * @return void
+	 * @throws \EE_Error
+	 */
 	public function set_order( $order ) {
 		$this->set( 'TKT_order', $order );
 	}
 
 
 
-    /**
-     * Gets row
-     *
-     * @return int
-     * @throws \EE_Error
-     */
+	/**
+	 * Gets row
+	 *
+	 * @return int
+	 * @throws \EE_Error
+	 */
 	public function row() {
 		return $this->get( 'TKT_row' );
 	}
 
 
 
-    /**
-     * Sets row
-     *
-     * @param int $row
-     * @return void
-     * @throws \EE_Error
-     */
+	/**
+	 * Sets row
+	 *
+	 * @param int $row
+	 * @return void
+	 * @throws \EE_Error
+	 */
 	public function set_row( $row ) {
 		$this->set( 'TKT_row', $row );
 	}
 
 
 
-    /**
-     * Gets deleted
-     *
-     * @return boolean
-     * @throws \EE_Error
-     */
+	/**
+	 * Gets deleted
+	 *
+	 * @return boolean
+	 * @throws \EE_Error
+	 */
 	public function deleted() {
 		return $this->get( 'TKT_deleted' );
 	}
 
 
 
-    /**
-     * Sets deleted
-     *
-     * @param boolean $deleted
-     * @return void
-     * @throws \EE_Error
-     */
+	/**
+	 * Sets deleted
+	 *
+	 * @param boolean $deleted
+	 * @return void
+	 * @throws \EE_Error
+	 */
 	public function set_deleted( $deleted ) {
 		$this->set( 'TKT_deleted', $deleted );
 	}
 
 
 
-    /**
-     * Gets parent
-     *
-     * @return int
-     * @throws \EE_Error
-     */
+	/**
+	 * Gets parent
+	 *
+	 * @return int
+	 * @throws \EE_Error
+	 */
 	public function parent_ID() {
 		return $this->get( 'TKT_parent' );
 	}
 
 
 
-    /**
-     * Sets parent
-     *
-     * @param int $parent
-     * @return void
-     * @throws \EE_Error
-     */
+	/**
+	 * Sets parent
+	 *
+	 * @param int $parent
+	 * @return void
+	 * @throws \EE_Error
+	 */
 	public function set_parent_ID( $parent ) {
 		$this->set( 'TKT_parent', $parent );
 	}
 
 
 
-    /**
-     * Gets a string which is handy for showing in gateways etc that describes the ticket.
-     *
-     * @return string
-     * @throws \EE_Error
-     */
+	/**
+	 * Gets a string which is handy for showing in gateways etc that describes the ticket.
+	 *
+	 * @return string
+	 * @throws \EE_Error
+	 */
 	public function name_and_info() {
 		$times = array();
 		foreach ( $this->datetimes() as $datetime ) {
@@ -1243,50 +1243,50 @@ 
 
 
 
-    /**
-     * Gets name
-     *
-     * @return string
-     * @throws \EE_Error
-     */
+	/**
+	 * Gets name
+	 *
+	 * @return string
+	 * @throws \EE_Error
+	 */
 	public function name() {
 		return $this->get( 'TKT_name' );
 	}
 
 
 
-    /**
-     * Gets price
-     *
-     * @return float
-     * @throws \EE_Error
-     */
+	/**
+	 * Gets price
+	 *
+	 * @return float
+	 * @throws \EE_Error
+	 */
 	public function price() {
 		return $this->get( 'TKT_price' );
 	}
 
 
 
-    /**
-     * Gets all the registrations for this ticket
-     *
-     * @param array $query_params like EEM_Base::get_all's
-     * @return EE_Registration[]|EE_Base_Class[]
-     * @throws \EE_Error
-     */
+	/**
+	 * Gets all the registrations for this ticket
+	 *
+	 * @param array $query_params like EEM_Base::get_all's
+	 * @return EE_Registration[]|EE_Base_Class[]
+	 * @throws \EE_Error
+	 */
 	public function registrations( $query_params = array() ) {
 		return $this->get_many_related( 'Registration', $query_params );
 	}
 
 
 
-    /**
-     * Updates the TKT_sold attribute (and saves) based on the number of APPROVED registrations for this ticket.
-     * into account
-     *
-     * @return int
-     * @throws \EE_Error
-     */
+	/**
+	 * Updates the TKT_sold attribute (and saves) based on the number of APPROVED registrations for this ticket.
+	 * into account
+	 *
+	 * @return int
+	 * @throws \EE_Error
+	 */
 	public function update_tickets_sold() {
 		$count_regs_for_this_ticket = $this->count_registrations( array( array( 'STS_ID' => EEM_Registration::status_id_approved, 'REG_deleted' => 0 ) ) );
 		$this->set_sold( $count_regs_for_this_ticket );
@@ -1318,21 +1318,21 @@ 
 
 
 
-    /**
-     * Implementation of the EEI_Event_Relation interface method
-     *
-     * @see EEI_Event_Relation for comments
-     * @return EE_Event
-     * @throws \EE_Error
-     * @throws UnexpectedEntityException
-     */
+	/**
+	 * Implementation of the EEI_Event_Relation interface method
+	 *
+	 * @see EEI_Event_Relation for comments
+	 * @return EE_Event
+	 * @throws \EE_Error
+	 * @throws UnexpectedEntityException
+	 */
 	public function get_related_event() {
 		//get one datetime to use for getting the event
 		$datetime = $this->first_datetime();
 		if ( ! $datetime instanceof \EE_Datetime ) {
 			throw new UnexpectedEntityException(
 				$datetime,
-                'EE_Datetime',
+				'EE_Datetime',
 				sprintf(
 					__( 'The ticket (%s) is not associated with any valid datetimes.', 'event_espresso'),
 					$this->name()
@@ -1343,7 +1343,7 @@ 
 		if ( ! $event instanceof \EE_Event ) {
 			throw new UnexpectedEntityException(
 				$event,
-                'EE_Event',
+				'EE_Event',
 				sprintf(
 					__( 'The ticket (%s) is not associated with a valid event.', 'event_espresso'),
 					$this->name()
@@ -1355,14 +1355,14 @@ 
 
 
 
-    /**
-     * Implementation of the EEI_Event_Relation interface method
-     *
-     * @see EEI_Event_Relation for comments
-     * @return string
-     * @throws UnexpectedEntityException
-     * @throws \EE_Error
-     */
+	/**
+	 * Implementation of the EEI_Event_Relation interface method
+	 *
+	 * @see EEI_Event_Relation for comments
+	 * @return string
+	 * @throws UnexpectedEntityException
+	 * @throws \EE_Error
+	 */
 	public function get_event_name() {
 		$event = $this->get_related_event();
 		return $event instanceof EE_Event ? $event->name() : '';
@@ -1370,14 +1370,14 @@ 
 
 
 
-    /**
-     * Implementation of the EEI_Event_Relation interface method
-     *
-     * @see EEI_Event_Relation for comments
-     * @return int
-     * @throws UnexpectedEntityException
-     * @throws \EE_Error
-     */
+	/**
+	 * Implementation of the EEI_Event_Relation interface method
+	 *
+	 * @see EEI_Event_Relation for comments
+	 * @return int
+	 * @throws UnexpectedEntityException
+	 * @throws \EE_Error
+	 */
 	public function get_event_ID() {
 		$event = $this->get_related_event();
 		return $event instanceof EE_Event ? $event->ID() : 0;

Spacing +205 added lines, -205 removed lines

@@ -1,7 +1,7 @@ 
 <?php use EventEspresso\core\exceptions\UnexpectedEntityException;
 
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -70,9 +70,9 @@ 
      * @return EE_Ticket
      * @throws \EE_Error
      */
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone, $date_formats );
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
 	}
 
 
@@ -84,8 +84,8 @@ 
      * @return EE_Ticket
      * @throws \EE_Error
      */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 
 
@@ -95,7 +95,7 @@ 
      * @throws \EE_Error
      */
 	public function parent() {
-		return $this->get( 'TKT_parent' );
+		return $this->get('TKT_parent');
 	}
 
 
@@ -107,13 +107,13 @@ 
      * @return boolean
      * @throws \EE_Error
      */
-	public function available( $DTT_ID = 0 ) {
+	public function available($DTT_ID = 0) {
 		// are we checking availability for a particular datetime ?
-		if ( $DTT_ID ) {
+		if ($DTT_ID) {
 			// get that datetime object
-			$datetime = $this->get_first_related( 'Datetime', array( array( 'DTT_ID' => $DTT_ID ) ) );
+			$datetime = $this->get_first_related('Datetime', array(array('DTT_ID' => $DTT_ID)));
 			// if  ticket sales for this datetime have exceeded the reg limit...
-			if ( $datetime instanceof EE_Datetime && $datetime->sold_out() ) {
+			if ($datetime instanceof EE_Datetime && $datetime->sold_out()) {
 				return FALSE;
 			}
 		}
@@ -131,22 +131,22 @@ 
      * @return mixed status int if the display string isn't requested
      * @throws \EE_Error
      */
-	public function ticket_status( $display = FALSE, $remaining = null ) {
-		$remaining = is_bool( $remaining ) ? $remaining : $this->is_remaining();
-		if ( ! $remaining ) {
-			return $display ? EEH_Template::pretty_status( EE_Ticket::sold_out, FALSE, 'sentence' ) : EE_Ticket::sold_out;
+	public function ticket_status($display = FALSE, $remaining = null) {
+		$remaining = is_bool($remaining) ? $remaining : $this->is_remaining();
+		if ( ! $remaining) {
+			return $display ? EEH_Template::pretty_status(EE_Ticket::sold_out, FALSE, 'sentence') : EE_Ticket::sold_out;
 		}
-		if ( $this->get( 'TKT_deleted' ) ) {
-			return $display ? EEH_Template::pretty_status( EE_Ticket::archived, FALSE, 'sentence' ) : EE_Ticket::archived;
+		if ($this->get('TKT_deleted')) {
+			return $display ? EEH_Template::pretty_status(EE_Ticket::archived, FALSE, 'sentence') : EE_Ticket::archived;
 		}
-		if ( $this->is_expired() ) {
-			return $display ? EEH_Template::pretty_status( EE_Ticket::expired, FALSE, 'sentence' ) : EE_Ticket::expired;
+		if ($this->is_expired()) {
+			return $display ? EEH_Template::pretty_status(EE_Ticket::expired, FALSE, 'sentence') : EE_Ticket::expired;
 		}
-		if ( $this->is_pending() ) {
-			return $display ? EEH_Template::pretty_status( EE_Ticket::pending, FALSE, 'sentence' ) : EE_Ticket::pending;
+		if ($this->is_pending()) {
+			return $display ? EEH_Template::pretty_status(EE_Ticket::pending, FALSE, 'sentence') : EE_Ticket::pending;
 		}
-		if ( $this->is_on_sale() ) {
-			return $display ? EEH_Template::pretty_status( EE_Ticket::onsale, FALSE, 'sentence' ) : EE_Ticket::onsale;
+		if ($this->is_on_sale()) {
+			return $display ? EEH_Template::pretty_status(EE_Ticket::onsale, FALSE, 'sentence') : EE_Ticket::onsale;
 		}
 		return '';
 	}
@@ -161,12 +161,12 @@ 
      * @return boolean         true = tickets remaining, false not.
      * @throws \EE_Error
      */
-	public function is_remaining( $DTT_ID = 0 ) {
-		$num_remaining = $this->remaining( $DTT_ID );
-		if ( $num_remaining === 0 ) {
+	public function is_remaining($DTT_ID = 0) {
+		$num_remaining = $this->remaining($DTT_ID);
+		if ($num_remaining === 0) {
 			return FALSE;
 		}
-		if ( $num_remaining > 0 && $num_remaining < $this->min() ) {
+		if ($num_remaining > 0 && $num_remaining < $this->min()) {
 			return FALSE;
 		}
 		return TRUE;
@@ -182,8 +182,8 @@ 
      * @return int
      * @throws \EE_Error
      */
-	public function remaining( $DTT_ID = 0 ) {
-		return $this->real_quantity_on_ticket('saleable', $DTT_ID );
+	public function remaining($DTT_ID = 0) {
+		return $this->real_quantity_on_ticket('saleable', $DTT_ID);
 	}
 
 
@@ -195,7 +195,7 @@ 
      * @throws \EE_Error
      */
 	public function min() {
-		return $this->get( 'TKT_min' );
+		return $this->get('TKT_min');
 	}
 
 
@@ -207,7 +207,7 @@ 
      * @throws \EE_Error
      */
 	public function is_expired() {
-		return ( $this->get_raw( 'TKT_end_date' ) < time() );
+		return ($this->get_raw('TKT_end_date') < time());
 	}
 
 
@@ -219,7 +219,7 @@ 
      * @throws \EE_Error
      */
 	public function is_pending() {
-		return ( $this->get_raw( 'TKT_start_date' ) > time() );
+		return ($this->get_raw('TKT_start_date') > time());
 	}
 
 
@@ -231,7 +231,7 @@ 
      * @throws \EE_Error
      */
 	public function is_on_sale() {
-		return ( $this->get_raw( 'TKT_start_date' ) < time() && $this->get_raw( 'TKT_end_date' ) > time() );
+		return ($this->get_raw('TKT_start_date') < time() && $this->get_raw('TKT_end_date') > time());
 	}
 
 
@@ -244,11 +244,11 @@ 
      * @return string
      * @throws \EE_Error
      */
-	public function date_range( $dt_frmt = '', $conjunction = ' - ' ) {
-		$first_date = $this->first_datetime() instanceof EE_Datetime ? $this->first_datetime()->start_date( $dt_frmt ) : '';
-		$last_date = $this->last_datetime() instanceof EE_Datetime ? $this->last_datetime()->end_date( $dt_frmt ) : '';
+	public function date_range($dt_frmt = '', $conjunction = ' - ') {
+		$first_date = $this->first_datetime() instanceof EE_Datetime ? $this->first_datetime()->start_date($dt_frmt) : '';
+		$last_date = $this->last_datetime() instanceof EE_Datetime ? $this->last_datetime()->end_date($dt_frmt) : '';
 
-		return $first_date && $last_date ? $first_date . $conjunction  . $last_date : '';
+		return $first_date && $last_date ? $first_date.$conjunction.$last_date : '';
 	}
 
 
@@ -260,8 +260,8 @@ 
      * @throws \EE_Error
      */
 	public function first_datetime() {
-		$datetimes = $this->datetimes( array( 'limit' => 1 ) );
-		return reset( $datetimes );
+		$datetimes = $this->datetimes(array('limit' => 1));
+		return reset($datetimes);
 	}
 
 
@@ -274,11 +274,11 @@ 
      * @return EE_Datetime[]|EE_Base_Class[]
      * @throws \EE_Error
      */
-	public function datetimes( $query_params = array() ) {
-		if ( ! isset( $query_params[ 'order_by' ] ) ) {
-			$query_params[ 'order_by' ][ 'DTT_order' ] = 'ASC';
+	public function datetimes($query_params = array()) {
+		if ( ! isset($query_params['order_by'])) {
+			$query_params['order_by']['DTT_order'] = 'ASC';
 		}
-		return $this->get_many_related( 'Datetime', $query_params );
+		return $this->get_many_related('Datetime', $query_params);
 	}
 
 
@@ -290,8 +290,8 @@ 
      * @throws \EE_Error
      */
 	public function last_datetime() {
-		$datetimes = $this->datetimes( array( 'limit' => 1, 'order_by' => array( 'DTT_EVT_start' => 'DESC' ) ) );
-		return end( $datetimes );
+		$datetimes = $this->datetimes(array('limit' => 1, 'order_by' => array('DTT_EVT_start' => 'DESC')));
+		return end($datetimes);
 	}
 
 
@@ -309,22 +309,22 @@ 
      * @return mixed (array|int)          how many tickets have sold
      * @throws \EE_Error
      */
-	public function tickets_sold( $what = 'ticket', $dtt_id = NULL ) {
+	public function tickets_sold($what = 'ticket', $dtt_id = NULL) {
 		$total = 0;
 		$tickets_sold = $this->_all_tickets_sold();
-		switch ( $what ) {
+		switch ($what) {
 			case 'ticket' :
-				return $tickets_sold[ 'ticket' ];
+				return $tickets_sold['ticket'];
 				break;
 			case 'datetime' :
-				if ( empty( $tickets_sold[ 'datetime' ] ) ) {
+				if (empty($tickets_sold['datetime'])) {
 					return $total;
 				}
-				if ( ! empty( $dtt_id ) && ! isset( $tickets_sold[ 'datetime' ][ $dtt_id ] ) ) {
-					EE_Error::add_error( __( 'You\'ve requested the amount of tickets sold for a given ticket and datetime, however there are no records for the datetime id you included.  Are you SURE that is a datetime related to this ticket?', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+				if ( ! empty($dtt_id) && ! isset($tickets_sold['datetime'][$dtt_id])) {
+					EE_Error::add_error(__('You\'ve requested the amount of tickets sold for a given ticket and datetime, however there are no records for the datetime id you included.  Are you SURE that is a datetime related to this ticket?', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 					return $total;
 				}
-				return empty( $dtt_id ) ? $tickets_sold[ 'datetime' ] : $tickets_sold[ 'datetime' ][ $dtt_id ];
+				return empty($dtt_id) ? $tickets_sold['datetime'] : $tickets_sold['datetime'][$dtt_id];
 				break;
 			default:
 				return $total;
@@ -340,15 +340,15 @@ 
      * @throws \EE_Error
      */
 	protected function _all_tickets_sold() {
-		$datetimes = $this->get_many_related( 'Datetime' );
+		$datetimes = $this->get_many_related('Datetime');
 		$tickets_sold = array();
-		if ( ! empty( $datetimes ) ) {
-			foreach ( $datetimes as $datetime ) {
-				$tickets_sold[ 'datetime' ][ $datetime->ID() ] = $datetime->get( 'DTT_sold' );
+		if ( ! empty($datetimes)) {
+			foreach ($datetimes as $datetime) {
+				$tickets_sold['datetime'][$datetime->ID()] = $datetime->get('DTT_sold');
 			}
 		}
 		//Tickets sold
-		$tickets_sold[ 'ticket' ] = $this->sold();
+		$tickets_sold['ticket'] = $this->sold();
 		return $tickets_sold;
 	}
 
@@ -361,11 +361,11 @@ 
      * @return EE_Price|EE_Base_Class|EE_Price[]|EE_Base_Class[]
      * @throws \EE_Error
      */
-	public function base_price( $return_array = FALSE ) {
-		$_where = array( 'Price_Type.PBT_ID' => EEM_Price_Type::base_type_base_price );
+	public function base_price($return_array = FALSE) {
+		$_where = array('Price_Type.PBT_ID' => EEM_Price_Type::base_type_base_price);
 		return $return_array
-            ? $this->get_many_related( 'Price', array( $_where ) )
-            : $this->get_first_related( 'Price', array( $_where ) );
+            ? $this->get_many_related('Price', array($_where))
+            : $this->get_first_related('Price', array($_where));
 	}
 
 
@@ -378,8 +378,8 @@ 
      * @throws \EE_Error
      */
 	public function price_modifiers() {
-		$query_params = array( 0 => array( 'Price_Type.PBT_ID' => array( 'NOT IN', array( EEM_Price_Type::base_type_base_price, EEM_Price_Type::base_type_tax ) ) ) );
-		return $this->prices( $query_params );
+		$query_params = array(0 => array('Price_Type.PBT_ID' => array('NOT IN', array(EEM_Price_Type::base_type_base_price, EEM_Price_Type::base_type_tax))));
+		return $this->prices($query_params);
 	}
 
 
@@ -391,8 +391,8 @@ 
      * @return EE_Price[]|EE_Base_Class[]
      * @throws \EE_Error
      */
-	public function prices( $query_params = array() ) {
-		return $this->get_many_related( 'Price', $query_params );
+	public function prices($query_params = array()) {
+		return $this->get_many_related('Price', $query_params);
 	}
 
 
@@ -404,8 +404,8 @@ 
      * @return EE_Datetime_Ticket|EE_Base_Class[]
      * @throws \EE_Error
      */
-	public function datetime_tickets( $query_params = array() ) {
-		return $this->get_many_related( 'Datetime_Ticket', $query_params );
+	public function datetime_tickets($query_params = array()) {
+		return $this->get_many_related('Datetime_Ticket', $query_params);
 	}
 
 
@@ -418,8 +418,8 @@ 
      * @return EE_Datetime[]
      * @throws \EE_Error
      */
-	public function datetimes_ordered( $show_expired = TRUE, $show_deleted = FALSE ) {
-		return EEM_Datetime::instance( $this->_timezone )->get_datetimes_for_ticket_ordered_by_DTT_order( $this->ID(), $show_expired, $show_deleted );
+	public function datetimes_ordered($show_expired = TRUE, $show_deleted = FALSE) {
+		return EEM_Datetime::instance($this->_timezone)->get_datetimes_for_ticket_ordered_by_DTT_order($this->ID(), $show_expired, $show_deleted);
 	}
 
 
@@ -431,7 +431,7 @@ 
      * @throws \EE_Error
      */
 	public function ID() {
-		return $this->get( 'TKT_ID' );
+		return $this->get('TKT_ID');
 	}
 
 
@@ -456,7 +456,7 @@ 
      * @throws \EE_Error
      */
 	public function template() {
-		return $this->get_first_related( 'Ticket_Template' );
+		return $this->get_first_related('Ticket_Template');
 	}
 
 
@@ -478,7 +478,7 @@ 
      * @throws \EE_Error
      */
 	public function ticket_price() {
-		return $this->get( 'TKT_price' );
+		return $this->get('TKT_price');
 	}
 
 
@@ -488,7 +488,7 @@ 
      * @throws \EE_Error
      */
 	public function pretty_price() {
-		return $this->get_pretty( 'TKT_price' );
+		return $this->get_pretty('TKT_price');
 	}
 
 
@@ -510,8 +510,8 @@ 
      * @return float
      * @throws \EE_Error
      */
-	public function get_ticket_total_with_taxes( $no_cache = FALSE ) {
-		if ($this->_ticket_total_with_taxes === null || $no_cache ) {
+	public function get_ticket_total_with_taxes($no_cache = FALSE) {
+		if ($this->_ticket_total_with_taxes === null || $no_cache) {
 			$this->_ticket_total_with_taxes = $this->get_ticket_subtotal() + $this->get_ticket_taxes_total_for_admin();
 		}
 		return (float) $this->_ticket_total_with_taxes;
@@ -520,7 +520,7 @@ 
 
 
 	public function ensure_TKT_Price_correct() {
-		$this->set( 'TKT_price', EE_Taxes::get_subtotal_for_admin( $this ) );
+		$this->set('TKT_price', EE_Taxes::get_subtotal_for_admin($this));
 		$this->save();
 	}
 
@@ -531,7 +531,7 @@ 
      * @throws \EE_Error
      */
 	public function get_ticket_subtotal() {
-		return EE_Taxes::get_subtotal_for_admin( $this );
+		return EE_Taxes::get_subtotal_for_admin($this);
 	}
 
 
@@ -543,7 +543,7 @@ 
      * @throws \EE_Error
      */
 	public function get_ticket_taxes_total_for_admin() {
-		return EE_Taxes::get_total_taxes_for_admin( $this );
+		return EE_Taxes::get_total_taxes_for_admin($this);
 	}
 
 
@@ -554,8 +554,8 @@ 
      * @param string $name
      * @throws \EE_Error
      */
-	public function set_name( $name ) {
-		$this->set( 'TKT_name', $name );
+	public function set_name($name) {
+		$this->set('TKT_name', $name);
 	}
 
 
@@ -567,7 +567,7 @@ 
      * @throws \EE_Error
      */
 	public function description() {
-		return $this->get( 'TKT_description' );
+		return $this->get('TKT_description');
 	}
 
 
@@ -578,8 +578,8 @@ 
      * @param string $description
      * @throws \EE_Error
      */
-	public function set_description( $description ) {
-		$this->set( 'TKT_description', $description );
+	public function set_description($description) {
+		$this->set('TKT_description', $description);
 	}
 
 
@@ -592,8 +592,8 @@ 
      * @return string
      * @throws \EE_Error
      */
-	public function start_date( $dt_frmt = '', $tm_frmt = '' ) {
-		return $this->_get_datetime( 'TKT_start_date', $dt_frmt, $tm_frmt );
+	public function start_date($dt_frmt = '', $tm_frmt = '') {
+		return $this->_get_datetime('TKT_start_date', $dt_frmt, $tm_frmt);
 	}
 
 
@@ -605,8 +605,8 @@ 
      * @return void
      * @throws \EE_Error
      */
-	public function set_start_date( $start_date ) {
-		$this->_set_date_time( 'B', $start_date, 'TKT_start_date' );
+	public function set_start_date($start_date) {
+		$this->_set_date_time('B', $start_date, 'TKT_start_date');
 	}
 
 
@@ -619,8 +619,8 @@ 
      * @return string
      * @throws \EE_Error
      */
-	public function end_date( $dt_frmt = '', $tm_frmt = '' ) {
-		return $this->_get_datetime( 'TKT_end_date', $dt_frmt, $tm_frmt );
+	public function end_date($dt_frmt = '', $tm_frmt = '') {
+		return $this->_get_datetime('TKT_end_date', $dt_frmt, $tm_frmt);
 	}
 
 
@@ -632,8 +632,8 @@ 
      * @return void
      * @throws \EE_Error
      */
-	public function set_end_date( $end_date ) {
-		$this->_set_date_time( 'B', $end_date, 'TKT_end_date' );
+	public function set_end_date($end_date) {
+		$this->_set_date_time('B', $end_date, 'TKT_end_date');
 	}
 
 
@@ -645,8 +645,8 @@ 
      * @param string $time a string representation of the sell until time (ex 9am or 7:30pm)
      * @throws \EE_Error
      */
-	public function set_end_time( $time ) {
-		$this->_set_time_for( $time, 'TKT_end_date' );
+	public function set_end_time($time) {
+		$this->_set_time_for($time, 'TKT_end_date');
 	}
 
 
@@ -658,8 +658,8 @@ 
      * @return void
      * @throws \EE_Error
      */
-	public function set_min( $min ) {
-		$this->set( 'TKT_min', $min );
+	public function set_min($min) {
+		$this->set('TKT_min', $min);
 	}
 
 
@@ -671,7 +671,7 @@ 
      * @throws \EE_Error
      */
 	public function max() {
-		return $this->get( 'TKT_max' );
+		return $this->get('TKT_max');
 	}
 
 
@@ -683,8 +683,8 @@ 
      * @return void
      * @throws \EE_Error
      */
-	public function set_max( $max ) {
-		$this->set( 'TKT_max', $max );
+	public function set_max($max) {
+		$this->set('TKT_max', $max);
 	}
 
 
@@ -696,8 +696,8 @@ 
      * @return void
      * @throws \EE_Error
      */
-	public function set_price( $price ) {
-		$this->set( 'TKT_price', $price );
+	public function set_price($price) {
+		$this->set('TKT_price', $price);
 	}
 
 
@@ -709,7 +709,7 @@ 
      * @throws \EE_Error
      */
 	public function sold() {
-		return $this->get_raw( 'TKT_sold' );
+		return $this->get_raw('TKT_sold');
 	}
 
 
@@ -721,10 +721,10 @@ 
      * @return void
      * @throws \EE_Error
      */
-	public function set_sold( $sold ) {
+	public function set_sold($sold) {
 		// sold can not go below zero
-		$sold = max( 0, $sold );
-		$this->set( 'TKT_sold', $sold );
+		$sold = max(0, $sold);
+		$this->set('TKT_sold', $sold);
 	}
 
 
@@ -736,13 +736,13 @@ 
      * @return void
      * @throws \EE_Error
      */
-	public function increase_sold( $qty = 1 ) {
+	public function increase_sold($qty = 1) {
 		$sold = $this->sold() + $qty;
 		// remove ticket reservation, but don't adjust datetime reservations,  because that will happen
 		// via \EE_Datetime::increase_sold() when \EE_Ticket::_increase_sold_for_datetimes() is called
-		$this->decrease_reserved( $qty, false );
-		$this->_increase_sold_for_datetimes( $qty );
-		$this->set_sold( $sold );
+		$this->decrease_reserved($qty, false);
+		$this->_increase_sold_for_datetimes($qty);
+		$this->set_sold($sold);
 	}
 
 
@@ -754,12 +754,12 @@ 
      * @return void
      * @throws \EE_Error
      */
-	protected function _increase_sold_for_datetimes( $qty = 1 ) {
+	protected function _increase_sold_for_datetimes($qty = 1) {
 		$datetimes = $this->datetimes();
-		if ( is_array( $datetimes ) ) {
-			foreach ( $datetimes as $datetime ) {
-				if ( $datetime instanceof EE_Datetime ) {
-					$datetime->increase_sold( $qty );
+		if (is_array($datetimes)) {
+			foreach ($datetimes as $datetime) {
+				if ($datetime instanceof EE_Datetime) {
+					$datetime->increase_sold($qty);
 					$datetime->save();
 				}
 			}
@@ -775,10 +775,10 @@ 
      * @return void
      * @throws \EE_Error
      */
-	public function decrease_sold( $qty = 1 ) {
+	public function decrease_sold($qty = 1) {
 		$sold = $this->sold() - $qty;
-		$this->_decrease_sold_for_datetimes( $qty );
-		$this->set_sold( $sold );
+		$this->_decrease_sold_for_datetimes($qty);
+		$this->set_sold($sold);
 	}
 
 
@@ -790,12 +790,12 @@ 
      * @return void
      * @throws \EE_Error
      */
-	protected function _decrease_sold_for_datetimes( $qty = 1 ) {
+	protected function _decrease_sold_for_datetimes($qty = 1) {
 		$datetimes = $this->datetimes();
-		if ( is_array( $datetimes ) ) {
-			foreach ( $datetimes as $datetime ) {
-				if ( $datetime instanceof EE_Datetime ) {
-					$datetime->decrease_sold( $qty );
+		if (is_array($datetimes)) {
+			foreach ($datetimes as $datetime) {
+				if ($datetime instanceof EE_Datetime) {
+					$datetime->decrease_sold($qty);
 					$datetime->save();
 				}
 			}
@@ -811,7 +811,7 @@ 
      * @throws \EE_Error
      */
 	public function reserved() {
-		return $this->get_raw( 'TKT_reserved' );
+		return $this->get_raw('TKT_reserved');
 	}
 
 
@@ -823,10 +823,10 @@ 
      * @return void
      * @throws \EE_Error
      */
-	public function set_reserved( $reserved ) {
+	public function set_reserved($reserved) {
 		// reserved can not go below zero
-		$reserved = max( 0, (int) $reserved );
-		$this->set( 'TKT_reserved', $reserved );
+		$reserved = max(0, (int) $reserved);
+		$this->set('TKT_reserved', $reserved);
 	}
 
 
@@ -838,11 +838,11 @@ 
      * @return void
      * @throws \EE_Error
      */
-	public function increase_reserved( $qty = 1 ) {
-		$qty = absint( $qty );
+	public function increase_reserved($qty = 1) {
+		$qty = absint($qty);
 		$reserved = $this->reserved() + $qty;
-		$this->_increase_reserved_for_datetimes( $qty );
-		$this->set_reserved( $reserved );
+		$this->_increase_reserved_for_datetimes($qty);
+		$this->set_reserved($reserved);
 	}
 
 
@@ -854,12 +854,12 @@ 
      * @return void
      * @throws \EE_Error
      */
-	protected function _increase_reserved_for_datetimes( $qty = 1 ) {
+	protected function _increase_reserved_for_datetimes($qty = 1) {
 		$datetimes = $this->datetimes();
-		if ( is_array( $datetimes ) ) {
-			foreach ( $datetimes as $datetime ) {
-				if ( $datetime instanceof EE_Datetime ) {
-					$datetime->increase_reserved( $qty );
+		if (is_array($datetimes)) {
+			foreach ($datetimes as $datetime) {
+				if ($datetime instanceof EE_Datetime) {
+					$datetime->increase_reserved($qty);
 					$datetime->save();
 				}
 			}
@@ -876,12 +876,12 @@ 
      * @return void
      * @throws \EE_Error
      */
-	public function decrease_reserved( $qty = 1, $adjust_datetimes = true ) {
-		$reserved = $this->reserved() - absint( $qty );
-		if ( $adjust_datetimes ) {
-			$this->_decrease_reserved_for_datetimes( $qty );
+	public function decrease_reserved($qty = 1, $adjust_datetimes = true) {
+		$reserved = $this->reserved() - absint($qty);
+		if ($adjust_datetimes) {
+			$this->_decrease_reserved_for_datetimes($qty);
 		}
-		$this->set_reserved( $reserved );
+		$this->set_reserved($reserved);
 	}
 
 
@@ -893,12 +893,12 @@ 
      * @return void
      * @throws \EE_Error
      */
-	protected function _decrease_reserved_for_datetimes( $qty = 1 ) {
+	protected function _decrease_reserved_for_datetimes($qty = 1) {
 		$datetimes = $this->datetimes();
-		if ( is_array( $datetimes ) ) {
-			foreach ( $datetimes as $datetime ) {
-				if ( $datetime instanceof EE_Datetime ) {
-					$datetime->decrease_reserved( $qty );
+		if (is_array($datetimes)) {
+			foreach ($datetimes as $datetime) {
+				if ($datetime instanceof EE_Datetime) {
+					$datetime->decrease_reserved($qty);
 					$datetime->save();
 				}
 			}
@@ -919,14 +919,14 @@ 
      * @return int
      * @throws \EE_Error
      */
-	public function qty( $context = '' ) {
-		switch ( $context ) {
+	public function qty($context = '') {
+		switch ($context) {
 			case 'reg_limit' :
 				return $this->real_quantity_on_ticket();
 			case 'saleable' :
-				return $this->real_quantity_on_ticket( 'saleable' );
+				return $this->real_quantity_on_ticket('saleable');
 			default:
-				return $this->get_raw( 'TKT_qty' );
+				return $this->get_raw('TKT_qty');
 		}
 	}
 
@@ -945,15 +945,15 @@ 
      * @return int
      * @throws \EE_Error
      */
-	public function real_quantity_on_ticket( $context = 'reg_limit', $DTT_ID = 0 ) {
-		$raw = $this->get_raw( 'TKT_qty' );
+	public function real_quantity_on_ticket($context = 'reg_limit', $DTT_ID = 0) {
+		$raw = $this->get_raw('TKT_qty');
 		// return immediately if it's zero
-		if ( $raw === 0 ) {
+		if ($raw === 0) {
 			return $raw;
 		}
 		//echo "\n\n<br />Ticket: " . $this->name() . '<br />';
 		// ensure qty doesn't exceed raw value for THIS ticket
-		$qty = min( EE_INF, $raw );
+		$qty = min(EE_INF, $raw);
 		//echo "\n . qty: " . $qty . '<br />';
 		// calculate this ticket's total sales and reservations
 		$sold_and_reserved_for_this_ticket = $this->sold() + $this->reserved();
@@ -962,23 +962,23 @@ 
 		//echo "\n . sold_and_reserved_for_this_ticket: " . $sold_and_reserved_for_this_ticket . '<br />';
 		// first we need to calculate the maximum number of tickets available for the datetime
 		// do we want data for one datetime or all of them ?
-		$query_params = $DTT_ID ? array( array( 'DTT_ID' => $DTT_ID ) ) : array();
-		$datetimes = $this->datetimes( $query_params );
-		if ( is_array( $datetimes ) && ! empty( $datetimes ) ) {
-			foreach ( $datetimes as $datetime ) {
-				if ( $datetime instanceof EE_Datetime ) {
+		$query_params = $DTT_ID ? array(array('DTT_ID' => $DTT_ID)) : array();
+		$datetimes = $this->datetimes($query_params);
+		if (is_array($datetimes) && ! empty($datetimes)) {
+			foreach ($datetimes as $datetime) {
+				if ($datetime instanceof EE_Datetime) {
 					$datetime->refresh_from_db();
 					//echo "\n . . datetime name: " . $datetime->name() . '<br />';
 					//echo "\n . . datetime ID: " . $datetime->ID() . '<br />';
 					// initialize with no restrictions for each datetime
 					// but adjust datetime qty based on datetime reg limit
-					$datetime_qty = min( EE_INF, $datetime->reg_limit() );
+					$datetime_qty = min(EE_INF, $datetime->reg_limit());
 					//echo "\n . . . datetime reg_limit: " . $datetime->reg_limit() . '<br />';
 					//echo "\n . . . datetime_qty: " . $datetime_qty . '<br />';
 					// if we want the actual saleable amount, then we need to consider OTHER ticket sales
 					// and reservations for this datetime, that do NOT include sales and reservations
 					// for this ticket (so we add $this->sold() and $this->reserved() back in)
-					if ( $context === 'saleable' ) {
+					if ($context === 'saleable') {
 						$datetime_qty = max(
 							$datetime_qty - $datetime->sold_and_reserved() + $sold_and_reserved_for_this_ticket,
 							0
@@ -990,16 +990,16 @@ 
 						$datetime_qty = ! $datetime->sold_out() ? $datetime_qty : 0;
 						//echo "\n . . . datetime_qty: " . $datetime_qty . '<br />';
 					}
-					$qty = min( $datetime_qty, $qty );
+					$qty = min($datetime_qty, $qty);
 					//echo "\n . . qty: " . $qty . '<br />';
 				}
 			}
 		}
 		// NOW that we know the  maximum number of tickets available for the datetime
 		// we can finally factor in the details for this specific ticket
-		if ( $qty > 0 && $context === 'saleable' ) {
+		if ($qty > 0 && $context === 'saleable') {
 			// and subtract the sales for THIS ticket
-			$qty = max( $qty - $sold_and_reserved_for_this_ticket, 0 );
+			$qty = max($qty - $sold_and_reserved_for_this_ticket, 0);
 			//echo "\n . qty: " . $qty . '<br />';
 		}
 		//echo "\nFINAL QTY: " . $qty . "<br /><br />";
@@ -1015,14 +1015,14 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	public function set_qty( $qty ) {
+	public function set_qty($qty) {
 		$datetimes = $this->datetimes();
-		foreach ( $datetimes as $datetime ) {
-			if ( $datetime instanceof EE_Datetime ) {
-				$qty = min( $qty, $datetime->reg_limit() );
+		foreach ($datetimes as $datetime) {
+			if ($datetime instanceof EE_Datetime) {
+				$qty = min($qty, $datetime->reg_limit());
 			}
 		}
-		$this->set( 'TKT_qty', $qty );
+		$this->set('TKT_qty', $qty);
 	}
 
 
@@ -1034,7 +1034,7 @@ 
      * @throws \EE_Error
      */
 	public function uses() {
-		return $this->get( 'TKT_uses' );
+		return $this->get('TKT_uses');
 	}
 
 
@@ -1046,8 +1046,8 @@ 
      * @return void
      * @throws \EE_Error
      */
-	public function set_uses( $uses ) {
-		$this->set( 'TKT_uses', $uses );
+	public function set_uses($uses) {
+		$this->set('TKT_uses', $uses);
 	}
 
 
@@ -1059,7 +1059,7 @@ 
      * @throws \EE_Error
      */
 	public function required() {
-		return $this->get( 'TKT_required' );
+		return $this->get('TKT_required');
 	}
 
 
@@ -1071,8 +1071,8 @@ 
      * @return void
      * @throws \EE_Error
      */
-	public function set_required( $required ) {
-		$this->set( 'TKT_required', $required );
+	public function set_required($required) {
+		$this->set('TKT_required', $required);
 	}
 
 
@@ -1084,7 +1084,7 @@ 
      * @throws \EE_Error
      */
 	public function taxable() {
-		return $this->get( 'TKT_taxable' );
+		return $this->get('TKT_taxable');
 	}
 
 
@@ -1096,8 +1096,8 @@ 
      * @return void
      * @throws \EE_Error
      */
-	public function set_taxable( $taxable ) {
-		$this->set( 'TKT_taxable', $taxable );
+	public function set_taxable($taxable) {
+		$this->set('TKT_taxable', $taxable);
 	}
 
 
@@ -1109,7 +1109,7 @@ 
      * @throws \EE_Error
      */
 	public function is_default() {
-		return $this->get( 'TKT_is_default' );
+		return $this->get('TKT_is_default');
 	}
 
 
@@ -1121,8 +1121,8 @@ 
      * @return void
      * @throws \EE_Error
      */
-	public function set_is_default( $is_default ) {
-		$this->set( 'TKT_is_default', $is_default );
+	public function set_is_default($is_default) {
+		$this->set('TKT_is_default', $is_default);
 	}
 
 
@@ -1134,7 +1134,7 @@ 
      * @throws \EE_Error
      */
 	public function order() {
-		return $this->get( 'TKT_order' );
+		return $this->get('TKT_order');
 	}
 
 
@@ -1146,8 +1146,8 @@ 
      * @return void
      * @throws \EE_Error
      */
-	public function set_order( $order ) {
-		$this->set( 'TKT_order', $order );
+	public function set_order($order) {
+		$this->set('TKT_order', $order);
 	}
 
 
@@ -1159,7 +1159,7 @@ 
      * @throws \EE_Error
      */
 	public function row() {
-		return $this->get( 'TKT_row' );
+		return $this->get('TKT_row');
 	}
 
 
@@ -1171,8 +1171,8 @@ 
      * @return void
      * @throws \EE_Error
      */
-	public function set_row( $row ) {
-		$this->set( 'TKT_row', $row );
+	public function set_row($row) {
+		$this->set('TKT_row', $row);
 	}
 
 
@@ -1184,7 +1184,7 @@ 
      * @throws \EE_Error
      */
 	public function deleted() {
-		return $this->get( 'TKT_deleted' );
+		return $this->get('TKT_deleted');
 	}
 
 
@@ -1196,8 +1196,8 @@ 
      * @return void
      * @throws \EE_Error
      */
-	public function set_deleted( $deleted ) {
-		$this->set( 'TKT_deleted', $deleted );
+	public function set_deleted($deleted) {
+		$this->set('TKT_deleted', $deleted);
 	}
 
 
@@ -1209,7 +1209,7 @@ 
      * @throws \EE_Error
      */
 	public function parent_ID() {
-		return $this->get( 'TKT_parent' );
+		return $this->get('TKT_parent');
 	}
 
 
@@ -1221,8 +1221,8 @@ 
      * @return void
      * @throws \EE_Error
      */
-	public function set_parent_ID( $parent ) {
-		$this->set( 'TKT_parent', $parent );
+	public function set_parent_ID($parent) {
+		$this->set('TKT_parent', $parent);
 	}
 
 
@@ -1235,10 +1235,10 @@ 
      */
 	public function name_and_info() {
 		$times = array();
-		foreach ( $this->datetimes() as $datetime ) {
+		foreach ($this->datetimes() as $datetime) {
 			$times[] = $datetime->start_date_and_time();
 		}
-		return $this->name() . ' @ ' . implode( ', ', $times ) . ' for ' . $this->pretty_price();
+		return $this->name().' @ '.implode(', ', $times).' for '.$this->pretty_price();
 	}
 
 
@@ -1250,7 +1250,7 @@ 
      * @throws \EE_Error
      */
 	public function name() {
-		return $this->get( 'TKT_name' );
+		return $this->get('TKT_name');
 	}
 
 
@@ -1262,7 +1262,7 @@ 
      * @throws \EE_Error
      */
 	public function price() {
-		return $this->get( 'TKT_price' );
+		return $this->get('TKT_price');
 	}
 
 
@@ -1274,8 +1274,8 @@ 
      * @return EE_Registration[]|EE_Base_Class[]
      * @throws \EE_Error
      */
-	public function registrations( $query_params = array() ) {
-		return $this->get_many_related( 'Registration', $query_params );
+	public function registrations($query_params = array()) {
+		return $this->get_many_related('Registration', $query_params);
 	}
 
 
@@ -1288,8 +1288,8 @@ 
      * @throws \EE_Error
      */
 	public function update_tickets_sold() {
-		$count_regs_for_this_ticket = $this->count_registrations( array( array( 'STS_ID' => EEM_Registration::status_id_approved, 'REG_deleted' => 0 ) ) );
-		$this->set_sold( $count_regs_for_this_ticket );
+		$count_regs_for_this_ticket = $this->count_registrations(array(array('STS_ID' => EEM_Registration::status_id_approved, 'REG_deleted' => 0)));
+		$this->set_sold($count_regs_for_this_ticket);
 		$this->save();
 		return $count_regs_for_this_ticket;
 	}
@@ -1301,7 +1301,7 @@ 
 	 * @param array $query_params like EEM_Base::get_all's
 	 * @return int
 	 */
-	public function count_registrations( $query_params = array() ) {
+	public function count_registrations($query_params = array()) {
 		return $this->count_related('Registration', $query_params);
 	}
 
@@ -1329,23 +1329,23 @@ 
 	public function get_related_event() {
 		//get one datetime to use for getting the event
 		$datetime = $this->first_datetime();
-		if ( ! $datetime instanceof \EE_Datetime ) {
+		if ( ! $datetime instanceof \EE_Datetime) {
 			throw new UnexpectedEntityException(
 				$datetime,
                 'EE_Datetime',
 				sprintf(
-					__( 'The ticket (%s) is not associated with any valid datetimes.', 'event_espresso'),
+					__('The ticket (%s) is not associated with any valid datetimes.', 'event_espresso'),
 					$this->name()
 				)
 			);
 		}
 		$event = $datetime->event();
-		if ( ! $event instanceof \EE_Event ) {
+		if ( ! $event instanceof \EE_Event) {
 			throw new UnexpectedEntityException(
 				$event,
                 'EE_Event',
 				sprintf(
-					__( 'The ticket (%s) is not associated with a valid event.', 'event_espresso'),
+					__('The ticket (%s) is not associated with a valid event.', 'event_espresso'),
 					$this->name()
 				)
 			);

modules/ticket_selector/DatetimeSelector.php

Indentation +169 added lines, -169 removed lines

@@ -16,175 +16,175 @@
 class DatetimeSelector
 {
 
-    /**
-     * @var \EE_Event $event
-     */
-    protected $event;
-
-    /**
-     * @var \EE_Ticket[] $tickets
-     */
-    protected $tickets;
-
-    /**
-     * @var \EE_Datetime[] $datetimes
-     */
-    protected $datetimes;
-
-    /**
-     * @var \EE_Datetime[] $unique_dates
-     */
-    protected $unique_dates;
-
-    /**
-     * @var \EE_Ticket_Selector_Config $template_settings
-     */
-    protected $template_settings;
-
-    /**
-     * @var boolean $active
-     */
-    protected $active = false;
-
-
-
-    /**
-     * DatetimeSelector constructor.
-     *
-     * @param \EE_Event                  $event
-     * @param \EE_Ticket[]               $tickets
-     * @param \EE_Ticket_Selector_Config $template_settings
-     * @param string                     $date_format
-     * @param string                     $time_format
-     * @throws \EE_Error
-     */
-    public function __construct(
-        \EE_Event $event,
-        array $tickets,
-        \EE_Ticket_Selector_Config $template_settings,
-        $date_format = 'Y-m-d',
-        $time_format = 'g:i a'
-    ) {
-        $this->event = $event;
-        $this->tickets = $tickets;
-        $this->template_settings = $template_settings;
-        $this->datetimes = $this->getAllDatetimesForAllTicket($tickets);
-        $this->unique_dates = $this->getUniqueDatetimeOptions($date_format, $time_format);
-        $this->active = $this->template_settings->showDatetimeSelector($this->unique_dates);
-    }
-
-
-
-    /**
-     * @param \EE_Ticket[] $tickets
-     * @return array
-     * @throws \EE_Error
-     */
-    protected function getAllDatetimesForAllTicket($tickets = array())
-    {
-        $datetimes = array();
-        foreach ($tickets as $ticket) {
-            $datetimes = $this->getTicketDatetimes($ticket, $datetimes);
-        }
-        return $datetimes;
-    }
-
-
-
-    /**
-     * @param \EE_Ticket      $ticket
-     * @param  \EE_Datetime[] $datetimes
-     * @return \EE_Datetime[]
-     * @throws \EE_Error
-     */
-    protected function getTicketDatetimes(\EE_Ticket $ticket, $datetimes = array())
-    {
-        $ticket_datetimes = $ticket->datetimes(
-            array(
-                'order_by'                 => array(
-                    'DTT_order'     => 'ASC',
-                    'DTT_EVT_start' => 'ASC'
-                ),
-                'default_where_conditions' => 'none',
-            )
-        );
-        foreach ($ticket_datetimes as $ticket_datetime) {
-            if ( ! $ticket_datetime instanceof \EE_Datetime) {
-                continue;
-            }
-            $datetimes[ $ticket_datetime->ID() ] = $ticket_datetime;
-        }
-        return $datetimes;
-    }
-
-
-
-    /**
-     * @param \EE_Ticket                 $ticket
-     * @return string
-     * @throws \EE_Error
-     */
-    public function getTicketDatetimeClasses( \EE_Ticket $ticket ) {
-        if ( ! $this->active) {
-            return '';
-        }
-        $ticket_datetimes = $this->getTicketDatetimes($ticket);
-        $classes = '';
-        foreach ($this->datetimes as $datetime) {
-            if ( ! $datetime instanceof \EE_Datetime || ! in_array($datetime, $ticket_datetimes, true)) {
-                continue;
-            }
-            $classes .= ' ee-ticket-datetimes-' . $datetime->date_and_time_range('Y_m_d', 'H_i', '-', '_');
-        }
-        return $classes;
-    }
-
-
-
-    /**
-     * @param string $date_format
-     * @param string $time_format
-     * @return array
-     * @throws \EE_Error
-     */
-    public function getUniqueDatetimeOptions($date_format = 'Y-m-d', $time_format = 'g:i a') {
-        $datetime_options = array();
-        foreach ($this->datetimes as $datetime) {
-            if ( ! $datetime instanceof \EE_Datetime) {
-                continue;
-            }
-            $datetime_options[$datetime->date_and_time_range('Y_m_d', 'H_i', '-', '_')] =
-                $datetime->date_and_time_range($date_format, $time_format, ' - ');
-        }
-        return $datetime_options;
-    }
-
-
-
-    /**
-     * @return string
-     * @throws \EE_Error
-     */
-    public function getDatetimeSelector() {
-        if ( ! $this->active) {
-            return '';
-        }
-        $dropdown_selector = new \EE_Checkbox_Dropdown_Selector_Input(
-            $this->unique_dates,
-            array(
-                'html_id'               => 'datetime-selector-' . $this->event->ID(),
-                'html_name'             => 'datetime_selector_' . $this->event->ID(),
-                'html_class'            => 'datetime-selector',
-                'select_button_text'       => '<span class="dashicons dashicons-calendar-alt"></span> '
-                                            . esc_html__('Filter by Date', 'event_espresso'),
-                'other_html_attributes' => ' data-tkt_slctr_evt="' . $this->event->ID() . '"',
-            )
-        );
-        return \EEH_HTML::div(
-            $dropdown_selector->get_html_for_input(),
-            '', 'datetime_selector-dv'
-        );
-    }
+	/**
+	 * @var \EE_Event $event
+	 */
+	protected $event;
+
+	/**
+	 * @var \EE_Ticket[] $tickets
+	 */
+	protected $tickets;
+
+	/**
+	 * @var \EE_Datetime[] $datetimes
+	 */
+	protected $datetimes;
+
+	/**
+	 * @var \EE_Datetime[] $unique_dates
+	 */
+	protected $unique_dates;
+
+	/**
+	 * @var \EE_Ticket_Selector_Config $template_settings
+	 */
+	protected $template_settings;
+
+	/**
+	 * @var boolean $active
+	 */
+	protected $active = false;
+
+
+
+	/**
+	 * DatetimeSelector constructor.
+	 *
+	 * @param \EE_Event                  $event
+	 * @param \EE_Ticket[]               $tickets
+	 * @param \EE_Ticket_Selector_Config $template_settings
+	 * @param string                     $date_format
+	 * @param string                     $time_format
+	 * @throws \EE_Error
+	 */
+	public function __construct(
+		\EE_Event $event,
+		array $tickets,
+		\EE_Ticket_Selector_Config $template_settings,
+		$date_format = 'Y-m-d',
+		$time_format = 'g:i a'
+	) {
+		$this->event = $event;
+		$this->tickets = $tickets;
+		$this->template_settings = $template_settings;
+		$this->datetimes = $this->getAllDatetimesForAllTicket($tickets);
+		$this->unique_dates = $this->getUniqueDatetimeOptions($date_format, $time_format);
+		$this->active = $this->template_settings->showDatetimeSelector($this->unique_dates);
+	}
+
+
+
+	/**
+	 * @param \EE_Ticket[] $tickets
+	 * @return array
+	 * @throws \EE_Error
+	 */
+	protected function getAllDatetimesForAllTicket($tickets = array())
+	{
+		$datetimes = array();
+		foreach ($tickets as $ticket) {
+			$datetimes = $this->getTicketDatetimes($ticket, $datetimes);
+		}
+		return $datetimes;
+	}
+
+
+
+	/**
+	 * @param \EE_Ticket      $ticket
+	 * @param  \EE_Datetime[] $datetimes
+	 * @return \EE_Datetime[]
+	 * @throws \EE_Error
+	 */
+	protected function getTicketDatetimes(\EE_Ticket $ticket, $datetimes = array())
+	{
+		$ticket_datetimes = $ticket->datetimes(
+			array(
+				'order_by'                 => array(
+					'DTT_order'     => 'ASC',
+					'DTT_EVT_start' => 'ASC'
+				),
+				'default_where_conditions' => 'none',
+			)
+		);
+		foreach ($ticket_datetimes as $ticket_datetime) {
+			if ( ! $ticket_datetime instanceof \EE_Datetime) {
+				continue;
+			}
+			$datetimes[ $ticket_datetime->ID() ] = $ticket_datetime;
+		}
+		return $datetimes;
+	}
+
+
+
+	/**
+	 * @param \EE_Ticket                 $ticket
+	 * @return string
+	 * @throws \EE_Error
+	 */
+	public function getTicketDatetimeClasses( \EE_Ticket $ticket ) {
+		if ( ! $this->active) {
+			return '';
+		}
+		$ticket_datetimes = $this->getTicketDatetimes($ticket);
+		$classes = '';
+		foreach ($this->datetimes as $datetime) {
+			if ( ! $datetime instanceof \EE_Datetime || ! in_array($datetime, $ticket_datetimes, true)) {
+				continue;
+			}
+			$classes .= ' ee-ticket-datetimes-' . $datetime->date_and_time_range('Y_m_d', 'H_i', '-', '_');
+		}
+		return $classes;
+	}
+
+
+
+	/**
+	 * @param string $date_format
+	 * @param string $time_format
+	 * @return array
+	 * @throws \EE_Error
+	 */
+	public function getUniqueDatetimeOptions($date_format = 'Y-m-d', $time_format = 'g:i a') {
+		$datetime_options = array();
+		foreach ($this->datetimes as $datetime) {
+			if ( ! $datetime instanceof \EE_Datetime) {
+				continue;
+			}
+			$datetime_options[$datetime->date_and_time_range('Y_m_d', 'H_i', '-', '_')] =
+				$datetime->date_and_time_range($date_format, $time_format, ' - ');
+		}
+		return $datetime_options;
+	}
+
+
+
+	/**
+	 * @return string
+	 * @throws \EE_Error
+	 */
+	public function getDatetimeSelector() {
+		if ( ! $this->active) {
+			return '';
+		}
+		$dropdown_selector = new \EE_Checkbox_Dropdown_Selector_Input(
+			$this->unique_dates,
+			array(
+				'html_id'               => 'datetime-selector-' . $this->event->ID(),
+				'html_name'             => 'datetime_selector_' . $this->event->ID(),
+				'html_class'            => 'datetime-selector',
+				'select_button_text'       => '<span class="dashicons dashicons-calendar-alt"></span> '
+											. esc_html__('Filter by Date', 'event_espresso'),
+				'other_html_attributes' => ' data-tkt_slctr_evt="' . $this->event->ID() . '"',
+			)
+		);
+		return \EEH_HTML::div(
+			$dropdown_selector->get_html_for_input(),
+			'', 'datetime_selector-dv'
+		);
+	}
 
 
 

Spacing +6 added lines, -6 removed lines

@@ -112,7 +112,7 @@ 
             if ( ! $ticket_datetime instanceof \EE_Datetime) {
                 continue;
             }
-            $datetimes[ $ticket_datetime->ID() ] = $ticket_datetime;
+            $datetimes[$ticket_datetime->ID()] = $ticket_datetime;
         }
         return $datetimes;
     }
@@ -124,7 +124,7 @@ 
      * @return string
      * @throws \EE_Error
      */
-    public function getTicketDatetimeClasses( \EE_Ticket $ticket ) {
+    public function getTicketDatetimeClasses(\EE_Ticket $ticket) {
         if ( ! $this->active) {
             return '';
         }
@@ -134,7 +134,7 @@ 
             if ( ! $datetime instanceof \EE_Datetime || ! in_array($datetime, $ticket_datetimes, true)) {
                 continue;
             }
-            $classes .= ' ee-ticket-datetimes-' . $datetime->date_and_time_range('Y_m_d', 'H_i', '-', '_');
+            $classes .= ' ee-ticket-datetimes-'.$datetime->date_and_time_range('Y_m_d', 'H_i', '-', '_');
         }
         return $classes;
     }
@@ -172,12 +172,12 @@ 
         $dropdown_selector = new \EE_Checkbox_Dropdown_Selector_Input(
             $this->unique_dates,
             array(
-                'html_id'               => 'datetime-selector-' . $this->event->ID(),
-                'html_name'             => 'datetime_selector_' . $this->event->ID(),
+                'html_id'               => 'datetime-selector-'.$this->event->ID(),
+                'html_name'             => 'datetime_selector_'.$this->event->ID(),
                 'html_class'            => 'datetime-selector',
                 'select_button_text'       => '<span class="dashicons dashicons-calendar-alt"></span> '
                                             . esc_html__('Filter by Date', 'event_espresso'),
-                'other_html_attributes' => ' data-tkt_slctr_evt="' . $this->event->ID() . '"',
+                'other_html_attributes' => ' data-tkt_slctr_evt="'.$this->event->ID().'"',
             )
         );
         return \EEH_HTML::div(

modules/ticket_selector/TicketSelectorRow.php

Indentation +190 added lines, -190 removed lines

@@ -16,196 +16,196 @@
 abstract class TicketSelectorRow
 {
 
-    /**
-     * @var \EE_Ticket $ticket
-     */
-    protected $ticket;
-
-    /**
-     * @var int $max_atndz
-     */
-    protected $max_atndz;
-
-    /**
-     * @var string $date_format
-     */
-    protected $date_format;
-
-    /**
-     * @var int $EVT_ID
-     */
-    protected $EVT_ID;
-
-    /**
-     * @var string $ticket_status_display
-     */
-    protected $ticket_status_display;
-
-
-
-    /**
-     * TicketDetails constructor.
-     *
-     * @param \EE_Ticket                 $ticket
-     * @param int                        $max_atndz
-     * @param string                     $date_format
-     */
-    public function __construct(
-        \EE_Ticket $ticket,
-        $max_atndz,
-        $date_format
-    ) {
-        $this->ticket = $ticket;
-        $this->max_atndz = $max_atndz;
-        $this->date_format = $date_format;
-        $this->EVT_ID = $this->ticket->get_event_ID();
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function getTicketStatusDisplay()
-    {
-        return $this->ticket_status_display;
-    }
-
-
-
-    /**
-     * setTicketStatusDisplay
-     *
-     * @param string $tkt_status
-     * @param string $ticket_status
-     * @param int    $remaining
-     * @throws \EE_Error
-     */
-    protected function setTicketStatusDisplay($tkt_status, $ticket_status, $remaining) {
-        $this->ticket_status_display = '';
-        // now depending on the ticket and other circumstances...
-        if ($this->max_atndz === 0) {
-            // registration is CLOSED because admin set max attendees to ZERO
-            $this->ticket_status_display = $this->registrationClosed();
-        } else if ($tkt_status === \EE_Ticket::sold_out || $remaining === 0) {
-            // SOLD OUT - no tickets remaining
-            $this->ticket_status_display = $this->ticketsSoldOut();
-        } else if ($tkt_status === \EE_Ticket::expired || $tkt_status === \EE_Ticket::archived) {
-            // expired or archived ticket
-            $this->ticket_status_display = $ticket_status;
-        } else if ($tkt_status === \EE_Ticket::pending) {
-            // ticket not on sale yet
-            $this->ticket_status_display = $this->ticketsSalesPending();
-        } else if ($this->ticket->min() > $remaining) {
-            // min qty purchasable is less than tickets available
-            $this->ticket_status_display = $this->notEnoughTicketsAvailable();
-        }
-    }
-
-
-
-    /**
-     * registrationClosed
-     */
-    protected function registrationClosed()
-    {
-        return \EEH_HTML::span(
-            apply_filters(
-                'FHEE__ticket_selector_chart_template__ticket_closed_msg',
-                __('Closed', 'event_espresso')
-            ),
-            '', 'sold-out'
-        );
-    }
-
-
-
-    /**
-     * ticketsSoldOut
-     */
-    protected function ticketsSoldOut()
-    {
-        return \EEH_HTML::span(
-            apply_filters(
-                'FHEE__ticket_selector_chart_template__ticket_sold_out_msg',
-                __('Sold Out', 'event_espresso')
-            ),
-            '', 'sold-out'
-        );
-    }
-
-
-
-    /**
-     * ticketsSalesPending
-     *
-     * @throws \EE_Error
-     */
-    protected function ticketsSalesPending()
-    {
-        return \EEH_HTML::span(
-            \EEH_HTML::span(
-                apply_filters(
-                    'FHEE__ticket_selector_chart_template__ticket_goes_on_sale_msg',
-                    __('Goes On Sale', 'event_espresso')
-                ),
-                '', 'ticket-pending'
-            )
-            . \EEH_HTML::br()
-            . \EEH_HTML::span(
-                $this->ticket->get_i18n_datetime(
-                    'TKT_start_date',
-                    apply_filters(
-                        'FHEE__EED_Ticket_Selector__display_goes_on_sale__date_format',
-                        $this->date_format
-                    )
-                ),
-                '', 'small-text'
-            ),
-            '', 'ticket-pending-pg'
-        );
-    }
-
-
-
-    /**
-     * notEnoughTicketsAvailable
-     */
-    protected function notEnoughTicketsAvailable()
-    {
-        return \EEH_HTML::div(
-            \EEH_HTML::span(
-                apply_filters(
-                    'FHEE__ticket_selector_chart_template__ticket_not_available_msg',
-                    __('Not Available', 'event_espresso')
-                ),
-                '', 'archived-ticket small-text'
-            )
-            . \EEH_HTML::br(),
-            '', 'archived-ticket-pg'
-        );
-    }
-
-
-
-    /**
-     * getHiddenInputs
-     *
-     * @param string $anchor_id
-     * @param int    $row
-     * @param int    $max_atndz
-     * @return string
-     */
-    protected function getHiddenInputs($anchor_id, $row, $max_atndz)
-    {
-        $html = '<input type="hidden" name="noheader" value="true"/>';
-        $html .= '<input type="hidden" name="tkt-slctr-return-url-' . $this->EVT_ID . '"';
-        $html .= ' value="' . \EEH_URL::current_url() . $anchor_id . '"/>';
-        $html .= '<input type="hidden" name="tkt-slctr-rows-' . $this->EVT_ID . '" value="' . $row - 1 . '"/>';
-        $html .= '<input type="hidden" name="tkt-slctr-max-atndz-' . $this->EVT_ID . '" value="' . $max_atndz . '"/>';
-        $html .= '<input type="hidden" name="tkt-slctr-event-id" value="' . $this->EVT_ID . '"/>';
-        return $html;
-    }
+	/**
+	 * @var \EE_Ticket $ticket
+	 */
+	protected $ticket;
+
+	/**
+	 * @var int $max_atndz
+	 */
+	protected $max_atndz;
+
+	/**
+	 * @var string $date_format
+	 */
+	protected $date_format;
+
+	/**
+	 * @var int $EVT_ID
+	 */
+	protected $EVT_ID;
+
+	/**
+	 * @var string $ticket_status_display
+	 */
+	protected $ticket_status_display;
+
+
+
+	/**
+	 * TicketDetails constructor.
+	 *
+	 * @param \EE_Ticket                 $ticket
+	 * @param int                        $max_atndz
+	 * @param string                     $date_format
+	 */
+	public function __construct(
+		\EE_Ticket $ticket,
+		$max_atndz,
+		$date_format
+	) {
+		$this->ticket = $ticket;
+		$this->max_atndz = $max_atndz;
+		$this->date_format = $date_format;
+		$this->EVT_ID = $this->ticket->get_event_ID();
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function getTicketStatusDisplay()
+	{
+		return $this->ticket_status_display;
+	}
+
+
+
+	/**
+	 * setTicketStatusDisplay
+	 *
+	 * @param string $tkt_status
+	 * @param string $ticket_status
+	 * @param int    $remaining
+	 * @throws \EE_Error
+	 */
+	protected function setTicketStatusDisplay($tkt_status, $ticket_status, $remaining) {
+		$this->ticket_status_display = '';
+		// now depending on the ticket and other circumstances...
+		if ($this->max_atndz === 0) {
+			// registration is CLOSED because admin set max attendees to ZERO
+			$this->ticket_status_display = $this->registrationClosed();
+		} else if ($tkt_status === \EE_Ticket::sold_out || $remaining === 0) {
+			// SOLD OUT - no tickets remaining
+			$this->ticket_status_display = $this->ticketsSoldOut();
+		} else if ($tkt_status === \EE_Ticket::expired || $tkt_status === \EE_Ticket::archived) {
+			// expired or archived ticket
+			$this->ticket_status_display = $ticket_status;
+		} else if ($tkt_status === \EE_Ticket::pending) {
+			// ticket not on sale yet
+			$this->ticket_status_display = $this->ticketsSalesPending();
+		} else if ($this->ticket->min() > $remaining) {
+			// min qty purchasable is less than tickets available
+			$this->ticket_status_display = $this->notEnoughTicketsAvailable();
+		}
+	}
+
+
+
+	/**
+	 * registrationClosed
+	 */
+	protected function registrationClosed()
+	{
+		return \EEH_HTML::span(
+			apply_filters(
+				'FHEE__ticket_selector_chart_template__ticket_closed_msg',
+				__('Closed', 'event_espresso')
+			),
+			'', 'sold-out'
+		);
+	}
+
+
+
+	/**
+	 * ticketsSoldOut
+	 */
+	protected function ticketsSoldOut()
+	{
+		return \EEH_HTML::span(
+			apply_filters(
+				'FHEE__ticket_selector_chart_template__ticket_sold_out_msg',
+				__('Sold&nbsp;Out', 'event_espresso')
+			),
+			'', 'sold-out'
+		);
+	}
+
+
+
+	/**
+	 * ticketsSalesPending
+	 *
+	 * @throws \EE_Error
+	 */
+	protected function ticketsSalesPending()
+	{
+		return \EEH_HTML::span(
+			\EEH_HTML::span(
+				apply_filters(
+					'FHEE__ticket_selector_chart_template__ticket_goes_on_sale_msg',
+					__('Goes&nbsp;On&nbsp;Sale', 'event_espresso')
+				),
+				'', 'ticket-pending'
+			)
+			. \EEH_HTML::br()
+			. \EEH_HTML::span(
+				$this->ticket->get_i18n_datetime(
+					'TKT_start_date',
+					apply_filters(
+						'FHEE__EED_Ticket_Selector__display_goes_on_sale__date_format',
+						$this->date_format
+					)
+				),
+				'', 'small-text'
+			),
+			'', 'ticket-pending-pg'
+		);
+	}
+
+
+
+	/**
+	 * notEnoughTicketsAvailable
+	 */
+	protected function notEnoughTicketsAvailable()
+	{
+		return \EEH_HTML::div(
+			\EEH_HTML::span(
+				apply_filters(
+					'FHEE__ticket_selector_chart_template__ticket_not_available_msg',
+					__('Not Available', 'event_espresso')
+				),
+				'', 'archived-ticket small-text'
+			)
+			. \EEH_HTML::br(),
+			'', 'archived-ticket-pg'
+		);
+	}
+
+
+
+	/**
+	 * getHiddenInputs
+	 *
+	 * @param string $anchor_id
+	 * @param int    $row
+	 * @param int    $max_atndz
+	 * @return string
+	 */
+	protected function getHiddenInputs($anchor_id, $row, $max_atndz)
+	{
+		$html = '<input type="hidden" name="noheader" value="true"/>';
+		$html .= '<input type="hidden" name="tkt-slctr-return-url-' . $this->EVT_ID . '"';
+		$html .= ' value="' . \EEH_URL::current_url() . $anchor_id . '"/>';
+		$html .= '<input type="hidden" name="tkt-slctr-rows-' . $this->EVT_ID . '" value="' . $row - 1 . '"/>';
+		$html .= '<input type="hidden" name="tkt-slctr-max-atndz-' . $this->EVT_ID . '" value="' . $max_atndz . '"/>';
+		$html .= '<input type="hidden" name="tkt-slctr-event-id" value="' . $this->EVT_ID . '"/>';
+		return $html;
+	}
 
 
 

Spacing +5 added lines, -5 removed lines

@@ -199,11 +199,11 @@
     protected function getHiddenInputs($anchor_id, $row, $max_atndz)
     {
         $html = '<input type="hidden" name="noheader" value="true"/>';
-        $html .= '<input type="hidden" name="tkt-slctr-return-url-' . $this->EVT_ID . '"';
-        $html .= ' value="' . \EEH_URL::current_url() . $anchor_id . '"/>';
-        $html .= '<input type="hidden" name="tkt-slctr-rows-' . $this->EVT_ID . '" value="' . $row - 1 . '"/>';
-        $html .= '<input type="hidden" name="tkt-slctr-max-atndz-' . $this->EVT_ID . '" value="' . $max_atndz . '"/>';
-        $html .= '<input type="hidden" name="tkt-slctr-event-id" value="' . $this->EVT_ID . '"/>';
+        $html .= '<input type="hidden" name="tkt-slctr-return-url-'.$this->EVT_ID.'"';
+        $html .= ' value="'.\EEH_URL::current_url().$anchor_id.'"/>';
+        $html .= '<input type="hidden" name="tkt-slctr-rows-'.$this->EVT_ID.'" value="'.$row - 1.'"/>';
+        $html .= '<input type="hidden" name="tkt-slctr-max-atndz-'.$this->EVT_ID.'" value="'.$max_atndz.'"/>';
+        $html .= '<input type="hidden" name="tkt-slctr-event-id" value="'.$this->EVT_ID.'"/>';
         return $html;
     }
 

modules/ticket_selector/templates/standard_ticket_selector.template.php

Indentation +22 added lines, -22 removed lines

@@ -28,12 +28,12 @@ 
 			<tr>
 				<th scope="col" class="ee-ticket-selector-ticket-details-th">
 					<?php
-                    echo apply_filters(
-                        'FHEE__ticket_selector_chart_template__table_header_available_tickets',
-                        esc_html(''),
-                        $EVT_ID
-                    );
-                    ?>
+					echo apply_filters(
+						'FHEE__ticket_selector_chart_template__table_header_available_tickets',
+						esc_html(''),
+						$EVT_ID
+					);
+					?>
 				</th>
 				<?php if ( apply_filters( 'FHEE__ticket_selector_chart_template__display_ticket_price_details', TRUE ) ) { ?>
 				<th scope="col" class="ee-ticket-selector-ticket-price-th cntr">
@@ -47,28 +47,28 @@ 
 						 * @param int $EVT_ID The Event ID
 						 */
 						echo apply_filters(
-                            'FHEE__ticket_selector_chart_template__table_header_price',
-                            esc_html__( 'Price', 'event_espresso' ),
-                            $EVT_ID
-                        );
+							'FHEE__ticket_selector_chart_template__table_header_price',
+							esc_html__( 'Price', 'event_espresso' ),
+							$EVT_ID
+						);
 					?>
 				</th>
 				<?php } ?>
 				<th scope="col" class="ee-ticket-selector-ticket-qty-th cntr">
 					<?php
 						/**
-						* Filters the text printed for the header of the quantity column in the ticket selector table
-						*
-						* @since 4.7.2
-						*
-						* @param string 'Qty' The translatable text to display in the table header for the Quantity of tickets
-						* @param int $EVT_ID The Event ID
-						*/
+						 * Filters the text printed for the header of the quantity column in the ticket selector table
+						 *
+						 * @since 4.7.2
+						 *
+						 * @param string 'Qty' The translatable text to display in the table header for the Quantity of tickets
+						 * @param int $EVT_ID The Event ID
+						 */
 						echo apply_filters(
-                            'FHEE__ticket_selector_chart_template__table_header_qty',
-                            esc_html__( 'Qty', 'event_espresso' ),
-                            $EVT_ID
-                        );
+							'FHEE__ticket_selector_chart_template__table_header_qty',
+							esc_html__( 'Qty', 'event_espresso' ),
+							$EVT_ID
+						);
 					?>
 				</th>
 			</tr>
@@ -98,7 +98,7 @@ 
 if ( $max_atndz > 0 ) {
 	echo apply_filters(
 		'FHEE__ticket_selector_chart_template__maximum_tickets_purchased_footnote',
-        esc_html('')
+		esc_html('')
 	);
 }
 if ( ! apply_filters( 'FHEE__EE_Ticket_Selector__display_ticket_selector_submit', false ) ) {

Spacing +15 added lines, -15 removed lines

@@ -20,7 +20,7 @@ 
 ?>
 <div id="tkt-slctr-tbl-wrap-dv-<?php echo $EVT_ID; ?>" class="tkt-slctr-tbl-wrap-dv">
 
-	<?php do_action( 'AHEE__ticket_selector_chart__template__before_ticket_selector', $event ); ?>
+	<?php do_action('AHEE__ticket_selector_chart__template__before_ticket_selector', $event); ?>
 	<?php echo $datetime_selector; ?>
 
 	<table id="tkt-slctr-tbl-<?php echo $EVT_ID; ?>" class="tkt-slctr-tbl">
@@ -35,7 +35,7 @@ 
                     );
                     ?>
 				</th>
-				<?php if ( apply_filters( 'FHEE__ticket_selector_chart_template__display_ticket_price_details', TRUE ) ) { ?>
+				<?php if (apply_filters('FHEE__ticket_selector_chart_template__display_ticket_price_details', TRUE)) { ?>
 				<th scope="col" class="ee-ticket-selector-ticket-price-th cntr">
 					<?php
 						/**
@@ -48,7 +48,7 @@ 
 						 */
 						echo apply_filters(
                             'FHEE__ticket_selector_chart_template__table_header_price',
-                            esc_html__( 'Price', 'event_espresso' ),
+                            esc_html__('Price', 'event_espresso'),
                             $EVT_ID
                         );
 					?>
@@ -66,7 +66,7 @@ 
 						*/
 						echo apply_filters(
                             'FHEE__ticket_selector_chart_template__table_header_qty',
-                            esc_html__( 'Qty', 'event_espresso' ),
+                            esc_html__('Qty', 'event_espresso'),
                             $EVT_ID
                         );
 					?>
@@ -74,34 +74,34 @@ 
 			</tr>
 		</thead>
 		<tbody>
-			<?php echo $ticket_row_html;?>
+			<?php echo $ticket_row_html; ?>
 		</tbody>
 	</table>
 	<?php
-	if ( $taxable_tickets && apply_filters( 'FHEE__ticket_selector_chart_template__display_ticket_price_details', true ) ) {
-		if ( $prices_displayed_including_taxes ) {
-			$ticket_price_includes_taxes = esc_html__( '* price includes taxes', 'event_espresso' );
+	if ($taxable_tickets && apply_filters('FHEE__ticket_selector_chart_template__display_ticket_price_details', true)) {
+		if ($prices_displayed_including_taxes) {
+			$ticket_price_includes_taxes = esc_html__('* price includes taxes', 'event_espresso');
 		} else {
-			$ticket_price_includes_taxes = esc_html__( '* price does not include taxes', 'event_espresso' );
+			$ticket_price_includes_taxes = esc_html__('* price does not include taxes', 'event_espresso');
 		}
-		echo '<p class="small-text lt-grey-text" style="text-align:right; margin: -1em 0 1em;">' . $ticket_price_includes_taxes . '</p>';
+		echo '<p class="small-text lt-grey-text" style="text-align:right; margin: -1em 0 1em;">'.$ticket_price_includes_taxes.'</p>';
 	}
 	?>
 
 	<input type="hidden" name="noheader" value="true" />
-	<input type="hidden" name="tkt-slctr-return-url-<?php echo $EVT_ID ?>" value="<?php echo EEH_URL::current_url() . $anchor_id; ?>" />
+	<input type="hidden" name="tkt-slctr-return-url-<?php echo $EVT_ID ?>" value="<?php echo EEH_URL::current_url().$anchor_id; ?>" />
 	<input type="hidden" name="tkt-slctr-rows-<?php echo $EVT_ID; ?>" value="<?php echo $row - 1; ?>" />
 	<input type="hidden" name="tkt-slctr-max-atndz-<?php echo $EVT_ID; ?>" value="<?php echo $max_atndz; ?>" />
 	<input type="hidden" name="tkt-slctr-event-id" value="<?php echo $EVT_ID; ?>" />
 
 <?php
-if ( $max_atndz > 0 ) {
+if ($max_atndz > 0) {
 	echo apply_filters(
 		'FHEE__ticket_selector_chart_template__maximum_tickets_purchased_footnote',
         esc_html('')
 	);
 }
-if ( ! apply_filters( 'FHEE__EE_Ticket_Selector__display_ticket_selector_submit', false ) ) {
-	add_filter( 'FHEE__EE_Ticket_Selector__no_ticket_selector_submit', '__return_true' );
+if ( ! apply_filters('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', false)) {
+	add_filter('FHEE__EE_Ticket_Selector__no_ticket_selector_submit', '__return_true');
 }
-do_action( 'AHEE__ticket_selector_chart__template__after_ticket_selector', $EVT_ID, $event );
\ No newline at end of file
+do_action('AHEE__ticket_selector_chart__template__after_ticket_selector', $EVT_ID, $event);
\ No newline at end of file

modules/ticket_selector/templates/ticket_details.template.php

Indentation +123 added lines, -123 removed lines

@@ -22,38 +22,38 @@ 
                 <p><?php echo $ticket->description(); ?></p>
 
                 <?php
-                do_action(
-                    'AHEE__ticket_selector_chart_template__ticket_details__after_description',
-                    $ticket,
-                    $ticket_price,
-                    $display_ticket_price
-                );
-                ?>
+				do_action(
+					'AHEE__ticket_selector_chart_template__ticket_details__after_description',
+					$ticket,
+					$ticket_price,
+					$display_ticket_price
+				);
+				?>
 
                 <section class="tckt-slctr-tkt-sale-dates-sctn">
                     <h5><?php echo apply_filters(
-                        'FHEE__ticket_selector_chart_template__ticket_details_sales_date_heading',
-                        esc_html__( 'Sale Dates', 'event_espresso' )
-                        ); ?>
+						'FHEE__ticket_selector_chart_template__ticket_details_sales_date_heading',
+						esc_html__( 'Sale Dates', 'event_espresso' )
+						); ?>
                     </h5>
                     <span class="drk-grey-text small-text no-bold"> - <?php echo apply_filters(
-                        'FHEE__ticket_selector_chart_template__ticket_details_dates_available_message',
-                        esc_html__( 'The dates when this option is available for purchase.', 'event_espresso' )
-                        ); ?></span>
+						'FHEE__ticket_selector_chart_template__ticket_details_dates_available_message',
+						esc_html__( 'The dates when this option is available for purchase.', 'event_espresso' )
+						); ?></span>
                     <br/>
                     <span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters(
-                        'FHEE__ticket_selector_chart_template__ticket_details_goes_on_sale',
-                        esc_html__( 'Goes On Sale:', 'event_espresso' )
-                        ); ?></span>
+						'FHEE__ticket_selector_chart_template__ticket_details_goes_on_sale',
+						esc_html__( 'Goes On Sale:', 'event_espresso' )
+						); ?></span>
                     <span class="dashicons dashicons-calendar"></span>
                     <?php echo $ticket->get_i18n_datetime('TKT_start_date', $date_format) . ' &nbsp; '; ?>
                     <span  class="dashicons dashicons-clock"></span>
                     <?php echo $ticket->get_i18n_datetime('TKT_start_date',$time_format); ?>
                     <br/>
                     <span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters(
-                        'FHEE__ticket_selector_chart_template__ticket_details_sales_end',
-                        esc_html__( 'Sales End:', 'event_espresso' )
-                        ); ?></span>
+						'FHEE__ticket_selector_chart_template__ticket_details_sales_end',
+						esc_html__( 'Sales End:', 'event_espresso' )
+						); ?></span>
                     <span class="dashicons dashicons-calendar"></span>
                     <?php echo $ticket->get_i18n_datetime('TKT_end_date', $date_format) . ' &nbsp; '; ?>
                     <span class="dashicons dashicons-clock"></span>
@@ -67,34 +67,34 @@ 
                 <?php if ( $ticket->min() && $ticket->max() ) { ?>
                     <section class="tckt-slctr-tkt-quantities-sctn">
                         <h5><?php echo apply_filters(
-                            'FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_heading',
-                            esc_html__( 'Purchasable Quantities', 'event_espresso' )
-                            ); ?></h5>
+							'FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_heading',
+							esc_html__( 'Purchasable Quantities', 'event_espresso' )
+							); ?></h5>
                         <span class="drk-grey-text small-text no-bold"> - <?php echo apply_filters(
-                            'FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_message',
-                            esc_html__(
-                            'The number of tickets that can be purchased per transaction (if available).',
-                            'event_espresso'
-                            )
-                            ); ?></span><br/>
+							'FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_message',
+							esc_html__(
+							'The number of tickets that can be purchased per transaction (if available).',
+							'event_espresso'
+							)
+							); ?></span><br/>
                         <span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters(
-                            'FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_min_qty',
-                            esc_html__( 'Minimum Qty:', 'event_espresso' )
-                            ); ?></span><?php echo $ticket->min() > 0 ? $ticket->min() : 0; ?>
+							'FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_min_qty',
+							esc_html__( 'Minimum Qty:', 'event_espresso' )
+							); ?></span><?php echo $ticket->min() > 0 ? $ticket->min() : 0; ?>
                         <?php if ( $ticket->min() > $remaining ) { ?> &nbsp; <span
                         class="important-notice small-text"><?php echo apply_filters(
-                        'FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_min_qty_message',
-                        esc_html__(
-                        'The Minimum Quantity purchasable for this ticket exceeds the number of spaces remaining',
-                        'event_espresso'
-                        )
-                        ); ?></span><?php } ?><br/>
+						'FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_min_qty_message',
+						esc_html__(
+						'The Minimum Quantity purchasable for this ticket exceeds the number of spaces remaining',
+						'event_espresso'
+						)
+						); ?></span><?php } ?><br/>
                         <?php //$max = min( $max, $max_atndz );?>
                         <span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters(
-                            'FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_max_qty',
-                            esc_html__( 'Maximum Qty:', 'event_espresso' )
-                            ); ?></span><?php echo $ticket->max() === EE_INF ? esc_html__( 'no limit', 'event_espresso' )
-                        : max( $ticket->max(), 1 ); ?><br/>
+							'FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_max_qty',
+							esc_html__( 'Maximum Qty:', 'event_espresso' )
+							); ?></span><?php echo $ticket->max() === EE_INF ? esc_html__( 'no limit', 'event_espresso' )
+						: max( $ticket->max(), 1 ); ?><br/>
                     </section>
                     <br/>
                 <?php } ?>
@@ -102,43 +102,43 @@ 
                 <?php if ( ( ! defined( 'EE_DECAF' ) || EE_DECAF !== true ) && $ticket->uses() !== EE_INF ) { ?>
                     <section class="tckt-slctr-tkt-uses-sctn">
                         <h5><?php echo apply_filters(
-                                'FHEE__ticket_selector_chart_template__ticket_details_event_date_ticket_uses_heading',
-                                esc_html__( 'Event Date Ticket Uses', 'event_espresso' )
-                            ); ?></h5>
+								'FHEE__ticket_selector_chart_template__ticket_details_event_date_ticket_uses_heading',
+								esc_html__( 'Event Date Ticket Uses', 'event_espresso' )
+							); ?></h5>
                         <span class="drk-grey-text small-text no-bold"> - <?php
-                            echo apply_filters(
-                            'FHEE__ticket_selector_chart_template__ticket_details_event_date_ticket_uses_message',
-                            sprintf(
-                                esc_html__(
-                                    'The number of separate event datetimes (see table below) that this ticket can be used to gain admittance to.%1$s%2$sAdmission is always one person per ticket.%3$s',
-                                    'event_espresso'
-                                ),
-                                '<br/>',
-                                '<strong>',
-                                '</strong>'
-                                )
-                            );
-                            ?></span><br/>
+							echo apply_filters(
+							'FHEE__ticket_selector_chart_template__ticket_details_event_date_ticket_uses_message',
+							sprintf(
+								esc_html__(
+									'The number of separate event datetimes (see table below) that this ticket can be used to gain admittance to.%1$s%2$sAdmission is always one person per ticket.%3$s',
+									'event_espresso'
+								),
+								'<br/>',
+								'<strong>',
+								'</strong>'
+								)
+							);
+							?></span><br/>
                         <span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters(
-                            'FHEE__ticket_selector_chart_template__ticket_details_event_date_number_datetimes',
-                            esc_html__( '# Datetimes:', 'event_espresso' )
-                            ); ?></span><?php echo $ticket->uses(); ?><br/>
+							'FHEE__ticket_selector_chart_template__ticket_details_event_date_number_datetimes',
+							esc_html__( '# Datetimes:', 'event_espresso' )
+							); ?></span><?php echo $ticket->uses(); ?><br/>
                     </section>
                 <?php } ?>
 
                 <?php
-                $datetimes = $ticket->datetimes_ordered( $event_is_expired, false );
-                $chart_column_width = $show_ticket_sale_columns ? ' ee-fourth-width' : ' ee-half-width';
-                if ( ! empty( $datetimes ) ) { ?>
+				$datetimes = $ticket->datetimes_ordered( $event_is_expired, false );
+				$chart_column_width = $show_ticket_sale_columns ? ' ee-fourth-width' : ' ee-half-width';
+				if ( ! empty( $datetimes ) ) { ?>
                     <section class="tckt-slctr-tkt-datetimes-sctn">
                         <h5><?php echo apply_filters(
-                            'FHEE__ticket_selector_chart_template__ticket_details_event_access_heading',
-                            esc_html__( 'Access', 'event_espresso' )
-                            ); ?></h5>
+							'FHEE__ticket_selector_chart_template__ticket_details_event_access_heading',
+							esc_html__( 'Access', 'event_espresso' )
+							); ?></h5>
                         <span class="drk-grey-text small-text no-bold"> - <?php echo apply_filters(
-                            'FHEE__ticket_selector_chart_template__ticket_details_event_access_message',
-                            esc_html__( 'This option allows access to the following dates and times.', 'event_espresso' )
-                            ); ?></span>
+							'FHEE__ticket_selector_chart_template__ticket_details_event_access_message',
+							esc_html__( 'This option allows access to the following dates and times.', 'event_espresso' )
+							); ?></span>
                         <div class="tckt-slctr-tkt-details-tbl-wrap-dv">
                             <table class="tckt-slctr-tkt-details-tbl">
                                 <thead>
@@ -146,9 +146,9 @@ 
                                     <th class="tckt-slctr-tkt-details-date-th">
                                         <span class="dashicons dashicons-calendar"></span><span
                                         class="small-text"><?php echo apply_filters(
-                                            'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_event_date',
-                                            esc_html__( 'Date ', 'event_espresso' )
-                                            ); ?></span>
+											'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_event_date',
+											esc_html__( 'Date ', 'event_espresso' )
+											); ?></span>
                                     </th>
                                     <th class="tckt-slctr-tkt-details-time-th <?php echo $chart_column_width; ?>">
                                         <span class="dashicons dashicons-clock"></span><span
@@ -157,98 +157,98 @@ 
                                     <?php if ( $show_ticket_sale_columns ) : ?>
                                         <th class="tckt-slctr-tkt-details-this-ticket-sold-th ee-fourth-width cntr">
                                             <span class="smaller-text"><?php echo apply_filters(
-                                                'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_sold',
-                                                sprintf( esc_html__( 'Sold', 'event_espresso' ), '<br/>' )
-                                                ); ?></span>
+												'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_sold',
+												sprintf( esc_html__( 'Sold', 'event_espresso' ), '<br/>' )
+												); ?></span>
                                         </th>
                                         <th class="tckt-slctr-tkt-details-this-ticket-left-th ee-fourth-width cntr">
                                             <span class="smaller-text"><?php echo apply_filters(
-                                                'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_left',
-                                                sprintf( esc_html__( 'Remaining', 'event_espresso' ), '<br/>' )
-                                                ); ?></span>
+												'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_left',
+												sprintf( esc_html__( 'Remaining', 'event_espresso' ), '<br/>' )
+												); ?></span>
                                         </th>
                                         <th
                                         class="tckt-slctr-tkt-details-total-tickets-sold-th ee-fourth-width cntr">
                                             <span class="smaller-text"><?php echo apply_filters(
-                                                'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_sold',
-                                                sprintf( esc_html__( 'Total%sSold', 'event_espresso' ), '<br/>' )
-                                                ); ?></span>
+												'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_sold',
+												sprintf( esc_html__( 'Total%sSold', 'event_espresso' ), '<br/>' )
+												); ?></span>
                                         </th>
                                         <th
                                         class="tckt-slctr-tkt-details-total-tickets-left-th ee-fourth-width cntr">
                                             <span class="smaller-text"><?php echo apply_filters(
-                                                'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_left',
-                                                sprintf( esc_html__( 'Total Spaces%sLeft', 'event_espresso' ), '<br/>' )
-                                                ); ?></span>
+												'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_left',
+												sprintf( esc_html__( 'Total Spaces%sLeft', 'event_espresso' ), '<br/>' )
+												); ?></span>
                                         </th>
                                     <?php endif; //end $show_ticket_sale_columns conditional ?>
                                 </tr>
                                 </thead>
                                 <tbody>
                                 <?php
-                                foreach ( $datetimes as $datetime ) {
-                                    if ( $datetime instanceof EE_Datetime ) {
-                                        ?>
+								foreach ( $datetimes as $datetime ) {
+									if ( $datetime instanceof EE_Datetime ) {
+										?>
 
                                         <tr>
                                             <td data-th="<?php echo apply_filters(
-                                            'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_event_date',
-                                            esc_html__( 'Event Date ', 'event_espresso' )
-                                            ); ?>" class="small-text">
+											'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_event_date',
+											esc_html__( 'Event Date ', 'event_espresso' )
+											); ?>" class="small-text">
                                                 <?php $datetime_name = $datetime->name(); ?>
                                                 <?php echo ! empty( $datetime_name ) ? '<b>'
-                                                                                       . $datetime_name
-                                                                                       . '</b><br/>' : ''; ?>
+																					   . $datetime_name
+																					   . '</b><br/>' : ''; ?>
                                                 <?php echo $datetime->date_range(
-                                                $date_format,
-                                                esc_html__( ' to  ', 'event_espresso' )
-                                                ); ?>
+												$date_format,
+												esc_html__( ' to  ', 'event_espresso' )
+												); ?>
                                             </td>
                                             <td data-th="<?php esc_html_e( 'Time ', 'event_espresso' ); ?>"
                                                 class="cntr small-text">
                                                 <?php echo $datetime->time_range(
-                                                $time_format,
-                                                esc_html__( ' to  ', 'event_espresso' )
-                                                ); ?>
+												$time_format,
+												esc_html__( ' to  ', 'event_espresso' )
+												); ?>
                                             </td>
                                             <?php if ( $show_ticket_sale_columns ) : ?>
                                                 <td data-th="<?php echo apply_filters(
-                                                'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_sold',
-                                                esc_html__( 'Sold', 'event_espresso' )
-                                                ); ?>" class="cntr small-text">
+												'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_sold',
+												esc_html__( 'Sold', 'event_espresso' )
+												); ?>" class="cntr small-text">
                                                     <?php echo $ticket->sold(); ?>
                                                 </td>
                                                 <td data-th="<?php echo apply_filters(
-                                                'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_left',
-                                                esc_html__( 'Remaining', 'event_espresso' )
-                                                ); ?>" class="cntr small-text">
+												'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_left',
+												esc_html__( 'Remaining', 'event_espresso' )
+												); ?>" class="cntr small-text">
                                                     <?php echo $remaining === EE_INF
-                                                    ? '<span class="smaller-text">' . esc_html__(
-                                                    'unlimited ',
-                                                    'event_espresso'
-                                                    ) . '</span>' : $remaining; ?>
+													? '<span class="smaller-text">' . esc_html__(
+													'unlimited ',
+													'event_espresso'
+													) . '</span>' : $remaining; ?>
                                                 </td>
                                                 <td data-th="<?php echo apply_filters(
-                                                'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_sold',
-                                                esc_html__( 'Total Sold', 'event_espresso' )
-                                                ); ?>" class="cntr small-text">
+												'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_sold',
+												esc_html__( 'Total Sold', 'event_espresso' )
+												); ?>" class="cntr small-text">
                                                     <?php echo $datetime->sold(); ?>
                                                 </td>
                                                 <?php $tkts_left = $datetime->sold_out()
-                                                ? '<span class="sold-out smaller-text">' . esc_html__(
-                                                'Sold&nbsp;Out',
-                                                'event_espresso'
-                                                ) . '</span>' : $datetime->spaces_remaining(); ?>
+												? '<span class="sold-out smaller-text">' . esc_html__(
+												'Sold&nbsp;Out',
+												'event_espresso'
+												) . '</span>' : $datetime->spaces_remaining(); ?>
                                                 <td data-th="<?php echo apply_filters(
-                                                'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_left',
-                                                esc_html__( 'Total Spaces Left', 'event_espresso' )
-                                                ); ?>" class="cntr small-text">
+												'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_left',
+												esc_html__( 'Total Spaces Left', 'event_espresso' )
+												); ?>" class="cntr small-text">
                                                     <?php echo $tkts_left === EE_INF ? '<span class="smaller-text">'
-                                                                                       . esc_html__(
-                                                                                       'unlimited ',
-                                                                                       'event_espresso'
-                                                                                       )
-                                                                                       . '</span>' : $tkts_left; ?>
+																					   . esc_html__(
+																					   'unlimited ',
+																					   'event_espresso'
+																					   )
+																					   . '</span>' : $tkts_left; ?>
                                                 </td>
                                             <?php endif; //end $show_ticket_sale_columns conditional ?>
                                         </tr>

Spacing +48 added lines, -48 removed lines

@@ -12,13 +12,13 @@ 
 /** @var string $price_breakdown_heading */
 /** @var \EventEspresso\modules\ticket_selector\TicketDetails $ticket_details */
 ?>
-<?php if ( $show_ticket_details ) : ?>
+<?php if ($show_ticket_details) : ?>
 <tr class="tckt-slctr-tkt-details-tr <?php echo $ticket_details_row_class; ?>">
     <td class="tckt-slctr-tkt-details-td" colspan="<?php echo $cols; ?>">
         <div id="<?php echo $ticket_details_css_id; ?>-dv" class="tckt-slctr-tkt-details-dv" style="display: none;">
 
             <section class="tckt-slctr-tkt-details-sctn">
-                <h3><?php echo esc_html__( 'Details', 'event_espresso' ); ?></h3>
+                <h3><?php echo esc_html__('Details', 'event_espresso'); ?></h3>
                 <p><?php echo $ticket->description(); ?></p>
 
                 <?php
@@ -33,42 +33,42 @@ 
                 <section class="tckt-slctr-tkt-sale-dates-sctn">
                     <h5><?php echo apply_filters(
                         'FHEE__ticket_selector_chart_template__ticket_details_sales_date_heading',
-                        esc_html__( 'Sale Dates', 'event_espresso' )
+                        esc_html__('Sale Dates', 'event_espresso')
                         ); ?>
                     </h5>
                     <span class="drk-grey-text small-text no-bold"> - <?php echo apply_filters(
                         'FHEE__ticket_selector_chart_template__ticket_details_dates_available_message',
-                        esc_html__( 'The dates when this option is available for purchase.', 'event_espresso' )
+                        esc_html__('The dates when this option is available for purchase.', 'event_espresso')
                         ); ?></span>
                     <br/>
                     <span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters(
                         'FHEE__ticket_selector_chart_template__ticket_details_goes_on_sale',
-                        esc_html__( 'Goes On Sale:', 'event_espresso' )
+                        esc_html__('Goes On Sale:', 'event_espresso')
                         ); ?></span>
                     <span class="dashicons dashicons-calendar"></span>
-                    <?php echo $ticket->get_i18n_datetime('TKT_start_date', $date_format) . ' &nbsp; '; ?>
+                    <?php echo $ticket->get_i18n_datetime('TKT_start_date', $date_format).' &nbsp; '; ?>
                     <span  class="dashicons dashicons-clock"></span>
-                    <?php echo $ticket->get_i18n_datetime('TKT_start_date',$time_format); ?>
+                    <?php echo $ticket->get_i18n_datetime('TKT_start_date', $time_format); ?>
                     <br/>
                     <span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters(
                         'FHEE__ticket_selector_chart_template__ticket_details_sales_end',
-                        esc_html__( 'Sales End:', 'event_espresso' )
+                        esc_html__('Sales End:', 'event_espresso')
                         ); ?></span>
                     <span class="dashicons dashicons-calendar"></span>
-                    <?php echo $ticket->get_i18n_datetime('TKT_end_date', $date_format) . ' &nbsp; '; ?>
+                    <?php echo $ticket->get_i18n_datetime('TKT_end_date', $date_format).' &nbsp; '; ?>
                     <span class="dashicons dashicons-clock"></span>
                     <?php echo $ticket->get_i18n_datetime('TKT_end_date', $time_format); ?>
                     <br/>
                 </section>
                 <br/>
 
-                <?php do_action( 'AHEE__ticket_selector_chart_template__after_ticket_date', $ticket ); ?>
+                <?php do_action('AHEE__ticket_selector_chart_template__after_ticket_date', $ticket); ?>
 
-                <?php if ( $ticket->min() && $ticket->max() ) { ?>
+                <?php if ($ticket->min() && $ticket->max()) { ?>
                     <section class="tckt-slctr-tkt-quantities-sctn">
                         <h5><?php echo apply_filters(
                             'FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_heading',
-                            esc_html__( 'Purchasable Quantities', 'event_espresso' )
+                            esc_html__('Purchasable Quantities', 'event_espresso')
                             ); ?></h5>
                         <span class="drk-grey-text small-text no-bold"> - <?php echo apply_filters(
                             'FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_message',
@@ -79,9 +79,9 @@ 
                             ); ?></span><br/>
                         <span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters(
                             'FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_min_qty',
-                            esc_html__( 'Minimum Qty:', 'event_espresso' )
+                            esc_html__('Minimum Qty:', 'event_espresso')
                             ); ?></span><?php echo $ticket->min() > 0 ? $ticket->min() : 0; ?>
-                        <?php if ( $ticket->min() > $remaining ) { ?> &nbsp; <span
+                        <?php if ($ticket->min() > $remaining) { ?> &nbsp; <span
                         class="important-notice small-text"><?php echo apply_filters(
                         'FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_min_qty_message',
                         esc_html__(
@@ -92,18 +92,18 @@ 
                         <?php //$max = min( $max, $max_atndz );?>
                         <span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters(
                             'FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_max_qty',
-                            esc_html__( 'Maximum Qty:', 'event_espresso' )
-                            ); ?></span><?php echo $ticket->max() === EE_INF ? esc_html__( 'no limit', 'event_espresso' )
-                        : max( $ticket->max(), 1 ); ?><br/>
+                            esc_html__('Maximum Qty:', 'event_espresso')
+                            ); ?></span><?php echo $ticket->max() === EE_INF ? esc_html__('no limit', 'event_espresso')
+                        : max($ticket->max(), 1); ?><br/>
                     </section>
                     <br/>
                 <?php } ?>
 
-                <?php if ( ( ! defined( 'EE_DECAF' ) || EE_DECAF !== true ) && $ticket->uses() !== EE_INF ) { ?>
+                <?php if (( ! defined('EE_DECAF') || EE_DECAF !== true) && $ticket->uses() !== EE_INF) { ?>
                     <section class="tckt-slctr-tkt-uses-sctn">
                         <h5><?php echo apply_filters(
                                 'FHEE__ticket_selector_chart_template__ticket_details_event_date_ticket_uses_heading',
-                                esc_html__( 'Event Date Ticket Uses', 'event_espresso' )
+                                esc_html__('Event Date Ticket Uses', 'event_espresso')
                             ); ?></h5>
                         <span class="drk-grey-text small-text no-bold"> - <?php
                             echo apply_filters(
@@ -121,23 +121,23 @@ 
                             ?></span><br/>
                         <span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters(
                             'FHEE__ticket_selector_chart_template__ticket_details_event_date_number_datetimes',
-                            esc_html__( '# Datetimes:', 'event_espresso' )
+                            esc_html__('# Datetimes:', 'event_espresso')
                             ); ?></span><?php echo $ticket->uses(); ?><br/>
                     </section>
                 <?php } ?>
 
                 <?php
-                $datetimes = $ticket->datetimes_ordered( $event_is_expired, false );
+                $datetimes = $ticket->datetimes_ordered($event_is_expired, false);
                 $chart_column_width = $show_ticket_sale_columns ? ' ee-fourth-width' : ' ee-half-width';
-                if ( ! empty( $datetimes ) ) { ?>
+                if ( ! empty($datetimes)) { ?>
                     <section class="tckt-slctr-tkt-datetimes-sctn">
                         <h5><?php echo apply_filters(
                             'FHEE__ticket_selector_chart_template__ticket_details_event_access_heading',
-                            esc_html__( 'Access', 'event_espresso' )
+                            esc_html__('Access', 'event_espresso')
                             ); ?></h5>
                         <span class="drk-grey-text small-text no-bold"> - <?php echo apply_filters(
                             'FHEE__ticket_selector_chart_template__ticket_details_event_access_message',
-                            esc_html__( 'This option allows access to the following dates and times.', 'event_espresso' )
+                            esc_html__('This option allows access to the following dates and times.', 'event_espresso')
                             ); ?></span>
                         <div class="tckt-slctr-tkt-details-tbl-wrap-dv">
                             <table class="tckt-slctr-tkt-details-tbl">
@@ -147,38 +147,38 @@ 
                                         <span class="dashicons dashicons-calendar"></span><span
                                         class="small-text"><?php echo apply_filters(
                                             'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_event_date',
-                                            esc_html__( 'Date ', 'event_espresso' )
+                                            esc_html__('Date ', 'event_espresso')
                                             ); ?></span>
                                     </th>
                                     <th class="tckt-slctr-tkt-details-time-th <?php echo $chart_column_width; ?>">
                                         <span class="dashicons dashicons-clock"></span><span
-                                        class="small-text"><?php esc_html_e( 'Time ', 'event_espresso' ); ?></span>
+                                        class="small-text"><?php esc_html_e('Time ', 'event_espresso'); ?></span>
                                     </th>
-                                    <?php if ( $show_ticket_sale_columns ) : ?>
+                                    <?php if ($show_ticket_sale_columns) : ?>
                                         <th class="tckt-slctr-tkt-details-this-ticket-sold-th ee-fourth-width cntr">
                                             <span class="smaller-text"><?php echo apply_filters(
                                                 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_sold',
-                                                sprintf( esc_html__( 'Sold', 'event_espresso' ), '<br/>' )
+                                                sprintf(esc_html__('Sold', 'event_espresso'), '<br/>')
                                                 ); ?></span>
                                         </th>
                                         <th class="tckt-slctr-tkt-details-this-ticket-left-th ee-fourth-width cntr">
                                             <span class="smaller-text"><?php echo apply_filters(
                                                 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_left',
-                                                sprintf( esc_html__( 'Remaining', 'event_espresso' ), '<br/>' )
+                                                sprintf(esc_html__('Remaining', 'event_espresso'), '<br/>')
                                                 ); ?></span>
                                         </th>
                                         <th
                                         class="tckt-slctr-tkt-details-total-tickets-sold-th ee-fourth-width cntr">
                                             <span class="smaller-text"><?php echo apply_filters(
                                                 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_sold',
-                                                sprintf( esc_html__( 'Total%sSold', 'event_espresso' ), '<br/>' )
+                                                sprintf(esc_html__('Total%sSold', 'event_espresso'), '<br/>')
                                                 ); ?></span>
                                         </th>
                                         <th
                                         class="tckt-slctr-tkt-details-total-tickets-left-th ee-fourth-width cntr">
                                             <span class="smaller-text"><?php echo apply_filters(
                                                 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_left',
-                                                sprintf( esc_html__( 'Total Spaces%sLeft', 'event_espresso' ), '<br/>' )
+                                                sprintf(esc_html__('Total Spaces%sLeft', 'event_espresso'), '<br/>')
                                                 ); ?></span>
                                         </th>
                                     <?php endif; //end $show_ticket_sale_columns conditional ?>
@@ -186,62 +186,62 @@ 
                                 </thead>
                                 <tbody>
                                 <?php
-                                foreach ( $datetimes as $datetime ) {
-                                    if ( $datetime instanceof EE_Datetime ) {
+                                foreach ($datetimes as $datetime) {
+                                    if ($datetime instanceof EE_Datetime) {
                                         ?>
 
                                         <tr>
                                             <td data-th="<?php echo apply_filters(
                                             'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_event_date',
-                                            esc_html__( 'Event Date ', 'event_espresso' )
+                                            esc_html__('Event Date ', 'event_espresso')
                                             ); ?>" class="small-text">
                                                 <?php $datetime_name = $datetime->name(); ?>
-                                                <?php echo ! empty( $datetime_name ) ? '<b>'
+                                                <?php echo ! empty($datetime_name) ? '<b>'
                                                                                        . $datetime_name
                                                                                        . '</b><br/>' : ''; ?>
                                                 <?php echo $datetime->date_range(
                                                 $date_format,
-                                                esc_html__( ' to  ', 'event_espresso' )
+                                                esc_html__(' to  ', 'event_espresso')
                                                 ); ?>
                                             </td>
-                                            <td data-th="<?php esc_html_e( 'Time ', 'event_espresso' ); ?>"
+                                            <td data-th="<?php esc_html_e('Time ', 'event_espresso'); ?>"
                                                 class="cntr small-text">
                                                 <?php echo $datetime->time_range(
                                                 $time_format,
-                                                esc_html__( ' to  ', 'event_espresso' )
+                                                esc_html__(' to  ', 'event_espresso')
                                                 ); ?>
                                             </td>
-                                            <?php if ( $show_ticket_sale_columns ) : ?>
+                                            <?php if ($show_ticket_sale_columns) : ?>
                                                 <td data-th="<?php echo apply_filters(
                                                 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_sold',
-                                                esc_html__( 'Sold', 'event_espresso' )
+                                                esc_html__('Sold', 'event_espresso')
                                                 ); ?>" class="cntr small-text">
                                                     <?php echo $ticket->sold(); ?>
                                                 </td>
                                                 <td data-th="<?php echo apply_filters(
                                                 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_left',
-                                                esc_html__( 'Remaining', 'event_espresso' )
+                                                esc_html__('Remaining', 'event_espresso')
                                                 ); ?>" class="cntr small-text">
                                                     <?php echo $remaining === EE_INF
-                                                    ? '<span class="smaller-text">' . esc_html__(
+                                                    ? '<span class="smaller-text">'.esc_html__(
                                                     'unlimited ',
                                                     'event_espresso'
-                                                    ) . '</span>' : $remaining; ?>
+                                                    ).'</span>' : $remaining; ?>
                                                 </td>
                                                 <td data-th="<?php echo apply_filters(
                                                 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_sold',
-                                                esc_html__( 'Total Sold', 'event_espresso' )
+                                                esc_html__('Total Sold', 'event_espresso')
                                                 ); ?>" class="cntr small-text">
                                                     <?php echo $datetime->sold(); ?>
                                                 </td>
                                                 <?php $tkts_left = $datetime->sold_out()
-                                                ? '<span class="sold-out smaller-text">' . esc_html__(
+                                                ? '<span class="sold-out smaller-text">'.esc_html__(
                                                 'Sold&nbsp;Out',
                                                 'event_espresso'
-                                                ) . '</span>' : $datetime->spaces_remaining(); ?>
+                                                ).'</span>' : $datetime->spaces_remaining(); ?>
                                                 <td data-th="<?php echo apply_filters(
                                                 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_left',
-                                                esc_html__( 'Total Spaces Left', 'event_espresso' )
+                                                esc_html__('Total Spaces Left', 'event_espresso')
                                                 ); ?>" class="cntr small-text">
                                                     <?php echo $tkts_left === EE_INF ? '<span class="smaller-text">'
                                                                                        . esc_html__(
@@ -266,4 +266,4 @@ 
         </div>
     </td>
 </tr>
-<?php endif;  //end template_settings->show_ticket_details check?>
\ No newline at end of file
+<?php endif; //end template_settings->show_ticket_details check?>
\ No newline at end of file

caffeinated/modules/ticket_selector_caff/templates/ticket_selector_price_details.template.php

Indentation +15 added lines, -15 removed lines

@@ -7,7 +7,7 @@ 
 if ($display_ticket_price) { ?>
     <section class="tckt-slctr-tkt-price-sctn">
         <h5><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_price_breakdown_heading',
-                esc_html__('Price', 'event_espresso')); ?></h5>
+				esc_html__('Price', 'event_espresso')); ?></h5>
         <div class="tckt-slctr-tkt-details-tbl-wrap-dv">
             <table class="tckt-slctr-tkt-details-tbl">
                 <thead>
@@ -30,12 +30,12 @@ 
                             class="jst-rght small-text"><?php echo $ticket->base_price()->pretty_price(); ?></td>
                     </tr>
                     <?php
-                    $running_total = $ticket->base_price()->amount();
-                } else {
-                    $running_total = 0;
-                }
-                // now add price modifiers
-                foreach ($ticket->price_modifiers() as $price_mod) { ?>
+					$running_total = $ticket->base_price()->amount();
+				} else {
+					$running_total = 0;
+				}
+				// now add price modifiers
+				foreach ($ticket->price_modifiers() as $price_mod) { ?>
                     <tr>
                         <td data-th="<?php esc_html_e('Name', 'event_espresso'); ?>"
                             class="jst-rght small-text"><?php echo $price_mod->name(); ?></td>
@@ -45,16 +45,16 @@ 
                                 %
                             </td>
                             <?php
-                            $new_sub_total = $running_total * ($price_mod->amount() / 100);
-                            $new_sub_total = $price_mod->is_discount() ? $new_sub_total * -1 : $new_sub_total;
-                            ?>
+							$new_sub_total = $running_total * ($price_mod->amount() / 100);
+							$new_sub_total = $price_mod->is_discount() ? $new_sub_total * -1 : $new_sub_total;
+							?>
                         <?php } else { ?>
                             <?php $new_sub_total = $price_mod->is_discount() ? $price_mod->amount() * -1
-                                : $price_mod->amount(); ?>
+								: $price_mod->amount(); ?>
                             <td data-th="<?php esc_html_e('Description', 'event_espresso'); ?>"
                                 class="small-text"><?php echo $price_mod->desc(); ?></td>
                             <?php $new_sub_total = $price_mod->is_discount() ? $price_mod->amount() * -1
-                                : $price_mod->amount(); ?>
+								: $price_mod->amount(); ?>
                         <?php } ?>
                         <td data-th="<?php esc_html_e('Amount', 'event_espresso'); ?>"
                             class="jst-rght small-text"><?php echo EEH_Template::format_currency($new_sub_total); ?></td>
@@ -65,7 +65,7 @@ 
                     <?php //$ticket_subtotal =$ticket->get_ticket_subtotal(); ?>
                     <tr>
                         <td colspan="2" class="jst-rght small-text sbttl"><b><?php esc_html_e('subtotal',
-                                    'event_espresso'); ?></b></td>
+									'event_espresso'); ?></b></td>
                         <td data-th="<?php esc_html_e('subtotal', 'event_espresso'); ?>" class="jst-rght small-text">
                             <b><?php echo EEH_Template::format_currency($running_total); ?></b></td>
                     </tr>
@@ -87,9 +87,9 @@ 
                 <tr>
                     <td colspan="2" class="jst-rght small-text ttl-lbl-td">
                         <b><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_total_price',
-                                esc_html__('Total', 'event_espresso')); ?></b></td>
+								esc_html__('Total', 'event_espresso')); ?></b></td>
                     <td data-th="<?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_total_price',
-                        esc_html__('Total', 'event_espresso')); ?>" class="jst-rght small-text">
+						esc_html__('Total', 'event_espresso')); ?>" class="jst-rght small-text">
                         <b><?php echo EEH_Template::format_currency($running_total); ?></b></td>
                 </tr>
                 </tbody>

core/EE_Front_Controller.core.php

Indentation +690 added lines, -690 removed lines

@@ -1,5 +1,5 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 /**
@@ -22,695 +22,695 @@ 
 final class EE_Front_Controller
 {
 
-    /**
-     *    $_template_path
-     * @var    string $_template_path
-     * @access    public
-     */
-    private $_template_path;
-
-    /**
-     *    $_template
-     * @var    string $_template
-     * @access    public
-     */
-    private $_template;
-
-    /**
-     * @type  EE_Registry $Registry
-     * @access    protected
-     */
-    protected $Registry;
-
-    /**
-     * @type  EE_Request_Handler $Request_Handler
-     * @access    protected
-     */
-    protected $Request_Handler;
-
-    /**
-     * @type  EE_Module_Request_Router $Module_Request_Router
-     * @access    protected
-     */
-    protected $Module_Request_Router;
-
-
-    /**
-     *    class constructor
-     *    should fire after shortcode, module, addon, or other plugin's default priority init phases have run
-     *
-     * @access    public
-     * @param \EE_Registry              $Registry
-     * @param \EE_Request_Handler       $Request_Handler
-     * @param \EE_Module_Request_Router $Module_Request_Router
-     */
-    public function __construct(
-        EE_Registry $Registry,
-        EE_Request_Handler $Request_Handler,
-        EE_Module_Request_Router $Module_Request_Router
-    ) {
-        $this->Registry              = $Registry;
-        $this->Request_Handler       = $Request_Handler;
-        $this->Module_Request_Router = $Module_Request_Router;
-        // make sure template tags are loaded immediately so that themes don't break
-        add_action('AHEE__EE_System__core_loaded_and_ready', array($this, 'load_espresso_template_tags'), 10);
-        // determine how to integrate WP_Query with the EE models
-        add_action('AHEE__EE_System__initialize', array($this, 'employ_CPT_Strategy'));
-        // load other resources and begin to actually run shortcodes and modules
-        add_action('wp_loaded', array($this, 'wp_loaded'), 5);
-        // analyse the incoming WP request
-        add_action('parse_request', array($this, 'get_request'), 1, 1);
-        // process any content shortcodes
-        add_action('parse_request', array($this, '_initialize_shortcodes'), 5);
-        // process request with module factory
-        add_action('pre_get_posts', array($this, 'pre_get_posts'), 10, 1);
-        // before headers sent
-        add_action('wp', array($this, 'wp'), 5);
-        // load css and js
-        add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 1);
-        // header
-        add_action('wp_head', array($this, 'header_meta_tag'), 5);
-        add_action('wp_print_scripts', array($this, 'wp_print_scripts'), 10);
-        add_filter('template_include', array($this, 'template_include'), 1);
-        // display errors
-        add_action('loop_start', array($this, 'display_errors'), 2);
-        // the content
-        // add_filter( 'the_content', array( $this, 'the_content' ), 5, 1 );
-        //exclude our private cpt comments
-        add_filter('comments_clauses', array($this, 'filter_wp_comments'), 10, 1);
-        //make sure any ajax requests will respect the url schema when requests are made against admin-ajax.php (http:// or https://)
-        add_filter('admin_url', array($this, 'maybe_force_admin_ajax_ssl'), 200, 1);
-        // action hook EE
-        do_action('AHEE__EE_Front_Controller__construct__done', $this);
-        // for checking that browser cookies are enabled
-        if (apply_filters('FHEE__EE_Front_Controller____construct__set_test_cookie', true)) {
-            setcookie('ee_cookie_test', uniqid(), time() + 24 * HOUR_IN_SECONDS, '/');
-        }
-    }
-
-
-    /**
-     * @return EE_Request_Handler
-     */
-    public function Request_Handler()
-    {
-        return $this->Request_Handler;
-    }
-
-
-    /**
-     * @return EE_Module_Request_Router
-     */
-    public function Module_Request_Router()
-    {
-        return $this->Module_Request_Router;
-    }
-
-
-
-
-
-    /***********************************************        INIT ACTION HOOK         ***********************************************/
-
-
-    /**
-     *    load_espresso_template_tags - if current theme is an espresso theme, or uses ee theme template parts, then
-     *    load it's functions.php file ( if not already loaded )
-     *
-     * @return void
-     */
-    public function load_espresso_template_tags()
-    {
-        if (is_readable(EE_PUBLIC . 'template_tags.php')) {
-            require_once(EE_PUBLIC . 'template_tags.php');
-        }
-    }
-
-
-    /**
-     * filter_wp_comments
-     * This simply makes sure that any "private" EE CPTs do not have their comments show up in any wp comment
-     * widgets/queries done on frontend
-     *
-     * @param  array $clauses array of comment clauses setup by WP_Comment_Query
-     * @return array array of comment clauses with modifications.
-     */
-    public function filter_wp_comments($clauses)
-    {
-        global $wpdb;
-        if (strpos($clauses['join'], $wpdb->posts) !== false) {
-            $cpts = EE_Register_CPTs::get_private_CPTs();
-            foreach ($cpts as $cpt => $details) {
-                $clauses['where'] .= $wpdb->prepare(" AND $wpdb->posts.post_type != %s", $cpt);
-            }
-        }
-        return $clauses;
-    }
-
-
-    /**
-     *    employ_CPT_Strategy
-     *
-     * @access    public
-     * @return    void
-     */
-    public function employ_CPT_Strategy()
-    {
-        if (apply_filters('FHEE__EE_Front_Controller__employ_CPT_Strategy', true)) {
-            $this->Registry->load_core('CPT_Strategy');
-        }
-    }
-
-
-    /**
-     * this just makes sure that if the site is using ssl that we force that for any admin ajax calls from frontend
-     *
-     * @param  string $url incoming url
-     * @return string         final assembled url
-     */
-    public function maybe_force_admin_ajax_ssl($url)
-    {
-        if (is_ssl() && preg_match('/admin-ajax.php/', $url)) {
-            $url = str_replace('http://', 'https://', $url);
-        }
-        return $url;
-    }
-
-
-
-
-
-
-    /***********************************************        WP_LOADED ACTION HOOK         ***********************************************/
-
-
-    /**
-     *    wp_loaded - should fire after shortcode, module, addon, or other plugin's have been registered and their
-     *    default priority init phases have run
-     *
-     * @access    public
-     * @return    void
-     */
-    public function wp_loaded()
-    {
-    }
-
-
-
-
-
-    /***********************************************        PARSE_REQUEST HOOK         ***********************************************/
-    /**
-     *    _get_request
-     *
-     * @access public
-     * @param WP $WP
-     * @return void
-     */
-    public function get_request(WP $WP)
-    {
-        do_action('AHEE__EE_Front_Controller__get_request__start');
-        $this->Request_Handler->parse_request($WP);
-        do_action('AHEE__EE_Front_Controller__get_request__complete');
-    }
-
-
-    /**
-     *    _initialize_shortcodes - calls init method on shortcodes that have been determined to be in the_content for
-     *    the currently requested page
-     *
-     * @access    public
-     * @param WP $WP
-     * @return    void
-     */
-    public function _initialize_shortcodes(WP $WP)
-    {
-        do_action('AHEE__EE_Front_Controller__initialize_shortcodes__begin', $WP, $this);
-        $this->Request_Handler->set_request_vars($WP);
-        // grab post_name from request
-        $current_post  = apply_filters('FHEE__EE_Front_Controller__initialize_shortcodes__current_post_name',
-            $this->Request_Handler->get('post_name'));
-        $show_on_front = get_option('show_on_front');
-        // if it's not set, then check if frontpage is blog
-        if (empty($current_post)) {
-            // yup.. this is the posts page, prepare to load all shortcode modules
-            $current_post = 'posts';
-            // unless..
-            if ($show_on_front === 'page') {
-                // some other page is set as the homepage
-                $page_on_front = get_option('page_on_front');
-                if ($page_on_front) {
-                    // k now we need to find the post_name for this page
-                    global $wpdb;
-                    $page_on_front = $wpdb->get_var(
-                        $wpdb->prepare(
-                            "SELECT post_name from $wpdb->posts WHERE post_type='page' AND post_status='publish' AND ID=%d",
-                            $page_on_front
-                        )
-                    );
-                    // set the current post slug to what it actually is
-                    $current_post = $page_on_front ? $page_on_front : $current_post;
-                }
-            }
-        }
-        // where are posts being displayed ?
-        $page_for_posts = EE_Config::get_page_for_posts();
-        // in case $current_post is hierarchical like: /parent-page/current-page
-        $current_post = basename($current_post);
-        // are we on a category page?
-        $term_exists = is_array(term_exists($current_post, 'category')) || array_key_exists('category_name',
-                $WP->query_vars);
-        // make sure shortcodes are set
-        if (isset($this->Registry->CFG->core->post_shortcodes)) {
-            if ( ! isset($this->Registry->CFG->core->post_shortcodes[$page_for_posts])) {
-                $this->Registry->CFG->core->post_shortcodes[$page_for_posts] = array();
-            }
-            // cycle thru all posts with shortcodes set
-            foreach ($this->Registry->CFG->core->post_shortcodes as $post_name => $post_shortcodes) {
-                // filter shortcodes so
-                $post_shortcodes = apply_filters('FHEE__Front_Controller__initialize_shortcodes__post_shortcodes',
-                    $post_shortcodes);
-                // now cycle thru shortcodes
-                foreach ($post_shortcodes as $shortcode_class => $post_id) {
-                    // are we on this page, or on the blog page, or an EE CPT category page ?
-                    if ($current_post === $post_name || $term_exists) {
-                        // maybe init the shortcode
-                        $this->initialize_shortcode_if_active_on_page(
-                            $shortcode_class,
-                            $current_post,
-                            $page_for_posts,
-                            $post_id,
-                            $term_exists,
-                            $WP
-                        );
-                        // if this is NOT the "Posts page" and we have a valid entry
-                        // for the "Posts page" in our tracked post_shortcodes array
-                        // but the shortcode is not being tracked for this page
-                    } else if (
-                        $post_name !== $page_for_posts
-                        && isset($this->Registry->CFG->core->post_shortcodes[$page_for_posts])
-                        && ! isset($this->Registry->CFG->core->post_shortcodes[$page_for_posts][$shortcode_class])
-                    ) {
-                        // then remove the "fallback" shortcode processor
-                        remove_shortcode($shortcode_class);
-                    }
-                }
-            }
-        }
-        do_action('AHEE__EE_Front_Controller__initialize_shortcodes__end', $this);
-    }
-
-
-    /**
-     * @param string $shortcode_class
-     * @param string $current_post
-     * @param string $page_for_posts
-     * @param int    $post_id
-     * @param bool   $term_exists
-     * @param WP     $WP
-     */
-    protected function initialize_shortcode_if_active_on_page(
-        $shortcode_class,
-        $current_post,
-        $page_for_posts,
-        $post_id,
-        $term_exists,
-        $WP
-    ) {
-        // verify shortcode is in list of registered shortcodes
-        if ( ! isset($this->Registry->shortcodes->{$shortcode_class})) {
-            if ($current_post !== $page_for_posts && current_user_can('edit_post', $post_id)) {
-                EE_Error::add_error(
-                    sprintf(
-                        __(
-                            'The [%s] shortcode has not been properly registered or the corresponding addon/module is not active for some reason. Either fix/remove the shortcode from the post, or activate the addon/module the shortcode is associated with.',
-                            'event_espresso'
-                        ),
-                        $shortcode_class
-                    ),
-                    __FILE__,
-                    __FUNCTION__,
-                    __LINE__
-                );
-                add_filter('FHEE_run_EE_the_content', '__return_true');
-            }
-            add_shortcode($shortcode_class, array('EES_Shortcode', 'invalid_shortcode_processor'));
-            return;
-        }
-        // is this : a shortcodes set exclusively for this post, or for the home page, or a category, or a taxonomy ?
-        if (
-            $term_exists
-            || $current_post === $page_for_posts
-            || isset($this->Registry->CFG->core->post_shortcodes[$current_post])
-        ) {
-            // let's pause to reflect on this...
-            $sc_reflector = new ReflectionClass('EES_' . $shortcode_class);
-            // ensure that class is actually a shortcode
-            if (
-                defined('WP_DEBUG')
-                && WP_DEBUG === true
-                && ! $sc_reflector->isSubclassOf('EES_Shortcode')
-            ) {
-                EE_Error::add_error(
-                    sprintf(
-                        __(
-                            'The requested %s shortcode is not of the class "EES_Shortcode". Please check your files.',
-                            'event_espresso'
-                        ),
-                        $shortcode_class
-                    ),
-                    __FILE__,
-                    __FUNCTION__,
-                    __LINE__
-                );
-                add_filter('FHEE_run_EE_the_content', '__return_true');
-                return;
-            }
-            // and pass the request object to the run method
-            $this->Registry->shortcodes->{$shortcode_class} = $sc_reflector->newInstance();
-            // fire the shortcode class's run method, so that it can activate resources
-            $this->Registry->shortcodes->{$shortcode_class}->run($WP);
-        }
-    }
-
-
-    /**
-     *    pre_get_posts - basically a module factory for instantiating modules and selecting the final view template
-     *
-     * @access    public
-     * @param   WP_Query $WP_Query
-     * @return    void
-     */
-    public function pre_get_posts($WP_Query)
-    {
-        // only load Module_Request_Router if this is the main query
-        if (
-            $this->Module_Request_Router instanceof EE_Module_Request_Router
-            && $WP_Query->is_main_query()
-        ) {
-            // cycle thru module routes
-            while ($route = $this->Module_Request_Router->get_route($WP_Query)) {
-                // determine module and method for route
-                $module = $this->Module_Request_Router->resolve_route($route[0], $route[1]);
-                if ($module instanceof EED_Module) {
-                    // get registered view for route
-                    $this->_template_path = $this->Module_Request_Router->get_view($route);
-                    // grab module name
-                    $module_name = $module->module_name();
-                    // map the module to the module objects
-                    $this->Registry->modules->{$module_name} = $module;
-                }
-            }
-        }
-    }
-
-
-
-
-
-    /***********************************************        WP HOOK         ***********************************************/
-
-
-    /**
-     *    wp - basically last chance to do stuff before headers sent
-     *
-     * @access    public
-     * @return    void
-     */
-    public function wp()
-    {
-    }
-
-
-
-    /***********************************************        WP_ENQUEUE_SCRIPTS && WP_HEAD HOOK         ***********************************************/
-
-
-    /**
-     *    wp_enqueue_scripts
-     *
-     * @access    public
-     * @return    void
-     */
-    public function wp_enqueue_scripts()
-    {
-
-        // css is turned ON by default, but prior to the wp_enqueue_scripts hook, can be turned OFF  via:  add_filter( 'FHEE_load_css', '__return_false' );
-        if (apply_filters('FHEE_load_css', true)) {
-
-            $this->Registry->CFG->template_settings->enable_default_style = true;
-            //Load the ThemeRoller styles if enabled
-            if (isset($this->Registry->CFG->template_settings->enable_default_style) && $this->Registry->CFG->template_settings->enable_default_style) {
-
-                //Load custom style sheet if available
-                if (isset($this->Registry->CFG->template_settings->custom_style_sheet)) {
-                    wp_register_style('espresso_custom_css',
-                        EVENT_ESPRESSO_UPLOAD_URL . 'css/' . $this->Registry->CFG->template_settings->custom_style_sheet,
-                        EVENT_ESPRESSO_VERSION);
-                    wp_enqueue_style('espresso_custom_css');
-                }
-
-                if (is_readable(EVENT_ESPRESSO_UPLOAD_DIR . 'css/style.css')) {
-                    wp_register_style('espresso_default', EVENT_ESPRESSO_UPLOAD_DIR . 'css/espresso_default.css',
-                        array('dashicons'), EVENT_ESPRESSO_VERSION);
-                } else {
-                    wp_register_style('espresso_default', EE_GLOBAL_ASSETS_URL . 'css/espresso_default.css',
-                        array('dashicons'), EVENT_ESPRESSO_VERSION);
-                }
-                wp_enqueue_style('espresso_default');
-
-                if (is_readable(get_stylesheet_directory() . EE_Config::get_current_theme() . DS . 'style.css')) {
-                    wp_register_style('espresso_style',
-                        get_stylesheet_directory_uri() . EE_Config::get_current_theme() . DS . 'style.css',
-                        array('dashicons', 'espresso_default'));
-                } else {
-                    wp_register_style('espresso_style',
-                        EE_TEMPLATES_URL . EE_Config::get_current_theme() . DS . 'style.css',
-                        array('dashicons', 'espresso_default'));
-                }
-
-            }
-
-        }
-
-        // js is turned ON by default, but prior to the wp_enqueue_scripts hook, can be turned OFF  via:  add_filter( 'FHEE_load_js', '__return_false' );
-        if (apply_filters('FHEE_load_js', true)) {
-
-            wp_enqueue_script('jquery');
-            //let's make sure that all required scripts have been setup
-            if (function_exists('wp_script_is') && ! wp_script_is('jquery')) {
-                $msg = sprintf(
-                    __('%sJquery is not loaded!%sEvent Espresso is unable to load Jquery due to a conflict with your theme or another plugin.',
-                        'event_espresso'),
-                    '<em><br />',
-                    '</em>'
-                );
-                EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
-            }
-            // load core js
-            wp_register_script('espresso_core', EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js', array('jquery'),
-                EVENT_ESPRESSO_VERSION, true);
-            wp_enqueue_script('espresso_core');
-            wp_localize_script('espresso_core', 'eei18n', EE_Registry::$i18n_js_strings);
-
-        }
-
-        //qtip is turned OFF by default, but prior to the wp_enqueue_scripts hook, can be turned back on again via: add_filter('FHEE_load_qtip', '__return_true' );
-        if (apply_filters('FHEE_load_qtip', false)) {
-            EEH_Qtip_Loader::instance()->register_and_enqueue();
-        }
-
-
-        //accounting.js library
-        // @link http://josscrowcroft.github.io/accounting.js/
-        if (apply_filters('FHEE_load_accounting_js', false)) {
-            $acct_js = EE_THIRD_PARTY_URL . 'accounting/accounting.js';
-            wp_register_script('ee-accounting', EE_GLOBAL_ASSETS_URL . 'scripts/ee-accounting-config.js',
-                array('ee-accounting-core'), EVENT_ESPRESSO_VERSION, true);
-            wp_register_script('ee-accounting-core', $acct_js, array('underscore'), '0.3.2', true);
-            wp_enqueue_script('ee-accounting');
-
-            $currency_config = array(
-                'currency' => array(
-                    'symbol'    => $this->Registry->CFG->currency->sign,
-                    'format'    => array(
-                        'pos'  => $this->Registry->CFG->currency->sign_b4 ? '%s%v' : '%v%s',
-                        'neg'  => $this->Registry->CFG->currency->sign_b4 ? '- %s%v' : '- %v%s',
-                        'zero' => $this->Registry->CFG->currency->sign_b4 ? '%s--' : '--%s',
-                    ),
-                    'decimal'   => $this->Registry->CFG->currency->dec_mrk,
-                    'thousand'  => $this->Registry->CFG->currency->thsnds,
-                    'precision' => $this->Registry->CFG->currency->dec_plc,
-                ),
-                'number'   => array(
-                    'precision' => 0,
-                    'thousand'  => $this->Registry->CFG->currency->thsnds,
-                    'decimal'   => $this->Registry->CFG->currency->dec_mrk,
-                ),
-            );
-            wp_localize_script('ee-accounting', 'EE_ACCOUNTING_CFG', $currency_config);
-        }
-
-        if ( ! function_exists('wp_head')) {
-            $msg = sprintf(
-                __('%sMissing wp_head() function.%sThe WordPress function wp_head() seems to be missing in your theme. Please contact the theme developer to make sure this is fixed before using Event Espresso.',
-                    'event_espresso'),
-                '<em><br />',
-                '</em>'
-            );
-            EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
-        }
-        if ( ! function_exists('wp_footer')) {
-            $msg = sprintf(
-                __('%sMissing wp_footer() function.%sThe WordPress function wp_footer() seems to be missing in your theme. Please contact the theme developer to make sure this is fixed before using Event Espresso.',
-                    'event_espresso'),
-                '<em><br />',
-                '</em>'
-            );
-            EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
-        }
-
-    }
-
-
-    /**
-     *    header_meta_tag
-     *
-     * @access    public
-     * @return    void
-     */
-    public function header_meta_tag()
-    {
-        print(
-            apply_filters(
-                'FHEE__EE_Front_Controller__header_meta_tag',
-                '<meta name="generator" content="Event Espresso Version ' . EVENT_ESPRESSO_VERSION . "\" />\n")
-        );
-
-        //let's exclude all event type taxonomy term archive pages from search engine indexing
-        //@see https://events.codebasehq.com/projects/event-espresso/tickets/10249
-        //also exclude all critical pages from indexing
-        if (
-            (
-                is_tax('espresso_event_type')
-                && get_option( 'blog_public' ) !== '0'
-            )
-            || is_page(EE_Registry::instance()->CFG->core->get_critical_pages_array())
-        ) {
-            print(
-                apply_filters(
-                    'FHEE__EE_Front_Controller__header_meta_tag__noindex_for_event_type',
-                    '<meta name="robots" content="noindex,follow" />' . "\n"
-                )
-            );
-        }
-    }
-
-
-
-    /**
-     * wp_print_scripts
-     *
-     * @return void
-     */
-    public function wp_print_scripts()
-    {
-        global $post;
-        if (
-            get_post_type() === 'espresso_events' 
-            && is_singular() 
-            && isset($post->EE_Event)
-            && $post->EE_Event instanceof EE_Event
-        ) {
-            \EEH_Schema::add_json_linked_data_for_event($post->EE_Event);
-        }
-    }
-
-
-
-    /***********************************************        THE_CONTENT FILTER HOOK         ***********************************************/
-
-
-
-    /**
-     *    the_content
-     *
-     * @access    public
-     * @param   $the_content
-     * @return    string
-     */
-    // public function the_content( $the_content ) {
-    // 	// nothing gets loaded at this point unless other systems turn this hookpoint on by using:  add_filter( 'FHEE_run_EE_the_content', '__return_true' );
-    // 	if ( apply_filters( 'FHEE_run_EE_the_content', FALSE ) ) {
-    // 	}
-    // 	return $the_content;
-    // }
-
-
-    /***********************************************        WP_FOOTER         ***********************************************/
-
-
-    /**
-     *    display_errors
-     *
-     * @access    public
-     * @return    string
-     */
-    public function display_errors()
-    {
-        static $shown_already = false;
-        do_action('AHEE__EE_Front_Controller__display_errors__begin');
-        if (
-            ! $shown_already
-            && apply_filters('FHEE__EE_Front_Controller__display_errors', true)
-            && is_main_query()
-            && ! is_feed()
-            && in_the_loop()
-            && $this->Request_Handler->is_espresso_page()
-        ) {
-            echo EE_Error::get_notices();
-            $shown_already = true;
-            EEH_Template::display_template(EE_TEMPLATES . 'espresso-ajax-notices.template.php');
-        }
-        do_action('AHEE__EE_Front_Controller__display_errors__end');
-    }
-
-
-
-
-
-    /***********************************************        UTILITIES         ***********************************************/
-    /**
-     *    template_include
-     *
-     * @access    public
-     * @param   string $template_include_path
-     * @return    string
-     */
-    public function template_include($template_include_path = null)
-    {
-        if ($this->Request_Handler->is_espresso_page()) {
-            $this->_template_path = ! empty($this->_template_path) ? basename($this->_template_path) : basename($template_include_path);
-            $template_path        = EEH_Template::locate_template($this->_template_path, array(), false);
-            $this->_template_path = ! empty($template_path) ? $template_path : $template_include_path;
-            $this->_template      = basename($this->_template_path);
-            return $this->_template_path;
-        }
-        return $template_include_path;
-    }
-
-
-    /**
-     *    get_selected_template
-     *
-     * @access    public
-     * @param bool $with_path
-     * @return    string
-     */
-    public function get_selected_template($with_path = false)
-    {
-        return $with_path ? $this->_template_path : $this->_template;
-    }
+	/**
+	 *    $_template_path
+	 * @var    string $_template_path
+	 * @access    public
+	 */
+	private $_template_path;
+
+	/**
+	 *    $_template
+	 * @var    string $_template
+	 * @access    public
+	 */
+	private $_template;
+
+	/**
+	 * @type  EE_Registry $Registry
+	 * @access    protected
+	 */
+	protected $Registry;
+
+	/**
+	 * @type  EE_Request_Handler $Request_Handler
+	 * @access    protected
+	 */
+	protected $Request_Handler;
+
+	/**
+	 * @type  EE_Module_Request_Router $Module_Request_Router
+	 * @access    protected
+	 */
+	protected $Module_Request_Router;
+
+
+	/**
+	 *    class constructor
+	 *    should fire after shortcode, module, addon, or other plugin's default priority init phases have run
+	 *
+	 * @access    public
+	 * @param \EE_Registry              $Registry
+	 * @param \EE_Request_Handler       $Request_Handler
+	 * @param \EE_Module_Request_Router $Module_Request_Router
+	 */
+	public function __construct(
+		EE_Registry $Registry,
+		EE_Request_Handler $Request_Handler,
+		EE_Module_Request_Router $Module_Request_Router
+	) {
+		$this->Registry              = $Registry;
+		$this->Request_Handler       = $Request_Handler;
+		$this->Module_Request_Router = $Module_Request_Router;
+		// make sure template tags are loaded immediately so that themes don't break
+		add_action('AHEE__EE_System__core_loaded_and_ready', array($this, 'load_espresso_template_tags'), 10);
+		// determine how to integrate WP_Query with the EE models
+		add_action('AHEE__EE_System__initialize', array($this, 'employ_CPT_Strategy'));
+		// load other resources and begin to actually run shortcodes and modules
+		add_action('wp_loaded', array($this, 'wp_loaded'), 5);
+		// analyse the incoming WP request
+		add_action('parse_request', array($this, 'get_request'), 1, 1);
+		// process any content shortcodes
+		add_action('parse_request', array($this, '_initialize_shortcodes'), 5);
+		// process request with module factory
+		add_action('pre_get_posts', array($this, 'pre_get_posts'), 10, 1);
+		// before headers sent
+		add_action('wp', array($this, 'wp'), 5);
+		// load css and js
+		add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 1);
+		// header
+		add_action('wp_head', array($this, 'header_meta_tag'), 5);
+		add_action('wp_print_scripts', array($this, 'wp_print_scripts'), 10);
+		add_filter('template_include', array($this, 'template_include'), 1);
+		// display errors
+		add_action('loop_start', array($this, 'display_errors'), 2);
+		// the content
+		// add_filter( 'the_content', array( $this, 'the_content' ), 5, 1 );
+		//exclude our private cpt comments
+		add_filter('comments_clauses', array($this, 'filter_wp_comments'), 10, 1);
+		//make sure any ajax requests will respect the url schema when requests are made against admin-ajax.php (http:// or https://)
+		add_filter('admin_url', array($this, 'maybe_force_admin_ajax_ssl'), 200, 1);
+		// action hook EE
+		do_action('AHEE__EE_Front_Controller__construct__done', $this);
+		// for checking that browser cookies are enabled
+		if (apply_filters('FHEE__EE_Front_Controller____construct__set_test_cookie', true)) {
+			setcookie('ee_cookie_test', uniqid(), time() + 24 * HOUR_IN_SECONDS, '/');
+		}
+	}
+
+
+	/**
+	 * @return EE_Request_Handler
+	 */
+	public function Request_Handler()
+	{
+		return $this->Request_Handler;
+	}
+
+
+	/**
+	 * @return EE_Module_Request_Router
+	 */
+	public function Module_Request_Router()
+	{
+		return $this->Module_Request_Router;
+	}
+
+
+
+
+
+	/***********************************************        INIT ACTION HOOK         ***********************************************/
+
+
+	/**
+	 *    load_espresso_template_tags - if current theme is an espresso theme, or uses ee theme template parts, then
+	 *    load it's functions.php file ( if not already loaded )
+	 *
+	 * @return void
+	 */
+	public function load_espresso_template_tags()
+	{
+		if (is_readable(EE_PUBLIC . 'template_tags.php')) {
+			require_once(EE_PUBLIC . 'template_tags.php');
+		}
+	}
+
+
+	/**
+	 * filter_wp_comments
+	 * This simply makes sure that any "private" EE CPTs do not have their comments show up in any wp comment
+	 * widgets/queries done on frontend
+	 *
+	 * @param  array $clauses array of comment clauses setup by WP_Comment_Query
+	 * @return array array of comment clauses with modifications.
+	 */
+	public function filter_wp_comments($clauses)
+	{
+		global $wpdb;
+		if (strpos($clauses['join'], $wpdb->posts) !== false) {
+			$cpts = EE_Register_CPTs::get_private_CPTs();
+			foreach ($cpts as $cpt => $details) {
+				$clauses['where'] .= $wpdb->prepare(" AND $wpdb->posts.post_type != %s", $cpt);
+			}
+		}
+		return $clauses;
+	}
+
+
+	/**
+	 *    employ_CPT_Strategy
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function employ_CPT_Strategy()
+	{
+		if (apply_filters('FHEE__EE_Front_Controller__employ_CPT_Strategy', true)) {
+			$this->Registry->load_core('CPT_Strategy');
+		}
+	}
+
+
+	/**
+	 * this just makes sure that if the site is using ssl that we force that for any admin ajax calls from frontend
+	 *
+	 * @param  string $url incoming url
+	 * @return string         final assembled url
+	 */
+	public function maybe_force_admin_ajax_ssl($url)
+	{
+		if (is_ssl() && preg_match('/admin-ajax.php/', $url)) {
+			$url = str_replace('http://', 'https://', $url);
+		}
+		return $url;
+	}
+
+
+
+
+
+
+	/***********************************************        WP_LOADED ACTION HOOK         ***********************************************/
+
+
+	/**
+	 *    wp_loaded - should fire after shortcode, module, addon, or other plugin's have been registered and their
+	 *    default priority init phases have run
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function wp_loaded()
+	{
+	}
+
+
+
+
+
+	/***********************************************        PARSE_REQUEST HOOK         ***********************************************/
+	/**
+	 *    _get_request
+	 *
+	 * @access public
+	 * @param WP $WP
+	 * @return void
+	 */
+	public function get_request(WP $WP)
+	{
+		do_action('AHEE__EE_Front_Controller__get_request__start');
+		$this->Request_Handler->parse_request($WP);
+		do_action('AHEE__EE_Front_Controller__get_request__complete');
+	}
+
+
+	/**
+	 *    _initialize_shortcodes - calls init method on shortcodes that have been determined to be in the_content for
+	 *    the currently requested page
+	 *
+	 * @access    public
+	 * @param WP $WP
+	 * @return    void
+	 */
+	public function _initialize_shortcodes(WP $WP)
+	{
+		do_action('AHEE__EE_Front_Controller__initialize_shortcodes__begin', $WP, $this);
+		$this->Request_Handler->set_request_vars($WP);
+		// grab post_name from request
+		$current_post  = apply_filters('FHEE__EE_Front_Controller__initialize_shortcodes__current_post_name',
+			$this->Request_Handler->get('post_name'));
+		$show_on_front = get_option('show_on_front');
+		// if it's not set, then check if frontpage is blog
+		if (empty($current_post)) {
+			// yup.. this is the posts page, prepare to load all shortcode modules
+			$current_post = 'posts';
+			// unless..
+			if ($show_on_front === 'page') {
+				// some other page is set as the homepage
+				$page_on_front = get_option('page_on_front');
+				if ($page_on_front) {
+					// k now we need to find the post_name for this page
+					global $wpdb;
+					$page_on_front = $wpdb->get_var(
+						$wpdb->prepare(
+							"SELECT post_name from $wpdb->posts WHERE post_type='page' AND post_status='publish' AND ID=%d",
+							$page_on_front
+						)
+					);
+					// set the current post slug to what it actually is
+					$current_post = $page_on_front ? $page_on_front : $current_post;
+				}
+			}
+		}
+		// where are posts being displayed ?
+		$page_for_posts = EE_Config::get_page_for_posts();
+		// in case $current_post is hierarchical like: /parent-page/current-page
+		$current_post = basename($current_post);
+		// are we on a category page?
+		$term_exists = is_array(term_exists($current_post, 'category')) || array_key_exists('category_name',
+				$WP->query_vars);
+		// make sure shortcodes are set
+		if (isset($this->Registry->CFG->core->post_shortcodes)) {
+			if ( ! isset($this->Registry->CFG->core->post_shortcodes[$page_for_posts])) {
+				$this->Registry->CFG->core->post_shortcodes[$page_for_posts] = array();
+			}
+			// cycle thru all posts with shortcodes set
+			foreach ($this->Registry->CFG->core->post_shortcodes as $post_name => $post_shortcodes) {
+				// filter shortcodes so
+				$post_shortcodes = apply_filters('FHEE__Front_Controller__initialize_shortcodes__post_shortcodes',
+					$post_shortcodes);
+				// now cycle thru shortcodes
+				foreach ($post_shortcodes as $shortcode_class => $post_id) {
+					// are we on this page, or on the blog page, or an EE CPT category page ?
+					if ($current_post === $post_name || $term_exists) {
+						// maybe init the shortcode
+						$this->initialize_shortcode_if_active_on_page(
+							$shortcode_class,
+							$current_post,
+							$page_for_posts,
+							$post_id,
+							$term_exists,
+							$WP
+						);
+						// if this is NOT the "Posts page" and we have a valid entry
+						// for the "Posts page" in our tracked post_shortcodes array
+						// but the shortcode is not being tracked for this page
+					} else if (
+						$post_name !== $page_for_posts
+						&& isset($this->Registry->CFG->core->post_shortcodes[$page_for_posts])
+						&& ! isset($this->Registry->CFG->core->post_shortcodes[$page_for_posts][$shortcode_class])
+					) {
+						// then remove the "fallback" shortcode processor
+						remove_shortcode($shortcode_class);
+					}
+				}
+			}
+		}
+		do_action('AHEE__EE_Front_Controller__initialize_shortcodes__end', $this);
+	}
+
+
+	/**
+	 * @param string $shortcode_class
+	 * @param string $current_post
+	 * @param string $page_for_posts
+	 * @param int    $post_id
+	 * @param bool   $term_exists
+	 * @param WP     $WP
+	 */
+	protected function initialize_shortcode_if_active_on_page(
+		$shortcode_class,
+		$current_post,
+		$page_for_posts,
+		$post_id,
+		$term_exists,
+		$WP
+	) {
+		// verify shortcode is in list of registered shortcodes
+		if ( ! isset($this->Registry->shortcodes->{$shortcode_class})) {
+			if ($current_post !== $page_for_posts && current_user_can('edit_post', $post_id)) {
+				EE_Error::add_error(
+					sprintf(
+						__(
+							'The [%s] shortcode has not been properly registered or the corresponding addon/module is not active for some reason. Either fix/remove the shortcode from the post, or activate the addon/module the shortcode is associated with.',
+							'event_espresso'
+						),
+						$shortcode_class
+					),
+					__FILE__,
+					__FUNCTION__,
+					__LINE__
+				);
+				add_filter('FHEE_run_EE_the_content', '__return_true');
+			}
+			add_shortcode($shortcode_class, array('EES_Shortcode', 'invalid_shortcode_processor'));
+			return;
+		}
+		// is this : a shortcodes set exclusively for this post, or for the home page, or a category, or a taxonomy ?
+		if (
+			$term_exists
+			|| $current_post === $page_for_posts
+			|| isset($this->Registry->CFG->core->post_shortcodes[$current_post])
+		) {
+			// let's pause to reflect on this...
+			$sc_reflector = new ReflectionClass('EES_' . $shortcode_class);
+			// ensure that class is actually a shortcode
+			if (
+				defined('WP_DEBUG')
+				&& WP_DEBUG === true
+				&& ! $sc_reflector->isSubclassOf('EES_Shortcode')
+			) {
+				EE_Error::add_error(
+					sprintf(
+						__(
+							'The requested %s shortcode is not of the class "EES_Shortcode". Please check your files.',
+							'event_espresso'
+						),
+						$shortcode_class
+					),
+					__FILE__,
+					__FUNCTION__,
+					__LINE__
+				);
+				add_filter('FHEE_run_EE_the_content', '__return_true');
+				return;
+			}
+			// and pass the request object to the run method
+			$this->Registry->shortcodes->{$shortcode_class} = $sc_reflector->newInstance();
+			// fire the shortcode class's run method, so that it can activate resources
+			$this->Registry->shortcodes->{$shortcode_class}->run($WP);
+		}
+	}
+
+
+	/**
+	 *    pre_get_posts - basically a module factory for instantiating modules and selecting the final view template
+	 *
+	 * @access    public
+	 * @param   WP_Query $WP_Query
+	 * @return    void
+	 */
+	public function pre_get_posts($WP_Query)
+	{
+		// only load Module_Request_Router if this is the main query
+		if (
+			$this->Module_Request_Router instanceof EE_Module_Request_Router
+			&& $WP_Query->is_main_query()
+		) {
+			// cycle thru module routes
+			while ($route = $this->Module_Request_Router->get_route($WP_Query)) {
+				// determine module and method for route
+				$module = $this->Module_Request_Router->resolve_route($route[0], $route[1]);
+				if ($module instanceof EED_Module) {
+					// get registered view for route
+					$this->_template_path = $this->Module_Request_Router->get_view($route);
+					// grab module name
+					$module_name = $module->module_name();
+					// map the module to the module objects
+					$this->Registry->modules->{$module_name} = $module;
+				}
+			}
+		}
+	}
+
+
+
+
+
+	/***********************************************        WP HOOK         ***********************************************/
+
+
+	/**
+	 *    wp - basically last chance to do stuff before headers sent
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function wp()
+	{
+	}
+
+
+
+	/***********************************************        WP_ENQUEUE_SCRIPTS && WP_HEAD HOOK         ***********************************************/
+
+
+	/**
+	 *    wp_enqueue_scripts
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function wp_enqueue_scripts()
+	{
+
+		// css is turned ON by default, but prior to the wp_enqueue_scripts hook, can be turned OFF  via:  add_filter( 'FHEE_load_css', '__return_false' );
+		if (apply_filters('FHEE_load_css', true)) {
+
+			$this->Registry->CFG->template_settings->enable_default_style = true;
+			//Load the ThemeRoller styles if enabled
+			if (isset($this->Registry->CFG->template_settings->enable_default_style) && $this->Registry->CFG->template_settings->enable_default_style) {
+
+				//Load custom style sheet if available
+				if (isset($this->Registry->CFG->template_settings->custom_style_sheet)) {
+					wp_register_style('espresso_custom_css',
+						EVENT_ESPRESSO_UPLOAD_URL . 'css/' . $this->Registry->CFG->template_settings->custom_style_sheet,
+						EVENT_ESPRESSO_VERSION);
+					wp_enqueue_style('espresso_custom_css');
+				}
+
+				if (is_readable(EVENT_ESPRESSO_UPLOAD_DIR . 'css/style.css')) {
+					wp_register_style('espresso_default', EVENT_ESPRESSO_UPLOAD_DIR . 'css/espresso_default.css',
+						array('dashicons'), EVENT_ESPRESSO_VERSION);
+				} else {
+					wp_register_style('espresso_default', EE_GLOBAL_ASSETS_URL . 'css/espresso_default.css',
+						array('dashicons'), EVENT_ESPRESSO_VERSION);
+				}
+				wp_enqueue_style('espresso_default');
+
+				if (is_readable(get_stylesheet_directory() . EE_Config::get_current_theme() . DS . 'style.css')) {
+					wp_register_style('espresso_style',
+						get_stylesheet_directory_uri() . EE_Config::get_current_theme() . DS . 'style.css',
+						array('dashicons', 'espresso_default'));
+				} else {
+					wp_register_style('espresso_style',
+						EE_TEMPLATES_URL . EE_Config::get_current_theme() . DS . 'style.css',
+						array('dashicons', 'espresso_default'));
+				}
+
+			}
+
+		}
+
+		// js is turned ON by default, but prior to the wp_enqueue_scripts hook, can be turned OFF  via:  add_filter( 'FHEE_load_js', '__return_false' );
+		if (apply_filters('FHEE_load_js', true)) {
+
+			wp_enqueue_script('jquery');
+			//let's make sure that all required scripts have been setup
+			if (function_exists('wp_script_is') && ! wp_script_is('jquery')) {
+				$msg = sprintf(
+					__('%sJquery is not loaded!%sEvent Espresso is unable to load Jquery due to a conflict with your theme or another plugin.',
+						'event_espresso'),
+					'<em><br />',
+					'</em>'
+				);
+				EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+			}
+			// load core js
+			wp_register_script('espresso_core', EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js', array('jquery'),
+				EVENT_ESPRESSO_VERSION, true);
+			wp_enqueue_script('espresso_core');
+			wp_localize_script('espresso_core', 'eei18n', EE_Registry::$i18n_js_strings);
+
+		}
+
+		//qtip is turned OFF by default, but prior to the wp_enqueue_scripts hook, can be turned back on again via: add_filter('FHEE_load_qtip', '__return_true' );
+		if (apply_filters('FHEE_load_qtip', false)) {
+			EEH_Qtip_Loader::instance()->register_and_enqueue();
+		}
+
+
+		//accounting.js library
+		// @link http://josscrowcroft.github.io/accounting.js/
+		if (apply_filters('FHEE_load_accounting_js', false)) {
+			$acct_js = EE_THIRD_PARTY_URL . 'accounting/accounting.js';
+			wp_register_script('ee-accounting', EE_GLOBAL_ASSETS_URL . 'scripts/ee-accounting-config.js',
+				array('ee-accounting-core'), EVENT_ESPRESSO_VERSION, true);
+			wp_register_script('ee-accounting-core', $acct_js, array('underscore'), '0.3.2', true);
+			wp_enqueue_script('ee-accounting');
+
+			$currency_config = array(
+				'currency' => array(
+					'symbol'    => $this->Registry->CFG->currency->sign,
+					'format'    => array(
+						'pos'  => $this->Registry->CFG->currency->sign_b4 ? '%s%v' : '%v%s',
+						'neg'  => $this->Registry->CFG->currency->sign_b4 ? '- %s%v' : '- %v%s',
+						'zero' => $this->Registry->CFG->currency->sign_b4 ? '%s--' : '--%s',
+					),
+					'decimal'   => $this->Registry->CFG->currency->dec_mrk,
+					'thousand'  => $this->Registry->CFG->currency->thsnds,
+					'precision' => $this->Registry->CFG->currency->dec_plc,
+				),
+				'number'   => array(
+					'precision' => 0,
+					'thousand'  => $this->Registry->CFG->currency->thsnds,
+					'decimal'   => $this->Registry->CFG->currency->dec_mrk,
+				),
+			);
+			wp_localize_script('ee-accounting', 'EE_ACCOUNTING_CFG', $currency_config);
+		}
+
+		if ( ! function_exists('wp_head')) {
+			$msg = sprintf(
+				__('%sMissing wp_head() function.%sThe WordPress function wp_head() seems to be missing in your theme. Please contact the theme developer to make sure this is fixed before using Event Espresso.',
+					'event_espresso'),
+				'<em><br />',
+				'</em>'
+			);
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+		}
+		if ( ! function_exists('wp_footer')) {
+			$msg = sprintf(
+				__('%sMissing wp_footer() function.%sThe WordPress function wp_footer() seems to be missing in your theme. Please contact the theme developer to make sure this is fixed before using Event Espresso.',
+					'event_espresso'),
+				'<em><br />',
+				'</em>'
+			);
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+		}
+
+	}
+
+
+	/**
+	 *    header_meta_tag
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function header_meta_tag()
+	{
+		print(
+			apply_filters(
+				'FHEE__EE_Front_Controller__header_meta_tag',
+				'<meta name="generator" content="Event Espresso Version ' . EVENT_ESPRESSO_VERSION . "\" />\n")
+		);
+
+		//let's exclude all event type taxonomy term archive pages from search engine indexing
+		//@see https://events.codebasehq.com/projects/event-espresso/tickets/10249
+		//also exclude all critical pages from indexing
+		if (
+			(
+				is_tax('espresso_event_type')
+				&& get_option( 'blog_public' ) !== '0'
+			)
+			|| is_page(EE_Registry::instance()->CFG->core->get_critical_pages_array())
+		) {
+			print(
+				apply_filters(
+					'FHEE__EE_Front_Controller__header_meta_tag__noindex_for_event_type',
+					'<meta name="robots" content="noindex,follow" />' . "\n"
+				)
+			);
+		}
+	}
+
+
+
+	/**
+	 * wp_print_scripts
+	 *
+	 * @return void
+	 */
+	public function wp_print_scripts()
+	{
+		global $post;
+		if (
+			get_post_type() === 'espresso_events' 
+			&& is_singular() 
+			&& isset($post->EE_Event)
+			&& $post->EE_Event instanceof EE_Event
+		) {
+			\EEH_Schema::add_json_linked_data_for_event($post->EE_Event);
+		}
+	}
+
+
+
+	/***********************************************        THE_CONTENT FILTER HOOK         ***********************************************/
+
+
+
+	/**
+	 *    the_content
+	 *
+	 * @access    public
+	 * @param   $the_content
+	 * @return    string
+	 */
+	// public function the_content( $the_content ) {
+	// 	// nothing gets loaded at this point unless other systems turn this hookpoint on by using:  add_filter( 'FHEE_run_EE_the_content', '__return_true' );
+	// 	if ( apply_filters( 'FHEE_run_EE_the_content', FALSE ) ) {
+	// 	}
+	// 	return $the_content;
+	// }
+
+
+	/***********************************************        WP_FOOTER         ***********************************************/
+
+
+	/**
+	 *    display_errors
+	 *
+	 * @access    public
+	 * @return    string
+	 */
+	public function display_errors()
+	{
+		static $shown_already = false;
+		do_action('AHEE__EE_Front_Controller__display_errors__begin');
+		if (
+			! $shown_already
+			&& apply_filters('FHEE__EE_Front_Controller__display_errors', true)
+			&& is_main_query()
+			&& ! is_feed()
+			&& in_the_loop()
+			&& $this->Request_Handler->is_espresso_page()
+		) {
+			echo EE_Error::get_notices();
+			$shown_already = true;
+			EEH_Template::display_template(EE_TEMPLATES . 'espresso-ajax-notices.template.php');
+		}
+		do_action('AHEE__EE_Front_Controller__display_errors__end');
+	}
+
+
+
+
+
+	/***********************************************        UTILITIES         ***********************************************/
+	/**
+	 *    template_include
+	 *
+	 * @access    public
+	 * @param   string $template_include_path
+	 * @return    string
+	 */
+	public function template_include($template_include_path = null)
+	{
+		if ($this->Request_Handler->is_espresso_page()) {
+			$this->_template_path = ! empty($this->_template_path) ? basename($this->_template_path) : basename($template_include_path);
+			$template_path        = EEH_Template::locate_template($this->_template_path, array(), false);
+			$this->_template_path = ! empty($template_path) ? $template_path : $template_include_path;
+			$this->_template      = basename($this->_template_path);
+			return $this->_template_path;
+		}
+		return $template_include_path;
+	}
+
+
+	/**
+	 *    get_selected_template
+	 *
+	 * @access    public
+	 * @param bool $with_path
+	 * @return    string
+	 */
+	public function get_selected_template($with_path = false)
+	{
+		return $with_path ? $this->_template_path : $this->_template;
+	}
 
 
 }

Spacing +17 added lines, -17 removed lines

@@ -141,8 +141,8 @@ 
      */
     public function load_espresso_template_tags()
     {
-        if (is_readable(EE_PUBLIC . 'template_tags.php')) {
-            require_once(EE_PUBLIC . 'template_tags.php');
+        if (is_readable(EE_PUBLIC.'template_tags.php')) {
+            require_once(EE_PUBLIC.'template_tags.php');
         }
     }
 
@@ -364,7 +364,7 @@ 
             || isset($this->Registry->CFG->core->post_shortcodes[$current_post])
         ) {
             // let's pause to reflect on this...
-            $sc_reflector = new ReflectionClass('EES_' . $shortcode_class);
+            $sc_reflector = new ReflectionClass('EES_'.$shortcode_class);
             // ensure that class is actually a shortcode
             if (
                 defined('WP_DEBUG')
@@ -465,27 +465,27 @@ 
                 //Load custom style sheet if available
                 if (isset($this->Registry->CFG->template_settings->custom_style_sheet)) {
                     wp_register_style('espresso_custom_css',
-                        EVENT_ESPRESSO_UPLOAD_URL . 'css/' . $this->Registry->CFG->template_settings->custom_style_sheet,
+                        EVENT_ESPRESSO_UPLOAD_URL.'css/'.$this->Registry->CFG->template_settings->custom_style_sheet,
                         EVENT_ESPRESSO_VERSION);
                     wp_enqueue_style('espresso_custom_css');
                 }
 
-                if (is_readable(EVENT_ESPRESSO_UPLOAD_DIR . 'css/style.css')) {
-                    wp_register_style('espresso_default', EVENT_ESPRESSO_UPLOAD_DIR . 'css/espresso_default.css',
+                if (is_readable(EVENT_ESPRESSO_UPLOAD_DIR.'css/style.css')) {
+                    wp_register_style('espresso_default', EVENT_ESPRESSO_UPLOAD_DIR.'css/espresso_default.css',
                         array('dashicons'), EVENT_ESPRESSO_VERSION);
                 } else {
-                    wp_register_style('espresso_default', EE_GLOBAL_ASSETS_URL . 'css/espresso_default.css',
+                    wp_register_style('espresso_default', EE_GLOBAL_ASSETS_URL.'css/espresso_default.css',
                         array('dashicons'), EVENT_ESPRESSO_VERSION);
                 }
                 wp_enqueue_style('espresso_default');
 
-                if (is_readable(get_stylesheet_directory() . EE_Config::get_current_theme() . DS . 'style.css')) {
+                if (is_readable(get_stylesheet_directory().EE_Config::get_current_theme().DS.'style.css')) {
                     wp_register_style('espresso_style',
-                        get_stylesheet_directory_uri() . EE_Config::get_current_theme() . DS . 'style.css',
+                        get_stylesheet_directory_uri().EE_Config::get_current_theme().DS.'style.css',
                         array('dashicons', 'espresso_default'));
                 } else {
                     wp_register_style('espresso_style',
-                        EE_TEMPLATES_URL . EE_Config::get_current_theme() . DS . 'style.css',
+                        EE_TEMPLATES_URL.EE_Config::get_current_theme().DS.'style.css',
                         array('dashicons', 'espresso_default'));
                 }
 
@@ -508,7 +508,7 @@ 
                 EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
             }
             // load core js
-            wp_register_script('espresso_core', EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js', array('jquery'),
+            wp_register_script('espresso_core', EE_GLOBAL_ASSETS_URL.'scripts/espresso_core.js', array('jquery'),
                 EVENT_ESPRESSO_VERSION, true);
             wp_enqueue_script('espresso_core');
             wp_localize_script('espresso_core', 'eei18n', EE_Registry::$i18n_js_strings);
@@ -524,8 +524,8 @@ 
         //accounting.js library
         // @link http://josscrowcroft.github.io/accounting.js/
         if (apply_filters('FHEE_load_accounting_js', false)) {
-            $acct_js = EE_THIRD_PARTY_URL . 'accounting/accounting.js';
-            wp_register_script('ee-accounting', EE_GLOBAL_ASSETS_URL . 'scripts/ee-accounting-config.js',
+            $acct_js = EE_THIRD_PARTY_URL.'accounting/accounting.js';
+            wp_register_script('ee-accounting', EE_GLOBAL_ASSETS_URL.'scripts/ee-accounting-config.js',
                 array('ee-accounting-core'), EVENT_ESPRESSO_VERSION, true);
             wp_register_script('ee-accounting-core', $acct_js, array('underscore'), '0.3.2', true);
             wp_enqueue_script('ee-accounting');
@@ -584,7 +584,7 @@ 
         print(
             apply_filters(
                 'FHEE__EE_Front_Controller__header_meta_tag',
-                '<meta name="generator" content="Event Espresso Version ' . EVENT_ESPRESSO_VERSION . "\" />\n")
+                '<meta name="generator" content="Event Espresso Version '.EVENT_ESPRESSO_VERSION."\" />\n")
         );
 
         //let's exclude all event type taxonomy term archive pages from search engine indexing
@@ -593,14 +593,14 @@ 
         if (
             (
                 is_tax('espresso_event_type')
-                && get_option( 'blog_public' ) !== '0'
+                && get_option('blog_public') !== '0'
             )
             || is_page(EE_Registry::instance()->CFG->core->get_critical_pages_array())
         ) {
             print(
                 apply_filters(
                     'FHEE__EE_Front_Controller__header_meta_tag__noindex_for_event_type',
-                    '<meta name="robots" content="noindex,follow" />' . "\n"
+                    '<meta name="robots" content="noindex,follow" />'."\n"
                 )
             );
         }
@@ -670,7 +670,7 @@ 
         ) {
             echo EE_Error::get_notices();
             $shown_already = true;
-            EEH_Template::display_template(EE_TEMPLATES . 'espresso-ajax-notices.template.php');
+            EEH_Template::display_template(EE_TEMPLATES.'espresso-ajax-notices.template.php');
         }
         do_action('AHEE__EE_Front_Controller__display_errors__end');
     }

core/admin/EE_Admin.core.php

Indentation +25 added lines, -25 removed lines

@@ -167,11 +167,11 @@ 
 
 
 	/**
-	* init- should fire after shortcode, module,  addon, other plugin (default priority), and even EE_Front_Controller's init phases have run
-	*
-	* @access public
-	* @return void
-	*/
+	 * init- should fire after shortcode, module,  addon, other plugin (default priority), and even EE_Front_Controller's init phases have run
+	 *
+	 * @access public
+	 * @return void
+	 */
 	public function init() {
 		//only enable most of the EE_Admin IF we're not in full maintenance mode
 		if ( EE_Maintenance_Mode::instance()->models_can_query() ){
@@ -456,11 +456,11 @@ 
 
 
 	/**
-	* admin_init
-	*
-	* @access public
-	* @return void
-	*/
+	 * admin_init
+	 *
+	 * @access public
+	 * @return void
+	 */
 	public function admin_init() {
 
 		/**
@@ -478,11 +478,11 @@ 
 
 		/**
 		 * This code excludes EE critical pages anywhere `wp_dropdown_pages` is used to create a dropdown for selecting
-         * critical pages.  The only place critical pages need included in a generated dropdown is on the "Critical Pages"
-         * tab in the EE General Settings Admin page.
-         * This is for user-proofing.
+		 * critical pages.  The only place critical pages need included in a generated dropdown is on the "Critical Pages"
+		 * tab in the EE General Settings Admin page.
+		 * This is for user-proofing.
 		 */
-        add_filter( 'wp_dropdown_pages', array( $this, 'modify_dropdown_pages' ) );
+		add_filter( 'wp_dropdown_pages', array( $this, 'modify_dropdown_pages' ) );
 
 	}
 
@@ -611,24 +611,24 @@ 
 
 
 	/**
-	* 	dismiss_persistent_admin_notice
-	*
-	*	@access 	public
-	* 	@return 		void
-	*/
+	 * 	dismiss_persistent_admin_notice
+	 *
+	 *	@access 	public
+	 * 	@return 		void
+	 */
 	public function dismiss_ee_nag_notice_callback() {
 		EE_Error::dismiss_persistent_admin_notice();
 	}
 
 
 
-    /**
-     * @param array $elements
-     * @return array
-     * @throws \EE_Error
-     */
+	/**
+	 * @param array $elements
+	 * @return array
+	 * @throws \EE_Error
+	 */
 	public function dashboard_glance_items($elements) {
-        $elements = is_array($elements) ? $elements : array($elements);
+		$elements = is_array($elements) ? $elements : array($elements);
 		$events = EEM_Event::instance()->count();
 		$items['events']['url'] = EE_Admin_Page::add_query_args_and_nonce( array('page' => 'espresso_events'), admin_url('admin.php') );
 		$items['events']['text'] = sprintf( _n( '%s Event', '%s Events', $events ), number_format_i18n( $events ) );

Spacing +141 added lines, -141 removed lines

@@ -40,7 +40,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated
-		if (  ! self::$_instance instanceof EE_Admin ) {
+		if ( ! self::$_instance instanceof EE_Admin) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -57,30 +57,30 @@ 
 		// define global EE_Admin constants
 		$this->_define_all_constants();
 		// set autoloaders for our admin page classes based on included path information
-		EEH_Autoloader::instance()->register_autoloaders_for_each_file_in_folder( EE_ADMIN );
+		EEH_Autoloader::instance()->register_autoloaders_for_each_file_in_folder(EE_ADMIN);
 		// admin hooks
-		add_filter( 'plugin_action_links', array( $this, 'filter_plugin_actions' ), 10, 2 );
+		add_filter('plugin_action_links', array($this, 'filter_plugin_actions'), 10, 2);
 		// load EE_Request_Handler early
-		add_action( 'AHEE__EE_System__core_loaded_and_ready', array( $this, 'get_request' ));
-		add_action( 'AHEE__EE_System__initialize_last', array( $this, 'init' ));
+		add_action('AHEE__EE_System__core_loaded_and_ready', array($this, 'get_request'));
+		add_action('AHEE__EE_System__initialize_last', array($this, 'init'));
 		// post shortcode tracking
 		add_action(
 			'AHEE__EE_System__initialize_last',
-			array( 'EventEspresso\core\admin\PostShortcodeTracking', 'set_hooks_admin' )
+			array('EventEspresso\core\admin\PostShortcodeTracking', 'set_hooks_admin')
 		);
-		add_action( 'AHEE__EE_Admin_Page__route_admin_request', array( $this, 'route_admin_request' ), 100, 2 );
-		add_action( 'wp_loaded', array( $this, 'wp_loaded' ), 100 );
-		add_action( 'admin_init', array( $this, 'admin_init' ), 100 );
-		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_admin_scripts' ), 20 );
-		add_action( 'admin_notices', array( $this, 'display_admin_notices' ), 10 );
-		add_action( 'network_admin_notices', array( $this, 'display_admin_notices' ), 10 );
-		add_filter( 'pre_update_option', array( $this, 'check_for_invalid_datetime_formats' ), 100, 2 );
-		add_filter('admin_footer_text', array( $this, 'espresso_admin_footer' ));
+		add_action('AHEE__EE_Admin_Page__route_admin_request', array($this, 'route_admin_request'), 100, 2);
+		add_action('wp_loaded', array($this, 'wp_loaded'), 100);
+		add_action('admin_init', array($this, 'admin_init'), 100);
+		add_action('admin_enqueue_scripts', array($this, 'enqueue_admin_scripts'), 20);
+		add_action('admin_notices', array($this, 'display_admin_notices'), 10);
+		add_action('network_admin_notices', array($this, 'display_admin_notices'), 10);
+		add_filter('pre_update_option', array($this, 'check_for_invalid_datetime_formats'), 100, 2);
+		add_filter('admin_footer_text', array($this, 'espresso_admin_footer'));
 
 		//reset Environment config (we only do this on admin page loads);
 		EE_Registry::instance()->CFG->environment->recheck_values();
 
-		do_action( 'AHEE__EE_Admin__loaded' );
+		do_action('AHEE__EE_Admin__loaded');
 	}
 
 
@@ -95,11 +95,11 @@ 
 	 * @return void
 	 */
 	private function _define_all_constants() {
-		define( 'EE_ADMIN_URL', EE_PLUGIN_DIR_URL . 'core/admin/' );
-		define( 'EE_ADMIN_PAGES_URL', EE_PLUGIN_DIR_URL . 'admin_pages/' );
-		define( 'EE_ADMIN_TEMPLATE', EE_ADMIN . 'templates' . DS );
-		define( 'WP_ADMIN_PATH', ABSPATH . 'wp-admin/' );
-		define( 'WP_AJAX_URL', admin_url( 'admin-ajax.php' ));
+		define('EE_ADMIN_URL', EE_PLUGIN_DIR_URL.'core/admin/');
+		define('EE_ADMIN_PAGES_URL', EE_PLUGIN_DIR_URL.'admin_pages/');
+		define('EE_ADMIN_TEMPLATE', EE_ADMIN.'templates'.DS);
+		define('WP_ADMIN_PATH', ABSPATH.'wp-admin/');
+		define('WP_AJAX_URL', admin_url('admin-ajax.php'));
 	}
 
 
@@ -112,23 +112,23 @@ 
 	 * @param 	string 	$plugin
 	 * @return 	array
 	 */
-	public function filter_plugin_actions( $links, $plugin ) {
+	public function filter_plugin_actions($links, $plugin) {
 		// set $main_file in stone
 		static $main_file;
 		// if $main_file is not set yet
-		if ( ! $main_file ) {
-			$main_file = plugin_basename( EVENT_ESPRESSO_MAIN_FILE );
+		if ( ! $main_file) {
+			$main_file = plugin_basename(EVENT_ESPRESSO_MAIN_FILE);
 		}
-		 if ( $plugin === $main_file ) {
+		 if ($plugin === $main_file) {
 		 	// compare current plugin to this one
-			if ( EE_Maintenance_Mode::instance()->level() === EE_Maintenance_Mode::level_2_complete_maintenance ) {
-				$maintenance_link = '<a href="admin.php?page=espresso_maintenance_settings" title="Event Espresso is in maintenance mode.  Click this link to learn why.">' . __('Maintenance Mode Active', 'event_espresso' ) . '</a>';
-				array_unshift( $links, $maintenance_link );
+			if (EE_Maintenance_Mode::instance()->level() === EE_Maintenance_Mode::level_2_complete_maintenance) {
+				$maintenance_link = '<a href="admin.php?page=espresso_maintenance_settings" title="Event Espresso is in maintenance mode.  Click this link to learn why.">'.__('Maintenance Mode Active', 'event_espresso').'</a>';
+				array_unshift($links, $maintenance_link);
 			} else {
-				$org_settings_link = '<a href="admin.php?page=espresso_general_settings">' . __( 'Settings', 'event_espresso' ) . '</a>';
-				$events_link = '<a href="admin.php?page=espresso_events">' . __( 'Events', 'event_espresso' ) . '</a>';
+				$org_settings_link = '<a href="admin.php?page=espresso_general_settings">'.__('Settings', 'event_espresso').'</a>';
+				$events_link = '<a href="admin.php?page=espresso_events">'.__('Events', 'event_espresso').'</a>';
 				// add before other links
-				array_unshift( $links, $org_settings_link, $events_link );
+				array_unshift($links, $org_settings_link, $events_link);
 			}
 		}
 		return $links;
@@ -143,8 +143,8 @@ 
 	 *	@return void
 	 */
 	public function get_request() {
-		EE_Registry::instance()->load_core( 'Request_Handler' );
-		EE_Registry::instance()->load_core( 'CPT_Strategy' );
+		EE_Registry::instance()->load_core('Request_Handler');
+		EE_Registry::instance()->load_core('CPT_Strategy');
 	}
 
 
@@ -156,11 +156,11 @@ 
 	 * @param array $admin_page_folder_names
 	 * @return array
 	 */
-	public function hide_admin_pages_except_maintenance_mode( $admin_page_folder_names = array() ){
+	public function hide_admin_pages_except_maintenance_mode($admin_page_folder_names = array()) {
 		return array(
-			'maintenance' => EE_ADMIN_PAGES . 'maintenance' . DS,
-			'about' => EE_ADMIN_PAGES . 'about' . DS,
-			'support' => EE_ADMIN_PAGES . 'support' . DS
+			'maintenance' => EE_ADMIN_PAGES.'maintenance'.DS,
+			'about' => EE_ADMIN_PAGES.'about'.DS,
+			'support' => EE_ADMIN_PAGES.'support'.DS
 		);
 	}
 
@@ -174,31 +174,31 @@ 
 	*/
 	public function init() {
 		//only enable most of the EE_Admin IF we're not in full maintenance mode
-		if ( EE_Maintenance_Mode::instance()->models_can_query() ){
+		if (EE_Maintenance_Mode::instance()->models_can_query()) {
 			//ok so we want to enable the entire admin
-			add_action( 'wp_ajax_dismiss_ee_nag_notice', array( $this, 'dismiss_ee_nag_notice_callback' ));
-			add_action( 'admin_notices', array( $this, 'get_persistent_admin_notices' ), 9 );
-			add_action( 'network_admin_notices', array( $this, 'get_persistent_admin_notices' ), 9 );
+			add_action('wp_ajax_dismiss_ee_nag_notice', array($this, 'dismiss_ee_nag_notice_callback'));
+			add_action('admin_notices', array($this, 'get_persistent_admin_notices'), 9);
+			add_action('network_admin_notices', array($this, 'get_persistent_admin_notices'), 9);
 			//at a glance dashboard widget
-			add_filter( 'dashboard_glance_items', array( $this, 'dashboard_glance_items' ), 10 );
+			add_filter('dashboard_glance_items', array($this, 'dashboard_glance_items'), 10);
 			//filter for get_edit_post_link used on comments for custom post types
-			add_filter( 'get_edit_post_link', array( $this, 'modify_edit_post_link' ), 10, 2 );
+			add_filter('get_edit_post_link', array($this, 'modify_edit_post_link'), 10, 2);
 		}
 		// run the admin page factory but ONLY if we are doing an ee admin ajax request
-		if ( !defined('DOING_AJAX') || EE_ADMIN_AJAX ) {
+		if ( ! defined('DOING_AJAX') || EE_ADMIN_AJAX) {
 			try {
 				//this loads the controller for the admin pages which will setup routing etc
-				EE_Registry::instance()->load_core( 'Admin_Page_Loader' );
-			} catch ( EE_Error $e ) {
+				EE_Registry::instance()->load_core('Admin_Page_Loader');
+			} catch (EE_Error $e) {
 				$e->get_error();
 			}
 		}
-		add_filter( 'content_save_pre', array( $this, 'its_eSpresso' ), 10, 1 );
+		add_filter('content_save_pre', array($this, 'its_eSpresso'), 10, 1);
 		//make sure our CPTs and custom taxonomy metaboxes get shown for first time users
-		add_action('admin_head', array($this, 'enable_hidden_ee_nav_menu_metaboxes' ), 10 );
-		add_action('admin_head', array( $this, 'register_custom_nav_menu_boxes' ), 10 );
+		add_action('admin_head', array($this, 'enable_hidden_ee_nav_menu_metaboxes'), 10);
+		add_action('admin_head', array($this, 'register_custom_nav_menu_boxes'), 10);
 		//exclude EE critical pages from all nav menus and wp_list_pages
-		add_filter('nav_menu_meta_box_object', array( $this, 'remove_pages_from_nav_menu'), 10 );
+		add_filter('nav_menu_meta_box_object', array($this, 'remove_pages_from_nav_menu'), 10);
 	}
 
 
@@ -211,9 +211,9 @@ 
 	 * @param  object $post_type WP post type object
 	 * @return object            WP post type object
 	 */
-	public function remove_pages_from_nav_menu( $post_type ) {
+	public function remove_pages_from_nav_menu($post_type) {
 		//if this isn't the "pages" post type let's get out
-		if ( $post_type->name !== 'page' ) {
+		if ($post_type->name !== 'page') {
 			return $post_type;
 		}
 		$critical_pages = EE_Registry::instance()->CFG->core->get_critical_pages_array();
@@ -233,28 +233,28 @@ 
 	 */
 	public function enable_hidden_ee_nav_menu_metaboxes() {
 		global $wp_meta_boxes, $pagenow;
-		if ( ! is_array($wp_meta_boxes) || $pagenow !== 'nav-menus.php' ) {
+		if ( ! is_array($wp_meta_boxes) || $pagenow !== 'nav-menus.php') {
 			return;
 		}
 		$user = wp_get_current_user();
 		//has this been done yet?
-		if ( get_user_option( 'ee_nav_menu_initialized', $user->ID ) ) {
+		if (get_user_option('ee_nav_menu_initialized', $user->ID)) {
 			return;
 		}
 
-		$hidden_meta_boxes = get_user_option( 'metaboxhidden_nav-menus', $user->ID );
-		$initial_meta_boxes = apply_filters( 'FHEE__EE_Admin__enable_hidden_ee_nav_menu_boxes__initial_meta_boxes', array( 'nav-menu-theme-locations', 'add-page', 'add-custom-links', 'add-category', 'add-espresso_events', 'add-espresso_venues', 'add-espresso_event_categories', 'add-espresso_venue_categories', 'add-post-type-post', 'add-post-type-page' ) );
+		$hidden_meta_boxes = get_user_option('metaboxhidden_nav-menus', $user->ID);
+		$initial_meta_boxes = apply_filters('FHEE__EE_Admin__enable_hidden_ee_nav_menu_boxes__initial_meta_boxes', array('nav-menu-theme-locations', 'add-page', 'add-custom-links', 'add-category', 'add-espresso_events', 'add-espresso_venues', 'add-espresso_event_categories', 'add-espresso_venue_categories', 'add-post-type-post', 'add-post-type-page'));
 
-		if ( is_array( $hidden_meta_boxes ) ) {
-			foreach ( $hidden_meta_boxes as $key => $meta_box_id ) {
-				if ( in_array( $meta_box_id, $initial_meta_boxes ) ) {
-					unset( $hidden_meta_boxes[ $key ] );
+		if (is_array($hidden_meta_boxes)) {
+			foreach ($hidden_meta_boxes as $key => $meta_box_id) {
+				if (in_array($meta_box_id, $initial_meta_boxes)) {
+					unset($hidden_meta_boxes[$key]);
 				}
 			}
 		}
 
-		update_user_option( $user->ID, 'metaboxhidden_nav-menus', $hidden_meta_boxes, true );
-		update_user_option( $user->ID, 'ee_nav_menu_initialized', 1, true );
+		update_user_option($user->ID, 'metaboxhidden_nav-menus', $hidden_meta_boxes, true);
+		update_user_option($user->ID, 'ee_nav_menu_initialized', 1, true);
 	}
 
 
@@ -273,7 +273,7 @@ 
 	 * @return void
 	 */
 	public function register_custom_nav_menu_boxes() {
-		add_meta_box( 'add-extra-nav-menu-pages', __('Event Espresso Pages', 'event_espresso'), array( $this, 'ee_cpt_archive_pages' ), 'nav-menus', 'side', 'core' );
+		add_meta_box('add-extra-nav-menu-pages', __('Event Espresso Pages', 'event_espresso'), array($this, 'ee_cpt_archive_pages'), 'nav-menus', 'side', 'core');
 	}
 
 
@@ -289,16 +289,16 @@ 
 	 *
 	 * @return string  the (maybe) modified link
 	 */
-	public function modify_edit_post_link( $link, $id ) {
-		if ( ! $post = get_post( $id ) ){
+	public function modify_edit_post_link($link, $id) {
+		if ( ! $post = get_post($id)) {
 			return $link;
 		}
-		if ( $post->post_type === 'espresso_attendees' ) {
+		if ($post->post_type === 'espresso_attendees') {
 			$query_args = array(
 				'action' => 'edit_attendee',
 				'post' => $id
 			);
-			return EEH_URL::add_query_args_and_nonce( $query_args, admin_url('admin.php?page=espresso_registrations') );
+			return EEH_URL::add_query_args_and_nonce($query_args, admin_url('admin.php?page=espresso_registrations'));
 		}
 		return $link;
 	}
@@ -310,7 +310,7 @@ 
 		global $nav_menu_selected_id;
 
 		$db_fields = false;
-		$walker = new Walker_Nav_Menu_Checklist( $db_fields );
+		$walker = new Walker_Nav_Menu_Checklist($db_fields);
 		$current_tab = 'event-archives';
 
 		/*if ( ! empty( $_REQUEST['quick-search-posttype-' . $post_type_name] ) ) {
@@ -329,9 +329,9 @@ 
 		?>
 		<div id="posttype-extra-nav-menu-pages" class="posttypediv">
 			<ul id="posttype-extra-nav-menu-pages-tabs" class="posttype-tabs add-menu-item-tabs">
-				<li <?php echo ( 'event-archives' === $current_tab ? ' class="tabs"' : '' ); ?>>
-					<a class="nav-tab-link" data-type="tabs-panel-posttype-extra-nav-menu-pages-event-archives" href="<?php if ( $nav_menu_selected_id ) {echo esc_url(add_query_arg('extra-nav-menu-pages-tab', 'event-archives', remove_query_arg($removed_args)));} ?>#tabs-panel-posttype-extra-nav-menu-pages-event-archives">
-						<?php _e( 'Event Archive Pages', 'event_espresso' ); ?>
+				<li <?php echo ('event-archives' === $current_tab ? ' class="tabs"' : ''); ?>>
+					<a class="nav-tab-link" data-type="tabs-panel-posttype-extra-nav-menu-pages-event-archives" href="<?php if ($nav_menu_selected_id) {echo esc_url(add_query_arg('extra-nav-menu-pages-tab', 'event-archives', remove_query_arg($removed_args))); } ?>#tabs-panel-posttype-extra-nav-menu-pages-event-archives">
+						<?php _e('Event Archive Pages', 'event_espresso'); ?>
 					</a>
 				</li>
 			<?php /* // temporarily removing but leaving skeleton in place in case we ever decide to add more tabs.
@@ -349,13 +349,13 @@ 
  			<?php */ ?>
 
 			<div id="tabs-panel-posttype-extra-nav-menu-pages-event-archives" class="tabs-panel <?php
-			echo ( 'event-archives' === $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
+			echo ('event-archives' === $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive');
 			?>">
 				<ul id="extra-nav-menu-pageschecklist-event-archives" class="categorychecklist form-no-clear">
 					<?php
 					$pages = $this->_get_extra_nav_menu_pages_items();
 					$args['walker'] = $walker;
-					echo walk_nav_menu_tree( array_map( array( $this, '_setup_extra_nav_menu_pages_items' ), $pages), 0, (object) $args );
+					echo walk_nav_menu_tree(array_map(array($this, '_setup_extra_nav_menu_pages_items'), $pages), 0, (object) $args);
 					?>
 				</ul>
 			</div><!-- /.tabs-panel -->
@@ -363,18 +363,18 @@ 
 			<p class="button-controls">
 				<span class="list-controls">
 					<a href="<?php
-						echo esc_url( add_query_arg(
+						echo esc_url(add_query_arg(
 							array(
 								'extra-nav-menu-pages-tab' => 'event-archives',
 								'selectall' => 1,
 							),
-							remove_query_arg( $removed_args )
+							remove_query_arg($removed_args)
 						));
 					?>#posttype-extra-nav-menu-pages>" class="select-all"><?php _e('Select All'); ?></a>
 				</span>
 
 				<span class="add-to-menu">
-					<input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e( __( 'Add to Menu' ) ); ?>" name="add-post-type-menu-item" id="<?php esc_attr_e( 'submit-posttype-extra-nav-menu-pages' ); ?>" />
+					<input type="submit"<?php wp_nav_menu_disabled_check($nav_menu_selected_id); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e(__('Add to Menu')); ?>" name="add-post-type-menu-item" id="<?php esc_attr_e('submit-posttype-extra-nav-menu-pages'); ?>" />
 					<span class="spinner"></span>
 				</span>
 			</p>
@@ -395,10 +395,10 @@ 
 	private function _get_extra_nav_menu_pages_items() {
 		$menuitems[] = array(
 			'title' => __('Event List', 'event_espresso'),
-			'url' => get_post_type_archive_link( 'espresso_events' ),
+			'url' => get_post_type_archive_link('espresso_events'),
 			'description' => __('Archive page for all events.', 'event_espresso')
 		);
-		return apply_filters( 'FHEE__EE_Admin__get_extra_nav_menu_pages_items', $menuitems );
+		return apply_filters('FHEE__EE_Admin__get_extra_nav_menu_pages_items', $menuitems);
 	}
 
 
@@ -410,7 +410,7 @@ 
 	 * @param $menu_item_values
 	 * @return stdClass
 	 */
-	private function _setup_extra_nav_menu_pages_items( $menu_item_values ) {
+	private function _setup_extra_nav_menu_pages_items($menu_item_values) {
 		$menu_item = new stdClass();
 		$keys = array(
 			'ID' => 0,
@@ -430,8 +430,8 @@ 
 			'xfn' => ''
 		);
 
-		foreach ( $keys as $key => $value) {
-			$menu_item->{$key} = isset( $menu_item_values[ $key]) ? $menu_item_values[ $key] : $value;
+		foreach ($keys as $key => $value) {
+			$menu_item->{$key} = isset($menu_item_values[$key]) ? $menu_item_values[$key] : $value;
 		}
 		return $menu_item;
 	}
@@ -470,9 +470,9 @@ 
 		 * - check if doing post processing of one of EE CPTs
 		 * - instantiate the corresponding EE CPT model for the post_type being processed.
 		 */
-		if ( isset( $_POST['action'], $_POST['post_type'] ) && $_POST['action'] === 'editpost' ) {
-			EE_Registry::instance()->load_core( 'Register_CPTs' );
-			EE_Register_CPTs::instantiate_cpt_models( $_POST['post_type'] );
+		if (isset($_POST['action'], $_POST['post_type']) && $_POST['action'] === 'editpost') {
+			EE_Registry::instance()->load_core('Register_CPTs');
+			EE_Register_CPTs::instantiate_cpt_models($_POST['post_type']);
 		}
 
 
@@ -482,7 +482,7 @@ 
          * tab in the EE General Settings Admin page.
          * This is for user-proofing.
 		 */
-        add_filter( 'wp_dropdown_pages', array( $this, 'modify_dropdown_pages' ) );
+        add_filter('wp_dropdown_pages', array($this, 'modify_dropdown_pages'));
 
 	}
 
@@ -493,25 +493,25 @@ 
 	 * @param string $output  Current output.
 	 * @return string
 	 */
-	public function modify_dropdown_pages( $output ) {
+	public function modify_dropdown_pages($output) {
 		//get critical pages
 		$critical_pages = EE_Registry::instance()->CFG->core->get_critical_pages_array();
 
 		//split current output by line break for easier parsing.
-		$split_output = explode( "\n", $output );
+		$split_output = explode("\n", $output);
 
 		//loop through to remove any critical pages from the array.
-		foreach ( $critical_pages as $page_id ) {
-			$needle = 'value="' . $page_id . '"';
-			foreach( $split_output as $key => $haystack ) {
-				if( strpos( $haystack, $needle ) !== false ) {
-					unset( $split_output[$key] );
+		foreach ($critical_pages as $page_id) {
+			$needle = 'value="'.$page_id.'"';
+			foreach ($split_output as $key => $haystack) {
+				if (strpos($haystack, $needle) !== false) {
+					unset($split_output[$key]);
 				}
 			}
 		}
 
 		//replace output with the new contents
-		return implode( "\n", $split_output );
+		return implode("\n", $split_output);
 	}
 
 
@@ -525,36 +525,36 @@ 
 	public function enqueue_admin_scripts() {
 		// this javascript is loaded on every admin page to catch any injections ee needs to add to wp run js.
 		// Note: the intention of this script is to only do TARGETED injections.  I.E, only injecting on certain script calls.
-		wp_enqueue_script('ee-inject-wp', EE_ADMIN_URL . 'assets/ee-cpt-wp-injects.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_enqueue_script('ee-inject-wp', EE_ADMIN_URL.'assets/ee-cpt-wp-injects.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE);
 		// register cookie script for future dependencies
-		wp_register_script('jquery-cookie', EE_THIRD_PARTY_URL . 'joyride/jquery.cookie.js', array('jquery'), '2.1', TRUE );
+		wp_register_script('jquery-cookie', EE_THIRD_PARTY_URL.'joyride/jquery.cookie.js', array('jquery'), '2.1', TRUE);
 		// jquery_validate loading is turned OFF by default, but prior to the admin_enqueue_scripts hook, can be turned back on again via:  add_filter( 'FHEE_load_jquery_validate', '__return_true' );
-		if ( apply_filters( 'FHEE_load_jquery_validate', FALSE ) ) {
+		if (apply_filters('FHEE_load_jquery_validate', FALSE)) {
 			// register jQuery Validate
-			wp_register_script('jquery-validate', EE_GLOBAL_ASSETS_URL . 'scripts/jquery.validate.min.js', array('jquery'), '1.15.0', TRUE);
+			wp_register_script('jquery-validate', EE_GLOBAL_ASSETS_URL.'scripts/jquery.validate.min.js', array('jquery'), '1.15.0', TRUE);
 		}
 		//joyride is turned OFF by default, but prior to the admin_enqueue_scripts hook, can be turned back on again vai: add_filter('FHEE_load_joyride', '__return_true' );
-		if ( apply_filters( 'FHEE_load_joyride', FALSE ) ) {
+		if (apply_filters('FHEE_load_joyride', FALSE)) {
 			//joyride style
-			wp_register_style('joyride-css', EE_THIRD_PARTY_URL . 'joyride/joyride-2.1.css', array(), '2.1');
-			wp_register_style('ee-joyride-css', EE_GLOBAL_ASSETS_URL . 'css/ee-joyride-styles.css', array('joyride-css'), EVENT_ESPRESSO_VERSION );
-			wp_register_script('joyride-modernizr', EE_THIRD_PARTY_URL . 'joyride/modernizr.mq.js', array(), '2.1', TRUE );
+			wp_register_style('joyride-css', EE_THIRD_PARTY_URL.'joyride/joyride-2.1.css', array(), '2.1');
+			wp_register_style('ee-joyride-css', EE_GLOBAL_ASSETS_URL.'css/ee-joyride-styles.css', array('joyride-css'), EVENT_ESPRESSO_VERSION);
+			wp_register_script('joyride-modernizr', EE_THIRD_PARTY_URL.'joyride/modernizr.mq.js', array(), '2.1', TRUE);
 			//joyride JS
-			wp_register_script('jquery-joyride', EE_THIRD_PARTY_URL . 'joyride/jquery.joyride-2.1.js', array('jquery-cookie', 'joyride-modernizr'), '2.1', TRUE );
+			wp_register_script('jquery-joyride', EE_THIRD_PARTY_URL.'joyride/jquery.joyride-2.1.js', array('jquery-cookie', 'joyride-modernizr'), '2.1', TRUE);
 			// wanna go for a joyride?
 			wp_enqueue_style('ee-joyride-css');
 			wp_enqueue_script('jquery-joyride');
 		}
 		//qtip is turned OFF by default, but prior to the admin_enqueue_scripts hook, can be turned back on again via: add_filter('FHEE_load_qtips', '__return_true' );
-		if ( apply_filters( 'FHEE_load_qtip', FALSE ) ) {
+		if (apply_filters('FHEE_load_qtip', FALSE)) {
 			EEH_Qtip_Loader::instance()->register_and_enqueue();
 		}
 		//accounting.js library
 		// @link http://josscrowcroft.github.io/accounting.js/
-		if ( apply_filters( 'FHEE_load_accounting_js', FALSE ) ) {
-			wp_register_script( 'ee-accounting', EE_GLOBAL_ASSETS_URL . 'scripts/ee-accounting-config.js', array('ee-accounting-core'), EVENT_ESPRESSO_VERSION, TRUE );
-			wp_register_script( 'ee-accounting-core', EE_THIRD_PARTY_URL . 'accounting/accounting.js', array('underscore'), '0.3.2', TRUE );
-			wp_enqueue_script( 'ee-accounting' );
+		if (apply_filters('FHEE_load_accounting_js', FALSE)) {
+			wp_register_script('ee-accounting', EE_GLOBAL_ASSETS_URL.'scripts/ee-accounting-config.js', array('ee-accounting-core'), EVENT_ESPRESSO_VERSION, TRUE);
+			wp_register_script('ee-accounting-core', EE_THIRD_PARTY_URL.'accounting/accounting.js', array('underscore'), '0.3.2', TRUE);
+			wp_enqueue_script('ee-accounting');
 			// array of settings to get converted to JSON array via wp_localize_script
 			$currency_config = array(
 				'currency' => array(
@@ -601,11 +601,11 @@ 
 	public function get_persistent_admin_notices() {
 		// http://www.example.com/wp-admin/admin.php?page=espresso_general_settings&action=critical_pages&critical_pages_nonce=2831ce0f30
 		$args = array(
-			'page' => EE_Registry::instance()->REQ->is_set( 'page' ) ? EE_Registry::instance()->REQ->get( 'page' ) : '',
-			'action' => EE_Registry::instance()->REQ->is_set( 'action' ) ? EE_Registry::instance()->REQ->get( 'action' ) : '',
+			'page' => EE_Registry::instance()->REQ->is_set('page') ? EE_Registry::instance()->REQ->get('page') : '',
+			'action' => EE_Registry::instance()->REQ->is_set('action') ? EE_Registry::instance()->REQ->get('action') : '',
 		);
-		$return_url = EE_Admin_Page::add_query_args_and_nonce( $args, EE_ADMIN_URL );
-		echo EE_Error::get_persistent_admin_notices( $return_url );
+		$return_url = EE_Admin_Page::add_query_args_and_nonce($args, EE_ADMIN_URL);
+		echo EE_Error::get_persistent_admin_notices($return_url);
 	}
 
 
@@ -630,24 +630,24 @@ 
 	public function dashboard_glance_items($elements) {
         $elements = is_array($elements) ? $elements : array($elements);
 		$events = EEM_Event::instance()->count();
-		$items['events']['url'] = EE_Admin_Page::add_query_args_and_nonce( array('page' => 'espresso_events'), admin_url('admin.php') );
-		$items['events']['text'] = sprintf( _n( '%s Event', '%s Events', $events ), number_format_i18n( $events ) );
+		$items['events']['url'] = EE_Admin_Page::add_query_args_and_nonce(array('page' => 'espresso_events'), admin_url('admin.php'));
+		$items['events']['text'] = sprintf(_n('%s Event', '%s Events', $events), number_format_i18n($events));
 		$items['events']['title'] = __('Click to view all Events', 'event_espresso');
 		$registrations = EEM_Registration::instance()->count(
 			array(
 				array(
-					'STS_ID' => array( '!=', EEM_Registration::status_id_incomplete )
+					'STS_ID' => array('!=', EEM_Registration::status_id_incomplete)
 				)
 			)
 		);
-		$items['registrations']['url'] = EE_Admin_Page::add_query_args_and_nonce( array('page' => 'espresso_registrations' ), admin_url('admin.php') );
-		$items['registrations']['text'] = sprintf( _n( '%s Registration', '%s Registrations', $registrations ), number_format_i18n($registrations) );
+		$items['registrations']['url'] = EE_Admin_Page::add_query_args_and_nonce(array('page' => 'espresso_registrations'), admin_url('admin.php'));
+		$items['registrations']['text'] = sprintf(_n('%s Registration', '%s Registrations', $registrations), number_format_i18n($registrations));
 		$items['registrations']['title'] = __('Click to view all registrations', 'event_espresso');
 
-		$items = (array) apply_filters( 'FHEE__EE_Admin__dashboard_glance_items__items', $items );
+		$items = (array) apply_filters('FHEE__EE_Admin__dashboard_glance_items__items', $items);
 
-		foreach ( $items as $type => $item_properties ) {
-			$elements[] = sprintf( '<a class="ee-dashboard-link-' . $type . '" href="%s" title="%s">%s</a>', $item_properties['url'], $item_properties['title'], $item_properties['text'] );
+		foreach ($items as $type => $item_properties) {
+			$elements[] = sprintf('<a class="ee-dashboard-link-'.$type.'" href="%s" title="%s">%s</a>', $item_properties['url'], $item_properties['title'], $item_properties['text']);
 		}
 		return $elements;
 	}
@@ -664,31 +664,31 @@ 
 	 * @throws EE_Error
 	 * @return    string
 	 */
-	public function check_for_invalid_datetime_formats( $value, $option ) {
+	public function check_for_invalid_datetime_formats($value, $option) {
 		// check for date_format or time_format
-		switch ( $option ) {
+		switch ($option) {
 			case 'date_format' :
-				$date_time_format = $value . ' ' . get_option('time_format');
+				$date_time_format = $value.' '.get_option('time_format');
 				break;
 			case 'time_format' :
-				$date_time_format = get_option('date_format') . ' ' . $value;
+				$date_time_format = get_option('date_format').' '.$value;
 				break;
 			default :
 				$date_time_format = FALSE;
 		}
 		// do we have a date_time format to check ?
-		if ( $date_time_format ) {
-			$error_msg = EEH_DTT_Helper::validate_format_string( $date_time_format );
+		if ($date_time_format) {
+			$error_msg = EEH_DTT_Helper::validate_format_string($date_time_format);
 
-			if ( is_array( $error_msg ) ) {
-				$msg = '<p>' . sprintf( __( 'The following date time "%s" ( %s ) is difficult to be properly parsed by PHP for the following reasons:', 'event_espresso' ), date( $date_time_format ) , $date_time_format  ) . '</p><p><ul>';
+			if (is_array($error_msg)) {
+				$msg = '<p>'.sprintf(__('The following date time "%s" ( %s ) is difficult to be properly parsed by PHP for the following reasons:', 'event_espresso'), date($date_time_format), $date_time_format).'</p><p><ul>';
 
 
-				foreach ( $error_msg as $error ) {
-					$msg .= '<li>' . $error . '</li>';
+				foreach ($error_msg as $error) {
+					$msg .= '<li>'.$error.'</li>';
 				}
 
-				$msg .= '</ul></p><p>' . sprintf( __( '%sPlease note that your date and time formats have been reset to "F j, Y" and "g:i a" respectively.%s', 'event_espresso' ), '<span style="color:#D54E21;">', '</span>' ) . '</p>';
+				$msg .= '</ul></p><p>'.sprintf(__('%sPlease note that your date and time formats have been reset to "F j, Y" and "g:i a" respectively.%s', 'event_espresso'), '<span style="color:#D54E21;">', '</span>').'</p>';
 
 				// trigger WP settings error
 				add_settings_error(
@@ -698,7 +698,7 @@ 
 				);
 
 				// set format to something valid
-				switch ( $option ) {
+				switch ($option) {
 					case 'date_format' :
 						$value = 'F j, Y';
 						break;
@@ -720,8 +720,8 @@ 
 	 * @param $content
 	 * @return    string
 	 */
-	public function its_eSpresso( $content ) {
-		return str_replace( '[EXPRESSO_', '[ESPRESSO_', $content );
+	public function its_eSpresso($content) {
+		return str_replace('[EXPRESSO_', '[ESPRESSO_', $content);
 	}
 
 
@@ -733,7 +733,7 @@ 
 	 *  @return 	string
 	 */
 	public function espresso_admin_footer() {
-		return \EEH_Template::powered_by_event_espresso( 'aln-cntr', '', array( 'utm_content' => 'admin_footer' ));
+		return \EEH_Template::powered_by_event_espresso('aln-cntr', '', array('utm_content' => 'admin_footer'));
 	}
 
 
@@ -752,12 +752,12 @@ 
 	 * @param array $config
 	 * @return void
 	 */
-	public static function register_ee_admin_page( $page_basename, $page_path, $config = array() ) {
-		EE_Error::doing_it_wrong( __METHOD__, sprintf( __('Usage is deprecated.  Use EE_Register_Admin_Page::register() for registering the %s admin page.', 'event_espresso'), $page_basename), '4.3' );
-		if ( class_exists( 'EE_Register_Admin_Page' ) ) {
+	public static function register_ee_admin_page($page_basename, $page_path, $config = array()) {
+		EE_Error::doing_it_wrong(__METHOD__, sprintf(__('Usage is deprecated.  Use EE_Register_Admin_Page::register() for registering the %s admin page.', 'event_espresso'), $page_basename), '4.3');
+		if (class_exists('EE_Register_Admin_Page')) {
 			$config['page_path'] = $page_path;
 		}
-		EE_Register_Admin_Page::register( $page_basename, $config );
+		EE_Register_Admin_Page::register($page_basename, $config);
 
 	}
 
@@ -770,7 +770,7 @@ 
 	 * @param  \WP_Post $post
 	 * @return void
 	 */
-	public static function parse_post_content_on_save( $post_ID, $post ) {
+	public static function parse_post_content_on_save($post_ID, $post) {
 		EE_Error::doing_it_wrong(
 			__METHOD__,
 			__(
@@ -779,7 +779,7 @@ 
 			),
 			'4.8.41'
 		);
-		EventEspresso\core\admin\PostShortcodeTracking::parse_post_content_on_save( $post_ID, $post );
+		EventEspresso\core\admin\PostShortcodeTracking::parse_post_content_on_save($post_ID, $post);
 	}
 
 
@@ -792,7 +792,7 @@ 
 	 * @param  $value
 	 * @return void
 	 */
-	public function reset_page_for_posts_on_change( $option, $old_value, $value ) {
+	public function reset_page_for_posts_on_change($option, $old_value, $value) {
 		EE_Error::doing_it_wrong(
 			__METHOD__,
 			__(
@@ -801,7 +801,7 @@ 
 			),
 			'4.8.41'
 		);
-		EventEspresso\core\admin\PostShortcodeTracking::reset_page_for_posts_on_change( $option, $old_value, $value );
+		EventEspresso\core\admin\PostShortcodeTracking::reset_page_for_posts_on_change($option, $old_value, $value);
 	}
 
 }

Braces +3 added lines, -1 removed lines

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