eventespresso / event-espresso-core

modules/venues_archive/EED_Venues_Archive.module.php

Indentation +2 added lines, -2 removed lines

@@ -37,8 +37,8 @@
 	 *  @return 	void
 	 */
 	public static function set_hooks() {
-        $post_type = get_post_type_object('espresso_venues');
-        EE_Config::register_route(strtolower($post_type->labels->name), 'Venues_Archive', 'run' );
+		$post_type = get_post_type_object('espresso_venues');
+		EE_Config::register_route(strtolower($post_type->labels->name), 'Venues_Archive', 'run' );
 	}
 
 	/**

Spacing +31 added lines, -31 removed lines

@@ -27,7 +27,7 @@ 
 	 * @return EED_Venues_Archive
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 	/**
@@ -38,7 +38,7 @@ 
 	 */
 	public static function set_hooks() {
         $post_type = get_post_type_object('espresso_venues');
-        EE_Config::register_route(strtolower($post_type->labels->name), 'Venues_Archive', 'run' );
+        EE_Config::register_route(strtolower($post_type->labels->name), 'Venues_Archive', 'run');
 	}
 
 	/**
@@ -58,10 +58,10 @@ 
 	 * @access    public
 	 * @param \WP $WP
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
 		// check what template is loaded
-		add_filter( 'template_include',  array( $this, 'template_include' ), 999, 1 );
-		add_action('wp_enqueue_scripts', array( $this, 'wp_enqueue_scripts' ), 10 );
+		add_filter('template_include', array($this, 'template_include'), 999, 1);
+		add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 10);
 	}
 
 
@@ -73,18 +73,18 @@ 
 	 * @param  string $template
 	 * @return string
 	 */
