eventespresso / event-espresso-core

modules/ticket_selector/DisplayTicketSelector.php

Indentation +818 added lines, -818 removed lines

@@ -39,825 +39,825 @@
  */
 class DisplayTicketSelector
 {
-    /**
-     * @var RequestInterface
-     */
-    protected $request;
-
-    /**
-     * @var EE_Ticket_Selector_Config
-     */
-    protected $config;
-
-    /**
-     * event that ticket selector is being generated for
-     *
-     * @access protected
-     * @var EE_Event $event
-     */
-    protected $event;
-
-    /**
-     * Used to flag when the ticket selector is being called from an external iframe.
-     *
-     * @var bool $iframe
-     */
-    protected $iframe = false;
-
-    /**
-     * max attendees that can register for event at one time
-     *
-     * @var int $max_attendees
-     */
-    private $max_attendees = EE_INF;
-
-    /**
-     * @var string $date_format
-     */
-    private $date_format;
-
-    /**
-     * @var string $time_format
-     */
-    private $time_format;
-
-    /**
-     * @var boolean $display_full_ui
-     */
-    private $display_full_ui;
-
-
-    /**
-     * DisplayTicketSelector constructor.
-     *
-     * @param RequestInterface          $request
-     * @param EE_Ticket_Selector_Config $config
-     * @param bool                      $iframe
-     */
-    public function __construct(RequestInterface $request, EE_Ticket_Selector_Config $config, $iframe = false)
-    {
-        $this->request     = $request;
-        $this->config      = $config;
-        $this->iframe      = $iframe;
-        $this->date_format = apply_filters(
-            'FHEE__EED_Ticket_Selector__display_ticket_selector__date_format',
-            get_option('date_format')
-        );
-        $this->time_format = apply_filters(
-            'FHEE__EED_Ticket_Selector__display_ticket_selector__time_format',
-            get_option('time_format')
-        );
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function isIframe()
-    {
-        return $this->iframe;
-    }
-
-
-    /**
-     * @param boolean $iframe
-     */
-    public function setIframe($iframe = true)
-    {
-        $this->iframe = filter_var($iframe, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * finds and sets the \EE_Event object for use throughout class
-     *
-     * @param mixed $event
-     * @return bool
-     * @throws EE_Error
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     */
-    protected function setEvent($event = null)
-    {
-        if ($event === null) {
-            global $post;
-            $event = $post;
-        }
-        if ($event instanceof EE_Event) {
-            $this->event = $event;
-        } elseif ($event instanceof WP_Post) {
-            if (isset($event->EE_Event) && $event->EE_Event instanceof EE_Event) {
-                $this->event = $event->EE_Event;
-            } elseif ($event->post_type === 'espresso_events') {
-                $event->EE_Event = EEM_Event::instance()->instantiate_class_from_post_object($event);
-                $this->event     = $event->EE_Event;
-            }
-        } else {
-            $user_msg = esc_html__('No Event object or an invalid Event object was supplied.', 'event_espresso');
-            $dev_msg  = $user_msg . esc_html__(
-                'In order to generate a ticket selector, please ensure you are passing either an EE_Event object or a WP_Post object of the post type "espresso_event" to the EE_Ticket_Selector class constructor.',
-                'event_espresso'
-            );
-            EE_Error::add_error($user_msg . '||' . $dev_msg, __FILE__, __FUNCTION__, __LINE__);
-            return false;
-        }
-        return true;
-    }
-
-
-    /**
-     * @return int
-     */
-    public function getMaxAttendees()
-    {
-        return $this->max_attendees;
-    }
-
-
-    /**
-     * @param int $max_attendees
-     */
-    public function setMaxAttendees($max_attendees)
-    {
-        $this->max_attendees = absint(
-            apply_filters(
-                'FHEE__EE_Ticket_Selector__display_ticket_selector__max_tickets',
-                $max_attendees
-            )
-        );
-    }
-
-
-    /**
-     * Returns whether or not the full ticket selector should be shown or not.
-     * Currently, it displays on the frontend (including ajax requests) but not the backend
-     *
-     * @return bool
-     */
-    private function display_full_ui()
-    {
-        if ($this->display_full_ui === null) {
-            $this->display_full_ui = ! is_admin() || (defined('DOING_AJAX') && DOING_AJAX);
-        }
-        return $this->display_full_ui;
-    }
-
-
-    /**
-     * creates buttons for selecting number of attendees for an event
-     *
-     * @param WP_Post|int $event
-     * @param bool        $view_details
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     * @throws Exception
-     */
-    public function display($event = null, $view_details = false)
-    {
-        // reset filter for displaying submit button
-        remove_filter('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true');
-        // poke and prod incoming event till it tells us what it is
-        if (! $this->setEvent($event)) {
-            return $this->handleMissingEvent();
-        }
-        // is the event expired ?
-        $template_args['event_is_expired'] = ! is_admin() && $this->event->is_expired();
-        if ($template_args['event_is_expired']) {
-            return is_single()
-                ? $this->expiredEventMessage()
-                : $this->expiredEventMessage()
-                  . $this->displayViewDetailsButton();
-        }
-        // begin gathering template arguments by getting event status
-        $template_args = ['event_status' => $this->event->get_active_status()];
-        if (
-            $this->activeEventAndShowTicketSelector(
-                $event,
-                $template_args['event_status'],
-                $view_details
-            )
-        ) {
-            return ! is_single() ? $this->displayViewDetailsButton() : '';
-        }
-        // filter the maximum qty that can appear in the Ticket Selector qty dropdowns
-        $this->setMaxAttendees($this->event->additional_limit());
-        if ($this->getMaxAttendees() < 1) {
-            return $this->ticketSalesClosedMessage();
-        }
-        // get all tickets for this event ordered by the datetime
-        $tickets = $this->getTickets();
-        if (count($tickets) < 1) {
-            return $this->noTicketAvailableMessage();
-        }
-        // redirecting to another site for registration ??
-        $external_url = (string) $this->event->external_url()
-                        && $this->event->external_url() !== get_the_permalink()
-            ? $this->event->external_url()
-            : '';
-        // if redirecting to another site for registration, then we don't load the TS
-        $ticket_selector = $external_url
-            ? $this->externalEventRegistration()
-            : $this->loadTicketSelector($tickets, $template_args);
-        // now set up the form (but not for the admin)
-        $ticket_selector = $this->display_full_ui()
-            ? $this->formOpen($this->event->ID(), $external_url) . $ticket_selector
-            : $ticket_selector;
-        // submit button and form close tag
-        $ticket_selector .= $this->display_full_ui() ? $this->displaySubmitButton($external_url) : '';
-        return $ticket_selector;
-    }
-
-
-    /**
-     * displayTicketSelector
-     * examines the event properties and determines whether a Ticket Selector should be displayed
-     *
-     * @param WP_Post|int $event
-     * @param string      $_event_active_status
-     * @param bool        $view_details
-     * @return bool
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function activeEventAndShowTicketSelector($event, $_event_active_status, $view_details)
-    {
-        $event_post = $this->event instanceof EE_Event ? $this->event->ID() : $event;
-        return $this->display_full_ui()
-               && (
-                   ! $this->event->display_ticket_selector()
-                   || $view_details
-                   || post_password_required($event_post)
-                   || (
-                       $_event_active_status !== EE_Datetime::active
-                       && $_event_active_status !== EE_Datetime::upcoming
-                       && $_event_active_status !== EE_Datetime::sold_out
-                       && ! (
-                           $_event_active_status === EE_Datetime::inactive
-                           && is_user_logged_in()
-                       )
-                   )
-               );
-    }
-
-
-    /**
-     * noTicketAvailableMessage
-     * notice displayed if event is expired
-     *
-     * @return string
-     */
-    protected function expiredEventMessage()
-    {
-        return '<div class="ee-event-expired-notice"><span class="important-notice">' . esc_html__(
-            'We\'re sorry, but all tickets sales have ended because the event is expired.',
-            'event_espresso'
-        ) . '</span></div><!-- .ee-event-expired-notice -->';
-    }
-
-
-    /**
-     * noTicketAvailableMessage
-     * notice displayed if event has no more tickets available
-     *
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function noTicketAvailableMessage()
-    {
-        $no_ticket_available_msg = esc_html__('We\'re sorry, but all ticket sales have ended.', 'event_espresso');
-        if (current_user_can('edit_post', $this->event->ID())) {
-            $no_ticket_available_msg .= sprintf(
-                esc_html__(
-                    '%1$sNote to Event Admin:%2$sNo tickets were found for this event. This effectively turns off ticket sales. Please ensure that at least one ticket is available for if you want people to be able to register.%3$s(click to edit this event)%4$s',
-                    'event_espresso'
-                ),
-                '<div class="ee-attention" style="text-align: left;"><b>',
-                '</b><br />',
-                '<span class="edit-link"><a class="post-edit-link" href="'
-                . get_edit_post_link($this->event->ID())
-                . '">',
-                '</a></span></div><!-- .ee-attention noTicketAvailableMessage -->'
-            );
-        }
-        return '
+	/**
+	 * @var RequestInterface
+	 */
+	protected $request;
+
+	/**
+	 * @var EE_Ticket_Selector_Config
+	 */
+	protected $config;
+
+	/**
+	 * event that ticket selector is being generated for
+	 *
+	 * @access protected
+	 * @var EE_Event $event
+	 */
+	protected $event;
+
+	/**
+	 * Used to flag when the ticket selector is being called from an external iframe.
+	 *
+	 * @var bool $iframe
+	 */
+	protected $iframe = false;
+
+	/**
+	 * max attendees that can register for event at one time
+	 *
+	 * @var int $max_attendees
+	 */
+	private $max_attendees = EE_INF;
+
+	/**
+	 * @var string $date_format
+	 */
+	private $date_format;
+
+	/**
+	 * @var string $time_format
+	 */
+	private $time_format;
+
+	/**
+	 * @var boolean $display_full_ui
+	 */
+	private $display_full_ui;
+
+
+	/**
+	 * DisplayTicketSelector constructor.
+	 *
+	 * @param RequestInterface          $request
+	 * @param EE_Ticket_Selector_Config $config
+	 * @param bool                      $iframe
+	 */
+	public function __construct(RequestInterface $request, EE_Ticket_Selector_Config $config, $iframe = false)
+	{
+		$this->request     = $request;
+		$this->config      = $config;
+		$this->iframe      = $iframe;
+		$this->date_format = apply_filters(
+			'FHEE__EED_Ticket_Selector__display_ticket_selector__date_format',
+			get_option('date_format')
+		);
+		$this->time_format = apply_filters(
+			'FHEE__EED_Ticket_Selector__display_ticket_selector__time_format',
+			get_option('time_format')
+		);
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isIframe()
+	{
+		return $this->iframe;
+	}
+
+
+	/**
+	 * @param boolean $iframe
+	 */
+	public function setIframe($iframe = true)
+	{
+		$this->iframe = filter_var($iframe, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * finds and sets the \EE_Event object for use throughout class
+	 *
+	 * @param mixed $event
+	 * @return bool
+	 * @throws EE_Error
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 */
+	protected function setEvent($event = null)
+	{
+		if ($event === null) {
+			global $post;
+			$event = $post;
+		}
+		if ($event instanceof EE_Event) {
+			$this->event = $event;
+		} elseif ($event instanceof WP_Post) {
+			if (isset($event->EE_Event) && $event->EE_Event instanceof EE_Event) {
+				$this->event = $event->EE_Event;
+			} elseif ($event->post_type === 'espresso_events') {
+				$event->EE_Event = EEM_Event::instance()->instantiate_class_from_post_object($event);
+				$this->event     = $event->EE_Event;
+			}
+		} else {
+			$user_msg = esc_html__('No Event object or an invalid Event object was supplied.', 'event_espresso');
+			$dev_msg  = $user_msg . esc_html__(
+				'In order to generate a ticket selector, please ensure you are passing either an EE_Event object or a WP_Post object of the post type "espresso_event" to the EE_Ticket_Selector class constructor.',
+				'event_espresso'
+			);
+			EE_Error::add_error($user_msg . '||' . $dev_msg, __FILE__, __FUNCTION__, __LINE__);
+			return false;
+		}
+		return true;
+	}
+
+
+	/**
+	 * @return int
+	 */
+	public function getMaxAttendees()
+	{
+		return $this->max_attendees;
+	}
+
+
+	/**
+	 * @param int $max_attendees
+	 */
+	public function setMaxAttendees($max_attendees)
+	{
+		$this->max_attendees = absint(
+			apply_filters(
+				'FHEE__EE_Ticket_Selector__display_ticket_selector__max_tickets',
+				$max_attendees
+			)
+		);
+	}
+
+
+	/**
+	 * Returns whether or not the full ticket selector should be shown or not.
+	 * Currently, it displays on the frontend (including ajax requests) but not the backend
+	 *
+	 * @return bool
+	 */
+	private function display_full_ui()
+	{
+		if ($this->display_full_ui === null) {
+			$this->display_full_ui = ! is_admin() || (defined('DOING_AJAX') && DOING_AJAX);
+		}
+		return $this->display_full_ui;
+	}
+
+
+	/**
+	 * creates buttons for selecting number of attendees for an event
+	 *
+	 * @param WP_Post|int $event
+	 * @param bool        $view_details
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 * @throws Exception
+	 */
+	public function display($event = null, $view_details = false)
+	{
+		// reset filter for displaying submit button
+		remove_filter('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true');
+		// poke and prod incoming event till it tells us what it is
+		if (! $this->setEvent($event)) {
+			return $this->handleMissingEvent();
+		}
+		// is the event expired ?
+		$template_args['event_is_expired'] = ! is_admin() && $this->event->is_expired();
+		if ($template_args['event_is_expired']) {
+			return is_single()
+				? $this->expiredEventMessage()
+				: $this->expiredEventMessage()
+				  . $this->displayViewDetailsButton();
+		}
+		// begin gathering template arguments by getting event status
+		$template_args = ['event_status' => $this->event->get_active_status()];
+		if (
+			$this->activeEventAndShowTicketSelector(
+				$event,
+				$template_args['event_status'],
+				$view_details
+			)
+		) {
+			return ! is_single() ? $this->displayViewDetailsButton() : '';
+		}
+		// filter the maximum qty that can appear in the Ticket Selector qty dropdowns
+		$this->setMaxAttendees($this->event->additional_limit());
+		if ($this->getMaxAttendees() < 1) {
+			return $this->ticketSalesClosedMessage();
+		}
+		// get all tickets for this event ordered by the datetime
+		$tickets = $this->getTickets();
+		if (count($tickets) < 1) {
+			return $this->noTicketAvailableMessage();
+		}
+		// redirecting to another site for registration ??
+		$external_url = (string) $this->event->external_url()
+						&& $this->event->external_url() !== get_the_permalink()
+			? $this->event->external_url()
+			: '';
+		// if redirecting to another site for registration, then we don't load the TS
+		$ticket_selector = $external_url
+			? $this->externalEventRegistration()
+			: $this->loadTicketSelector($tickets, $template_args);
+		// now set up the form (but not for the admin)
+		$ticket_selector = $this->display_full_ui()
+			? $this->formOpen($this->event->ID(), $external_url) . $ticket_selector
+			: $ticket_selector;
+		// submit button and form close tag
+		$ticket_selector .= $this->display_full_ui() ? $this->displaySubmitButton($external_url) : '';
+		return $ticket_selector;
+	}
+
+
+	/**
+	 * displayTicketSelector
+	 * examines the event properties and determines whether a Ticket Selector should be displayed
+	 *
+	 * @param WP_Post|int $event
+	 * @param string      $_event_active_status
+	 * @param bool        $view_details
+	 * @return bool
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function activeEventAndShowTicketSelector($event, $_event_active_status, $view_details)
+	{
+		$event_post = $this->event instanceof EE_Event ? $this->event->ID() : $event;
+		return $this->display_full_ui()
+			   && (
+				   ! $this->event->display_ticket_selector()
+				   || $view_details
+				   || post_password_required($event_post)
+				   || (
+					   $_event_active_status !== EE_Datetime::active
+					   && $_event_active_status !== EE_Datetime::upcoming
+					   && $_event_active_status !== EE_Datetime::sold_out
+					   && ! (
+						   $_event_active_status === EE_Datetime::inactive
+						   && is_user_logged_in()
+					   )
+				   )
+			   );
+	}
+
+
+	/**
+	 * noTicketAvailableMessage
+	 * notice displayed if event is expired
+	 *
+	 * @return string
+	 */
+	protected function expiredEventMessage()
+	{
+		return '<div class="ee-event-expired-notice"><span class="important-notice">' . esc_html__(
+			'We\'re sorry, but all tickets sales have ended because the event is expired.',
+			'event_espresso'
+		) . '</span></div><!-- .ee-event-expired-notice -->';
+	}
+
+
+	/**
+	 * noTicketAvailableMessage
+	 * notice displayed if event has no more tickets available
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function noTicketAvailableMessage()
+	{
+		$no_ticket_available_msg = esc_html__('We\'re sorry, but all ticket sales have ended.', 'event_espresso');
+		if (current_user_can('edit_post', $this->event->ID())) {
+			$no_ticket_available_msg .= sprintf(
+				esc_html__(
+					'%1$sNote to Event Admin:%2$sNo tickets were found for this event. This effectively turns off ticket sales. Please ensure that at least one ticket is available for if you want people to be able to register.%3$s(click to edit this event)%4$s',
+					'event_espresso'
+				),
+				'<div class="ee-attention" style="text-align: left;"><b>',
+				'</b><br />',
+				'<span class="edit-link"><a class="post-edit-link" href="'
+				. get_edit_post_link($this->event->ID())
+				. '">',
+				'</a></span></div><!-- .ee-attention noTicketAvailableMessage -->'
+			);
+		}
+		return '
             <div class="ee-event-expired-notice">
                 <span class="important-notice">' . $no_ticket_available_msg . '</span>
             </div><!-- .ee-event-expired-notice -->';
-    }
-
-
-    /**
-     * ticketSalesClosed
-     * notice displayed if event ticket sales are turned off
-     *
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function ticketSalesClosedMessage()
-    {
-        $sales_closed_msg = esc_html__(
-            'We\'re sorry, but ticket sales have been closed at this time. Please check back again later.',
-            'event_espresso'
-        );
-        if (current_user_can('edit_post', $this->event->ID())) {
-            $sales_closed_msg .= sprintf(
-                esc_html__(
-                    '%sNote to Event Admin:%sThe "Maximum number of tickets allowed per order for this event" in the Event Registration Options has been set to "0". This effectively turns off ticket sales. %s(click to edit this event)%s',
-                    'event_espresso'
-                ),
-                '<div class="ee-attention" style="text-align: left;"><b>',
-                '</b><br />',
-                '<span class="edit-link"><a class="post-edit-link" href="'
-                . get_edit_post_link($this->event->ID())
-                . '">',
-                '</a></span></div><!-- .ee-attention ticketSalesClosedMessage -->'
-            );
-        }
-        return '<p><span class="important-notice">' . $sales_closed_msg . '</span></p>';
-    }
-
-
-    /**
-     * getTickets
-     *
-     * @return EE_Base_Class[]|EE_Ticket[]
-     * @throws EE_Error
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     */
-    protected function getTickets()
-    {
-        $show_expired_tickets = is_admin() || $this->config->show_expired_tickets;
-
-        $ticket_query_args = [
-            ['Datetime.EVT_ID' => $this->event->ID()],
-            'order_by' => [
-                'TKT_order'              => 'ASC',
-                'TKT_required'           => 'DESC',
-                'TKT_start_date'         => 'ASC',
-                'TKT_end_date'           => 'ASC',
-                'Datetime.DTT_EVT_start' => 'DESC',
-            ],
-        ];
-        if (! $show_expired_tickets) {
-            // use the correct applicable time query depending on what version of core is being run.
-            $current_time                         = method_exists('EEM_Datetime', 'current_time_for_query')
-                ? time()
-                : current_time('timestamp');
-            $ticket_query_args[0]['TKT_end_date'] = ['>', $current_time];
-        }
-        /** @var EE_Ticket[] $tickets */
-        $tickets = EEM_Ticket::instance()->get_all($ticket_query_args);
-
-        return (array) apply_filters(
-            'FHEE__EventEspresso_modules_ticketSelector_DisplayTicketSelector__getTickets',
-            $tickets,
-            $ticket_query_args,
-            $this
-        );
-    }
-
-
-    /**
-     * loadTicketSelector
-     * begins to assemble template arguments
-     * and decides whether to load a "simple" ticket selector, or the standard
-     *
-     * @param EE_Ticket[] $tickets
-     * @param array       $template_args
-     * @return TicketSelectorSimple|TicketSelectorStandard
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function loadTicketSelector(array $tickets, array $template_args)
-    {
-        $template_args['event']            = $this->event;
-        $template_args['EVT_ID']           = $this->event->ID();
-        $template_args['event_is_expired'] = $this->event->is_expired();
-        $template_args['max_atndz']        = $this->getMaxAttendees();
-        $template_args['date_format']      = $this->date_format;
-        $template_args['time_format']      = $this->time_format;
-        /**
-         * Filters the anchor ID used when redirecting to the Ticket Selector if no quantity selected
-         *
-         * @param string  '#tkt-slctr-tbl-' . $EVT_ID The html ID to anchor to
-         * @param int $EVT_ID The Event ID
-         * @since 4.9.13
-         */
-        $template_args['anchor_id']    = apply_filters(
-            'FHEE__EE_Ticket_Selector__redirect_anchor_id',
-            '#tkt-slctr-tbl-' . $this->event->ID(),
-            $this->event->ID()
-        );
-        $template_args['tickets']      = $tickets;
-        $template_args['ticket_count'] = count($tickets);
-        $ticket_selector               = $this->simpleTicketSelector($tickets, $template_args);
-        if ($ticket_selector instanceof TicketSelectorSimple) {
-            return $ticket_selector;
-        }
-        return new TicketSelectorStandard(
-            $this->config,
-            $this->getTaxConfig(),
-            $this->event,
-            $tickets,
-            $this->getMaxAttendees(),
-            $template_args,
-            $this->date_format,
-            $this->time_format
-        );
-    }
-
-
-    /**
-     * simpleTicketSelector
-     * there's one ticket, and max attendees is set to one,
-     * so if the event is free, then this is a "simple" ticket selector
-     * a.k.a. "Dude Where's my Ticket Selector?"
-     *
-     * @param EE_Ticket[] $tickets
-     * @param array       $template_args
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function simpleTicketSelector($tickets, array $template_args)
-    {
-        // if there is only ONE ticket with a max qty of ONE
-        if (count($tickets) > 1 || $this->getMaxAttendees() !== 1) {
-            return '';
-        }
-        /** @var EE_Ticket $ticket */
-        $ticket = reset($tickets);
-        // if the ticket is free... then not much need for the ticket selector
-        if (
-            apply_filters(
-                'FHEE__ticket_selector_chart_template__hide_ticket_selector',
-                $ticket->is_free(),
-                $this->event->ID()
-            )
-        ) {
-            return new TicketSelectorSimple(
-                $this->event,
-                $ticket,
-                $this->getMaxAttendees(),
-                $template_args
-            );
-        }
-        return '';
-    }
-
-
-    /**
-     * externalEventRegistration
-     *
-     * @return string
-     */
-    public function externalEventRegistration()
-    {
-        // if not we still need to trigger the display of the submit button
-        add_filter('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true');
-        // display notice to admin that registration is external
-        return $this->display_full_ui()
-            ? esc_html__(
-                'Registration is at an external URL for this event.',
-                'event_espresso'
-            )
-            : '';
-    }
-
-
-    /**
-     * formOpen
-     *
-     * @param int    $ID
-     * @param string $external_url
-     * @return        string
-     */
-    public function formOpen($ID = 0, $external_url = '')
-    {
-        // if redirecting, we don't need any anything else
-        if ($external_url) {
-            $html = '<form method="GET" ';
-            $html .= 'action="' . EEH_URL::refactor_url($external_url) . '" ';
-            $html .= 'name="ticket-selector-form-' . $ID . '"';
-            // open link in new window ?
-            $html       .= apply_filters(
-                'FHEE__EventEspresso_modules_ticket_selector_DisplayTicketSelector__formOpen__external_url_target_blank',
-                $this->isIframe(),
-                $this
-            )
-                ? ' target="_blank"'
-                : '';
-            $html       .= '>';
-            $query_args = EEH_URL::get_query_string($external_url);
-            foreach ((array) $query_args as $query_arg => $value) {
-                $html .= '<input type="hidden" name="' . $query_arg . '" value="' . $value . '">';
-            }
-            return $html;
-        }
-        // if there is no submit button, then don't start building a form
-        // because the "View Details" button will build its own form
-        if (! apply_filters('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', false)) {
-            return '';
-        }
-        $checkout_url = EEH_Event_View::event_link_url($ID);
-        if (! $checkout_url) {
-            EE_Error::add_error(
-                esc_html__('The URL for the Event Details page could not be retrieved.', 'event_espresso'),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-        }
-        // set no cache headers and constants
-        EE_System::do_not_cache();
-        $html = '<form method="POST" ';
-        $html .= 'action="' . $checkout_url . '" ';
-        $html .= 'name="ticket-selector-form-' . $ID . '"';
-        $html .= $this->iframe ? ' target="_blank"' : '';
-        $html .= '>';
-        $html .= '<input type="hidden" name="ee" value="process_ticket_selections">';
-        return apply_filters('FHEE__EE_Ticket_Selector__ticket_selector_form_open__html', $html, $this->event);
-    }
-
-
-    /**
-     * displaySubmitButton
-     *
-     * @param string $external_url
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function displaySubmitButton($external_url = '')
-    {
-        $html = '';
-        if ($this->display_full_ui()) {
-            // standard TS displayed with submit button, ie: "Register Now"
-            if (apply_filters('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', false)) {
-                $html .= $this->displayRegisterNowButton();
-                $html .= empty($external_url)
-                    ? $this->ticketSelectorEndDiv()
-                    : $this->clearTicketSelector();
-                $html .= '<br/>' . $this->formClose();
-            } elseif ($this->getMaxAttendees() === 1) {
-                // its a "Dude Where's my Ticket Selector?" (DWMTS) type event (ie: $_max_atndz === 1)
-                if ($this->event->is_sold_out()) {
-                    // then instead of a View Details or Submit button, just display a "Sold Out" message
-                    $html .= apply_filters(
-                        'FHEE__EE_Ticket_Selector__display_ticket_selector_submit__sold_out_msg',
-                        sprintf(
-                            esc_html__(
-                                '%1$s"%2$s" is currently sold out.%4$sPlease check back again later, as spots may become available.%3$s',
-                                'event_espresso'
-                            ),
-                            '<p class="no-ticket-selector-msg clear-float">',
-                            $this->event->name(),
-                            '</p>',
-                            '<br />'
-                        ),
-                        $this->event
-                    );
-                    if (
-                        apply_filters(
-                            'FHEE__EE_Ticket_Selector__display_ticket_selector_submit__no_tickets_but_display_register_now_button',
-                            false,
-                            $this->event
-                        )
-                    ) {
-                        $html .= $this->displayRegisterNowButton();
-                    }
-                    // sold out DWMTS event, no TS, no submit or view details button, but has additional content
-                    $html .= $this->ticketSelectorEndDiv();
-                } elseif (
-                    apply_filters('FHEE__EE_Ticket_Selector__hide_ticket_selector', false)
-                          && ! is_single()
-                ) {
-                    // this is a "Dude Where's my Ticket Selector?" (DWMTS) type event,
-                    // but no tickets are available, so display event's "View Details" button.
-                    // it is being viewed via somewhere other than a single post
-                    $html .= $this->displayViewDetailsButton(true);
-                } else {
-                    $html .= $this->ticketSelectorEndDiv();
-                }
-            } elseif (is_archive()) {
-                // event list, no tickets available so display event's "View Details" button
-                $html .= $this->ticketSelectorEndDiv();
-                $html .= $this->displayViewDetailsButton();
-            } else {
-                if (
-                    apply_filters(
-                        'FHEE__EE_Ticket_Selector__display_ticket_selector_submit__no_tickets_but_display_register_now_button',
-                        false,
-                        $this->event
-                    )
-                ) {
-                    $html .= $this->displayRegisterNowButton();
-                }
-                // no submit or view details button, and no additional content
-                $html .= $this->ticketSelectorEndDiv();
-            }
-            if (! $this->iframe && ! is_archive()) {
-                $html .= EEH_Template::powered_by_event_espresso('', '', ['utm_content' => 'ticket_selector']);
-            }
-        }
-        return apply_filters(
-            'FHEE__EventEspresso_modules_ticket_selector_DisplayTicketSelector__displaySubmitButton__html',
-            $html,
-            $this->event,
-            $this
-        );
-    }
-
-
-    /**
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function displayRegisterNowButton()
-    {
-        $btn_text     = apply_filters(
-            'FHEE__EE_Ticket_Selector__display_ticket_selector_submit__btn_text',
-            esc_html__('Register Now', 'event_espresso'),
-            $this->event
-        );
-        $external_url = (string) $this->event->external_url()
-                        && $this->event->external_url() !== get_the_permalink()
-            ? $this->event->external_url()
-            : '';
-        $html         = EEH_HTML::div(
-            '',
-            'ticket-selector-submit-' . $this->event->ID() . '-btn-wrap',
-            'ticket-selector-submit-btn-wrap'
-        );
-        $html         .= '<input id="ticket-selector-submit-' . $this->event->ID() . '-btn"';
-        $html         .= ' class="ticket-selector-submit-btn ';
-        $html         .= empty($external_url) ? 'ticket-selector-submit-ajax"' : '"';
-        $html         .= ' type="submit" value="' . $btn_text . '" data-ee-disable-after-recaptcha="true" />';
-        $html         .= EEH_HTML::divx() . '<!-- .ticket-selector-submit-btn-wrap -->';
-        $html         .= apply_filters(
-            'FHEE__EE_Ticket_Selector__after_ticket_selector_submit',
-            '',
-            $this->event,
-            $this->iframe
-        );
-        return $html;
-    }
-
-
-    /**
-     * displayViewDetailsButton
-     *
-     * @param bool $DWMTS indicates a "Dude Where's my Ticket Selector?" (DWMTS) type event
-     *                    (ie: $_max_atndz === 1) where there are no available tickets,
-     *                    either because they are sold out, expired, or not yet on sale.
-     *                    In this case, we need to close the form BEFORE adding any closing divs
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function displayViewDetailsButton($DWMTS = false)
-    {
-        if (! $this->event->get_permalink()) {
-            EE_Error::add_error(
-                esc_html__('The URL for the Event Details page could not be retrieved.', 'event_espresso'),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-        }
-        $view_details_btn = '<form method="GET" action="';
-        $view_details_btn .= apply_filters(
-            'FHEE__EE_Ticket_Selector__display_view_details_btn__btn_url',
-            $this->event->get_permalink(),
-            $this->event
-        );
-        $view_details_btn .= '"';
-        // open link in new window ?
-        $view_details_btn .= apply_filters(
-            'FHEE__EventEspresso_modules_ticket_selector_DisplayTicketSelector__displayViewDetailsButton__url_target_blank',
-            $this->isIframe(),
-            $this
-        )
-            ? ' target="_blank"'
-            : '';
-        $view_details_btn .= '>';
-        $btn_text         = apply_filters(
-            'FHEE__EE_Ticket_Selector__display_view_details_btn__btn_text',
-            esc_html__('View Details', 'event_espresso'),
-            $this->event
-        );
-        $view_details_btn .= '<input id="ticket-selector-submit-'
-                             . $this->event->ID()
-                             . '-btn" class="ticket-selector-submit-btn view-details-btn" type="submit" value="'
-                             . $btn_text
-                             . '" />';
-        $view_details_btn .= apply_filters('FHEE__EE_Ticket_Selector__after_view_details_btn', '', $this->event);
-        if ($DWMTS) {
-            $view_details_btn .= $this->formClose();
-            $view_details_btn .= $this->ticketSelectorEndDiv();
-            $view_details_btn .= '<br/>';
-        } else {
-            $view_details_btn .= $this->clearTicketSelector();
-            $view_details_btn .= '<br/>';
-            $view_details_btn .= $this->formClose();
-        }
-        return $view_details_btn;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function ticketSelectorEndDiv()
-    {
-        return $this->clearTicketSelector() . '</div><!-- ticketSelectorEndDiv -->';
-    }
-
-
-    /**
-     * @return string
-     */
-    public function clearTicketSelector()
-    {
-        // standard TS displayed, appears after a "Register Now" or "view Details" button
-        return '<div class="clear"></div><!-- clearTicketSelector -->';
-    }
-
-
-    /**
-     * @access        public
-     * @return        string
-     */
-    public function formClose()
-    {
-        return '</form>';
-    }
-
-
-    /**
-     * handleMissingEvent
-     * Returns either false or an error to display when no valid event is passed.
-     *
-     * @return string
-     * @throws ExceptionStackTraceDisplay
-     * @throws InvalidInterfaceException
-     * @throws Exception
-     */
-    protected function handleMissingEvent()
-    {
-        // If this is not an iFrame request, simply return false.
-        if (! $this->isIframe()) {
-            return '';
-        }
-        // This is an iFrame so return an error.
-        // Display stack trace if WP_DEBUG is enabled.
-        if (WP_DEBUG === true && current_user_can('edit_pages')) {
-            $event_id = $this->request->getRequestParam('event', 0, 'int');
-            new ExceptionStackTraceDisplay(
-                new InvalidArgumentException(
-                    sprintf(
-                        esc_html__(
-                            'A valid Event ID is required to display the ticket selector.%3$sAn Event with an ID of "%1$s" could not be found.%3$sPlease verify that the embed code added to this post\'s content includes an "%2$s" argument and that its value corresponds to a valid Event ID.',
-                            'event_espresso'
-                        ),
-                        $event_id,
-                        'event',
-                        '<br />'
-                    )
-                )
-            );
-            return '';
-        }
-        // If WP_DEBUG is not enabled, display a message stating the event could not be found.
-        return EEH_HTML::p(
-            esc_html__(
-                'A valid Event could not be found. Please contact the event administrator for assistance.',
-                'event_espresso'
-            )
-        );
-    }
-
-
-    /**
-     * @return EE_Tax_Config
-     * @since   4.10.14.p
-     */
-    protected function getTaxConfig()
-    {
-        return isset(EE_Registry::instance()->CFG->tax_settings)
-               && EE_Registry::instance()->CFG->tax_settings instanceof EE_Tax_Config
-            ? EE_Registry::instance()->CFG->tax_settings
-            : new EE_Tax_Config();
-    }
+	}
+
+
+	/**
+	 * ticketSalesClosed
+	 * notice displayed if event ticket sales are turned off
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function ticketSalesClosedMessage()
+	{
+		$sales_closed_msg = esc_html__(
+			'We\'re sorry, but ticket sales have been closed at this time. Please check back again later.',
+			'event_espresso'
+		);
+		if (current_user_can('edit_post', $this->event->ID())) {
+			$sales_closed_msg .= sprintf(
+				esc_html__(
+					'%sNote to Event Admin:%sThe "Maximum number of tickets allowed per order for this event" in the Event Registration Options has been set to "0". This effectively turns off ticket sales. %s(click to edit this event)%s',
+					'event_espresso'
+				),
+				'<div class="ee-attention" style="text-align: left;"><b>',
+				'</b><br />',
+				'<span class="edit-link"><a class="post-edit-link" href="'
+				. get_edit_post_link($this->event->ID())
+				. '">',
+				'</a></span></div><!-- .ee-attention ticketSalesClosedMessage -->'
+			);
+		}
+		return '<p><span class="important-notice">' . $sales_closed_msg . '</span></p>';
+	}
+
+
+	/**
+	 * getTickets
+	 *
+	 * @return EE_Base_Class[]|EE_Ticket[]
+	 * @throws EE_Error
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 */
+	protected function getTickets()
+	{
+		$show_expired_tickets = is_admin() || $this->config->show_expired_tickets;
+
+		$ticket_query_args = [
+			['Datetime.EVT_ID' => $this->event->ID()],
+			'order_by' => [
+				'TKT_order'              => 'ASC',
+				'TKT_required'           => 'DESC',
+				'TKT_start_date'         => 'ASC',
+				'TKT_end_date'           => 'ASC',
+				'Datetime.DTT_EVT_start' => 'DESC',
+			],
+		];
+		if (! $show_expired_tickets) {
+			// use the correct applicable time query depending on what version of core is being run.
+			$current_time                         = method_exists('EEM_Datetime', 'current_time_for_query')
+				? time()
+				: current_time('timestamp');
+			$ticket_query_args[0]['TKT_end_date'] = ['>', $current_time];
+		}
+		/** @var EE_Ticket[] $tickets */
+		$tickets = EEM_Ticket::instance()->get_all($ticket_query_args);
+
+		return (array) apply_filters(
+			'FHEE__EventEspresso_modules_ticketSelector_DisplayTicketSelector__getTickets',
+			$tickets,
+			$ticket_query_args,
+			$this
+		);
+	}
+
+
+	/**
+	 * loadTicketSelector
+	 * begins to assemble template arguments
+	 * and decides whether to load a "simple" ticket selector, or the standard
+	 *
+	 * @param EE_Ticket[] $tickets
+	 * @param array       $template_args
+	 * @return TicketSelectorSimple|TicketSelectorStandard
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function loadTicketSelector(array $tickets, array $template_args)
+	{
+		$template_args['event']            = $this->event;
+		$template_args['EVT_ID']           = $this->event->ID();
+		$template_args['event_is_expired'] = $this->event->is_expired();
+		$template_args['max_atndz']        = $this->getMaxAttendees();
+		$template_args['date_format']      = $this->date_format;
+		$template_args['time_format']      = $this->time_format;
+		/**
+		 * Filters the anchor ID used when redirecting to the Ticket Selector if no quantity selected
+		 *
+		 * @param string  '#tkt-slctr-tbl-' . $EVT_ID The html ID to anchor to
+		 * @param int $EVT_ID The Event ID
+		 * @since 4.9.13
+		 */
+		$template_args['anchor_id']    = apply_filters(
+			'FHEE__EE_Ticket_Selector__redirect_anchor_id',
+			'#tkt-slctr-tbl-' . $this->event->ID(),
+			$this->event->ID()
+		);
+		$template_args['tickets']      = $tickets;
+		$template_args['ticket_count'] = count($tickets);
+		$ticket_selector               = $this->simpleTicketSelector($tickets, $template_args);
+		if ($ticket_selector instanceof TicketSelectorSimple) {
+			return $ticket_selector;
+		}
+		return new TicketSelectorStandard(
+			$this->config,
+			$this->getTaxConfig(),
+			$this->event,
+			$tickets,
+			$this->getMaxAttendees(),
+			$template_args,
+			$this->date_format,
+			$this->time_format
+		);
+	}
+
+
+	/**
+	 * simpleTicketSelector
+	 * there's one ticket, and max attendees is set to one,
+	 * so if the event is free, then this is a "simple" ticket selector
+	 * a.k.a. "Dude Where's my Ticket Selector?"
+	 *
+	 * @param EE_Ticket[] $tickets
+	 * @param array       $template_args
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function simpleTicketSelector($tickets, array $template_args)
+	{
+		// if there is only ONE ticket with a max qty of ONE
+		if (count($tickets) > 1 || $this->getMaxAttendees() !== 1) {
+			return '';
+		}
+		/** @var EE_Ticket $ticket */
+		$ticket = reset($tickets);
+		// if the ticket is free... then not much need for the ticket selector
+		if (
+			apply_filters(
+				'FHEE__ticket_selector_chart_template__hide_ticket_selector',
+				$ticket->is_free(),
+				$this->event->ID()
+			)
+		) {
+			return new TicketSelectorSimple(
+				$this->event,
+				$ticket,
+				$this->getMaxAttendees(),
+				$template_args
+			);
+		}
+		return '';
+	}
+
+
+	/**
+	 * externalEventRegistration
+	 *
+	 * @return string
+	 */
+	public function externalEventRegistration()
+	{
+		// if not we still need to trigger the display of the submit button
+		add_filter('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true');
+		// display notice to admin that registration is external
+		return $this->display_full_ui()
+			? esc_html__(
+				'Registration is at an external URL for this event.',
+				'event_espresso'
+			)
+			: '';
+	}
+
+
+	/**
+	 * formOpen
+	 *
+	 * @param int    $ID
+	 * @param string $external_url
+	 * @return        string
+	 */
+	public function formOpen($ID = 0, $external_url = '')
+	{
+		// if redirecting, we don't need any anything else
+		if ($external_url) {
+			$html = '<form method="GET" ';
+			$html .= 'action="' . EEH_URL::refactor_url($external_url) . '" ';
+			$html .= 'name="ticket-selector-form-' . $ID . '"';
+			// open link in new window ?
+			$html       .= apply_filters(
+				'FHEE__EventEspresso_modules_ticket_selector_DisplayTicketSelector__formOpen__external_url_target_blank',
+				$this->isIframe(),
+				$this
+			)
+				? ' target="_blank"'
+				: '';
+			$html       .= '>';
+			$query_args = EEH_URL::get_query_string($external_url);
+			foreach ((array) $query_args as $query_arg => $value) {
+				$html .= '<input type="hidden" name="' . $query_arg . '" value="' . $value . '">';
+			}
+			return $html;
+		}
+		// if there is no submit button, then don't start building a form
+		// because the "View Details" button will build its own form
+		if (! apply_filters('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', false)) {
+			return '';
+		}
+		$checkout_url = EEH_Event_View::event_link_url($ID);
+		if (! $checkout_url) {
+			EE_Error::add_error(
+				esc_html__('The URL for the Event Details page could not be retrieved.', 'event_espresso'),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+		}
+		// set no cache headers and constants
+		EE_System::do_not_cache();
+		$html = '<form method="POST" ';
+		$html .= 'action="' . $checkout_url . '" ';
+		$html .= 'name="ticket-selector-form-' . $ID . '"';
+		$html .= $this->iframe ? ' target="_blank"' : '';
+		$html .= '>';
+		$html .= '<input type="hidden" name="ee" value="process_ticket_selections">';
+		return apply_filters('FHEE__EE_Ticket_Selector__ticket_selector_form_open__html', $html, $this->event);
+	}
+
+
+	/**
+	 * displaySubmitButton
+	 *
+	 * @param string $external_url
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function displaySubmitButton($external_url = '')
+	{
+		$html = '';
+		if ($this->display_full_ui()) {
+			// standard TS displayed with submit button, ie: "Register Now"
+			if (apply_filters('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', false)) {
+				$html .= $this->displayRegisterNowButton();
+				$html .= empty($external_url)
+					? $this->ticketSelectorEndDiv()
+					: $this->clearTicketSelector();
+				$html .= '<br/>' . $this->formClose();
+			} elseif ($this->getMaxAttendees() === 1) {
+				// its a "Dude Where's my Ticket Selector?" (DWMTS) type event (ie: $_max_atndz === 1)
+				if ($this->event->is_sold_out()) {
+					// then instead of a View Details or Submit button, just display a "Sold Out" message
+					$html .= apply_filters(
+						'FHEE__EE_Ticket_Selector__display_ticket_selector_submit__sold_out_msg',
+						sprintf(
+							esc_html__(
+								'%1$s"%2$s" is currently sold out.%4$sPlease check back again later, as spots may become available.%3$s',
+								'event_espresso'
+							),
+							'<p class="no-ticket-selector-msg clear-float">',
+							$this->event->name(),
+							'</p>',
+							'<br />'
+						),
+						$this->event
+					);
+					if (
+						apply_filters(
+							'FHEE__EE_Ticket_Selector__display_ticket_selector_submit__no_tickets_but_display_register_now_button',
+							false,
+							$this->event
+						)
+					) {
+						$html .= $this->displayRegisterNowButton();
+					}
+					// sold out DWMTS event, no TS, no submit or view details button, but has additional content
+					$html .= $this->ticketSelectorEndDiv();
+				} elseif (
+					apply_filters('FHEE__EE_Ticket_Selector__hide_ticket_selector', false)
+						  && ! is_single()
+				) {
+					// this is a "Dude Where's my Ticket Selector?" (DWMTS) type event,
+					// but no tickets are available, so display event's "View Details" button.
+					// it is being viewed via somewhere other than a single post
+					$html .= $this->displayViewDetailsButton(true);
+				} else {
+					$html .= $this->ticketSelectorEndDiv();
+				}
+			} elseif (is_archive()) {
+				// event list, no tickets available so display event's "View Details" button
+				$html .= $this->ticketSelectorEndDiv();
+				$html .= $this->displayViewDetailsButton();
+			} else {
+				if (
+					apply_filters(
+						'FHEE__EE_Ticket_Selector__display_ticket_selector_submit__no_tickets_but_display_register_now_button',
+						false,
+						$this->event
+					)
+				) {
+					$html .= $this->displayRegisterNowButton();
+				}
+				// no submit or view details button, and no additional content
+				$html .= $this->ticketSelectorEndDiv();
+			}
+			if (! $this->iframe && ! is_archive()) {
+				$html .= EEH_Template::powered_by_event_espresso('', '', ['utm_content' => 'ticket_selector']);
+			}
+		}
+		return apply_filters(
+			'FHEE__EventEspresso_modules_ticket_selector_DisplayTicketSelector__displaySubmitButton__html',
+			$html,
+			$this->event,
+			$this
+		);
+	}
+
+
+	/**
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function displayRegisterNowButton()
+	{
+		$btn_text     = apply_filters(
+			'FHEE__EE_Ticket_Selector__display_ticket_selector_submit__btn_text',
+			esc_html__('Register Now', 'event_espresso'),
+			$this->event
+		);
+		$external_url = (string) $this->event->external_url()
+						&& $this->event->external_url() !== get_the_permalink()
+			? $this->event->external_url()
+			: '';
+		$html         = EEH_HTML::div(
+			'',
+			'ticket-selector-submit-' . $this->event->ID() . '-btn-wrap',
+			'ticket-selector-submit-btn-wrap'
+		);
+		$html         .= '<input id="ticket-selector-submit-' . $this->event->ID() . '-btn"';
+		$html         .= ' class="ticket-selector-submit-btn ';
+		$html         .= empty($external_url) ? 'ticket-selector-submit-ajax"' : '"';
+		$html         .= ' type="submit" value="' . $btn_text . '" data-ee-disable-after-recaptcha="true" />';
+		$html         .= EEH_HTML::divx() . '<!-- .ticket-selector-submit-btn-wrap -->';
+		$html         .= apply_filters(
+			'FHEE__EE_Ticket_Selector__after_ticket_selector_submit',
+			'',
+			$this->event,
+			$this->iframe
+		);
+		return $html;
+	}
+
+
+	/**
+	 * displayViewDetailsButton
+	 *
+	 * @param bool $DWMTS indicates a "Dude Where's my Ticket Selector?" (DWMTS) type event
+	 *                    (ie: $_max_atndz === 1) where there are no available tickets,
+	 *                    either because they are sold out, expired, or not yet on sale.
+	 *                    In this case, we need to close the form BEFORE adding any closing divs
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function displayViewDetailsButton($DWMTS = false)
+	{
+		if (! $this->event->get_permalink()) {
+			EE_Error::add_error(
+				esc_html__('The URL for the Event Details page could not be retrieved.', 'event_espresso'),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+		}
+		$view_details_btn = '<form method="GET" action="';
+		$view_details_btn .= apply_filters(
+			'FHEE__EE_Ticket_Selector__display_view_details_btn__btn_url',
+			$this->event->get_permalink(),
+			$this->event
+		);
+		$view_details_btn .= '"';
+		// open link in new window ?
+		$view_details_btn .= apply_filters(
+			'FHEE__EventEspresso_modules_ticket_selector_DisplayTicketSelector__displayViewDetailsButton__url_target_blank',
+			$this->isIframe(),
+			$this
+		)
+			? ' target="_blank"'
+			: '';
+		$view_details_btn .= '>';
+		$btn_text         = apply_filters(
+			'FHEE__EE_Ticket_Selector__display_view_details_btn__btn_text',
+			esc_html__('View Details', 'event_espresso'),
+			$this->event
+		);
+		$view_details_btn .= '<input id="ticket-selector-submit-'
+							 . $this->event->ID()
+							 . '-btn" class="ticket-selector-submit-btn view-details-btn" type="submit" value="'
+							 . $btn_text
+							 . '" />';
+		$view_details_btn .= apply_filters('FHEE__EE_Ticket_Selector__after_view_details_btn', '', $this->event);
+		if ($DWMTS) {
+			$view_details_btn .= $this->formClose();
+			$view_details_btn .= $this->ticketSelectorEndDiv();
+			$view_details_btn .= '<br/>';
+		} else {
+			$view_details_btn .= $this->clearTicketSelector();
+			$view_details_btn .= '<br/>';
+			$view_details_btn .= $this->formClose();
+		}
+		return $view_details_btn;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function ticketSelectorEndDiv()
+	{
+		return $this->clearTicketSelector() . '</div><!-- ticketSelectorEndDiv -->';
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function clearTicketSelector()
+	{
+		// standard TS displayed, appears after a "Register Now" or "view Details" button
+		return '<div class="clear"></div><!-- clearTicketSelector -->';
+	}
+
+
+	/**
+	 * @access        public
+	 * @return        string
+	 */
+	public function formClose()
+	{
+		return '</form>';
+	}
+
+
+	/**
+	 * handleMissingEvent
+	 * Returns either false or an error to display when no valid event is passed.
+	 *
+	 * @return string
+	 * @throws ExceptionStackTraceDisplay
+	 * @throws InvalidInterfaceException
+	 * @throws Exception
+	 */
+	protected function handleMissingEvent()
+	{
+		// If this is not an iFrame request, simply return false.
+		if (! $this->isIframe()) {
+			return '';
+		}
+		// This is an iFrame so return an error.
+		// Display stack trace if WP_DEBUG is enabled.
+		if (WP_DEBUG === true && current_user_can('edit_pages')) {
+			$event_id = $this->request->getRequestParam('event', 0, 'int');
+			new ExceptionStackTraceDisplay(
+				new InvalidArgumentException(
+					sprintf(
+						esc_html__(
+							'A valid Event ID is required to display the ticket selector.%3$sAn Event with an ID of "%1$s" could not be found.%3$sPlease verify that the embed code added to this post\'s content includes an "%2$s" argument and that its value corresponds to a valid Event ID.',
+							'event_espresso'
+						),
+						$event_id,
+						'event',
+						'<br />'
+					)
+				)
+			);
+			return '';
+		}
+		// If WP_DEBUG is not enabled, display a message stating the event could not be found.
+		return EEH_HTML::p(
+			esc_html__(
+				'A valid Event could not be found. Please contact the event administrator for assistance.',
+				'event_espresso'
+			)
+		);
+	}
+
+
+	/**
+	 * @return EE_Tax_Config
+	 * @since   4.10.14.p
+	 */
+	protected function getTaxConfig()
+	{
+		return isset(EE_Registry::instance()->CFG->tax_settings)
+			   && EE_Registry::instance()->CFG->tax_settings instanceof EE_Tax_Config
+			? EE_Registry::instance()->CFG->tax_settings
+			: new EE_Tax_Config();
+	}
 }

admin_pages/transactions/templates/txn_admin_details_main_meta_box_txn_details.template.php

Indentation +207 added lines, -207 removed lines

@@ -83,25 +83,25 @@ 
     </div>
     <br class="clear" />
     <?php
-    $no_payments = $grand_raw_total > 0
-                   || $TXN_status !== EEM_Transaction::complete_status_code
-                   || ! empty($payments);
-    ?>
+	$no_payments = $grand_raw_total > 0
+				   || $TXN_status !== EEM_Transaction::complete_status_code
+				   || ! empty($payments);
+	?>
     <?php if ($attendee instanceof EE_Attendee && $no_payments) : ?>
         <?php $no_payment_text = $can_edit_payments
-            ? esc_html__(
-                'No payments have been applied to this transaction yet. Click "Apply Payment" below to make a payment.',
-                'event_espresso'
-            )
-            : esc_html__(
-                'No payments have been applied to this transaction yet.',
-                'event_espresso'
-            );
-        ?>
+			? esc_html__(
+				'No payments have been applied to this transaction yet. Click "Apply Payment" below to make a payment.',
+				'event_espresso'
+			)
+			: esc_html__(
+				'No payments have been applied to this transaction yet.',
+				'event_espresso'
+			);
+		?>
 
         <h3 class="admin-primary-mbox-h4 hdr-has-icon">
             <span class="ee-icon ee-icon-cash"></span><?php
-            esc_html_e('Payment Details', 'event_espresso'); ?>
+			esc_html_e('Payment Details', 'event_espresso'); ?>
         </h3>
 
         <div class="admin-primary-mbox-tbl-wrap">
@@ -117,37 +117,37 @@ 
                         <th class="jst-left"><?php esc_html_e('TXN&nbsp;ID / CHQ&nbsp;#', 'event_espresso'); ?></th>
                         <th class="jst-left"><?php esc_html_e('P.O. / S.O.&nbsp;#', 'event_espresso'); ?></th>
                         <th class="jst-left"><?php esc_html_e(
-                            'Notes / Extra&nbsp;Accounting',
-                            'event_espresso'
-                        ); ?></th>
+							'Notes / Extra&nbsp;Accounting',
+							'event_espresso'
+						); ?></th>
                         <th class="jst-cntr"><?php esc_html_e('Amount', 'event_espresso'); ?></th>
                     </tr>
                 </thead>
                 <tbody>
                     <?php if ($payments) :
-                        $payment_total = 0;
-                        foreach ($payments as $PAY_ID => $payment) :
-                            if (! $payment instanceof EE_Payment) {
-                                continue;
-                            }
-                            $PAY_ID = absint($PAY_ID);
-                            $existing_reg_payment_json = isset($existing_reg_payments[ $PAY_ID ])
-                                ? wp_json_encode($existing_reg_payments[ $PAY_ID ])
-                                : '{}';
-                    ?>
+						$payment_total = 0;
+						foreach ($payments as $PAY_ID => $payment) :
+							if (! $payment instanceof EE_Payment) {
+								continue;
+							}
+							$PAY_ID = absint($PAY_ID);
+							$existing_reg_payment_json = isset($existing_reg_payments[ $PAY_ID ])
+								? wp_json_encode($existing_reg_payments[ $PAY_ID ])
+								: '{}';
+					?>
                     <tr id="txn-admin-payment-tr-<?php echo absint($PAY_ID); ?>">
                         <td>
                             <span id="payment-status-<?php echo absint($PAY_ID); ?>"
                                   class="ee-status-strip-td ee-status-strip pymt-status-<?php
-                                  echo esc_attr($payment->STS_ID()); ?>"
+								  echo esc_attr($payment->STS_ID()); ?>"
                             >
                             </span>
                             <div id="payment-STS_ID-<?php echo absint($PAY_ID); ?>" class="hidden"><?php
-                                echo esc_html($payment->STS_ID());
-                                ?></div>
+								echo esc_html($payment->STS_ID());
+								?></div>
                             <div id="reg-payments-<?php echo absint($PAY_ID); ?>" class="hidden"><?php
-                                echo esc_html($existing_reg_payment_json);
-                                ?></div>
+								echo esc_html($existing_reg_payment_json);
+								?></div>
                         </td>
                         <td class=" jst-cntr">
                             <ul class="txn-overview-actions-ul">
@@ -178,75 +178,75 @@ 
                         </td>
                         <td class=" jst-left">
                             <div id="payment-date-<?php echo absint($PAY_ID); ?>" class="payment-date-dv"><?php
-                                echo esc_html($payment->timestamp('Y-m-d', 'g:i a'));
-                                ?></div>
+								echo esc_html($payment->timestamp('Y-m-d', 'g:i a'));
+								?></div>
                         </td>
                         <td class=" jst-left">
                             <div id="payment-method-<?php echo absint($PAY_ID); ?>"><?php
-                                echo esc_html($payment->source());
-                                ?></div>
+								echo esc_html($payment->source());
+								?></div>
                             <div id="payment-gateway-<?php echo absint($PAY_ID); ?>"><?php
-                                echo ($payment->payment_method() instanceof EE_Payment_Method
-                                    ? esc_html($payment->payment_method()->admin_name())
-                                    : esc_html__("Unknown", 'event_espresso'));
-                                ?></div>
+								echo ($payment->payment_method() instanceof EE_Payment_Method
+									? esc_html($payment->payment_method()->admin_name())
+									: esc_html__("Unknown", 'event_espresso'));
+								?></div>
                             <div id="payment-gateway-id-<?php echo absint($PAY_ID); ?>" class="hidden"><?php
-                                echo ($payment->payment_method() instanceof EE_Payment_Method
-                                    ? esc_html($payment->payment_method()->ID())
-                                    : 0);
-                                ?></div>
+								echo ($payment->payment_method() instanceof EE_Payment_Method
+									? esc_html($payment->payment_method()->ID())
+									: 0);
+								?></div>
                         </td>
                         <td class=" jst-left">
                             <div id="payment-response-<?php echo absint($PAY_ID); ?>"><?php
-                                echo esc_html($payment->gateway_response());
-                                ?></div>
+								echo esc_html($payment->gateway_response());
+								?></div>
                         </td>
                         <td class=" jst-left payment-txn-id-chq-nmbr">
                             <div id="payment-txn-id-chq-nmbr-<?php echo absint($PAY_ID); ?>"><?php
-                                echo esc_html($payment->txn_id_chq_nmbr());
-                                ?></div>
+								echo esc_html($payment->txn_id_chq_nmbr());
+								?></div>
                         </td>
                         <td class=" jst-left">
                             <div id="payment-po-nmbr-<?php echo absint($PAY_ID); ?>"><?php
-                                echo esc_html($payment->po_number());
-                                ?></div>
+								echo esc_html($payment->po_number());
+								?></div>
                         </td>
                         <td class=" jst-left">
                             <div id="payment-accntng-<?php echo absint($PAY_ID); ?>"><?php
-                                echo esc_html($payment->extra_accntng());
-                                ?></div>
+								echo esc_html($payment->extra_accntng());
+								?></div>
                         </td>
                         <td class=" jst-rght">
                             <?php
-                            $payment_class = $payment->amount() > 0
-                                ? 'txn-admin-payment-status-' . $payment->STS_ID()
-                                : 'txn-admin-payment-status-PDC';
-                            ?>
+							$payment_class = $payment->amount() > 0
+								? 'txn-admin-payment-status-' . $payment->STS_ID()
+								: 'txn-admin-payment-status-PDC';
+							?>
                             <span class="<?php echo esc_attr($payment_class); ?>">
                                 <span id="payment-amount-<?php echo absint($PAY_ID); ?>" style="display:inline;"><?php
-                                    echo wp_kses(
-                                    EEH_Template::format_currency(
-                                        $payment->amount(),
-                                        false,
-                                        false
-                                    ),
-                                    AllowedTags::getAllowedTags()
-                                );
-                                ?></span>
+									echo wp_kses(
+									EEH_Template::format_currency(
+										$payment->amount(),
+										false,
+										false
+									),
+									AllowedTags::getAllowedTags()
+								);
+								?></span>
                             </span>
                         </td>
                     </tr>
                             <?php $payment_total += $payment->STS_ID() == 'PAP' ? $payment->amount() : 0; ?>
                         <?php endforeach; ?>
                         <?php $pay_totals_class = $payment_total > $grand_raw_total
-                            ? ' important-notice'
-                            : '';
-                        ?>
+							? ' important-notice'
+							: '';
+						?>
                     <tr id="txn-admin-no-payments-tr" class="admin-primary-mbox-total-tr hidden">
                         <td class=" jst-rght" colspan="10">
                             <span class="important-notice"><?php
-                                echo wp_kses($no_payment_text, AllowedTags::getAllowedTags());
-                            ?></span>
+								echo wp_kses($no_payment_text, AllowedTags::getAllowedTags());
+							?></span>
                         </td>
                     </tr>
                     <tr id="txn-admin-payments-total-tr"
@@ -254,45 +254,45 @@ 
                     >
                         <th class=" jst-rght" colspan="9">
                             <span id="payments-total-spn"><?php
-                            $overpaid = $payment_total > $grand_raw_total
-                                ? '<span id="overpaid">'
-                                  . __('This transaction has been overpaid ! ', 'event_espresso')
-                                  . '</span>'
-                                : '';
-                            echo wp_kses(
-                                $overpaid
-                                . sprintf(
-                                    __('Payments Total %s', 'event_espresso'),
-                                    '(' . EE_Registry::instance()->CFG->currency->code . ')'
-                                ),
-                                AllowedTags::getAllowedTags()
-                            ); ?></span>
+							$overpaid = $payment_total > $grand_raw_total
+								? '<span id="overpaid">'
+								  . __('This transaction has been overpaid ! ', 'event_espresso')
+								  . '</span>'
+								: '';
+							echo wp_kses(
+								$overpaid
+								. sprintf(
+									__('Payments Total %s', 'event_espresso'),
+									'(' . EE_Registry::instance()->CFG->currency->code . ')'
+								),
+								AllowedTags::getAllowedTags()
+							); ?></span>
                         </th>
                         <th class=" jst-rght">
                             <span id="txn-admin-payment-total"><?php
-                            echo wp_kses(
-                                EEH_Template::format_currency(
-                                    $payment_total,
-                                    false,
-                                    false
-                                ),
-                                AllowedTags::getAllowedTags()
-                            ); ?></span>
+							echo wp_kses(
+								EEH_Template::format_currency(
+									$payment_total,
+									false,
+									false
+								),
+								AllowedTags::getAllowedTags()
+							); ?></span>
                         </th>
                     </tr>
                     <?php else : ?>
                     <tr id="txn-admin-no-payments-tr" class="admin-primary-mbox-total-tr">
                         <td class=" jst-rght" colspan="10">
                             <span class="important-notice"><?php
-                                echo wp_kses($no_payment_text, AllowedTags::getAllowedTags());
-                            ?></span>
+								echo wp_kses($no_payment_text, AllowedTags::getAllowedTags());
+							?></span>
                         </td>
                     </tr>
                     <tr id="txn-admin-payments-total-tr" class="admin-primary-mbox-total-tr hidden">
                         <th class=" jst-rght" colspan="9">
                             <span id="payments-total-spn"><?php
-                            echo esc_html__('Payments Total', 'event_espresso');
-                            ?></span>
+							echo esc_html__('Payments Total', 'event_espresso');
+							?></span>
                         </th>
                         <th class=" jst-rght">
                             <span id="txn-admin-payment-total"></span>
@@ -359,7 +359,7 @@ 
 
         <ul id="txn-admin-payment-options-ul">
             <?php if ($can_edit_payments) :
-                ?>
+				?>
                 <li>
                     <a id="display-txn-admin-apply-payment"
                        class="button-primary no-icon no-hide"
@@ -384,12 +384,12 @@ 
                 </li>
             <?php endif; ?>
             <?php
-            // Allows extend the fields at actions area.
-            do_action(
-                'AHEE__txn_admin_details_main_meta_box_txn_details__after_actions_buttons',
-                $can_edit_payments
-            );
-            ?>
+			// Allows extend the fields at actions area.
+			do_action(
+				'AHEE__txn_admin_details_main_meta_box_txn_details__after_actions_buttons',
+				$can_edit_payments
+			);
+			?>
         </ul>
         <br class="clear" />
 
@@ -400,7 +400,7 @@ 
             >
                 <div class="ee-icon ee-icon-cash-add float-left"></div>
                 <?php
-                echo esc_html__('Apply a Payment to Transaction #', 'event_espresso') . esc_html($txn_nmbr['value']); ?>
+				echo esc_html__('Apply a Payment to Transaction #', 'event_espresso') . esc_html($txn_nmbr['value']); ?>
             </h2>
 
             <h2 id="admin-modal-dialog-edit-payment-h2" class="admin-modal-dialog-h2 hdr-has-icon"
@@ -408,23 +408,23 @@ 
             >
                 <div class="ee-icon ee-icon-cash-edit float-left"></div>
                 <?php
-                printf(
-                    esc_html__('Edit Payment #%s for Transaction #%s', 'event_espresso'),
-                    '<span></span>',
-                    $txn_nmbr['value']
-                );
-                ?>
+				printf(
+					esc_html__('Edit Payment #%s for Transaction #%s', 'event_espresso'),
+					'<span></span>',
+					$txn_nmbr['value']
+				);
+				?>
             </h2>
 
             <h2 id="admin-modal-dialog-edit-refund-h2" class="admin-modal-dialog-h2 hdr-has-icon" style="display:none;">
                 <div class="ee-icon ee-icon-cash-edit float-left"></div>
                 <?php
-                printf(
-                    esc_html__('Edit Refund #%s for Transaction #%s', 'event_espresso'),
-                    '<span></span>',
-                    $txn_nmbr['value']
-                );
-                ?>
+				printf(
+					esc_html__('Edit Refund #%s for Transaction #%s', 'event_espresso'),
+					'<span></span>',
+					$txn_nmbr['value']
+				);
+				?>
             </h2>
 
             <h2 id="admin-modal-dialog-apply-refund-h2" class="admin-modal-dialog-h2 hdr-has-icon"
@@ -432,9 +432,9 @@ 
             >
                 <div class="ee-icon ee-icon-cash-remove float-left"></div>
                 <?php
-                echo esc_html__('Apply a Refund to Transaction #', 'event_espresso');
-                echo esc_html($txn_nmbr['value']);
-                ?>
+				echo esc_html__('Apply a Refund to Transaction #', 'event_espresso');
+				echo esc_html($txn_nmbr['value']);
+				?>
             </h2>
 
             <form name="txn-admin-apply-payment-frm"
@@ -533,29 +533,29 @@ 
                             >
                                 <?php foreach ($payment_methods as $method) : ?>
                                     <?php
-                                    $selected = $method->slug() == 'cash'
-                                        ? ' selected'
-                                        : '';
-                                    ?>
+									$selected = $method->slug() == 'cash'
+										? ' selected'
+										: '';
+									?>
                                     <option id="payment-method-opt-<?php echo esc_attr($method->slug()); ?>"
                                             value="<?php echo esc_attr($method->ID()); ?>"
                                         <?php echo esc_attr($selected); ?>
                                     >
                                         <?php
-                                        echo esc_html(
-                                            sanitize_key($method->admin_desc())
-                                                ? substr($method->admin_desc(), 0, 128)
-                                                : $method->admin_name()
-                                        );
-                                        ?>&nbsp;&nbsp;
+										echo esc_html(
+											sanitize_key($method->admin_desc())
+												? substr($method->admin_desc(), 0, 128)
+												: $method->admin_name()
+										);
+										?>&nbsp;&nbsp;
                                     </option>
                                 <?php endforeach; ?>
                             </select>
                             <p class="description">
                                 <?php esc_html_e(
-                                    'Whether the payment was made via PayPal, Credit Card, Cheque, or Cash',
-                                    'event_espresso'
-                                ); ?>
+									'Whether the payment was made via PayPal, Credit Card, Cheque, or Cash',
+									'event_espresso'
+								); ?>
                             </p>
                         </div>
 
@@ -563,9 +563,9 @@ 
                             <div class="txn-admin-apply-payment-gw-txn-id-dv admin-modal-dialog-row">
                                 <label for="txn-admin-payment-txn-id-chq-nmbr-inp" class="">
                                     <?php esc_html_e(
-                                        'TXN ID / CHQ #',
-                                        'event_espresso'
-                                    ); ?>
+										'TXN ID / CHQ #',
+										'event_espresso'
+									); ?>
                                 </label>
                                 <input name="txn_admin_payment[txn_id_chq_nmbr]"
                                        id="txn-admin-payment-txn-id-chq-nmbr-inp"
