eventespresso / event-espresso-core

admin_pages/registrations/qtips/Registration_List_Table_Tips.lib.php

Indentation +37 added lines, -37 removed lines

@@ -15,16 +15,16 @@ 
  */
 class Registration_List_Table_Tips extends EE_Qtip_Config
 {
-    protected function _set_tips_array()
-    {
-        $this->_qtipsa = array(
-            0 => array(
-                'content_id' => 'registration-trash-lock',
-                'target'     => '.ee-lock-icon',
-                'content'    => $this->_registration_trash_message(),
-            ),
-            /** removing status strips for now because they are triggered anywhere on the row. */
-            /**1 => array(
+	protected function _set_tips_array()
+	{
+		$this->_qtipsa = array(
+			0 => array(
+				'content_id' => 'registration-trash-lock',
+				'target'     => '.ee-lock-icon',
+				'content'    => $this->_registration_trash_message(),
+			),
+			/** removing status strips for now because they are triggered anywhere on the row. */
+			/**1 => array(
              * 'content_id' => 'registration-status-' . RegStatus::APPROVED,
              * 'target' => '.reg-status-' . RegStatus::APPROVED,
              * 'content' => $this->_registration_status_legend(RegStatus::APPROVED),
@@ -74,37 +74,37 @@ 
              * )
              * )
              * )/**/
-        );
-    }
+		);
+	}
 
 
-    private function _registration_trash_message()
-    {
-        return '<p>'
-               . esc_html__(
-                   'This lock-icon means that this registration cannot be trashed.  Registrations that belong to a transaction that has payments cannot be trashed.  If you wish to trash this registration then you must delete all payments attached to the related transaction first.',
-                   'event_espresso'
-               ) . '</p>';
-    }
+	private function _registration_trash_message()
+	{
+		return '<p>'
+			   . esc_html__(
+				   'This lock-icon means that this registration cannot be trashed.  Registrations that belong to a transaction that has payments cannot be trashed.  If you wish to trash this registration then you must delete all payments attached to the related transaction first.',
+				   'event_espresso'
+			   ) . '</p>';
+	}
 
 
-    /**
-     * output the relevant ee-status-legend with the designated status highlighted.
-     *
-     * @param  EEM_Registration constant $status What status is set (by class)
-     * @return string         The status legend with the related status highlighted
-     */
-    private function _registration_status_legend($status)
-    {
+	/**
+	 * output the relevant ee-status-legend with the designated status highlighted.
+	 *
+	 * @param  EEM_Registration constant $status What status is set (by class)
+	 * @return string         The status legend with the related status highlighted
+	 */
+	private function _registration_status_legend($status)
+	{
 
-        $status_array = array(
-            'approved_status' => RegStatus::APPROVED,
-            'pending_status' => RegStatus::PENDING_PAYMENT,
-            'not_approved' => RegStatus::AWAITING_REVIEW,
-            'declined_status' => RegStatus::DECLINED,
-            'cancelled_status' => RegStatus::CANCELLED,
-        );
+		$status_array = array(
+			'approved_status' => RegStatus::APPROVED,
+			'pending_status' => RegStatus::PENDING_PAYMENT,
+			'not_approved' => RegStatus::AWAITING_REVIEW,
+			'declined_status' => RegStatus::DECLINED,
+			'cancelled_status' => RegStatus::CANCELLED,
+		);
 
-        return EEH_Template::status_legend($status_array, $status);
-    }
+		return EEH_Template::status_legend($status_array, $status);
+	}
 }

admin_pages/registrations/help_tabs/registrations_overview_filters.help_tab.php

Indentation +18 added lines, -18 removed lines

@@ -19,49 +19,49 @@
         <strong><?php esc_html_e('Filter by Status', 'event_espresso'); ?></strong>
         <br />
         <?php esc_html_e(
-            'The following statuses are available: Approved, Cancelled, Declined, Not Approved / Awaiting Review, Pending Payment.',
-            'event_espresso'
-        ); ?>
+			'The following statuses are available: Approved, Cancelled, Declined, Not Approved / Awaiting Review, Pending Payment.',
+			'event_espresso'
+		); ?>
         <ul>
             <li style="list-style-type: none;">
                 <strong><?php esc_html_e('Approved', 'event_espresso'); ?></strong>
                 <br />
                 <?php esc_html_e(
-                    'An approved registration allows payments and may have a transaction status of complete or incomplete. The registration is marked as active and a space is reserved for the registrant.',
-                    'event_espresso'
-                ); ?>
+					'An approved registration allows payments and may have a transaction status of complete or incomplete. The registration is marked as active and a space is reserved for the registrant.',
+					'event_espresso'
+				); ?>
             </li>
             <li style="list-style-type: none;">
                 <strong><?php esc_html_e('Cancelled', 'event_espresso'); ?></strong>
                 <br />
                 <?php esc_html_e(
-                    'A cancelled registration is performed by the registrant. Payments are not allowed, the registration is inactive, and no space is reserved.',
-                    'event_espresso'
-                ); ?>
+					'A cancelled registration is performed by the registrant. Payments are not allowed, the registration is inactive, and no space is reserved.',
+					'event_espresso'
+				); ?>
             </li>
             <li style="list-style-type: none;">
                 <strong><?php esc_html_e('Declined', 'event_espresso'); ?></strong>
                 <br />
                 <?php esc_html_e(
-                    'A declined registration is performed by the event admin. Payments are not allowed, the registration is inactive, and not space is reserved.',
-                    'event_espresso'
-                ); ?>
+					'A declined registration is performed by the event admin. Payments are not allowed, the registration is inactive, and not space is reserved.',
+					'event_espresso'
+				); ?>
             </li>
             <li style="list-style-type: none;">
                 <strong><?php esc_html_e('Awaiting Review', 'event_espresso'); ?></strong>
                 <br />
                 <?php esc_html_e(
-                    'Registration is awaiting review from the event admin. Payments are not allowed, the registration is active, and no space is reserved.',
-                    'event_espresso'
-                ); ?>
+					'Registration is awaiting review from the event admin. Payments are not allowed, the registration is active, and no space is reserved.',
+					'event_espresso'
+				); ?>
             </li>
             <li style="list-style-type: none;">
                 <strong><?php esc_html_e('Pending Payment', 'event_espresso'); ?></strong>
                 <br />
                 <?php esc_html_e(
-                    'A pending registration allows payments. The status will be automatically toggled to approved if the payment is made in full by registrant.',
-                    'event_espresso'
-                ); ?>
+					'A pending registration allows payments. The status will be automatically toggled to approved if the payment is made in full by registrant.',
+					'event_espresso'
+				); ?>
             </li>
         </ul>
 </ul>

admin_pages/registrations/help_tabs/registrations_details.help_tab.php

Indentation +24 added lines, -24 removed lines

@@ -6,64 +6,64 @@
 </p>
 <p>
     <?php esc_html_e(
-        'The number for the registration is shown along with the date of the registration. Next the status of the registration is shown. A registration may have one of the following statuses: Approved, Pending Payment, Not Approved / Awaiting Review, Declined, or Cancelled.',
-        'event_espresso'
-    ); ?>
+		'The number for the registration is shown along with the date of the registration. Next the status of the registration is shown. A registration may have one of the following statuses: Approved, Pending Payment, Not Approved / Awaiting Review, Declined, or Cancelled.',
+		'event_espresso'
+	); ?>
 <ul>
     <li style="list-style-type: none;">
         <strong><?php esc_html_e('Approved', 'event_espresso'); ?></strong>
         <br />
         <?php esc_html_e(
-            'An approved registration allows payments and may have a transaction status of incomplete or complete. The registration is marked as active and a space is reserved for the registrant.',
-            'event_espresso'
-        ); ?>
+			'An approved registration allows payments and may have a transaction status of incomplete or complete. The registration is marked as active and a space is reserved for the registrant.',
+			'event_espresso'
+		); ?>
     </li>
     <li style="list-style-type: none;">
         <strong><?php esc_html_e('Cancelled', 'event_espresso'); ?></strong>
         <br />
         <?php esc_html_e(
-            'A cancelled registration is performed by the registrant. Payments are not allowed, the registration is inactive, and no space is reserved.',
-            'event_espresso'
-        ); ?>
+			'A cancelled registration is performed by the registrant. Payments are not allowed, the registration is inactive, and no space is reserved.',
+			'event_espresso'
+		); ?>
     </li>
     <li style="list-style-type: none;">
         <strong><?php esc_html_e('Declined', 'event_espresso'); ?></strong>
         <br />
         <?php esc_html_e(
-            'A declined registration is performed by the event admin. Payments are not allowed, the registration is inactive, and not space is reserved.',
-            'event_espresso'
-        ); ?>
+			'A declined registration is performed by the event admin. Payments are not allowed, the registration is inactive, and not space is reserved.',
+			'event_espresso'
+		); ?>
     </li>
     <li style="list-style-type: none;">
         <strong><?php esc_html_e('Awaiting Review', 'event_espresso'); ?></strong>
         <br />
         <?php esc_html_e(
-            'Registration is awaiting review from the event admin. Payments are not allowed, the registration is active, and no space is reserved.',
-            'event_espresso'
-        ); ?>
+			'Registration is awaiting review from the event admin. Payments are not allowed, the registration is active, and no space is reserved.',
+			'event_espresso'
+		); ?>
     </li>
     <li style="list-style-type: none;">
         <strong><?php esc_html_e('Pending Payment', 'event_espresso'); ?></strong>
         <br />
         <?php esc_html_e(
-            'A pending registration allows payments. The status will be automatically toggled to approved if the payment is made in full by registrant.',
-            'event_espresso'
-        ); ?>
+			'A pending registration allows payments. The status will be automatically toggled to approved if the payment is made in full by registrant.',
+			'event_espresso'
+		); ?>
     </li>
 </ul>
 <p>
     <strong><?php esc_html_e('Recommendations', 'event_espresso'); ?></strong>
     <br />
     <?php esc_html_e(
-        'To learn more about the options on this page, take a look at the different tabs that appear on the left side of the page.',
-        'event_espresso'
-    ); ?>
+		'To learn more about the options on this page, take a look at the different tabs that appear on the left side of the page.',
+		'event_espresso'
+	); ?>
 </p>
 <p>
     <strong><?php esc_html_e('Screen Options', 'event_espresso'); ?></strong>
     <br />
     <?php esc_html_e(
-        'You can customize the information that is shown on this page by toggling the Screen Options tab. Then you can add or remove checkmarks to hide or show certain content.',
-        'event_espresso'
-    ); ?>
+		'You can customize the information that is shown on this page by toggling the Screen Options tab. Then you can add or remove checkmarks to hide or show certain content.',
+		'event_espresso'
+	); ?>
 </p>

admin_pages/registrations/help_tabs/registrations_overview_other.help_tab.php

Indentation +6 added lines, -6 removed lines

@@ -3,16 +3,16 @@
 </p>
 <p>
     <?php esc_html_e(
-        'Bulk actions allow you to perform an action to multiple registrations at once. The following bulk actions are supported: Approve Registrations, Decline Registrations, Set Registrations to Pending Payment, Set Registrations to Not Approved / Awaiting Review, Cancel Registrations, Trash Registrations. To use the bulk action feature, place a checkmark next to the registrations that you want to include. Then select a bulk action from the menu and click on the Apply button.',
-        'event_espresso'
-    ); ?>
+		'Bulk actions allow you to perform an action to multiple registrations at once. The following bulk actions are supported: Approve Registrations, Decline Registrations, Set Registrations to Pending Payment, Set Registrations to Not Approved / Awaiting Review, Cancel Registrations, Trash Registrations. To use the bulk action feature, place a checkmark next to the registrations that you want to include. Then select a bulk action from the menu and click on the Apply button.',
+		'event_espresso'
+	); ?>
 </p>
 <p>
     <strong><?php esc_html_e('Registrations Search', 'event_espresso'); ?></strong>
 </p>
 <p>
     <?php esc_html_e(
-        'You can perform a search to find certain registrations. The following sources will be searched: Event Name (title), Event Description, First Name, Last Name, Bio, Email, Address, Comments, Notes, Registration Final Price, Registration Code, Registration Group Size, Ticket Name, and Ticket Description. To use the search feature, enter a value into the search box and click on the Search Registrations button.',
-        'event_espresso'
-    ); ?>
+		'You can perform a search to find certain registrations. The following sources will be searched: Event Name (title), Event Description, First Name, Last Name, Bio, Email, Address, Comments, Notes, Registration Final Price, Registration Code, Registration Group Size, Ticket Name, and Ticket Description. To use the search feature, enter a value into the search box and click on the Search Registrations button.',
+		'event_espresso'
+	); ?>
 </p>

admin_pages/registrations/EE_Registrations_List_Table.class.php

Indentation +1137 added lines, -1137 removed lines

