eventespresso / event-espresso-core

core/CPTs/EE_CPT_Event_Strategy.core.php

Indentation +242 added lines, -242 removed lines

@@ -9,246 +9,246 @@
  */
 class EE_CPT_Event_Strategy
 {
-    /**
-     * the current page, if it utilizes CPTs
-     *
-     * @var object $CPT
-     */
-    protected $CPT;
-
-
-    /**
-     * @param array|WP_Query|null $wp_query
-     * @param array         $CPT
-     */
-    public function __construct($wp_query, array $CPT = [])
-    {
-        if ($wp_query instanceof WP_Query) {
-            $WP_Query  = $wp_query;
-            $this->CPT = $CPT;
-        } else {
-            $WP_Query  = $wp_query['WP_Query'] ?? null;
-            $this->CPT = $wp_query['CPT'] ?? null;
-        }
-        // !!!!!!!!!!  IMPORTANT !!!!!!!!!!!!
-        // here's the list of available filters in the WP_Query object
-        // 'posts_where'
-        // 'posts_where_paged'
-        // 'posts_groupby'
-        // 'posts_join_paged'
-        // 'posts_orderby'
-        // 'posts_distinct'
-        // 'post_limits'
-        // 'posts_fields'
-        // 'posts_join'
-        $this->_add_filters();
-        if ($WP_Query instanceof WP_Query) {
-            $WP_Query->is_espresso_event_single   = is_singular()
-                                                    && isset($WP_Query->query->post_type)
-                                                    && $WP_Query->query->post_type === 'espresso_events';
-            $WP_Query->is_espresso_event_archive  = is_post_type_archive('espresso_events');
-            $WP_Query->is_espresso_event_taxonomy = is_tax('espresso_event_categories');
-        }
-    }
-
-
-    /**
-     * When an instance of this class is created, we add our filters
-     * (which will get removed in case the next call to get_posts ISN'T
-     * for event CPTs)
-     */
-    protected function _add_filters()
-    {
-        add_filter('posts_fields', [$this, 'posts_fields'], 1, 2);
-        add_filter('posts_join', [$this, 'posts_join'], 1, 2);
-        add_filter('posts_where', [$this, 'posts_where'], 10, 2);
-        // add_filter( 'the_posts', array( $this, 'the_posts' ), 1, 2 );
-        add_filter('posts_orderby', [$this, 'posts_orderby'], 1, 2);
-        add_filter('posts_groupby', [$this, 'posts_groupby'], 1, 2);
-        add_action('posts_selection', [$this, 'remove_filters']);
-    }
-
-
-    /**
-     * public access to _remove_filters()
-     *
-     * @since 4.9.63.p
-     */
-    public function remove_filters()
-    {
-        $this->_remove_filters();
-    }
-
-
-    /**
-     * Should eb called when the last filter or hook is fired for this CPT strategy.
-     * This is to avoid applying this CPT strategy for other posts or CPTs (eg,
-     * we don't want to join to the datetime table when querying for venues, do we!?)
-     */
-    protected function _remove_filters()
-    {
-        remove_filter('posts_fields', [$this, 'posts_fields'], 1);
-        remove_filter('posts_join', [$this, 'posts_join'], 1);
-        remove_filter('posts_where', [$this, 'posts_where']);
-        // remove_filter( 'the_posts', array( $this, 'the_posts' ), 1 );
-        remove_filter('posts_orderby', [$this, 'posts_orderby'], 1);
-        remove_filter('posts_groupby', [$this, 'posts_groupby'], 1);
-        remove_action('posts_selection', [$this, 'remove_filters']);
-    }
-
-
-    /**
-     * @param string        $SQL
-     * @param WP_Query|null $wp_query
-     * @return    string
-     * @throws EE_Error
-     */
-    public function posts_fields(string $SQL, ?WP_Query $wp_query): string
-    {
-        if (
-            $wp_query instanceof WP_Query
-            && (
-                $wp_query->is_espresso_event_single
-                || $wp_query->is_espresso_event_archive
-                || $wp_query->is_espresso_event_taxonomy
-            )
-        ) {
-            // adds something like ", wp_esp_datetime.* " to WP Query SELECT statement
-            $SQL .= ', ' . EEM_Datetime::instance()->table() . '.* ';
-            if ($wp_query->is_espresso_event_archive || $wp_query->is_espresso_event_taxonomy) {
-                // because we only want to retrieve the next upcoming datetime for each event:
-                // add something like:
-                // ", MIN( wp_esp_datetime.DTT_EVT_start ) as event_start_date "
-                // to WP Query SELECT statement
-                $SQL .= ', MIN( ' . EEM_Datetime::instance()->table() . '.DTT_EVT_start ) as event_start_date ';
-            }
-        }
-        return $SQL;
-    }
-
-
-    /**
-     * @param string        $SQL
-     * @param WP_Query|null $wp_query
-     * @return string
-     * @throws EE_Error
-     */
-    public function posts_join(string $SQL, ?WP_Query $wp_query): string
-    {
-        if (
-            $wp_query instanceof WP_Query
-            && (
-                $wp_query->is_espresso_event_single
-                || $wp_query->is_espresso_event_archive
-                || $wp_query->is_espresso_event_taxonomy
-            )
-        ) {
-            // adds something like:
-            // " LEFT JOIN wp_esp_datetime ON ( wp_esp_datetime.EVT_ID = wp_posts.ID ) "
-            // to WP Query JOIN statement
-            $SQL .= ' INNER JOIN ' . EEM_Datetime::instance()->table() . ' ON ( ' . EEM_Event::instance()->table()
-                    . '.ID = ' . EEM_Datetime::instance()->table() . '.'
-                    . EEM_Event::instance()->primary_key_name() . ' ) ';
-        }
-        return $SQL;
-    }
-
-
-    /**
-     * @param string        $SQL
-     * @param WP_Query|null $wp_query
-     * @return string
-     * @throws EE_Error
-     */
-    public function posts_where(string $SQL, ?WP_Query $wp_query): string
-    {
-        if (
-            $wp_query instanceof WP_Query
-            && (
-                $wp_query->is_espresso_event_archive
-                || $wp_query->is_espresso_event_taxonomy
-            )
-        ) {
-            if (
-                ! isset(EE_Registry::instance()->CFG->template_settings->EED_Events_Archive)
-                || ! isset(EE_Registry::instance()->CFG->template_settings->EED_Events_Archive->display_expired_events)
-                || ! EE_Registry::instance()->CFG->template_settings->EED_Events_Archive->display_expired_events
-            ) {
-                $SQL .= ' AND ' . EEM_Datetime::instance()->table() . ".DTT_EVT_end > '"
-                        . current_time('mysql', true) . "' ";
-            }
-            // exclude trashed datetimes
-            $SQL .= ' AND ' . EEM_Datetime::instance()->table() . '.DTT_deleted = 0';
-        }
-        return $SQL;
-    }
-
-
-    /**
-     * @param string        $SQL
-     * @param WP_Query|null $wp_query
-     * @return string
-     */
-    public function posts_orderby(string $SQL, ?WP_Query $wp_query): string
-    {
-        if (
-            $wp_query instanceof WP_Query
-            && (
-                $wp_query->is_espresso_event_archive
-                || $wp_query->is_espresso_event_taxonomy
-            )
-        ) {
-            $SQL = ' event_start_date ASC ';
-        }
-        return $SQL;
-    }
-
-
-    /**
-     * @param string        $SQL
-     * @param WP_Query|null $wp_query
-     * @return string
-     */
-    public function posts_groupby(string $SQL, ?WP_Query $wp_query): string
-    {
-        if (
-            $wp_query instanceof WP_Query
-            && (
-                $wp_query->is_espresso_event_archive
-                || $wp_query->is_espresso_event_taxonomy
-            )
-        ) {
-            // TODO: add event list option for displaying ALL datetimes in event list or only primary datetime (default)
-            // we're joining to the datetimes table, where there can be MANY datetimes for a single event,
-            // but we want to only show each event only once
-            // (whereas if we didn't group them by the post's ID, then we would end up with many repeats)
-            global $wpdb;
-            $SQL = $wpdb->posts . '.ID ';
-        }
-        return $SQL;
-    }
-
-
-    /**
-     * @param array         $posts
-     * @param WP_Query|null $wp_query
-     * @return array
-     */
-    public function the_posts(array $posts, ?WP_Query $wp_query): array
-    {
-        return $posts;
-    }
-
-
-    /**
-     * @param mixed           $meta_value
-     * @param int|string      $post_id
-     * @param int|string      $meta_key
-     * @param bool|int|string $single
-     * @return mixed
-     */
-    public function get_EE_post_type_metadata($meta_value, $post_id, $meta_key, $single)
-    {
-        return $meta_value;
-    }
+	/**
+	 * the current page, if it utilizes CPTs
+	 *
+	 * @var object $CPT
+	 */
+	protected $CPT;
+
+
+	/**
+	 * @param array|WP_Query|null $wp_query
+	 * @param array         $CPT
+	 */
+	public function __construct($wp_query, array $CPT = [])
+	{
+		if ($wp_query instanceof WP_Query) {
+			$WP_Query  = $wp_query;
+			$this->CPT = $CPT;
+		} else {
+			$WP_Query  = $wp_query['WP_Query'] ?? null;
+			$this->CPT = $wp_query['CPT'] ?? null;
+		}
+		// !!!!!!!!!!  IMPORTANT !!!!!!!!!!!!
+		// here's the list of available filters in the WP_Query object
+		// 'posts_where'
+		// 'posts_where_paged'
+		// 'posts_groupby'
+		// 'posts_join_paged'
+		// 'posts_orderby'
+		// 'posts_distinct'
+		// 'post_limits'
+		// 'posts_fields'
+		// 'posts_join'
+		$this->_add_filters();
+		if ($WP_Query instanceof WP_Query) {
+			$WP_Query->is_espresso_event_single   = is_singular()
+													&& isset($WP_Query->query->post_type)
+													&& $WP_Query->query->post_type === 'espresso_events';
+			$WP_Query->is_espresso_event_archive  = is_post_type_archive('espresso_events');
+			$WP_Query->is_espresso_event_taxonomy = is_tax('espresso_event_categories');
+		}
+	}
+
+
+	/**
+	 * When an instance of this class is created, we add our filters
+	 * (which will get removed in case the next call to get_posts ISN'T
+	 * for event CPTs)
+	 */
+	protected function _add_filters()
+	{
+		add_filter('posts_fields', [$this, 'posts_fields'], 1, 2);
+		add_filter('posts_join', [$this, 'posts_join'], 1, 2);
+		add_filter('posts_where', [$this, 'posts_where'], 10, 2);
+		// add_filter( 'the_posts', array( $this, 'the_posts' ), 1, 2 );
+		add_filter('posts_orderby', [$this, 'posts_orderby'], 1, 2);
+		add_filter('posts_groupby', [$this, 'posts_groupby'], 1, 2);
+		add_action('posts_selection', [$this, 'remove_filters']);
+	}
+
+
+	/**
+	 * public access to _remove_filters()
+	 *
+	 * @since 4.9.63.p
+	 */
+	public function remove_filters()
+	{
+		$this->_remove_filters();
+	}
+
+
+	/**
+	 * Should eb called when the last filter or hook is fired for this CPT strategy.
+	 * This is to avoid applying this CPT strategy for other posts or CPTs (eg,
+	 * we don't want to join to the datetime table when querying for venues, do we!?)
+	 */
+	protected function _remove_filters()
+	{
+		remove_filter('posts_fields', [$this, 'posts_fields'], 1);
+		remove_filter('posts_join', [$this, 'posts_join'], 1);
+		remove_filter('posts_where', [$this, 'posts_where']);
+		// remove_filter( 'the_posts', array( $this, 'the_posts' ), 1 );
+		remove_filter('posts_orderby', [$this, 'posts_orderby'], 1);
+		remove_filter('posts_groupby', [$this, 'posts_groupby'], 1);
+		remove_action('posts_selection', [$this, 'remove_filters']);
+	}
+
+
+	/**
+	 * @param string        $SQL
+	 * @param WP_Query|null $wp_query
+	 * @return    string
+	 * @throws EE_Error
+	 */
+	public function posts_fields(string $SQL, ?WP_Query $wp_query): string
+	{
+		if (
+			$wp_query instanceof WP_Query
+			&& (
+				$wp_query->is_espresso_event_single
+				|| $wp_query->is_espresso_event_archive
+				|| $wp_query->is_espresso_event_taxonomy
+			)
+		) {
+			// adds something like ", wp_esp_datetime.* " to WP Query SELECT statement
+			$SQL .= ', ' . EEM_Datetime::instance()->table() . '.* ';
+			if ($wp_query->is_espresso_event_archive || $wp_query->is_espresso_event_taxonomy) {
+				// because we only want to retrieve the next upcoming datetime for each event:
+				// add something like:
+				// ", MIN( wp_esp_datetime.DTT_EVT_start ) as event_start_date "
+				// to WP Query SELECT statement
+				$SQL .= ', MIN( ' . EEM_Datetime::instance()->table() . '.DTT_EVT_start ) as event_start_date ';
+			}
+		}
+		return $SQL;
+	}
+
+
+	/**
+	 * @param string        $SQL
+	 * @param WP_Query|null $wp_query
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function posts_join(string $SQL, ?WP_Query $wp_query): string
+	{
+		if (
+			$wp_query instanceof WP_Query
+			&& (
+				$wp_query->is_espresso_event_single
+				|| $wp_query->is_espresso_event_archive
+				|| $wp_query->is_espresso_event_taxonomy
+			)
+		) {
+			// adds something like:
+			// " LEFT JOIN wp_esp_datetime ON ( wp_esp_datetime.EVT_ID = wp_posts.ID ) "
+			// to WP Query JOIN statement
+			$SQL .= ' INNER JOIN ' . EEM_Datetime::instance()->table() . ' ON ( ' . EEM_Event::instance()->table()
+					. '.ID = ' . EEM_Datetime::instance()->table() . '.'
+					. EEM_Event::instance()->primary_key_name() . ' ) ';
+		}
+		return $SQL;
+	}
+
+
+	/**
+	 * @param string        $SQL
+	 * @param WP_Query|null $wp_query
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function posts_where(string $SQL, ?WP_Query $wp_query): string
+	{
+		if (
+			$wp_query instanceof WP_Query
+			&& (
+				$wp_query->is_espresso_event_archive
+				|| $wp_query->is_espresso_event_taxonomy
+			)
+		) {
+			if (
+				! isset(EE_Registry::instance()->CFG->template_settings->EED_Events_Archive)
+				|| ! isset(EE_Registry::instance()->CFG->template_settings->EED_Events_Archive->display_expired_events)
+				|| ! EE_Registry::instance()->CFG->template_settings->EED_Events_Archive->display_expired_events
+			) {
+				$SQL .= ' AND ' . EEM_Datetime::instance()->table() . ".DTT_EVT_end > '"
+						. current_time('mysql', true) . "' ";
+			}
+			// exclude trashed datetimes
+			$SQL .= ' AND ' . EEM_Datetime::instance()->table() . '.DTT_deleted = 0';
+		}
+		return $SQL;
+	}
+
+
+	/**
+	 * @param string        $SQL
+	 * @param WP_Query|null $wp_query
+	 * @return string
+	 */
+	public function posts_orderby(string $SQL, ?WP_Query $wp_query): string
+	{
+		if (
+			$wp_query instanceof WP_Query
+			&& (
+				$wp_query->is_espresso_event_archive
+				|| $wp_query->is_espresso_event_taxonomy
+			)
+		) {
+			$SQL = ' event_start_date ASC ';
+		}
+		return $SQL;
+	}
+
+
+	/**
+	 * @param string        $SQL
+	 * @param WP_Query|null $wp_query
+	 * @return string
+	 */
+	public function posts_groupby(string $SQL, ?WP_Query $wp_query): string
+	{
+		if (
+			$wp_query instanceof WP_Query
+			&& (
+				$wp_query->is_espresso_event_archive
+				|| $wp_query->is_espresso_event_taxonomy
+			)
+		) {
+			// TODO: add event list option for displaying ALL datetimes in event list or only primary datetime (default)
+			// we're joining to the datetimes table, where there can be MANY datetimes for a single event,
+			// but we want to only show each event only once
+			// (whereas if we didn't group them by the post's ID, then we would end up with many repeats)
+			global $wpdb;
+			$SQL = $wpdb->posts . '.ID ';
+		}
+		return $SQL;
+	}
+
+
+	/**
+	 * @param array         $posts
+	 * @param WP_Query|null $wp_query
+	 * @return array
+	 */
+	public function the_posts(array $posts, ?WP_Query $wp_query): array
+	{
+		return $posts;
+	}
+
+
+	/**
+	 * @param mixed           $meta_value
+	 * @param int|string      $post_id
+	 * @param int|string      $meta_key
+	 * @param bool|int|string $single
+	 * @return mixed
+	 */
+	public function get_EE_post_type_metadata($meta_value, $post_id, $meta_key, $single)
+	{
+		return $meta_value;
+	}
 }

Spacing +9 added lines, -9 removed lines

@@ -114,13 +114,13 @@ 
             )
         ) {
             // adds something like ", wp_esp_datetime.* " to WP Query SELECT statement
-            $SQL .= ', ' . EEM_Datetime::instance()->table() . '.* ';
+            $SQL .= ', '.EEM_Datetime::instance()->table().'.* ';
             if ($wp_query->is_espresso_event_archive || $wp_query->is_espresso_event_taxonomy) {
                 // because we only want to retrieve the next upcoming datetime for each event:
                 // add something like:
                 // ", MIN( wp_esp_datetime.DTT_EVT_start ) as event_start_date "
                 // to WP Query SELECT statement
-                $SQL .= ', MIN( ' . EEM_Datetime::instance()->table() . '.DTT_EVT_start ) as event_start_date ';
+                $SQL .= ', MIN( '.EEM_Datetime::instance()->table().'.DTT_EVT_start ) as event_start_date ';
             }
         }
         return $SQL;
@@ -146,9 +146,9 @@ 
             // adds something like:
             // " LEFT JOIN wp_esp_datetime ON ( wp_esp_datetime.EVT_ID = wp_posts.ID ) "
             // to WP Query JOIN statement
-            $SQL .= ' INNER JOIN ' . EEM_Datetime::instance()->table() . ' ON ( ' . EEM_Event::instance()->table()
-                    . '.ID = ' . EEM_Datetime::instance()->table() . '.'
-                    . EEM_Event::instance()->primary_key_name() . ' ) ';
+            $SQL .= ' INNER JOIN '.EEM_Datetime::instance()->table().' ON ( '.EEM_Event::instance()->table()
+                    . '.ID = '.EEM_Datetime::instance()->table().'.'
+                    . EEM_Event::instance()->primary_key_name().' ) ';
         }
         return $SQL;
     }
@@ -174,11 +174,11 @@ 
                 || ! isset(EE_Registry::instance()->CFG->template_settings->EED_Events_Archive->display_expired_events)
                 || ! EE_Registry::instance()->CFG->template_settings->EED_Events_Archive->display_expired_events
             ) {
-                $SQL .= ' AND ' . EEM_Datetime::instance()->table() . ".DTT_EVT_end > '"
-                        . current_time('mysql', true) . "' ";
+                $SQL .= ' AND '.EEM_Datetime::instance()->table().".DTT_EVT_end > '"
+                        . current_time('mysql', true)."' ";
             }
             // exclude trashed datetimes
-            $SQL .= ' AND ' . EEM_Datetime::instance()->table() . '.DTT_deleted = 0';
+            $SQL .= ' AND '.EEM_Datetime::instance()->table().'.DTT_deleted = 0';
         }
         return $SQL;
     }
@@ -223,7 +223,7 @@ 
             // but we want to only show each event only once
             // (whereas if we didn't group them by the post's ID, then we would end up with many repeats)
             global $wpdb;
-            $SQL = $wpdb->posts . '.ID ';
+            $SQL = $wpdb->posts.'.ID ';
         }
         return $SQL;
     }

core/domain/services/admin/AdminToolBar.php

Indentation +821 added lines, -821 removed lines

@@ -20,825 +20,825 @@
  */
 class AdminToolBar
 {
-    private ?WP_Admin_Bar   $admin_bar        = null;
-
-    private EE_Capabilities $capabilities;
-
-    private string          $events_admin_url = '';
-
-    private string          $menu_class       = 'espresso_menu_item_class';
-
-    private string          $reg_admin_url    = '';
-
-
-    /**
-     * AdminToolBar constructor.
-     *
-     * @param EE_Capabilities $capabilities
-     */
-    public function __construct(EE_Capabilities $capabilities)
-    {
-        $this->capabilities = $capabilities;
-        add_action('admin_bar_menu', [$this, 'espressoToolbarItems'], 100);
-        $this->enqueueAssets();
-    }
-
-
-    /**
-     *    espresso_toolbar_items
-     *
-     * @access public
-     * @param WP_Admin_Bar $admin_bar
-     * @return void
-     */
-    public function espressoToolbarItems(WP_Admin_Bar $admin_bar)
-    {
-        // if its an AJAX request, or user is NOT an admin, or in full M-Mode
-        if (
-            defined('DOING_AJAX')
-            || ! $this->capabilities->current_user_can('ee_read_ee', 'ee_admin_bar_menu_top_level')
-            || EE_Maintenance_Mode::instance()->level() === EE_Maintenance_Mode::level_2_complete_maintenance
-        ) {
-            return;
-        }
-        $this->admin_bar = $admin_bar;
-        // we don't use the constants EVENTS_ADMIN_URL or REG_ADMIN_URL
-        // because they're only defined in each of their respective constructors
-        // and this might be a frontend request, in which case they aren't available
-        $this->events_admin_url = admin_url('admin.php?page=espresso_events');
-        $this->reg_admin_url    = admin_url('admin.php?page=espresso_registrations');
-        // now let's add all of the menu items
-        $this->addTopLevelMenu();
-        $this->addEventsSubMenu();
-        $this->addEventsAddEditHeader();
-        $this->addEventsAddNew();
-        $this->addEventsEditCurrentEvent();
-        $this->addEventsViewHeader();
-        $this->addEventsViewAll();
-        $this->addEventsViewToday();
-        $this->addEventsViewThisMonth();
-        $this->addRegistrationSubMenu();
-        $this->addRegistrationOverviewToday();
-        $this->addRegistrationOverviewTodayApproved();
-        $this->addRegistrationOverviewTodayPendingPayment();
-        $this->addRegistrationOverviewTodayNotApproved();
-        $this->addRegistrationOverviewTodayCancelled();
-        $this->addRegistrationOverviewThisMonth();
-        $this->addRegistrationOverviewThisMonthApproved();
-        $this->addRegistrationOverviewThisMonthPending();
-        $this->addRegistrationOverviewThisMonthNotApproved();
-        $this->addRegistrationOverviewThisMonthCancelled();
-        $this->addExtensionsAndServices();
-        $this->addFontSizeSubMenu();
-    }
-
-
-    /**
-     * @return void
-     */
-    private function enqueueAssets()
-    {
-        wp_register_style(
-            'espresso-admin-toolbar',
-            EE_GLOBAL_ASSETS_URL . 'css/espresso-admin-toolbar.css',
-            ['dashicons'],
-            EVENT_ESPRESSO_VERSION
-        );
-        wp_enqueue_style('espresso-admin-toolbar');
-    }
-
-
-    /**
-     * @return void
-     */
-    private function addTopLevelMenu()
-    {
-        $this->admin_bar->add_menu(
-            [
-                'id'    => 'espresso-toolbar',
-                'title' => '<span class="ab-icon ee-icon ee-icon-ee-cup-thick ee-icon-size-20"></span><span class="ab-label">'
-                           . esc_html_x('Event Espresso', 'admin bar menu group label', 'event_espresso')
-                           . '</span>',
-                'href'  => $this->events_admin_url,
-                'meta'  => [
-                    'title' => esc_html__('Event Espresso', 'event_espresso'),
-                    'class' => $this->menu_class . 'first',
-                ],
-            ]
-        );
-    }
-
-
-    /**
-     * @return void
-     */
-    private function addEventsSubMenu()
-    {
-        if (
-            $this->capabilities->current_user_can(
-                'ee_read_events',
-                'ee_admin_bar_menu_espresso-toolbar-events'
-            )
-        ) {
-            $this->admin_bar->add_menu(
-                [
-                    'id'     => 'espresso-toolbar-events',
-                    'parent' => 'espresso-toolbar',
-                    'title'  => '<span class="ee-toolbar-icon"></span>'
-                                . esc_html__('Events', 'event_espresso'),
-                    'href'   => $this->events_admin_url,
-                    'meta'   => [
-                        'title'  => esc_html__('Events', 'event_espresso'),
-                        'target' => '',
-                        'class'  => $this->menu_class,
-                    ],
-                ]
-            );
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    private function addEventsAddEditHeader()
-    {
-        if (
-            $this->capabilities->current_user_can(
-                'ee_read_events',
-                'ee_admin_bar_menu_espresso-toolbar-events-view'
-            )
-        ) {
-            $this->admin_bar->add_menu(
-                [
-                    'id'     => 'espresso-toolbar-events-add-edit',
-                    'parent' => 'espresso-toolbar-events',
-                    'title'  => esc_html__('Add / Edit', 'event_espresso'),
-                    'href'   => '',
-                ]
-            );
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    private function addEventsAddNew()
-    {
-        if (
-            $this->capabilities->current_user_can(
-                'ee_edit_events',
-                'ee_admin_bar_menu_espresso-toolbar-events-new'
-            )
-        ) {
-            $this->admin_bar->add_menu(
-                [
-                    'id'     => 'espresso-toolbar-events-new',
-                    'parent' => 'espresso-toolbar-events',
-                    'title'  => '<span class="ee-toolbar-icon"></span>'
-                                . esc_html__('Add New', 'event_espresso'),
-                    'href'   => EEH_URL::add_query_args_and_nonce(
-                        ['action' => 'create_new'],
-                        $this->events_admin_url
-                    ),
-                    'meta'   => [
-                        'title'  => esc_html__('Add New', 'event_espresso'),
-                        'target' => '',
-                        'class'  => $this->menu_class,
-                    ],
-                ]
-            );
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    private function addEventsEditCurrentEvent()
-    {
-        if (is_single() && (get_post_type() === 'espresso_events')) {
-            // Current post
-            global $post;
-            if (
-                $this->capabilities->current_user_can(
-                    'ee_edit_event',
-                    'ee_admin_bar_menu_espresso-toolbar-events-edit',
-                    $post->ID
-                )
-            ) {
-                $this->admin_bar->add_menu(
-                    [
-                        'id'     => 'espresso-toolbar-events-edit',
-                        'parent' => 'espresso-toolbar-events',
-                        'title'  => '<span class="ee-toolbar-icon"></span>'
-                                    . esc_html__('Edit Event', 'event_espresso'),
-                        'href'   => EEH_URL::add_query_args_and_nonce(
-                            [
-                                'action' => 'edit',
-                                'post'   => $post->ID,
-                            ],
-                            $this->events_admin_url
-                        ),
-                        'meta'   => [
-                            'title'  => esc_html__('Edit Event', 'event_espresso'),
-                            'target' => '',
-                            'class'  => $this->menu_class,
-                        ],
-                    ]
-                );
-            }
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    private function addEventsViewHeader()
-    {
-        if (
-            $this->capabilities->current_user_can(
-                'ee_read_events',
-                'ee_admin_bar_menu_espresso-toolbar-events-view'
-            )
-        ) {
-            $this->admin_bar->add_menu(
-                [
-                    'id'     => 'espresso-toolbar-events-view',
-                    'parent' => 'espresso-toolbar-events',
-                    'title'  => esc_html__('View', 'event_espresso'),
-                    'href'   => '',
-                ]
-            );
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    private function addEventsViewAll()
-    {
-        if (
-            $this->capabilities->current_user_can(
-                'ee_read_events',
-                'ee_admin_bar_menu_espresso-toolbar-events-all'
-            )
-        ) {
-            $this->admin_bar->add_menu(
-                [
-                    'id'     => 'espresso-toolbar-events-all',
-                    'parent' => 'espresso-toolbar-events',
-                    'title'  => '<span class="ee-toolbar-icon"></span>'
-                                . esc_html__('All', 'event_espresso'),
-                    'href'   => $this->events_admin_url,
-                    'meta'   => [
-                        'title'  => esc_html__('All', 'event_espresso'),
-                        'target' => '',
-                        'class'  => $this->menu_class,
-                    ],
-                ]
-            );
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    private function addEventsViewToday()
-    {
-        if (
-            $this->capabilities->current_user_can(
-                'ee_read_events',
-                'ee_admin_bar_menu_espresso-toolbar-events-today'
-            )
-        ) {
-            $this->admin_bar->add_menu(
-                [
-                    'id'     => 'espresso-toolbar-events-today',
-                    'parent' => 'espresso-toolbar-events',
-                    'title'  => '<span class="ee-toolbar-icon"></span>'
-                                . esc_html__('Today', 'event_espresso'),
-                    'href'   => EEH_URL::add_query_args_and_nonce(
-                        [
-                            'action' => 'default',
-                            'status' => 'today',
-                        ],
-                        $this->events_admin_url
-                    ),
-                    'meta'   => [
-                        'title'  => esc_html__('Today', 'event_espresso'),
-                        'target' => '',
-                        'class'  => $this->menu_class,
-                    ],
-                ]
-            );
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    private function addEventsViewThisMonth()
-    {
-        if (
-            $this->capabilities->current_user_can(
-                'ee_read_events',
-                'ee_admin_bar_menu_espresso-toolbar-events-month'
-            )
-        ) {
-            $this->admin_bar->add_menu(
-                [
-                    'id'     => 'espresso-toolbar-events-month',
-                    'parent' => 'espresso-toolbar-events',
-                    'title'  => '<span class="ee-toolbar-icon"></span>'
-                                . esc_html__('This Month', 'event_espresso'),
-                    'href'   => EEH_URL::add_query_args_and_nonce(
-                        [
-                            'action' => 'default',
-                            'status' => 'month',
-                        ],
-                        $this->events_admin_url
-                    ),
-                    'meta'   => [
-                        'title'  => esc_html__('This Month', 'event_espresso'),
-                        'target' => '',
-                        'class'  => $this->menu_class,
-                    ],
-                ]
-            );
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    private function addRegistrationSubMenu()
-    {
-        if (
-            $this->capabilities->current_user_can(
-                'ee_read_registrations',
-                'ee_admin_bar_menu_espresso-toolbar-registrations'
-            )
-        ) {
-            $this->admin_bar->add_menu(
-                [
-                    'id'     => 'espresso-toolbar-registrations',
-                    'parent' => 'espresso-toolbar',
-                    'title'  => '<span class="ee-toolbar-icon"></span>'
-                                . esc_html__('Registrations', 'event_espresso'),
-                    'href'   => $this->reg_admin_url,
-                    'meta'   => [
-                        'title'  => esc_html__('Registrations', 'event_espresso'),
-                        'target' => '',
-                        'class'  => $this->menu_class,
-                    ],
-                ]
-            );
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    private function addRegistrationOverviewToday()
-    {
-        if (
-            $this->capabilities->current_user_can(
-                'ee_read_registrations',
-                'ee_admin_bar_menu_espresso-toolbar-registrations-today'
-            )
-        ) {
-            $this->admin_bar->add_menu(
-                [
-                    'id'     => 'espresso-toolbar-registrations-today',
-                    'parent' => 'espresso-toolbar-registrations',
-                    'title'  => esc_html__('Today', 'event_espresso'),
-                    'href'   => '',
-                    'meta'   => [
-                        'title'  => esc_html__('Today', 'event_espresso'),
-                        'target' => '',
-                        'class'  => $this->menu_class,
-                    ],
-                ]
-            );
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    private function addRegistrationOverviewTodayApproved()
-    {
-        if (
-            $this->capabilities->current_user_can(
-                'ee_read_registrations',
-                'ee_admin_bar_menu_espresso-toolbar-registrations-today-approved'
-            )
-        ) {
-            $this->admin_bar->add_menu(
-                [
-                    'id'     => 'espresso-toolbar-registrations-today-approved',
-                    'parent' => 'espresso-toolbar-registrations',
-                    'title'  => '<span class="ee-toolbar-icon"></span>'
-                                . esc_html__('Approved', 'event_espresso'),
-                    'href'   => EEH_URL::add_query_args_and_nonce(
-                        [
-                            'action'      => 'default',
-                            'status'      => 'today',
-                            '_reg_status' => EEM_Registration::status_id_approved,
-                        ],
-                        $this->reg_admin_url
-                    ),
-                    'meta'   => [
-                        'title'  => esc_html__('Approved', 'event_espresso'),
-                        'target' => '',
-                        'class'  => $this->menu_class . ' ee-toolbar-icon-approved',
-                    ],
-                ]
-            );
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    private function addRegistrationOverviewTodayPendingPayment()
-    {
-        if (
-            $this->capabilities->current_user_can(
-                'ee_read_registrations',
-                'ee_admin_bar_menu_espresso-toolbar-registrations-today-pending'
-            )
-        ) {
-            $this->admin_bar->add_menu(
-                [
-                    'id'     => 'espresso-toolbar-registrations-today-pending',
-                    'parent' => 'espresso-toolbar-registrations',
-                    'title'  => '<span class="ee-toolbar-icon"></span>'
-                                . esc_html__('Pending', 'event_espresso'),
-                    'href'   => EEH_URL::add_query_args_and_nonce(
-                        [
-                            'action'      => 'default',
-                            'status'      => 'today',
-                            '_reg_status' => EEM_Registration::status_id_pending_payment,
-                        ],
-                        $this->reg_admin_url
-                    ),
-                    'meta'   => [
-                        'title'  => esc_html__('Pending Payment', 'event_espresso'),
-                        'target' => '',
-                        'class'  => $this->menu_class . ' ee-toolbar-icon-pending',
-                    ],
-                ]
-            );
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    private function addRegistrationOverviewTodayNotApproved()
-    {
-        if (
-            $this->capabilities->current_user_can(
-                'ee_read_registrations',
-                'ee_admin_bar_menu_espresso-toolbar-registrations-today-not-approved'
-            )
-        ) {
-            $this->admin_bar->add_menu(
-                [
-                    'id'     => 'espresso-toolbar-registrations-today-not-approved',
-                    'parent' => 'espresso-toolbar-registrations',
-                    'title'  => '<span class="ee-toolbar-icon"></span>'
-                                . esc_html__('Not Approved', 'event_espresso'),
-                    'href'   => EEH_URL::add_query_args_and_nonce(
-                        [
-                            'action'      => 'default',
-                            'status'      => 'today',
-                            '_reg_status' => EEM_Registration::status_id_not_approved,
-                        ],
-                        $this->reg_admin_url
-                    ),
-                    'meta'   => [
-                        'title'  => esc_html__('Not Approved', 'event_espresso'),
-                        'target' => '',
-                        'class'  => $this->menu_class . ' ee-toolbar-icon-not-approved',
-                    ],
-                ]
-            );
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    private function addRegistrationOverviewTodayCancelled()
-    {
-        if (
-            $this->capabilities->current_user_can(
-                'ee_read_registrations',
-                'ee_admin_bar_menu_espresso-toolbar-registrations-today-cancelled'
-            )
-        ) {
-            $this->admin_bar->add_menu(
-                [
-                    'id'     => 'espresso-toolbar-registrations-today-cancelled',
-                    'parent' => 'espresso-toolbar-registrations',
-                    'title'  => '<span class="ee-toolbar-icon"></span>'
-                                . esc_html__('Cancelled', 'event_espresso'),
-                    'href'   => EEH_URL::add_query_args_and_nonce(
-                        [
-                            'action'      => 'default',
-                            'status'      => 'today',
-                            '_reg_status' => EEM_Registration::status_id_cancelled,
-                        ],
-                        $this->reg_admin_url
-                    ),
-                    'meta'   => [
-                        'title'  => esc_html__('Cancelled', 'event_espresso'),
-                        'target' => '',
-                        'class'  => $this->menu_class . ' ee-toolbar-icon-cancelled',
-                    ],
-                ]
-            );
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    private function addRegistrationOverviewThisMonth()
-    {
-        if (
-            $this->capabilities->current_user_can(
-                'ee_read_registrations',
-                'ee_admin_bar_menu_espresso-toolbar-registrations-month'
-            )
-        ) {
-            $this->admin_bar->add_menu(
-                [
-                    'id'     => 'espresso-toolbar-registrations-month',
-                    'parent' => 'espresso-toolbar-registrations',
-                    'title'  => esc_html__('This Month', 'event_espresso'),
-                    'href'   => '', // EEH_URL::add_query_args_and_nonce(
-                    //     array(
-                    //         'action' => 'default',
-                    //         'status' => 'month'
-                    //     ),
-                    //     $this->reg_admin_url
-                    // ),
-                    'meta'   => [
-                        'title'  => esc_html__('This Month', 'event_espresso'),
-                        'target' => '',
-                        'class'  => $this->menu_class,
-                    ],
-                ]
-            );
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    private function addRegistrationOverviewThisMonthApproved()
-    {
-        if (
-            $this->capabilities->current_user_can(
-                'ee_read_registrations',
-                'ee_admin_bar_menu_espresso-toolbar-registrations-month-approved'
-            )
-        ) {
-            $this->admin_bar->add_menu(
-                [
-                    'id'     => 'espresso-toolbar-registrations-month-approved',
-                    'parent' => 'espresso-toolbar-registrations',
-                    'title'  => '<span class="ee-toolbar-icon"></span>'
-                                . esc_html__('Approved', 'event_espresso'),
-                    'href'   => EEH_URL::add_query_args_and_nonce(
-                        [
-                            'action'      => 'default',
-                            'status'      => 'month',
-                            '_reg_status' => EEM_Registration::status_id_approved,
-                        ],
-                        $this->reg_admin_url
-                    ),
-                    'meta'   => [
-                        'title'  => esc_html__('Approved', 'event_espresso'),
-                        'target' => '',
-                        'class'  => $this->menu_class . ' ee-toolbar-icon-approved',
-                    ],
-                ]
-            );
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    private function addRegistrationOverviewThisMonthPending()
-    {
-        if (
-            $this->capabilities->current_user_can(
-                'ee_read_registrations',
-                'ee_admin_bar_menu_espresso-toolbar-registrations-month-pending'
-            )
-        ) {
-            $this->admin_bar->add_menu(
-                [
-                    'id'     => 'espresso-toolbar-registrations-month-pending',
-                    'parent' => 'espresso-toolbar-registrations',
-                    'title'  => '<span class="ee-toolbar-icon"></span>'
-                                . esc_html__('Pending', 'event_espresso'),
-                    'href'   => EEH_URL::add_query_args_and_nonce(
-                        [
-                            'action'      => 'default',
-                            'status'      => 'month',
-                            '_reg_status' => EEM_Registration::status_id_pending_payment,
-                        ],
-                        $this->reg_admin_url
-                    ),
-                    'meta'   => [
-                        'title'  => esc_html__('Pending', 'event_espresso'),
-                        'target' => '',
-                        'class'  => $this->menu_class . ' ee-toolbar-icon-pending',
-                    ],
-                ]
-            );
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    private function addRegistrationOverviewThisMonthNotApproved()
-    {
-        if (
-            $this->capabilities->current_user_can(
-                'ee_read_registrations',
-                'ee_admin_bar_menu_espresso-toolbar-registrations-month-not-approved'
-            )
-        ) {
-            $this->admin_bar->add_menu(
-                [
-                    'id'     => 'espresso-toolbar-registrations-month-not-approved',
-                    'parent' => 'espresso-toolbar-registrations',
-                    'title'  => '<span class="ee-toolbar-icon"></span>'
-                                . esc_html__('Not Approved', 'event_espresso'),
-                    'href'   => EEH_URL::add_query_args_and_nonce(
-                        [
-                            'action'      => 'default',
-                            'status'      => 'month',
-                            '_reg_status' => EEM_Registration::status_id_not_approved,
-                        ],
-                        $this->reg_admin_url
-                    ),
-                    'meta'   => [
-                        'title'  => esc_html__('Not Approved', 'event_espresso'),
-                        'target' => '',
-                        'class'  => $this->menu_class . ' ee-toolbar-icon-not-approved',
-                    ],
-                ]
-            );
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    private function addRegistrationOverviewThisMonthCancelled()
-    {
-        if (
-            $this->capabilities->current_user_can(
-                'ee_read_registrations',
-                'ee_admin_bar_menu_espresso-toolbar-registrations-month-cancelled'
-            )
-        ) {
-            $this->admin_bar->add_menu(
-                [
-                    'id'     => 'espresso-toolbar-registrations-month-cancelled',
-                    'parent' => 'espresso-toolbar-registrations',
-                    'title'  => '<span class="ee-toolbar-icon"></span>'
-                                . esc_html__('Cancelled', 'event_espresso'),
-                    'href'   => EEH_URL::add_query_args_and_nonce(
-                        [
-                            'action'      => 'default',
-                            'status'      => 'month',
-                            '_reg_status' => EEM_Registration::status_id_cancelled,
-                        ],
-                        $this->reg_admin_url
-                    ),
-                    'meta'   => [
-                        'title'  => esc_html__('Cancelled', 'event_espresso'),
-                        'target' => '',
-                        'class'  => $this->menu_class . ' ee-toolbar-icon-cancelled',
-                    ],
-                ]
-            );
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    private function addExtensionsAndServices()
-    {
-        if (
-            $this->capabilities->current_user_can(
-                'ee_read_ee',
-                'ee_admin_bar_menu_espresso-toolbar-extensions-and-services'
-            )
-        ) {
-            $this->admin_bar->add_menu(
-                [
-                    'id'     => 'espresso-toolbar-extensions-and-services',
-                    'parent' => 'espresso-toolbar',
-                    'title'  => '<span class="ee-toolbar-icon"></span>'
-                                . esc_html__('Extensions & Services', 'event_espresso'),
-                    'href'   => admin_url('admin.php?page=espresso_packages'),
-                    'meta'   => [
-                        'title'  => esc_html__('Extensions & Services', 'event_espresso'),
-                        'target' => '',
-                        'class'  => $this->menu_class,
-                    ],
-                ]
-            );
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    private function addFontSizeSubMenu()
-    {
-        if (! is_admin()) {
-            return;
-        }
-        $this->admin_bar->add_menu(
-            [
-                'id'     => 'espresso-toolbar-font-size',
-                'parent' => 'espresso-toolbar',
-                'title'  => '<span class="ee-toolbar-icon"></span>'
-                            . esc_html__('Set Font Size', 'event_espresso'),
-                'href'   => '',
-                'meta'   => [
-                    'title'  => esc_html__('Set Font Size', 'event_espresso'),
-                    'target' => '',
-                    'class'  => $this->menu_class,
-                ],
-            ]
-        );
-
-        $settings_admin_url = admin_url('admin.php?page=espresso_general_settings');
-
-        $font_sizes = [
-            'tiny'    => AdminFontSize::FONT_SIZE_TINY,
-            'smaller' => AdminFontSize::FONT_SIZE_SMALLER,
-            'small'   => AdminFontSize::FONT_SIZE_SMALL,
-            'default' => AdminFontSize::FONT_SIZE_DEFAULT,
-            'big'     => AdminFontSize::FONT_SIZE_BIG,
-            'bigger'  => AdminFontSize::FONT_SIZE_BIGGER,
-        ];
-
-        foreach ($font_sizes as $font_size => $value) {
-            $this->admin_bar->add_menu(
-                [
-                    'id'     => "espresso-toolbar-set-font-size-$font_size",
-                    'parent' => 'espresso-toolbar-font-size',
-                    'title'  => '<span class="ee-toolbar-icon"></span>'
-                                . sprintf(
-                                    /* translators: Font Size Small */
-                                    esc_html__('Font Size %1$s', 'event_espresso'),
-                                    ucwords($font_size)
-                                ),
-                    'href'   => EEH_URL::add_query_args_and_nonce(
-                        ['action' => 'set_font_size', 'font_size' => $value],
-                        $settings_admin_url
-                    ),
-                    'meta'   => [
-                        'title'  => esc_html__('increases or decreases the Event Espresso admin font size', 'event_espresso'),
-                        'target' => '',
-                        'class'  => $this->menu_class,
-                    ],
-                ]
-            );
-        }
-    }
+	private ?WP_Admin_Bar   $admin_bar        = null;
+
+	private EE_Capabilities $capabilities;
+
+	private string          $events_admin_url = '';
+
+	private string          $menu_class       = 'espresso_menu_item_class';
+
+	private string          $reg_admin_url    = '';
+
+
+	/**
+	 * AdminToolBar constructor.
+	 *
+	 * @param EE_Capabilities $capabilities
+	 */
+	public function __construct(EE_Capabilities $capabilities)
+	{
+		$this->capabilities = $capabilities;
+		add_action('admin_bar_menu', [$this, 'espressoToolbarItems'], 100);
+		$this->enqueueAssets();
+	}
+
+
+	/**
+	 *    espresso_toolbar_items
+	 *
+	 * @access public
+	 * @param WP_Admin_Bar $admin_bar
+	 * @return void
+	 */
+	public function espressoToolbarItems(WP_Admin_Bar $admin_bar)
+	{
+		// if its an AJAX request, or user is NOT an admin, or in full M-Mode
+		if (
+			defined('DOING_AJAX')
+			|| ! $this->capabilities->current_user_can('ee_read_ee', 'ee_admin_bar_menu_top_level')
+			|| EE_Maintenance_Mode::instance()->level() === EE_Maintenance_Mode::level_2_complete_maintenance
+		) {
+			return;
+		}
+		$this->admin_bar = $admin_bar;
+		// we don't use the constants EVENTS_ADMIN_URL or REG_ADMIN_URL
+		// because they're only defined in each of their respective constructors
+		// and this might be a frontend request, in which case they aren't available
+		$this->events_admin_url = admin_url('admin.php?page=espresso_events');
+		$this->reg_admin_url    = admin_url('admin.php?page=espresso_registrations');
+		// now let's add all of the menu items
+		$this->addTopLevelMenu();
+		$this->addEventsSubMenu();
+		$this->addEventsAddEditHeader();
+		$this->addEventsAddNew();
+		$this->addEventsEditCurrentEvent();
+		$this->addEventsViewHeader();
+		$this->addEventsViewAll();
+		$this->addEventsViewToday();
+		$this->addEventsViewThisMonth();
+		$this->addRegistrationSubMenu();
+		$this->addRegistrationOverviewToday();
+		$this->addRegistrationOverviewTodayApproved();
+		$this->addRegistrationOverviewTodayPendingPayment();
+		$this->addRegistrationOverviewTodayNotApproved();
+		$this->addRegistrationOverviewTodayCancelled();
+		$this->addRegistrationOverviewThisMonth();
+		$this->addRegistrationOverviewThisMonthApproved();
+		$this->addRegistrationOverviewThisMonthPending();
+		$this->addRegistrationOverviewThisMonthNotApproved();
+		$this->addRegistrationOverviewThisMonthCancelled();
+		$this->addExtensionsAndServices();
+		$this->addFontSizeSubMenu();
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function enqueueAssets()
+	{
+		wp_register_style(
+			'espresso-admin-toolbar',
+			EE_GLOBAL_ASSETS_URL . 'css/espresso-admin-toolbar.css',
+			['dashicons'],
+			EVENT_ESPRESSO_VERSION
+		);
+		wp_enqueue_style('espresso-admin-toolbar');
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function addTopLevelMenu()
+	{
+		$this->admin_bar->add_menu(
+			[
+				'id'    => 'espresso-toolbar',
+				'title' => '<span class="ab-icon ee-icon ee-icon-ee-cup-thick ee-icon-size-20"></span><span class="ab-label">'
+						   . esc_html_x('Event Espresso', 'admin bar menu group label', 'event_espresso')
+						   . '</span>',
+				'href'  => $this->events_admin_url,
+				'meta'  => [
+					'title' => esc_html__('Event Espresso', 'event_espresso'),
+					'class' => $this->menu_class . 'first',
+				],
+			]
+		);
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function addEventsSubMenu()
+	{
+		if (
+			$this->capabilities->current_user_can(
+				'ee_read_events',
+				'ee_admin_bar_menu_espresso-toolbar-events'
+			)
+		) {
+			$this->admin_bar->add_menu(
+				[
+					'id'     => 'espresso-toolbar-events',
+					'parent' => 'espresso-toolbar',
+					'title'  => '<span class="ee-toolbar-icon"></span>'
+								. esc_html__('Events', 'event_espresso'),
+					'href'   => $this->events_admin_url,
+					'meta'   => [
+						'title'  => esc_html__('Events', 'event_espresso'),
+						'target' => '',
+						'class'  => $this->menu_class,
+					],
+				]
+			);
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function addEventsAddEditHeader()
+	{
+		if (
+			$this->capabilities->current_user_can(
+				'ee_read_events',
+				'ee_admin_bar_menu_espresso-toolbar-events-view'
+			)
+		) {
+			$this->admin_bar->add_menu(
+				[
+					'id'     => 'espresso-toolbar-events-add-edit',
+					'parent' => 'espresso-toolbar-events',
+					'title'  => esc_html__('Add / Edit', 'event_espresso'),
+					'href'   => '',
+				]
+			);
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function addEventsAddNew()
+	{
+		if (
+			$this->capabilities->current_user_can(
+				'ee_edit_events',
+				'ee_admin_bar_menu_espresso-toolbar-events-new'
+			)
+		) {
+			$this->admin_bar->add_menu(
+				[
+					'id'     => 'espresso-toolbar-events-new',
+					'parent' => 'espresso-toolbar-events',
+					'title'  => '<span class="ee-toolbar-icon"></span>'
+								. esc_html__('Add New', 'event_espresso'),
+					'href'   => EEH_URL::add_query_args_and_nonce(
+						['action' => 'create_new'],
+						$this->events_admin_url
+					),
+					'meta'   => [
+						'title'  => esc_html__('Add New', 'event_espresso'),
+						'target' => '',
+						'class'  => $this->menu_class,
+					],
+				]
+			);
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function addEventsEditCurrentEvent()
+	{
+		if (is_single() && (get_post_type() === 'espresso_events')) {
+			// Current post
+			global $post;
+			if (
+				$this->capabilities->current_user_can(
+					'ee_edit_event',
+					'ee_admin_bar_menu_espresso-toolbar-events-edit',
+					$post->ID
+				)
+			) {
+				$this->admin_bar->add_menu(
+					[
+						'id'     => 'espresso-toolbar-events-edit',
+						'parent' => 'espresso-toolbar-events',
+						'title'  => '<span class="ee-toolbar-icon"></span>'
+									. esc_html__('Edit Event', 'event_espresso'),
+						'href'   => EEH_URL::add_query_args_and_nonce(
+							[
+								'action' => 'edit',
+								'post'   => $post->ID,
+							],
+							$this->events_admin_url
+						),
+						'meta'   => [
+							'title'  => esc_html__('Edit Event', 'event_espresso'),
+							'target' => '',
+							'class'  => $this->menu_class,
+						],
+					]
+				);
+			}
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function addEventsViewHeader()
+	{
+		if (
+			$this->capabilities->current_user_can(
+				'ee_read_events',
+				'ee_admin_bar_menu_espresso-toolbar-events-view'
+			)
+		) {
+			$this->admin_bar->add_menu(
+				[
+					'id'     => 'espresso-toolbar-events-view',
+					'parent' => 'espresso-toolbar-events',
+					'title'  => esc_html__('View', 'event_espresso'),
+					'href'   => '',
+				]
+			);
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function addEventsViewAll()
+	{
+		if (
+			$this->capabilities->current_user_can(
+				'ee_read_events',
+				'ee_admin_bar_menu_espresso-toolbar-events-all'
+			)
+		) {
+			$this->admin_bar->add_menu(
+				[
+					'id'     => 'espresso-toolbar-events-all',
+					'parent' => 'espresso-toolbar-events',
+					'title'  => '<span class="ee-toolbar-icon"></span>'
+								. esc_html__('All', 'event_espresso'),
+					'href'   => $this->events_admin_url,
+					'meta'   => [
+						'title'  => esc_html__('All', 'event_espresso'),
+						'target' => '',
+						'class'  => $this->menu_class,
+					],
+				]
+			);
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function addEventsViewToday()
+	{
+		if (
+			$this->capabilities->current_user_can(
+				'ee_read_events',
+				'ee_admin_bar_menu_espresso-toolbar-events-today'
+			)
+		) {
+			$this->admin_bar->add_menu(
+				[
+					'id'     => 'espresso-toolbar-events-today',
+					'parent' => 'espresso-toolbar-events',
+					'title'  => '<span class="ee-toolbar-icon"></span>'
+								. esc_html__('Today', 'event_espresso'),
+					'href'   => EEH_URL::add_query_args_and_nonce(
+						[
+							'action' => 'default',
+							'status' => 'today',
+						],
+						$this->events_admin_url
+					),
+					'meta'   => [
+						'title'  => esc_html__('Today', 'event_espresso'),
+						'target' => '',
+						'class'  => $this->menu_class,
+					],
+				]
+			);
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function addEventsViewThisMonth()
+	{
+		if (
+			$this->capabilities->current_user_can(
+				'ee_read_events',
+				'ee_admin_bar_menu_espresso-toolbar-events-month'
+			)
+		) {
+			$this->admin_bar->add_menu(
+				[
+					'id'     => 'espresso-toolbar-events-month',
+					'parent' => 'espresso-toolbar-events',
+					'title'  => '<span class="ee-toolbar-icon"></span>'
+								. esc_html__('This Month', 'event_espresso'),
+					'href'   => EEH_URL::add_query_args_and_nonce(
+						[
+							'action' => 'default',
+							'status' => 'month',
+						],
+						$this->events_admin_url
+					),
+					'meta'   => [
+						'title'  => esc_html__('This Month', 'event_espresso'),
+						'target' => '',
+						'class'  => $this->menu_class,
+					],
+				]
+			);
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function addRegistrationSubMenu()
+	{
+		if (
+			$this->capabilities->current_user_can(
+				'ee_read_registrations',
+				'ee_admin_bar_menu_espresso-toolbar-registrations'
+			)
+		) {
+			$this->admin_bar->add_menu(
+				[
+					'id'     => 'espresso-toolbar-registrations',
+					'parent' => 'espresso-toolbar',
+					'title'  => '<span class="ee-toolbar-icon"></span>'
+								. esc_html__('Registrations', 'event_espresso'),
+					'href'   => $this->reg_admin_url,
+					'meta'   => [
+						'title'  => esc_html__('Registrations', 'event_espresso'),
+						'target' => '',
+						'class'  => $this->menu_class,
+					],
+				]
+			);
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function addRegistrationOverviewToday()
+	{
+		if (
+			$this->capabilities->current_user_can(
+				'ee_read_registrations',
+				'ee_admin_bar_menu_espresso-toolbar-registrations-today'
+			)
+		) {
+			$this->admin_bar->add_menu(
+				[
+					'id'     => 'espresso-toolbar-registrations-today',
+					'parent' => 'espresso-toolbar-registrations',
+					'title'  => esc_html__('Today', 'event_espresso'),
+					'href'   => '',
+					'meta'   => [
+						'title'  => esc_html__('Today', 'event_espresso'),
+						'target' => '',
+						'class'  => $this->menu_class,
+					],
+				]
+			);
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function addRegistrationOverviewTodayApproved()
+	{
+		if (
+			$this->capabilities->current_user_can(
+				'ee_read_registrations',
+				'ee_admin_bar_menu_espresso-toolbar-registrations-today-approved'
+			)
+		) {
+			$this->admin_bar->add_menu(
+				[
+					'id'     => 'espresso-toolbar-registrations-today-approved',
+					'parent' => 'espresso-toolbar-registrations',
+					'title'  => '<span class="ee-toolbar-icon"></span>'
+								. esc_html__('Approved', 'event_espresso'),
+					'href'   => EEH_URL::add_query_args_and_nonce(
+						[
+							'action'      => 'default',
+							'status'      => 'today',
+							'_reg_status' => EEM_Registration::status_id_approved,
+						],
+						$this->reg_admin_url
+					),
+					'meta'   => [
+						'title'  => esc_html__('Approved', 'event_espresso'),
+						'target' => '',
+						'class'  => $this->menu_class . ' ee-toolbar-icon-approved',
+					],
+				]
+			);
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function addRegistrationOverviewTodayPendingPayment()
+	{
+		if (
+			$this->capabilities->current_user_can(
+				'ee_read_registrations',
+				'ee_admin_bar_menu_espresso-toolbar-registrations-today-pending'
+			)
+		) {
+			$this->admin_bar->add_menu(
+				[
+					'id'     => 'espresso-toolbar-registrations-today-pending',
+					'parent' => 'espresso-toolbar-registrations',
+					'title'  => '<span class="ee-toolbar-icon"></span>'
+								. esc_html__('Pending', 'event_espresso'),
+					'href'   => EEH_URL::add_query_args_and_nonce(
+						[
+							'action'      => 'default',
+							'status'      => 'today',
+							'_reg_status' => EEM_Registration::status_id_pending_payment,
+						],
+						$this->reg_admin_url
+					),
+					'meta'   => [
+						'title'  => esc_html__('Pending Payment', 'event_espresso'),
+						'target' => '',
+						'class'  => $this->menu_class . ' ee-toolbar-icon-pending',
+					],
+				]
+			);
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function addRegistrationOverviewTodayNotApproved()
+	{
+		if (
+			$this->capabilities->current_user_can(
+				'ee_read_registrations',
+				'ee_admin_bar_menu_espresso-toolbar-registrations-today-not-approved'
+			)
+		) {
+			$this->admin_bar->add_menu(
+				[
+					'id'     => 'espresso-toolbar-registrations-today-not-approved',
+					'parent' => 'espresso-toolbar-registrations',
+					'title'  => '<span class="ee-toolbar-icon"></span>'
+								. esc_html__('Not Approved', 'event_espresso'),
+					'href'   => EEH_URL::add_query_args_and_nonce(
+						[
+							'action'      => 'default',
+							'status'      => 'today',
+							'_reg_status' => EEM_Registration::status_id_not_approved,
+						],
+						$this->reg_admin_url
+					),
+					'meta'   => [
+						'title'  => esc_html__('Not Approved', 'event_espresso'),
+						'target' => '',
+						'class'  => $this->menu_class . ' ee-toolbar-icon-not-approved',
+					],
+				]
+			);
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function addRegistrationOverviewTodayCancelled()
+	{
+		if (
+			$this->capabilities->current_user_can(
+				'ee_read_registrations',
+				'ee_admin_bar_menu_espresso-toolbar-registrations-today-cancelled'
+			)
+		) {
+			$this->admin_bar->add_menu(
+				[
+					'id'     => 'espresso-toolbar-registrations-today-cancelled',
+					'parent' => 'espresso-toolbar-registrations',
+					'title'  => '<span class="ee-toolbar-icon"></span>'
+								. esc_html__('Cancelled', 'event_espresso'),
+					'href'   => EEH_URL::add_query_args_and_nonce(
+						[
+							'action'      => 'default',
+							'status'      => 'today',
+							'_reg_status' => EEM_Registration::status_id_cancelled,
+						],
+						$this->reg_admin_url
+					),
+					'meta'   => [
+						'title'  => esc_html__('Cancelled', 'event_espresso'),
+						'target' => '',
+						'class'  => $this->menu_class . ' ee-toolbar-icon-cancelled',
+					],
+				]
+			);
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function addRegistrationOverviewThisMonth()
+	{
+		if (
+			$this->capabilities->current_user_can(
+				'ee_read_registrations',
+				'ee_admin_bar_menu_espresso-toolbar-registrations-month'
+			)
+		) {
+			$this->admin_bar->add_menu(
+				[
+					'id'     => 'espresso-toolbar-registrations-month',
+					'parent' => 'espresso-toolbar-registrations',
+					'title'  => esc_html__('This Month', 'event_espresso'),
+					'href'   => '', // EEH_URL::add_query_args_and_nonce(
+					//     array(
+					//         'action' => 'default',
+					//         'status' => 'month'
+					//     ),
+					//     $this->reg_admin_url
+					// ),
+					'meta'   => [
+						'title'  => esc_html__('This Month', 'event_espresso'),
+						'target' => '',
+						'class'  => $this->menu_class,
+					],
+				]
+			);
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function addRegistrationOverviewThisMonthApproved()
+	{
+		if (
+			$this->capabilities->current_user_can(
+				'ee_read_registrations',
+				'ee_admin_bar_menu_espresso-toolbar-registrations-month-approved'
+			)
+		) {
+			$this->admin_bar->add_menu(
+				[
+					'id'     => 'espresso-toolbar-registrations-month-approved',
+					'parent' => 'espresso-toolbar-registrations',
+					'title'  => '<span class="ee-toolbar-icon"></span>'
+								. esc_html__('Approved', 'event_espresso'),
+					'href'   => EEH_URL::add_query_args_and_nonce(
+						[
+							'action'      => 'default',
+							'status'      => 'month',
+							'_reg_status' => EEM_Registration::status_id_approved,
+						],
+						$this->reg_admin_url
+					),
+					'meta'   => [
+						'title'  => esc_html__('Approved', 'event_espresso'),
+						'target' => '',
+						'class'  => $this->menu_class . ' ee-toolbar-icon-approved',
+					],
+				]
+			);
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function addRegistrationOverviewThisMonthPending()
+	{
+		if (
+			$this->capabilities->current_user_can(
+				'ee_read_registrations',
+				'ee_admin_bar_menu_espresso-toolbar-registrations-month-pending'
+			)
+		) {
+			$this->admin_bar->add_menu(
+				[
+					'id'     => 'espresso-toolbar-registrations-month-pending',
+					'parent' => 'espresso-toolbar-registrations',
+					'title'  => '<span class="ee-toolbar-icon"></span>'
+								. esc_html__('Pending', 'event_espresso'),
+					'href'   => EEH_URL::add_query_args_and_nonce(
+						[
+							'action'      => 'default',
+							'status'      => 'month',
+							'_reg_status' => EEM_Registration::status_id_pending_payment,
+						],
+						$this->reg_admin_url
+					),
+					'meta'   => [
+						'title'  => esc_html__('Pending', 'event_espresso'),
+						'target' => '',
+						'class'  => $this->menu_class . ' ee-toolbar-icon-pending',
+					],
+				]
+			);
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function addRegistrationOverviewThisMonthNotApproved()
+	{
+		if (
+			$this->capabilities->current_user_can(
+				'ee_read_registrations',
+				'ee_admin_bar_menu_espresso-toolbar-registrations-month-not-approved'
+			)
+		) {
+			$this->admin_bar->add_menu(
+				[
+					'id'     => 'espresso-toolbar-registrations-month-not-approved',
+					'parent' => 'espresso-toolbar-registrations',
+					'title'  => '<span class="ee-toolbar-icon"></span>'
+								. esc_html__('Not Approved', 'event_espresso'),
+					'href'   => EEH_URL::add_query_args_and_nonce(
+						[
+							'action'      => 'default',
+							'status'      => 'month',
+							'_reg_status' => EEM_Registration::status_id_not_approved,
+						],
+						$this->reg_admin_url
+					),
+					'meta'   => [
+						'title'  => esc_html__('Not Approved', 'event_espresso'),
+						'target' => '',
+						'class'  => $this->menu_class . ' ee-toolbar-icon-not-approved',
+					],
+				]
+			);
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function addRegistrationOverviewThisMonthCancelled()
+	{
+		if (
+			$this->capabilities->current_user_can(
+				'ee_read_registrations',
+				'ee_admin_bar_menu_espresso-toolbar-registrations-month-cancelled'
+			)
+		) {
+			$this->admin_bar->add_menu(
+				[
+					'id'     => 'espresso-toolbar-registrations-month-cancelled',
+					'parent' => 'espresso-toolbar-registrations',
+					'title'  => '<span class="ee-toolbar-icon"></span>'
+								. esc_html__('Cancelled', 'event_espresso'),
+					'href'   => EEH_URL::add_query_args_and_nonce(
+						[
+							'action'      => 'default',
+							'status'      => 'month',
+							'_reg_status' => EEM_Registration::status_id_cancelled,
+						],
+						$this->reg_admin_url
+					),
+					'meta'   => [
+						'title'  => esc_html__('Cancelled', 'event_espresso'),
+						'target' => '',
+						'class'  => $this->menu_class . ' ee-toolbar-icon-cancelled',
+					],
+				]
+			);
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function addExtensionsAndServices()
+	{
+		if (
+			$this->capabilities->current_user_can(
+				'ee_read_ee',
+				'ee_admin_bar_menu_espresso-toolbar-extensions-and-services'
+			)
+		) {
+			$this->admin_bar->add_menu(
+				[
+					'id'     => 'espresso-toolbar-extensions-and-services',
+					'parent' => 'espresso-toolbar',
+					'title'  => '<span class="ee-toolbar-icon"></span>'
+								. esc_html__('Extensions & Services', 'event_espresso'),
+					'href'   => admin_url('admin.php?page=espresso_packages'),
+					'meta'   => [
+						'title'  => esc_html__('Extensions & Services', 'event_espresso'),
+						'target' => '',
+						'class'  => $this->menu_class,
+					],
+				]
+			);
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function addFontSizeSubMenu()
+	{
+		if (! is_admin()) {
+			return;
+		}
+		$this->admin_bar->add_menu(
+			[
+				'id'     => 'espresso-toolbar-font-size',
+				'parent' => 'espresso-toolbar',
+				'title'  => '<span class="ee-toolbar-icon"></span>'
+							. esc_html__('Set Font Size', 'event_espresso'),
+				'href'   => '',
+				'meta'   => [
+					'title'  => esc_html__('Set Font Size', 'event_espresso'),
+					'target' => '',
+					'class'  => $this->menu_class,
+				],
+			]
+		);
+
+		$settings_admin_url = admin_url('admin.php?page=espresso_general_settings');
+
+		$font_sizes = [
+			'tiny'    => AdminFontSize::FONT_SIZE_TINY,
+			'smaller' => AdminFontSize::FONT_SIZE_SMALLER,
+			'small'   => AdminFontSize::FONT_SIZE_SMALL,
+			'default' => AdminFontSize::FONT_SIZE_DEFAULT,
+			'big'     => AdminFontSize::FONT_SIZE_BIG,
+			'bigger'  => AdminFontSize::FONT_SIZE_BIGGER,
+		];
+
+		foreach ($font_sizes as $font_size => $value) {
+			$this->admin_bar->add_menu(
+				[
+					'id'     => "espresso-toolbar-set-font-size-$font_size",
+					'parent' => 'espresso-toolbar-font-size',
+					'title'  => '<span class="ee-toolbar-icon"></span>'
+								. sprintf(
+									/* translators: Font Size Small */
+									esc_html__('Font Size %1$s', 'event_espresso'),
+									ucwords($font_size)
+								),
+					'href'   => EEH_URL::add_query_args_and_nonce(
+						['action' => 'set_font_size', 'font_size' => $value],
+						$settings_admin_url
+					),
+					'meta'   => [
+						'title'  => esc_html__('increases or decreases the Event Espresso admin font size', 'event_espresso'),
+						'target' => '',
+						'class'  => $this->menu_class,
+					],
+				]
+			);
+		}
+	}
 }

Spacing +12 added lines, -12 removed lines

@@ -20,7 +20,7 @@ 
  */
 class AdminToolBar
 {
-    private ?WP_Admin_Bar   $admin_bar        = null;
+    private ?WP_Admin_Bar   $admin_bar = null;
 
     private EE_Capabilities $capabilities;
 
@@ -100,7 +100,7 @@ 
     {
         wp_register_style(
             'espresso-admin-toolbar',
-            EE_GLOBAL_ASSETS_URL . 'css/espresso-admin-toolbar.css',
+            EE_GLOBAL_ASSETS_URL.'css/espresso-admin-toolbar.css',
             ['dashicons'],
             EVENT_ESPRESSO_VERSION
         );
@@ -122,7 +122,7 @@ 
                 'href'  => $this->events_admin_url,
                 'meta'  => [
                     'title' => esc_html__('Event Espresso', 'event_espresso'),
-                    'class' => $this->menu_class . 'first',
+                    'class' => $this->menu_class.'first',
                 ],
             ]
         );
@@ -460,7 +460,7 @@ 
                     'meta'   => [
                         'title'  => esc_html__('Approved', 'event_espresso'),
                         'target' => '',
-                        'class'  => $this->menu_class . ' ee-toolbar-icon-approved',
+                        'class'  => $this->menu_class.' ee-toolbar-icon-approved',
                     ],
                 ]
             );
@@ -496,7 +496,7 @@ 
                     'meta'   => [
                         'title'  => esc_html__('Pending Payment', 'event_espresso'),
                         'target' => '',
-                        'class'  => $this->menu_class . ' ee-toolbar-icon-pending',
+                        'class'  => $this->menu_class.' ee-toolbar-icon-pending',
                     ],
                 ]
             );
@@ -532,7 +532,7 @@ 
                     'meta'   => [
                         'title'  => esc_html__('Not Approved', 'event_espresso'),
                         'target' => '',
-                        'class'  => $this->menu_class . ' ee-toolbar-icon-not-approved',
+                        'class'  => $this->menu_class.' ee-toolbar-icon-not-approved',
                     ],
                 ]
             );
@@ -568,7 +568,7 @@ 
                     'meta'   => [
                         'title'  => esc_html__('Cancelled', 'event_espresso'),
                         'target' => '',
-                        'class'  => $this->menu_class . ' ee-toolbar-icon-cancelled',
+                        'class'  => $this->menu_class.' ee-toolbar-icon-cancelled',
                     ],
                 ]
             );
@@ -638,7 +638,7 @@ 
                     'meta'   => [
                         'title'  => esc_html__('Approved', 'event_espresso'),
                         'target' => '',
-                        'class'  => $this->menu_class . ' ee-toolbar-icon-approved',
+                        'class'  => $this->menu_class.' ee-toolbar-icon-approved',
                     ],
                 ]
             );
@@ -674,7 +674,7 @@ 
                     'meta'   => [
                         'title'  => esc_html__('Pending', 'event_espresso'),
                         'target' => '',
-                        'class'  => $this->menu_class . ' ee-toolbar-icon-pending',
+                        'class'  => $this->menu_class.' ee-toolbar-icon-pending',
                     ],
                 ]
             );
@@ -710,7 +710,7 @@ 
                     'meta'   => [
                         'title'  => esc_html__('Not Approved', 'event_espresso'),
                         'target' => '',
-                        'class'  => $this->menu_class . ' ee-toolbar-icon-not-approved',
+                        'class'  => $this->menu_class.' ee-toolbar-icon-not-approved',
                     ],
                 ]
             );
@@ -746,7 +746,7 @@ 
                     'meta'   => [
                         'title'  => esc_html__('Cancelled', 'event_espresso'),
                         'target' => '',
-                        'class'  => $this->menu_class . ' ee-toolbar-icon-cancelled',
+                        'class'  => $this->menu_class.' ee-toolbar-icon-cancelled',
                     ],
                 ]
             );
@@ -788,7 +788,7 @@ 
      */
     private function addFontSizeSubMenu()
     {
-        if (! is_admin()) {
+        if ( ! is_admin()) {
             return;
         }
         $this->admin_bar->add_menu(

core/domain/services/messages/MessageTemplateRequestData.php

Indentation +214 added lines, -214 removed lines

@@ -14,262 +14,262 @@
  */
 class MessageTemplateRequestData
 {
-    protected ?RequestInterface $request         = null;
+	protected ?RequestInterface $request         = null;
 
-    protected string            $context         = '';
+	protected string            $context         = '';
 
-    protected string            $description     = '';
+	protected string            $description     = '';
 
-    protected string            $messenger       = '';
+	protected string            $messenger       = '';
 
-    protected string            $message_type    = '';
+	protected string            $message_type    = '';
 
-    protected string            $name            = '';
+	protected string            $name            = '';
 
-    protected array             $template_fields = [];
+	protected array             $template_fields = [];
 
-    protected int               $group_ID        = 0;
+	protected int               $group_ID        = 0;
 
-    protected int               $user_ID         = 0;
+	protected int               $user_ID         = 0;
 
-    protected bool              $is_active       = false;
+	protected bool              $is_active       = false;
 
-    protected bool              $is_deleted      = false;
+	protected bool              $is_deleted      = false;
 
-    protected bool              $is_global       = false;
+	protected bool              $is_global       = false;
 
-    protected bool              $is_override     = false;
+	protected bool              $is_override     = false;
 
 
-    /**
-     * @param RequestInterface|null $request
-     */
-    public function __construct(?RequestInterface $request)
-    {
-        $this->request = $request;
-    }
+	/**
+	 * @param RequestInterface|null $request
+	 */
+	public function __construct(?RequestInterface $request)
+	{
+		$this->request = $request;
+	}
 
 
-    public function setMessageTemplateRequestData()
-    {
-        $this->setContext();
-        $this->setDescription();
-        $this->setGroupID();
-        $this->setIsActive();
-        $this->setIsDeleted();
-        $this->setIsGlobal();
-        $this->setIsOverride();
-        $this->setMessenger();
-        $this->setMessageType();
-        $this->setName();
-        $this->setUserID();
-        $this->setTemplateFields();
-    }
+	public function setMessageTemplateRequestData()
+	{
+		$this->setContext();
+		$this->setDescription();
+		$this->setGroupID();
+		$this->setIsActive();
+		$this->setIsDeleted();
+		$this->setIsGlobal();
+		$this->setIsOverride();
+		$this->setMessenger();
+		$this->setMessageType();
+		$this->setName();
+		$this->setUserID();
+		$this->setTemplateFields();
+	}
 
 
-    public function context(): string
-    {
-        return $this->context;
-    }
+	public function context(): string
+	{
+		return $this->context;
+	}
 
 
-    public function description(): string
-    {
-        return $this->description;
-    }
+	public function description(): string
+	{
+		return $this->description;
+	}
 
 
-    public function messenger(): string
-    {
-        return $this->messenger;
-    }
+	public function messenger(): string
+	{
+		return $this->messenger;
+	}
 
 
-    public function messageType(): string
-    {
-        return $this->message_type;
-    }
+	public function messageType(): string
+	{
+		return $this->message_type;
+	}
 
 
-    public function name(): string
-    {
-        return $this->name;
-    }
+	public function name(): string
+	{
+		return $this->name;
+	}
 
 
-    public function templateFields(): array
-    {
-        return $this->template_fields;
-    }
+	public function templateFields(): array
+	{
+		return $this->template_fields;
+	}
 
 
-    public function groupID(): int
-    {
-        return $this->group_ID;
-    }
+	public function groupID(): int
+	{
+		return $this->group_ID;
+	}
 
 
-    public function userID(): int
-    {
-        return $this->user_ID;
-    }
+	public function userID(): int
+	{
+		return $this->user_ID;
+	}
 
 
-    public function isActive(): bool
-    {
-        return $this->is_active;
-    }
+	public function isActive(): bool
+	{
+		return $this->is_active;
+	}
 
 
-    public function isDeleted(): bool
-    {
-        return $this->is_deleted;
-    }
+	public function isDeleted(): bool
+	{
+		return $this->is_deleted;
+	}
 
 
-    public function isGlobal(): bool
-    {
-        return $this->is_global;
-    }
+	public function isGlobal(): bool
+	{
+		return $this->is_global;
+	}
 
 
-    public function isOverride(): bool
-    {
-        return $this->is_override;
-    }
+	public function isOverride(): bool
+	{
+		return $this->is_override;
+	}
 
 
-    public function setContext(?string $context = ''): void
-    {
-        $this->context = $this->request->getRequestParam('context', $context);
-        $this->context = $this->request->getRequestParam('MTP_context', $this->context);
-        $this->context = strtolower($this->context);
-    }
+	public function setContext(?string $context = ''): void
+	{
+		$this->context = $this->request->getRequestParam('context', $context);
+		$this->context = $this->request->getRequestParam('MTP_context', $this->context);
+		$this->context = strtolower($this->context);
+	}
 
 
-    public function setDescription(?string $description = ''): void
-    {
-        $this->description = $this->request->getRequestParam(
-            'ee_msg_non_global_fields[MTP_description]',
-            $description
-        );
-    }
-
-
-    public function setGroupID(?int $group_ID = 0): void
-    {
-        $this->group_ID = $this->request->getRequestParam('group_ID', $group_ID, DataType::INTEGER);
-        $this->group_ID = $this->request->getRequestParam('GRP_ID', $this->group_ID, DataType::INTEGER);
-        // we need the GRP_ID for the template being used as the base for the new template
-        if (empty($this->group_ID)) {
-            throw new RuntimeException(
-                esc_html__(
-                    'In order to create a custom message template the GRP_ID of the template being used as a base is needed',
-                    'event_espresso'
-                )
-            );
-        }
-    }
-
-
-    public function setIsActive(bool $is_active = false): void
-    {
-        $this->is_active = $this->request->getRequestParam('MTP_is_active', $is_active, DataType::BOOLEAN);
-    }
-
-
-    public function setIsDeleted(bool $is_deleted = false): void
-    {
-        $this->is_deleted = $this->request->getRequestParam('MTP_deleted', $is_deleted, DataType::BOOLEAN);
-    }
-
-
-    public function setIsGlobal(bool $is_global = false): void
-    {
-        $this->is_global = $this->request->getRequestParam('MTP_is_global', $is_global, DataType::BOOLEAN);
-    }
-
-
-    public function setIsOverride(bool $is_override = false): void
-    {
-        $this->is_override = $this->request->getRequestParam('MTP_is_override', $is_override, DataType::BOOLEAN);
-    }
-
-
-    public function setMessenger(?string $messenger = ''): void
-    {
-        // have to check for multiple params because a previouv dev used different names for the same param >:(
-        $this->messenger = $this->request->getRequestParam('msgr', $messenger);
-        $this->messenger = $this->request->getRequestParam('messenger', $this->messenger);
-        $this->messenger = $this->request->getRequestParam('MTP_messenger', $this->messenger);
-        $this->messenger = strtolower($this->messenger);
-        if (empty($this->messenger)) {
-            throw new RuntimeException(
-                esc_html__(
-                    'Sorry, but we can\'t create new templates because we\'re missing the messenger',
-                    'event_espresso'
-                )
-            );
-        }
-    }
-
-
-    public function setMessageType(?string $message_type = ''): void
-    {
-        // have to check for multiple params because a previouv dev used different names for the same param >:(
-        $this->message_type = $this->request->getRequestParam('mt', $message_type);
-        $this->message_type = $this->request->getRequestParam('message_type', $this->message_type);
-        $this->message_type = $this->request->getRequestParam('messageType', $this->message_type);
-        $this->message_type = $this->request->getRequestParam('MTP_message_type', $this->message_type);
-        $this->message_type = strtolower($this->message_type);
-
-        if (empty($this->message_type)) {
-            throw new RuntimeException(
-                esc_html__(
-                    'Sorry, but we can\'t create new templates because we\'re missing the message type',
-                    'event_espresso'
-                )
-            );
-        }
-    }
-
-
-    public function setName(?string $name = ''): void
-    {
-        $this->name = $this->request->getRequestParam('ee_msg_non_global_fields[MTP_name]', $name);
-    }
-
-
-    public function setUserID(?int $user_ID = 0): void
-    {
-        $this->user_ID = $this->request->getRequestParam('user_id', $user_ID, DataType::INTEGER);
-        $this->user_ID = $this->request->getRequestParam('MTP_user_id', $this->user_ID, DataType::INTEGER);
-    }
-
-
-    private function setTemplateFields(): void
-    {
-        $this->template_fields = $this->request->getRequestParam(
-            'template_fields',
-            null,
-            DataType::EDITOR,
-            true
-        );
-        $this->template_fields = $this->request->getRequestParam(
-            'MTP_template_fields',
-            $this->template_fields,
-            DataType::EDITOR,
-            true
-        );
-        if (empty($this->template_fields)) {
-            throw new RuntimeException(
-                esc_html__(
-                    'There was a problem saving the template fields from the form because I didn\'t receive any actual template field data.',
-                    'event_espresso'
-                )
-            );
-        }
-        // messages content is expected to be escaped
-        $this->template_fields = EEH_Array::addSlashesRecursively($this->template_fields);
-    }
+	public function setDescription(?string $description = ''): void
+	{
+		$this->description = $this->request->getRequestParam(
+			'ee_msg_non_global_fields[MTP_description]',
+			$description
+		);
+	}
+
+
+	public function setGroupID(?int $group_ID = 0): void
+	{
+		$this->group_ID = $this->request->getRequestParam('group_ID', $group_ID, DataType::INTEGER);
+		$this->group_ID = $this->request->getRequestParam('GRP_ID', $this->group_ID, DataType::INTEGER);
+		// we need the GRP_ID for the template being used as the base for the new template
+		if (empty($this->group_ID)) {
+			throw new RuntimeException(
+				esc_html__(
+					'In order to create a custom message template the GRP_ID of the template being used as a base is needed',
+					'event_espresso'
+				)
+			);
+		}
+	}
+
+
+	public function setIsActive(bool $is_active = false): void
+	{
+		$this->is_active = $this->request->getRequestParam('MTP_is_active', $is_active, DataType::BOOLEAN);
+	}
+
+
+	public function setIsDeleted(bool $is_deleted = false): void
+	{
+		$this->is_deleted = $this->request->getRequestParam('MTP_deleted', $is_deleted, DataType::BOOLEAN);
+	}
+
+
+	public function setIsGlobal(bool $is_global = false): void
+	{
+		$this->is_global = $this->request->getRequestParam('MTP_is_global', $is_global, DataType::BOOLEAN);
+	}
+
+
+	public function setIsOverride(bool $is_override = false): void
+	{
+		$this->is_override = $this->request->getRequestParam('MTP_is_override', $is_override, DataType::BOOLEAN);
+	}
+
+
+	public function setMessenger(?string $messenger = ''): void
+	{
+		// have to check for multiple params because a previouv dev used different names for the same param >:(
+		$this->messenger = $this->request->getRequestParam('msgr', $messenger);
+		$this->messenger = $this->request->getRequestParam('messenger', $this->messenger);
+		$this->messenger = $this->request->getRequestParam('MTP_messenger', $this->messenger);
+		$this->messenger = strtolower($this->messenger);
+		if (empty($this->messenger)) {
+			throw new RuntimeException(
+				esc_html__(
+					'Sorry, but we can\'t create new templates because we\'re missing the messenger',
+					'event_espresso'
+				)
+			);
+		}
+	}
+
+
+	public function setMessageType(?string $message_type = ''): void
+	{
+		// have to check for multiple params because a previouv dev used different names for the same param >:(
+		$this->message_type = $this->request->getRequestParam('mt', $message_type);
+		$this->message_type = $this->request->getRequestParam('message_type', $this->message_type);
+		$this->message_type = $this->request->getRequestParam('messageType', $this->message_type);
+		$this->message_type = $this->request->getRequestParam('MTP_message_type', $this->message_type);
+		$this->message_type = strtolower($this->message_type);
+
+		if (empty($this->message_type)) {
+			throw new RuntimeException(
+				esc_html__(
+					'Sorry, but we can\'t create new templates because we\'re missing the message type',
+					'event_espresso'
+				)
+			);
+		}
+	}
+
+
+	public function setName(?string $name = ''): void
+	{
+		$this->name = $this->request->getRequestParam('ee_msg_non_global_fields[MTP_name]', $name);
+	}
+
+
+	public function setUserID(?int $user_ID = 0): void
+	{
+		$this->user_ID = $this->request->getRequestParam('user_id', $user_ID, DataType::INTEGER);
+		$this->user_ID = $this->request->getRequestParam('MTP_user_id', $this->user_ID, DataType::INTEGER);
+	}
+
+
+	private function setTemplateFields(): void
+	{
+		$this->template_fields = $this->request->getRequestParam(
+			'template_fields',
+			null,
+			DataType::EDITOR,
+			true
+		);
+		$this->template_fields = $this->request->getRequestParam(
+			'MTP_template_fields',
+			$this->template_fields,
+			DataType::EDITOR,
+			true
+		);
+		if (empty($this->template_fields)) {
+			throw new RuntimeException(
+				esc_html__(
+					'There was a problem saving the template fields from the form because I didn\'t receive any actual template field data.',
+					'event_espresso'
+				)
+			);
+		}
+		// messages content is expected to be escaped
+		$this->template_fields = EEH_Array::addSlashesRecursively($this->template_fields);
+	}
 }

core/domain/services/messages/MessageTemplateManager.php

Indentation +335 added lines, -335 removed lines

@@ -17,339 +17,339 @@
  */
 class MessageTemplateManager
 {
-    private EEM_Message_Template         $message_template_model;
-
-    private EEM_Message_Template_Group   $message_template_group_model;
-
-    protected MessageTemplateRequestData $form_data;
-
-    protected MessageTemplateValidator   $validator;
-
-    protected RequestInterface           $request;
-
-
-    /**
-     * @param EEM_Message_Template       $message_template_model
-     * @param EEM_Message_Template_Group $message_template_group_model
-     * @param MessageTemplateRequestData $form_data
-     * @param MessageTemplateValidator   $validator
-     * @param RequestInterface           $request
-     */
-    public function __construct(
-        EEM_Message_Template $message_template_model,
-        EEM_Message_Template_Group $message_template_group_model,
-        MessageTemplateRequestData $form_data,
-        MessageTemplateValidator $validator,
-        RequestInterface $request
-    ) {
-        $this->message_template_model       = $message_template_model;
-        $this->message_template_group_model = $message_template_group_model;
-        $this->form_data                    = $form_data;
-        $this->validator                    = $validator;
-        $this->request                      = $request;
-    }
-
-
-    /**
-     * @param string|null $messenger
-     * @param string|null $message_type
-     * @param int         $GRP_ID
-     * @param bool        $global
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function generateNewTemplates(
-        ?string $messenger = '',
-        ?string $message_type = '',
-        int $GRP_ID = 0,
-        bool $global = false
-    ): array {
-        $this->form_data->setMessageTemplateRequestData();
-
-        $messenger    = $messenger ?: $this->form_data->messenger();
-        $message_type = $message_type ?: $this->form_data->messageType();
-        $GRP_ID       = $GRP_ID ?: $this->form_data->groupID();
-
-        // if no $message_types are given then that's okay...
-        // this may be a messenger that just adds shortcodes,
-        // so we just don't generate any templates.
-        if (empty($message_type)) {
-            return [];
-        }
-        $new_templates = EEH_MSG_Template::generate_new_templates($messenger, [$message_type], $GRP_ID, $global);
-        return $new_templates[0];
-    }
-
-
-    /**
-     * @throws DomainException
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function updateExistingTemplates(): void
-    {
-        $this->form_data->setMessageTemplateRequestData();
-        $template_fields = $this->form_data->templateFields();
-
-        if ($template_fields) {
-            if (
-                $this->validator->validateTemplateFields(
-                    $this->form_data->messenger(),
-                    $this->form_data->messageType(),
-                    $this->form_data->context(),
-                    $template_fields
-                )
-            ) {
-                foreach ($template_fields as $template_field => $data) {
-                    $this->validateTemplateFieldData($template_field, $data);
-                    $this->updateMessageTemplate(
-                        $template_field,
-                        [
-                            'GRP_ID'             => $this->form_data->groupID(),
-                            'MTP_ID'             => $data['MTP_ID'],
-                            'MTP_template_field' => $data['name'],
-                            'MTP_context'        => $this->form_data->context(),
-                            // if they aren't allowed to use all JS, restrict them to standard allowed post tags
-                            'MTP_content'        => ! current_user_can('unfiltered_html')
-                                ? $this->sanitizeMessageTemplateContent($data['content'])
-                                : $data['content'],
-                        ]
-                    );
-                }
-                // we can use the last set_column_values for the Message Template Group update
-                // (because its the same for all of these specific MTPs)
-                $this->updateMessageTemplateGroup(
-                    [
-                        'GRP_ID'           => $this->form_data->groupID(),
-                        'MTP_user_id'      => $this->form_data->userID(),
-                        'MTP_messenger'    => $this->form_data->messenger(),
-                        'MTP_message_type' => $this->form_data->messageType(),
-                        'MTP_is_global'    => $this->form_data->isGlobal(),
-                        'MTP_is_override'  => $this->form_data->isOverride(),
-                        'MTP_deleted'      => $this->form_data->isDeleted(),
-                        'MTP_is_active'    => $this->form_data->isActive(),
-                        'MTP_name'         => $this->form_data->name(),
-                        'MTP_description'  => $this->form_data->description(),
-                    ]
-                );
-            }
-        }
-    }
-
-
-    /**
-     * @param string $template_field
-     * @param array  $message_template_fields
-     * @return void
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function updateMessageTemplate(string $template_field, array $message_template_fields): void
-    {
-        $MTP_ID = $message_template_fields['MTP_ID'] ?? 0;
-        // if we have a MTP_ID for this field then update it, otherwise insert.
-        // this has already been through the template field validator and sanitized, so it will be
-        // safe to insert this field.  Why insert?  This typically happens when we introduce a new
-        // message template field in a messenger/message type and existing users don't have the
-        // default setup for it.
-        // @link https://events.codebasehq.com/projects/event-espresso/tickets/9465
-        $updated = $MTP_ID
-            ? $this->message_template_model->update($message_template_fields, [['MTP_ID' => $MTP_ID]])
-            : $this->message_template_model->insert($message_template_fields);
-
-        // updates will return 0 if the field was not changed (ie: no changes = nothing actually updated)
-        // but we won't consider that a problem, but if it returns false, then something went BOOM!
-        if ($updated === false) {
-            EE_Error::add_error(
-                sprintf(
-                    esc_html__('%s field was NOT updated for some reason', 'event_espresso'),
-                    $template_field
-                ),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-        }
-    }
-
-
-    /**
-     * @param array $form_data
-     * @return void
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function updateMessageTemplateGroup(array $form_data): void
-    {
-        try {
-            $GRP_ID = $form_data['id'] ?? 0;
-            $GRP_ID = $form_data['GRP_ID'] ?? $GRP_ID;
-            if (! $GRP_ID) {
-                throw new RuntimeException(
-                    esc_html__(
-                        'Can not update message template group because no GRP_ID was provided',
-                        'event_espresso'
-                    )
-                );
-            }
-
-            $updated       = $this->message_template_group_model->update($form_data, [['GRP_ID' => $GRP_ID]]);
-            $error_message = esc_html__(
-                'unknown error occurred while updating message template group',
-                'event_espresso'
-            );
-
-            if ($updated !== false) {
-                $message_template_group = $this->message_template_group_model->get_one_by_ID($GRP_ID);
-                if ($message_template_group instanceof EE_Message_Template_Group) {
-                    // k now we need to ensure the template_pack and template_variation fields are set.
-                    $template_pack      = $this->request->getRequestParam('MTP_template_pack', 'default');
-                    $template_variation = $this->request->getRequestParam('MTP_template_variation', 'default');
-                    $message_template_group->set_template_pack_name($template_pack);
-                    $message_template_group->set_template_pack_variation($template_variation);
-                }
-                return;
-            }
-        } catch (RuntimeException $exception) {
-            $error_message = $exception->getMessage();
-        }
-
-        EE_Error::add_error(
-            sprintf(
-                esc_html__(
-                    'The Message Template Group (%1$d) was NOT updated for the following reason: %2$s',
-                    'event_espresso'
-                ),
-                $form_data['GRP_ID'],
-                $error_message
-            ),
-            __FILE__,
-            __FUNCTION__,
-            __LINE__
-        );
-    }
-
-
-    /**
-     * recursively runs wp_kses() on message template content in a model safe manner
-     *
-     * @param array|string $content
-     * @return array|string
-     * @since   4.10.29.p
-     */
-    private function sanitizeMessageTemplateContent($content)
-    {
-        if (is_array($content)) {
-            foreach ($content as $key => $value) {
-                $content[ $key ] = $this->sanitizeMessageTemplateContent($value);
-            }
-            return $content;
-        }
-        // remove slashes so wp_kses() works properly
-        // wp_kses_stripslashes() only removes slashes from double-quotes,
-        // so attributes using single quotes always appear invalid.
-        $content = stripslashes($content);
-        $content = wp_kses($content, wp_kses_allowed_html('post'));
-        // But currently the models expect slashed data, so after wp_kses()
-        // runs we need to re-slash the data. Sheesh.
-        // See https://events.codebasehq.com/projects/event-espresso/tickets/11211#update-47321587
-        return addslashes($content);
-    }
-
-
-    /**
-     * @param int $GRP_ID
-     * @return false|int
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function trashMessageTemplate(int $GRP_ID)
-    {
-        return $this->message_template_group_model->delete_by_ID($GRP_ID);
-    }
-
-
-    /**
-     * @param int $GRP_ID
-     * @return bool
-     * @throws EE_Error
-     */
-    public function restoreMessageTemplate(int $GRP_ID): bool
-    {
-        return $this->message_template_group_model->restore_by_ID($GRP_ID);
-    }
-
-
-    /**
-     * @param int $GRP_ID
-     * @return EE_Message_Template_Group
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function getMessageTemplateGroup(int $GRP_ID): EE_Message_Template_Group
-    {
-        $message_template_group = $this->message_template_group_model->get_one_by_ID($GRP_ID);
-        if ($message_template_group instanceof EE_Message_Template_Group) {
-            return $message_template_group;
-        }
-        throw new RuntimeException(
-            esc_html__(
-                'Can not permanently delete message template group because an invalid GRP_ID was provided',
-                'event_espresso'
-            )
-        );
-    }
-
-
-    /**
-     * @param int $GRP_ID
-     * @return bool
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function permanentlyDeleteMessageTemplates(int $GRP_ID): bool
-    {
-        $message_template_group = $this->getMessageTemplateGroup($GRP_ID);
-        // permanently delete all the related Message Templates
-        $deleted = $message_template_group->delete_related_permanently('Message_Template');
-        return $deleted > 0;
-    }
-
-
-    /**
-     * @param int $GRP_ID
-     * @return bool
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function permanentlyDeleteMessageTemplateGroup(int $GRP_ID): bool
-    {
-        if ($this->permanentlyDeleteMessageTemplates($GRP_ID)) {
-            return $this->message_template_group_model->delete_permanently([['GRP_ID' => $GRP_ID]]);
-        }
-        return false;
-    }
-
-
-    private function validateTemplateFieldData(string $template_field, array $data)
-    {
-        if (
-            ! (
-                array_key_exists('MTP_ID', $data)
-                && array_key_exists('name', $data)
-                && array_key_exists('content', $data)
-            )
-        ) {
-            throw new RuntimeException(
-                sprintf(
-                    esc_html__(
-                        'Can not update message template field %1$s because of a missing MTP_ID, name, or content.',
-                        'event_espresso'
-                    ),
-                    $template_field
-                )
-            );
-        }
-    }
+	private EEM_Message_Template         $message_template_model;
+
+	private EEM_Message_Template_Group   $message_template_group_model;
+
+	protected MessageTemplateRequestData $form_data;
+
+	protected MessageTemplateValidator   $validator;
+
+	protected RequestInterface           $request;
+
+
+	/**
+	 * @param EEM_Message_Template       $message_template_model
+	 * @param EEM_Message_Template_Group $message_template_group_model
+	 * @param MessageTemplateRequestData $form_data
+	 * @param MessageTemplateValidator   $validator
+	 * @param RequestInterface           $request
+	 */
+	public function __construct(
+		EEM_Message_Template $message_template_model,
+		EEM_Message_Template_Group $message_template_group_model,
+		MessageTemplateRequestData $form_data,
+		MessageTemplateValidator $validator,
+		RequestInterface $request
+	) {
+		$this->message_template_model       = $message_template_model;
+		$this->message_template_group_model = $message_template_group_model;
+		$this->form_data                    = $form_data;
+		$this->validator                    = $validator;
+		$this->request                      = $request;
+	}
+
+
+	/**
+	 * @param string|null $messenger
+	 * @param string|null $message_type
+	 * @param int         $GRP_ID
+	 * @param bool        $global
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function generateNewTemplates(
+		?string $messenger = '',
+		?string $message_type = '',
+		int $GRP_ID = 0,
+		bool $global = false
+	): array {
+		$this->form_data->setMessageTemplateRequestData();
+
+		$messenger    = $messenger ?: $this->form_data->messenger();
+		$message_type = $message_type ?: $this->form_data->messageType();
+		$GRP_ID       = $GRP_ID ?: $this->form_data->groupID();
+
+		// if no $message_types are given then that's okay...
+		// this may be a messenger that just adds shortcodes,
+		// so we just don't generate any templates.
+		if (empty($message_type)) {
+			return [];
+		}
+		$new_templates = EEH_MSG_Template::generate_new_templates($messenger, [$message_type], $GRP_ID, $global);
+		return $new_templates[0];
+	}
+
+
+	/**
+	 * @throws DomainException
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function updateExistingTemplates(): void
+	{
+		$this->form_data->setMessageTemplateRequestData();
+		$template_fields = $this->form_data->templateFields();
+
+		if ($template_fields) {
+			if (
+				$this->validator->validateTemplateFields(
+					$this->form_data->messenger(),
+					$this->form_data->messageType(),
+					$this->form_data->context(),
+					$template_fields
+				)
+			) {
+				foreach ($template_fields as $template_field => $data) {
+					$this->validateTemplateFieldData($template_field, $data);
+					$this->updateMessageTemplate(
+						$template_field,
+						[
+							'GRP_ID'             => $this->form_data->groupID(),
+							'MTP_ID'             => $data['MTP_ID'],
+							'MTP_template_field' => $data['name'],
+							'MTP_context'        => $this->form_data->context(),
+							// if they aren't allowed to use all JS, restrict them to standard allowed post tags
+							'MTP_content'        => ! current_user_can('unfiltered_html')
+								? $this->sanitizeMessageTemplateContent($data['content'])
+								: $data['content'],
+						]
+					);
+				}
+				// we can use the last set_column_values for the Message Template Group update
+				// (because its the same for all of these specific MTPs)
+				$this->updateMessageTemplateGroup(
+					[
+						'GRP_ID'           => $this->form_data->groupID(),
+						'MTP_user_id'      => $this->form_data->userID(),
+						'MTP_messenger'    => $this->form_data->messenger(),
+						'MTP_message_type' => $this->form_data->messageType(),
+						'MTP_is_global'    => $this->form_data->isGlobal(),
+						'MTP_is_override'  => $this->form_data->isOverride(),
+						'MTP_deleted'      => $this->form_data->isDeleted(),
+						'MTP_is_active'    => $this->form_data->isActive(),
+						'MTP_name'         => $this->form_data->name(),
+						'MTP_description'  => $this->form_data->description(),
+					]
+				);
+			}
+		}
+	}
+
+
+	/**
+	 * @param string $template_field
+	 * @param array  $message_template_fields
+	 * @return void
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function updateMessageTemplate(string $template_field, array $message_template_fields): void
+	{
+		$MTP_ID = $message_template_fields['MTP_ID'] ?? 0;
+		// if we have a MTP_ID for this field then update it, otherwise insert.
+		// this has already been through the template field validator and sanitized, so it will be
+		// safe to insert this field.  Why insert?  This typically happens when we introduce a new
+		// message template field in a messenger/message type and existing users don't have the
+		// default setup for it.
+		// @link https://events.codebasehq.com/projects/event-espresso/tickets/9465
+		$updated = $MTP_ID
+			? $this->message_template_model->update($message_template_fields, [['MTP_ID' => $MTP_ID]])
+			: $this->message_template_model->insert($message_template_fields);
+
+		// updates will return 0 if the field was not changed (ie: no changes = nothing actually updated)
+		// but we won't consider that a problem, but if it returns false, then something went BOOM!
+		if ($updated === false) {
+			EE_Error::add_error(
+				sprintf(
+					esc_html__('%s field was NOT updated for some reason', 'event_espresso'),
+					$template_field
+				),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+		}
+	}
+
+
+	/**
+	 * @param array $form_data
+	 * @return void
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function updateMessageTemplateGroup(array $form_data): void
+	{
+		try {
+			$GRP_ID = $form_data['id'] ?? 0;
+			$GRP_ID = $form_data['GRP_ID'] ?? $GRP_ID;
+			if (! $GRP_ID) {
+				throw new RuntimeException(
+					esc_html__(
+						'Can not update message template group because no GRP_ID was provided',
+						'event_espresso'
+					)
+				);
+			}
+
+			$updated       = $this->message_template_group_model->update($form_data, [['GRP_ID' => $GRP_ID]]);
+			$error_message = esc_html__(
+				'unknown error occurred while updating message template group',
+				'event_espresso'
+			);
+
+			if ($updated !== false) {
+				$message_template_group = $this->message_template_group_model->get_one_by_ID($GRP_ID);
+				if ($message_template_group instanceof EE_Message_Template_Group) {
+					// k now we need to ensure the template_pack and template_variation fields are set.
+					$template_pack      = $this->request->getRequestParam('MTP_template_pack', 'default');
+					$template_variation = $this->request->getRequestParam('MTP_template_variation', 'default');
+					$message_template_group->set_template_pack_name($template_pack);
+					$message_template_group->set_template_pack_variation($template_variation);
+				}
+				return;
+			}
+		} catch (RuntimeException $exception) {
+			$error_message = $exception->getMessage();
+		}
+
+		EE_Error::add_error(
+			sprintf(
+				esc_html__(
+					'The Message Template Group (%1$d) was NOT updated for the following reason: %2$s',
+					'event_espresso'
+				),
+				$form_data['GRP_ID'],
+				$error_message
+			),
+			__FILE__,
+			__FUNCTION__,
+			__LINE__
+		);
+	}
+
+
+	/**
+	 * recursively runs wp_kses() on message template content in a model safe manner
+	 *
+	 * @param array|string $content
+	 * @return array|string
+	 * @since   4.10.29.p
+	 */
+	private function sanitizeMessageTemplateContent($content)
+	{
+		if (is_array($content)) {
+			foreach ($content as $key => $value) {
+				$content[ $key ] = $this->sanitizeMessageTemplateContent($value);
+			}
+			return $content;
+		}
+		// remove slashes so wp_kses() works properly
+		// wp_kses_stripslashes() only removes slashes from double-quotes,
+		// so attributes using single quotes always appear invalid.
+		$content = stripslashes($content);
+		$content = wp_kses($content, wp_kses_allowed_html('post'));
+		// But currently the models expect slashed data, so after wp_kses()
+		// runs we need to re-slash the data. Sheesh.
+		// See https://events.codebasehq.com/projects/event-espresso/tickets/11211#update-47321587
+		return addslashes($content);
+	}
+
+
+	/**
+	 * @param int $GRP_ID
+	 * @return false|int
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function trashMessageTemplate(int $GRP_ID)
+	{
+		return $this->message_template_group_model->delete_by_ID($GRP_ID);
+	}
+
+
+	/**
+	 * @param int $GRP_ID
+	 * @return bool
+	 * @throws EE_Error
+	 */
+	public function restoreMessageTemplate(int $GRP_ID): bool
+	{
+		return $this->message_template_group_model->restore_by_ID($GRP_ID);
+	}
+
+
+	/**
+	 * @param int $GRP_ID
+	 * @return EE_Message_Template_Group
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function getMessageTemplateGroup(int $GRP_ID): EE_Message_Template_Group
+	{
+		$message_template_group = $this->message_template_group_model->get_one_by_ID($GRP_ID);
+		if ($message_template_group instanceof EE_Message_Template_Group) {
+			return $message_template_group;
+		}
+		throw new RuntimeException(
+			esc_html__(
+				'Can not permanently delete message template group because an invalid GRP_ID was provided',
+				'event_espresso'
+			)
+		);
+	}
+
+
+	/**
+	 * @param int $GRP_ID
+	 * @return bool
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function permanentlyDeleteMessageTemplates(int $GRP_ID): bool
+	{
+		$message_template_group = $this->getMessageTemplateGroup($GRP_ID);
+		// permanently delete all the related Message Templates
+		$deleted = $message_template_group->delete_related_permanently('Message_Template');
+		return $deleted > 0;
+	}
+
+
+	/**
+	 * @param int $GRP_ID
+	 * @return bool
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function permanentlyDeleteMessageTemplateGroup(int $GRP_ID): bool
+	{
+		if ($this->permanentlyDeleteMessageTemplates($GRP_ID)) {
+			return $this->message_template_group_model->delete_permanently([['GRP_ID' => $GRP_ID]]);
+		}
+		return false;
+	}
+
+
+	private function validateTemplateFieldData(string $template_field, array $data)
+	{
+		if (
+			! (
+				array_key_exists('MTP_ID', $data)
+				&& array_key_exists('name', $data)
+				&& array_key_exists('content', $data)
+			)
+		) {
+			throw new RuntimeException(
+				sprintf(
+					esc_html__(
+						'Can not update message template field %1$s because of a missing MTP_ID, name, or content.',
+						'event_espresso'
+					),
+					$template_field
+				)
+			);
+		}
+	}
 }

core/domain/services/capabilities/FeatureFlagsConfig.php

Indentation +133 added lines, -133 removed lines

@@ -17,137 +17,137 @@
  */
 class FeatureFlagsConfig extends JsonDataWordpressOption
 {
-    /**
-     * WP option name for saving the Feature Flags configuration
-     */
-    private const OPTION_NAME = 'ee_feature_flags';
-
-    /**
-     * Whether to use the New Event Editor (EDTR) or continue using the legacy Event Editor
-     * deafult: Enabled for Caffeinated sites, disabled for Decaf or Multisite installs
-     */
-    public const  USE_ADVANCED_EVENT_EDITOR = 'ee_advanced_event_editor';
-
-    /**
-     * Whether to enable the Bulk Edit feature in the Advanced Event Editor (EDTR)
-     * default: Enabled for Caffeinated sites, disabled for Decaf or Multisite installs
-     */
-    public const  USE_EVENT_EDITOR_BULK_EDIT = 'ee_event_editor_bulk_edit';
-
-    /**
-     * Whether to enable the new Default Ticket Manager in the EDTR
-     * default: Enabled
-     */
-    public const  USE_DEFAULT_TICKET_MANAGER = 'use_default_ticket_manager';
-
-    /**
-     * Whether to enable the Rich Text Editor for the Event Description field in the EDTR or use tinymce
-     * default: Disabled
-     */
-    public const  USE_EVENT_DESCRIPTION_RTE = 'use_event_description_rte';
-
-    /**
-     * Whether to enable the Rich Text Editor for all other RTE fields in the EDTR
-     * default: Disabled
-     */
-    public const  USE_EXPERIMENTAL_RTE = 'use_experimental_rte';
-
-    /**
-     * Whether to enable the new Registration Form Builder in the EDTR
-     * or continue using the legacy Question Groups and Registration Form admin pages
-     * default: Disabled
-     */
-    public const  USE_REG_FORM_BUILDER = 'use_reg_form_builder';
-
-    /**
-     * Whether to enable the new Registration Options meta box in the EDTR
-     * or continue using the legacy Event Registration Options
-     * default: Disabled
-     */
-    public const  USE_REG_OPTIONS_META_BOX = 'use_reg_options_meta_box';
-
-
-    protected Domain $domain;
-
-
-    public function __construct(Domain $domain, JsonDataHandler $json_data_handler)
-    {
-        $this->domain = $domain;
-        parent::__construct($json_data_handler, FeatureFlagsConfig::OPTION_NAME, $this->getDefaultFeatureFlagOptions());
-    }
-
-
-    /**
-     * see the FeatureFlagsConfig::USE_* constants for descriptions of each feature flag and their default values
-     *
-     * @return stdClass
-     */
-    public function getDefaultFeatureFlagOptions(): stdClass
-    {
-        return (object) [
-            self::USE_ADVANCED_EVENT_EDITOR  => $this->domain->isCaffeinated() && ! $this->domain->isMultiSite(),
-            self::USE_EVENT_EDITOR_BULK_EDIT => $this->domain->isCaffeinated() && ! $this->domain->isMultiSite(),
-            self::USE_DEFAULT_TICKET_MANAGER => true,
-            self::USE_EVENT_DESCRIPTION_RTE  => false,
-            self::USE_EXPERIMENTAL_RTE       => false,
-            self::USE_REG_FORM_BUILDER       => false,
-            self::USE_REG_OPTIONS_META_BOX   => false,
-        ];
-    }
-
-
-    /**
-     * @return stdClass
-     */
-    public function getFeatureFlags(): stdClass
-    {
-        return $this->getAll() ?: $this->getDefaultFeatureFlagOptions();
-    }
-
-
-    public function saveFeatureFlagsConfig(stdClass $feature_flags): int
-    {
-        return $this->updateOption($feature_flags);
-    }
-
-
-    /**
-     * enables a feature flag, ex:
-     * $this->enableFeatureFlag(FeatureFlagsConfig::USE_ADVANCED_EVENT_EDITOR);
-     *
-     * @param string $feature_flag the feature flag to enable. One of the FeatureFlagsConfig::USE_* constants
-     * @return int
-     */
-    public function enableFeatureFlag(string $feature_flag): int
-    {
-        $feature_flags = $this->getFeatureFlags();
-        if (! property_exists($feature_flags, $feature_flag)) {
-            return WordPressOption::UPDATE_ERROR;
-        }
-        $feature_flags->{$feature_flag} = true;
-        // if feature flag is the advanced event editor or bulk edit options
-        // then only enabled if the site is Caffeinated and not MultiSite
-        if ($feature_flag === self::USE_ADVANCED_EVENT_EDITOR || $feature_flag === self::USE_EVENT_EDITOR_BULK_EDIT) {
-            $feature_flags->{$feature_flag} = $this->domain->isCaffeinated() && ! $this->domain->isMultiSite();
-        }
-        return $this->saveFeatureFlagsConfig($feature_flags);
-    }
-
-
-    /**
-     * disables a feature flag, ex:
-     * $this->disableFeatureFlag(FeatureFlagsConfig::USE_ADVANCED_EVENT_EDITOR);
-     *
-     * @param string $feature_flag the feature flag to disable. One of the FeatureFlagsConfig::USE_* constants
-     * @return int
-     */
-    public function disableFeatureFlag(string $feature_flag): int
-    {
-        $feature_flags = $this->getFeatureFlags();
-        if (! property_exists($feature_flags, $feature_flag)) {
-            return WordPressOption::UPDATE_ERROR;
-        }
-        $feature_flags->{$feature_flag} = false;
-        return $this->saveFeatureFlagsConfig($feature_flags);
-    }
+	/**
+	 * WP option name for saving the Feature Flags configuration
+	 */
+	private const OPTION_NAME = 'ee_feature_flags';
+
+	/**
+	 * Whether to use the New Event Editor (EDTR) or continue using the legacy Event Editor
+	 * deafult: Enabled for Caffeinated sites, disabled for Decaf or Multisite installs
+	 */
+	public const  USE_ADVANCED_EVENT_EDITOR = 'ee_advanced_event_editor';
+
+	/**
+	 * Whether to enable the Bulk Edit feature in the Advanced Event Editor (EDTR)
+	 * default: Enabled for Caffeinated sites, disabled for Decaf or Multisite installs
+	 */
+	public const  USE_EVENT_EDITOR_BULK_EDIT = 'ee_event_editor_bulk_edit';
+
+	/**
+	 * Whether to enable the new Default Ticket Manager in the EDTR
+	 * default: Enabled
+	 */
+	public const  USE_DEFAULT_TICKET_MANAGER = 'use_default_ticket_manager';
+
+	/**
+	 * Whether to enable the Rich Text Editor for the Event Description field in the EDTR or use tinymce
+	 * default: Disabled
+	 */
+	public const  USE_EVENT_DESCRIPTION_RTE = 'use_event_description_rte';
+
+	/**
+	 * Whether to enable the Rich Text Editor for all other RTE fields in the EDTR
+	 * default: Disabled
+	 */
+	public const  USE_EXPERIMENTAL_RTE = 'use_experimental_rte';
+
+	/**
+	 * Whether to enable the new Registration Form Builder in the EDTR
+	 * or continue using the legacy Question Groups and Registration Form admin pages
+	 * default: Disabled
+	 */
+	public const  USE_REG_FORM_BUILDER = 'use_reg_form_builder';
+
+	/**
+	 * Whether to enable the new Registration Options meta box in the EDTR
+	 * or continue using the legacy Event Registration Options
+	 * default: Disabled
+	 */
+	public const  USE_REG_OPTIONS_META_BOX = 'use_reg_options_meta_box';
+
+
+	protected Domain $domain;
+
+
+	public function __construct(Domain $domain, JsonDataHandler $json_data_handler)
+	{
+		$this->domain = $domain;
+		parent::__construct($json_data_handler, FeatureFlagsConfig::OPTION_NAME, $this->getDefaultFeatureFlagOptions());
+	}
+
+
+	/**
+	 * see the FeatureFlagsConfig::USE_* constants for descriptions of each feature flag and their default values
+	 *
+	 * @return stdClass
+	 */
+	public function getDefaultFeatureFlagOptions(): stdClass
+	{
+		return (object) [
+			self::USE_ADVANCED_EVENT_EDITOR  => $this->domain->isCaffeinated() && ! $this->domain->isMultiSite(),
+			self::USE_EVENT_EDITOR_BULK_EDIT => $this->domain->isCaffeinated() && ! $this->domain->isMultiSite(),
+			self::USE_DEFAULT_TICKET_MANAGER => true,
+			self::USE_EVENT_DESCRIPTION_RTE  => false,
+			self::USE_EXPERIMENTAL_RTE       => false,
+			self::USE_REG_FORM_BUILDER       => false,
+			self::USE_REG_OPTIONS_META_BOX   => false,
+		];
+	}
+
+
+	/**
+	 * @return stdClass
+	 */
+	public function getFeatureFlags(): stdClass
+	{
+		return $this->getAll() ?: $this->getDefaultFeatureFlagOptions();
+	}
+
+
+	public function saveFeatureFlagsConfig(stdClass $feature_flags): int
+	{
+		return $this->updateOption($feature_flags);
+	}
+
+
+	/**
+	 * enables a feature flag, ex:
+	 * $this->enableFeatureFlag(FeatureFlagsConfig::USE_ADVANCED_EVENT_EDITOR);
+	 *
+	 * @param string $feature_flag the feature flag to enable. One of the FeatureFlagsConfig::USE_* constants
+	 * @return int
+	 */
+	public function enableFeatureFlag(string $feature_flag): int
+	{
+		$feature_flags = $this->getFeatureFlags();
+		if (! property_exists($feature_flags, $feature_flag)) {
+			return WordPressOption::UPDATE_ERROR;
+		}
+		$feature_flags->{$feature_flag} = true;
+		// if feature flag is the advanced event editor or bulk edit options
+		// then only enabled if the site is Caffeinated and not MultiSite
+		if ($feature_flag === self::USE_ADVANCED_EVENT_EDITOR || $feature_flag === self::USE_EVENT_EDITOR_BULK_EDIT) {
+			$feature_flags->{$feature_flag} = $this->domain->isCaffeinated() && ! $this->domain->isMultiSite();
+		}
+		return $this->saveFeatureFlagsConfig($feature_flags);
+	}
+
+
+	/**
+	 * disables a feature flag, ex:
+	 * $this->disableFeatureFlag(FeatureFlagsConfig::USE_ADVANCED_EVENT_EDITOR);
+	 *
+	 * @param string $feature_flag the feature flag to disable. One of the FeatureFlagsConfig::USE_* constants
+	 * @return int
+	 */
+	public function disableFeatureFlag(string $feature_flag): int
+	{
+		$feature_flags = $this->getFeatureFlags();
+		if (! property_exists($feature_flags, $feature_flag)) {
+			return WordPressOption::UPDATE_ERROR;
+		}
+		$feature_flags->{$feature_flag} = false;
+		return $this->saveFeatureFlagsConfig($feature_flags);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -121,7 +121,7 @@ 
     public function enableFeatureFlag(string $feature_flag): int
     {
         $feature_flags = $this->getFeatureFlags();
-        if (! property_exists($feature_flags, $feature_flag)) {
+        if ( ! property_exists($feature_flags, $feature_flag)) {
             return WordPressOption::UPDATE_ERROR;
         }
         $feature_flags->{$feature_flag} = true;
@@ -144,7 +144,7 @@ 
     public function disableFeatureFlag(string $feature_flag): int
     {
         $feature_flags = $this->getFeatureFlags();
-        if (! property_exists($feature_flags, $feature_flag)) {
+        if ( ! property_exists($feature_flags, $feature_flag)) {
             return WordPressOption::UPDATE_ERROR;
         }
         $feature_flags->{$feature_flag} = false;

core/domain/services/capabilities/FeatureFlags.php

Indentation +54 added lines, -54 removed lines

@@ -13,66 +13,66 @@
  */
 class FeatureFlags
 {
-    private CapabilitiesChecker $capabilities_checker;
+	private CapabilitiesChecker $capabilities_checker;
 
-    protected FeatureFlagsConfig $option;
+	protected FeatureFlagsConfig $option;
 
-    /**
-     * array of key value pairs where the key is the feature flag in question
-     * and the value is either a boolean or a CapCheck object defining the required permissions
-     * example:
-     *       [
-     *          'use_bulk_edit' => true,
-     *          'use_death_ray' => new CapCheck( 'ee-death-ray-cap', 'context-desc' )
-     *      ]
-     * array is filterable via FHEE__EventEspresso_core_domain_services_capabilities_FeatureFlags
-     *
-     * @var boolean[]|CapCheck[]
-     */
-    private $feature_flags;
+	/**
+	 * array of key value pairs where the key is the feature flag in question
+	 * and the value is either a boolean or a CapCheck object defining the required permissions
+	 * example:
+	 *       [
+	 *          'use_bulk_edit' => true,
+	 *          'use_death_ray' => new CapCheck( 'ee-death-ray-cap', 'context-desc' )
+	 *      ]
+	 * array is filterable via FHEE__EventEspresso_core_domain_services_capabilities_FeatureFlags
+	 *
+	 * @var boolean[]|CapCheck[]
+	 */
+	private $feature_flags;
 
 
-    /**
-     * FeatureFlags constructor.
-     *
-     * @param CapabilitiesChecker $capabilities_checker
-     * @param FeatureFlagsConfig  $option
-     */
-    public function __construct(CapabilitiesChecker $capabilities_checker, FeatureFlagsConfig $option)
-    {
-        $this->capabilities_checker = $capabilities_checker;
-        $this->option = $option;
-        $this->feature_flags = apply_filters(
-            'FHEE__EventEspresso_core_domain_services_capabilities_FeatureFlags',
-            $this->option->getFeatureFlags()
-        );
-    }
+	/**
+	 * FeatureFlags constructor.
+	 *
+	 * @param CapabilitiesChecker $capabilities_checker
+	 * @param FeatureFlagsConfig  $option
+	 */
+	public function __construct(CapabilitiesChecker $capabilities_checker, FeatureFlagsConfig $option)
+	{
+		$this->capabilities_checker = $capabilities_checker;
+		$this->option = $option;
+		$this->feature_flags = apply_filters(
+			'FHEE__EventEspresso_core_domain_services_capabilities_FeatureFlags',
+			$this->option->getFeatureFlags()
+		);
+	}
 
 
-    /**
-     * @param string $feature
-     * @return bool
-     */
-    public function allowed(string $feature): bool
-    {
-        $flag = $this->feature_flags->{$feature} ?? false;
-        try {
-            return $flag instanceof CapCheck
-                ? $this->capabilities_checker->processCapCheck($flag)
-                : filter_var($flag, FILTER_VALIDATE_BOOLEAN);
-        } catch (InsufficientPermissionsException $e) {
-            // eat the exception
-        }
-        return false;
-    }
+	/**
+	 * @param string $feature
+	 * @return bool
+	 */
+	public function allowed(string $feature): bool
+	{
+		$flag = $this->feature_flags->{$feature} ?? false;
+		try {
+			return $flag instanceof CapCheck
+				? $this->capabilities_checker->processCapCheck($flag)
+				: filter_var($flag, FILTER_VALIDATE_BOOLEAN);
+		} catch (InsufficientPermissionsException $e) {
+			// eat the exception
+		}
+		return false;
+	}
 
 
-    /**
-     * @return array
-     */
-    public function getAllowedFeatures(): array
-    {
-        $allowed = array_filter( (array) $this->feature_flags, [$this, 'allowed'], ARRAY_FILTER_USE_KEY);
-        return array_keys($allowed);
-    }
+	/**
+	 * @return array
+	 */
+	public function getAllowedFeatures(): array
+	{
+		$allowed = array_filter( (array) $this->feature_flags, [$this, 'allowed'], ARRAY_FILTER_USE_KEY);
+		return array_keys($allowed);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
      */
     public function getAllowedFeatures(): array
     {
-        $allowed = array_filter( (array) $this->feature_flags, [$this, 'allowed'], ARRAY_FILTER_USE_KEY);
+        $allowed = array_filter((array) $this->feature_flags, [$this, 'allowed'], ARRAY_FILTER_USE_KEY);
         return array_keys($allowed);
     }
 }

core/domain/services/assets/EspressoLegacyAdminAssetManager.php

Indentation +243 added lines, -243 removed lines

@@ -15,266 +15,266 @@
 class EspressoLegacyAdminAssetManager extends AssetManager
 {
 
-    const JS_HANDLE_EE_ADMIN                = 'ee_admin_js';
+	const JS_HANDLE_EE_ADMIN                = 'ee_admin_js';
 
-    const JS_HANDLE_EE_AJAX_TABLE_SORTING   = 'espresso_ajax_table_sorting';
+	const JS_HANDLE_EE_AJAX_TABLE_SORTING   = 'espresso_ajax_table_sorting';
 
-    const JS_HANDLE_EE_DATEPICKER           = 'ee-datepicker';
+	const JS_HANDLE_EE_DATEPICKER           = 'ee-datepicker';
 
-    const JS_HANDLE_EE_DIALOG               = 'ee-dialog';
+	const JS_HANDLE_EE_DIALOG               = 'ee-dialog';
 
-    const JS_HANDLE_EE_HELP_TOUR            = 'ee-help-tour';
+	const JS_HANDLE_EE_HELP_TOUR            = 'ee-help-tour';
 
-    const JS_HANDLE_EE_INJECT_WP            = 'ee-inject-wp';
+	const JS_HANDLE_EE_INJECT_WP            = 'ee-inject-wp';
 
-    const JS_HANDLE_GOOGLE_CHARTS           = 'google-charts';
+	const JS_HANDLE_GOOGLE_CHARTS           = 'google-charts';
 
-    const JS_HANDLE_MOMENT                  = 'ee-moment';
+	const JS_HANDLE_MOMENT                  = 'ee-moment';
 
-    const JS_HANDLE_MOMENT_CORE             = 'ee-moment-core';
+	const JS_HANDLE_MOMENT_CORE             = 'ee-moment-core';
 
-    const JS_HANDLE_PARSE_URI               = 'ee-parse-uri';
+	const JS_HANDLE_PARSE_URI               = 'ee-parse-uri';
 
-    const JS_HANDLE_EE_TEXT_LINKS           = 'ee-text-links';
+	const JS_HANDLE_EE_TEXT_LINKS           = 'ee-text-links';
 
-    const JS_HANDLE_EE_SERIALIZE_FULL_ARRAY = 'ee-serialize-full-array';
+	const JS_HANDLE_EE_SERIALIZE_FULL_ARRAY = 'ee-serialize-full-array';
 
-    const JS_HANDLE_JOYRIDE_MODERNIZR       = 'joyride-modernizr';
+	const JS_HANDLE_JOYRIDE_MODERNIZR       = 'joyride-modernizr';
 
-    const JS_HANDLE_JQUERY_JOYRIDE          = 'jquery-joyride';
+	const JS_HANDLE_JQUERY_JOYRIDE          = 'jquery-joyride';
 
-    const CSS_HANDLE_EE_ADMIN               = 'ee-admin-css';
+	const CSS_HANDLE_EE_ADMIN               = 'ee-admin-css';
 
-    const CSS_HANDLE_EE_ADMIN_MEDIA_MODAL   = 'ee-admin-media-modal-css';
+	const CSS_HANDLE_EE_ADMIN_MEDIA_MODAL   = 'ee-admin-media-modal-css';
 
-    const CSS_HANDLE_EE_ADMIN_FILEBIRD      = 'ee-admin-filebird-css';
+	const CSS_HANDLE_EE_ADMIN_FILEBIRD      = 'ee-admin-filebird-css';
 
-    const CSS_HANDLE_EE_JOYRIDE             = 'ee-joyride-css';
+	const CSS_HANDLE_EE_JOYRIDE             = 'ee-joyride-css';
 
-    const CSS_HANDLE_EE_TEXT_LINKS          = 'ee-text-links';
+	const CSS_HANDLE_EE_TEXT_LINKS          = 'ee-text-links';
 
-    const CSS_HANDLE_EE_UI_THEME            = 'espresso-ui-theme';
-
-    const CSS_HANDLE_JOYRIDE                = 'joyride-css';
-
-
-    /**
-     * @inheritDoc
-     */
-    public function addAssets()
-    {
-        $joyride = filter_var(apply_filters('FHEE_load_joyride', false), FILTER_VALIDATE_BOOLEAN);
-        $this->registerJavascript($joyride);
-        $this->registerStyleSheets($joyride);
-    }
-
-
-    /**
-     * Register javascript assets
-     *
-     * @param bool $joyride
-     */
-    private function registerJavascript($joyride = false)
-    {
-        $this->addJavascript(
-            EspressoLegacyAdminAssetManager::JS_HANDLE_EE_DIALOG,
-            EE_ADMIN_URL . 'assets/ee-dialog-helper.js',
-            [
-                JqueryAssetManager::JS_HANDLE_JQUERY,
-                JqueryAssetManager::JS_HANDLE_JQUERY_UI_DRAGGABLE,
-            ]
-        );
-        $this->addJavascript(
-            EspressoLegacyAdminAssetManager::JS_HANDLE_EE_ADMIN,
-            EE_ADMIN_URL . 'assets/ee-admin-page.js',
-            [
-                CoreAssetManager::JS_HANDLE_CORE,
-                EspressoLegacyAdminAssetManager::JS_HANDLE_PARSE_URI,
-                EspressoLegacyAdminAssetManager::JS_HANDLE_EE_DIALOG,
-            ]
-        );
-
-        // script for sorting tables
-        $this->addJavascript(
-            EspressoLegacyAdminAssetManager::JS_HANDLE_EE_AJAX_TABLE_SORTING,
-            EE_ADMIN_URL . 'assets/espresso_ajax_table_sorting.js',
-            [
-                EspressoLegacyAdminAssetManager::JS_HANDLE_EE_ADMIN,
-                JqueryAssetManager::JS_HANDLE_JQUERY_UI_SORTABLE,
-            ]
-        );
-
-        // script for parsing uri's
-        $this->addJavascript(
-            EspressoLegacyAdminAssetManager::JS_HANDLE_PARSE_URI,
-            EE_GLOBAL_ASSETS_URL . 'scripts/parseuri.js'
-        );
-
-        // and parsing associative serialized form elements
-        $this->addJavascript(
-            EspressoLegacyAdminAssetManager::JS_HANDLE_EE_SERIALIZE_FULL_ARRAY,
-            EE_GLOBAL_ASSETS_URL . 'scripts/jquery.serializefullarray.js',
-            [JqueryAssetManager::JS_HANDLE_JQUERY]
-
-        );
-
-        // helpers scripts
-        $this->addJavascript(
-            EspressoLegacyAdminAssetManager::JS_HANDLE_EE_TEXT_LINKS,
-            EE_PLUGIN_DIR_URL . 'core/helpers/assets/ee_text_list_helper.js',
-            [JqueryAssetManager::JS_HANDLE_JQUERY]
-        );
-
-        $this->addJavascript(
-            EspressoLegacyAdminAssetManager::JS_HANDLE_MOMENT_CORE,
-            EE_THIRD_PARTY_URL . 'moment/moment-with-locales.min.js'
-        );
-
-        $this->addJavascript(
-            EspressoLegacyAdminAssetManager::JS_HANDLE_MOMENT,
-            EE_THIRD_PARTY_URL . 'moment/moment-timezone-with-data.min.js',
-            [EspressoLegacyAdminAssetManager::JS_HANDLE_MOMENT_CORE]
-        );
-
-        $this->addJavascript(
-            EspressoLegacyAdminAssetManager::JS_HANDLE_EE_DATEPICKER,
-            EE_ADMIN_URL . 'assets/ee-datepicker.js',
-            [
-                JqueryAssetManager::JS_HANDLE_JQUERY_UI_TIMEPICKER_ADDON,
-                EspressoLegacyAdminAssetManager::JS_HANDLE_MOMENT,
-            ]
-        );
-
-        // google charts
-        $this->addJavascript(
-            EspressoLegacyAdminAssetManager::JS_HANDLE_GOOGLE_CHARTS,
-            'https://www.gstatic.com/charts/loader.js'
-        );
-
-        // this javascript is loaded on every admin page to catch any injections ee needs to add to wp run js.
-        // Note: the intention of this script is to only do TARGETED injections.
-        //ie: only injecting on certain script calls.
-        $this->addJavascript(
-            EspressoLegacyAdminAssetManager::JS_HANDLE_EE_INJECT_WP,
-            EE_ADMIN_URL . 'assets/ee-cpt-wp-injects.js',
-            [JqueryAssetManager::JS_HANDLE_JQUERY]
-        );
-
-        $this->loadQtipJs();
-
-        // joyride is turned OFF by default, but prior to the admin_enqueue_scripts hook,
-        // can be turned back on again via: add_filter('FHEE_load_joyride', '__return_true' );
-        if (! $joyride) {
-            return;
-        }
-
-        $this->addJavascript(
-            EspressoLegacyAdminAssetManager::JS_HANDLE_JOYRIDE_MODERNIZR,
-            EE_THIRD_PARTY_URL . 'joyride/modernizr.mq.js',
-            [],
-            true,
-            '2.1'
-        );
-
-        // wanna go for a joyride?
-        $this->addJavascript(
-            EspressoLegacyAdminAssetManager::JS_HANDLE_JQUERY_JOYRIDE,
-            EE_THIRD_PARTY_URL . 'joyride/jquery.joyride-2.1.js',
-            [
-                JqueryAssetManager::JS_HANDLE_JQUERY_COOKIE,
-                EspressoLegacyAdminAssetManager::JS_HANDLE_JOYRIDE_MODERNIZR,
-            ],
-            true,
-            '2.1'
-        )->setEnqueueImmediately();
-
-        $this->addJavascript(
-            EspressoLegacyAdminAssetManager::JS_HANDLE_EE_HELP_TOUR,
-            EE_ADMIN_URL . 'assets/ee-help-tour.js',
-            [
-                EspressoLegacyAdminAssetManager::JS_HANDLE_JQUERY_JOYRIDE,
-            ],
-            true,
-            '2.1'
-        )->setEnqueueImmediately();
-    }
-
-
-    /**
-     * Register CSS assets.
-     *
-     * @param bool $joyride
-     */
-    private function registerStyleSheets($joyride = false)
-    {
-
-        $this->addStylesheet(
-            EspressoLegacyAdminAssetManager::CSS_HANDLE_EE_UI_THEME,
-            EE_GLOBAL_ASSETS_URL . 'css/espresso-ui-theme/jquery-ui-1.10.3.custom.min.css'
-        );
-
-        $this->addStylesheet(
-            EspressoLegacyAdminAssetManager::CSS_HANDLE_EE_TEXT_LINKS,
-            EE_PLUGIN_DIR_URL . 'core/helpers/assets/ee_text_list_helper.css'
-        );
-
-        $this->addStylesheet(
-            EspressoLegacyAdminAssetManager::CSS_HANDLE_EE_ADMIN,
-            EE_ADMIN_URL . 'assets/ee-admin-page.css',
-            ['espresso_admin_base']
-        )->setEnqueueImmediately();
-
-        if (
-            apply_filters(
-                'FHEE__EventEspresso_core_domain_services_assets_EspressoLegacyAdminAssetManager__registerStyleSheets__load_media_modal_css',
-                ! class_exists('FileBird\Plugin')
-            )
-        ) {
-            $this->addStylesheet(
-                EspressoLegacyAdminAssetManager::CSS_HANDLE_EE_ADMIN_MEDIA_MODAL,
-                EE_ADMIN_URL . 'assets/ee-admin-media-modal.css',
-                [EspressoLegacyAdminAssetManager::CSS_HANDLE_EE_ADMIN]
-            )->setEnqueueImmediately();
-        } else {
-            $this->addStylesheet(
-                EspressoLegacyAdminAssetManager::CSS_HANDLE_EE_ADMIN_FILEBIRD,
-                EE_ADMIN_URL . 'assets/ee-admin-media-modal-reset.css',
-                [EspressoLegacyAdminAssetManager::CSS_HANDLE_EE_ADMIN]
-            )->setEnqueueImmediately();
-        }
-
-        if (! $joyride) {
-            return;
-        }
-        // joyride style
-        $this->addStylesheet(
-            EspressoLegacyAdminAssetManager::CSS_HANDLE_JOYRIDE,
-            EE_THIRD_PARTY_URL . 'joyride/joyride-2.1.css',
-            [],
-            'all',
-            '2.1'
-        );
-
-        $this->addStylesheet(
-            EspressoLegacyAdminAssetManager::CSS_HANDLE_EE_JOYRIDE,
-            EE_GLOBAL_ASSETS_URL . 'css/ee-joyride-styles.css',
-            [EspressoLegacyAdminAssetManager::CSS_HANDLE_JOYRIDE]
-        )->setEnqueueImmediately();
-    }
-
-
-    /**
-     * registers assets for cleaning your ears
-     */
-    public function loadQtipJs()
-    {
-        // qtip is turned OFF by default, but prior to the wp_enqueue_scripts hook,
-        // can be turned back on again via: add_filter('FHEE_load_qtip', '__return_true' );
-        if (apply_filters('FHEE_load_qtip', false)) {
-            $qtip_loader = EEH_Qtip_Loader::instance();
-            if ($qtip_loader instanceof EEH_Qtip_Loader) {
-                $qtip_loader->register_and_enqueue();
-            }
-        }
-    }
+	const CSS_HANDLE_EE_UI_THEME            = 'espresso-ui-theme';
+
+	const CSS_HANDLE_JOYRIDE                = 'joyride-css';
+
+
+	/**
+	 * @inheritDoc
+	 */
+	public function addAssets()
+	{
+		$joyride = filter_var(apply_filters('FHEE_load_joyride', false), FILTER_VALIDATE_BOOLEAN);
+		$this->registerJavascript($joyride);
+		$this->registerStyleSheets($joyride);
+	}
+
+
+	/**
+	 * Register javascript assets
+	 *
+	 * @param bool $joyride
+	 */
+	private function registerJavascript($joyride = false)
+	{
+		$this->addJavascript(
+			EspressoLegacyAdminAssetManager::JS_HANDLE_EE_DIALOG,
+			EE_ADMIN_URL . 'assets/ee-dialog-helper.js',
+			[
+				JqueryAssetManager::JS_HANDLE_JQUERY,
+				JqueryAssetManager::JS_HANDLE_JQUERY_UI_DRAGGABLE,
+			]
+		);
+		$this->addJavascript(
+			EspressoLegacyAdminAssetManager::JS_HANDLE_EE_ADMIN,
+			EE_ADMIN_URL . 'assets/ee-admin-page.js',
+			[
+				CoreAssetManager::JS_HANDLE_CORE,
+				EspressoLegacyAdminAssetManager::JS_HANDLE_PARSE_URI,
+				EspressoLegacyAdminAssetManager::JS_HANDLE_EE_DIALOG,
+			]
+		);
+
+		// script for sorting tables
+		$this->addJavascript(
+			EspressoLegacyAdminAssetManager::JS_HANDLE_EE_AJAX_TABLE_SORTING,
+			EE_ADMIN_URL . 'assets/espresso_ajax_table_sorting.js',
+			[
+				EspressoLegacyAdminAssetManager::JS_HANDLE_EE_ADMIN,
+				JqueryAssetManager::JS_HANDLE_JQUERY_UI_SORTABLE,
+			]
+		);
+
+		// script for parsing uri's
+		$this->addJavascript(
+			EspressoLegacyAdminAssetManager::JS_HANDLE_PARSE_URI,
+			EE_GLOBAL_ASSETS_URL . 'scripts/parseuri.js'
+		);
+
+		// and parsing associative serialized form elements
+		$this->addJavascript(
+			EspressoLegacyAdminAssetManager::JS_HANDLE_EE_SERIALIZE_FULL_ARRAY,
+			EE_GLOBAL_ASSETS_URL . 'scripts/jquery.serializefullarray.js',
+			[JqueryAssetManager::JS_HANDLE_JQUERY]
+
+		);
+
+		// helpers scripts
+		$this->addJavascript(
+			EspressoLegacyAdminAssetManager::JS_HANDLE_EE_TEXT_LINKS,
+			EE_PLUGIN_DIR_URL . 'core/helpers/assets/ee_text_list_helper.js',
+			[JqueryAssetManager::JS_HANDLE_JQUERY]
+		);
+
+		$this->addJavascript(
+			EspressoLegacyAdminAssetManager::JS_HANDLE_MOMENT_CORE,
+			EE_THIRD_PARTY_URL . 'moment/moment-with-locales.min.js'
+		);
+
+		$this->addJavascript(
+			EspressoLegacyAdminAssetManager::JS_HANDLE_MOMENT,
+			EE_THIRD_PARTY_URL . 'moment/moment-timezone-with-data.min.js',
+			[EspressoLegacyAdminAssetManager::JS_HANDLE_MOMENT_CORE]
+		);
+
+		$this->addJavascript(
+			EspressoLegacyAdminAssetManager::JS_HANDLE_EE_DATEPICKER,
+			EE_ADMIN_URL . 'assets/ee-datepicker.js',
+			[
+				JqueryAssetManager::JS_HANDLE_JQUERY_UI_TIMEPICKER_ADDON,
+				EspressoLegacyAdminAssetManager::JS_HANDLE_MOMENT,
+			]
+		);
+
+		// google charts
+		$this->addJavascript(
+			EspressoLegacyAdminAssetManager::JS_HANDLE_GOOGLE_CHARTS,
+			'https://www.gstatic.com/charts/loader.js'
+		);
+
+		// this javascript is loaded on every admin page to catch any injections ee needs to add to wp run js.
+		// Note: the intention of this script is to only do TARGETED injections.
+		//ie: only injecting on certain script calls.
+		$this->addJavascript(
+			EspressoLegacyAdminAssetManager::JS_HANDLE_EE_INJECT_WP,
+			EE_ADMIN_URL . 'assets/ee-cpt-wp-injects.js',
+			[JqueryAssetManager::JS_HANDLE_JQUERY]
+		);
+
+		$this->loadQtipJs();
+
+		// joyride is turned OFF by default, but prior to the admin_enqueue_scripts hook,
+		// can be turned back on again via: add_filter('FHEE_load_joyride', '__return_true' );
+		if (! $joyride) {
+			return;
+		}
+
+		$this->addJavascript(
+			EspressoLegacyAdminAssetManager::JS_HANDLE_JOYRIDE_MODERNIZR,
+			EE_THIRD_PARTY_URL . 'joyride/modernizr.mq.js',
+			[],
+			true,
+			'2.1'
+		);
+
+		// wanna go for a joyride?
+		$this->addJavascript(
+			EspressoLegacyAdminAssetManager::JS_HANDLE_JQUERY_JOYRIDE,
+			EE_THIRD_PARTY_URL . 'joyride/jquery.joyride-2.1.js',
+			[
+				JqueryAssetManager::JS_HANDLE_JQUERY_COOKIE,
+				EspressoLegacyAdminAssetManager::JS_HANDLE_JOYRIDE_MODERNIZR,
+			],
+			true,
+			'2.1'
+		)->setEnqueueImmediately();
+
+		$this->addJavascript(
+			EspressoLegacyAdminAssetManager::JS_HANDLE_EE_HELP_TOUR,
+			EE_ADMIN_URL . 'assets/ee-help-tour.js',
+			[
+				EspressoLegacyAdminAssetManager::JS_HANDLE_JQUERY_JOYRIDE,
+			],
+			true,
+			'2.1'
+		)->setEnqueueImmediately();
+	}
+
+
+	/**
+	 * Register CSS assets.
+	 *
+	 * @param bool $joyride
+	 */
+	private function registerStyleSheets($joyride = false)
+	{
+
+		$this->addStylesheet(
+			EspressoLegacyAdminAssetManager::CSS_HANDLE_EE_UI_THEME,
+			EE_GLOBAL_ASSETS_URL . 'css/espresso-ui-theme/jquery-ui-1.10.3.custom.min.css'
+		);
+
+		$this->addStylesheet(
+			EspressoLegacyAdminAssetManager::CSS_HANDLE_EE_TEXT_LINKS,
+			EE_PLUGIN_DIR_URL . 'core/helpers/assets/ee_text_list_helper.css'
+		);
+
+		$this->addStylesheet(
+			EspressoLegacyAdminAssetManager::CSS_HANDLE_EE_ADMIN,
+			EE_ADMIN_URL . 'assets/ee-admin-page.css',
+			['espresso_admin_base']
+		)->setEnqueueImmediately();
+
+		if (
+			apply_filters(
+				'FHEE__EventEspresso_core_domain_services_assets_EspressoLegacyAdminAssetManager__registerStyleSheets__load_media_modal_css',
+				! class_exists('FileBird\Plugin')
+			)
+		) {
+			$this->addStylesheet(
+				EspressoLegacyAdminAssetManager::CSS_HANDLE_EE_ADMIN_MEDIA_MODAL,
+				EE_ADMIN_URL . 'assets/ee-admin-media-modal.css',
+				[EspressoLegacyAdminAssetManager::CSS_HANDLE_EE_ADMIN]
+			)->setEnqueueImmediately();
+		} else {
+			$this->addStylesheet(
+				EspressoLegacyAdminAssetManager::CSS_HANDLE_EE_ADMIN_FILEBIRD,
+				EE_ADMIN_URL . 'assets/ee-admin-media-modal-reset.css',
+				[EspressoLegacyAdminAssetManager::CSS_HANDLE_EE_ADMIN]
+			)->setEnqueueImmediately();
+		}
+
+		if (! $joyride) {
+			return;
+		}
+		// joyride style
+		$this->addStylesheet(
+			EspressoLegacyAdminAssetManager::CSS_HANDLE_JOYRIDE,
+			EE_THIRD_PARTY_URL . 'joyride/joyride-2.1.css',
+			[],
+			'all',
+			'2.1'
+		);
+
+		$this->addStylesheet(
+			EspressoLegacyAdminAssetManager::CSS_HANDLE_EE_JOYRIDE,
+			EE_GLOBAL_ASSETS_URL . 'css/ee-joyride-styles.css',
+			[EspressoLegacyAdminAssetManager::CSS_HANDLE_JOYRIDE]
+		)->setEnqueueImmediately();
+	}
+
+
+	/**
+	 * registers assets for cleaning your ears
+	 */
+	public function loadQtipJs()
+	{
+		// qtip is turned OFF by default, but prior to the wp_enqueue_scripts hook,
+		// can be turned back on again via: add_filter('FHEE_load_qtip', '__return_true' );
+		if (apply_filters('FHEE_load_qtip', false)) {
+			$qtip_loader = EEH_Qtip_Loader::instance();
+			if ($qtip_loader instanceof EEH_Qtip_Loader) {
+				$qtip_loader->register_and_enqueue();
+			}
+		}
+	}
 }

Spacing +22 added lines, -22 removed lines

@@ -78,7 +78,7 @@ 
     {
         $this->addJavascript(
             EspressoLegacyAdminAssetManager::JS_HANDLE_EE_DIALOG,
-            EE_ADMIN_URL . 'assets/ee-dialog-helper.js',
+            EE_ADMIN_URL.'assets/ee-dialog-helper.js',
             [
                 JqueryAssetManager::JS_HANDLE_JQUERY,
                 JqueryAssetManager::JS_HANDLE_JQUERY_UI_DRAGGABLE,
@@ -86,7 +86,7 @@ 
         );
         $this->addJavascript(
             EspressoLegacyAdminAssetManager::JS_HANDLE_EE_ADMIN,
-            EE_ADMIN_URL . 'assets/ee-admin-page.js',
+            EE_ADMIN_URL.'assets/ee-admin-page.js',
             [
                 CoreAssetManager::JS_HANDLE_CORE,
                 EspressoLegacyAdminAssetManager::JS_HANDLE_PARSE_URI,
@@ -97,7 +97,7 @@ 
         // script for sorting tables
         $this->addJavascript(
             EspressoLegacyAdminAssetManager::JS_HANDLE_EE_AJAX_TABLE_SORTING,
-            EE_ADMIN_URL . 'assets/espresso_ajax_table_sorting.js',
+            EE_ADMIN_URL.'assets/espresso_ajax_table_sorting.js',
             [
                 EspressoLegacyAdminAssetManager::JS_HANDLE_EE_ADMIN,
                 JqueryAssetManager::JS_HANDLE_JQUERY_UI_SORTABLE,
@@ -107,13 +107,13 @@ 
         // script for parsing uri's
         $this->addJavascript(
             EspressoLegacyAdminAssetManager::JS_HANDLE_PARSE_URI,
-            EE_GLOBAL_ASSETS_URL . 'scripts/parseuri.js'
+            EE_GLOBAL_ASSETS_URL.'scripts/parseuri.js'
         );
 
         // and parsing associative serialized form elements
         $this->addJavascript(
             EspressoLegacyAdminAssetManager::JS_HANDLE_EE_SERIALIZE_FULL_ARRAY,
-            EE_GLOBAL_ASSETS_URL . 'scripts/jquery.serializefullarray.js',
+            EE_GLOBAL_ASSETS_URL.'scripts/jquery.serializefullarray.js',
             [JqueryAssetManager::JS_HANDLE_JQUERY]
 
         );
@@ -121,24 +121,24 @@ 
         // helpers scripts
         $this->addJavascript(
             EspressoLegacyAdminAssetManager::JS_HANDLE_EE_TEXT_LINKS,
-            EE_PLUGIN_DIR_URL . 'core/helpers/assets/ee_text_list_helper.js',
+            EE_PLUGIN_DIR_URL.'core/helpers/assets/ee_text_list_helper.js',
             [JqueryAssetManager::JS_HANDLE_JQUERY]
         );
 
         $this->addJavascript(
             EspressoLegacyAdminAssetManager::JS_HANDLE_MOMENT_CORE,
-            EE_THIRD_PARTY_URL . 'moment/moment-with-locales.min.js'
+            EE_THIRD_PARTY_URL.'moment/moment-with-locales.min.js'
         );
 
         $this->addJavascript(
             EspressoLegacyAdminAssetManager::JS_HANDLE_MOMENT,
-            EE_THIRD_PARTY_URL . 'moment/moment-timezone-with-data.min.js',
+            EE_THIRD_PARTY_URL.'moment/moment-timezone-with-data.min.js',
             [EspressoLegacyAdminAssetManager::JS_HANDLE_MOMENT_CORE]
         );
 
         $this->addJavascript(
             EspressoLegacyAdminAssetManager::JS_HANDLE_EE_DATEPICKER,
-            EE_ADMIN_URL . 'assets/ee-datepicker.js',
+            EE_ADMIN_URL.'assets/ee-datepicker.js',
             [
                 JqueryAssetManager::JS_HANDLE_JQUERY_UI_TIMEPICKER_ADDON,
                 EspressoLegacyAdminAssetManager::JS_HANDLE_MOMENT,
@@ -156,7 +156,7 @@ 
         //ie: only injecting on certain script calls.
         $this->addJavascript(
             EspressoLegacyAdminAssetManager::JS_HANDLE_EE_INJECT_WP,
-            EE_ADMIN_URL . 'assets/ee-cpt-wp-injects.js',
+            EE_ADMIN_URL.'assets/ee-cpt-wp-injects.js',
             [JqueryAssetManager::JS_HANDLE_JQUERY]
         );
 
@@ -164,13 +164,13 @@ 
 
         // joyride is turned OFF by default, but prior to the admin_enqueue_scripts hook,
         // can be turned back on again via: add_filter('FHEE_load_joyride', '__return_true' );
-        if (! $joyride) {
+        if ( ! $joyride) {
             return;
         }
 
         $this->addJavascript(
             EspressoLegacyAdminAssetManager::JS_HANDLE_JOYRIDE_MODERNIZR,
-            EE_THIRD_PARTY_URL . 'joyride/modernizr.mq.js',
+            EE_THIRD_PARTY_URL.'joyride/modernizr.mq.js',
             [],
             true,
             '2.1'
@@ -179,7 +179,7 @@ 
         // wanna go for a joyride?
         $this->addJavascript(
             EspressoLegacyAdminAssetManager::JS_HANDLE_JQUERY_JOYRIDE,
-            EE_THIRD_PARTY_URL . 'joyride/jquery.joyride-2.1.js',
+            EE_THIRD_PARTY_URL.'joyride/jquery.joyride-2.1.js',
             [
                 JqueryAssetManager::JS_HANDLE_JQUERY_COOKIE,
                 EspressoLegacyAdminAssetManager::JS_HANDLE_JOYRIDE_MODERNIZR,
@@ -190,7 +190,7 @@ 
 
         $this->addJavascript(
             EspressoLegacyAdminAssetManager::JS_HANDLE_EE_HELP_TOUR,
-            EE_ADMIN_URL . 'assets/ee-help-tour.js',
+            EE_ADMIN_URL.'assets/ee-help-tour.js',
             [
                 EspressoLegacyAdminAssetManager::JS_HANDLE_JQUERY_JOYRIDE,
             ],
@@ -210,17 +210,17 @@ 
 
         $this->addStylesheet(
             EspressoLegacyAdminAssetManager::CSS_HANDLE_EE_UI_THEME,
-            EE_GLOBAL_ASSETS_URL . 'css/espresso-ui-theme/jquery-ui-1.10.3.custom.min.css'
+            EE_GLOBAL_ASSETS_URL.'css/espresso-ui-theme/jquery-ui-1.10.3.custom.min.css'
         );
 
         $this->addStylesheet(
             EspressoLegacyAdminAssetManager::CSS_HANDLE_EE_TEXT_LINKS,
-            EE_PLUGIN_DIR_URL . 'core/helpers/assets/ee_text_list_helper.css'
+            EE_PLUGIN_DIR_URL.'core/helpers/assets/ee_text_list_helper.css'
         );
 
         $this->addStylesheet(
             EspressoLegacyAdminAssetManager::CSS_HANDLE_EE_ADMIN,
-            EE_ADMIN_URL . 'assets/ee-admin-page.css',
+            EE_ADMIN_URL.'assets/ee-admin-page.css',
             ['espresso_admin_base']
         )->setEnqueueImmediately();
 
@@ -232,24 +232,24 @@ 
         ) {
             $this->addStylesheet(
                 EspressoLegacyAdminAssetManager::CSS_HANDLE_EE_ADMIN_MEDIA_MODAL,
-                EE_ADMIN_URL . 'assets/ee-admin-media-modal.css',
+                EE_ADMIN_URL.'assets/ee-admin-media-modal.css',
                 [EspressoLegacyAdminAssetManager::CSS_HANDLE_EE_ADMIN]
             )->setEnqueueImmediately();
         } else {
             $this->addStylesheet(
                 EspressoLegacyAdminAssetManager::CSS_HANDLE_EE_ADMIN_FILEBIRD,
-                EE_ADMIN_URL . 'assets/ee-admin-media-modal-reset.css',
+                EE_ADMIN_URL.'assets/ee-admin-media-modal-reset.css',
                 [EspressoLegacyAdminAssetManager::CSS_HANDLE_EE_ADMIN]
             )->setEnqueueImmediately();
         }
 
-        if (! $joyride) {
+        if ( ! $joyride) {
             return;
         }
         // joyride style
         $this->addStylesheet(
             EspressoLegacyAdminAssetManager::CSS_HANDLE_JOYRIDE,
-            EE_THIRD_PARTY_URL . 'joyride/joyride-2.1.css',
+            EE_THIRD_PARTY_URL.'joyride/joyride-2.1.css',
             [],
             'all',
             '2.1'
@@ -257,7 +257,7 @@ 
 
         $this->addStylesheet(
             EspressoLegacyAdminAssetManager::CSS_HANDLE_EE_JOYRIDE,
-            EE_GLOBAL_ASSETS_URL . 'css/ee-joyride-styles.css',
+            EE_GLOBAL_ASSETS_URL.'css/ee-joyride-styles.css',
             [EspressoLegacyAdminAssetManager::CSS_HANDLE_JOYRIDE]
         )->setEnqueueImmediately();
     }

core/domain/entities/notifications/PersistentAdminNotice.php

Indentation +266 added lines, -266 removed lines

@@ -24,270 +24,270 @@
  */
 class PersistentAdminNotice implements RequiresCapCheckInterface
 {
-    protected string $name = '';
-
-    protected string $message = '';
-
-    protected bool $force_update = false;
-
-    protected string $capability = 'manage_options';
-
-    protected string $cap_context = 'view persistent admin notice';
-
-    protected bool $dismissed = false;
-
-    protected ?CapCheckInterface $cap_check = null;
-
-    /**
-     * if true, then this notice will be deleted from the database
-     *
-     * @var boolean $purge
-     */
-    protected bool $purge = false;
-
-    /**
-     * gets set to true if notice is successfully registered with the PersistentAdminNoticeManager
-     * if false, and WP_DEBUG is on, then an exception will be thrown in the admin footer
-     *
-     * @var boolean $registered
-     */
-    private bool $registered = false;
-
-
-    /**
-     * PersistentAdminNotice constructor
-     *
-     * @param string $name         [required] the name, or key of the Persistent Admin Notice to be stored
-     * @param string $message      [required] the message to be stored persistently until dismissed
-     * @param bool   $force_update enforce the reappearance of a persistent message
-     * @param string $capability   user capability required to view this notice
-     * @param string $cap_context  description for why the cap check is being performed
-     * @param bool   $dismissed    whether the user has already dismissed/viewed this notice
-     */
-    public function __construct(
-        string $name,
-        string $message,
-        bool $force_update = false,
-        string $capability = 'manage_options',
-        string $cap_context = 'view persistent admin notice',
-        bool $dismissed = false
-    ) {
-        $this->setName($name);
-        $this->setMessage($message);
-        $this->setForceUpdate($force_update);
-        $this->setCapability($capability);
-        $this->setCapContext($cap_context);
-        $this->setDismissed($dismissed);
-        add_action(
-            'AHEE__EventEspresso_core_services_notifications_PersistentAdminNoticeManager__registerNotices',
-            [$this, 'registerPersistentAdminNotice']
-        );
-        add_action('shutdown', [$this, 'confirmRegistered'], 999);
-    }
-
-
-    /**
-     * @return string
-     */
-    public function getName(): string
-    {
-        return $this->name;
-    }
-
-
-    /**
-     * @param string $name
-     */
-    private function setName(string $name)
-    {
-        $this->name = sanitize_key($name);
-    }
-
-
-    /**
-     * @return string
-     */
-    public function getMessage(): string
-    {
-        return $this->message;
-    }
-
-
-    /**
-     * @param string $message
-     */
-    private function setMessage(string $message)
-    {
-        $allowedtags   = AllowedTags::getAllowedTags();
-        $this->message = wp_kses($message, $allowedtags);
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function getForceUpdate(): bool
-    {
-        return $this->force_update;
-    }
-
-
-    /**
-     * @param bool|int|string $force_update
-     */
-    private function setForceUpdate($force_update)
-    {
-        $this->force_update = filter_var($force_update, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * @return string
-     */
-    public function getCapability(): string
-    {
-        return $this->capability;
-    }
-
-
-    /**
-     * @param string $capability
-     */
-    private function setCapability(string $capability)
-    {
-        $this->capability = ! empty($capability) ? $capability : 'manage_options';
-    }
-
-
-    /**
-     * @return string
-     */
-    public function getCapContext(): string
-    {
-        return $this->cap_context;
-    }
-
-
-    /**
-     * @param string $cap_context
-     */
-    private function setCapContext(string $cap_context)
-    {
-        $this->cap_context = ! empty($cap_context) ? $cap_context : 'view persistent admin notice';
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function getDismissed(): bool
-    {
-        return $this->dismissed;
-    }
-
-
-    /**
-     * @param bool|int|string $dismissed
-     */
-    public function setDismissed($dismissed)
-    {
-        $this->dismissed = filter_var($dismissed, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * @return CapCheckInterface
-     */
-    public function getCapCheck(): ?CapCheckInterface
-    {
-        if (! $this->cap_check instanceof CapCheckInterface) {
-            $this->setCapCheck(new CapCheck($this->capability, $this->cap_context));
-        }
-        return $this->cap_check;
-    }
-
-
-    /**
-     * @param CapCheckInterface $cap_check
-     */
-    private function setCapCheck(CapCheckInterface $cap_check)
-    {
-        $this->cap_check = $cap_check;
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function getPurge(): bool
-    {
-        return $this->purge;
-    }
-
-
-    /**
-     * @param bool|int|string $purge
-     */
-    public function setPurge($purge)
-    {
-        $this->purge = filter_var($purge, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * given a valid PersistentAdminNotice Collection,
-     * this notice will be added if it is not already found in the collection (using its name as the identifier)
-     * if an existing notice is found that has already been dismissed,
-     * but we are overriding with a forced update, then we will toggle its dismissed state,
-     * so that the notice is displayed again
-     *
-     * @param Collection $persistent_admin_notice_collection
-     * @throws InvalidEntityException
-     * @throws DuplicateCollectionIdentifierException
-     */
-    public function registerPersistentAdminNotice(Collection $persistent_admin_notice_collection)
-    {
-        if ($this->registered) {
-            return;
-        }
-        // first check if this notice has already been added to the collection
-        if ($persistent_admin_notice_collection->has($this->name)) {
-            /** @var PersistentAdminNotice $existing */
-            $existing = $persistent_admin_notice_collection->get($this->name);
-            // we don't need to add it again (we can't actually)
-            // but if it has already been dismissed, and we are overriding with a forced update
-            if ($existing->getDismissed() && $this->getForceUpdate()) {
-                // then toggle the notice's dismissed state to true
-                // so that it gets displayed again
-                $existing->setDismissed(false);
-                // and make sure the message is set
-                $existing->setMessage($this->message);
-            }
-        } else {
-            $persistent_admin_notice_collection->add($this, $this->name);
-        }
-        $this->registered = true;
-    }
-
-
-    /**
-     * @throws Exception
-     */
-    public function confirmRegistered()
-    {
-        if (! apply_filters('PersistentAdminNoticeManager__registerAndSaveNotices__complete', false)) {
-            PersistentAdminNoticeManager::loadRegisterAndSaveNotices();
-        }
-        if (! $this->registered && WP_DEBUG) {
-            throw new DomainException(
-                sprintf(
-                    esc_html__(
-                        'The "%1$s" PersistentAdminNotice was not successfully registered. Please ensure that it is being created prior to either the "admin_notices" or "network_admin_notices" hooks being triggered.',
-                        'event_espresso'
-                    ),
-                    $this->name
-                )
-            );
-        }
-    }
+	protected string $name = '';
+
+	protected string $message = '';
+
+	protected bool $force_update = false;
+
+	protected string $capability = 'manage_options';
+
+	protected string $cap_context = 'view persistent admin notice';
+
+	protected bool $dismissed = false;
+
+	protected ?CapCheckInterface $cap_check = null;
+
+	/**
+	 * if true, then this notice will be deleted from the database
+	 *
+	 * @var boolean $purge
+	 */
+	protected bool $purge = false;
+
+	/**
+	 * gets set to true if notice is successfully registered with the PersistentAdminNoticeManager
+	 * if false, and WP_DEBUG is on, then an exception will be thrown in the admin footer
+	 *
+	 * @var boolean $registered
+	 */
+	private bool $registered = false;
+
+
+	/**
+	 * PersistentAdminNotice constructor
+	 *
+	 * @param string $name         [required] the name, or key of the Persistent Admin Notice to be stored
+	 * @param string $message      [required] the message to be stored persistently until dismissed
+	 * @param bool   $force_update enforce the reappearance of a persistent message
+	 * @param string $capability   user capability required to view this notice
+	 * @param string $cap_context  description for why the cap check is being performed
+	 * @param bool   $dismissed    whether the user has already dismissed/viewed this notice
+	 */
+	public function __construct(
+		string $name,
+		string $message,
+		bool $force_update = false,
+		string $capability = 'manage_options',
+		string $cap_context = 'view persistent admin notice',
+		bool $dismissed = false
+	) {
+		$this->setName($name);
+		$this->setMessage($message);
+		$this->setForceUpdate($force_update);
+		$this->setCapability($capability);
+		$this->setCapContext($cap_context);
+		$this->setDismissed($dismissed);
+		add_action(
+			'AHEE__EventEspresso_core_services_notifications_PersistentAdminNoticeManager__registerNotices',
+			[$this, 'registerPersistentAdminNotice']
+		);
+		add_action('shutdown', [$this, 'confirmRegistered'], 999);
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getName(): string
+	{
+		return $this->name;
+	}
+
+
+	/**
+	 * @param string $name
+	 */
+	private function setName(string $name)
+	{
+		$this->name = sanitize_key($name);
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getMessage(): string
+	{
+		return $this->message;
+	}
+
+
+	/**
+	 * @param string $message
+	 */
+	private function setMessage(string $message)
+	{
+		$allowedtags   = AllowedTags::getAllowedTags();
+		$this->message = wp_kses($message, $allowedtags);
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function getForceUpdate(): bool
+	{
+		return $this->force_update;
+	}
+
+
+	/**
+	 * @param bool|int|string $force_update
+	 */
+	private function setForceUpdate($force_update)
+	{
+		$this->force_update = filter_var($force_update, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getCapability(): string
+	{
+		return $this->capability;
+	}
+
+
+	/**
+	 * @param string $capability
+	 */
+	private function setCapability(string $capability)
+	{
+		$this->capability = ! empty($capability) ? $capability : 'manage_options';
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getCapContext(): string
+	{
+		return $this->cap_context;
+	}
+
+
+	/**
+	 * @param string $cap_context
+	 */
+	private function setCapContext(string $cap_context)
+	{
+		$this->cap_context = ! empty($cap_context) ? $cap_context : 'view persistent admin notice';
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function getDismissed(): bool
+	{
+		return $this->dismissed;
+	}
+
+
+	/**
+	 * @param bool|int|string $dismissed
+	 */
+	public function setDismissed($dismissed)
+	{
+		$this->dismissed = filter_var($dismissed, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * @return CapCheckInterface
+	 */
+	public function getCapCheck(): ?CapCheckInterface
+	{
+		if (! $this->cap_check instanceof CapCheckInterface) {
+			$this->setCapCheck(new CapCheck($this->capability, $this->cap_context));
+		}
+		return $this->cap_check;
+	}
+
+
+	/**
+	 * @param CapCheckInterface $cap_check
+	 */
+	private function setCapCheck(CapCheckInterface $cap_check)
+	{
+		$this->cap_check = $cap_check;
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function getPurge(): bool
+	{
+		return $this->purge;
+	}
+
+
+	/**
+	 * @param bool|int|string $purge
+	 */
+	public function setPurge($purge)
+	{
+		$this->purge = filter_var($purge, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * given a valid PersistentAdminNotice Collection,
+	 * this notice will be added if it is not already found in the collection (using its name as the identifier)
+	 * if an existing notice is found that has already been dismissed,
+	 * but we are overriding with a forced update, then we will toggle its dismissed state,
+	 * so that the notice is displayed again
+	 *
+	 * @param Collection $persistent_admin_notice_collection
+	 * @throws InvalidEntityException
+	 * @throws DuplicateCollectionIdentifierException
+	 */
+	public function registerPersistentAdminNotice(Collection $persistent_admin_notice_collection)
+	{
+		if ($this->registered) {
+			return;
+		}
+		// first check if this notice has already been added to the collection
+		if ($persistent_admin_notice_collection->has($this->name)) {
+			/** @var PersistentAdminNotice $existing */
+			$existing = $persistent_admin_notice_collection->get($this->name);
+			// we don't need to add it again (we can't actually)
+			// but if it has already been dismissed, and we are overriding with a forced update
+			if ($existing->getDismissed() && $this->getForceUpdate()) {
+				// then toggle the notice's dismissed state to true
+				// so that it gets displayed again
+				$existing->setDismissed(false);
+				// and make sure the message is set
+				$existing->setMessage($this->message);
+			}
+		} else {
+			$persistent_admin_notice_collection->add($this, $this->name);
+		}
+		$this->registered = true;
+	}
+
+
+	/**
+	 * @throws Exception
+	 */
+	public function confirmRegistered()
+	{
+		if (! apply_filters('PersistentAdminNoticeManager__registerAndSaveNotices__complete', false)) {
+			PersistentAdminNoticeManager::loadRegisterAndSaveNotices();
+		}
+		if (! $this->registered && WP_DEBUG) {
+			throw new DomainException(
+				sprintf(
+					esc_html__(
+						'The "%1$s" PersistentAdminNotice was not successfully registered. Please ensure that it is being created prior to either the "admin_notices" or "network_admin_notices" hooks being triggered.',
+						'event_espresso'
+					),
+					$this->name
+				)
+			);
+		}
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -200,7 +200,7 @@ 
      */
     public function getCapCheck(): ?CapCheckInterface
     {
-        if (! $this->cap_check instanceof CapCheckInterface) {
+        if ( ! $this->cap_check instanceof CapCheckInterface) {
             $this->setCapCheck(new CapCheck($this->capability, $this->cap_context));
         }
         return $this->cap_check;
@@ -275,10 +275,10 @@ 
      */
     public function confirmRegistered()
     {
-        if (! apply_filters('PersistentAdminNoticeManager__registerAndSaveNotices__complete', false)) {
+        if ( ! apply_filters('PersistentAdminNoticeManager__registerAndSaveNotices__complete', false)) {
             PersistentAdminNoticeManager::loadRegisterAndSaveNotices();
         }
-        if (! $this->registered && WP_DEBUG) {
+        if ( ! $this->registered && WP_DEBUG) {
             throw new DomainException(
                 sprintf(
                     esc_html__(

core/services/request/sanitizers/AllowedTags.php

Indentation +294 added lines, -294 removed lines

@@ -12,298 +12,298 @@
  */
 class AllowedTags
 {
-    /**
-     * @var array[]
-     */
-    private static $attributes = [
-        'accept-charset'    => true,
-        'action'            => true,
-        'alt'               => true,
-        'allow'             => true,
-        'allowfullscreen'   => true,
-        'align'             => true,
-        'aria-controls'     => true,
-        'aria-current'      => true,
-        'aria-describedby'  => true,
-        'aria-details'      => true,
-        'aria-expanded'     => true,
-        'aria-hidden'       => true,
-        'aria-label'        => true,
-        'aria-labelledby'   => true,
-        'aria-live'         => true,
-        'autocomplete'      => true,
-        'bgcolor'           => true,
-        'border'            => true,
-        'cellpadding'       => true,
-        'cellspacing'       => true,
-        'checked'           => true,
-        'class'             => true,
-        'cols'              => true,
-        'content'           => true,
-        'data-*'            => true,
-        'dir'               => true,
-        'disabled'          => true,
-        'enctype'           => true,
-        'extension'         => true,
-        'for'               => true,
-        'frameborder'       => true,
-        'height'            => true,
-        'href'              => true,
-        'id'                => true,
-        'itemprop'          => true,
-        'itemscope'         => true,
-        'itemtype'          => true,
-        'label'             => true,
-        'lang'              => true,
-        'leftmargin'        => true,
-        'marginheight'      => true,
-        'marginwidth'       => true,
-        'max'               => true,
-        'maxlength'         => true,
-        'media'             => true,
-        'method'            => true,
-        'min'               => true,
-        'multiple'          => true,
-        'name'              => true,
-        'novalidate'        => true,
-        'onclick'           => true,
-        'placeholder'       => true,
-        'property'          => true,
-        'readonly'          => true,
-        'rel'               => true,
-        'required'          => true,
-        'rows'              => true,
-        'selected'          => true,
-        'src'               => true,
-        'size'              => true,
-        'style'             => true,
-        'step'              => true,
-        'tabindex'          => true,
-        'target'            => true,
-        'title'             => true,
-        'topmargin'         => true,
-        'type'              => true,
-        'value'             => true,
-        'width'             => true,
-        'http-equiv'        => true,
-    ];
-
-
-    /**
-     * @var array
-     */
-    private static $tags = [
-        'a',
-        'abbr',
-        'b',
-        'br',
-        'code',
-        'div',
-        'em',
-        'h1',
-        'h2',
-        'h3',
-        'h4',
-        'h5',
-        'h6',
-        'hr',
-        'i',
-        'img',
-        'li',
-        'ol',
-        'p',
-        'pre',
-        'small',
-        'span',
-        'strong',
-        'table',
-        'td',
-        'tr',
-        'ul',
-    ];
-
-
-    /**
-     * @var array
-     */
-    private static $allowed_tags;
-
-
-    /**
-     * @var array
-     */
-    private static $allowed_with_embed_tags;
-
-
-    /**
-     * @var array
-     */
-    private static $allowed_with_form_tags;
-
-
-    /**
-     * @var array
-     */
-    private static $allowed_with_script_and_style_tags;
-
-    /**
-     * @var array
-     */
-    private static $allowed_with_full_tags;
-
-
-    /**
-     * merges additional tags and attributes into the WP post tags
-     */
-    private static function initializeAllowedTags()
-    {
-        $allowed_post_tags = wp_kses_allowed_html('post');
-        $allowed_tags = [];
-        foreach (AllowedTags::$tags as $tag) {
-            $allowed_tags[ $tag ] = AllowedTags::$attributes;
-        }
-        AllowedTags::$allowed_tags = array_merge_recursive($allowed_post_tags, $allowed_tags);
-    }
-
-
-    /**
-     * merges embed tags and attributes into the EE all tags
-     */
-    private static function initializeWithEmbedTags()
-    {
-        $all_tags = AllowedTags::getAllowedTags();
-        $embed_tags = [
-            'iframe' => AllowedTags::$attributes
-        ];
-        AllowedTags::$allowed_with_embed_tags = array_merge_recursive($all_tags, $embed_tags);
-    }
-
-
-    /**
-     * merges form tags and attributes into the EE all tags
-     */
-    private static function initializeWithFormTags()
-    {
-        $all_tags = AllowedTags::getAllowedTags();
-        $form_tags = [
-            'form'     => AllowedTags::$attributes,
-            'label'    => AllowedTags::$attributes,
-            'input'    => AllowedTags::$attributes,
-            'select'   => AllowedTags::$attributes,
-            'option'   => AllowedTags::$attributes,
-            'optgroup' => AllowedTags::$attributes,
-            'textarea' => AllowedTags::$attributes,
-            'button'   => AllowedTags::$attributes,
-            'fieldset' => AllowedTags::$attributes,
-            'output'   => AllowedTags::$attributes,
-        ];
-        AllowedTags::$allowed_with_form_tags = array_merge_recursive($all_tags, $form_tags);
-    }
-
-
-    /**
-     * merges form script and style tags and attributes into the EE all tags
-     */
-    private static function initializeWithScriptAndStyleTags()
-    {
-        $all_tags = AllowedTags::getAllowedTags();
-        $script_and_style_tags = [
-            'script'   => AllowedTags::$attributes,
-            'style'    => AllowedTags::$attributes,
-            'link'     => AllowedTags::$attributes,
-            'noscript' => AllowedTags::$attributes,
-        ];
-        AllowedTags::$allowed_with_script_and_style_tags = array_merge_recursive($all_tags, $script_and_style_tags);
-    }
-
-    /**
-     * merges all head and body tags and attributes into the EE all tags
-     */
-    private static function initializeWithFullTags()
-    {
-        $all_tags = AllowedTags::getAllowedTags();
-        $full_tags = [
-            'script'    => AllowedTags::$attributes,
-            'style'     => AllowedTags::$attributes,
-            'link'      => AllowedTags::$attributes,
-            'title'     => AllowedTags::$attributes,
-            'meta'      => AllowedTags::$attributes,
-            'iframe'    => AllowedTags::$attributes,
-            'form'      => AllowedTags::$attributes,
-            'label'     => AllowedTags::$attributes,
-            'input'     => AllowedTags::$attributes,
-            'select'    => AllowedTags::$attributes,
-            'option'    => AllowedTags::$attributes,
-            'optgroup'  => AllowedTags::$attributes,
-            'textarea'  => AllowedTags::$attributes,
-            'button'    => AllowedTags::$attributes,
-            'fieldset'  => AllowedTags::$attributes,
-            'output'    => AllowedTags::$attributes,
-            'noscript'  => AllowedTags::$attributes,
-            'html'      => AllowedTags::$attributes,
-            'body'      => AllowedTags::$attributes,
-            'head'      => AllowedTags::$attributes,
-        ];
-        AllowedTags::$allowed_with_full_tags = array_merge_recursive($all_tags, $full_tags);
-    }
-
-
-    /**
-     * @return array[]
-     */
-    public static function getAllowedTags()
-    {
-        if (empty(AllowedTags::$allowed_tags)) {
-            AllowedTags::initializeAllowedTags();
-        }
-        return AllowedTags::$allowed_tags;
-    }
-
-
-    /**
-     * @return array[]
-     */
-    public static function getWithEmbedTags()
-    {
-        if (empty(AllowedTags::$allowed_with_embed_tags)) {
-            AllowedTags::initializeWithEmbedTags();
-        }
-        return AllowedTags::$allowed_with_embed_tags;
-    }
-
-
-    /**
-     * @return array[]
-     */
-    public static function getWithFormTags()
-    {
-        if (empty(AllowedTags::$allowed_with_form_tags)) {
-            AllowedTags::initializeWithFormTags();
-        }
-        return AllowedTags::$allowed_with_form_tags;
-    }
-
-
-    /**
-     * @return array[]
-     */
-    public static function getWithScriptAndStyleTags()
-    {
-        if (empty(AllowedTags::$allowed_with_script_and_style_tags)) {
-            AllowedTags::initializeWithScriptAndStyleTags();
-        }
-        return AllowedTags::$allowed_with_script_and_style_tags;
-    }
-
-
-    /**
-     * @return array[]
-     */
-    public static function getWithFullTags()
-    {
-        if (empty(AllowedTags::$allowed_with_full_tags)) {
-            AllowedTags::initializeWithFullTags();
-        }
-        return AllowedTags::$allowed_with_full_tags;
-    }
+	/**
+	 * @var array[]
+	 */
+	private static $attributes = [
+		'accept-charset'    => true,
+		'action'            => true,
+		'alt'               => true,
+		'allow'             => true,
+		'allowfullscreen'   => true,
+		'align'             => true,
+		'aria-controls'     => true,
+		'aria-current'      => true,
+		'aria-describedby'  => true,
+		'aria-details'      => true,
+		'aria-expanded'     => true,
+		'aria-hidden'       => true,
+		'aria-label'        => true,
+		'aria-labelledby'   => true,
+		'aria-live'         => true,
+		'autocomplete'      => true,
+		'bgcolor'           => true,
+		'border'            => true,
+		'cellpadding'       => true,
+		'cellspacing'       => true,
+		'checked'           => true,
+		'class'             => true,
+		'cols'              => true,
+		'content'           => true,
+		'data-*'            => true,
+		'dir'               => true,
+		'disabled'          => true,
+		'enctype'           => true,
+		'extension'         => true,
+		'for'               => true,
+		'frameborder'       => true,
+		'height'            => true,
+		'href'              => true,
+		'id'                => true,
+		'itemprop'          => true,
+		'itemscope'         => true,
+		'itemtype'          => true,
+		'label'             => true,
+		'lang'              => true,
+		'leftmargin'        => true,
+		'marginheight'      => true,
+		'marginwidth'       => true,
+		'max'               => true,
+		'maxlength'         => true,
+		'media'             => true,
+		'method'            => true,
+		'min'               => true,
+		'multiple'          => true,
+		'name'              => true,
+		'novalidate'        => true,
+		'onclick'           => true,
+		'placeholder'       => true,
+		'property'          => true,
+		'readonly'          => true,
+		'rel'               => true,
+		'required'          => true,
+		'rows'              => true,
+		'selected'          => true,
+		'src'               => true,
+		'size'              => true,
+		'style'             => true,
+		'step'              => true,
+		'tabindex'          => true,
+		'target'            => true,
+		'title'             => true,
+		'topmargin'         => true,
+		'type'              => true,
+		'value'             => true,
+		'width'             => true,
+		'http-equiv'        => true,
+	];
+
+
+	/**
+	 * @var array
+	 */
+	private static $tags = [
+		'a',
+		'abbr',
+		'b',
+		'br',
+		'code',
+		'div',
+		'em',
+		'h1',
+		'h2',
+		'h3',
+		'h4',
+		'h5',
+		'h6',
+		'hr',
+		'i',
+		'img',
+		'li',
+		'ol',
+		'p',
+		'pre',
+		'small',
+		'span',
+		'strong',
+		'table',
+		'td',
+		'tr',
+		'ul',
+	];
+
+
+	/**
+	 * @var array
+	 */
+	private static $allowed_tags;
+
+
+	/**
+	 * @var array
+	 */
+	private static $allowed_with_embed_tags;
+
+
+	/**
+	 * @var array
+	 */
+	private static $allowed_with_form_tags;
+
+
+	/**
+	 * @var array
+	 */
+	private static $allowed_with_script_and_style_tags;
+
+	/**
+	 * @var array
+	 */
+	private static $allowed_with_full_tags;
+
+
+	/**
+	 * merges additional tags and attributes into the WP post tags
+	 */
+	private static function initializeAllowedTags()
+	{
+		$allowed_post_tags = wp_kses_allowed_html('post');
+		$allowed_tags = [];
+		foreach (AllowedTags::$tags as $tag) {
+			$allowed_tags[ $tag ] = AllowedTags::$attributes;
+		}
+		AllowedTags::$allowed_tags = array_merge_recursive($allowed_post_tags, $allowed_tags);
+	}
+
+
+	/**
+	 * merges embed tags and attributes into the EE all tags
+	 */
+	private static function initializeWithEmbedTags()
+	{
+		$all_tags = AllowedTags::getAllowedTags();
+		$embed_tags = [
+			'iframe' => AllowedTags::$attributes
+		];
+		AllowedTags::$allowed_with_embed_tags = array_merge_recursive($all_tags, $embed_tags);
+	}
+
+
+	/**
+	 * merges form tags and attributes into the EE all tags
+	 */
+	private static function initializeWithFormTags()
+	{
+		$all_tags = AllowedTags::getAllowedTags();
+		$form_tags = [
+			'form'     => AllowedTags::$attributes,
+			'label'    => AllowedTags::$attributes,
+			'input'    => AllowedTags::$attributes,
+			'select'   => AllowedTags::$attributes,
+			'option'   => AllowedTags::$attributes,
+			'optgroup' => AllowedTags::$attributes,
+			'textarea' => AllowedTags::$attributes,
+			'button'   => AllowedTags::$attributes,
+			'fieldset' => AllowedTags::$attributes,
+			'output'   => AllowedTags::$attributes,
+		];
+		AllowedTags::$allowed_with_form_tags = array_merge_recursive($all_tags, $form_tags);
+	}
+
+
+	/**
+	 * merges form script and style tags and attributes into the EE all tags
+	 */
+	private static function initializeWithScriptAndStyleTags()
+	{
+		$all_tags = AllowedTags::getAllowedTags();
+		$script_and_style_tags = [
+			'script'   => AllowedTags::$attributes,
+			'style'    => AllowedTags::$attributes,
+			'link'     => AllowedTags::$attributes,
+			'noscript' => AllowedTags::$attributes,
+		];
+		AllowedTags::$allowed_with_script_and_style_tags = array_merge_recursive($all_tags, $script_and_style_tags);
+	}
+
+	/**
+	 * merges all head and body tags and attributes into the EE all tags
+	 */
+	private static function initializeWithFullTags()
+	{
+		$all_tags = AllowedTags::getAllowedTags();
+		$full_tags = [
+			'script'    => AllowedTags::$attributes,
+			'style'     => AllowedTags::$attributes,
+			'link'      => AllowedTags::$attributes,
+			'title'     => AllowedTags::$attributes,
+			'meta'      => AllowedTags::$attributes,
+			'iframe'    => AllowedTags::$attributes,
+			'form'      => AllowedTags::$attributes,
+			'label'     => AllowedTags::$attributes,
+			'input'     => AllowedTags::$attributes,
+			'select'    => AllowedTags::$attributes,
+			'option'    => AllowedTags::$attributes,
+			'optgroup'  => AllowedTags::$attributes,
+			'textarea'  => AllowedTags::$attributes,
+			'button'    => AllowedTags::$attributes,
+			'fieldset'  => AllowedTags::$attributes,
+			'output'    => AllowedTags::$attributes,
+			'noscript'  => AllowedTags::$attributes,
+			'html'      => AllowedTags::$attributes,
+			'body'      => AllowedTags::$attributes,
+			'head'      => AllowedTags::$attributes,
+		];
+		AllowedTags::$allowed_with_full_tags = array_merge_recursive($all_tags, $full_tags);
+	}
+
+
+	/**
+	 * @return array[]
+	 */
+	public static function getAllowedTags()
+	{
+		if (empty(AllowedTags::$allowed_tags)) {
+			AllowedTags::initializeAllowedTags();
+		}
+		return AllowedTags::$allowed_tags;
+	}
+
+
+	/**
+	 * @return array[]
+	 */
+	public static function getWithEmbedTags()
+	{
+		if (empty(AllowedTags::$allowed_with_embed_tags)) {
+			AllowedTags::initializeWithEmbedTags();
+		}
+		return AllowedTags::$allowed_with_embed_tags;
+	}
+
+
+	/**
+	 * @return array[]
+	 */
+	public static function getWithFormTags()
+	{
+		if (empty(AllowedTags::$allowed_with_form_tags)) {
+			AllowedTags::initializeWithFormTags();
+		}
+		return AllowedTags::$allowed_with_form_tags;
+	}
+
+
+	/**
+	 * @return array[]
+	 */
+	public static function getWithScriptAndStyleTags()
+	{
+		if (empty(AllowedTags::$allowed_with_script_and_style_tags)) {
+			AllowedTags::initializeWithScriptAndStyleTags();
+		}
+		return AllowedTags::$allowed_with_script_and_style_tags;
+	}
+
+
+	/**
+	 * @return array[]
+	 */
+	public static function getWithFullTags()
+	{
+		if (empty(AllowedTags::$allowed_with_full_tags)) {
+			AllowedTags::initializeWithFullTags();
+		}
+		return AllowedTags::$allowed_with_full_tags;
+	}
 }