@@ -574,9 +574,9 @@ 
                                 />
                                 <p class="description">
                                     <?php esc_html_e(
-                                        'The Transaction ID sent back from the payment gateway, or the Cheque #',
-                                        'event_espresso'
-                                    ); ?>
+										'The Transaction ID sent back from the payment gateway, or the Cheque #',
+										'event_espresso'
+									); ?>
                                 </p>
                             </div>
                         </div>
@@ -593,9 +593,9 @@ 
                                 />
                                 <p class="description">
                                     <?php esc_html_e(
-                                        'The gateway response string (optional)',
-                                        'event_espresso'
-                                    ); ?>
+										'The gateway response string (optional)',
+										'event_espresso'
+									); ?>
                                 </p>
                             </div>
                         </div>
@@ -604,9 +604,9 @@ 
                             <div class="txn-admin-apply-payment-status-dv admin-modal-dialog-row">
                                 <label for="txn-admin-payment-status-slct" class="">
                                     <?php esc_html_e(
-                                        'Payment Status',
-                                        'event_espresso'
-                                    ); ?>
+										'Payment Status',
+										'event_espresso'
+									); ?>
                                 </label>
                                 <select name="txn_admin_payment[status]"
                                         id="txn-admin-payment-status-slct"
@@ -615,10 +615,10 @@ 
                                 >
                                     <?php foreach ($payment_status as $STS_ID => $STS_code) : ?>
                                         <?php