-	public function template_include( $template ) {
+	public function template_include($template) {
 		// not a custom template?
-		if ( EE_Registry::instance()->load_core( 'Front_Controller', array(), false, true )->get_selected_template() != 'archive-espresso_venues.php' ) {
+		if (EE_Registry::instance()->load_core('Front_Controller', array(), false, true)->get_selected_template() != 'archive-espresso_venues.php') {
 			EEH_Template::load_espresso_theme_functions();
 			// then add extra event data via hooks
-			add_filter( 'the_title', array( $this, 'the_title' ), 100, 1 );
+			add_filter('the_title', array($this, 'the_title'), 100, 1);
 			// don't know if theme uses the_excerpt
-			add_filter( 'the_excerpt', array( $this, 'venue_details' ), 100 );
+			add_filter('the_excerpt', array($this, 'venue_details'), 100);
 			// or the_content
-			add_filter( 'the_content', array( $this, 'venue_details' ), 100 );
+			add_filter('the_content', array($this, 'venue_details'), 100);
 			// don't display entry meta because the existing theme will take care of that
-			add_filter( 'FHEE__content_espresso_venues_details_template__display_entry_meta', '__return_false' );
+			add_filter('FHEE__content_espresso_venues_details_template__display_entry_meta', '__return_false');
 		}
 		return $template;
 	}
@@ -98,7 +98,7 @@ 
 	 * @param  string $title
 	 * @return string
 	 */
-	public function the_title( $title = '' ) {
+	public function the_title($title = '') {
 		return $title;
 	}
 
@@ -110,7 +110,7 @@ 
 	 * @param  string $content
 	 * @return string
 	 */
-	public function venue_details( $content ) {
+	public function venue_details($content) {
 		global $post;
 		if (
 			$post->post_type == 'espresso_venues'
@@ -120,22 +120,22 @@ 
 			// it uses the_content() for displaying the $post->post_content
 			// so in order to load a template that uses the_content() from within a callback being used to filter the_content(),
 			// we need to first remove this callback from being applied to the_content() (otherwise it will recurse and blow up the interweb)
-			remove_filter( 'the_excerpt', array( $this, 'venue_details' ), 100 );
-			remove_filter( 'the_content', array( $this, 'venue_details' ), 100 );
+			remove_filter('the_excerpt', array($this, 'venue_details'), 100);
+			remove_filter('the_content', array($this, 'venue_details'), 100);
 			// add filters we want
-			add_filter( 'the_content', array( $this, 'venue_location' ), 110 );
-			add_filter( 'the_excerpt', array( $this, 'venue_location' ), 110 );
+			add_filter('the_content', array($this, 'venue_location'), 110);
+			add_filter('the_excerpt', array($this, 'venue_location'), 110);
 			// now load our template
-			$template = EEH_Template::locate_template( 'content-espresso_venues-details.php' );
+			$template = EEH_Template::locate_template('content-espresso_venues-details.php');
 			//now add our filter back in, plus some others
-			add_filter( 'the_excerpt', array( $this, 'venue_details' ), 100 );
-			add_filter( 'the_content', array( $this, 'venue_details' ), 100 );
+			add_filter('the_excerpt', array($this, 'venue_details'), 100);
+			add_filter('the_content', array($this, 'venue_details'), 100);
 			// remove other filters we added so they won't get applied to the next post
-			remove_filter( 'the_content', array( $this, 'venue_location' ), 110 );
-			remove_filter( 'the_excerpt', array( $this, 'venue_location' ), 110 );
+			remove_filter('the_content', array($this, 'venue_location'), 110);
+			remove_filter('the_excerpt', array($this, 'venue_location'), 110);
 			// we're not returning the $content directly because the template we are loading uses the_content (or the_excerpt)
 		}
-		return ! empty( $template ) ? $template : $content;
+		return ! empty($template) ? $template : $content;
 	}
 
 
@@ -147,8 +147,8 @@ 
 	 * @param  string $content
 	 * @return string
 	 */
-	public function venue_location( $content ) {
-		return $content . EEH_Template::locate_template( 'content-espresso_venues-location.php' );
+	public function venue_location($content) {
+		return $content.EEH_Template::locate_template('content-espresso_venues-location.php');
 	}
 
 
@@ -162,14 +162,14 @@ 
 	 */
 	public function wp_enqueue_scripts() {
 		// get some style
-		if ( apply_filters( 'FHEE_enable_default_espresso_css', TRUE ) && is_archive() ) {
+		if (apply_filters('FHEE_enable_default_espresso_css', TRUE) && is_archive()) {
 			// first check theme folder
-			if ( is_readable( get_stylesheet_directory() . $this->theme . DS . 'style.css' )) {
-				wp_register_style( $this->theme, get_stylesheet_directory_uri() . $this->theme . DS . 'style.css', array( 'dashicons', 'espresso_default' ) );
-			} else if ( is_readable( EE_TEMPLATES . $this->theme . DS . 'style.css' )) {
-				wp_register_style( $this->theme, EE_TEMPLATES_URL . $this->theme . DS . 'style.css', array( 'dashicons', 'espresso_default' ) );
+			if (is_readable(get_stylesheet_directory().$this->theme.DS.'style.css')) {
+				wp_register_style($this->theme, get_stylesheet_directory_uri().$this->theme.DS.'style.css', array('dashicons', 'espresso_default'));
+			} else if (is_readable(EE_TEMPLATES.$this->theme.DS.'style.css')) {
+				wp_register_style($this->theme, EE_TEMPLATES_URL.$this->theme.DS.'style.css', array('dashicons', 'espresso_default'));
 			}
-			wp_enqueue_style( $this->theme );
+			wp_enqueue_style($this->theme);
 		}
 	}
 

modules/event_single/EED_Event_Single.module.php

Indentation +458 added lines, -458 removed lines

@@ -13,463 +13,463 @@ 
 class EED_Event_Single extends EED_Module
 {
 
-    const EVENT_DETAILS_PRIORITY = 100;
-    const EVENT_DATETIMES_PRIORITY = 110;
-    const EVENT_TICKETS_PRIORITY = 120;
-    const EVENT_VENUES_PRIORITY = 130;
-
-    /**
-     * @type bool $using_get_the_excerpt
-     */
-    protected static $using_get_the_excerpt = false;
-
-
-    /**
-     * @type EE_Template_Part_Manager $template_parts
-     */
-    protected $template_parts;
-
-
-    /**
-     * @return EED_Module|EED_Event_Single
-     */
-    public static function instance()
-    {
-        return parent::get_instance(__CLASS__);
-    }
-
-
-    /**
-     * set_hooks - for hooking into EE Core, other modules, etc
-     *
-     * @return    void
-     */
-    public static function set_hooks()
-    {
-        add_filter('FHEE_run_EE_wp', '__return_true');
-        add_action('wp_loaded', array('EED_Event_Single', 'set_definitions'), 2);
-        $post_type = get_post_type_object('espresso_events');
-        EE_Config::register_route(strtolower($post_type->labels->singular_name), 'Event_Single', 'run');
-    }
-
-    /**
-     * set_hooks_admin - for hooking into EE Admin Core, other modules, etc
-     *
-     * @return    void
-     */
-    public static function set_hooks_admin()
-    {
-        add_action('wp_loaded', array('EED_Event_Single', 'set_definitions'), 2);
-    }
-
-
-    /**
-     * set_definitions
-     *
-     * @static
-     * @return void
-     */
-    public static function set_definitions()
-    {
-        define('EVENT_SINGLE_ASSETS_URL', plugin_dir_url(__FILE__) . 'assets' . DS);
-        define('EVENT_SINGLE_TEMPLATES_PATH', plugin_dir_path(__FILE__) . 'templates' . DS);
-    }
-
-
-    /**
-     * set_config
-     *
-     * @void
-     */
-    protected function set_config()
-    {
-        $this->set_config_section('template_settings');
-        $this->set_config_class('EE_Event_Single_Config');
-        $this->set_config_name('EED_Event_Single');
-    }
-
-
-    /**
-     * initialize_template_parts
-     *
-     * @param EE_Config_Base|EE_Event_Single_Config $config
-     * @return EE_Template_Part_Manager
-     */
-    public function initialize_template_parts(EE_Event_Single_Config $config = null)
-    {
-        /** @type EE_Event_Single_Config $config */
-        $config = $config instanceof EE_Event_Single_Config ? $config : $this->config();
-        EEH_Autoloader::instance()->register_template_part_autoloaders();
-        $template_parts = new EE_Template_Part_Manager();
-        $template_parts->add_template_part(
-            'tickets',
-            __('Ticket Selector', 'event_espresso'),
-            'content-espresso_events-tickets.php',
-            $config->display_order_tickets
-        );
-        $template_parts->add_template_part(
-            'datetimes',
-            __('Dates and Times', 'event_espresso'),
-            'content-espresso_events-datetimes.php',
-            $config->display_order_datetimes
-        );
-        $template_parts->add_template_part(
-            'event',
-            __('Event Description', 'event_espresso'),
-            'content-espresso_events-details.php',
-            $config->display_order_event
-        );
-        $template_parts->add_template_part(
-            'venue',
-            __('Venue Information', 'event_espresso'),
-            'content-espresso_events-venues.php',
-            $config->display_order_venue
-        );
-        do_action('AHEE__EED_Event_Single__initialize_template_parts', $template_parts);
-        return $template_parts;
-    }
-
-
-    /**
-     * run - initial module setup
-     *
-     * @param WP $WP
-     * @return    void
-     */
-    public function run($WP)
-    {
-        // ensure valid EE_Events_Single_Config() object exists
-        $this->set_config();
-        // check what template is loaded
-        add_filter('template_include', array($this, 'template_include'), 999, 1);
-        add_filter('FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', '__return_true');
-        // load css
-        add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 10);
-    }
-
-
-    /**
-     * template_include
-     *
-     * @param    string $template
-     * @return    string
-     */
-    public function template_include($template)
-    {
-        global $post;
-        /** @type EE_Event_Single_Config $config */
-        $config = $this->config();
-        if ($config->display_status_banner_single) {
-            add_filter('the_title', array('EED_Event_Single', 'the_title'), 100, 2);
-        }
-        // not a custom template?
-        if (
-            !post_password_required($post)
-            && (
-                apply_filters('FHEE__EED_Event_Single__template_include__allow_custom_selected_template', false)
-                || EE_Registry::instance()
-                    ->load_core('Front_Controller')
-                    ->get_selected_template() !== 'single-espresso_events.php'
-            )
-
-        ) {
-            EEH_Template::load_espresso_theme_functions();
-            // then add extra event data via hooks
-            add_action('loop_start', array('EED_Event_Single', 'loop_start'));
-            add_filter('get_the_excerpt', array('EED_Event_Single', 'get_the_excerpt'), 1, 1);
-            add_filter(
-                'the_content',
-                array('EED_Event_Single', 'event_details'),
-                EED_Event_Single::EVENT_DETAILS_PRIORITY
-            );
-            add_action('loop_end', array('EED_Event_Single', 'loop_end'));
-            // don't display entry meta because the existing theme will take car of that
-            add_filter('FHEE__content_espresso_events_details_template__display_entry_meta', '__return_false');
-        }
-        return $template;
-    }
-
-
-    /**
-     * loop_start
-     *
-     * @param    array $wp_query_array an array containing the WP_Query object
-     * @return    void
-     */
-    public static function loop_start($wp_query_array)
-    {
-        global $post;
-        do_action('AHEE_event_details_before_post', $post, $wp_query_array);
-    }
-
-
-    /**
-     * the_title
-     *
-     * @param    string $title
-     * @param    int $id
-     * @return    string
-     */
-    public static function the_title($title = '', $id = 0)
-    {
-        global $post;
-        return in_the_loop() && $post->ID === (int)$id
-            ? espresso_event_status_banner($post->ID) . $title
-            : $title;
-    }
-
-
-    /**
-     * get_the_excerpt
-     * kinda hacky, but if a theme is using get_the_excerpt(),
-     * then we need to remove our filters on the_content()
-     *
-     * @param        string $excerpt
-     * @return        string
-     */
-    public static function get_the_excerpt($excerpt = '')
-    {
-        EED_Event_Single::$using_get_the_excerpt = true;
-        add_filter('wp_trim_excerpt', array('EED_Event_Single', 'end_get_the_excerpt'), 999, 1);
-        return $excerpt;
-    }
-
-
-    /**
-     * end_get_the_excerpt
-     *
-     * @param  string $text
-     * @return string
-     */
-    public static function end_get_the_excerpt($text = '')
-    {
-        EED_Event_Single::$using_get_the_excerpt = false;
-        return $text;
-    }
-
-
-    /**
-     * event_details
-     *
-     * @param    string $content
-     * @return    string
-     */
-    public static function event_details($content)
-    {
-        global $post;
-        static $current_post_ID = 0;
-        if (
-            $current_post_ID !== $post->ID
-            && $post->post_type === 'espresso_events'
-            && !EED_Event_Single::$using_get_the_excerpt
-            && !post_password_required()
-        ) {
-            // Set current post ID to prevent showing content twice, but only if headers have definitely been sent.
-            // Reason being is that some plugins, like Yoast, need to run through a copy of the loop early
-            // BEFORE headers are sent in order to examine the post content and generate content for the HTML header.
-            // We want to allow those plugins to still do their thing and have access to our content, but depending on
-            // how your event content is being displayed (shortcode, CPT route, etc), this filter can get applied twice,
-            // so the following allows this filter to be applied multiple times, but only once for real
-            $current_post_ID = did_action('loop_start') ? $post->ID : 0;
-            if (EE_Registry::instance()->CFG->template_settings->EED_Event_Single->use_sortable_display_order) {
-                // we need to first remove this callback from being applied to the_content()
-                // (otherwise it will recurse and blow up the interweb)
-                remove_filter(
-                    'the_content',
-                    array('EED_Event_Single', 'event_details'),
-                    EED_Event_Single::EVENT_DETAILS_PRIORITY
-                );
-                EED_Event_Single::instance()->template_parts = EED_Event_Single::instance()->initialize_template_parts();
-                $content = EEH_Template::locate_template('content-espresso_events-details.php');
-                $content = EED_Event_Single::instance()->template_parts->apply_template_part_filters($content);
-                add_filter(
-                    'the_content',
-                    array('EED_Event_Single', 'event_details'),
-                    EED_Event_Single::EVENT_DETAILS_PRIORITY
-                );
-            } else {
-                $content = EED_Event_Single::use_filterable_display_order();
-            }
-        }
-        return $content;
-    }
-
-
-    /**
-     * use_filterable_display_order
-     *
-     * @return string
-     */
-    protected static function use_filterable_display_order()
-    {
-        // since the 'content-espresso_events-details.php' template might be used directly from within a theme,
-        // it uses the_content() for displaying the $post->post_content
-        // so in order to load a template that uses the_content()
-        // from within a callback being used to filter the_content(),
-        // we need to first remove this callback from being applied to the_content()
-        // (otherwise it will recurse and blow up the interweb)
-        remove_filter(
-            'the_content',
-            array('EED_Event_Single', 'event_details'),
-            EED_Event_Single::EVENT_DETAILS_PRIORITY
-        );
-        //now add additional content
-        add_filter(
-            'the_content',
-            array('EED_Event_Single', 'event_datetimes'),
-            EED_Event_Single::EVENT_DATETIMES_PRIORITY,
-            1
-        );
-        add_filter(
-            'the_content',
-            array('EED_Event_Single', 'event_tickets'),
-            EED_Event_Single::EVENT_TICKETS_PRIORITY,
-            1
-        );
-        add_filter(
-            'the_content',
-            array('EED_Event_Single', 'event_venues'),
-            EED_Event_Single::EVENT_VENUES_PRIORITY,
-            1
-        );
-        do_action('AHEE__EED_Event_Single__use_filterable_display_order__after_add_filters');
-        // now load our template
-        $content = EEH_Template::locate_template('content-espresso_events-details.php');
-        //now add our filter back in, plus some others
-        add_filter(
-            'the_content',
-            array('EED_Event_Single', 'event_details'),
-            EED_Event_Single::EVENT_DETAILS_PRIORITY
-        );
-        remove_filter(
-            'the_content',
-            array('EED_Event_Single', 'event_datetimes'),
-            EED_Event_Single::EVENT_DATETIMES_PRIORITY
-        );
-        remove_filter(
-            'the_content',
-            array('EED_Event_Single', 'event_tickets'),
-            EED_Event_Single::EVENT_TICKETS_PRIORITY
-        );
-        remove_filter(
-            'the_content',
-            array('EED_Event_Single', 'event_venues'),
-            EED_Event_Single::EVENT_VENUES_PRIORITY
-        );
-        do_action('AHEE__EED_Event_Single__use_filterable_display_order__after_remove_filters');
-        // we're not returning the $content directly because the template we are loading uses the_content (or the_excerpt)
-        return $content;
-    }
-
-
-    /**
-     * event_datetimes - adds datetimes ABOVE content
-     *
-     * @param        string $content
-     * @return        string
-     */
-    public static function event_datetimes($content)
-    {
-        return EEH_Template::locate_template('content-espresso_events-datetimes.php') . $content;
-    }
-
-
-    /**
-     * event_tickets - adds tickets ABOVE content (which includes datetimes)
-     *
-     * @param        string $content
-     * @return        string
-     */
-    public static function event_tickets($content)
-    {
-        return EEH_Template::locate_template('content-espresso_events-tickets.php') . $content;
-    }
-
-
-    /**
-     * event_venues
-     *
-     * @param    string $content
-     * @return    string
-     */
-    public static function event_venue($content)
-    {
-        return EED_Event_Single::event_venues($content);
-    }
-
-
-    /**
-     * event_venues - adds venues BELOW content
-     *
-     * @param        string $content
-     * @return        string
-     */
-    public static function event_venues($content)
-    {
-        return $content . EEH_Template::locate_template('content-espresso_events-venues.php');
-    }
-
-
-    /**
-     * loop_end
-     *
-     * @param        array $wp_query_array an array containing the WP_Query object
-     * @return        void
-     */
-    public static function loop_end($wp_query_array)
-    {
-        global $post;
-        do_action('AHEE_event_details_after_post', $post, $wp_query_array);
-    }
-
-
-    /**
-     * wp_enqueue_scripts
-     *
-     * @return    void
-     */
-    public function wp_enqueue_scripts()
-    {
-        // get some style
-        if (
-            apply_filters('FHEE_enable_default_espresso_css', TRUE)
-            && apply_filters('FHEE__EED_Event_Single__wp_enqueue_scripts__enable_css', TRUE)
-        ) {
-            // first check uploads folder
-            if (is_readable(get_stylesheet_directory() . $this->theme . DS . 'style.css')) {
-                wp_register_style(
-                    $this->theme,
-                    get_stylesheet_directory_uri() . $this->theme . DS . 'style.css',
-                    array('dashicons', 'espresso_default')
-                );
-            } else {
-                wp_register_style(
-                    $this->theme,
-                    EE_TEMPLATES_URL . $this->theme . DS . 'style.css',
-                    array('dashicons', 'espresso_default')
-                );
-            }
-            wp_enqueue_script($this->theme);
-            if (EE_Registry::instance()->CFG->map_settings->use_google_maps) {
-                add_action('wp_enqueue_scripts', array('EEH_Maps', 'espresso_google_map_js'), 11);
-            }
-        }
-    }
-
-
-    /**
-     * display_venue
-     *
-     * @return    bool
-     */
-    public static function display_venue()
-    {
-        /** @type EE_Event_Single_Config $config */
-        $config = EED_Event_Single::instance()->config();
-        $display_venue = $config->display_venue === null ? true : $config->display_venue;
-        $venue_name = EEH_Venue_View::venue_name();
-        return $display_venue && !empty($venue_name);
-    }
+	const EVENT_DETAILS_PRIORITY = 100;
+	const EVENT_DATETIMES_PRIORITY = 110;
+	const EVENT_TICKETS_PRIORITY = 120;
+	const EVENT_VENUES_PRIORITY = 130;
+
+	/**
+	 * @type bool $using_get_the_excerpt
+	 */
+	protected static $using_get_the_excerpt = false;
+
+
+	/**
+	 * @type EE_Template_Part_Manager $template_parts
+	 */
+	protected $template_parts;
+
+
+	/**
+	 * @return EED_Module|EED_Event_Single
+	 */
+	public static function instance()
+	{
+		return parent::get_instance(__CLASS__);
+	}
+
+
+	/**
+	 * set_hooks - for hooking into EE Core, other modules, etc
+	 *
+	 * @return    void
+	 */
+	public static function set_hooks()
+	{
+		add_filter('FHEE_run_EE_wp', '__return_true');
+		add_action('wp_loaded', array('EED_Event_Single', 'set_definitions'), 2);
+		$post_type = get_post_type_object('espresso_events');
+		EE_Config::register_route(strtolower($post_type->labels->singular_name), 'Event_Single', 'run');
+	}
+
+	/**
+	 * set_hooks_admin - for hooking into EE Admin Core, other modules, etc
+	 *
+	 * @return    void
+	 */
+	public static function set_hooks_admin()
+	{
+		add_action('wp_loaded', array('EED_Event_Single', 'set_definitions'), 2);
+	}
+
+
+	/**
+	 * set_definitions
+	 *
+	 * @static
+	 * @return void
+	 */
+	public static function set_definitions()
+	{
+		define('EVENT_SINGLE_ASSETS_URL', plugin_dir_url(__FILE__) . 'assets' . DS);
+		define('EVENT_SINGLE_TEMPLATES_PATH', plugin_dir_path(__FILE__) . 'templates' . DS);
+	}
+
+
+	/**
+	 * set_config
+	 *
+	 * @void
+	 */
+	protected function set_config()
+	{
+		$this->set_config_section('template_settings');
+		$this->set_config_class('EE_Event_Single_Config');
+		$this->set_config_name('EED_Event_Single');
+	}
+
+
+	/**
+	 * initialize_template_parts
+	 *
+	 * @param EE_Config_Base|EE_Event_Single_Config $config
+	 * @return EE_Template_Part_Manager
+	 */
+	public function initialize_template_parts(EE_Event_Single_Config $config = null)
+	{
+		/** @type EE_Event_Single_Config $config */
+		$config = $config instanceof EE_Event_Single_Config ? $config : $this->config();
+		EEH_Autoloader::instance()->register_template_part_autoloaders();
+		$template_parts = new EE_Template_Part_Manager();
+		$template_parts->add_template_part(
+			'tickets',
+			__('Ticket Selector', 'event_espresso'),
+			'content-espresso_events-tickets.php',
+			$config->display_order_tickets
+		);
+		$template_parts->add_template_part(
+			'datetimes',
+			__('Dates and Times', 'event_espresso'),
+			'content-espresso_events-datetimes.php',
+			$config->display_order_datetimes
+		);
+		$template_parts->add_template_part(
+			'event',
+			__('Event Description', 'event_espresso'),
+			'content-espresso_events-details.php',
+			$config->display_order_event
+		);
+		$template_parts->add_template_part(
+			'venue',
+			__('Venue Information', 'event_espresso'),
+			'content-espresso_events-venues.php',
+			$config->display_order_venue
+		);
+		do_action('AHEE__EED_Event_Single__initialize_template_parts', $template_parts);
+		return $template_parts;
+	}
+
+
+	/**
+	 * run - initial module setup
+	 *
+	 * @param WP $WP
+	 * @return    void
+	 */
+	public function run($WP)
+	{
+		// ensure valid EE_Events_Single_Config() object exists
+		$this->set_config();
+		// check what template is loaded
+		add_filter('template_include', array($this, 'template_include'), 999, 1);
+		add_filter('FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', '__return_true');
+		// load css
+		add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 10);
+	}
+
+
+	/**
+	 * template_include
+	 *
+	 * @param    string $template
+	 * @return    string
+	 */
+	public function template_include($template)
+	{
+		global $post;
+		/** @type EE_Event_Single_Config $config */
+		$config = $this->config();
+		if ($config->display_status_banner_single) {
+			add_filter('the_title', array('EED_Event_Single', 'the_title'), 100, 2);
+		}
+		// not a custom template?
+		if (
+			!post_password_required($post)
+			&& (
+				apply_filters('FHEE__EED_Event_Single__template_include__allow_custom_selected_template', false)
+				|| EE_Registry::instance()
+					->load_core('Front_Controller')
+					->get_selected_template() !== 'single-espresso_events.php'
+			)
+
+		) {
+			EEH_Template::load_espresso_theme_functions();
+			// then add extra event data via hooks
+			add_action('loop_start', array('EED_Event_Single', 'loop_start'));
+			add_filter('get_the_excerpt', array('EED_Event_Single', 'get_the_excerpt'), 1, 1);
+			add_filter(
+				'the_content',
+				array('EED_Event_Single', 'event_details'),
+				EED_Event_Single::EVENT_DETAILS_PRIORITY
+			);
+			add_action('loop_end', array('EED_Event_Single', 'loop_end'));
+			// don't display entry meta because the existing theme will take car of that
+			add_filter('FHEE__content_espresso_events_details_template__display_entry_meta', '__return_false');
+		}
+		return $template;
+	}
+
+
+	/**
+	 * loop_start
+	 *
+	 * @param    array $wp_query_array an array containing the WP_Query object
+	 * @return    void
+	 */
+	public static function loop_start($wp_query_array)
+	{
+		global $post;
+		do_action('AHEE_event_details_before_post', $post, $wp_query_array);
+	}
+
+
+	/**
+	 * the_title
+	 *
+	 * @param    string $title
+	 * @param    int $id
+	 * @return    string
+	 */
+	public static function the_title($title = '', $id = 0)
+	{
+		global $post;
+		return in_the_loop() && $post->ID === (int)$id
+			? espresso_event_status_banner($post->ID) . $title
+			: $title;
+	}
+
+
+	/**
+	 * get_the_excerpt
+	 * kinda hacky, but if a theme is using get_the_excerpt(),
+	 * then we need to remove our filters on the_content()
+	 *
+	 * @param        string $excerpt
+	 * @return        string
+	 */
+	public static function get_the_excerpt($excerpt = '')
+	{
+		EED_Event_Single::$using_get_the_excerpt = true;
+		add_filter('wp_trim_excerpt', array('EED_Event_Single', 'end_get_the_excerpt'), 999, 1);
+		return $excerpt;
+	}
+
+
+	/**
+	 * end_get_the_excerpt
+	 *
+	 * @param  string $text
+	 * @return string
+	 */
+	public static function end_get_the_excerpt($text = '')
+	{
+		EED_Event_Single::$using_get_the_excerpt = false;
+		return $text;
+	}
+
+
+	/**
+	 * event_details
+	 *
+	 * @param    string $content
+	 * @return    string
+	 */
+	public static function event_details($content)
+	{
+		global $post;
+		static $current_post_ID = 0;
+		if (
+			$current_post_ID !== $post->ID
+			&& $post->post_type === 'espresso_events'
+			&& !EED_Event_Single::$using_get_the_excerpt
+			&& !post_password_required()
+		) {
+			// Set current post ID to prevent showing content twice, but only if headers have definitely been sent.
+			// Reason being is that some plugins, like Yoast, need to run through a copy of the loop early
+			// BEFORE headers are sent in order to examine the post content and generate content for the HTML header.
+			// We want to allow those plugins to still do their thing and have access to our content, but depending on
+			// how your event content is being displayed (shortcode, CPT route, etc), this filter can get applied twice,
+			// so the following allows this filter to be applied multiple times, but only once for real
+			$current_post_ID = did_action('loop_start') ? $post->ID : 0;
+			if (EE_Registry::instance()->CFG->template_settings->EED_Event_Single->use_sortable_display_order) {
+				// we need to first remove this callback from being applied to the_content()
+				// (otherwise it will recurse and blow up the interweb)
+				remove_filter(
+					'the_content',
+					array('EED_Event_Single', 'event_details'),
+					EED_Event_Single::EVENT_DETAILS_PRIORITY
+				);
+				EED_Event_Single::instance()->template_parts = EED_Event_Single::instance()->initialize_template_parts();
+				$content = EEH_Template::locate_template('content-espresso_events-details.php');
+				$content = EED_Event_Single::instance()->template_parts->apply_template_part_filters($content);
+				add_filter(
+					'the_content',
+					array('EED_Event_Single', 'event_details'),
+					EED_Event_Single::EVENT_DETAILS_PRIORITY
+				);
+			} else {
+				$content = EED_Event_Single::use_filterable_display_order();
+			}
+		}
+		return $content;
+	}
+
+
+	/**
+	 * use_filterable_display_order
+	 *
+	 * @return string
+	 */
+	protected static function use_filterable_display_order()
+	{
+		// since the 'content-espresso_events-details.php' template might be used directly from within a theme,
+		// it uses the_content() for displaying the $post->post_content
+		// so in order to load a template that uses the_content()
+		// from within a callback being used to filter the_content(),
+		// we need to first remove this callback from being applied to the_content()
+		// (otherwise it will recurse and blow up the interweb)
+		remove_filter(
+			'the_content',
+			array('EED_Event_Single', 'event_details'),
+			EED_Event_Single::EVENT_DETAILS_PRIORITY
+		);
+		//now add additional content
+		add_filter(
+			'the_content',
+			array('EED_Event_Single', 'event_datetimes'),
+			EED_Event_Single::EVENT_DATETIMES_PRIORITY,
+			1
+		);
+		add_filter(
+			'the_content',
+			array('EED_Event_Single', 'event_tickets'),
+			EED_Event_Single::EVENT_TICKETS_PRIORITY,
+			1
+		);
+		add_filter(
+			'the_content',
+			array('EED_Event_Single', 'event_venues'),
+			EED_Event_Single::EVENT_VENUES_PRIORITY,
+			1
+		);
+		do_action('AHEE__EED_Event_Single__use_filterable_display_order__after_add_filters');
+		// now load our template
+		$content = EEH_Template::locate_template('content-espresso_events-details.php');
+		//now add our filter back in, plus some others
+		add_filter(
+			'the_content',
+			array('EED_Event_Single', 'event_details'),
+			EED_Event_Single::EVENT_DETAILS_PRIORITY
+		);
+		remove_filter(
+			'the_content',
+			array('EED_Event_Single', 'event_datetimes'),
+			EED_Event_Single::EVENT_DATETIMES_PRIORITY
+		);
+		remove_filter(
+			'the_content',
+			array('EED_Event_Single', 'event_tickets'),
+			EED_Event_Single::EVENT_TICKETS_PRIORITY
+		);
+		remove_filter(
+			'the_content',
+			array('EED_Event_Single', 'event_venues'),
+			EED_Event_Single::EVENT_VENUES_PRIORITY
+		);
+		do_action('AHEE__EED_Event_Single__use_filterable_display_order__after_remove_filters');
+		// we're not returning the $content directly because the template we are loading uses the_content (or the_excerpt)
+		return $content;
+	}
+
+
+	/**
+	 * event_datetimes - adds datetimes ABOVE content
+	 *
+	 * @param        string $content
+	 * @return        string
+	 */
+	public static function event_datetimes($content)
+	{
+		return EEH_Template::locate_template('content-espresso_events-datetimes.php') . $content;
+	}
+
+
+	/**
+	 * event_tickets - adds tickets ABOVE content (which includes datetimes)
+	 *
+	 * @param        string $content
+	 * @return        string
+	 */
+	public static function event_tickets($content)
+	{
+		return EEH_Template::locate_template('content-espresso_events-tickets.php') . $content;
+	}
+
+
+	/**
+	 * event_venues
+	 *
+	 * @param    string $content
+	 * @return    string
+	 */
+	public static function event_venue($content)
+	{
+		return EED_Event_Single::event_venues($content);
+	}
+
+
+	/**
+	 * event_venues - adds venues BELOW content
+	 *
+	 * @param        string $content
+	 * @return        string
+	 */
+	public static function event_venues($content)
+	{
+		return $content . EEH_Template::locate_template('content-espresso_events-venues.php');
+	}
+
+
+	/**
+	 * loop_end
+	 *
+	 * @param        array $wp_query_array an array containing the WP_Query object
+	 * @return        void
+	 */
+	public static function loop_end($wp_query_array)
+	{
+		global $post;
+		do_action('AHEE_event_details_after_post', $post, $wp_query_array);
+	}
+
+
+	/**
+	 * wp_enqueue_scripts
+	 *
+	 * @return    void
+	 */
+	public function wp_enqueue_scripts()
+	{
+		// get some style
+		if (
+			apply_filters('FHEE_enable_default_espresso_css', TRUE)
+			&& apply_filters('FHEE__EED_Event_Single__wp_enqueue_scripts__enable_css', TRUE)
+		) {
+			// first check uploads folder
+			if (is_readable(get_stylesheet_directory() . $this->theme . DS . 'style.css')) {
+				wp_register_style(
+					$this->theme,
+					get_stylesheet_directory_uri() . $this->theme . DS . 'style.css',
+					array('dashicons', 'espresso_default')
+				);
+			} else {
+				wp_register_style(
+					$this->theme,
+					EE_TEMPLATES_URL . $this->theme . DS . 'style.css',
+					array('dashicons', 'espresso_default')
+				);
+			}
+			wp_enqueue_script($this->theme);
+			if (EE_Registry::instance()->CFG->map_settings->use_google_maps) {
+				add_action('wp_enqueue_scripts', array('EEH_Maps', 'espresso_google_map_js'), 11);
+			}
+		}
+	}
+
+
+	/**
+	 * display_venue
+	 *
+	 * @return    bool
+	 */
+	public static function display_venue()
+	{
+		/** @type EE_Event_Single_Config $config */
+		$config = EED_Event_Single::instance()->config();
+		$display_venue = $config->display_venue === null ? true : $config->display_venue;
+		$venue_name = EEH_Venue_View::venue_name();
+		return $display_venue && !empty($venue_name);
+	}
 
 
 }
@@ -483,7 +483,7 @@ 
  */
 function espresso_display_venue_in_event_details()
 {
-    return EED_Event_Single::display_venue();
+	return EED_Event_Single::display_venue();
 }
 
 

modules/venue_single/EED_Venue_Single.module.php

Indentation +2 added lines, -2 removed lines

@@ -37,8 +37,8 @@
 	 *  @return 	void
 	 */
 	public static function set_hooks() {
-        $post_type = get_post_type_object('espresso_venues');
-        EE_Config::register_route(strtolower($post_type->labels->singular_name), 'Venue_Single', 'run' );
+		$post_type = get_post_type_object('espresso_venues');
+		EE_Config::register_route(strtolower($post_type->labels->singular_name), 'Venue_Single', 'run' );
 	}
 
 	/**

Spacing +27 added lines, -27 removed lines

@@ -27,7 +27,7 @@ 
 	 * @return EED_Venue_Single
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 	/**
@@ -38,7 +38,7 @@ 
 	 */
 	public static function set_hooks() {
         $post_type = get_post_type_object('espresso_venues');
-        EE_Config::register_route(strtolower($post_type->labels->singular_name), 'Venue_Single', 'run' );
+        EE_Config::register_route(strtolower($post_type->labels->singular_name), 'Venue_Single', 'run');
 	}
 
 	/**
@@ -58,10 +58,10 @@ 
 	 * @access    public
 	 * @param \WP $WP
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
 		// check what template is loaded
-		add_filter( 'template_include',  array( $this, 'template_include' ), 999, 1 );
-		add_action('wp_enqueue_scripts', array( $this, 'wp_enqueue_scripts' ), 10 );
+		add_filter('template_include', array($this, 'template_include'), 999, 1);
+		add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 10);
 	}
 
 
@@ -73,15 +73,15 @@ 
 	 * @param  string $template
 	 * @return string
 	 */
-	public function template_include( $template ) {
+	public function template_include($template) {
 		// not a custom template?
-		if ( EE_Registry::instance()->load_core( 'Front_Controller', array(), false, true )->get_selected_template() != 'single-espresso_venues.php' ) {
+		if (EE_Registry::instance()->load_core('Front_Controller', array(), false, true)->get_selected_template() != 'single-espresso_venues.php') {
 			EEH_Template::load_espresso_theme_functions();
 			// then add extra event data via hooks
-			add_filter( 'the_title', array( $this, 'the_title' ), 100, 1 );
-			add_filter( 'the_content', array( $this, 'venue_details' ), 100 );
+			add_filter('the_title', array($this, 'the_title'), 100, 1);
+			add_filter('the_content', array($this, 'venue_details'), 100);
 			// don't display entry meta because the existing theme will take car of that
-			add_filter( 'FHEE__content_espresso_venues_details_template__display_entry_meta', '__return_false' );
+			add_filter('FHEE__content_espresso_venues_details_template__display_entry_meta', '__return_false');
 		}
 		return $template;
 	}
@@ -95,7 +95,7 @@ 
 	 * @param  string $title
 	 * @return string
 	 */
-	public function the_title( $title = '' ) {
+	public function the_title($title = '') {
 		return $title;
 	}
 
@@ -107,7 +107,7 @@ 
 	 * @param  string $content
 	 * @return string
 	 */
-	public function venue_details( $content ) {
+	public function venue_details($content) {
 		global $post;
 		if (
 			$post->post_type == 'espresso_venues'
@@ -117,16 +117,16 @@ 
 			// it uses the_content() for displaying the $post->post_content
 			// so in order to load a template that uses the_content() from within a callback being used to filter the_content(),
 			// we need to first remove this callback from being applied to the_content() (otherwise it will recurse and blow up the interweb)
-			remove_filter( 'the_content', array( $this, 'venue_details' ), 100 );
+			remove_filter('the_content', array($this, 'venue_details'), 100);
 			// add filters we want
-			add_filter( 'the_content', array( $this, 'venue_location' ), 110 );
+			add_filter('the_content', array($this, 'venue_location'), 110);
 			// now load our template
-			$template = EEH_Template::locate_template( 'content-espresso_venues-details.php' );
+			$template = EEH_Template::locate_template('content-espresso_venues-details.php');
 			// remove other filters we added so they won't get applied to the next post
-			remove_filter( 'the_content', array( $this, 'venue_location' ), 110 );
+			remove_filter('the_content', array($this, 'venue_location'), 110);
 		}
 		// we're not returning the $content directly because the template we are loading uses the_content (or the_excerpt)
-		return ! empty( $template ) ? $template : $content;
+		return ! empty($template) ? $template : $content;
 	}
 
 
@@ -138,8 +138,8 @@ 
 	 * @param  string $content
 	 * @return string
 	 */
-	public function venue_location( $content ) {
-		return $content . EEH_Template::locate_template( 'content-espresso_venues-location.php' );
+	public function venue_location($content) {
+		return $content.EEH_Template::locate_template('content-espresso_venues-location.php');
 	}
 
 
@@ -152,16 +152,16 @@ 
 	 */
 	public function wp_enqueue_scripts() {
 		// get some style
-		if ( apply_filters( 'FHEE_enable_default_espresso_css', TRUE ) && is_single() ) {
+		if (apply_filters('FHEE_enable_default_espresso_css', TRUE) && is_single()) {
 			// first check theme folder
-			if ( is_readable( get_stylesheet_directory() . $this->theme . DS . 'style.css' )) {
-				wp_register_style( $this->theme, get_stylesheet_directory_uri() . $this->theme . DS . 'style.css', array( 'dashicons', 'espresso_default' ) );
-			} else if ( is_readable( EE_TEMPLATES . $this->theme . DS . 'style.css' )) {
-				wp_register_style( $this->theme, EE_TEMPLATES_URL . $this->theme . DS . 'style.css', array( 'dashicons', 'espresso_default' ) );
+			if (is_readable(get_stylesheet_directory().$this->theme.DS.'style.css')) {
+				wp_register_style($this->theme, get_stylesheet_directory_uri().$this->theme.DS.'style.css', array('dashicons', 'espresso_default'));
+			} else if (is_readable(EE_TEMPLATES.$this->theme.DS.'style.css')) {
+				wp_register_style($this->theme, EE_TEMPLATES_URL.$this->theme.DS.'style.css', array('dashicons', 'espresso_default'));
 			}
-			wp_enqueue_style( $this->theme );
-			if ( EE_Registry::instance()->CFG->map_settings->use_google_maps ) {
-				add_action('wp_enqueue_scripts', array( 'EEH_Maps', 'espresso_google_map_js' ), 11 );
+			wp_enqueue_style($this->theme);
+			if (EE_Registry::instance()->CFG->map_settings->use_google_maps) {
+				add_action('wp_enqueue_scripts', array('EEH_Maps', 'espresso_google_map_js'), 11);
 			}
 		}
 	}

modules/events_archive/EED_Events_Archive.module.php

Indentation +174 added lines, -174 removed lines

@@ -14,13 +14,13 @@ 
  */
 class EED_Events_Archive  extends EED_Module {
 
-    const EVENT_DETAILS_PRIORITY = 100;
-    const EVENT_DATETIMES_PRIORITY = 110;
-    const EVENT_TICKETS_PRIORITY = 120;
-    const EVENT_VENUES_PRIORITY = 130;
+	const EVENT_DETAILS_PRIORITY = 100;
+	const EVENT_DATETIMES_PRIORITY = 110;
+	const EVENT_TICKETS_PRIORITY = 120;
+	const EVENT_VENUES_PRIORITY = 130;
 
 
-    public static $espresso_event_list_ID = 0;
+	public static $espresso_event_list_ID = 0;
 	public static $espresso_grid_event_lists = array();
 
 	/**
@@ -28,19 +28,19 @@ 
 	 */
 	protected static $using_get_the_excerpt = false;
 
-    /**
-     * Used to flag when the event list is being called from an external iframe.
-     *
-     * @var bool $iframe
-     */
-    protected static $iframe = false;
+	/**
+	 * Used to flag when the event list is being called from an external iframe.
+	 *
+	 * @var bool $iframe
+	 */
+	protected static $iframe = false;
 
-    /**
+	/**
 	 * @var \EventEspresso\core\libraries\iframe_display\EventListIframeEmbedButton $_iframe_embed_button
 	 */
 	private static $_iframe_embed_button;
 
-    /**
+	/**
 	 * @type EE_Template_Part_Manager $template_parts
 	 */
 	protected $template_parts;
@@ -63,8 +63,8 @@ 
 	 *  @return 	void
 	 */
 	public static function set_hooks() {
-        $post_type = get_post_type_object('espresso_events');
-        EE_Config::register_route(strtolower($post_type->labels->name), 'Events_Archive', 'run' );
+		$post_type = get_post_type_object('espresso_events');
+		EE_Config::register_route(strtolower($post_type->labels->name), 'Events_Archive', 'run' );
 		EE_Config::register_route( 'event_list', 'Events_Archive', 'event_list' );
 		EE_Config::register_route( 'iframe', 'Events_Archive', 'event_list_iframe', 'event_list' );
 		add_action( 'wp_loaded', array( 'EED_Events_Archive', 'set_definitions' ), 2 );
@@ -211,9 +211,9 @@ 
 
 
 	/**
-     * most likely called by the ESPRESSO_EVENTS shortcode which uses this module to do some of it's lifting
-     *
-     * @return    void
+	 * most likely called by the ESPRESSO_EVENTS shortcode which uses this module to do some of it's lifting
+	 *
+	 * @return    void
 	 */
 	public function event_list() {
 		// ensure valid EE_Events_Archive_Config() object exists
@@ -224,36 +224,36 @@ 
 
 
 
-    /**
-     * @access    public
-     * @return    void
-     * @throws \EE_Error
-     * @throws \DomainException
-     */
+	/**
+	 * @access    public
+	 * @return    void
+	 * @throws \EE_Error
+	 * @throws \DomainException
+	 */
 	public function event_list_iframe() {
-        \EED_Events_Archive::$iframe = true;
+		\EED_Events_Archive::$iframe = true;
 		$event_list_iframe = new EventsArchiveIframe( $this );
 		$event_list_iframe->display();
 	}
 
 
 
-    /**
-     * @access public
-     * @return string
-     */
+	/**
+	 * @access public
+	 * @return string
+	 */
 	public static function is_iframe() {
-        return \EED_Events_Archive::$iframe;
+		return \EED_Events_Archive::$iframe;
 	}
 
 
 
-    /**
-     * @access public
-     * @return string
-     */
+	/**
+	 * @access public
+	 * @return string
+	 */
 	public static function link_target() {
-        return \EED_Events_Archive::$iframe ? ' target="_blank"' : '';
+		return \EED_Events_Archive::$iframe ? ' target="_blank"' : '';
 	}
 
 
@@ -281,10 +281,10 @@ 
 			}
 			// if NOT a custom template
 			if (
-                apply_filters('FHEE__EED_Event_Archive__template_include__allow_custom_selected_template', false)
+				apply_filters('FHEE__EED_Event_Archive__template_include__allow_custom_selected_template', false)
 				|| EE_Registry::instance()
-                    ->load_core( 'Front_Controller' )
-                    ->get_selected_template() !== 'archive-espresso_events.php'
+					->load_core( 'Front_Controller' )
+					->get_selected_template() !== 'archive-espresso_events.php'
 			) {
 				// don't display entry meta because the existing theme will take care of that
 				add_filter( 'FHEE__EED_Events_Archive__template_include__events_list_active', '__return_true' );
@@ -292,16 +292,16 @@ 
 				EEH_Template::load_espresso_theme_functions();
 				// because we don't know if the theme is using the_excerpt()
 				add_filter(
-				    'the_excerpt',
-                    array( 'EED_Events_Archive', 'event_details' ),
-                    EED_Events_Archive::EVENT_DETAILS_PRIORITY
-                );
+					'the_excerpt',
+					array( 'EED_Events_Archive', 'event_details' ),
+					EED_Events_Archive::EVENT_DETAILS_PRIORITY
+				);
 				// or the_content
 				add_filter(
-				    'the_content',
-                    array( 'EED_Events_Archive', 'event_details' ),
-                    EED_Events_Archive::EVENT_DETAILS_PRIORITY
-                );
+					'the_content',
+					array( 'EED_Events_Archive', 'event_details' ),
+					EED_Events_Archive::EVENT_DETAILS_PRIORITY
+				);
 				// and just in case they are running get_the_excerpt() which DESTROYS things
 				add_filter( 'get_the_excerpt', array( 'EED_Events_Archive', 'get_the_excerpt' ), 1, 1 );
 				// don't display entry meta because the existing theme will take care of that
@@ -326,15 +326,15 @@ 
 		}
 		if ( apply_filters( 'FHEE__EED_Events_Archive__get_the_excerpt__theme_uses_get_the_excerpt', false ) ) {
 			remove_filter(
-			    'the_excerpt',
-                array( 'EED_Events_Archive', 'event_details' ),
-                EED_Events_Archive::EVENT_DETAILS_PRIORITY
-            );
+				'the_excerpt',
+				array( 'EED_Events_Archive', 'event_details' ),
+				EED_Events_Archive::EVENT_DETAILS_PRIORITY
+			);
 			remove_filter(
-			    'the_content',
-                array( 'EED_Events_Archive', 'event_details' ),
-                EED_Events_Archive::EVENT_DETAILS_PRIORITY
-            );
+				'the_content',
+				array( 'EED_Events_Archive', 'event_details' ),
+				EED_Events_Archive::EVENT_DETAILS_PRIORITY
+			);
 			$excerpt = EED_Events_Archive::event_details( $excerpt );
 		} else {
 			EED_Events_Archive::$using_get_the_excerpt = true;
@@ -425,17 +425,17 @@ 
 		// no further password checks required atm
 		add_filter( 'FHEE__EED_Events_Archive__event_details__no_post_password_required', '__return_true' );
 		// we need to first remove this callback from being applied to the_content() or the_excerpt()
-        // (otherwise it will recurse and blow up the interweb)
+		// (otherwise it will recurse and blow up the interweb)
 		remove_filter(
-		    'the_excerpt',
-            array( 'EED_Events_Archive', 'event_details' ),
-            EED_Events_Archive::EVENT_DETAILS_PRIORITY
-        );
+			'the_excerpt',
+			array( 'EED_Events_Archive', 'event_details' ),
+			EED_Events_Archive::EVENT_DETAILS_PRIORITY
+		);
 		remove_filter(
-		    'the_content',
-            array( 'EED_Events_Archive', 'event_details' ),
-            EED_Events_Archive::EVENT_DETAILS_PRIORITY
-        );
+			'the_content',
+			array( 'EED_Events_Archive', 'event_details' ),
+			EED_Events_Archive::EVENT_DETAILS_PRIORITY
+		);
 		remove_filter( 'get_the_excerpt', array( 'EED_Events_Archive', 'get_the_excerpt' ), 1 );
 		// now add additional content depending on whether event is using the_excerpt() or the_content()
 		EED_Events_Archive::instance()->template_parts = EED_Events_Archive::instance()->initialize_template_parts();
@@ -443,20 +443,20 @@ 
 		$content = EED_Events_Archive::instance()->template_parts->apply_template_part_filters( $content );
 		// re-add our main filters (or else the next event won't have them)
 		add_filter(
-		    'the_excerpt',
-            array( 'EED_Events_Archive', 'event_details' ),
-            EED_Events_Archive::EVENT_DETAILS_PRIORITY
-        );
+			'the_excerpt',
+			array( 'EED_Events_Archive', 'event_details' ),
+			EED_Events_Archive::EVENT_DETAILS_PRIORITY
+		);
 		add_filter(
-		    'the_content',
-            array( 'EED_Events_Archive', 'event_details' ),
-            EED_Events_Archive::EVENT_DETAILS_PRIORITY
-        );
+			'the_content',
+			array( 'EED_Events_Archive', 'event_details' ),
+			EED_Events_Archive::EVENT_DETAILS_PRIORITY
+		);
 		add_filter( 'get_the_excerpt', array( 'EED_Events_Archive', 'get_the_excerpt' ), 1, 1 );
 		remove_filter(
-		    'FHEE__EED_Events_Archive__event_details__no_post_password_required',
-            '__return_true'
-        );
+			'FHEE__EED_Events_Archive__event_details__no_post_password_required',
+			'__return_true'
+		);
 		return $content;
 	}
 
@@ -472,15 +472,15 @@ 
 		// we need to first remove this callback from being applied to the_content()
 		// (otherwise it will recurse and blow up the interweb)
 		remove_filter(
-		    'the_excerpt',
-            array( 'EED_Events_Archive', 'event_details' ),
-            EED_Events_Archive::EVENT_DETAILS_PRIORITY
-        );
+			'the_excerpt',
+			array( 'EED_Events_Archive', 'event_details' ),
+			EED_Events_Archive::EVENT_DETAILS_PRIORITY
+		);
 		remove_filter(
-		    'the_content',
-            array( 'EED_Events_Archive', 'event_details' ),
-            EED_Events_Archive::EVENT_DETAILS_PRIORITY
-        );
+			'the_content',
+			array( 'EED_Events_Archive', 'event_details' ),
+			EED_Events_Archive::EVENT_DETAILS_PRIORITY
+		);
 		remove_filter( 'get_the_excerpt', array( 'EED_Events_Archive', 'get_the_excerpt' ), 1 );
 		//now add additional content depending on whether event is using the_excerpt() or the_content()
 		EED_Events_Archive::_add_additional_excerpt_filters();
@@ -490,15 +490,15 @@ 
 		$content = EEH_Template::locate_template( 'content-espresso_events-details.php' );
 		// re-add our main filters (or else the next event won't have them)
 		add_filter(
-		    'the_excerpt',
-            array( 'EED_Events_Archive', 'event_details' ),
-            EED_Events_Archive::EVENT_DETAILS_PRIORITY
-        );
+			'the_excerpt',
+			array( 'EED_Events_Archive', 'event_details' ),
+			EED_Events_Archive::EVENT_DETAILS_PRIORITY
+		);
 		add_filter(
-		    'the_content',
-            array( 'EED_Events_Archive', 'event_details' ),
-            EED_Events_Archive::EVENT_DETAILS_PRIORITY
-        );
+			'the_content',
+			array( 'EED_Events_Archive', 'event_details' ),
+			EED_Events_Archive::EVENT_DETAILS_PRIORITY
+		);
 		add_filter( 'get_the_excerpt', array( 'EED_Events_Archive', 'get_the_excerpt' ), 1, 1 );
 		// but remove the other filters so that they don't get applied to the next post
 		EED_Events_Archive::_remove_additional_events_archive_filters();
@@ -575,20 +575,20 @@ 
 	 */
 	private static function _add_additional_excerpt_filters() {
 		add_filter(
-		    'the_excerpt',
-            array( 'EED_Events_Archive', 'event_datetimes' ),
-            EED_Events_Archive::EVENT_DATETIMES_PRIORITY
-        );
+			'the_excerpt',
+			array( 'EED_Events_Archive', 'event_datetimes' ),
+			EED_Events_Archive::EVENT_DATETIMES_PRIORITY
+		);
 		add_filter(
-		    'the_excerpt',
-            array( 'EED_Events_Archive', 'event_tickets' ),
-            EED_Events_Archive::EVENT_TICKETS_PRIORITY
-        );
+			'the_excerpt',
+			array( 'EED_Events_Archive', 'event_tickets' ),
+			EED_Events_Archive::EVENT_TICKETS_PRIORITY
+		);
 		add_filter(
-		    'the_excerpt',
-            array( 'EED_Events_Archive', 'event_venues' ),
-            EED_Events_Archive::EVENT_VENUES_PRIORITY
-        );
+			'the_excerpt',
+			array( 'EED_Events_Archive', 'event_venues' ),
+			EED_Events_Archive::EVENT_VENUES_PRIORITY
+		);
 	}
 
 