@@ -19,620 +19,620 @@ 
  */
 class EE_Registrations_List_Table extends EE_Admin_List_Table
 {
-    /**
-     * @var Registrations_Admin_Page
-     */
-    protected EE_Admin_Page $_admin_page;
-
-    protected RegistrationsListTableUserCapabilities $caps_handler;
-
-    private array $_status;
-
-    /**
-     * An array of transaction details for the related transaction to the registration being processed.
-     * This is set via the _set_related_details method.
-     *
-     * @var array
-     */
-    protected array $_transaction_details = [];
-
-    /**
-     * An array of event details for the related event to the registration being processed.
-     * This is set via the _set_related_details method.
-     *
-     * @var array
-     */
-    protected array $_event_details = [];
-
-    private array $filters = [];
-
-    private int $EVT_ID = 0;
-
-    private int $DTT_ID = 0;
-
-    private int $TKT_ID = 0;
-
-
-    /**
-     * @param Registrations_Admin_Page $admin_page
-     */
-    public function __construct(Registrations_Admin_Page $admin_page)
-    {
-        $this->caps_handler = new RegistrationsListTableUserCapabilities(EE_Registry::instance()->CAP);
-        $this->request      = $this->request ?? LoaderFactory::getShared(RequestInterface::class);
-        $this->setupFilters();
-        parent::__construct($admin_page);
-        $this->_status = $this->_admin_page->get_registration_status_array();
-    }
-
-
-    private function setupFilters()
-    {
-        // for event filtering
-        $this->EVT_ID = $this->request->getRequestParam('EVT_ID', 0, DataType::INTEGER);
-        $this->EVT_ID = $this->request->getRequestParam('event_id', $this->EVT_ID, DataType::INTEGER);
-        // for datetime filtering
-        $this->DTT_ID = $this->request->getRequestParam('DTT_ID', 0, DataType::INTEGER);
-        $this->DTT_ID = $this->request->getRequestParam('datetime_id', $this->DTT_ID, DataType::INTEGER);
-        // for ticket filtering
-        $this->TKT_ID = $this->request->getRequestParam('TKT_ID', 0, DataType::INTEGER);
-        $this->TKT_ID = $this->request->getRequestParam('ticket_id', $this->TKT_ID, DataType::INTEGER);
-
-        $filters = [
-            'event_id'    => $this->EVT_ID,
-            'datetime_id' => $this->DTT_ID,
-            'ticket_id'   => $this->TKT_ID,
-        ];
-        foreach ($filters as $filter_key => $filter_value) {
-            if ($filter_value) {
-                $this->filters[ $filter_key ] = $filter_value;
-            }
-        }
-
-        add_filter(
-            'FHEE__EE_Admin_Page__get_list_table_view_RLs__extra_query_args',
-            [$this, 'filterExtraQueryArgs'],
-            10,
-            2
-        );
-    }
-
-
-    /**
-     * @param array         $extra_query_args
-     * @param EE_Admin_Page $admin_page
-     * @return void
-     * @since 5.0.13.p
-     */
-    public function filterExtraQueryArgs(array $extra_query_args, EE_Admin_Page $admin_page): array
-    {
-        if ($admin_page instanceof Registrations_Admin_Page) {
-            foreach ($admin_page->get_views() as $view_details) {
-                foreach ($this->filters as $filter_key => $filter_value) {
-                    $extra_query_args[ $view_details['slug'] ][ $filter_key ] = $filter_value;
-                }
-            }
-        }
-        return $extra_query_args;
-    }
-
-
-    /**
-     * @return void
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function _setup_data()
-    {
-        $this->_data           = $this->_admin_page->get_registrations($this->_per_page);
-        $this->_all_data_count = $this->_admin_page->get_registrations($this->_per_page, true);
-    }
-
-
-    /**
-     * @return void
-     */
-    protected function _set_properties()
-    {
-        $this->_wp_list_args = [
-            'singular' => esc_html__('registration', 'event_espresso'),
-            'plural'   => esc_html__('registrations', 'event_espresso'),
-            'ajax'     => true,
-            'screen'   => $this->_admin_page->get_current_screen()->id,
-        ];
-
-        if ($this->EVT_ID) {
-            $this->_columns = [
-                'cb'               => '<input type="checkbox" />', // Render a checkbox instead of text
-                'id'               => esc_html__('ID', 'event_espresso'),
-                'ATT_fname'        => esc_html__('Name', 'event_espresso'),
-                'ATT_email'        => esc_html__('Email', 'event_espresso'),
-                '_REG_date'        => esc_html__('Reg Date', 'event_espresso'),
-                'REG_ticket'       => esc_html__('Ticket', 'event_espresso'),
-                '_REG_final_price' => esc_html__('Price', 'event_espresso'),
-                '_REG_paid'        => esc_html__('REG Paid', 'event_espresso'),
-                'TXN_total'        => esc_html__('TXN Paid/Total', 'event_espresso'),
-                'actions'          => $this->actionsColumnHeader(),
-            ];
-        } elseif ($this->TKT_ID) {
-            $this->_columns = [
-                'cb'               => '<input type="checkbox" />', // Render a checkbox instead of text
-                'id'               => esc_html__('ID', 'event_espresso'),
-                'ATT_fname'        => esc_html__('Name', 'event_espresso'),
-                'ATT_email'        => esc_html__('Email', 'event_espresso'),
-                '_REG_date'        => esc_html__('Reg Date', 'event_espresso'),
-                '_REG_final_price' => esc_html__('Price', 'event_espresso'),
-                '_REG_paid'        => esc_html__('REG Paid', 'event_espresso'),
-                'TXN_total'        => esc_html__('TXN Paid/Total', 'event_espresso'),
-                'actions'          => $this->actionsColumnHeader(),
-            ];
-        } else {
-            $this->_columns = [
-                'cb'               => '<input type="checkbox" />', // Render a checkbox instead of text
-                'id'               => esc_html__('ID', 'event_espresso'),
-                'ATT_fname'        => esc_html__('Name', 'event_espresso'),
-                '_REG_date'        => esc_html__('Reg Date', 'event_espresso'),
-                'event_name'       => esc_html__('Event', 'event_espresso'),
-                'DTT_EVT_start'    => esc_html__('Event Date', 'event_espresso'),
-                'REG_ticket'       => esc_html__('Ticket', 'event_espresso'),
-                '_REG_final_price' => esc_html__('Price', 'event_espresso'),
-                '_REG_paid'        => esc_html__('REG Paid', 'event_espresso'),
-                'TXN_total'        => esc_html__('TXN Paid/Total', 'event_espresso'),
-                'actions'          => $this->actionsColumnHeader(),
-            ];
-        }
-
-        $this->_primary_column   = 'id';
-        $this->_sortable_columns = [
-            '_REG_date'     => ['_REG_date' => true],   // true means its already sorted
-            /**
-             * Allows users to change the default sort if they wish.
-             * Returning a falsey on this filter will result in the default sort to be by firstname rather than last
-             * name.
-             */
-            'ATT_fname'     => [
-                'FHEE__EE_Registrations_List_Table___set_properties__default_sort_by_registration_last_name',
-                true,
-                $this,
-            ]
-                ? ['ATT_lname' => false]
-                : ['ATT_fname' => false],
-            'event_name'    => ['event_name' => false],
-            'DTT_EVT_start' => ['DTT_EVT_start' => false],
-            'id'            => ['REG_ID' => false],
-        ];
-        $this->_hidden_columns   = [];
-
-        $csv_report = RegistrationsCsvReportParams::getRequestParams(
-            $this->getReturnUrl(),
-            $this->_admin_page->get_request_data(),
-            $this->EVT_ID,
-            $this->DTT_ID
-        );
-        if (! empty($csv_report)) {
-            $this->_bottom_buttons['csv_reg_report'] = $csv_report;
-        }
-    }
-
-
-    /**
-     * This simply sets up the row class for the table rows.
-     * Allows for easier overriding of child methods for setting up sorting.
-     *
-     * @param EE_Registration $item the current item
-     * @return string
-     */
-    protected function _get_row_class($item): string
-    {
-        $class = parent::_get_row_class($item);
-        if ($this->_has_checkbox_column) {
-            $class .= ' has-checkbox-column';
-        }
-        return $class;
-    }
-
-
-    /**
-     * Set the $_transaction_details property if not set yet.
-     *
-     * @param EE_Registration $registration
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    protected function _set_related_details(EE_Registration $registration)
-    {
-        $transaction                = $registration->transaction();
-        $status                     = $transaction->status_ID();
-        $this->_transaction_details = [
-            'transaction' => $transaction,
-            'status'      => $status,
-            'id'          => $transaction->ID(),
-            'title_attr'  => sprintf(
-                esc_html__('View Transaction Details (%s)', 'event_espresso'),
-                EEH_Template::pretty_status($status, false, 'sentence')
-            ),
-        ];
-        try {
-            $event = $registration->event();
-        } catch (EntityNotFoundException $e) {
-            $event = null;
-        }
-        $status               = $event instanceof EE_Event
-            ? $event->get_active_status()
-            : EE_Datetime::inactive;
-        $this->_event_details = [
-            'event'      => $event,
-            'status'     => $status,
-            'id'         => $event instanceof EE_Event
-                ? $event->ID()
-                : 0,
-            'title_attr' => sprintf(
-                esc_html__('Edit Event (%s)', 'event_espresso'),
-                EEH_Template::pretty_status($status, false, 'sentence')
-            ),
-        ];
-    }
-
-
-    /**
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function _get_table_filters()
-    {
-        $filters = [];
-        // todo we're currently using old functions here. We need to move things into the Events_Admin_Page() class as
-        // methods.
-        $cur_date     = $this->request->getRequestParam('month_range', '');
-        $cur_category = $this->request->getRequestParam('EVT_CAT', -1, DataType::INTEGER);
-        $reg_status   = $this->request->getRequestParam('_reg_status', '');
-        $filters[]    = EEH_Form_Fields::generate_registration_months_dropdown($cur_date, $reg_status, $cur_category);
-        $filters[]    = EEH_Form_Fields::generate_event_category_dropdown($cur_category);
-        $status       = [];
-        $status[]     = ['id' => 0, 'text' => esc_html__('Select Status', 'event_espresso')];
-        foreach ($this->_status as $key => $value) {
-            $status[] = ['id' => $key, 'text' => $value];
-        }
-        if ($this->_view !== 'incomplete') {
-            $filters[] = EEH_Form_Fields::select_input(
-                '_reg_status',
-                $status,
-                $reg_status ? strtoupper($reg_status) : ''
-            );
-        }
-        foreach ($this->filters as $filter_key => $filter_value) {
-            $filters[] = EEH_Form_Fields::hidden_input($filter_key, $filter_value, 'reg_' . $filter_key);
-        }
-        return $filters;
-    }
-
-
-    /**
-     * @return void
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    protected function _add_view_counts()
-    {
-        $this->_views['all']['count']       = $this->_total_registrations();
-        $this->_views['today']['count']     = $this->_total_registrations_today();
-        $this->_views['yesterday']['count'] = $this->totalRegistrationsYesterday();
-        $this->_views['month']['count']     = $this->_total_registrations_this_month();
-        if ($this->caps_handler->userCanTrashRegistrations()) {
-            $this->_views['incomplete']['count'] = $this->_total_registrations('incomplete');
-            $this->_views['trash']['count']      = $this->_total_registrations('trash');
-        }
-    }
-
-
-    private function addWhereParamsForFilters(array $where = []): array
-    {
-        if ($this->EVT_ID) {
-            $where['EVT_ID'] = $this->EVT_ID;
-        }
-        if ($this->DTT_ID) {
-            $where['Ticket.Datetime.DTT_ID'] = $this->DTT_ID;
-        }
-        if ($this->TKT_ID) {
-            $where['TKT_ID'] = $this->TKT_ID;
-        }
-        return $where;
-    }
-
-
-    /**
-     * @param string $view
-     * @return int
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function _total_registrations(string $view = ''): int
-    {
-        $where = $this->addWhereParamsForFilters();
-        switch ($view) {
-            case 'trash':
-                return EEM_Registration::instance()->count_deleted([$where]);
-            case 'incomplete':
-                $where['STS_ID'] = RegStatus::INCOMPLETE;
-                break;
-            default:
-                $where['STS_ID'] = ['!=', RegStatus::INCOMPLETE];
-        }
-        return EEM_Registration::instance()->count([$where]);
-    }
-
-
-    /**
-     * @return int
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function _total_registrations_this_month(): int
-    {
-        $current_time   = current_time('timestamp');
-        $year_and_month = date('Y-m', $current_time);
-        $days_in_month  = date('t', $current_time);
-
-        $start_date = "$year_and_month-01";
-        $end_date   = "$year_and_month-$days_in_month";
-
-        return $this->totalRegistrationsForDateRange($start_date, $end_date);
-    }
-
-
-    /**
-     * @return int
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function _total_registrations_today(): int
-    {
-        $today = date('Y-m-d', current_time('timestamp'));
-        return $this->totalRegistrationsForDateRange($today, $today);
-    }
-
-
-    /**
-     * @return int
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function totalRegistrationsYesterday(): int
-    {
-        $yesterday = date('Y-m-d', current_time('timestamp') - DAY_IN_SECONDS);
-        return $this->totalRegistrationsForDateRange($yesterday, $yesterday);
-    }
-
-
-    /**
-     * @param string $start_date earlier date string in format 'Y-m-d'
-     * @param string $end_date   later date string in format 'Y-m-d'
-     * @return int
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function totalRegistrationsForDateRange(string $start_date, string $end_date): int
-    {
-        $where = $this->addWhereParamsForFilters(
-            [
-                'REG_date' => [
-                    'BETWEEN',
-                    [
-                        EEM_Registration::instance()->convert_datetime_for_query(
-                            'REG_date',
-                            "$start_date 00:00:00",
-                            'Y-m-d H:i:s'
-                        ),
-                        EEM_Registration::instance()->convert_datetime_for_query(
-                            'REG_date',
-                            "$end_date  23:59:59",
-                            'Y-m-d H:i:s'
-                        ),
-                    ],
-                ],
-                'STS_ID'   => ['!=', RegStatus::INCOMPLETE],
-            ]
-        );
-        return EEM_Registration::instance()->count([$where]);
-    }
-
-
-    /**
-     * @param EE_Registration $item
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function column_cb($item): string
-    {
-        /** checkbox/lock **/
-        $REG_ID        = $item->ID();
-        $transaction   = $item->transaction();
-        $payment_count = $transaction->count_related('Payment');
-
-        $content = '<input type="checkbox" name="_REG_ID[]" value="' . $REG_ID . '" />';
-        $content .= $payment_count > 0 || ! $this->caps_handler->userCanEditRegistration($item)
-            ? '<span class="ee-locked-entity dashicons dashicons-lock ee-aria-tooltip ee-aria-tooltip--big-box"
+	/**
+	 * @var Registrations_Admin_Page
+	 */
+	protected EE_Admin_Page $_admin_page;
+
+	protected RegistrationsListTableUserCapabilities $caps_handler;
+
+	private array $_status;
+
+	/**
+	 * An array of transaction details for the related transaction to the registration being processed.
+	 * This is set via the _set_related_details method.
+	 *
+	 * @var array
+	 */
+	protected array $_transaction_details = [];
+
+	/**
+	 * An array of event details for the related event to the registration being processed.
+	 * This is set via the _set_related_details method.
+	 *
+	 * @var array
+	 */
+	protected array $_event_details = [];
+
+	private array $filters = [];
+
+	private int $EVT_ID = 0;
+
+	private int $DTT_ID = 0;
+
+	private int $TKT_ID = 0;
+
+
+	/**
+	 * @param Registrations_Admin_Page $admin_page
+	 */
+	public function __construct(Registrations_Admin_Page $admin_page)
+	{
+		$this->caps_handler = new RegistrationsListTableUserCapabilities(EE_Registry::instance()->CAP);
+		$this->request      = $this->request ?? LoaderFactory::getShared(RequestInterface::class);
+		$this->setupFilters();
+		parent::__construct($admin_page);
+		$this->_status = $this->_admin_page->get_registration_status_array();
+	}
+
+
+	private function setupFilters()
+	{
+		// for event filtering
+		$this->EVT_ID = $this->request->getRequestParam('EVT_ID', 0, DataType::INTEGER);
+		$this->EVT_ID = $this->request->getRequestParam('event_id', $this->EVT_ID, DataType::INTEGER);
+		// for datetime filtering
+		$this->DTT_ID = $this->request->getRequestParam('DTT_ID', 0, DataType::INTEGER);
+		$this->DTT_ID = $this->request->getRequestParam('datetime_id', $this->DTT_ID, DataType::INTEGER);
+		// for ticket filtering
+		$this->TKT_ID = $this->request->getRequestParam('TKT_ID', 0, DataType::INTEGER);
+		$this->TKT_ID = $this->request->getRequestParam('ticket_id', $this->TKT_ID, DataType::INTEGER);
+
+		$filters = [
+			'event_id'    => $this->EVT_ID,
+			'datetime_id' => $this->DTT_ID,
+			'ticket_id'   => $this->TKT_ID,
+		];
+		foreach ($filters as $filter_key => $filter_value) {
+			if ($filter_value) {
+				$this->filters[ $filter_key ] = $filter_value;
+			}
+		}
+
+		add_filter(
+			'FHEE__EE_Admin_Page__get_list_table_view_RLs__extra_query_args',
+			[$this, 'filterExtraQueryArgs'],
+			10,
+			2
+		);
+	}
+
+
+	/**
+	 * @param array         $extra_query_args
+	 * @param EE_Admin_Page $admin_page
+	 * @return void
+	 * @since 5.0.13.p
+	 */
+	public function filterExtraQueryArgs(array $extra_query_args, EE_Admin_Page $admin_page): array
+	{
+		if ($admin_page instanceof Registrations_Admin_Page) {
+			foreach ($admin_page->get_views() as $view_details) {
+				foreach ($this->filters as $filter_key => $filter_value) {
+					$extra_query_args[ $view_details['slug'] ][ $filter_key ] = $filter_value;
+				}
+			}
+		}
+		return $extra_query_args;
+	}
+
+
+	/**
+	 * @return void
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function _setup_data()
+	{
+		$this->_data           = $this->_admin_page->get_registrations($this->_per_page);
+		$this->_all_data_count = $this->_admin_page->get_registrations($this->_per_page, true);
+	}
+
+
+	/**
+	 * @return void
+	 */
+	protected function _set_properties()
+	{
+		$this->_wp_list_args = [
+			'singular' => esc_html__('registration', 'event_espresso'),
+			'plural'   => esc_html__('registrations', 'event_espresso'),
+			'ajax'     => true,
+			'screen'   => $this->_admin_page->get_current_screen()->id,
+		];
+
+		if ($this->EVT_ID) {
+			$this->_columns = [
+				'cb'               => '<input type="checkbox" />', // Render a checkbox instead of text
+				'id'               => esc_html__('ID', 'event_espresso'),
+				'ATT_fname'        => esc_html__('Name', 'event_espresso'),
+				'ATT_email'        => esc_html__('Email', 'event_espresso'),
+				'_REG_date'        => esc_html__('Reg Date', 'event_espresso'),
+				'REG_ticket'       => esc_html__('Ticket', 'event_espresso'),
+				'_REG_final_price' => esc_html__('Price', 'event_espresso'),
+				'_REG_paid'        => esc_html__('REG Paid', 'event_espresso'),
+				'TXN_total'        => esc_html__('TXN Paid/Total', 'event_espresso'),
+				'actions'          => $this->actionsColumnHeader(),
+			];
+		} elseif ($this->TKT_ID) {
+			$this->_columns = [
+				'cb'               => '<input type="checkbox" />', // Render a checkbox instead of text
+				'id'               => esc_html__('ID', 'event_espresso'),
+				'ATT_fname'        => esc_html__('Name', 'event_espresso'),
+				'ATT_email'        => esc_html__('Email', 'event_espresso'),
+				'_REG_date'        => esc_html__('Reg Date', 'event_espresso'),
+				'_REG_final_price' => esc_html__('Price', 'event_espresso'),
+				'_REG_paid'        => esc_html__('REG Paid', 'event_espresso'),
+				'TXN_total'        => esc_html__('TXN Paid/Total', 'event_espresso'),
+				'actions'          => $this->actionsColumnHeader(),
+			];
+		} else {
+			$this->_columns = [
+				'cb'               => '<input type="checkbox" />', // Render a checkbox instead of text
+				'id'               => esc_html__('ID', 'event_espresso'),
+				'ATT_fname'        => esc_html__('Name', 'event_espresso'),
+				'_REG_date'        => esc_html__('Reg Date', 'event_espresso'),
+				'event_name'       => esc_html__('Event', 'event_espresso'),
+				'DTT_EVT_start'    => esc_html__('Event Date', 'event_espresso'),
+				'REG_ticket'       => esc_html__('Ticket', 'event_espresso'),
+				'_REG_final_price' => esc_html__('Price', 'event_espresso'),
+				'_REG_paid'        => esc_html__('REG Paid', 'event_espresso'),
+				'TXN_total'        => esc_html__('TXN Paid/Total', 'event_espresso'),
+				'actions'          => $this->actionsColumnHeader(),
+			];
+		}
+
+		$this->_primary_column   = 'id';
+		$this->_sortable_columns = [
+			'_REG_date'     => ['_REG_date' => true],   // true means its already sorted
+			/**
+			 * Allows users to change the default sort if they wish.
+			 * Returning a falsey on this filter will result in the default sort to be by firstname rather than last
+			 * name.
+			 */
+			'ATT_fname'     => [
+				'FHEE__EE_Registrations_List_Table___set_properties__default_sort_by_registration_last_name',
+				true,
+				$this,
+			]
+				? ['ATT_lname' => false]
+				: ['ATT_fname' => false],
+			'event_name'    => ['event_name' => false],
+			'DTT_EVT_start' => ['DTT_EVT_start' => false],
+			'id'            => ['REG_ID' => false],
+		];
+		$this->_hidden_columns   = [];
+
+		$csv_report = RegistrationsCsvReportParams::getRequestParams(
+			$this->getReturnUrl(),
+			$this->_admin_page->get_request_data(),
+			$this->EVT_ID,
+			$this->DTT_ID
+		);
+		if (! empty($csv_report)) {
+			$this->_bottom_buttons['csv_reg_report'] = $csv_report;
+		}
+	}
+
+
+	/**
+	 * This simply sets up the row class for the table rows.
+	 * Allows for easier overriding of child methods for setting up sorting.
+	 *
+	 * @param EE_Registration $item the current item
+	 * @return string
+	 */
+	protected function _get_row_class($item): string
+	{
+		$class = parent::_get_row_class($item);
+		if ($this->_has_checkbox_column) {
+			$class .= ' has-checkbox-column';
+		}
+		return $class;
+	}
+
+
+	/**
+	 * Set the $_transaction_details property if not set yet.
+	 *
+	 * @param EE_Registration $registration
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	protected function _set_related_details(EE_Registration $registration)
+	{
+		$transaction                = $registration->transaction();
+		$status                     = $transaction->status_ID();
+		$this->_transaction_details = [
+			'transaction' => $transaction,
+			'status'      => $status,
+			'id'          => $transaction->ID(),
+			'title_attr'  => sprintf(
+				esc_html__('View Transaction Details (%s)', 'event_espresso'),
+				EEH_Template::pretty_status($status, false, 'sentence')
+			),
+		];
+		try {
+			$event = $registration->event();
+		} catch (EntityNotFoundException $e) {
+			$event = null;
+		}
+		$status               = $event instanceof EE_Event
+			? $event->get_active_status()
+			: EE_Datetime::inactive;
+		$this->_event_details = [
+			'event'      => $event,
+			'status'     => $status,
+			'id'         => $event instanceof EE_Event
+				? $event->ID()
+				: 0,
+			'title_attr' => sprintf(
+				esc_html__('Edit Event (%s)', 'event_espresso'),
+				EEH_Template::pretty_status($status, false, 'sentence')
+			),
+		];
+	}
+
+
+	/**
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function _get_table_filters()
+	{
+		$filters = [];
+		// todo we're currently using old functions here. We need to move things into the Events_Admin_Page() class as
+		// methods.
+		$cur_date     = $this->request->getRequestParam('month_range', '');
+		$cur_category = $this->request->getRequestParam('EVT_CAT', -1, DataType::INTEGER);
+		$reg_status   = $this->request->getRequestParam('_reg_status', '');
+		$filters[]    = EEH_Form_Fields::generate_registration_months_dropdown($cur_date, $reg_status, $cur_category);
+		$filters[]    = EEH_Form_Fields::generate_event_category_dropdown($cur_category);
+		$status       = [];
+		$status[]     = ['id' => 0, 'text' => esc_html__('Select Status', 'event_espresso')];
+		foreach ($this->_status as $key => $value) {
+			$status[] = ['id' => $key, 'text' => $value];
+		}
+		if ($this->_view !== 'incomplete') {
+			$filters[] = EEH_Form_Fields::select_input(
+				'_reg_status',
+				$status,
+				$reg_status ? strtoupper($reg_status) : ''
+			);
+		}
+		foreach ($this->filters as $filter_key => $filter_value) {
+			$filters[] = EEH_Form_Fields::hidden_input($filter_key, $filter_value, 'reg_' . $filter_key);
+		}
+		return $filters;
+	}
+
+
+	/**
+	 * @return void
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	protected function _add_view_counts()
+	{
+		$this->_views['all']['count']       = $this->_total_registrations();
+		$this->_views['today']['count']     = $this->_total_registrations_today();
+		$this->_views['yesterday']['count'] = $this->totalRegistrationsYesterday();
+		$this->_views['month']['count']     = $this->_total_registrations_this_month();
+		if ($this->caps_handler->userCanTrashRegistrations()) {
+			$this->_views['incomplete']['count'] = $this->_total_registrations('incomplete');
+			$this->_views['trash']['count']      = $this->_total_registrations('trash');
+		}
+	}
+
+
+	private function addWhereParamsForFilters(array $where = []): array
+	{
+		if ($this->EVT_ID) {
+			$where['EVT_ID'] = $this->EVT_ID;
+		}
+		if ($this->DTT_ID) {
+			$where['Ticket.Datetime.DTT_ID'] = $this->DTT_ID;
+		}
+		if ($this->TKT_ID) {
+			$where['TKT_ID'] = $this->TKT_ID;
+		}
+		return $where;
+	}
+
+
+	/**
+	 * @param string $view
+	 * @return int
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function _total_registrations(string $view = ''): int
+	{
+		$where = $this->addWhereParamsForFilters();
+		switch ($view) {
+			case 'trash':
+				return EEM_Registration::instance()->count_deleted([$where]);
+			case 'incomplete':
+				$where['STS_ID'] = RegStatus::INCOMPLETE;
+				break;
+			default:
+				$where['STS_ID'] = ['!=', RegStatus::INCOMPLETE];
+		}
+		return EEM_Registration::instance()->count([$where]);
+	}
+
+
+	/**
+	 * @return int
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function _total_registrations_this_month(): int
+	{
+		$current_time   = current_time('timestamp');
+		$year_and_month = date('Y-m', $current_time);
+		$days_in_month  = date('t', $current_time);
+
+		$start_date = "$year_and_month-01";
+		$end_date   = "$year_and_month-$days_in_month";
+
+		return $this->totalRegistrationsForDateRange($start_date, $end_date);
+	}
+
+
+	/**
+	 * @return int
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function _total_registrations_today(): int
+	{
+		$today = date('Y-m-d', current_time('timestamp'));
+		return $this->totalRegistrationsForDateRange($today, $today);
+	}
+
+
+	/**
+	 * @return int
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function totalRegistrationsYesterday(): int
+	{
+		$yesterday = date('Y-m-d', current_time('timestamp') - DAY_IN_SECONDS);
+		return $this->totalRegistrationsForDateRange($yesterday, $yesterday);
+	}
+
+
+	/**
+	 * @param string $start_date earlier date string in format 'Y-m-d'
+	 * @param string $end_date   later date string in format 'Y-m-d'
+	 * @return int
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function totalRegistrationsForDateRange(string $start_date, string $end_date): int
+	{
+		$where = $this->addWhereParamsForFilters(
+			[
+				'REG_date' => [
+					'BETWEEN',
+					[
+						EEM_Registration::instance()->convert_datetime_for_query(
+							'REG_date',
+							"$start_date 00:00:00",
+							'Y-m-d H:i:s'
+						),
+						EEM_Registration::instance()->convert_datetime_for_query(
+							'REG_date',
+							"$end_date  23:59:59",
+							'Y-m-d H:i:s'
+						),
+					],
+				],
+				'STS_ID'   => ['!=', RegStatus::INCOMPLETE],
+			]
+		);
+		return EEM_Registration::instance()->count([$where]);
+	}
+
+
+	/**
+	 * @param EE_Registration $item
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function column_cb($item): string
+	{
+		/** checkbox/lock **/
+		$REG_ID        = $item->ID();
+		$transaction   = $item->transaction();
+		$payment_count = $transaction->count_related('Payment');
+
+		$content = '<input type="checkbox" name="_REG_ID[]" value="' . $REG_ID . '" />';
+		$content .= $payment_count > 0 || ! $this->caps_handler->userCanEditRegistration($item)
+			? '<span class="ee-locked-entity dashicons dashicons-lock ee-aria-tooltip ee-aria-tooltip--big-box"
                     aria-label="' . $this->lockedRegMessage() . '"></span>'
-            : '';
-        return $this->columnContent('cb', $content, 'center');
-    }
-
-
-    private function lockedRegMessage(): string
-    {
-        return esc_html__(
-            'This lock-icon means that this registration cannot be trashed.  Registrations that belong to a transaction that has payments cannot be trashed.  If you wish to trash this registration then you must delete all payments attached to the related transaction first.',
-            'event_espresso'
-        );
-    }
-
-
-    /**
-     * @param EE_Registration $registration
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function column_id(EE_Registration $registration): string
-    {
-        $content = '<span class="ee-entity-id">' . $registration->ID() . '</span>';
-        $content .= '<span class="show-on-mobile-view-only">';
-        $content .= $this->column_ATT_fname($registration, false);
-        $content .= '</span>';
-
-        return $this->columnContent('id', $content, 'end');
-    }
-
-
-    /**
-     * @param EE_Registration $registration
-     * @param bool            $prep_content
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function column_ATT_fname(EE_Registration $registration, bool $prep_content = true): string
-    {
-        $status         = esc_attr($registration->status_ID());
-        $pretty_status  = EEH_Template::pretty_status($status, false, 'sentence');
-        $prime_reg_star = $registration->count() === 1
-            ? '<sup><span class="dashicons dashicons-star-filled gold-icon"></span></sup>'
-            : '';
-
-        $group_count = '
+			: '';
+		return $this->columnContent('cb', $content, 'center');
+	}
+
+
+	private function lockedRegMessage(): string
+	{
+		return esc_html__(
+			'This lock-icon means that this registration cannot be trashed.  Registrations that belong to a transaction that has payments cannot be trashed.  If you wish to trash this registration then you must delete all payments attached to the related transaction first.',
+			'event_espresso'
+		);
+	}
+
+
+	/**
+	 * @param EE_Registration $registration
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function column_id(EE_Registration $registration): string
+	{
+		$content = '<span class="ee-entity-id">' . $registration->ID() . '</span>';
+		$content .= '<span class="show-on-mobile-view-only">';
+		$content .= $this->column_ATT_fname($registration, false);
+		$content .= '</span>';
+
+		return $this->columnContent('id', $content, 'end');
+	}
+
+
+	/**
+	 * @param EE_Registration $registration
+	 * @param bool            $prep_content
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function column_ATT_fname(EE_Registration $registration, bool $prep_content = true): string
+	{
+		$status         = esc_attr($registration->status_ID());
+		$pretty_status  = EEH_Template::pretty_status($status, false, 'sentence');
+		$prime_reg_star = $registration->count() === 1
+			? '<sup><span class="dashicons dashicons-star-filled gold-icon"></span></sup>'
+			: '';
+
+		$group_count = '
             <span class="reg-count-group-size" >
                 ' . sprintf(
-                esc_html__('(%1$s / %2$s)', 'event_espresso'),
-                $registration->count(),
-                $registration->group_size()
-            ) . '
+				esc_html__('(%1$s / %2$s)', 'event_espresso'),
+				$registration->count(),
+				$registration->group_size()
+			) . '
             </span >';
 
-        $content = '
+		$content = '
         <div class="ee-layout-row">
             <span aria-label="' . $pretty_status . '"
                   class="ee-status-dot ee-status-bg--' . $status . ' ee-aria-tooltip"
             ></span>
             ' . $this->viewRegistrationLink($registration, $status)
-            . $prime_reg_star
-            . $group_count . '
+			. $prime_reg_star
+			. $group_count . '
             <span class="spacer"></span>
             <span>
                 ' . sprintf(
-                esc_html__('Reg Code: %s', 'event_espresso'),
-                $registration->get('REG_code')
-            ) . '
+				esc_html__('Reg Code: %s', 'event_espresso'),
+				$registration->get('REG_code')
+			) . '
             </span>
         </div>';
 
-        $url_params = ['_REG_ID' => $registration->ID()];
-        if ($this->EVT_ID) {
-            $url_params['event_id'] = $this->EVT_ID;
-        }
-        // trash/restore/delete actions
-        $actions = $this->trashRegistrationLink($registration, $url_params);
-        $actions = $this->restoreRegistrationLink($registration, $url_params, $actions);
-        $actions = $this->deleteRegistrationLink($registration, $url_params, $actions);
-
-        $content .= $this->row_actions($actions);
-
-        return $prep_content ? $this->columnContent('ATT_fname', $content) : $content;
-    }
-
-
-    /**
-     * @param EE_Registration $registration
-     * @param bool            $prep_content
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function column__REG_date(EE_Registration $registration, bool $prep_content = true): string
-    {
-        $this->_set_related_details($registration);
-        // Build row actions
-        $content = $this->viewTransactionLink(
-            $registration->transaction(),
-            $registration->get_i18n_datetime('REG_date', 'M jS Y g:i a')
-        );
-        return $prep_content ? $this->columnContent('_REG_date', $content) : $content;
-    }
-
-
-    /**
-     * @param EE_Registration $registration
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function column_event_name(EE_Registration $registration): string
-    {
-        $this->_set_related_details($registration);
-        $edit_event              = $this->editEventLink($registration);
-        $actions['event_filter'] = $this->eventFilterLink($registration);
-        return $this->columnContent(
-            'event_name',
-            $edit_event . $this->row_actions($actions)
-        );
-    }
-
-
-    /**
-     * @param EE_Registration $registration
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function column_DTT_EVT_start(EE_Registration $registration): string
-    {
-        $datetime_strings = [];
-        $ticket           = $registration->ticket();
-        if ($ticket instanceof EE_Ticket) {
-            $remove_defaults = ['default_where_conditions' => 'none'];
-            $datetimes       = $ticket->datetimes($remove_defaults);
-            foreach ($datetimes as $datetime) {
-                $datetime_strings[] = $datetime->get_i18n_datetime('DTT_EVT_start', 'M jS Y g:i a');
-            }
-            $content = $this->generateDisplayForDatetimes($datetime_strings);
-        } else {
-            $content = esc_html__('There is no ticket on this registration', 'event_espresso');
-        }
-        return $this->columnContent('DTT_EVT_start', $content);
-    }
-
-
-    /**
-     * Receives an array of datetime strings to display and converts them to the html container for the column.
-     *
-     * @param array $datetime_strings
-     * @return string
-     */
-    public function generateDisplayForDatetimes(array $datetime_strings): string
-    {
-        // get first item for initial visibility
-        $content = (string) array_shift($datetime_strings);
-        if (! empty($datetime_strings)) {
-            $content .= '
+		$url_params = ['_REG_ID' => $registration->ID()];
+		if ($this->EVT_ID) {
+			$url_params['event_id'] = $this->EVT_ID;
+		}
+		// trash/restore/delete actions
+		$actions = $this->trashRegistrationLink($registration, $url_params);
+		$actions = $this->restoreRegistrationLink($registration, $url_params, $actions);
+		$actions = $this->deleteRegistrationLink($registration, $url_params, $actions);
+
+		$content .= $this->row_actions($actions);
+
+		return $prep_content ? $this->columnContent('ATT_fname', $content) : $content;
+	}
+
+
+	/**
+	 * @param EE_Registration $registration
+	 * @param bool            $prep_content
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function column__REG_date(EE_Registration $registration, bool $prep_content = true): string
+	{
+		$this->_set_related_details($registration);
+		// Build row actions
+		$content = $this->viewTransactionLink(
+			$registration->transaction(),
+			$registration->get_i18n_datetime('REG_date', 'M jS Y g:i a')
+		);
+		return $prep_content ? $this->columnContent('_REG_date', $content) : $content;
+	}
+
+
+	/**
+	 * @param EE_Registration $registration
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function column_event_name(EE_Registration $registration): string
+	{
+		$this->_set_related_details($registration);
+		$edit_event              = $this->editEventLink($registration);
+		$actions['event_filter'] = $this->eventFilterLink($registration);
+		return $this->columnContent(
+			'event_name',
+			$edit_event . $this->row_actions($actions)
+		);
+	}
+
+
+	/**
+	 * @param EE_Registration $registration
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function column_DTT_EVT_start(EE_Registration $registration): string
+	{
+		$datetime_strings = [];
+		$ticket           = $registration->ticket();
+		if ($ticket instanceof EE_Ticket) {
+			$remove_defaults = ['default_where_conditions' => 'none'];
+			$datetimes       = $ticket->datetimes($remove_defaults);
+			foreach ($datetimes as $datetime) {
+				$datetime_strings[] = $datetime->get_i18n_datetime('DTT_EVT_start', 'M jS Y g:i a');
+			}
+			$content = $this->generateDisplayForDatetimes($datetime_strings);
+		} else {
+			$content = esc_html__('There is no ticket on this registration', 'event_espresso');
+		}
+		return $this->columnContent('DTT_EVT_start', $content);
+	}
+
+
+	/**
+	 * Receives an array of datetime strings to display and converts them to the html container for the column.
+	 *
+	 * @param array $datetime_strings
+	 * @return string
+	 */
+	public function generateDisplayForDatetimes(array $datetime_strings): string
+	{
+		// get first item for initial visibility
+		$content = (string) array_shift($datetime_strings);
+		if (! empty($datetime_strings)) {
+			$content .= '
                 <div class="ee-registration-event-datetimes-container-wrap">
                     <div class="ee-registration-event-datetimes-container__control">
                         <span class="tiny-text">' . esc_html__('Click to view additional dates', 'event_espresso') . '</span>
@@ -646,637 +646,637 @@ 
                         ' . implode("", $datetime_strings) . '
                     </div>
                 </div>';
-        }
-        return $content;
-    }
-
-
-    /**
-     * @param EE_Registration $registration
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function column_ATT_email(EE_Registration $registration): string
-    {
-        $attendee = $registration->get_first_related('Attendee');
-        $content  = ! $attendee instanceof EE_Attendee
-            ? esc_html__('No attached contact record.', 'event_espresso')
-            : $attendee->email();
-        return $this->columnContent('ATT_email', $content);
-    }
-
-
-    /**
-     * @param EE_Registration $registration
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function column__REG_count(EE_Registration $registration): string
-    {
-        $content = sprintf(
-            esc_html__('%1$s / %2$s', 'event_espresso'),
-            $registration->count(),
-            $registration->group_size()
-        );
-        return $this->columnContent('_REG_count', $content);
-    }
-
-
-    /**
-     * @param EE_Registration $registration
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function column_REG_ticket(EE_Registration $registration): string
-    {
-        $ticket = $registration->ticket();
-        $ticket_name = $this->ticketName($ticket);
-        $actions['ticket_filter'] = $this->ticketFilterLink($ticket);
-        return $this->columnContent(
-            'REG_ticket',
-            $ticket_name . $this->row_actions($actions)
-        );
-    }
-
-
-    /**
-     * @param EE_Registration $registration
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function column__REG_final_price(EE_Registration $registration): string
-    {
-        // free ticket?
-        $content = $registration->final_price() > 0
-            ? '<span class="reg-overview-paid-event-spn">' . $registration->pretty_final_price() . '</span>'
-            : '<span class="reg-overview-free-event-spn">' . esc_html__('free', 'event_espresso') . '</span>';
-        return $this->columnContent( '_REG_final_price', $content, 'end' );
-    }
-
-
-    /**
-     * @param EE_Registration $registration
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function column__REG_paid(EE_Registration $registration): string
-    {
-        $payment_method      = $registration->payment_method();
-        $payment_method_name = $payment_method instanceof EE_Payment_Method
-            ? $payment_method->admin_name()
-            : esc_html__('Unknown', 'event_espresso');
-
-        $payment_status = RegStatus::PENDING_PAYMENT;
-        $content = '<span>';
-        $icon = '';
-        $label = esc_attr__('pending payment', 'event_espresso');
-        if ($registration->paid() == $registration->final_price()) {
-            $icon = '<span class="dashicons dashicons-yes green-icon"></span> ';
-            $label = esc_attr__('paid in full', 'event_espresso');
-            $payment_status = RegStatus::APPROVED;
-        }
-        if ($registration->paid() > $registration->final_price()) {
-            $icon = '<span class="dashicons dashicons-warning orange-icon"></span> ';
-            $label = esc_attr__('overpaid', 'event_espresso');
-            $payment_status = EEM_Transaction::overpaid_status_code;
-        }
-        $content .= '
+		}
+		return $content;
+	}
+
+
+	/**
+	 * @param EE_Registration $registration
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function column_ATT_email(EE_Registration $registration): string
+	{
+		$attendee = $registration->get_first_related('Attendee');
+		$content  = ! $attendee instanceof EE_Attendee
+			? esc_html__('No attached contact record.', 'event_espresso')
+			: $attendee->email();
+		return $this->columnContent('ATT_email', $content);
+	}
+
+
+	/**
+	 * @param EE_Registration $registration
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function column__REG_count(EE_Registration $registration): string
+	{
+		$content = sprintf(
+			esc_html__('%1$s / %2$s', 'event_espresso'),
+			$registration->count(),
+			$registration->group_size()
+		);
+		return $this->columnContent('_REG_count', $content);
+	}
+
+
+	/**
+	 * @param EE_Registration $registration
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function column_REG_ticket(EE_Registration $registration): string
+	{
+		$ticket = $registration->ticket();
+		$ticket_name = $this->ticketName($ticket);
+		$actions['ticket_filter'] = $this->ticketFilterLink($ticket);
+		return $this->columnContent(
+			'REG_ticket',
+			$ticket_name . $this->row_actions($actions)
+		);
+	}
+
+
+	/**
+	 * @param EE_Registration $registration
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function column__REG_final_price(EE_Registration $registration): string
+	{
+		// free ticket?
+		$content = $registration->final_price() > 0
+			? '<span class="reg-overview-paid-event-spn">' . $registration->pretty_final_price() . '</span>'
+			: '<span class="reg-overview-free-event-spn">' . esc_html__('free', 'event_espresso') . '</span>';
+		return $this->columnContent( '_REG_final_price', $content, 'end' );
+	}
+
+
+	/**
+	 * @param EE_Registration $registration
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function column__REG_paid(EE_Registration $registration): string
+	{
+		$payment_method      = $registration->payment_method();
+		$payment_method_name = $payment_method instanceof EE_Payment_Method
+			? $payment_method->admin_name()
+			: esc_html__('Unknown', 'event_espresso');
+
+		$payment_status = RegStatus::PENDING_PAYMENT;
+		$content = '<span>';
+		$icon = '';
+		$label = esc_attr__('pending payment', 'event_espresso');
+		if ($registration->paid() == $registration->final_price()) {
+			$icon = '<span class="dashicons dashicons-yes green-icon"></span> ';
+			$label = esc_attr__('paid in full', 'event_espresso');
+			$payment_status = RegStatus::APPROVED;
+		}
+		if ($registration->paid() > $registration->final_price()) {
+			$icon = '<span class="dashicons dashicons-warning orange-icon"></span> ';
+			$label = esc_attr__('overpaid', 'event_espresso');
+			$payment_status = EEM_Transaction::overpaid_status_code;
+		}
+		$content .= '
             <span class="reg-overview-paid-event-spn ee-aria-tooltip ee-status-color--' . $payment_status . '"
                   aria-label="' . $label . '"
             >
                 ' . $icon . $registration->pretty_paid('no_currency_code') . '
             </span>
             </span>';
-        if ($registration->paid() > 0) {
-            $content .= '
+		if ($registration->paid() > 0) {
+			$content .= '
             <span class="ee-status-text-small">
                 ' . sprintf(
-                        esc_html__('...via %s', 'event_espresso'),
-                        $payment_method_name
-                    ) . '
+						esc_html__('...via %s', 'event_espresso'),
+						$payment_method_name
+					) . '
             </span>';
-        }
-        return $this->columnContent('_REG_paid', $content, 'end', 'stack');
-    }
-
-
-    /**
-     * @param EE_Registration $registration
-     * @return string
-     * @throws EE_Error
-     * @throws EntityNotFoundException
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function column_TXN_total(EE_Registration $registration): string
-    {
-        $content      = '';
-        if ($registration->count() === 1) {
-            $transaction = $registration->transaction();
-            $content     = '
+		}
+		return $this->columnContent('_REG_paid', $content, 'end', 'stack');
+	}
+
+
+	/**
+	 * @param EE_Registration $registration
+	 * @return string
+	 * @throws EE_Error
+	 * @throws EntityNotFoundException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function column_TXN_total(EE_Registration $registration): string
+	{
+		$content      = '';
+		if ($registration->count() === 1) {
+			$transaction = $registration->transaction();
+			$content     = '
             <span class="ee-status-color--' . $transaction->status_ID() . '">
                 ' . $transaction->pretty_paid('no_currency_code') . '
                 <span class="separator">/</span>
                 ' . $transaction->pretty_total('no_currency_code') . '
             </span>';
 
-            $content .= '<span class="row-actions">' . $this->viewTransactionLink($transaction) . '</span>';
-        }
-        return $this->columnContent('TXN_total', $content, 'end', 'stack');
-    }
-
-
-    /**
-     * @param EE_Registration $registration
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function column_actions(EE_Registration $registration): string
-    {
-        $attendee = $registration->attendee();
-        $this->_set_related_details($registration);
-
-        // Build and filter row actions
-        $actions = apply_filters(
-            'FHEE__EE_Registrations_List_Table__column_actions__actions',
-            [
-                'view_lnk'               => $this->viewRegistrationAction($registration),
-                'edit_lnk'               => $this->editContactAction($registration, $attendee),
-                'resend_reg_lnk'         => $this->resendRegistrationMessageAction($registration, $attendee),
-                'view_txn_lnk'           => $this->viewTransactionAction($registration->transaction()),
-                'dl_invoice_lnk'         => $this->viewTransactionInvoiceAction($registration, $attendee),
-                'filtered_messages_link' => $this->viewNotificationsAction($registration),
-            ],
-            $registration,
-            $this
-        );
-
-        $content = $this->_action_string(
-            implode('', $actions),
-            $registration,
-            'div',
-            'reg-overview-actions ee-list-table-actions'
-        );
-
-        return $this->columnContent('actions', $this->actionsModalMenu($content));
-    }
-
-
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function viewRegistrationUrl(EE_Registration $registration): string
-    {
-        return EE_Admin_Page::add_query_args_and_nonce(
-            [
-                'action'  => 'view_registration',
-                '_REG_ID' => $registration->ID(),
-            ],
-            REG_ADMIN_URL
-        );
-    }
-
-
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function viewRegistrationLink(
-        EE_Registration $registration,
-        string $status
-    ): string {
-        $attendee      = $registration->attendee();
-        $attendee_name = $attendee instanceof EE_Attendee
-            ? $attendee->full_name()
-            : '';
-        return $this->caps_handler->userCanReadRegistration($registration)
-            ? '
+			$content .= '<span class="row-actions">' . $this->viewTransactionLink($transaction) . '</span>';
+		}
+		return $this->columnContent('TXN_total', $content, 'end', 'stack');
+	}
+
+
+	/**
+	 * @param EE_Registration $registration
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function column_actions(EE_Registration $registration): string
+	{
+		$attendee = $registration->attendee();
+		$this->_set_related_details($registration);
+
+		// Build and filter row actions
+		$actions = apply_filters(
+			'FHEE__EE_Registrations_List_Table__column_actions__actions',
+			[
+				'view_lnk'               => $this->viewRegistrationAction($registration),
+				'edit_lnk'               => $this->editContactAction($registration, $attendee),
+				'resend_reg_lnk'         => $this->resendRegistrationMessageAction($registration, $attendee),
+				'view_txn_lnk'           => $this->viewTransactionAction($registration->transaction()),
+				'dl_invoice_lnk'         => $this->viewTransactionInvoiceAction($registration, $attendee),
+				'filtered_messages_link' => $this->viewNotificationsAction($registration),
+			],
+			$registration,
+			$this
+		);
+
+		$content = $this->_action_string(
+			implode('', $actions),
+			$registration,
+			'div',
+			'reg-overview-actions ee-list-table-actions'
+		);
+
+		return $this->columnContent('actions', $this->actionsModalMenu($content));
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function viewRegistrationUrl(EE_Registration $registration): string
+	{
+		return EE_Admin_Page::add_query_args_and_nonce(
+			[
+				'action'  => 'view_registration',
+				'_REG_ID' => $registration->ID(),
+			],
+			REG_ADMIN_URL
+		);
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function viewRegistrationLink(
+		EE_Registration $registration,
+		string $status
+	): string {
+		$attendee      = $registration->attendee();
+		$attendee_name = $attendee instanceof EE_Attendee
+			? $attendee->full_name()
+			: '';
+		return $this->caps_handler->userCanReadRegistration($registration)
+			? '
             <a  href="' . $this->viewRegistrationUrl($registration) . '"
                 class="row-title ee-status-color--' . $status . ' ee-aria-tooltip"
                 aria-label="' . esc_attr__('View Registration Details', 'event_espresso') . '"
             >
                 ' . $attendee_name . '
             </a>'
-            : $attendee_name;
-    }
-
-
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function viewRegistrationAction(EE_Registration $registration): string
-    {
-        return $this->caps_handler->userCanReadRegistration($registration)
-            ? '
+			: $attendee_name;
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function viewRegistrationAction(EE_Registration $registration): string
+	{
+		return $this->caps_handler->userCanReadRegistration($registration)
+			? '
             <a  href="' . $this->viewRegistrationUrl($registration) . '"
                 class="ee-aria-tooltip button button--icon-only"
                 aria-label="' . esc_attr__('View Registration Details', 'event_espresso') . '"
             >
                 <span class="dashicons dashicons-clipboard"></span>
             </a>'
-            : '';
-    }
-
-
-    protected function editContactAction(EE_Registration $registration, ?EE_Attendee $attendee = null): string
-    {
-        if ($attendee instanceof EE_Attendee && $this->caps_handler->userCanEditContacts()) {
-            $edit_link_url = EE_Admin_Page::add_query_args_and_nonce(
-                [
-                    'action' => 'edit_attendee',
-                    'post'   => $registration->attendee_ID(),
-                ],
-                REG_ADMIN_URL
-            );
-            return '
+			: '';
+	}
+
+
+	protected function editContactAction(EE_Registration $registration, ?EE_Attendee $attendee = null): string
+	{
+		if ($attendee instanceof EE_Attendee && $this->caps_handler->userCanEditContacts()) {
+			$edit_link_url = EE_Admin_Page::add_query_args_and_nonce(
+				[
+					'action' => 'edit_attendee',
+					'post'   => $registration->attendee_ID(),
+				],
+				REG_ADMIN_URL
+			);
+			return '
                 <a href="' . $edit_link_url . '"
                    aria-label="' . esc_attr__('Edit Contact Details', 'event_espresso') . '"
                    class="ee-aria-tooltip button button--secondary button--icon-only"
                 >
                     <span class="dashicons dashicons-admin-users"></span>
                 </a>';
-        }
-        return '';
-    }
-
-
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function resendRegistrationMessageAction(
-        EE_Registration $registration,
-        ?EE_Attendee $attendee = null
-    ): string {
-        if ($attendee instanceof EE_Attendee && $this->caps_handler->userCanResendMessage($registration)) {
-            $resend_reg_link_url = EE_Admin_Page::add_query_args_and_nonce(
-                [
-                    'action'  => 'resend_registration',
-                    '_REG_ID' => $registration->ID(),
-                ],
-                REG_ADMIN_URL,
-                true
-            );
-            return '
+		}
+		return '';
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function resendRegistrationMessageAction(
+		EE_Registration $registration,
+		?EE_Attendee $attendee = null
+	): string {
+		if ($attendee instanceof EE_Attendee && $this->caps_handler->userCanResendMessage($registration)) {
+			$resend_reg_link_url = EE_Admin_Page::add_query_args_and_nonce(
+				[
+					'action'  => 'resend_registration',
+					'_REG_ID' => $registration->ID(),
+				],
+				REG_ADMIN_URL,
+				true
+			);
+			return '
 			    <a href="' . $resend_reg_link_url . '" aria-label="'
-                . esc_attr__('Resend Registration Details', 'event_espresso')
-                . '" class="ee-aria-tooltip button button--icon-only">
+				. esc_attr__('Resend Registration Details', 'event_espresso')
+				. '" class="ee-aria-tooltip button button--icon-only">
 			        <span class="dashicons dashicons-email-alt"></span>
 			    </a>';
-        }
-        return '';
-    }
-
-
-    /**
-     * @param EE_Transaction $transaction
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function viewTransactionUrl(EE_Transaction $transaction): string
-    {
-        return EE_Admin_Page::add_query_args_and_nonce(
-            [
-                'action' => 'view_transaction',
-                'TXN_ID' => $transaction->ID(),
-            ],
-            TXN_ADMIN_URL
-        );
-    }
-
-
-    /**
-     * @param EE_Transaction $transaction
-     * @param string         $link_text
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @since 5.0.18.p
-     */
-    protected function viewTransactionLink(EE_Transaction $transaction, string $link_text = ''): string
-    {
-        if ($this->caps_handler->userCanViewTransaction()) {
-            $link_text = $link_text ?: '<span class="dashicons dashicons-cart"></span> '
-                . esc_html__('View Transaction', 'event_espresso');
-            return '
+		}
+		return '';
+	}
+
+
+	/**
+	 * @param EE_Transaction $transaction
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function viewTransactionUrl(EE_Transaction $transaction): string
+	{
+		return EE_Admin_Page::add_query_args_and_nonce(
+			[
+				'action' => 'view_transaction',
+				'TXN_ID' => $transaction->ID(),
+			],
+			TXN_ADMIN_URL
+		);
+	}
+
+
+	/**
+	 * @param EE_Transaction $transaction
+	 * @param string         $link_text
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @since 5.0.18.p
+	 */
+	protected function viewTransactionLink(EE_Transaction $transaction, string $link_text = ''): string
+	{
+		if ($this->caps_handler->userCanViewTransaction()) {
+			$link_text = $link_text ?: '<span class="dashicons dashicons-cart"></span> '
+				. esc_html__('View Transaction', 'event_espresso');
+			return '
             <a class="ee-reg-list-txn-link ee-aria-tooltip ee-status-color--' . $transaction->status_ID() . '"
                 href="' . $this->viewTransactionUrl($transaction) . '"
                 aria-label="' . esc_attr__('View Transaction', 'event_espresso') . '"
             >
                 ' . $link_text . '
             </a>';
-        }
-        return $link_text;
-    }
-
-
-    /**
-     * @param EE_Transaction $transaction
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function viewTransactionAction(EE_Transaction $transaction): string
-    {
-        if ($this->caps_handler->userCanViewTransaction()) {
-            return '
+		}
+		return $link_text;
+	}
+
+
+	/**
+	 * @param EE_Transaction $transaction
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function viewTransactionAction(EE_Transaction $transaction): string
+	{
+		if ($this->caps_handler->userCanViewTransaction()) {
+			return '
                 <a class="ee-aria-tooltip button button--icon-only"
                    href="' . $this->viewTransactionUrl($transaction) . '"
                    aria-label="' . sprintf(
-                    esc_html__('View Transaction Details (%s)', 'event_espresso'),
-                    EEH_Template::pretty_status($transaction->status_ID(), false, 'sentence')
-                ) . '"
+					esc_html__('View Transaction Details (%s)', 'event_espresso'),
+					EEH_Template::pretty_status($transaction->status_ID(), false, 'sentence')
+				) . '"
                 >
                     <span class="dashicons dashicons-cart"></span>
                 </a>';
-        }
-        return '';
-    }
-
-
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function viewTransactionInvoiceAction(
-        EE_Registration $registration,
-        ?EE_Attendee $attendee = null
-    ): string {
-        // only show invoice link if message type is active.
-        if (
-            $attendee instanceof EE_Attendee
-            && $registration->is_primary_registrant()
-            && EEH_MSG_Template::is_mt_active('invoice')
-        ) {
-            return '
+		}
+		return '';
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function viewTransactionInvoiceAction(
+		EE_Registration $registration,
+		?EE_Attendee $attendee = null
+	): string {
+		// only show invoice link if message type is active.
+		if (
+			$attendee instanceof EE_Attendee
+			&& $registration->is_primary_registrant()
+			&& EEH_MSG_Template::is_mt_active('invoice')
+		) {
+			return '
                 <a aria-label="' . esc_attr__('View Transaction Invoice', 'event_espresso')
-                . '" target="_blank" href="' . $registration->invoice_url() . '" class="ee-aria-tooltip button button--icon-only">
+				. '" target="_blank" href="' . $registration->invoice_url() . '" class="ee-aria-tooltip button button--icon-only">
                     <span class="dashicons dashicons-media-spreadsheet"></span>
                 </a>';
-        }
-        return '';
-    }
-
-
-    /**
-     * @throws ReflectionException
-     * @throws EE_Error
-     */
-    protected function viewNotificationsAction(EE_Registration $registration): string
-    {
-        // message list table link (filtered by REG_ID
-        return $this->caps_handler->userCanReadGlobalMessages()
-            ? EEH_MSG_Template::get_message_action_link(
-                'see_notifications_for',
-                null,
-                ['_REG_ID' => $registration->ID()]
-            )
-            : '';
-    }
-
-
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function trashRegistrationLink(
-        EE_Registration $registration,
-        array $url_params
-    ): array {
-        $actions = [];
-        // can't trash what's already trashed
-        if ($this->_view === 'trash') {
-            return $actions;
-        }
-
-        // check caps
-        if (! $this->caps_handler->userCanTrashRegistration($registration)) {
-            return $actions;
-        }
-
-        // don't delete registrations that have payments applied
-        $transaction   = $registration->transaction();
-        $payment_count = $transaction instanceof EE_Transaction
-            ? $transaction->count_related('Payment')
-            : 0;
-
-        if ($payment_count > 0) {
-            return $actions;
-        }
-
-        $url_params['action'] = 'trash_registrations';
-        $trash_link_url       = EE_Admin_Page::add_query_args_and_nonce($url_params, REG_ADMIN_URL);
-        $actions['trash']     = '
+		}
+		return '';
+	}
+
+
+	/**
+	 * @throws ReflectionException
+	 * @throws EE_Error
+	 */
+	protected function viewNotificationsAction(EE_Registration $registration): string
+	{
+		// message list table link (filtered by REG_ID
+		return $this->caps_handler->userCanReadGlobalMessages()
+			? EEH_MSG_Template::get_message_action_link(
+				'see_notifications_for',
+				null,
+				['_REG_ID' => $registration->ID()]
+			)
+			: '';
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function trashRegistrationLink(
+		EE_Registration $registration,
+		array $url_params
+	): array {
+		$actions = [];
+		// can't trash what's already trashed
+		if ($this->_view === 'trash') {
+			return $actions;
+		}
+
+		// check caps
+		if (! $this->caps_handler->userCanTrashRegistration($registration)) {
+			return $actions;
+		}
+
+		// don't delete registrations that have payments applied
+		$transaction   = $registration->transaction();
+		$payment_count = $transaction instanceof EE_Transaction
+			? $transaction->count_related('Payment')
+			: 0;
+
+		if ($payment_count > 0) {
+			return $actions;
+		}
+
+		$url_params['action'] = 'trash_registrations';
+		$trash_link_url       = EE_Admin_Page::add_query_args_and_nonce($url_params, REG_ADMIN_URL);
+		$actions['trash']     = '
             <a class="ee-aria-tooltip"
                 href="' . $trash_link_url . '"
                 aria-label="' . esc_attr__('Trash Registration', 'event_espresso') . '"
             >
                 ' . esc_html__('Trash', 'event_espresso') . '
             </a>';
-        return $actions;
-    }
-
-
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function restoreRegistrationLink(
-        EE_Registration $registration,
-        array $url_params,
-        array $actions
-    ): array {
-        // can't restore what's not trashed
-        if ($this->_view !== 'trash') {
-            return $actions;
-        }
-
-        // restore registration link
-        if ($this->caps_handler->userCanRestoreRegistration($registration)) {
-            $url_params['action'] = 'restore_registrations';
-            $restore_link_url     = EE_Admin_Page::add_query_args_and_nonce($url_params, REG_ADMIN_URL);
-            $actions['restore']   = '
+		return $actions;
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function restoreRegistrationLink(
+		EE_Registration $registration,
+		array $url_params,
+		array $actions
+	): array {
+		// can't restore what's not trashed
+		if ($this->_view !== 'trash') {
+			return $actions;
+		}
+
+		// restore registration link
+		if ($this->caps_handler->userCanRestoreRegistration($registration)) {
+			$url_params['action'] = 'restore_registrations';
+			$restore_link_url     = EE_Admin_Page::add_query_args_and_nonce($url_params, REG_ADMIN_URL);
+			$actions['restore']   = '
                 <a class="ee-aria-tooltip"
                     href="' . $restore_link_url . '"
                     aria-label="' . esc_attr__('Restore Registration', 'event_espresso') . '"
                 >
                     ' . esc_html__('Restore', 'event_espresso') . '
                 </a>';
-        }
-
-        return $actions;
-    }
-
-
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function deleteRegistrationLink(
-        EE_Registration $registration,
-        array $url_params,
-        array $actions
-    ): array {
-        if ($this->_view === 'trash' && $this->caps_handler->userCanDeleteRegistration($registration)) {
-            $url_params['action'] = 'delete_registrations';
-            $delete_link_url      = EE_Admin_Page::add_query_args_and_nonce($url_params, REG_ADMIN_URL);
-            $actions['delete']    = '
+		}
+
+		return $actions;
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function deleteRegistrationLink(
+		EE_Registration $registration,
+		array $url_params,
+		array $actions
+	): array {
+		if ($this->_view === 'trash' && $this->caps_handler->userCanDeleteRegistration($registration)) {
+			$url_params['action'] = 'delete_registrations';
+			$delete_link_url      = EE_Admin_Page::add_query_args_and_nonce($url_params, REG_ADMIN_URL);
+			$actions['delete']    = '
                 <a class="ee-aria-tooltip"
                     href="' . $delete_link_url . '"
                     aria-label="' . esc_attr__('Delete Registration Permanently', 'event_espresso') . '"
                 >
                     ' . esc_html__('Delete', 'event_espresso') . '
                 </a>';
-        }
-        return $actions;
-    }
-
-
-    protected function editEventLink(EE_Registration $registration): string
-    {
-        $EVT_ID     = $registration->event_ID();
-        $event_name = $this->eventName($registration);
-        if (! $EVT_ID || ! $this->caps_handler->userCanEditEvent($EVT_ID)) {
-            return $event_name;
-        }
-        $edit_event_url = EE_Admin_Page::add_query_args_and_nonce(
-            ['action' => 'edit', 'post' => $EVT_ID],
-            EVENTS_ADMIN_URL
-        );
-        return '
+		}
+		return $actions;
+	}
+
+
+	protected function editEventLink(EE_Registration $registration): string
+	{
+		$EVT_ID     = $registration->event_ID();
+		$event_name = $this->eventName($registration);
+		if (! $EVT_ID || ! $this->caps_handler->userCanEditEvent($EVT_ID)) {
+			return $event_name;
+		}
+		$edit_event_url = EE_Admin_Page::add_query_args_and_nonce(
+			['action' => 'edit', 'post' => $EVT_ID],
+			EVENTS_ADMIN_URL
+		);
+		return '
             <a class="ee-aria-tooltip ee-status-color--' . $this->_event_details['status'] . '"
                 href="' . $edit_event_url . '"
                 aria-label="' . esc_attr($this->_event_details['title_attr']) . '"
             >
                 ' . $event_name . '
             </a>';
-    }
+	}
 
 
-    protected function eventName(EE_Registration $registration): string
-    {
-        $event_name = $registration->event_name();
-        $event_name = $event_name ?: esc_html__("No Associated Event", 'event_espresso');
-        return wp_trim_words($event_name, 30, '...');
-    }
+	protected function eventName(EE_Registration $registration): string
+	{
+		$event_name = $registration->event_name();
+		$event_name = $event_name ?: esc_html__("No Associated Event", 'event_espresso');
+		return wp_trim_words($event_name, 30, '...');
+	}
 
 
-    protected function eventFilterLink(EE_Registration $registration): string
-    {
-        $event_filter_url = EE_Admin_Page::add_query_args_and_nonce(
-            ['event_id' => $registration->event_ID()],
-            REG_ADMIN_URL
-        );
-        return '
+	protected function eventFilterLink(EE_Registration $registration): string
+	{
+		$event_filter_url = EE_Admin_Page::add_query_args_and_nonce(
+			['event_id' => $registration->event_ID()],
+			REG_ADMIN_URL
+		);
+		return '
             <a  class="ee-aria-tooltip ee-event-filter-link"
                 href="' . $event_filter_url . '"
                 aria-label="' . sprintf(
-                    esc_attr__('Filter this list to only show registrations for %s', 'event_espresso'),
-                    $this->eventName($registration)
-                ) . '"
+					esc_attr__('Filter this list to only show registrations for %s', 'event_espresso'),
+					$this->eventName($registration)
+				) . '"
             >
                 <span class="dashicons dashicons-groups dashicons--small"></span>'
-                . esc_html__('View Registrations', 'event_espresso') . '
+				. esc_html__('View Registrations', 'event_espresso') . '
             </a>';
-    }
-
-
-    /**
-     * @param EE_Ticket $ticket
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @since 5.0.18.p
-     */
-    protected function ticketName(EE_Ticket $ticket): string
-    {
-        return '<span class="TKT_name ee-status-color--' . $ticket->ticket_status() . '">' . $ticket->name() . '</span>';
-    }
-
-
-    /**
-     * @param EE_Ticket $ticket
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @since 5.0.18.p
-     */
-    protected function ticketFilterLink(EE_Ticket $ticket): string
-    {
-        $ticket_filter_url = EE_Admin_Page::add_query_args_and_nonce(['ticket_id' => $ticket->ID()], REG_ADMIN_URL);
-        return '
+	}
+
+
+	/**
+	 * @param EE_Ticket $ticket
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @since 5.0.18.p
+	 */
+	protected function ticketName(EE_Ticket $ticket): string
+	{
+		return '<span class="TKT_name ee-status-color--' . $ticket->ticket_status() . '">' . $ticket->name() . '</span>';
+	}
+
+
+	/**
+	 * @param EE_Ticket $ticket
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @since 5.0.18.p
+	 */
+	protected function ticketFilterLink(EE_Ticket $ticket): string
+	{
+		$ticket_filter_url = EE_Admin_Page::add_query_args_and_nonce(['ticket_id' => $ticket->ID()], REG_ADMIN_URL);
+		return '
             <a  class="ee-aria-tooltip ee-ticket-filter-link"
                 href="' . $ticket_filter_url . '"
                 aria-label="' . sprintf(
-                esc_attr__('Filter this list to only show registrations for ticket %s', 'event_espresso'),
-                $ticket->name()
-            ) . '"
+				esc_attr__('Filter this list to only show registrations for ticket %s', 'event_espresso'),
+				$ticket->name()
+			) . '"
             >
                 <span class="dashicons dashicons-groups dashicons--small"></span>'
