eventespresso / event-espresso-core

shortcodes/espresso_events/EES_Espresso_Events.shortcode.php

Indentation +13 added lines, -13 removed lines

@@ -104,16 +104,16 @@ 
 		// grab attributes and merge with defaults, then extract
 		$attributes = array_merge( (array) $default_espresso_events_shortcode_atts, (array) $attributes );
 		$attributes = \EES_Shortcode::sanitize_attributes(
-		    $attributes,
-            // the following get sanitized/whitelisted in EEH_Event_Query
-            array(
-                'category_slug' => 'skip_sanitization',
-                'show_expired'  => 'skip_sanitization',
-                'order_by'      => 'skip_sanitization',
-                'month'         => 'skip_sanitization',
-                'sort'          => 'skip_sanitization',
-            )
-        );
+			$attributes,
+			// the following get sanitized/whitelisted in EEH_Event_Query
+			array(
+				'category_slug' => 'skip_sanitization',
+				'show_expired'  => 'skip_sanitization',
+				'order_by'      => 'skip_sanitization',
+				'month'         => 'skip_sanitization',
+				'sort'          => 'skip_sanitization',
+			)
+		);
 		// make sure we use the_excerpt()
 		add_filter( 'FHEE__EES_Espresso_Events__process_shortcode__true', '__return_true' );
 		// apply query filters
