eventespresso / event-espresso-core

espresso.php

Indentation +107 added lines, -107 removed lines

@@ -37,138 +37,138 @@
  * @since       4.0
  */
 if (function_exists('espresso_version')) {
-    if (! function_exists('espresso_duplicate_plugin_error')) {
-        /**
-         *    espresso_duplicate_plugin_error
-         *    displays if more than one version of EE is activated at the same time.
-         */
-        function espresso_duplicate_plugin_error()
-        {
-            ?>
+	if (! function_exists('espresso_duplicate_plugin_error')) {
+		/**
+		 *    espresso_duplicate_plugin_error
+		 *    displays if more than one version of EE is activated at the same time.
+		 */
+		function espresso_duplicate_plugin_error()
+		{
+			?>
 <div class="error">
     <p>
         <?php
-                    echo esc_html__(
-                        'Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.',
-                        'event_espresso'
-                    ); ?>
+					echo esc_html__(
+						'Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.',
+						'event_espresso'
+					); ?>
     </p>
 </div>
 <?php
-            espresso_deactivate_plugin(plugin_basename(__FILE__));
-        }
-    }
-    add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
+			espresso_deactivate_plugin(plugin_basename(__FILE__));
+		}
+	}
+	add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
 } else {
-    define('EE_MIN_PHP_VER_REQUIRED', '7.4.0');
-    if (! version_compare(PHP_VERSION, EE_MIN_PHP_VER_REQUIRED, '>=')) {
-        /**
-         * espresso_minimum_php_version_error
-         *
-         * @return void
-         */
-        function espresso_minimum_php_version_error()
-        {
-            ?>
+	define('EE_MIN_PHP_VER_REQUIRED', '7.4.0');
+	if (! version_compare(PHP_VERSION, EE_MIN_PHP_VER_REQUIRED, '>=')) {
+		/**
+		 * espresso_minimum_php_version_error
+		 *
+		 * @return void
+		 */
+		function espresso_minimum_php_version_error()
+		{
+			?>
 <div class="error">
     <p>
         <?php
-                    printf(
-                        esc_html__(
-                            'We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
-                            'event_espresso'
-                        ),
-                        EE_MIN_PHP_VER_REQUIRED,
-                        PHP_VERSION,
-                        '<br/>',
-                        '<a href="https://www.php.net/downloads.php">https://php.net/downloads.php</a>'
-                    );
-        ?>
+					printf(
+						esc_html__(
+							'We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
+							'event_espresso'
+						),
+						EE_MIN_PHP_VER_REQUIRED,
+						PHP_VERSION,
+						'<br/>',
+						'<a href="https://www.php.net/downloads.php">https://php.net/downloads.php</a>'
+					);
+		?>
     </p>
 </div>
 <?php
-            espresso_deactivate_plugin(plugin_basename(__FILE__));
-        }
+			espresso_deactivate_plugin(plugin_basename(__FILE__));
+		}
 
-        add_action('admin_notices', 'espresso_minimum_php_version_error', 1);
-    } else {
-        define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
+		add_action('admin_notices', 'espresso_minimum_php_version_error', 1);
+	} else {
+		define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
 
-        require_once __DIR__ . '/vendor/autoload.php';
+		require_once __DIR__ . '/vendor/autoload.php';
 
-        /**
-         * espresso_version
-         * Returns the plugin version
-         *
-         * @return string
-         */
-        function espresso_version(): string
-        {
-            return apply_filters('FHEE__espresso__espresso_version', '5.0.47');
-        }
+		/**
+		 * espresso_version
+		 * Returns the plugin version
+		 *
+		 * @return string
+		 */
+		function espresso_version(): string
+		{
+			return apply_filters('FHEE__espresso__espresso_version', '5.0.47');
+		}
 
-        /**
-         * espresso_plugin_activation
-         * adds a wp-option to indicate that EE has been activated via the WP admin plugins page
-         */
-        function espresso_plugin_activation()
-        {
-            update_option('ee_espresso_activation', true);
-            update_option('event-espresso-core_allow_tracking', 'no');
-            update_option('event-espresso-core_tracking_notice', 'hide');
-            // Run WP GraphQL activation callback
-            espressoLoadWpGraphQL();
-            graphql_activation_callback();
-        }
+		/**
+		 * espresso_plugin_activation
+		 * adds a wp-option to indicate that EE has been activated via the WP admin plugins page
+		 */
+		function espresso_plugin_activation()
+		{
+			update_option('ee_espresso_activation', true);
+			update_option('event-espresso-core_allow_tracking', 'no');
+			update_option('event-espresso-core_tracking_notice', 'hide');
+			// Run WP GraphQL activation callback
+			espressoLoadWpGraphQL();
+			graphql_activation_callback();
+		}
 
-        register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
+		register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
 
-        /**
-         * espresso_plugin_deactivation
-         */
-        function espresso_plugin_deactivation()
-        {
-            // Run WP GraphQL deactivation callback
-            espressoLoadWpGraphQL();
-            graphql_deactivation_callback();
-            delete_option('event-espresso-core_allow_tracking');
-            delete_option('event-espresso-core_tracking_notice');
-        }
-        register_deactivation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_deactivation');
+		/**
+		 * espresso_plugin_deactivation
+		 */
+		function espresso_plugin_deactivation()
+		{
+			// Run WP GraphQL deactivation callback
+			espressoLoadWpGraphQL();
+			graphql_deactivation_callback();
+			delete_option('event-espresso-core_allow_tracking');
+			delete_option('event-espresso-core_tracking_notice');
+		}
+		register_deactivation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_deactivation');
 
-        require_once __DIR__ . '/core/bootstrap_espresso.php';
-        bootstrap_espresso();
-    }
+		require_once __DIR__ . '/core/bootstrap_espresso.php';
+		bootstrap_espresso();
+	}
 }
 
 if (! function_exists('espresso_deactivate_plugin')) {
-    /**
-     *    deactivate_plugin
-     * usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
-     *
-     * @access public
-     * @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file
-     * @return    void
-     */
-    function espresso_deactivate_plugin(string $plugin_basename = '')
-    {
-        if (! function_exists('deactivate_plugins')) {
-            require_once ABSPATH . 'wp-admin/includes/plugin.php';
-        }
-        unset($_GET['activate'], $_REQUEST['activate']);
-        deactivate_plugins($plugin_basename);
-    }
+	/**
+	 *    deactivate_plugin
+	 * usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
+	 *
+	 * @access public
+	 * @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file
+	 * @return    void
+	 */
+	function espresso_deactivate_plugin(string $plugin_basename = '')
+	{
+		if (! function_exists('deactivate_plugins')) {
+			require_once ABSPATH . 'wp-admin/includes/plugin.php';
+		}
+		unset($_GET['activate'], $_REQUEST['activate']);
+		deactivate_plugins($plugin_basename);
+	}
 }
 
 
 if (! function_exists('espressoLoadWpGraphQL')) {
-    function espressoLoadWpGraphQL()
-    {
-        if (
-            ! class_exists('WPGraphQL')
-            && is_readable(__DIR__ . '/vendor/wp-graphql/wp-graphql/wp-graphql.php')
-        ) {
-            require_once __DIR__ . '/vendor/wp-graphql/wp-graphql/wp-graphql.php';
-        }
-    }
+	function espressoLoadWpGraphQL()
+	{
+		if (
+			! class_exists('WPGraphQL')
+			&& is_readable(__DIR__ . '/vendor/wp-graphql/wp-graphql/wp-graphql.php')
+		) {
+			require_once __DIR__ . '/vendor/wp-graphql/wp-graphql/wp-graphql.php';
+		}
+	}
 }

modules/ticket_selector/TicketSelector.php

Indentation +111 added lines, -111 removed lines