-                . esc_html__('View Registrations', 'event_espresso') . '
+				. esc_html__('View Registrations', 'event_espresso') . '
             </a>';
-    }
-
-
-    /**
-     * @param EE_Registration $registration
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @deprecated 5.0.18.p
-     */
-    public function column_TXN_paid(EE_Registration $registration): string
-    {
-        $transaction = $registration->transaction();
-        $content = $transaction->pretty_paid();
-        if ($transaction->paid() >= $transaction->total()) {
-            $content .= '<span class="dashicons dashicons-yes green-icon"></span>';
-        }
-        $content .= $this->viewTransactionLink($transaction);
-        return $this->columnContent('TXN_paid', $content, 'end');
-    }
-
-
-    /**
-     * @param EE_Registration $registration
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @deprecated 5.0.18.p
-     */
-    public function column_PRC_amount(EE_Registration $registration): string
-    {
-        $ticket = $registration->ticket();
-
-        $content = $this->EVT_ID && $ticket instanceof EE_Ticket
-            ? '<div class="TKT_name">' . $ticket->name() . '</div>'
-            : '';
-
-        $payment_status = $registration->owes_monies_and_can_pay() ? 'TFL' : 'TCM';
-        $content        .= $registration->final_price() > 0
-            ? '<span class="reg-overview-paid-event-spn ee-status-color--' . $payment_status . '">
+	}
+
+
+	/**
+	 * @param EE_Registration $registration
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @deprecated 5.0.18.p
+	 */
+	public function column_TXN_paid(EE_Registration $registration): string
+	{
+		$transaction = $registration->transaction();
+		$content = $transaction->pretty_paid();
+		if ($transaction->paid() >= $transaction->total()) {
+			$content .= '<span class="dashicons dashicons-yes green-icon"></span>';
+		}
+		$content .= $this->viewTransactionLink($transaction);
+		return $this->columnContent('TXN_paid', $content, 'end');
+	}
+
+
+	/**
+	 * @param EE_Registration $registration
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @deprecated 5.0.18.p
+	 */
+	public function column_PRC_amount(EE_Registration $registration): string
+	{
+		$ticket = $registration->ticket();
+
+		$content = $this->EVT_ID && $ticket instanceof EE_Ticket
+			? '<div class="TKT_name">' . $ticket->name() . '</div>'
+			: '';
+
+		$payment_status = $registration->owes_monies_and_can_pay() ? 'TFL' : 'TCM';
+		$content        .= $registration->final_price() > 0
+			? '<span class="reg-overview-paid-event-spn ee-status-color--' . $payment_status . '">
                 ' . $registration->pretty_final_price() . '
                </span>'
-            // free event
-            : '<span class="reg-overview-free-event-spn">' . esc_html__('free', 'event_espresso') . '</span>';
+			// free event
+			: '<span class="reg-overview-free-event-spn">' . esc_html__('free', 'event_espresso') . '</span>';
 
-        return $this->columnContent('PRC_amount', $content, 'end');
-    }
+		return $this->columnContent('PRC_amount', $content, 'end');
+	}
 }