@@ -232,9 +232,9 @@ 
 
 
 	/**
-     * event_list_css
-     *
-     * @param string $event_list_css
+	 * event_list_css
+	 *
+	 * @param string $event_list_css
 	 * @return string
 	 */
 	public function event_list_css( $event_list_css = '' ) {

Spacing +33 added lines, -33 removed lines

@@ -50,14 +50,14 @@ 
 	 * @param WP $WP
 	 * @return    void
 	 */
-	public function run( WP $WP ) {
-		if ( did_action( 'pre_get_posts' ) && did_action( 'send_headers' ) ) {
+	public function run(WP $WP) {
+		if (did_action('pre_get_posts') && did_action('send_headers')) {
 			EED_Events_Archive::instance()->event_list();
 		} else {
 			// this will trigger the EED_Events_Archive module's event_list() method during the pre_get_posts hook point,
 			// this allows us to initialize things, enqueue assets, etc,
 			// as well, this saves an instantiation of the module in an array using 'espresso_events' as the key, so that we can retrieve it
-			add_action( 'pre_get_posts', array( EED_Events_Archive::instance(), 'event_list' ) );
+			add_action('pre_get_posts', array(EED_Events_Archive::instance(), 'event_list'));
 		}
 	}
 
@@ -79,9 +79,9 @@ 
 	 *  @param 	array 	$attributes
 	 *  @return 	string
 	 */
-	public function process_shortcode( $attributes = array() ) {
+	public function process_shortcode($attributes = array()) {
 		// make sure EED_Events_Archive is setup properly
-		if ( apply_filters( 'FHEE__fallback_shortcode_processor__EES_Espresso_Events', FALSE )) {
+		if (apply_filters('FHEE__fallback_shortcode_processor__EES_Espresso_Events', FALSE)) {
 			EED_Events_Archive::instance()->event_list();
 		}
 		//set default attributes
@@ -102,7 +102,7 @@ 
 			$default_espresso_events_shortcode_atts
 		);
 		// grab attributes and merge with defaults, then extract
-		$attributes = array_merge( (array) $default_espresso_events_shortcode_atts, (array) $attributes );
+		$attributes = array_merge((array) $default_espresso_events_shortcode_atts, (array) $attributes);
 		$attributes = \EES_Shortcode::sanitize_attributes(
 		    $attributes,
             // the following get sanitized/whitelisted in EEH_Event_Query
@@ -115,22 +115,22 @@ 
             )
         );
 		// make sure we use the_excerpt()
-		add_filter( 'FHEE__EES_Espresso_Events__process_shortcode__true', '__return_true' );
+		add_filter('FHEE__EES_Espresso_Events__process_shortcode__true', '__return_true');
 		// apply query filters
-		add_filter( 'FHEE__EEH_Event_Query__apply_query_filters', '__return_true' );
+		add_filter('FHEE__EEH_Event_Query__apply_query_filters', '__return_true');
 		// run the query
 		global $wp_query;
-		$wp_query = new EE_Event_List_Query( $attributes );
+		$wp_query = new EE_Event_List_Query($attributes);
 		// check what template is loaded and load filters accordingly
-		EED_Events_Archive::instance()->template_include( 'loop-espresso_events.php' );
+		EED_Events_Archive::instance()->template_include('loop-espresso_events.php');
 		// load our template
-		$event_list = EEH_Template::locate_template( 'loop-espresso_events.php', array(), TRUE, TRUE );
+		$event_list = EEH_Template::locate_template('loop-espresso_events.php', array(), TRUE, TRUE);
 		// now reset the query and postdata
 		wp_reset_query();
 		wp_reset_postdata();
 		EED_Events_Archive::remove_all_events_archive_filters();
 		// remove query filters
-		remove_filter( 'FHEE__EEH_Event_Query__apply_query_filters', '__return_true' );
+		remove_filter('FHEE__EEH_Event_Query__apply_query_filters', '__return_true');
 		// pull our content from the output buffer and return it
 		return $event_list;
 	}
@@ -174,43 +174,43 @@ 
 	 *
 	 * @param array $args
 	 */
-	public function __construct( $args = array() ) {
+	public function __construct($args = array()) {
 		// incoming args could be a mix of WP query args + EE shortcode args
-		foreach ( $args as $key =>$value ) {
-			$property = '_' . $key;
+		foreach ($args as $key =>$value) {
+			$property = '_'.$key;
 			// if the arg is a property of this class, then it's an EE shortcode arg
-			if ( property_exists( $this, $property )) {
+			if (property_exists($this, $property)) {
 				// set the property value
 				$this->{$property} = $value;
 				// then remove it from the array of args that will later be passed to WP_Query()
-				unset( $args[ $key ] );
+				unset($args[$key]);
 			}
 		}
 		//add query filters
 		EEH_Event_Query::add_query_filters();
 		// set params that will get used by the filters
-		EEH_Event_Query::set_query_params( $this->_month, $this->_category_slug, $this->_show_expired, $this->_order_by, $this->_sort );
+		EEH_Event_Query::set_query_params($this->_month, $this->_category_slug, $this->_show_expired, $this->_order_by, $this->_sort);
 		// first off, let's remove any filters from previous queries
-		remove_filter( 'FHEE__archive_espresso_events_template__upcoming_events_h1', array( $this, 'event_list_title' ));
-		remove_all_filters( 'FHEE__content_espresso_events__event_class' );
+		remove_filter('FHEE__archive_espresso_events_template__upcoming_events_h1', array($this, 'event_list_title'));
+		remove_all_filters('FHEE__content_espresso_events__event_class');
 		// Event List Title ?
-		add_filter( 'FHEE__archive_espresso_events_template__upcoming_events_h1', array( $this, 'event_list_title' ), 10, 1 );
+		add_filter('FHEE__archive_espresso_events_template__upcoming_events_h1', array($this, 'event_list_title'), 10, 1);
 		// add the css class
-		add_filter( 'FHEE__content_espresso_events__event_class', array( $this, 'event_list_css' ), 10, 1 );
+		add_filter('FHEE__content_espresso_events__event_class', array($this, 'event_list_css'), 10, 1);
 		// the current "page" we are viewing
-		$paged = max( 1, get_query_var( 'paged' ));
+		$paged = max(1, get_query_var('paged'));
 		// Force these args
-		$args = array_merge( $args, array(
+		$args = array_merge($args, array(
 			'post_type' => 'espresso_events',
 			'posts_per_page' => $this->_limit,
 			'update_post_term_cache' => FALSE,
 			'update_post_meta_cache' => FALSE,
 			'paged' => $paged,
-			'offset' => ( $paged - 1 ) * $this->_limit
+			'offset' => ($paged - 1) * $this->_limit
 		));
 
 		// run the query
-		parent::__construct( $args );
+		parent::__construct($args);
 	}
 
 
@@ -222,8 +222,8 @@ 
 	 * @param string $event_list_title
 	 * @return string
 	 */
-	public function event_list_title( $event_list_title = '' ) {
-		if ( ! empty( $this->_title )) {
+	public function event_list_title($event_list_title = '') {
+		if ( ! empty($this->_title)) {
 			return $this->_title;
 		}
 		return $event_list_title;
@@ -237,11 +237,11 @@ 
      * @param string $event_list_css
 	 * @return string
 	 */
-	public function event_list_css( $event_list_css = '' ) {
-		$event_list_css .=  ! empty( $event_list_css ) ? ' ' : '';
-		$event_list_css .=  ! empty( $this->_css_class ) ? $this->_css_class : '';
-		$event_list_css .=  ! empty( $event_list_css ) ? ' ' : '';
-		$event_list_css .=  ! empty( $this->_category_slug ) ? $this->_category_slug : '';
+	public function event_list_css($event_list_css = '') {
+		$event_list_css .= ! empty($event_list_css) ? ' ' : '';
+		$event_list_css .= ! empty($this->_css_class) ? $this->_css_class : '';
+		$event_list_css .= ! empty($event_list_css) ? ' ' : '';
+		$event_list_css .= ! empty($this->_category_slug) ? $this->_category_slug : '';
 		return $event_list_css;
 	}
 

core/helpers/EEH_Event_Query.helper.php

Indentation +147 added lines, -147 removed lines

@@ -91,9 +91,9 @@ 
 	 */
 	public static function apply_query_filters( WP_Query $WP_Query ) {
 		return (
-		    isset( $WP_Query->query, $WP_Query->query['post_type'] )
-            && $WP_Query->query['post_type'] === 'espresso_events'
-        ) ||  apply_filters( 'FHEE__EEH_Event_Query__apply_query_filters', false ) ;
+			isset( $WP_Query->query, $WP_Query->query['post_type'] )
+			&& $WP_Query->query['post_type'] === 'espresso_events'
+		) ||  apply_filters( 'FHEE__EEH_Event_Query__apply_query_filters', false ) ;
 	}
 
 
@@ -104,8 +104,8 @@ 
 	 */
 	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.
+		// 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 );
@@ -127,13 +127,13 @@ 
 	 * @param string $orderby
 	 * @param string $sort
 	 */
-    public static function set_query_params(
-        $month = '',
-        $category = '',
-        $show_expired = false,
-        $orderby = 'start_date',
-        $sort = 'ASC'
-    ) {
+	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 );
@@ -151,8 +151,8 @@ 
 	 * @return    string
 	 */
 	private static function _display_month( $month = '' ) {
-        return sanitize_text_field(EE_Registry::instance()->REQ->get('event_query_month', $month));
-    }
+		return sanitize_text_field(EE_Registry::instance()->REQ->get('event_query_month', $month));
+	}
 
 
 
@@ -177,9 +177,9 @@ 
 	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
-        );
+			EE_Registry::instance()->REQ->get('event_query_show_expired', $show_expired),
+			FILTER_VALIDATE_BOOLEAN
+		);
 	}
 
 
@@ -193,8 +193,8 @@ 
 	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
+			: 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;
@@ -211,8 +211,8 @@ 
 	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';
+			? strtoupper( $sort )
+			: 'ASC';
 	}
 
 
@@ -235,14 +235,14 @@ 
 
 
 
-    /**
-     *    posts_fields
-     *
-     * @param          $SQL
-     * @param WP_Query $wp_query
-     * @return    string
-     * @throws \EE_Error
-     */
+	/**
+	 *    posts_fields
+	 *
+	 * @param          $SQL
+	 * @param WP_Query $wp_query
+	 * @return    string
+	 * @throws \EE_Error
+	 */
 	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
@@ -253,13 +253,13 @@ 
 
 
 
-    /**
-     *    posts_join_sql_for_terms
-     *
-     * @param array $orderby_params
-     * @return    string
-     * @throws \EE_Error
-     */
+	/**
+	 *    posts_join_sql_for_terms
+	 *
+	 * @param array $orderby_params
+	 * @return    string
+	 * @throws \EE_Error
+	 */
 	public static function posts_fields_sql_for_orderby( $orderby_params = array() ) {
 		$SQL = ', MIN( ' . EEM_Datetime::instance()->table() . '.DTT_EVT_start ) as event_start_date ' ;
 		foreach( (array)$orderby_params as $orderby ) {
@@ -292,14 +292,14 @@ 
 
 
 
-    /**
-     *    posts_join
-     *
-     * @param string   $SQL
-     * @param WP_Query $wp_query
-     * @return    string
-     * @throws \EE_Error
-     */
+	/**
+	 *    posts_join
+	 *
+	 * @param string   $SQL
+	 * @param WP_Query $wp_query
+	 * @return    string
+	 * @throws \EE_Error
+	 */
 	public static function posts_join( $SQL = '', WP_Query $wp_query ) {
 		if ( EEH_Event_Query::apply_query_filters( $wp_query ) ) {
 			// Category
@@ -312,14 +312,14 @@ 
 
 
 
-    /**
-     *    posts_join_sql_for_terms
-     *
-     * @param string     $SQL
-     * @param    boolean $show_expired if TRUE, then displayed past events
-     * @return string
-     * @throws \EE_Error
-     */
+	/**
+	 *    posts_join_sql_for_terms
+	 *
+	 * @param string     $SQL
+	 * @param    boolean $show_expired if TRUE, then displayed past events
+	 * @return string
+	 * @throws \EE_Error
+	 */
 	public static function posts_join_sql_for_show_expired( $SQL = '', $show_expired = FALSE ) {
 		if ( ! $show_expired ) {
 			$join = EEM_Event::instance()->table() . '.ID = ';
@@ -353,24 +353,24 @@ 
 
 
 
-    /**
-     *    posts_join_for_orderby
-     *    usage:  $SQL .= EEH_Event_Query::posts_join_for_orderby( $orderby_params );
-     *
-     * @param    string $SQL
-     * @param    array  $orderby_params
-     * @return    string
-     * @throws \EE_Error
-     */
+	/**
+	 *    posts_join_for_orderby
+	 *    usage:  $SQL .= EEH_Event_Query::posts_join_for_orderby( $orderby_params );
+	 *
+	 * @param    string $SQL
+	 * @param    array  $orderby_params
+	 * @return    string
+	 * @throws \EE_Error
+	 */
 	public static function posts_join_for_orderby( $SQL = '', $orderby_params = array() ) {
 		foreach ( (array)$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,
+						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();
@@ -398,14 +398,14 @@ 
 
 
 
-    /**
-     *    _posts_join_for_datetime
-     *
-     * @param string $SQL
-     * @param string $join
-     * @return string
-     * @throws \EE_Error
-     */
+	/**
+	 *    _posts_join_for_datetime
+	 *
+	 * @param string $SQL
+	 * @param string $join
+	 * @return string
+	 * @throws \EE_Error
+	 */
 	protected static function _posts_join_for_datetime( $SQL = '', $join = '' ) {
 		if ( ! empty( $join )) {
 			$join .= ' = ' . EEM_Datetime::instance()->table() . '.' . EEM_Event::instance()->primary_key_name();
@@ -418,13 +418,13 @@ 
 
 
 
-    /**
-     *    _posts_join_for_event_venue
-     *
-     * @param string $SQL
-     * @return string
-     * @throws \EE_Error
-     */
+	/**
+	 *    _posts_join_for_event_venue
+	 *
+	 * @param string $SQL
+	 * @return string
+	 * @throws \EE_Error
+	 */
 	protected static function _posts_join_for_event_venue( $SQL = '' ) {
 		// Event Venue table name
 		$event_venue_table = EEM_Event_Venue::instance()->table();
@@ -454,13 +454,13 @@ 
 
 
 
-    /**
-     *    _posts_join_for_venue_state
-     *
-     * @param string $SQL
-     * @return string
-     * @throws \EE_Error
-     */
+	/**
+	 *    _posts_join_for_venue_state
+	 *
+	 * @param string $SQL
+	 * @return string
+	 * @throws \EE_Error
+	 */
 	protected static function _posts_join_for_venue_state( $SQL = '' ) {
 		// Venue Meta table name
 		$venue_meta_table = EEM_Venue::instance()->second_table();
@@ -484,14 +484,14 @@ 
 
 
 
-    /**
-     *    posts_where
-     *
-     * @param string   $SQL
-     * @param WP_Query $wp_query
-     * @return    string
-     * @throws \EE_Error
-     */
+	/**
+	 *    posts_where
+	 *
+	 * @param string   $SQL
+	 * @param WP_Query $wp_query
+	 * @return    string
+	 * @throws \EE_Error
+	 */
 	public static function posts_where( $SQL = '', WP_Query $wp_query ) {
 		if ( EEH_Event_Query::apply_query_filters( $wp_query ) ) {
 			// Show Expired ?
@@ -506,17 +506,17 @@ 
 
 
 
-    /**
-     *    posts_where_sql_for_show_expired
-     *
-     * @param    boolean $show_expired if TRUE, then displayed past events
-     * @return    string
-     * @throws \EE_Error
-     */
+	/**
+	 *    posts_where_sql_for_show_expired
+	 *
+	 * @param    boolean $show_expired if TRUE, then displayed past events
+	 * @return    string
+	 * @throws \EE_Error
+	 */
 	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 ) . '\' '
+			: '';
 	}
 
 
@@ -531,19 +531,19 @@ 
 		global $wpdb;
 		$event_category_slug = esc_sql($event_category_slug);
 		return ! empty( $event_category_slug )
-            ? " AND {$wpdb->terms}.slug = '{$event_category_slug}' "
-            : '';
+			? " AND {$wpdb->terms}.slug = '{$event_category_slug}' "
+			: '';
 	}
 
 
 
-    /**
-     *    posts_where_sql_for_event_list_month
-     *
-     * @param    boolean $month
-     * @return    string
-     * @throws \EE_Error
-     */
+	/**
+	 *    posts_where_sql_for_event_list_month
+	 *
+	 * @param    boolean $month
+	 * @return    string
+	 * @throws \EE_Error
+	 */
 	public static function posts_where_sql_for_event_list_month( $month = NULL ) {
 		$SQL = '';
 		if ( ! empty( $month ) ) {
@@ -558,55 +558,55 @@ 
 
 
 
-    /**
-     *    posts_orderby
-     *
-     * @param string   $SQL
-     * @param WP_Query $wp_query
-     * @return    string
-     * @throws \EE_Error
-     */
+	/**
+	 *    posts_orderby
+	 *
+	 * @param string   $SQL
+	 * @param WP_Query $wp_query
+	 * @return    string
+	 * @throws \EE_Error
+	 */
 	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
-            );
+				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|bool $orderby_params
-     * @param string     $sort
-     * @return string
-     * @throws \EE_Error
-     */
+	/**
+	 *    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|bool $orderby_params
+	 * @param string     $sort
+	 * @return string
+	 * @throws \EE_Error
+	 */
 	public static function posts_orderby_sql( $orderby_params = array(), $sort = 'ASC' ) {
 		global $wpdb;
 		$SQL = '';
 		$counter = 0;
 		$sort = in_array($sort, array('ASC', 'asc', 'DESC', 'desc'), true)
-            ? strtoupper($sort)
-            : 'ASC';
+			? strtoupper($sort)
+			: 'ASC';
 		//make sure 'orderby' is set in query params
 		if ( ! isset( self::$_query_params['orderby'] )) {
 			self::$_query_params['orderby'] = array();

Spacing +119 added lines, -119 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -78,7 +78,7 @@ 
 	 */
 	public static function add_query_filters() {
 		//add query filters
-		add_action( 'pre_get_posts', array( 'EEH_Event_Query', 'filter_query_parts' ), 10, 1 );
+		add_action('pre_get_posts', array('EEH_Event_Query', 'filter_query_parts'), 10, 1);
 	}
 
 
@@ -89,11 +89,11 @@ 
 	 * @param \WP_Query $WP_Query
 	 * @return bool
 	 */
-	public static function apply_query_filters( WP_Query $WP_Query ) {
+	public static function apply_query_filters(WP_Query $WP_Query) {
 		return (
-		    isset( $WP_Query->query, $WP_Query->query['post_type'] )
+		    isset($WP_Query->query, $WP_Query->query['post_type'])
             && $WP_Query->query['post_type'] === 'espresso_events'
-        ) ||  apply_filters( 'FHEE__EEH_Event_Query__apply_query_filters', false ) ;
+        ) || apply_filters('FHEE__EEH_Event_Query__apply_query_filters', false);
 	}
 
 
@@ -102,17 +102,17 @@ 
 	 *
 	 * @param \WP_Query $WP_Query
 	 */
-	public static function filter_query_parts( 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() ) {
+		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 );
+			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);
 		}
 	}
 
@@ -135,11 +135,11 @@ 
         $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 );
+		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);
 	}
 
 
@@ -150,7 +150,7 @@ 
 	 * @param string $month
 	 * @return    string
 	 */
-	private static function _display_month( $month = '' ) {
+	private static function _display_month($month = '') {
         return sanitize_text_field(EE_Registry::instance()->REQ->get('event_query_month', $month));
     }
 
@@ -162,7 +162,7 @@ 
 	 * @param string $category
 	 * @return    string
 	 */
-	private static function _event_category_slug( $category = '' ) {
+	private static function _event_category_slug($category = '') {
 		return sanitize_title_with_dashes(EE_Registry::instance()->REQ->get('event_query_category', $category));
 	}
 
@@ -174,7 +174,7 @@ 
 	 * @param bool $show_expired
 	 * @return    boolean
 	 */
-	private static function _show_expired( $show_expired = false ) {
+	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),
@@ -190,13 +190,13 @@ 
 	 * @param    string $orderby
 	 * @return    array
 	 */
-	private static function _orderby( $orderby = 'start_date' ) {
+	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 = 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 );
+            : 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;
 	}
 
@@ -208,10 +208,10 @@ 
 	 * @param string $sort
 	 * @return string
 	 */
-	private static function _sort( $sort = 'ASC' ) {
+	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 )
+		return in_array($sort, array('ASC', 'asc', 'DESC', 'desc'), true)
+            ? strtoupper($sort)
             : 'ASC';
 	}
 
@@ -225,10 +225,10 @@ 
 	 *
 	 * @return array   array of clauses
 	 */
-	public static function posts_clauses( $clauses, WP_Query $wp_query ) {
-		if ( EEH_Event_Query::apply_query_filters( $wp_query ) ) {
+	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 ';
+			$clauses['groupby'] = $wpdb->posts.'.ID ';
 		}
 		return $clauses;
 	}
@@ -243,10 +243,10 @@ 
      * @return    string
      * @throws \EE_Error
      */
-	public static function posts_fields( $SQL, WP_Query $wp_query ) {
-		if ( EEH_Event_Query::apply_query_filters( $wp_query ) ) {
+	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 );
+			$SQL .= EEH_Event_Query::posts_fields_sql_for_orderby(EEH_Event_Query::$_event_query_orderby);
 		}
 		return $SQL;
 	}
@@ -260,29 +260,29 @@ 
      * @return    string
      * @throws \EE_Error
      */
-	public static function posts_fields_sql_for_orderby( $orderby_params = array() ) {
-		$SQL = ', MIN( ' . EEM_Datetime::instance()->table() . '.DTT_EVT_start ) as event_start_date ' ;
-		foreach( (array)$orderby_params as $orderby ) {
-			switch ( $orderby ) {
+	public static function posts_fields_sql_for_orderby($orderby_params = array()) {
+		$SQL = ', MIN( '.EEM_Datetime::instance()->table().'.DTT_EVT_start ) as event_start_date ';
+		foreach ((array) $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' ;
+					$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;
 
 			}
@@ -300,12 +300,12 @@ 
      * @return    string
      * @throws \EE_Error
      */
-	public static function posts_join( $SQL = '', WP_Query $wp_query ) {
-		if ( EEH_Event_Query::apply_query_filters( $wp_query ) ) {
+	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 );
+			$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;
 	}
@@ -320,13 +320,13 @@ 
      * @return string
      * @throws \EE_Error
      */
-	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();
+	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 . ' ) ';
+			if (strpos($SQL, $join) === FALSE) {
+				$SQL .= ' INNER JOIN '.EEM_Datetime::instance()->table().' ON ( '.$join.' ) ';
 			}
 		}
 		return $SQL;
@@ -341,8 +341,8 @@ 
 	 * @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 ) ) {
+	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)";
@@ -362,33 +362,33 @@ 
      * @return    string
      * @throws \EE_Error
      */
-	public static function posts_join_for_orderby( $SQL = '', $orderby_params = array() ) {
-		foreach ( (array)$orderby_params as $orderby ) {
-			switch ( $orderby ) {
+	public static function posts_join_for_orderby($SQL = '', $orderby_params = array()) {
+		foreach ((array) $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()
+                        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 .=  ' )';
+					$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 );
+					$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 );
+					$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' );
+					$SQL .= EEH_Event_Query::_posts_join_for_datetime($SQL, EEM_Event::instance()->table().'.ID');
 					break;
 
 			}
@@ -406,11 +406,11 @@ 
      * @return string
      * @throws \EE_Error
      */
-	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 . ' )';
+	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 '';
@@ -425,14 +425,14 @@ 
      * @return string
      * @throws \EE_Error
      */
-	protected static function _posts_join_for_event_venue( $SQL = '' ) {
+	protected static function _posts_join_for_event_venue($SQL = '') {
 		// Event Venue table name
 		$event_venue_table = EEM_Event_Venue::instance()->table();
 		// generate conditions for:  Event <=> Event Venue  JOIN clause
-		$event_to_event_venue_join = EEM_Event::instance()->table() . '.ID = ';
-		$event_to_event_venue_join .= $event_venue_table . '.' . EEM_Event::instance()->primary_key_name();
+		$event_to_event_venue_join = EEM_Event::instance()->table().'.ID = ';
+		$event_to_event_venue_join .= $event_venue_table.'.'.EEM_Event::instance()->primary_key_name();
 		// don't add joins if they have already been added
-		if ( strpos( $SQL, $event_to_event_venue_join ) === FALSE ) {
+		if (strpos($SQL, $event_to_event_venue_join) === FALSE) {
 			// Venue table name
 			$venue_table = EEM_Venue::instance()->table();
 			// Venue table pk
@@ -445,10 +445,10 @@ 
 			$venue_SQL .= " LEFT JOIN $venue_table as Venue ON ( $event_venue_table.$venue_table_pk = Venue.ID )";
 			// generate JOIN clause for: Venue <=> Venue Meta
 			$venue_SQL .= " LEFT JOIN $venue_meta_table ON ( Venue.ID = $venue_meta_table.$venue_table_pk )";
-			unset( $event_venue_table, $event_to_event_venue_join, $venue_table, $venue_table_pk, $venue_meta_table );
+			unset($event_venue_table, $event_to_event_venue_join, $venue_table, $venue_table_pk, $venue_meta_table);
 			return $venue_SQL;
 		}
-		unset( $event_venue_table, $event_to_event_venue_join );
+		unset($event_venue_table, $event_to_event_venue_join);
 		return '';
 	}
 
@@ -461,7 +461,7 @@ 
      * @return string
      * @throws \EE_Error
      */
-	protected static function _posts_join_for_venue_state( $SQL = '' ) {
+	protected static function _posts_join_for_venue_state($SQL = '') {
 		// Venue Meta table name
 		$venue_meta_table = EEM_Venue::instance()->second_table();
 		// State table name
@@ -469,16 +469,16 @@ 
 		// State table pk
 		$state_table_pk = EEM_State::instance()->primary_key_name();
 		// verify vars
-		if ( $venue_meta_table && $state_table && $state_table_pk ) {
+		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 );
+			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 );
+		unset($join, $state_table, $state_table_pk, $venue_meta_table, $venue_table_pk);
 		return '';
 	}
 
@@ -492,14 +492,14 @@ 
      * @return    string
      * @throws \EE_Error
      */
-	public static function posts_where( $SQL = '', WP_Query $wp_query ) {
-		if ( EEH_Event_Query::apply_query_filters( $wp_query ) ) {
+	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 );
+			$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 );
+			$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 );
+			$SQL .= EEH_Event_Query::posts_where_sql_for_event_list_month(EEH_Event_Query::$_event_query_month);
 		}
 		return $SQL;
 	}
@@ -513,9 +513,9 @@ 
      * @return    string
      * @throws \EE_Error
      */
-	public static function posts_where_sql_for_show_expired( $show_expired = FALSE ) {
+	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).'\' '
             : '';
 	}
 
@@ -527,10 +527,10 @@ 
 	 * @param    boolean $event_category_slug
 	 * @return    string
 	 */
-	public static function posts_where_sql_for_event_category_slug( $event_category_slug = NULL ) {
+	public static function posts_where_sql_for_event_category_slug($event_category_slug = NULL) {
 		global $wpdb;
 		$event_category_slug = esc_sql($event_category_slug);
-		return ! empty( $event_category_slug )
+		return ! empty($event_category_slug)
             ? " AND {$wpdb->terms}.slug = '{$event_category_slug}' "
             : '';
 	}
@@ -544,14 +544,14 @@ 
      * @return    string
      * @throws \EE_Error
      */
-	public static function posts_where_sql_for_event_list_month( $month = NULL ) {
+	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 <= '" . date( 'Y-m-t 23:59:59', strtotime( $month . ' 1') ) . "'";
+			$SQL = " AND {$datetime_table}.DTT_EVT_start <= '".date('Y-m-t 23:59:59', strtotime($month.' 1'))."'";
 			// 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 >= '" . date( 'Y-m-01 0:0:00', strtotime( $month . ' 1') ) . "' ";
+			$SQL .= " AND {$datetime_table}.DTT_EVT_end >= '".date('Y-m-01 0:0:00', strtotime($month.' 1'))."' ";
 		}
 		return $SQL;
 	}
@@ -566,8 +566,8 @@ 
      * @return    string
      * @throws \EE_Error
      */
-	public static function posts_orderby( $SQL = '', WP_Query $wp_query ) {
-		if ( EEH_Event_Query::apply_query_filters( $wp_query ) ) {
+	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
@@ -600,7 +600,7 @@ 
      * @return string
      * @throws \EE_Error
      */
-	public static function posts_orderby_sql( $orderby_params = array(), $sort = 'ASC' ) {
+	public static function posts_orderby_sql($orderby_params = array(), $sort = 'ASC') {
 		global $wpdb;
 		$SQL = '';
 		$counter = 0;
@@ -608,58 +608,58 @@ 
             ? 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 ( (array)$orderby_params as $orderby ) {
+		foreach ((array) $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;
 			}
 			// this will ad a comma depending on whether this is the first or last param
-			$glue = $counter === 0 || $counter === count( $orderby_params ) ? ' ' : ', ';
+			$glue = $counter === 0 || $counter === count($orderby_params) ? ' ' : ', ';
 			// ok what's we dealing with?
-			switch ( $orderby ) {
+			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;
-			$counter ++;
+			self::$_query_params['orderby'][$orderby] = TRUE;
+			$counter++;
 		}
 		return $SQL;
 	}

core/EES_Shortcode.shortcode.php

Indentation +45 added lines, -45 removed lines

@@ -72,11 +72,11 @@ 
 		}
 		$shortcode = str_replace( 'EES_', '', strtoupper( $shortcode_class ));
 		$shortcode_obj = isset( EE_Registry::instance()->shortcodes->{$shortcode} )
-            ? EE_Registry::instance()->shortcodes->{$shortcode}
-            : null;
+			? EE_Registry::instance()->shortcodes->{$shortcode}
+			: null;
 		return $shortcode_obj instanceof $shortcode_class || $shortcode_class === 'self'
-            ? $shortcode_obj
-            : new $shortcode_class();
+			? $shortcode_obj
+			: new $shortcode_class();
 	}
 
 
@@ -142,47 +142,47 @@ 
 
 
 
-    /**
-     * @param array $attributes
-     * @param array $custom_sanitization
-     * @return array
-     */
-    public static function sanitize_attributes(array $attributes, $custom_sanitization = array())
-    {
-        foreach ($attributes as $key => $value) {
-            // is a custom sanitization callback specified ?
-            if ( isset($custom_sanitization[$key])) {
-                $callback = $custom_sanitization[$key];
-                if ($callback === 'skip_sanitization') {
-                    $attributes[$key] = $value;
-                    continue;
-                } else if (function_exists($callback)){
-                    $attributes[$key] = $callback($value);
-                    continue;
-                }
-            }
-            switch (true) {
-                case $value === null :
-                case is_int($value) :
-                case is_float($value) :
-                    // typical booleans
-                case in_array($value, array(true, 'true', '1', 'on', 'yes', false, 'false', '0', 'off', 'no'), true) :
-                    $attributes[$key] = $value;
-                    break;
-                case is_string($value) :
-                    $attributes[$key] = sanitize_text_field($value);
-                    break;
-                case is_array($value) :
-                    $attributes[$key] = \EES_Shortcode::sanitize_attributes($value);
-                    break;
-                default :
-                    // only remaining data types are Object and Resource
-                    // which are not allowed as shortcode attributes
-                    $attributes[$key] = null;
-                    break;
-            }
-        }
-        return $attributes;
+	/**
+	 * @param array $attributes
+	 * @param array $custom_sanitization
+	 * @return array
+	 */
+	public static function sanitize_attributes(array $attributes, $custom_sanitization = array())
+	{
+		foreach ($attributes as $key => $value) {
+			// is a custom sanitization callback specified ?
+			if ( isset($custom_sanitization[$key])) {
+				$callback = $custom_sanitization[$key];
+				if ($callback === 'skip_sanitization') {
+					$attributes[$key] = $value;
+					continue;
+				} else if (function_exists($callback)){
+					$attributes[$key] = $callback($value);
+					continue;
+				}
+			}
+			switch (true) {
+				case $value === null :
+				case is_int($value) :
+				case is_float($value) :
+					// typical booleans
+				case in_array($value, array(true, 'true', '1', 'on', 'yes', false, 'false', '0', 'off', 'no'), true) :
+					$attributes[$key] = $value;
+					break;
+				case is_string($value) :
+					$attributes[$key] = sanitize_text_field($value);
+					break;
+				case is_array($value) :
+					$attributes[$key] = \EES_Shortcode::sanitize_attributes($value);
+					break;
+				default :
+					// only remaining data types are Object and Resource
+					// which are not allowed as shortcode attributes
+					$attributes[$key] = null;
+					break;
+			}
+		}
+		return $attributes;
 	}
 
 

Spacing +21 added lines, -21 removed lines

@@ -42,7 +42,7 @@ 
 	 * @param WP $WP
 	 * @return    void
 	 */
-	public abstract function run( WP $WP );
+	public abstract function run(WP $WP);
 
 
 
@@ -54,7 +54,7 @@ 
 	 *  @param		array 	$attributes
 	 *  @return 	mixed
 	 */
-	public abstract function process_shortcode( $attributes = array() );
+	public abstract function process_shortcode($attributes = array());
 
 
 
@@ -65,13 +65,13 @@ 
 	 * @param 	string $shortcode_class
 	 * @return 	\EES_Shortcode
 	 */
-	final public static function instance( $shortcode_class = null ) {
-		$shortcode_class = ! empty( $shortcode_class ) ? $shortcode_class : get_called_class();
-		if ( $shortcode_class === 'EES_Shortcode' || empty( $shortcode_class )) {
+	final public static function instance($shortcode_class = null) {
+		$shortcode_class = ! empty($shortcode_class) ? $shortcode_class : get_called_class();
+		if ($shortcode_class === 'EES_Shortcode' || empty($shortcode_class)) {
 			return null;
 		}
-		$shortcode = str_replace( 'EES_', '', strtoupper( $shortcode_class ));
-		$shortcode_obj = isset( EE_Registry::instance()->shortcodes->{$shortcode} )
+		$shortcode = str_replace('EES_', '', strtoupper($shortcode_class));
+		$shortcode_obj = isset(EE_Registry::instance()->shortcodes->{$shortcode} )
             ? EE_Registry::instance()->shortcodes->{$shortcode}
             : null;
 		return $shortcode_obj instanceof $shortcode_class || $shortcode_class === 'self'
@@ -90,23 +90,23 @@ 
 	 * @param 	$attributes
 	 * @return 	mixed
 	 */
-	final public static function fallback_shortcode_processor( $attributes ) {
-		if ( EE_Maintenance_Mode::disable_frontend_for_maintenance() ) {
+	final public static function fallback_shortcode_processor($attributes) {
+		if (EE_Maintenance_Mode::disable_frontend_for_maintenance()) {
 			return null;
 		}
 		// what shortcode was actually parsed ?
 		$shortcode_class = get_called_class();
 		// notify rest of system that fallback processor was triggered
-		add_filter( 'FHEE__fallback_shortcode_processor__' . $shortcode_class, '__return_true' );
+		add_filter('FHEE__fallback_shortcode_processor__'.$shortcode_class, '__return_true');
 		// get instance of actual shortcode
-		$shortcode_obj = self::instance( $shortcode_class );
+		$shortcode_obj = self::instance($shortcode_class);
 		// verify class
-		if ( $shortcode_obj instanceof EES_Shortcode ) {
+		if ($shortcode_obj instanceof EES_Shortcode) {
 			global $wp;
-			$shortcode_obj->run( $wp );
+			$shortcode_obj->run($wp);
 			// set attributes and run the shortcode
-			$shortcode_obj->_attributes = (array)$attributes;
-			return $shortcode_obj->process_shortcode( $shortcode_obj->_attributes );
+			$shortcode_obj->_attributes = (array) $attributes;
+			return $shortcode_obj->process_shortcode($shortcode_obj->_attributes);
 		} else {
 			return null;
 		}
@@ -122,7 +122,7 @@ 
 	 * @param 	$attributes
 	 * @return 	string
 	 */
-	final public static function invalid_shortcode_processor( $attributes ) {
+	final public static function invalid_shortcode_processor($attributes) {
 		return '';
 	}
 
@@ -133,11 +133,11 @@ 
 	 */
 	final public function __construct() {
 		// get classname, remove EES_prefix, and convert to UPPERCASE
-		$shortcode = strtoupper( str_replace( 'EES_', '', get_class( $this )));
+		$shortcode = strtoupper(str_replace('EES_', '', get_class($this)));
 		// assign shortcode to the preferred callback, which overwrites the "fallback shortcode processor" assigned earlier
-		add_shortcode( $shortcode, array( $this, 'process_shortcode' ));
+		add_shortcode($shortcode, array($this, 'process_shortcode'));
 		// make sure system knows this is an EE page
-		EE_Registry::instance()->REQ->set_espresso_page( TRUE );
+		EE_Registry::instance()->REQ->set_espresso_page(TRUE);
 	}
 
 
@@ -151,12 +151,12 @@ 
     {
         foreach ($attributes as $key => $value) {
             // is a custom sanitization callback specified ?
-            if ( isset($custom_sanitization[$key])) {
+            if (isset($custom_sanitization[$key])) {
                 $callback = $custom_sanitization[$key];
                 if ($callback === 'skip_sanitization') {
                     $attributes[$key] = $value;
                     continue;
-                } else if (function_exists($callback)){
+                } else if (function_exists($callback)) {
                     $attributes[$key] = $callback($value);
                     continue;
                 }