@@ -20,115 +20,115 @@
  */
 abstract class TicketSelector
 {
-    /**
-     * @var EE_Event
-     */
-    protected $event;
-
-    /**
-     * @var EE_Ticket[]
-     */
-    protected $tickets;
-
-    /**
-     * @var int
-     */
-    protected $max_attendees;
-
-    /**
-     * @var array
-     */
-    protected $template_args;
-
-    /**
-     * @var int
-     */
-    protected $ticket_rows = 0;
-
-
-    /**
-     * TicketSelectorSimple constructor.
-     *
-     * @param EE_Event    $event
-     * @param EE_Ticket[] $tickets
-     * @param int          $max_attendees
-     * @param array        $template_args
-     */
-    public function __construct(EE_Event $event, array $tickets, $max_attendees, array $template_args)
-    {
-        $this->event = $event;
-        $this->tickets = $tickets;
-        $this->max_attendees = $max_attendees;
-        $this->template_args = $template_args;
-        $this->addTemplateArgs();
-        EE_Registry::$i18n_js_strings['required_checkbox_notice'] = esc_html__(
-            'This ticket is required and must be selected',
-            'event_espresso'
-        );
-    }
-
-
-    /**
-     * sets any and all template args that are required for this Ticket Selector
-     *
-     * @return void
-     */
-    abstract protected function addTemplateArgs();
-
-
-    /**
-     * loadTicketSelectorTemplate
-     *
-     * @return string
-     */
-    protected function loadTicketSelectorTemplate()
-    {
-        try {
-            $this->template_args['hidden_inputs'] = $this->getHiddenInputs();
-            return EEH_Template::locate_template(
-                apply_filters(
-                    'FHEE__EE_Ticket_Selector__display_ticket_selector__template_path',
-                    $this->template_args['template_path'],
-                    $this->event
-                ),
-                $this->template_args
-            );
-        } catch (Exception $e) {
-            EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
-        }
-        return '';
-    }
-
-
-    /**
-     * The __toString method allows a class to decide how it will react when it is converted to a string.
-     *
-     * @return string
-     * @link http://php.net/manual/en/language.oop5.magic.php#language.oop5.magic.tostring
-     */
-    public function __toString()
-    {
-        return $this->loadTicketSelectorTemplate();
-    }
-
-
-    /**
-     * getHiddenInputs
-     *
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function getHiddenInputs()
-    {
-        $html = '<input type="hidden" name="noheader" value="true"/>';
-        $html .= '<input type="hidden" name="tkt-slctr-return-url-' . $this->event->ID() . '"';
-        $html .= ' value="' . EEH_URL::current_url() . $this->template_args['anchor_id'] . '"/>';
-        $html .= '<input type="hidden" name="tkt-slctr-rows-' . $this->event->ID();
-        $html .= '" value="' . $this->ticket_rows . '"/>';
-        $html .= '<input type="hidden" name="tkt-slctr-max-atndz-' . $this->event->ID();
-        $html .= '" value="' . $this->template_args['max_atndz'] . '"/>';
-        $html .= '<input type="hidden" name="tkt-slctr-event-id" value="' . $this->event->ID() . '"/>';
-        return $html;
-    }
+	/**
+	 * @var EE_Event
+	 */
+	protected $event;
+
+	/**
+	 * @var EE_Ticket[]
+	 */
+	protected $tickets;
+
+	/**
+	 * @var int
+	 */
+	protected $max_attendees;
+
+	/**
+	 * @var array
+	 */
+	protected $template_args;
+
+	/**
+	 * @var int
+	 */
+	protected $ticket_rows = 0;
+
+
+	/**
+	 * TicketSelectorSimple constructor.
+	 *
+	 * @param EE_Event    $event
+	 * @param EE_Ticket[] $tickets
+	 * @param int          $max_attendees
+	 * @param array        $template_args
+	 */
+	public function __construct(EE_Event $event, array $tickets, $max_attendees, array $template_args)
+	{
+		$this->event = $event;
+		$this->tickets = $tickets;
+		$this->max_attendees = $max_attendees;
+		$this->template_args = $template_args;
+		$this->addTemplateArgs();
+		EE_Registry::$i18n_js_strings['required_checkbox_notice'] = esc_html__(
+			'This ticket is required and must be selected',
+			'event_espresso'
+		);
+	}
+
+
+	/**
+	 * sets any and all template args that are required for this Ticket Selector
+	 *
+	 * @return void
+	 */
+	abstract protected function addTemplateArgs();
+
+
+	/**
+	 * loadTicketSelectorTemplate
+	 *
+	 * @return string
+	 */
+	protected function loadTicketSelectorTemplate()
+	{
+		try {
+			$this->template_args['hidden_inputs'] = $this->getHiddenInputs();
+			return EEH_Template::locate_template(
+				apply_filters(
+					'FHEE__EE_Ticket_Selector__display_ticket_selector__template_path',
+					$this->template_args['template_path'],
+					$this->event
+				),
+				$this->template_args
+			);
+		} catch (Exception $e) {
+			EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
+		}
+		return '';
+	}
+
+
+	/**
+	 * The __toString method allows a class to decide how it will react when it is converted to a string.
+	 *
+	 * @return string
+	 * @link http://php.net/manual/en/language.oop5.magic.php#language.oop5.magic.tostring
+	 */
+	public function __toString()
+	{
+		return $this->loadTicketSelectorTemplate();
+	}
+
+
+	/**
+	 * getHiddenInputs
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function getHiddenInputs()
+	{
+		$html = '<input type="hidden" name="noheader" value="true"/>';
+		$html .= '<input type="hidden" name="tkt-slctr-return-url-' . $this->event->ID() . '"';
+		$html .= ' value="' . EEH_URL::current_url() . $this->template_args['anchor_id'] . '"/>';
+		$html .= '<input type="hidden" name="tkt-slctr-rows-' . $this->event->ID();
+		$html .= '" value="' . $this->ticket_rows . '"/>';
+		$html .= '<input type="hidden" name="tkt-slctr-max-atndz-' . $this->event->ID();
+		$html .= '" value="' . $this->template_args['max_atndz'] . '"/>';
+		$html .= '<input type="hidden" name="tkt-slctr-event-id" value="' . $this->event->ID() . '"/>';
+		return $html;
+	}
 }

modules/ticket_selector/TicketSelectorStandard.php

Indentation +132 added lines, -132 removed lines

@@ -21,148 +21,148 @@
  */
 class TicketSelectorStandard extends TicketSelector
 {
-    protected string $date_format;
+	protected string $date_format;
 
-    protected string $time_format;
+	protected string $time_format;
 
-    protected EE_Ticket_Selector_Config $ticket_selector_config;
+	protected EE_Ticket_Selector_Config $ticket_selector_config;
 
-    protected EE_Tax_Config $tax_config;
+	protected EE_Tax_Config $tax_config;
 
 
-    /**
-     * TicketSelectorSimple constructor.
-     *
-     * @param EE_Ticket_Selector_Config $ticket_selector_config
-     * @param EE_Tax_Config             $tax_config
-     * @param EE_Event                  $event
-     * @param EE_Ticket[]               $tickets
-     * @param int                       $max_attendees
-     * @param array                     $template_args
-     * @param string                    $date_format
-     * @param string                    $time_format
-     */
-    public function __construct(
-        EE_Ticket_Selector_Config $ticket_selector_config,
-        EE_Tax_Config $tax_config,
-        EE_Event $event,
-        array $tickets,
-        int $max_attendees,
-        array $template_args,
-        string $date_format = 'Y-m-d',
-        string $time_format = 'g:i a'
-    ) {
-        $this->ticket_selector_config = $ticket_selector_config;
-        $this->tax_config             = $tax_config;
-        $this->date_format            = $date_format;
-        $this->time_format            = $time_format;
-        parent::__construct($event, $tickets, $max_attendees, $template_args);
-    }
+	/**
+	 * TicketSelectorSimple constructor.
+	 *
+	 * @param EE_Ticket_Selector_Config $ticket_selector_config
+	 * @param EE_Tax_Config             $tax_config
+	 * @param EE_Event                  $event
+	 * @param EE_Ticket[]               $tickets
+	 * @param int                       $max_attendees
+	 * @param array                     $template_args
+	 * @param string                    $date_format
+	 * @param string                    $time_format
+	 */
+	public function __construct(
+		EE_Ticket_Selector_Config $ticket_selector_config,
+		EE_Tax_Config $tax_config,
+		EE_Event $event,
+		array $tickets,
+		int $max_attendees,
+		array $template_args,
+		string $date_format = 'Y-m-d',
+		string $time_format = 'g:i a'
+	) {
+		$this->ticket_selector_config = $ticket_selector_config;
+		$this->tax_config             = $tax_config;
+		$this->date_format            = $date_format;
+		$this->time_format            = $time_format;
+		parent::__construct($event, $tickets, $max_attendees, $template_args);
+	}
 
 
-    /**
-     * sets any and all template args that are required for this Ticket Selector
-     *
-     * @return void
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function addTemplateArgs()
-    {
-        $this->ticket_rows        = 0;
-        $all_ticket_rows_html     = '';
-        $required_ticket_sold_out = false;
-        // flag to indicate that at least one taxable ticket has been encountered
-        $taxable_tickets                          = false;
-        $datetime_selector                        = null;
-        $this->template_args['datetime_selector'] = '';
-        if (
-            $this->ticket_selector_config->getShowDatetimeSelector()
-            !== EE_Ticket_Selector_Config::DO_NOT_SHOW_DATETIME_SELECTOR
-        ) {
-            $datetime_selector                        = new DatetimeSelector(
-                $this->event,
-                $this->tickets,
-                $this->ticket_selector_config,
-                $this->date_format,
-                $this->time_format
-            );
-            $this->template_args['datetime_selector'] = $datetime_selector->getDatetimeSelector();
-        }
+	/**
+	 * sets any and all template args that are required for this Ticket Selector
+	 *
+	 * @return void
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function addTemplateArgs()
+	{
+		$this->ticket_rows        = 0;
+		$all_ticket_rows_html     = '';
+		$required_ticket_sold_out = false;
+		// flag to indicate that at least one taxable ticket has been encountered
+		$taxable_tickets                          = false;
+		$datetime_selector                        = null;
+		$this->template_args['datetime_selector'] = '';
+		if (
+			$this->ticket_selector_config->getShowDatetimeSelector()
+			!== EE_Ticket_Selector_Config::DO_NOT_SHOW_DATETIME_SELECTOR
+		) {
+			$datetime_selector                        = new DatetimeSelector(
+				$this->event,
+				$this->tickets,
+				$this->ticket_selector_config,
+				$this->date_format,
+				$this->time_format
+			);
+			$this->template_args['datetime_selector'] = $datetime_selector->getDatetimeSelector();
+		}
 
-        $total_tickets = count($this->tickets);
-        // loop through tickets
-        foreach ($this->tickets as $ticket) {
-            if ($ticket instanceof EE_Ticket) {
-                $this->ticket_rows++;
-                $cols                = 2;
-                $taxable_tickets     = $ticket->taxable() ? true : $taxable_tickets;
-                $ticket_selector_row = new TicketSelectorRowStandard(
-                    new TicketDetails($ticket, $this->ticket_selector_config, $this->template_args),
-                    $this->tax_config,
-                    $total_tickets,
-                    $this->max_attendees,
-                    $this->ticket_rows,
-                    $cols,
-                    $required_ticket_sold_out,
-                    $this->template_args['event_status'],
-                    $datetime_selector instanceof DatetimeSelector
-                        ? $datetime_selector->getTicketDatetimeClasses($ticket)
-                        : '',
-                    $this->ticket_selector_config->useNewCheckboxSelector()
-                );
-                $ticket_row_html     = $ticket_selector_row->getHtml();
-                // check if something was actually returned
-                if (! empty($ticket_row_html)) {
-                    // add any output to the cumulative HTML
-                    $all_ticket_rows_html .= $ticket_row_html;
-                }
-                if (empty($ticket_row_html) || ! $ticket_selector_row->isOnSale()) {
-                    // decrement the ticket row count since it looks like one has been removed
-                    $this->ticket_rows--;
-                }
+		$total_tickets = count($this->tickets);
+		// loop through tickets
+		foreach ($this->tickets as $ticket) {
+			if ($ticket instanceof EE_Ticket) {
+				$this->ticket_rows++;
+				$cols                = 2;
+				$taxable_tickets     = $ticket->taxable() ? true : $taxable_tickets;
+				$ticket_selector_row = new TicketSelectorRowStandard(
+					new TicketDetails($ticket, $this->ticket_selector_config, $this->template_args),
+					$this->tax_config,
+					$total_tickets,
+					$this->max_attendees,
+					$this->ticket_rows,
+					$cols,
+					$required_ticket_sold_out,
+					$this->template_args['event_status'],
+					$datetime_selector instanceof DatetimeSelector
+						? $datetime_selector->getTicketDatetimeClasses($ticket)
+						: '',
+					$this->ticket_selector_config->useNewCheckboxSelector()
+				);
+				$ticket_row_html     = $ticket_selector_row->getHtml();
+				// check if something was actually returned
+				if (! empty($ticket_row_html)) {
+					// add any output to the cumulative HTML
+					$all_ticket_rows_html .= $ticket_row_html;
+				}
+				if (empty($ticket_row_html) || ! $ticket_selector_row->isOnSale()) {
+					// decrement the ticket row count since it looks like one has been removed
+					$this->ticket_rows--;
+				}
 
-                $required_ticket_sold_out = $ticket_selector_row->getRequiredTicketSoldOut();
-            }
-        }
-        $this->template_args['allowed_form_tags']                = AllowedTags::getWithFormTags();
-        $this->template_args['row']                              = $this->ticket_rows;
-        $this->template_args['ticket_row_html']                  = $all_ticket_rows_html;
-        $this->template_args['taxable_tickets']                  = $taxable_tickets;
-        $this->template_args['use_new_form_styles_class']        = $this->ticket_selector_config->useNewFormStyles()
-            ? ' tkt-slctr-use-new-form-styles'
-            : '';
-        $this->template_args['prices_displayed_including_taxes'] = $this->tax_config->prices_displayed_including_taxes;
+				$required_ticket_sold_out = $ticket_selector_row->getRequiredTicketSoldOut();
+			}
+		}
+		$this->template_args['allowed_form_tags']                = AllowedTags::getWithFormTags();
+		$this->template_args['row']                              = $this->ticket_rows;
+		$this->template_args['ticket_row_html']                  = $all_ticket_rows_html;
+		$this->template_args['taxable_tickets']                  = $taxable_tickets;
+		$this->template_args['use_new_form_styles_class']        = $this->ticket_selector_config->useNewFormStyles()
+			? ' tkt-slctr-use-new-form-styles'
+			: '';
+		$this->template_args['prices_displayed_including_taxes'] = $this->tax_config->prices_displayed_including_taxes;
 
 
-        /**
-         * Filters the text printed for the header of the price column in the ticket selector table
-         *
-         * @param string 'Price' The translatable text to display in the table header for price
-         * @param int $EVT_ID The Event ID
-         * @since 4.7.2
-         *
-         */
-        $this->template_args['table_header_price'] = apply_filters(
-            'FHEE__ticket_selector_chart_template__table_header_price',
-            esc_html__('Price', 'event_espresso'),
-            $this->event->ID()
-        );
+		/**
+		 * Filters the text printed for the header of the price column in the ticket selector table
+		 *
+		 * @param string 'Price' The translatable text to display in the table header for price
+		 * @param int $EVT_ID The Event ID
+		 * @since 4.7.2
+		 *
+		 */
+		$this->template_args['table_header_price'] = apply_filters(
+			'FHEE__ticket_selector_chart_template__table_header_price',
+			esc_html__('Price', 'event_espresso'),
+			$this->event->ID()
+		);
 
-        /**
-         * Filters the text printed for the header of the quantity column in the ticket selector table
-         *
-         * @param string 'Qty' The translatable text to display in the table header for the Quantity of tickets
-         * @param int $EVT_ID The Event ID
-         * @since 4.7.2
-         *
-         */
-        $this->template_args['table_header_qty'] = apply_filters(
-            'FHEE__ticket_selector_chart_template__table_header_qty',
-            esc_html__('Qty', 'event_espresso'),
-            $this->event->ID()
-        );
-        $this->template_args['template_path'] = TICKET_SELECTOR_TEMPLATES_PATH . 'standard_ticket_selector.template.php';
-        remove_all_filters('FHEE__EE_Ticket_Selector__hide_ticket_selector');
-    }
+		/**
+		 * Filters the text printed for the header of the quantity column in the ticket selector table
+		 *
+		 * @param string 'Qty' The translatable text to display in the table header for the Quantity of tickets
+		 * @param int $EVT_ID The Event ID
+		 * @since 4.7.2
+		 *
+		 */
+		$this->template_args['table_header_qty'] = apply_filters(
+			'FHEE__ticket_selector_chart_template__table_header_qty',
+			esc_html__('Qty', 'event_espresso'),
+			$this->event->ID()
+		);
+		$this->template_args['template_path'] = TICKET_SELECTOR_TEMPLATES_PATH . 'standard_ticket_selector.template.php';
+		remove_all_filters('FHEE__EE_Ticket_Selector__hide_ticket_selector');
+	}
 }

modules/ticket_selector/TicketSelectorRowSimple.php

Indentation +26 added lines, -26 removed lines

@@ -14,32 +14,32 @@
  */
 class TicketSelectorRowSimple extends TicketSelectorRow
 {
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function setupTicketStatusDisplay()
-    {
-        $remaining = $this->ticket->remaining();
-        $this->setTicketMinAndMax($remaining);
-        $this->setTicketStatusClasses($remaining);
-        $this->setTicketStatusDisplay($remaining);
-    }
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function setupTicketStatusDisplay()
+	{
+		$remaining = $this->ticket->remaining();
+		$this->setTicketMinAndMax($remaining);
+		$this->setTicketStatusClasses($remaining);
+		$this->setTicketStatusDisplay($remaining);
+	}
 
 
-    /**
-     * @return bool|string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function getTicketDescription()
-    {
-        $filtered_row_content = $this->getFilteredRowContents();
-        if ($filtered_row_content !== false) {
-            remove_filter('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true');
-            add_filter('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_false');
-            return $filtered_row_content;
-        }
-        return $this->ticket->description();
-    }
+	/**
+	 * @return bool|string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function getTicketDescription()
+	{
+		$filtered_row_content = $this->getFilteredRowContents();
+		if ($filtered_row_content !== false) {
+			remove_filter('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true');
+			add_filter('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_false');
+			return $filtered_row_content;
+		}
+		return $this->ticket->description();
+	}
 }

modules/ticket_selector/TicketSelectorRowStandard.php

Indentation +385 added lines, -385 removed lines

@@ -19,393 +19,393 @@
  */
 class TicketSelectorRowStandard extends TicketSelectorRow
 {
-    /**
-     * @var TicketDetails
-     */
-    protected $ticket_details;
-
-    /**
-     * @var EE_Ticket_Selector_Config
-     */
-    protected $template_settings;
-
-    /**
-     * @var EE_Tax_Config
-     */
-    protected $tax_settings;
-
-    /**
-     * @var boolean
-     */
-    protected $prices_displayed_including_taxes;
-
-    /**
-     * @var int
-     */
-    protected $row;
-
-    /**
-     * @var int
-     */
-    protected $cols;
-
-    /**
-     * @var boolean
-     */
-    protected $hidden_input_qty = false;
-
-    /**
-     * @var string
-     */
-    protected $ticket_datetime_classes;
-
-    private bool $use_new_checkbox_selector;
-
-
-    /**
-     * TicketDetails constructor.
-     *
-     * @param TicketDetails $ticket_details
-     * @param EE_Tax_Config $tax_settings
-     * @param int           $total_tickets
-     * @param int           $max_attendees
-     * @param int           $row
-     * @param int           $cols
-     * @param boolean       $required_ticket_sold_out
-     * @param string        $event_status
-     * @param string        $ticket_datetime_classes
-     * @param bool          $use_new_checkbox_selector
-     * @throws EE_Error
-     * @throws UnexpectedEntityException
-     */
-    public function __construct(
-        TicketDetails $ticket_details,
-        EE_Tax_Config $tax_settings,
-        $total_tickets,
-        $max_attendees,
-        $row,
-        $cols,
-        $required_ticket_sold_out,
-        $event_status,
-        $ticket_datetime_classes,
-        bool $use_new_checkbox_selector = false
-    ) {
-        $this->ticket_details            = $ticket_details;
-        $this->template_settings         = $ticket_details->getTemplateSettings();
-        $this->tax_settings              = $tax_settings;
-        $this->row                       = $row;
-        $this->cols                      = $cols;
-        $this->ticket_datetime_classes   = $ticket_datetime_classes;
-        $this->use_new_checkbox_selector = $use_new_checkbox_selector;
-        parent::__construct(
-            $ticket_details->getTicket(),
-            $max_attendees,
-            $ticket_details->getDateFormat(),
-            $event_status,
-            $required_ticket_sold_out,
-            $total_tickets
-        );
-    }
-
-
-    /**
-     * other ticket rows will need to know if a required ticket is sold out,
-     * so that they are not offered for sale
-     *
-     * @return boolean
-     */
-    public function getRequiredTicketSoldOut()
-    {
-        return $this->required_ticket_sold_out;
-    }
-
-
-    /**
-     * @return int
-     */
-    public function getCols()
-    {
-        return $this->cols;
-    }
-
-
-    /**
-     * getHtml
-     *
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function getHtml()
-    {
-        $this->min = 0;
-        $this->max = $this->ticket->max();
-        $remaining = $this->ticket->remaining();
-        $this->setTicketMinAndMax($remaining);
-        // set flag if ticket is required (flag is set to start date so that future tickets are not blocked)
-        $this->required_ticket_sold_out = $this->ticket->required() && ! $remaining
-            ? $this->ticket->start_date()
-            : $this->required_ticket_sold_out;
-        $this->setTicketPriceDetails();
-        $this->setTicketStatusClasses($remaining);
-        $filtered_row_html = $this->getFilteredRowHtml();
-        if ($filtered_row_html !== false) {
-            return $filtered_row_html;
-        }
-        $ticket_selector_row_html = EEH_HTML::tr(
-            '',
-            '',
-            "tckt-slctr-tbl-tr {$this->status_class}{$this->ticket_datetime_classes} "
-            . espresso_get_object_css_class($this->ticket)
-        );
-        $filtered_row_content     = $this->getFilteredRowContents();
-        if ($filtered_row_content !== false) {
-            if ($this->max_attendees === 1) {
-                return $ticket_selector_row_html
-                    . $filtered_row_content
-                    . $this->ticketQtyAndIdHiddenInputs()
-                    . EEH_HTML::trx();
-            }
-            return $ticket_selector_row_html
-                . $filtered_row_content
-                . EEH_HTML::trx();
-        }
-        $this->hidden_input_qty = $this->max_attendees > 1;
-
-        $ticket_selector_row_html .= $this->ticketNameTableCell();
-        $ticket_selector_row_html .= $this->ticketPriceTableCell();
-        $ticket_selector_row_html .= EEH_HTML::td(
-            '',
-            '',
-            'tckt-slctr-tbl-td-qty cntr',
-            '',
-            'headers="quantity-' . $this->EVT_ID . '"'
-        );
-        $this->setTicketStatusDisplay($remaining);
-        if (empty($this->ticket_status_display)) {
-            $this->hidden_input_qty = false;
-            // display submit button since we have tickets available
-            add_filter('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true');
-            if ($this->max_attendees === 1) {
-                // only ONE attendee is allowed to register at a time
-                $ticket_selector_row_html .= $this->onlyOneAttendeeCanRegister();
-            } else {
-                $ticket_selector_row_html .= $this->max === 1 && $this->use_new_checkbox_selector
-                    ? $this->ticketCheckboxSelector()
-                    : $this->ticketQuantitySelector();
-            }
-        }
-        $ticket_selector_row_html .= $this->ticket_status_display;
-        $ticket_selector_row_html .= $this->ticketQtyAndIdHiddenInputs();
-        $ticket_selector_row_html .= $this->ticket_details->display(
-            $this->ticket_price,
-            $remaining,
-            $this->cols
-        );
-        $ticket_selector_row_html .= EEH_HTML::tdx();
-        $ticket_selector_row_html .= EEH_HTML::trx();
-
-
-        $this->row++;
-        return $ticket_selector_row_html;
-    }
-
-
-    /**
-     * getTicketPriceDetails
-     *
-     * @return void
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function setTicketPriceDetails()
-    {
-        $this->ticket_price  = $this->tax_settings->prices_displayed_including_taxes
-            ? $this->ticket->get_ticket_total_with_taxes()
-            : $this->ticket->get_ticket_subtotal();
-        $this->ticket_bundle = false;
-        $ticket_min          = $this->ticket->min();
-        // for ticket bundles, set min and max qty the same
-        if ($ticket_min !== 0 && $ticket_min === $this->ticket->max()) {
-            $this->ticket_price  *= $ticket_min;
-            $this->ticket_bundle = true;
-        }
-        $this->ticket_price = apply_filters(
-            'FHEE__ticket_selector_chart_template__ticket_price',
-            $this->ticket_price,
-            $this->ticket
-        );
-    }
-
-
-    /**
-     * ticketNameTableCell
-     *
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function ticketNameTableCell()
-    {
-        $html = EEH_HTML::td(
-            '',
-            '',
-            'tckt-slctr-tbl-td-name',
-            '',
-            'headers="details-' . $this->EVT_ID . '"'
-        );
-        $html .= EEH_HTML::strong($this->ticket->get_pretty('TKT_name'));
-        $html .= $this->ticket_details->getShowHideLinks();
-        if ($this->ticket->required()) {
-            $html .= EEH_HTML::p(
-                apply_filters(
-                    'FHEE__ticket_selector_chart_template__ticket_required_message',
-                    esc_html__('This ticket is required and must be purchased.', 'event_espresso')
-                ),
-                '',
-                'ticket-required-pg'
-            );
-        }
-        $html .= EEH_HTML::tdx();
-        return $html;
-    }
-
-
-    /**
-     * ticketPriceTableCell
-     *
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function ticketPriceTableCell()
-    {
-        $html = '';
-        if (apply_filters('FHEE__ticket_selector_chart_template__display_ticket_price_details', true)) {
-            $html .= EEH_HTML::td(
-                '',
-                '',
-                'tckt-slctr-tbl-td-price jst-rght',
-                '',
-                'headers="price-' . $this->EVT_ID . '"'
-            );
-            $html .= EEH_HTML::span(
-                EEH_Template::format_currency($this->ticket_price),
-                '',
-                'tckt-price--nowrap'
-            );
-            $html .= $this->ticket->taxable()
-                ? EEH_HTML::span('*', '', 'taxable-tickets-asterisk grey-text')
-                : '';
-            $html .= ' ';
-            // phpcs:disable WordPress.WP.I18n.NoEmptyStrings
-            $html .= EEH_HTML::span(
-                $this->ticket_bundle
-                    ? apply_filters(
-                    'FHEE__ticket_selector_chart_template__per_ticket_bundle_text',
-                    esc_html__(' / bundle', 'event_espresso')
-                )
-                    : apply_filters(
-                    'FHEE__ticket_selector_chart_template__per_ticket_text',
-                    esc_html__('', 'event_espresso')
-                ),
-                '',
-                'smaller-text no-bold'
-            );
-            $html .= ' ';
-            $html .= EEH_HTML::tdx();
-            $this->cols++;
-        }
-        return $html;
-    }
-
-
-    /**
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function onlyOneAttendeeCanRegister(): string
-    {
-        $TKT     = $this->ticket->ID();
-        $label   = esc_html__('Select this ticket', 'event_espresso');
-        $name    = "tkt-slctr-qty-$this->EVT_ID";
-        $class   = "ticket-selector-tbl-qty-slct";
-        $id      = "$class-$this->EVT_ID-$this->row";
-        $checked = $this->total_tickets === 1 ? ' checked="checked"' : '';
-
-        return "
+	/**
+	 * @var TicketDetails
+	 */
+	protected $ticket_details;
+
+	/**
+	 * @var EE_Ticket_Selector_Config
+	 */
+	protected $template_settings;
+
+	/**
+	 * @var EE_Tax_Config
+	 */
+	protected $tax_settings;
+
+	/**
+	 * @var boolean
+	 */
+	protected $prices_displayed_including_taxes;
+
+	/**
+	 * @var int
+	 */
+	protected $row;
+
+	/**
+	 * @var int
+	 */
+	protected $cols;
+
+	/**
+	 * @var boolean
+	 */
+	protected $hidden_input_qty = false;
+
+	/**
+	 * @var string
+	 */
+	protected $ticket_datetime_classes;
+
+	private bool $use_new_checkbox_selector;
+
+
+	/**
+	 * TicketDetails constructor.
+	 *
+	 * @param TicketDetails $ticket_details
+	 * @param EE_Tax_Config $tax_settings
+	 * @param int           $total_tickets
+	 * @param int           $max_attendees
+	 * @param int           $row
+	 * @param int           $cols
+	 * @param boolean       $required_ticket_sold_out
+	 * @param string        $event_status
+	 * @param string        $ticket_datetime_classes
+	 * @param bool          $use_new_checkbox_selector
+	 * @throws EE_Error
+	 * @throws UnexpectedEntityException
+	 */
+	public function __construct(
+		TicketDetails $ticket_details,
+		EE_Tax_Config $tax_settings,
+		$total_tickets,
+		$max_attendees,
+		$row,
+		$cols,
+		$required_ticket_sold_out,
+		$event_status,
+		$ticket_datetime_classes,
+		bool $use_new_checkbox_selector = false
+	) {
+		$this->ticket_details            = $ticket_details;
+		$this->template_settings         = $ticket_details->getTemplateSettings();
+		$this->tax_settings              = $tax_settings;
+		$this->row                       = $row;
+		$this->cols                      = $cols;
+		$this->ticket_datetime_classes   = $ticket_datetime_classes;
+		$this->use_new_checkbox_selector = $use_new_checkbox_selector;
+		parent::__construct(
+			$ticket_details->getTicket(),
+			$max_attendees,
+			$ticket_details->getDateFormat(),
+			$event_status,
+			$required_ticket_sold_out,
+			$total_tickets
+		);
+	}
+
+
+	/**
+	 * other ticket rows will need to know if a required ticket is sold out,
+	 * so that they are not offered for sale
+	 *
+	 * @return boolean
+	 */
+	public function getRequiredTicketSoldOut()
+	{
+		return $this->required_ticket_sold_out;
+	}
+
+
+	/**
+	 * @return int
+	 */
+	public function getCols()
+	{
+		return $this->cols;
+	}
+
+
+	/**
+	 * getHtml
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function getHtml()
+	{
+		$this->min = 0;
+		$this->max = $this->ticket->max();
+		$remaining = $this->ticket->remaining();
+		$this->setTicketMinAndMax($remaining);
+		// set flag if ticket is required (flag is set to start date so that future tickets are not blocked)
+		$this->required_ticket_sold_out = $this->ticket->required() && ! $remaining
+			? $this->ticket->start_date()
+			: $this->required_ticket_sold_out;
+		$this->setTicketPriceDetails();
+		$this->setTicketStatusClasses($remaining);
+		$filtered_row_html = $this->getFilteredRowHtml();
+		if ($filtered_row_html !== false) {
+			return $filtered_row_html;
+		}
+		$ticket_selector_row_html = EEH_HTML::tr(
+			'',
+			'',
+			"tckt-slctr-tbl-tr {$this->status_class}{$this->ticket_datetime_classes} "
+			. espresso_get_object_css_class($this->ticket)
+		);
+		$filtered_row_content     = $this->getFilteredRowContents();
+		if ($filtered_row_content !== false) {
+			if ($this->max_attendees === 1) {
+				return $ticket_selector_row_html
+					. $filtered_row_content
+					. $this->ticketQtyAndIdHiddenInputs()
+					. EEH_HTML::trx();
+			}
+			return $ticket_selector_row_html
+				. $filtered_row_content
+				. EEH_HTML::trx();
+		}
+		$this->hidden_input_qty = $this->max_attendees > 1;
+
+		$ticket_selector_row_html .= $this->ticketNameTableCell();
+		$ticket_selector_row_html .= $this->ticketPriceTableCell();
+		$ticket_selector_row_html .= EEH_HTML::td(
+			'',
+			'',
+			'tckt-slctr-tbl-td-qty cntr',
+			'',
+			'headers="quantity-' . $this->EVT_ID . '"'
+		);
+		$this->setTicketStatusDisplay($remaining);
+		if (empty($this->ticket_status_display)) {
+			$this->hidden_input_qty = false;
+			// display submit button since we have tickets available
+			add_filter('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true');
+			if ($this->max_attendees === 1) {
+				// only ONE attendee is allowed to register at a time
+				$ticket_selector_row_html .= $this->onlyOneAttendeeCanRegister();
+			} else {
+				$ticket_selector_row_html .= $this->max === 1 && $this->use_new_checkbox_selector
+					? $this->ticketCheckboxSelector()
+					: $this->ticketQuantitySelector();
+			}
+		}
+		$ticket_selector_row_html .= $this->ticket_status_display;
+		$ticket_selector_row_html .= $this->ticketQtyAndIdHiddenInputs();
+		$ticket_selector_row_html .= $this->ticket_details->display(
+			$this->ticket_price,
+			$remaining,
+			$this->cols
+		);
+		$ticket_selector_row_html .= EEH_HTML::tdx();
+		$ticket_selector_row_html .= EEH_HTML::trx();
+
+
+		$this->row++;
+		return $ticket_selector_row_html;
+	}
+
+
+	/**
+	 * getTicketPriceDetails
+	 *
+	 * @return void
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function setTicketPriceDetails()
+	{
+		$this->ticket_price  = $this->tax_settings->prices_displayed_including_taxes
+			? $this->ticket->get_ticket_total_with_taxes()
+			: $this->ticket->get_ticket_subtotal();
+		$this->ticket_bundle = false;
+		$ticket_min          = $this->ticket->min();
+		// for ticket bundles, set min and max qty the same
+		if ($ticket_min !== 0 && $ticket_min === $this->ticket->max()) {
+			$this->ticket_price  *= $ticket_min;
+			$this->ticket_bundle = true;
+		}
+		$this->ticket_price = apply_filters(
+			'FHEE__ticket_selector_chart_template__ticket_price',
+			$this->ticket_price,
+			$this->ticket
+		);
+	}
+
+
+	/**
+	 * ticketNameTableCell
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function ticketNameTableCell()
+	{
+		$html = EEH_HTML::td(
+			'',
+			'',
+			'tckt-slctr-tbl-td-name',
+			'',
+			'headers="details-' . $this->EVT_ID . '"'
+		);
+		$html .= EEH_HTML::strong($this->ticket->get_pretty('TKT_name'));
+		$html .= $this->ticket_details->getShowHideLinks();
+		if ($this->ticket->required()) {
+			$html .= EEH_HTML::p(
+				apply_filters(
+					'FHEE__ticket_selector_chart_template__ticket_required_message',
+					esc_html__('This ticket is required and must be purchased.', 'event_espresso')
+				),
+				'',
+				'ticket-required-pg'
+			);
+		}
+		$html .= EEH_HTML::tdx();
+		return $html;
+	}
+
+
+	/**
+	 * ticketPriceTableCell
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function ticketPriceTableCell()
+	{
+		$html = '';
+		if (apply_filters('FHEE__ticket_selector_chart_template__display_ticket_price_details', true)) {
+			$html .= EEH_HTML::td(
+				'',
+				'',
+				'tckt-slctr-tbl-td-price jst-rght',
+				'',
+				'headers="price-' . $this->EVT_ID . '"'
+			);
+			$html .= EEH_HTML::span(
+				EEH_Template::format_currency($this->ticket_price),
+				'',
+				'tckt-price--nowrap'
+			);
+			$html .= $this->ticket->taxable()
+				? EEH_HTML::span('*', '', 'taxable-tickets-asterisk grey-text')
+				: '';
+			$html .= ' ';
+			// phpcs:disable WordPress.WP.I18n.NoEmptyStrings
+			$html .= EEH_HTML::span(
+				$this->ticket_bundle
+					? apply_filters(
+					'FHEE__ticket_selector_chart_template__per_ticket_bundle_text',
+					esc_html__(' / bundle', 'event_espresso')
+				)
+					: apply_filters(
+					'FHEE__ticket_selector_chart_template__per_ticket_text',
+					esc_html__('', 'event_espresso')
+				),
+				'',
+				'smaller-text no-bold'
+			);
+			$html .= ' ';
+			$html .= EEH_HTML::tdx();
+			$this->cols++;
+		}
+		return $html;
+	}
+
+
+	/**
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function onlyOneAttendeeCanRegister(): string
+	{
+		$TKT     = $this->ticket->ID();
+		$label   = esc_html__('Select this ticket', 'event_espresso');
+		$name    = "tkt-slctr-qty-$this->EVT_ID";
+		$class   = "ticket-selector-tbl-qty-slct";
+		$id      = "$class-$this->EVT_ID-$this->row";
+		$checked = $this->total_tickets === 1 ? ' checked="checked"' : '';
+
+		return "
         <label class='ee-a11y-screen-reader-text' for='$id' >$label</label>
         <input type='radio'$checked name='$name' id='$id' class='$class' value='$TKT-1'/>";
-    }
-
-
-    /**
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function ticketCheckboxSelector(): string
-    {
-        $TKT      = $this->ticket->ID();
-        $label    = esc_html__('Select this ticket', 'event_espresso');
-        $name     = "tkt-slctr-qty-$this->EVT_ID[$TKT]";
-        $class    = 'ticket-selector-tbl-qty-slct';
-        $id       = "$class-$this->EVT_ID-$this->row";
-        $title    = esc_html__('only one of this ticket can be purchased at a time', 'event_espresso');
-        $checked  = $this->ticket->required() ? ' checked="checked"' : '';
-        $required = $this->ticket->required() ? ' required="required"' : '';
-
-        return "
+	}
+
+
+	/**
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function ticketCheckboxSelector(): string
+	{
+		$TKT      = $this->ticket->ID();
+		$label    = esc_html__('Select this ticket', 'event_espresso');
+		$name     = "tkt-slctr-qty-$this->EVT_ID[$TKT]";
+		$class    = 'ticket-selector-tbl-qty-slct';
+		$id       = "$class-$this->EVT_ID-$this->row";
+		$title    = esc_html__('only one of this ticket can be purchased at a time', 'event_espresso');
+		$checked  = $this->ticket->required() ? ' checked="checked"' : '';
+		$required = $this->ticket->required() ? ' required="required"' : '';
+
+		return "
         <label class='ee-a11y-screen-reader-text' for='$id' >$label</label>
         <input type='checkbox' name='$name' id='$id' class='$class' value='1' title='$title'$checked$required/>";
-    }
-
-
-    /**
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function ticketQuantitySelector(): string
-    {
-        $TKT      = $this->ticket->ID();
-        $label    = esc_html__('Quantity', 'event_espresso');
-        $name     = "tkt-slctr-qty-$this->EVT_ID[$TKT]";
-        $class    = 'ticket-selector-tbl-qty-slct';
-        $id       = "$class-$this->EVT_ID-$this->row";
-        $required = $this->ticket->required() ? ' required="required"' : '';
-
-        $html = "<label class='ee-a11y-screen-reader-text' for='$id' >$label</label>";
-        $html .= "<select name='$name' id='$id' class='$class'$required>";
-        // this ensures that non-required tickets with non-zero MIN QTYs don't HAVE to be purchased
-        if ($this->min !== 0 && ! $this->ticket->required()) {
-            $html .= "<option value='0'>&nbsp;0&nbsp;</option>";
-        }
-        // offer ticket quantities from the min to the max
-        for ($i = $this->min; $i <= $this->max; $i++) {
-            $html .= "<option value='$i'>&nbsp;$i&nbsp;</option>";
-        }
-        $html .= "</select>";
-        return $html;
-    }
-
-
-    /**
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function ticketQtyAndIdHiddenInputs(): string
-    {
-        $html = '';
-        $EVT  = $this->EVT_ID;
-        $TKT  = $this->ticket->ID();
-        // depending on group reg we need to change the format for qty
-        if ($this->hidden_input_qty) {
-            $html .= "<input type='hidden' name='tkt-slctr-qty-{$EVT}[]' value='0' />";
-        }
-        $html .= "<input type='hidden' name='tkt-slctr-ticket-id-{$EVT}[]' value='$TKT' />";
-        return $html;
-    }
+	}
+
+
+	/**
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function ticketQuantitySelector(): string
+	{
+		$TKT      = $this->ticket->ID();
+		$label    = esc_html__('Quantity', 'event_espresso');
+		$name     = "tkt-slctr-qty-$this->EVT_ID[$TKT]";
+		$class    = 'ticket-selector-tbl-qty-slct';
+		$id       = "$class-$this->EVT_ID-$this->row";
+		$required = $this->ticket->required() ? ' required="required"' : '';
+
+		$html = "<label class='ee-a11y-screen-reader-text' for='$id' >$label</label>";
+		$html .= "<select name='$name' id='$id' class='$class'$required>";
+		// this ensures that non-required tickets with non-zero MIN QTYs don't HAVE to be purchased
+		if ($this->min !== 0 && ! $this->ticket->required()) {
+			$html .= "<option value='0'>&nbsp;0&nbsp;</option>";
+		}
+		// offer ticket quantities from the min to the max
+		for ($i = $this->min; $i <= $this->max; $i++) {
+			$html .= "<option value='$i'>&nbsp;$i&nbsp;</option>";
+		}
+		$html .= "</select>";
+		return $html;
+	}
+
+
+	/**
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function ticketQtyAndIdHiddenInputs(): string
+	{
+		$html = '';
+		$EVT  = $this->EVT_ID;
+		$TKT  = $this->ticket->ID();
+		// depending on group reg we need to change the format for qty
+		if ($this->hidden_input_qty) {
+			$html .= "<input type='hidden' name='tkt-slctr-qty-{$EVT}[]' value='0' />";
+		}
+		$html .= "<input type='hidden' name='tkt-slctr-ticket-id-{$EVT}[]' value='$TKT' />";
+		return $html;
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -158,7 +158,7 @@ 
             "tckt-slctr-tbl-tr {$this->status_class}{$this->ticket_datetime_classes} "
             . espresso_get_object_css_class($this->ticket)
         );
-        $filtered_row_content     = $this->getFilteredRowContents();
+        $filtered_row_content = $this->getFilteredRowContents();
         if ($filtered_row_content !== false) {
             if ($this->max_attendees === 1) {
                 return $ticket_selector_row_html
@@ -179,7 +179,7 @@ 
             '',
             'tckt-slctr-tbl-td-qty cntr',
             '',
-            'headers="quantity-' . $this->EVT_ID . '"'
+            'headers="quantity-'.$this->EVT_ID.'"'
         );
         $this->setTicketStatusDisplay($remaining);
         if (empty($this->ticket_status_display)) {
@@ -227,7 +227,7 @@ 
         $ticket_min          = $this->ticket->min();
         // for ticket bundles, set min and max qty the same
         if ($ticket_min !== 0 && $ticket_min === $this->ticket->max()) {
-            $this->ticket_price  *= $ticket_min;
+            $this->ticket_price *= $ticket_min;
             $this->ticket_bundle = true;
         }
         $this->ticket_price = apply_filters(
@@ -252,7 +252,7 @@ 
             '',
             'tckt-slctr-tbl-td-name',
             '',
-            'headers="details-' . $this->EVT_ID . '"'
+            'headers="details-'.$this->EVT_ID.'"'
         );
         $html .= EEH_HTML::strong($this->ticket->get_pretty('TKT_name'));
         $html .= $this->ticket_details->getShowHideLinks();
@@ -287,7 +287,7 @@ 
                 '',
                 'tckt-slctr-tbl-td-price jst-rght',
                 '',
-                'headers="price-' . $this->EVT_ID . '"'
+                'headers="price-'.$this->EVT_ID.'"'
             );
             $html .= EEH_HTML::span(
                 EEH_Template::format_currency($this->ticket_price),

core/EE_Front_Controller.core.php

Indentation +512 added lines, -512 removed lines

@@ -20,516 +20,516 @@
  */
 final class EE_Front_Controller
 {
-    /**
-     * @var string
-     */
-    private $_template_path;
-
-    /**
-     * @var string
-     */
-    private $_template;
-
-    /**
-     * @type EE_Registry
-     */
-    protected $Registry;
-
-    /**
-     * @type EE_Request_Handler
-     */
-    protected $Request_Handler;
-
-    /**
-     * @type EE_Module_Request_Router
-     */
-    protected $Module_Request_Router;
-
-    /**
-     * @type CurrentPage
-     */
-    protected $current_page;
-
-
-    /**
-     *    class constructor
-     *    should fire after shortcode, module, addon, or other plugin's default priority init phases have run
-     *
-     * @access    public
-     * @param EE_Registry              $Registry
-     * @param CurrentPage              $EspressoPage
-     * @param EE_Module_Request_Router $Module_Request_Router
-     */
-    public function __construct(
-        EE_Registry $Registry,
-        CurrentPage $EspressoPage,
-        EE_Module_Request_Router $Module_Request_Router
-    ) {
-        $this->Registry              = $Registry;
-        $this->current_page          = $EspressoPage;
-        $this->Module_Request_Router = $Module_Request_Router;
-        // load other resources and begin to actually run shortcodes and modules
-        // analyse the incoming WP request
-        add_action('parse_request', [$this, 'get_request'], 1);
-        // process request with module factory
-        add_action('pre_get_posts', [$this, 'pre_get_posts']);
-        // before headers sent
-        add_action('wp', [$this, 'wp'], 5);
-        // primarily used to process any content shortcodes
-        add_action('template_redirect', [$this, 'templateRedirect'], 999);
-        // header
-        add_action('wp_head', [$this, 'header_meta_tag'], 5);
-        add_action('wp_print_scripts', [$this, 'wp_print_scripts']);
-        add_filter('template_include', [$this, 'template_include'], 1);
-        // display errors
-        add_action('loop_start', [$this, 'display_errors'], 2);
-        // the content
-        // add_filter( 'the_content', array( $this, 'the_content' ), 5, 1 );
-        // exclude our private cpt comments
-        add_filter('comments_clauses', [$this, 'filter_wp_comments']);
-        // make sure any ajax requests will respect the url schema
-        // when requests are made against admin-ajax.php (http:// or https://)
-        add_filter('admin_url', [$this, 'maybe_force_admin_ajax_ssl'], 200);
-        // action hook EE
-        do_action('AHEE__EE_Front_Controller__construct__done', $this);
-    }
-
-
-    /**
-     * @return EE_Request_Handler
-     * @deprecated 4.10.14.p
-     */
-    public function Request_Handler()
-    {
-        if (! $this->Request_Handler instanceof EE_Request_Handler) {
-            $this->Request_Handler = LoaderFactory::getLoader()->getShared('EE_Request_Handler');
-        }
-        return $this->Request_Handler;
-    }
-
-
-    /**
-     * @return EE_Module_Request_Router
-     */
-    public function Module_Request_Router()
-    {
-        return $this->Module_Request_Router;
-    }
-
-
-    /**
-     * @return LegacyShortcodesManager
-     * @deprecated 4.10.14.p
-     */
-    public function getLegacyShortcodesManager()
-    {
-        return EE_Config::getLegacyShortcodesManager();
-    }
-
-
-
-
-
-    /***********************************************        INIT ACTION HOOK         ***********************************************/
-    /**
-     * filter_wp_comments
-     * This simply makes sure that any "private" EE CPTs do not have their comments show up in any wp comment
-     * widgets/queries done on frontend
-     *
-     * @param array $clauses array of comment clauses setup by WP_Comment_Query
-     * @return array array of comment clauses with modifications.
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function filter_wp_comments($clauses)
-    {
-        global $wpdb;
-        if (strpos($clauses['join'], $wpdb->posts) !== false) {
-            /** @var EventEspresso\core\domain\entities\custom_post_types\CustomPostTypeDefinitions $custom_post_types */
-            $custom_post_types = LoaderFactory::getLoader()->getShared(
-                'EventEspresso\core\domain\entities\custom_post_types\CustomPostTypeDefinitions'
-            );
-            $cpts              = $custom_post_types->getPrivateCustomPostTypes();
-            foreach ($cpts as $cpt => $details) {
-                $clauses['where'] .= $wpdb->prepare(" AND $wpdb->posts.post_type != %s", $cpt);
-            }
-        }
-        return $clauses;
-    }
-
-
-    /**
-     * this just makes sure that if the site is using ssl that we force that for any admin ajax calls from frontend
-     *
-     * @param string $url incoming url
-     * @return string         final assembled url
-     */
-    public function maybe_force_admin_ajax_ssl($url)
-    {
-        if (is_ssl() && preg_match('/admin-ajax.php/', $url)) {
-            $url = str_replace('http://', 'https://', $url);
-        }
-        return $url;
-    }
-
-
-
-
-
-
-    /***********************************************        WP_LOADED ACTION HOOK         ***********************************************/
-
-
-    /**
-     *    wp_loaded - should fire after shortcode, module, addon, or other plugin's have been registered and their
-     *    default priority init phases have run
-     *
-     * @access    public
-     * @return    void
-     */
-    public function wp_loaded()
-    {
-    }
-
-
-
-
-
-    /***********************************************        PARSE_REQUEST HOOK         ***********************************************/
-    /**
-     *    _get_request
-     *
-     * @access public
-     * @param WP $WP
-     * @return void
-     */
-    public function get_request(WP $WP)
-    {
-        do_action('AHEE__EE_Front_Controller__get_request__start');
-        $this->current_page->parseQueryVars($WP);
-        do_action('AHEE__EE_Front_Controller__get_request__complete');
-        remove_action('parse_request', [$this, 'get_request'], 1);
-    }
-
-
-    /**
-     *    pre_get_posts - basically a module factory for instantiating modules and selecting the final view template
-     *
-     * @access    public
-     * @param WP_Query $WP_Query
-     * @return    void
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function pre_get_posts($WP_Query)
-    {
-        // only load Module_Request_Router if this is the main query
-        if (
-            $this->Module_Request_Router instanceof EE_Module_Request_Router
-            && $WP_Query->is_main_query()
-        ) {
-            // cycle thru module routes
-            while ($route = $this->Module_Request_Router->get_route($WP_Query)) {
-                // determine module and method for route
-                $module = $this->Module_Request_Router->resolve_route($route[0], $route[1]);
-                if ($module instanceof EED_Module) {
-                    // get registered view for route
-                    $this->_template_path = $this->Module_Request_Router->get_view($route);
-                    // grab module name
-                    $module_name = $module->module_name();
-                    // map the module to the module objects
-                    $this->Registry->modules->{$module_name} = $module;
-                }
-            }
-        }
-    }
-
-
-
-
-
-    /***********************************************        WP HOOK         ***********************************************/
-
-
-    /**
-     *    wp - basically last chance to do stuff before headers sent
-     *
-     * @access    public
-     * @return    void
-     */
-    public function wp()
-    {
-        AriaLiveAnnouncer::setHooks();
-    }
-
-
-
-    /***********************     GET_HEADER && WP_HEAD HOOK     ***********************/
-
-
-    /**
-     * callback for the "template_redirect" hook point
-     * checks sidebars for EE widgets
-     * loads resources and assets accordingly
-     *
-     * @return void
-     */
-    public function templateRedirect()
-    {
-        global $wp_query;
-        if (empty($wp_query->posts)) {
-            return;
-        }
-        // if we already know this is an espresso page, then load assets
-        $load_assets = $this->current_page->isEspressoPage();
-        // if we are already loading assets then just move along, otherwise check for widgets
-        $load_assets = $load_assets || $this->espresso_widgets_in_active_sidebars();
-        if ($load_assets) {
-            add_action('wp_enqueue_scripts', [$this, 'enqueueStyle']);
-            add_action('wp_enqueue_scripts', [$this, 'enqueueScripts']);
-        }
-
-        if (is_singular(EspressoPostType::EVENTS)) {
-            new FilterNextPreviousEventPostQuery();
-        }
-    }
-
-
-    /**
-     * builds list of active widgets then scans active sidebars looking for them
-     * returns true is an EE widget is found in an active sidebar
-     * Please Note: this does NOT mean that the sidebar or widget
-     * is actually in use in a given template, as that is unfortunately not known
-     * until a sidebar and it's widgets are actually loaded
-     *
-     * @return boolean
-     */
-    private function espresso_widgets_in_active_sidebars()
-    {
-        $espresso_widgets = [];
-        foreach ($this->Registry->widgets as $widget_class => $widget) {
-            $id_base = EspressoWidget::getIdBase($widget_class);
-            if (is_active_widget(false, false, $id_base)) {
-                $espresso_widgets[] = $id_base;
-            }
-        }
-        $all_sidebar_widgets = wp_get_sidebars_widgets();
-        foreach ($all_sidebar_widgets as $sidebar_widgets) {
-            if (is_array($sidebar_widgets) && ! empty($sidebar_widgets)) {
-                foreach ($sidebar_widgets as $sidebar_widget) {
-                    foreach ($espresso_widgets as $espresso_widget) {
-                        if (strpos($sidebar_widget, $espresso_widget) !== false) {
-                            return true;
-                        }
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-
-    /**
-     *    header_meta_tag
-     *
-     * @access    public
-     * @return    void
-     */
-    public function header_meta_tag()
-    {
-        print(
-        apply_filters(
-            'FHEE__EE_Front_Controller__header_meta_tag',
-            '<meta name="generator" content="Event Espresso Version ' . EVENT_ESPRESSO_VERSION . "\" />\n"
-        )
-        );
-
-        // let's exclude all event type taxonomy term archive pages from search engine indexing
-        // @see https://events.codebasehq.com/projects/event-espresso/tickets/10249
-        // also exclude all critical pages from indexing
-        if (
-            (
-                is_tax('espresso_event_type')
-                && get_option('blog_public') !== '0'
-            )
-            || is_page(EE_Registry::instance()->CFG->core->get_critical_pages_array())
-        ) {
-            print(
-            apply_filters(
-                'FHEE__EE_Front_Controller__header_meta_tag__noindex_for_event_type',
-                '<meta name="robots" content="noindex,follow" />' . "\n"
-            )
-            );
-        }
-    }
-
-
-    /**
-     * wp_print_scripts
-     *
-     * @return void
-     * @throws EE_Error
-     */
-    public function wp_print_scripts()
-    {
-        global $post;
-        if (
-            isset($post->EE_Event)
-            && $post->EE_Event instanceof EE_Event
-            && get_post_type() === EspressoPostType::EVENTS
-            && is_singular()
-        ) {
-            EEH_Schema::add_json_linked_data_for_event($post->EE_Event);
-        }
-    }
-
-
-    public function enqueueStyle()
-    {
-        wp_enqueue_style('espresso_default');
-        wp_enqueue_style('espresso_custom_css');
-    }
-
-
-    /***********************************************        WP_FOOTER         ***********************************************/
-
-
-    public function enqueueScripts()
-    {
-        wp_enqueue_script('espresso_core');
-    }
-
-
-    /**
-     * @param WP_Query $query
-     * @return void
-     * @throws DomainException
-     */
-    public function display_errors(WP_Query $query)
-    {
-        if (! $query->is_main_query()) {
-            return;
-        }
-        static $shown_already = false;
-        do_action('AHEE__EE_Front_Controller__display_errors__begin');
-        if (
-            ! $shown_already
-            && apply_filters('FHEE__EE_Front_Controller__display_errors', true)
-            && is_main_query()
-            && ! is_feed()
-            && in_the_loop()
-            && $this->current_page->isEspressoPage()
-        ) {
-            $shown_already = true;
-            if (did_action('wp_head')) {
-                echo wp_kses($this->printNotices(), AllowedTags::getAllowedTags());
-            } else {
-                // block enabled themes run their query loop before headers are sent
-                // so we need to add our notices onto the beginning of the content
-                add_filter('the_content', [$this, 'prependNotices'], 1);
-            }
-        }
-        do_action('AHEE__EE_Front_Controller__display_errors__end');
-    }
-
-
-    /**
-     * @param string $the_content
-     * @return string
-     * @since 4.10.30.p
-     */
-    public function prependNotices($the_content)
-    {
-        $notices = $this->printNotices();
-        return $notices ? $notices . $the_content : $the_content;
-    }
-
-
-    /**
-     * @return false|string
-     * @since 4.10.30.p
-     */
-    public function printNotices()
-    {
-        ob_start();
-        echo wp_kses(EE_Error::get_notices(), AllowedTags::getWithFormTags());
-        EEH_Template::display_template(EE_TEMPLATES . 'espresso-ajax-notices.template.php');
-        return ob_get_clean();
-    }
-
-
-
-    /***********************************************        UTILITIES         ***********************************************/
-
-
-    /**
-     * @param bool|string $template_include_path
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function template_include($template_include_path = '')
-    {
-        if ($this->current_page->isEspressoPage()) {
-            // despite all helpers having autoloaders set, we need to manually load the template loader
-            // because there are some side effects in that class for triggering template tag functions
-            $this->Registry->load_helper('EEH_Template');
-            $this->_template_path = ! empty($this->_template_path)
-                ? basename($this->_template_path)
-                : basename((string) $template_include_path);
-            $template_path        = EEH_Template::locate_template($this->_template_path, [], false);
-            $this->_template_path = ! empty($template_path) ? $template_path : $template_include_path;
-            $this->_template      = basename($this->_template_path);
-            return $this->_template_path;
-        }
-        return $template_include_path;
-    }
-
-
-    /**
-     * @param bool $with_path
-     * @return    string
-     */
-    public function get_selected_template($with_path = false)
-    {
-        return $with_path ? $this->_template_path : $this->_template;
-    }
-
-    /**
-     * @param string $shortcode_class
-     * @param WP     $wp
-     * @throws ReflectionException
-     * @deprecated 4.9.26
-     */
-    public function initialize_shortcode($shortcode_class = '', WP $wp = null)
-    {
-        EE_Error::doing_it_wrong(
-            __METHOD__,
-            esc_html__(
-                'Usage is deprecated. Please use \EventEspresso\core\services\shortcodes\LegacyShortcodesManager::initializeShortcode() instead.',
-                'event_espresso'
-            ),
-            '4.9.26'
-        );
-        $this->getLegacyShortcodesManager()->initializeShortcode($shortcode_class, $wp);
-    }
-
-
-    /**
-     * @return void
-     * @deprecated 4.9.57.p
-     */
-    public function loadPersistentAdminNoticeManager()
-    {
-    }
-
-
-    /**
-     * @return void
-     * @deprecated 4.9.64.p
-     */
-    public function employ_CPT_Strategy()
-    {
-    }
+	/**
+	 * @var string
+	 */
+	private $_template_path;
+
+	/**
+	 * @var string
+	 */
+	private $_template;
+
+	/**
+	 * @type EE_Registry
+	 */
+	protected $Registry;
+
+	/**
+	 * @type EE_Request_Handler
+	 */
+	protected $Request_Handler;
+
+	/**
+	 * @type EE_Module_Request_Router
+	 */
+	protected $Module_Request_Router;
+
+	/**
+	 * @type CurrentPage
+	 */
+	protected $current_page;
+
+
+	/**
+	 *    class constructor
+	 *    should fire after shortcode, module, addon, or other plugin's default priority init phases have run
+	 *
+	 * @access    public
+	 * @param EE_Registry              $Registry
+	 * @param CurrentPage              $EspressoPage
+	 * @param EE_Module_Request_Router $Module_Request_Router
+	 */
+	public function __construct(
+		EE_Registry $Registry,
+		CurrentPage $EspressoPage,
+		EE_Module_Request_Router $Module_Request_Router
+	) {
+		$this->Registry              = $Registry;
+		$this->current_page          = $EspressoPage;
+		$this->Module_Request_Router = $Module_Request_Router;
+		// load other resources and begin to actually run shortcodes and modules
+		// analyse the incoming WP request
+		add_action('parse_request', [$this, 'get_request'], 1);
+		// process request with module factory
+		add_action('pre_get_posts', [$this, 'pre_get_posts']);
+		// before headers sent
+		add_action('wp', [$this, 'wp'], 5);
+		// primarily used to process any content shortcodes
+		add_action('template_redirect', [$this, 'templateRedirect'], 999);
+		// header
+		add_action('wp_head', [$this, 'header_meta_tag'], 5);
+		add_action('wp_print_scripts', [$this, 'wp_print_scripts']);
+		add_filter('template_include', [$this, 'template_include'], 1);
+		// display errors
+		add_action('loop_start', [$this, 'display_errors'], 2);
+		// the content
+		// add_filter( 'the_content', array( $this, 'the_content' ), 5, 1 );
+		// exclude our private cpt comments
+		add_filter('comments_clauses', [$this, 'filter_wp_comments']);
+		// make sure any ajax requests will respect the url schema
+		// when requests are made against admin-ajax.php (http:// or https://)
+		add_filter('admin_url', [$this, 'maybe_force_admin_ajax_ssl'], 200);
+		// action hook EE
+		do_action('AHEE__EE_Front_Controller__construct__done', $this);
+	}
+
+
+	/**
+	 * @return EE_Request_Handler
+	 * @deprecated 4.10.14.p
+	 */
+	public function Request_Handler()
+	{
+		if (! $this->Request_Handler instanceof EE_Request_Handler) {
+			$this->Request_Handler = LoaderFactory::getLoader()->getShared('EE_Request_Handler');
+		}
+		return $this->Request_Handler;
+	}
+
+
+	/**
+	 * @return EE_Module_Request_Router
+	 */
+	public function Module_Request_Router()
+	{
+		return $this->Module_Request_Router;
+	}
+
+
+	/**
+	 * @return LegacyShortcodesManager
+	 * @deprecated 4.10.14.p
+	 */
+	public function getLegacyShortcodesManager()
+	{
+		return EE_Config::getLegacyShortcodesManager();
+	}
+
+
+
+
+
+	/***********************************************        INIT ACTION HOOK         ***********************************************/
+	/**
+	 * filter_wp_comments
+	 * This simply makes sure that any "private" EE CPTs do not have their comments show up in any wp comment
+	 * widgets/queries done on frontend
+	 *
+	 * @param array $clauses array of comment clauses setup by WP_Comment_Query
+	 * @return array array of comment clauses with modifications.
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function filter_wp_comments($clauses)
+	{
+		global $wpdb;
+		if (strpos($clauses['join'], $wpdb->posts) !== false) {
+			/** @var EventEspresso\core\domain\entities\custom_post_types\CustomPostTypeDefinitions $custom_post_types */
+			$custom_post_types = LoaderFactory::getLoader()->getShared(
+				'EventEspresso\core\domain\entities\custom_post_types\CustomPostTypeDefinitions'
+			);
+			$cpts              = $custom_post_types->getPrivateCustomPostTypes();
+			foreach ($cpts as $cpt => $details) {
+				$clauses['where'] .= $wpdb->prepare(" AND $wpdb->posts.post_type != %s", $cpt);
+			}
+		}
+		return $clauses;
+	}
+
+
+	/**
+	 * this just makes sure that if the site is using ssl that we force that for any admin ajax calls from frontend
+	 *
+	 * @param string $url incoming url
+	 * @return string         final assembled url
+	 */
+	public function maybe_force_admin_ajax_ssl($url)
+	{
+		if (is_ssl() && preg_match('/admin-ajax.php/', $url)) {
+			$url = str_replace('http://', 'https://', $url);
+		}
+		return $url;
+	}
+
+
+
+
+
+
+	/***********************************************        WP_LOADED ACTION HOOK         ***********************************************/
+
+
+	/**
+	 *    wp_loaded - should fire after shortcode, module, addon, or other plugin's have been registered and their
+	 *    default priority init phases have run
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function wp_loaded()
+	{
+	}
+
+
+
+
+
+	/***********************************************        PARSE_REQUEST HOOK         ***********************************************/
+	/**
+	 *    _get_request
+	 *
+	 * @access public
+	 * @param WP $WP
+	 * @return void
+	 */
+	public function get_request(WP $WP)
+	{
+		do_action('AHEE__EE_Front_Controller__get_request__start');
+		$this->current_page->parseQueryVars($WP);
+		do_action('AHEE__EE_Front_Controller__get_request__complete');
+		remove_action('parse_request', [$this, 'get_request'], 1);
+	}
+
+
+	/**
+	 *    pre_get_posts - basically a module factory for instantiating modules and selecting the final view template
+	 *
+	 * @access    public
+	 * @param WP_Query $WP_Query
+	 * @return    void
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function pre_get_posts($WP_Query)
+	{
+		// only load Module_Request_Router if this is the main query
+		if (
+			$this->Module_Request_Router instanceof EE_Module_Request_Router
+			&& $WP_Query->is_main_query()
+		) {
+			// cycle thru module routes
+			while ($route = $this->Module_Request_Router->get_route($WP_Query)) {
+				// determine module and method for route
+				$module = $this->Module_Request_Router->resolve_route($route[0], $route[1]);
+				if ($module instanceof EED_Module) {
+					// get registered view for route
+					$this->_template_path = $this->Module_Request_Router->get_view($route);
+					// grab module name
+					$module_name = $module->module_name();
+					// map the module to the module objects
+					$this->Registry->modules->{$module_name} = $module;
+				}
+			}
+		}
+	}
+
+
+
+
+
+	/***********************************************        WP HOOK         ***********************************************/
+
+
+	/**
+	 *    wp - basically last chance to do stuff before headers sent
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function wp()
+	{
+		AriaLiveAnnouncer::setHooks();
+	}
+
+
+
+	/***********************     GET_HEADER && WP_HEAD HOOK     ***********************/
+
+
+	/**
+	 * callback for the "template_redirect" hook point
+	 * checks sidebars for EE widgets
+	 * loads resources and assets accordingly
+	 *
+	 * @return void
+	 */
+	public function templateRedirect()
+	{
+		global $wp_query;
+		if (empty($wp_query->posts)) {
+			return;
+		}
+		// if we already know this is an espresso page, then load assets
+		$load_assets = $this->current_page->isEspressoPage();
+		// if we are already loading assets then just move along, otherwise check for widgets
+		$load_assets = $load_assets || $this->espresso_widgets_in_active_sidebars();
+		if ($load_assets) {
+			add_action('wp_enqueue_scripts', [$this, 'enqueueStyle']);
+			add_action('wp_enqueue_scripts', [$this, 'enqueueScripts']);
+		}
+
+		if (is_singular(EspressoPostType::EVENTS)) {
+			new FilterNextPreviousEventPostQuery();
+		}
+	}
+
+
+	/**
+	 * builds list of active widgets then scans active sidebars looking for them
+	 * returns true is an EE widget is found in an active sidebar
+	 * Please Note: this does NOT mean that the sidebar or widget
+	 * is actually in use in a given template, as that is unfortunately not known
+	 * until a sidebar and it's widgets are actually loaded
+	 *
+	 * @return boolean
+	 */
+	private function espresso_widgets_in_active_sidebars()
+	{
+		$espresso_widgets = [];
+		foreach ($this->Registry->widgets as $widget_class => $widget) {
+			$id_base = EspressoWidget::getIdBase($widget_class);
+			if (is_active_widget(false, false, $id_base)) {
+				$espresso_widgets[] = $id_base;
+			}
+		}
+		$all_sidebar_widgets = wp_get_sidebars_widgets();
+		foreach ($all_sidebar_widgets as $sidebar_widgets) {
+			if (is_array($sidebar_widgets) && ! empty($sidebar_widgets)) {
+				foreach ($sidebar_widgets as $sidebar_widget) {
+					foreach ($espresso_widgets as $espresso_widget) {
+						if (strpos($sidebar_widget, $espresso_widget) !== false) {
+							return true;
+						}
+					}
+				}
+			}
+		}
+		return false;
+	}
+
+
+	/**
+	 *    header_meta_tag
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function header_meta_tag()
+	{
+		print(
+		apply_filters(
+			'FHEE__EE_Front_Controller__header_meta_tag',
+			'<meta name="generator" content="Event Espresso Version ' . EVENT_ESPRESSO_VERSION . "\" />\n"
+		)
+		);
+
+		// let's exclude all event type taxonomy term archive pages from search engine indexing
+		// @see https://events.codebasehq.com/projects/event-espresso/tickets/10249
+		// also exclude all critical pages from indexing
+		if (
+			(
+				is_tax('espresso_event_type')
+				&& get_option('blog_public') !== '0'
+			)
+			|| is_page(EE_Registry::instance()->CFG->core->get_critical_pages_array())
+		) {
+			print(
+			apply_filters(
+				'FHEE__EE_Front_Controller__header_meta_tag__noindex_for_event_type',
+				'<meta name="robots" content="noindex,follow" />' . "\n"
+			)
+			);
+		}
+	}
+
+
+	/**
+	 * wp_print_scripts
+	 *
+	 * @return void
+	 * @throws EE_Error
+	 */
+	public function wp_print_scripts()
+	{
+		global $post;
+		if (
+			isset($post->EE_Event)
+			&& $post->EE_Event instanceof EE_Event
+			&& get_post_type() === EspressoPostType::EVENTS
+			&& is_singular()
+		) {
+			EEH_Schema::add_json_linked_data_for_event($post->EE_Event);
+		}
+	}
+
+
+	public function enqueueStyle()
+	{
+		wp_enqueue_style('espresso_default');
+		wp_enqueue_style('espresso_custom_css');
+	}
+
+
+	/***********************************************        WP_FOOTER         ***********************************************/
+
+
+	public function enqueueScripts()
+	{
+		wp_enqueue_script('espresso_core');
+	}
+
+
+	/**
+	 * @param WP_Query $query
+	 * @return void
+	 * @throws DomainException
+	 */
+	public function display_errors(WP_Query $query)
+	{
+		if (! $query->is_main_query()) {
+			return;
+		}
+		static $shown_already = false;
+		do_action('AHEE__EE_Front_Controller__display_errors__begin');
+		if (
+			! $shown_already
+			&& apply_filters('FHEE__EE_Front_Controller__display_errors', true)
+			&& is_main_query()
+			&& ! is_feed()
+			&& in_the_loop()
+			&& $this->current_page->isEspressoPage()
+		) {
+			$shown_already = true;
+			if (did_action('wp_head')) {
+				echo wp_kses($this->printNotices(), AllowedTags::getAllowedTags());
+			} else {
+				// block enabled themes run their query loop before headers are sent
+				// so we need to add our notices onto the beginning of the content
+				add_filter('the_content', [$this, 'prependNotices'], 1);
+			}
+		}
+		do_action('AHEE__EE_Front_Controller__display_errors__end');
+	}
+
+
+	/**
+	 * @param string $the_content
+	 * @return string
+	 * @since 4.10.30.p
+	 */
+	public function prependNotices($the_content)
+	{
+		$notices = $this->printNotices();
+		return $notices ? $notices . $the_content : $the_content;
+	}
+
+
+	/**
+	 * @return false|string
+	 * @since 4.10.30.p
+	 */
+	public function printNotices()
+	{
+		ob_start();
+		echo wp_kses(EE_Error::get_notices(), AllowedTags::getWithFormTags());
+		EEH_Template::display_template(EE_TEMPLATES . 'espresso-ajax-notices.template.php');
+		return ob_get_clean();
+	}
+
+
+
+	/***********************************************        UTILITIES         ***********************************************/
+
+
+	/**
+	 * @param bool|string $template_include_path
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function template_include($template_include_path = '')
+	{
+		if ($this->current_page->isEspressoPage()) {
+			// despite all helpers having autoloaders set, we need to manually load the template loader
+			// because there are some side effects in that class for triggering template tag functions
+			$this->Registry->load_helper('EEH_Template');
+			$this->_template_path = ! empty($this->_template_path)
+				? basename($this->_template_path)
+				: basename((string) $template_include_path);
+			$template_path        = EEH_Template::locate_template($this->_template_path, [], false);
+			$this->_template_path = ! empty($template_path) ? $template_path : $template_include_path;
+			$this->_template      = basename($this->_template_path);
+			return $this->_template_path;
+		}
+		return $template_include_path;
+	}
+
+
+	/**
+	 * @param bool $with_path
+	 * @return    string
+	 */
+	public function get_selected_template($with_path = false)
+	{
+		return $with_path ? $this->_template_path : $this->_template;
+	}
+
+	/**
+	 * @param string $shortcode_class
+	 * @param WP     $wp
+	 * @throws ReflectionException
+	 * @deprecated 4.9.26
+	 */
+	public function initialize_shortcode($shortcode_class = '', WP $wp = null)
+	{
+		EE_Error::doing_it_wrong(
+			__METHOD__,
+			esc_html__(
+				'Usage is deprecated. Please use \EventEspresso\core\services\shortcodes\LegacyShortcodesManager::initializeShortcode() instead.',
+				'event_espresso'
+			),
+			'4.9.26'
+		);
+		$this->getLegacyShortcodesManager()->initializeShortcode($shortcode_class, $wp);
+	}
+
+
+	/**
+	 * @return void
+	 * @deprecated 4.9.57.p
+	 */
+	public function loadPersistentAdminNoticeManager()
+	{
+	}
+
+
+	/**
+	 * @return void
+	 * @deprecated 4.9.64.p
+	 */
+	public function employ_CPT_Strategy()
+	{
+	}
 }

core/services/session/SessionStartHandler.php

Indentation +508 added lines, -508 removed lines

@@ -29,512 +29,512 @@
  */
 class SessionStartHandler
 {
-    const OPTION_NAME_SESSION_SAVE_HANDLER_STATUS = 'ee_session_save_handler_status';
-
-    const REQUEST_PARAM_RETRY_SESSION             = 'ee_retry_session';
-
-    const SESSION_SAVE_HANDLER_STATUS_FAILED      = 'session_save_handler_failed';
-
-    const SESSION_SAVE_HANDLER_STATUS_SUCCESS     = 'session_save_handler_success';
-
-    const SESSION_SAVE_HANDLER_STATUS_UNKNOWN     = 'session_save_handler_untested';
-
-
-    protected RequestInterface $request;
-
-    /**
-     * @var string
-     * @since 5.0.47
-     */
-    private string $open_basedir = '';
-
-    /**
-     * @var string
-     * @since 5.0.47
-     */
-    private string $save_handler = '';
-
-    /**
-     * @var string
-     * @since 5.0.47
-     */
-    private string $save_path = '';
-
-
-    /**
-     * StartSession constructor.
-     *
-     * @param RequestInterface $request
-     */
-    public function __construct(RequestInterface $request)
-    {
-        $this->request = $request;
-    }
-
-
-    /**
-     * Check if a custom session save handler is in play
-     * and attempt to start the PHP session
-     *
-     * @since 4.9.68.p
-     */
-    public function startSession(): int
-    {
-        // check that session has started
-        if (session_id() === '') {
-            // clear any previous error
-            error_clear_last();
-
-            // convert warnings to ErrorException so we can catch them
-            $previous_handler = set_error_handler([$this, 'customErrorHandler'], E_WARNING);
-
-            try {
-                $this->initializeSessionVars();
-                // starts a new session if one doesn't already exist, or re-initiates an existing one
-                if ($this->hasCustomSessionSaveHandler()) {
-                    $this->checkCustomSessionSaveHandler();
-                } else {
-                    $this->verifySessionSavePath();
-                    $this->sessionStart();
-                }
-            } catch (Throwable $error) {
-                error_log(
-                    sprintf(
-                        '[SessionStartHandler] session_start() warning: %s in %s:%s',
-                        $error->getMessage(),
-                        $error->getFile(),
-                        $error->getLine()
-                    )
-                );
-                $this->displaySessionErrorNotice(
-                    $error->getMessage(),
-                    $error->getFile(),
-                    __FUNCTION__,
-                    $error->getLine()
-                );
-            } finally {
-                $this->restorePreviousErrorHandler($previous_handler);
-            }
-        }
-        return session_status();
-    }
-
-
-    /**
-     * @return void
-     * @since 5.0.47
-     */
-    private function initializeSessionVars(): void
-    {
-        $this->open_basedir = ini_get('open_basedir') ?: '';
-        $this->save_handler = strtolower((string) ini_get('session.save_handler'));
-        $this->save_path    = session_save_path() ?: '';
-    }
-
-
-    /**
-     * @return void
-     * @throws Throwable
-     * @since 5.0.46
-     */
-    private function sessionStart(): void
-    {
-        session_start();
-        session_write_close();
-    }
-
-
-    /**
-     * @return void
-     * @throws ErrorException
-     * @since 5.0.46
-     */
-    private function verifySessionSavePath(): void
-    {
-        if (WP_DEBUG) {
-            error_log(
-                sprintf(
-                    "[SessionStartHandler] diagnostic: save_handler=%s save_path=%s open_basedir=%s",
-                    $this->save_handler,
-                    $this->save_path,
-                    $this->open_basedir ?: '(none)'
-                )
-            );
-        }
-        // Only validate session save path as a filesystem directory when PHP is
-        // configured to use the 'files' session save handler. Other handlers
-        // (memcache, memcached, redis, user, etc.) use different transport
-        // formats (hosts, sockets, URIs) and are not filesystem directories.
-        if ($this->save_handler !== 'files') {
-            // assume the configured handler knows how to interpret the save path
-            // (e.g. "unix:///run/memcached/memcached.sock", "127.0.0.1:11211", etc.)
-            return;
-        }
-        $this->save_path = $this->normalizeSessionSavePath($this->save_path);
-        // Use @-suppressed checks to avoid PHP warnings while validating.
-        if (! @is_dir($this->save_path) || ! @is_writable($this->save_path)) {
-            throw new ErrorException(
-                sprintf(
-                    esc_html__('Invalid or missing session save path: %s', 'event_espresso'),
-                    $this->save_path
-                ),
-                0,
-                E_WARNING,
-                __FILE__,
-                __LINE__
-            );
-        }
-    }
-
-
-    /**
-     * @param string $session_save_path
-     * @return string
-     * @throws ErrorException
-     * @since 5.0.47
-     */
-    private function normalizeSessionSavePath(string $session_save_path): string
-    {
-        // Normalize "N;/path" style values
-        if (strpos($session_save_path, ';') !== false) {
-            $parts             = explode(';', $session_save_path);
-            $session_save_path = end($parts);
-        }
-        $session_save_path = trim((string) $session_save_path);
-        if ($session_save_path === '') {
-            // fall back to a sane temp dir if PHP reports no explicit session_save_path
-            $session_save_path = sys_get_temp_dir();
-        }
-        // normalize trailing separators
-        $session_save_path = rtrim($session_save_path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
-        // For 'files' handler we expect a writable filesystem directory.
-        // However, calling realpath() or is_dir() on paths outside of PHP's
-        // configured open_basedir can trigger warnings.
-        // Handle that case explicitly by checking open_basedir first
-        // and avoiding functions that would emit warnings.
-        if ($this->open_basedir !== '') {
-            $session_save_path = $this->checkPathsOutsideBaseDir($session_save_path);
-        } else {
-            // No open_basedir restriction; realpath() is safe to use and gives
-            // us a canonical path for the directory checks.
-            $session_save_path = @realpath($session_save_path) ?: $session_save_path;
-        }
-        return $session_save_path;
-    }
-
-
-    /**
-     * @param string $session_save_path
-     * @return string
-     * @throws ErrorException
-     * @since 5.0.47
-     */
-    private function checkPathsOutsideBaseDir(string $session_save_path): string
-    {
-        // open_basedir is set; check whether the configured session path
-        // appears to be within one of the allowed paths.
-        $allowed_paths = array_filter(array_map('trim', explode(PATH_SEPARATOR, $this->open_basedir)));
-        $allowed       = false;
-        foreach ($allowed_paths as $allowed_path) {
-            if ($allowed_path === '') {
-                continue;
-            }
-            // normalize trailing separators for comparison
-            $allowed_path_norm = rtrim($allowed_path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
-            // compare start of paths for a match
-            if (strncmp($session_save_path, $allowed_path_norm, strlen($allowed_path_norm)) === 0) {
-                $allowed = true;
-                break;
-            }
-        }
-        if ($allowed) {
-            return $session_save_path;
-        }
-        error_log(
-            sprintf(
-                "[SessionStartHandler] session_save_path outside open_basedir: save_path=%s open_basedir=%s",
-                $session_save_path,
-                $this->open_basedir
-            )
-        );
-        throw new ErrorException(
-            sprintf(
-                esc_html__(
-                    'Session save path "%s" is outside PHP open_basedir allowed paths: %s. Ask your server admin to move session.save_path inside open_basedir or update open_basedir',
-                    'event_espresso'
-                ),
-                $session_save_path,
-                $this->open_basedir
-            ),
-            0,
-            E_WARNING,
-            __FILE__,
-            __LINE__
-        );
-    }
-
-
-    /**
-     * Returns `true` if the 'session.save_handler' ini setting matches a known custom handler
-     *
-     * @return bool
-     * @since 4.9.68.p
-     */
-    private function hasCustomSessionSaveHandler(): bool
-    {
-        return $this->save_handler === 'user';
-    }
-
-
-    /**
-     * Attempt to start the PHP session when a custom Session Save Handler is known to be set.
-     *
-     * @throws ErrorException
-     * @throws Throwable
-     * @since 4.9.68.p
-     */
-    private function checkCustomSessionSaveHandler(): void
-    {
-        // If we've already successfully tested the session save handler
-        // on a previous request then just start the session
-        if ($this->sessionSaveHandlerIsValid()) {
-            $this->sessionStart();
-            return;
-        }
-        // If not, then attempt to deal with any errors,
-        // otherwise, try to hobble along without the session
-        if (! $this->handleSessionSaveHandlerErrors()) {
-            return;
-        }
-        // there is no record of a fatal error while trying to start the session
-        // so let's see if there's a custom session save handler. Proceed with caution
-        if ($this->initializeSessionSaveHandlerStatus() === false) {
-            throw new ErrorException(
-                esc_html__('Failed to initialize session save handler status', 'event_espresso'),
-                0,
-                E_WARNING,
-                __FILE__,
-                __LINE__
-            );
-        }
-        // hold your breath, the custom session save handler might cause a fatal here...
-        $this->sessionStart();
-        // phew! we made it! the custom session handler is a-ok
-        if ($this->setSessionSaveHandlerStatusToValid() === false) {
-            throw new ErrorException(
-                esc_html__('Failed to set session save handler status to valid', 'event_espresso'),
-                0,
-                E_WARNING,
-                __FILE__,
-                __LINE__
-            );
-        }
-    }
-
-
-    /**
-     * retrieves the value for the 'ee_session_save_handler_status' WP option.
-     * default value = 'session_save_handler_untested'
-     *
-     * @return string
-     * @since 4.9.68.p
-     */
-    private function getSessionSaveHandlerStatus(): string
-    {
-        return get_option(
-            SessionStartHandler::OPTION_NAME_SESSION_SAVE_HANDLER_STATUS,
-            SessionStartHandler::SESSION_SAVE_HANDLER_STATUS_UNKNOWN
-        );
-    }
-
-
-    /**
-     * Sets the 'ee_session_save_handler_status' WP option value to 'session_save_handler_failed'
-     * which can then be upgraded is everything works correctly
-     *
-     * @return bool
-     * @since 4.9.68.p
-     */
-    private function initializeSessionSaveHandlerStatus(): bool
-    {
-        return update_option(
-            SessionStartHandler::OPTION_NAME_SESSION_SAVE_HANDLER_STATUS,
-            SessionStartHandler::SESSION_SAVE_HANDLER_STATUS_FAILED
-        );
-    }
-
-
-    /**
-     * Sets the 'ee_session_save_handler_status' WP option value to 'session_save_handler_success'
-     *
-     * @return bool
-     * @since 4.9.68.p
-     */
-    private function setSessionSaveHandlerStatusToValid(): bool
-    {
-        return update_option(
-            SessionStartHandler::OPTION_NAME_SESSION_SAVE_HANDLER_STATUS,
-            SessionStartHandler::SESSION_SAVE_HANDLER_STATUS_SUCCESS
-        );
-    }
-
-
-    /**
-     * Sets the 'ee_session_save_handler_status' WP option value to 'session_save_handler_untested'
-     *
-     * @return bool
-     * @since 4.9.68.p
-     */
-    private function resetSessionSaveHandlerStatus(): bool
-    {
-        return update_option(
-            SessionStartHandler::OPTION_NAME_SESSION_SAVE_HANDLER_STATUS,
-            SessionStartHandler::SESSION_SAVE_HANDLER_STATUS_UNKNOWN
-        );
-    }
-
-
-    /**
-     * Returns `true` if the 'ee_session_save_handler_status' WP option value
-     * is equal to 'session_save_handler_success'
-     *
-     * @return bool
-     * @since 4.9.68.p
-     */
-    private function sessionSaveHandlerIsValid(): bool
-    {
-        return $this->getSessionSaveHandlerStatus() === SessionStartHandler::SESSION_SAVE_HANDLER_STATUS_SUCCESS;
-    }
-
-
-    /**
-     * Returns `true` if the 'ee_session_save_handler_status' WP option value
-     * is equal to 'session_save_handler_failed'
-     *
-     * @return bool
-     * @since 4.9.68.p
-     */
-    private function sessionSaveHandlerFailed(): bool
-    {
-        return $this->getSessionSaveHandlerStatus() === SessionStartHandler::SESSION_SAVE_HANDLER_STATUS_FAILED;
-    }
-
-
-    /**
-     * @param int    $severity
-     * @param string $message
-     * @param string $file
-     * @param int    $line
-     * @return bool
-     * @throws ErrorException
-     * @since 5.0.46
-     */
-    public function customErrorHandler(int $severity, string $message, string $file, int $line): bool
-    {
-        // Only convert warnings we care about
-        if (($severity & E_WARNING) === E_WARNING) {
-            throw new ErrorException($message, 0, $severity, $file, $line);
-        }
-        // fallback to PHP's normal handler for other severities
-        return false;
-    }
-
-
-    /**
-     * @param callable|null $previous_handler
-     * @return void
-     * @since 5.0.46
-     */
-    private function restorePreviousErrorHandler(?callable $previous_handler): void
-    {
-        if ($previous_handler !== null) {
-            set_error_handler($previous_handler);
-        } else {
-            restore_error_handler();
-        }
-    }
-
-
-    /**
-     * Returns `true` if no errors were detected with the session save handler,
-     * otherwise attempts to work notify the appropriate authorities
-     * with a suggestion for how to fix the issue, and returns `false`.
-     *
-     * @return bool
-     * @throws ErrorException
-     * @throws Throwable
-     * @since 4.9.68.p
-     */
-    private function handleSessionSaveHandlerErrors(): bool
-    {
-        // Check if we had a fatal error last time while trying to start the session
-        if ($this->sessionSaveHandlerFailed()) {
-            // apparently, last time we tried using the custom session save handler there was a fatal
-            if ($this->request->requestParamIsSet(SessionStartHandler::REQUEST_PARAM_RETRY_SESSION)) {
-                if ($this->resetSessionSaveHandlerStatus() === false) {
-                    throw new ErrorException(
-                        esc_html__('Failed to reset session save handler status', 'event_espresso'),
-                        0,
-                        E_WARNING,
-                        __FILE__,
-                        __LINE__
-                    );
-                }
-                // remove "ee_retry_session", otherwise if the problem still isn't fixed,
-                // we'll just keep getting the fatal error over and over.
-                // Better to remove it and redirect, and try on the next request
-                EEH_URL::safeRedirectAndExit(
-                    remove_query_arg(
-                        [SessionStartHandler::REQUEST_PARAM_RETRY_SESSION],
-                        EEH_URL::current_url()
-                    )
-                );
-            }
-            // so the session is broken, don't try it again,
-            // just show a message to users that can fix it
-            $this->displaySessionSaveHandlerErrorNotice();
-            return false;
-        }
-        return true;
-    }
-
-
-    /**
-     * @since 4.9.68.p
-     */
-    private function displaySessionSaveHandlerErrorNotice(): void
-    {
-        $retry_session_url = add_query_arg(
-            [SessionStartHandler::REQUEST_PARAM_RETRY_SESSION => true],
-            EEH_URL::current_url()
-        );
-        $this->displaySessionErrorNotice(
-            sprintf(
-                esc_html__(
-                    'It appears there was a fatal error while starting the session, so Event Espresso is not able to process registrations normally. Some hosting companies, like Pantheon, require an extra plugin for Event Espresso to work. Please install the %1$sWordPress Native PHP Sessions plugin%2$s, then %3$sclick here to check if the problem is resolved.%2$s',
-                    'event_espresso'
-                ),
-                '<a href="https://wordpress.org/plugins/wp-native-php-sessions/">',
-                '</a>',
-                '<a href="' . $retry_session_url . '">'
-            ),
-            __FILE__,
-            __FUNCTION__,
-            __LINE__
-        );
-    }
-
-
-    /**
-     * Generates an EE_Error notice regarding the current session woes
-     * but only if the current user is an admin with permission to 'install_plugins'.
-     *
-     * @since 5.0.46
-     */
-    private function displaySessionErrorNotice(string $message, string $file, string $function, int $line): void
-    {
-        if (current_user_can('install_plugins')) {
-            EE_Error::add_error($message, $file, $function, $line);
-        }
-    }
+	const OPTION_NAME_SESSION_SAVE_HANDLER_STATUS = 'ee_session_save_handler_status';
+
+	const REQUEST_PARAM_RETRY_SESSION             = 'ee_retry_session';
+
+	const SESSION_SAVE_HANDLER_STATUS_FAILED      = 'session_save_handler_failed';
+
+	const SESSION_SAVE_HANDLER_STATUS_SUCCESS     = 'session_save_handler_success';
+
+	const SESSION_SAVE_HANDLER_STATUS_UNKNOWN     = 'session_save_handler_untested';
+
+
+	protected RequestInterface $request;
+
+	/**
+	 * @var string
+	 * @since 5.0.47
+	 */
+	private string $open_basedir = '';
+
+	/**
+	 * @var string
+	 * @since 5.0.47
+	 */
+	private string $save_handler = '';
+
+	/**
+	 * @var string
+	 * @since 5.0.47
+	 */
+	private string $save_path = '';
+
+
+	/**
+	 * StartSession constructor.
+	 *
+	 * @param RequestInterface $request
+	 */
+	public function __construct(RequestInterface $request)
+	{
+		$this->request = $request;
+	}
+
+
+	/**
+	 * Check if a custom session save handler is in play
+	 * and attempt to start the PHP session
+	 *
+	 * @since 4.9.68.p
+	 */
+	public function startSession(): int
+	{
+		// check that session has started
+		if (session_id() === '') {
+			// clear any previous error
+			error_clear_last();
+
+			// convert warnings to ErrorException so we can catch them
+			$previous_handler = set_error_handler([$this, 'customErrorHandler'], E_WARNING);
+
+			try {
+				$this->initializeSessionVars();
+				// starts a new session if one doesn't already exist, or re-initiates an existing one
+				if ($this->hasCustomSessionSaveHandler()) {
+					$this->checkCustomSessionSaveHandler();
+				} else {
+					$this->verifySessionSavePath();
+					$this->sessionStart();
+				}
+			} catch (Throwable $error) {
+				error_log(
+					sprintf(
+						'[SessionStartHandler] session_start() warning: %s in %s:%s',
+						$error->getMessage(),
+						$error->getFile(),
+						$error->getLine()
+					)
+				);
+				$this->displaySessionErrorNotice(
+					$error->getMessage(),
+					$error->getFile(),
+					__FUNCTION__,
+					$error->getLine()
+				);
+			} finally {
+				$this->restorePreviousErrorHandler($previous_handler);
+			}
+		}
+		return session_status();
+	}
+
+
+	/**
+	 * @return void
+	 * @since 5.0.47
+	 */
+	private function initializeSessionVars(): void
+	{
+		$this->open_basedir = ini_get('open_basedir') ?: '';
+		$this->save_handler = strtolower((string) ini_get('session.save_handler'));
+		$this->save_path    = session_save_path() ?: '';
+	}
+
+
+	/**
+	 * @return void
+	 * @throws Throwable
+	 * @since 5.0.46
+	 */
+	private function sessionStart(): void
+	{
+		session_start();
+		session_write_close();
+	}
+
+
+	/**
+	 * @return void
+	 * @throws ErrorException
+	 * @since 5.0.46
+	 */
+	private function verifySessionSavePath(): void
+	{
+		if (WP_DEBUG) {
+			error_log(
+				sprintf(
+					"[SessionStartHandler] diagnostic: save_handler=%s save_path=%s open_basedir=%s",
+					$this->save_handler,
+					$this->save_path,
+					$this->open_basedir ?: '(none)'
+				)
+			);
+		}
+		// Only validate session save path as a filesystem directory when PHP is
+		// configured to use the 'files' session save handler. Other handlers
+		// (memcache, memcached, redis, user, etc.) use different transport
+		// formats (hosts, sockets, URIs) and are not filesystem directories.
+		if ($this->save_handler !== 'files') {
+			// assume the configured handler knows how to interpret the save path
+			// (e.g. "unix:///run/memcached/memcached.sock", "127.0.0.1:11211", etc.)
+			return;
+		}
+		$this->save_path = $this->normalizeSessionSavePath($this->save_path);
+		// Use @-suppressed checks to avoid PHP warnings while validating.
+		if (! @is_dir($this->save_path) || ! @is_writable($this->save_path)) {
+			throw new ErrorException(
+				sprintf(
+					esc_html__('Invalid or missing session save path: %s', 'event_espresso'),
+					$this->save_path
+				),
+				0,
+				E_WARNING,
+				__FILE__,
+				__LINE__
+			);
+		}
+	}
+
+
+	/**
+	 * @param string $session_save_path
+	 * @return string
+	 * @throws ErrorException
+	 * @since 5.0.47
+	 */
+	private function normalizeSessionSavePath(string $session_save_path): string
+	{
+		// Normalize "N;/path" style values
+		if (strpos($session_save_path, ';') !== false) {
+			$parts             = explode(';', $session_save_path);
+			$session_save_path = end($parts);
+		}
+		$session_save_path = trim((string) $session_save_path);
+		if ($session_save_path === '') {
+			// fall back to a sane temp dir if PHP reports no explicit session_save_path
+			$session_save_path = sys_get_temp_dir();
+		}
+		// normalize trailing separators
+		$session_save_path = rtrim($session_save_path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+		// For 'files' handler we expect a writable filesystem directory.
+		// However, calling realpath() or is_dir() on paths outside of PHP's
+		// configured open_basedir can trigger warnings.
+		// Handle that case explicitly by checking open_basedir first
+		// and avoiding functions that would emit warnings.
+		if ($this->open_basedir !== '') {
+			$session_save_path = $this->checkPathsOutsideBaseDir($session_save_path);
+		} else {
+			// No open_basedir restriction; realpath() is safe to use and gives
+			// us a canonical path for the directory checks.
+			$session_save_path = @realpath($session_save_path) ?: $session_save_path;
+		}
+		return $session_save_path;
+	}
+
+
+	/**
+	 * @param string $session_save_path
+	 * @return string
+	 * @throws ErrorException
+	 * @since 5.0.47
+	 */
+	private function checkPathsOutsideBaseDir(string $session_save_path): string
+	{
+		// open_basedir is set; check whether the configured session path
+		// appears to be within one of the allowed paths.
+		$allowed_paths = array_filter(array_map('trim', explode(PATH_SEPARATOR, $this->open_basedir)));
+		$allowed       = false;
+		foreach ($allowed_paths as $allowed_path) {
+			if ($allowed_path === '') {
+				continue;
+			}
+			// normalize trailing separators for comparison
+			$allowed_path_norm = rtrim($allowed_path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+			// compare start of paths for a match
+			if (strncmp($session_save_path, $allowed_path_norm, strlen($allowed_path_norm)) === 0) {
+				$allowed = true;
+				break;
+			}
+		}
+		if ($allowed) {
+			return $session_save_path;
+		}
+		error_log(
+			sprintf(
+				"[SessionStartHandler] session_save_path outside open_basedir: save_path=%s open_basedir=%s",
+				$session_save_path,
+				$this->open_basedir
+			)
+		);
+		throw new ErrorException(
+			sprintf(
+				esc_html__(
+					'Session save path "%s" is outside PHP open_basedir allowed paths: %s. Ask your server admin to move session.save_path inside open_basedir or update open_basedir',
+					'event_espresso'
+				),
+				$session_save_path,
+				$this->open_basedir
+			),
+			0,
+			E_WARNING,
+			__FILE__,
+			__LINE__
+		);
+	}
+
+
+	/**
+	 * Returns `true` if the 'session.save_handler' ini setting matches a known custom handler
+	 *
+	 * @return bool
+	 * @since 4.9.68.p
+	 */
+	private function hasCustomSessionSaveHandler(): bool
+	{
+		return $this->save_handler === 'user';
+	}
+
+
+	/**
+	 * Attempt to start the PHP session when a custom Session Save Handler is known to be set.
+	 *
+	 * @throws ErrorException
+	 * @throws Throwable
+	 * @since 4.9.68.p
+	 */
+	private function checkCustomSessionSaveHandler(): void
+	{
+		// If we've already successfully tested the session save handler
+		// on a previous request then just start the session
+		if ($this->sessionSaveHandlerIsValid()) {
+			$this->sessionStart();
+			return;
+		}
+		// If not, then attempt to deal with any errors,
+		// otherwise, try to hobble along without the session
+		if (! $this->handleSessionSaveHandlerErrors()) {
+			return;
+		}
+		// there is no record of a fatal error while trying to start the session
+		// so let's see if there's a custom session save handler. Proceed with caution
+		if ($this->initializeSessionSaveHandlerStatus() === false) {
+			throw new ErrorException(
+				esc_html__('Failed to initialize session save handler status', 'event_espresso'),
+				0,
+				E_WARNING,
+				__FILE__,
+				__LINE__
+			);
+		}
+		// hold your breath, the custom session save handler might cause a fatal here...
+		$this->sessionStart();
+		// phew! we made it! the custom session handler is a-ok
+		if ($this->setSessionSaveHandlerStatusToValid() === false) {
+			throw new ErrorException(
+				esc_html__('Failed to set session save handler status to valid', 'event_espresso'),
+				0,
+				E_WARNING,
+				__FILE__,
+				__LINE__
+			);
+		}
+	}
+
+
+	/**
+	 * retrieves the value for the 'ee_session_save_handler_status' WP option.
+	 * default value = 'session_save_handler_untested'
+	 *
+	 * @return string
+	 * @since 4.9.68.p
+	 */
+	private function getSessionSaveHandlerStatus(): string
+	{
+		return get_option(
+			SessionStartHandler::OPTION_NAME_SESSION_SAVE_HANDLER_STATUS,
+			SessionStartHandler::SESSION_SAVE_HANDLER_STATUS_UNKNOWN
+		);
+	}
+
+
+	/**
+	 * Sets the 'ee_session_save_handler_status' WP option value to 'session_save_handler_failed'
+	 * which can then be upgraded is everything works correctly
+	 *
+	 * @return bool
+	 * @since 4.9.68.p
+	 */
+	private function initializeSessionSaveHandlerStatus(): bool
+	{
+		return update_option(
+			SessionStartHandler::OPTION_NAME_SESSION_SAVE_HANDLER_STATUS,
+			SessionStartHandler::SESSION_SAVE_HANDLER_STATUS_FAILED
+		);
+	}
+
+
+	/**
+	 * Sets the 'ee_session_save_handler_status' WP option value to 'session_save_handler_success'
+	 *
+	 * @return bool
+	 * @since 4.9.68.p
+	 */
+	private function setSessionSaveHandlerStatusToValid(): bool
+	{
+		return update_option(
+			SessionStartHandler::OPTION_NAME_SESSION_SAVE_HANDLER_STATUS,
+			SessionStartHandler::SESSION_SAVE_HANDLER_STATUS_SUCCESS
+		);
+	}
+
+
+	/**
+	 * Sets the 'ee_session_save_handler_status' WP option value to 'session_save_handler_untested'
+	 *
+	 * @return bool
+	 * @since 4.9.68.p
+	 */
+	private function resetSessionSaveHandlerStatus(): bool
+	{
+		return update_option(
+			SessionStartHandler::OPTION_NAME_SESSION_SAVE_HANDLER_STATUS,
+			SessionStartHandler::SESSION_SAVE_HANDLER_STATUS_UNKNOWN
+		);
+	}
+
+
+	/**
+	 * Returns `true` if the 'ee_session_save_handler_status' WP option value
+	 * is equal to 'session_save_handler_success'
+	 *
+	 * @return bool
+	 * @since 4.9.68.p
+	 */
+	private function sessionSaveHandlerIsValid(): bool
+	{
+		return $this->getSessionSaveHandlerStatus() === SessionStartHandler::SESSION_SAVE_HANDLER_STATUS_SUCCESS;
+	}
+
+
+	/**
+	 * Returns `true` if the 'ee_session_save_handler_status' WP option value
+	 * is equal to 'session_save_handler_failed'
+	 *
+	 * @return bool
+	 * @since 4.9.68.p
+	 */
+	private function sessionSaveHandlerFailed(): bool
+	{
+		return $this->getSessionSaveHandlerStatus() === SessionStartHandler::SESSION_SAVE_HANDLER_STATUS_FAILED;
+	}
+
+
+	/**
+	 * @param int    $severity
+	 * @param string $message
+	 * @param string $file
+	 * @param int    $line
+	 * @return bool
+	 * @throws ErrorException
+	 * @since 5.0.46
+	 */
+	public function customErrorHandler(int $severity, string $message, string $file, int $line): bool
+	{
+		// Only convert warnings we care about
+		if (($severity & E_WARNING) === E_WARNING) {
+			throw new ErrorException($message, 0, $severity, $file, $line);
+		}
+		// fallback to PHP's normal handler for other severities
+		return false;
+	}
+
+
+	/**
+	 * @param callable|null $previous_handler
+	 * @return void
+	 * @since 5.0.46
+	 */
+	private function restorePreviousErrorHandler(?callable $previous_handler): void
+	{
+		if ($previous_handler !== null) {
+			set_error_handler($previous_handler);
+		} else {
+			restore_error_handler();
+		}
+	}
+
+
+	/**
+	 * Returns `true` if no errors were detected with the session save handler,
+	 * otherwise attempts to work notify the appropriate authorities
+	 * with a suggestion for how to fix the issue, and returns `false`.
+	 *
+	 * @return bool
+	 * @throws ErrorException
+	 * @throws Throwable
+	 * @since 4.9.68.p
+	 */
+	private function handleSessionSaveHandlerErrors(): bool
+	{
+		// Check if we had a fatal error last time while trying to start the session
+		if ($this->sessionSaveHandlerFailed()) {
+			// apparently, last time we tried using the custom session save handler there was a fatal
+			if ($this->request->requestParamIsSet(SessionStartHandler::REQUEST_PARAM_RETRY_SESSION)) {
+				if ($this->resetSessionSaveHandlerStatus() === false) {
+					throw new ErrorException(
+						esc_html__('Failed to reset session save handler status', 'event_espresso'),
+						0,
+						E_WARNING,
+						__FILE__,
+						__LINE__
+					);
+				}
+				// remove "ee_retry_session", otherwise if the problem still isn't fixed,
+				// we'll just keep getting the fatal error over and over.
+				// Better to remove it and redirect, and try on the next request
+				EEH_URL::safeRedirectAndExit(
+					remove_query_arg(
+						[SessionStartHandler::REQUEST_PARAM_RETRY_SESSION],
+						EEH_URL::current_url()
+					)
+				);
+			}
+			// so the session is broken, don't try it again,
+			// just show a message to users that can fix it
+			$this->displaySessionSaveHandlerErrorNotice();
+			return false;
+		}
+		return true;
+	}
+
+
+	/**
+	 * @since 4.9.68.p
+	 */
+	private function displaySessionSaveHandlerErrorNotice(): void
+	{
+		$retry_session_url = add_query_arg(
+			[SessionStartHandler::REQUEST_PARAM_RETRY_SESSION => true],
+			EEH_URL::current_url()
+		);
+		$this->displaySessionErrorNotice(
+			sprintf(
+				esc_html__(
+					'It appears there was a fatal error while starting the session, so Event Espresso is not able to process registrations normally. Some hosting companies, like Pantheon, require an extra plugin for Event Espresso to work. Please install the %1$sWordPress Native PHP Sessions plugin%2$s, then %3$sclick here to check if the problem is resolved.%2$s',
+					'event_espresso'
+				),
+				'<a href="https://wordpress.org/plugins/wp-native-php-sessions/">',
+				'</a>',
+				'<a href="' . $retry_session_url . '">'
+			),
+			__FILE__,
+			__FUNCTION__,
+			__LINE__
+		);
+	}
+
+
+	/**
+	 * Generates an EE_Error notice regarding the current session woes
+	 * but only if the current user is an admin with permission to 'install_plugins'.
+	 *
+	 * @since 5.0.46
+	 */
+	private function displaySessionErrorNotice(string $message, string $file, string $function, int $line): void
+	{
+		if (current_user_can('install_plugins')) {
+			EE_Error::add_error($message, $file, $function, $line);
+		}
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -172,7 +172,7 @@ 
         }
         $this->save_path = $this->normalizeSessionSavePath($this->save_path);
         // Use @-suppressed checks to avoid PHP warnings while validating.
-        if (! @is_dir($this->save_path) || ! @is_writable($this->save_path)) {
+        if ( ! @is_dir($this->save_path) || ! @is_writable($this->save_path)) {
             throw new ErrorException(
                 sprintf(
                     esc_html__('Invalid or missing session save path: %s', 'event_espresso'),
@@ -206,7 +206,7 @@ 
             $session_save_path = sys_get_temp_dir();
         }
         // normalize trailing separators
-        $session_save_path = rtrim($session_save_path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+        $session_save_path = rtrim($session_save_path, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR;
         // For 'files' handler we expect a writable filesystem directory.
         // However, calling realpath() or is_dir() on paths outside of PHP's
         // configured open_basedir can trigger warnings.
@@ -240,7 +240,7 @@ 
                 continue;
             }
             // normalize trailing separators for comparison
-            $allowed_path_norm = rtrim($allowed_path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+            $allowed_path_norm = rtrim($allowed_path, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR;
             // compare start of paths for a match
             if (strncmp($session_save_path, $allowed_path_norm, strlen($allowed_path_norm)) === 0) {
                 $allowed = true;
@@ -303,7 +303,7 @@ 
         }
         // If not, then attempt to deal with any errors,
         // otherwise, try to hobble along without the session
-        if (! $this->handleSessionSaveHandlerErrors()) {
+        if ( ! $this->handleSessionSaveHandlerErrors()) {
             return;
         }
         // there is no record of a fatal error while trying to start the session
@@ -516,7 +516,7 @@ 
                 ),
                 '<a href="https://wordpress.org/plugins/wp-native-php-sessions/">',
                 '</a>',
-                '<a href="' . $retry_session_url . '">'
+                '<a href="'.$retry_session_url.'">'
             ),
             __FILE__,
             __FUNCTION__,

core/services/notifications/AriaLiveAnnouncer.php

Indentation +7 added lines, -7 removed lines

@@ -13,19 +13,19 @@
 class AriaLiveAnnouncer
 {
 
-    public static function setHooks() {
-        add_action('wp_footer', [AriaLiveAnnouncer::class, 'ariaLiveRegion'], 9999);
-    }
+	public static function setHooks() {
+		add_action('wp_footer', [AriaLiveAnnouncer::class, 'ariaLiveRegion'], 9999);
+	}
 
 
-    public static function ariaLiveRegion()
-    {
-        echo '
+	public static function ariaLiveRegion()
+	{
+		echo '
         <div id="espresso-aria-live-region"
              class="screen-reader-text"
              aria-live="polite"
              aria-atomic="true"
         ></div>';
-    }
+	}
 
 }

core/services/addon/api/IncompatibleAddonHandler.php

Indentation +78 added lines, -78 removed lines

@@ -6,84 +6,84 @@
 
 class IncompatibleAddonHandler
 {
-    public function deactivateIncompatibleAddons(): void
-    {
-        static $done = false;
-        if ($done) {
-            return;
-        }
-        $this->deactivateIncompatibleAddon(
-            'Wait Lists',
-            'EE_WAIT_LISTS_VERSION',
-            '1.0.0.beta.074',
-            'load_espresso_wait_lists',
-            'EE_WAIT_LISTS_PLUGIN_FILE'
-        );
-        $this->deactivateIncompatibleAddon(
-            'Automated Upcoming Event Notifications',
-            'EE_AUTOMATED_UPCOMING_EVENT_NOTIFICATION_VERSION',
-            '1.0.0.beta.091',
-            'load_espresso_automated_upcoming_event_notification',
-            'EE_AUTOMATED_UPCOMING_EVENT_NOTIFICATION_PLUGIN_FILE'
-        );
-        $this->deactivateIncompatibleAddon(
-            'Mailchimp Integration',
-            'ESPRESSO_MAILCHIMP_VERSION',
-            '2.5.1.rc.009',
-            'load_ee4_espresso_mailchimp_class',
-            'ESPRESSO_MAILCHIMP_MAIN_FILE'
-        );
-        // $this->deactivateIncompatibleAddon(
-        //     'WP Users Integration',
-        //     'EE_WPUSERS_VERSION',
-        //     '2.1.0.rc.003',
-        //     'load_ee_core_wpusers',
-        //     'EE_WPUSERS_PLUGIN_FILE'
-        // );
-        $done = true;
-    }
+	public function deactivateIncompatibleAddons(): void
+	{
+		static $done = false;
+		if ($done) {
+			return;
+		}
+		$this->deactivateIncompatibleAddon(
+			'Wait Lists',
+			'EE_WAIT_LISTS_VERSION',
+			'1.0.0.beta.074',
+			'load_espresso_wait_lists',
+			'EE_WAIT_LISTS_PLUGIN_FILE'
+		);
+		$this->deactivateIncompatibleAddon(
+			'Automated Upcoming Event Notifications',
+			'EE_AUTOMATED_UPCOMING_EVENT_NOTIFICATION_VERSION',
+			'1.0.0.beta.091',
+			'load_espresso_automated_upcoming_event_notification',
+			'EE_AUTOMATED_UPCOMING_EVENT_NOTIFICATION_PLUGIN_FILE'
+		);
+		$this->deactivateIncompatibleAddon(
+			'Mailchimp Integration',
+			'ESPRESSO_MAILCHIMP_VERSION',
+			'2.5.1.rc.009',
+			'load_ee4_espresso_mailchimp_class',
+			'ESPRESSO_MAILCHIMP_MAIN_FILE'
+		);
+		// $this->deactivateIncompatibleAddon(
+		//     'WP Users Integration',
+		//     'EE_WPUSERS_VERSION',
+		//     '2.1.0.rc.003',
+		//     'load_ee_core_wpusers',
+		//     'EE_WPUSERS_PLUGIN_FILE'
+		// );
+		$done = true;
+	}
 
 
-    /**
-     * @param string $addon_name
-     * @param string $version_constant
-     * @param string $min_version_required
-     * @param string $load_callback
-     * @param string $plugin_file_constant
-     * @return void
-     */
-    private function deactivateIncompatibleAddon(
-        string $addon_name,
-        string $version_constant,
-        string $min_version_required,
-        string $load_callback,
-        string $plugin_file_constant
-    ): void {
-        if (! defined($version_constant)) {
-            return;
-        }
-        $addon_version = constant($version_constant);
-        if ($addon_version && version_compare($addon_version, $min_version_required, '<')) {
-            remove_action('AHEE__EE_System__load_espresso_addons', $load_callback);
-            if (! function_exists('deactivate_plugins')) {
-                require_once ABSPATH . 'wp-admin/includes/plugin.php';
-            }
-            deactivate_plugins(plugin_basename(constant($plugin_file_constant)));
-            unset($_GET['activate'], $_REQUEST['activate'], $_GET['activate-multi'], $_REQUEST['activate-multi']);
-            EE_Error::add_error(
-                sprintf(
-                    esc_html__(
-                        'We\'re sorry, but the Event Espresso %1$s addon was deactivated because version %2$s or higher is required with this version of Event Espresso core.',
-                        'event_espresso'
-                    ),
-                    $addon_name,
-                    $min_version_required
-                ),
-                __FILE__,
-                __FUNCTION__ . "($addon_name)",
-                __LINE__
-            );
-            EE_Error::get_notices(false, true);
-        }
-    }
+	/**
+	 * @param string $addon_name
+	 * @param string $version_constant
+	 * @param string $min_version_required
+	 * @param string $load_callback
+	 * @param string $plugin_file_constant
+	 * @return void
+	 */
+	private function deactivateIncompatibleAddon(
+		string $addon_name,
+		string $version_constant,
+		string $min_version_required,
+		string $load_callback,
+		string $plugin_file_constant
+	): void {
+		if (! defined($version_constant)) {
+			return;
+		}
+		$addon_version = constant($version_constant);
+		if ($addon_version && version_compare($addon_version, $min_version_required, '<')) {
+			remove_action('AHEE__EE_System__load_espresso_addons', $load_callback);
+			if (! function_exists('deactivate_plugins')) {
+				require_once ABSPATH . 'wp-admin/includes/plugin.php';
+			}
+			deactivate_plugins(plugin_basename(constant($plugin_file_constant)));
+			unset($_GET['activate'], $_REQUEST['activate'], $_GET['activate-multi'], $_REQUEST['activate-multi']);
+			EE_Error::add_error(
+				sprintf(
+					esc_html__(
+						'We\'re sorry, but the Event Espresso %1$s addon was deactivated because version %2$s or higher is required with this version of Event Espresso core.',
+						'event_espresso'
+					),
+					$addon_name,
+					$min_version_required
+				),
+				__FILE__,
+				__FUNCTION__ . "($addon_name)",
+				__LINE__
+			);
+			EE_Error::get_notices(false, true);
+		}
+	}
 }