-                                        $selected = $STS_ID == 'PAP'
-                                            ? 'selected'
-                                            : '';
-                                        ?>
+										$selected = $STS_ID == 'PAP'
+											? 'selected'
+											: '';
+										?>
                                         <option id="payment-status-opt-<?php echo esc_attr($STS_ID); ?>"
                                                 value="<?php echo esc_attr($STS_ID); ?>"
                                             <?php echo esc_attr($selected); ?>
@@ -629,10 +629,10 @@ 
                                 </select>
                                 <p class="description">
                                     <?php
-                                    esc_html_e(
-                                        'Whether the payment was approved, cancelled, declined or failed after submission to the gateway',
-                                        'event_espresso'
-                                    ); ?>
+									esc_html_e(
+										'Whether the payment was approved, cancelled, declined or failed after submission to the gateway',
+										'event_espresso'
+									); ?>
                                 </p>
                             </div>
                         </div>
@@ -649,9 +649,9 @@ 
                             />
                             <p class="description">
                                 <?php esc_html_e(
-                                    'The Purchase or Sales Order Number if any (optional)',
-                                    'event_espresso'
-                                ); ?>
+									'The Purchase or Sales Order Number if any (optional)',
+									'event_espresso'
+								); ?>
                             </p>
                         </div>
 
@@ -672,9 +672,9 @@ 
                             />
                             <p class="description">
                                 <?php esc_html_e(
-                                    'An extra field you may use for accounting purposes or simple notes. Defaults to the primary registrant\'s registration code.',
-                                    'event_espresso'
-                                ); ?>
+									'An extra field you may use for accounting purposes or simple notes. Defaults to the primary registrant\'s registration code.',
+									'event_espresso'
+								); ?>
                             </p>
                         </div>
 
@@ -709,9 +709,9 @@ 
                             <?php echo wp_kses($status_change_select, AllowedTags::getWithFormTags()); ?>
                             <p class="description">
                                 <?php esc_html_e(
-                                    'If you wish to change the status for the registrations selected above, then select which status from this dropdown.',
-                                    'event_espresso'
-                                ); ?>
+									'If you wish to change the status for the registrations selected above, then select which status from this dropdown.',
+									'event_espresso'
+								); ?>
                             </p>
                             <br />
                         </div>
@@ -742,14 +742,14 @@ 
                             <br class="clear-float" />
                             <p class="description">
                                 <?php printf(
-                                    esc_html__(
-                                        'By default %1$sa payment message is sent to the primary registrant%2$s after submitting this form.%3$sHowever, if you check the "Registration Messages" box, the system will also send any related messages matching the status of the registrations to %1$seach registration for this transaction%2$s.',
-                                        'event_espresso'
-                                    ),
-                                    '<strong>',
-                                    '</strong>',
-                                    '<br />'
-                                ); ?>
+									esc_html__(
+										'By default %1$sa payment message is sent to the primary registrant%2$s after submitting this form.%3$sHowever, if you check the "Registration Messages" box, the system will also send any related messages matching the status of the registrations to %1$seach registration for this transaction%2$s.',
+										'event_espresso'
+									),
+									'<strong>',
+									'</strong>',
+									'<br />'
+								); ?>
                             </p>
                         </div>
                         <div class="clear"></div>
@@ -814,10 +814,10 @@ 
             >
                 <span class="ee-icon ee-icon-cash-add"></span>
                 <?php printf(
-                    esc_html__('Delete Payment/Refund for Transaction #', 'event_espresso'),
-                    $txn_nmbr['value']
-                );
-                ?>
+					esc_html__('Delete Payment/Refund for Transaction #', 'event_espresso'),
+					$txn_nmbr['value']
+				);
+				?>
             </h2>
 
             <form name="txn-admin-delete-payment-frm"
@@ -853,13 +853,13 @@ 
                             <?php echo wp_kses($delete_status_change_select, AllowedTags::getWithFormTags()); ?>
                             <p class="description">
                                 <?php printf(
-                                    esc_html__(
-                                        'If you wish to change the status of all the registrations associated with this transaction after deleting this payment/refund, then select which status from this dropdown. %sNote: ALL registrations associated with this transaction will be updated to this new status.%s',
-                                        'event_espresso'
-                                    ),
-                                    '<strong>',
-                                    '</strong>'
-                                ); ?>
+									esc_html__(
+										'If you wish to change the status of all the registrations associated with this transaction after deleting this payment/refund, then select which status from this dropdown. %sNote: ALL registrations associated with this transaction will be updated to this new status.%s',
+										'event_espresso'
+									),
+									'<strong>',
+									'</strong>'
+								); ?>
                             </p>
                         </div>
 
@@ -874,10 +874,10 @@ 
                             />
                             <p class="description">
                                 <?php
-                                esc_html_e(
-                                    'If you check this box, the system will send any related registration messages matching the status of the registrations to each registration for this transaction. No Payment notifications are sent when deleting a payment.',
-                                    'event_espresso'
-                                ); ?>
+								esc_html_e(
+									'If you check this box, the system will send any related registration messages matching the status of the registrations to each registration for this transaction. No Payment notifications are sent when deleting a payment.',
+									'event_espresso'
+								); ?>
                             </p>
                         </div>
                         <div class="clear"></div>
@@ -910,8 +910,8 @@ 
     <?php endif; // $grand_raw_total > 0?>
 
     <?php if (WP_DEBUG) {
-        $delivered_messages = get_option('EED_Messages__payment', []);
-        if (isset($delivered_messages[ $TXN_ID ])) { ?>
+		$delivered_messages = get_option('EED_Messages__payment', []);
+		if (isset($delivered_messages[ $TXN_ID ])) { ?>
             <h4 class="admin-primary-mbox-h4 hdr-has-icon">
                 <span class="dashicons dashicons-email-alt"></span>
                 <?php esc_html_e('Messages Sent to Primary Registrant', 'event_espresso'); ?>
@@ -923,39 +923,39 @@ 
                             <th class="jst-left"><?php esc_html_e('Date & Time', 'event_espresso'); ?></th>
                             <th class="jst-left"><?php esc_html_e('Message Type', 'event_espresso'); ?></th>
                             <th class="jst-left"><?php esc_html_e(
-                                'Payment Status Upon Sending',
-                                'event_espresso'
-                            ); ?></th>
+								'Payment Status Upon Sending',
+								'event_espresso'
+							); ?></th>
                             <th class="jst-left"><?php esc_html_e('TXN Status Upon Sending', 'event_espresso'); ?></th>
                         </tr>
                     </thead>
                     <tbody>
                         <?php
-                        foreach ($delivered_messages[ $TXN_ID ] as $timestamp => $delivered_message) :
-                            ?>
+						foreach ($delivered_messages[ $TXN_ID ] as $timestamp => $delivered_message) :
+							?>
                             <tr>
                                 <td class="jst-left">
                                     <?php echo esc_html(
-                                        date(
-                                            get_option('date_format') . ' ' . get_option('time_format'),
-                                            ($timestamp + (get_option('gmt_offset') * HOUR_IN_SECONDS))
-                                        )
-                                    ); ?>
+										date(
+											get_option('date_format') . ' ' . get_option('time_format'),
+											($timestamp + (get_option('gmt_offset') * HOUR_IN_SECONDS))
+										)
+									); ?>
                                 </td>
                                 <td class="jst-left"><?php
-                                    echo isset($delivered_message['message_type'])
-                                        ? esc_html($delivered_message['message_type'])
-                                        : ''; ?>
+									echo isset($delivered_message['message_type'])
+										? esc_html($delivered_message['message_type'])
+										: ''; ?>
                                 </td>
                                 <td class="jst-left"><?php
-                                    echo isset($delivered_message['pay_status'])
-                                        ? esc_html($delivered_message['pay_status'])
-                                        : ''; ?>
+									echo isset($delivered_message['pay_status'])
+										? esc_html($delivered_message['pay_status'])
+										: ''; ?>
                                 </td>
                                 <td class="jst-left"><?php
-                                    echo isset($delivered_message['txn_status'])
-                                        ? esc_html($delivered_message['txn_status'])
-                                        : ''; ?>
+									echo isset($delivered_message['txn_status'])
+										? esc_html($delivered_message['txn_status'])
+										: ''; ?>
                                 </td>
                             </tr>
                         <?php endforeach; // $delivered_messages?>
@@ -963,7 +963,7 @@ 
                 </table>
             </div>
             <?php
-        }
-    }
-    ?>
+		}
+	}
+	?>
 </div>

Spacing +9 added lines, -9 removed lines

@@ -127,12 +127,12 @@ 
                     <?php if ($payments) :
                         $payment_total = 0;
                         foreach ($payments as $PAY_ID => $payment) :
-                            if (! $payment instanceof EE_Payment) {
+                            if ( ! $payment instanceof EE_Payment) {
                                 continue;
                             }
                             $PAY_ID = absint($PAY_ID);
-                            $existing_reg_payment_json = isset($existing_reg_payments[ $PAY_ID ])
-                                ? wp_json_encode($existing_reg_payments[ $PAY_ID ])
+                            $existing_reg_payment_json = isset($existing_reg_payments[$PAY_ID])
+                                ? wp_json_encode($existing_reg_payments[$PAY_ID])
                                 : '{}';
                     ?>
                     <tr id="txn-admin-payment-tr-<?php echo absint($PAY_ID); ?>">
@@ -219,7 +219,7 @@ 
                         <td class=" jst-rght">
                             <?php
                             $payment_class = $payment->amount() > 0
-                                ? 'txn-admin-payment-status-' . $payment->STS_ID()
+                                ? 'txn-admin-payment-status-'.$payment->STS_ID()
                                 : 'txn-admin-payment-status-PDC';
                             ?>
                             <span class="<?php echo esc_attr($payment_class); ?>">
@@ -263,7 +263,7 @@ 
                                 $overpaid
                                 . sprintf(
                                     __('Payments Total %s', 'event_espresso'),
-                                    '(' . EE_Registry::instance()->CFG->currency->code . ')'
+                                    '('.EE_Registry::instance()->CFG->currency->code.')'
                                 ),
                                 AllowedTags::getAllowedTags()
                             ); ?></span>
@@ -400,7 +400,7 @@ 
             >
                 <div class="ee-icon ee-icon-cash-add float-left"></div>
                 <?php
-                echo esc_html__('Apply a Payment to Transaction #', 'event_espresso') . esc_html($txn_nmbr['value']); ?>
+                echo esc_html__('Apply a Payment to Transaction #', 'event_espresso').esc_html($txn_nmbr['value']); ?>
             </h2>
 
             <h2 id="admin-modal-dialog-edit-payment-h2" class="admin-modal-dialog-h2 hdr-has-icon"