admin_pages/about/templates/credits.template.php

Indentation +89 added lines, -89 removed lines

@@ -3,67 +3,67 @@ 
 use EventEspresso\core\services\request\sanitizers\AllowedTags;
 
 $tEEm_members = [
-    esc_html__('Founders', 'event_espresso') => [
-        'garth-koyle' => [
-            'email' => 'garth@eventespresso.com',
-            'name'  => 'Garth Koyle',
-            'desc'  => esc_html__('Co-Founder', 'event_espresso'),
-        ],
-    ],
-    esc_html__('Core Developers', 'event_espresso') => [
-        'brent-christensen' => [
-            'email' => 'brent@eventespresso.com',
-            'name'  => 'Brent Christensen',
-            'desc'  => esc_html__('Lead Developer', 'event_espresso'),
-        ],
-        'nazar-kolivoshka' => [
-            'email' => 'nazar@eventespresso.com',
-            'name'  => 'Nazar Kolivoshka',
-            'desc'  => esc_html__('Core Developer', 'event_espresso'),
-        ],
-        'alex' => [
-            'email' => 'alex@eventespresso.com',
-            'name'  => 'Alexander Kucheryuk',
-            'desc'  => esc_html__('Core Developer', 'event_espresso'),
-        ],
-    ],
-    esc_html__('Support Staff', 'event_espresso') => [
-        'tony-warwick' => [
-            'email' => 'tony@eventespresso.com',
-            'name'  => 'Tony Warwick',
-            'desc'  => esc_html__('Support Lead', 'event_espresso'),
-        ],
-        'janice-gutierrez' => [
-            'email' => 'janice@eventespresso.com',
-            'name'  => 'Janice Gutierrez',
-            'desc'  => esc_html__('Support', 'event_espresso'),
-        ],
-        'chinny-love-verana' => [
-            'email' => 'chinny@eventespresso.com',
-            'name'  => 'Chinny Love Verana',
-            'desc'  => esc_html__('Sales & Support', 'event_espresso'),
-        ],
-        'kimiko-catherine-sy' => [
-            'email' => 'kimiko@eventespresso.com',
-            'name'  => 'Kimiko Catherine Sy',
-            'desc'  => esc_html__('Sales & Support', 'event_espresso'),
-        ],
-        'sam' => [
-            'email' => 'sam@eventespresso.com',
-            'name'  => 'Sam',
-            'desc'  => esc_html__('Support & QA', 'event_espresso'),
-        ],
-        'rio-michael-miranda' => [
-            'email' => 'rio@eventespresso.com',
-            'name'  => 'Rio Michael Miranda',
-            'desc'  => esc_html__('Support & QA', 'event_espresso'),
-        ],
-    ],
+	esc_html__('Founders', 'event_espresso') => [
+		'garth-koyle' => [
+			'email' => 'garth@eventespresso.com',
+			'name'  => 'Garth Koyle',
+			'desc'  => esc_html__('Co-Founder', 'event_espresso'),
+		],
+	],
+	esc_html__('Core Developers', 'event_espresso') => [
+		'brent-christensen' => [
+			'email' => 'brent@eventespresso.com',
+			'name'  => 'Brent Christensen',
+			'desc'  => esc_html__('Lead Developer', 'event_espresso'),
+		],
+		'nazar-kolivoshka' => [
+			'email' => 'nazar@eventespresso.com',
+			'name'  => 'Nazar Kolivoshka',
+			'desc'  => esc_html__('Core Developer', 'event_espresso'),
+		],
+		'alex' => [
+			'email' => 'alex@eventespresso.com',
+			'name'  => 'Alexander Kucheryuk',
+			'desc'  => esc_html__('Core Developer', 'event_espresso'),
+		],
+	],
+	esc_html__('Support Staff', 'event_espresso') => [
+		'tony-warwick' => [
+			'email' => 'tony@eventespresso.com',
+			'name'  => 'Tony Warwick',
+			'desc'  => esc_html__('Support Lead', 'event_espresso'),
+		],
+		'janice-gutierrez' => [
+			'email' => 'janice@eventespresso.com',
+			'name'  => 'Janice Gutierrez',
+			'desc'  => esc_html__('Support', 'event_espresso'),
+		],
+		'chinny-love-verana' => [
+			'email' => 'chinny@eventespresso.com',
+			'name'  => 'Chinny Love Verana',
+			'desc'  => esc_html__('Sales & Support', 'event_espresso'),
+		],
+		'kimiko-catherine-sy' => [
+			'email' => 'kimiko@eventespresso.com',
+			'name'  => 'Kimiko Catherine Sy',
+			'desc'  => esc_html__('Sales & Support', 'event_espresso'),
+		],
+		'sam' => [
+			'email' => 'sam@eventespresso.com',
+			'name'  => 'Sam',
+			'desc'  => esc_html__('Support & QA', 'event_espresso'),
+		],
+		'rio-michael-miranda' => [
+			'email' => 'rio@eventespresso.com',
+			'name'  => 'Rio Michael Miranda',
+			'desc'  => esc_html__('Support & QA', 'event_espresso'),
+		],
+	],
 ];
 
 function espressoPerson(string $id, string $email, string $name, string $desc): string
 {
-    return '
+	return '
     <li class="ee-card ee-credits-person" id="ee-person-' . $id . '">
         <a href="' . esp_gravatar_profile($email) . '" target="_blank">
             ' . esp_gravatar_image($email, $name) . '
@@ -77,15 +77,15 @@ 
 
 function esp_gravatar_profile(string $email): string
 {
-    return esc_url_raw('https://www.gravatar.com/' . md5($email));
+	return esc_url_raw('https://www.gravatar.com/' . md5($email));
 }
 
 function esp_gravatar_image(string $email, string $name): string
 {
-    $email = md5($email);
-    $name  = esc_attr($name);
-    $url   = esc_url_raw("https://0.gravatar.com/avatar/{$email}?s=60");
-    return "<img src='{$url}' class='gravatar' alt='{$name}'/>";
+	$email = md5($email);
+	$name  = esc_attr($name);
+	$url   = esc_url_raw("https://0.gravatar.com/avatar/{$email}?s=60");
+	return "<img src='{$url}' class='gravatar' alt='{$name}'/>";
 }
 
 
@@ -96,9 +96,9 @@ 
 
         <h4>
             <?php esc_html_e(
-                'Event Espresso is created by an international team of passionate individuals with a drive to empower your events!',
-                'event_espresso'
-            ); ?>
+				'Event Espresso is created by an international team of passionate individuals with a drive to empower your events!',
+				'event_espresso'
+			); ?>
         </h4>
 
         <div class='ee-credits-tEEm'>
