eventespresso / event-espresso-core

core/libraries/shortcodes/EE_Venue_Shortcodes.lib.php

Doc Comments +1 added lines, -1 removed lines

@@ -129,7 +129,7 @@
 
 	/**
 	 * This retrieves the specified venue information
-	 * @param  string $what What to retrieve from database
+	 * @param string $db_ref
 	 * @return string       What was retrieved!
 	 */
 	private function _venue( $db_ref ) {

Braces +9 added lines, -5 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -155,13 +156,16 @@ 
 
 
 		//If there is no event objecdt by now then get out.
-		if ( ! $this->_event instanceof EE_Event )
-			return '';
+		if ( ! $this->_event instanceof EE_Event ) {
+					return '';
+		}
 
 		$venue = $this->_event->get_first_related('Venue');
 
-		if ( empty( $venue ) )
-			return ''; //no venue so get out.
+		if ( empty( $venue ) ) {
+					return '';
+		}
+		//no venue so get out.
 
 		switch ( $db_ref ) {
 			case 'title':

Spacing +16 added lines, -16 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -62,9 +62,9 @@ 
 	}
 
 
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 
 			case '[VENUE_TITLE]' :
 				return $this->_venue('title');
@@ -132,38 +132,38 @@ 
 	 * @param  string $what What to retrieve from database
 	 * @return string       What was retrieved!
 	 */
-	private function _venue( $db_ref ) {
+	private function _venue($db_ref) {
 
 		//we need the EE_Event object to get the venue.
 
 		$this->_event = $this->_data instanceof EE_Event ? $this->_data : null;
 
 		//if no event, then let's see if there is a reg_obj.  If there IS, then we'll try and grab the event from the reg_obj instead.
-		if ( empty( $this->_event ) ) {
+		if (empty($this->_event)) {
 			$aee = $this->_data instanceof EE_Messages_Addressee ? $this->_data : NULL;
 			$aee = $this->_extra_data instanceof EE_Messages_Addressee ? $this->_extra_data : $aee;
 
 			$this->_event = $aee instanceof EE_Messages_Addressee && $aee->reg_obj instanceof EE_Registration ? $aee->reg_obj->event() : NULL;
 
 			//if still empty do we have a ticket data item?
-			$this->_event = empty( $this->_event ) && $this->_data instanceof EE_Ticket && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data']->tickets[$this->_data->ID()]['EE_Event'] : $this->_event;
+			$this->_event = empty($this->_event) && $this->_data instanceof EE_Ticket && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data']->tickets[$this->_data->ID()]['EE_Event'] : $this->_event;
 
 			//if STILL empty event, let's try to get the first event in the list of events via EE_Messages_Addressee and use that.
-			$event = $aee instanceof EE_Messages_Addressee ? reset( $aee->events ) : array();
-			$this->_event = empty( $this->_event ) && !empty( $events ) ? $event : $this->_event;
+			$event = $aee instanceof EE_Messages_Addressee ? reset($aee->events) : array();
+			$this->_event = empty($this->_event) && ! empty($events) ? $event : $this->_event;
 		}
 
 
 		//If there is no event objecdt by now then get out.
-		if ( ! $this->_event instanceof EE_Event )
+		if ( ! $this->_event instanceof EE_Event)
 			return '';
 
 		$venue = $this->_event->get_first_related('Venue');
 
-		if ( empty( $venue ) )
+		if (empty($venue))
 			return ''; //no venue so get out.
 
-		switch ( $db_ref ) {
+		switch ($db_ref) {
 			case 'title':
 				return $venue->get('VNU_name');
 				break;
@@ -174,11 +174,11 @@ 
 
 			case 'url':
 				$url = $venue->get('VNU_url');
-				return empty( $url ) ? $venue->get_permalink() : $url;
+				return empty($url) ? $venue->get_permalink() : $url;
 				break;
 
 			case 'image':
-				return '<img src="' . $venue->feature_image_url(array(200,200) ) . '" alt="' . sprintf( esc_attr__( '%s Feature Image', 'event_espresso'), $venue->get('VNU_name') ) . '" />';
+				return '<img src="'.$venue->feature_image_url(array(200, 200)).'" alt="'.sprintf(esc_attr__('%s Feature Image', 'event_espresso'), $venue->get('VNU_name')).'" />';
 				break;
 
 			case 'phone':
@@ -212,7 +212,7 @@ 
 				break;
 
 			case 'formatted_address' :
-				return EEH_Address::format( $venue );
+				return EEH_Address::format($venue);
 				break;
 
 			case 'gmap_link':
@@ -223,9 +223,9 @@ 
 					'id' => $venue->ID(),
 					'address' => $venue->get('VNU_address'),
 					'city' => $venue->get('VNU_city'),
-					'state' => is_object( $state ) ? $state->get('STA_name') : '',
+					'state' => is_object($state) ? $state->get('STA_name') : '',
 					'zip' => $venue->get('VNU_zip'),
-					'country' => is_object( $country ) ? $country->get('CNT_name'): '',
+					'country' => is_object($country) ? $country->get('CNT_name') : '',
 					'type' => $db_ref == 'gmap_link' ? 'url' : 'map',
 					'map_w' => 200,
 					'map_h' => 200

modules/certificate/EED_Certificate.module.php

Doc Comments +1 added lines, -1 removed lines

@@ -112,7 +112,7 @@
 	 * 	the_content
 	 *
 	 *  @access 	public
-	 *  @return 	void
+	 *  @return 	string
 	 */
 	public function the_content( $content ) {
 		$content .= $this->ouput;

Spacing +5 added lines, -5 removed lines

@@ -29,7 +29,7 @@ 
 	 * @return EED_Module
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -60,7 +60,7 @@ 
 	 *  @access 	public
 	 *  @return 	void
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
 //		add_filter( 'FHEE_load_ee_config', '__return_true' );
 //		add_filter( 'FHEE_run_EE_wp', '__return_true' );
 //		add_filter( 'FHEE_load_EE_Session', '__return_true' );
@@ -79,8 +79,8 @@ 
 	 *  @return 	void
 	 */
 	public function certificate_launch() {
-		if ( EE_Registry::instance()->REQ->is_set( 'id' ) && EE_Registry::instance()->REQ->is_set( 'r_id' )) {
-			echo espresso_certificate_launch( EE_Registry::instance()->REQ->get( 'id' ), EE_Registry::instance()->REQ->get( 'r_id' ));
+		if (EE_Registry::instance()->REQ->is_set('id') && EE_Registry::instance()->REQ->is_set('r_id')) {
+			echo espresso_certificate_launch(EE_Registry::instance()->REQ->get('id'), EE_Registry::instance()->REQ->get('r_id'));
 		}
 	}
 
@@ -114,7 +114,7 @@ 
 	 *  @access 	public
 	 *  @return 	void
 	 */
-	public function the_content( $content ) {
+	public function the_content($content) {
 		$content .= $this->ouput;
 		return $content;
 	}

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *

modules/events_archive/EED_Events_Archive.module.php

Doc Comments +1 added lines, -1 removed lines

@@ -495,7 +495,7 @@
 	 *    display_description
 	 *
 	 * @access    public
-	 * @param $value
+	 * @param integer $value
 	 * @return    bool
 	 */
 	public static function display_description( $value ) {

Spacing +173 added lines, -173 removed lines

@@ -43,7 +43,7 @@ 
 	 * @return EED_Events_Archive
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -55,9 +55,9 @@ 
 	 *  @return 	void
 	 */
 	public static function set_hooks() {
-		EE_Config::register_route( EE_Registry::instance()->CFG->core->event_cpt_slug, 'Events_Archive', 'run' );
-		EE_Config::register_route( 'event_list', 'Events_Archive', 'event_list' );
-		add_action( 'wp_loaded', array( 'EED_Events_Archive', 'set_definitions' ), 2 );
+		EE_Config::register_route(EE_Registry::instance()->CFG->core->event_cpt_slug, 'Events_Archive', 'run');
+		EE_Config::register_route('event_list', 'Events_Archive', 'event_list');
+		add_action('wp_loaded', array('EED_Events_Archive', 'set_definitions'), 2);
 	}
 
 	/**
@@ -67,7 +67,7 @@ 
 	 *  @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);
 	}
 
 
@@ -80,8 +80,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);
 	}
 
 
@@ -91,10 +91,10 @@ 
 	 *
 	 * @return \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');
 	}
 
 
@@ -106,35 +106,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;
 	}
 
@@ -147,8 +147,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 */
@@ -160,14 +160,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);
 	}
 
 
@@ -199,32 +199,32 @@ 
 	 * @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 (
-				EE_Registry::instance()->load_core( 'Front_Controller', array(), false, true )->get_selected_template() != 'archive-espresso_events.php'
-				|| apply_filters( 'FHEE__EED_Event_Archive__template_include__allow_custom_selected_template', FALSE )
+				EE_Registry::instance()->load_core('Front_Controller', array(), false, true)->get_selected_template() != 'archive-espresso_events.php'
+				|| apply_filters('FHEE__EED_Event_Archive__template_include__allow_custom_selected_template', FALSE)
 			) {
 				// 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' ), 100, 1 );
+				add_filter('the_excerpt', array('EED_Events_Archive', 'event_details'), 100, 1);
 				// or the_content
-				add_filter( 'the_content', array( 'EED_Events_Archive', 'event_details' ), 100, 1 );
+				add_filter('the_content', array('EED_Events_Archive', 'event_details'), 100, 1);
 				// 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;
@@ -239,17 +239,17 @@ 
 	 * 	@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 ) ) {
-			remove_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_details' ), 100 );
-			remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_details' ), 100 );
-			$excerpt = EED_Events_Archive::event_details( $excerpt );
+		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'), 100);
+			remove_filter('the_content', array('EED_Events_Archive', 'event_details'), 100);
+			$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;
 	}
@@ -263,7 +263,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;
 	}
@@ -278,10 +278,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;
 }
@@ -295,7 +295,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 (
@@ -304,8 +304,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.
@@ -314,8 +314,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();
@@ -334,20 +334,20 @@ 
 	 */
 	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' ), 100 );
-		remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_details' ), 100 );
-		remove_filter( 'get_the_excerpt', array( 'EED_Events_Archive', 'get_the_excerpt' ), 1 );
+		remove_filter('the_excerpt', array('EED_Events_Archive', 'event_details'), 100);
+		remove_filter('the_content', array('EED_Events_Archive', 'event_details'), 100);
+		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' ), 100, 1 );
-		add_filter( 'the_content', array( 'EED_Events_Archive', 'event_details' ), 100, 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' );
+		add_filter('the_excerpt', array('EED_Events_Archive', 'event_details'), 100, 1);
+		add_filter('the_content', array('EED_Events_Archive', 'event_details'), 100, 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');
 		return $content;
 	}
 
@@ -362,22 +362,22 @@ 
 	protected static function use_filterable_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_excerpt', array( 'EED_Events_Archive', 'event_details' ), 100 );
-		remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_details' ), 100 );
-		remove_filter( 'get_the_excerpt', array( 'EED_Events_Archive', 'get_the_excerpt' ), 1 );
+		remove_filter('the_excerpt', array('EED_Events_Archive', 'event_details'), 100);
+		remove_filter('the_content', array('EED_Events_Archive', 'event_details'), 100);
+		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' ), 100, 1 );
-		add_filter( 'the_content', array( 'EED_Events_Archive', 'event_details' ), 100, 1 );
-		add_filter( 'get_the_excerpt', array( 'EED_Events_Archive', 'get_the_excerpt' ), 1, 1 );
+		add_filter('the_excerpt', array('EED_Events_Archive', 'event_details'), 100, 1);
+		add_filter('the_content', array('EED_Events_Archive', 'event_details'), 100, 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;
@@ -392,11 +392,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;
 	}
 
 	/**
@@ -406,11 +406,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;
 	}
 
 
@@ -422,8 +422,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);
 	}
 
 	/**
@@ -433,11 +433,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');
 	}
 
 
@@ -449,9 +449,9 @@ 
 	 * @return        void
 	 */
 	private static function _add_additional_excerpt_filters() {
-		add_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_datetimes' ), 110, 1 );
-		add_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_tickets' ), 120, 1 );
-		add_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_venues' ), 130, 1 );
+		add_filter('the_excerpt', array('EED_Events_Archive', 'event_datetimes'), 110, 1);
+		add_filter('the_excerpt', array('EED_Events_Archive', 'event_tickets'), 120, 1);
+		add_filter('the_excerpt', array('EED_Events_Archive', 'event_venues'), 130, 1);
 	}
 
 
@@ -463,9 +463,9 @@ 
 	 * @return        void
 	 */
 	private static function _add_additional_content_filters() {
-		add_filter( 'the_content', array( 'EED_Events_Archive', 'event_datetimes' ), 110, 1 );
-		add_filter( 'the_content', array( 'EED_Events_Archive', 'event_tickets' ), 120, 1 );
-		add_filter( 'the_content', array( 'EED_Events_Archive', 'event_venues' ), 130, 1 );
+		add_filter('the_content', array('EED_Events_Archive', 'event_datetimes'), 110, 1);
+		add_filter('the_content', array('EED_Events_Archive', 'event_tickets'), 120, 1);
+		add_filter('the_content', array('EED_Events_Archive', 'event_venues'), 130, 1);
 	}
 
 
@@ -477,12 +477,12 @@ 
 	 * @return        void
 	 */
 	private static function _remove_additional_events_archive_filters() {
-		remove_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_datetimes' ), 110 );
-		remove_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_tickets' ), 120 );
-		remove_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_venues' ), 130 );
-		remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_datetimes' ), 110 );
-		remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_tickets' ), 120 );
-		remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_venues' ), 130 );
+		remove_filter('the_excerpt', array('EED_Events_Archive', 'event_datetimes'), 110);
+		remove_filter('the_excerpt', array('EED_Events_Archive', 'event_tickets'), 120);
+		remove_filter('the_excerpt', array('EED_Events_Archive', 'event_venues'), 130);
+		remove_filter('the_content', array('EED_Events_Archive', 'event_datetimes'), 110);
+		remove_filter('the_content', array('EED_Events_Archive', 'event_tickets'), 120);
+		remove_filter('the_content', array('EED_Events_Archive', 'event_venues'), 130);
 	}
 
 
@@ -495,17 +495,17 @@ 
 	 */
 	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' ), 100 );
-		remove_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_details' ), 100 );
-		remove_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_datetimes' ), 110 );
-		remove_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_tickets' ), 120 );
-		remove_filter( 'the_excerpt', array( 'EED_Events_Archive', 'event_venues' ), 130 );
-		remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_details' ), 100 );
-		remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_datetimes' ), 110 );
-		remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_tickets' ), 120 );
-		remove_filter( 'the_content', array( 'EED_Events_Archive', 'event_venues' ), 130 );
+		remove_filter('the_title', array('EED_Events_Archive', 'the_title'), 100);
+		remove_filter('the_excerpt', array('EED_Events_Archive', 'event_details'), 100);
+		remove_filter('the_excerpt', array('EED_Events_Archive', 'event_datetimes'), 110);
+		remove_filter('the_excerpt', array('EED_Events_Archive', 'event_tickets'), 120);
+		remove_filter('the_excerpt', array('EED_Events_Archive', 'event_venues'), 130);
+		remove_filter('the_content', array('EED_Events_Archive', 'event_details'), 100);
+		remove_filter('the_content', array('EED_Events_Archive', 'event_datetimes'), 110);
+		remove_filter('the_content', array('EED_Events_Archive', 'event_tickets'), 120);
+		remove_filter('the_content', array('EED_Events_Archive', 'event_venues'), 130);
 		// 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' );
+		remove_filter('FHEE__content_espresso_events_details_template__display_entry_meta', '__return_false');
 	}
 
 
@@ -520,12 +520,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);
 		}
 	}
 
@@ -542,13 +542,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);
 
 	}
 }