@@ -911,7 +911,7 @@ 
 
     <?php if (WP_DEBUG) {
         $delivered_messages = get_option('EED_Messages__payment', []);
-        if (isset($delivered_messages[ $TXN_ID ])) { ?>
+        if (isset($delivered_messages[$TXN_ID])) { ?>
             <h4 class="admin-primary-mbox-h4 hdr-has-icon">
                 <span class="dashicons dashicons-email-alt"></span>
                 <?php esc_html_e('Messages Sent to Primary Registrant', 'event_espresso'); ?>
@@ -931,13 +931,13 @@ 
                     </thead>
                     <tbody>
                         <?php
-                        foreach ($delivered_messages[ $TXN_ID ] as $timestamp => $delivered_message) :
+                        foreach ($delivered_messages[$TXN_ID] as $timestamp => $delivered_message) :
                             ?>
                             <tr>
                                 <td class="jst-left">
                                     <?php echo esc_html(
                                         date(
-                                            get_option('date_format') . ' ' . get_option('time_format'),
+                                            get_option('date_format').' '.get_option('time_format'),
                                             ($timestamp + (get_option('gmt_offset') * HOUR_IN_SECONDS))
                                         )
                                     ); ?>

Braces +8 added lines, -3 removed lines

@@ -280,11 +280,13 @@ 
                             ); ?></span>
                         </th>
                     </tr>
-                    <?php else : ?>
+                    <?php else {
+	: ?>
                     <tr id="txn-admin-no-payments-tr" class="admin-primary-mbox-total-tr">
                         <td class=" jst-rght" colspan="10">
                             <span class="important-notice"><?php
                                 echo wp_kses($no_payment_text, AllowedTags::getAllowedTags());
+}
                             ?></span>
                         </td>
                     </tr>
@@ -376,10 +378,13 @@ 
                         <?php esc_html_e('Apply Refund', 'event_espresso'); ?>
                     </a>
                 </li>
-            <?php else : ?>
+            <?php else {
+	: ?>
                 <li>
                     <p>
-                        <?php esc_html__('You do not have access to apply payments or refunds.', 'event_espresso'); ?>
+                        <?php esc_html__('You do not have access to apply payments or refunds.', 'event_espresso');
+}
+?>
                     </p>
                 </li>
             <?php endif; ?>

admin_pages/general_settings/OrganizationSettings.php

Indentation +389 added lines, -389 removed lines

@@ -40,405 +40,405 @@
  */
 class OrganizationSettings extends FormHandler
 {
-    protected EE_Organization_Config $organization_config;
+	protected EE_Organization_Config $organization_config;
 
-    protected EE_Core_Config $core_config;
+	protected EE_Core_Config $core_config;
 
-    protected EE_Network_Core_Config $network_core_config;
+	protected EE_Network_Core_Config $network_core_config;
 
-    protected CountrySubRegionDao $countrySubRegionDao;
+	protected CountrySubRegionDao $countrySubRegionDao;
 
-    /**
-     * Form constructor.
-     *
-     * @param EE_Registry             $registry
-     * @param EE_Organization_Config  $organization_config
-     * @param EE_Core_Config          $core_config
-     * @param EE_Network_Core_Config $network_core_config
-     * @param CountrySubRegionDao $countrySubRegionDao
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws DomainException
-     */
-    public function __construct(
-        EE_Registry $registry,
-        EE_Organization_Config $organization_config,
-        EE_Core_Config $core_config,
-        EE_Network_Core_Config $network_core_config,
-        CountrySubRegionDao $countrySubRegionDao
-    ) {
-        $this->organization_config = $organization_config;
-        $this->core_config = $core_config;
-        $this->network_core_config = $network_core_config;
-        $this->countrySubRegionDao = $countrySubRegionDao;
-        parent::__construct(
-            esc_html__('Your Organization Settings', 'event_espresso'),
-            esc_html__('Your Organization Settings', 'event_espresso'),
-            'organization_settings',
-            '',
-            FormHandler::DO_NOT_SETUP_FORM,
-            $registry
-        );
-    }
+	/**
+	 * Form constructor.
+	 *
+	 * @param EE_Registry             $registry
+	 * @param EE_Organization_Config  $organization_config
+	 * @param EE_Core_Config          $core_config
+	 * @param EE_Network_Core_Config $network_core_config
+	 * @param CountrySubRegionDao $countrySubRegionDao
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws DomainException
+	 */
+	public function __construct(
+		EE_Registry $registry,
+		EE_Organization_Config $organization_config,
+		EE_Core_Config $core_config,
+		EE_Network_Core_Config $network_core_config,
+		CountrySubRegionDao $countrySubRegionDao
+	) {
+		$this->organization_config = $organization_config;
+		$this->core_config = $core_config;
+		$this->network_core_config = $network_core_config;
+		$this->countrySubRegionDao = $countrySubRegionDao;
+		parent::__construct(
+			esc_html__('Your Organization Settings', 'event_espresso'),
+			esc_html__('Your Organization Settings', 'event_espresso'),
+			'organization_settings',
+			'',
+			FormHandler::DO_NOT_SETUP_FORM,
+			$registry
+		);
+	}
 
 
-    /**
-     * creates and returns the actual form
-     *
-     * @return EE_Form_Section_Proper
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function generate(): EE_Form_Section_Proper
-    {
-        $has_sub_regions = EEM_State::instance()->count(
-            array(array('Country.CNT_ISO' => $this->organization_config->CNT_ISO))
-        );
-        return apply_filters(
-            'FHEE__EventEspresso_admin_pages_general_settings_OrganizationSettings__generate__form',
-            new EE_Form_Section_Proper(
-                array(
-                    'name'            => 'organization_settings',
-                    'html_id'         => 'organization_settings',
-                    'layout_strategy' => new EE_Admin_Two_Column_Layout(),
-                    'subsections'     => array(
-                        'contact_information_hdr'        => new EE_Form_Section_HTML(
-                            EEH_HTML::h2(
-                                esc_html__('Contact Information', 'event_espresso')
-                                . ' '
-                                . EEH_HTML::span(EEH_Template::get_help_tab_link('contact_info_info')),
-                                '',
-                                'contact-information-hdr'
-                            )
-                        ),
-                        'organization_name'      => new EE_Text_Input(
-                            array(
-                                'html_name' => 'organization_name',
-                                'html_label_text' => esc_html__('Organization Name', 'event_espresso'),
-                                'html_help_text'  => esc_html__(
-                                    'Displayed on all emails and invoices.',
-                                    'event_espresso'
-                                ),
-                                'default'         => $this->organization_config->get_pretty('name'),
-                                'required'        => false,
-                            )
-                        ),
-                        'organization_address_1'      => new EE_Text_Input(
-                            array(
-                                'html_name' => 'organization_address_1',
-                                'html_label_text' => esc_html__('Street Address', 'event_espresso'),
-                                'default'         => $this->organization_config->get_pretty('address_1'),
-                                'required'        => false,
-                            )
-                        ),
-                        'organization_address_2'      => new EE_Text_Input(
-                            array(
-                                'html_name' => 'organization_address_2',
-                                'html_label_text' => esc_html__('Street Address 2', 'event_espresso'),
-                                'default'         => $this->organization_config->get_pretty('address_2'),
-                                'required'        => false,
-                            )
-                        ),
-                        'organization_city'      => new EE_Text_Input(
-                            array(
-                                'html_name' => 'organization_city',
-                                'html_label_text' => esc_html__('City', 'event_espresso'),
-                                'default'         => $this->organization_config->get_pretty('city'),
-                                'required'        => false,
-                            )
-                        ),
-                        'organization_country'      => new EE_Country_Select_Input(
-                            null,
-                            array(
-                                EE_Country_Select_Input::OPTION_GET_KEY => EE_Country_Select_Input::OPTION_GET_ALL,
-                                'html_name'       => 'organization_country',
-                                'html_label_text' => esc_html__('Country', 'event_espresso'),
-                                'default'         => $this->organization_config->CNT_ISO,
-                                'required'        => false,
-                                'html_help_text'  => sprintf(
-                                    esc_html__(
-                                        '%1$sThe Country set here will have the effect of setting the currency used for all ticket prices.%2$s',
-                                        'event_espresso'
-                                    ),
-                                    '<span class="reminder-spn">',
-                                    '</span>'
-                                ),
-                            )
-                        ),
-                        'organization_state' => new EE_State_Select_Input(
-                            null,
-                            array(
-                                'html_name'       => 'organization_state',
-                                'html_label_text' => esc_html__('State/Province', 'event_espresso'),
-                                'default'         => $this->organization_config->STA_ID,
-                                'required'        => false,
-                                'html_help_text' => empty($this->organization_config->STA_ID) || ! $has_sub_regions
-                                    ? sprintf(
-                                        esc_html__(
-                                            'If the States/Provinces for the selected Country do not appear in this list, then click "Save".%3$sIf data exists, then the list will be populated when the page reloads and you will be able to make a selection at that time.%3$s%1$sMake sure you click "Save" again after selecting a State/Province that has just been loaded in order to keep that selection.%2$s',
-                                            'event_espresso'
-                                        ),
-                                        '<span class="reminder-spn">',
-                                        '</span>',
-                                        '<br />'
-                                    )
-                                    : '',
-                            )
-                        ),
-                        'organization_zip'      => new EE_Text_Input(
-                            array(
-                                'html_name' => 'organization_zip',
-                                'html_label_text' => esc_html__('Zip/Postal Code', 'event_espresso'),
-                                'default'         => $this->organization_config->get_pretty('zip'),
-                                'required'        => false,
-                            )
-                        ),
-                        'organization_email'      => new EE_Text_Input(
-                            array(
-                                'html_name' => 'organization_email',
-                                'html_label_text' => esc_html__('Primary Contact Email', 'event_espresso'),
-                                'html_help_text'  => sprintf(
-                                    esc_html__(
-                                        'This is where notifications go to when you use the %1$s and %2$s shortcodes in the message templates.',
-                                        'event_espresso'
-                                    ),
-                                    '<code>[CO_FORMATTED_EMAIL]</code>',
-                                    '<code>[CO_EMAIL]</code>'
-                                ),
-                                'default'         => $this->organization_config->get_pretty('email'),
-                                'required'        => false,
-                            )
-                        ),
-                        'organization_phone'      => new EE_Text_Input(
-                            array(
-                                'html_name' => 'organization_phone',
-                                'html_label_text' => esc_html__('Phone Number', 'event_espresso'),
-                                'html_help_text'  => esc_html__(
-                                    'The phone number for your organization.',
-                                    'event_espresso'
-                                ),
-                                'default'         => $this->organization_config->get_pretty('phone'),
-                                'required'        => false,
-                            )
-                        ),
-                        'organization_vat'      => new EE_Text_Input(
-                            array(
-                                'html_name' => 'organization_vat',
-                                'html_label_text' => esc_html__('VAT/Tax Number', 'event_espresso'),
-                                'html_help_text'  => esc_html__(
-                                    'The VAT/Tax Number may be displayed on invoices and receipts.',
-                                    'event_espresso'
-                                ),
-                                'default'         => $this->organization_config->get_pretty('vat'),
-                                'required'        => false,
-                            )
-                        ),
-                        'company_logo_hdr'        => new EE_Form_Section_HTML(
-                            EEH_HTML::h2(
-                                esc_html__('Company Logo', 'event_espresso')
-                                . ' '
-                                . EEH_HTML::span(EEH_Template::get_help_tab_link('organization_logo_info')),
-                                '',
-                                'company-logo-hdr'
-                            )
-                        ),
-                        'organization_logo_url'      => new EE_Admin_File_Uploader_Input(
-                            array(
-                                'html_name' => 'organization_logo_url',
-                                'html_label_text' => esc_html__('Upload New Logo', 'event_espresso'),
-                                'html_help_text'  => esc_html__(
-                                    'Your logo will be used on custom invoices, tickets, certificates, and payment templates.',
-                                    'event_espresso'
-                                ),
-                                'default'         => $this->organization_config->get_pretty('logo_url'),
-                                'required'        => false,
-                            )
-                        ),
-                        'social_links_hdr'        => new EE_Form_Section_HTML(
-                            EEH_HTML::h2(
-                                esc_html__('Social Links', 'event_espresso')
-                                . ' '
-                                . EEH_HTML::span(EEH_Template::get_help_tab_link('social_links_info'))
-                                . EEH_HTML::br()
-                                . EEH_HTML::p(
-                                    esc_html__(
-                                        'Enter any links to social accounts for your organization here',
-                                        'event_espresso'
-                                    ),
-                                    '',
-                                    'description'
-                                ),
-                                '',
-                                'social-links-hdr'
-                            )
-                        ),
-                        'organization_facebook'      => new EE_Text_Input(
-                            array(
-                                'html_name' => 'organization_facebook',
-                                'html_label_text' => esc_html__('Facebook', 'event_espresso'),
-                                'other_html_attributes' => ' placeholder="facebook.com/profile.name"',
-                                'default'         => $this->organization_config->get_pretty('facebook'),
-                                'required'        => false,
-                            )
-                        ),
-                        'organization_twitter'      => new EE_Text_Input(
-                            array(
-                                'html_name' => 'organization_twitter',
-                                'html_label_text' => esc_html__('Twitter', 'event_espresso'),
-                                'other_html_attributes' => ' placeholder="twitter.com/twitterhandle"',
-                                'default'         => $this->organization_config->get_pretty('twitter'),
-                                'required'        => false,
-                            )
-                        ),
-                        'organization_linkedin'      => new EE_Text_Input(
-                            array(
-                                'html_name' => 'organization_linkedin',
-                                'html_label_text' => esc_html__('LinkedIn', 'event_espresso'),
-                                'other_html_attributes' => ' placeholder="linkedin.com/in/profilename"',
-                                'default'         => $this->organization_config->get_pretty('linkedin'),
-                                'required'        => false,
-                            )
-                        ),
-                        'organization_pinterest'      => new EE_Text_Input(
-                            array(
-                                'html_name' => 'organization_pinterest',
-                                'html_label_text' => esc_html__('Pinterest', 'event_espresso'),
-                                'other_html_attributes' => ' placeholder="pinterest.com/profilename"',
-                                'default'         => $this->organization_config->get_pretty('pinterest'),
-                                'required'        => false,
-                            )
-                        ),
-                        'organization_instagram'      => new EE_Text_Input(
-                            array(
-                                'html_name' => 'organization_instagram',
-                                'html_label_text' => esc_html__('Instagram', 'event_espresso'),
-                                'other_html_attributes' => ' placeholder="instagram.com/handle"',
-                                'default'         => $this->organization_config->get_pretty('instagram'),
-                                'required'        => false,
-                            )
-                        ),
-                    ),
-                )
-            ),
-            $this,
-            $has_sub_regions
-        );
-    }
+	/**
+	 * creates and returns the actual form
+	 *
+	 * @return EE_Form_Section_Proper
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function generate(): EE_Form_Section_Proper
+	{
+		$has_sub_regions = EEM_State::instance()->count(
+			array(array('Country.CNT_ISO' => $this->organization_config->CNT_ISO))
+		);
+		return apply_filters(
+			'FHEE__EventEspresso_admin_pages_general_settings_OrganizationSettings__generate__form',
+			new EE_Form_Section_Proper(
+				array(
+					'name'            => 'organization_settings',
+					'html_id'         => 'organization_settings',
+					'layout_strategy' => new EE_Admin_Two_Column_Layout(),
+					'subsections'     => array(
+						'contact_information_hdr'        => new EE_Form_Section_HTML(
+							EEH_HTML::h2(
+								esc_html__('Contact Information', 'event_espresso')
+								. ' '
+								. EEH_HTML::span(EEH_Template::get_help_tab_link('contact_info_info')),
+								'',
+								'contact-information-hdr'
+							)
+						),
+						'organization_name'      => new EE_Text_Input(
+							array(
+								'html_name' => 'organization_name',
+								'html_label_text' => esc_html__('Organization Name', 'event_espresso'),
+								'html_help_text'  => esc_html__(
+									'Displayed on all emails and invoices.',
+									'event_espresso'
+								),
+								'default'         => $this->organization_config->get_pretty('name'),
+								'required'        => false,
+							)
+						),
+						'organization_address_1'      => new EE_Text_Input(
+							array(
+								'html_name' => 'organization_address_1',
+								'html_label_text' => esc_html__('Street Address', 'event_espresso'),
+								'default'         => $this->organization_config->get_pretty('address_1'),
+								'required'        => false,
+							)
+						),
+						'organization_address_2'      => new EE_Text_Input(
+							array(
+								'html_name' => 'organization_address_2',
+								'html_label_text' => esc_html__('Street Address 2', 'event_espresso'),
+								'default'         => $this->organization_config->get_pretty('address_2'),
+								'required'        => false,
+							)
+						),
+						'organization_city'      => new EE_Text_Input(
+							array(
+								'html_name' => 'organization_city',
+								'html_label_text' => esc_html__('City', 'event_espresso'),
+								'default'         => $this->organization_config->get_pretty('city'),
+								'required'        => false,
+							)
+						),
+						'organization_country'      => new EE_Country_Select_Input(
+							null,
+							array(
+								EE_Country_Select_Input::OPTION_GET_KEY => EE_Country_Select_Input::OPTION_GET_ALL,
+								'html_name'       => 'organization_country',
+								'html_label_text' => esc_html__('Country', 'event_espresso'),
+								'default'         => $this->organization_config->CNT_ISO,
+								'required'        => false,
+								'html_help_text'  => sprintf(
+									esc_html__(
+										'%1$sThe Country set here will have the effect of setting the currency used for all ticket prices.%2$s',
+										'event_espresso'
+									),
+									'<span class="reminder-spn">',
+									'</span>'
+								),
+							)
+						),
+						'organization_state' => new EE_State_Select_Input(
+							null,
+							array(
+								'html_name'       => 'organization_state',
+								'html_label_text' => esc_html__('State/Province', 'event_espresso'),
+								'default'         => $this->organization_config->STA_ID,
+								'required'        => false,
+								'html_help_text' => empty($this->organization_config->STA_ID) || ! $has_sub_regions
+									? sprintf(
+										esc_html__(
+											'If the States/Provinces for the selected Country do not appear in this list, then click "Save".%3$sIf data exists, then the list will be populated when the page reloads and you will be able to make a selection at that time.%3$s%1$sMake sure you click "Save" again after selecting a State/Province that has just been loaded in order to keep that selection.%2$s',
+											'event_espresso'
+										),
+										'<span class="reminder-spn">',
+										'</span>',
+										'<br />'
+									)
+									: '',
+							)
+						),
+						'organization_zip'      => new EE_Text_Input(
+							array(
+								'html_name' => 'organization_zip',
+								'html_label_text' => esc_html__('Zip/Postal Code', 'event_espresso'),
+								'default'         => $this->organization_config->get_pretty('zip'),
+								'required'        => false,
+							)
+						),
+						'organization_email'      => new EE_Text_Input(
+							array(
+								'html_name' => 'organization_email',
+								'html_label_text' => esc_html__('Primary Contact Email', 'event_espresso'),
+								'html_help_text'  => sprintf(
+									esc_html__(
+										'This is where notifications go to when you use the %1$s and %2$s shortcodes in the message templates.',
+										'event_espresso'
+									),
+									'<code>[CO_FORMATTED_EMAIL]</code>',
+									'<code>[CO_EMAIL]</code>'
+								),
+								'default'         => $this->organization_config->get_pretty('email'),
+								'required'        => false,
+							)
+						),
+						'organization_phone'      => new EE_Text_Input(
+							array(
+								'html_name' => 'organization_phone',
+								'html_label_text' => esc_html__('Phone Number', 'event_espresso'),
+								'html_help_text'  => esc_html__(
+									'The phone number for your organization.',
+									'event_espresso'
+								),
+								'default'         => $this->organization_config->get_pretty('phone'),
+								'required'        => false,
+							)
+						),
+						'organization_vat'      => new EE_Text_Input(
+							array(
+								'html_name' => 'organization_vat',
+								'html_label_text' => esc_html__('VAT/Tax Number', 'event_espresso'),
+								'html_help_text'  => esc_html__(
+									'The VAT/Tax Number may be displayed on invoices and receipts.',
+									'event_espresso'
+								),
+								'default'         => $this->organization_config->get_pretty('vat'),
+								'required'        => false,
+							)
+						),
+						'company_logo_hdr'        => new EE_Form_Section_HTML(
+							EEH_HTML::h2(
+								esc_html__('Company Logo', 'event_espresso')
+								. ' '
+								. EEH_HTML::span(EEH_Template::get_help_tab_link('organization_logo_info')),
+								'',
+								'company-logo-hdr'
+							)
+						),
+						'organization_logo_url'      => new EE_Admin_File_Uploader_Input(
+							array(
+								'html_name' => 'organization_logo_url',
+								'html_label_text' => esc_html__('Upload New Logo', 'event_espresso'),
+								'html_help_text'  => esc_html__(
+									'Your logo will be used on custom invoices, tickets, certificates, and payment templates.',
+									'event_espresso'
+								),
+								'default'         => $this->organization_config->get_pretty('logo_url'),
+								'required'        => false,
+							)
+						),
+						'social_links_hdr'        => new EE_Form_Section_HTML(
+							EEH_HTML::h2(
+								esc_html__('Social Links', 'event_espresso')
+								. ' '
+								. EEH_HTML::span(EEH_Template::get_help_tab_link('social_links_info'))
+								. EEH_HTML::br()
+								. EEH_HTML::p(
+									esc_html__(
+										'Enter any links to social accounts for your organization here',
+										'event_espresso'
+									),
+									'',
+									'description'
+								),
+								'',
+								'social-links-hdr'
+							)
+						),
+						'organization_facebook'      => new EE_Text_Input(
+							array(
+								'html_name' => 'organization_facebook',
+								'html_label_text' => esc_html__('Facebook', 'event_espresso'),
+								'other_html_attributes' => ' placeholder="facebook.com/profile.name"',
+								'default'         => $this->organization_config->get_pretty('facebook'),
+								'required'        => false,
+							)
+						),
+						'organization_twitter'      => new EE_Text_Input(
+							array(
+								'html_name' => 'organization_twitter',
+								'html_label_text' => esc_html__('Twitter', 'event_espresso'),
+								'other_html_attributes' => ' placeholder="twitter.com/twitterhandle"',
+								'default'         => $this->organization_config->get_pretty('twitter'),
+								'required'        => false,
+							)
+						),
+						'organization_linkedin'      => new EE_Text_Input(
+							array(
+								'html_name' => 'organization_linkedin',
+								'html_label_text' => esc_html__('LinkedIn', 'event_espresso'),
+								'other_html_attributes' => ' placeholder="linkedin.com/in/profilename"',
+								'default'         => $this->organization_config->get_pretty('linkedin'),
+								'required'        => false,
+							)
+						),
+						'organization_pinterest'      => new EE_Text_Input(
+							array(
+								'html_name' => 'organization_pinterest',
+								'html_label_text' => esc_html__('Pinterest', 'event_espresso'),
+								'other_html_attributes' => ' placeholder="pinterest.com/profilename"',
+								'default'         => $this->organization_config->get_pretty('pinterest'),
+								'required'        => false,
+							)
+						),
+						'organization_instagram'      => new EE_Text_Input(
+							array(
+								'html_name' => 'organization_instagram',
+								'html_label_text' => esc_html__('Instagram', 'event_espresso'),
+								'other_html_attributes' => ' placeholder="instagram.com/handle"',
+								'default'         => $this->organization_config->get_pretty('instagram'),
+								'required'        => false,
+							)
+						),
+					),
+				)
+			),
+			$this,
+			$has_sub_regions
+		);
+	}
 
 
-    /**
-     * takes the generated form and displays it along with ony other non-form HTML that may be required
-     * returns a string of HTML that can be directly echoed in a template
-     *
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws LogicException
-     */
-    public function display()
-    {
-        $this->form()->enqueue_js();
-        return parent::display();
-    }
+	/**
+	 * takes the generated form and displays it along with ony other non-form HTML that may be required
+	 * returns a string of HTML that can be directly echoed in a template
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws LogicException
+	 */
+	public function display()
+	{
+		$this->form()->enqueue_js();
+		return parent::display();
+	}
 
 
-    /**
-     * handles processing the form submission
-     * returns true or false depending on whether the form was processed successfully or not
-     *
-     * @param array $form_data
-     * @return bool
-     * @throws InvalidFormSubmissionException
-     * @throws EE_Error
-     * @throws LogicException
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws ReflectionException
-     */
-    public function process($form_data = array()): bool
-    {
-        // process form
-        $valid_data = (array) parent::process($form_data);
-        if (empty($valid_data)) {
-            return false;
-        }
+	/**
+	 * handles processing the form submission
+	 * returns true or false depending on whether the form was processed successfully or not
+	 *
+	 * @param array $form_data
+	 * @return bool
+	 * @throws InvalidFormSubmissionException
+	 * @throws EE_Error
+	 * @throws LogicException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws ReflectionException
+	 */
+	public function process($form_data = array()): bool
+	{
+		// process form
+		$valid_data = (array) parent::process($form_data);
+		if (empty($valid_data)) {
+			return false;
+		}
 
-        if (is_main_site()) {
-            $this->network_core_config->site_license_key = isset($form_data['ee_site_license_key'])
-                ? sanitize_text_field($form_data['ee_site_license_key'])
-                : $this->network_core_config->site_license_key;
-        }
-        $this->organization_config->name = isset($form_data['organization_name'])
-            ? sanitize_text_field($form_data['organization_name'])
-            : $this->organization_config->name;
-        $this->organization_config->address_1 = isset($form_data['organization_address_1'])
-            ? sanitize_text_field($form_data['organization_address_1'])
-            : $this->organization_config->address_1;
-        $this->organization_config->address_2 = isset($form_data['organization_address_2'])
-            ? sanitize_text_field($form_data['organization_address_2'])
-            : $this->organization_config->address_2;
-        $this->organization_config->city = isset($form_data['organization_city'])
-            ? sanitize_text_field($form_data['organization_city'])
-            : $this->organization_config->city;
-        $this->organization_config->STA_ID = isset($form_data['organization_state'])
-            ? absint($form_data['organization_state'])
-            : $this->organization_config->STA_ID;
-        $this->organization_config->CNT_ISO = isset($form_data['organization_country'])
-            ? sanitize_text_field($form_data['organization_country'])
-            : $this->organization_config->CNT_ISO;
-        $this->organization_config->zip = isset($form_data['organization_zip'])
-            ? sanitize_text_field($form_data['organization_zip'])
-            : $this->organization_config->zip;
-        $this->organization_config->email = isset($form_data['organization_email'])
-            ? sanitize_email($form_data['organization_email'])
-            : $this->organization_config->email;
-        $this->organization_config->vat = isset($form_data['organization_vat'])
-            ? sanitize_text_field($form_data['organization_vat'])
-            : $this->organization_config->vat;
-        $this->organization_config->phone = isset($form_data['organization_phone'])
-            ? sanitize_text_field($form_data['organization_phone'])
-            : $this->organization_config->phone;
-        $this->organization_config->logo_url = isset($form_data['organization_logo_url'])
-            ? esc_url_raw($form_data['organization_logo_url'])
-            : $this->organization_config->logo_url;
-        $this->organization_config->facebook = isset($form_data['organization_facebook'])
-            ? esc_url_raw($form_data['organization_facebook'])
-            : $this->organization_config->facebook;
-        $this->organization_config->twitter = isset($form_data['organization_twitter'])
-            ? esc_url_raw($form_data['organization_twitter'])
-            : $this->organization_config->twitter;
-        $this->organization_config->linkedin = isset($form_data['organization_linkedin'])
-            ? esc_url_raw($form_data['organization_linkedin'])
-            : $this->organization_config->linkedin;
-        $this->organization_config->pinterest = isset($form_data['organization_pinterest'])
-            ? esc_url_raw($form_data['organization_pinterest'])
-            : $this->organization_config->pinterest;
-        $this->organization_config->google = isset($form_data['organization_google'])
-            ? esc_url_raw($form_data['organization_google'])
-            : $this->organization_config->google;
-        $this->organization_config->instagram = isset($form_data['organization_instagram'])
-            ? esc_url_raw($form_data['organization_instagram'])
-            : $this->organization_config->instagram;
-        $this->core_config->ee_ueip_optin = isset($form_data[ EE_Core_Config::OPTION_NAME_UXIP ][0])
-            ? filter_var($form_data[ EE_Core_Config::OPTION_NAME_UXIP ][0], FILTER_VALIDATE_BOOLEAN)
-            : false;
-        $this->core_config->ee_ueip_has_notified = true;
+		if (is_main_site()) {
+			$this->network_core_config->site_license_key = isset($form_data['ee_site_license_key'])
+				? sanitize_text_field($form_data['ee_site_license_key'])
+				: $this->network_core_config->site_license_key;
+		}
+		$this->organization_config->name = isset($form_data['organization_name'])
+			? sanitize_text_field($form_data['organization_name'])
+			: $this->organization_config->name;
+		$this->organization_config->address_1 = isset($form_data['organization_address_1'])
+			? sanitize_text_field($form_data['organization_address_1'])
+			: $this->organization_config->address_1;
+		$this->organization_config->address_2 = isset($form_data['organization_address_2'])
+			? sanitize_text_field($form_data['organization_address_2'])
+			: $this->organization_config->address_2;
+		$this->organization_config->city = isset($form_data['organization_city'])
+			? sanitize_text_field($form_data['organization_city'])
+			: $this->organization_config->city;
+		$this->organization_config->STA_ID = isset($form_data['organization_state'])
+			? absint($form_data['organization_state'])
+			: $this->organization_config->STA_ID;
+		$this->organization_config->CNT_ISO = isset($form_data['organization_country'])
+			? sanitize_text_field($form_data['organization_country'])
+			: $this->organization_config->CNT_ISO;
+		$this->organization_config->zip = isset($form_data['organization_zip'])
+			? sanitize_text_field($form_data['organization_zip'])
+			: $this->organization_config->zip;
+		$this->organization_config->email = isset($form_data['organization_email'])
+			? sanitize_email($form_data['organization_email'])
+			: $this->organization_config->email;
+		$this->organization_config->vat = isset($form_data['organization_vat'])
+			? sanitize_text_field($form_data['organization_vat'])
+			: $this->organization_config->vat;
+		$this->organization_config->phone = isset($form_data['organization_phone'])
+			? sanitize_text_field($form_data['organization_phone'])
+			: $this->organization_config->phone;
+		$this->organization_config->logo_url = isset($form_data['organization_logo_url'])
+			? esc_url_raw($form_data['organization_logo_url'])
+			: $this->organization_config->logo_url;
+		$this->organization_config->facebook = isset($form_data['organization_facebook'])
+			? esc_url_raw($form_data['organization_facebook'])
+			: $this->organization_config->facebook;
+		$this->organization_config->twitter = isset($form_data['organization_twitter'])
+			? esc_url_raw($form_data['organization_twitter'])
+			: $this->organization_config->twitter;
+		$this->organization_config->linkedin = isset($form_data['organization_linkedin'])
+			? esc_url_raw($form_data['organization_linkedin'])
+			: $this->organization_config->linkedin;
+		$this->organization_config->pinterest = isset($form_data['organization_pinterest'])
+			? esc_url_raw($form_data['organization_pinterest'])
+			: $this->organization_config->pinterest;
+		$this->organization_config->google = isset($form_data['organization_google'])
+			? esc_url_raw($form_data['organization_google'])
+			: $this->organization_config->google;
+		$this->organization_config->instagram = isset($form_data['organization_instagram'])
+			? esc_url_raw($form_data['organization_instagram'])
+			: $this->organization_config->instagram;
+		$this->core_config->ee_ueip_optin = isset($form_data[ EE_Core_Config::OPTION_NAME_UXIP ][0])
+			? filter_var($form_data[ EE_Core_Config::OPTION_NAME_UXIP ][0], FILTER_VALIDATE_BOOLEAN)
+			: false;
+		$this->core_config->ee_ueip_has_notified = true;
 
-        $this->registry->CFG->currency = new EE_Currency_Config(
-            $this->organization_config->CNT_ISO
-        );
-        /** @var EE_Country $country */
-        $country = EEM_Country::instance()->get_one_by_ID($this->organization_config->CNT_ISO);
-        if ($country instanceof EE_Country) {
-            $country->set('CNT_active', 1);
-            $country->save();
-            $this->countrySubRegionDao->saveCountrySubRegions($country);
-        }
-        return true;
-    }
+		$this->registry->CFG->currency = new EE_Currency_Config(
+			$this->organization_config->CNT_ISO
+		);
+		/** @var EE_Country $country */
+		$country = EEM_Country::instance()->get_one_by_ID($this->organization_config->CNT_ISO);
+		if ($country instanceof EE_Country) {
+			$country->set('CNT_active', 1);
+			$country->save();
+			$this->countrySubRegionDao->saveCountrySubRegions($country);
+		}
+		return true;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -424,8 +424,8 @@
         $this->organization_config->instagram = isset($form_data['organization_instagram'])
             ? esc_url_raw($form_data['organization_instagram'])
             : $this->organization_config->instagram;
-        $this->core_config->ee_ueip_optin = isset($form_data[ EE_Core_Config::OPTION_NAME_UXIP ][0])
-            ? filter_var($form_data[ EE_Core_Config::OPTION_NAME_UXIP ][0], FILTER_VALIDATE_BOOLEAN)
+        $this->core_config->ee_ueip_optin = isset($form_data[EE_Core_Config::OPTION_NAME_UXIP][0])
+            ? filter_var($form_data[EE_Core_Config::OPTION_NAME_UXIP][0], FILTER_VALIDATE_BOOLEAN)
             : false;
         $this->core_config->ee_ueip_has_notified = true;
 

public/template_tags.php

Indentation +1056 added lines, -1056 removed lines

@@ -20,13 +20,13 @@ 
  */
 function is_espresso_event($event = null)
 {
-    if (can_use_espresso_conditionals(__FUNCTION__)) {
-        // extract EE_Event object from passed param regardless of what it is (within reason of course)
-        $event = EEH_Event_View::get_event($event);
-        // do we have a valid event ?
-        return $event instanceof EE_Event;
-    }
-    return false;
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
+		// extract EE_Event object from passed param regardless of what it is (within reason of course)
+		$event = EEH_Event_View::get_event($event);
+		// do we have a valid event ?
+		return $event instanceof EE_Event;
+	}
+	return false;
 }
 
 /**
@@ -37,12 +37,12 @@ 
  */
 function is_espresso_event_single()
 {
-    if (can_use_espresso_conditionals(__FUNCTION__)) {
-        global $wp_query;
-        // return conditionals set by CPTs
-        return $wp_query instanceof WP_Query ? $wp_query->is_espresso_event_single : false;
-    }
-    return false;
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
+		global $wp_query;
+		// return conditionals set by CPTs
+		return $wp_query instanceof WP_Query ? $wp_query->is_espresso_event_single : false;
+	}
+	return false;
 }
 
 /**
@@ -53,11 +53,11 @@ 
  */
 function is_espresso_event_archive()
 {
-    if (can_use_espresso_conditionals(__FUNCTION__)) {
-        global $wp_query;
-        return $wp_query instanceof WP_Query ? $wp_query->is_espresso_event_archive : false;
-    }
-    return false;
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
+		global $wp_query;
+		return $wp_query instanceof WP_Query ? $wp_query->is_espresso_event_archive : false;
+	}
+	return false;
 }
 
 /**
@@ -68,11 +68,11 @@ 
  */
 function is_espresso_event_taxonomy()
 {
-    if (can_use_espresso_conditionals(__FUNCTION__)) {
-        global $wp_query;
-        return $wp_query instanceof WP_Query ? $wp_query->is_espresso_event_taxonomy : false;
-    }
-    return false;
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
+		global $wp_query;
+		return $wp_query instanceof WP_Query ? $wp_query->is_espresso_event_taxonomy : false;
+	}
+	return false;
 }
 
 /**
@@ -86,13 +86,13 @@ 
  */
 function is_espresso_venue($venue = null)
 {
-    if (can_use_espresso_conditionals(__FUNCTION__)) {
-        // extract EE_Venue object from passed param regardless of what it is (within reason of course)
-        $venue = EEH_Venue_View::get_venue($venue, false);
-        // do we have a valid event ?
-        return $venue instanceof EE_Venue;
-    }
-    return false;
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
+		// extract EE_Venue object from passed param regardless of what it is (within reason of course)
+		$venue = EEH_Venue_View::get_venue($venue, false);
+		// do we have a valid event ?
+		return $venue instanceof EE_Venue;
+	}
+	return false;
 }
 
 /**
@@ -103,11 +103,11 @@ 
  */
 function is_espresso_venue_single()
 {
-    if (can_use_espresso_conditionals(__FUNCTION__)) {
-        global $wp_query;
-        return $wp_query instanceof WP_Query ? $wp_query->is_espresso_venue_single : false;
-    }
-    return false;
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
+		global $wp_query;
+		return $wp_query instanceof WP_Query ? $wp_query->is_espresso_venue_single : false;
+	}
+	return false;
 }
 
 /**
@@ -118,11 +118,11 @@ 
  */
 function is_espresso_venue_archive()
 {
-    if (can_use_espresso_conditionals(__FUNCTION__)) {
-        global $wp_query;
-        return $wp_query instanceof WP_Query ? $wp_query->is_espresso_venue_archive : false;
-    }
-    return false;
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
+		global $wp_query;
+		return $wp_query instanceof WP_Query ? $wp_query->is_espresso_venue_archive : false;
+	}
+	return false;
 }
 
 /**
@@ -133,11 +133,11 @@ 
  */
 function is_espresso_venue_taxonomy()
 {
-    if (can_use_espresso_conditionals(__FUNCTION__)) {
-        global $wp_query;
-        return $wp_query instanceof WP_Query ? $wp_query->is_espresso_venue_taxonomy : false;
-    }
-    return false;
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
+		global $wp_query;
+		return $wp_query instanceof WP_Query ? $wp_query->is_espresso_venue_taxonomy : false;
+	}
+	return false;
 }
 
 /**
@@ -149,62 +149,62 @@ 
  */
 function can_use_espresso_conditionals($conditional_tag)
 {
-    if (! did_action('AHEE__EE_System__initialize')) {
-        EE_Error::doing_it_wrong(
-            __FUNCTION__,
-            sprintf(
-                esc_html__(
-                    'The "%s" conditional tag can not be used until after the "init" hook has run, but works best when used within a theme\'s template files.',
-                    'event_espresso'
-                ),
-                $conditional_tag
-            ),
-            '4.4.0'
-        );
-        return false;
-    }
-    return true;
+	if (! did_action('AHEE__EE_System__initialize')) {
+		EE_Error::doing_it_wrong(
+			__FUNCTION__,
+			sprintf(
+				esc_html__(
+					'The "%s" conditional tag can not be used until after the "init" hook has run, but works best when used within a theme\'s template files.',
+					'event_espresso'
+				),
+				$conditional_tag
+			),
+			'4.4.0'
+		);
+		return false;
+	}
+	return true;
 }
 
 
 /*************************** Event Queries ***************************/
 
 if (! function_exists('espresso_get_events')) {
-    /**
-     *    espresso_get_events
-     *
-     * @param array $params
-     * @return array
-     */
-    function espresso_get_events($params = [])
-    {
-        //set default params
-        $default_espresso_events_params = [
-            'limit'         => 10,
-            'show_expired'  => false,
-            'month'         => null,
-            'category_slug' => null,
-            'order_by'      => 'start_date',
-            'sort'          => 'ASC',
-        ];
-        // allow the defaults to be filtered
-        $default_espresso_events_params = apply_filters(
-            'espresso_get_events__default_espresso_events_params',
-            $default_espresso_events_params
-        );
-        // grab params and merge with defaults, then extract
-        $params = array_merge($default_espresso_events_params, $params);
-        // run the query
-        $events_query = new EventEspresso\core\domain\services\wp_queries\EventListQuery($params);
-        // assign results to a variable so we can return it
-        $events = $events_query->have_posts() ? $events_query->posts : [];
-        // but first reset the query and postdata
-        wp_reset_query();
-        wp_reset_postdata();
-        EED_Events_Archive::remove_all_events_archive_filters();
-        unset($events_query);
-        return $events;
-    }
+	/**
+	 *    espresso_get_events
+	 *
+	 * @param array $params
+	 * @return array
+	 */
+	function espresso_get_events($params = [])
+	{
+		//set default params
+		$default_espresso_events_params = [
+			'limit'         => 10,
+			'show_expired'  => false,
+			'month'         => null,
+			'category_slug' => null,
+			'order_by'      => 'start_date',
+			'sort'          => 'ASC',
+		];
+		// allow the defaults to be filtered
+		$default_espresso_events_params = apply_filters(
+			'espresso_get_events__default_espresso_events_params',
+			$default_espresso_events_params
+		);
+		// grab params and merge with defaults, then extract
+		$params = array_merge($default_espresso_events_params, $params);
+		// run the query
+		$events_query = new EventEspresso\core\domain\services\wp_queries\EventListQuery($params);
+		// assign results to a variable so we can return it
+		$events = $events_query->have_posts() ? $events_query->posts : [];
+		// but first reset the query and postdata
+		wp_reset_query();
+		wp_reset_postdata();
+		EED_Events_Archive::remove_all_events_archive_filters();
+		unset($events_query);
+		return $events;
+	}
 }
 
 