@@ -106,12 +106,12 @@ 
             <h3 class="wp-people-group"><?php echo esc_html($tEEm); ?></h3>
             <ul class="ee-card-grid ee-card-grid-4-cols" id="' . sanitize_key($tEEm) . '">
                 <?php foreach ($members as $id => $person) {
-                    echo wp_kses(
-                        espressoPerson($id, $person['email'], $person['name'], $person['desc']),
-                        AllowedTags::getAllowedTags()
-                    );
-                }
-                ?>
+					echo wp_kses(
+						espressoPerson($id, $person['email'], $person['name'], $person['desc']),
+						AllowedTags::getAllowedTags()
+					);
+				}
+				?>
             </ul>
             <?php } ?>
         </div>
@@ -119,15 +119,15 @@ 
         <h3 class="wp-people-group"><?php esc_html_e('Contributor Recognition', 'event_espresso'); ?></h3>
         <p class="description">
             <?php
-            printf(
-                esc_html__(
-                    'For every major release we want to recognize the people who contributed to the release via a GitHub pull request. Want to see your name listed here? %sWhen you submit a pull request that gets included in a major release%s, we\'ll add your name here linked to your GitHub profile.',
-                    'event_espresso'
-                ),
-                '<a href="https://github.com/eventespresso/event-espresso-core" aria-label="Contribute to Event Espresso by making a pull request via GitHub" target="_blank">',
-                '</a>'
-            );
-            ?>
+			printf(
+				esc_html__(
+					'For every major release we want to recognize the people who contributed to the release via a GitHub pull request. Want to see your name listed here? %sWhen you submit a pull request that gets included in a major release%s, we\'ll add your name here linked to your GitHub profile.',
+					'event_espresso'
+				),
+				'<a href="https://github.com/eventespresso/event-espresso-core" aria-label="Contribute to Event Espresso by making a pull request via GitHub" target="_blank">',
+				'</a>'
+			);
+			?>
         </p>
 
         <ul class='wp-credits-list'>
