eventespresso / event-espresso-core

core/libraries/shortcodes/EE_Ticket_List_Shortcodes.lib.php

Braces +12 added lines, -11 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
@@ -68,18 +69,18 @@ 
 		$this->_set_shortcode_helper();
 
 
-		if ( $this->_data['data'] instanceof EE_Messages_Addressee )
-			return $this->_get_ticket_list_for_main();
-
-		else if ( $this->_data['data'] instanceof EE_Registration )
-			return $this->_get_ticket_list_for_attendee();
-
-		else if ( $this->_data['data'] instanceof EE_Event )
-			return $this->_get_ticket_list_for_event();
+		if ( $this->_data['data'] instanceof EE_Messages_Addressee ) {
+					return $this->_get_ticket_list_for_main();
+		} else if ( $this->_data['data'] instanceof EE_Registration ) {
+					return $this->_get_ticket_list_for_attendee();
+		} else if ( $this->_data['data'] instanceof EE_Event ) {
+					return $this->_get_ticket_list_for_event();
+		}
 
 		//prevent recursive loop
-		else
-			return '';
+		else {
+					return '';
+		}
 	}
 
 

Spacing +13 added lines, -13 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -48,8 +48,8 @@ 
 
 
 
-	protected function _parser( $shortcode ) {
-		switch ( $shortcode ) {
+	protected function _parser($shortcode) {
+		switch ($shortcode) {
 			case '[TICKET_LIST]' :
 				return $this->_get_ticket_list();
 				break;
@@ -68,13 +68,13 @@ 
 		$this->_set_shortcode_helper();
 
 
-		if ( $this->_data['data'] instanceof EE_Messages_Addressee )
+		if ($this->_data['data'] instanceof EE_Messages_Addressee)
 			return $this->_get_ticket_list_for_main();
 
-		else if ( $this->_data['data'] instanceof EE_Registration )
+		else if ($this->_data['data'] instanceof EE_Registration)
 			return $this->_get_ticket_list_for_attendee();
 
-		else if ( $this->_data['data'] instanceof EE_Event )
+		else if ($this->_data['data'] instanceof EE_Event)
 			return $this->_get_ticket_list_for_event();
 
 		//prevent recursive loop
@@ -91,14 +91,14 @@ 
 	 * This returns the parsed ticket list for main template;
 	 */
 	private function _get_ticket_list_for_main() {
-		$valid_shortcodes = array('ticket', 'event_list', 'attendee_list','datetime_list', 'attendee', 'line_item_list', 'primary_registration_details');
+		$valid_shortcodes = array('ticket', 'event_list', 'attendee_list', 'datetime_list', 'attendee', 'line_item_list', 'primary_registration_details');
 		$template = $this->_data['template'];
 		$data = $this->_data['data'];
 		$tktparsed = '';
 
 
 		//now we need to loop through the ticket list and send data to the EE_Parser helper.
-		foreach ( $data->tickets as $ticket ) {
+		foreach ($data->tickets as $ticket) {
 			$tktparsed .= $this->_shortcode_helper->parse_ticket_list_template($template, $ticket['ticket'], $valid_shortcodes, $this->_extra_data);
 		}
 
@@ -113,7 +113,7 @@ 
 	 */
 	private function _get_ticket_list_for_event() {
 		$valid_shortcodes = array('ticket', 'attendee_list', 'datetime_list', 'attendee', 'venue', 'line_item_list', 'primary_registration_details');
-		$template = is_array($this->_data['template'] ) && isset($this->_data['template']['ticket_list']) ? $this->_data['template']['ticket_list'] : $this->_extra_data['template']['ticket_list'];
+		$template = is_array($this->_data['template']) && isset($this->_data['template']['ticket_list']) ? $this->_data['template']['ticket_list'] : $this->_extra_data['template']['ticket_list'];
 		$event = $this->_data['data'];
 
 		//let's remove any existing [EVENT_LIST] shortcodes from the ticket list template so that we don't get recursion.
@@ -124,7 +124,7 @@ 
 		$tickets = $this->_get_tickets_from_event($event);
 
 		//each ticket in this case should be an ticket object.
-		foreach ( $tickets as $ticket ) {
+		foreach ($tickets as $ticket) {
 			$tkt_parsed .= $this->_shortcode_helper->parse_ticket_list_template($template, $ticket, $valid_shortcodes, $this->_extra_data);
 		}
 
@@ -151,18 +151,18 @@ 
 		$tickets = $this->_get_ticket_list_from_registration($registration);
 
 		//each ticket in this case should be an ticket object.
-		foreach ( $tickets as $ticket ) {
+		foreach ($tickets as $ticket) {
 			$tkt_parsed .= $this->_shortcode_helper->parse_ticket_list_template($template, $ticket, $valid_shortcodes, $this->_extra_data);
 		}
 
 		return $tkt_parsed;
 	}
 
-	private function _get_tickets_from_event( EE_Event $event ) {
+	private function _get_tickets_from_event(EE_Event $event) {
 		return isset($this->_extra_data['data']->events) ? $this->_extra_data['data']->events[$event->ID()]['tkt_objs'] : array();
 	}
 
-	private function _get_ticket_list_from_registration( EE_Registration $registration, $att = NULL ) {
+	private function _get_ticket_list_from_registration(EE_Registration $registration, $att = NULL) {
 		return isset($this->_extra_data['data']->registrations) ? array($this->_extra_data['data']->registrations[$registration->ID()]['tkt_obj']) : array();
 	}
 

core/libraries/shortcodes/EE_Ticket_Shortcodes.lib.php

Braces +5 added lines, -3 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
@@ -80,8 +81,9 @@ 
 
 
 		//If there is no event object by now then get out.
-		if ( ! $this->_ticket instanceof EE_Ticket )
-			return '';
+		if ( ! $this->_ticket instanceof EE_Ticket ) {
+					return '';
+		}
 
 		switch ( $shortcode ) {
 

Spacing +18 added lines, -18 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -49,40 +49,40 @@ 
 			'[TICKET_DESCRIPTION]' => __('The description of the ticket', 'event_espresso'),
 			'[TICKET_PRICE]' => __('The price of the ticket', 'event_espresso'),
 			'[TKT_QTY_PURCHASED]' => __('The total quantity of the current ticket in the list that has been purchased in this transaction', 'event_espresso'),
-			'[TKT_USES_*]' => __( 'This attribute based shortcode parses to show the number of uses the ticket has.  The optional "schema" attribute can be used to indicate what schema is used when the uses is infinite.  Options are:', 'event_espresso' ) .
-				'<p><ul>' .
-				'<li><strong>symbol</strong>:' . __('This returns the &infin; symbol.', 'event_espresso') . '</li>' .
-				'<li><strong>text</strong>:' . __('This returns the word, "Unlimited". This is also the default if the "schema" attribute is not used.', 'event_espresso' ) . '</li>' .
-				'<li><strong>{custom}</strong>:' . __('You can put anything you want as a string instead and that will be used.  So you could have the world "any" and whenever uses for a ticket is infinity, this shortcode will parse to "any".', 'event_espresso' ) . '</li>' .
+			'[TKT_USES_*]' => __('This attribute based shortcode parses to show the number of uses the ticket has.  The optional "schema" attribute can be used to indicate what schema is used when the uses is infinite.  Options are:', 'event_espresso').
+				'<p><ul>'.
+				'<li><strong>symbol</strong>:'.__('This returns the &infin; symbol.', 'event_espresso').'</li>'.
+				'<li><strong>text</strong>:'.__('This returns the word, "Unlimited". This is also the default if the "schema" attribute is not used.', 'event_espresso').'</li>'.
+				'<li><strong>{custom}</strong>:'.__('You can put anything you want as a string instead and that will be used.  So you could have the world "any" and whenever uses for a ticket is infinity, this shortcode will parse to "any".', 'event_espresso').'</li>'.
 				'</ul></p>'
 			);
 	}
 
 
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 
-		EE_Registry::instance()->load_helper( 'Template' );
+		EE_Registry::instance()->load_helper('Template');
 
 		$this->_ticket = $this->_data instanceof EE_Ticket ? $this->_data : null;
 
 		$aee = $this->_data instanceof EE_Messages_Addressee ? $this->_data : null;
-		$aee = ! $aee instanceof EE_Messages_Addressee && is_array( $this->_extra_data ) && isset( $this->_extra_data['data'] ) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $aee;
+		$aee = ! $aee instanceof EE_Messages_Addressee && is_array($this->_extra_data) && isset($this->_extra_data['data']) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $aee;
 
 
 		//possible EE_Line_Item may be incoming data
-		$this->_ticket = empty( $this->_ticket ) && $this->_data instanceof EE_Line_Item && $aee instanceof EE_Messages_Addressee && ! empty( $aee->line_items_with_children[$this->_data->ID()]['EE_Ticket'] ) && $aee->line_items_with_children[$this->_data->ID()]['EE_Ticket'] instanceof EE_Ticket ? $aee->line_items_with_children[$this->_data->ID()]['EE_Ticket'] : $this->_ticket;
+		$this->_ticket = empty($this->_ticket) && $this->_data instanceof EE_Line_Item && $aee instanceof EE_Messages_Addressee && ! empty($aee->line_items_with_children[$this->_data->ID()]['EE_Ticket']) && $aee->line_items_with_children[$this->_data->ID()]['EE_Ticket'] instanceof EE_Ticket ? $aee->line_items_with_children[$this->_data->ID()]['EE_Ticket'] : $this->_ticket;
 
 		//if still no ticket, then let's see if there is a reg_obj.  If there IS, then we'll try and grab the ticket from the reg_obj instead.
-		if ( empty( $this->_ticket ) ) {
+		if (empty($this->_ticket)) {
 			$this->_ticket = $aee instanceof EE_Messages_Addressee && $aee->reg_obj instanceof EE_Registration ? $aee->reg_obj->ticket() : NULL;
 		}
 
 
 		//If there is no event object by now then get out.
-		if ( ! $this->_ticket instanceof EE_Ticket )
+		if ( ! $this->_ticket instanceof EE_Ticket)
 			return '';
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 
 			case '[TICKET_ID]' :
 				return $this->_ticket->ID();
@@ -97,7 +97,7 @@ 
 				break;
 
 			case '[TICKET_PRICE]' :
-				return EEH_Template::format_currency( $this->_ticket->get('TKT_price') );
+				return EEH_Template::format_currency($this->_ticket->get('TKT_price'));
 				break;
 
 			case '[TKT_QTY_PURCHASED]' :
@@ -105,10 +105,10 @@ 
 				break;
 		}
 
-		if ( strpos( $shortcode, '[TKT_USES_*') !== FALSE  ) {
-			$attrs = $this->_get_shortcode_attrs( $shortcode );
-			$schema = empty( $attrs['schema'] ) ? null : $attrs['schema'];
-			return $this->_ticket->get_pretty( 'TKT_uses', $schema );
+		if (strpos($shortcode, '[TKT_USES_*') !== FALSE) {
+			$attrs = $this->_get_shortcode_attrs($shortcode);
+			$schema = empty($attrs['schema']) ? null : $attrs['schema'];
+			return $this->_ticket->get_pretty('TKT_uses', $schema);
 		}
 		return '';
 

core/templates/maintenance_mode.template.php

Spacing +2 added lines, -2 removed lines

@@ -20,10 +20,10 @@
 		<div id="ee-maintenance-mode-dv" class="" role="main">
 			<article id="ee-maintenance-mode">
 				<header class="event-header">
-					<h1  id="ee-maintenance-mode-h1"><?php _e( 'Maintenance Mode', 'event_espresso' ); ?></h1>
+					<h1  id="ee-maintenance-mode-h1"><?php _e('Maintenance Mode', 'event_espresso'); ?></h1>
 				</header>
 				<div class="ee-maintenance-mode-dv">
-					<p><?php _e( 'Event Registration has been temporarily closed while system maintenance is being performed. We\'re sorry for any inconveniences this may have caused. Please try back again later.	', 'event_espresso' ); ?></p>
+					<p><?php _e('Event Registration has been temporarily closed while system maintenance is being performed. We\'re sorry for any inconveniences this may have caused. Please try back again later.	', 'event_espresso'); ?></p>
 				</div>
 			</article>
 		</div>

espresso.php

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( ! defined('ABSPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('ABSPATH')) {
+	exit('No direct script access allowed');
+}
 /*
   Plugin Name:		Event Espresso
   Plugin URI:  		http://eventespresso.com/pricing/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=wordpress_plugins_page&utm_content=support_link

Spacing +78 added lines, -78 removed lines

@@ -40,7 +40,7 @@ 
  */
 
 //Returns the plugin version
-if ( ! function_exists( 'espresso_version' )) {
+if ( ! function_exists('espresso_version')) {
 	/**
 	 * espresso_version
 	 * @return string
@@ -49,92 +49,92 @@ 
 		return '4.8.1.rc.004';
 	}
 } else {
-	unset( $_GET['activate'] );
-	add_action( 'admin_notices', 'espresso_duplicate_plugin_error', 1 );
+	unset($_GET['activate']);
+	add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
 }
 // define versions
-define( 'EVENT_ESPRESSO_VERSION', espresso_version());
-define( 'EE_MIN_WP_VER_REQUIRED', '4.0' );
-define( 'EE_MIN_WP_VER_RECOMMENDED', '4.1' );
-define( 'EE_MIN_PHP_VER_REQUIRED', '5.3.0' );
-define( 'EE_MIN_PHP_VER_RECOMMENDED', '5.4.33' );
-define( 'EVENT_ESPRESSO_POWERED_BY', 'Event Espresso - ' . EVENT_ESPRESSO_VERSION );
-define( 'EVENT_ESPRESSO_MAIN_FILE', __FILE__ );
+define('EVENT_ESPRESSO_VERSION', espresso_version());
+define('EE_MIN_WP_VER_REQUIRED', '4.0');
+define('EE_MIN_WP_VER_RECOMMENDED', '4.1');
+define('EE_MIN_PHP_VER_REQUIRED', '5.3.0');
+define('EE_MIN_PHP_VER_RECOMMENDED', '5.4.33');
+define('EVENT_ESPRESSO_POWERED_BY', 'Event Espresso - '.EVENT_ESPRESSO_VERSION);
+define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
 
 //used to be DIRECTORY_SEPARATOR, but that caused issues on windows
-if ( ! defined( 'DS' )) {
-	define( 'DS', '/' );
+if ( ! defined('DS')) {
+	define('DS', '/');
 }
-if ( ! defined( 'PS' )) {
-	define( 'PS', PATH_SEPARATOR );
+if ( ! defined('PS')) {
+	define('PS', PATH_SEPARATOR);
 }
-if( ! defined( 'SP' )){
-	define( 'SP', ' ' );
+if ( ! defined('SP')) {
+	define('SP', ' ');
 }
-if( ! defined( 'EENL' )){
-	define( 'EENL', "\n" );
+if ( ! defined('EENL')) {
+	define('EENL', "\n");
 }
 
 
-define( 'EE_SUPPORT_EMAIL', 'support@eventespresso.com');
+define('EE_SUPPORT_EMAIL', 'support@eventespresso.com');
 // define the plugin directory and URL
-define( 'EE_PLUGIN_BASENAME', plugin_basename( EVENT_ESPRESSO_MAIN_FILE ));
-define( 'EE_PLUGIN_DIR_PATH', plugin_dir_path( EVENT_ESPRESSO_MAIN_FILE ));
-define( 'EE_PLUGIN_DIR_URL', plugin_dir_url( EVENT_ESPRESSO_MAIN_FILE ));
+define('EE_PLUGIN_BASENAME', plugin_basename(EVENT_ESPRESSO_MAIN_FILE));
+define('EE_PLUGIN_DIR_PATH', plugin_dir_path(EVENT_ESPRESSO_MAIN_FILE));
+define('EE_PLUGIN_DIR_URL', plugin_dir_url(EVENT_ESPRESSO_MAIN_FILE));
 // main root folder paths
-define( 'EE_ADMIN_PAGES', EE_PLUGIN_DIR_PATH . 'admin_pages' . DS );
-define( 'EE_CORE', EE_PLUGIN_DIR_PATH . 'core' . DS );
-define( 'EE_MODULES', EE_PLUGIN_DIR_PATH . 'modules' . DS );
-define( 'EE_PUBLIC', EE_PLUGIN_DIR_PATH . 'public' . DS );
-define( 'EE_SHORTCODES', EE_PLUGIN_DIR_PATH . 'shortcodes' . DS );
-define( 'EE_WIDGETS', EE_PLUGIN_DIR_PATH . 'widgets' . DS );
-define( 'EE_PAYMENT_METHODS', EE_PLUGIN_DIR_PATH . 'payment_methods' . DS);
-define( 'EE_CAFF_PATH', EE_PLUGIN_DIR_PATH . 'caffeinated' . DS );
+define('EE_ADMIN_PAGES', EE_PLUGIN_DIR_PATH.'admin_pages'.DS);
+define('EE_CORE', EE_PLUGIN_DIR_PATH.'core'.DS);
+define('EE_MODULES', EE_PLUGIN_DIR_PATH.'modules'.DS);
+define('EE_PUBLIC', EE_PLUGIN_DIR_PATH.'public'.DS);
+define('EE_SHORTCODES', EE_PLUGIN_DIR_PATH.'shortcodes'.DS);
+define('EE_WIDGETS', EE_PLUGIN_DIR_PATH.'widgets'.DS);
+define('EE_PAYMENT_METHODS', EE_PLUGIN_DIR_PATH.'payment_methods'.DS);
+define('EE_CAFF_PATH', EE_PLUGIN_DIR_PATH.'caffeinated'.DS);
 // core system paths
-define( 'EE_ADMIN', EE_CORE . 'admin' . DS );
-define( 'EE_CPTS', EE_CORE . 'CPTs' . DS );
-define( 'EE_CLASSES', EE_CORE . 'db_classes' . DS );
-define( 'EE_BUSINESS', EE_CORE . 'business' . DS );
-define( 'EE_MODELS', EE_CORE . 'db_models' . DS );
-define( 'EE_HELPERS', EE_CORE . 'helpers' . DS );
-define( 'EE_LIBRARIES', EE_CORE . 'libraries' . DS );
-define( 'EE_TEMPLATES', EE_CORE . 'templates' . DS );
-define( 'EE_THIRD_PARTY', EE_CORE . 'third_party_libs' . DS );
-define( 'EE_GLOBAL_ASSETS', EE_TEMPLATES . 'global_assets' . DS );
-define( 'EE_FORM_SECTIONS', EE_LIBRARIES  .'form_sections' . DS );
+define('EE_ADMIN', EE_CORE.'admin'.DS);
+define('EE_CPTS', EE_CORE.'CPTs'.DS);
+define('EE_CLASSES', EE_CORE.'db_classes'.DS);
+define('EE_BUSINESS', EE_CORE.'business'.DS);
+define('EE_MODELS', EE_CORE.'db_models'.DS);
+define('EE_HELPERS', EE_CORE.'helpers'.DS);
+define('EE_LIBRARIES', EE_CORE.'libraries'.DS);
+define('EE_TEMPLATES', EE_CORE.'templates'.DS);
+define('EE_THIRD_PARTY', EE_CORE.'third_party_libs'.DS);
+define('EE_GLOBAL_ASSETS', EE_TEMPLATES.'global_assets'.DS);
+define('EE_FORM_SECTIONS', EE_LIBRARIES.'form_sections'.DS);
 // gateways
-define( 'EE_GATEWAYS', EE_MODULES . 'gateways' . DS );
-define( 'EE_GATEWAYS_URL', EE_PLUGIN_DIR_URL . 'modules' . DS . 'gateways' . DS );
+define('EE_GATEWAYS', EE_MODULES.'gateways'.DS);
+define('EE_GATEWAYS_URL', EE_PLUGIN_DIR_URL.'modules'.DS.'gateways'.DS);
 // asset URL paths
-define( 'EE_TEMPLATES_URL', EE_PLUGIN_DIR_URL . 'core' . DS . 'templates' . DS );
-define( 'EE_GLOBAL_ASSETS_URL', EE_TEMPLATES_URL . 'global_assets' . DS );
-define( 'EE_IMAGES_URL',  EE_GLOBAL_ASSETS_URL . 'images' . DS );
-define( 'EE_THIRD_PARTY_URL', EE_PLUGIN_DIR_URL . 'core' . DS . 'third_party_libs' . DS );
-define( 'EE_HELPERS_ASSETS', EE_PLUGIN_DIR_URL . 'core/helpers/assets/' );
-define( 'EE_LIBRARIES_URL', EE_PLUGIN_DIR_URL . 'core/libraries/');
+define('EE_TEMPLATES_URL', EE_PLUGIN_DIR_URL.'core'.DS.'templates'.DS);
+define('EE_GLOBAL_ASSETS_URL', EE_TEMPLATES_URL.'global_assets'.DS);
+define('EE_IMAGES_URL', EE_GLOBAL_ASSETS_URL.'images'.DS);
+define('EE_THIRD_PARTY_URL', EE_PLUGIN_DIR_URL.'core'.DS.'third_party_libs'.DS);
+define('EE_HELPERS_ASSETS', EE_PLUGIN_DIR_URL.'core/helpers/assets/');
+define('EE_LIBRARIES_URL', EE_PLUGIN_DIR_URL.'core/libraries/');
 
 // define upload paths
 $uploads = wp_upload_dir();
 // define the uploads directory and URL
-define( 'EVENT_ESPRESSO_UPLOAD_DIR', $uploads['basedir'] . DS . 'espresso' . DS );
-define( 'EVENT_ESPRESSO_UPLOAD_URL', $uploads['baseurl'] . DS . 'espresso' . DS );
+define('EVENT_ESPRESSO_UPLOAD_DIR', $uploads['basedir'].DS.'espresso'.DS);
+define('EVENT_ESPRESSO_UPLOAD_URL', $uploads['baseurl'].DS.'espresso'.DS);
 // define the templates directory and URL
-define( 'EVENT_ESPRESSO_TEMPLATE_DIR', $uploads['basedir'] . DS . 'espresso' . DS . 'templates' . DS );
-define( 'EVENT_ESPRESSO_TEMPLATE_URL', $uploads['baseurl'] . DS . 'espresso' . DS . 'templates' . DS );
+define('EVENT_ESPRESSO_TEMPLATE_DIR', $uploads['basedir'].DS.'espresso'.DS.'templates'.DS);
+define('EVENT_ESPRESSO_TEMPLATE_URL', $uploads['baseurl'].DS.'espresso'.DS.'templates'.DS);
 // define the gateway directory and URL
-define( 'EVENT_ESPRESSO_GATEWAY_DIR', $uploads['basedir'] . DS . 'espresso' . DS . 'gateways' . DS );
-define( 'EVENT_ESPRESSO_GATEWAY_URL', $uploads['baseurl'] . DS . 'espresso' . DS . 'gateways' . DS );
+define('EVENT_ESPRESSO_GATEWAY_DIR', $uploads['basedir'].DS.'espresso'.DS.'gateways'.DS);
+define('EVENT_ESPRESSO_GATEWAY_URL', $uploads['baseurl'].DS.'espresso'.DS.'gateways'.DS);
 // languages folder/path
-define( 'EE_LANGUAGES_SAFE_LOC', '..' . DS . 'uploads' . DS . 'espresso' . DS . 'languages' . DS );
-define( 'EE_LANGUAGES_SAFE_DIR', EVENT_ESPRESSO_UPLOAD_DIR . 'languages' . DS );
+define('EE_LANGUAGES_SAFE_LOC', '..'.DS.'uploads'.DS.'espresso'.DS.'languages'.DS);
+define('EE_LANGUAGES_SAFE_DIR', EVENT_ESPRESSO_UPLOAD_DIR.'languages'.DS);
 //check for dompdf fonts in uploads
-if( file_exists(EVENT_ESPRESSO_UPLOAD_DIR . 'fonts' . DS ) ){
-	define( 'DOMPDF_FONT_DIR', EVENT_ESPRESSO_UPLOAD_DIR . 'fonts' . DS  );
+if (file_exists(EVENT_ESPRESSO_UPLOAD_DIR.'fonts'.DS)) {
+	define('DOMPDF_FONT_DIR', EVENT_ESPRESSO_UPLOAD_DIR.'fonts'.DS);
 }
 
 //ajax constants
-define( 'EE_FRONT_AJAX', isset($_REQUEST['ee_front_ajax']) || isset( $_REQUEST['data']['ee_front_ajax'] ) ? TRUE : FALSE );
-define( 'EE_ADMIN_AJAX', isset($_REQUEST['ee_admin_ajax']) || isset( $_REQUEST['data']['ee_admin_ajax'] ) ? TRUE : FALSE );
+define('EE_FRONT_AJAX', isset($_REQUEST['ee_front_ajax']) || isset($_REQUEST['data']['ee_front_ajax']) ? TRUE : FALSE);
+define('EE_ADMIN_AJAX', isset($_REQUEST['ee_admin_ajax']) || isset($_REQUEST['data']['ee_admin_ajax']) ? TRUE : FALSE);
 //just a handy constant occasionally needed for finding values representing infinity in the DB
 //you're better to use this than its straight value (currently -1) in case you ever
 //want to change its default value! or find when -1 means infinity
@@ -149,10 +149,10 @@ 
 function espresso_duplicate_plugin_error() {
 	?>
 	<div class="error">
-	<p><?php _e( 'Can not run multiple versions of Event Espresso! Please deactivate one of the versions.', 'event_espresso' ); ?></p>
+	<p><?php _e('Can not run multiple versions of Event Espresso! Please deactivate one of the versions.', 'event_espresso'); ?></p>
 	</div>
 	<?php
-	EE_System::deactivate_plugin( EE_PLUGIN_BASENAME );
+	EE_System::deactivate_plugin(EE_PLUGIN_BASENAME);
 }
 
 
@@ -162,9 +162,9 @@ 
  * 	adds a wp-option to indicate that EE has been activated via the WP admin plugins page
  */
 function espresso_plugin_activation() {
-	update_option( 'ee_espresso_activation', TRUE );
+	update_option('ee_espresso_activation', TRUE);
 }
-register_activation_hook( EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation' );
+register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
 
 
 
@@ -172,10 +172,10 @@ 
  * 	espresso_plugin_deactivation
  */
 function espresso_plugin_deactivation() {
-	espresso_load_required( 'EEH_Activation', EE_HELPERS . 'EEH_Activation.helper.php' );
+	espresso_load_required('EEH_Activation', EE_HELPERS.'EEH_Activation.helper.php');
 	EEH_Activation::plugin_deactivation();
 }
-register_deactivation_hook( EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_deactivation' );
+register_deactivation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_deactivation');
 
 
 
@@ -185,15 +185,15 @@ 
  */
 function espresso_load_error_handling() {
 	// load debugging tools
-	if ( WP_DEBUG === TRUE ) {
-		require_once( EE_HELPERS . 'EEH_Debug_Tools.helper.php' );
+	if (WP_DEBUG === TRUE) {
+		require_once(EE_HELPERS.'EEH_Debug_Tools.helper.php');
 		EEH_Debug_Tools::instance();
 	}
 	// load error handling
-	if ( is_readable( EE_CORE . 'EE_Error.core.php' )) {
-		 require_once( EE_CORE . 'EE_Error.core.php' );
+	if (is_readable(EE_CORE.'EE_Error.core.php')) {
+		 require_once(EE_CORE.'EE_Error.core.php');
 	} else {
-		wp_die( __( 'The EE_Error core class could not be loaded.', 'event_espresso' ));
+		wp_die(__('The EE_Error core class could not be loaded.', 'event_espresso'));
 	}
 }
 
@@ -203,13 +203,13 @@ 
  * 	espresso_load_required
  * 	given a class name and path, this function will load that file or throw an exception
  */
-function espresso_load_required( $classname, $full_path_to_file ) {
+function espresso_load_required($classname, $full_path_to_file) {
 	espresso_load_error_handling();
-	if ( is_readable( $full_path_to_file )) {
-		require_once( $full_path_to_file );
+	if (is_readable($full_path_to_file)) {
+		require_once($full_path_to_file);
 	} else {
-		throw new EE_Error ( sprintf (
-			__( 'The %s class file could not be located or is not readable due to file permissions.', 'event_espresso' ),
+		throw new EE_Error(sprintf(
+			__('The %s class file could not be located or is not readable due to file permissions.', 'event_espresso'),
 			$classname
 		));
 	}
@@ -217,5 +217,5 @@ 
 
 
 
-espresso_load_required( 'EE_System', EE_CORE . 'EE_System.core.php' );
+espresso_load_required('EE_System', EE_CORE.'EE_System.core.php');
 EE_System::instance();

modules/certificate/EED_Certificate.module.php

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;
 	}

Doc Comments +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
 	 * 
 	 *  @access 	public
 	 *  @param		array 	$attributes
-	 *  @return 	void
+	 *  @return 	string
 	 */
 	public function process_shortcode( $attributes = array() ) {
 		extract( $attributes );

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/csv/EED_Csv.module.php

Spacing +4 added lines, -4 removed lines

@@ -29,7 +29,7 @@ 
 	 * @return EED_Csv
 	 */
 	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,7 +79,7 @@ 
 	 *  @return 	void
 	 */
 	public function export() {
-		$Export = EE_Registry::instance()->load_class( 'Export' );
+		$Export = EE_Registry::instance()->load_class('Export');
 		$Export->export();
 	}
 
@@ -93,7 +93,7 @@ 
 	 *  @return 	void
 	 */
 	public function import() {
-		$Import = EE_Registry::instance()->load_class( 'Import' );
+		$Import = EE_Registry::instance()->load_class('Import');
 		$Import->import();
 	}
 

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/event_single/EED_Event_Single.module.php

Spacing +60 added lines, -60 removed lines

@@ -29,7 +29,7 @@ 
 	 * @return EED_Event_Single
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -41,9 +41,9 @@ 
 	 *  @return 	void
 	 */
 	public static function set_hooks() {
-		add_filter( 'FHEE_run_EE_wp', '__return_true' );
-		add_action( 'wp_loaded', array( 'EED_Event_Single', 'set_definitions' ), 2 );
-		EE_Config::register_route( __( 'event', 'event_espresso' ), 'Event_Single', 'run' );
+		add_filter('FHEE_run_EE_wp', '__return_true');
+		add_action('wp_loaded', array('EED_Event_Single', 'set_definitions'), 2);
+		EE_Config::register_route(__('event', 'event_espresso'), 'Event_Single', 'run');
 	}
 
 	/**
@@ -53,7 +53,7 @@ 
 	 *  @return 	void
 	 */
 	public static function set_hooks_admin() {
-		add_action( 'wp_loaded', array( 'EED_Event_Single', 'set_definitions' ), 2 );
+		add_action('wp_loaded', array('EED_Event_Single', 'set_definitions'), 2);
 	}
 
 
@@ -67,8 +67,8 @@ 
 	 * @return void
 	 */
 	public static function set_definitions() {
-		define( 'EVENT_SINGLE_ASSETS_URL', plugin_dir_url( __FILE__ ) . 'assets' . DS );
-		define( 'EVENT_SINGLE_TEMPLATES_PATH', plugin_dir_path( __FILE__ ) . 'templates' . DS );
+		define('EVENT_SINGLE_ASSETS_URL', plugin_dir_url(__FILE__).'assets'.DS);
+		define('EVENT_SINGLE_TEMPLATES_PATH', plugin_dir_path(__FILE__).'templates'.DS);
 	}
 
 
@@ -78,10 +78,10 @@ 
 	 *
 	 * @return \EE_Events_Archive_Config
 	 */
-	protected function set_config(){
-		$this->set_config_section( 'template_settings' );
-		$this->set_config_class( 'EE_Event_Single_Config' );
-		$this->set_config_name( 'EED_Event_Single' );
+	protected function set_config() {
+		$this->set_config_section('template_settings');
+		$this->set_config_class('EE_Event_Single_Config');
+		$this->set_config_name('EED_Event_Single');
 	}
 
 
@@ -93,15 +93,15 @@ 
 	 * @param WP $WP
 	 * @return    void
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
 		// ensure valid EE_Events_Archive_Config() object exists
 		$this->set_config();
 		// check what template is loaded
-		add_filter( 'template_include',  array( $this, 'template_include' ), 999, 1 );
-		add_filter( 'FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', '__return_true' );
+		add_filter('template_include', array($this, 'template_include'), 999, 1);
+		add_filter('FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', '__return_true');
 		// load css
-		add_action('wp_enqueue_scripts', array( $this, 'wp_enqueue_scripts' ), 10 );
-		EE_Registry::instance()->load_helper( 'Venue_View' );
+		add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 10);
+		EE_Registry::instance()->load_helper('Venue_View');
 	}
 
 
@@ -113,20 +113,20 @@ 
 	 * @param 	string $template
 	 * @return 	string
 	 */
-	public function template_include( $template ) {
+	public function template_include($template) {
 		global $post;
-		if ( $this->config()->display_status_banner_single ) {
-			add_filter( 'the_title', array( 'EED_Event_Single', 'the_title' ), 100, 2 );
+		if ($this->config()->display_status_banner_single) {
+			add_filter('the_title', array('EED_Event_Single', 'the_title'), 100, 2);
 		}
 		// not a custom template?
-		if ( EE_Front_Controller::instance()->get_selected_template() != 'single-espresso_events.php' && ! post_password_required( $post ) ) {
+		if (EE_Front_Controller::instance()->get_selected_template() != 'single-espresso_events.php' && ! post_password_required($post)) {
 			EEH_Template::load_espresso_theme_functions();
 			// then add extra event data via hooks
-			add_action( 'loop_start', array( 'EED_Event_Single', 'loop_start' ));
-			add_filter( 'the_content', array( 'EED_Event_Single', 'event_details' ), 100 );
-			add_action( 'loop_end', array( 'EED_Event_Single', 'loop_end' ));
+			add_action('loop_start', array('EED_Event_Single', 'loop_start'));
+			add_filter('the_content', array('EED_Event_Single', 'event_details'), 100);
+			add_action('loop_end', array('EED_Event_Single', 'loop_end'));
 			// don't display entry meta because the existing theme will take car of that
-			add_filter( 'FHEE__content_espresso_events_details_template__display_entry_meta', '__return_false' );
+			add_filter('FHEE__content_espresso_events_details_template__display_entry_meta', '__return_false');
 		}
 		return $template;
 	}
@@ -140,9 +140,9 @@ 
 	 * 	@param		array 	$wp_query_array an array containing the WP_Query object
 	 *  	@return 		void
 	 */
-	public static function loop_start( $wp_query_array ) {
+	public static function loop_start($wp_query_array) {
 		global $post;
-		do_action( 'AHEE_event_details_before_post', $post, $wp_query_array );
+		do_action('AHEE_event_details_before_post', $post, $wp_query_array);
 	}
 
 
@@ -155,9 +155,9 @@ 
 	 * @param 	int 	$id
 	 * @return 	string
 	 */
-	public static function the_title( $title = '', $id = 0 ) {
+	public static function the_title($title = '', $id = 0) {
 		global $post;
-		return in_the_loop() && $post->ID == $id ? espresso_event_status_banner( $post->ID ) . $title :  $title;
+		return in_the_loop() && $post->ID == $id ? espresso_event_status_banner($post->ID).$title : $title;
 	}
 
 
@@ -168,28 +168,28 @@ 
 	 * 	@param 	string 	$content
 	 * 	@return 	string
 	 */
-	public static function event_details( $content ) {
+	public static function event_details($content) {
 		global $post;
-		if ( $post->post_type == 'espresso_events' && ! post_password_required() ) {
+		if ($post->post_type == 'espresso_events' && ! post_password_required()) {
 			// since the 'content-espresso_events-details.php' template might be used directly from within a theme,
 			// it uses the_content() for displaying the $post->post_content
 			// so in order to load a template that uses the_content() from within a callback being used to filter the_content(),
 			// we need to first remove this callback from being applied to the_content() (otherwise it will recurse and blow up the interweb)
-			remove_filter( 'the_content', array( 'EED_Event_Single', 'event_details' ), 100 );
+			remove_filter('the_content', array('EED_Event_Single', 'event_details'), 100);
 			//now add additional content
-			add_filter( 'the_content', array( 'EED_Event_Single', 'event_datetimes' ), 110, 1 );
-			add_filter( 'the_content', array( 'EED_Event_Single', 'event_tickets' ), 120, 1 );
-			add_filter( 'the_content', array( 'EED_Event_Single', 'event_venues' ), 130, 1 );
+			add_filter('the_content', array('EED_Event_Single', 'event_datetimes'), 110, 1);
+			add_filter('the_content', array('EED_Event_Single', 'event_tickets'), 120, 1);
+			add_filter('the_content', array('EED_Event_Single', 'event_venues'), 130, 1);
 			// now load our template
-			$template = EEH_Template::locate_template( 'content-espresso_events-details.php' );
+			$template = EEH_Template::locate_template('content-espresso_events-details.php');
 			//now add our filter back in, plus some others
-			add_filter( 'the_content', array( 'EED_Event_Single', 'event_details' ), 100 );
-			remove_filter( 'the_content', array( 'EED_Event_Single', 'event_datetimes' ), 110 );
-			remove_filter( 'the_content', array( 'EED_Event_Single', 'event_tickets' ), 120 );
-			remove_filter( 'the_content', array( 'EED_Event_Single', 'event_venues' ), 130 );
+			add_filter('the_content', array('EED_Event_Single', 'event_details'), 100);
+			remove_filter('the_content', array('EED_Event_Single', 'event_datetimes'), 110);
+			remove_filter('the_content', array('EED_Event_Single', 'event_tickets'), 120);
+			remove_filter('the_content', array('EED_Event_Single', 'event_venues'), 130);
 		}
 		// we're not returning the $content directly because the template we are loading uses the_content (or the_excerpt)
-		return ! empty( $template ) ? $template : $content;
+		return ! empty($template) ? $template : $content;
 	}
 
 
@@ -201,8 +201,8 @@ 
 	 * 	@param		string 	$content
 	 *  	@return 		string
 	 */
-	public static function event_datetimes( $content ) {
-		return EEH_Template::locate_template( 'content-espresso_events-datetimes.php' ) . $content;
+	public static function event_datetimes($content) {
+		return EEH_Template::locate_template('content-espresso_events-datetimes.php').$content;
 	}
 
 	/**
@@ -212,8 +212,8 @@ 
 	 * 	@param		string 	$content
 	 *  	@return 		string
 	 */
-	public static function event_tickets( $content ) {
-		return EEH_Template::locate_template( 'content-espresso_events-tickets.php' ) . $content;
+	public static function event_tickets($content) {
+		return EEH_Template::locate_template('content-espresso_events-tickets.php').$content;
 	}
 
 	/**
@@ -223,8 +223,8 @@ 
 	 * 	@param		string 	$content
 	 *  	@return 		string
 	 */
-	public static function event_venues( $content ) {
-		return $content . EEH_Template::locate_template( 'content-espresso_events-venues.php' );
+	public static function event_venues($content) {
+		return $content.EEH_Template::locate_template('content-espresso_events-venues.php');
 	}
 
 
@@ -236,9 +236,9 @@ 
 	 * 	@param		array 	$wp_query_array an array containing the WP_Query object
 	 *  	@return 		void
 	 */
-	public static function loop_end( $wp_query_array ) {
+	public static function loop_end($wp_query_array) {
 		global $post;
-		do_action( 'AHEE_event_details_after_post', $post, $wp_query_array );
+		do_action('AHEE_event_details_after_post', $post, $wp_query_array);
 	}
 
 
@@ -251,18 +251,18 @@ 
 	 */
 	public function wp_enqueue_scripts() {
 		// get some style
-		if ( apply_filters( 'FHEE_enable_default_espresso_css', TRUE ) && apply_filters( 'FHEE__EED_Event_Single__wp_enqueue_scripts__enable_css', TRUE )) {
-			EE_Registry::instance()->load_helper( 'File' );
+		if (apply_filters('FHEE_enable_default_espresso_css', TRUE) && apply_filters('FHEE__EED_Event_Single__wp_enqueue_scripts__enable_css', TRUE)) {
+			EE_Registry::instance()->load_helper('File');
 			// first check uploads folder
-			if ( is_readable( get_stylesheet_directory() . $this->theme . DS . 'style.css' )) {
-				wp_register_style( $this->theme, get_stylesheet_directory_uri() . $this->theme . DS . 'style.css', array( 'dashicons', 'espresso_default' ));
+			if (is_readable(get_stylesheet_directory().$this->theme.DS.'style.css')) {
+				wp_register_style($this->theme, get_stylesheet_directory_uri().$this->theme.DS.'style.css', array('dashicons', 'espresso_default'));
 			} else {
-				wp_register_style( $this->theme, EE_TEMPLATES_URL . $this->theme . DS . 'style.css', array( 'dashicons', 'espresso_default' ));
+				wp_register_style($this->theme, EE_TEMPLATES_URL.$this->theme.DS.'style.css', array('dashicons', 'espresso_default'));
 			}
-			wp_enqueue_script( $this->theme );
-			if ( EE_Registry::instance()->CFG->map_settings->use_google_maps ) {
-				EE_Registry::instance()->load_helper( 'Maps' );
-				add_action('wp_enqueue_scripts', array( 'EEH_Maps', 'espresso_google_map_js' ), 11 );
+			wp_enqueue_script($this->theme);
+			if (EE_Registry::instance()->CFG->map_settings->use_google_maps) {
+				EE_Registry::instance()->load_helper('Maps');
+				add_action('wp_enqueue_scripts', array('EEH_Maps', 'espresso_google_map_js'), 11);
 			}
 		}
 	}
@@ -281,11 +281,11 @@ 
 	 *  @return 	bool
 	 */
 	public static function display_venue() {
-		EE_Registry::instance()->load_helper( 'Venue_View' );
+		EE_Registry::instance()->load_helper('Venue_View');
 		/** @type EE_Event_Single_Config EED_Event_Single::instance()->config() */
-		$display_venue= isset( EED_Event_Single::instance()->config()->display_venue ) ? EED_Event_Single::instance()->config()->display_venue : TRUE;
+		$display_venue = isset(EED_Event_Single::instance()->config()->display_venue) ? EED_Event_Single::instance()->config()->display_venue : TRUE;
 		$venue_name = EEH_Venue_View::venue_name();
-		return $display_venue && ! empty( $venue_name ) ? TRUE : FALSE;
+		return $display_venue && ! empty($venue_name) ? TRUE : FALSE;
 	}
 
 

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/templates/espresso_events_feed.template.php

Spacing +9 added lines, -9 removed lines

@@ -10,13 +10,13 @@
  * @ version		4+
  */
  ?>
-<p><?php  _e( 'Event Organizer: ', 'event_espresso' ) . espresso_organization_name( $EVT_ID ); ?><br/>
-<?php  _e( 'Organizer Email: ', 'event_espresso' ) . espresso_organization_email( $EVT_ID ); ?><br/>
-<?php  _e( 'Event Phone: ', 'event_espresso' ) . espresso_event_phone( $EVT_ID ); ?></p>
-<p><?php  _e( 'Event Status: ', 'event_espresso' ) . espresso_event_status( $EVT_ID );?></p>
-<p><?php  _e( 'Categories: ', 'event_espresso' ) . espresso_event_categories( $EVT_ID );?></p>
-<?php  _e( 'Dates and Times: ', 'event_espresso' ) . espresso_list_of_event_dates( $EVT_ID );?>
-<?php  _e( 'Available Tickets: ', 'event_espresso' ) . espresso_event_tickets_available( $EVT_ID );?>
-<p><?php  _e( 'Event Venue: ', 'event_espresso' ) . espresso_venue_name( NULL, FALSE ); ?></p>
-<p><?php  echo __( 'Description: ', 'event_espresso' ) . $event_description; ?></p><br/>
+<p><?php  _e('Event Organizer: ', 'event_espresso').espresso_organization_name($EVT_ID); ?><br/>
+<?php  _e('Organizer Email: ', 'event_espresso').espresso_organization_email($EVT_ID); ?><br/>
+<?php  _e('Event Phone: ', 'event_espresso').espresso_event_phone($EVT_ID); ?></p>
+<p><?php  _e('Event Status: ', 'event_espresso').espresso_event_status($EVT_ID); ?></p>
+<p><?php  _e('Categories: ', 'event_espresso').espresso_event_categories($EVT_ID); ?></p>
+<?php  _e('Dates and Times: ', 'event_espresso').espresso_list_of_event_dates($EVT_ID); ?>
+<?php  _e('Available Tickets: ', 'event_espresso').espresso_event_tickets_available($EVT_ID); ?>
+<p><?php  _e('Event Venue: ', 'event_espresso').espresso_venue_name(NULL, FALSE); ?></p>
+<p><?php  echo __('Description: ', 'event_espresso').$event_description; ?></p><br/>
  
\ No newline at end of file

modules/feeds/templates/espresso_venues_feed.template.php

Spacing +7 added lines, -7 removed lines

@@ -10,11 +10,11 @@
  * @ version		4+
  */
  ?>
-<p><?php  _e( 'Organizer Name: ', 'event_espresso' ) . espresso_organization_name( $VNU_ID ); ?><br/>
-<?php  _e( 'Organizer Email: ', 'event_espresso' ) . espresso_organization_email( $VNU_ID ); ?><br/>
-<?php  _e( 'Venue Phone: ', 'event_espresso' ) . espresso_venue_phone( $VNU_ID ); ?></p>
-<p><?php  _e( 'Categories: ', 'event_espresso' ) . espresso_venue_categories( $VNU_ID );?></p>
-<p><?php  _e( 'Address: ', 'event_espresso' ) . espresso_venue_address( $VNU_ID );?></p>
-<p><?php  _e( 'Website: ', 'event_espresso' ) . espresso_venue_website( $VNU_ID );?></p>
-<p><?php  echo __( 'Description: ', 'event_espresso' )  . $venue_description; ?></p><br/>
+<p><?php  _e('Organizer Name: ', 'event_espresso').espresso_organization_name($VNU_ID); ?><br/>
+<?php  _e('Organizer Email: ', 'event_espresso').espresso_organization_email($VNU_ID); ?><br/>
+<?php  _e('Venue Phone: ', 'event_espresso').espresso_venue_phone($VNU_ID); ?></p>
+<p><?php  _e('Categories: ', 'event_espresso').espresso_venue_categories($VNU_ID); ?></p>
+<p><?php  _e('Address: ', 'event_espresso').espresso_venue_address($VNU_ID); ?></p>
+<p><?php  _e('Website: ', 'event_espresso').espresso_venue_website($VNU_ID); ?></p>
+<p><?php  echo __('Description: ', 'event_espresso').$venue_description; ?></p><br/>
  
\ No newline at end of file