@@ -219,115 +219,115 @@ 
  */
 function espresso_load_ticket_selector()
 {
-    EE_Registry::instance()->load_file(EE_MODULES . 'ticket_selector', 'EED_Ticket_Selector', 'module');
+	EE_Registry::instance()->load_file(EE_MODULES . 'ticket_selector', 'EED_Ticket_Selector', 'module');
 }
 
 if (! function_exists('espresso_ticket_selector')) {
-    /**
-     * espresso_ticket_selector
-     *
-     * @param null $event
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_ticket_selector($event = null)
-    {
-        if (! apply_filters('FHEE_disable_espresso_ticket_selector', false)) {
-            espresso_load_ticket_selector();
-            EED_Ticket_Selector::set_definitions();
-            echo EED_Ticket_Selector::display_ticket_selector($event); // already escaped
-        }
-    }
+	/**
+	 * espresso_ticket_selector
+	 *
+	 * @param null $event
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_ticket_selector($event = null)
+	{
+		if (! apply_filters('FHEE_disable_espresso_ticket_selector', false)) {
+			espresso_load_ticket_selector();
+			EED_Ticket_Selector::set_definitions();
+			echo EED_Ticket_Selector::display_ticket_selector($event); // already escaped
+		}
+	}
 }
 
 
 if (! function_exists('espresso_view_details_btn')) {
-    /**
-     * espresso_view_details_btn
-     *
-     * @param null $event
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_view_details_btn($event = null)
-    {
-        if (! apply_filters('FHEE_disable_espresso_view_details_btn', false)) {
-            espresso_load_ticket_selector();
-            echo EED_Ticket_Selector::display_ticket_selector($event, true); // already escaped
-        }
-    }
+	/**
+	 * espresso_view_details_btn
+	 *
+	 * @param null $event
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_view_details_btn($event = null)
+	{
+		if (! apply_filters('FHEE_disable_espresso_view_details_btn', false)) {
+			espresso_load_ticket_selector();
+			echo EED_Ticket_Selector::display_ticket_selector($event, true); // already escaped
+		}
+	}
 }
 
 
 /*************************** EEH_Event_View ***************************/
 
 if (! function_exists('espresso_load_event_list_assets')) {
-    /**
-     * espresso_load_event_list_assets
-     * ensures that event list styles and scripts are loaded
-     *
-     * @return void
-     */
-    function espresso_load_event_list_assets()
-    {
-        $event_list = EED_Events_Archive::instance();
-        add_action('AHEE__EE_System__initialize_last', [$event_list, 'load_event_list_assets'], 10);
-        add_filter('FHEE_enable_default_espresso_css', '__return_true');
-    }
+	/**
+	 * espresso_load_event_list_assets
+	 * ensures that event list styles and scripts are loaded
+	 *
+	 * @return void
+	 */
+	function espresso_load_event_list_assets()
+	{
+		$event_list = EED_Events_Archive::instance();
+		add_action('AHEE__EE_System__initialize_last', [$event_list, 'load_event_list_assets'], 10);
+		add_filter('FHEE_enable_default_espresso_css', '__return_true');
+	}
 }
 
 
 if (! function_exists('espresso_event_reg_button')) {
-    /**
-     * espresso_event_reg_button
-     * returns the "Register Now" button if event is active,
-     * an inactive button like status banner if the event is not active
-     * or a "Read More" button if so desired
-     *
-     * @param null $btn_text_if_active
-     * @param bool $btn_text_if_inactive
-     * @param bool $EVT_ID
-     * @return void
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_event_reg_button($btn_text_if_active = null, $btn_text_if_inactive = false, $EVT_ID = false)
-    {
-        $event = EEH_Event_View::get_event($EVT_ID);
-        if (! $event instanceof EE_Event) {
-            return;
-        }
-        $event_status = $event->get_active_status();
-        switch ($event_status) {
-            case EE_Datetime::sold_out :
-                $btn_text = __('Sold Out', 'event_espresso');
-                $class    = 'ee-pink';
-                break;
-            case EE_Datetime::expired :
-                $btn_text = __('Event is Over', 'event_espresso');
-                $class    = 'ee-grey';
-                break;
-            case EE_Datetime::inactive :
-                $btn_text = __('Event Not Active', 'event_espresso');
-                $class    = 'ee-grey';
-                break;
-            case EE_Datetime::cancelled :
-                $btn_text = __('Event was Cancelled', 'event_espresso');
-                $class    = 'ee-red';
-                break;
-            case EE_Datetime::upcoming :
-            case EE_Datetime::active :
-            default :
-                $btn_text = ! empty($btn_text_if_active)
-                    ? $btn_text_if_active
-                    : __('Register Now', 'event_espresso');
-                $class    = 'ee-green';
-        }
-        if ($event_status < 1 && ! empty($btn_text_if_inactive)) {
-            $btn_text = $btn_text_if_inactive;
-            $class    = 'ee-grey';
-        }
-        ?>
+	/**
+	 * espresso_event_reg_button
+	 * returns the "Register Now" button if event is active,
+	 * an inactive button like status banner if the event is not active
+	 * or a "Read More" button if so desired
+	 *
+	 * @param null $btn_text_if_active
+	 * @param bool $btn_text_if_inactive
+	 * @param bool $EVT_ID
+	 * @return void
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_event_reg_button($btn_text_if_active = null, $btn_text_if_inactive = false, $EVT_ID = false)
+	{
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if (! $event instanceof EE_Event) {
+			return;
+		}
+		$event_status = $event->get_active_status();
+		switch ($event_status) {
+			case EE_Datetime::sold_out :
+				$btn_text = __('Sold Out', 'event_espresso');
+				$class    = 'ee-pink';
+				break;
+			case EE_Datetime::expired :
+				$btn_text = __('Event is Over', 'event_espresso');
+				$class    = 'ee-grey';
+				break;
+			case EE_Datetime::inactive :
+				$btn_text = __('Event Not Active', 'event_espresso');
+				$class    = 'ee-grey';
+				break;
+			case EE_Datetime::cancelled :
+				$btn_text = __('Event was Cancelled', 'event_espresso');
+				$class    = 'ee-red';
+				break;
+			case EE_Datetime::upcoming :
+			case EE_Datetime::active :
+			default :
+				$btn_text = ! empty($btn_text_if_active)
+					? $btn_text_if_active
+					: __('Register Now', 'event_espresso');
+				$class    = 'ee-green';
+		}
+		if ($event_status < 1 && ! empty($btn_text_if_inactive)) {
+			$btn_text = $btn_text_if_inactive;
+			$class    = 'ee-grey';
+		}
+		?>
         <a class="ee-button ee-register-button <?php echo esc_attr($class); ?>"
             href="<?php espresso_event_link_url($EVT_ID); ?>"
             <?php echo AttributesSanitizer::clean(EED_Events_Archive::link_target(), AllowedTags::getAllowedTags(), 'a'); ?>
@@ -335,240 +335,240 @@ 
             <?php echo esc_html($btn_text); ?>
         </a>
         <?php
-    }
+	}
 }
 
 
 if (! function_exists('espresso_display_ticket_selector')) {
-    /**
-     * espresso_display_ticket_selector
-     * whether or not to display the Ticket Selector for an event
-     *
-     * @param bool $EVT_ID
-     * @return boolean
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_display_ticket_selector($EVT_ID = false)
-    {
-        return EEH_Event_View::display_ticket_selector($EVT_ID);
-    }
+	/**
+	 * espresso_display_ticket_selector
+	 * whether or not to display the Ticket Selector for an event
+	 *
+	 * @param bool $EVT_ID
+	 * @return boolean
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_display_ticket_selector($EVT_ID = false)
+	{
+		return EEH_Event_View::display_ticket_selector($EVT_ID);
+	}
 }
 
 
 if (! function_exists('espresso_event_status_banner')) {
-    /**
-     * espresso_event_status
-     * returns a banner showing the event status if it is sold out, expired, or inactive
-     *
-     * @param bool $EVT_ID
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_event_status_banner($EVT_ID = false)
-    {
-        return EEH_Event_View::event_status($EVT_ID);
-    }
+	/**
+	 * espresso_event_status
+	 * returns a banner showing the event status if it is sold out, expired, or inactive
+	 *
+	 * @param bool $EVT_ID
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_event_status_banner($EVT_ID = false)
+	{
+		return EEH_Event_View::event_status($EVT_ID);
+	}
 }
 
 
 if (! function_exists('espresso_event_status')) {
-    /**
-     * espresso_event_status
-     * returns the event status if it is sold out, expired, or inactive
-     *
-     * @param int  $EVT_ID
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_event_status($EVT_ID = 0, $echo = true)
-    {
-        return EEH_Event_View::event_active_status($EVT_ID, $echo);
-    }
+	/**
+	 * espresso_event_status
+	 * returns the event status if it is sold out, expired, or inactive
+	 *
+	 * @param int  $EVT_ID
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_event_status($EVT_ID = 0, $echo = true)
+	{
+		return EEH_Event_View::event_active_status($EVT_ID, $echo);
+	}
 }
 
 
 if (! function_exists('espresso_event_categories')) {
-    /**
-     * espresso_event_categories
-     * returns the terms associated with an event
-     *
-     * @param int  $EVT_ID
-     * @param bool $hide_uncategorized
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_event_categories($EVT_ID = 0, $hide_uncategorized = true, $echo = true)
-    {
-        if ($echo) {
-            echo wp_kses(EEH_Event_View::event_categories($EVT_ID, $hide_uncategorized), AllowedTags::getWithFormTags());
-            return '';
-        }
-        return EEH_Event_View::event_categories($EVT_ID, $hide_uncategorized);
-    }
+	/**
+	 * espresso_event_categories
+	 * returns the terms associated with an event
+	 *
+	 * @param int  $EVT_ID
+	 * @param bool $hide_uncategorized
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_event_categories($EVT_ID = 0, $hide_uncategorized = true, $echo = true)
+	{
+		if ($echo) {
+			echo wp_kses(EEH_Event_View::event_categories($EVT_ID, $hide_uncategorized), AllowedTags::getWithFormTags());
+			return '';
+		}
+		return EEH_Event_View::event_categories($EVT_ID, $hide_uncategorized);
+	}
 }
 
 
 if (! function_exists('espresso_event_tickets_available')) {
-    /**
-     * espresso_event_tickets_available
-     * returns the ticket types available for purchase for an event
-     *
-     * @param int  $EVT_ID
-     * @param bool $echo
-     * @param bool $format
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_event_tickets_available($EVT_ID = 0, $echo = true, $format = true)
-    {
-        $tickets = EEH_Event_View::event_tickets_available($EVT_ID);
-        if (is_array($tickets) && ! empty($tickets)) {
-            // if formatting then $html will be a string, else it will be an array of ticket objects
-            $html =
-                $format ? '<ul id="ee-event-tickets-ul-' . esc_attr($EVT_ID) . '" class="ee-event-tickets-ul">' : [];
-            foreach ($tickets as $ticket) {
-                if ($ticket instanceof EE_Ticket) {
-                    if ($format) {
-                        $html .= '<li id="ee-event-tickets-li-'
-                                 . esc_attr($ticket->ID())
-                                 . '" class="ee-event-tickets-li">';
-                        $html .= esc_html($ticket->name()) . ' ';
-                        $html .= EEH_Template::format_currency(
-                            $ticket->get_ticket_total_with_taxes()
-                        ); // already escaped
-                        $html .= '</li>';
-                    } else {
-                        $html[] = $ticket;
-                    }
-                }
-            }
-            if ($format) {
-                $html .= '</ul>';
-            }
-            if ($echo && $format) {
-                echo wp_kses($html, AllowedTags::getAllowedTags());
-                return '';
-            }
-            return $html;
-        }
-        return '';
-    }
+	/**
+	 * espresso_event_tickets_available
+	 * returns the ticket types available for purchase for an event
+	 *
+	 * @param int  $EVT_ID
+	 * @param bool $echo
+	 * @param bool $format
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_event_tickets_available($EVT_ID = 0, $echo = true, $format = true)
+	{
+		$tickets = EEH_Event_View::event_tickets_available($EVT_ID);
+		if (is_array($tickets) && ! empty($tickets)) {
+			// if formatting then $html will be a string, else it will be an array of ticket objects
+			$html =
+				$format ? '<ul id="ee-event-tickets-ul-' . esc_attr($EVT_ID) . '" class="ee-event-tickets-ul">' : [];
+			foreach ($tickets as $ticket) {
+				if ($ticket instanceof EE_Ticket) {
+					if ($format) {
+						$html .= '<li id="ee-event-tickets-li-'
+								 . esc_attr($ticket->ID())
+								 . '" class="ee-event-tickets-li">';
+						$html .= esc_html($ticket->name()) . ' ';
+						$html .= EEH_Template::format_currency(
+							$ticket->get_ticket_total_with_taxes()
+						); // already escaped
+						$html .= '</li>';
+					} else {
+						$html[] = $ticket;
+					}
+				}
+			}
+			if ($format) {
+				$html .= '</ul>';
+			}
+			if ($echo && $format) {
+				echo wp_kses($html, AllowedTags::getAllowedTags());
+				return '';
+			}
+			return $html;
+		}
+		return '';
+	}
 }
 
 if (! function_exists('espresso_event_date_obj')) {
-    /**
-     * espresso_event_date_obj
-     * returns the primary date object for an event
-     *
-     * @param bool $EVT_ID
-     * @return EE_Datetime|null
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_event_date_obj($EVT_ID = false)
-    {
-        return EEH_Event_View::get_primary_date_obj($EVT_ID);
-    }
+	/**
+	 * espresso_event_date_obj
+	 * returns the primary date object for an event
+	 *
+	 * @param bool $EVT_ID
+	 * @return EE_Datetime|null
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_event_date_obj($EVT_ID = false)
+	{
+		return EEH_Event_View::get_primary_date_obj($EVT_ID);
+	}
 }
 
 
 if (! function_exists('espresso_event_date')) {
-    /**
-     * espresso_event_date
-     * returns the primary date for an event
-     *
-     * @param string $date_format
-     * @param string $time_format
-     * @param bool   $EVT_ID
-     * @param bool   $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_event_date($date_format = '', $time_format = '', $EVT_ID = false, $echo = true)
-    {
-        $date_format = ! empty($date_format) ? $date_format : get_option('date_format');
-        $time_format = ! empty($time_format) ? $time_format : get_option('time_format');
-        $date_format = apply_filters('FHEE__espresso_event_date__date_format', $date_format);
-        $time_format = apply_filters('FHEE__espresso_event_date__time_format', $time_format);
-        if ($echo) {
-            echo wp_kses(EEH_Event_View::the_event_date($date_format, $time_format, $EVT_ID), AllowedTags::getWithFormTags());
-            return '';
-        }
-        return EEH_Event_View::the_event_date($date_format, $time_format, $EVT_ID);
-
-    }
+	/**
+	 * espresso_event_date
+	 * returns the primary date for an event
+	 *
+	 * @param string $date_format
+	 * @param string $time_format
+	 * @param bool   $EVT_ID
+	 * @param bool   $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_event_date($date_format = '', $time_format = '', $EVT_ID = false, $echo = true)
+	{
+		$date_format = ! empty($date_format) ? $date_format : get_option('date_format');
+		$time_format = ! empty($time_format) ? $time_format : get_option('time_format');
+		$date_format = apply_filters('FHEE__espresso_event_date__date_format', $date_format);
+		$time_format = apply_filters('FHEE__espresso_event_date__time_format', $time_format);
+		if ($echo) {
+			echo wp_kses(EEH_Event_View::the_event_date($date_format, $time_format, $EVT_ID), AllowedTags::getWithFormTags());
+			return '';
+		}
+		return EEH_Event_View::the_event_date($date_format, $time_format, $EVT_ID);
+
+	}
 }
 
 
 if (! function_exists('espresso_list_of_event_dates')) {
-    /**
-     * espresso_list_of_event_dates
-     * returns a unordered list of dates for an event
-     *
-     * @param int    $EVT_ID
-     * @param string $date_format
-     * @param string $time_format
-     * @param bool   $echo
-     * @param null   $show_expired
-     * @param bool   $format
-     * @param bool   $add_breaks
-     * @param null   $limit
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_list_of_event_dates(
-        $EVT_ID = 0,
-        $date_format = '',
-        $time_format = '',
-        $echo = true,
-        $show_expired = null,
-        $format = true,
-        $add_breaks = true,
-        $limit = null
-    ) {
-        $allowedtags = AllowedTags::getAllowedTags();
-        $date_format = ! empty($date_format) ? $date_format : get_option('date_format');
-        $time_format = ! empty($time_format) ? $time_format : get_option('time_format');
-        $date_format = apply_filters('FHEE__espresso_list_of_event_dates__date_format', $date_format);
-        $time_format = apply_filters('FHEE__espresso_list_of_event_dates__time_format', $time_format);
-        $datetimes   = EEH_Event_View::get_all_date_obj($EVT_ID, $show_expired, false, $limit);
-        if (! $format) {
-            return apply_filters('FHEE__espresso_list_of_event_dates__datetimes', $datetimes);
-        }
-        $newline = $add_breaks ? '<br />' : '';
-        if (is_array($datetimes) && ! empty($datetimes)) {
-            global $post;
-            $html =
-                '<ul id="ee-event-datetimes-ul-' . esc_attr($post->ID) . '" class="ee-event-datetimes-ul ee-clearfix">';
-            foreach ($datetimes as $datetime) {
-                if ($datetime instanceof EE_Datetime) {
-
-                    $datetime_name        = $datetime->name();
-                    $datetime_html        = ! empty($datetime_name)
-                        ? '
+	/**
+	 * espresso_list_of_event_dates
+	 * returns a unordered list of dates for an event
+	 *
+	 * @param int    $EVT_ID
+	 * @param string $date_format
+	 * @param string $time_format
+	 * @param bool   $echo
+	 * @param null   $show_expired
+	 * @param bool   $format
+	 * @param bool   $add_breaks
+	 * @param null   $limit
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_list_of_event_dates(
+		$EVT_ID = 0,
+		$date_format = '',
+		$time_format = '',
+		$echo = true,
+		$show_expired = null,
+		$format = true,
+		$add_breaks = true,
+		$limit = null
+	) {
+		$allowedtags = AllowedTags::getAllowedTags();
+		$date_format = ! empty($date_format) ? $date_format : get_option('date_format');
+		$time_format = ! empty($time_format) ? $time_format : get_option('time_format');
+		$date_format = apply_filters('FHEE__espresso_list_of_event_dates__date_format', $date_format);
+		$time_format = apply_filters('FHEE__espresso_list_of_event_dates__time_format', $time_format);
+		$datetimes   = EEH_Event_View::get_all_date_obj($EVT_ID, $show_expired, false, $limit);
+		if (! $format) {
+			return apply_filters('FHEE__espresso_list_of_event_dates__datetimes', $datetimes);
+		}
+		$newline = $add_breaks ? '<br />' : '';
+		if (is_array($datetimes) && ! empty($datetimes)) {
+			global $post;
+			$html =
+				'<ul id="ee-event-datetimes-ul-' . esc_attr($post->ID) . '" class="ee-event-datetimes-ul ee-clearfix">';
+			foreach ($datetimes as $datetime) {
+				if ($datetime instanceof EE_Datetime) {
+
+					$datetime_name        = $datetime->name();
+					$datetime_html        = ! empty($datetime_name)
+						? '
                         <strong class="ee-event-datetimes-li-date-name">
                           ' . esc_html($datetime_name) . '
                        </strong>' . $newline
-                        : '';
+						: '';
 
-                    $datetime_description = $datetime->description();
-                    $datetime_html .= ! empty($datetime_description)
-                        ? '
+					$datetime_description = $datetime->description();
+					$datetime_html .= ! empty($datetime_description)
+						? '
                         <span class="ee-event-datetimes-li-date-desc">
                             ' . wp_kses($datetime_description, $allowedtags) . '
                         </span>' . $newline
-                        : '';
+						: '';
 
-                    $datetime_html .= '
+					$datetime_html .= '
                         <span class="dashicons dashicons-calendar"></span>
                         <span class="ee-event-datetimes-li-daterange">' . $datetime->date_range($date_format) . '</span>
                         <br/>
@@ -576,482 +576,482 @@ 
                         <span class="ee-event-datetimes-li-timerange">' . $datetime->time_range($time_format) . '</span>
                         ';
 
-                    $datetime_html = apply_filters(
-                        'FHEE__espresso_list_of_event_dates__datetime_html',
-                        $datetime_html,
-                        $datetime
-                    );
+					$datetime_html = apply_filters(
+						'FHEE__espresso_list_of_event_dates__datetime_html',
+						$datetime_html,
+						$datetime
+					);
 
-                    $DTD_ID        = esc_attr($datetime->ID());
-                    $active_status = esc_attr(' ee-event-datetimes-li-' . $datetime->get_active_status());
+					$DTD_ID        = esc_attr($datetime->ID());
+					$active_status = esc_attr(' ee-event-datetimes-li-' . $datetime->get_active_status());
 
-                    $html .= '
+					$html .= '
                     <li id="ee-event-datetimes-li-' . $DTD_ID . '" class="ee-event-datetimes-li' . $active_status . '">
                         ' . $datetime_html . '
                     </li>';
-                }
-            }
-            $html .= '</ul>';
-        } else {
-            $html =
-                '
+				}
+			}
+			$html .= '</ul>';
+		} else {
+			$html =
+				'
             <p>
                 <span class="dashicons dashicons-marker pink-text"></span>
                 ' . esc_html__(
-                    'There are no upcoming dates for this event.',
-                    'event_espresso'
-                ) . '
+					'There are no upcoming dates for this event.',
+					'event_espresso'
+				) . '
             </p>
             <br/>';
-        }
-        if ($echo) {
-            echo wp_kses($html, AllowedTags::getWithFormTags());
-            return '';
-        }
-        return $html;
-    }
+		}
+		if ($echo) {
+			echo wp_kses($html, AllowedTags::getWithFormTags());
+			return '';
+		}
+		return $html;
+	}
 }
 
 
 if (! function_exists('espresso_event_end_date')) {
-    /**
-     * espresso_event_end_date
-     * returns the last date for an event
-     *
-     * @param string $date_format
-     * @param string $time_format
-     * @param bool   $EVT_ID
-     * @param bool   $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_event_end_date($date_format = '', $time_format = '', $EVT_ID = false, $echo = true)
-    {
-        $date_format = ! empty($date_format) ? $date_format : get_option('date_format');
-        $time_format = ! empty($time_format) ? $time_format : get_option('time_format');
-        $date_format = apply_filters('FHEE__espresso_event_end_date__date_format', $date_format);
-        $time_format = apply_filters('FHEE__espresso_event_end_date__time_format', $time_format);
-        if ($echo) {
-            echo wp_kses(EEH_Event_View::the_event_end_date($date_format, $time_format, $EVT_ID), AllowedTags::getWithFormTags());
-            return '';
-        }
-        return EEH_Event_View::the_event_end_date($date_format, $time_format, $EVT_ID);
-    }
+	/**
+	 * espresso_event_end_date
+	 * returns the last date for an event
+	 *
+	 * @param string $date_format
+	 * @param string $time_format
+	 * @param bool   $EVT_ID
+	 * @param bool   $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_event_end_date($date_format = '', $time_format = '', $EVT_ID = false, $echo = true)
+	{
+		$date_format = ! empty($date_format) ? $date_format : get_option('date_format');
+		$time_format = ! empty($time_format) ? $time_format : get_option('time_format');
+		$date_format = apply_filters('FHEE__espresso_event_end_date__date_format', $date_format);
+		$time_format = apply_filters('FHEE__espresso_event_end_date__time_format', $time_format);
+		if ($echo) {
+			echo wp_kses(EEH_Event_View::the_event_end_date($date_format, $time_format, $EVT_ID), AllowedTags::getWithFormTags());
+			return '';
+		}
+		return EEH_Event_View::the_event_end_date($date_format, $time_format, $EVT_ID);
+	}
 }
 
 if (! function_exists('espresso_event_date_range')) {
-    /**
-     * espresso_event_date_range
-     * returns the first and last chronologically ordered dates for an event (if different)
-     *
-     * @param string $date_format
-     * @param string $time_format
-     * @param string $single_date_format
-     * @param string $single_time_format
-     * @param bool   $EVT_ID
-     * @param bool   $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_event_date_range(
-        $date_format = '',
-        $time_format = '',
-        $single_date_format = '',
-        $single_time_format = '',
-        $EVT_ID = false,
-        $echo = true
-    ) {
-        // set and filter date and time formats when a range is returned
-        $date_format = ! empty($date_format) ? $date_format : get_option('date_format');
-        $date_format = apply_filters('FHEE__espresso_event_date_range__date_format', $date_format);
-        // get the start and end date with NO time portion
-        $the_event_date     = EEH_Event_View::the_earliest_event_date($date_format, '', $EVT_ID);
-        $the_event_end_date = EEH_Event_View::the_latest_event_date($date_format, '', $EVT_ID);
-        // now we can determine if date range spans more than one day
-        if ($the_event_date != $the_event_end_date) {
-            $time_format = ! empty($time_format) ? $time_format : get_option('time_format');
-            $time_format = apply_filters('FHEE__espresso_event_date_range__time_format', $time_format);
-            $html        = sprintf(
-            /* translators: 1: first event date, 2: last event date */
-                esc_html__('%1$s - %2$s', 'event_espresso'),
-                EEH_Event_View::the_earliest_event_date($date_format, $time_format, $EVT_ID),
-                EEH_Event_View::the_latest_event_date($date_format, $time_format, $EVT_ID)
-            );
-        } else {
-            // set and filter date and time formats when only a single datetime is returned
-            $single_date_format = ! empty($single_date_format) ? $single_date_format : get_option('date_format');
-            $single_time_format = ! empty($single_time_format) ? $single_time_format : get_option('time_format');
-            $single_date_format =
-                apply_filters('FHEE__espresso_event_date_range__single_date_format', $single_date_format);
-            $single_time_format =
-                apply_filters('FHEE__espresso_event_date_range__single_time_format', $single_time_format);
-            $html               =
-                EEH_Event_View::the_earliest_event_date($single_date_format, $single_time_format, $EVT_ID);
-        }
-        if ($echo) {
-            echo wp_kses($html, AllowedTags::getAllowedTags());
-            return '';
-        }
-        return $html;
-    }
+	/**
+	 * espresso_event_date_range
+	 * returns the first and last chronologically ordered dates for an event (if different)
+	 *
+	 * @param string $date_format
+	 * @param string $time_format
+	 * @param string $single_date_format
+	 * @param string $single_time_format
+	 * @param bool   $EVT_ID
+	 * @param bool   $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_event_date_range(
+		$date_format = '',
+		$time_format = '',
+		$single_date_format = '',
+		$single_time_format = '',
+		$EVT_ID = false,
+		$echo = true
+	) {
+		// set and filter date and time formats when a range is returned
+		$date_format = ! empty($date_format) ? $date_format : get_option('date_format');
+		$date_format = apply_filters('FHEE__espresso_event_date_range__date_format', $date_format);
+		// get the start and end date with NO time portion
+		$the_event_date     = EEH_Event_View::the_earliest_event_date($date_format, '', $EVT_ID);
+		$the_event_end_date = EEH_Event_View::the_latest_event_date($date_format, '', $EVT_ID);
+		// now we can determine if date range spans more than one day
+		if ($the_event_date != $the_event_end_date) {
+			$time_format = ! empty($time_format) ? $time_format : get_option('time_format');
+			$time_format = apply_filters('FHEE__espresso_event_date_range__time_format', $time_format);
+			$html        = sprintf(
+			/* translators: 1: first event date, 2: last event date */
+				esc_html__('%1$s - %2$s', 'event_espresso'),
+				EEH_Event_View::the_earliest_event_date($date_format, $time_format, $EVT_ID),
+				EEH_Event_View::the_latest_event_date($date_format, $time_format, $EVT_ID)
+			);
+		} else {
+			// set and filter date and time formats when only a single datetime is returned
+			$single_date_format = ! empty($single_date_format) ? $single_date_format : get_option('date_format');
+			$single_time_format = ! empty($single_time_format) ? $single_time_format : get_option('time_format');
+			$single_date_format =
+				apply_filters('FHEE__espresso_event_date_range__single_date_format', $single_date_format);
+			$single_time_format =
+				apply_filters('FHEE__espresso_event_date_range__single_time_format', $single_time_format);
+			$html               =
+				EEH_Event_View::the_earliest_event_date($single_date_format, $single_time_format, $EVT_ID);
+		}
+		if ($echo) {
+			echo wp_kses($html, AllowedTags::getAllowedTags());
+			return '';
+		}
+		return $html;
+	}
 }
 
 if (! function_exists('espresso_next_upcoming_datetime_obj')) {
-    /**
-     * espresso_next_upcoming_datetime_obj
-     * returns the next upcoming datetime object for an event
-     *
-     * @param int $EVT_ID
-     * @return EE_Datetime|null
-     * @throws EE_Error
-     */
-    function espresso_next_upcoming_datetime_obj($EVT_ID = 0)
-    {
-        return EEH_Event_View::get_next_upcoming_date_obj($EVT_ID);
-    }
+	/**
+	 * espresso_next_upcoming_datetime_obj
+	 * returns the next upcoming datetime object for an event
+	 *
+	 * @param int $EVT_ID
+	 * @return EE_Datetime|null
+	 * @throws EE_Error
+	 */
+	function espresso_next_upcoming_datetime_obj($EVT_ID = 0)
+	{
+		return EEH_Event_View::get_next_upcoming_date_obj($EVT_ID);
+	}
 }
 
 if (! function_exists('espresso_next_upcoming_datetime')) {
-    /**
-     * espresso_next_upcoming_datetime
-     * returns the start date and time for the next upcoming event.
-     *
-     * @param string $date_format
-     * @param string $time_format
-     * @param int    $EVT_ID
-     * @param bool   $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_next_upcoming_datetime($date_format = '', $time_format = '', $EVT_ID = 0, $echo = true)
-    {
-
-        $date_format = ! empty($date_format) ? $date_format : get_option('date_format');
-        $date_format = apply_filters('FHEE__espresso_next_upcoming_datetime__date_format', $date_format);
-
-        $time_format = ! empty($time_format) ? $time_format : get_option('time_format');
-        $time_format = apply_filters('FHEE__espresso_next_upcoming_datetime__time_format', $time_format);
-
-        $datetime_format = trim($date_format . ' ' . $time_format);
-
-        $datetime = espresso_next_upcoming_datetime_obj($EVT_ID);
-
-        if (! $datetime instanceof EE_Datetime) {
-            return '';
-        }
-        if ($echo) {
-            echo esc_html($datetime->get_i18n_datetime('DTT_EVT_start', $datetime_format));
-            return '';
-        }
-        return $datetime->get_i18n_datetime('DTT_EVT_start', $datetime_format);
-    }
+	/**
+	 * espresso_next_upcoming_datetime
+	 * returns the start date and time for the next upcoming event.
+	 *
+	 * @param string $date_format
+	 * @param string $time_format
+	 * @param int    $EVT_ID
+	 * @param bool   $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_next_upcoming_datetime($date_format = '', $time_format = '', $EVT_ID = 0, $echo = true)
+	{
+
+		$date_format = ! empty($date_format) ? $date_format : get_option('date_format');
+		$date_format = apply_filters('FHEE__espresso_next_upcoming_datetime__date_format', $date_format);
+
+		$time_format = ! empty($time_format) ? $time_format : get_option('time_format');
+		$time_format = apply_filters('FHEE__espresso_next_upcoming_datetime__time_format', $time_format);
+
+		$datetime_format = trim($date_format . ' ' . $time_format);
+
+		$datetime = espresso_next_upcoming_datetime_obj($EVT_ID);
+
+		if (! $datetime instanceof EE_Datetime) {
+			return '';
+		}
+		if ($echo) {
+			echo esc_html($datetime->get_i18n_datetime('DTT_EVT_start', $datetime_format));
+			return '';
+		}
+		return $datetime->get_i18n_datetime('DTT_EVT_start', $datetime_format);
+	}
 }
 
 if (! function_exists('espresso_event_date_as_calendar_page')) {
-    /**
-     * espresso_event_date_as_calendar_page
-     * returns the primary date for an event, stylized to appear as the page of a calendar
-     *
-     * @param bool $EVT_ID
-     * @return void
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_event_date_as_calendar_page($EVT_ID = false)
-    {
-        EEH_Event_View::event_date_as_calendar_page($EVT_ID);
-    }
+	/**
+	 * espresso_event_date_as_calendar_page
+	 * returns the primary date for an event, stylized to appear as the page of a calendar
+	 *
+	 * @param bool $EVT_ID
+	 * @return void
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_event_date_as_calendar_page($EVT_ID = false)
+	{
+		EEH_Event_View::event_date_as_calendar_page($EVT_ID);
+	}
 }
 
 
 if (! function_exists('espresso_event_link_url')) {
-    /**
-     * espresso_event_link_url
-     *
-     * @param int  $EVT_ID
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_event_link_url($EVT_ID = 0, $echo = true)
-    {
-        if ($echo) {
-            echo wp_kses(EEH_Event_View::event_link_url($EVT_ID), AllowedTags::getWithFormTags());
-            return '';
-        }
-        return EEH_Event_View::event_link_url($EVT_ID);
-    }
+	/**
+	 * espresso_event_link_url
+	 *
+	 * @param int  $EVT_ID
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_event_link_url($EVT_ID = 0, $echo = true)
+	{
+		if ($echo) {
+			echo wp_kses(EEH_Event_View::event_link_url($EVT_ID), AllowedTags::getWithFormTags());
+			return '';
+		}
+		return EEH_Event_View::event_link_url($EVT_ID);
+	}
 }
 
 
 if (! function_exists('espresso_event_has_content_or_excerpt')) {
-    /**
-     *    espresso_event_has_content_or_excerpt
-     *
-     * @access    public
-     * @param bool $EVT_ID
-     * @return    boolean
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_event_has_content_or_excerpt($EVT_ID = false)
-    {
-        return EEH_Event_View::event_has_content_or_excerpt($EVT_ID);
-    }
+	/**
+	 *    espresso_event_has_content_or_excerpt
+	 *
+	 * @access    public
+	 * @param bool $EVT_ID
+	 * @return    boolean
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_event_has_content_or_excerpt($EVT_ID = false)
+	{
+		return EEH_Event_View::event_has_content_or_excerpt($EVT_ID);
+	}
 }
 
 
 if (! function_exists('espresso_event_content_or_excerpt')) {
-    /**
-     * espresso_event_content_or_excerpt
-     *
-     * @param int  $num_words
-     * @param null $more
-     * @param bool $echo
-     * @return string
-     */
-    function espresso_event_content_or_excerpt($num_words = 55, $more = null, $echo = true)
-    {
-        if ($echo) {
-            echo wp_kses(EEH_Event_View::event_content_or_excerpt($num_words, $more), AllowedTags::getWithFormTags());
-            return '';
-        }
-        return EEH_Event_View::event_content_or_excerpt($num_words, $more);
-    }
+	/**
+	 * espresso_event_content_or_excerpt
+	 *
+	 * @param int  $num_words
+	 * @param null $more
+	 * @param bool $echo
+	 * @return string
+	 */
+	function espresso_event_content_or_excerpt($num_words = 55, $more = null, $echo = true)
+	{
+		if ($echo) {
+			echo wp_kses(EEH_Event_View::event_content_or_excerpt($num_words, $more), AllowedTags::getWithFormTags());
+			return '';
+		}
+		return EEH_Event_View::event_content_or_excerpt($num_words, $more);
+	}
 }
 
 
 if (! function_exists('espresso_event_phone')) {
-    /**
-     * espresso_event_phone
-     *
-     * @param int  $EVT_ID
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_event_phone($EVT_ID = 0, $echo = true)
-    {
-        if ($echo) {
-            echo wp_kses(EEH_Event_View::event_phone($EVT_ID), AllowedTags::getWithFormTags());
-            return '';
-        }
-        return EEH_Event_View::event_phone($EVT_ID);
-    }
+	/**
+	 * espresso_event_phone
+	 *
+	 * @param int  $EVT_ID
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_event_phone($EVT_ID = 0, $echo = true)
+	{
+		if ($echo) {
+			echo wp_kses(EEH_Event_View::event_phone($EVT_ID), AllowedTags::getWithFormTags());
+			return '';
+		}
+		return EEH_Event_View::event_phone($EVT_ID);
+	}
 }
 
 
 if (! function_exists('espresso_edit_event_link')) {
-    /**
-     * espresso_edit_event_link
-     * returns a link to edit an event
-     *
-     * @param int  $EVT_ID
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_edit_event_link($EVT_ID = 0, $echo = true)
-    {
-        if ($echo) {
-            echo wp_kses(EEH_Event_View::edit_event_link($EVT_ID), AllowedTags::getWithFormTags());
-            return '';
-        }
-        return EEH_Event_View::edit_event_link($EVT_ID);
-    }
+	/**
+	 * espresso_edit_event_link
+	 * returns a link to edit an event
+	 *
+	 * @param int  $EVT_ID
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_edit_event_link($EVT_ID = 0, $echo = true)
+	{
+		if ($echo) {
+			echo wp_kses(EEH_Event_View::edit_event_link($EVT_ID), AllowedTags::getWithFormTags());
+			return '';
+		}
+		return EEH_Event_View::edit_event_link($EVT_ID);
+	}
 }
 
 
 if (! function_exists('espresso_organization_name')) {
-    /**
-     * espresso_organization_name
-     *
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     */
-    function espresso_organization_name($echo = true)
-    {
-        if ($echo) {
-            echo esc_html(EE_Registry::instance()->CFG->organization->get_pretty('name'));
-            return '';
-        }
-        return EE_Registry::instance()->CFG->organization->get_pretty('name');
-    }
+	/**
+	 * espresso_organization_name
+	 *
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 */
+	function espresso_organization_name($echo = true)
+	{
+		if ($echo) {
+			echo esc_html(EE_Registry::instance()->CFG->organization->get_pretty('name'));
+			return '';
+		}
+		return EE_Registry::instance()->CFG->organization->get_pretty('name');
+	}
 }
 
 if (! function_exists('espresso_organization_address')) {
-    /**
-     * espresso_organization_address
-     *
-     * @param string $type
-     * @return string
-     */
-    function espresso_organization_address($type = 'inline')
-    {
-        if (EE_Registry::instance()->CFG->organization instanceof EE_Organization_Config) {
-            $address = new EventEspresso\core\domain\entities\GenericAddress(
-                EE_Registry::instance()->CFG->organization->address_1,
-                EE_Registry::instance()->CFG->organization->address_2,
-                EE_Registry::instance()->CFG->organization->city,
-                EE_Registry::instance()->CFG->organization->STA_ID,
-                EE_Registry::instance()->CFG->organization->zip,
-                EE_Registry::instance()->CFG->organization->CNT_ISO
-            );
-            return EEH_Address::format($address, $type);
-        }
-        return '';
-    }
+	/**
+	 * espresso_organization_address
+	 *
+	 * @param string $type
+	 * @return string
+	 */
+	function espresso_organization_address($type = 'inline')
+	{
+		if (EE_Registry::instance()->CFG->organization instanceof EE_Organization_Config) {
+			$address = new EventEspresso\core\domain\entities\GenericAddress(
+				EE_Registry::instance()->CFG->organization->address_1,
+				EE_Registry::instance()->CFG->organization->address_2,
+				EE_Registry::instance()->CFG->organization->city,
+				EE_Registry::instance()->CFG->organization->STA_ID,
+				EE_Registry::instance()->CFG->organization->zip,
+				EE_Registry::instance()->CFG->organization->CNT_ISO
+			);
+			return EEH_Address::format($address, $type);
+		}
+		return '';
+	}
 }
 
 if (! function_exists('espresso_organization_email')) {
-    /**
-     * espresso_organization_email
-     *
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     */
-    function espresso_organization_email($echo = true)
-    {
-        if ($echo) {
-            echo esc_html(EE_Registry::instance()->CFG->organization->get_pretty('email'));
-            return '';
-        }
-        return EE_Registry::instance()->CFG->organization->get_pretty('email');
-    }
+	/**
+	 * espresso_organization_email
+	 *
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 */
+	function espresso_organization_email($echo = true)
+	{
+		if ($echo) {
+			echo esc_html(EE_Registry::instance()->CFG->organization->get_pretty('email'));
+			return '';
+		}
+		return EE_Registry::instance()->CFG->organization->get_pretty('email');
+	}
 }
 
 if (! function_exists('espresso_organization_logo_url')) {
-    /**
-     * espresso_organization_logo_url
-     *
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     */
-    function espresso_organization_logo_url($echo = true)
-    {
-        if ($echo) {
-            echo esc_html(EE_Registry::instance()->CFG->organization->get_pretty('logo_url'));
-            return '';
-        }
-        return EE_Registry::instance()->CFG->organization->get_pretty('logo_url');
-    }
+	/**
+	 * espresso_organization_logo_url
+	 *
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 */
+	function espresso_organization_logo_url($echo = true)
+	{
+		if ($echo) {
+			echo esc_html(EE_Registry::instance()->CFG->organization->get_pretty('logo_url'));
+			return '';
+		}
+		return EE_Registry::instance()->CFG->organization->get_pretty('logo_url');
+	}
 }
 
 if (! function_exists('espresso_organization_facebook')) {
-    /**
-     * espresso_organization_facebook
-     *
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     */
-    function espresso_organization_facebook($echo = true)
-    {
-        if ($echo) {
-            echo esc_html(EE_Registry::instance()->CFG->organization->get_pretty('facebook'));
-            return '';
-        }
-        return EE_Registry::instance()->CFG->organization->get_pretty('facebook');
-    }
+	/**
+	 * espresso_organization_facebook
+	 *
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 */
+	function espresso_organization_facebook($echo = true)
+	{
+		if ($echo) {
+			echo esc_html(EE_Registry::instance()->CFG->organization->get_pretty('facebook'));
+			return '';
+		}
+		return EE_Registry::instance()->CFG->organization->get_pretty('facebook');
+	}
 }
 
 if (! function_exists('espresso_organization_twitter')) {
-    /**
-     * espresso_organization_twitter
-     *
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     */
-    function espresso_organization_twitter($echo = true)
-    {
-        if ($echo) {
-            echo esc_html(EE_Registry::instance()->CFG->organization->get_pretty('twitter'));
-            return '';
-        }
-        return EE_Registry::instance()->CFG->organization->get_pretty('twitter');
-    }
+	/**
+	 * espresso_organization_twitter
+	 *
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 */
+	function espresso_organization_twitter($echo = true)
+	{
+		if ($echo) {
+			echo esc_html(EE_Registry::instance()->CFG->organization->get_pretty('twitter'));
+			return '';
+		}
+		return EE_Registry::instance()->CFG->organization->get_pretty('twitter');
+	}
 }
 
 if (! function_exists('espresso_organization_linkedin')) {
-    /**
-     * espresso_organization_linkedin
-     *
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     */
-    function espresso_organization_linkedin($echo = true)
-    {
-        if ($echo) {
-            echo esc_html(EE_Registry::instance()->CFG->organization->get_pretty('linkedin'));
-            return '';
-        }
-        return EE_Registry::instance()->CFG->organization->get_pretty('linkedin');
-    }
+	/**
+	 * espresso_organization_linkedin
+	 *
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 */
+	function espresso_organization_linkedin($echo = true)
+	{
+		if ($echo) {
+			echo esc_html(EE_Registry::instance()->CFG->organization->get_pretty('linkedin'));
+			return '';
+		}
+		return EE_Registry::instance()->CFG->organization->get_pretty('linkedin');
+	}
 }
 
 if (! function_exists('espresso_organization_pinterest')) {
-    /**
-     * espresso_organization_pinterest
-     *
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     */
-    function espresso_organization_pinterest($echo = true)
-    {
-        if ($echo) {
-            echo esc_html(EE_Registry::instance()->CFG->organization->get_pretty('pinterest'));
-            return '';
-        }
-        return EE_Registry::instance()->CFG->organization->get_pretty('pinterest');
-    }
+	/**
+	 * espresso_organization_pinterest
+	 *
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 */
+	function espresso_organization_pinterest($echo = true)
+	{
+		if ($echo) {
+			echo esc_html(EE_Registry::instance()->CFG->organization->get_pretty('pinterest'));
+			return '';
+		}
+		return EE_Registry::instance()->CFG->organization->get_pretty('pinterest');
+	}
 }
 
 if (! function_exists('espresso_organization_google')) {
-    /**
-     * espresso_organization_google
-     *
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     */
-    function espresso_organization_google($echo = true)
-    {
-        if ($echo) {
-            echo esc_html(EE_Registry::instance()->CFG->organization->get_pretty('google'));
-            return '';
-        }
-        return EE_Registry::instance()->CFG->organization->get_pretty('google');
-    }
+	/**
+	 * espresso_organization_google
+	 *
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 */
+	function espresso_organization_google($echo = true)
+	{
+		if ($echo) {
+			echo esc_html(EE_Registry::instance()->CFG->organization->get_pretty('google'));
+			return '';
+		}
+		return EE_Registry::instance()->CFG->organization->get_pretty('google');
+	}
 }
 
 if (! function_exists('espresso_organization_instagram')) {
-    /**
-     * espresso_organization_instagram
-     *
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     */
-    function espresso_organization_instagram($echo = true)
-    {
-        if ($echo) {
-            echo esc_html(EE_Registry::instance()->CFG->organization->get_pretty('instagram'));
-            return '';
-        }
-        return EE_Registry::instance()->CFG->organization->get_pretty('instagram');
-    }
+	/**
+	 * espresso_organization_instagram
+	 *
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 */
+	function espresso_organization_instagram($echo = true)
+	{
+		if ($echo) {
+			echo esc_html(EE_Registry::instance()->CFG->organization->get_pretty('instagram'));
+			return '';
+		}
+		return EE_Registry::instance()->CFG->organization->get_pretty('instagram');
+	}
 }
 
 