@@ -601,20 +601,20 @@ 
 	 */
 	private static function _add_additional_content_filters() {
 		add_filter(
-		    'the_content',
-            array( 'EED_Events_Archive', 'event_datetimes' ),
-            EED_Events_Archive::EVENT_DATETIMES_PRIORITY
-        );
+			'the_content',
+			array( 'EED_Events_Archive', 'event_datetimes' ),
+			EED_Events_Archive::EVENT_DATETIMES_PRIORITY
+		);
 		add_filter(
-		    'the_content',
-            array( 'EED_Events_Archive', 'event_tickets' ),
-            EED_Events_Archive::EVENT_TICKETS_PRIORITY
-        );
+			'the_content',
+			array( 'EED_Events_Archive', 'event_tickets' ),
+			EED_Events_Archive::EVENT_TICKETS_PRIORITY
+		);
 		add_filter(
-		    'the_content',
-            array( 'EED_Events_Archive', 'event_venues' ),
-            EED_Events_Archive::EVENT_VENUES_PRIORITY
-        );
+			'the_content',
+			array( 'EED_Events_Archive', 'event_venues' ),
+			EED_Events_Archive::EVENT_VENUES_PRIORITY
+		);
 	}
 
 
@@ -627,35 +627,35 @@ 
 	 */
 	private static function _remove_additional_events_archive_filters() {
 		remove_filter(
-		    'the_excerpt',
-            array( 'EED_Events_Archive', 'event_datetimes' ),
-            EED_Events_Archive::EVENT_DATETIMES_PRIORITY
-        );
+			'the_excerpt',
+			array( 'EED_Events_Archive', 'event_datetimes' ),
+			EED_Events_Archive::EVENT_DATETIMES_PRIORITY
+		);
 		remove_filter(
-		    'the_excerpt',
-            array( 'EED_Events_Archive', 'event_tickets' ),
-            EED_Events_Archive::EVENT_TICKETS_PRIORITY
-        );
+			'the_excerpt',
+			array( 'EED_Events_Archive', 'event_tickets' ),
+			EED_Events_Archive::EVENT_TICKETS_PRIORITY
+		);
 		remove_filter(
-		    'the_excerpt',
-            array( 'EED_Events_Archive', 'event_venues' ),
-            EED_Events_Archive::EVENT_VENUES_PRIORITY
-        );
+			'the_excerpt',
+			array( 'EED_Events_Archive', 'event_venues' ),
+			EED_Events_Archive::EVENT_VENUES_PRIORITY
+		);
 		remove_filter(
-		    'the_content',
-            array( 'EED_Events_Archive', 'event_datetimes' ),
-            EED_Events_Archive::EVENT_DATETIMES_PRIORITY
-        );
+			'the_content',
+			array( 'EED_Events_Archive', 'event_datetimes' ),
+			EED_Events_Archive::EVENT_DATETIMES_PRIORITY
+		);
 		remove_filter(
-		    'the_content',
-            array( 'EED_Events_Archive', 'event_tickets' ),
-            EED_Events_Archive::EVENT_TICKETS_PRIORITY
-        );
+			'the_content',
+			array( 'EED_Events_Archive', 'event_tickets' ),
+			EED_Events_Archive::EVENT_TICKETS_PRIORITY
+		);
 		remove_filter(
-		    'the_content',
-            array( 'EED_Events_Archive', 'event_venues' ),
-            EED_Events_Archive::EVENT_VENUES_PRIORITY
-        );
+			'the_content',
+			array( 'EED_Events_Archive', 'event_venues' ),
+			EED_Events_Archive::EVENT_VENUES_PRIORITY
+		);
 	}
 
 