@@ -141,15 +141,15 @@ 
         <h3 class="wp-people-group"><?php esc_html_e('External Libraries', 'event_espresso'); ?></h3>
         <p class="description">
             <?php
-            printf(
-                esc_html__(
-                    'Along with the libraries %sincluded with WordPress%s, Event Espresso utilizes the following third party libraries:',
-                    'event_espresso'
-                ),
-                '<a href="' . admin_url('credits.php') . '">',
-                '</a>'
-            );
-            ?>
+			printf(
+				esc_html__(
+					'Along with the libraries %sincluded with WordPress%s, Event Espresso utilizes the following third party libraries:',
+					'event_espresso'
+				),
+				'<a href="' . admin_url('credits.php') . '">',
+				'</a>'
+			);
+			?>
         </p>
         <ul class="wp-credits-list">
             <li><a href="https://openexchangerates.github.io/accounting.js/" target='_blank'>accounting.js</a>,</li>

admin_pages/general_settings/OrganizationSettings.php

Indentation +433 added lines, -433 removed lines

@@ -43,452 +43,452 @@
  */
 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;
 
-    private FeatureFlags $feature;
+	private FeatureFlags $feature;
 
 
-    /**
-     * 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
-     * @param FeatureFlags           $feature
-     * @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,
-        FeatureFlags $feature
-    ) {
-        $this->organization_config = $organization_config;
-        $this->core_config         = $core_config;
-        $this->network_core_config = $network_core_config;
-        $this->countrySubRegionDao = $countrySubRegionDao;
-        $this->feature             = $feature;
-        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
+	 * @param FeatureFlags           $feature
+	 * @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,
+		FeatureFlags $feature
+	) {
+		$this->organization_config = $organization_config;
+		$this->core_config         = $core_config;
+		$this->network_core_config = $network_core_config;
+		$this->countrySubRegionDao = $countrySubRegionDao;
+		$this->feature             = $feature;
+		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([['Country.CNT_ISO' => $this->organization_config->CNT_ISO]]);
-        $subsections     = [
-            '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(
-                [
-                    'html_name'       => 'organization_name',
-                    'html_class'      => 'ee-input-width--reg',
-                    '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(
-                [
-                    'html_name'       => 'organization_address_1',
-                    'html_class'      => 'ee-input-width--reg',
-                    '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(
-                [
-                    'html_name'       => 'organization_address_2',
-                    'html_class'      => 'ee-input-width--reg',
-                    '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(
-                [
-                    'html_name'       => 'organization_city',
-                    'html_class'      => 'ee-input-width--reg',
-                    '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,
-                [
-                    EE_Country_Select_Input::OPTION_GET_KEY => EE_Country_Select_Input::OPTION_GET_ALL,
-                    'html_name'                             => 'organization_country',
-                    'html_class'                            => 'ee-input-width--reg',
-                    '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,
-                [
-                    'html_name'       => 'organization_state',
-                    'html_class'      => 'ee-input-width--reg',
-                    '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(
-                [
-                    'html_name'       => 'organization_zip',
-                    'html_class'      => 'ee-input-width--small',
-                    '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(
-                [
-                    'html_name'       => 'organization_email',
-                    'html_class'      => 'ee-input-width--reg',
-                    '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(
-                [
-                    'html_name'       => 'organization_phone',
-                    'html_class'      => 'ee-input-width--reg',
-                    '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(
-                [
-                    'html_name'       => 'organization_vat',
-                    'html_class'      => 'ee-input-width--reg',
-                    '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(
-                [
-                    'html_name'       => 'organization_logo_url',
-                    'html_class'      => 'ee-input-width--big',
-                    '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(
-                [
-                    'html_name'             => 'organization_facebook',
-                    'html_class'            => 'ee-input-width--reg',
-                    '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(
-                [
-                    'html_name'             => 'organization_twitter',
-                    'html_class'            => 'ee-input-width--reg',
-                    '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(
-                [
-                    'html_name'             => 'organization_linkedin',
-                    'html_class'            => 'ee-input-width--reg',
-                    '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(
-                [
-                    'html_name'             => 'organization_pinterest',
-                    'html_class'            => 'ee-input-width--reg',
-                    '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(
-                [
-                    'html_name'             => 'organization_instagram',
-                    'html_class'            => 'ee-input-width--reg',
-                    'html_label_text'       => esc_html__('Instagram', 'event_espresso'),
-                    'other_html_attributes' => ' placeholder="instagram.com/handle"',
-                    'default'               => $this->organization_config->get_pretty('instagram'),
-                    'required'              => false,
-                ]
-            ),
-        ];
+	/**
+	 * 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([['Country.CNT_ISO' => $this->organization_config->CNT_ISO]]);
+		$subsections     = [
+			'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(
+				[
+					'html_name'       => 'organization_name',
+					'html_class'      => 'ee-input-width--reg',
+					'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(
+				[
+					'html_name'       => 'organization_address_1',
+					'html_class'      => 'ee-input-width--reg',
+					'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(
+				[
+					'html_name'       => 'organization_address_2',
+					'html_class'      => 'ee-input-width--reg',
+					'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(
+				[
+					'html_name'       => 'organization_city',
+					'html_class'      => 'ee-input-width--reg',
+					'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,
+				[
+					EE_Country_Select_Input::OPTION_GET_KEY => EE_Country_Select_Input::OPTION_GET_ALL,
+					'html_name'                             => 'organization_country',
+					'html_class'                            => 'ee-input-width--reg',
+					'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,
+				[
+					'html_name'       => 'organization_state',
+					'html_class'      => 'ee-input-width--reg',
+					'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(
+				[
+					'html_name'       => 'organization_zip',
+					'html_class'      => 'ee-input-width--small',
+					'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(
+				[
+					'html_name'       => 'organization_email',
+					'html_class'      => 'ee-input-width--reg',
+					'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(
+				[
+					'html_name'       => 'organization_phone',
+					'html_class'      => 'ee-input-width--reg',
+					'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(
+				[
+					'html_name'       => 'organization_vat',
+					'html_class'      => 'ee-input-width--reg',
+					'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(
+				[
+					'html_name'       => 'organization_logo_url',
+					'html_class'      => 'ee-input-width--big',
+					'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(
+				[
+					'html_name'             => 'organization_facebook',
+					'html_class'            => 'ee-input-width--reg',
+					'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(
+				[
+					'html_name'             => 'organization_twitter',
+					'html_class'            => 'ee-input-width--reg',
+					'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(
+				[
+					'html_name'             => 'organization_linkedin',
+					'html_class'            => 'ee-input-width--reg',
+					'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(
+				[
+					'html_name'             => 'organization_pinterest',
+					'html_class'            => 'ee-input-width--reg',
+					'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(
+				[
+					'html_name'             => 'organization_instagram',
+					'html_class'            => 'ee-input-width--reg',
+					'html_label_text'       => esc_html__('Instagram', 'event_espresso'),
+					'other_html_attributes' => ' placeholder="instagram.com/handle"',
+					'default'               => $this->organization_config->get_pretty('instagram'),
+					'required'              => false,
+				]
+			),
+		];
 
-        if ($this->feature->allowed('use_edd_plugin_licensing')) {
-            $subsections = EEH_Array::insert_into_array(
-                $subsections,
-                [
-                    'support_license_key_notice' => new EE_Form_Section_HTML(
-                        EEH_HTML::p(
-                            sprintf(
-                                esc_html__(
-                                    'Management for your Event Espresso Support License Key has been moved to the %1$sLicense Keys admin page%2$s',
-                                    'event_espresso'
-                                ),
-                                '<a href="' . EE_Admin_Page::add_query_args_and_nonce(
-                                    [],
-                                    LICENSE_KEYS_ADMIN_URL
-                                ) . '">',
-                                '</a>'
-                            ),
-                            '',
-                            'ee-status-outline ee-status-bg--info'
-                        )
-                    ),
-                ],
-                'contact_information_hdr'
-            );
-        }
-        return apply_filters(
-            'FHEE__EventEspresso_admin_pages_general_settings_OrganizationSettings__generate__form',
-            new EE_Form_Section_Proper(
-                [
-                    'name'            => 'organization_settings',
-                    'html_id'         => 'organization_settings',
-                    'layout_strategy' => new EE_Admin_Two_Column_Layout(),
-                    'subsections'     => $subsections,
-                ]
-            ),
-            $this,
-            $has_sub_regions
-        );
-    }
+		if ($this->feature->allowed('use_edd_plugin_licensing')) {
+			$subsections = EEH_Array::insert_into_array(
+				$subsections,
+				[
+					'support_license_key_notice' => new EE_Form_Section_HTML(
+						EEH_HTML::p(
+							sprintf(
+								esc_html__(
+									'Management for your Event Espresso Support License Key has been moved to the %1$sLicense Keys admin page%2$s',
+									'event_espresso'
+								),
+								'<a href="' . EE_Admin_Page::add_query_args_and_nonce(
+									[],
+									LICENSE_KEYS_ADMIN_URL
+								) . '">',
+								'</a>'
+							),
+							'',
+							'ee-status-outline ee-status-bg--info'
+						)
+					),
+				],
+				'contact_information_hdr'
+			);
+		}
+		return apply_filters(
+			'FHEE__EventEspresso_admin_pages_general_settings_OrganizationSettings__generate__form',
+			new EE_Form_Section_Proper(
+				[
+					'name'            => 'organization_settings',
+					'html_id'         => 'organization_settings',
+					'layout_strategy' => new EE_Admin_Two_Column_Layout(),
+					'subsections'     => $subsections,
+				]
+			),
+			$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 = []): 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 = []): 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 +4 added lines, -4 removed lines

@@ -349,10 +349,10 @@ 
                                     'Management for your Event Espresso Support License Key has been moved to the %1$sLicense Keys admin page%2$s',
                                     'event_espresso'
                                 ),
-                                '<a href="' . EE_Admin_Page::add_query_args_and_nonce(
+                                '<a href="'.EE_Admin_Page::add_query_args_and_nonce(
                                     [],
                                     LICENSE_KEYS_ADMIN_URL
-                                ) . '">',
+                                ).'">',
                                 '</a>'
                             ),
                             '',
@@ -474,8 +474,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 +1086 added lines, -1086 removed lines

@@ -22,13 +22,13 @@ 
  */
 function is_espresso_event($event = null): bool
 {
-    if (! can_use_espresso_conditionals(__FUNCTION__)) {
-        return false;
-    }
-    // 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;
+	if (! can_use_espresso_conditionals(__FUNCTION__)) {
+		return false;
+	}
+	// 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;
 }
 
 /**
@@ -39,14 +39,14 @@ 
  */
 function is_espresso_event_single(): bool
 {
-    if (! can_use_espresso_conditionals(__FUNCTION__)) {
-        return false;
-    }
-    global $wp_query;
-    // return conditionals set by CPTs
-    return $wp_query instanceof WP_Query
-        && isset($wp_query->is_espresso_event_single)
-        && $wp_query->is_espresso_event_single;
+	if (! can_use_espresso_conditionals(__FUNCTION__)) {
+		return false;
+	}
+	global $wp_query;
+	// return conditionals set by CPTs
+	return $wp_query instanceof WP_Query
+		&& isset($wp_query->is_espresso_event_single)
+		&& $wp_query->is_espresso_event_single;
 }
 
 /**
@@ -57,13 +57,13 @@ 
  */
 function is_espresso_event_archive(): bool
 {
-    if (! can_use_espresso_conditionals(__FUNCTION__)) {
-        return false;
-    }
-    global $wp_query;
-    return $wp_query instanceof WP_Query
-        && isset($wp_query->is_espresso_event_archive)
-        && $wp_query->is_espresso_event_archive;
+	if (! can_use_espresso_conditionals(__FUNCTION__)) {
+		return false;
+	}
+	global $wp_query;
+	return $wp_query instanceof WP_Query
+		&& isset($wp_query->is_espresso_event_archive)
+		&& $wp_query->is_espresso_event_archive;
 }
 
 /**
@@ -74,13 +74,13 @@ 
  */
 function is_espresso_event_taxonomy(): bool
 {
-    if (! can_use_espresso_conditionals(__FUNCTION__)) {
-        return false;
-    }
-    global $wp_query;
-    return $wp_query instanceof WP_Query
-        && isset($wp_query->is_espresso_event_taxonomy)
-        && $wp_query->is_espresso_event_taxonomy;
+	if (! can_use_espresso_conditionals(__FUNCTION__)) {
+		return false;
+	}
+	global $wp_query;
+	return $wp_query instanceof WP_Query
+		&& isset($wp_query->is_espresso_event_taxonomy)
+		&& $wp_query->is_espresso_event_taxonomy;
 }
 
 /**
@@ -94,13 +94,13 @@ 
  */
 function is_espresso_venue($venue = null): bool
 {
-    if (! can_use_espresso_conditionals(__FUNCTION__)) {
-        return false;
-    }
-    // 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;
+	if (! can_use_espresso_conditionals(__FUNCTION__)) {
+		return false;
+	}
+	// 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;
 }
 
 /**
@@ -111,13 +111,13 @@ 
  */
 function is_espresso_venue_single(): bool
 {
-    if (! can_use_espresso_conditionals(__FUNCTION__)) {
-        return false;
-    }
-    global $wp_query;
-    return $wp_query instanceof WP_Query
-        && isset($wp_query->is_espresso_venue_single)
-        && $wp_query->is_espresso_venue_single;
+	if (! can_use_espresso_conditionals(__FUNCTION__)) {
+		return false;
+	}
+	global $wp_query;
+	return $wp_query instanceof WP_Query
+		&& isset($wp_query->is_espresso_venue_single)
+		&& $wp_query->is_espresso_venue_single;
 }
 
 /**
@@ -128,13 +128,13 @@ 
  */
 function is_espresso_venue_archive(): bool
 {
-    if (! can_use_espresso_conditionals(__FUNCTION__)) {
-        return false;
-    }
-    global $wp_query;
-    return $wp_query instanceof WP_Query
-        && isset($wp_query->is_espresso_venue_archive)
-        && $wp_query->is_espresso_venue_archive;
+	if (! can_use_espresso_conditionals(__FUNCTION__)) {
+		return false;
+	}
+	global $wp_query;
+	return $wp_query instanceof WP_Query
+		&& isset($wp_query->is_espresso_venue_archive)
+		&& $wp_query->is_espresso_venue_archive;
 }
 
 /**
@@ -145,13 +145,13 @@ 
  */
 function is_espresso_venue_taxonomy(): bool
 {
-    if (! can_use_espresso_conditionals(__FUNCTION__)) {
-        return false;
-    }
-    global $wp_query;
-    return $wp_query instanceof WP_Query
-        && isset($wp_query->is_espresso_venue_taxonomy)
-        && $wp_query->is_espresso_venue_taxonomy;
+	if (! can_use_espresso_conditionals(__FUNCTION__)) {
+		return false;
+	}
+	global $wp_query;
+	return $wp_query instanceof WP_Query
+		&& isset($wp_query->is_espresso_venue_taxonomy)
+		&& $wp_query->is_espresso_venue_taxonomy;
 }
 
 /**
@@ -163,62 +163,62 @@ 
  */
 function can_use_espresso_conditionals($conditional_tag): bool
 {
-    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;
+	}
 }
 
 