@@ -1059,345 +1059,345 @@ 
 
 
 if (! function_exists('espresso_event_venues')) {
-    /**
-     * espresso_event_venues
-     *
-     * @return array  all venues related to an event
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_event_venues()
-    {
-        return EEH_Venue_View::get_event_venues();
-    }
+	/**
+	 * espresso_event_venues
+	 *
+	 * @return array  all venues related to an event
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_event_venues()
+	{
+		return EEH_Venue_View::get_event_venues();
+	}
 }
 
 
 if (! function_exists('espresso_venue_id')) {
-    /**
-     *    espresso_venue_name
-     *
-     * @access    public
-     * @param int $EVT_ID
-     * @return    string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_venue_id($EVT_ID = 0)
-    {
-        $venue = EEH_Venue_View::get_venue($EVT_ID);
-        return $venue instanceof EE_Venue ? $venue->ID() : 0;
-    }
+	/**
+	 *    espresso_venue_name
+	 *
+	 * @access    public
+	 * @param int $EVT_ID
+	 * @return    string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_venue_id($EVT_ID = 0)
+	{
+		$venue = EEH_Venue_View::get_venue($EVT_ID);
+		return $venue instanceof EE_Venue ? $venue->ID() : 0;
+	}
 }
 
 
 if (! function_exists('espresso_is_venue_private')) {
-    /**
-     * Return whether a venue is private or not.
-     *
-     * @param int $VNU_ID optional, the venue id to check.
-     *
-     * @return bool | null
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @see EEH_Venue_View::get_venue() for more info on expected return results.
-     */
-    function espresso_is_venue_private($VNU_ID = 0)
-    {
-        return EEH_Venue_View::is_venue_private($VNU_ID);
-    }
+	/**
+	 * Return whether a venue is private or not.
+	 *
+	 * @param int $VNU_ID optional, the venue id to check.
+	 *
+	 * @return bool | null
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @see EEH_Venue_View::get_venue() for more info on expected return results.
+	 */
+	function espresso_is_venue_private($VNU_ID = 0)
+	{
+		return EEH_Venue_View::is_venue_private($VNU_ID);
+	}
 }
 
 
 if (! function_exists('espresso_venue_is_password_protected')) {
-    /**
-     * returns true or false if a venue is password protected or not
-     *
-     * @param int $VNU_ID optional, the venue id to check.
-     * @return bool
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_venue_is_password_protected($VNU_ID = 0)
-    {
-        EE_Registry::instance()->load_helper('Venue_View');
-        return EEH_Venue_View::is_venue_password_protected($VNU_ID);
-    }
+	/**
+	 * returns true or false if a venue is password protected or not
+	 *
+	 * @param int $VNU_ID optional, the venue id to check.
+	 * @return bool
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_venue_is_password_protected($VNU_ID = 0)
+	{
+		EE_Registry::instance()->load_helper('Venue_View');
+		return EEH_Venue_View::is_venue_password_protected($VNU_ID);
+	}
 }
 
 
 if (! function_exists('espresso_password_protected_venue_form')) {
-    /**
-     * Returns a password form if venue is password protected.
-     *
-     * @param int $VNU_ID optional, the venue id to check.
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_password_protected_venue_form($VNU_ID = 0)
-    {
-        EE_Registry::instance()->load_helper('Venue_View');
-        return EEH_Venue_View::password_protected_venue_form($VNU_ID);
-    }
+	/**
+	 * Returns a password form if venue is password protected.
+	 *
+	 * @param int $VNU_ID optional, the venue id to check.
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_password_protected_venue_form($VNU_ID = 0)
+	{
+		EE_Registry::instance()->load_helper('Venue_View');
+		return EEH_Venue_View::password_protected_venue_form($VNU_ID);
+	}
 }
 
 
 if (! function_exists('espresso_venue_name')) {
-    /**
-     *    espresso_venue_name
-     *
-     * @access    public
-     * @param int    $VNU_ID
-     * @param string $link_to - options( details, website, none ) whether to turn Venue name into a clickable link to the Venue's details page or website
-     * @param bool   $echo
-     * @return    string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_venue_name($VNU_ID = 0, $link_to = 'details', $echo = true)
-    {
-        if ($echo) {
-            echo wp_kses(EEH_Venue_View::venue_name($link_to, $VNU_ID), AllowedTags::getWithFormTags());
-            return '';
-        }
-        return EEH_Venue_View::venue_name($link_to, $VNU_ID);
-    }
+	/**
+	 *    espresso_venue_name
+	 *
+	 * @access    public
+	 * @param int    $VNU_ID
+	 * @param string $link_to - options( details, website, none ) whether to turn Venue name into a clickable link to the Venue's details page or website
+	 * @param bool   $echo
+	 * @return    string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_venue_name($VNU_ID = 0, $link_to = 'details', $echo = true)
+	{
+		if ($echo) {
+			echo wp_kses(EEH_Venue_View::venue_name($link_to, $VNU_ID), AllowedTags::getWithFormTags());
+			return '';
+		}
+		return EEH_Venue_View::venue_name($link_to, $VNU_ID);
+	}
 }
 
 
 if (! function_exists('espresso_venue_link')) {
-    /**
-     *    espresso_venue_link
-     *
-     * @access    public
-     * @param int    $VNU_ID
-     * @param string $text
-     * @return    string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_venue_link($VNU_ID = 0, $text = '')
-    {
-        return EEH_Venue_View::venue_details_link($VNU_ID, $text);
-    }
+	/**
+	 *    espresso_venue_link
+	 *
+	 * @access    public
+	 * @param int    $VNU_ID
+	 * @param string $text
+	 * @return    string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_venue_link($VNU_ID = 0, $text = '')
+	{
+		return EEH_Venue_View::venue_details_link($VNU_ID, $text);
+	}
 }
 
 
 if (! function_exists('espresso_venue_description')) {
-    /**
-     *    espresso_venue_description
-     *
-     * @access    public
-     * @param bool $VNU_ID
-     * @param bool $echo
-     * @return    string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_venue_description($VNU_ID = false, $echo = true)
-    {
-        if ($echo) {
-            echo wp_kses(EEH_Venue_View::venue_description($VNU_ID), AllowedTags::getWithFormTags());
-            return '';
-        }
-        return EEH_Venue_View::venue_description($VNU_ID);
-    }
+	/**
+	 *    espresso_venue_description
+	 *
+	 * @access    public
+	 * @param bool $VNU_ID
+	 * @param bool $echo
+	 * @return    string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_venue_description($VNU_ID = false, $echo = true)
+	{
+		if ($echo) {
+			echo wp_kses(EEH_Venue_View::venue_description($VNU_ID), AllowedTags::getWithFormTags());
+			return '';
+		}
+		return EEH_Venue_View::venue_description($VNU_ID);
+	}
 }
 
 
 if (! function_exists('espresso_venue_excerpt')) {
-    /**
-     *    espresso_venue_excerpt
-     *
-     * @access    public
-     * @param int  $VNU_ID
-     * @param bool $echo
-     * @return    string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_venue_excerpt($VNU_ID = 0, $echo = true)
-    {
-        if ($echo) {
-            echo wp_kses(EEH_Venue_View::venue_excerpt($VNU_ID), AllowedTags::getWithFormTags());
-            return '';
-        }
-        return EEH_Venue_View::venue_excerpt($VNU_ID);
-    }
+	/**
+	 *    espresso_venue_excerpt
+	 *
+	 * @access    public
+	 * @param int  $VNU_ID
+	 * @param bool $echo
+	 * @return    string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_venue_excerpt($VNU_ID = 0, $echo = true)
+	{
+		if ($echo) {
+			echo wp_kses(EEH_Venue_View::venue_excerpt($VNU_ID), AllowedTags::getWithFormTags());
+			return '';
+		}
+		return EEH_Venue_View::venue_excerpt($VNU_ID);
+	}
 }
 
 
 if (! function_exists('espresso_venue_categories')) {
-    /**
-     * espresso_venue_categories
-     * returns the terms associated with a venue
-     *
-     * @param int  $VNU_ID
-     * @param bool $hide_uncategorized
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_venue_categories($VNU_ID = 0, $hide_uncategorized = true, $echo = true)
-    {
-        if ($echo) {
-            echo wp_kses(EEH_Venue_View::venue_categories($VNU_ID, $hide_uncategorized), AllowedTags::getWithFormTags());
-            return '';
-        }
-        return EEH_Venue_View::venue_categories($VNU_ID, $hide_uncategorized);
-    }
+	/**
+	 * espresso_venue_categories
+	 * returns the terms associated with a venue
+	 *
+	 * @param int  $VNU_ID
+	 * @param bool $hide_uncategorized
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_venue_categories($VNU_ID = 0, $hide_uncategorized = true, $echo = true)
+	{
+		if ($echo) {
+			echo wp_kses(EEH_Venue_View::venue_categories($VNU_ID, $hide_uncategorized), AllowedTags::getWithFormTags());
+			return '';
+		}
+		return EEH_Venue_View::venue_categories($VNU_ID, $hide_uncategorized);
+	}
 }
 
 
 if (! function_exists('espresso_venue_address')) {
-    /**
-     * espresso_venue_address
-     * returns a formatted block of html  for displaying a venue's address
-     *
-     * @param string $type 'inline' or 'multiline'
-     * @param int    $VNU_ID
-     * @param bool   $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_venue_address($type = 'multiline', $VNU_ID = 0, $echo = true)
-    {
-        if ($echo) {
-            echo wp_kses(EEH_Venue_View::venue_address($type, $VNU_ID), AllowedTags::getWithFormTags());
-            return '';
-        }
-        return EEH_Venue_View::venue_address($type, $VNU_ID);
-    }
+	/**
+	 * espresso_venue_address
+	 * returns a formatted block of html  for displaying a venue's address
+	 *
+	 * @param string $type 'inline' or 'multiline'
+	 * @param int    $VNU_ID
+	 * @param bool   $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_venue_address($type = 'multiline', $VNU_ID = 0, $echo = true)
+	{
+		if ($echo) {
+			echo wp_kses(EEH_Venue_View::venue_address($type, $VNU_ID), AllowedTags::getWithFormTags());
+			return '';
+		}
+		return EEH_Venue_View::venue_address($type, $VNU_ID);
+	}
 }
 
 
 if (! function_exists('espresso_venue_raw_address')) {
-    /**
-     * espresso_venue_address
-     * returns an UN-formatted string containing a venue's address
-     *
-     * @param string $type 'inline' or 'multiline'
-     * @param int    $VNU_ID
-     * @param bool   $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_venue_raw_address($type = 'multiline', $VNU_ID = 0, $echo = true)
-    {
-        if ($echo) {
-            echo wp_kses(EEH_Venue_View::venue_address($type, $VNU_ID, false, false), AllowedTags::getWithFormTags());
-            return '';
-        }
-        return EEH_Venue_View::venue_address($type, $VNU_ID, false, false);
-    }
+	/**
+	 * espresso_venue_address
+	 * returns an UN-formatted string containing a venue's address
+	 *
+	 * @param string $type 'inline' or 'multiline'
+	 * @param int    $VNU_ID
+	 * @param bool   $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_venue_raw_address($type = 'multiline', $VNU_ID = 0, $echo = true)
+	{
+		if ($echo) {
+			echo wp_kses(EEH_Venue_View::venue_address($type, $VNU_ID, false, false), AllowedTags::getWithFormTags());
+			return '';
+		}
+		return EEH_Venue_View::venue_address($type, $VNU_ID, false, false);
+	}
 }
 
 
 if (! function_exists('espresso_venue_has_address')) {
-    /**
-     * espresso_venue_has_address
-     * returns TRUE or FALSE if a Venue has address information
-     *
-     * @param int $VNU_ID
-     * @return bool
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_venue_has_address($VNU_ID = 0)
-    {
-        return EEH_Venue_View::venue_has_address($VNU_ID);
-    }
+	/**
+	 * espresso_venue_has_address
+	 * returns TRUE or FALSE if a Venue has address information
+	 *
+	 * @param int $VNU_ID
+	 * @return bool
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_venue_has_address($VNU_ID = 0)
+	{
+		return EEH_Venue_View::venue_has_address($VNU_ID);
+	}
 }
 
 
 if (! function_exists('espresso_venue_gmap')) {
-    /**
-     * espresso_venue_gmap
-     * returns a google map for the venue address
-     *
-     * @param int   $VNU_ID
-     * @param bool  $map_ID
-     * @param array $gmap
-     * @param bool  $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_venue_gmap($VNU_ID = 0, $map_ID = false, $gmap = [], $echo = true)
-    {
-        if ($echo) {
-            echo EEH_Venue_View::venue_gmap($VNU_ID, $map_ID, $gmap); // already escaped
-            return '';
-        }
-        return EEH_Venue_View::venue_gmap($VNU_ID, $map_ID, $gmap);
-    }
+	/**
+	 * espresso_venue_gmap
+	 * returns a google map for the venue address
+	 *
+	 * @param int   $VNU_ID
+	 * @param bool  $map_ID
+	 * @param array $gmap
+	 * @param bool  $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_venue_gmap($VNU_ID = 0, $map_ID = false, $gmap = [], $echo = true)
+	{
+		if ($echo) {
+			echo EEH_Venue_View::venue_gmap($VNU_ID, $map_ID, $gmap); // already escaped
+			return '';
+		}
+		return EEH_Venue_View::venue_gmap($VNU_ID, $map_ID, $gmap);
+	}
 }
 
 
 if (! function_exists('espresso_venue_phone')) {
-    /**
-     * espresso_venue_phone
-     *
-     * @param int  $VNU_ID
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_venue_phone($VNU_ID = 0, $echo = true)
-    {
-        if ($echo) {
-            echo wp_kses(EEH_Venue_View::venue_phone($VNU_ID), AllowedTags::getWithFormTags());
-            return '';
-        }
-        return EEH_Venue_View::venue_phone($VNU_ID);
-    }
+	/**
+	 * espresso_venue_phone
+	 *
+	 * @param int  $VNU_ID
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_venue_phone($VNU_ID = 0, $echo = true)
+	{
+		if ($echo) {
+			echo wp_kses(EEH_Venue_View::venue_phone($VNU_ID), AllowedTags::getWithFormTags());
+			return '';
+		}
+		return EEH_Venue_View::venue_phone($VNU_ID);
+	}
 }
 
 
 if (! function_exists('espresso_venue_website')) {
-    /**
-     * espresso_venue_website
-     *
-     * @param int  $VNU_ID
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_venue_website($VNU_ID = 0, $echo = true)
-    {
-        if ($echo) {
-            echo wp_kses(EEH_Venue_View::venue_website_link($VNU_ID), AllowedTags::getWithFormTags());
-            return '';
-        }
-        return EEH_Venue_View::venue_website_link($VNU_ID);
-    }
+	/**
+	 * espresso_venue_website
+	 *
+	 * @param int  $VNU_ID
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_venue_website($VNU_ID = 0, $echo = true)
+	{
+		if ($echo) {
+			echo wp_kses(EEH_Venue_View::venue_website_link($VNU_ID), AllowedTags::getWithFormTags());
+			return '';
+		}
+		return EEH_Venue_View::venue_website_link($VNU_ID);
+	}
 }
 
 
 if (! function_exists('espresso_edit_venue_link')) {
-    /**
-     * espresso_edit_venue_link
-     *
-     * @param int  $VNU_ID
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_edit_venue_link($VNU_ID = 0, $echo = true)
-    {
-        if ($echo) {
-            echo wp_kses(EEH_Venue_View::edit_venue_link($VNU_ID), AllowedTags::getWithFormTags());
-            return '';
-        }
-        return EEH_Venue_View::edit_venue_link($VNU_ID);
-    }
+	/**
+	 * espresso_edit_venue_link
+	 *
+	 * @param int  $VNU_ID
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_edit_venue_link($VNU_ID = 0, $echo = true)
+	{
+		if ($echo) {
+			echo wp_kses(EEH_Venue_View::edit_venue_link($VNU_ID), AllowedTags::getWithFormTags());
+			return '';
+		}
+		return EEH_Venue_View::edit_venue_link($VNU_ID);
+	}
 }
 
 

caffeinated/brewing_regular.php

Indentation +352 added lines, -352 removed lines

@@ -24,358 +24,358 @@
 class EE_Brewing_Regular extends EE_BASE implements InterminableInterface
 {
 
-    /**
-     * @var EE_Dependency_Map
-     */
-    protected $dependency_map;
-
-    /**
-     * @var LoaderInterface
-     */
-    protected $loader;
-
-    /**
-     * @var TableAnalysis
-     */
-    protected $_table_analysis;
-
-
-    /**
-     * EE_Brewing_Regular constructor.
-     *
-     * @param EE_Dependency_Map $dependency_map
-     * @param LoaderInterface   $loader
-     * @param TableAnalysis     $table_analysis
-     */
-    public function __construct(
-        EE_Dependency_Map $dependency_map,
-        LoaderInterface $loader,
-        TableAnalysis $table_analysis
-    ) {
-        $this->dependency_map = $dependency_map;
-        $this->loader         = $loader;
-        $this->_table_analysis = $table_analysis;
-        if (defined('EE_CAFF_PATH')) {
-            // defined some new constants related to caffeinated folder
-            define('EE_CAF_URL', EE_PLUGIN_DIR_URL . 'caffeinated/');
-            define('EE_CAF_CORE', EE_CAFF_PATH . 'core/');
-            define('EE_CAF_LIBRARIES', EE_CAF_CORE . 'libraries/');
-            define('EE_CAF_PAYMENT_METHODS', EE_CAFF_PATH . 'payment_methods/');
-        }
-    }
-
-
-    /**
-     * @throws EE_Error
-     */
-    public function caffeinated()
-    {
-        $this->setInitializationHooks();
-        $this->setApiRegistrationHooks();
-        $this->setSwitchHooks();
-        $this->setDefaultFilterHooks();
-        // caffeinated constructed
-        do_action('AHEE__EE_Brewing_Regular__construct__complete');
-    }
-
-
-    public function initializePUE()
-    {
-        $this->dependency_map->registerDependencies(
-            PueLicensingManager::class,
-            [
-                'EE_Dependency_Map'                          => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\loaders\Loader' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        /** @var PueLicensingManager $pue_manager */
-        $pue_manager = $this->loader->getShared(PueLicensingManager::class);
-        $pue_manager->registerDependencies();
-        $pue_manager->registerHooks();
-    }
-
-
-    /**
-     * Various hooks used for extending features via registration of modules or extensions.
-     *
-     * @throws EE_Error
-     */
-    private function setApiRegistrationHooks()
-    {
-        add_filter(
-            'FHEE__EE_Config__register_modules__modules_to_register',
-            [$this, 'caffeinated_modules_to_register']
-        );
-        add_filter('FHEE__EE_Registry__load_helper__helper_paths', [$this, 'caf_helper_paths'], 10);
-        add_filter(
-            'AHEE__EE_System__load_core_configuration__complete',
-            function () {
-                EE_Register_Payment_Method::register(
-                    'caffeinated_payment_methods',
-                    [
-                        'payment_method_paths' => glob(EE_CAF_PAYMENT_METHODS . '*', GLOB_ONLYDIR),
-                    ]
-                );
-            }
-        );
-    }
-
-
-    /**
-     * Various hooks used for modifying initialization or activation processes.
-     */
-    private function setInitializationHooks()
-    {
-        // activation
-        add_action('AHEE__EEH_Activation__initialize_db_content', [$this, 'initialize_caf_db_content']);
-        // load caff init
-        add_action('AHEE__EE_System__set_hooks_for_core', [$this, 'caffeinated_init']);
-        // load caff scripts
-        add_action('wp_enqueue_scripts', [$this, 'enqueue_caffeinated_scripts'], 10);
-    }
-
-
-    /**
-     * Various hooks used for switch (on/off) type filters.
-     */
-    private function setSwitchHooks()
-    {
-        // remove the "powered by" credit link from receipts and invoices
-        add_filter('FHEE_EE_Html_messenger__add_powered_by_credit_link_to_receipt_and_invoice', '__return_false');
-        // seeing how this is caf, which isn't put on WordPress.org, we can have affiliate links without a disclaimer
-        add_filter('FHEE__ee_show_affiliate_links', '__return_false');
-    }
-
-
-    /**
-     * Various filters for affecting default configuration values in the caffeinated
-     * context.
-     */
-    private function setDefaultFilterHooks()
-    {
-        add_filter(
-            'FHEE__EE_Admin_Config__show_reg_footer__default',
-            '__return_true'
-        );
-    }
-
-
-    /**
-     * callback for the FHEE__EE_Registry__load_helper__helper_paths filter to add the caffeinated paths
-     *
-     * @param array $paths original helper paths array
-     * @return array             new array of paths
-     */
-    public function caf_helper_paths(array $paths): array
-    {
-        $paths[] = EE_CAF_CORE . 'helpers/';
-        return $paths;
-    }
-
-
-    /**
-     * Upon brand-new activation, if this is a new activation of CAF, we want to add
-     * some global prices that will show off EE4's capabilities. However, if they're upgrading
-     * from 3.1, or simply EE4.x decaf, we assume they don't want us to suddenly introduce these extra prices.
-     * This action should only be called when EE 4.x.0.P is initially activated.
-     * Right now the only CAF content are these global prices. If there's more in the future, then
-     * we should probably create a caf file to contain it all instead just a function like this.
-     * Right now, we ASSUME the only price types in the system are default ones
-     *
-     * @global wpdb $wpdb
-     */
-    public function initialize_caf_db_content()
-    {
-        global $wpdb;
-        // use same method of getting creator id as the version introducing the change
-        $default_creator_id = apply_filters('FHEE__EE_DMS_Core_4_5_0__get_default_creator_id', get_current_user_id());
-        $price_type_table   = $wpdb->prefix . "esp_price_type";
-        $price_table        = $wpdb->prefix . "esp_price";
-        if ($this->_get_table_analysis()->tableExists($price_type_table)) {
-            $SQL                  =
-                'SELECT COUNT(PRT_ID) FROM ' . $price_type_table . ' WHERE PBT_ID=4';// include trashed price types
-            $tax_price_type_count = $wpdb->get_var($SQL);
-            if ($tax_price_type_count <= 1) {
-                $wpdb->insert(
-                    $price_type_table,
-                    [
-                        'PRT_name'       => esc_html__("Regional Tax", "event_espresso"),
-                        'PBT_ID'         => 4,
-                        'PRT_is_percent' => true,
-                        'PRT_order'      => 60,
-                        'PRT_deleted'    => false,
-                        'PRT_wp_user'    => $default_creator_id,
-                    ],
-                    [
-                        '%s',// PRT_name
-                        '%d',// PBT_id
-                        '%d',// PRT_is_percent
-                        '%d',// PRT_order
-                        '%d',// PRT_deleted
-                        '%d', // PRT_wp_user
-                    ]
-                );
-                // federal tax
-                $result = $wpdb->insert(
-                    $price_type_table,
-                    [
-                        'PRT_name'       => esc_html__("Federal Tax", "event_espresso"),
-                        'PBT_ID'         => 4,
-                        'PRT_is_percent' => true,
-                        'PRT_order'      => 70,
-                        'PRT_deleted'    => false,
-                        'PRT_wp_user'    => $default_creator_id,
-                    ],
-                    [
-                        '%s',// PRT_name
-                        '%d',// PBT_id
-                        '%d',// PRT_is_percent
-                        '%d',// PRT_order
-                        '%d',// PRT_deleted
-                        '%d' // PRT_wp_user
-                    ]
-                );
-                if ($result) {
-                    $wpdb->insert(
-                        $price_table,
-                        [
-                            'PRT_ID'         => $wpdb->insert_id,
-                            'PRC_amount'     => 15.00,
-                            'PRC_name'       => esc_html__("Sales Tax", "event_espresso"),
-                            'PRC_desc'       => '',
-                            'PRC_is_default' => true,
-                            'PRC_overrides'  => null,
-                            'PRC_deleted'    => false,
-                            'PRC_order'      => 50,
-                            'PRC_parent'     => null,
-                            'PRC_wp_user'    => $default_creator_id,
-                        ],
-                        [
-                            '%d',// PRT_id
-                            '%f',// PRC_amount
-                            '%s',// PRC_name
-                            '%s',// PRC_desc
-                            '%d',// PRC_is_default
-                            '%d',// PRC_overrides
-                            '%d',// PRC_deleted
-                            '%d',// PRC_order
-                            '%d',// PRC_parent
-                            '%d' // PRC_wp_user
-                        ]
-                    );
-                }
-            }
-        }
-    }
-
-
-    /**
-     *    caffeinated_modules_to_register
-     *
-     * @access public
-     * @param array $modules_to_register
-     * @return array
-     */
-    public function caffeinated_modules_to_register(array $modules_to_register = []): array
-    {
-        if (is_readable(EE_CAFF_PATH . 'modules')) {
-            $caffeinated_modules_to_register = glob(EE_CAFF_PATH . 'modules/*', GLOB_ONLYDIR);
-            if (is_array($caffeinated_modules_to_register) && ! empty($caffeinated_modules_to_register)) {
-                $modules_to_register = array_merge($modules_to_register, $caffeinated_modules_to_register);
-            }
-        }
-        return $modules_to_register;
-    }
-
-
-    /**
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function caffeinated_init()
-    {
-        // Custom Post Type hooks
-        add_filter(
-            'FHEE__EventEspresso_core_domain_entities_custom_post_types_TaxonomyDefinitions__getTaxonomies',
-            [$this, 'filter_taxonomies']
-        );
-        add_filter(
-            'FHEE__EventEspresso_core_domain_entities_custom_post_types_CustomPostTypeDefinitions__getCustomPostTypes',
-            [$this, 'filter_cpts']
-        );
-        add_filter(
-            'FHEE__EE_Admin__get_extra_nav_menu_pages_items',
-            [$this, 'nav_metabox_items']
-        );
-        EE_Registry::instance()->load_file(
-            EE_CAFF_PATH,
-            'EE_Caf_Messages',
-            'class',
-            [],
-            false
-        );
-        // caffeinated_init__complete hook
-        do_action('AHEE__EE_Brewing_Regular__caffeinated_init__complete');
-    }
-
-
-    public function enqueue_caffeinated_scripts()
-    {
-        // sound of crickets...
-    }
-
-
-    /**
-     * callbacks below here
-     *
-     * @param array $taxonomy_array
-     * @return array
-     */
-    public function filter_taxonomies(array $taxonomy_array): array
-    {
-        $taxonomy_array['espresso_venue_categories']['args']['show_in_nav_menus'] = true;
-        return $taxonomy_array;
-    }
-
-
-    /**
-     * @param array $cpt_array
-     * @return array
-     */
-    public function filter_cpts(array $cpt_array): array
-    {
-        $cpt_array['espresso_venues']['args']['show_in_nav_menus'] = true;
-        return $cpt_array;
-    }
-
-
-    /**
-     * @param array $menu_items
-     * @return array
-     */
-    public function nav_metabox_items(array $menu_items): array
-    {
-        $menu_items[] = [
-            'title'       => esc_html__('Venue List', 'event_espresso'),
-            'url'         => get_post_type_archive_link('espresso_venues'),
-            'description' => esc_html__('Archive page for all venues.', 'event_espresso'),
-        ];
-        return $menu_items;
-    }
-
-
-    /**
-     * Gets the injected table analyzer, or throws an exception
-     *
-     * @return TableAnalysis
-     */
-    protected function _get_table_analysis(): TableAnalysis
-    {
-        return $this->_table_analysis;
-    }
+	/**
+	 * @var EE_Dependency_Map
+	 */
+	protected $dependency_map;
+
+	/**
+	 * @var LoaderInterface
+	 */
+	protected $loader;
+
+	/**
+	 * @var TableAnalysis
+	 */
+	protected $_table_analysis;
+
+
+	/**
+	 * EE_Brewing_Regular constructor.
+	 *
+	 * @param EE_Dependency_Map $dependency_map
+	 * @param LoaderInterface   $loader
+	 * @param TableAnalysis     $table_analysis
+	 */
+	public function __construct(
+		EE_Dependency_Map $dependency_map,
+		LoaderInterface $loader,
+		TableAnalysis $table_analysis
+	) {
+		$this->dependency_map = $dependency_map;
+		$this->loader         = $loader;
+		$this->_table_analysis = $table_analysis;
+		if (defined('EE_CAFF_PATH')) {
+			// defined some new constants related to caffeinated folder
+			define('EE_CAF_URL', EE_PLUGIN_DIR_URL . 'caffeinated/');
+			define('EE_CAF_CORE', EE_CAFF_PATH . 'core/');
+			define('EE_CAF_LIBRARIES', EE_CAF_CORE . 'libraries/');
+			define('EE_CAF_PAYMENT_METHODS', EE_CAFF_PATH . 'payment_methods/');
+		}
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 */
+	public function caffeinated()
+	{
+		$this->setInitializationHooks();
+		$this->setApiRegistrationHooks();
+		$this->setSwitchHooks();
+		$this->setDefaultFilterHooks();
+		// caffeinated constructed
+		do_action('AHEE__EE_Brewing_Regular__construct__complete');
+	}
+
+
+	public function initializePUE()
+	{
+		$this->dependency_map->registerDependencies(
+			PueLicensingManager::class,
+			[
+				'EE_Dependency_Map'                          => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\loaders\Loader' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		/** @var PueLicensingManager $pue_manager */
+		$pue_manager = $this->loader->getShared(PueLicensingManager::class);
+		$pue_manager->registerDependencies();
+		$pue_manager->registerHooks();
+	}
+
+
+	/**
+	 * Various hooks used for extending features via registration of modules or extensions.
+	 *
+	 * @throws EE_Error
+	 */
+	private function setApiRegistrationHooks()
+	{
+		add_filter(
+			'FHEE__EE_Config__register_modules__modules_to_register',
+			[$this, 'caffeinated_modules_to_register']
+		);
+		add_filter('FHEE__EE_Registry__load_helper__helper_paths', [$this, 'caf_helper_paths'], 10);
+		add_filter(
+			'AHEE__EE_System__load_core_configuration__complete',
+			function () {
+				EE_Register_Payment_Method::register(
+					'caffeinated_payment_methods',
+					[
+						'payment_method_paths' => glob(EE_CAF_PAYMENT_METHODS . '*', GLOB_ONLYDIR),
+					]
+				);
+			}
+		);
+	}
+
+
+	/**
+	 * Various hooks used for modifying initialization or activation processes.
+	 */
+	private function setInitializationHooks()
+	{
+		// activation
+		add_action('AHEE__EEH_Activation__initialize_db_content', [$this, 'initialize_caf_db_content']);
+		// load caff init
+		add_action('AHEE__EE_System__set_hooks_for_core', [$this, 'caffeinated_init']);
+		// load caff scripts
+		add_action('wp_enqueue_scripts', [$this, 'enqueue_caffeinated_scripts'], 10);
+	}
+
+
+	/**
+	 * Various hooks used for switch (on/off) type filters.
+	 */
+	private function setSwitchHooks()
+	{
+		// remove the "powered by" credit link from receipts and invoices
+		add_filter('FHEE_EE_Html_messenger__add_powered_by_credit_link_to_receipt_and_invoice', '__return_false');
+		// seeing how this is caf, which isn't put on WordPress.org, we can have affiliate links without a disclaimer
+		add_filter('FHEE__ee_show_affiliate_links', '__return_false');
+	}
+
+
+	/**
+	 * Various filters for affecting default configuration values in the caffeinated
+	 * context.
+	 */
+	private function setDefaultFilterHooks()
+	{
+		add_filter(
+			'FHEE__EE_Admin_Config__show_reg_footer__default',
+			'__return_true'
+		);
+	}
+
+
+	/**
+	 * callback for the FHEE__EE_Registry__load_helper__helper_paths filter to add the caffeinated paths
+	 *
+	 * @param array $paths original helper paths array
+	 * @return array             new array of paths
+	 */
+	public function caf_helper_paths(array $paths): array
+	{
+		$paths[] = EE_CAF_CORE . 'helpers/';
+		return $paths;
+	}
+
+
+	/**
+	 * Upon brand-new activation, if this is a new activation of CAF, we want to add
+	 * some global prices that will show off EE4's capabilities. However, if they're upgrading
+	 * from 3.1, or simply EE4.x decaf, we assume they don't want us to suddenly introduce these extra prices.
+	 * This action should only be called when EE 4.x.0.P is initially activated.
+	 * Right now the only CAF content are these global prices. If there's more in the future, then
+	 * we should probably create a caf file to contain it all instead just a function like this.
+	 * Right now, we ASSUME the only price types in the system are default ones
+	 *
+	 * @global wpdb $wpdb
+	 */
+	public function initialize_caf_db_content()
+	{
+		global $wpdb;
+		// use same method of getting creator id as the version introducing the change
+		$default_creator_id = apply_filters('FHEE__EE_DMS_Core_4_5_0__get_default_creator_id', get_current_user_id());
+		$price_type_table   = $wpdb->prefix . "esp_price_type";
+		$price_table        = $wpdb->prefix . "esp_price";
+		if ($this->_get_table_analysis()->tableExists($price_type_table)) {
+			$SQL                  =
+				'SELECT COUNT(PRT_ID) FROM ' . $price_type_table . ' WHERE PBT_ID=4';// include trashed price types
+			$tax_price_type_count = $wpdb->get_var($SQL);
+			if ($tax_price_type_count <= 1) {
+				$wpdb->insert(
+					$price_type_table,
+					[
+						'PRT_name'       => esc_html__("Regional Tax", "event_espresso"),
+						'PBT_ID'         => 4,
+						'PRT_is_percent' => true,
+						'PRT_order'      => 60,
+						'PRT_deleted'    => false,
+						'PRT_wp_user'    => $default_creator_id,
+					],
+					[
+						'%s',// PRT_name
+						'%d',// PBT_id
+						'%d',// PRT_is_percent
+						'%d',// PRT_order
+						'%d',// PRT_deleted
+						'%d', // PRT_wp_user
+					]
+				);
+				// federal tax
+				$result = $wpdb->insert(
+					$price_type_table,
+					[
+						'PRT_name'       => esc_html__("Federal Tax", "event_espresso"),
+						'PBT_ID'         => 4,
+						'PRT_is_percent' => true,
+						'PRT_order'      => 70,
+						'PRT_deleted'    => false,
+						'PRT_wp_user'    => $default_creator_id,
+					],
+					[
+						'%s',// PRT_name
+						'%d',// PBT_id
+						'%d',// PRT_is_percent
+						'%d',// PRT_order
+						'%d',// PRT_deleted
+						'%d' // PRT_wp_user
+					]
+				);
+				if ($result) {
+					$wpdb->insert(
+						$price_table,
+						[
+							'PRT_ID'         => $wpdb->insert_id,
+							'PRC_amount'     => 15.00,
+							'PRC_name'       => esc_html__("Sales Tax", "event_espresso"),
+							'PRC_desc'       => '',
+							'PRC_is_default' => true,
+							'PRC_overrides'  => null,
+							'PRC_deleted'    => false,
+							'PRC_order'      => 50,
+							'PRC_parent'     => null,
+							'PRC_wp_user'    => $default_creator_id,
+						],
+						[
+							'%d',// PRT_id
+							'%f',// PRC_amount
+							'%s',// PRC_name
+							'%s',// PRC_desc
+							'%d',// PRC_is_default
+							'%d',// PRC_overrides
+							'%d',// PRC_deleted
+							'%d',// PRC_order
+							'%d',// PRC_parent
+							'%d' // PRC_wp_user
+						]
+					);
+				}
+			}
+		}
+	}
+
+
+	/**
+	 *    caffeinated_modules_to_register
+	 *
+	 * @access public
+	 * @param array $modules_to_register
+	 * @return array
+	 */
+	public function caffeinated_modules_to_register(array $modules_to_register = []): array
+	{
+		if (is_readable(EE_CAFF_PATH . 'modules')) {
+			$caffeinated_modules_to_register = glob(EE_CAFF_PATH . 'modules/*', GLOB_ONLYDIR);
+			if (is_array($caffeinated_modules_to_register) && ! empty($caffeinated_modules_to_register)) {
+				$modules_to_register = array_merge($modules_to_register, $caffeinated_modules_to_register);
+			}
+		}
+		return $modules_to_register;
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function caffeinated_init()
+	{
+		// Custom Post Type hooks
+		add_filter(
+			'FHEE__EventEspresso_core_domain_entities_custom_post_types_TaxonomyDefinitions__getTaxonomies',
+			[$this, 'filter_taxonomies']
+		);
+		add_filter(
+			'FHEE__EventEspresso_core_domain_entities_custom_post_types_CustomPostTypeDefinitions__getCustomPostTypes',
+			[$this, 'filter_cpts']
+		);
+		add_filter(
+			'FHEE__EE_Admin__get_extra_nav_menu_pages_items',
+			[$this, 'nav_metabox_items']
+		);
+		EE_Registry::instance()->load_file(
+			EE_CAFF_PATH,
+			'EE_Caf_Messages',
+			'class',
+			[],
+			false
+		);
+		// caffeinated_init__complete hook
+		do_action('AHEE__EE_Brewing_Regular__caffeinated_init__complete');
+	}
+
+
+	public function enqueue_caffeinated_scripts()
+	{
+		// sound of crickets...
+	}
+
+
+	/**
+	 * callbacks below here
+	 *
+	 * @param array $taxonomy_array
+	 * @return array
+	 */
+	public function filter_taxonomies(array $taxonomy_array): array
+	{
+		$taxonomy_array['espresso_venue_categories']['args']['show_in_nav_menus'] = true;
+		return $taxonomy_array;
+	}
+
+
+	/**
+	 * @param array $cpt_array
+	 * @return array
+	 */
+	public function filter_cpts(array $cpt_array): array
+	{
+		$cpt_array['espresso_venues']['args']['show_in_nav_menus'] = true;
+		return $cpt_array;
+	}
+
+
+	/**
+	 * @param array $menu_items
+	 * @return array
+	 */
+	public function nav_metabox_items(array $menu_items): array
+	{
+		$menu_items[] = [
+			'title'       => esc_html__('Venue List', 'event_espresso'),
+			'url'         => get_post_type_archive_link('espresso_venues'),
+			'description' => esc_html__('Archive page for all venues.', 'event_espresso'),
+		];
+		return $menu_items;
+	}
+
+
+	/**
+	 * Gets the injected table analyzer, or throws an exception
+	 *
+	 * @return TableAnalysis
+	 */
+	protected function _get_table_analysis(): TableAnalysis
+	{
+		return $this->_table_analysis;
+	}
 }
 
 

Spacing +31 added lines, -31 removed lines

@@ -57,10 +57,10 @@ 
         $this->_table_analysis = $table_analysis;
         if (defined('EE_CAFF_PATH')) {
             // defined some new constants related to caffeinated folder
-            define('EE_CAF_URL', EE_PLUGIN_DIR_URL . 'caffeinated/');
-            define('EE_CAF_CORE', EE_CAFF_PATH . 'core/');
-            define('EE_CAF_LIBRARIES', EE_CAF_CORE . 'libraries/');
-            define('EE_CAF_PAYMENT_METHODS', EE_CAFF_PATH . 'payment_methods/');
+            define('EE_CAF_URL', EE_PLUGIN_DIR_URL.'caffeinated/');
+            define('EE_CAF_CORE', EE_CAFF_PATH.'core/');
+            define('EE_CAF_LIBRARIES', EE_CAF_CORE.'libraries/');
+            define('EE_CAF_PAYMENT_METHODS', EE_CAFF_PATH.'payment_methods/');
         }
     }
 
@@ -109,11 +109,11 @@ 
         add_filter('FHEE__EE_Registry__load_helper__helper_paths', [$this, 'caf_helper_paths'], 10);
         add_filter(
             'AHEE__EE_System__load_core_configuration__complete',
-            function () {
+            function() {
                 EE_Register_Payment_Method::register(
                     'caffeinated_payment_methods',
                     [
-                        'payment_method_paths' => glob(EE_CAF_PAYMENT_METHODS . '*', GLOB_ONLYDIR),
+                        'payment_method_paths' => glob(EE_CAF_PAYMENT_METHODS.'*', GLOB_ONLYDIR),
                     ]
                 );
             }
@@ -168,7 +168,7 @@ 
      */
     public function caf_helper_paths(array $paths): array
     {
-        $paths[] = EE_CAF_CORE . 'helpers/';
+        $paths[] = EE_CAF_CORE.'helpers/';
         return $paths;
     }
 
@@ -189,11 +189,11 @@ 
         global $wpdb;
         // use same method of getting creator id as the version introducing the change
         $default_creator_id = apply_filters('FHEE__EE_DMS_Core_4_5_0__get_default_creator_id', get_current_user_id());
-        $price_type_table   = $wpdb->prefix . "esp_price_type";
-        $price_table        = $wpdb->prefix . "esp_price";
+        $price_type_table   = $wpdb->prefix."esp_price_type";
+        $price_table        = $wpdb->prefix."esp_price";
         if ($this->_get_table_analysis()->tableExists($price_type_table)) {
             $SQL                  =
-                'SELECT COUNT(PRT_ID) FROM ' . $price_type_table . ' WHERE PBT_ID=4';// include trashed price types
+                'SELECT COUNT(PRT_ID) FROM '.$price_type_table.' WHERE PBT_ID=4'; // include trashed price types
             $tax_price_type_count = $wpdb->get_var($SQL);
             if ($tax_price_type_count <= 1) {
                 $wpdb->insert(
@@ -207,11 +207,11 @@ 
                         'PRT_wp_user'    => $default_creator_id,
                     ],
                     [
-                        '%s',// PRT_name
-                        '%d',// PBT_id
-                        '%d',// PRT_is_percent
-                        '%d',// PRT_order
-                        '%d',// PRT_deleted
+                        '%s', // PRT_name
+                        '%d', // PBT_id
+                        '%d', // PRT_is_percent
+                        '%d', // PRT_order
+                        '%d', // PRT_deleted
                         '%d', // PRT_wp_user
                     ]
                 );
@@ -227,11 +227,11 @@ 
                         'PRT_wp_user'    => $default_creator_id,
                     ],
                     [
-                        '%s',// PRT_name
-                        '%d',// PBT_id
-                        '%d',// PRT_is_percent
-                        '%d',// PRT_order
-                        '%d',// PRT_deleted
+                        '%s', // PRT_name
+                        '%d', // PBT_id
+                        '%d', // PRT_is_percent
+                        '%d', // PRT_order
+                        '%d', // PRT_deleted
                         '%d' // PRT_wp_user
                     ]
                 );
@@ -251,15 +251,15 @@ 
                             'PRC_wp_user'    => $default_creator_id,
                         ],
                         [
-                            '%d',// PRT_id
-                            '%f',// PRC_amount
-                            '%s',// PRC_name
-                            '%s',// PRC_desc
-                            '%d',// PRC_is_default
-                            '%d',// PRC_overrides
-                            '%d',// PRC_deleted
-                            '%d',// PRC_order
-                            '%d',// PRC_parent
+                            '%d', // PRT_id
+                            '%f', // PRC_amount
+                            '%s', // PRC_name
+                            '%s', // PRC_desc
+                            '%d', // PRC_is_default
+                            '%d', // PRC_overrides
+                            '%d', // PRC_deleted
+                            '%d', // PRC_order
+                            '%d', // PRC_parent
                             '%d' // PRC_wp_user
                         ]
                     );
@@ -278,8 +278,8 @@ 
      */
     public function caffeinated_modules_to_register(array $modules_to_register = []): array
     {
-        if (is_readable(EE_CAFF_PATH . 'modules')) {
-            $caffeinated_modules_to_register = glob(EE_CAFF_PATH . 'modules/*', GLOB_ONLYDIR);
+        if (is_readable(EE_CAFF_PATH.'modules')) {
+            $caffeinated_modules_to_register = glob(EE_CAFF_PATH.'modules/*', GLOB_ONLYDIR);
             if (is_array($caffeinated_modules_to_register) && ! empty($caffeinated_modules_to_register)) {
                 $modules_to_register = array_merge($modules_to_register, $caffeinated_modules_to_register);
             }

caffeinated/modules/events_archive_caff/templates/admin-event-list-settings.template.php

Indentation +119 added lines, -119 removed lines

@@ -5,18 +5,18 @@ 
 add_filter('FHEE__EEH_Form_Fields__label_html', '__return_empty_string');
 
 $values = EEH_Form_Fields::prep_answer_options(
-    array(
-        array('id' => 1, 'text' => esc_html__('Yes', 'event_espresso')),
-        array('id' => 0, 'text' => esc_html__('No', 'event_espresso')),
-    )
+	array(
+		array('id' => 1, 'text' => esc_html__('Yes', 'event_espresso')),
+		array('id' => 0, 'text' => esc_html__('No', 'event_espresso')),
+	)
 );
 
 $description = EEH_Form_Fields::prep_answer_options(
-    array(
-        array('id' => 0, 'text' => esc_html__('none', 'event_espresso')),
-        array('id' => 1, 'text' => esc_html__('excerpt (short desc)', 'event_espresso')),
-        array('id' => 2, 'text' => esc_html__('full description', 'event_espresso')),
-    )
+	array(
+		array('id' => 0, 'text' => esc_html__('none', 'event_espresso')),
+		array('id' => 1, 'text' => esc_html__('excerpt (short desc)', 'event_espresso')),
+		array('id' => 2, 'text' => esc_html__('full description', 'event_espresso')),
+	)
 );
 
 ?>
@@ -54,30 +54,30 @@ 
         </th>
         <td>
             <p><?php echo site_url() . '/ '
-                          . EEH_Form_Fields::text(
-                              'not_used',
-                              EE_Registry::instance()->CFG->core->event_cpt_slug,
-                              'event_cpt_slug',
-                              'event_cpt_slug',
-                              'regular'
-                          ); ?></p>
+						  . EEH_Form_Fields::text(
+							  'not_used',
+							  EE_Registry::instance()->CFG->core->event_cpt_slug,
+							  'event_cpt_slug',
+							  'event_cpt_slug',
+							  'regular'
+						  ); ?></p>
             <p class="description"><?php
-                esc_html_e(
-                    'This allows you to configure what slug is used for the url of all event pages.',
-                    'event_espresso'
-                ); ?></p>
+				esc_html_e(
+					'This allows you to configure what slug is used for the url of all event pages.',
+					'event_espresso'
+				); ?></p>
             <?php if (has_filter('FHEE__EE_Register_CPTs__register_CPT__rewrite')) : ?>
                 <p class="important-notice">
                     <?php
-                    sprintf(
-                        esc_html__(
-                            'Usage of the %1$s FHEE__EE_Register_CPTs__register_CPT__rewrite %2$s filter has been detected.  Please be aware that while this filter is being used, this setting has no affect.',
-                            'event_espresso'
-                        ),
-                        '<code>',
-                        '</code>'
-                    );
-                    ?>
+					sprintf(
+						esc_html__(
+							'Usage of the %1$s FHEE__EE_Register_CPTs__register_CPT__rewrite %2$s filter has been detected.  Please be aware that while this filter is being used, this setting has no affect.',
+							'event_espresso'
+						),
+						'<code>',
+						'</code>'
+					);
+					?>
                 </p>
             <?php endif; ?>
         </td>
@@ -91,20 +91,20 @@ 
         </th>
         <td>
             <?php echo wp_kses(
-                EEH_Form_Fields::select(
-                    'display_status_banner',
-                    $display_status_banner,
-                    $values,
-                    'EED_Events_Archive_display_status_banner',
-                    'EED_Events_Archive_display_status_banner'
-                ),
-                AllowedTags::getWithFormTags()
-            ); ?>
+				EEH_Form_Fields::select(
+					'display_status_banner',
+					$display_status_banner,
+					$values,
+					'EED_Events_Archive_display_status_banner',
+					'EED_Events_Archive_display_status_banner'
+				),
+				AllowedTags::getWithFormTags()
+			); ?>
             <p class="description"><?php
-                esc_html_e(
-                    'Selecting "Yes" will inject an Event Status banner with the title whenever Events are displaying on the events archive page.',
-                    'event_espresso'
-                ); ?></p>
+				esc_html_e(
+					'Selecting "Yes" will inject an Event Status banner with the title whenever Events are displaying on the events archive page.',
+					'event_espresso'
+				); ?></p>
         </td>
     </tr>
 
@@ -117,15 +117,15 @@ 
         </th>
         <td>
             <?php echo wp_kses(
-                EEH_Form_Fields::select(
-                    'description',
-                    $display_description,
-                    $description,
-                    'EED_Events_Archive_display_description',
-                    'EED_Events_Archive_display_description'
-                ),
-                AllowedTags::getWithFormTags()
-            ); ?>
+				EEH_Form_Fields::select(
+					'description',
+					$display_description,
+					$description,
+					'EED_Events_Archive_display_description',
+					'EED_Events_Archive_display_description'
+				),
+				AllowedTags::getWithFormTags()
+			); ?>
         </td>
     </tr>
 
@@ -138,15 +138,15 @@ 
         </th>
         <td>
             <?php echo wp_kses(
-                EEH_Form_Fields::select(
-                    'ticket_selector',
-                    $display_ticket_selector,
-                    $values,
-                    'EED_Events_Archive_display_ticket_selector',
-                    'EED_Events_Archive_display_ticket_selector'
-                ),
-                AllowedTags::getWithFormTags()
-            ); ?>
+				EEH_Form_Fields::select(
+					'ticket_selector',
+					$display_ticket_selector,
+					$values,
+					'EED_Events_Archive_display_ticket_selector',
+					'EED_Events_Archive_display_ticket_selector'
+				),
+				AllowedTags::getWithFormTags()
+			); ?>
         </td>
     </tr>
 
@@ -159,15 +159,15 @@ 
         </th>
         <td>
             <?php echo wp_kses(
-                EEH_Form_Fields::select(
-                    'venue_details',
-                    $display_datetimes,
-                    $values,
-                    'EED_Events_Archive_display_datetimes',
-                    'EED_Events_Archive_display_datetimes'
-                ),
-                AllowedTags::getWithFormTags()
-            ); ?>
+				EEH_Form_Fields::select(
+					'venue_details',
+					$display_datetimes,
+					$values,
+					'EED_Events_Archive_display_datetimes',
+					'EED_Events_Archive_display_datetimes'
+				),
+				AllowedTags::getWithFormTags()
+			); ?>
         </td>
     </tr>
 
@@ -180,15 +180,15 @@ 
         </th>
         <td>
             <?php echo wp_kses(
-                EEH_Form_Fields::select(
-                    'display_venue',
-                    $display_venue,
-                    $values,
-                    'EED_Events_Archive_display_venue',
-                    'EED_Events_Archive_display_venue'
-                ),
-                AllowedTags::getWithFormTags()
-            ); ?>
+				EEH_Form_Fields::select(
+					'display_venue',
+					$display_venue,
+					$values,
+					'EED_Events_Archive_display_venue',
+					'EED_Events_Archive_display_venue'
+				),
+				AllowedTags::getWithFormTags()
+			); ?>
         </td>
     </tr>
 
@@ -201,15 +201,15 @@ 
         </th>
         <td>
             <?php echo wp_kses(
-                EEH_Form_Fields::select(
-                    'expired_events',
-                    $display_expired_events,
-                    $values,
-                    'EED_Events_Archive_display_expired_events',
-                    'EED_Events_Archive_display_expired_events'
-                ),
-                AllowedTags::getWithFormTags()
-            ); ?>
+				EEH_Form_Fields::select(
+					'expired_events',
+					$display_expired_events,
+					$values,
+					'EED_Events_Archive_display_expired_events',
+					'EED_Events_Archive_display_expired_events'
+				),
+				AllowedTags::getWithFormTags()
+			); ?>
         </td>
     </tr>
 
@@ -217,46 +217,46 @@ 
         <th>
             <label for="EED_Events_Archive_use_sortable_display_order">
                 <?php esc_html_e(
-                    'Use Custom Display Order?',
-                    'event_espresso'
-                ); ?><?php // echo wp_kses(EEH_Template::get_help_tab_link('use_sortable_display_order_info'),AllowedTags::getAllowedTags()); ?>
+					'Use Custom Display Order?',
+					'event_espresso'
+				); ?><?php // echo wp_kses(EEH_Template::get_help_tab_link('use_sortable_display_order_info'),AllowedTags::getAllowedTags()); ?>
             </label>
         </th>
         <td>
             <?php echo wp_kses(
-                EEH_Form_Fields::select(
-                    'use_sortable_display_order',
-                    $use_sortable_display_order,
-                    $values,
-                    'EED_Events_Archive_use_sortable_display_order',
-                    'EED_Events_Archive_use_sortable_display_order'
-                ),
-                AllowedTags::getWithFormTags()
-            ); ?>
+				EEH_Form_Fields::select(
+					'use_sortable_display_order',
+					$use_sortable_display_order,
+					$values,
+					'EED_Events_Archive_use_sortable_display_order',
+					'EED_Events_Archive_use_sortable_display_order'
+				),
+				AllowedTags::getWithFormTags()
+			); ?>
         </td>
     </tr>
 
     <tr>
         <th>
             <?php esc_html_e(
-                'Display Order',
-                'event_espresso'
-            ); ?><?php // echo wp_kses(EEH_Template::get_help_tab_link('event_archive_order_info'),AllowedTags::getAllowedTags()); ?>
+				'Display Order',
+				'event_espresso'
+			); ?><?php // echo wp_kses(EEH_Template::get_help_tab_link('event_archive_order_info'),AllowedTags::getAllowedTags()); ?>
         </th>
         <td>
 
             <?php wp_nonce_field(
-                'espresso_update_event_archive_order',
-                'espresso_update_event_archive_order_nonce',
-                false
-            ); ?>
+				'espresso_update_event_archive_order',
+				'espresso_update_event_archive_order_nonce',
+				false
+			); ?>
             <?php echo wp_kses($event_archive_display_order, AllowedTags::getWithFormTags()); ?>
 
             <p class="description"><?php
-                esc_html_e(
-                    'Drag and Drop the above to determine the display order of the Event Description, Date and Times, Ticket Selector, and Venue Information on the event archive page.',
-                    'event_espresso'
-                ); ?></p>
+				esc_html_e(
+					'Drag and Drop the above to determine the display order of the Event Description, Date and Times, Ticket Selector, and Venue Information on the event archive page.',
+					'event_espresso'
+				); ?></p>
 
         </td>
     </tr>
@@ -269,15 +269,15 @@ 
         </th>
         <td>
             <?php echo wp_kses(
-                EEH_Form_Fields::select(
-                    'reset_event_list_settings',
-                    0,
-                    $values,
-                    'EED_Events_Archive_reset_event_list_settings',
-                    'EED_Events_Archive_reset_event_list_settings'
-                ),
-                AllowedTags::getWithFormTags()
-            ); ?>
+				EEH_Form_Fields::select(
+					'reset_event_list_settings',
+					0,
+					$values,
+					'EED_Events_Archive_reset_event_list_settings',
+					'EED_Events_Archive_reset_event_list_settings'
+				),
+				AllowedTags::getWithFormTags()
+			); ?>
         </td>
     </tr>
 

caffeinated/core/services/licensing/LicenseService.php

Indentation +77 added lines, -77 removed lines