@@ -566,8 +566,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,
@@ -576,8 +576,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);
 }
 
 
@@ -593,16 +593,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;
 	}
 
@@ -615,10 +615,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);
 	}
 
 
@@ -645,9 +645,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;
 	}
 
@@ -660,7 +660,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;
 	}
 
 
@@ -673,7 +673,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;
 	}
 
 
@@ -685,7 +685,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;
 }
 
 
@@ -700,7 +700,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'));
 	}
 
 
@@ -709,11 +709,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'
@@ -735,89 +735,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);
 	}
 
 
@@ -848,8 +848,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);
 }
 
 /**
@@ -863,14 +863,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);
 }
 
 /**

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *

modules/events_archive_filters/EED_Events_Archive_Filters.module.php

Doc Comments +14 added lines, -13 removed lines

@@ -271,6 +271,7 @@ 
 	 *
 	 *  @access 	public
 	 *  @param	mixed boolean|string	$join_terms pass TRUE or term string, doesn't really matter since this value doesn't really get used for anything yet
+	 * @param string $join_terms
 	 *  @return 	string
 	 */
 	public static function posts_join_sql_for_terms( $join_terms = NULL ) {
@@ -423,7 +424,7 @@ 
 	 * 	or else some of the table references below will result in MySQL errors
 	 *
 	 *  @access 	public
-	 *  @param	boolean	$orderby_params
+	 *  @param	string[]	$orderby_params
 	 *  @return 	string
 	 */
 	public static function posts_orderby_sql( $orderby_params = array(), $sort = 'ASC' ) {
@@ -534,7 +535,7 @@ 
 	 *
 	 *  	@access 	public
 	 * 	@param		string 	$content
-	 *  	@return 		void
+	 *  	@return 		string
 	 */
 	public function event_details( $content ) {
 		return EEH_Template::display_template( EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'content-espresso_events-details.php', array( 'the_content' => $content ), TRUE );
@@ -546,7 +547,7 @@ 
 	 *
 	 *  	@access 	public
 	 * 	@param		string 	$content
-	 *  	@return 		void
+	 *  	@return 		string
 	 */
 	public function event_tickets( $content ) {
 		return $content . EEH_Template::display_template( EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'content-espresso_events-tickets.php', array(), TRUE );
@@ -557,7 +558,7 @@ 
 	 *
 	 *  	@access 	public
 	 * 	@param		string 	$content
-	 *  	@return 		void
+	 *  	@return 		string
 	 */
 	public function event_datetimes( $content ) {
 		return $content . EEH_Template::display_template( EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'content-espresso_events-datetimes.php', array(), TRUE );
@@ -568,7 +569,7 @@ 
 	 *
 	 *  	@access 	public
 	 * 	@param		string 	$content
-	 *  	@return 		void
+	 *  	@return 		string
 	 */
 	public function event_venues( $content ) {
 		return $content . EEH_Template::display_template( EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'content-espresso_events-venues.php', array(), TRUE );
@@ -618,7 +619,7 @@ 
 	 * 	excerpt_length
 	 *
 	 *  @access 	public
-	 *  @return 	void
+	 *  @return 	integer|null
 	 */
 	public function excerpt_length( $length ) {
 
@@ -648,7 +649,7 @@ 
 	 * 	excerpt_more
 	 *
 	 *  @access 	public
-	 *  @return 	void
+	 *  @return 	string
 	 */
 	public function excerpt_more( $more ) {
 		return '…';
@@ -813,7 +814,7 @@ 
 	 * 	get_template_part
 	 *
 	 *  @access 	public
-	 *  @return 	void
+	 *  @return 	string|null
 	 */
 	public static function get_template_part() {
 		switch ( self::$_type ) {
@@ -857,7 +858,7 @@ 
 	 * 	event_list_css
 	 *
 	 *  @access 	public
-	 *  @return 	void
+	 *  @return 	string
 	 */
 	public static function event_list_css( $extra_class = '' ) {
 		$EE = EE_Registry::instance();
@@ -892,7 +893,7 @@ 
 	 * 	display_description
 	 *
 	 *  @access 	public
-	 *  @return 	void
+	 *  @return 	boolean
 	 */
 	public static function display_description( $value ) {
 		$EE = EE_Registry::instance();
@@ -906,7 +907,7 @@ 
 	 * 	display_venue_details
 	 *
 	 *  @access 	public
-	 *  @return 	void
+	 *  @return 	boolean
 	 */
 	public static function display_venue_details() {
 		$EE = EE_Registry::instance();
@@ -921,7 +922,7 @@ 
 	 * 	display_address
 	 *
 	 *  @access 	public
-	 *  @return 	void
+	 *  @return 	boolean
 	 */
 	public static function display_address() {
 		$EE = EE_Registry::instance();
@@ -937,7 +938,7 @@ 
 	 * 	pagination
 	 *
 	 *  @access 	public
-	 *  @return 	void
+	 *  @return 	string
 	 */
 	public static function pagination() {
 		global $wp_query;

Spacing +165 added lines, -165 removed lines

@@ -29,7 +29,7 @@ 
 	 * @return EED_Events_Archive_Filters
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -71,7 +71,7 @@ 
 	 *	@var 	$_types
 	 * 	@access 	protected
 	 */
-	protected static $_types = array( 'grid', 'text', 'dates' );
+	protected static $_types = array('grid', 'text', 'dates');
 
 
 //	public static $espresso_event_list_ID = 0;
@@ -125,7 +125,7 @@ 
 	 *  @access 	public
 	 *  @return 	void
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
 //		do_action( 'AHEE__EED_Events_Archive_Filters__before_run' );
 //		// set config
 //		if ( ! isset( EE_Registry::instance()->CFG->template_settings->EED_Events_Archive_Filters ) || ! EE_Registry::instance()->CFG->template_settings->EED_Events_Archive_Filters instanceof EE_Events_Archive_Config ) {
@@ -170,9 +170,9 @@ 
 	 */
 	private function _filter_query_parts() {
 		// build event list query
-		add_filter( 'posts_join', array( $this, 'posts_join' ), 1, 2 );
-		add_filter( 'posts_where', array( $this, 'posts_where' ), 1, 2 );
-		add_filter( 'posts_orderby', array( $this, 'posts_orderby' ), 1, 2 );
+		add_filter('posts_join', array($this, 'posts_join'), 1, 2);
+		add_filter('posts_where', array($this, 'posts_where'), 1, 2);
+		add_filter('posts_orderby', array($this, 'posts_orderby'), 1, 2);
 	}
 
 	/**
@@ -182,13 +182,13 @@ 
 	 *  @return 	string
 	 */
 	public static function set_type() {
-		do_action( 'AHEE__EED_Events_Archive_Filters__before_set_type' );
-		EED_Events_Archive_Filters::$_types = apply_filters( 'EED_Events_Archive_Filters__set_type__types', EED_Events_Archive_Filters::$_types );
-		$view = isset( EE_Registry::instance()->CFG->EED_Events_Archive_Filters['default_type'] ) ? EE_Registry::instance()->CFG->EED_Events_Archive_Filters['default_type'] : 'grid';
-		$elf_type = EE_Registry::instance()->REQ->is_set( 'elf_type' ) ? sanitize_text_field( EE_Registry::instance()->REQ->get( 'elf_type' )) : '';
-		$view = ! empty( $elf_type ) ? $elf_type : $view;
-		$view = apply_filters( 'EED_Events_Archive_Filters__set_type__type', $view );
-		if ( ! empty( $view ) && in_array( $view, EED_Events_Archive_Filters::$_types )) {
+		do_action('AHEE__EED_Events_Archive_Filters__before_set_type');
+		EED_Events_Archive_Filters::$_types = apply_filters('EED_Events_Archive_Filters__set_type__types', EED_Events_Archive_Filters::$_types);
+		$view = isset(EE_Registry::instance()->CFG->EED_Events_Archive_Filters['default_type']) ? EE_Registry::instance()->CFG->EED_Events_Archive_Filters['default_type'] : 'grid';
+		$elf_type = EE_Registry::instance()->REQ->is_set('elf_type') ? sanitize_text_field(EE_Registry::instance()->REQ->get('elf_type')) : '';
+		$view = ! empty($elf_type) ? $elf_type : $view;
+		$view = apply_filters('EED_Events_Archive_Filters__set_type__type', $view);
+		if ( ! empty($view) && in_array($view, EED_Events_Archive_Filters::$_types)) {
 			self::$_type = $view;
 		}
 	}
@@ -200,11 +200,11 @@ 
 	 *  @param	boolean	$req_only if TRUE, then ignore defaults and only return $_POST value
 	 *  @return 	boolean
 	 */
-	private static function _show_expired( $req_only = FALSE ) {
+	private static function _show_expired($req_only = FALSE) {
 		// get default value for "display_expired_events" as set in the EE General Settings > Templates > Event Listings
-		$show_expired = ! $req_only && isset( EE_Registry::instance()->CFG->EED_Events_Archive_Filters['display_expired_events'] ) ? EE_Registry::instance()->CFG->EED_Events_Archive_Filters['display_expired_events'] : FALSE;
+		$show_expired = ! $req_only && isset(EE_Registry::instance()->CFG->EED_Events_Archive_Filters['display_expired_events']) ? EE_Registry::instance()->CFG->EED_Events_Archive_Filters['display_expired_events'] : FALSE;
 		// override default expired option if set via filter
-		$show_expired = EE_Registry::instance()->REQ->is_set( 'elf_expired_chk' ) ? absint( EE_Registry::instance()->REQ->get( 'elf_expired_chk' )) : $show_expired;
+		$show_expired = EE_Registry::instance()->REQ->is_set('elf_expired_chk') ? absint(EE_Registry::instance()->REQ->get('elf_expired_chk')) : $show_expired;
 		return $show_expired ? TRUE : FALSE;
 	}
 
@@ -215,7 +215,7 @@ 
 	 *  @return 	string
 	 */
 	private static function _event_category_slug() {
-		return EE_Registry::instance()->REQ->is_set( 'elf_category_dd' ) ? sanitize_text_field( EE_Registry::instance()->REQ->get( 'elf_category_dd' )) : '';
+		return EE_Registry::instance()->REQ->is_set('elf_category_dd') ? sanitize_text_field(EE_Registry::instance()->REQ->get('elf_category_dd')) : '';
 	}
 
 	/**
@@ -225,7 +225,7 @@ 
 	 *  @return 	string
 	 */
 	private static function _display_month() {
-		return EE_Registry::instance()->REQ->is_set( 'elf_month_dd' ) ? sanitize_text_field( EE_Registry::instance()->REQ->get( 'elf_month_dd' )) : '';
+		return EE_Registry::instance()->REQ->is_set('elf_month_dd') ? sanitize_text_field(EE_Registry::instance()->REQ->get('elf_month_dd')) : '';
 	}
 
 
@@ -239,7 +239,7 @@ 
 	public function get_post_data() {
 		$this->_elf_month = EED_Events_Archive_Filters::_display_month();
 		$this->_elf_category = EED_Events_Archive_Filters::_event_category_slug();
-		$this->_show_expired = EED_Events_Archive_Filters::_show_expired( TRUE );
+		$this->_show_expired = EED_Events_Archive_Filters::_show_expired(TRUE);
 //		EEH_Debug_Tools::printr( EE_Registry::instance()->REQ, 'EE_Registry::instance()->REQ  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 //		echo '<h4>$this->_elf_month : ' . $this->_elf_month . '  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>';
 //		echo '<h4>$this->_elf_category : ' . $this->_elf_category . '  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>';
@@ -256,11 +256,11 @@ 
 	 *  @access 	public
 	 *  @return 	void
 	 */
-	public function posts_join( $SQL, WP_Query $wp_query ) {
-		if ( isset( $wp_query->query ) && isset( $wp_query->query['post_type'] ) && $wp_query->query['post_type'] == 'espresso_events' ) {
+	public function posts_join($SQL, WP_Query $wp_query) {
+		if (isset($wp_query->query) && isset($wp_query->query['post_type']) && $wp_query->query['post_type'] == 'espresso_events') {
 			// Category
 //			$elf_category = EE_Registry::instance()->REQ->is_set( 'elf_category_dd' ) ? sanitize_text_field( EE_Registry::instance()->REQ->get( 'elf_category_dd' )) : '';
-			$SQL .= EED_Events_Archive_Filters::posts_join_sql_for_terms( EED_Events_Archive_Filters::_event_category_slug() );
+			$SQL .= EED_Events_Archive_Filters::posts_join_sql_for_terms(EED_Events_Archive_Filters::_event_category_slug());
 		}
 		return $SQL;
 	}
@@ -273,9 +273,9 @@ 
 	 *  @param	mixed boolean|string	$join_terms pass TRUE or term string, doesn't really matter since this value doesn't really get used for anything yet
 	 *  @return 	string
 	 */
-	public static function posts_join_sql_for_terms( $join_terms = NULL ) {
-		$SQL= '';
-		if ( ! empty( $join_terms )) {
+	public static function posts_join_sql_for_terms($join_terms = NULL) {
+		$SQL = '';
+		if ( ! empty($join_terms)) {
 			global $wpdb;
 			$SQL .= " LEFT JOIN $wpdb->term_relationships ON ($wpdb->posts.ID = $wpdb->term_relationships.object_id)";
 			$SQL .= " LEFT JOIN $wpdb->term_taxonomy ON ($wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id)";
@@ -293,28 +293,28 @@ 
 	 *  @param	array	$orderby_params
 	 *  @return 	string
 	 */
-	public static function posts_join_for_orderby( $orderby_params = array() ) {
+	public static function posts_join_for_orderby($orderby_params = array()) {
 		global $wpdb;
-		$SQL= '';
-		$orderby_params = is_array( $orderby_params ) ? $orderby_params : array( $orderby_params );
-		foreach( $orderby_params as $orderby ) {
-			switch ( $orderby ) {
+		$SQL = '';
+		$orderby_params = is_array($orderby_params) ? $orderby_params : array($orderby_params);
+		foreach ($orderby_params as $orderby) {
+			switch ($orderby) {
 
 				case 'ticket_start' :
 				case 'ticket_end' :
-					$SQL .= ' LEFT JOIN ' . EEM_Datetime_Ticket::instance()->table() . ' ON (' . EEM_Datetime::instance()->table() . '.DTT_ID = ' . EEM_Datetime_Ticket::instance()->table() . '.DTT_ID )';
-					$SQL .= ' LEFT JOIN ' . EEM_Ticket::instance()->table() . ' ON (' . EEM_Datetime_Ticket::instance()->table() . '.TKT_ID = ' . EEM_Ticket::instance()->table() . '.TKT_ID )';
+					$SQL .= ' LEFT JOIN '.EEM_Datetime_Ticket::instance()->table().' ON ('.EEM_Datetime::instance()->table().'.DTT_ID = '.EEM_Datetime_Ticket::instance()->table().'.DTT_ID )';
+					$SQL .= ' LEFT JOIN '.EEM_Ticket::instance()->table().' ON ('.EEM_Datetime_Ticket::instance()->table().'.TKT_ID = '.EEM_Ticket::instance()->table().'.TKT_ID )';
 					break;
 
 				case 'venue_title' :
 				case 'city' :
-					$SQL .= ' LEFT JOIN ' . EEM_Event_Venue::instance()->table() . ' ON (' . $wpdb->posts . '.ID = ' . EEM_Event_Venue::instance()->table() . '.EVT_ID )';
-					$SQL .= ' LEFT JOIN ' . EEM_Venue::instance()->table() . ' ON (' . EEM_Event_Venue::instance()->table() . '.VNU_ID = ' . EEM_Venue::instance()->table() . '.VNU_ID )';
+					$SQL .= ' LEFT JOIN '.EEM_Event_Venue::instance()->table().' ON ('.$wpdb->posts.'.ID = '.EEM_Event_Venue::instance()->table().'.EVT_ID )';
+					$SQL .= ' LEFT JOIN '.EEM_Venue::instance()->table().' ON ('.EEM_Event_Venue::instance()->table().'.VNU_ID = '.EEM_Venue::instance()->table().'.VNU_ID )';
 					break;
 
 				case 'state' :
-					$SQL .= ' LEFT JOIN ' . EEM_Event_Venue::instance()->table() . ' ON (' . $wpdb->posts . '.ID = ' . EEM_Event_Venue::instance()->table() . '.EVT_ID )';
-					$SQL .= ' LEFT JOIN ' . EEM_Event_Venue::instance()->second_table() . ' ON (' . EEM_Event_Venue::instance()->table() . '.VNU_ID = ' . EEM_Event_Venue::instance()->second_table() . '.VNU_ID )';
+					$SQL .= ' LEFT JOIN '.EEM_Event_Venue::instance()->table().' ON ('.$wpdb->posts.'.ID = '.EEM_Event_Venue::instance()->table().'.EVT_ID )';
+					$SQL .= ' LEFT JOIN '.EEM_Event_Venue::instance()->second_table().' ON ('.EEM_Event_Venue::instance()->table().'.VNU_ID = '.EEM_Event_Venue::instance()->second_table().'.VNU_ID )';
 					break;
 
 				break;
@@ -331,16 +331,16 @@ 
 	 *  @access 	public
 	 *  @return 	void
 	 */
-	public function posts_where( $SQL, WP_Query $wp_query ) {
-		if ( isset( $wp_query->query_vars ) && isset( $wp_query->query_vars['post_type'] ) && $wp_query->query_vars['post_type'] == 'espresso_events'  ) {
+	public function posts_where($SQL, WP_Query $wp_query) {
+		if (isset($wp_query->query_vars) && isset($wp_query->query_vars['post_type']) && $wp_query->query_vars['post_type'] == 'espresso_events') {
 			// Show Expired ?
-			$SQL .= EED_Events_Archive_Filters::posts_where_sql_for_show_expired( EED_Events_Archive_Filters::_show_expired() );
+			$SQL .= EED_Events_Archive_Filters::posts_where_sql_for_show_expired(EED_Events_Archive_Filters::_show_expired());
 			// Category
 			//$elf_category = EED_Events_Archive_Filters::_event_category_slug();
-			$SQL .=  EED_Events_Archive_Filters::posts_where_sql_for_event_category_slug( EED_Events_Archive_Filters::_event_category_slug() );
+			$SQL .= EED_Events_Archive_Filters::posts_where_sql_for_event_category_slug(EED_Events_Archive_Filters::_event_category_slug());
 			// Start Date
 			//$elf_month = EED_Events_Archive_Filters::_display_month();
-			$SQL .= EED_Events_Archive_Filters::posts_where_sql_for_event_list_month( EED_Events_Archive_Filters::_display_month() );
+			$SQL .= EED_Events_Archive_Filters::posts_where_sql_for_event_list_month(EED_Events_Archive_Filters::_display_month());
 		}
 		return $SQL;
 	}
@@ -353,8 +353,8 @@ 
 	 *  @param	boolean	$show_expired if TRUE, then displayed past events
 	 *  @return 	string
 	 */
-	public static function posts_where_sql_for_show_expired( $show_expired = FALSE ) {
-		return  ! $show_expired ? ' AND ' . EEM_Datetime::instance()->table() . '.DTT_EVT_end > "' . date('Y-m-d H:s:i') . '" ' : '';
+	public static function posts_where_sql_for_show_expired($show_expired = FALSE) {
+		return  ! $show_expired ? ' AND '.EEM_Datetime::instance()->table().'.DTT_EVT_end > "'.date('Y-m-d H:s:i').'" ' : '';
 	}
 
 
@@ -365,9 +365,9 @@ 
 	 *  @param	boolean	$event_category_slug
 	 *  @return 	string
 	 */
-	public static function posts_where_sql_for_event_category_slug( $event_category_slug = NULL ) {
+	public static function posts_where_sql_for_event_category_slug($event_category_slug = NULL) {
 		global $wpdb;
-		return  ! empty( $event_category_slug ) ? ' AND ' . $wpdb->terms . '.slug = "' . $event_category_slug . '" ' : '';
+		return  ! empty($event_category_slug) ? ' AND '.$wpdb->terms.'.slug = "'.$event_category_slug.'" ' : '';
 	}
 
 	/**
@@ -377,13 +377,13 @@ 
 	 *  @param	boolean	$month
 	 *  @return 	string
 	 */
-	public static function posts_where_sql_for_event_list_month( $month = NULL ) {
-		$SQL= '';
-		if ( ! empty( $month )) {
+	public static function posts_where_sql_for_event_list_month($month = NULL) {
+		$SQL = '';
+		if ( ! empty($month)) {
 			// event start date is LESS than the end of the month ( so nothing that doesn't start until next month )
-			$SQL = ' AND ' . EEM_Datetime::instance()->table() . '.DTT_EVT_start <= "' . date('Y-m-t 23:59:59', strtotime( $month )) . '"';
+			$SQL = ' AND '.EEM_Datetime::instance()->table().'.DTT_EVT_start <= "'.date('Y-m-t 23:59:59', strtotime($month)).'"';
 			// event end date is GREATER than the start of the month ( so nothing that ended before this month )
-			$SQL .= ' AND ' . EEM_Datetime::instance()->table() . '.DTT_EVT_end >= "' . date('Y-m-d 0:0:00', strtotime( $month )) . '" ';
+			$SQL .= ' AND '.EEM_Datetime::instance()->table().'.DTT_EVT_end >= "'.date('Y-m-d 0:0:00', strtotime($month)).'" ';
 		}
 		return $SQL;
 	}
@@ -395,9 +395,9 @@ 
 	 *  @access 	public
 	 *  @return 	void
 	 */
-	public function posts_orderby( $SQL, WP_Query $wp_query ) {
-		if ( isset( $wp_query->query ) && isset( $wp_query->query['post_type'] ) && $wp_query->query['post_type'] == 'espresso_events' ) {
-			$SQL = EED_Events_Archive_Filters::posts_orderby_sql( array( 'start_date' ));
+	public function posts_orderby($SQL, WP_Query $wp_query) {
+		if (isset($wp_query->query) && isset($wp_query->query['post_type']) && $wp_query->query['post_type'] == 'espresso_events') {
+			$SQL = EED_Events_Archive_Filters::posts_orderby_sql(array('start_date'));
 		}
 		return $SQL;
 	}
@@ -426,54 +426,54 @@ 
 	 *  @param	boolean	$orderby_params
 	 *  @return 	string
 	 */
-	public static function posts_orderby_sql( $orderby_params = array(), $sort = 'ASC' ) {
+	public static function posts_orderby_sql($orderby_params = array(), $sort = 'ASC') {
 		global $wpdb;
 		$SQL = '';
 		$cntr = 1;
-		$orderby_params = is_array( $orderby_params ) ? $orderby_params : array( $orderby_params );
-		foreach( $orderby_params as $orderby ) {
-			$glue = $cntr == 1 || $cntr == count( $orderby_params ) ? ' ' : ', ';
-			switch ( $orderby ) {
+		$orderby_params = is_array($orderby_params) ? $orderby_params : array($orderby_params);
+		foreach ($orderby_params as $orderby) {
+			$glue = $cntr == 1 || $cntr == count($orderby_params) ? ' ' : ', ';
+			switch ($orderby) {
 
 				case 'id' :
 				case 'ID' :
-					$SQL .= $glue . $wpdb->posts . '.ID ' . $sort;
+					$SQL .= $glue.$wpdb->posts.'.ID '.$sort;
 					break;
 
 				case 'start_date' :
-					$SQL .= $glue . EEM_Datetime::instance()->table() . '.DTT_EVT_start ' . $sort;
+					$SQL .= $glue.EEM_Datetime::instance()->table().'.DTT_EVT_start '.$sort;
 					break;
 
 				case 'end_date' :
-					$SQL .= $glue . EEM_Datetime::instance()->table() . '.DTT_EVT_end ' . $sort;
+					$SQL .= $glue.EEM_Datetime::instance()->table().'.DTT_EVT_end '.$sort;
 					break;
 
 				case 'event_name' :
-					$SQL .= $glue . $wpdb->posts . '.post_title ' . $sort;
+					$SQL .= $glue.$wpdb->posts.'.post_title '.$sort;
 					break;
 
 				case 'category_slug' :
-					$SQL .= $glue . $wpdb->terms . '.slug ' . $sort;
+					$SQL .= $glue.$wpdb->terms.'.slug '.$sort;
 					break;
 
 				case 'ticket_start' :
-					$SQL .= $glue . EEM_Ticket::instance()->table() . '.TKT_start_date ' . $sort;
+					$SQL .= $glue.EEM_Ticket::instance()->table().'.TKT_start_date '.$sort;
 					break;
 
 				case 'ticket_end' :
-					$SQL .= $glue . EEM_Ticket::instance()->table() . '.TKT_end_date ' . $sort;
+					$SQL .= $glue.EEM_Ticket::instance()->table().'.TKT_end_date '.$sort;
 					break;
 
 				case 'venue_title' :
-					$SQL .= $glue . 'venue_title ' . $sort;
+					$SQL .= $glue.'venue_title '.$sort;
 					break;
 
 				case 'city' :
-					$SQL .= $glue . EEM_Venue::instance()->second_table() . '.VNU_city ' . $sort;
+					$SQL .= $glue.EEM_Venue::instance()->second_table().'.VNU_city '.$sort;
 				break;
 
 				case 'state' :
-					$SQL .= $glue . EEM_State::instance()->table() . '.STA_name ' . $sort;
+					$SQL .= $glue.EEM_State::instance()->table().'.STA_name '.$sort;
 				break;
 
 			}
@@ -493,26 +493,26 @@ 
 	 */
 	public function template_redirect() {
 		// add event list filters
-		add_action( 'loop_start', array( $this, 'event_list_template_filters' ));
+		add_action('loop_start', array($this, 'event_list_template_filters'));
 		// and pagination
-		add_action( 'loop_start', array( $this, 'event_list_pagination' ));
-		add_action( 'loop_end', array( $this, 'event_list_pagination' ));
+		add_action('loop_start', array($this, 'event_list_pagination'));
+		add_action('loop_end', array($this, 'event_list_pagination'));
 		// if NOT a custom template
-		if ( EE_Registry::instance()->load_core( 'Front_Controller', array(), false, true )->get_selected_template() != 'archive-espresso_events.php' ) {
+		if (EE_Registry::instance()->load_core('Front_Controller', array(), false, true)->get_selected_template() != 'archive-espresso_events.php') {
 			// don't know if theme uses the_excerpt
-			add_filter( 'the_excerpt', array( $this, 'event_details' ), 100 );
-			add_filter( 'the_excerpt', array( $this, 'event_tickets' ), 110 );
-			add_filter( 'the_excerpt', array( $this, 'event_datetimes' ), 120 );
-			add_filter( 'the_excerpt', array( $this, 'event_venues' ), 130 );
+			add_filter('the_excerpt', array($this, 'event_details'), 100);
+			add_filter('the_excerpt', array($this, 'event_tickets'), 110);
+			add_filter('the_excerpt', array($this, 'event_datetimes'), 120);
+			add_filter('the_excerpt', array($this, 'event_venues'), 130);
 			// or the_content
-			add_filter( 'the_content', array( $this, 'event_details' ), 100 );
-			add_filter( 'the_content', array( $this, 'event_tickets' ), 110 );
-			add_filter( 'the_content', array( $this, 'event_datetimes' ), 120 );
-			add_filter( 'the_content', array( $this, 'event_venues' ), 130 );
+			add_filter('the_content', array($this, 'event_details'), 100);
+			add_filter('the_content', array($this, 'event_tickets'), 110);
+			add_filter('the_content', array($this, 'event_datetimes'), 120);
+			add_filter('the_content', array($this, 'event_venues'), 130);
 		} else {
-			remove_all_filters( 'excerpt_length' );
-			add_filter( 'excerpt_length', array( $this, 'excerpt_length' ), 10 );
-			add_filter( 'excerpt_more', array( $this, 'excerpt_more' ), 10 );
+			remove_all_filters('excerpt_length');
+			add_filter('excerpt_length', array($this, 'excerpt_length'), 10);
+			add_filter('excerpt_more', array($this, 'excerpt_more'), 10);
 		}
 	}
 
@@ -525,7 +525,7 @@ 
 	 *  	@return 		void
 	 */
 	public function event_list_pagination() {
-		echo '<div class="ee-pagination-dv clear">' . espresso_event_list_pagination() . '</div>';
+		echo '<div class="ee-pagination-dv clear">'.espresso_event_list_pagination().'</div>';
 	}
 
 
@@ -536,8 +536,8 @@ 
 	 * 	@param		string 	$content
 	 *  	@return 		void
 	 */
-	public function event_details( $content ) {
-		return EEH_Template::display_template( EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'content-espresso_events-details.php', array( 'the_content' => $content ), TRUE );
+	public function event_details($content) {
+		return EEH_Template::display_template(EE_TEMPLATES.EE_Config::get_current_theme().DS.'content-espresso_events-details.php', array('the_content' => $content), TRUE);
 	}
 
 
@@ -548,8 +548,8 @@ 
 	 * 	@param		string 	$content
 	 *  	@return 		void
 	 */
-	public function event_tickets( $content ) {
-		return $content . EEH_Template::display_template( EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'content-espresso_events-tickets.php', array(), TRUE );
+	public function event_tickets($content) {
+		return $content.EEH_Template::display_template(EE_TEMPLATES.EE_Config::get_current_theme().DS.'content-espresso_events-tickets.php', array(), TRUE);
 	}
 
 	/**
@@ -559,8 +559,8 @@ 
 	 * 	@param		string 	$content
 	 *  	@return 		void
 	 */
-	public function event_datetimes( $content ) {
-		return $content . EEH_Template::display_template( EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'content-espresso_events-datetimes.php', array(), TRUE );
+	public function event_datetimes($content) {
+		return $content.EEH_Template::display_template(EE_TEMPLATES.EE_Config::get_current_theme().DS.'content-espresso_events-datetimes.php', array(), TRUE);
 	}
 
 	/**
@@ -570,8 +570,8 @@ 
 	 * 	@param		string 	$content
 	 *  	@return 		void
 	 */
-	public function event_venues( $content ) {
-		return $content . EEH_Template::display_template( EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'content-espresso_events-venues.php', array(), TRUE );
+	public function event_venues($content) {
+		return $content.EEH_Template::display_template(EE_TEMPLATES.EE_Config::get_current_theme().DS.'content-espresso_events-venues.php', array(), TRUE);
 	}
 
 
@@ -586,12 +586,12 @@ 
 	 *  @return 	void
 	 */
 	private function _load_assests() {
-		do_action( 'AHEE__EED_Events_Archive_Filters__before_load_assests' );
-		add_filter( 'FHEE_load_css', '__return_true' );
-		add_filter( 'FHEE_load_EE_Session', '__return_true' );
-		add_action('wp_enqueue_scripts', array( $this, 'wp_enqueue_scripts' ), 10 );
-		if ( EE_Registry::instance()->CFG->map_settings->use_google_maps ) {
-			add_action('wp_enqueue_scripts', array( 'EEH_Maps', 'espresso_google_map_js' ), 11 );
+		do_action('AHEE__EED_Events_Archive_Filters__before_load_assests');
+		add_filter('FHEE_load_css', '__return_true');
+		add_filter('FHEE_load_EE_Session', '__return_true');
+		add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 10);
+		if (EE_Registry::instance()->CFG->map_settings->use_google_maps) {
+			add_action('wp_enqueue_scripts', array('EEH_Maps', 'espresso_google_map_js'), 11);
 		}
 		//add_filter( 'the_excerpt', array( $this, 'the_excerpt' ), 999 );
 	}
@@ -606,8 +606,8 @@ 
 	 *  @access 	private
 	 *  @return 	string
 	 */
-	private function _get_template( $which = 'part' ) {
-		return EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_events.php';
+	private function _get_template($which = 'part') {
+		return EE_TEMPLATES.EE_Config::get_current_theme().DS.'archive-espresso_events.php';
 	}
 
 
@@ -618,13 +618,13 @@ 
 	 *  @access 	public
 	 *  @return 	void
 	 */
-	public function excerpt_length( $length ) {
+	public function excerpt_length($length) {
 
-		if ( self::$_type == 'grid' ) {
+		if (self::$_type == 'grid') {
 			return 36;
 		}
 
-		switch ( EE_Registry::instance()->CFG->template_settings->EED_Events_Archive_Filters->event_list_grid_size ) {
+		switch (EE_Registry::instance()->CFG->template_settings->EED_Events_Archive_Filters->event_list_grid_size) {
 			case 'tiny' :
 				return 12;
 				break;
@@ -648,7 +648,7 @@ 
 	 *  @access 	public
 	 *  @return 	void
 	 */
-	public function excerpt_more( $more ) {
+	public function excerpt_more($more) {
 		return '&hellip;';
 	}
 
@@ -678,22 +678,22 @@ 
 	 */
 	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 ( is_readable( get_stylesheet_directory() . EE_Config::get_current_theme() . DS . 'archive-espresso_events.css' )) {
-				wp_register_style( 'archive-espresso_events', get_stylesheet_directory_uri() . EE_Config::get_current_theme() . DS . 'archive-espresso_events.css', array( 'dashicons', 'espresso_default' ));
+			if (is_readable(get_stylesheet_directory().EE_Config::get_current_theme().DS.'archive-espresso_events.css')) {
+				wp_register_style('archive-espresso_events', get_stylesheet_directory_uri().EE_Config::get_current_theme().DS.'archive-espresso_events.css', array('dashicons', 'espresso_default'));
 			} else {
-				wp_register_style( 'archive-espresso_events', EE_TEMPLATES_URL . EE_Config::get_current_theme() . DS . 'archive-espresso_events.css', array( 'dashicons', 'espresso_default' ));
+				wp_register_style('archive-espresso_events', EE_TEMPLATES_URL.EE_Config::get_current_theme().DS.'archive-espresso_events.css', array('dashicons', 'espresso_default'));
 			}
-			if ( is_readable( get_stylesheet_directory() . EE_Config::get_current_theme() . DS . 'archive-espresso_events.js' )) {
-				wp_register_script( 'archive-espresso_events', get_stylesheet_directory_uri() . EE_Config::get_current_theme() . DS . 'archive-espresso_events.js', array( 'jquery-masonry' ), '1.0', TRUE  );
+			if (is_readable(get_stylesheet_directory().EE_Config::get_current_theme().DS.'archive-espresso_events.js')) {
+				wp_register_script('archive-espresso_events', get_stylesheet_directory_uri().EE_Config::get_current_theme().DS.'archive-espresso_events.js', array('jquery-masonry'), '1.0', TRUE);
 			} else {
-				wp_register_script( 'archive-espresso_events', EVENTS_ARCHIVE_ASSETS_URL . 'archive-espresso_events.js', array( 'jquery-masonry' ), '1.0', TRUE );
+				wp_register_script('archive-espresso_events', EVENTS_ARCHIVE_ASSETS_URL.'archive-espresso_events.js', array('jquery-masonry'), '1.0', TRUE);
 			}
-			wp_enqueue_style( 'archive-espresso_events' );
-			wp_enqueue_script( 'jquery-masonry' );
-			wp_enqueue_script( 'archive-espresso_events' );
-			add_action( 'wp_footer', array( 'EED_Events_Archive_Filters', 'localize_grid_event_lists' ), 1 );
+			wp_enqueue_style('archive-espresso_events');
+			wp_enqueue_script('jquery-masonry');
+			wp_enqueue_script('archive-espresso_events');
+			add_action('wp_footer', array('EED_Events_Archive_Filters', 'localize_grid_event_lists'), 1);
 		}
 	}
 
@@ -708,7 +708,7 @@ 
 	 *  @return 	void
 	 */
 	public static function localize_grid_event_lists() {
-		wp_localize_script( 'archive-espresso_events', 'espresso_grid_event_lists', EED_Events_Archive_Filters::$espresso_grid_event_lists );
+		wp_localize_script('archive-espresso_events', 'espresso_grid_event_lists', EED_Events_Archive_Filters::$espresso_grid_event_lists);
 	}
 
 
@@ -723,9 +723,9 @@ 
 	 */
 	public static function template_settings_form() {
 		$EE = EE_Registry::instance();
-		$EE->CFG->template_settings->EED_Events_Archive_Filters = isset( $EE->CFG->template_settings->EED_Events_Archive_Filters ) ? $EE->CFG->template_settings->EED_Events_Archive_Filters : new EE_Events_Archive_Config();
-		$EE->CFG->template_settings->EED_Events_Archive_Filters = apply_filters( 'FHEE__Event_List__template_settings_form__event_list_config', $EE->CFG->template_settings->EED_Events_Archive_Filters );
-		EEH_Template::display_template( EVENTS_ARCHIVE_TEMPLATES_PATH . 'admin-event-list-settings.template.php', $EE->CFG->template_settings->EED_Events_Archive_Filters );
+		$EE->CFG->template_settings->EED_Events_Archive_Filters = isset($EE->CFG->template_settings->EED_Events_Archive_Filters) ? $EE->CFG->template_settings->EED_Events_Archive_Filters : new EE_Events_Archive_Config();
+		$EE->CFG->template_settings->EED_Events_Archive_Filters = apply_filters('FHEE__Event_List__template_settings_form__event_list_config', $EE->CFG->template_settings->EED_Events_Archive_Filters);
+		EEH_Template::display_template(EVENTS_ARCHIVE_TEMPLATES_PATH.'admin-event-list-settings.template.php', $EE->CFG->template_settings->EED_Events_Archive_Filters);
 	}
 
 
@@ -739,16 +739,16 @@ 
 	 *  @static
 	 *  @return 	void
 	 */
-	public static function set_default_settings( $CFG ) {
+	public static function set_default_settings($CFG) {
 		//EEH_Debug_Tools::printr( $CFG, '$CFG  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-		$CFG->display_description = isset( $CFG->display_description ) && ! empty( $CFG->display_description ) ? $CFG->display_description : 1;
-		$CFG->display_address = isset( $CFG->display_address ) && ! empty( $CFG->display_address ) ? $CFG->display_address : TRUE;
-		$CFG->display_venue_details = isset( $CFG->display_venue_details ) && ! empty( $CFG->display_venue_details ) ? $CFG->display_venue_details : TRUE;
-		$CFG->display_expired_events = isset( $CFG->display_expired_events ) && ! empty( $CFG->display_expired_events ) ? $CFG->display_expired_events : FALSE;
-		$CFG->default_type = isset( $CFG->default_type ) && ! empty( $CFG->default_type ) ? $CFG->default_type : 'grid';
-		$CFG->event_list_grid_size = isset( $CFG->event_list_grid_size ) && ! empty( $CFG->event_list_grid_size ) ? $CFG->event_list_grid_size : 'medium';
-		$CFG->templates['full'] = isset( $CFG->templates['full'] ) && ! empty( $CFG->templates['full'] ) ? $CFG->templates['full'] : EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_events.php';
-		$CFG->templates['part'] = isset( $CFG->templates['part'] ) && ! empty( $CFG->templates['part'] ) ? $CFG->templates['part'] : EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_events-grid-view.php';
+		$CFG->display_description = isset($CFG->display_description) && ! empty($CFG->display_description) ? $CFG->display_description : 1;
+		$CFG->display_address = isset($CFG->display_address) && ! empty($CFG->display_address) ? $CFG->display_address : TRUE;
+		$CFG->display_venue_details = isset($CFG->display_venue_details) && ! empty($CFG->display_venue_details) ? $CFG->display_venue_details : TRUE;
+		$CFG->display_expired_events = isset($CFG->display_expired_events) && ! empty($CFG->display_expired_events) ? $CFG->display_expired_events : FALSE;
+		$CFG->default_type = isset($CFG->default_type) && ! empty($CFG->default_type) ? $CFG->default_type : 'grid';
+		$CFG->event_list_grid_size = isset($CFG->event_list_grid_size) && ! empty($CFG->event_list_grid_size) ? $CFG->event_list_grid_size : 'medium';
+		$CFG->templates['full'] = isset($CFG->templates['full']) && ! empty($CFG->templates['full']) ? $CFG->templates['full'] : EE_TEMPLATES.EE_Config::get_current_theme().DS.'archive-espresso_events.php';
+		$CFG->templates['part'] = isset($CFG->templates['part']) && ! empty($CFG->templates['part']) ? $CFG->templates['part'] : EE_TEMPLATES.EE_Config::get_current_theme().DS.'archive-espresso_events-grid-view.php';
 		return $CFG;
 	}
 
@@ -760,7 +760,7 @@ 
 	 *  @access 	public
 	 *  @return 	void
 	 */
-	public function filter_config( $CFG ) {
+	public function filter_config($CFG) {
 		return $CFG;
 	}
 
@@ -773,32 +773,32 @@ 
 	 *  @access 	public
 	 *  @return 	void
 	 */
-	public static function update_template_settings( $CFG, $REQ ) {
+	public static function update_template_settings($CFG, $REQ) {
 //		EEH_Debug_Tools::printr( $REQ, '$REQ  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 //		EEH_Debug_Tools::printr( $CFG, '$CFG  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 		//$CFG->template_settings->EED_Events_Archive_Filters = new stdClass();
-		$CFG->EED_Events_Archive_Filters->display_description = isset( $REQ['display_description_in_event_list'] ) ? absint( $REQ['display_description_in_event_list'] ) : 1;
-		$CFG->EED_Events_Archive_Filters->display_address = isset( $REQ['display_address_in_event_list'] ) ? absint( $REQ['display_address_in_event_list'] ) : TRUE;
-		$CFG->EED_Events_Archive_Filters->display_venue_details = isset( $REQ['display_venue_details_in_event_list'] ) ? absint( $REQ['display_venue_details_in_event_list'] ) : TRUE;
-		$CFG->EED_Events_Archive_Filters->display_expired_events = isset( $REQ['display_expired_events'] ) ? absint( $REQ['display_expired_events'] ) : FALSE;
-		$CFG->EED_Events_Archive_Filters->default_type = isset( $REQ['default_type'] ) ? sanitize_text_field( $REQ['default_type'] ) : 'grid';
-		$CFG->EED_Events_Archive_Filters->event_list_grid_size = isset( $REQ['event_list_grid_size'] ) ? sanitize_text_field( $REQ['event_list_grid_size'] ) : 'medium';
+		$CFG->EED_Events_Archive_Filters->display_description = isset($REQ['display_description_in_event_list']) ? absint($REQ['display_description_in_event_list']) : 1;
+		$CFG->EED_Events_Archive_Filters->display_address = isset($REQ['display_address_in_event_list']) ? absint($REQ['display_address_in_event_list']) : TRUE;
+		$CFG->EED_Events_Archive_Filters->display_venue_details = isset($REQ['display_venue_details_in_event_list']) ? absint($REQ['display_venue_details_in_event_list']) : TRUE;
+		$CFG->EED_Events_Archive_Filters->display_expired_events = isset($REQ['display_expired_events']) ? absint($REQ['display_expired_events']) : FALSE;
+		$CFG->EED_Events_Archive_Filters->default_type = isset($REQ['default_type']) ? sanitize_text_field($REQ['default_type']) : 'grid';
+		$CFG->EED_Events_Archive_Filters->event_list_grid_size = isset($REQ['event_list_grid_size']) ? sanitize_text_field($REQ['event_list_grid_size']) : 'medium';
 		$CFG->EED_Events_Archive_Filters->templates = array(
-				'full'  => EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_events.php'
+				'full'  => EE_TEMPLATES.EE_Config::get_current_theme().DS.'archive-espresso_events.php'
 			);
 
-		switch ( $CFG->EED_Events_Archive_Filters->default_type ) {
+		switch ($CFG->EED_Events_Archive_Filters->default_type) {
 			case 'dates' :
-					$CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_events-dates-view.php';
+					$CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES.EE_Config::get_current_theme().DS.'archive-espresso_events-dates-view.php';
 				break;
 			case 'text' :
-					$CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_events-text-view.php';
+					$CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES.EE_Config::get_current_theme().DS.'archive-espresso_events-text-view.php';
 				break;
 			default :
-					$CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_events-grid-view.php';
+					$CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES.EE_Config::get_current_theme().DS.'archive-espresso_events-grid-view.php';
 		}
 
-		$CFG->EED_Events_Archive_Filters = isset( $REQ['reset_event_list_settings'] ) && absint( $REQ['reset_event_list_settings'] ) == 1 ? new EE_Events_Archive_Config() : $CFG->EED_Events_Archive_Filters;
+		$CFG->EED_Events_Archive_Filters = isset($REQ['reset_event_list_settings']) && absint($REQ['reset_event_list_settings']) == 1 ? new EE_Events_Archive_Config() : $CFG->EED_Events_Archive_Filters;
 		return $CFG;
 	}
 
@@ -813,7 +813,7 @@ 
 	 *  @return 	void
 	 */
 	public static function get_template_part() {
-		switch ( self::$_type ) {
+		switch (self::$_type) {
 			case 'dates' :
 					return 'archive-espresso_events-dates-view.php';
 				break;
@@ -837,13 +837,13 @@ 
 	 */
 	public function event_list_template_filters() {
 		$args = array(
-			'form_url' => get_post_type_archive_link( 'espresso_events' ), //add_query_arg( array( 'post_type' => 'espresso_events' ), home_url() ),
+			'form_url' => get_post_type_archive_link('espresso_events'), //add_query_arg( array( 'post_type' => 'espresso_events' ), home_url() ),
 			'elf_month' => EED_Events_Archive_Filters::_display_month(),
 			'elf_category' => EED_Events_Archive_Filters::_event_category_slug(),
 			'elf_show_expired' => EED_Events_Archive_Filters::_show_expired(),
 			'elf_type' => self::$_type
 		);
-		EEH_Template::display_template( EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_events-filters.php', $args );
+		EEH_Template::display_template(EE_TEMPLATES.EE_Config::get_current_theme().DS.'archive-espresso_events-filters.php', $args);
 	}
 
 
@@ -856,16 +856,16 @@ 
 	 *  @access 	public
 	 *  @return 	void
 	 */
-	public static function event_list_css( $extra_class = '' ) {
+	public static function event_list_css($extra_class = '') {
 		$EE = EE_Registry::instance();
-		$event_list_css = ! empty( $extra_class ) ? array( $extra_class ) : array();
+		$event_list_css = ! empty($extra_class) ? array($extra_class) : array();
 		$event_list_css[] = 'espresso-event-list-event';
-		if ( self::$_type == 'grid' ) {
-			$event_list_grid_size = isset( $EE->CFG->template_settings->EED_Events_Archive_Filters->event_list_grid_size ) ? $EE->CFG->template_settings->EED_Events_Archive_Filters->event_list_grid_size : 'medium';
-			$event_list_css[] = $event_list_grid_size . '-event-list-grid';
+		if (self::$_type == 'grid') {
+			$event_list_grid_size = isset($EE->CFG->template_settings->EED_Events_Archive_Filters->event_list_grid_size) ? $EE->CFG->template_settings->EED_Events_Archive_Filters->event_list_grid_size : 'medium';
+			$event_list_css[] = $event_list_grid_size.'-event-list-grid';
 		}
-		$event_list_css = apply_filters( 'EED_Events_Archive_Filters__event_list_css__event_list_css_array', $event_list_css );
-		return implode( ' ', $event_list_css );
+		$event_list_css = apply_filters('EED_Events_Archive_Filters__event_list_css__event_list_css_array', $event_list_css);
+		return implode(' ', $event_list_css);
 	}
 
 
@@ -891,9 +891,9 @@ 
 	 *  @access 	public
 	 *  @return 	void
 	 */
-	public static function display_description( $value ) {
+	public static function display_description($value) {
 		$EE = EE_Registry::instance();
-		$display_description= isset( $EE->CFG->template_settings->EED_Events_Archive_Filters->display_description ) ? $EE->CFG->template_settings->EED_Events_Archive_Filters->display_description : 1;
+		$display_description = isset($EE->CFG->template_settings->EED_Events_Archive_Filters->display_description) ? $EE->CFG->template_settings->EED_Events_Archive_Filters->display_description : 1;
 		return $display_description === $value ? TRUE : FALSE;
 	}
 
@@ -907,9 +907,9 @@ 
 	 */
 	public static function display_venue_details() {
 		$EE = EE_Registry::instance();
-		$display_venue_details= isset( $EE->CFG->template_settings->EED_Events_Archive_Filters->display_venue_details ) ? $EE->CFG->template_settings->EED_Events_Archive_Filters->display_venue_details : TRUE;
+		$display_venue_details = isset($EE->CFG->template_settings->EED_Events_Archive_Filters->display_venue_details) ? $EE->CFG->template_settings->EED_Events_Archive_Filters->display_venue_details : TRUE;
 		$venue_name = EEH_Venue_View::venue_name();
-		return $display_venue_details && ! empty( $venue_name ) ? TRUE : FALSE;
+		return $display_venue_details && ! empty($venue_name) ? TRUE : FALSE;
 	}
 
 
@@ -921,9 +921,9 @@ 
 	 */
 	public static function display_address() {
 		$EE = EE_Registry::instance();
-		$display_address= isset( $EE->CFG->template_settings->EED_Events_Archive_Filters->display_address ) ? $EE->CFG->template_settings->EED_Events_Archive_Filters->display_address : FALSE;
+		$display_address = isset($EE->CFG->template_settings->EED_Events_Archive_Filters->display_address) ? $EE->CFG->template_settings->EED_Events_Archive_Filters->display_address : FALSE;
 		$venue_name = EEH_Venue_View::venue_name();
-		return $display_address && ! empty( $venue_name ) ? TRUE : FALSE;
+		return $display_address && ! empty($venue_name) ? TRUE : FALSE;
 	}
 
 
@@ -937,22 +937,22 @@ 
 	public static function pagination() {
 		global $wp_query;
 		$big = 999999999; // need an unlikely integer
-		$pagination = paginate_links( array(
-			'base' => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
+		$pagination = paginate_links(array(
+			'base' => str_replace($big, '%#%', esc_url(get_pagenum_link($big))),
 			'format' => '?paged=%#%',
-			'current' => max( 1, get_query_var('paged') ),
+			'current' => max(1, get_query_var('paged')),
 			'total' => $wp_query->max_num_pages,
 			'show_all'     => TRUE,
 			'end_size'     => 10,
 			'mid_size'     => 6,
 			'prev_next'    => TRUE,
-			'prev_text'    => __( '&lsaquo; PREV', 'event_espresso' ),
-			'next_text'    => __( 'NEXT &rsaquo;', 'event_espresso' ),
+			'prev_text'    => __('&lsaquo; PREV', 'event_espresso'),
+			'next_text'    => __('NEXT &rsaquo;', 'event_espresso'),
 			'type'         => 'plain',
 			'add_args'     => FALSE,
 			'add_fragment' => ''
 		));
-		return ! empty( $pagination ) ? '<div class="ee-pagination-dv clear">' . $pagination . '</div>' : '';
+		return ! empty($pagination) ? '<div class="ee-pagination-dv clear">'.$pagination.'</div>' : '';
 	}
 
 
@@ -966,7 +966,7 @@ 
 	 *  @return 	void
 	 */
 	public static function event_list_title() {
-		return apply_filters( 'EED_Events_Archive_Filters__event_list_title__event_list_title', __( 'Upcoming Events', 'event_espresso' ));
+		return apply_filters('EED_Events_Archive_Filters__event_list_title__event_list_title', __('Upcoming Events', 'event_espresso'));
 	}
 
 

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *

modules/feeds/EED_Feeds.module.php

Doc Comments +4 added lines, -4 removed lines

@@ -125,7 +125,7 @@ 
 	 *
 	 *  @access 	public
 	 *  @param 	string 	$SQL	the JOIN clause for the comment feed query
-	 *  @return 	void
+	 *  @return 	string
 	 */
 	public static function comment_feed_join( $SQL ) {
 		global $wpdb;
@@ -146,7 +146,7 @@ 
 	 *
 	 *  @access 	public
 	 *  @param 	string 	$SQL	the WHERE clause for the comment feed query
-	 *  @return 	void
+	 *  @return 	string
 	 */
 	public static function comment_feed_where( $SQL ) {
 		global $wp_query, $wpdb;
@@ -164,7 +164,7 @@ 
 	 *
 	 *  @access 	public
 	 *  @param 	string 	$content
-	 *  @return 	void
+	 *  @return 	string
 	 */
 	public static function the_event_feed( $content ) {
 		if ( is_feed() && is_readable( RSS_FEEDS_TEMPLATES_PATH . 'espresso_events_feed.template.php' )) {
@@ -205,7 +205,7 @@ 
 	 *
 	 *  @access 	public
 	 *  @param 	string 	$content
-	 *  @return 	void
+	 *  @return 	string
 	 */
 	public static function the_venue_feed( $content ) {
 		if ( is_feed() && is_readable( RSS_FEEDS_TEMPLATES_PATH . 'espresso_venues_feed.template.php' )) {

Spacing +33 added lines, -33 removed lines

@@ -29,7 +29,7 @@ 
 	 * @return EED_Feeds
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -41,10 +41,10 @@ 
 	 *  @return 	void
 	 */
 	public static function set_hooks() {
-		add_action( 'parse_request', array( 'EED_Feeds', 'parse_request' ), 10 );
-		add_filter( 'default_feed', array( 'EED_Feeds', 'default_feed' ), 10, 1  );
-		add_filter( 'comment_feed_join', array( 'EED_Feeds', 'comment_feed_join' ), 10, 2 );
-		add_filter( 'comment_feed_where', array( 'EED_Feeds', 'comment_feed_where' ), 10, 2 );
+		add_action('parse_request', array('EED_Feeds', 'parse_request'), 10);
+		add_filter('default_feed', array('EED_Feeds', 'default_feed'), 10, 1);
+		add_filter('comment_feed_join', array('EED_Feeds', 'comment_feed_join'), 10, 2);
+		add_filter('comment_feed_where', array('EED_Feeds', 'comment_feed_where'), 10, 2);
 	}
 
 	/**
@@ -64,7 +64,7 @@ 
 	 *  @access 	public
 	 *  @return 	void
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
 	}
 
 
@@ -76,7 +76,7 @@ 
 	 *  @param 	type	rss2, atom, rss, rdf, rssjs
 	 *  @return 	string
 	 */
-	public static function default_feed( $type = 'rss2' ) {
+	public static function default_feed($type = 'rss2') {
 		 //rss2, atom, rss, rdf, rssjs
 		$type = 'rss2';
 		return $type;
@@ -92,24 +92,24 @@ 
 	 *  @return 	void
 	 */
 	public static function parse_request() {
-		if ( EE_Registry::instance()->REQ->is_set( 'post_type' )) {
+		if (EE_Registry::instance()->REQ->is_set('post_type')) {
 			// define path to templates
-			define( 'RSS_FEEDS_TEMPLATES_PATH', str_replace( '\\', DS, plugin_dir_path( __FILE__ )) . 'templates' . DS );
+			define('RSS_FEEDS_TEMPLATES_PATH', str_replace('\\', DS, plugin_dir_path(__FILE__)).'templates'.DS);
 			// what kinda post_type are we dealing with ?
-			switch( EE_Registry::instance()->REQ->get( 'post_type' )) {
+			switch (EE_Registry::instance()->REQ->get('post_type')) {
 				case 'espresso_events' :
 					// for rss2, atom, rss, rdf
-					add_filter( 'the_excerpt_rss', array( 'EED_Feeds', 'the_event_feed' ), 10, 1 );
-					add_filter( 'the_content_feed', array( 'EED_Feeds', 'the_event_feed' ), 10, 1 );
+					add_filter('the_excerpt_rss', array('EED_Feeds', 'the_event_feed'), 10, 1);
+					add_filter('the_content_feed', array('EED_Feeds', 'the_event_feed'), 10, 1);
 					// for json ( also uses the above filter )
-					add_filter( 'rssjs_feed_item', array( 'EED_Feeds', 'the_event_rssjs_feed' ), 10, 1 );
+					add_filter('rssjs_feed_item', array('EED_Feeds', 'the_event_rssjs_feed'), 10, 1);
 					break;
 				case 'espresso_venues' :
 					// for rss2, atom, rss, rdf
-					add_filter( 'the_excerpt_rss', array( 'EED_Feeds', 'the_venue_feed' ), 10, 1 );
-					add_filter( 'the_content_feed', array( 'EED_Feeds', 'the_venue_feed' ), 10, 1 );
+					add_filter('the_excerpt_rss', array('EED_Feeds', 'the_venue_feed'), 10, 1);
+					add_filter('the_content_feed', array('EED_Feeds', 'the_venue_feed'), 10, 1);
 					// for json ( also uses the above filter )
-					add_filter( 'rssjs_feed_item', array( 'EED_Feeds', 'the_venue_rssjs_feed' ), 10, 1 );
+					add_filter('rssjs_feed_item', array('EED_Feeds', 'the_venue_rssjs_feed'), 10, 1);
 					break;
 			}
 		}
@@ -127,11 +127,11 @@ 
 	 *  @param 	string 	$SQL	the JOIN clause for the comment feed query
 	 *  @return 	void
 	 */
-	public static function comment_feed_join( $SQL ) {
+	public static function comment_feed_join($SQL) {
 		global $wpdb;
 		// check for wp_posts table in JOIN clause
-		if ( strpos( $SQL, $wpdb->posts ) !== FALSE ) {
-			add_filter( 'EED_Feeds__comment_feed_where__espresso_attendees', '__return_true' );
+		if (strpos($SQL, $wpdb->posts) !== FALSE) {
+			add_filter('EED_Feeds__comment_feed_where__espresso_attendees', '__return_true');
 		}
 		return $SQL;
 	}
@@ -148,9 +148,9 @@ 
 	 *  @param 	string 	$SQL	the WHERE clause for the comment feed query
 	 *  @return 	void
 	 */
-	public static function comment_feed_where( $SQL ) {
+	public static function comment_feed_where($SQL) {
 		global $wp_query, $wpdb;
-		if ( $wp_query->is_comment_feed && apply_filters( 'EED_Feeds__comment_feed_where__espresso_attendees', FALSE )) {
+		if ($wp_query->is_comment_feed && apply_filters('EED_Feeds__comment_feed_where__espresso_attendees', FALSE)) {
 			$SQL .= " AND $wpdb->posts.post_type != 'espresso_attendees'";
 		}
 		return $SQL;
@@ -166,14 +166,14 @@ 
 	 *  @param 	string 	$content
 	 *  @return 	void
 	 */
-	public static function the_event_feed( $content ) {
-		if ( is_feed() && is_readable( RSS_FEEDS_TEMPLATES_PATH . 'espresso_events_feed.template.php' )) {
+	public static function the_event_feed($content) {
+		if (is_feed() && is_readable(RSS_FEEDS_TEMPLATES_PATH.'espresso_events_feed.template.php')) {
  			global $post;
 			$template_args = array(
 				'EVT_ID' => $post->ID,
 				'event_description' => get_option('rss_use_excerpt') ? $post->post_excerpt : $post->post_content
 			);
-			$content = EEH_Template::display_template( RSS_FEEDS_TEMPLATES_PATH . 'espresso_events_feed.template.php', $template_args, TRUE );
+			$content = EEH_Template::display_template(RSS_FEEDS_TEMPLATES_PATH.'espresso_events_feed.template.php', $template_args, TRUE);
 		}
 		return  $content;
 	}
@@ -188,9 +188,9 @@ 
 	 *  @param 	object 	$item
 	 *  @return 	void
 	 */
-	public static function the_event_rssjs_feed( $item ) {
-		if ( is_feed() && isset( $item->description )) {
-			$item->description = EED_Feeds::the_event_feed( $item->description );
+	public static function the_event_rssjs_feed($item) {
+		if (is_feed() && isset($item->description)) {
+			$item->description = EED_Feeds::the_event_feed($item->description);
 		}
 		return $item;
 	}
@@ -205,14 +205,14 @@ 
 	 *  @param 	string 	$content
 	 *  @return 	void
 	 */
-	public static function the_venue_feed( $content ) {
-		if ( is_feed() && is_readable( RSS_FEEDS_TEMPLATES_PATH . 'espresso_venues_feed.template.php' )) {
+	public static function the_venue_feed($content) {
+		if (is_feed() && is_readable(RSS_FEEDS_TEMPLATES_PATH.'espresso_venues_feed.template.php')) {
  			global $post;
 			$template_args = array(
 				'VNU_ID' => $post->ID,
 				'venue_description' => get_option('rss_use_excerpt') ? $post->post_excerpt : $post->post_content
 			);
-			$content = EEH_Template::display_template( RSS_FEEDS_TEMPLATES_PATH . 'espresso_venues_feed.template.php', $template_args, TRUE );
+			$content = EEH_Template::display_template(RSS_FEEDS_TEMPLATES_PATH.'espresso_venues_feed.template.php', $template_args, TRUE);
 		}
 		return $content;
 	}
@@ -227,9 +227,9 @@ 
 	 *  @param 	object 	$item
 	 *  @return 	void
 	 */
-	public static function the_venue_rssjs_feed( $item ) {
-		if ( is_feed() && isset( $item->description )) {
-			$item->description = EED_Feeds::the_venue_feed( $item->description );
+	public static function the_venue_rssjs_feed($item) {
+		if (is_feed() && isset($item->description)) {
+			$item->description = EED_Feeds::the_venue_feed($item->description);
 		}
 		return $item;
 	}

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *

modules/single_page_checkout/inc/EE_SPCO_Reg_Step.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -387,7 +387,7 @@
 
 	/**
 	 * creates the default hidden inputs section
-	 * @return EE_Form_Input_Base[]
+	 * @return EE_Form_Section_Proper
 	 */
 	public function reg_step_hidden_inputs() {
 		// hidden inputs for admin registrations

Indentation +11 added lines, -11 removed lines

@@ -1,16 +1,16 @@
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
  /**
- *
- * Class EE_SPCO_Reg_Step
- *
- * Description
- *
- * @package 			Event Espresso
- * @subpackage 	core
- * @author 				Brent Christensen
- * @since 				4.5.0
- *
- */
+  *
+  * Class EE_SPCO_Reg_Step
+  *
+  * Description
+  *
+  * @package 			Event Espresso
+  * @subpackage 	core
+  * @author 				Brent Christensen
+  * @since 				4.5.0
+  *
+  */
 abstract class EE_SPCO_Reg_Step {
 
 	/**

Spacing +52 added lines, -52 removed lines

@@ -153,7 +153,7 @@ 
 	public function set_completed() {
 		// DEBUG LOG
 		//$this->checkout->log( __CLASS__, __FUNCTION__, __LINE__ );
-		$this->_completed = apply_filters( 'FHEE__EE_SPCO_Reg_Step__set_completed___completed', true, $this );
+		$this->_completed = apply_filters('FHEE__EE_SPCO_Reg_Step__set_completed___completed', true, $this);
 	}
 
 
@@ -201,18 +201,18 @@ 
 	 * sets the text that appears on the reg step form submit button
 	 * @param string $submit_button_text
 	 */
-	public function set_submit_button_text( $submit_button_text = '' ) {
-		if ( ! empty( $submit_button_text )) {
+	public function set_submit_button_text($submit_button_text = '') {
+		if ( ! empty($submit_button_text)) {
 			$this->_submit_button_text = $submit_button_text;
-		} else if ( $this->checkout->next_step instanceof EE_SPCO_Reg_Step ) {
-			if ( $this->checkout->revisit ) {
-				$this->_submit_button_text = sprintf( __( 'Update %s', 'event_espresso' ), $this->checkout->current_step->name() );
+		} else if ($this->checkout->next_step instanceof EE_SPCO_Reg_Step) {
+			if ($this->checkout->revisit) {
+				$this->_submit_button_text = sprintf(__('Update %s', 'event_espresso'), $this->checkout->current_step->name());
 			} else {
-				$this->_submit_button_text = sprintf( __( 'Proceed to %s', 'event_espresso' ), $this->checkout->next_step->name() );
+				$this->_submit_button_text = sprintf(__('Proceed to %s', 'event_espresso'), $this->checkout->next_step->name());
 			}
 		}
 		// filters the submit button text
-		$this->_submit_button_text = apply_filters( 'FHEE__EE_SPCO_Reg_Step__set_submit_button_text___submit_button_text', $this->_submit_button_text, $this->checkout );
+		$this->_submit_button_text = apply_filters('FHEE__EE_SPCO_Reg_Step__set_submit_button_text___submit_button_text', $this->_submit_button_text, $this->checkout);
 	}
 
 
@@ -220,7 +220,7 @@ 
 	/**
 	 * @param boolean $is_current_step
 	 */
-	public function set_is_current_step( $is_current_step ) {
+	public function set_is_current_step($is_current_step) {
 		$this->_is_current_step = $is_current_step;
 	}
 
@@ -247,7 +247,7 @@ 
 	/**
 	 * @param int $order
 	 */
-	public function set_order( $order ) {
+	public function set_order($order) {
 		$this->_order = $order;
 	}
 
@@ -285,7 +285,7 @@ 
 	 * _set_success_message
 	 * @param string $success_message
 	 */
-	protected function _set_success_message( $success_message ) {
+	protected function _set_success_message($success_message) {
 		$this->_success_message = $success_message;
 	}
 
@@ -313,8 +313,8 @@ 
 	/**
 	 * @param string $instructions
 	 */
-	public function set_instructions( $instructions ) {
-		$this->_instructions = apply_filters( 'FHEE__EE_SPCO_Reg_Step__set_instructions__instructions', $instructions, $this );
+	public function set_instructions($instructions) {
+		$this->_instructions = apply_filters('FHEE__EE_SPCO_Reg_Step__set_instructions__instructions', $instructions, $this);
 	}
 
 
@@ -322,7 +322,7 @@ 
 	/**
 	 * @param array $valid_data
 	 */
-	public function set_valid_data( $valid_data ) {
+	public function set_valid_data($valid_data) {
 		$this->_valid_data = $valid_data;
 	}
 
@@ -332,7 +332,7 @@ 
 	 * @return array
 	 */
 	public function valid_data() {
-		if ( empty( $this->_valid_data )) {
+		if (empty($this->_valid_data)) {
 			$this->_valid_data = $this->reg_form->valid_data();
 		}
 		return $this->_valid_data;
@@ -343,8 +343,8 @@ 
 	 * @return string
 	 */
 	public function reg_form_name() {
-		if ( empty( $this->_reg_form_name )) {
-			$this->set_reg_form_name( 'ee-spco-' . $this->slug() . '-reg-step-form' );
+		if (empty($this->_reg_form_name)) {
+			$this->set_reg_form_name('ee-spco-'.$this->slug().'-reg-step-form');
 		}
 		return $this->_reg_form_name;
 	}
@@ -354,7 +354,7 @@ 
 	/**
 	 * @param string $reg_form_name
 	 */
-	protected function set_reg_form_name( $reg_form_name ) {
+	protected function set_reg_form_name($reg_form_name) {
 		$this->_reg_form_name = $reg_form_name;
 	}
 
@@ -365,22 +365,22 @@ 
 	 * @param string $action
 	 * @return string
 	 */
-	public function reg_step_url( $action = '' ) {
-		$query_args = array( 'step' => $this->slug() );
-		if( ! empty( $action )) {
+	public function reg_step_url($action = '') {
+		$query_args = array('step' => $this->slug());
+		if ( ! empty($action)) {
 			$query_args['action'] = $action;
 		}
 		// final step has no display
-		if ( $this instanceof EE_SPCO_Reg_Step_Finalize_Registration && $action == 'display_spco_reg_step' ) {
-			$query_args[ 'action' ] = 'process_reg_step';
+		if ($this instanceof EE_SPCO_Reg_Step_Finalize_Registration && $action == 'display_spco_reg_step') {
+			$query_args['action'] = 'process_reg_step';
 		}
-		if( $this->checkout->revisit ) {
+		if ($this->checkout->revisit) {
 			$query_args['revisit'] = TRUE;
 		}
-		if( $this->checkout->reg_url_link ) {
+		if ($this->checkout->reg_url_link) {
 			$query_args['e_reg_url_link'] = $this->checkout->reg_url_link;
 		}
-		return add_query_arg( $query_args, $this->checkout->reg_page_base_url );
+		return add_query_arg($query_args, $this->checkout->reg_page_base_url);
 	}
 
 
@@ -391,16 +391,16 @@ 
 	 */
 	public function reg_step_hidden_inputs() {
 		// hidden inputs for admin registrations
-		if ( $this->checkout->admin_request ) {
+		if ($this->checkout->admin_request) {
 			return new EE_Form_Section_Proper(
 				array(
 					'layout_strategy' 	=> new EE_Div_Per_Section_Layout(),
-					'html_id' 					=> 'ee-' . $this->slug() . '-hidden-inputs',
+					'html_id' 					=> 'ee-'.$this->slug().'-hidden-inputs',
 					'subsections' 			=> array(
 						'next_step' 			=> new EE_Fixed_Hidden_Input(
 							array(
 								'html_name' 	=> 'next_step',
-								'html_id' 			=> 'spco-' . $this->slug() . '-next-step',
+								'html_id' 			=> 'spco-'.$this->slug().'-next-step',
 								'default' 			=> $this->checkout->next_step instanceof EE_SPCO_Reg_Step ? $this->checkout->next_step->slug() : ''
 							)
 						)
@@ -412,19 +412,19 @@ 
 			return new EE_Form_Section_Proper(
 				array(
 					'layout_strategy' 	=> new EE_Div_Per_Section_Layout(),
-					'html_id' 					=> 'ee-' . $this->slug() . '-hidden-inputs',
+					'html_id' 					=> 'ee-'.$this->slug().'-hidden-inputs',
 					'subsections' 			=> array(
 						'action' 				=> new EE_Fixed_Hidden_Input(
 								array(
 									'html_name' 	=> 'action',
-									'html_id' 			=> 'spco-' . $this->slug() . '-action',
-									'default' 			=> empty( $this->checkout->reg_url_link ) ? 'process_reg_step' : 'update_reg_step'
+									'html_id' 			=> 'spco-'.$this->slug().'-action',
+									'default' 			=> empty($this->checkout->reg_url_link) ? 'process_reg_step' : 'update_reg_step'
 								)
 							),
 						'next_step' 			=> new EE_Fixed_Hidden_Input(
 								array(
 									'html_name' 	=> 'next_step',
-									'html_id' 			=> 'spco-' . $this->slug() . '-next-step',
+									'html_id' 			=> 'spco-'.$this->slug().'-next-step',
 									'default' 			=> $this->checkout->next_step instanceof EE_SPCO_Reg_Step ? $this->checkout->next_step->slug() : ''
 								)
 							),
@@ -456,9 +456,9 @@ 
 	 * @param array $actions
 	 * @return void
 	 */
-	public function generate_reg_form_for_actions( $actions = array() ) {
-		$actions = array_merge( array( 'generate_reg_form', 'display_spco_reg_step', 'process_reg_step', 'update_reg_step' ), $actions );
-		$this->checkout->generate_reg_form = in_array( $this->checkout->action, $actions ) ? TRUE : FALSE;
+	public function generate_reg_form_for_actions($actions = array()) {
+		$actions = array_merge(array('generate_reg_form', 'display_spco_reg_step', 'process_reg_step', 'update_reg_step'), $actions);
+		$this->checkout->generate_reg_form = in_array($this->checkout->action, $actions) ? TRUE : FALSE;
 	}
 
 
@@ -468,11 +468,11 @@ 
 	 */
 	public function display_reg_form() {
 		$html = '';
-		if ( $this->reg_form instanceof EE_Form_Section_Proper ) {
-			$html .= ! $this->checkout->admin_request ? $this->reg_form->form_open( $this->reg_step_url() ) : '';
-			if ( EE_Registry::instance()->REQ->ajax ) {
+		if ($this->reg_form instanceof EE_Form_Section_Proper) {
+			$html .= ! $this->checkout->admin_request ? $this->reg_form->form_open($this->reg_step_url()) : '';
+			if (EE_Registry::instance()->REQ->ajax) {
 				$this->reg_form->localize_validation_rules();
-				$this->checkout->json_response->add_validation_rules( EE_Form_Section_Proper::js_localization() );
+				$this->checkout->json_response->add_validation_rules(EE_Form_Section_Proper::js_localization());
 				$html .= $this->reg_form->get_html();
 			} else {
 				$html .= $this->reg_form->get_html_and_js();
@@ -490,25 +490,25 @@ 
 	 * @return string
 	 */
 	public function reg_step_submit_button() {
-		if ( ! $this->checkout->next_step instanceof EE_SPCO_Reg_Step ) {
+		if ( ! $this->checkout->next_step instanceof EE_SPCO_Reg_Step) {
 			return '';
 		}
 		ob_start();
-		do_action( 'AHEE__before_spco_whats_next_buttons', $this->slug(), $this->checkout->next_step->slug(), $this->checkout );
+		do_action('AHEE__before_spco_whats_next_buttons', $this->slug(), $this->checkout->next_step->slug(), $this->checkout);
 		$html = ob_get_clean();
 		// generate submit button
-		$sbmt_btn = new EE_Submit_Input( array(
-			'html_name' 					=> 'spco-go-to-step-' . $this->checkout->next_step->slug(),
-			'html_id' 							=> 'spco-go-to-step-' . $this->checkout->next_step->slug(),
+		$sbmt_btn = new EE_Submit_Input(array(
+			'html_name' 					=> 'spco-go-to-step-'.$this->checkout->next_step->slug(),
+			'html_id' 							=> 'spco-go-to-step-'.$this->checkout->next_step->slug(),
 			'html_class' 					=> 'spco-next-step-btn',
-			'other_html_attributes' 	=> ' rel="' . $this->slug() . '"',
+			'other_html_attributes' 	=> ' rel="'.$this->slug().'"',
 			'default'							=> $this->submit_button_text()
 		));
-		$sbmt_btn->set_button_css_attributes( TRUE, 'large' );
+		$sbmt_btn->set_button_css_attributes(TRUE, 'large');
 		$sbmt_btn_html = $sbmt_btn->get_html_for_input();
 		$html .= EEH_HTML::div(
-			apply_filters( 'FHEE__EE_SPCO_Reg_Step__reg_step_submit_button__sbmt_btn_html', $sbmt_btn_html, $this ),
-			'spco-' . $this->slug() . '-whats-next-buttons-dv',
+			apply_filters('FHEE__EE_SPCO_Reg_Step__reg_step_submit_button__sbmt_btn_html', $sbmt_btn_html, $this),
+			'spco-'.$this->slug().'-whats-next-buttons-dv',
 			'spco-whats-next-buttons'
 		);
 		return $html;
@@ -531,7 +531,7 @@ 
 	 * @return string
 	 */
 	public function edit_lnk_url() {
-		return 	add_query_arg( array( 'step' => $this->slug() ), $this->checkout->reg_page_base_url );
+		return 	add_query_arg(array('step' => $this->slug()), $this->checkout->reg_page_base_url);
 
 	}
 
@@ -553,7 +553,7 @@ 
 	 */
 	public function update_checkout() {
 		// grab the cart grand total and reset TXN total
-		$this->checkout->transaction->set_total( $this->checkout->cart->get_cart_grand_total() );
+		$this->checkout->transaction->set_total($this->checkout->cart->get_cart_grand_total());
 		$this->checkout->stash_transaction_and_checkout();
 	}
 
@@ -568,7 +568,7 @@ 
 	 */
 	function __sleep() {
 		// remove the reg form and the checkout
-		return array_diff( array_keys( get_object_vars( $this )), array( 'reg_form', 'checkout' ));
+		return array_diff(array_keys(get_object_vars($this)), array('reg_form', 'checkout'));
 	}
 }
 

shortcodes/espresso_events/EES_Espresso_Events.shortcode.php

Doc Comments +1 added lines, -1 removed lines

@@ -229,7 +229,7 @@
 	 *
 	 * @access    public
 	 * @param string $event_list_css
-	 * @return    array
+	 * @return    string
 	 */
 	public function event_list_css( $event_list_css = '' ) {
 		$event_list_css .=  ! empty( $event_list_css ) ? ' ' : '';

Spacing +35 added lines, -35 removed lines

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

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *

admin_pages/about/About_Admin_Page.core.php

Braces +5 added lines, -3 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  *
@@ -152,8 +153,9 @@ 
 		$done_step_three = EE_Registry::instance()->load_model('Event')->count() > 0 ? TRUE : FALSE;
 
 		//if ALL steps are done, let's just return FALSE so we don't display anything
-		if ( $done_step_one && $done_step_two && $done_step_three )
-			return FALSE;
+		if ( $done_step_one && $done_step_two && $done_step_three ) {
+					return FALSE;
+		}
 
 		//now let's put it together
 		$steps .= sprintf( '%s' . $step_one . '%s', $done_step_one ? '<strike>' : '', $done_step_one ? '</strike>': '' );

Spacing +25 added lines, -25 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -117,11 +117,11 @@ 
 		//Copied from _whats_new()
 		$steps = EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance ? $this->_get_started_steps() : FALSE;
 		$steps = $steps !== FALSE ? $steps : '';
-		$this->_admin_page_title = sprintf( __('Welcome to Event Espresso %s', 'event_espresso'), EVENT_ESPRESSO_VERSION );
+		$this->_admin_page_title = sprintf(__('Welcome to Event Espresso %s', 'event_espresso'), EVENT_ESPRESSO_VERSION);
 		$settings_message = $steps;
-		$this->_template_args['admin_page_subtitle'] = __('Thank you for choosing Event Espresso, the most powerful, and free, Event Management plugin for WordPress.', 'event_espresso' ) . $settings_message;
-		$template = EE_ABOUT_TEMPLATE_PATH . 'ee4-overview.template.php';
-		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template( $template, $this->_template_args, TRUE );
+		$this->_template_args['admin_page_subtitle'] = __('Thank you for choosing Event Espresso, the most powerful, and free, Event Management plugin for WordPress.', 'event_espresso').$settings_message;
+		$template = EE_ABOUT_TEMPLATE_PATH.'ee4-overview.template.php';
+		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template($template, $this->_template_args, TRUE);
 		$this->display_about_admin_page();
 	}
 
@@ -129,36 +129,36 @@ 
 
 	protected function _get_started_steps() {
 		$steps = '<h2>'.__('Getting Started').'</h2>';
-		$step_one = '<p>'.sprintf( __('%sStep 1%s: Visit your %sOrganization Settings%s and add/update your details.', 'event_espresso'), '<strong>', '</strong>', '<a href="admin.php?page=espresso_general_settings">', '</a>') .'</strong></p>';
-		$step_two = '<p>'.sprintf( __('%sStep 2%s: Setup your %sPayment Methods%s.', 'event_espresso'), '<strong>', '</strong>', '<a href="admin.php?page=espresso_payment_settings">', '</a>') .'</strong></p>';
-		$step_three = '<p>'.sprintf( __('%sStep 3%s: Create your %sFirst Event%s.', 'event_espresso'), '<strong>', '</strong>', '<a href="admin.php?page=espresso_events&action=create_new">', '</a>') .'</strong></p>';
+		$step_one = '<p>'.sprintf(__('%sStep 1%s: Visit your %sOrganization Settings%s and add/update your details.', 'event_espresso'), '<strong>', '</strong>', '<a href="admin.php?page=espresso_general_settings">', '</a>').'</strong></p>';
+		$step_two = '<p>'.sprintf(__('%sStep 2%s: Setup your %sPayment Methods%s.', 'event_espresso'), '<strong>', '</strong>', '<a href="admin.php?page=espresso_payment_settings">', '</a>').'</strong></p>';
+		$step_three = '<p>'.sprintf(__('%sStep 3%s: Create your %sFirst Event%s.', 'event_espresso'), '<strong>', '</strong>', '<a href="admin.php?page=espresso_events&action=create_new">', '</a>').'</strong></p>';
 
 		//done?
 		$done_step_one = EE_Registry::instance()->CFG->organization->address_1 == '123 Onna Road' ? FALSE : TRUE;
-		$active_invoice_pm = EEM_Payment_Method::instance()->get_one_active( EEM_Payment_Method::scope_cart, array( array( 'PMD_type' => 'Invoice' ) ) );
-		$active_pms_count = EEM_Payment_Method::instance()->count_active( EEM_Payment_Method::scope_cart );
+		$active_invoice_pm = EEM_Payment_Method::instance()->get_one_active(EEM_Payment_Method::scope_cart, array(array('PMD_type' => 'Invoice')));
+		$active_pms_count = EEM_Payment_Method::instance()->count_active(EEM_Payment_Method::scope_cart);
 		//done step two if a non-invoice paymetn method is active; or there is more than one PM active, or
 		//if only the invoice is active but it's clearly been updated
-		$done_step_two = $active_pms_count > 1  ||
-						 ( $active_pms_count === 1 && ! $active_invoice_pm )	||
-						 ( $active_invoice_pm instanceof EE_Payment_Method && (
-								 $active_invoice_pm->get_extra_meta( 'pdf_payee_name', TRUE, '' ) ||
-								 $active_invoice_pm->get_extra_meta( 'pdf_payee_email', TRUE, '' ) ||
-								 $active_invoice_pm->get_extra_meta( 'pdf_payee_tax_number', TRUE, '' ) ||
-								 $active_invoice_pm->get_extra_meta( 'pdf_payee_address', TRUE, '' ) ||
-								 $active_invoice_pm->get_extra_meta( 'page_extra_info', TRUE, '' )
+		$done_step_two = $active_pms_count > 1 ||
+						 ($active_pms_count === 1 && ! $active_invoice_pm) ||
+						 ($active_invoice_pm instanceof EE_Payment_Method && (
+								 $active_invoice_pm->get_extra_meta('pdf_payee_name', TRUE, '') ||
+								 $active_invoice_pm->get_extra_meta('pdf_payee_email', TRUE, '') ||
+								 $active_invoice_pm->get_extra_meta('pdf_payee_tax_number', TRUE, '') ||
+								 $active_invoice_pm->get_extra_meta('pdf_payee_address', TRUE, '') ||
+								 $active_invoice_pm->get_extra_meta('page_extra_info', TRUE, '')
 								)
 				);
 		$done_step_three = EE_Registry::instance()->load_model('Event')->count() > 0 ? TRUE : FALSE;
 
 		//if ALL steps are done, let's just return FALSE so we don't display anything
-		if ( $done_step_one && $done_step_two && $done_step_three )
+		if ($done_step_one && $done_step_two && $done_step_three)
 			return FALSE;
 
 		//now let's put it together
-		$steps .= sprintf( '%s' . $step_one . '%s', $done_step_one ? '<strike>' : '', $done_step_one ? '</strike>': '' );
-		$steps .= sprintf( '%s' . $step_two . '%s', $done_step_two ? '<strike>' : '', $done_step_two ? '</strike>': '' );
-		$steps .= sprintf( '%s' . $step_three . '%s', $done_step_three ? '<strike>' : '', $done_step_three ? '</strike>': '' );
+		$steps .= sprintf('%s'.$step_one.'%s', $done_step_one ? '<strike>' : '', $done_step_one ? '</strike>' : '');
+		$steps .= sprintf('%s'.$step_two.'%s', $done_step_two ? '<strike>' : '', $done_step_two ? '</strike>' : '');
+		$steps .= sprintf('%s'.$step_three.'%s', $done_step_three ? '<strike>' : '', $done_step_three ? '</strike>' : '');
 
 		return $steps;
 	}
@@ -166,10 +166,10 @@ 
 
 
 	protected function _credits() {
-		$this->_template_args['admin_page_title'] = sprintf( __('Welcome to Event Espresso %s', 'event_espresso'), EVENT_ESPRESSO_VERSION );
+		$this->_template_args['admin_page_title'] = sprintf(__('Welcome to Event Espresso %s', 'event_espresso'), EVENT_ESPRESSO_VERSION);
 		$this->_template_args['admin_page_subtitle'] = __('Thank you for choosing Event Espresso Decaf, the most powerful, and free, Event Management plugin for WordPress.', 'event_espresso');
-		$template = EE_ABOUT_TEMPLATE_PATH . 'credits.template.php';
-		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template( $template, $this->_template_args, TRUE );
+		$template = EE_ABOUT_TEMPLATE_PATH.'credits.template.php';
+		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template($template, $this->_template_args, TRUE);
 		$this->display_about_admin_page();
 	}
 

admin_pages/about/About_Admin_Page_Init.core.php

Spacing +7 added lines, -7 removed lines

@@ -30,12 +30,12 @@ 
 
 	public function __construct() {
 		//define some events related constants
-		define( 'EE_ABOUT_PG_SLUG', 'espresso_about' );
-		define( 'EE_ABOUT_LABEL', __('About', 'event_espresso'));
-		define( 'EE_ABOUT_ADMIN', EE_ADMIN_PAGES . 'about' . DS );
-		define( 'EE_ABOUT_ADMIN_URL', admin_url( 'admin.php?page=' . EE_ABOUT_PG_SLUG ));
-		define( 'EE_ABOUT_TEMPLATE_PATH', EE_ABOUT_ADMIN . 'templates' . DS );
-		define( 'EE_ABOUT_ASSETS_URL', EE_ADMIN_PAGES_URL . 'about/assets/' );
+		define('EE_ABOUT_PG_SLUG', 'espresso_about');
+		define('EE_ABOUT_LABEL', __('About', 'event_espresso'));
+		define('EE_ABOUT_ADMIN', EE_ADMIN_PAGES.'about'.DS);
+		define('EE_ABOUT_ADMIN_URL', admin_url('admin.php?page='.EE_ABOUT_PG_SLUG));
+		define('EE_ABOUT_TEMPLATE_PATH', EE_ABOUT_ADMIN.'templates'.DS);
+		define('EE_ABOUT_ASSETS_URL', EE_ADMIN_PAGES_URL.'about/assets/');
 		parent::__construct();
 	}
 
@@ -44,7 +44,7 @@ 
 	}
 
 	protected function _set_menu_map() {
-		$this->_menu_map = new EE_Admin_Page_Sub_Menu( array(
+		$this->_menu_map = new EE_Admin_Page_Sub_Menu(array(
 			'menu_group' => 'extras',
 			'menu_order' => 40,
 			'show_on_menu' => EE_Admin_Page_Menu_Map::BLOG_AND_NETWORK_ADMIN,

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *