eventespresso / event-espresso-core

core/helpers/EEH_Event_Query.helper.php

Indentation +671 added lines, -671 removed lines

@@ -15,675 +15,675 @@
 class EEH_Event_Query
 {
 
-    /**
-     * Start Date
-     *
-     * @var $_event_query_month
-     */
-    protected static $_event_query_month;
-
-    /**
-     * Category
-     *
-     * @var $_event_query_category
-     */
-    protected static $_event_query_category;
-
-    /**
-     * whether to display expired events in the event list
-     *
-     * @var bool $_show_expired
-     */
-    protected static $_event_query_show_expired = false;
-
-    /**
-     * list of params for controlling how the query results are ordered
-     *
-     * @var array $_event_query_orderby
-     */
-    protected static $_event_query_orderby = array();
-
-    /**
-     * direction list is sorted
-     *
-     * @var string $_event_query_sort
-     */
-    protected static $_event_query_sort;
-
-    /**
-     * list of params used to build the query's various clauses
-     *
-     * @var $_query_params
-     */
-    protected static $_query_params = array();
-
-
-
-    /**
-     * @return void
-     */
-    public static function add_query_filters()
-    {
-        // add query filters
-        add_action('pre_get_posts', array('EEH_Event_Query', 'filter_query_parts'), 10, 1);
-    }
-
-
-
-    /**
-     * @param WP_Query $WP_Query
-     * @return bool
-     */
-    public static function apply_query_filters(WP_Query $WP_Query)
-    {
-        return (
-                   isset($WP_Query->query['post_type'])
-                   && $WP_Query->query['post_type'] === 'espresso_events'
-               )
-               || apply_filters('FHEE__EEH_Event_Query__apply_query_filters', false);
-    }
-
-
-    /**
-     * @param WP_Query $WP_Query
-     */
-    public static function filter_query_parts(WP_Query $WP_Query)
-    {
-        // ONLY add our filters if this isn't the main wp_query,
-        // because if this is the main wp_query we already have
-        // our cpt strategies take care of adding things in.
-        if ($WP_Query instanceof WP_Query && ! $WP_Query->is_main_query()) {
-            // build event list query
-            add_filter('posts_fields', array('EEH_Event_Query', 'posts_fields'), 10, 2);
-            add_filter('posts_join', array('EEH_Event_Query', 'posts_join'), 10, 2);
-            add_filter('posts_where', array('EEH_Event_Query', 'posts_where'), 10, 2);
-            add_filter('posts_orderby', array('EEH_Event_Query', 'posts_orderby'), 10, 2);
-            add_filter('posts_clauses_request', array('EEH_Event_Query', 'posts_clauses'), 10, 2);
-        }
-    }
-
-
-
-    /**
-     * @param string $month
-     * @param string $category
-     * @param bool   $show_expired
-     * @param string $orderby
-     * @param string $sort
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function set_query_params(
-        $month = '',
-        $category = '',
-        $show_expired = false,
-        $orderby = 'start_date',
-        $sort = 'ASC'
-    ) {
-        self::$_query_params                        = array();
-        EEH_Event_Query::$_event_query_month        = EEH_Event_Query::_display_month($month);
-        EEH_Event_Query::$_event_query_category     = EEH_Event_Query::_event_category_slug($category);
-        EEH_Event_Query::$_event_query_show_expired = EEH_Event_Query::_show_expired($show_expired);
-        EEH_Event_Query::$_event_query_orderby      = EEH_Event_Query::_orderby($orderby);
-        EEH_Event_Query::$_event_query_sort         = EEH_Event_Query::_sort($sort);
-    }
-
-
-
-    /**
-     * what month should the event list display events for?
-     *
-     * @param string $month
-     * @return string
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    private static function _display_month($month = '')
-    {
-        return sanitize_text_field(EE_Registry::instance()->REQ->get('event_query_month', $month));
-    }
-
-
-
-    /**
-     * @param string $category
-     * @return string
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    private static function _event_category_slug($category = '')
-    {
-        return sanitize_text_field(EE_Registry::instance()->REQ->get('event_query_category', $category));
-    }
-
-
-
-    /**
-     * @param bool $show_expired
-     * @return bool
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    private static function _show_expired($show_expired = false)
-    {
-        // override default expired option if set via filter
-        return filter_var(
-            EE_Registry::instance()->REQ->get('event_query_show_expired', $show_expired),
-            FILTER_VALIDATE_BOOLEAN
-        );
-    }
-
-
-
-    /**
-     * @param    string $orderby
-     * @return array
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    private static function _orderby($orderby = 'start_date')
-    {
-        $event_query_orderby = EE_Registry::instance()->REQ->get('event_query_orderby', $orderby);
-        $event_query_orderby = is_array($event_query_orderby)
-            ? $event_query_orderby
-            : explode(',', $event_query_orderby);
-        $event_query_orderby = array_map('trim', $event_query_orderby);
-        $event_query_orderby = array_map('sanitize_text_field', $event_query_orderby);
-        return $event_query_orderby;
-    }
-
-
-
-    /**
-     * @param string $sort
-     * @return string
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    private static function _sort($sort = 'ASC')
-    {
-        $sort = EE_Registry::instance()->REQ->get('event_query_sort', $sort);
-        return in_array($sort, array('ASC', 'asc', 'DESC', 'desc'), true)
-            ? strtoupper($sort)
-            : 'ASC';
-    }
-
-
-
-    /**
-     * Filters the clauses for the WP_Query object
-     *
-     * @param array    $clauses array of clauses
-     * @param WP_Query $wp_query
-     * @return array   array of clauses
-     */
-    public static function posts_clauses($clauses, WP_Query $wp_query)
-    {
-        if (EEH_Event_Query::apply_query_filters($wp_query)) {
-            global $wpdb;
-            $clauses['groupby'] = $wpdb->posts . '.ID ';
-        }
-        return $clauses;
-    }
-
-
-
-    /**
-     * @param string   $SQL
-     * @param WP_Query $wp_query
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function posts_fields($SQL, WP_Query $wp_query)
-    {
-        if (EEH_Event_Query::apply_query_filters($wp_query)) {
-            // adds something like ", wp_esp_datetime.* " to WP Query SELECT statement
-            $SQL .= EEH_Event_Query::posts_fields_sql_for_orderby(EEH_Event_Query::$_event_query_orderby);
-        }
-        return $SQL;
-    }
-
-
-
-    /**
-     * @param array $orderby_params
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function posts_fields_sql_for_orderby(array $orderby_params = array())
-    {
-        $SQL = ', MIN( ' . EEM_Datetime::instance()->table() . '.DTT_EVT_start ) as event_start_date ';
-        foreach ($orderby_params as $orderby) {
-            switch ($orderby) {
-                case 'ticket_start':
-                    $SQL .= ', ' . EEM_Ticket::instance()->table() . '.TKT_start_date';
-                    break;
-                case 'ticket_end':
-                    $SQL .= ', ' . EEM_Ticket::instance()->table() . '.TKT_end_date';
-                    break;
-                case 'venue_title':
-                    $SQL .= ', Venue.post_title AS venue_title';
-                    break;
-                case 'city':
-                    $SQL .= ', ' . EEM_Venue::instance()->second_table() . '.VNU_city';
-                    break;
-                case 'state':
-                    $SQL .= ', ' . EEM_State::instance()->table() . '.STA_name';
-                    break;
-            }
-        }
-        return $SQL;
-    }
-
-
-
-    /**
-     * @param string   $SQL
-     * @param WP_Query $wp_query
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function posts_join($SQL = '', WP_Query $wp_query)
-    {
-        if (EEH_Event_Query::apply_query_filters($wp_query)) {
-            // Category
-            $SQL = EEH_Event_Query::posts_join_sql_for_show_expired($SQL, EEH_Event_Query::$_event_query_show_expired);
-            $SQL = EEH_Event_Query::posts_join_sql_for_terms($SQL, EEH_Event_Query::$_event_query_category);
-            $SQL = EEH_Event_Query::posts_join_for_orderby($SQL, EEH_Event_Query::$_event_query_orderby);
-        }
-        return $SQL;
-    }
-
-
-
-    /**
-     * @param string  $SQL
-     * @param boolean $show_expired if TRUE, then displayed past events
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function posts_join_sql_for_show_expired($SQL = '', $show_expired = false)
-    {
-        if (! $show_expired) {
-            $join = EEM_Event::instance()->table() . '.ID = ';
-            $join .= EEM_Datetime::instance()->table() . '.' . EEM_Event::instance()->primary_key_name();
-            // don't add if this is already in the SQL
-            if (strpos($SQL, $join) === false) {
-                $SQL .= ' INNER JOIN ' . EEM_Datetime::instance()->table() . ' ON ( ' . $join . ' ) ';
-            }
-        }
-        return $SQL;
-    }
-
-
-
-    /**
-     * @param string $SQL
-     * @param string $join_terms    pass TRUE or term string, doesn't really matter since this value doesn't really get
-     *                              used for anything yet
-     * @return string
-     */
-    public static function posts_join_sql_for_terms($SQL = '', $join_terms = '')
-    {
-        if (! empty($join_terms)) {
-            global $wpdb;
-            $SQL .= " LEFT JOIN $wpdb->term_relationships ON ($wpdb->posts.ID = $wpdb->term_relationships.object_id)";
-            $SQL .= " LEFT JOIN $wpdb->term_taxonomy ON ($wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id)";
-            $SQL .= " LEFT JOIN $wpdb->terms ON ($wpdb->terms.term_id = $wpdb->term_taxonomy.term_id) ";
-        }
-        return $SQL;
-    }
-
-
-
-    /**
-     * usage:  $SQL .= EEH_Event_Query::posts_join_for_orderby( $orderby_params );
-     *
-     * @param    string $SQL
-     * @param    array  $orderby_params
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function posts_join_for_orderby($SQL = '', array $orderby_params = array())
-    {
-        foreach ($orderby_params as $orderby) {
-            switch ($orderby) {
-                case 'ticket_start':
-                case 'ticket_end':
-                    $SQL .= EEH_Event_Query::_posts_join_for_datetime(
-                        $SQL,
-                        EEM_Datetime_Ticket::instance()->table() . '.' . EEM_Datetime::instance()->primary_key_name()
-                    );
-                    $SQL .= ' LEFT JOIN ' . EEM_Ticket::instance()->table();
-                    $SQL .= ' ON (';
-                    $SQL .= EEM_Datetime_Ticket::instance()->table() . '.' . EEM_Ticket::instance()->primary_key_name();
-                    $SQL .= ' = ';
-                    $SQL .= EEM_Ticket::instance()->table() . '.' . EEM_Ticket::instance()->primary_key_name();
-                    $SQL .= ' )';
-                    break;
-                case 'venue_title':
-                case 'city':
-                    $SQL .= EEH_Event_Query::_posts_join_for_event_venue($SQL);
-                    break;
-                case 'state':
-                    $SQL .= EEH_Event_Query::_posts_join_for_event_venue($SQL);
-                    $SQL .= EEH_Event_Query::_posts_join_for_venue_state($SQL);
-                    break;
-                case 'start_date':
-                default:
-                    $SQL .= EEH_Event_Query::_posts_join_for_datetime($SQL, EEM_Event::instance()->table() . '.ID');
-                    break;
-            }
-        }
-        return $SQL;
-    }
-
-
-
-    /**
-     * @param string $SQL
-     * @param string $join
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    protected static function _posts_join_for_datetime($SQL = '', $join = '')
-    {
-        if (! empty($join)) {
-            $join .= ' = ' . EEM_Datetime::instance()->table() . '.' . EEM_Event::instance()->primary_key_name();
-            if (strpos($SQL, $join) === false) {
-                return ' INNER JOIN ' . EEM_Datetime::instance()->table() . ' ON ( ' . $join . ' )';
-            }
-        }
-        return '';
-    }
-
-
-    /**
-     * @param string $SQL
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    protected static function _posts_join_for_event_venue(string $SQL = ''): string
-    {
-        // grab venue table PK name & event_meta table name
-        $VNU_ID = EEM_Venue::instance()->primary_key_name();
-        $event_meta = EEM_Event::instance()->second_table();
-        // generate conditions for:  Event <=> Venue  JOIN clause
-        $event_venue_join = "Venue.ID = $event_meta.$VNU_ID";
-        // don't add joins if they have already been added
-        if (strpos($SQL, $event_venue_join) === false) {
-            global $wpdb;
-            // grab wp_posts (event), venue, and venue_meta table names
-            $wp_posts = $wpdb->posts;
-            $venue = EEM_Venue::instance()->table();
-            $venue_meta = EEM_Venue::instance()->second_table();
-            // generate JOIN clause for: Event <=> Event Meta
-            $venue_SQL = " LEFT JOIN $event_meta ON ( $wp_posts.ID = $event_meta.EVT_ID )";
-            // generate JOIN clause for: Event Meta <=> Venue
-            $venue_SQL .= " LEFT JOIN $venue AS Venue ON ( $event_venue_join )";
-            // generate JOIN clause for: Venue <=> Venue Meta
-            $venue_SQL .= " LEFT JOIN $venue_meta ON ( Venue.ID = $venue_meta.$VNU_ID )";
-            unset($venue, $VNU_ID, $event_meta, $venue_meta, $event_venue_join);
-            return $venue_SQL;
-        }
-        unset($VNU_ID, $event_meta, $event_venue_join);
-        return '';
-    }
-
-
-
-    /**
-     * @param string $SQL
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    protected static function _posts_join_for_venue_state($SQL = '')
-    {
-        // Venue Meta table name
-        $venue_meta_table = EEM_Venue::instance()->second_table();
-        // State table name
-        $state_table = EEM_State::instance()->table();
-        // State table pk
-        $state_table_pk = EEM_State::instance()->primary_key_name();
-        // verify vars
-        if ($venue_meta_table && $state_table && $state_table_pk) {
-            // like: wp_esp_venue_meta.STA_ID = wp_esp_state.STA_ID
-            $join = "$venue_meta_table.$state_table_pk = $state_table.$state_table_pk";
-            // don't add join if it has already been added
-            if (strpos($SQL, $join) === false) {
-                unset($state_table_pk, $venue_meta_table, $venue_table_pk);
-                return " LEFT JOIN $state_table ON ( $join )";
-            }
-        }
-        unset($join, $state_table, $state_table_pk, $venue_meta_table, $venue_table_pk);
-        return '';
-    }
-
-
-
-    /**
-     * @param string   $SQL
-     * @param WP_Query $wp_query
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function posts_where($SQL = '', WP_Query $wp_query)
-    {
-        if (EEH_Event_Query::apply_query_filters($wp_query)) {
-            // Show Expired ?
-            $SQL .= EEH_Event_Query::posts_where_sql_for_show_expired(EEH_Event_Query::$_event_query_show_expired);
-            // Category
-            $SQL .= EEH_Event_Query::posts_where_sql_for_event_category_slug(EEH_Event_Query::$_event_query_category);
-            // Start Date
-            $SQL .= EEH_Event_Query::posts_where_sql_for_event_list_month(EEH_Event_Query::$_event_query_month);
-        }
-        return $SQL;
-    }
-
-
-
-    /**
-     * @param    boolean $show_expired if TRUE, then displayed past events
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function posts_where_sql_for_show_expired($show_expired = false)
-    {
-        return ! $show_expired
-            ? ' AND ' . EEM_Datetime::instance()->table() . '.DTT_EVT_end > \'' . current_time('mysql', true) . '\' '
-            : '';
-    }
-
-
-
-    /**
-     * @param boolean $event_category_slug
-     * @return string
-     */
-    public static function posts_where_sql_for_event_category_slug($event_category_slug = null)
-    {
-        global $wpdb;
-        if (! empty($event_category_slug)) {
-            $event_category_slugs_array = array_map('trim', explode(',', $event_category_slug));
-            $event_category_slugs_prepare = implode(', ', array_fill(0, count($event_category_slugs_array), '%s'));
-            return $wpdb->prepare(" AND {$wpdb->terms}.slug IN ({$event_category_slugs_prepare}) ", $event_category_slugs_array);
-        }
-        return '';
-    }
-
-
-
-    /**
-     * @param boolean $month
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function posts_where_sql_for_event_list_month($month = null)
-    {
-        $SQL = '';
-        if (! empty($month)) {
-            $datetime_table = EEM_Datetime::instance()->table();
-            // event start date is LESS than the end of the month ( so nothing that doesn't start until next month )
-            $SQL = " AND {$datetime_table}.DTT_EVT_start <= '";
-            $SQL .= date('Y-m-t 23:59:59', \EEH_DTT_Helper::first_of_month_timestamp($month)) . "'";
-            // event end date is GREATER than the start of the month ( so nothing that ended before this month )
-            $SQL .= " AND {$datetime_table}.DTT_EVT_end >= '";
-            $SQL .= date('Y-m-01 0:0:00', \EEH_DTT_Helper::first_of_month_timestamp($month)) . "' ";
-        }
-        return $SQL;
-    }
-
-
-
-    /**
-     * @param string $SQL
-     * @param WP_Query $wp_query
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function posts_orderby($SQL = '', WP_Query $wp_query)
-    {
-        if (EEH_Event_Query::apply_query_filters($wp_query)) {
-            $SQL = EEH_Event_Query::posts_orderby_sql(
-                EEH_Event_Query::$_event_query_orderby,
-                EEH_Event_Query::$_event_query_sort
-            );
-        }
-        return $SQL;
-    }
-
-
-
-    /**
-     *    posts_orderby_sql
-     *    possible parameters:
-     *    ID
-     *    start_date
-     *    end_date
-     *    event_name
-     *    category_slug
-     *    ticket_start
-     *    ticket_end
-     *    venue_title
-     *    city
-     *    state
-     *    **IMPORTANT**
-     *    make sure to also send the $orderby_params array to the posts_join_for_orderby() method
-     *    or else some of the table references below will result in MySQL errors
-     *
-     * @param array  $orderby_params
-     * @param string $sort
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function posts_orderby_sql(array $orderby_params = array(), $sort = 'ASC')
-    {
-        global $wpdb;
-        $SQL     = '';
-        $counter = 0;
-        $sort    = in_array($sort, array('ASC', 'asc', 'DESC', 'desc'), true)
-            ? strtoupper($sort)
-            : 'ASC';
-        // make sure 'orderby' is set in query params
-        if (! isset(self::$_query_params['orderby'])) {
-            self::$_query_params['orderby'] = array();
-        }
-        // loop thru $orderby_params (type cast as array)
-        foreach ($orderby_params as $orderby) {
-            // check if we have already added this param
-            if (isset(self::$_query_params['orderby'][ $orderby ])) {
-                // if so then remove from the $orderby_params so that the count() method below is accurate
-                unset($orderby_params[ $orderby ]);
-                // then bump ahead to the next param
-                continue;
-            }
-            // this will ad a comma depending on whether this is the first or last param
-            $glue = $counter === 0 || $counter === count($orderby_params) ? ' ' : ', ';
-            // ok what's we dealing with?
-            switch ($orderby) {
-                case 'id':
-                case 'ID':
-                    $SQL .= $glue . $wpdb->posts . '.ID ' . $sort;
-                    break;
-                case 'end_date':
-                    $SQL .= $glue . EEM_Datetime::instance()->table() . '.DTT_EVT_end ' . $sort;
-                    break;
-                case 'event_name':
-                    $SQL .= $glue . $wpdb->posts . '.post_title ' . $sort;
-                    break;
-                case 'category_slug':
-                    $SQL .= $glue . $wpdb->terms . '.slug ' . $sort;
-                    break;
-                case 'ticket_start':
-                    $SQL .= $glue . EEM_Ticket::instance()->table() . '.TKT_start_date ' . $sort;
-                    break;
-                case 'ticket_end':
-                    $SQL .= $glue . EEM_Ticket::instance()->table() . '.TKT_end_date ' . $sort;
-                    break;
-                case 'venue_title':
-                    $SQL .= $glue . 'venue_title ' . $sort;
-                    break;
-                case 'city':
-                    $SQL .= $glue . EEM_Venue::instance()->second_table() . '.VNU_city ' . $sort;
-                    break;
-                case 'state':
-                    $SQL .= $glue . EEM_State::instance()->table() . '.STA_name ' . $sort;
-                    break;
-                case 'start_date':
-                default:
-                    $SQL .= $glue . ' event_start_date ' . $sort;
-                    break;
-            }
-            // add to array of orderby params that have been added
-            self::$_query_params['orderby'][ $orderby ] = true;
-            $counter++;
-        }
-        return $SQL;
-    }
+	/**
+	 * Start Date
+	 *
+	 * @var $_event_query_month
+	 */
+	protected static $_event_query_month;
+
+	/**
+	 * Category
+	 *
+	 * @var $_event_query_category
+	 */
+	protected static $_event_query_category;
+
+	/**
+	 * whether to display expired events in the event list
+	 *
+	 * @var bool $_show_expired
+	 */
+	protected static $_event_query_show_expired = false;
+
+	/**
+	 * list of params for controlling how the query results are ordered
+	 *
+	 * @var array $_event_query_orderby
+	 */
+	protected static $_event_query_orderby = array();
+
+	/**
+	 * direction list is sorted
+	 *
+	 * @var string $_event_query_sort
+	 */
+	protected static $_event_query_sort;
+
+	/**
+	 * list of params used to build the query's various clauses
+	 *
+	 * @var $_query_params
+	 */
+	protected static $_query_params = array();
+
+
+
+	/**
+	 * @return void
+	 */
+	public static function add_query_filters()
+	{
+		// add query filters
+		add_action('pre_get_posts', array('EEH_Event_Query', 'filter_query_parts'), 10, 1);
+	}
+
+
+
+	/**
+	 * @param WP_Query $WP_Query
+	 * @return bool
+	 */
+	public static function apply_query_filters(WP_Query $WP_Query)
+	{
+		return (
+				   isset($WP_Query->query['post_type'])
+				   && $WP_Query->query['post_type'] === 'espresso_events'
+			   )
+			   || apply_filters('FHEE__EEH_Event_Query__apply_query_filters', false);
+	}
+
+
+	/**
+	 * @param WP_Query $WP_Query
+	 */
+	public static function filter_query_parts(WP_Query $WP_Query)
+	{
+		// ONLY add our filters if this isn't the main wp_query,
+		// because if this is the main wp_query we already have
+		// our cpt strategies take care of adding things in.
+		if ($WP_Query instanceof WP_Query && ! $WP_Query->is_main_query()) {
+			// build event list query
+			add_filter('posts_fields', array('EEH_Event_Query', 'posts_fields'), 10, 2);
+			add_filter('posts_join', array('EEH_Event_Query', 'posts_join'), 10, 2);
+			add_filter('posts_where', array('EEH_Event_Query', 'posts_where'), 10, 2);
+			add_filter('posts_orderby', array('EEH_Event_Query', 'posts_orderby'), 10, 2);
+			add_filter('posts_clauses_request', array('EEH_Event_Query', 'posts_clauses'), 10, 2);
+		}
+	}
+
+
+
+	/**
+	 * @param string $month
+	 * @param string $category
+	 * @param bool   $show_expired
+	 * @param string $orderby
+	 * @param string $sort
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function set_query_params(
+		$month = '',
+		$category = '',
+		$show_expired = false,
+		$orderby = 'start_date',
+		$sort = 'ASC'
+	) {
+		self::$_query_params                        = array();
+		EEH_Event_Query::$_event_query_month        = EEH_Event_Query::_display_month($month);
+		EEH_Event_Query::$_event_query_category     = EEH_Event_Query::_event_category_slug($category);
+		EEH_Event_Query::$_event_query_show_expired = EEH_Event_Query::_show_expired($show_expired);
+		EEH_Event_Query::$_event_query_orderby      = EEH_Event_Query::_orderby($orderby);
+		EEH_Event_Query::$_event_query_sort         = EEH_Event_Query::_sort($sort);
+	}
+
+
+
+	/**
+	 * what month should the event list display events for?
+	 *
+	 * @param string $month
+	 * @return string
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	private static function _display_month($month = '')
+	{
+		return sanitize_text_field(EE_Registry::instance()->REQ->get('event_query_month', $month));
+	}
+
+
+
+	/**
+	 * @param string $category
+	 * @return string
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	private static function _event_category_slug($category = '')
+	{
+		return sanitize_text_field(EE_Registry::instance()->REQ->get('event_query_category', $category));
+	}
+
+
+
+	/**
+	 * @param bool $show_expired
+	 * @return bool
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	private static function _show_expired($show_expired = false)
+	{
+		// override default expired option if set via filter
+		return filter_var(
+			EE_Registry::instance()->REQ->get('event_query_show_expired', $show_expired),
+			FILTER_VALIDATE_BOOLEAN
+		);
+	}
+
+
+
+	/**
+	 * @param    string $orderby
+	 * @return array
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	private static function _orderby($orderby = 'start_date')
+	{
+		$event_query_orderby = EE_Registry::instance()->REQ->get('event_query_orderby', $orderby);
+		$event_query_orderby = is_array($event_query_orderby)
+			? $event_query_orderby
+			: explode(',', $event_query_orderby);
+		$event_query_orderby = array_map('trim', $event_query_orderby);
+		$event_query_orderby = array_map('sanitize_text_field', $event_query_orderby);
+		return $event_query_orderby;
+	}
+
+
+
+	/**
+	 * @param string $sort
+	 * @return string
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	private static function _sort($sort = 'ASC')
+	{
+		$sort = EE_Registry::instance()->REQ->get('event_query_sort', $sort);
+		return in_array($sort, array('ASC', 'asc', 'DESC', 'desc'), true)
+			? strtoupper($sort)
+			: 'ASC';
+	}
+
+
+
+	/**
+	 * Filters the clauses for the WP_Query object
+	 *
+	 * @param array    $clauses array of clauses
+	 * @param WP_Query $wp_query
+	 * @return array   array of clauses
+	 */
+	public static function posts_clauses($clauses, WP_Query $wp_query)
+	{
+		if (EEH_Event_Query::apply_query_filters($wp_query)) {
+			global $wpdb;
+			$clauses['groupby'] = $wpdb->posts . '.ID ';
+		}
+		return $clauses;
+	}
+
+
+
+	/**
+	 * @param string   $SQL
+	 * @param WP_Query $wp_query
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function posts_fields($SQL, WP_Query $wp_query)
+	{
+		if (EEH_Event_Query::apply_query_filters($wp_query)) {
+			// adds something like ", wp_esp_datetime.* " to WP Query SELECT statement
+			$SQL .= EEH_Event_Query::posts_fields_sql_for_orderby(EEH_Event_Query::$_event_query_orderby);
+		}
+		return $SQL;
+	}
+
+
+
+	/**
+	 * @param array $orderby_params
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function posts_fields_sql_for_orderby(array $orderby_params = array())
+	{
+		$SQL = ', MIN( ' . EEM_Datetime::instance()->table() . '.DTT_EVT_start ) as event_start_date ';
+		foreach ($orderby_params as $orderby) {
+			switch ($orderby) {
+				case 'ticket_start':
+					$SQL .= ', ' . EEM_Ticket::instance()->table() . '.TKT_start_date';
+					break;
+				case 'ticket_end':
+					$SQL .= ', ' . EEM_Ticket::instance()->table() . '.TKT_end_date';
+					break;
+				case 'venue_title':
+					$SQL .= ', Venue.post_title AS venue_title';
+					break;
+				case 'city':
+					$SQL .= ', ' . EEM_Venue::instance()->second_table() . '.VNU_city';
+					break;
+				case 'state':
+					$SQL .= ', ' . EEM_State::instance()->table() . '.STA_name';
+					break;
+			}
+		}
+		return $SQL;
+	}
+
+
+
+	/**
+	 * @param string   $SQL
+	 * @param WP_Query $wp_query
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function posts_join($SQL = '', WP_Query $wp_query)
+	{
+		if (EEH_Event_Query::apply_query_filters($wp_query)) {
+			// Category
+			$SQL = EEH_Event_Query::posts_join_sql_for_show_expired($SQL, EEH_Event_Query::$_event_query_show_expired);
+			$SQL = EEH_Event_Query::posts_join_sql_for_terms($SQL, EEH_Event_Query::$_event_query_category);
+			$SQL = EEH_Event_Query::posts_join_for_orderby($SQL, EEH_Event_Query::$_event_query_orderby);
+		}
+		return $SQL;
+	}
+
+
+
+	/**
+	 * @param string  $SQL
+	 * @param boolean $show_expired if TRUE, then displayed past events
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function posts_join_sql_for_show_expired($SQL = '', $show_expired = false)
+	{
+		if (! $show_expired) {
+			$join = EEM_Event::instance()->table() . '.ID = ';
+			$join .= EEM_Datetime::instance()->table() . '.' . EEM_Event::instance()->primary_key_name();
+			// don't add if this is already in the SQL
+			if (strpos($SQL, $join) === false) {
+				$SQL .= ' INNER JOIN ' . EEM_Datetime::instance()->table() . ' ON ( ' . $join . ' ) ';
+			}
+		}
+		return $SQL;
+	}
+
+
+
+	/**
+	 * @param string $SQL
+	 * @param string $join_terms    pass TRUE or term string, doesn't really matter since this value doesn't really get
+	 *                              used for anything yet
+	 * @return string
+	 */
+	public static function posts_join_sql_for_terms($SQL = '', $join_terms = '')
+	{
+		if (! empty($join_terms)) {
+			global $wpdb;
+			$SQL .= " LEFT JOIN $wpdb->term_relationships ON ($wpdb->posts.ID = $wpdb->term_relationships.object_id)";
+			$SQL .= " LEFT JOIN $wpdb->term_taxonomy ON ($wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id)";
+			$SQL .= " LEFT JOIN $wpdb->terms ON ($wpdb->terms.term_id = $wpdb->term_taxonomy.term_id) ";
+		}
+		return $SQL;
+	}
+
+
+
+	/**
+	 * usage:  $SQL .= EEH_Event_Query::posts_join_for_orderby( $orderby_params );
+	 *
+	 * @param    string $SQL
+	 * @param    array  $orderby_params
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function posts_join_for_orderby($SQL = '', array $orderby_params = array())
+	{
+		foreach ($orderby_params as $orderby) {
+			switch ($orderby) {
+				case 'ticket_start':
+				case 'ticket_end':
+					$SQL .= EEH_Event_Query::_posts_join_for_datetime(
+						$SQL,
+						EEM_Datetime_Ticket::instance()->table() . '.' . EEM_Datetime::instance()->primary_key_name()
+					);
+					$SQL .= ' LEFT JOIN ' . EEM_Ticket::instance()->table();
+					$SQL .= ' ON (';
+					$SQL .= EEM_Datetime_Ticket::instance()->table() . '.' . EEM_Ticket::instance()->primary_key_name();
+					$SQL .= ' = ';
+					$SQL .= EEM_Ticket::instance()->table() . '.' . EEM_Ticket::instance()->primary_key_name();
+					$SQL .= ' )';
+					break;
+				case 'venue_title':
+				case 'city':
+					$SQL .= EEH_Event_Query::_posts_join_for_event_venue($SQL);
+					break;
+				case 'state':
+					$SQL .= EEH_Event_Query::_posts_join_for_event_venue($SQL);
+					$SQL .= EEH_Event_Query::_posts_join_for_venue_state($SQL);
+					break;
+				case 'start_date':
+				default:
+					$SQL .= EEH_Event_Query::_posts_join_for_datetime($SQL, EEM_Event::instance()->table() . '.ID');
+					break;
+			}
+		}
+		return $SQL;
+	}
+
+
+
+	/**
+	 * @param string $SQL
+	 * @param string $join
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	protected static function _posts_join_for_datetime($SQL = '', $join = '')
+	{
+		if (! empty($join)) {
+			$join .= ' = ' . EEM_Datetime::instance()->table() . '.' . EEM_Event::instance()->primary_key_name();
+			if (strpos($SQL, $join) === false) {
+				return ' INNER JOIN ' . EEM_Datetime::instance()->table() . ' ON ( ' . $join . ' )';
+			}
+		}
+		return '';
+	}
+
+
+	/**
+	 * @param string $SQL
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	protected static function _posts_join_for_event_venue(string $SQL = ''): string
+	{
+		// grab venue table PK name & event_meta table name
+		$VNU_ID = EEM_Venue::instance()->primary_key_name();
+		$event_meta = EEM_Event::instance()->second_table();
+		// generate conditions for:  Event <=> Venue  JOIN clause
+		$event_venue_join = "Venue.ID = $event_meta.$VNU_ID";
+		// don't add joins if they have already been added
+		if (strpos($SQL, $event_venue_join) === false) {
+			global $wpdb;
+			// grab wp_posts (event), venue, and venue_meta table names
+			$wp_posts = $wpdb->posts;
+			$venue = EEM_Venue::instance()->table();
+			$venue_meta = EEM_Venue::instance()->second_table();
+			// generate JOIN clause for: Event <=> Event Meta
+			$venue_SQL = " LEFT JOIN $event_meta ON ( $wp_posts.ID = $event_meta.EVT_ID )";
+			// generate JOIN clause for: Event Meta <=> Venue
+			$venue_SQL .= " LEFT JOIN $venue AS Venue ON ( $event_venue_join )";
+			// generate JOIN clause for: Venue <=> Venue Meta
+			$venue_SQL .= " LEFT JOIN $venue_meta ON ( Venue.ID = $venue_meta.$VNU_ID )";
+			unset($venue, $VNU_ID, $event_meta, $venue_meta, $event_venue_join);
+			return $venue_SQL;
+		}
+		unset($VNU_ID, $event_meta, $event_venue_join);
+		return '';
+	}
+
+
+
+	/**
+	 * @param string $SQL
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	protected static function _posts_join_for_venue_state($SQL = '')
+	{
+		// Venue Meta table name
+		$venue_meta_table = EEM_Venue::instance()->second_table();
+		// State table name
+		$state_table = EEM_State::instance()->table();
+		// State table pk
+		$state_table_pk = EEM_State::instance()->primary_key_name();
+		// verify vars
+		if ($venue_meta_table && $state_table && $state_table_pk) {
+			// like: wp_esp_venue_meta.STA_ID = wp_esp_state.STA_ID
+			$join = "$venue_meta_table.$state_table_pk = $state_table.$state_table_pk";
+			// don't add join if it has already been added
+			if (strpos($SQL, $join) === false) {
+				unset($state_table_pk, $venue_meta_table, $venue_table_pk);
+				return " LEFT JOIN $state_table ON ( $join )";
+			}
+		}
+		unset($join, $state_table, $state_table_pk, $venue_meta_table, $venue_table_pk);
+		return '';
+	}
+
+
+
+	/**
+	 * @param string   $SQL
+	 * @param WP_Query $wp_query
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function posts_where($SQL = '', WP_Query $wp_query)
+	{
+		if (EEH_Event_Query::apply_query_filters($wp_query)) {
+			// Show Expired ?
+			$SQL .= EEH_Event_Query::posts_where_sql_for_show_expired(EEH_Event_Query::$_event_query_show_expired);
+			// Category
+			$SQL .= EEH_Event_Query::posts_where_sql_for_event_category_slug(EEH_Event_Query::$_event_query_category);
+			// Start Date
+			$SQL .= EEH_Event_Query::posts_where_sql_for_event_list_month(EEH_Event_Query::$_event_query_month);
+		}
+		return $SQL;
+	}
+
+
+
+	/**
+	 * @param    boolean $show_expired if TRUE, then displayed past events
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function posts_where_sql_for_show_expired($show_expired = false)
+	{
+		return ! $show_expired
+			? ' AND ' . EEM_Datetime::instance()->table() . '.DTT_EVT_end > \'' . current_time('mysql', true) . '\' '
+			: '';
+	}
+
+
+
+	/**
+	 * @param boolean $event_category_slug
+	 * @return string
+	 */
+	public static function posts_where_sql_for_event_category_slug($event_category_slug = null)
+	{
+		global $wpdb;
+		if (! empty($event_category_slug)) {
+			$event_category_slugs_array = array_map('trim', explode(',', $event_category_slug));
+			$event_category_slugs_prepare = implode(', ', array_fill(0, count($event_category_slugs_array), '%s'));
+			return $wpdb->prepare(" AND {$wpdb->terms}.slug IN ({$event_category_slugs_prepare}) ", $event_category_slugs_array);
+		}
+		return '';
+	}
+
+
+
+	/**
+	 * @param boolean $month
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function posts_where_sql_for_event_list_month($month = null)
+	{
+		$SQL = '';
+		if (! empty($month)) {
+			$datetime_table = EEM_Datetime::instance()->table();
+			// event start date is LESS than the end of the month ( so nothing that doesn't start until next month )
+			$SQL = " AND {$datetime_table}.DTT_EVT_start <= '";
+			$SQL .= date('Y-m-t 23:59:59', \EEH_DTT_Helper::first_of_month_timestamp($month)) . "'";
+			// event end date is GREATER than the start of the month ( so nothing that ended before this month )
+			$SQL .= " AND {$datetime_table}.DTT_EVT_end >= '";
+			$SQL .= date('Y-m-01 0:0:00', \EEH_DTT_Helper::first_of_month_timestamp($month)) . "' ";
+		}
+		return $SQL;
+	}
+
+
+
+	/**
+	 * @param string $SQL
+	 * @param WP_Query $wp_query
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function posts_orderby($SQL = '', WP_Query $wp_query)
+	{
+		if (EEH_Event_Query::apply_query_filters($wp_query)) {
+			$SQL = EEH_Event_Query::posts_orderby_sql(
+				EEH_Event_Query::$_event_query_orderby,
+				EEH_Event_Query::$_event_query_sort
+			);
+		}
+		return $SQL;
+	}
+
+
+
+	/**
+	 *    posts_orderby_sql
+	 *    possible parameters:
+	 *    ID
+	 *    start_date
+	 *    end_date
+	 *    event_name
+	 *    category_slug
+	 *    ticket_start
+	 *    ticket_end
+	 *    venue_title
+	 *    city
+	 *    state
+	 *    **IMPORTANT**
+	 *    make sure to also send the $orderby_params array to the posts_join_for_orderby() method
+	 *    or else some of the table references below will result in MySQL errors
+	 *
+	 * @param array  $orderby_params
+	 * @param string $sort
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function posts_orderby_sql(array $orderby_params = array(), $sort = 'ASC')
+	{
+		global $wpdb;
+		$SQL     = '';
+		$counter = 0;
+		$sort    = in_array($sort, array('ASC', 'asc', 'DESC', 'desc'), true)
+			? strtoupper($sort)
+			: 'ASC';
+		// make sure 'orderby' is set in query params
+		if (! isset(self::$_query_params['orderby'])) {
+			self::$_query_params['orderby'] = array();
+		}
+		// loop thru $orderby_params (type cast as array)
+		foreach ($orderby_params as $orderby) {
+			// check if we have already added this param
+			if (isset(self::$_query_params['orderby'][ $orderby ])) {
+				// if so then remove from the $orderby_params so that the count() method below is accurate
+				unset($orderby_params[ $orderby ]);
+				// then bump ahead to the next param
+				continue;
+			}
+			// this will ad a comma depending on whether this is the first or last param
+			$glue = $counter === 0 || $counter === count($orderby_params) ? ' ' : ', ';
+			// ok what's we dealing with?
+			switch ($orderby) {
+				case 'id':
+				case 'ID':
+					$SQL .= $glue . $wpdb->posts . '.ID ' . $sort;
+					break;
+				case 'end_date':
+					$SQL .= $glue . EEM_Datetime::instance()->table() . '.DTT_EVT_end ' . $sort;
+					break;
+				case 'event_name':
+					$SQL .= $glue . $wpdb->posts . '.post_title ' . $sort;
+					break;
+				case 'category_slug':
+					$SQL .= $glue . $wpdb->terms . '.slug ' . $sort;
+					break;
+				case 'ticket_start':
+					$SQL .= $glue . EEM_Ticket::instance()->table() . '.TKT_start_date ' . $sort;
+					break;
+				case 'ticket_end':
+					$SQL .= $glue . EEM_Ticket::instance()->table() . '.TKT_end_date ' . $sort;
+					break;
+				case 'venue_title':
+					$SQL .= $glue . 'venue_title ' . $sort;
+					break;
+				case 'city':
+					$SQL .= $glue . EEM_Venue::instance()->second_table() . '.VNU_city ' . $sort;
+					break;
+				case 'state':
+					$SQL .= $glue . EEM_State::instance()->table() . '.STA_name ' . $sort;
+					break;
+				case 'start_date':
+				default:
+					$SQL .= $glue . ' event_start_date ' . $sort;
+					break;
+			}
+			// add to array of orderby params that have been added
+			self::$_query_params['orderby'][ $orderby ] = true;
+			$counter++;
+		}
+		return $SQL;
+	}
 }

Spacing +38 added lines, -38 removed lines

@@ -227,7 +227,7 @@ 
     {
         if (EEH_Event_Query::apply_query_filters($wp_query)) {
             global $wpdb;
-            $clauses['groupby'] = $wpdb->posts . '.ID ';
+            $clauses['groupby'] = $wpdb->posts.'.ID ';
         }
         return $clauses;
     }
@@ -264,23 +264,23 @@ 
      */
     public static function posts_fields_sql_for_orderby(array $orderby_params = array())
     {
-        $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 ';
         foreach ($orderby_params as $orderby) {
             switch ($orderby) {
                 case 'ticket_start':
-                    $SQL .= ', ' . EEM_Ticket::instance()->table() . '.TKT_start_date';
+                    $SQL .= ', '.EEM_Ticket::instance()->table().'.TKT_start_date';
                     break;
                 case 'ticket_end':
-                    $SQL .= ', ' . EEM_Ticket::instance()->table() . '.TKT_end_date';
+                    $SQL .= ', '.EEM_Ticket::instance()->table().'.TKT_end_date';
                     break;
                 case 'venue_title':
                     $SQL .= ', Venue.post_title AS venue_title';
                     break;
                 case 'city':
-                    $SQL .= ', ' . EEM_Venue::instance()->second_table() . '.VNU_city';
+                    $SQL .= ', '.EEM_Venue::instance()->second_table().'.VNU_city';
                     break;
                 case 'state':
-                    $SQL .= ', ' . EEM_State::instance()->table() . '.STA_name';
+                    $SQL .= ', '.EEM_State::instance()->table().'.STA_name';
                     break;
             }
         }
@@ -322,12 +322,12 @@ 
      */
     public static function posts_join_sql_for_show_expired($SQL = '', $show_expired = false)
     {
-        if (! $show_expired) {
-            $join = EEM_Event::instance()->table() . '.ID = ';
-            $join .= EEM_Datetime::instance()->table() . '.' . EEM_Event::instance()->primary_key_name();
+        if ( ! $show_expired) {
+            $join = EEM_Event::instance()->table().'.ID = ';
+            $join .= EEM_Datetime::instance()->table().'.'.EEM_Event::instance()->primary_key_name();
             // don't add if this is already in the SQL
             if (strpos($SQL, $join) === false) {
-                $SQL .= ' INNER JOIN ' . EEM_Datetime::instance()->table() . ' ON ( ' . $join . ' ) ';
+                $SQL .= ' INNER JOIN '.EEM_Datetime::instance()->table().' ON ( '.$join.' ) ';
             }
         }
         return $SQL;
@@ -343,7 +343,7 @@ 
      */
     public static function posts_join_sql_for_terms($SQL = '', $join_terms = '')
     {
-        if (! empty($join_terms)) {
+        if ( ! empty($join_terms)) {
             global $wpdb;
             $SQL .= " LEFT JOIN $wpdb->term_relationships ON ($wpdb->posts.ID = $wpdb->term_relationships.object_id)";
             $SQL .= " LEFT JOIN $wpdb->term_taxonomy ON ($wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id)";
@@ -373,13 +373,13 @@ 
                 case 'ticket_end':
                     $SQL .= EEH_Event_Query::_posts_join_for_datetime(
                         $SQL,
-                        EEM_Datetime_Ticket::instance()->table() . '.' . EEM_Datetime::instance()->primary_key_name()
+                        EEM_Datetime_Ticket::instance()->table().'.'.EEM_Datetime::instance()->primary_key_name()
                     );
-                    $SQL .= ' LEFT JOIN ' . EEM_Ticket::instance()->table();
+                    $SQL .= ' LEFT JOIN '.EEM_Ticket::instance()->table();
                     $SQL .= ' ON (';
-                    $SQL .= EEM_Datetime_Ticket::instance()->table() . '.' . EEM_Ticket::instance()->primary_key_name();
+                    $SQL .= EEM_Datetime_Ticket::instance()->table().'.'.EEM_Ticket::instance()->primary_key_name();
                     $SQL .= ' = ';
-                    $SQL .= EEM_Ticket::instance()->table() . '.' . EEM_Ticket::instance()->primary_key_name();
+                    $SQL .= EEM_Ticket::instance()->table().'.'.EEM_Ticket::instance()->primary_key_name();
                     $SQL .= ' )';
                     break;
                 case 'venue_title':
@@ -392,7 +392,7 @@ 
                     break;
                 case 'start_date':
                 default:
-                    $SQL .= EEH_Event_Query::_posts_join_for_datetime($SQL, EEM_Event::instance()->table() . '.ID');
+                    $SQL .= EEH_Event_Query::_posts_join_for_datetime($SQL, EEM_Event::instance()->table().'.ID');
                     break;
             }
         }
@@ -412,10 +412,10 @@ 
      */
     protected static function _posts_join_for_datetime($SQL = '', $join = '')
     {
-        if (! empty($join)) {
-            $join .= ' = ' . EEM_Datetime::instance()->table() . '.' . EEM_Event::instance()->primary_key_name();
+        if ( ! empty($join)) {
+            $join .= ' = '.EEM_Datetime::instance()->table().'.'.EEM_Event::instance()->primary_key_name();
             if (strpos($SQL, $join) === false) {
-                return ' INNER JOIN ' . EEM_Datetime::instance()->table() . ' ON ( ' . $join . ' )';
+                return ' INNER JOIN '.EEM_Datetime::instance()->table().' ON ( '.$join.' )';
             }
         }
         return '';
@@ -527,7 +527,7 @@ 
     public static function posts_where_sql_for_show_expired($show_expired = false)
     {
         return ! $show_expired
-            ? ' AND ' . EEM_Datetime::instance()->table() . '.DTT_EVT_end > \'' . current_time('mysql', true) . '\' '
+            ? ' AND '.EEM_Datetime::instance()->table().'.DTT_EVT_end > \''.current_time('mysql', true).'\' '
             : '';
     }
 
@@ -540,7 +540,7 @@ 
     public static function posts_where_sql_for_event_category_slug($event_category_slug = null)
     {
         global $wpdb;
-        if (! empty($event_category_slug)) {
+        if ( ! empty($event_category_slug)) {
             $event_category_slugs_array = array_map('trim', explode(',', $event_category_slug));
             $event_category_slugs_prepare = implode(', ', array_fill(0, count($event_category_slugs_array), '%s'));
             return $wpdb->prepare(" AND {$wpdb->terms}.slug IN ({$event_category_slugs_prepare}) ", $event_category_slugs_array);
@@ -561,14 +561,14 @@ 
     public static function posts_where_sql_for_event_list_month($month = null)
     {
         $SQL = '';
-        if (! empty($month)) {
+        if ( ! empty($month)) {
             $datetime_table = EEM_Datetime::instance()->table();
             // event start date is LESS than the end of the month ( so nothing that doesn't start until next month )
             $SQL = " AND {$datetime_table}.DTT_EVT_start <= '";
-            $SQL .= date('Y-m-t 23:59:59', \EEH_DTT_Helper::first_of_month_timestamp($month)) . "'";
+            $SQL .= date('Y-m-t 23:59:59', \EEH_DTT_Helper::first_of_month_timestamp($month))."'";
             // event end date is GREATER than the start of the month ( so nothing that ended before this month )
             $SQL .= " AND {$datetime_table}.DTT_EVT_end >= '";
-            $SQL .= date('Y-m-01 0:0:00', \EEH_DTT_Helper::first_of_month_timestamp($month)) . "' ";
+            $SQL .= date('Y-m-01 0:0:00', \EEH_DTT_Helper::first_of_month_timestamp($month))."' ";
         }
         return $SQL;
     }
@@ -631,15 +631,15 @@ 
             ? strtoupper($sort)
             : 'ASC';
         // make sure 'orderby' is set in query params
-        if (! isset(self::$_query_params['orderby'])) {
+        if ( ! isset(self::$_query_params['orderby'])) {
             self::$_query_params['orderby'] = array();
         }
         // loop thru $orderby_params (type cast as array)
         foreach ($orderby_params as $orderby) {
             // check if we have already added this param
-            if (isset(self::$_query_params['orderby'][ $orderby ])) {
+            if (isset(self::$_query_params['orderby'][$orderby])) {
                 // if so then remove from the $orderby_params so that the count() method below is accurate
-                unset($orderby_params[ $orderby ]);
+                unset($orderby_params[$orderby]);
                 // then bump ahead to the next param
                 continue;
             }
@@ -649,39 +649,39 @@ 
             switch ($orderby) {
                 case 'id':
                 case 'ID':
-                    $SQL .= $glue . $wpdb->posts . '.ID ' . $sort;
+                    $SQL .= $glue.$wpdb->posts.'.ID '.$sort;
                     break;
                 case 'end_date':
-                    $SQL .= $glue . EEM_Datetime::instance()->table() . '.DTT_EVT_end ' . $sort;
+                    $SQL .= $glue.EEM_Datetime::instance()->table().'.DTT_EVT_end '.$sort;
                     break;
                 case 'event_name':
-                    $SQL .= $glue . $wpdb->posts . '.post_title ' . $sort;
+                    $SQL .= $glue.$wpdb->posts.'.post_title '.$sort;
                     break;
                 case 'category_slug':
-                    $SQL .= $glue . $wpdb->terms . '.slug ' . $sort;
+                    $SQL .= $glue.$wpdb->terms.'.slug '.$sort;
                     break;
                 case 'ticket_start':
-                    $SQL .= $glue . EEM_Ticket::instance()->table() . '.TKT_start_date ' . $sort;
+                    $SQL .= $glue.EEM_Ticket::instance()->table().'.TKT_start_date '.$sort;
                     break;
                 case 'ticket_end':
-                    $SQL .= $glue . EEM_Ticket::instance()->table() . '.TKT_end_date ' . $sort;
+                    $SQL .= $glue.EEM_Ticket::instance()->table().'.TKT_end_date '.$sort;
                     break;
                 case 'venue_title':
-                    $SQL .= $glue . 'venue_title ' . $sort;
+                    $SQL .= $glue.'venue_title '.$sort;
                     break;
                 case 'city':
-                    $SQL .= $glue . EEM_Venue::instance()->second_table() . '.VNU_city ' . $sort;
+                    $SQL .= $glue.EEM_Venue::instance()->second_table().'.VNU_city '.$sort;
                     break;
                 case 'state':
-                    $SQL .= $glue . EEM_State::instance()->table() . '.STA_name ' . $sort;
+                    $SQL .= $glue.EEM_State::instance()->table().'.STA_name '.$sort;
                     break;
                 case 'start_date':
                 default:
-                    $SQL .= $glue . ' event_start_date ' . $sort;
+                    $SQL .= $glue.' event_start_date '.$sort;
                     break;
             }
             // add to array of orderby params that have been added
-            self::$_query_params['orderby'][ $orderby ] = true;
+            self::$_query_params['orderby'][$orderby] = true;
             $counter++;
         }
         return $SQL;

core/db_models/EEM_Venue.model.php

Indentation +182 added lines, -182 removed lines

@@ -11,189 +11,189 @@
 class EEM_Venue extends EEM_CPT_Base
 {
 
-    // private instance of the Attendee object
-    protected static $_instance = null;
+	// private instance of the Attendee object
+	protected static $_instance = null;
 
 
 
-    protected function __construct($timezone = null)
-    {
-        $this->singular_item = __('Venue', 'event_espresso');
-        $this->plural_item = __('Venues', 'event_espresso');
-        $this->_tables = array(
-            'Venue_CPT'  => new EE_Primary_Table('posts', 'ID'),
-            'Venue_Meta' => new EE_Secondary_Table('esp_venue_meta', 'VNUM_ID', 'VNU_ID'),
-        );
-        $this->_fields = array(
-            'Venue_CPT'  => array(
-                'VNU_ID'         => new EE_Primary_Key_Int_Field('ID', __("Venue ID", "event_espresso")),
-                'VNU_name'       => new EE_Plain_Text_Field(
-                    'post_title',
-                    __("Venue Name", "event_espresso"),
-                    false,
-                    ''
-                ),
-                'VNU_desc'       => new EE_Post_Content_Field(
-                    'post_content',
-                    __("Venue Description", "event_espresso"),
-                    false,
-                    ''
-                ),
-                'VNU_identifier' => new EE_Slug_Field('post_name', __("Venue Identifier", "event_espresso"), false, ''),
-                'VNU_created'    => new EE_Datetime_Field(
-                    'post_date',
-                    __("Date Venue Created", "event_espresso"),
-                    false,
-                    EE_Datetime_Field::now
-                ),
-                'VNU_short_desc' => new EE_Plain_Text_Field(
-                    'post_excerpt',
-                    __("Short Description of Venue", "event_espresso"),
-                    true,
-                    ''
-                ),
-                'VNU_modified'   => new EE_Datetime_Field(
-                    'post_modified',
-                    __("Venue Modified Date", "event_espresso"),
-                    false,
-                    EE_Datetime_Field::now
-                ),
-                'VNU_wp_user'    => new EE_WP_User_Field(
-                    'post_author',
-                    __("Venue Creator ID", "event_espresso"),
-                    false
-                ),
-                'parent'         => new EE_Integer_Field(
-                    'post_parent',
-                    __("Venue Parent ID", "event_espresso"),
-                    false,
-                    0
-                ),
-                'VNU_order'      => new EE_Integer_Field('menu_order', __("Venue order", "event_espresso"), false, 1),
-                'post_type'      => new EE_WP_Post_Type_Field('espresso_venues'),
-                'password' => new EE_Password_Field(
-                    'post_password',
-                    __('Password', 'event_espresso'),
-                    false,
-                    '',
-                    array(
-                        'VNU_desc',
-                        'VNU_short_desc',
-                        'VNU_address',
-                        'VNU_address2',
-                        'VNU_city',
-                        'STA_ID',
-                        'CNT_ISO',
-                        'VNU_zip',
-                        'VNU_phone',
-                        'VNU_capacity',
-                        'VNU_url',
-                        'VNU_virtual_phone',
-                        'VNU_virtual_url',
-                        'VNU_google_map_link',
-                        'VNU_enable_for_gmap',
-                    )
-                )
-            ),
-            'Venue_Meta' => array(
-                'VNUM_ID'             => new EE_DB_Only_Int_Field(
-                    'VNUM_ID',
-                    __("ID of Venue Meta Row", "event_espresso"),
-                    false
-                ),
-                'VNU_ID_fk'           => new EE_DB_Only_Int_Field(
-                    'VNU_ID',
-                    __("Foreign Key to Venue Post ", "event_espresso"),
-                    false
-                ),
-                'VNU_address'         => new EE_Plain_Text_Field(
-                    'VNU_address',
-                    __("Venue Address line 1", "event_espresso"),
-                    true,
-                    ''
-                ),
-                'VNU_address2'        => new EE_Plain_Text_Field(
-                    'VNU_address2',
-                    __("Venue Address line 2", "event_espresso"),
-                    true,
-                    ''
-                ),
-                'VNU_city'            => new EE_Plain_Text_Field(
-                    'VNU_city',
-                    __("Venue City", "event_espresso"),
-                    true,
-                    ''
-                ),
-                'STA_ID'              => new EE_Foreign_Key_Int_Field(
-                    'STA_ID',
-                    __("State ID", "event_espresso"),
-                    true,
-                    null,
-                    'State'
-                ),
-                'CNT_ISO'             => new EE_Foreign_Key_String_Field(
-                    'CNT_ISO',
-                    __("Country Code", "event_espresso"),
-                    true,
-                    null,
-                    'Country'
-                ),
-                'VNU_zip'             => new EE_Plain_Text_Field(
-                    'VNU_zip',
-                    __("Venue Zip/Postal Code", "event_espresso"),
-                    true
-                ),
-                'VNU_phone'           => new EE_Plain_Text_Field(
-                    'VNU_phone',
-                    __("Venue Phone", "event_espresso"),
-                    true
-                ),
-                'VNU_capacity'        => new EE_Infinite_Integer_Field(
-                    'VNU_capacity',
-                    __("Venue Capacity", "event_espresso"),
-                    true,
-                    EE_INF
-                ),
-                'VNU_url'             => new EE_Plain_Text_Field(
-                    'VNU_url',
-                    __('Venue Website', 'event_espresso'),
-                    true
-                ),
-                'VNU_virtual_phone'   => new EE_Plain_Text_Field(
-                    'VNU_virtual_phone',
-                    __('Call in Number', 'event_espresso'),
-                    true
-                ),
-                'VNU_virtual_url'     => new EE_Plain_Text_Field(
-                    'VNU_virtual_url',
-                    __('Virtual URL', 'event_espresso'),
-                    true
-                ),
-                'VNU_google_map_link' => new EE_Plain_Text_Field(
-                    'VNU_google_map_link',
-                    __('Google Map Link', 'event_espresso'),
-                    true
-                ),
-                'VNU_enable_for_gmap' => new EE_Boolean_Field(
-                    'VNU_enable_for_gmap',
-                    __('Show Google Map?', 'event_espresso'),
-                    false,
-                    false
-                ),
-            ),
-        );
-        $this->_model_relations = array(
-            'Country'           => new EE_Belongs_To_Relation(),
-            'Event'             => new EE_Has_Many_Relation(),
-            'Datetime'          => new EE_Has_Many_Relation(),
-            'State'             => new EE_Belongs_To_Relation(),
-            'Term_Relationship' => new EE_Has_Many_Relation(),
-            'Term_Taxonomy'     => new EE_HABTM_Relation('Term_Relationship'),
-            'WP_User'           => new EE_Belongs_To_Relation(),
-        );
-        // this model is generally available for reading
-        $this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
-        $this->model_chain_to_password = '';
-        parent::__construct($timezone);
-    }
+	protected function __construct($timezone = null)
+	{
+		$this->singular_item = __('Venue', 'event_espresso');
+		$this->plural_item = __('Venues', 'event_espresso');
+		$this->_tables = array(
+			'Venue_CPT'  => new EE_Primary_Table('posts', 'ID'),
+			'Venue_Meta' => new EE_Secondary_Table('esp_venue_meta', 'VNUM_ID', 'VNU_ID'),
+		);
+		$this->_fields = array(
+			'Venue_CPT'  => array(
+				'VNU_ID'         => new EE_Primary_Key_Int_Field('ID', __("Venue ID", "event_espresso")),
+				'VNU_name'       => new EE_Plain_Text_Field(
+					'post_title',
+					__("Venue Name", "event_espresso"),
+					false,
+					''
+				),
+				'VNU_desc'       => new EE_Post_Content_Field(
+					'post_content',
+					__("Venue Description", "event_espresso"),
+					false,
+					''
+				),
+				'VNU_identifier' => new EE_Slug_Field('post_name', __("Venue Identifier", "event_espresso"), false, ''),
+				'VNU_created'    => new EE_Datetime_Field(
+					'post_date',
+					__("Date Venue Created", "event_espresso"),
+					false,
+					EE_Datetime_Field::now
+				),
+				'VNU_short_desc' => new EE_Plain_Text_Field(
+					'post_excerpt',
+					__("Short Description of Venue", "event_espresso"),
+					true,
+					''
+				),
+				'VNU_modified'   => new EE_Datetime_Field(
+					'post_modified',
+					__("Venue Modified Date", "event_espresso"),
+					false,
+					EE_Datetime_Field::now
+				),
+				'VNU_wp_user'    => new EE_WP_User_Field(
+					'post_author',
+					__("Venue Creator ID", "event_espresso"),
+					false
+				),
+				'parent'         => new EE_Integer_Field(
+					'post_parent',
+					__("Venue Parent ID", "event_espresso"),
+					false,
+					0
+				),
+				'VNU_order'      => new EE_Integer_Field('menu_order', __("Venue order", "event_espresso"), false, 1),
+				'post_type'      => new EE_WP_Post_Type_Field('espresso_venues'),
+				'password' => new EE_Password_Field(
+					'post_password',
+					__('Password', 'event_espresso'),
+					false,
+					'',
+					array(
+						'VNU_desc',
+						'VNU_short_desc',
+						'VNU_address',
+						'VNU_address2',
+						'VNU_city',
+						'STA_ID',
+						'CNT_ISO',
+						'VNU_zip',
+						'VNU_phone',
+						'VNU_capacity',
+						'VNU_url',
+						'VNU_virtual_phone',
+						'VNU_virtual_url',
+						'VNU_google_map_link',
+						'VNU_enable_for_gmap',
+					)
+				)
+			),
+			'Venue_Meta' => array(
+				'VNUM_ID'             => new EE_DB_Only_Int_Field(
+					'VNUM_ID',
+					__("ID of Venue Meta Row", "event_espresso"),
+					false
+				),
+				'VNU_ID_fk'           => new EE_DB_Only_Int_Field(
+					'VNU_ID',
+					__("Foreign Key to Venue Post ", "event_espresso"),
+					false
+				),
+				'VNU_address'         => new EE_Plain_Text_Field(
+					'VNU_address',
+					__("Venue Address line 1", "event_espresso"),
+					true,
+					''
+				),
+				'VNU_address2'        => new EE_Plain_Text_Field(
+					'VNU_address2',
+					__("Venue Address line 2", "event_espresso"),
+					true,
+					''
+				),
+				'VNU_city'            => new EE_Plain_Text_Field(
+					'VNU_city',
+					__("Venue City", "event_espresso"),
+					true,
+					''
+				),
+				'STA_ID'              => new EE_Foreign_Key_Int_Field(
+					'STA_ID',
+					__("State ID", "event_espresso"),
+					true,
+					null,
+					'State'
+				),
+				'CNT_ISO'             => new EE_Foreign_Key_String_Field(
+					'CNT_ISO',
+					__("Country Code", "event_espresso"),
+					true,
+					null,
+					'Country'
+				),
+				'VNU_zip'             => new EE_Plain_Text_Field(
+					'VNU_zip',
+					__("Venue Zip/Postal Code", "event_espresso"),
+					true
+				),
+				'VNU_phone'           => new EE_Plain_Text_Field(
+					'VNU_phone',
+					__("Venue Phone", "event_espresso"),
+					true
+				),
+				'VNU_capacity'        => new EE_Infinite_Integer_Field(
+					'VNU_capacity',
+					__("Venue Capacity", "event_espresso"),
+					true,
+					EE_INF
+				),
+				'VNU_url'             => new EE_Plain_Text_Field(
+					'VNU_url',
+					__('Venue Website', 'event_espresso'),
+					true
+				),
+				'VNU_virtual_phone'   => new EE_Plain_Text_Field(
+					'VNU_virtual_phone',
+					__('Call in Number', 'event_espresso'),
+					true
+				),
+				'VNU_virtual_url'     => new EE_Plain_Text_Field(
+					'VNU_virtual_url',
+					__('Virtual URL', 'event_espresso'),
+					true
+				),
+				'VNU_google_map_link' => new EE_Plain_Text_Field(
+					'VNU_google_map_link',
+					__('Google Map Link', 'event_espresso'),
+					true
+				),
+				'VNU_enable_for_gmap' => new EE_Boolean_Field(
+					'VNU_enable_for_gmap',
+					__('Show Google Map?', 'event_espresso'),
+					false,
+					false
+				),
+			),
+		);
+		$this->_model_relations = array(
+			'Country'           => new EE_Belongs_To_Relation(),
+			'Event'             => new EE_Has_Many_Relation(),
+			'Datetime'          => new EE_Has_Many_Relation(),
+			'State'             => new EE_Belongs_To_Relation(),
+			'Term_Relationship' => new EE_Has_Many_Relation(),
+			'Term_Taxonomy'     => new EE_HABTM_Relation('Term_Relationship'),
+			'WP_User'           => new EE_Belongs_To_Relation(),
+		);
+		// this model is generally available for reading
+		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
+		$this->model_chain_to_password = '';
+		parent::__construct($timezone);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -192,7 +192,7 @@
             'WP_User'           => new EE_Belongs_To_Relation(),
         );
         // this model is generally available for reading
-        $this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
+        $this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
         $this->model_chain_to_password = '';
         parent::__construct($timezone);
     }

core/domain/services/graphql/types/Event.php

Indentation +218 added lines, -218 removed lines

@@ -25,227 +25,227 @@
 class Event extends TypeBase
 {
 
-    /**
-     * Event constructor.
-     *
-     * @param EEM_Event $event_model
-     */
-    public function __construct(EEM_Event $event_model)
-    {
-        $this->setName($this->namespace . 'Event');
-        $this->setIsCustomPostType(true);
-        parent::__construct($event_model);
-    }
+	/**
+	 * Event constructor.
+	 *
+	 * @param EEM_Event $event_model
+	 */
+	public function __construct(EEM_Event $event_model)
+	{
+		$this->setName($this->namespace . 'Event');
+		$this->setIsCustomPostType(true);
+		parent::__construct($event_model);
+	}
 
 
-    /**
-     * @return GraphQLFieldInterface[]
-     */
-    public function getFields(): array
-    {
-        $fields = [
-            new GraphQLField(
-                'allowDonations',
-                'Boolean',
-                'donations',
-                esc_html__('Accept Donations?', 'event_espresso')
-            ),
-            new GraphQLField(
-                'allowOverflow',
-                'Boolean',
-                'allow_overflow',
-                esc_html__('Enable Wait List for Event', 'event_espresso')
-            ),
-            new GraphQLField(
-                'altRegPage',
-                'String',
-                'external_url',
-                esc_html__('URL of Event Page if hosted elsewhere', 'event_espresso')
-            ),
-            new GraphQLOutputField(
-                'cacheId',
-                ['non_null' => 'String'],
-                null,
-                esc_html__('The cache ID of the object.', 'event_espresso')
-            ),
-            new GraphQLField(
-                'created',
-                'String',
-                'created',
-                esc_html__('Date/Time Event Created', 'event_espresso')
-            ),
-            new GraphQLOutputField(
-                'dbId',
-                ['non_null' => 'Int'],
-                'ID',
-                esc_html__('The event ID.', 'event_espresso')
-            ),
-            new GraphQLField(
-                'defaultRegStatus',
-                $this->namespace . 'RegistrationStatusEnum',
-                'default_registration_status',
-                esc_html__('Default Event Registration Status', 'event_espresso')
-            ),
-            new GraphQLField(
-                'description',
-                'String',
-                'description',
-                esc_html__('Event Description', 'event_espresso')
-            ),
-            new GraphQLField(
-                'displayDescription',
-                'Boolean',
-                'display_description',
-                esc_html__('Display Description Flag', 'event_espresso')
-            ),
-            new GraphQLField(
-                'displayTicketSelector',
-                'Boolean',
-                'display_ticket_selector',
-                esc_html__('Display Ticket Selector Flag', 'event_espresso')
-            ),
-            new GraphQLOutputField(
-                'isActive',
-                'Boolean',
-                'is_active',
-                esc_html__('Flag indicating event is active', 'event_espresso')
-            ),
-            new GraphQLOutputField(
-                'isCancelled',
-                'Boolean',
-                'is_cancelled',
-                esc_html__('Flag indicating whether the event is marked as cancelled', 'event_espresso')
-            ),
-            new GraphQLOutputField(
-                'isExpired',
-                'Boolean',
-                'is_expired',
-                esc_html__('Flag indicating event is expired or not', 'event_espresso')
-            ),
-            new GraphQLOutputField(
-                'isInactive',
-                'Boolean',
-                'is_inactive',
-                esc_html__('Flag indicating event is inactive', 'event_espresso')
-            ),
-            new GraphQLOutputField(
-                'isPostponed',
-                'Boolean',
-                'is_postponed',
-                esc_html__('Flag indicating whether the event is marked as postponed', 'event_espresso')
-            ),
-            new GraphQLOutputField(
-                'isSoldOut',
-                'Boolean',
-                'is_sold_out',
-                esc_html__(
-                    'Flag indicating whether the tickets sold for the event, met or exceed the registration limit',
-                    'event_espresso'
-                )
-            ),
-            new GraphQLOutputField(
-                'isUpcoming',
-                'Boolean',
-                'is_upcoming',
-                esc_html__('Whether the event is upcoming', 'event_espresso')
-            ),
-            new GraphQLInputField(
-                'manager',
-                'String',
-                null,
-                esc_html__('Globally unique event ID for the event manager', 'event_espresso')
-            ),
-            new GraphQLOutputField(
-                'manager',
-                'User',
-                null,
-                esc_html__('Event Manager', 'event_espresso')
-            ),
-            new GraphQLField(
-                'maxRegistrations',
-                'Int',
-                'additional_limit',
-                esc_html__('Limit of Additional Registrations on Same Transaction', 'event_espresso')
-            ),
-            new GraphQLField(
-                'memberOnly',
-                'Boolean',
-                'member_only',
-                esc_html__('Member-Only Event Flag', 'event_espresso')
-            ),
-            new GraphQLField(
-                'name',
-                'String',
-                'name',
-                esc_html__('Event Name', 'event_espresso')
-            ),
-            new GraphQLField(
-                'order',
-                'Int',
-                'order',
-                esc_html__('Event Menu Order', 'event_espresso')
-            ),
-            new GraphQLField(
-                'phoneNumber',
-                'String',
-                'phone',
-                esc_html__('Event Phone Number', 'event_espresso')
-            ),
-            new GraphQLField(
-                'shortDescription',
-                'String',
-                'short_description',
-                esc_html__('Event Short Description', 'event_espresso')
-            ),
-            new GraphQLField(
-                'timezoneString',
-                'String',
-                'timezone_string',
-                esc_html__('Timezone (name) for Event times', 'event_espresso')
-            ),
-            new GraphQLField(
-                'visibleOn',
-                'String',
-                'visible_on',
-                esc_html__('Event Visible Date', 'event_espresso')
-            ),
-            new GraphQLField(
-                'venue',
-                'String',
-                null,
-                esc_html__('Event venue ID', 'event_espresso'),
-                null,
-                function (EE_Event $source) {
-                    $venue_ID = $source->venue_ID();
-                    return $venue_ID
-                    // Since venue is a CPT, $type will be 'post'
-                    ? Relay::toGlobalId('post', $venue_ID)
-                    : null;
-                }
-            ),
-        ];
+	/**
+	 * @return GraphQLFieldInterface[]
+	 */
+	public function getFields(): array
+	{
+		$fields = [
+			new GraphQLField(
+				'allowDonations',
+				'Boolean',
+				'donations',
+				esc_html__('Accept Donations?', 'event_espresso')
+			),
+			new GraphQLField(
+				'allowOverflow',
+				'Boolean',
+				'allow_overflow',
+				esc_html__('Enable Wait List for Event', 'event_espresso')
+			),
+			new GraphQLField(
+				'altRegPage',
+				'String',
+				'external_url',
+				esc_html__('URL of Event Page if hosted elsewhere', 'event_espresso')
+			),
+			new GraphQLOutputField(
+				'cacheId',
+				['non_null' => 'String'],
+				null,
+				esc_html__('The cache ID of the object.', 'event_espresso')
+			),
+			new GraphQLField(
+				'created',
+				'String',
+				'created',
+				esc_html__('Date/Time Event Created', 'event_espresso')
+			),
+			new GraphQLOutputField(
+				'dbId',
+				['non_null' => 'Int'],
+				'ID',
+				esc_html__('The event ID.', 'event_espresso')
+			),
+			new GraphQLField(
+				'defaultRegStatus',
+				$this->namespace . 'RegistrationStatusEnum',
+				'default_registration_status',
+				esc_html__('Default Event Registration Status', 'event_espresso')
+			),
+			new GraphQLField(
+				'description',
+				'String',
+				'description',
+				esc_html__('Event Description', 'event_espresso')
+			),
+			new GraphQLField(
+				'displayDescription',
+				'Boolean',
+				'display_description',
+				esc_html__('Display Description Flag', 'event_espresso')
+			),
+			new GraphQLField(
+				'displayTicketSelector',
+				'Boolean',
+				'display_ticket_selector',
+				esc_html__('Display Ticket Selector Flag', 'event_espresso')
+			),
+			new GraphQLOutputField(
+				'isActive',
+				'Boolean',
+				'is_active',
+				esc_html__('Flag indicating event is active', 'event_espresso')
+			),
+			new GraphQLOutputField(
+				'isCancelled',
+				'Boolean',
+				'is_cancelled',
+				esc_html__('Flag indicating whether the event is marked as cancelled', 'event_espresso')
+			),
+			new GraphQLOutputField(
+				'isExpired',
+				'Boolean',
+				'is_expired',
+				esc_html__('Flag indicating event is expired or not', 'event_espresso')
+			),
+			new GraphQLOutputField(
+				'isInactive',
+				'Boolean',
+				'is_inactive',
+				esc_html__('Flag indicating event is inactive', 'event_espresso')
+			),
+			new GraphQLOutputField(
+				'isPostponed',
+				'Boolean',
+				'is_postponed',
+				esc_html__('Flag indicating whether the event is marked as postponed', 'event_espresso')
+			),
+			new GraphQLOutputField(
+				'isSoldOut',
+				'Boolean',
+				'is_sold_out',
+				esc_html__(
+					'Flag indicating whether the tickets sold for the event, met or exceed the registration limit',
+					'event_espresso'
+				)
+			),
+			new GraphQLOutputField(
+				'isUpcoming',
+				'Boolean',
+				'is_upcoming',
+				esc_html__('Whether the event is upcoming', 'event_espresso')
+			),
+			new GraphQLInputField(
+				'manager',
+				'String',
+				null,
+				esc_html__('Globally unique event ID for the event manager', 'event_espresso')
+			),
+			new GraphQLOutputField(
+				'manager',
+				'User',
+				null,
+				esc_html__('Event Manager', 'event_espresso')
+			),
+			new GraphQLField(
+				'maxRegistrations',
+				'Int',
+				'additional_limit',
+				esc_html__('Limit of Additional Registrations on Same Transaction', 'event_espresso')
+			),
+			new GraphQLField(
+				'memberOnly',
+				'Boolean',
+				'member_only',
+				esc_html__('Member-Only Event Flag', 'event_espresso')
+			),
+			new GraphQLField(
+				'name',
+				'String',
+				'name',
+				esc_html__('Event Name', 'event_espresso')
+			),
+			new GraphQLField(
+				'order',
+				'Int',
+				'order',
+				esc_html__('Event Menu Order', 'event_espresso')
+			),
+			new GraphQLField(
+				'phoneNumber',
+				'String',
+				'phone',
+				esc_html__('Event Phone Number', 'event_espresso')
+			),
+			new GraphQLField(
+				'shortDescription',
+				'String',
+				'short_description',
+				esc_html__('Event Short Description', 'event_espresso')
+			),
+			new GraphQLField(
+				'timezoneString',
+				'String',
+				'timezone_string',
+				esc_html__('Timezone (name) for Event times', 'event_espresso')
+			),
+			new GraphQLField(
+				'visibleOn',
+				'String',
+				'visible_on',
+				esc_html__('Event Visible Date', 'event_espresso')
+			),
+			new GraphQLField(
+				'venue',
+				'String',
+				null,
+				esc_html__('Event venue ID', 'event_espresso'),
+				null,
+				function (EE_Event $source) {
+					$venue_ID = $source->venue_ID();
+					return $venue_ID
+					// Since venue is a CPT, $type will be 'post'
+					? Relay::toGlobalId('post', $venue_ID)
+					: null;
+				}
+			),
+		];
 
-        return apply_filters(
-            'FHEE__EventEspresso_core_domain_services_graphql_types__event_fields',
-            $fields,
-            $this->name,
-            $this->model
-        );
-    }
+		return apply_filters(
+			'FHEE__EventEspresso_core_domain_services_graphql_types__event_fields',
+			$fields,
+			$this->name,
+			$this->model
+		);
+	}
 
 
-    /**
-     * Extends the existing WP GraphQL mutations.
-     *
-     * @since $VID:$
-     */
-    public function extendMutations()
-    {
-        add_action(
-            'graphql_post_object_mutation_update_additional_data',
-            EventUpdate::mutateFields($this->model, $this),
-            10,
-            6
-        );
-    }
+	/**
+	 * Extends the existing WP GraphQL mutations.
+	 *
+	 * @since $VID:$
+	 */
+	public function extendMutations()
+	{
+		add_action(
+			'graphql_post_object_mutation_update_additional_data',
+			EventUpdate::mutateFields($this->model, $this),
+			10,
+			6
+		);
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -32,7 +32,7 @@ 
      */
     public function __construct(EEM_Event $event_model)
     {
-        $this->setName($this->namespace . 'Event');
+        $this->setName($this->namespace.'Event');
         $this->setIsCustomPostType(true);
         parent::__construct($event_model);
     }
@@ -82,7 +82,7 @@ 
             ),
             new GraphQLField(
                 'defaultRegStatus',
-                $this->namespace . 'RegistrationStatusEnum',
+                $this->namespace.'RegistrationStatusEnum',
                 'default_registration_status',
                 esc_html__('Default Event Registration Status', 'event_espresso')
             ),
@@ -215,7 +215,7 @@ 
                 null,
                 esc_html__('Event venue ID', 'event_espresso'),
                 null,
-                function (EE_Event $source) {
+                function(EE_Event $source) {
                     $venue_ID = $source->venue_ID();
                     return $venue_ID
                     // Since venue is a CPT, $type will be 'post'

modules/events_archive_filters/EED_Events_Archive_Filters.module.php

Indentation +1020 added lines, -1020 removed lines

@@ -13,1024 +13,1024 @@
 {
 
 
-    /**
-     * @return EED_Events_Archive_Filters
-     */
-    public static function instance()
-    {
-        return parent::get_instance(__CLASS__);
-    }
-
-
-    /**
-     *    Start Date
-     *
-     * @var    $_elf_month
-     * @access    protected
-     */
-    protected $_elf_month = null;
-
-
-    /**
-     *    Category
-     *
-     * @var    $_elf_category
-     * @access    protected
-     */
-    protected $_elf_category = null;
-
-
-    /**
-     *    whether to display expired events in the event list
-     *
-     * @var    $_show_expired
-     * @access    protected
-     */
-    protected $_show_expired = null;
-
-
-    /**
-     *    whether to display the event list as a grid or list
-     *
-     * @var    $_type
-     * @access    protected
-     */
-    protected static $_type = null;
-
-
-    /**
-     *    array of existing event list views
-     *
-     * @var    $_types
-     * @access    protected
-     */
-    protected static $_types = array('grid', 'text', 'dates');
-
-
-
-    /**
-     *    set_hooks - for hooking into EE Core, other modules, etc
-     *
-     * @access    public
-     * @return    void
-     */
-    public static function set_hooks()
-    {
-    }
-
-    /**
-     *    set_hooks_admin - for hooking into EE Admin Core, other modules, etc
-     *
-     * @access    public
-     * @return    void
-     */
-    public static function set_hooks_admin()
-    {
-    }
-
-
-    /**
-     *    set_definitions
-     *
-     * @access    public
-     * @return    void
-     */
-    public static function set_definitions()
-    {
-    }
-
-
-    /**
-     *    run - initial module setup
-     *
-     * @access    public
-     * @return    void
-     */
-    public function run($WP)
-    {
-    }
-
-
-    /**
-     *    event_list
-     *
-     * @access    public
-     * @return    void
-     */
-    public function event_list()
-    {
-        // load other required components
-        $this->_load_assests();
-    }
-
-
-    /**
-     *    _filter_query_parts
-     *
-     * @access    public
-     * @return    void
-     */
-    private function _filter_query_parts()
-    {
-        // build event list query
-        add_filter('posts_join', array($this, 'posts_join'), 1, 2);
-        add_filter('posts_where', array($this, 'posts_where'), 1, 2);
-        add_filter('posts_orderby', array($this, 'posts_orderby'), 1, 2);
-    }
-
-    /**
-     *    _type - the type of event list : grid, text, dates
-     *
-     * @access    public
-     * @return    string
-     */
-    public static function set_type()
-    {
-        do_action('AHEE__EED_Events_Archive_Filters__before_set_type');
-        EED_Events_Archive_Filters::$_types = apply_filters(
-            'EED_Events_Archive_Filters__set_type__types',
-            EED_Events_Archive_Filters::$_types
-        );
-        $view = isset(EE_Registry::instance()->CFG->EED_Events_Archive_Filters['default_type']) ? EE_Registry::instance(
-        )->CFG->EED_Events_Archive_Filters['default_type'] : 'grid';
-        $elf_type = EE_Registry::instance()->REQ->is_set('elf_type') ? sanitize_text_field(
-            EE_Registry::instance()->REQ->get('elf_type')
-        ) : '';
-        $view = ! empty($elf_type) ? $elf_type : $view;
-        $view = apply_filters('EED_Events_Archive_Filters__set_type__type', $view);
-        if (! empty($view) && in_array($view, EED_Events_Archive_Filters::$_types)) {
-            self::$_type = $view;
-        }
-    }
-
-    /**
-     *    _show_expired
-     *
-     * @access    private
-     * @param    boolean $req_only if TRUE, then ignore defaults and only return $_POST value
-     * @return    boolean
-     */
-    private static function _show_expired($req_only = false)
-    {
-        // get default value for "display_expired_events" as set in the EE General Settings > Templates > Event Listings
-        $show_expired = ! $req_only && isset(
-            EE_Registry::instance()->CFG->EED_Events_Archive_Filters['display_expired_events']
-        ) ? EE_Registry::instance()->CFG->EED_Events_Archive_Filters['display_expired_events'] : false;
-        // override default expired option if set via filter
-        $show_expired = EE_Registry::instance()->REQ->is_set('elf_expired_chk') ? absint(
-            EE_Registry::instance()->REQ->get('elf_expired_chk')
-        ) : $show_expired;
-        return $show_expired ? true : false;
-    }
-
-    /**
-     *    _event_category_slug
-     *
-     * @access    private
-     * @return    string
-     */
-    private static function _event_category_slug()
-    {
-        return EE_Registry::instance()->REQ->is_set('elf_category_dd') ? sanitize_text_field(
-            EE_Registry::instance()->REQ->get('elf_category_dd')
-        ) : '';
-    }
-
-    /**
-     *    _display_month - what month should the event list display events for?
-     *
-     * @access    private
-     * @return    string
-     */
-    private static function _display_month()
-    {
-        return EE_Registry::instance()->REQ->is_set('elf_month_dd') ? sanitize_text_field(
-            EE_Registry::instance()->REQ->get('elf_month_dd')
-        ) : '';
-    }
-
-
-    /**
-     *    get_post_data
-     *
-     * @access    public
-     * @return    void
-     */
-    public function get_post_data()
-    {
-        $this->_elf_month = EED_Events_Archive_Filters::_display_month();
-        $this->_elf_category = EED_Events_Archive_Filters::_event_category_slug();
-        $this->_show_expired = EED_Events_Archive_Filters::_show_expired(true);
-    }
-
-
-    /**
-     *    posts_join
-     *
-     * @access    public
-     * @return    void
-     */
-    public function posts_join($SQL, WP_Query $wp_query)
-    {
-        if (isset($wp_query->query) && isset($wp_query->query['post_type']) && $wp_query->query['post_type'] == 'espresso_events') {
-            // Category
-            $SQL .= EED_Events_Archive_Filters::posts_join_sql_for_terms(
-                EED_Events_Archive_Filters::_event_category_slug()
-            );
-        }
-        return $SQL;
-    }
-
-
-    /**
-     *    posts_join_sql_for_terms
-     *
-     * @access    public
-     * @param    mixed boolean|string    $join_terms pass TRUE or term string, doesn't really matter since this value
-     *                                   doesn't really get used for anything yet
-     * @return    string
-     */
-    public static function posts_join_sql_for_terms($join_terms = null)
-    {
-        $SQL = '';
-        if (! empty($join_terms)) {
-            global $wpdb;
-            $SQL .= " LEFT JOIN $wpdb->term_relationships ON ($wpdb->posts.ID = $wpdb->term_relationships.object_id)";
-            $SQL .= " LEFT JOIN $wpdb->term_taxonomy ON ($wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id)";
-            $SQL .= " LEFT JOIN $wpdb->terms ON ($wpdb->terms.term_id = $wpdb->term_taxonomy.term_id) ";
-        }
-        return $SQL;
-    }
-
-
-    /**
-     * usage:  $SQL .= EED_Events_Archive_Filters::posts_join_for_orderby( $orderby_params );
-     *
-     * @param array $orderby_params
-     * @return  string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function posts_join_for_orderby(array $orderby_params = array()): string
-    {
-        global $wpdb;
-        $SQL = '';
-        $orderby_params = is_array($orderby_params) ? $orderby_params : array($orderby_params);
-        foreach ($orderby_params as $orderby) {
-            switch ($orderby) {
-                case 'ticket_start':
-                case 'ticket_end':
-                    $SQL .= ' LEFT JOIN ' . EEM_Datetime_Ticket::instance()->table() . ' ON ('
-                            . EEM_Datetime::instance()->table() . '.DTT_ID = '
-                            . EEM_Datetime_Ticket::instance()->table() . '.DTT_ID )';
-                    $SQL .= ' LEFT JOIN ' . EEM_Ticket::instance()->table() . ' ON ('
-                            . EEM_Datetime_Ticket::instance()->table() . '.TKT_ID = '
-                            . EEM_Ticket::instance()->table() . '.TKT_ID )';
-                    break;
-
-                case 'city':
-                case 'state':
-                case 'venue_title':
-                    // grab wp_posts (event), venue, and event_meta table names
-                    $wp_posts = $wpdb->posts;
-                    $venue = EEM_Venue::instance()->table();
-                    $event_meta = EEM_Event::instance()->second_table();
-                    $SQL .= " LEFT JOIN $event_meta ON ( $wp_posts.ID = $event_meta.EVT_ID )";
-                    $SQL .= " LEFT JOIN $venue ON ( $event_meta.VNU_ID = $venue.VNU_ID )";
-                    break;
-            }
-        }
-        return $SQL;
-    }
-
-
-    /**
-     *    posts_where
-     *
-     * @access    public
-     * @return    void
-     */
-    public function posts_where($SQL, WP_Query $wp_query)
-    {
-        if (isset($wp_query->query_vars) && isset($wp_query->query_vars['post_type']) && $wp_query->query_vars['post_type'] == 'espresso_events') {
-            // Show Expired ?
-            $SQL .= EED_Events_Archive_Filters::posts_where_sql_for_show_expired(
-                EED_Events_Archive_Filters::_show_expired()
-            );
-            // Category
-            // $elf_category = EED_Events_Archive_Filters::_event_category_slug();
-            $SQL .= EED_Events_Archive_Filters::posts_where_sql_for_event_category_slug(
-                EED_Events_Archive_Filters::_event_category_slug()
-            );
-            // Start Date
-            // $elf_month = EED_Events_Archive_Filters::_display_month();
-            $SQL .= EED_Events_Archive_Filters::posts_where_sql_for_event_list_month(
-                EED_Events_Archive_Filters::_display_month()
-            );
-        }
-        return $SQL;
-    }
-
-
-    /**
-     *    posts_where_sql_for_show_expired
-     *
-     * @access    public
-     * @param    boolean $show_expired if TRUE, then displayed past events
-     * @return    string
-     */
-    public static function posts_where_sql_for_show_expired($show_expired = false)
-    {
-        return ! $show_expired
-            ? ' AND ' . EEM_Datetime::instance()->table() . '.DTT_EVT_end > "' . date('Y-m-d H:s:i') . '" '
-            : '';
-    }
-
-
-    /**
-     *    posts_where_sql_for_event_category_slug
-     *
-     * @access    public
-     * @param    boolean $event_category_slug
-     * @return    string
-     */
-    public static function posts_where_sql_for_event_category_slug($event_category_slug = null)
-    {
-        global $wpdb;
-        return ! empty($event_category_slug) ? ' AND ' . $wpdb->terms . '.slug = "' . $event_category_slug . '" ' : '';
-    }
-
-    /**
-     *    posts_where_sql_for_event_list_month
-     *
-     * @access    public
-     * @param    boolean $month
-     * @return    string
-     */
-    public static function posts_where_sql_for_event_list_month($month = null)
-    {
-        $SQL = '';
-        if (! empty($month)) {
-            // event start date is LESS than the end of the month ( so nothing that doesn't start until next month )
-            $SQL = ' AND ' . EEM_Datetime::instance()->table() . '.DTT_EVT_start';
-            $SQL .= ' <= "' . date('Y-m-t 23:59:59', \EEH_DTT_Helper::first_of_month_timestamp($month)) . '"';
-            // event end date is GREATER than the start of the month ( so nothing that ended before this month )
-            $SQL .= ' AND ' . EEM_Datetime::instance()->table() . '.DTT_EVT_end';
-            $SQL .= ' >= "' . date('Y-m-d 0:0:00', \EEH_DTT_Helper::first_of_month_timestamp($month)) . '" ';
-        }
-        return $SQL;
-    }
-
-
-    /**
-     *    posts_orderby
-     *
-     * @access    public
-     * @return    void
-     */
-    public function posts_orderby($SQL, WP_Query $wp_query)
-    {
-        if (isset($wp_query->query) && isset($wp_query->query['post_type']) && $wp_query->query['post_type'] == 'espresso_events') {
-            $SQL = EED_Events_Archive_Filters::posts_orderby_sql(array('start_date'));
-        }
-        return $SQL;
-    }
-
-
-    /**
-     *    posts_orderby_sql
-     *
-     *    possible parameters:
-     *    ID
-     *    start_date
-     *    end_date
-     *    event_name
-     *    category_slug
-     *    ticket_start
-     *    ticket_end
-     *    venue_title
-     *    city
-     *    state
-     *
-     *    **IMPORTANT**
-     *    make sure to also send the $orderby_params array to the posts_join_for_orderby() method
-     *    or else some of the table references below will result in MySQL errors
-     *
-     * @access    public
-     * @param    boolean $orderby_params
-     * @return    string
-     */
-    public static function posts_orderby_sql($orderby_params = array(), $sort = 'ASC')
-    {
-        global $wpdb;
-        $SQL = '';
-        $cntr = 1;
-        $orderby_params = is_array($orderby_params) ? $orderby_params : array($orderby_params);
-        foreach ($orderby_params as $orderby) {
-            $glue = $cntr == 1 || $cntr == count($orderby_params) ? ' ' : ', ';
-            switch ($orderby) {
-                case 'id':
-                case 'ID':
-                    $SQL .= $glue . $wpdb->posts . '.ID ' . $sort;
-                    break;
-
-                case 'start_date':
-                    $SQL .= $glue . EEM_Datetime::instance()->table() . '.DTT_EVT_start ' . $sort;
-                    break;
-
-                case 'end_date':
-                    $SQL .= $glue . EEM_Datetime::instance()->table() . '.DTT_EVT_end ' . $sort;
-                    break;
-
-                case 'event_name':
-                    $SQL .= $glue . $wpdb->posts . '.post_title ' . $sort;
-                    break;
-
-                case 'category_slug':
-                    $SQL .= $glue . $wpdb->terms . '.slug ' . $sort;
-                    break;
-
-                case 'ticket_start':
-                    $SQL .= $glue . EEM_Ticket::instance()->table() . '.TKT_start_date ' . $sort;
-                    break;
-
-                case 'ticket_end':
-                    $SQL .= $glue . EEM_Ticket::instance()->table() . '.TKT_end_date ' . $sort;
-                    break;
-
-                case 'venue_title':
-                    $SQL .= $glue . 'venue_title ' . $sort;
-                    break;
-
-                case 'city':
-                    $SQL .= $glue . EEM_Venue::instance()->second_table() . '.VNU_city ' . $sort;
-                    break;
-
-                case 'state':
-                    $SQL .= $glue . EEM_State::instance()->table() . '.STA_name ' . $sort;
-                    break;
-            }
-            $cntr++;
-        }
-        // echo '<h4>$SQL : ' . $SQL . '  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>';
-        return $SQL;
-    }
-
-
-    /**
-     *    template_redirect
-     *
-     * @access    public
-     * @return    void
-     */
-    public function template_redirect()
-    {
-        // add event list filters
-        add_action('loop_start', array($this, 'event_list_template_filters'));
-        // and pagination
-        add_action('loop_start', array($this, 'event_list_pagination'));
-        add_action('loop_end', array($this, 'event_list_pagination'));
-        // if NOT a custom template
-        if (
-            EE_Registry::instance()
-                       ->load_core('Front_Controller', array(), false, true)
-                       ->get_selected_template() != 'archive-espresso_events.php'
-        ) {
-            // don't know if theme uses the_excerpt
-            add_filter('the_excerpt', array($this, 'event_details'), 100);
-            add_filter('the_excerpt', array($this, 'event_tickets'), 110);
-            add_filter('the_excerpt', array($this, 'event_datetimes'), 120);
-            add_filter('the_excerpt', array($this, 'event_venues'), 130);
-            // or the_content
-            add_filter('the_content', array($this, 'event_details'), 100);
-            add_filter('the_content', array($this, 'event_tickets'), 110);
-            add_filter('the_content', array($this, 'event_datetimes'), 120);
-            add_filter('the_content', array($this, 'event_venues'), 130);
-        } else {
-            remove_all_filters('excerpt_length');
-            add_filter('excerpt_length', array($this, 'excerpt_length'), 10);
-            add_filter('excerpt_more', array($this, 'excerpt_more'), 10);
-        }
-    }
-
-
-    /**
-     *    event_list_pagination
-     *
-     * @access    public
-     * @return        void
-     */
-    public function event_list_pagination()
-    {
-        echo '<div class="ee-pagination-dv ee-clear-float">' . espresso_event_list_pagination() . '</div>';
-    }
-
-
-    /**
-     *    event_details
-     *
-     * @access    public
-     * @param        string $content
-     * @return        void
-     */
-    public function event_details($content)
-    {
-        return EEH_Template::display_template(
-            EE_TEMPLATES . EE_Config::get_current_theme() . '/content-espresso_events-details.php',
-            array('the_content' => $content),
-            true
-        );
-    }
-
-
-    /**
-     *    event_tickets
-     *
-     * @access    public
-     * @param        string $content
-     * @return        void
-     */
-    public function event_tickets($content)
-    {
-        return $content
-               . EEH_Template::display_template(
-                   EE_TEMPLATES . EE_Config::get_current_theme() . '/content-espresso_events-tickets.php',
-                   array(),
-                   true
-               );
-    }
-
-    /**
-     *    event_datetimes
-     *
-     * @access    public
-     * @param        string $content
-     * @return        void
-     */
-    public function event_datetimes($content)
-    {
-        return $content
-               . EEH_Template::display_template(
-                   EE_TEMPLATES . EE_Config::get_current_theme() . '/content-espresso_events-datetimes.php',
-                   array(),
-                   true
-               );
-    }
-
-    /**
-     *    event_venues
-     *
-     * @access    public
-     * @param        string $content
-     * @return        void
-     */
-    public function event_venues($content)
-    {
-        return $content
-               . EEH_Template::display_template(
-                   EE_TEMPLATES . EE_Config::get_current_theme() . '/content-espresso_events-venues.php',
-                   array(),
-                   true
-               );
-    }
-
-
-    /**
-     *    _initial_setup
-     *
-     * @access    public
-     * @return    void
-     */
-    private function _load_assests()
-    {
-        do_action('AHEE__EED_Events_Archive_Filters__before_load_assests');
-        wp_enqueue_style('espresso_default');
-        wp_enqueue_style('espresso_custom_css');
-        add_filter('FHEE_load_EE_Session', '__return_true');
-        add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 10);
-        if (EE_Registry::instance()->CFG->map_settings->use_google_maps) {
-            add_action('wp_enqueue_scripts', array('EEH_Maps', 'espresso_google_map_js'), 11);
-        }
-        // add_filter( 'the_excerpt', array( $this, 'the_excerpt' ), 999 );
-    }
-
-
-    /**
-     *    _get_template
-     *
-     * @access    private
-     * @return    string
-     */
-    private function _get_template($which = 'part')
-    {
-        return EE_TEMPLATES . EE_Config::get_current_theme() . '/archive-espresso_events.php';
-    }
-
-
-    /**
-     *    excerpt_length
-     *
-     * @access    public
-     * @return    void
-     */
-    public function excerpt_length($length)
-    {
-
-        if (self::$_type == 'grid') {
-            return 36;
-        }
-
-        switch (EE_Registry::instance()->CFG->template_settings->EED_Events_Archive_Filters->event_list_grid_size) {
-            case 'tiny':
-                return 12;
-                break;
-            case 'small':
-                return 24;
-                break;
-            case 'large':
-                return 48;
-                break;
-            case 'medium':
-            default:
-                return 36;
-        }
-    }
-
-
-    /**
-     *    excerpt_more
-     *
-     * @access    public
-     * @return    void
-     */
-    public function excerpt_more($more)
-    {
-        return '&hellip;';
-    }
-
-
-
-
-    /**
-     *    wp_enqueue_scripts
-     *
-     * @access    public
-     * @return    void
-     */
-    public function wp_enqueue_scripts()
-    {
-        // get some style
-        if (apply_filters('FHEE_enable_default_espresso_css', false)) {
-            // first check uploads folder
-            if (
-                is_readable(
-                    get_stylesheet_directory() . EE_Config::get_current_theme() . '/archive-espresso_events.css'
-                )
-            ) {
-                wp_register_style(
-                    'archive-espresso_events',
-                    get_stylesheet_directory_uri() . EE_Config::get_current_theme(
-                    ) . '/archive-espresso_events.css',
-                    array('dashicons', 'espresso_default')
-                );
-            } else {
-                wp_register_style(
-                    'archive-espresso_events',
-                    EE_TEMPLATES_URL . EE_Config::get_current_theme() . '/archive-espresso_events.css',
-                    array('dashicons', 'espresso_default')
-                );
-            }
-            if (
-                is_readable(
-                    get_stylesheet_directory() . EE_Config::get_current_theme() . '/archive-espresso_events.js'
-                )
-            ) {
-                wp_register_script(
-                    'archive-espresso_events',
-                    get_stylesheet_directory_uri() . EE_Config::get_current_theme() . '/archive-espresso_events.js',
-                    array('jquery-masonry'),
-                    '1.0',
-                    true
-                );
-            } else {
-                wp_register_script(
-                    'archive-espresso_events',
-                    EVENTS_ARCHIVE_ASSETS_URL . 'archive-espresso_events.js',
-                    array('jquery-masonry'),
-                    '1.0',
-                    true
-                );
-            }
-            wp_enqueue_style('archive-espresso_events');
-            wp_enqueue_script('jquery-masonry');
-            wp_enqueue_script('archive-espresso_events');
-            add_action('wp_footer', array('EED_Events_Archive_Filters', 'localize_grid_event_lists'), 1);
-        }
-    }
-
-
-    /**
-     *    template_settings_form
-     *
-     * @access    public
-     * @static
-     * @return    void
-     */
-    public static function localize_grid_event_lists()
-    {
-        wp_localize_script(
-            'archive-espresso_events',
-            'espresso_grid_event_lists',
-            EED_Events_Archive_Filters::$espresso_grid_event_lists
-        );
-    }
-
-
-    /**
-     *    template_settings_form
-     *
-     * @access    public
-     * @static
-     * @return    void
-     */
-    public static function template_settings_form()
-    {
-        $EE = EE_Registry::instance();
-        $EE->CFG->template_settings->EED_Events_Archive_Filters = isset($EE->CFG->template_settings->EED_Events_Archive_Filters)
-            ? $EE->CFG->template_settings->EED_Events_Archive_Filters : new EE_Events_Archive_Config();
-        $EE->CFG->template_settings->EED_Events_Archive_Filters = apply_filters(
-            'FHEE__Event_List__template_settings_form__event_list_config',
-            $EE->CFG->template_settings->EED_Events_Archive_Filters
-        );
-        EEH_Template::display_template(
-            EVENTS_ARCHIVE_TEMPLATES_PATH . 'admin-event-list-settings.template.php',
-            $EE->CFG->template_settings->EED_Events_Archive_Filters
-        );
-    }
-
-
-    /**
-     *    set_default_settings
-     *
-     * @access    public
-     * @static
-     * @return    void
-     */
-    public static function set_default_settings($CFG)
-    {
-        // EEH_Debug_Tools::printr( $CFG, '$CFG  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-        $CFG->display_description = isset($CFG->display_description) && ! empty($CFG->display_description)
-            ? $CFG->display_description : 1;
-        $CFG->display_address = isset($CFG->display_address) && ! empty($CFG->display_address) ? $CFG->display_address
-            : true;
-        $CFG->display_venue_details = isset($CFG->display_venue_details) && ! empty($CFG->display_venue_details)
-            ? $CFG->display_venue_details : true;
-        $CFG->display_expired_events = isset($CFG->display_expired_events) && ! empty($CFG->display_expired_events)
-            ? $CFG->display_expired_events : false;
-        $CFG->default_type = isset($CFG->default_type) && ! empty($CFG->default_type) ? $CFG->default_type : 'grid';
-        $CFG->event_list_grid_size = isset($CFG->event_list_grid_size) && ! empty($CFG->event_list_grid_size)
-            ? $CFG->event_list_grid_size : 'medium';
-        $CFG->templates['full'] = isset($CFG->templates['full']) && ! empty($CFG->templates['full'])
-            ? $CFG->templates['full']
-            : EE_TEMPLATES . EE_Config::get_current_theme() . '/archive-espresso_events.php';
-        $CFG->templates['part'] = isset($CFG->templates['part']) && ! empty($CFG->templates['part'])
-            ? $CFG->templates['part']
-            : EE_TEMPLATES . EE_Config::get_current_theme() . '/archive-espresso_events-grid-view.php';
-        return $CFG;
-    }
-
-
-    /**
-     *    filter_config
-     *
-     * @access    public
-     * @return    void
-     */
-    public function filter_config($CFG)
-    {
-        return $CFG;
-    }
-
-
-    /**
-     *    filter_config
-     *
-     * @access    public
-     * @return    void
-     */
-    public static function update_template_settings($CFG, $REQ)
-    {
-        // $CFG->template_settings->EED_Events_Archive_Filters = new stdClass();
-        $CFG->EED_Events_Archive_Filters->display_description = isset($REQ['display_description_in_event_list'])
-            ? absint($REQ['display_description_in_event_list']) : 1;
-        $CFG->EED_Events_Archive_Filters->display_address = isset($REQ['display_address_in_event_list']) ? absint(
-            $REQ['display_address_in_event_list']
-        ) : true;
-        $CFG->EED_Events_Archive_Filters->display_venue_details = isset($REQ['display_venue_details_in_event_list'])
-            ? absint($REQ['display_venue_details_in_event_list']) : true;
-        $CFG->EED_Events_Archive_Filters->display_expired_events = isset($REQ['display_expired_events']) ? absint(
-            $REQ['display_expired_events']
-        ) : false;
-        $CFG->EED_Events_Archive_Filters->default_type = isset($REQ['default_type']) ? sanitize_text_field(
-            $REQ['default_type']
-        ) : 'grid';
-        $CFG->EED_Events_Archive_Filters->event_list_grid_size = isset($REQ['event_list_grid_size'])
-            ? sanitize_text_field($REQ['event_list_grid_size']) : 'medium';
-        $CFG->EED_Events_Archive_Filters->templates = array(
-            'full' => EE_TEMPLATES . EE_Config::get_current_theme() . '/archive-espresso_events.php',
-        );
-
-        switch ($CFG->EED_Events_Archive_Filters->default_type) {
-            case 'dates':
-                $CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES . EE_Config::get_current_theme()
-                                                                      . '/archive-espresso_events-dates-view.php';
-                break;
-            case 'text':
-                $CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES . EE_Config::get_current_theme()
-                                                                      . '/archive-espresso_events-text-view.php';
-                break;
-            default:
-                $CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES . EE_Config::get_current_theme()
-                                                                      . '/archive-espresso_events-grid-view.php';
-        }
-
-        $CFG->EED_Events_Archive_Filters = isset($REQ['reset_event_list_settings'])
-                                           && absint($REQ['reset_event_list_settings']) == 1
-            ? new EE_Events_Archive_Config()
-            : $CFG->EED_Events_Archive_Filters;
-        return $CFG;
-    }
-
-
-    /**
-     *    get_template_part
-     *
-     * @access    public
-     * @return    void
-     */
-    public static function get_template_part()
-    {
-        switch (self::$_type) {
-            case 'dates':
-                return 'archive-espresso_events-dates-view.php';
-                break;
-            case 'text':
-                return 'archive-espresso_events-text-view.php';
-                break;
-            default:
-                return 'archive-espresso_events-grid-view.php';
-        }
-    }
-
-
-    /**
-     *    event_list_template_filters
-     *
-     * @access    public
-     * @return    void
-     */
-    public function event_list_template_filters()
-    {
-        $args = array(
-            'form_url'         => get_post_type_archive_link('espresso_events'),
-            // add_query_arg( array( 'post_type' => 'espresso_events' ), home_url() ),
-            'elf_month'        => EED_Events_Archive_Filters::_display_month(),
-            'elf_category'     => EED_Events_Archive_Filters::_event_category_slug(),
-            'elf_show_expired' => EED_Events_Archive_Filters::_show_expired(),
-            'elf_type'         => self::$_type,
-        );
-        EEH_Template::display_template(
-            EE_TEMPLATES . EE_Config::get_current_theme() . '/archive-espresso_events-filters.php',
-            $args
-        );
-    }
-
-
-    /**
-     *    event_list_css
-     *
-     * @access    public
-     * @return    void
-     */
-    public static function event_list_css($extra_class = '')
-    {
-        $EE = EE_Registry::instance();
-        $event_list_css = ! empty($extra_class) ? array($extra_class) : array();
-        $event_list_css[] = 'espresso-event-list-event';
-        if (self::$_type == 'grid') {
-            $event_list_grid_size = isset($EE->CFG->template_settings->EED_Events_Archive_Filters->event_list_grid_size)
-                ? $EE->CFG->template_settings->EED_Events_Archive_Filters->event_list_grid_size : 'medium';
-            $event_list_css[] = $event_list_grid_size . '-event-list-grid';
-        }
-        $event_list_css = apply_filters(
-            'EED_Events_Archive_Filters__event_list_css__event_list_css_array',
-            $event_list_css
-        );
-        return implode(' ', $event_list_css);
-    }
-
-
-    /**
-     *    event_categories
-     *
-     * @access    public
-     * @return    void
-     */
-    public static function event_categories()
-    {
-        return EE_Registry::instance()->load_model('Term')->get_all_ee_categories();
-    }
-
-
-    /**
-     *    display_description
-     *
-     * @access    public
-     * @return    void
-     */
-    public static function display_description($value)
-    {
-        $EE = EE_Registry::instance();
-        $display_description = isset($EE->CFG->template_settings->EED_Events_Archive_Filters->display_description)
-            ? $EE->CFG->template_settings->EED_Events_Archive_Filters->display_description : 1;
-        return $display_description === $value ? true : false;
-    }
-
-
-    /**
-     *    display_venue_details
-     *
-     * @access    public
-     * @return    void
-     */
-    public static function display_venue_details()
-    {
-        $EE = EE_Registry::instance();
-        $display_venue_details = isset($EE->CFG->template_settings->EED_Events_Archive_Filters->display_venue_details)
-            ? $EE->CFG->template_settings->EED_Events_Archive_Filters->display_venue_details : true;
-        $venue_name = EEH_Venue_View::venue_name();
-        return $display_venue_details && ! empty($venue_name) ? true : false;
-    }
-
-
-    /**
-     *    display_address
-     *
-     * @access    public
-     * @return    void
-     */
-    public static function display_address()
-    {
-        $EE = EE_Registry::instance();
-        $display_address = isset($EE->CFG->template_settings->EED_Events_Archive_Filters->display_address)
-            ? $EE->CFG->template_settings->EED_Events_Archive_Filters->display_address : false;
-        $venue_name = EEH_Venue_View::venue_name();
-        return $display_address && ! empty($venue_name) ? true : false;
-    }
-
-
-    /**
-     *    pagination
-     *
-     * @access    public
-     * @return    void
-     */
-    public static function pagination()
-    {
-        global $wp_query;
-        $big = 999999999; // need an unlikely integer
-        $pagination = paginate_links(
-            array(
-                'base'         => str_replace($big, '%#%', esc_url(get_pagenum_link($big))),
-                'format'       => '?paged=%#%',
-                'current'      => max(1, get_query_var('paged')),
-                'total'        => $wp_query->max_num_pages,
-                'show_all'     => true,
-                'end_size'     => 10,
-                'mid_size'     => 6,
-                'prev_next'    => true,
-                'prev_text'    => __('&lsaquo; PREV', 'event_espresso'),
-                'next_text'    => __('NEXT &rsaquo;', 'event_espresso'),
-                'type'         => 'plain',
-                'add_args'     => false,
-                'add_fragment' => '',
-            )
-        );
-        return ! empty($pagination) ? '<div class="ee-pagination-dv clear">' . $pagination . '</div>' : '';
-    }
-
-
-    /**
-     *    event_list_title
-     *
-     * @access    public
-     * @return    void
-     */
-    public static function event_list_title()
-    {
-        return apply_filters(
-            'EED_Events_Archive_Filters__event_list_title__event_list_title',
-            __('Upcoming Events', 'event_espresso')
-        );
-    }
+	/**
+	 * @return EED_Events_Archive_Filters
+	 */
+	public static function instance()
+	{
+		return parent::get_instance(__CLASS__);
+	}
+
+
+	/**
+	 *    Start Date
+	 *
+	 * @var    $_elf_month
+	 * @access    protected
+	 */
+	protected $_elf_month = null;
+
+
+	/**
+	 *    Category
+	 *
+	 * @var    $_elf_category
+	 * @access    protected
+	 */
+	protected $_elf_category = null;
+
+
+	/**
+	 *    whether to display expired events in the event list
+	 *
+	 * @var    $_show_expired
+	 * @access    protected
+	 */
+	protected $_show_expired = null;
+
+
+	/**
+	 *    whether to display the event list as a grid or list
+	 *
+	 * @var    $_type
+	 * @access    protected
+	 */
+	protected static $_type = null;
+
+
+	/**
+	 *    array of existing event list views
+	 *
+	 * @var    $_types
+	 * @access    protected
+	 */
+	protected static $_types = array('grid', 'text', 'dates');
+
+
+
+	/**
+	 *    set_hooks - for hooking into EE Core, other modules, etc
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public static function set_hooks()
+	{
+	}
+
+	/**
+	 *    set_hooks_admin - for hooking into EE Admin Core, other modules, etc
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public static function set_hooks_admin()
+	{
+	}
+
+
+	/**
+	 *    set_definitions
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public static function set_definitions()
+	{
+	}
+
+
+	/**
+	 *    run - initial module setup
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function run($WP)
+	{
+	}
+
+
+	/**
+	 *    event_list
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function event_list()
+	{
+		// load other required components
+		$this->_load_assests();
+	}
+
+
+	/**
+	 *    _filter_query_parts
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	private function _filter_query_parts()
+	{
+		// build event list query
+		add_filter('posts_join', array($this, 'posts_join'), 1, 2);
+		add_filter('posts_where', array($this, 'posts_where'), 1, 2);
+		add_filter('posts_orderby', array($this, 'posts_orderby'), 1, 2);
+	}
+
+	/**
+	 *    _type - the type of event list : grid, text, dates
+	 *
+	 * @access    public
+	 * @return    string
+	 */
+	public static function set_type()
+	{
+		do_action('AHEE__EED_Events_Archive_Filters__before_set_type');
+		EED_Events_Archive_Filters::$_types = apply_filters(
+			'EED_Events_Archive_Filters__set_type__types',
+			EED_Events_Archive_Filters::$_types
+		);
+		$view = isset(EE_Registry::instance()->CFG->EED_Events_Archive_Filters['default_type']) ? EE_Registry::instance(
+		)->CFG->EED_Events_Archive_Filters['default_type'] : 'grid';
+		$elf_type = EE_Registry::instance()->REQ->is_set('elf_type') ? sanitize_text_field(
+			EE_Registry::instance()->REQ->get('elf_type')
+		) : '';
+		$view = ! empty($elf_type) ? $elf_type : $view;
+		$view = apply_filters('EED_Events_Archive_Filters__set_type__type', $view);
+		if (! empty($view) && in_array($view, EED_Events_Archive_Filters::$_types)) {
+			self::$_type = $view;
+		}
+	}
+
+	/**
+	 *    _show_expired
+	 *
+	 * @access    private
+	 * @param    boolean $req_only if TRUE, then ignore defaults and only return $_POST value
+	 * @return    boolean
+	 */
+	private static function _show_expired($req_only = false)
+	{
+		// get default value for "display_expired_events" as set in the EE General Settings > Templates > Event Listings
+		$show_expired = ! $req_only && isset(
+			EE_Registry::instance()->CFG->EED_Events_Archive_Filters['display_expired_events']
+		) ? EE_Registry::instance()->CFG->EED_Events_Archive_Filters['display_expired_events'] : false;
+		// override default expired option if set via filter
+		$show_expired = EE_Registry::instance()->REQ->is_set('elf_expired_chk') ? absint(
+			EE_Registry::instance()->REQ->get('elf_expired_chk')
+		) : $show_expired;
+		return $show_expired ? true : false;
+	}
+
+	/**
+	 *    _event_category_slug
+	 *
+	 * @access    private
+	 * @return    string
+	 */
+	private static function _event_category_slug()
+	{
+		return EE_Registry::instance()->REQ->is_set('elf_category_dd') ? sanitize_text_field(
+			EE_Registry::instance()->REQ->get('elf_category_dd')
+		) : '';
+	}
+
+	/**
+	 *    _display_month - what month should the event list display events for?
+	 *
+	 * @access    private
+	 * @return    string
+	 */
+	private static function _display_month()
+	{
+		return EE_Registry::instance()->REQ->is_set('elf_month_dd') ? sanitize_text_field(
+			EE_Registry::instance()->REQ->get('elf_month_dd')
+		) : '';
+	}
+
+
+	/**
+	 *    get_post_data
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function get_post_data()
+	{
+		$this->_elf_month = EED_Events_Archive_Filters::_display_month();
+		$this->_elf_category = EED_Events_Archive_Filters::_event_category_slug();
+		$this->_show_expired = EED_Events_Archive_Filters::_show_expired(true);
+	}
+
+
+	/**
+	 *    posts_join
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function posts_join($SQL, WP_Query $wp_query)
+	{
+		if (isset($wp_query->query) && isset($wp_query->query['post_type']) && $wp_query->query['post_type'] == 'espresso_events') {
+			// Category
+			$SQL .= EED_Events_Archive_Filters::posts_join_sql_for_terms(
+				EED_Events_Archive_Filters::_event_category_slug()
+			);
+		}
+		return $SQL;
+	}
+
+
+	/**
+	 *    posts_join_sql_for_terms
+	 *
+	 * @access    public
+	 * @param    mixed boolean|string    $join_terms pass TRUE or term string, doesn't really matter since this value
+	 *                                   doesn't really get used for anything yet
+	 * @return    string
+	 */
+	public static function posts_join_sql_for_terms($join_terms = null)
+	{
+		$SQL = '';
+		if (! empty($join_terms)) {
+			global $wpdb;
+			$SQL .= " LEFT JOIN $wpdb->term_relationships ON ($wpdb->posts.ID = $wpdb->term_relationships.object_id)";
+			$SQL .= " LEFT JOIN $wpdb->term_taxonomy ON ($wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id)";
+			$SQL .= " LEFT JOIN $wpdb->terms ON ($wpdb->terms.term_id = $wpdb->term_taxonomy.term_id) ";
+		}
+		return $SQL;
+	}
+
+
+	/**
+	 * usage:  $SQL .= EED_Events_Archive_Filters::posts_join_for_orderby( $orderby_params );
+	 *
+	 * @param array $orderby_params
+	 * @return  string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function posts_join_for_orderby(array $orderby_params = array()): string
+	{
+		global $wpdb;
+		$SQL = '';
+		$orderby_params = is_array($orderby_params) ? $orderby_params : array($orderby_params);
+		foreach ($orderby_params as $orderby) {
+			switch ($orderby) {
+				case 'ticket_start':
+				case 'ticket_end':
+					$SQL .= ' LEFT JOIN ' . EEM_Datetime_Ticket::instance()->table() . ' ON ('
+							. EEM_Datetime::instance()->table() . '.DTT_ID = '
+							. EEM_Datetime_Ticket::instance()->table() . '.DTT_ID )';
+					$SQL .= ' LEFT JOIN ' . EEM_Ticket::instance()->table() . ' ON ('
+							. EEM_Datetime_Ticket::instance()->table() . '.TKT_ID = '
+							. EEM_Ticket::instance()->table() . '.TKT_ID )';
+					break;
+
+				case 'city':
+				case 'state':
+				case 'venue_title':
+					// grab wp_posts (event), venue, and event_meta table names
+					$wp_posts = $wpdb->posts;
+					$venue = EEM_Venue::instance()->table();
+					$event_meta = EEM_Event::instance()->second_table();
+					$SQL .= " LEFT JOIN $event_meta ON ( $wp_posts.ID = $event_meta.EVT_ID )";
+					$SQL .= " LEFT JOIN $venue ON ( $event_meta.VNU_ID = $venue.VNU_ID )";
+					break;
+			}
+		}
+		return $SQL;
+	}
+
+
+	/**
+	 *    posts_where
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function posts_where($SQL, WP_Query $wp_query)
+	{
+		if (isset($wp_query->query_vars) && isset($wp_query->query_vars['post_type']) && $wp_query->query_vars['post_type'] == 'espresso_events') {
+			// Show Expired ?
+			$SQL .= EED_Events_Archive_Filters::posts_where_sql_for_show_expired(
+				EED_Events_Archive_Filters::_show_expired()
+			);
+			// Category
+			// $elf_category = EED_Events_Archive_Filters::_event_category_slug();
+			$SQL .= EED_Events_Archive_Filters::posts_where_sql_for_event_category_slug(
+				EED_Events_Archive_Filters::_event_category_slug()
+			);
+			// Start Date
+			// $elf_month = EED_Events_Archive_Filters::_display_month();
+			$SQL .= EED_Events_Archive_Filters::posts_where_sql_for_event_list_month(
+				EED_Events_Archive_Filters::_display_month()
+			);
+		}
+		return $SQL;
+	}
+
+
+	/**
+	 *    posts_where_sql_for_show_expired
+	 *
+	 * @access    public
+	 * @param    boolean $show_expired if TRUE, then displayed past events
+	 * @return    string
+	 */
+	public static function posts_where_sql_for_show_expired($show_expired = false)
+	{
+		return ! $show_expired
+			? ' AND ' . EEM_Datetime::instance()->table() . '.DTT_EVT_end > "' . date('Y-m-d H:s:i') . '" '
+			: '';
+	}
+
+
+	/**
+	 *    posts_where_sql_for_event_category_slug
+	 *
+	 * @access    public
+	 * @param    boolean $event_category_slug
+	 * @return    string
+	 */
+	public static function posts_where_sql_for_event_category_slug($event_category_slug = null)
+	{
+		global $wpdb;
+		return ! empty($event_category_slug) ? ' AND ' . $wpdb->terms . '.slug = "' . $event_category_slug . '" ' : '';
+	}
+
+	/**
+	 *    posts_where_sql_for_event_list_month
+	 *
+	 * @access    public
+	 * @param    boolean $month
+	 * @return    string
+	 */
+	public static function posts_where_sql_for_event_list_month($month = null)
+	{
+		$SQL = '';
+		if (! empty($month)) {
+			// event start date is LESS than the end of the month ( so nothing that doesn't start until next month )
+			$SQL = ' AND ' . EEM_Datetime::instance()->table() . '.DTT_EVT_start';
+			$SQL .= ' <= "' . date('Y-m-t 23:59:59', \EEH_DTT_Helper::first_of_month_timestamp($month)) . '"';
+			// event end date is GREATER than the start of the month ( so nothing that ended before this month )
+			$SQL .= ' AND ' . EEM_Datetime::instance()->table() . '.DTT_EVT_end';
+			$SQL .= ' >= "' . date('Y-m-d 0:0:00', \EEH_DTT_Helper::first_of_month_timestamp($month)) . '" ';
+		}
+		return $SQL;
+	}
+
+
+	/**
+	 *    posts_orderby
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function posts_orderby($SQL, WP_Query $wp_query)
+	{
+		if (isset($wp_query->query) && isset($wp_query->query['post_type']) && $wp_query->query['post_type'] == 'espresso_events') {
+			$SQL = EED_Events_Archive_Filters::posts_orderby_sql(array('start_date'));
+		}
+		return $SQL;
+	}
+
+
+	/**
+	 *    posts_orderby_sql
+	 *
+	 *    possible parameters:
+	 *    ID
+	 *    start_date
+	 *    end_date
+	 *    event_name
+	 *    category_slug
+	 *    ticket_start
+	 *    ticket_end
+	 *    venue_title
+	 *    city
+	 *    state
+	 *
+	 *    **IMPORTANT**
+	 *    make sure to also send the $orderby_params array to the posts_join_for_orderby() method
+	 *    or else some of the table references below will result in MySQL errors
+	 *
+	 * @access    public
+	 * @param    boolean $orderby_params
+	 * @return    string
+	 */
+	public static function posts_orderby_sql($orderby_params = array(), $sort = 'ASC')
+	{
+		global $wpdb;
+		$SQL = '';
+		$cntr = 1;
+		$orderby_params = is_array($orderby_params) ? $orderby_params : array($orderby_params);
+		foreach ($orderby_params as $orderby) {
+			$glue = $cntr == 1 || $cntr == count($orderby_params) ? ' ' : ', ';
+			switch ($orderby) {
+				case 'id':
+				case 'ID':
+					$SQL .= $glue . $wpdb->posts . '.ID ' . $sort;
+					break;
+
+				case 'start_date':
+					$SQL .= $glue . EEM_Datetime::instance()->table() . '.DTT_EVT_start ' . $sort;
+					break;
+
+				case 'end_date':
+					$SQL .= $glue . EEM_Datetime::instance()->table() . '.DTT_EVT_end ' . $sort;
+					break;
+
+				case 'event_name':
+					$SQL .= $glue . $wpdb->posts . '.post_title ' . $sort;
+					break;
+
+				case 'category_slug':
+					$SQL .= $glue . $wpdb->terms . '.slug ' . $sort;
+					break;
+
+				case 'ticket_start':
+					$SQL .= $glue . EEM_Ticket::instance()->table() . '.TKT_start_date ' . $sort;
+					break;
+
+				case 'ticket_end':
+					$SQL .= $glue . EEM_Ticket::instance()->table() . '.TKT_end_date ' . $sort;
+					break;
+
+				case 'venue_title':
+					$SQL .= $glue . 'venue_title ' . $sort;
+					break;
+
+				case 'city':
+					$SQL .= $glue . EEM_Venue::instance()->second_table() . '.VNU_city ' . $sort;
+					break;
+
+				case 'state':
+					$SQL .= $glue . EEM_State::instance()->table() . '.STA_name ' . $sort;
+					break;
+			}
+			$cntr++;
+		}
+		// echo '<h4>$SQL : ' . $SQL . '  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>';
+		return $SQL;
+	}
+
+
+	/**
+	 *    template_redirect
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function template_redirect()
+	{
+		// add event list filters
+		add_action('loop_start', array($this, 'event_list_template_filters'));
+		// and pagination
+		add_action('loop_start', array($this, 'event_list_pagination'));
+		add_action('loop_end', array($this, 'event_list_pagination'));
+		// if NOT a custom template
+		if (
+			EE_Registry::instance()
+					   ->load_core('Front_Controller', array(), false, true)
+					   ->get_selected_template() != 'archive-espresso_events.php'
+		) {
+			// don't know if theme uses the_excerpt
+			add_filter('the_excerpt', array($this, 'event_details'), 100);
+			add_filter('the_excerpt', array($this, 'event_tickets'), 110);
+			add_filter('the_excerpt', array($this, 'event_datetimes'), 120);
+			add_filter('the_excerpt', array($this, 'event_venues'), 130);
+			// or the_content
+			add_filter('the_content', array($this, 'event_details'), 100);
+			add_filter('the_content', array($this, 'event_tickets'), 110);
+			add_filter('the_content', array($this, 'event_datetimes'), 120);
+			add_filter('the_content', array($this, 'event_venues'), 130);
+		} else {
+			remove_all_filters('excerpt_length');
+			add_filter('excerpt_length', array($this, 'excerpt_length'), 10);
+			add_filter('excerpt_more', array($this, 'excerpt_more'), 10);
+		}
+	}
+
+
+	/**
+	 *    event_list_pagination
+	 *
+	 * @access    public
+	 * @return        void
+	 */
+	public function event_list_pagination()
+	{
+		echo '<div class="ee-pagination-dv ee-clear-float">' . espresso_event_list_pagination() . '</div>';
+	}
+
+
+	/**
+	 *    event_details
+	 *
+	 * @access    public
+	 * @param        string $content
+	 * @return        void
+	 */
+	public function event_details($content)
+	{
+		return EEH_Template::display_template(
+			EE_TEMPLATES . EE_Config::get_current_theme() . '/content-espresso_events-details.php',
+			array('the_content' => $content),
+			true
+		);
+	}
+
+
+	/**
+	 *    event_tickets
+	 *
+	 * @access    public
+	 * @param        string $content
+	 * @return        void
+	 */
+	public function event_tickets($content)
+	{
+		return $content
+			   . EEH_Template::display_template(
+				   EE_TEMPLATES . EE_Config::get_current_theme() . '/content-espresso_events-tickets.php',
+				   array(),
+				   true
+			   );
+	}
+
+	/**
+	 *    event_datetimes
+	 *
+	 * @access    public
+	 * @param        string $content
+	 * @return        void
+	 */
+	public function event_datetimes($content)
+	{
+		return $content
+			   . EEH_Template::display_template(
+				   EE_TEMPLATES . EE_Config::get_current_theme() . '/content-espresso_events-datetimes.php',
+				   array(),
+				   true
+			   );
+	}
+
+	/**
+	 *    event_venues
+	 *
+	 * @access    public
+	 * @param        string $content
+	 * @return        void
+	 */
+	public function event_venues($content)
+	{
+		return $content
+			   . EEH_Template::display_template(
+				   EE_TEMPLATES . EE_Config::get_current_theme() . '/content-espresso_events-venues.php',
+				   array(),
+				   true
+			   );
+	}
+
+
+	/**
+	 *    _initial_setup
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	private function _load_assests()
+	{
+		do_action('AHEE__EED_Events_Archive_Filters__before_load_assests');
+		wp_enqueue_style('espresso_default');
+		wp_enqueue_style('espresso_custom_css');
+		add_filter('FHEE_load_EE_Session', '__return_true');
+		add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 10);
+		if (EE_Registry::instance()->CFG->map_settings->use_google_maps) {
+			add_action('wp_enqueue_scripts', array('EEH_Maps', 'espresso_google_map_js'), 11);
+		}
+		// add_filter( 'the_excerpt', array( $this, 'the_excerpt' ), 999 );
+	}
+
+
+	/**
+	 *    _get_template
+	 *
+	 * @access    private
+	 * @return    string
+	 */
+	private function _get_template($which = 'part')
+	{
+		return EE_TEMPLATES . EE_Config::get_current_theme() . '/archive-espresso_events.php';
+	}
+
+
+	/**
+	 *    excerpt_length
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function excerpt_length($length)
+	{
+
+		if (self::$_type == 'grid') {
+			return 36;
+		}
+
+		switch (EE_Registry::instance()->CFG->template_settings->EED_Events_Archive_Filters->event_list_grid_size) {
+			case 'tiny':
+				return 12;
+				break;
+			case 'small':
+				return 24;
+				break;
+			case 'large':
+				return 48;
+				break;
+			case 'medium':
+			default:
+				return 36;
+		}
+	}
+
+
+	/**
+	 *    excerpt_more
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function excerpt_more($more)
+	{
+		return '&hellip;';
+	}
+
+
+
+
+	/**
+	 *    wp_enqueue_scripts
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function wp_enqueue_scripts()
+	{
+		// get some style
+		if (apply_filters('FHEE_enable_default_espresso_css', false)) {
+			// first check uploads folder
+			if (
+				is_readable(
+					get_stylesheet_directory() . EE_Config::get_current_theme() . '/archive-espresso_events.css'
+				)
+			) {
+				wp_register_style(
+					'archive-espresso_events',
+					get_stylesheet_directory_uri() . EE_Config::get_current_theme(
+					) . '/archive-espresso_events.css',
+					array('dashicons', 'espresso_default')
+				);
+			} else {
+				wp_register_style(
+					'archive-espresso_events',
+					EE_TEMPLATES_URL . EE_Config::get_current_theme() . '/archive-espresso_events.css',
+					array('dashicons', 'espresso_default')
+				);
+			}
+			if (
+				is_readable(
+					get_stylesheet_directory() . EE_Config::get_current_theme() . '/archive-espresso_events.js'
+				)
+			) {
+				wp_register_script(
+					'archive-espresso_events',
+					get_stylesheet_directory_uri() . EE_Config::get_current_theme() . '/archive-espresso_events.js',
+					array('jquery-masonry'),
+					'1.0',
+					true
+				);
+			} else {
+				wp_register_script(
+					'archive-espresso_events',
+					EVENTS_ARCHIVE_ASSETS_URL . 'archive-espresso_events.js',
+					array('jquery-masonry'),
+					'1.0',
+					true
+				);
+			}
+			wp_enqueue_style('archive-espresso_events');
+			wp_enqueue_script('jquery-masonry');
+			wp_enqueue_script('archive-espresso_events');
+			add_action('wp_footer', array('EED_Events_Archive_Filters', 'localize_grid_event_lists'), 1);
+		}
+	}
+
+
+	/**
+	 *    template_settings_form
+	 *
+	 * @access    public
+	 * @static
+	 * @return    void
+	 */
+	public static function localize_grid_event_lists()
+	{
+		wp_localize_script(
+			'archive-espresso_events',
+			'espresso_grid_event_lists',
+			EED_Events_Archive_Filters::$espresso_grid_event_lists
+		);
+	}
+
+
+	/**
+	 *    template_settings_form
+	 *
+	 * @access    public
+	 * @static
+	 * @return    void
+	 */
+	public static function template_settings_form()
+	{
+		$EE = EE_Registry::instance();
+		$EE->CFG->template_settings->EED_Events_Archive_Filters = isset($EE->CFG->template_settings->EED_Events_Archive_Filters)
+			? $EE->CFG->template_settings->EED_Events_Archive_Filters : new EE_Events_Archive_Config();
+		$EE->CFG->template_settings->EED_Events_Archive_Filters = apply_filters(
+			'FHEE__Event_List__template_settings_form__event_list_config',
+			$EE->CFG->template_settings->EED_Events_Archive_Filters
+		);
+		EEH_Template::display_template(
+			EVENTS_ARCHIVE_TEMPLATES_PATH . 'admin-event-list-settings.template.php',
+			$EE->CFG->template_settings->EED_Events_Archive_Filters
+		);
+	}
+
+
+	/**
+	 *    set_default_settings
+	 *
+	 * @access    public
+	 * @static
+	 * @return    void
+	 */
+	public static function set_default_settings($CFG)
+	{
+		// EEH_Debug_Tools::printr( $CFG, '$CFG  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
+		$CFG->display_description = isset($CFG->display_description) && ! empty($CFG->display_description)
+			? $CFG->display_description : 1;
+		$CFG->display_address = isset($CFG->display_address) && ! empty($CFG->display_address) ? $CFG->display_address
+			: true;
+		$CFG->display_venue_details = isset($CFG->display_venue_details) && ! empty($CFG->display_venue_details)
+			? $CFG->display_venue_details : true;
+		$CFG->display_expired_events = isset($CFG->display_expired_events) && ! empty($CFG->display_expired_events)
+			? $CFG->display_expired_events : false;
+		$CFG->default_type = isset($CFG->default_type) && ! empty($CFG->default_type) ? $CFG->default_type : 'grid';
+		$CFG->event_list_grid_size = isset($CFG->event_list_grid_size) && ! empty($CFG->event_list_grid_size)
+			? $CFG->event_list_grid_size : 'medium';
+		$CFG->templates['full'] = isset($CFG->templates['full']) && ! empty($CFG->templates['full'])
+			? $CFG->templates['full']
+			: EE_TEMPLATES . EE_Config::get_current_theme() . '/archive-espresso_events.php';
+		$CFG->templates['part'] = isset($CFG->templates['part']) && ! empty($CFG->templates['part'])
+			? $CFG->templates['part']
+			: EE_TEMPLATES . EE_Config::get_current_theme() . '/archive-espresso_events-grid-view.php';
+		return $CFG;
+	}
+
+
+	/**
+	 *    filter_config
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function filter_config($CFG)
+	{
+		return $CFG;
+	}
+
+
+	/**
+	 *    filter_config
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public static function update_template_settings($CFG, $REQ)
+	{
+		// $CFG->template_settings->EED_Events_Archive_Filters = new stdClass();
+		$CFG->EED_Events_Archive_Filters->display_description = isset($REQ['display_description_in_event_list'])
+			? absint($REQ['display_description_in_event_list']) : 1;
+		$CFG->EED_Events_Archive_Filters->display_address = isset($REQ['display_address_in_event_list']) ? absint(
+			$REQ['display_address_in_event_list']
+		) : true;
+		$CFG->EED_Events_Archive_Filters->display_venue_details = isset($REQ['display_venue_details_in_event_list'])
+			? absint($REQ['display_venue_details_in_event_list']) : true;
+		$CFG->EED_Events_Archive_Filters->display_expired_events = isset($REQ['display_expired_events']) ? absint(
+			$REQ['display_expired_events']
+		) : false;
+		$CFG->EED_Events_Archive_Filters->default_type = isset($REQ['default_type']) ? sanitize_text_field(
+			$REQ['default_type']
+		) : 'grid';
+		$CFG->EED_Events_Archive_Filters->event_list_grid_size = isset($REQ['event_list_grid_size'])
+			? sanitize_text_field($REQ['event_list_grid_size']) : 'medium';
+		$CFG->EED_Events_Archive_Filters->templates = array(
+			'full' => EE_TEMPLATES . EE_Config::get_current_theme() . '/archive-espresso_events.php',
+		);
+
+		switch ($CFG->EED_Events_Archive_Filters->default_type) {
+			case 'dates':
+				$CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES . EE_Config::get_current_theme()
+																	  . '/archive-espresso_events-dates-view.php';
+				break;
+			case 'text':
+				$CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES . EE_Config::get_current_theme()
+																	  . '/archive-espresso_events-text-view.php';
+				break;
+			default:
+				$CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES . EE_Config::get_current_theme()
+																	  . '/archive-espresso_events-grid-view.php';
+		}
+
+		$CFG->EED_Events_Archive_Filters = isset($REQ['reset_event_list_settings'])
+										   && absint($REQ['reset_event_list_settings']) == 1
+			? new EE_Events_Archive_Config()
+			: $CFG->EED_Events_Archive_Filters;
+		return $CFG;
+	}
+
+
+	/**
+	 *    get_template_part
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public static function get_template_part()
+	{
+		switch (self::$_type) {
+			case 'dates':
+				return 'archive-espresso_events-dates-view.php';
+				break;
+			case 'text':
+				return 'archive-espresso_events-text-view.php';
+				break;
+			default:
+				return 'archive-espresso_events-grid-view.php';
+		}
+	}
+
+
+	/**
+	 *    event_list_template_filters
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function event_list_template_filters()
+	{
+		$args = array(
+			'form_url'         => get_post_type_archive_link('espresso_events'),
+			// add_query_arg( array( 'post_type' => 'espresso_events' ), home_url() ),
+			'elf_month'        => EED_Events_Archive_Filters::_display_month(),
+			'elf_category'     => EED_Events_Archive_Filters::_event_category_slug(),
+			'elf_show_expired' => EED_Events_Archive_Filters::_show_expired(),
+			'elf_type'         => self::$_type,
+		);
+		EEH_Template::display_template(
+			EE_TEMPLATES . EE_Config::get_current_theme() . '/archive-espresso_events-filters.php',
+			$args
+		);
+	}
+
+
+	/**
+	 *    event_list_css
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public static function event_list_css($extra_class = '')
+	{
+		$EE = EE_Registry::instance();
+		$event_list_css = ! empty($extra_class) ? array($extra_class) : array();
+		$event_list_css[] = 'espresso-event-list-event';
+		if (self::$_type == 'grid') {
+			$event_list_grid_size = isset($EE->CFG->template_settings->EED_Events_Archive_Filters->event_list_grid_size)
+				? $EE->CFG->template_settings->EED_Events_Archive_Filters->event_list_grid_size : 'medium';
+			$event_list_css[] = $event_list_grid_size . '-event-list-grid';
+		}
+		$event_list_css = apply_filters(
+			'EED_Events_Archive_Filters__event_list_css__event_list_css_array',
+			$event_list_css
+		);
+		return implode(' ', $event_list_css);
+	}
+
+
+	/**
+	 *    event_categories
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public static function event_categories()
+	{
+		return EE_Registry::instance()->load_model('Term')->get_all_ee_categories();
+	}
+
+
+	/**
+	 *    display_description
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public static function display_description($value)
+	{
+		$EE = EE_Registry::instance();
+		$display_description = isset($EE->CFG->template_settings->EED_Events_Archive_Filters->display_description)
+			? $EE->CFG->template_settings->EED_Events_Archive_Filters->display_description : 1;
+		return $display_description === $value ? true : false;
+	}
+
+
+	/**
+	 *    display_venue_details
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public static function display_venue_details()
+	{
+		$EE = EE_Registry::instance();
+		$display_venue_details = isset($EE->CFG->template_settings->EED_Events_Archive_Filters->display_venue_details)
+			? $EE->CFG->template_settings->EED_Events_Archive_Filters->display_venue_details : true;
+		$venue_name = EEH_Venue_View::venue_name();
+		return $display_venue_details && ! empty($venue_name) ? true : false;
+	}
+
+
+	/**
+	 *    display_address
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public static function display_address()
+	{
+		$EE = EE_Registry::instance();
+		$display_address = isset($EE->CFG->template_settings->EED_Events_Archive_Filters->display_address)
+			? $EE->CFG->template_settings->EED_Events_Archive_Filters->display_address : false;
+		$venue_name = EEH_Venue_View::venue_name();
+		return $display_address && ! empty($venue_name) ? true : false;
+	}
+
+
+	/**
+	 *    pagination
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public static function pagination()
+	{
+		global $wp_query;
+		$big = 999999999; // need an unlikely integer
+		$pagination = paginate_links(
+			array(
+				'base'         => str_replace($big, '%#%', esc_url(get_pagenum_link($big))),
+				'format'       => '?paged=%#%',
+				'current'      => max(1, get_query_var('paged')),
+				'total'        => $wp_query->max_num_pages,
+				'show_all'     => true,
+				'end_size'     => 10,
+				'mid_size'     => 6,
+				'prev_next'    => true,
+				'prev_text'    => __('&lsaquo; PREV', 'event_espresso'),
+				'next_text'    => __('NEXT &rsaquo;', 'event_espresso'),
+				'type'         => 'plain',
+				'add_args'     => false,
+				'add_fragment' => '',
+			)
+		);
+		return ! empty($pagination) ? '<div class="ee-pagination-dv clear">' . $pagination . '</div>' : '';
+	}
+
+
+	/**
+	 *    event_list_title
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public static function event_list_title()
+	{
+		return apply_filters(
+			'EED_Events_Archive_Filters__event_list_title__event_list_title',
+			__('Upcoming Events', 'event_espresso')
+		);
+	}
 }

Spacing +48 added lines, -48 removed lines

@@ -158,7 +158,7 @@ 
         ) : '';
         $view = ! empty($elf_type) ? $elf_type : $view;
         $view = apply_filters('EED_Events_Archive_Filters__set_type__type', $view);
-        if (! empty($view) && in_array($view, EED_Events_Archive_Filters::$_types)) {
+        if ( ! empty($view) && in_array($view, EED_Events_Archive_Filters::$_types)) {
             self::$_type = $view;
         }
     }
@@ -253,7 +253,7 @@ 
     public static function posts_join_sql_for_terms($join_terms = null)
     {
         $SQL = '';
-        if (! empty($join_terms)) {
+        if ( ! empty($join_terms)) {
             global $wpdb;
             $SQL .= " LEFT JOIN $wpdb->term_relationships ON ($wpdb->posts.ID = $wpdb->term_relationships.object_id)";
             $SQL .= " LEFT JOIN $wpdb->term_taxonomy ON ($wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id)";
@@ -280,12 +280,12 @@ 
             switch ($orderby) {
                 case 'ticket_start':
                 case 'ticket_end':
-                    $SQL .= ' LEFT JOIN ' . EEM_Datetime_Ticket::instance()->table() . ' ON ('
-                            . EEM_Datetime::instance()->table() . '.DTT_ID = '
-                            . EEM_Datetime_Ticket::instance()->table() . '.DTT_ID )';
-                    $SQL .= ' LEFT JOIN ' . EEM_Ticket::instance()->table() . ' ON ('
-                            . EEM_Datetime_Ticket::instance()->table() . '.TKT_ID = '
-                            . EEM_Ticket::instance()->table() . '.TKT_ID )';
+                    $SQL .= ' LEFT JOIN '.EEM_Datetime_Ticket::instance()->table().' ON ('
+                            . EEM_Datetime::instance()->table().'.DTT_ID = '
+                            . EEM_Datetime_Ticket::instance()->table().'.DTT_ID )';
+                    $SQL .= ' LEFT JOIN '.EEM_Ticket::instance()->table().' ON ('
+                            . EEM_Datetime_Ticket::instance()->table().'.TKT_ID = '
+                            . EEM_Ticket::instance()->table().'.TKT_ID )';
                     break;
 
                 case 'city':
@@ -342,7 +342,7 @@ 
     public static function posts_where_sql_for_show_expired($show_expired = false)
     {
         return ! $show_expired
-            ? ' AND ' . EEM_Datetime::instance()->table() . '.DTT_EVT_end > "' . date('Y-m-d H:s:i') . '" '
+            ? ' AND '.EEM_Datetime::instance()->table().'.DTT_EVT_end > "'.date('Y-m-d H:s:i').'" '
             : '';
     }
 
@@ -357,7 +357,7 @@ 
     public static function posts_where_sql_for_event_category_slug($event_category_slug = null)
     {
         global $wpdb;
-        return ! empty($event_category_slug) ? ' AND ' . $wpdb->terms . '.slug = "' . $event_category_slug . '" ' : '';
+        return ! empty($event_category_slug) ? ' AND '.$wpdb->terms.'.slug = "'.$event_category_slug.'" ' : '';
     }
 
     /**
@@ -370,13 +370,13 @@ 
     public static function posts_where_sql_for_event_list_month($month = null)
     {
         $SQL = '';
-        if (! empty($month)) {
+        if ( ! empty($month)) {
             // event start date is LESS than the end of the month ( so nothing that doesn't start until next month )
-            $SQL = ' AND ' . EEM_Datetime::instance()->table() . '.DTT_EVT_start';
-            $SQL .= ' <= "' . date('Y-m-t 23:59:59', \EEH_DTT_Helper::first_of_month_timestamp($month)) . '"';
+            $SQL = ' AND '.EEM_Datetime::instance()->table().'.DTT_EVT_start';
+            $SQL .= ' <= "'.date('Y-m-t 23:59:59', \EEH_DTT_Helper::first_of_month_timestamp($month)).'"';
             // event end date is GREATER than the start of the month ( so nothing that ended before this month )
-            $SQL .= ' AND ' . EEM_Datetime::instance()->table() . '.DTT_EVT_end';
-            $SQL .= ' >= "' . date('Y-m-d 0:0:00', \EEH_DTT_Helper::first_of_month_timestamp($month)) . '" ';
+            $SQL .= ' AND '.EEM_Datetime::instance()->table().'.DTT_EVT_end';
+            $SQL .= ' >= "'.date('Y-m-d 0:0:00', \EEH_DTT_Helper::first_of_month_timestamp($month)).'" ';
         }
         return $SQL;
     }
@@ -431,43 +431,43 @@ 
             switch ($orderby) {
                 case 'id':
                 case 'ID':
-                    $SQL .= $glue . $wpdb->posts . '.ID ' . $sort;
+                    $SQL .= $glue.$wpdb->posts.'.ID '.$sort;
                     break;
 
                 case 'start_date':
-                    $SQL .= $glue . EEM_Datetime::instance()->table() . '.DTT_EVT_start ' . $sort;
+                    $SQL .= $glue.EEM_Datetime::instance()->table().'.DTT_EVT_start '.$sort;
                     break;
 
                 case 'end_date':
-                    $SQL .= $glue . EEM_Datetime::instance()->table() . '.DTT_EVT_end ' . $sort;
+                    $SQL .= $glue.EEM_Datetime::instance()->table().'.DTT_EVT_end '.$sort;
                     break;
 
                 case 'event_name':
-                    $SQL .= $glue . $wpdb->posts . '.post_title ' . $sort;
+                    $SQL .= $glue.$wpdb->posts.'.post_title '.$sort;
                     break;
 
                 case 'category_slug':
-                    $SQL .= $glue . $wpdb->terms . '.slug ' . $sort;
+                    $SQL .= $glue.$wpdb->terms.'.slug '.$sort;
                     break;
 
                 case 'ticket_start':
-                    $SQL .= $glue . EEM_Ticket::instance()->table() . '.TKT_start_date ' . $sort;
+                    $SQL .= $glue.EEM_Ticket::instance()->table().'.TKT_start_date '.$sort;
                     break;
 
                 case 'ticket_end':
-                    $SQL .= $glue . EEM_Ticket::instance()->table() . '.TKT_end_date ' . $sort;
+                    $SQL .= $glue.EEM_Ticket::instance()->table().'.TKT_end_date '.$sort;
                     break;
 
                 case 'venue_title':
-                    $SQL .= $glue . 'venue_title ' . $sort;
+                    $SQL .= $glue.'venue_title '.$sort;
                     break;
 
                 case 'city':
-                    $SQL .= $glue . EEM_Venue::instance()->second_table() . '.VNU_city ' . $sort;
+                    $SQL .= $glue.EEM_Venue::instance()->second_table().'.VNU_city '.$sort;
                     break;
 
                 case 'state':
-                    $SQL .= $glue . EEM_State::instance()->table() . '.STA_name ' . $sort;
+                    $SQL .= $glue.EEM_State::instance()->table().'.STA_name '.$sort;
                     break;
             }
             $cntr++;
@@ -522,7 +522,7 @@ 
      */
     public function event_list_pagination()
     {
-        echo '<div class="ee-pagination-dv ee-clear-float">' . espresso_event_list_pagination() . '</div>';
+        echo '<div class="ee-pagination-dv ee-clear-float">'.espresso_event_list_pagination().'</div>';
     }
 
 
@@ -536,7 +536,7 @@ 
     public function event_details($content)
     {
         return EEH_Template::display_template(
-            EE_TEMPLATES . EE_Config::get_current_theme() . '/content-espresso_events-details.php',
+            EE_TEMPLATES.EE_Config::get_current_theme().'/content-espresso_events-details.php',
             array('the_content' => $content),
             true
         );
@@ -554,7 +554,7 @@ 
     {
         return $content
                . EEH_Template::display_template(
-                   EE_TEMPLATES . EE_Config::get_current_theme() . '/content-espresso_events-tickets.php',
+                   EE_TEMPLATES.EE_Config::get_current_theme().'/content-espresso_events-tickets.php',
                    array(),
                    true
                );
@@ -571,7 +571,7 @@ 
     {
         return $content
                . EEH_Template::display_template(
-                   EE_TEMPLATES . EE_Config::get_current_theme() . '/content-espresso_events-datetimes.php',
+                   EE_TEMPLATES.EE_Config::get_current_theme().'/content-espresso_events-datetimes.php',
                    array(),
                    true
                );
@@ -588,7 +588,7 @@ 
     {
         return $content
                . EEH_Template::display_template(
-                   EE_TEMPLATES . EE_Config::get_current_theme() . '/content-espresso_events-venues.php',
+                   EE_TEMPLATES.EE_Config::get_current_theme().'/content-espresso_events-venues.php',
                    array(),
                    true
                );
@@ -623,7 +623,7 @@ 
      */
     private function _get_template($which = 'part')
     {
-        return EE_TEMPLATES . EE_Config::get_current_theme() . '/archive-espresso_events.php';
+        return EE_TEMPLATES.EE_Config::get_current_theme().'/archive-espresso_events.php';
     }
 
 
@@ -684,30 +684,30 @@ 
             // first check uploads folder
             if (
                 is_readable(
-                    get_stylesheet_directory() . EE_Config::get_current_theme() . '/archive-espresso_events.css'
+                    get_stylesheet_directory().EE_Config::get_current_theme().'/archive-espresso_events.css'
                 )
             ) {
                 wp_register_style(
                     'archive-espresso_events',
-                    get_stylesheet_directory_uri() . EE_Config::get_current_theme(
-                    ) . '/archive-espresso_events.css',
+                    get_stylesheet_directory_uri().EE_Config::get_current_theme(
+                    ).'/archive-espresso_events.css',
                     array('dashicons', 'espresso_default')
                 );
             } else {
                 wp_register_style(
                     'archive-espresso_events',
-                    EE_TEMPLATES_URL . EE_Config::get_current_theme() . '/archive-espresso_events.css',
+                    EE_TEMPLATES_URL.EE_Config::get_current_theme().'/archive-espresso_events.css',
                     array('dashicons', 'espresso_default')
                 );
             }
             if (
                 is_readable(
-                    get_stylesheet_directory() . EE_Config::get_current_theme() . '/archive-espresso_events.js'
+                    get_stylesheet_directory().EE_Config::get_current_theme().'/archive-espresso_events.js'
                 )
             ) {
                 wp_register_script(
                     'archive-espresso_events',
-                    get_stylesheet_directory_uri() . EE_Config::get_current_theme() . '/archive-espresso_events.js',
+                    get_stylesheet_directory_uri().EE_Config::get_current_theme().'/archive-espresso_events.js',
                     array('jquery-masonry'),
                     '1.0',
                     true
@@ -715,7 +715,7 @@ 
             } else {
                 wp_register_script(
                     'archive-espresso_events',
-                    EVENTS_ARCHIVE_ASSETS_URL . 'archive-espresso_events.js',
+                    EVENTS_ARCHIVE_ASSETS_URL.'archive-espresso_events.js',
                     array('jquery-masonry'),
                     '1.0',
                     true
@@ -763,7 +763,7 @@ 
             $EE->CFG->template_settings->EED_Events_Archive_Filters
         );
         EEH_Template::display_template(
-            EVENTS_ARCHIVE_TEMPLATES_PATH . 'admin-event-list-settings.template.php',
+            EVENTS_ARCHIVE_TEMPLATES_PATH.'admin-event-list-settings.template.php',
             $EE->CFG->template_settings->EED_Events_Archive_Filters
         );
     }
@@ -792,10 +792,10 @@ 
             ? $CFG->event_list_grid_size : 'medium';
         $CFG->templates['full'] = isset($CFG->templates['full']) && ! empty($CFG->templates['full'])
             ? $CFG->templates['full']
-            : EE_TEMPLATES . EE_Config::get_current_theme() . '/archive-espresso_events.php';
+            : EE_TEMPLATES.EE_Config::get_current_theme().'/archive-espresso_events.php';
         $CFG->templates['part'] = isset($CFG->templates['part']) && ! empty($CFG->templates['part'])
             ? $CFG->templates['part']
-            : EE_TEMPLATES . EE_Config::get_current_theme() . '/archive-espresso_events-grid-view.php';
+            : EE_TEMPLATES.EE_Config::get_current_theme().'/archive-espresso_events-grid-view.php';
         return $CFG;
     }
 
@@ -837,20 +837,20 @@ 
         $CFG->EED_Events_Archive_Filters->event_list_grid_size = isset($REQ['event_list_grid_size'])
             ? sanitize_text_field($REQ['event_list_grid_size']) : 'medium';
         $CFG->EED_Events_Archive_Filters->templates = array(
-            'full' => EE_TEMPLATES . EE_Config::get_current_theme() . '/archive-espresso_events.php',
+            'full' => EE_TEMPLATES.EE_Config::get_current_theme().'/archive-espresso_events.php',
         );
 
         switch ($CFG->EED_Events_Archive_Filters->default_type) {
             case 'dates':
-                $CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES . EE_Config::get_current_theme()
+                $CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES.EE_Config::get_current_theme()
                                                                       . '/archive-espresso_events-dates-view.php';
                 break;
             case 'text':
-                $CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES . EE_Config::get_current_theme()
+                $CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES.EE_Config::get_current_theme()
                                                                       . '/archive-espresso_events-text-view.php';
                 break;
             default:
-                $CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES . EE_Config::get_current_theme()
+                $CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES.EE_Config::get_current_theme()
                                                                       . '/archive-espresso_events-grid-view.php';
         }
 
@@ -900,7 +900,7 @@ 
             'elf_type'         => self::$_type,
         );
         EEH_Template::display_template(
-            EE_TEMPLATES . EE_Config::get_current_theme() . '/archive-espresso_events-filters.php',
+            EE_TEMPLATES.EE_Config::get_current_theme().'/archive-espresso_events-filters.php',
             $args
         );
     }
@@ -920,7 +920,7 @@ 
         if (self::$_type == 'grid') {
             $event_list_grid_size = isset($EE->CFG->template_settings->EED_Events_Archive_Filters->event_list_grid_size)
                 ? $EE->CFG->template_settings->EED_Events_Archive_Filters->event_list_grid_size : 'medium';
-            $event_list_css[] = $event_list_grid_size . '-event-list-grid';
+            $event_list_css[] = $event_list_grid_size.'-event-list-grid';
         }
         $event_list_css = apply_filters(
             'EED_Events_Archive_Filters__event_list_css__event_list_css_array',
@@ -1016,7 +1016,7 @@ 
                 'add_fragment' => '',
             )
         );
-        return ! empty($pagination) ? '<div class="ee-pagination-dv clear">' . $pagination . '</div>' : '';
+        return ! empty($pagination) ? '<div class="ee-pagination-dv clear">'.$pagination.'</div>' : '';
     }
 
 

core/db_classes/EE_Country.class.php

Indentation +141 added lines, -141 removed lines

@@ -10,145 +10,145 @@
 class EE_Country extends EE_Base_Class
 {
 
-    /**
-     * @param array $props_n_values
-     * @return EE_Country|mixed
-     */
-    public static function new_instance($props_n_values = array())
-    {
-        $has_object = parent::_check_for_object($props_n_values, __CLASS__);
-        return $has_object ? $has_object : new self($props_n_values);
-    }
-
-
-    /**
-     * @param array $props_n_values
-     * @return EE_Country
-     */
-    public static function new_instance_from_db($props_n_values = array())
-    {
-        return new self($props_n_values, true);
-    }
-
-
-    /**
-     * Gets the country name
-     *
-     * @return string
-     */
-    public function name()
-    {
-        return $this->get('CNT_name');
-    }
-
-
-    /**
-     * Whether the country is active/enabled
-     *
-     * @return bool
-     */
-    public function is_active(): bool
-    {
-        return $this->get('CNT_active');
-    }
-
-
-    /**
-     * Gets the country ISO3
-     *
-     * @return string
-     */
-    public function ISO3(): string
-    {
-        return $this->get('CNT_ISO3');
-    }
-
-
-    /**
-     * gets the country's currency code
-     *
-     * @return string
-     */
-    public function currency_code()
-    {
-        return $this->get('CNT_cur_code');
-    }
-
-
-    /**
-     * gets the country's currency sign/symbol
-     *
-     * @return string
-     */
-    public function currency_sign()
-    {
-        $CNT_cur_sign = $this->get('CNT_cur_sign');
-        return $CNT_cur_sign ? $CNT_cur_sign : '';
-    }
-
-
-    /**
-     * Currency name singular
-     *
-     * @return string
-     */
-    public function currency_name_single()
-    {
-        return $this->get('CNT_cur_single');
-    }
-
-
-    /**
-     * Currency name plural
-     *
-     * @return string
-     */
-    public function currency_name_plural()
-    {
-        return $this->get('CNT_cur_plural');
-    }
-
-
-    /**
-     * currency_sign_before - ie: $TRUE  or  FALSE$
-     *
-     * @return boolean
-     */
-    public function currency_sign_before()
-    {
-        return $this->get('CNT_cur_sign_b4');
-    }
-
-
-    /**
-     * currency_decimal_places : 2 = 0.00   3 = 0.000
-     *
-     * @return integer
-     */
-    public function currency_decimal_places()
-    {
-        return $this->get('CNT_cur_dec_plc');
-    }
-
-
-    /**
-     * currency_decimal_mark :   (comma) ',' = 0,01   or   (decimal) '.' = 0.01
-     *
-     * @return string
-     */
-    public function currency_decimal_mark()
-    {
-        return $this->get('CNT_cur_dec_mrk');
-    }
-
-
-    /**
-     * currency thousands separator:   (comma) ',' = 1,000   or   (decimal) '.' = 1.000
-     *
-     * @return string
-     */
-    public function currency_thousands_separator()
-    {
-        return $this->get('CNT_cur_thsnds');
-    }
+	/**
+	 * @param array $props_n_values
+	 * @return EE_Country|mixed
+	 */
+	public static function new_instance($props_n_values = array())
+	{
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values);
+	}
+
+
+	/**
+	 * @param array $props_n_values
+	 * @return EE_Country
+	 */
+	public static function new_instance_from_db($props_n_values = array())
+	{
+		return new self($props_n_values, true);
+	}
+
+
+	/**
+	 * Gets the country name
+	 *
+	 * @return string
+	 */
+	public function name()
+	{
+		return $this->get('CNT_name');
+	}
+
+
+	/**
+	 * Whether the country is active/enabled
+	 *
+	 * @return bool
+	 */
+	public function is_active(): bool
+	{
+		return $this->get('CNT_active');
+	}
+
+
+	/**
+	 * Gets the country ISO3
+	 *
+	 * @return string
+	 */
+	public function ISO3(): string
+	{
+		return $this->get('CNT_ISO3');
+	}
+
+
+	/**
+	 * gets the country's currency code
+	 *
+	 * @return string
+	 */
+	public function currency_code()
+	{
+		return $this->get('CNT_cur_code');
+	}
+
+
+	/**
+	 * gets the country's currency sign/symbol
+	 *
+	 * @return string
+	 */
+	public function currency_sign()
+	{
+		$CNT_cur_sign = $this->get('CNT_cur_sign');
+		return $CNT_cur_sign ? $CNT_cur_sign : '';
+	}
+
+
+	/**
+	 * Currency name singular
+	 *
+	 * @return string
+	 */
+	public function currency_name_single()
+	{
+		return $this->get('CNT_cur_single');
+	}
+
+
+	/**
+	 * Currency name plural
+	 *
+	 * @return string
+	 */
+	public function currency_name_plural()
+	{
+		return $this->get('CNT_cur_plural');
+	}
+
+
+	/**
+	 * currency_sign_before - ie: $TRUE  or  FALSE$
+	 *
+	 * @return boolean
+	 */
+	public function currency_sign_before()
+	{
+		return $this->get('CNT_cur_sign_b4');
+	}
+
+
+	/**
+	 * currency_decimal_places : 2 = 0.00   3 = 0.000
+	 *
+	 * @return integer
+	 */
+	public function currency_decimal_places()
+	{
+		return $this->get('CNT_cur_dec_plc');
+	}
+
+
+	/**
+	 * currency_decimal_mark :   (comma) ',' = 0,01   or   (decimal) '.' = 0.01
+	 *
+	 * @return string
+	 */
+	public function currency_decimal_mark()
+	{
+		return $this->get('CNT_cur_dec_mrk');
+	}
+
+
+	/**
+	 * currency thousands separator:   (comma) ',' = 1,000   or   (decimal) '.' = 1.000
+	 *
+	 * @return string
+	 */
+	public function currency_thousands_separator()
+	{
+		return $this->get('CNT_cur_thsnds');
+	}
 }

core/domain/services/graphql/connections/RootQueryStatesConnection.php

Indentation +85 added lines, -85 removed lines

@@ -20,95 +20,95 @@
 {
 
 
-    /**
-     * StateConnection constructor.
-     *
-     * @param EEM_State               $model
-     */
-    public function __construct(EEM_State $model)
-    {
-        parent::__construct($model);
-    }
+	/**
+	 * StateConnection constructor.
+	 *
+	 * @param EEM_State               $model
+	 */
+	public function __construct(EEM_State $model)
+	{
+		parent::__construct($model);
+	}
 
 
-    /**
-     * @return array
-     */
-    public function config(): array
-    {
-        return [
-            'fromType'           => 'RootQuery',
-            'toType'             => $this->namespace . 'State',
-            'fromFieldName'      => lcfirst($this->namespace) . 'States',
-            'connectionTypeName' => "{$this->namespace}RootQueryStatesConnection",
-            'connectionArgs'     => self::get_connection_args(),
-            'resolve'            => [$this, 'resolveConnection'],
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	public function config(): array
+	{
+		return [
+			'fromType'           => 'RootQuery',
+			'toType'             => $this->namespace . 'State',
+			'fromFieldName'      => lcfirst($this->namespace) . 'States',
+			'connectionTypeName' => "{$this->namespace}RootQueryStatesConnection",
+			'connectionArgs'     => self::get_connection_args(),
+			'resolve'            => [$this, 'resolveConnection'],
+		];
+	}
 
 
-    /**
-     * @param $entity
-     * @param $args
-     * @param $context
-     * @param $info
-     * @return StateConnectionResolver
-     * @throws Exception
-     */
-    public function getConnectionResolver($entity, $args, $context, $info): AbstractConnectionResolver
-    {
-        return new StateConnectionResolver($entity, $args, $context, $info);
-    }
+	/**
+	 * @param $entity
+	 * @param $args
+	 * @param $context
+	 * @param $info
+	 * @return StateConnectionResolver
+	 * @throws Exception
+	 */
+	public function getConnectionResolver($entity, $args, $context, $info): AbstractConnectionResolver
+	{
+		return new StateConnectionResolver($entity, $args, $context, $info);
+	}
 
-    /**
-     * Given an optional array of args, this returns the args to be used in the connection
-     *
-     * @param array $args The args to modify the defaults
-     * @return array
-     */
-    // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-    public static function get_connection_args(array $args = []): array
-    {
-        $newArgs = [
-            'orderby'      => [
-                'type'        => ['list_of' => 'EspressoCountriesConnectionOrderbyInput'],
-                'description' => esc_html__('What parameter to use to order the objects by.', 'event_espresso'),
-            ],
-            'in' => [
-                'type'        => ['list_of' => 'ID'],
-                'description' => esc_html__(
-                    'Limit the result to the set of given state IDs.',
-                    'event_espresso'
-                ),
-            ],
-            'countryIsoIn' => [
-                'type'        => ['list_of' => 'String'],
-                'description' => esc_html__(
-                    'Limit the result to the set of given country ISOs.',
-                    'event_espresso'
-                ),
-            ],
-            'search' => [
-                'type'        => 'String',
-                'description' => esc_html__('The search keywords', 'event_espresso'),
-            ],
-            'activeOnly' => [
-                'type'        => 'Boolean',
-                'description' => esc_html__(
-                    'Limit the result to the active states.',
-                    'event_espresso'
-                ),
-            ],
-        ];
+	/**
+	 * Given an optional array of args, this returns the args to be used in the connection
+	 *
+	 * @param array $args The args to modify the defaults
+	 * @return array
+	 */
+	// phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	public static function get_connection_args(array $args = []): array
+	{
+		$newArgs = [
+			'orderby'      => [
+				'type'        => ['list_of' => 'EspressoCountriesConnectionOrderbyInput'],
+				'description' => esc_html__('What parameter to use to order the objects by.', 'event_espresso'),
+			],
+			'in' => [
+				'type'        => ['list_of' => 'ID'],
+				'description' => esc_html__(
+					'Limit the result to the set of given state IDs.',
+					'event_espresso'
+				),
+			],
+			'countryIsoIn' => [
+				'type'        => ['list_of' => 'String'],
+				'description' => esc_html__(
+					'Limit the result to the set of given country ISOs.',
+					'event_espresso'
+				),
+			],
+			'search' => [
+				'type'        => 'String',
+				'description' => esc_html__('The search keywords', 'event_espresso'),
+			],
+			'activeOnly' => [
+				'type'        => 'Boolean',
+				'description' => esc_html__(
+					'Limit the result to the active states.',
+					'event_espresso'
+				),
+			],
+		];
 
-        $newArgs = apply_filters(
-            'FHEE__EventEspresso_core_domain_services_graphql_connections__state_args',
-            $newArgs,
-            $args
-        );
-        return array_merge(
-            $newArgs,
-            $args
-        );
-    }
+		$newArgs = apply_filters(
+			'FHEE__EventEspresso_core_domain_services_graphql_connections__state_args',
+			$newArgs,
+			$args
+		);
+		return array_merge(
+			$newArgs,
+			$args
+		);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -38,8 +38,8 @@
     {
         return [
             'fromType'           => 'RootQuery',
-            'toType'             => $this->namespace . 'State',
-            'fromFieldName'      => lcfirst($this->namespace) . 'States',
+            'toType'             => $this->namespace.'State',
+            'fromFieldName'      => lcfirst($this->namespace).'States',
             'connectionTypeName' => "{$this->namespace}RootQueryStatesConnection",
             'connectionArgs'     => self::get_connection_args(),
             'resolve'            => [$this, 'resolveConnection'],

core/domain/services/graphql/connections/RootQueryCountriesConnection.php

Indentation +95 added lines, -95 removed lines

@@ -20,105 +20,105 @@
 {
 
 
-    /**
-     * CountryConnection constructor.
-     *
-     * @param EEM_Country               $model
-     */
-    public function __construct(EEM_Country $model)
-    {
-        parent::__construct($model);
-    }
+	/**
+	 * CountryConnection constructor.
+	 *
+	 * @param EEM_Country               $model
+	 */
+	public function __construct(EEM_Country $model)
+	{
+		parent::__construct($model);
+	}
 
 
-    /**
-     * @return array
-     */
-    public function config(): array
-    {
-        return [
-            'fromType'           => 'RootQuery',
-            'toType'             => $this->namespace . 'Country',
-            'fromFieldName'      => lcfirst($this->namespace . 'Countries'),
-            'connectionTypeName' => "{$this->namespace}RootQueryCountriesConnection",
-            'connectionArgs'     => RootQueryCountriesConnection::get_connection_args(),
-            'resolve'            => [$this, 'resolveConnection'],
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	public function config(): array
+	{
+		return [
+			'fromType'           => 'RootQuery',
+			'toType'             => $this->namespace . 'Country',
+			'fromFieldName'      => lcfirst($this->namespace . 'Countries'),
+			'connectionTypeName' => "{$this->namespace}RootQueryCountriesConnection",
+			'connectionArgs'     => RootQueryCountriesConnection::get_connection_args(),
+			'resolve'            => [$this, 'resolveConnection'],
+		];
+	}
 
 
-    /**
-     * @param $entity
-     * @param $args
-     * @param $context
-     * @param $info
-     * @return CountryConnectionResolver
-     * @throws Exception
-     */
-    public function getConnectionResolver($entity, $args, $context, $info): AbstractConnectionResolver
-    {
-        return new CountryConnectionResolver($entity, $args, $context, $info);
-    }
+	/**
+	 * @param $entity
+	 * @param $args
+	 * @param $context
+	 * @param $info
+	 * @return CountryConnectionResolver
+	 * @throws Exception
+	 */
+	public function getConnectionResolver($entity, $args, $context, $info): AbstractConnectionResolver
+	{
+		return new CountryConnectionResolver($entity, $args, $context, $info);
+	}
 
-    /**
-     * Given an optional array of args, this returns the args to be used in the connection
-     *
-     * @param array $args The args to modify the defaults
-     * @return array
-     */
-    // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-    public static function get_connection_args(array $args = []): array
-    {
-        $newArgs = [
-            'orderby'      => [
-                'type'        => ['list_of' => 'EspressoCountriesConnectionOrderbyInput'],
-                'description' => esc_html__('What parameter to use to order the objects by.', 'event_espresso'),
-            ],
-            'in' => [
-                'type'        => ['list_of' => 'ID'],
-                'description' => esc_html__(
-                    'Limit the result to the set of given country IDs.',
-                    'event_espresso'
-                ),
-            ],
-            'isoIn' => [
-                'type'        => ['list_of' => 'String'],
-                'description' => esc_html__(
-                    'Limit the result to the set of given country ISOs.',
-                    'event_espresso'
-                ),
-            ],
-            'iso3In' => [
-                'type'        => ['list_of' => 'String'],
-                'description' => esc_html__(
-                    'Limit the result to the set of given country ISO3s.',
-                    'event_espresso'
-                ),
-            ],
-            'search' => [
-                'type'        => 'String',
-                'description' => esc_html__(
-                    'Limit the result to the given search query.',
-                    'event_espresso'
-                ),
-            ],
-            'activeOnly' => [
-                'type'        => 'Boolean',
-                'description' => esc_html__(
-                    'Limit the result to the active countries.',
-                    'event_espresso'
-                ),
-            ],
-        ];
+	/**
+	 * Given an optional array of args, this returns the args to be used in the connection
+	 *
+	 * @param array $args The args to modify the defaults
+	 * @return array
+	 */
+	// phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	public static function get_connection_args(array $args = []): array
+	{
+		$newArgs = [
+			'orderby'      => [
+				'type'        => ['list_of' => 'EspressoCountriesConnectionOrderbyInput'],
+				'description' => esc_html__('What parameter to use to order the objects by.', 'event_espresso'),
+			],
+			'in' => [
+				'type'        => ['list_of' => 'ID'],
+				'description' => esc_html__(
+					'Limit the result to the set of given country IDs.',
+					'event_espresso'
+				),
+			],
+			'isoIn' => [
+				'type'        => ['list_of' => 'String'],
+				'description' => esc_html__(
+					'Limit the result to the set of given country ISOs.',
+					'event_espresso'
+				),
+			],
+			'iso3In' => [
+				'type'        => ['list_of' => 'String'],
+				'description' => esc_html__(
+					'Limit the result to the set of given country ISO3s.',
+					'event_espresso'
+				),
+			],
+			'search' => [
+				'type'        => 'String',
+				'description' => esc_html__(
+					'Limit the result to the given search query.',
+					'event_espresso'
+				),
+			],
+			'activeOnly' => [
+				'type'        => 'Boolean',
+				'description' => esc_html__(
+					'Limit the result to the active countries.',
+					'event_espresso'
+				),
+			],
+		];
 
-        $newArgs = apply_filters(
-            'FHEE__EventEspresso_core_domain_services_graphql_connections__country_args',
-            $newArgs,
-            $args
-        );
-        return array_merge(
-            $newArgs,
-            $args
-        );
-    }
+		$newArgs = apply_filters(
+			'FHEE__EventEspresso_core_domain_services_graphql_connections__country_args',
+			$newArgs,
+			$args
+		);
+		return array_merge(
+			$newArgs,
+			$args
+		);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -38,8 +38,8 @@
     {
         return [
             'fromType'           => 'RootQuery',
-            'toType'             => $this->namespace . 'Country',
-            'fromFieldName'      => lcfirst($this->namespace . 'Countries'),
+            'toType'             => $this->namespace.'Country',
+            'fromFieldName'      => lcfirst($this->namespace.'Countries'),
             'connectionTypeName' => "{$this->namespace}RootQueryCountriesConnection",
             'connectionArgs'     => RootQueryCountriesConnection::get_connection_args(),
             'resolve'            => [$this, 'resolveConnection'],

core/domain/services/graphql/inputs/StatesConnectionOrderbyInput.php

Indentation +25 added lines, -25 removed lines

@@ -17,31 +17,31 @@
 class StatesConnectionOrderbyInput extends InputBase
 {
 
-    /**
-     * StatesConnectionOrderbyInput constructor.
-     */
-    public function __construct()
-    {
-        $this->setName($this->namespace . 'StatesConnectionOrderbyInput');
-        $this->setDescription(esc_html__('Options for ordering the connection', 'event_espresso'));
-        parent::__construct();
-    }
+	/**
+	 * StatesConnectionOrderbyInput constructor.
+	 */
+	public function __construct()
+	{
+		$this->setName($this->namespace . 'StatesConnectionOrderbyInput');
+		$this->setDescription(esc_html__('Options for ordering the connection', 'event_espresso'));
+		parent::__construct();
+	}
 
 
-    /**
-     * @return GraphQLFieldInterface[]
-     */
-    protected function getFields(): array
-    {
-        return [
-            new GraphQLField(
-                'field',
-                ['non_null' => $this->namespace . 'StatesConnectionOrderbyEnum']
-            ),
-            new GraphQLField(
-                'order',
-                'OrderEnum'
-            ),
-        ];
-    }
+	/**
+	 * @return GraphQLFieldInterface[]
+	 */
+	protected function getFields(): array
+	{
+		return [
+			new GraphQLField(
+				'field',
+				['non_null' => $this->namespace . 'StatesConnectionOrderbyEnum']
+			),
+			new GraphQLField(
+				'order',
+				'OrderEnum'
+			),
+		];
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
      */
     public function __construct()
     {
-        $this->setName($this->namespace . 'StatesConnectionOrderbyInput');
+        $this->setName($this->namespace.'StatesConnectionOrderbyInput');
         $this->setDescription(esc_html__('Options for ordering the connection', 'event_espresso'));
         parent::__construct();
     }
@@ -36,7 +36,7 @@ 
         return [
             new GraphQLField(
                 'field',
-                ['non_null' => $this->namespace . 'StatesConnectionOrderbyEnum']
+                ['non_null' => $this->namespace.'StatesConnectionOrderbyEnum']
             ),
             new GraphQLField(
                 'order',

core/domain/services/graphql/inputs/CountriesConnectionOrderbyInput.php

Indentation +25 added lines, -25 removed lines

@@ -17,31 +17,31 @@
 class CountriesConnectionOrderbyInput extends InputBase
 {
 
-    /**
-     * CountriesConnectionOrderbyInput constructor.
-     */
-    public function __construct()
-    {
-        $this->setName($this->namespace . 'CountriesConnectionOrderbyInput');
-        $this->setDescription(esc_html__('Options for ordering the connection', 'event_espresso'));
-        parent::__construct();
-    }
+	/**
+	 * CountriesConnectionOrderbyInput constructor.
+	 */
+	public function __construct()
+	{
+		$this->setName($this->namespace . 'CountriesConnectionOrderbyInput');
+		$this->setDescription(esc_html__('Options for ordering the connection', 'event_espresso'));
+		parent::__construct();
+	}
 
 
-    /**
-     * @return GraphQLFieldInterface[]
-     */
-    protected function getFields(): array
-    {
-        return [
-            new GraphQLField(
-                'field',
-                ['non_null' => $this->namespace . 'CountriesConnectionOrderbyEnum']
-            ),
-            new GraphQLField(
-                'order',
-                'OrderEnum'
-            ),
-        ];
-    }
+	/**
+	 * @return GraphQLFieldInterface[]
+	 */
+	protected function getFields(): array
+	{
+		return [
+			new GraphQLField(
+				'field',
+				['non_null' => $this->namespace . 'CountriesConnectionOrderbyEnum']
+			),
+			new GraphQLField(
+				'order',
+				'OrderEnum'
+			),
+		];
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
      */
     public function __construct()
     {
-        $this->setName($this->namespace . 'CountriesConnectionOrderbyInput');
+        $this->setName($this->namespace.'CountriesConnectionOrderbyInput');
         $this->setDescription(esc_html__('Options for ordering the connection', 'event_espresso'));
         parent::__construct();
     }
@@ -36,7 +36,7 @@ 
         return [
             new GraphQLField(
                 'field',
-                ['non_null' => $this->namespace . 'CountriesConnectionOrderbyEnum']
+                ['non_null' => $this->namespace.'CountriesConnectionOrderbyEnum']
             ),
             new GraphQLField(
                 'order',