@@ -15,93 +15,93 @@
  */
 class LicenseService
 {
-    /**
-     * @var Config
-     */
-    private $config;
+	/**
+	 * @var Config
+	 */
+	private $config;
 
-    /**
-     * @var Stats
-     */
-    private $stats_collection;
+	/**
+	 * @var Stats
+	 */
+	private $stats_collection;
 
-    public function __construct(Stats $stats_collection, Config $config)
-    {
-        $this->config = $config;
-        $this->stats_collection = $stats_collection;
-    }
+	public function __construct(Stats $stats_collection, Config $config)
+	{
+		$this->config = $config;
+		$this->stats_collection = $stats_collection;
+	}
 
-    public function loadPueClient()
-    {
-        // PUE Auto Upgrades stuff
-        if (is_readable(EE_THIRD_PARTY . 'pue/pue-client.php')) { // include the file
-            require_once(EE_THIRD_PARTY . 'pue/pue-client.php');
+	public function loadPueClient()
+	{
+		// PUE Auto Upgrades stuff
+		if (is_readable(EE_THIRD_PARTY . 'pue/pue-client.php')) { // include the file
+			require_once(EE_THIRD_PARTY . 'pue/pue-client.php');
 
-            // $options needs to be an array with the included keys as listed.
-            $options = array(
-                // 'optionName' => '', //(optional) - used as the reference for saving update information in the
-                // clients options table.  Will be automatically set if left blank.
-                'apikey'                => $this->config->siteLicenseKey(),
-                // (required), you will need to obtain the apikey that the client gets from your site and
-                // then saves in their sites options table (see 'getting an api-key' below)
-                'lang_domain'           => $this->config->i18nDomain(),
-                // (optional) - put here whatever reference you are using for the localization of your plugin (if it's
-                // localized).  That way strings in this file will be included in the translation for your plugin.
-                'checkPeriod'           => $this->config->checkPeriod(),
-                // (optional) - use this parameter to indicate how often you want the client's install to ping your
-                // server for update checks.  The integer indicates hours.  If you don't include this parameter it will
-                // default to 12 hours.
-                'option_key'            => $this->config->optionKey(),
-                // this is what is used to reference the api_key in your plugin options.  PUE uses this to trigger
-                // updating your information message whenever this option_key is modified.
-                'options_page_slug'     => $this->config->optionsPageSlug(),
-                'plugin_basename'       => EE_PLUGIN_BASENAME,
-                'use_wp_update'         => true,
-                // if TRUE then you want FREE versions of the plugin to be updated from WP
-                'extra_stats'           => $this->stats_collection->statsCallback(),
-                'turn_on_notices_saved' => true,
-            );
-            // initiate the class and start the plugin update engine!
-            new PluginUpdateEngineChecker(
-                $this->config->hostServerUrl(),
-                $this->config->pluginSlug(),
-                $options
-            );
+			// $options needs to be an array with the included keys as listed.
+			$options = array(
+				// 'optionName' => '', //(optional) - used as the reference for saving update information in the
+				// clients options table.  Will be automatically set if left blank.
+				'apikey'                => $this->config->siteLicenseKey(),
+				// (required), you will need to obtain the apikey that the client gets from your site and
+				// then saves in their sites options table (see 'getting an api-key' below)
+				'lang_domain'           => $this->config->i18nDomain(),
+				// (optional) - put here whatever reference you are using for the localization of your plugin (if it's
+				// localized).  That way strings in this file will be included in the translation for your plugin.
+				'checkPeriod'           => $this->config->checkPeriod(),
+				// (optional) - use this parameter to indicate how often you want the client's install to ping your
+				// server for update checks.  The integer indicates hours.  If you don't include this parameter it will
+				// default to 12 hours.
+				'option_key'            => $this->config->optionKey(),
+				// this is what is used to reference the api_key in your plugin options.  PUE uses this to trigger
+				// updating your information message whenever this option_key is modified.
+				'options_page_slug'     => $this->config->optionsPageSlug(),
+				'plugin_basename'       => EE_PLUGIN_BASENAME,
+				'use_wp_update'         => true,
+				// if TRUE then you want FREE versions of the plugin to be updated from WP
+				'extra_stats'           => $this->stats_collection->statsCallback(),
+				'turn_on_notices_saved' => true,
+			);
+			// initiate the class and start the plugin update engine!
+			new PluginUpdateEngineChecker(
+				$this->config->hostServerUrl(),
+				$this->config->pluginSlug(),
+				$options
+			);
 
-            do_action('AHEE__EE_System__brew_espresso__after_pue_init');
-        }
-    }
+			do_action('AHEE__EE_System__brew_espresso__after_pue_init');
+		}
+	}
 
 
-    /**
-     * This is a handy helper method for retrieving whether there is an update available for the given plugin.
-     *
-     * @param string $basename  Use the equivalent result from plugin_basename() for this param as WP uses that to
-     *                          identify plugins. Defaults to core update
-     * @return bool           True if update available, false if not.
-     */
-    public static function isUpdateAvailable(string $basename = ''): bool
-    {
-        $basename = ! empty($basename) ? $basename : EE_PLUGIN_BASENAME;
+	/**
+	 * This is a handy helper method for retrieving whether there is an update available for the given plugin.
+	 *
+	 * @param string $basename  Use the equivalent result from plugin_basename() for this param as WP uses that to
+	 *                          identify plugins. Defaults to core update
+	 * @return bool           True if update available, false if not.
+	 */
+	public static function isUpdateAvailable(string $basename = ''): bool
+	{
+		$basename = ! empty($basename) ? $basename : EE_PLUGIN_BASENAME;
 
-        $update = false;
+		$update = false;
 
-        // should take "event-espresso-core/espresso.php" and change to "/event-espresso-core"
-        $folder = '/' . dirname($basename);
+		// should take "event-espresso-core/espresso.php" and change to "/event-espresso-core"
+		$folder = '/' . dirname($basename);
 
-        $plugins = get_plugins($folder);
-        $current = get_site_transient('update_plugins');
-        foreach ($plugins as $plugin_file => $plugin_data) {
-            if (isset($current->response[ $plugin_file ])) {
-                $update = true;
-            }
-        }
+		$plugins = get_plugins($folder);
+		$current = get_site_transient('update_plugins');
+		foreach ($plugins as $plugin_file => $plugin_data) {
+			if (isset($current->response[ $plugin_file ])) {
+				$update = true;
+			}
+		}
 
-        // it's possible that there is an update but an invalid site-license-key is in use
-        if (get_site_option('pue_json_error_' . $basename)) {
-            $update = true;
-        }
+		// it's possible that there is an update but an invalid site-license-key is in use
+		if (get_site_option('pue_json_error_' . $basename)) {
+			$update = true;
+		}
 
-        return $update;
-    }
+		return $update;
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -34,8 +34,8 @@ 
     public function loadPueClient()
     {
         // PUE Auto Upgrades stuff
-        if (is_readable(EE_THIRD_PARTY . 'pue/pue-client.php')) { // include the file
-            require_once(EE_THIRD_PARTY . 'pue/pue-client.php');
+        if (is_readable(EE_THIRD_PARTY.'pue/pue-client.php')) { // include the file
+            require_once(EE_THIRD_PARTY.'pue/pue-client.php');
 
             // $options needs to be an array with the included keys as listed.
             $options = array(
@@ -87,18 +87,18 @@ 
         $update = false;
 
         // should take "event-espresso-core/espresso.php" and change to "/event-espresso-core"
-        $folder = '/' . dirname($basename);
+        $folder = '/'.dirname($basename);
 
         $plugins = get_plugins($folder);
         $current = get_site_transient('update_plugins');
         foreach ($plugins as $plugin_file => $plugin_data) {
-            if (isset($current->response[ $plugin_file ])) {
+            if (isset($current->response[$plugin_file])) {
                 $update = true;
             }
         }
 
         // it's possible that there is an update but an invalid site-license-key is in use
-        if (get_site_option('pue_json_error_' . $basename)) {
+        if (get_site_option('pue_json_error_'.$basename)) {
             $update = true;
         }
 

caffeinated/core/services/licensing/UserExperienceForm.php

Indentation +115 added lines, -115 removed lines

@@ -16,129 +16,129 @@
 
 class UserExperienceForm
 {
-    /**
-     * @var EE_Core_Config
-     */
-    protected $core_config;
+	/**
+	 * @var EE_Core_Config
+	 */
+	protected $core_config;
 
-    /**
-     * @var EE_Network_Core_Config
-     */
-    protected $network_core_config;
+	/**
+	 * @var EE_Network_Core_Config
+	 */
+	protected $network_core_config;
 
 
-    /**
-     * @param EE_Core_Config         $core_config
-     * @param EE_Network_Core_Config $network_core_config
-     */
-    public function __construct(EE_Core_Config $core_config, EE_Network_Core_Config $network_core_config)
-    {
-        $this->core_config         = $core_config;
-        $this->network_core_config = $network_core_config;
-    }
+	/**
+	 * @param EE_Core_Config         $core_config
+	 * @param EE_Network_Core_Config $network_core_config
+	 */
+	public function __construct(EE_Core_Config $core_config, EE_Network_Core_Config $network_core_config)
+	{
+		$this->core_config         = $core_config;
+		$this->network_core_config = $network_core_config;
+	}
 
 
-    /**
-     * @throws EE_Error
-     */
-    public function uxipFormSections(EE_Form_Section_Proper $org_settings_form ): EE_Form_Section_Proper
-    {
-        if (is_main_site()) {
-            $org_settings_form->add_subsections(
-                [
-                    'site_license_key_hdr' => new EE_Form_Section_HTML(
-                        EEH_HTML::h2(
-                            esc_html__('Your Event Espresso License Key', 'event_espresso')
-                            . ' '
-                            . EEH_HTML::span(
-                                EEH_Template::get_help_tab_link('site_license_key_info')
-                            ),
-                            '',
-                            'site-license-key-hdr'
-                        )
-                    ),
-                    'site_license_key'     => new EE_Text_Input(
-                        [
-                            'html_name'        => 'ee_site_license_key',
-                            'html_id'          => 'site_license_key',
-                            'html_label_text'  => esc_html__('Support License Key', 'event_espresso'),
-                            /** phpcs:disable WordPress.WP.I18n.UnorderedPlaceholdersText */
-                            'html_help_text'   => sprintf(
-                                esc_html__(
-                                    'Adding a valid Support License Key will enable automatic update notifications and backend updates for Event Espresso Core and any installed add-ons. If this is a Development or Test site, %sDO NOT%s enter your Support License Key.',
-                                    'event_espresso'
-                                ),
-                                '<strong>',
-                                '</strong>'
-                            ),
-                            /** phpcs:enable */
-                            'default'          => $this->network_core_config->site_license_key ?? '',
-                            'required'         => false,
-                            'form_html_filter' => new VsprintfFilter(
-                                '%2$s %1$s',
-                                [$this->getValidationIndicator()]
-                            )
-                        ]
-                    )
-                ]
-            );
-            $org_settings_form->add_subsections(
-                [
-                    'uxip_optin_hdr' => new EE_Form_Section_HTML(Stats::optinText(false)),
-                    'ueip_optin'     => new EE_Checkbox_Multi_Input(
-                        [
-                            true => esc_html__('Yes! I want to help improve Event Espresso!', 'event_espresso')
-                        ],
-                        [
-                            'html_name'       => EE_Core_Config::OPTION_NAME_UXIP,
-                            'html_label_text' => esc_html__(
-                                'UXIP Opt In?',
-                                'event_espresso'
-                            ),
-                            'default'         => isset($this->core_config->ee_ueip_optin)
-                                ? filter_var($this->core_config->ee_ueip_optin, FILTER_VALIDATE_BOOLEAN)
-                                : false,
-                            'required'        => false,
-                        ]
-                    ),
-                ],
-                'organization_instagram',
-                false
-            );
-        }
-        return $org_settings_form;
-    }
+	/**
+	 * @throws EE_Error
+	 */
+	public function uxipFormSections(EE_Form_Section_Proper $org_settings_form ): EE_Form_Section_Proper
+	{
+		if (is_main_site()) {
+			$org_settings_form->add_subsections(
+				[
+					'site_license_key_hdr' => new EE_Form_Section_HTML(
+						EEH_HTML::h2(
+							esc_html__('Your Event Espresso License Key', 'event_espresso')
+							. ' '
+							. EEH_HTML::span(
+								EEH_Template::get_help_tab_link('site_license_key_info')
+							),
+							'',
+							'site-license-key-hdr'
+						)
+					),
+					'site_license_key'     => new EE_Text_Input(
+						[
+							'html_name'        => 'ee_site_license_key',
+							'html_id'          => 'site_license_key',
+							'html_label_text'  => esc_html__('Support License Key', 'event_espresso'),
+							/** phpcs:disable WordPress.WP.I18n.UnorderedPlaceholdersText */
+							'html_help_text'   => sprintf(
+								esc_html__(
+									'Adding a valid Support License Key will enable automatic update notifications and backend updates for Event Espresso Core and any installed add-ons. If this is a Development or Test site, %sDO NOT%s enter your Support License Key.',
+									'event_espresso'
+								),
+								'<strong>',
+								'</strong>'
+							),
+							/** phpcs:enable */
+							'default'          => $this->network_core_config->site_license_key ?? '',
+							'required'         => false,
+							'form_html_filter' => new VsprintfFilter(
+								'%2$s %1$s',
+								[$this->getValidationIndicator()]
+							)
+						]
+					)
+				]
+			);
+			$org_settings_form->add_subsections(
+				[
+					'uxip_optin_hdr' => new EE_Form_Section_HTML(Stats::optinText(false)),
+					'ueip_optin'     => new EE_Checkbox_Multi_Input(
+						[
+							true => esc_html__('Yes! I want to help improve Event Espresso!', 'event_espresso')
+						],
+						[
+							'html_name'       => EE_Core_Config::OPTION_NAME_UXIP,
+							'html_label_text' => esc_html__(
+								'UXIP Opt In?',
+								'event_espresso'
+							),
+							'default'         => isset($this->core_config->ee_ueip_optin)
+								? filter_var($this->core_config->ee_ueip_optin, FILTER_VALIDATE_BOOLEAN)
+								: false,
+							'required'        => false,
+						]
+					),
+				],
+				'organization_instagram',
+				false
+			);
+		}
+		return $org_settings_form;
+	}
 
 
 
-    /**
-     * Return whether the site license key has been verified or not.
-     *
-     * @return bool
-     */
-    private function licenseKeyVerified(): bool
-    {
-        if (empty($this->network_core_config->site_license_key)) {
-            return false;
-        }
-        $verify_fail = get_option(
-            'puvererr_' . basename(EE_PLUGIN_BASENAME),
-            false
-        );
-        return $verify_fail === false
-               || (
-                   ! empty($this->network_core_config->site_license_key)
-                   && $verify_fail === false
-               );
-    }
+	/**
+	 * Return whether the site license key has been verified or not.
+	 *
+	 * @return bool
+	 */
+	private function licenseKeyVerified(): bool
+	{
+		if (empty($this->network_core_config->site_license_key)) {
+			return false;
+		}
+		$verify_fail = get_option(
+			'puvererr_' . basename(EE_PLUGIN_BASENAME),
+			false
+		);
+		return $verify_fail === false
+			   || (
+				   ! empty($this->network_core_config->site_license_key)
+				   && $verify_fail === false
+			   );
+	}
 
 
-    /**
-     * @return string
-     */
-    private function getValidationIndicator(): string
-    {
-        $verified_class = $this->licenseKeyVerified() ? 'ee-icon-color-ee-green' : 'ee-icon-color-ee-red';
-        return '<span class="dashicons dashicons-admin-network ' . $verified_class . ' ee-icon-size-20"></span>';
-    }
+	/**
+	 * @return string
+	 */
+	private function getValidationIndicator(): string
+	{
+		$verified_class = $this->licenseKeyVerified() ? 'ee-icon-color-ee-green' : 'ee-icon-color-ee-red';
+		return '<span class="dashicons dashicons-admin-network ' . $verified_class . ' ee-icon-size-20"></span>';
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -41,7 +41,7 @@ 
     /**
      * @throws EE_Error
      */
-    public function uxipFormSections(EE_Form_Section_Proper $org_settings_form ): EE_Form_Section_Proper
+    public function uxipFormSections(EE_Form_Section_Proper $org_settings_form): EE_Form_Section_Proper
     {
         if (is_main_site()) {
             $org_settings_form->add_subsections(
@@ -122,7 +122,7 @@ 
             return false;
         }
         $verify_fail = get_option(
-            'puvererr_' . basename(EE_PLUGIN_BASENAME),
+            'puvererr_'.basename(EE_PLUGIN_BASENAME),
             false
         );
         return $verify_fail === false
@@ -139,6 +139,6 @@ 
     private function getValidationIndicator(): string
     {
         $verified_class = $this->licenseKeyVerified() ? 'ee-icon-color-ee-green' : 'ee-icon-color-ee-red';
-        return '<span class="dashicons dashicons-admin-network ' . $verified_class . ' ee-icon-size-20"></span>';
+        return '<span class="dashicons dashicons-admin-network '.$verified_class.' ee-icon-size-20"></span>';
     }
 }

caffeinated/core/domain/services/pue/Config.php

Indentation +126 added lines, -126 removed lines

@@ -15,130 +15,130 @@
  */
 class Config
 {
-    /**
-     * @var EE_Network_Config
-     */
-    private $network_config;
-
-    /**
-     * @var EE_Config
-     */
-    private $ee_config;
-
-
-    public function __construct(EE_Network_Config $network_config, EE_Config $ee_config)
-    {
-        $this->network_config = $network_config;
-        $this->ee_config      = $ee_config;
-    }
-
-
-    /**
-     * Get the site license key for the site.
-     */
-    public function siteLicenseKey(): string
-    {
-        return $this->network_config->core->site_license_key;
-    }
-
-
-    public function i18nDomain(): string
-    {
-        return 'event_espresso';
-    }
-
-
-    public function checkPeriod(): int
-    {
-        return 24;
-    }
-
-
-    public function optionKey(): string
-    {
-        return 'ee_site_license_key';
-    }
-
-
-    public function optionsPageSlug(): string
-    {
-        return 'espresso_general_settings';
-    }
-
-
-    public function hostServerUrl(): string
-    {
-        return defined('PUE_UPDATES_ENDPOINT')
-            ? PUE_UPDATES_ENDPOINT
-            : 'https://eventespresso.com';
-    }
-
-
-    public function pluginSlug(): array
-    {
-        // Note: PUE uses a simple preg_match to determine what type is currently installed based on version number.
-        //  So it's important that you use a key for the version type that is unique and not found in another key.
-        // For example:
-        // $plugin_slug['premium']['p'] = 'some-premium-slug';
-        // $plugin_slug['prerelease']['pr'] = 'some-pre-release-slug';
-        // The above would not work because "p" is found in both keys for the version type. ( i.e 1.0.p vs 1.0.pr )
-        // so doing something like:
-        // $plugin_slug['premium']['p'] = 'some-premium-slug';
-        // $plugin_slug['prerelease']['b'] = 'some-pre-release-slug';
-        // ..WOULD work!
-        return [
-            'free'       => ['decaf' => 'event-espresso-core-decaf'],
-            'premium'    => ['p' => 'event-espresso-core-reg'],
-            'prerelease' => ['beta' => 'event-espresso-core-pr'],
-        ];
-    }
-
-
-    /**
-     * Return whether the site is opted in for UXIP or not.
-     *
-     * @return bool
-     */
-    public function isOptedInForUxip(): bool
-    {
-        return filter_var($this->ee_config->core->ee_ueip_optin, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * Return whether the site has been notified about UXIP or not.
-     *
-     * @return bool
-     */
-    public function hasNotifiedForUxip(): bool
-    {
-        return filter_var($this->ee_config->core->ee_ueip_has_notified, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * Set the site opted in for UXIP.
-     */
-    public function setHasOptedInForUxip()
-    {
-        $this->ee_config->core->ee_ueip_optin = true;
-        $this->ee_config->update_espresso_config(false, false);
-    }
-
-
-    /**
-     * Set the site opted out for UXIP
-     */
-    public function setHasOptedOutForUxip()
-    {
-        $this->ee_config->core->ee_ueip_optin = false;
-        $this->ee_config->update_espresso_config(false, false);
-    }
-
-
-    public function setHasNotifiedAboutUxip()
-    {
-        $this->ee_config->core->ee_ueip_has_notified = true;
-        $this->ee_config->update_espresso_config(false, false);
-    }
+	/**
+	 * @var EE_Network_Config
+	 */
+	private $network_config;
+
+	/**
+	 * @var EE_Config
+	 */
+	private $ee_config;
+
+
+	public function __construct(EE_Network_Config $network_config, EE_Config $ee_config)
+	{
+		$this->network_config = $network_config;
+		$this->ee_config      = $ee_config;
+	}
+
+
+	/**
+	 * Get the site license key for the site.
+	 */
+	public function siteLicenseKey(): string
+	{
+		return $this->network_config->core->site_license_key;
+	}
+
+
+	public function i18nDomain(): string
+	{
+		return 'event_espresso';
+	}
+
+
+	public function checkPeriod(): int
+	{
+		return 24;
+	}
+
+
+	public function optionKey(): string
+	{
+		return 'ee_site_license_key';
+	}
+
+
+	public function optionsPageSlug(): string
+	{
+		return 'espresso_general_settings';
+	}
+
+
+	public function hostServerUrl(): string
+	{
+		return defined('PUE_UPDATES_ENDPOINT')
+			? PUE_UPDATES_ENDPOINT
+			: 'https://eventespresso.com';
+	}
+
+
+	public function pluginSlug(): array
+	{
+		// Note: PUE uses a simple preg_match to determine what type is currently installed based on version number.
+		//  So it's important that you use a key for the version type that is unique and not found in another key.
+		// For example:
+		// $plugin_slug['premium']['p'] = 'some-premium-slug';
+		// $plugin_slug['prerelease']['pr'] = 'some-pre-release-slug';
+		// The above would not work because "p" is found in both keys for the version type. ( i.e 1.0.p vs 1.0.pr )
+		// so doing something like:
+		// $plugin_slug['premium']['p'] = 'some-premium-slug';
+		// $plugin_slug['prerelease']['b'] = 'some-pre-release-slug';
+		// ..WOULD work!
+		return [
+			'free'       => ['decaf' => 'event-espresso-core-decaf'],
+			'premium'    => ['p' => 'event-espresso-core-reg'],
+			'prerelease' => ['beta' => 'event-espresso-core-pr'],
+		];
+	}
+
+
+	/**
+	 * Return whether the site is opted in for UXIP or not.
+	 *
+	 * @return bool
+	 */
+	public function isOptedInForUxip(): bool
+	{
+		return filter_var($this->ee_config->core->ee_ueip_optin, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * Return whether the site has been notified about UXIP or not.
+	 *
+	 * @return bool
+	 */
+	public function hasNotifiedForUxip(): bool
+	{
+		return filter_var($this->ee_config->core->ee_ueip_has_notified, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * Set the site opted in for UXIP.
+	 */
+	public function setHasOptedInForUxip()
+	{
+		$this->ee_config->core->ee_ueip_optin = true;
+		$this->ee_config->update_espresso_config(false, false);
+	}
+
+
+	/**
+	 * Set the site opted out for UXIP
+	 */
+	public function setHasOptedOutForUxip()
+	{
+		$this->ee_config->core->ee_ueip_optin = false;
+		$this->ee_config->update_espresso_config(false, false);
+	}
+
+
+	public function setHasNotifiedAboutUxip()
+	{
+		$this->ee_config->core->ee_ueip_has_notified = true;
+		$this->ee_config->update_espresso_config(false, false);
+	}
 }