@@ -670,50 +670,50 @@ 
 		//remove_filter( 'get_the_excerpt', array( 'EED_Events_Archive', 'get_the_excerpt' ), 1 );
 		remove_filter( 'the_title', array( 'EED_Events_Archive', 'the_title' ), 1 );
 		remove_filter(
-		    'the_excerpt',
-            array( 'EED_Events_Archive', 'event_details' ),
-            EED_Events_Archive::EVENT_DETAILS_PRIORITY
-        );
+			'the_excerpt',
+			array( 'EED_Events_Archive', 'event_details' ),
+			EED_Events_Archive::EVENT_DETAILS_PRIORITY
+		);
 		remove_filter(
-		    'the_excerpt',
-            array( 'EED_Events_Archive', 'event_datetimes' ),
-            EED_Events_Archive::EVENT_DATETIMES_PRIORITY
-        );
+			'the_excerpt',
+			array( 'EED_Events_Archive', 'event_datetimes' ),
+			EED_Events_Archive::EVENT_DATETIMES_PRIORITY
+		);
 		remove_filter(
-		    'the_excerpt',
-            array( 'EED_Events_Archive', 'event_tickets' ),
-            EED_Events_Archive::EVENT_TICKETS_PRIORITY
-        );
+			'the_excerpt',
+			array( 'EED_Events_Archive', 'event_tickets' ),
+			EED_Events_Archive::EVENT_TICKETS_PRIORITY
+		);
 		remove_filter(
-		    'the_excerpt',
-            array( 'EED_Events_Archive', 'event_venues' ),
-            EED_Events_Archive::EVENT_VENUES_PRIORITY
-        );
+			'the_excerpt',
+			array( 'EED_Events_Archive', 'event_venues' ),
+			EED_Events_Archive::EVENT_VENUES_PRIORITY
+		);
 		remove_filter(
-		    'the_content',
-            array( 'EED_Events_Archive', 'event_details' ),
-            EED_Events_Archive::EVENT_DETAILS_PRIORITY
-        );
+			'the_content',
+			array( 'EED_Events_Archive', 'event_details' ),
+			EED_Events_Archive::EVENT_DETAILS_PRIORITY
+		);
 		remove_filter(
-		    'the_content',
-            array( 'EED_Events_Archive', 'event_datetimes' ),
-            EED_Events_Archive::EVENT_DATETIMES_PRIORITY
-        );
+			'the_content',
+			array( 'EED_Events_Archive', 'event_datetimes' ),
+			EED_Events_Archive::EVENT_DATETIMES_PRIORITY
+		);
 		remove_filter(
-		    'the_content',
-            array( 'EED_Events_Archive', 'event_tickets' ),
-            EED_Events_Archive::EVENT_TICKETS_PRIORITY
-        );
+			'the_content',
+			array( 'EED_Events_Archive', 'event_tickets' ),
+			EED_Events_Archive::EVENT_TICKETS_PRIORITY
+		);
 		remove_filter(
-		    'the_content',
-            array( 'EED_Events_Archive', 'event_venues' ),
-            EED_Events_Archive::EVENT_VENUES_PRIORITY
-        );
+			'the_content',
+			array( 'EED_Events_Archive', 'event_venues' ),
+			EED_Events_Archive::EVENT_VENUES_PRIORITY
+		);
 		// don't display entry meta because the existing theme will take care of that
 		remove_filter(
-		    'FHEE__content_espresso_events_details_template__display_entry_meta',
-            '__return_false'
-        );
+			'FHEE__content_espresso_events_details_template__display_entry_meta',
+			'__return_false'
+		);
 	}
 
 
@@ -728,7 +728,7 @@ 
 	 *  @return 	void
 	 */
 	public function load_event_list_assets() {
-        do_action( 'AHEE__EED_Events_Archive__before_load_assets' );
+		do_action( 'AHEE__EED_Events_Archive__before_load_assets' );
 		add_filter( 'FHEE_load_EE_Session', '__return_true' );
 		add_filter( 'FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', '__return_true' );
 		add_action('wp_enqueue_scripts', array( $this, 'wp_enqueue_scripts' ), 10 );

Spacing +175 added lines, -175 removed lines

@@ -3,7 +3,7 @@ 
 use EventEspresso\core\libraries\iframe_display\EventListIframeEmbedButton;
 use EventEspresso\modules\events_archive\EventsArchiveIframe;
 
-defined( 'EVENT_ESPRESSO_VERSION') || exit('No direct script access allowed');
+defined('EVENT_ESPRESSO_VERSION') || exit('No direct script access allowed');
 
 /**
  * Event List
@@ -51,7 +51,7 @@ 
 	 * @return EED_Events_Archive
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -64,10 +64,10 @@ 
 	 */
 	public static function set_hooks() {
         $post_type = get_post_type_object('espresso_events');
-        EE_Config::register_route(strtolower($post_type->labels->name), 'Events_Archive', 'run' );
-		EE_Config::register_route( 'event_list', 'Events_Archive', 'event_list' );
-		EE_Config::register_route( 'iframe', 'Events_Archive', 'event_list_iframe', 'event_list' );
-		add_action( 'wp_loaded', array( 'EED_Events_Archive', 'set_definitions' ), 2 );
+        EE_Config::register_route(strtolower($post_type->labels->name), 'Events_Archive', 'run');
+		EE_Config::register_route('event_list', 'Events_Archive', 'event_list');
+		EE_Config::register_route('iframe', 'Events_Archive', 'event_list_iframe', 'event_list');
+		add_action('wp_loaded', array('EED_Events_Archive', 'set_definitions'), 2);
 	}
 
 	/**
@@ -77,12 +77,12 @@ 
 	 *  @return 	void
 	 */
 	public static function set_hooks_admin() {
-		add_action( 'wp_loaded', array( 'EED_Events_Archive', 'set_definitions' ), 2 );
+		add_action('wp_loaded', array('EED_Events_Archive', 'set_definitions'), 2);
 		// hook into the end of the \EE_Admin_Page::_load_page_dependencies()
 		// to load assets for "espresso_events" page on the "default" route (action)
 		add_action(
 			'FHEE__EE_Admin_Page___load_page_dependencies__after_load__espresso_events__default',
-			array( 'EED_Events_Archive', 'event_list_iframe_embed_button' ),
+			array('EED_Events_Archive', 'event_list_iframe_embed_button'),
 			10
 		);
 	}
@@ -97,8 +97,8 @@ 
 	 *  @return 	void
 	 */
 	public static function set_definitions() {
-		define( 'EVENTS_ARCHIVE_ASSETS_URL', plugin_dir_url( __FILE__ ) . 'assets' . DS );
-		define( 'EVENTS_ARCHIVE_TEMPLATES_PATH', str_replace( '\\', DS, plugin_dir_path( __FILE__ )) . 'templates' . DS );
+		define('EVENTS_ARCHIVE_ASSETS_URL', plugin_dir_url(__FILE__).'assets'.DS);
+		define('EVENTS_ARCHIVE_TEMPLATES_PATH', str_replace('\\', DS, plugin_dir_path(__FILE__)).'templates'.DS);
 	}
 
 
@@ -106,10 +106,10 @@ 
 	/**
 	 * set up EE_Events_Archive_Config
 	 */
-	protected function set_config(){
-		$this->set_config_section( 'template_settings' );
-		$this->set_config_class( 'EE_Events_Archive_Config' );
-		$this->set_config_name( 'EED_Events_Archive' );
+	protected function set_config() {
+		$this->set_config_section('template_settings');
+		$this->set_config_class('EE_Events_Archive_Config');
+		$this->set_config_name('EED_Events_Archive');
 	}
 
 
@@ -118,7 +118,7 @@ 
 	 * @return EventListIframeEmbedButton
 	 */
 	public static function get_iframe_embed_button() {
-		if ( ! self::$_iframe_embed_button instanceof EventListIframeEmbedButton ) {
+		if ( ! self::$_iframe_embed_button instanceof EventListIframeEmbedButton) {
 			self::$_iframe_embed_button = new EventListIframeEmbedButton();
 		}
 		return self::$_iframe_embed_button;
@@ -144,35 +144,35 @@ 
 	 * @param \EE_Events_Archive_Config $config
 	 * @return \EE_Template_Part_Manager
 	 */
-	public function initialize_template_parts( EE_Events_Archive_Config $config = null ) {
+	public function initialize_template_parts(EE_Events_Archive_Config $config = null) {
 		$config = $config instanceof EE_Events_Archive_Config ? $config : $this->config();
 		EEH_Autoloader::instance()->register_template_part_autoloaders();
 		$template_parts = new EE_Template_Part_Manager();
 		$template_parts->add_template_part(
 			'tickets',
-			__( 'Ticket Selector', 'event_espresso' ),
+			__('Ticket Selector', 'event_espresso'),
 			'content-espresso_events-tickets.php',
 			$config->display_order_tickets
 		);
 		$template_parts->add_template_part(
 			'datetimes',
-			__( 'Dates and Times', 'event_espresso' ),
+			__('Dates and Times', 'event_espresso'),
 			'content-espresso_events-datetimes.php',
 			$config->display_order_datetimes
 		);
 		$template_parts->add_template_part(
 			'event',
-			__( 'Event Description', 'event_espresso' ),
+			__('Event Description', 'event_espresso'),
 			'content-espresso_events-details.php',
 			$config->display_order_event
 		);
 		$template_parts->add_template_part(
 			'venue',
-			__( 'Venue Information', 'event_espresso' ),
+			__('Venue Information', 'event_espresso'),
 			'content-espresso_events-venues.php',
 			$config->display_order_venue
 		);
-		do_action( 'AHEE__EED_Event_Archive__initialize_template_parts', $template_parts );
+		do_action('AHEE__EED_Event_Archive__initialize_template_parts', $template_parts);
 		return $template_parts;
 	}
 
@@ -185,8 +185,8 @@ 
 	 * @param WP $WP
 	 * @return    void
 	 */
-	public function run( $WP ) {
-		do_action( 'AHEE__EED_Events_Archive__before_run' );
+	public function run($WP) {
+		do_action('AHEE__EED_Events_Archive__before_run');
 		// ensure valid EE_Events_Archive_Config() object exists
 		$this->set_config();
 		/** @type EE_Events_Archive_Config $config */
@@ -198,14 +198,14 @@ 
 		EEH_Event_Query::add_query_filters();
 		// set params that will get used by the filters
 		EEH_Event_Query::set_query_params(
-			'', 	// month
-			'', 	// category
-			$config->display_expired_events, 	// show_expired
-			'start_date', 	// orderby
+			'', // month
+			'', // category
+			$config->display_expired_events, // show_expired
+			'start_date', // orderby
 			'ASC' 	// sort
 		);
 		// check what template is loaded
-		add_filter( 'template_include',  array( $this, 'template_include' ), 999, 1 );
+		add_filter('template_include', array($this, 'template_include'), 999, 1);
 	}
 
 
@@ -232,7 +232,7 @@ 
      */
 	public function event_list_iframe() {
         \EED_Events_Archive::$iframe = true;
-		$event_list_iframe = new EventsArchiveIframe( $this );
+		$event_list_iframe = new EventsArchiveIframe($this);
 		$event_list_iframe->display();
 	}
 
@@ -270,42 +270,42 @@ 
 	 * @param string $template
 	 * @return    string
 	 */
-	public function template_include( $template = '' ) {
+	public function template_include($template = '') {
 		// don't add content filter for dedicated EE child themes or private posts
-		if ( ! EEH_Template::is_espresso_theme() ) {
+		if ( ! EEH_Template::is_espresso_theme()) {
 			/** @type EE_Events_Archive_Config $config */
 			$config = $this->config();
 			// add status banner ?
-			if ( $config->display_status_banner ) {
-				add_filter( 'the_title', array( 'EED_Events_Archive', 'the_title' ), 100, 2 );
+			if ($config->display_status_banner) {
+				add_filter('the_title', array('EED_Events_Archive', 'the_title'), 100, 2);
 			}
 			// if NOT a custom template
 			if (
                 apply_filters('FHEE__EED_Event_Archive__template_include__allow_custom_selected_template', false)
 				|| EE_Registry::instance()
-                    ->load_core( 'Front_Controller' )
+                    ->load_core('Front_Controller')
                     ->get_selected_template() !== 'archive-espresso_events.php'
 			) {
 				// don't display entry meta because the existing theme will take care of that
-				add_filter( 'FHEE__EED_Events_Archive__template_include__events_list_active', '__return_true' );
+				add_filter('FHEE__EED_Events_Archive__template_include__events_list_active', '__return_true');
 			// load functions.php file for the theme (loaded by WP if using child theme)
 				EEH_Template::load_espresso_theme_functions();
 				// because we don't know if the theme is using the_excerpt()
 				add_filter(
 				    'the_excerpt',
-                    array( 'EED_Events_Archive', 'event_details' ),
+                    array('EED_Events_Archive', 'event_details'),
                     EED_Events_Archive::EVENT_DETAILS_PRIORITY
                 );
 				// or the_content
 				add_filter(
 				    'the_content',
-                    array( 'EED_Events_Archive', 'event_details' ),
+                    array('EED_Events_Archive', 'event_details'),
                     EED_Events_Archive::EVENT_DETAILS_PRIORITY
                 );
 				// and just in case they are running get_the_excerpt() which DESTROYS things
-				add_filter( 'get_the_excerpt', array( 'EED_Events_Archive', 'get_the_excerpt' ), 1, 1 );
+				add_filter('get_the_excerpt', array('EED_Events_Archive', 'get_the_excerpt'), 1, 1);
 				// don't display entry meta because the existing theme will take care of that
-				add_filter( 'FHEE__content_espresso_events_details_template__display_entry_meta', '__return_false' );
+				add_filter('FHEE__content_espresso_events_details_template__display_entry_meta', '__return_false');
 			}
 		}
 		return $template;
@@ -320,25 +320,25 @@ 
 	 * 	@param		string 	$excerpt
 	 * 	@return 		string
 	 */
-	public static function get_the_excerpt( $excerpt = '' ) {
-		if ( post_password_required() ) {
+	public static function get_the_excerpt($excerpt = '') {
+		if (post_password_required()) {
 			return $excerpt;
 		}
-		if ( apply_filters( 'FHEE__EED_Events_Archive__get_the_excerpt__theme_uses_get_the_excerpt', false ) ) {
+		if (apply_filters('FHEE__EED_Events_Archive__get_the_excerpt__theme_uses_get_the_excerpt', false)) {
 			remove_filter(
 			    'the_excerpt',
-                array( 'EED_Events_Archive', 'event_details' ),
+                array('EED_Events_Archive', 'event_details'),
                 EED_Events_Archive::EVENT_DETAILS_PRIORITY
             );
 			remove_filter(
 			    'the_content',
-                array( 'EED_Events_Archive', 'event_details' ),
+                array('EED_Events_Archive', 'event_details'),
                 EED_Events_Archive::EVENT_DETAILS_PRIORITY
             );
-			$excerpt = EED_Events_Archive::event_details( $excerpt );
+			$excerpt = EED_Events_Archive::event_details($excerpt);
 		} else {
 			EED_Events_Archive::$using_get_the_excerpt = true;
-			add_filter( 'wp_trim_excerpt', array( 'EED_Events_Archive', 'end_get_the_excerpt' ), 999, 1 );
+			add_filter('wp_trim_excerpt', array('EED_Events_Archive', 'end_get_the_excerpt'), 999, 1);
 		}
 		return $excerpt;
 	}
@@ -352,7 +352,7 @@ 
 	 * @param  string $text
 	 * @return string
 	 */
-	public static function end_get_the_excerpt( $text = '' ) {
+	public static function end_get_the_excerpt($text = '') {
 		EED_Events_Archive::$using_get_the_excerpt = false;
 		return $text;
 	}
@@ -367,10 +367,10 @@ 
 	 * @param 		string 		$id
 	 * @return 		string
 	 */
-	public static function the_title( $title = '', $id = '' ) {
+	public static function the_title($title = '', $id = '') {
 	global $post;
-	if ( $post instanceof WP_Post ) {
-		return in_the_loop() && $post->ID == $id ? espresso_event_status_banner( $post->ID  ) . $title :  $title;
+	if ($post instanceof WP_Post) {
+		return in_the_loop() && $post->ID == $id ? espresso_event_status_banner($post->ID).$title : $title;
 	}
 	return $title;
 }
@@ -384,7 +384,7 @@ 
 	 * 	@param		string 	$content
 	 * 	@return 		string
 	 */
-	public static function event_details( $content ) {
+	public static function event_details($content) {
 		global $post;
 		static $current_post_ID = 0;
 		if (
@@ -393,8 +393,8 @@ 
 			&& ! EED_Events_Archive::$using_get_the_excerpt
 			&& ! post_password_required()
 			&& (
-				apply_filters( 'FHEE__EES_Espresso_Events__process_shortcode__true', false )
-				|| ! apply_filters( 'FHEE__content_espresso_events__template_loaded', false )
+				apply_filters('FHEE__EES_Espresso_Events__process_shortcode__true', false)
+				|| ! apply_filters('FHEE__content_espresso_events__template_loaded', false)
 			)
 		) {
 			// Set current post ID to prevent showing content twice, but only if headers have definitely been sent.
@@ -403,8 +403,8 @@ 
 			// We want to allow those plugins to still do their thing and have access to our content, but depending on
 			// how your event content is being displayed (shortcode, CPT route, etc), this filter can get applied twice,
 			// so the following allows this filter to be applied multiple times, but only once for real
-			$current_post_ID = did_action( 'loop_start' ) ? $post->ID : 0;
-			if ( EE_Registry::instance()->CFG->template_settings->EED_Events_Archive->use_sortable_display_order ) {
+			$current_post_ID = did_action('loop_start') ? $post->ID : 0;
+			if (EE_Registry::instance()->CFG->template_settings->EED_Events_Archive->use_sortable_display_order) {
 				$content = \EED_Events_Archive::use_sortable_display_order();
 			} else {
 				$content = \EED_Events_Archive::use_filterable_display_order();
@@ -423,36 +423,36 @@ 
 	 */
 	protected static function use_sortable_display_order() {
 		// no further password checks required atm
-		add_filter( 'FHEE__EED_Events_Archive__event_details__no_post_password_required', '__return_true' );
+		add_filter('FHEE__EED_Events_Archive__event_details__no_post_password_required', '__return_true');
 		// we need to first remove this callback from being applied to the_content() or the_excerpt()
         // (otherwise it will recurse and blow up the interweb)
 		remove_filter(
 		    'the_excerpt',
-            array( 'EED_Events_Archive', 'event_details' ),
+            array('EED_Events_Archive', 'event_details'),
             EED_Events_Archive::EVENT_DETAILS_PRIORITY
         );
 		remove_filter(
 		    'the_content',
-            array( 'EED_Events_Archive', 'event_details' ),
+            array('EED_Events_Archive', 'event_details'),
             EED_Events_Archive::EVENT_DETAILS_PRIORITY
         );
-		remove_filter( 'get_the_excerpt', array( 'EED_Events_Archive', 'get_the_excerpt' ), 1 );
+		remove_filter('get_the_excerpt', array('EED_Events_Archive', 'get_the_excerpt'), 1);
 		// now add additional content depending on whether event is using the_excerpt() or the_content()
 		EED_Events_Archive::instance()->template_parts = EED_Events_Archive::instance()->initialize_template_parts();
-		$content = EEH_Template::locate_template( 'content-espresso_events-details.php' );
-		$content = EED_Events_Archive::instance()->template_parts->apply_template_part_filters( $content );
+		$content = EEH_Template::locate_template('content-espresso_events-details.php');
+		$content = EED_Events_Archive::instance()->template_parts->apply_template_part_filters($content);
 		// re-add our main filters (or else the next event won't have them)
 		add_filter(
 		    'the_excerpt',
-            array( 'EED_Events_Archive', 'event_details' ),
+            array('EED_Events_Archive', 'event_details'),
             EED_Events_Archive::EVENT_DETAILS_PRIORITY
         );
 		add_filter(
 		    'the_content',
-            array( 'EED_Events_Archive', 'event_details' ),
+            array('EED_Events_Archive', 'event_details'),
             EED_Events_Archive::EVENT_DETAILS_PRIORITY
         );
-		add_filter( 'get_the_excerpt', array( 'EED_Events_Archive', 'get_the_excerpt' ), 1, 1 );
+		add_filter('get_the_excerpt', array('EED_Events_Archive', 'get_the_excerpt'), 1, 1);
 		remove_filter(
 		    'FHEE__EED_Events_Archive__event_details__no_post_password_required',
             '__return_true'
@@ -473,36 +473,36 @@ 
 		// (otherwise it will recurse and blow up the interweb)
 		remove_filter(
 		    'the_excerpt',
-            array( 'EED_Events_Archive', 'event_details' ),
+            array('EED_Events_Archive', 'event_details'),
             EED_Events_Archive::EVENT_DETAILS_PRIORITY
         );
 		remove_filter(
 		    'the_content',
-            array( 'EED_Events_Archive', 'event_details' ),
+            array('EED_Events_Archive', 'event_details'),
             EED_Events_Archive::EVENT_DETAILS_PRIORITY
         );
-		remove_filter( 'get_the_excerpt', array( 'EED_Events_Archive', 'get_the_excerpt' ), 1 );
+		remove_filter('get_the_excerpt', array('EED_Events_Archive', 'get_the_excerpt'), 1);
 		//now add additional content depending on whether event is using the_excerpt() or the_content()
 		EED_Events_Archive::_add_additional_excerpt_filters();
 		EED_Events_Archive::_add_additional_content_filters();
-		do_action( 'AHEE__EED_Events_Archive__use_filterable_display_order__after_add_filters' );
+		do_action('AHEE__EED_Events_Archive__use_filterable_display_order__after_add_filters');
 		// now load our template
-		$content = EEH_Template::locate_template( 'content-espresso_events-details.php' );
+		$content = EEH_Template::locate_template('content-espresso_events-details.php');
 		// re-add our main filters (or else the next event won't have them)
 		add_filter(
 		    'the_excerpt',
-            array( 'EED_Events_Archive', 'event_details' ),
+            array('EED_Events_Archive', 'event_details'),
             EED_Events_Archive::EVENT_DETAILS_PRIORITY
         );
 		add_filter(
 		    'the_content',
-            array( 'EED_Events_Archive', 'event_details' ),
+            array('EED_Events_Archive', 'event_details'),
             EED_Events_Archive::EVENT_DETAILS_PRIORITY
         );
-		add_filter( 'get_the_excerpt', array( 'EED_Events_Archive', 'get_the_excerpt' ), 1, 1 );
+		add_filter('get_the_excerpt', array('EED_Events_Archive', 'get_the_excerpt'), 1, 1);
 		// but remove the other filters so that they don't get applied to the next post
 		EED_Events_Archive::_remove_additional_events_archive_filters();
-		do_action( 'AHEE__EED_Events_Archive__use_filterable_display_order__after_remove_filters' );
+		do_action('AHEE__EED_Events_Archive__use_filterable_display_order__after_remove_filters');
 		// we're not returning the $content directly because the template we are loading uses the_content (or the_excerpt)
 		//return ! empty( $template ) ? $template : $content;
 		return $content;
@@ -517,11 +517,11 @@ 
 	 * 	@param		string 	$content
 	 *  	@return 		string
 	 */
-	public static function event_datetimes( $content ) {
-		if ( post_password_required() ) {
+	public static function event_datetimes($content) {
+		if (post_password_required()) {
 			return $content;
 		}
-		return EEH_Template::locate_template( 'content-espresso_events-datetimes.php' ) . $content;
+		return EEH_Template::locate_template('content-espresso_events-datetimes.php').$content;
 	}
 
 	/**
@@ -531,11 +531,11 @@ 
 	 * 	@param		string 	$content
 	 *  	@return 		string
 	 */
-	public static function event_tickets( $content ) {
-		if ( post_password_required() ) {
+	public static function event_tickets($content) {
+		if (post_password_required()) {
 			return $content;
 		}
-		return EEH_Template::locate_template( 'content-espresso_events-tickets.php' ) . $content;
+		return EEH_Template::locate_template('content-espresso_events-tickets.php').$content;
 	}
 
 
@@ -547,8 +547,8 @@ 
 	 * @param    string $content
 	 * @return    string
 	 */
-	public static function event_venue( $content ) {
-		return EED_Events_Archive::event_venues( $content );
+	public static function event_venue($content) {
+		return EED_Events_Archive::event_venues($content);
 	}
 
 	/**
@@ -558,11 +558,11 @@ 
 	 * 	@param		string 	$content
 	 *  	@return 		string
 	 */
-	public static function event_venues( $content ) {
-		if ( post_password_required() ) {
+	public static function event_venues($content) {
+		if (post_password_required()) {
 			return $content;
 		}
-		return $content . EEH_Template::locate_template( 'content-espresso_events-venues.php' );
+		return $content.EEH_Template::locate_template('content-espresso_events-venues.php');
 	}
 
 
@@ -576,17 +576,17 @@ 
 	private static function _add_additional_excerpt_filters() {
 		add_filter(
 		    'the_excerpt',
-            array( 'EED_Events_Archive', 'event_datetimes' ),
+            array('EED_Events_Archive', 'event_datetimes'),
             EED_Events_Archive::EVENT_DATETIMES_PRIORITY
         );
 		add_filter(
 		    'the_excerpt',
-            array( 'EED_Events_Archive', 'event_tickets' ),
+            array('EED_Events_Archive', 'event_tickets'),
             EED_Events_Archive::EVENT_TICKETS_PRIORITY
         );
 		add_filter(
 		    'the_excerpt',
-            array( 'EED_Events_Archive', 'event_venues' ),
+            array('EED_Events_Archive', 'event_venues'),
             EED_Events_Archive::EVENT_VENUES_PRIORITY
         );
 	}
@@ -602,17 +602,17 @@ 
 	private static function _add_additional_content_filters() {
 		add_filter(
 		    'the_content',
-            array( 'EED_Events_Archive', 'event_datetimes' ),
+            array('EED_Events_Archive', 'event_datetimes'),
             EED_Events_Archive::EVENT_DATETIMES_PRIORITY
         );
 		add_filter(
 		    'the_content',
-            array( 'EED_Events_Archive', 'event_tickets' ),
+            array('EED_Events_Archive', 'event_tickets'),
             EED_Events_Archive::EVENT_TICKETS_PRIORITY
         );
 		add_filter(
 		    'the_content',
-            array( 'EED_Events_Archive', 'event_venues' ),
+            array('EED_Events_Archive', 'event_venues'),
             EED_Events_Archive::EVENT_VENUES_PRIORITY
         );
 	}
@@ -628,32 +628,32 @@ 
 	private static function _remove_additional_events_archive_filters() {
 		remove_filter(
 		    'the_excerpt',
-            array( 'EED_Events_Archive', 'event_datetimes' ),
+            array('EED_Events_Archive', 'event_datetimes'),
             EED_Events_Archive::EVENT_DATETIMES_PRIORITY
         );
 		remove_filter(
 		    'the_excerpt',
-            array( 'EED_Events_Archive', 'event_tickets' ),
+            array('EED_Events_Archive', 'event_tickets'),
             EED_Events_Archive::EVENT_TICKETS_PRIORITY
         );
 		remove_filter(
 		    'the_excerpt',
-            array( 'EED_Events_Archive', 'event_venues' ),
+            array('EED_Events_Archive', 'event_venues'),
             EED_Events_Archive::EVENT_VENUES_PRIORITY
         );
 		remove_filter(
 		    'the_content',
-            array( 'EED_Events_Archive', 'event_datetimes' ),
+            array('EED_Events_Archive', 'event_datetimes'),
             EED_Events_Archive::EVENT_DATETIMES_PRIORITY
         );
 		remove_filter(
 		    'the_content',
-            array( 'EED_Events_Archive', 'event_tickets' ),
+            array('EED_Events_Archive', 'event_tickets'),
             EED_Events_Archive::EVENT_TICKETS_PRIORITY
         );
 		remove_filter(
 		    'the_content',
-            array( 'EED_Events_Archive', 'event_venues' ),
+            array('EED_Events_Archive', 'event_venues'),
             EED_Events_Archive::EVENT_VENUES_PRIORITY
         );
 	}
@@ -668,45 +668,45 @@ 
 	 */
 	public static function remove_all_events_archive_filters() {
 		//remove_filter( 'get_the_excerpt', array( 'EED_Events_Archive', 'get_the_excerpt' ), 1 );
-		remove_filter( 'the_title', array( 'EED_Events_Archive', 'the_title' ), 1 );
+		remove_filter('the_title', array('EED_Events_Archive', 'the_title'), 1);
 		remove_filter(
 		    'the_excerpt',
-            array( 'EED_Events_Archive', 'event_details' ),
+            array('EED_Events_Archive', 'event_details'),
             EED_Events_Archive::EVENT_DETAILS_PRIORITY
         );
 		remove_filter(
 		    'the_excerpt',
-            array( 'EED_Events_Archive', 'event_datetimes' ),
+            array('EED_Events_Archive', 'event_datetimes'),
             EED_Events_Archive::EVENT_DATETIMES_PRIORITY
         );
 		remove_filter(
 		    'the_excerpt',
-            array( 'EED_Events_Archive', 'event_tickets' ),
+            array('EED_Events_Archive', 'event_tickets'),
             EED_Events_Archive::EVENT_TICKETS_PRIORITY
         );
 		remove_filter(
 		    'the_excerpt',
-            array( 'EED_Events_Archive', 'event_venues' ),
+            array('EED_Events_Archive', 'event_venues'),
             EED_Events_Archive::EVENT_VENUES_PRIORITY
         );
 		remove_filter(
 		    'the_content',
-            array( 'EED_Events_Archive', 'event_details' ),
+            array('EED_Events_Archive', 'event_details'),
             EED_Events_Archive::EVENT_DETAILS_PRIORITY
         );
 		remove_filter(
 		    'the_content',
-            array( 'EED_Events_Archive', 'event_datetimes' ),
+            array('EED_Events_Archive', 'event_datetimes'),
             EED_Events_Archive::EVENT_DATETIMES_PRIORITY
         );
 		remove_filter(
 		    'the_content',
-            array( 'EED_Events_Archive', 'event_tickets' ),
+            array('EED_Events_Archive', 'event_tickets'),
             EED_Events_Archive::EVENT_TICKETS_PRIORITY
         );
 		remove_filter(
 		    'the_content',
-            array( 'EED_Events_Archive', 'event_venues' ),
+            array('EED_Events_Archive', 'event_venues'),
             EED_Events_Archive::EVENT_VENUES_PRIORITY
         );
 		// don't display entry meta because the existing theme will take care of that
@@ -728,12 +728,12 @@ 
 	 *  @return 	void
 	 */
 	public function load_event_list_assets() {
-        do_action( 'AHEE__EED_Events_Archive__before_load_assets' );
-		add_filter( 'FHEE_load_EE_Session', '__return_true' );
-		add_filter( 'FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', '__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 );
+        do_action('AHEE__EED_Events_Archive__before_load_assets');
+		add_filter('FHEE_load_EE_Session', '__return_true');
+		add_filter('FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', '__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);
 		}
 	}
 
@@ -750,13 +750,13 @@ 
 	 */
 	public function wp_enqueue_scripts() {
 		// get some style
-		if ( apply_filters( 'FHEE_enable_default_espresso_css', FALSE ) ) {
+		if (apply_filters('FHEE_enable_default_espresso_css', FALSE)) {
 			// first check uploads folder
-			if ( EEH_File::is_readable( get_stylesheet_directory() . $this->theme . DS . 'style.css' )) {
-				wp_register_style( $this->theme, get_stylesheet_directory_uri() . $this->theme . DS . 'style.css', array( 'dashicons', 'espresso_default' ));
+			if (EEH_File::is_readable(get_stylesheet_directory().$this->theme.DS.'style.css')) {
+				wp_register_style($this->theme, get_stylesheet_directory_uri().$this->theme.DS.'style.css', array('dashicons', 'espresso_default'));
 			} else {
 		}
-		wp_enqueue_style( $this->theme );
+		wp_enqueue_style($this->theme);
 
 	}
 }
@@ -774,8 +774,8 @@ 
 	 */
 	public static function template_settings_form() {
 	$template_settings = EE_Registry::instance()->CFG->template_settings;
-	$template_settings->EED_Events_Archive = isset( $template_settings->EED_Events_Archive ) ? $template_settings->EED_Events_Archive : new EE_Events_Archive_Config();
-	$template_settings->EED_Events_Archive = apply_filters( 'FHEE__EED_Events_Archive__template_settings_form__event_list_config', $template_settings->EED_Events_Archive );
+	$template_settings->EED_Events_Archive = isset($template_settings->EED_Events_Archive) ? $template_settings->EED_Events_Archive : new EE_Events_Archive_Config();
+	$template_settings->EED_Events_Archive = apply_filters('FHEE__EED_Events_Archive__template_settings_form__event_list_config', $template_settings->EED_Events_Archive);
 	$events_archive_settings = array(
 		'display_status_banner' => 0,
 		'display_description' => 1,
@@ -784,8 +784,8 @@ 
 		'display_venue' => 0,
 		'display_expired_events' => 0
 	);
-	$events_archive_settings = array_merge( $events_archive_settings, (array)$template_settings->EED_Events_Archive );
-	EEH_Template::display_template( EVENTS_ARCHIVE_TEMPLATES_PATH . 'admin-event-list-settings.template.php', $events_archive_settings );
+	$events_archive_settings = array_merge($events_archive_settings, (array) $template_settings->EED_Events_Archive);
+	EEH_Template::display_template(EVENTS_ARCHIVE_TEMPLATES_PATH.'admin-event-list-settings.template.php', $events_archive_settings);
 }
 
 
@@ -801,16 +801,16 @@ 
 	 *  @param 	EE_Request_Handler $REQ
 	 *  @return 	EE_Template_Config
 	 */
-	public static function update_template_settings( $CFG, $REQ ) {
+	public static function update_template_settings($CFG, $REQ) {
 		$CFG->EED_Events_Archive = new EE_Events_Archive_Config();
 		// unless we are resetting the config...
-		if ( ! isset( $REQ['EED_Events_Archive_reset_event_list_settings'] ) || absint( $REQ['EED_Events_Archive_reset_event_list_settings'] ) !== 1 ) {
-			$CFG->EED_Events_Archive->display_status_banner = isset( $REQ['EED_Events_Archive_display_status_banner'] ) ? absint( $REQ['EED_Events_Archive_display_status_banner'] ) : 0;
-			$CFG->EED_Events_Archive->display_description = isset( $REQ['EED_Events_Archive_display_description'] ) ? absint( $REQ['EED_Events_Archive_display_description'] ) : 1;
-			$CFG->EED_Events_Archive->display_ticket_selector = isset( $REQ['EED_Events_Archive_display_ticket_selector'] ) ? absint( $REQ['EED_Events_Archive_display_ticket_selector'] ) : 0;
-			$CFG->EED_Events_Archive->display_datetimes = isset( $REQ['EED_Events_Archive_display_datetimes'] ) ? absint( $REQ['EED_Events_Archive_display_datetimes'] ) : 1;
-			$CFG->EED_Events_Archive->display_venue = isset( $REQ['EED_Events_Archive_display_venue'] ) ? absint( $REQ['EED_Events_Archive_display_venue'] ) : 0;
-			$CFG->EED_Events_Archive->display_expired_events = isset( $REQ['EED_Events_Archive_display_expired_events'] ) ? absint( $REQ['EED_Events_Archive_display_expired_events'] ) : 0;			}
+		if ( ! isset($REQ['EED_Events_Archive_reset_event_list_settings']) || absint($REQ['EED_Events_Archive_reset_event_list_settings']) !== 1) {
+			$CFG->EED_Events_Archive->display_status_banner = isset($REQ['EED_Events_Archive_display_status_banner']) ? absint($REQ['EED_Events_Archive_display_status_banner']) : 0;
+			$CFG->EED_Events_Archive->display_description = isset($REQ['EED_Events_Archive_display_description']) ? absint($REQ['EED_Events_Archive_display_description']) : 1;
+			$CFG->EED_Events_Archive->display_ticket_selector = isset($REQ['EED_Events_Archive_display_ticket_selector']) ? absint($REQ['EED_Events_Archive_display_ticket_selector']) : 0;
+			$CFG->EED_Events_Archive->display_datetimes = isset($REQ['EED_Events_Archive_display_datetimes']) ? absint($REQ['EED_Events_Archive_display_datetimes']) : 1;
+			$CFG->EED_Events_Archive->display_venue = isset($REQ['EED_Events_Archive_display_venue']) ? absint($REQ['EED_Events_Archive_display_venue']) : 0;
+			$CFG->EED_Events_Archive->display_expired_events = isset($REQ['EED_Events_Archive_display_expired_events']) ? absint($REQ['EED_Events_Archive_display_expired_events']) : 0; }
 		return $CFG;
 	}
 
@@ -823,10 +823,10 @@ 
 	 * @param string $extra_class
 	 * @return    string
 	 */
-	public static function event_list_css( $extra_class = '' ) {
-		$event_list_css = ! empty( $extra_class ) ? array( $extra_class ) : array();
+	public static function event_list_css($extra_class = '') {
+		$event_list_css = ! empty($extra_class) ? array($extra_class) : array();
 		$event_list_css[] = 'espresso-event-list-event';
-		return implode( ' ', $event_list_css );
+		return implode(' ', $event_list_css);
 	}
 
 
@@ -853,9 +853,9 @@ 
 	 * @param $value
 	 * @return    bool
 	 */
-	public static function display_description( $value ) {
+	public static function display_description($value) {
 		$config = EE_Registry::instance()->CFG->template_settings->EED_Events_Archive;
-		$display_description= isset( $config->display_description ) ? $config->display_description : 1;
+		$display_description = isset($config->display_description) ? $config->display_description : 1;
 		return $display_description === $value ? TRUE : FALSE;
 	}
 
@@ -868,7 +868,7 @@ 
 	 */
 	public static function display_ticket_selector() {
 		$config = EE_Registry::instance()->CFG->template_settings->EED_Events_Archive;
-		return isset( $config->display_ticket_selector ) && $config->display_ticket_selector ? TRUE : FALSE;
+		return isset($config->display_ticket_selector) && $config->display_ticket_selector ? TRUE : FALSE;
 	}
 
 
@@ -881,7 +881,7 @@ 
 	 */
 	public static function display_venue() {
 		$config = EE_Registry::instance()->CFG->template_settings->EED_Events_Archive;
-		return isset( $config->display_venue ) && $config->display_venue && EEH_Venue_View::venue_name() ? TRUE : FALSE;
+		return isset($config->display_venue) && $config->display_venue && EEH_Venue_View::venue_name() ? TRUE : FALSE;
 	}
 
 
@@ -893,7 +893,7 @@ 
 	 */
 	public static function display_datetimes() {
 		$config = EE_Registry::instance()->CFG->template_settings->EED_Events_Archive;
-		return isset( $config->display_datetimes ) && $config->display_datetimes ? TRUE : FALSE;
+		return isset($config->display_datetimes) && $config->display_datetimes ? TRUE : FALSE;
 }
 
 
@@ -908,7 +908,7 @@ 
 	 *  @return 	string
 	 */
 	public static function event_list_title() {
-		return apply_filters( 'FHEE__archive_espresso_events_template__upcoming_events_h1', __( 'Upcoming Events', 'event_espresso' ));
+		return apply_filters('FHEE__archive_espresso_events_template__upcoming_events_h1', __('Upcoming Events', 'event_espresso'));
 	}
 
 
@@ -917,11 +917,11 @@ 
 	/**
 	 * 	@since 4.4.0
 	 */
-	public static function _doing_it_wrong_notice( $function = '' ) {
+	public static function _doing_it_wrong_notice($function = '') {
 		EE_Error::doing_it_wrong(
 			__FUNCTION__,
 			sprintf(
-				__( 'EED_Events_Archive::%1$s was moved to EEH_Event_Query::%1$s:%2$sPlease update your existing code because the method it calls will be removed in version %3$s', 'event_espresso' ),
+				__('EED_Events_Archive::%1$s was moved to EEH_Event_Query::%1$s:%2$sPlease update your existing code because the method it calls will be removed in version %3$s', 'event_espresso'),
 				$function,
 				'<br />',
 				'4.6.0'
@@ -943,89 +943,89 @@ 
 	 * 	@deprecated
 	 * 	@since 4.4.0
 	 */
-	public function posts_fields( $SQL, WP_Query $wp_query ) {
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
-		return EEH_Event_Query::posts_fields( $SQL, $wp_query );
+	public function posts_fields($SQL, WP_Query $wp_query) {
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
+		return EEH_Event_Query::posts_fields($SQL, $wp_query);
 	}
 	/**
 	 * 	@deprecated
 	 * 	@since 4.4.0
 	 */
-	public static function posts_fields_sql_for_orderby( $orderby_params = array() ) {
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
-		return EEH_Event_Query::posts_fields_sql_for_orderby( $orderby_params );
+	public static function posts_fields_sql_for_orderby($orderby_params = array()) {
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
+		return EEH_Event_Query::posts_fields_sql_for_orderby($orderby_params);
 	}
 	/**
 	 * 	@deprecated
 	 * 	@since 4.4.0
 	 */
-	public function posts_join( $SQL, WP_Query $wp_query ) {
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
-		return EEH_Event_Query::posts_join( $SQL, $wp_query );
+	public function posts_join($SQL, WP_Query $wp_query) {
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
+		return EEH_Event_Query::posts_join($SQL, $wp_query);
 	}
 	/**
 	 * 	@deprecated
 	 * 	@since 4.4.0
 	 */
-	public static function posts_join_sql_for_terms( $join_terms = NULL ) {
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
-		return EEH_Event_Query::posts_join_sql_for_terms( $join_terms );
+	public static function posts_join_sql_for_terms($join_terms = NULL) {
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
+		return EEH_Event_Query::posts_join_sql_for_terms($join_terms);
 	}
 	/**
 	 * 	@deprecated
 	 * 	@since 4.4.0
 	 */
-	public static function posts_join_for_orderby( $orderby_params = array() ) {
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
-		return EEH_Event_Query::posts_join_for_orderby( $orderby_params );
+	public static function posts_join_for_orderby($orderby_params = array()) {
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
+		return EEH_Event_Query::posts_join_for_orderby($orderby_params);
 	}
 	/**
 	 * 	@deprecated
 	 * 	@since 4.4.0
 	 */
-	public function posts_where( $SQL, WP_Query $wp_query ) {
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
-		return EEH_Event_Query::posts_where( $SQL, $wp_query );
+	public function posts_where($SQL, WP_Query $wp_query) {
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
+		return EEH_Event_Query::posts_where($SQL, $wp_query);
 	}
 	/**
 	 * 	@deprecated
 	 * 	@since 4.4.0
 	 */
-	public static function posts_where_sql_for_show_expired( $show_expired = FALSE ) {
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
-		return EEH_Event_Query::posts_where_sql_for_show_expired( $show_expired );
+	public static function posts_where_sql_for_show_expired($show_expired = FALSE) {
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
+		return EEH_Event_Query::posts_where_sql_for_show_expired($show_expired);
 	}
 	/**
 	 * 	@deprecated
 	 * 	@since 4.4.0
 	 */
-	public static function posts_where_sql_for_event_category_slug( $event_category_slug = NULL ) {
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
-		return EEH_Event_Query::posts_where_sql_for_event_category_slug( $event_category_slug );
+	public static function posts_where_sql_for_event_category_slug($event_category_slug = NULL) {
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
+		return EEH_Event_Query::posts_where_sql_for_event_category_slug($event_category_slug);
 	}
 	/**
 	 * 	@deprecated
 	 * 	@since 4.4.0
 	 */
-	public static function posts_where_sql_for_event_list_month( $month = NULL ) {
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
-		return EEH_Event_Query::posts_where_sql_for_event_list_month( $month );
+	public static function posts_where_sql_for_event_list_month($month = NULL) {
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
+		return EEH_Event_Query::posts_where_sql_for_event_list_month($month);
 	}
 	/**
 	 * 	@deprecated
 	 * 	@since 4.4.0
 	 */
-	public function posts_orderby( $SQL, WP_Query $wp_query ) {
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
-		return EEH_Event_Query::posts_orderby( $SQL, $wp_query );
+	public function posts_orderby($SQL, WP_Query $wp_query) {
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
+		return EEH_Event_Query::posts_orderby($SQL, $wp_query);
 	}
 	/**
 	 * 	@deprecated
 	 * 	@since 4.4.0
 	 */
-	public static function posts_orderby_sql( $orderby_params = array(), $sort = 'ASC' ) {
-		EED_Events_Archive::_doing_it_wrong_notice( __FUNCTION__ );
-		return EEH_Event_Query::posts_orderby_sql( $orderby_params, $sort );
+	public static function posts_orderby_sql($orderby_params = array(), $sort = 'ASC') {
+		EED_Events_Archive::_doing_it_wrong_notice(__FUNCTION__);
+		return EEH_Event_Query::posts_orderby_sql($orderby_params, $sort);
 	}
 
 
@@ -1056,8 +1056,8 @@ 
  * @param string $extra_class
  * @return string
  */
-function espresso_event_list_css( $extra_class = '' ) {
-	return EED_Events_Archive::event_list_css( $extra_class );
+function espresso_event_list_css($extra_class = '') {
+	return EED_Events_Archive::event_list_css($extra_class);
 }
 
 /**
@@ -1071,14 +1071,14 @@ 
  * @return bool
  */
 function espresso_display_full_description_in_event_list() {
-	return EED_Events_Archive::display_description( 2 );
+	return EED_Events_Archive::display_description(2);
 }
 
 /**
  * @return bool
  */
 function espresso_display_excerpt_in_event_list() {
-	return EED_Events_Archive::display_description( 1 );
+	return EED_Events_Archive::display_description(1);
 }
 
 /**