@@ -233,115 +233,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'); ?>
@@ -349,244 +349,244 @@ 
             <?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();
-
-        $DTT_ID = LoaderFactory::getShared(RequestInterface::class)->getRequestParam('datetime', 0, 'int');
-        $arguments = apply_filters(
-            'FHEE__espresso_list_of_event_dates__arguments',
-            [ $EVT_ID, $date_format, $time_format, $echo, $show_expired, $format, $add_breaks, $limit, $DTT_ID ]
-        );
-        [$EVT_ID, $date_format, $time_format, $echo, $show_expired, $format, $add_breaks, $limit, $DTT_ID] = $arguments;
-        $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   = $DTT_ID
-            ? [EEH_Event_View::get_date_obj($DTT_ID)]
-            : EEH_Event_View::get_all_date_obj($EVT_ID, $show_expired, false, (int) $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;
+	/**
+	 * 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();
+
+		$DTT_ID = LoaderFactory::getShared(RequestInterface::class)->getRequestParam('datetime', 0, 'int');
+		$arguments = apply_filters(
+			'FHEE__espresso_list_of_event_dates__arguments',
+			[ $EVT_ID, $date_format, $time_format, $echo, $show_expired, $format, $add_breaks, $limit, $DTT_ID ]
+		);
+		[$EVT_ID, $date_format, $time_format, $echo, $show_expired, $format, $add_breaks, $limit, $DTT_ID] = $arguments;
+		$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   = $DTT_ID
+			? [EEH_Event_View::get_date_obj($DTT_ID)]
+			: EEH_Event_View::get_all_date_obj($EVT_ID, $show_expired, false, (int) $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;
 			$cols = count($datetimes);
 			$cols = $cols >= 3 ? 'big' : 'small';
 			$ul_class = "ee-event-datetimes-ul ee-event-datetimes-ul--{$cols}";
 			$html = '<ul id="ee-event-datetimes-ul-' . esc_attr($post->ID) . '" class="'. $ul_class.'">';
-            $datetime = null;
-            foreach ($datetimes as $datetime) {
-                if ($datetime instanceof EE_Datetime) {
+			$datetime = null;
+			foreach ($datetimes as $datetime) {
+				if ($datetime instanceof EE_Datetime) {
 
-                    $datetime_name        = $datetime->name();
-                    $datetime_html        = ! empty($datetime_name)
-                        ? '
+					$datetime_name        = $datetime->name();
+					$datetime_html        = ! empty($datetime_name)
+						? '
                         <strong class="ee-event-datetimes-li-date-name">
                           ' . esc_html($datetime_name) . '
                        </strong>' . $newline
-                        : '';
+						: '';
 
-                    $datetime_html .= '
+					$datetime_html .= '
                         <span class="ee-event-datetimes-li-daterange">
 							<span class="dashicons dashicons-calendar"></span>&nbsp;'
 							. $datetime->date_range($date_format). '
@@ -598,501 +598,501 @@ 
 						</span>
                         ';
 
-                    $venue = $datetime->venue();
-                    if ($venue instanceof EE_Venue) {
-                    	$venue_name      = esc_html($venue->name());
-                        $datetime_html .= '<br /><span class="ee-event-datetimes-li-venue">';
-                        $datetime_html .= '<span class="dashicons dashicons-admin-home"></span>&nbsp;';
-                        $datetime_html .= '<a href="'. esc_url_raw($venue->get_permalink()) .'" target="_blank">';
-                        $datetime_html .= $venue_name . '</a></span>';
-                    }
-
-                    $datetime_description = $datetime->description();
-                    $datetime_html .= ! empty($datetime_description)
-                        ? '
+					$venue = $datetime->venue();
+					if ($venue instanceof EE_Venue) {
+						$venue_name      = esc_html($venue->name());
+						$datetime_html .= '<br /><span class="ee-event-datetimes-li-venue">';
+						$datetime_html .= '<span class="dashicons dashicons-admin-home"></span>&nbsp;';
+						$datetime_html .= '<a href="'. esc_url_raw($venue->get_permalink()) .'" target="_blank">';
+						$datetime_html .= $venue_name . '</a></span>';
+					}
+
+					$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 = apply_filters(
-                        'FHEE__espresso_list_of_event_dates__datetime_html',
-                        $datetime_html,
-                        $datetime,
-                        $arguments
-                    );
+					$datetime_html = apply_filters(
+						'FHEE__espresso_list_of_event_dates__datetime_html',
+						$datetime_html,
+						$datetime,
+						$arguments
+					);
 
-                    $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>';
-            $html = apply_filters('FHEE__espresso_list_of_event_dates__html', $html, $arguments, $datetime);
-        } else {
-            $html =
-                '
+				}
+			}
+			$html .= '</ul>';
+			$html = apply_filters('FHEE__espresso_list_of_event_dates__html', $html, $arguments, $datetime);
+		} 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');
+	}
 }
 
 
@@ -1100,345 +1100,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);
+	}
 }
 
 

Spacing +81 added lines, -81 removed lines

@@ -22,7 +22,7 @@ 
  */
 function is_espresso_event($event = null): bool
 {
-    if (! can_use_espresso_conditionals(__FUNCTION__)) {
+    if ( ! can_use_espresso_conditionals(__FUNCTION__)) {
         return false;
     }
     // extract EE_Event object from passed param regardless of what it is (within reason of course)
@@ -39,7 +39,7 @@ 
  */
 function is_espresso_event_single(): bool
 {
-    if (! can_use_espresso_conditionals(__FUNCTION__)) {
+    if ( ! can_use_espresso_conditionals(__FUNCTION__)) {
         return false;
     }
     global $wp_query;
@@ -57,7 +57,7 @@ 
  */
 function is_espresso_event_archive(): bool
 {
-    if (! can_use_espresso_conditionals(__FUNCTION__)) {
+    if ( ! can_use_espresso_conditionals(__FUNCTION__)) {
         return false;
     }
     global $wp_query;
@@ -74,7 +74,7 @@ 
  */
 function is_espresso_event_taxonomy(): bool
 {
-    if (! can_use_espresso_conditionals(__FUNCTION__)) {
+    if ( ! can_use_espresso_conditionals(__FUNCTION__)) {
         return false;
     }
     global $wp_query;
@@ -94,7 +94,7 @@ 
  */
 function is_espresso_venue($venue = null): bool
 {
-    if (! can_use_espresso_conditionals(__FUNCTION__)) {
+    if ( ! can_use_espresso_conditionals(__FUNCTION__)) {
         return false;
     }
     // extract EE_Venue object from passed param regardless of what it is (within reason of course)
@@ -111,7 +111,7 @@ 
  */
 function is_espresso_venue_single(): bool
 {
-    if (! can_use_espresso_conditionals(__FUNCTION__)) {
+    if ( ! can_use_espresso_conditionals(__FUNCTION__)) {
         return false;
     }
     global $wp_query;
@@ -128,7 +128,7 @@ 
  */
 function is_espresso_venue_archive(): bool
 {
-    if (! can_use_espresso_conditionals(__FUNCTION__)) {
+    if ( ! can_use_espresso_conditionals(__FUNCTION__)) {
         return false;
     }
     global $wp_query;
@@ -145,7 +145,7 @@ 
  */
 function is_espresso_venue_taxonomy(): bool
 {
-    if (! can_use_espresso_conditionals(__FUNCTION__)) {
+    if ( ! can_use_espresso_conditionals(__FUNCTION__)) {
         return false;
     }
     global $wp_query;
@@ -163,7 +163,7 @@ 
  */
 function can_use_espresso_conditionals($conditional_tag): bool
 {
-    if (! did_action('AHEE__EE_System__initialize')) {
+    if ( ! did_action('AHEE__EE_System__initialize')) {
         EE_Error::doing_it_wrong(
             __FUNCTION__,
             sprintf(
@@ -183,7 +183,7 @@ 
 
 /*************************** Event Queries ***************************/
 
-if (! function_exists('espresso_get_events')) {
+if ( ! function_exists('espresso_get_events')) {
     /**
      *    espresso_get_events
      *
@@ -233,10 +233,10 @@ 
  */
 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')) {
+if ( ! function_exists('espresso_ticket_selector')) {
     /**
      * espresso_ticket_selector
      *
@@ -246,7 +246,7 @@ 
      */
     function espresso_ticket_selector($event = null)
     {
-        if (! apply_filters('FHEE_disable_espresso_ticket_selector', false)) {
+        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
@@ -255,7 +255,7 @@ 
 }
 
 
-if (! function_exists('espresso_view_details_btn')) {
+if ( ! function_exists('espresso_view_details_btn')) {
     /**
      * espresso_view_details_btn
      *
@@ -265,7 +265,7 @@ 
      */
     function espresso_view_details_btn($event = null)
     {
-        if (! apply_filters('FHEE_disable_espresso_view_details_btn', false)) {
+        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
         }
@@ -275,7 +275,7 @@ 
 
 /*************************** EEH_Event_View ***************************/
 
-if (! function_exists('espresso_load_event_list_assets')) {
+if ( ! function_exists('espresso_load_event_list_assets')) {
     /**
      * espresso_load_event_list_assets
      * ensures that event list styles and scripts are loaded
@@ -291,7 +291,7 @@ 
 }
 
 
-if (! function_exists('espresso_event_reg_button')) {
+if ( ! function_exists('espresso_event_reg_button')) {
     /**
      * espresso_event_reg_button
      * returns the "Register Now" button if event is active,
@@ -308,7 +308,7 @@ 
     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) {
+        if ( ! $event instanceof EE_Event) {
             return;
         }
         $event_status = $event->get_active_status();
@@ -353,7 +353,7 @@ 
 }
 
 
-if (! function_exists('espresso_display_ticket_selector')) {
+if ( ! function_exists('espresso_display_ticket_selector')) {
     /**
      * espresso_display_ticket_selector
      * whether or not to display the Ticket Selector for an event
@@ -370,7 +370,7 @@ 
 }
 
 
-if (! function_exists('espresso_event_status_banner')) {
+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
@@ -387,7 +387,7 @@ 
 }
 
 
-if (! function_exists('espresso_event_status')) {
+if ( ! function_exists('espresso_event_status')) {
     /**
      * espresso_event_status
      * returns the event status if it is sold out, expired, or inactive
@@ -405,7 +405,7 @@ 
 }
 
 
-if (! function_exists('espresso_event_categories')) {
+if ( ! function_exists('espresso_event_categories')) {
     /**
      * espresso_event_categories
      * returns the terms associated with an event
@@ -428,7 +428,7 @@ 
 }
 
 
-if (! function_exists('espresso_event_tickets_available')) {
+if ( ! function_exists('espresso_event_tickets_available')) {
     /**
      * espresso_event_tickets_available
      * returns the ticket types available for purchase for an event
@@ -446,14 +446,14 @@ 
         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">' : [];
+                $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 .= esc_html($ticket->name()).' ';
                         $html .= EEH_Template::format_currency(
                             $ticket->get_ticket_total_with_taxes()
                         ); // already escaped
@@ -476,7 +476,7 @@ 
     }
 }
 
-if (! function_exists('espresso_event_date_obj')) {
+if ( ! function_exists('espresso_event_date_obj')) {
     /**
      * espresso_event_date_obj
      * returns the primary date object for an event
@@ -493,7 +493,7 @@ 
 }
 
 
-if (! function_exists('espresso_event_date')) {
+if ( ! function_exists('espresso_event_date')) {
     /**
      * espresso_event_date
      * returns the primary date for an event
@@ -522,7 +522,7 @@ 
 }
 
 
-if (! function_exists('espresso_list_of_event_dates')) {
+if ( ! function_exists('espresso_list_of_event_dates')) {
     /**
      * espresso_list_of_event_dates
      * returns a unordered list of dates for an event
@@ -554,7 +554,7 @@ 
         $DTT_ID = LoaderFactory::getShared(RequestInterface::class)->getRequestParam('datetime', 0, 'int');
         $arguments = apply_filters(
             'FHEE__espresso_list_of_event_dates__arguments',
-            [ $EVT_ID, $date_format, $time_format, $echo, $show_expired, $format, $add_breaks, $limit, $DTT_ID ]
+            [$EVT_ID, $date_format, $time_format, $echo, $show_expired, $format, $add_breaks, $limit, $DTT_ID]
         );
         [$EVT_ID, $date_format, $time_format, $echo, $show_expired, $format, $add_breaks, $limit, $DTT_ID] = $arguments;
         $date_format = ! empty($date_format) ? $date_format : get_option('date_format');
@@ -564,7 +564,7 @@ 
         $datetimes   = $DTT_ID
             ? [EEH_Event_View::get_date_obj($DTT_ID)]
             : EEH_Event_View::get_all_date_obj($EVT_ID, $show_expired, false, (int) $limit);
-        if (! $format) {
+        if ( ! $format) {
             return apply_filters('FHEE__espresso_list_of_event_dates__datetimes', $datetimes);
         }
         $newline = $add_breaks ? '<br />' : '';
@@ -573,7 +573,7 @@ 
 			$cols = count($datetimes);
 			$cols = $cols >= 3 ? 'big' : 'small';
 			$ul_class = "ee-event-datetimes-ul ee-event-datetimes-ul--{$cols}";
-			$html = '<ul id="ee-event-datetimes-ul-' . esc_attr($post->ID) . '" class="'. $ul_class.'">';
+			$html = '<ul id="ee-event-datetimes-ul-'.esc_attr($post->ID).'" class="'.$ul_class.'">';
             $datetime = null;
             foreach ($datetimes as $datetime) {
                 if ($datetime instanceof EE_Datetime) {
@@ -582,36 +582,36 @@ 
                     $datetime_html        = ! empty($datetime_name)
                         ? '
                         <strong class="ee-event-datetimes-li-date-name">
-                          ' . esc_html($datetime_name) . '
+                          ' . esc_html($datetime_name).'
                        </strong>' . $newline
                         : '';
 
                     $datetime_html .= '
                         <span class="ee-event-datetimes-li-daterange">
 							<span class="dashicons dashicons-calendar"></span>&nbsp;'
-							. $datetime->date_range($date_format). '
+							. $datetime->date_range($date_format).'
 						</span>
                         <br/>
                         <span class="ee-event-datetimes-li-timerange">
 							<span class="dashicons dashicons-clock"></span>&nbsp;'
-							. $datetime->time_range($time_format) . '
+							. $datetime->time_range($time_format).'
 						</span>
                         ';
 
                     $venue = $datetime->venue();
                     if ($venue instanceof EE_Venue) {
-                    	$venue_name      = esc_html($venue->name());
+                    	$venue_name = esc_html($venue->name());
                         $datetime_html .= '<br /><span class="ee-event-datetimes-li-venue">';
                         $datetime_html .= '<span class="dashicons dashicons-admin-home"></span>&nbsp;';
-                        $datetime_html .= '<a href="'. esc_url_raw($venue->get_permalink()) .'" target="_blank">';
-                        $datetime_html .= $venue_name . '</a></span>';
+                        $datetime_html .= '<a href="'.esc_url_raw($venue->get_permalink()).'" target="_blank">';
+                        $datetime_html .= $venue_name.'</a></span>';
                     }
 
                     $datetime_description = $datetime->description();
                     $datetime_html .= ! empty($datetime_description)
                         ? '
                         <span class="ee-event-datetimes-li-date-desc">
-                            ' . wp_kses($datetime_description, $allowedtags) . '
+                            ' . wp_kses($datetime_description, $allowedtags).'
                         </span>' . $newline
                         : '';
 
@@ -623,11 +623,11 @@ 
                     );
 
                     $DTD_ID        = esc_attr($datetime->ID());
-                    $active_status = esc_attr('ee-event-datetimes-li-' . $datetime->get_active_status());
+                    $active_status = esc_attr('ee-event-datetimes-li-'.$datetime->get_active_status());
 
                     $html .= '
-                    <li id="ee-event-datetimes-li-' . $DTD_ID . '" class="ee-event-datetimes-li ' . $active_status . '">
-                        ' . $datetime_html . '
+                    <li id="ee-event-datetimes-li-' . $DTD_ID.'" class="ee-event-datetimes-li '.$active_status.'">
+                        ' . $datetime_html.'
                     </li>';
                 }
             }
@@ -641,7 +641,7 @@ 
                 ' . esc_html__(
                     'There are no upcoming dates for this event.',
                     'event_espresso'
-                ) . '
+                ).'
             </p>
             <br/>';
         }
@@ -654,7 +654,7 @@ 
 }
 
 
-if (! function_exists('espresso_event_end_date')) {
+if ( ! function_exists('espresso_event_end_date')) {
     /**
      * espresso_event_end_date
      * returns the last date for an event
@@ -681,7 +681,7 @@ 
     }
 }
 
-if (! function_exists('espresso_event_date_range')) {
+if ( ! function_exists('espresso_event_date_range')) {
     /**
      * espresso_event_date_range
      * returns the first and last chronologically ordered dates for an event (if different)
@@ -739,7 +739,7 @@ 
     }
 }
 
-if (! function_exists('espresso_next_upcoming_datetime_obj')) {
+if ( ! function_exists('espresso_next_upcoming_datetime_obj')) {
     /**
      * espresso_next_upcoming_datetime_obj
      * returns the next upcoming datetime object for an event
@@ -754,7 +754,7 @@ 
     }
 }
 
-if (! function_exists('espresso_next_upcoming_datetime')) {
+if ( ! function_exists('espresso_next_upcoming_datetime')) {
     /**
      * espresso_next_upcoming_datetime
      * returns the start date and time for the next upcoming event.
@@ -776,11 +776,11 @@ 
         $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_format = trim($date_format.' '.$time_format);
 
         $datetime = espresso_next_upcoming_datetime_obj($EVT_ID);
 
-        if (! $datetime instanceof EE_Datetime) {
+        if ( ! $datetime instanceof EE_Datetime) {
             return '';
         }
         if ($echo) {
@@ -791,7 +791,7 @@ 
     }
 }
 
-if (! function_exists('espresso_event_date_as_calendar_page')) {
+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
@@ -808,7 +808,7 @@ 
 }
 
 
-if (! function_exists('espresso_event_link_url')) {
+if ( ! function_exists('espresso_event_link_url')) {
     /**
      * espresso_event_link_url
      *
@@ -829,7 +829,7 @@ 
 }
 
 
-if (! function_exists('espresso_event_has_content_or_excerpt')) {
+if ( ! function_exists('espresso_event_has_content_or_excerpt')) {
     /**
      *    espresso_event_has_content_or_excerpt
      *
@@ -846,7 +846,7 @@ 
 }
 
 
-if (! function_exists('espresso_event_content_or_excerpt')) {
+if ( ! function_exists('espresso_event_content_or_excerpt')) {
     /**
      * espresso_event_content_or_excerpt
      *
@@ -866,7 +866,7 @@ 
 }
 
 
-if (! function_exists('espresso_event_phone')) {
+if ( ! function_exists('espresso_event_phone')) {
     /**
      * espresso_event_phone
      *
@@ -887,7 +887,7 @@ 
 }
 
 
-if (! function_exists('espresso_edit_event_link')) {
+if ( ! function_exists('espresso_edit_event_link')) {
     /**
      * espresso_edit_event_link
      * returns a link to edit an event
@@ -909,7 +909,7 @@ 
 }
 
 
-if (! function_exists('espresso_organization_name')) {
+if ( ! function_exists('espresso_organization_name')) {
     /**
      * espresso_organization_name
      *
@@ -927,7 +927,7 @@ 
     }
 }
 
-if (! function_exists('espresso_organization_address')) {
+if ( ! function_exists('espresso_organization_address')) {
     /**
      * espresso_organization_address
      *
@@ -951,7 +951,7 @@ 
     }
 }
 
-if (! function_exists('espresso_organization_email')) {
+if ( ! function_exists('espresso_organization_email')) {
     /**
      * espresso_organization_email
      *
@@ -969,7 +969,7 @@ 
     }
 }
 
-if (! function_exists('espresso_organization_logo_url')) {
+if ( ! function_exists('espresso_organization_logo_url')) {
     /**
      * espresso_organization_logo_url
      *
@@ -987,7 +987,7 @@ 
     }
 }
 
-if (! function_exists('espresso_organization_facebook')) {
+if ( ! function_exists('espresso_organization_facebook')) {
     /**
      * espresso_organization_facebook
      *
@@ -1005,7 +1005,7 @@ 
     }
 }
 
-if (! function_exists('espresso_organization_twitter')) {
+if ( ! function_exists('espresso_organization_twitter')) {
     /**
      * espresso_organization_twitter
      *
@@ -1023,7 +1023,7 @@ 
     }
 }
 
-if (! function_exists('espresso_organization_linkedin')) {
+if ( ! function_exists('espresso_organization_linkedin')) {
     /**
      * espresso_organization_linkedin
      *
@@ -1041,7 +1041,7 @@ 
     }
 }
 
-if (! function_exists('espresso_organization_pinterest')) {
+if ( ! function_exists('espresso_organization_pinterest')) {
     /**
      * espresso_organization_pinterest
      *
@@ -1059,7 +1059,7 @@ 
     }
 }
 
-if (! function_exists('espresso_organization_google')) {
+if ( ! function_exists('espresso_organization_google')) {
     /**
      * espresso_organization_google
      *
@@ -1077,7 +1077,7 @@ 
     }
 }
 
-if (! function_exists('espresso_organization_instagram')) {
+if ( ! function_exists('espresso_organization_instagram')) {
     /**
      * espresso_organization_instagram
      *
@@ -1099,7 +1099,7 @@ 
 /*************************** EEH_Venue_View ***************************/
 
 
-if (! function_exists('espresso_event_venues')) {
+if ( ! function_exists('espresso_event_venues')) {
     /**
      * espresso_event_venues
      *
@@ -1114,7 +1114,7 @@ 
 }
 
 
-if (! function_exists('espresso_venue_id')) {
+if ( ! function_exists('espresso_venue_id')) {
     /**
      *    espresso_venue_name
      *
@@ -1132,7 +1132,7 @@ 
 }
 
 
-if (! function_exists('espresso_is_venue_private')) {
+if ( ! function_exists('espresso_is_venue_private')) {
     /**
      * Return whether a venue is private or not.
      *
@@ -1150,7 +1150,7 @@ 
 }
 
 
-if (! function_exists('espresso_venue_is_password_protected')) {
+if ( ! function_exists('espresso_venue_is_password_protected')) {
     /**
      * returns true or false if a venue is password protected or not
      *
@@ -1167,7 +1167,7 @@ 
 }
 
 
-if (! function_exists('espresso_password_protected_venue_form')) {
+if ( ! function_exists('espresso_password_protected_venue_form')) {
     /**
      * Returns a password form if venue is password protected.
      *
@@ -1184,7 +1184,7 @@ 
 }
 
 
-if (! function_exists('espresso_venue_name')) {
+if ( ! function_exists('espresso_venue_name')) {
     /**
      *    espresso_venue_name
      *
@@ -1207,7 +1207,7 @@ 
 }
 
 
-if (! function_exists('espresso_venue_link')) {
+if ( ! function_exists('espresso_venue_link')) {
     /**
      *    espresso_venue_link
      *
@@ -1225,7 +1225,7 @@ 
 }
 
 
-if (! function_exists('espresso_venue_description')) {
+if ( ! function_exists('espresso_venue_description')) {
     /**
      *    espresso_venue_description
      *
@@ -1247,7 +1247,7 @@ 
 }
 
 
-if (! function_exists('espresso_venue_excerpt')) {
+if ( ! function_exists('espresso_venue_excerpt')) {
     /**
      *    espresso_venue_excerpt
      *
@@ -1269,7 +1269,7 @@ 
 }
 
 
-if (! function_exists('espresso_venue_categories')) {
+if ( ! function_exists('espresso_venue_categories')) {
     /**
      * espresso_venue_categories
      * returns the terms associated with a venue
@@ -1292,7 +1292,7 @@ 
 }
 
 
-if (! function_exists('espresso_venue_address')) {
+if ( ! function_exists('espresso_venue_address')) {
     /**
      * espresso_venue_address
      * returns a formatted block of html  for displaying a venue's address
@@ -1315,7 +1315,7 @@ 
 }
 
 
-if (! function_exists('espresso_venue_raw_address')) {
+if ( ! function_exists('espresso_venue_raw_address')) {
     /**
      * espresso_venue_address
      * returns an UN-formatted string containing a venue's address
@@ -1338,7 +1338,7 @@ 
 }
 
 
-if (! function_exists('espresso_venue_has_address')) {
+if ( ! function_exists('espresso_venue_has_address')) {
     /**
      * espresso_venue_has_address
      * returns TRUE or FALSE if a Venue has address information
@@ -1355,7 +1355,7 @@ 
 }
 
 
-if (! function_exists('espresso_venue_gmap')) {
+if ( ! function_exists('espresso_venue_gmap')) {
     /**
      * espresso_venue_gmap
      * returns a google map for the venue address
@@ -1379,7 +1379,7 @@ 
 }
 
 
-if (! function_exists('espresso_venue_phone')) {
+if ( ! function_exists('espresso_venue_phone')) {
     /**
      * espresso_venue_phone
      *
@@ -1400,7 +1400,7 @@ 
 }
 
 
-if (! function_exists('espresso_venue_website')) {
+if ( ! function_exists('espresso_venue_website')) {
     /**
      * espresso_venue_website
      *
@@ -1421,7 +1421,7 @@ 
 }
 
 
-if (! function_exists('espresso_edit_venue_link')) {
+if ( ! function_exists('espresso_edit_venue_link')) {
     /**
      * espresso_edit_venue_link
      *

caffeinated/brewing_regular.php

Indentation +343 added lines, -343 removed lines

@@ -28,347 +28,347 @@
  */
 class EE_Brewing_Regular extends EE_BASE implements InterminableInterface
 {
-    protected EE_Dependency_Map $dependency_map;
-
-    protected LoaderInterface $loader;
-
-    protected TableAnalysis $_table_analysis;
-
-    protected RouteHandler $route_handler;
-
-
-    /**
-     * EE_Brewing_Regular constructor.
-     *
-     * @param EE_Dependency_Map $dependency_map
-     * @param LoaderInterface   $loader
-     * @param RouteHandler      $route_handler
-     * @param TableAnalysis     $table_analysis
-     */
-    public function __construct(
-        EE_Dependency_Map $dependency_map,
-        LoaderInterface $loader,
-        RouteHandler $route_handler,
-        TableAnalysis $table_analysis
-    ) {
-        $this->dependency_map  = $dependency_map;
-        $this->loader          = $loader;
-        $this->route_handler   = $route_handler;
-        $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');
-    }
-
-
-    /**
-     * @throws Exception
-     * @deprecated 5.0.20.p
-     */
-    public function initializePUE()
-    {
-        $this->dependency_map->registerDependencies(PueRequests::class, Route::getDefaultDependencies());
-        $this->route_handler->addRoute(PueRequests::class);
-    }
-
-
-    /**
-     * 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']);
-        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']);
-    }
-
-
-    /**
-     * 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'      => 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
-                    ]
-                );
-                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'      => 60,
-                            '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[EspressoPostType::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(EspressoPostType::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;
-    }
+	protected EE_Dependency_Map $dependency_map;
+
+	protected LoaderInterface $loader;
+
+	protected TableAnalysis $_table_analysis;
+
+	protected RouteHandler $route_handler;
+
+
+	/**
+	 * EE_Brewing_Regular constructor.
+	 *
+	 * @param EE_Dependency_Map $dependency_map
+	 * @param LoaderInterface   $loader
+	 * @param RouteHandler      $route_handler
+	 * @param TableAnalysis     $table_analysis
+	 */
+	public function __construct(
+		EE_Dependency_Map $dependency_map,
+		LoaderInterface $loader,
+		RouteHandler $route_handler,
+		TableAnalysis $table_analysis
+	) {
+		$this->dependency_map  = $dependency_map;
+		$this->loader          = $loader;
+		$this->route_handler   = $route_handler;
+		$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');
+	}
+
+
+	/**
+	 * @throws Exception
+	 * @deprecated 5.0.20.p
+	 */
+	public function initializePUE()
+	{
+		$this->dependency_map->registerDependencies(PueRequests::class, Route::getDefaultDependencies());
+		$this->route_handler->addRoute(PueRequests::class);
+	}
+
+
+	/**
+	 * 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']);
+		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']);
+	}
+
+
+	/**
+	 * 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'      => 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
+					]
+				);
+				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'      => 60,
+							'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[EspressoPostType::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(EspressoPostType::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/');
         }
     }
 
@@ -104,11 +104,11 @@ 
         add_filter('FHEE__EE_Registry__load_helper__helper_paths', [$this, 'caf_helper_paths']);
         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),
                     ]
                 );
             }
@@ -163,7 +163,7 @@ 
      */
     public function caf_helper_paths(array $paths): array
     {
-        $paths[] = EE_CAF_CORE . 'helpers/';
+        $paths[] = EE_CAF_CORE.'helpers/';
         return $paths;
     }
 
@@ -184,11 +184,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(
@@ -202,11 +202,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
                     ]
                 );
@@ -222,11 +222,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
                     ]
                 );
@@ -246,15 +246,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
                         ]
                     );
@@ -273,8 +273,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);
             }