Inspection of "Daily Inspection: Merge branch 'master' into BETA-..." - eventespresso/event-espresso-core - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Branch — BETA-4.9-messages-queue-fixed (941081)

unknown

created 2016-01-14 21:40 UTC

Status

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -40,7 +40,7 @@  discard block
 block discarded – undo
 	 * @return \EE_Response
 	 */
 	public function __construct() {
-		$this->terminate_request( false );
+		$this->terminate_request(false);
 	}
 
 
@@ -53,8 +53,8 @@  discard block
 block discarded – undo
 	 * @param $value
 	 * @return    void
 	 */
-	public function set_notice( $key, $value ) {
-		$this->_notice[ $key ] = $value;
+	public function set_notice($key, $value) {
+		$this->_notice[$key] = $value;
 	}
 
 
@@ -66,8 +66,8 @@  discard block
 block discarded – undo
 	 * @param $key
 	 * @return    mixed
 	 */
-	public function get_notice( $key ) {
-		return isset( $this->_notice[ $key ] ) ? $this->_notice[ $key ] : NULL;
+	public function get_notice($key) {
+		return isset($this->_notice[$key]) ? $this->_notice[$key] : NULL;
 	}
 
 
@@ -91,8 +91,8 @@  discard block
 block discarded – undo
 	 * @param $string
 	 * @param bool $append
 	 */
-	public function add_output( $string, $append = true ) {
-		$this->_output = $append ? $this->_output . $string : $string . $this->_output;
+	public function add_output($string, $append = true) {
+		$this->_output = $append ? $this->_output.$string : $string.$this->_output;
 	}
 
 
@@ -121,8 +121,8 @@  discard block
 block discarded – undo
 	/**
 	 * @param boolean $request_terminated
 	 */
-	public function terminate_request( $request_terminated = true ) {
-		$this->request_terminated = filter_var( $request_terminated, FILTER_VALIDATE_BOOLEAN );
+	public function terminate_request($request_terminated = true) {
+		$this->request_terminated = filter_var($request_terminated, FILTER_VALIDATE_BOOLEAN);
 	}
 
 

Please login to merge, or discard this patch.

modules/ticket_selector/templates/ticket_selector_chart_iframe.template.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -19,13 +19,13 @@
 block discarded – undo
 <html>
 <head>
 	<title><?php _e('Ticket Selector', 'event_espresso'); ?></title>
-	<?php foreach ( $css as $url ) : ?>
-		<link rel="stylesheet" type="text/css" href="<?php echo $url;?>">
+	<?php foreach ($css as $url) : ?>
+		<link rel="stylesheet" type="text/css" href="<?php echo $url; ?>">
 	<?php endforeach; ?>
 	<script type="text/javascript">
 		<?php echo  $eei18n; ?>
 	</script>
-	<?php foreach ( $js as $jsurl ) : ?>
+	<?php foreach ($js as $jsurl) : ?>
 		<script type="text/javascript" src="<?php echo $jsurl; ?>"></script>
 	<?php endforeach; ?>
 </head>

Please login to merge, or discard this patch.

payment_methods/Bank/EE_PMT_Bank.pm.php 1 patch

Spacing +12 added lines, -12 removed lines patch added patch discarded remove patch

@@ -1,6 +1,6 @@  discard block
 block discarded – undo
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
  *
  * ------------------------------------------------------------------------
  */
-class EE_PMT_Bank extends EE_PMT_Base{
+class EE_PMT_Bank extends EE_PMT_Base {
 
 
 
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
 		$this->_pretty_name = __("Bank", 'event_espresso');
 		parent::__construct($pm_instance);
 		$this->_default_button_url = $this->file_url().'lib'.DS.'bank-logo.png';
-		$this->_default_description = __( 'Make payment using an electronic funds transfer from your bank.', 'event_espresso' );
+		$this->_default_description = __('Make payment using an electronic funds transfer from your bank.', 'event_espresso');
 	}
 
 
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
 	 * @param \EE_Transaction $transaction
 	 * @return NULL
 	 */
-	public function generate_new_billing_form( EE_Transaction $transaction = NULL ) {
+	public function generate_new_billing_form(EE_Transaction $transaction = NULL) {
 		return NULL;
 	}
 
@@ -62,17 +62,17 @@  discard block
 block discarded – undo
 		return new EE_Payment_Method_Form(array(
 			'extra_meta_inputs'=>array(
 				'page_title'=>new EE_Text_Input(array(
-					'html_label_text'=>  sprintf(__("Title %s", "event_espresso"),  $this->get_help_tab_link()),
+					'html_label_text'=>  sprintf(__("Title %s", "event_espresso"), $this->get_help_tab_link()),
 					'default'=>  __("Electronic Funds Transfers", 'event_espresso')
 				)),
-				'payment_instructions'=>new EE_Text_Area_Input( array(
-					'html_label_text'=>  sprintf(__("Payment Instructions %s", "event_espresso"),  $this->get_help_tab_link()),
-					'html_help_text' => __( 'Provide instructions on how registrants can send the bank draft payment. Eg, mention your account name, bank account number, bank name, bank routing code, and bank address, etc.', 'event_espresso' ),
+				'payment_instructions'=>new EE_Text_Area_Input(array(
+					'html_label_text'=>  sprintf(__("Payment Instructions %s", "event_espresso"), $this->get_help_tab_link()),
+					'html_help_text' => __('Provide instructions on how registrants can send the bank draft payment. Eg, mention your account name, bank account number, bank name, bank routing code, and bank address, etc.', 'event_espresso'),
 					'default'=> sprintf(
 						__('Please initiate an electronic payment using the following bank information: %1$sAccount Owner: Luke Skywalker%1$sBank Account # 1234567890%1$sBank Name: Rebellion Bank%1$sRouting Number: 12345%1$sBank Address: 12345 Wookie Rd., Planet Corellian.%1$sPayment must be received within 48 hours of event date.', 'event_espresso'),
 						"\n"
 					),
-					'validation_strategies' => array( new EE_Full_HTML_Validation_Strategy() ),
+					'validation_strategies' => array(new EE_Full_HTML_Validation_Strategy()),
 				)),
 			),
 			'exclude'=>array('PMD_debug_mode')
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
 	 * @see EE_PMT_Base::help_tabs_config()
 	 * @return array
 	 */
-	public function help_tabs_config(){
+	public function help_tabs_config() {
 		return array(
 			$this->get_help_tab_name() => array(
 						'title' => __('Bank Draft Settings', 'event_espresso'),
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
 	 * Other gateways may want to override this, such as offline gateways.
 	 * @return string
 	 */
-	public function payment_overview_content(EE_Payment $payment){
+	public function payment_overview_content(EE_Payment $payment) {
 		EE_Registry::instance()->load_helper('Template');
 		$extra_meta_for_payment_method = $this->_pm_instance->all_extra_meta_array();
 		$template_vars = array_merge(
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
 							),
 						$extra_meta_for_payment_method);
 		return EEH_Template::locate_template(
-				'payment_methods' . DS . 'Bank'. DS . 'templates' . DS . 'bank_payment_details_content.template.php',
+				'payment_methods'.DS.'Bank'.DS.'templates'.DS.'bank_payment_details_content.template.php',
 				$template_vars);
 	}
 

Please login to merge, or discard this patch.

payment_methods/Check/EE_PMT_Check.pm.php 1 patch

Spacing +25 added lines, -25 removed lines patch added patch discarded remove patch

@@ -1,6 +1,6 @@  discard block
 block discarded – undo
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
  *
  * ------------------------------------------------------------------------
  */
-class EE_PMT_Check extends EE_PMT_Base{
+class EE_PMT_Check extends EE_PMT_Base {
 
 
 	/**
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
 	 */
 	public function __construct($pm_instance = NULL) {
 		$this->_pretty_name = __("Check", 'event_espresso');
-		$this->_default_description = __( 'After clicking "Finalize Registration", you will be given instructions on how to complete your payment.', 'event_espresso' );
+		$this->_default_description = __('After clicking "Finalize Registration", you will be given instructions on how to complete your payment.', 'event_espresso');
 		parent::__construct($pm_instance);
 		$this->_default_button_url = $this->file_url().'lib'.DS.'check-logo.png';
 	}
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
 	 * @param \EE_Transaction $transaction
 	 * @return NULL
 	 */
-	public function generate_new_billing_form( EE_Transaction $transaction = NULL ) {
+	public function generate_new_billing_form(EE_Transaction $transaction = NULL) {
 		return NULL;
 	}
 
@@ -57,41 +57,41 @@  discard block
 block discarded – undo
 	 * @return EE_Form_Section_Proper
 	 */
 	public function generate_new_settings_form() {
-			if ( EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance){
+			if (EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance) {
 				$organization = EE_Registry::instance()->CFG->organization;
-				$organization_name = $organization->get_pretty( 'name' );
-				$default_address = $organization->address_1 != '' ? $organization->get_pretty( 'address_1' ) . '<br />' : '';
-				$default_address .= $organization->address_2 != '' ? $organization->get_pretty( 'address_2' ) . '<br />' : '';
-				$default_address .= $organization->city != '' ? $organization->get_pretty( 'city' ) : '';
-				$default_address .= ( $organization->city != '' && $organization->STA_ID != '') ? ', ' : '<br />';
-				$state = EE_Registry::instance()->load_model( 'State' )->get_one_by_ID( $organization->STA_ID );
-				$country = EE_Registry::instance()->load_model( 'Country' )->get_one_by_ID( $organization->CNT_ISO ) ;
-				$default_address .=  $state ? $state->name() . '<br />' : '';
-				$default_address .= $country ? $country->name(). '<br />' : '';
-				$default_address .= $organization->zip != '' ? $organization->get_pretty( 'zip' ) : '';
-			}else{
+				$organization_name = $organization->get_pretty('name');
+				$default_address = $organization->address_1 != '' ? $organization->get_pretty('address_1').'<br />' : '';
+				$default_address .= $organization->address_2 != '' ? $organization->get_pretty('address_2').'<br />' : '';
+				$default_address .= $organization->city != '' ? $organization->get_pretty('city') : '';
+				$default_address .= ($organization->city != '' && $organization->STA_ID != '') ? ', ' : '<br />';
+				$state = EE_Registry::instance()->load_model('State')->get_one_by_ID($organization->STA_ID);
+				$country = EE_Registry::instance()->load_model('Country')->get_one_by_ID($organization->CNT_ISO);
+				$default_address .= $state ? $state->name().'<br />' : '';
+				$default_address .= $country ? $country->name().'<br />' : '';
+				$default_address .= $organization->zip != '' ? $organization->get_pretty('zip') : '';
+			} else {
 				$default_address = 'unknown';
 				$organization_name = 'unknown';
 			}
 			return new EE_Payment_Method_Form(array(
 			'extra_meta_inputs'=>array(
 				'check_title'=> new EE_Text_Input(array(
-					'html_label_text'=>  sprintf(__("Title %s", "event_espresso"),  $this->get_help_tab_link()),
+					'html_label_text'=>  sprintf(__("Title %s", "event_espresso"), $this->get_help_tab_link()),
 					'default'=>  __("Check/Money Order Payments", 'event_espresso'),
 				)),
 				'payment_instructions'=>new EE_Text_Area_Input(array(
-					'html_label_text'=>  sprintf(__("Instructions %s", "event_espresso"),  $this->get_help_tab_link()),
+					'html_label_text'=>  sprintf(__("Instructions %s", "event_espresso"), $this->get_help_tab_link()),
 					'default'=> __("Please send Check/Money Order to the address below. Payment must be received within 48 hours of event date.", 'event_espresso'),
-					'validation_strategies' => array( new EE_Full_HTML_Validation_Strategy() ),
+					'validation_strategies' => array(new EE_Full_HTML_Validation_Strategy()),
 				)),
 				'payable_to'=>new EE_Text_Input(array(
-					'html_label_text'=>  sprintf(__("Payable To %s", "event_espresso"),  $this->get_help_tab_link()),
+					'html_label_text'=>  sprintf(__("Payable To %s", "event_espresso"), $this->get_help_tab_link()),
 					'default'=>$organization_name
 				)),
 				'address_to_send_payment'=>new EE_Text_Area_Input(array(
-					'html_label_text'=>  sprintf(__("Address Payable %s", "event_espresso"),  $this->get_help_tab_link()),
+					'html_label_text'=>  sprintf(__("Address Payable %s", "event_espresso"), $this->get_help_tab_link()),
 					'default'=>$default_address,
-					'validation_strategies' => array( new EE_Full_HTML_Validation_Strategy() ),
+					'validation_strategies' => array(new EE_Full_HTML_Validation_Strategy()),
 				)),
 			),
 			'exclude'=>array('PMD_debug_mode')
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
 	 * @see EE_PMT_Base::help_tabs_config()
 	 * @return array
 	 */
-	public function help_tabs_config(){
+	public function help_tabs_config() {
 		return array(
 			$this->get_help_tab_name() => array(
 						'title' => __('Check Settings', 'event_espresso'),
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
 	 * Other gateways may want to override this, such as offline gateways.
 	 * @return string
 	 */
-	public function payment_overview_content(EE_Payment $payment){
+	public function payment_overview_content(EE_Payment $payment) {
 		EE_Registry::instance()->load_helper('Template');
 		$extra_meta_for_payment_method = $this->_pm_instance->all_extra_meta_array();
 		$template_vars = array_merge(
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
 							),
 						$extra_meta_for_payment_method);
 		return EEH_Template::locate_template(
-				'payment_methods' . DS . 'Check'. DS . 'templates'.DS.'check_payment_details_content.template.php',
+				'payment_methods'.DS.'Check'.DS.'templates'.DS.'check_payment_details_content.template.php',
 				$template_vars
 				);
 	}

Please login to merge, or discard this patch.

public/Espresso_Arabica_2014/content-espresso_events-details.php 1 patch

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

@@ -3,30 +3,30 @@
 block discarded – undo
 global $post;
 ?>
 <div class="event-content">
-<?php if ( apply_filters( 'FHEE__content_espresso_events_details_template__display_entry_meta', TRUE )): ?>
+<?php if (apply_filters('FHEE__content_espresso_events_details_template__display_entry_meta', TRUE)): ?>
 	<div class="entry-meta">
-		<span class="tags-links"><?php espresso_event_categories( $post->ID, TRUE, TRUE ); ?></span>
+		<span class="tags-links"><?php espresso_event_categories($post->ID, TRUE, TRUE); ?></span>
 	<?php
-		if ( ! post_password_required() && ( comments_open() || get_comments_number() ) ) :
+		if ( ! post_password_required() && (comments_open() || get_comments_number())) :
 	?>
-	<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'event_espresso' ), __( '1 Comment', 'event_espresso' ), __( '% Comments', 'event_espresso' ) ); ?></span>
+	<span class="comments-link"><?php comments_popup_link(__('Leave a comment', 'event_espresso'), __('1 Comment', 'event_espresso'), __('% Comments', 'event_espresso')); ?></span>
 	<?php
 		endif;
-		edit_post_link( __( 'Edit', 'event_espresso' ), '<span class="edit-link">', '</span>' );
+		edit_post_link(__('Edit', 'event_espresso'), '<span class="edit-link">', '</span>');
 	?>
 	</div>
 <?php endif;
-	$event_phone = espresso_event_phone( $post->ID, FALSE );
-	if ( $event_phone != '' ) : ?>
+	$event_phone = espresso_event_phone($post->ID, FALSE);
+	if ($event_phone != '') : ?>
 	<p>
-		<span class="small-text"><strong><?php _e( 'Event Phone:', 'event_espresso' ); ?> </strong></span> <?php echo $event_phone; ?>
+		<span class="small-text"><strong><?php _e('Event Phone:', 'event_espresso'); ?> </strong></span> <?php echo $event_phone; ?>
 	</p>
-<?php endif;  ?>
+<?php endif; ?>
 <?php
-	if ( apply_filters( 'FHEE__content_espresso_events_details_template__display_the_content', true ) ) {
-		do_action( 'AHEE_event_details_before_the_content', $post );
-		apply_filters( 'FHEE__content_espresso_events_details_template__the_content', espresso_event_content_or_excerpt() );
-		do_action( 'AHEE_event_details_after_the_content', $post );
+	if (apply_filters('FHEE__content_espresso_events_details_template__display_the_content', true)) {
+		do_action('AHEE_event_details_before_the_content', $post);
+		apply_filters('FHEE__content_espresso_events_details_template__the_content', espresso_event_content_or_excerpt());
+		do_action('AHEE_event_details_after_the_content', $post);
 	}
  ?>
 </div>

Please login to merge, or discard this patch.

public/Espresso_Arabica_2014/content-espresso_events-shortcode.php 1 patch

Spacing +16 added lines, -16 removed lines patch added patch discarded remove patch

@@ -21,22 +21,22 @@  discard block
 block discarded – undo
  * and/or use any of the template tags functions found in:
  * \wp-content\plugins\event-espresso-core\public\template_tags.php
  ************************** IMPORTANT **************************/
-add_filter( 'FHEE__content_espresso_events__template_loaded', '__return_false' );
+add_filter('FHEE__content_espresso_events__template_loaded', '__return_false');
 
 //echo '<br/><h6 style="color:#2EA2CC;">'. __FILE__ . ' &nbsp; <span style="font-weight:normal;color:#E76700"> Line #: ' . __LINE__ . '</span></h6>';
 
 global $post;
-$event_class = has_excerpt( $post->ID ) ? ' has-excerpt' : '';
-$event_class = apply_filters( 'FHEE__content_espresso_events__event_class', $event_class );
+$event_class = has_excerpt($post->ID) ? ' has-excerpt' : '';
+$event_class = apply_filters('FHEE__content_espresso_events__event_class', $event_class);
 ?>
-<?php do_action( 'AHEE_event_details_before_post', $post ); ?>
-<article id="post-<?php the_ID(); ?>" <?php post_class( $event_class ); ?>>
+<?php do_action('AHEE_event_details_before_post', $post); ?>
+<article id="post-<?php the_ID(); ?>" <?php post_class($event_class); ?>>
 
-<?php if ( is_single() ) : ?>
+<?php if (is_single()) : ?>
 
-	<div id="espresso-event-header-dv-<?php echo $post->ID;?>" class="espresso-event-header-dv">
-		<?php espresso_get_template_part( 'content', 'espresso_events-thumbnail' ); ?>
-		<?php espresso_get_template_part( 'content', 'espresso_events-header' ); ?>
+	<div id="espresso-event-header-dv-<?php echo $post->ID; ?>" class="espresso-event-header-dv">
+		<?php espresso_get_template_part('content', 'espresso_events-thumbnail'); ?>
+		<?php espresso_get_template_part('content', 'espresso_events-header'); ?>
 	</div>
 
 	<div class="espresso-event-wrapper-dv">
@@ -46,16 +46,16 @@  discard block
 block discarded – undo
 		<?php //espresso_get_template_part( 'content', 'espresso_events-details' ); ?>
 		<?php //espresso_get_template_part( 'content', 'espresso_events-venues' ); ?>
 		<footer class="event-meta">
-			<?php do_action( 'AHEE_event_details_footer_top', $post ); ?>
-			<?php do_action( 'AHEE_event_details_footer_bottom', $post ); ?>
+			<?php do_action('AHEE_event_details_footer_top', $post); ?>
+			<?php do_action('AHEE_event_details_footer_bottom', $post); ?>
 		</footer>
 	</div>
 
-<?php elseif ( is_archive() ) : ?>
+<?php elseif (is_archive()) : ?>
 
-	<div id="espresso-event-list-header-dv-<?php echo $post->ID;?>" class="espresso-event-header-dv">
-		<?php espresso_get_template_part( 'content', 'espresso_events-thumbnail' ); ?>
-		<?php espresso_get_template_part( 'content', 'espresso_events-header' ); ?>
+	<div id="espresso-event-list-header-dv-<?php echo $post->ID; ?>" class="espresso-event-header-dv">
+		<?php espresso_get_template_part('content', 'espresso_events-thumbnail'); ?>
+		<?php espresso_get_template_part('content', 'espresso_events-header'); ?>
 	</div>
 
 	<div class="espresso-event-list-wrapper-dv">
@@ -70,5 +70,5 @@  discard block
 block discarded – undo
 
 </article>
 <!-- #post -->
-<?php do_action( 'AHEE_event_details_after_post', $post );
+<?php do_action('AHEE_event_details_after_post', $post);
 

Please login to merge, or discard this patch.

public/Espresso_Arabica_2014/content-espresso_events-venues.php 1 patch

Spacing +28 added lines, -28 removed lines patch added patch discarded remove patch

@@ -1,54 +1,54 @@
 block discarded – undo
 <?php
 //echo '<br/><h6 style="color:#2EA2CC;">'. __FILE__ . ' &nbsp; <span style="font-weight:normal;color:#E76700"> Line #: ' . __LINE__ . '</span></h6>';
-if (( is_single() && espresso_display_venue_in_event_details() ) || ( is_archive() && espresso_display_venue_in_event_list() ) ) :
+if ((is_single() && espresso_display_venue_in_event_details()) || (is_archive() && espresso_display_venue_in_event_list())) :
 	global $post;
-	do_action( 'AHEE_event_details_before_venue_details', $post );
-	$venue_name = espresso_venue_name( 0, 'details', FALSE );
-	if ( empty( $venue_name ) && espresso_is_venue_private() ) {
-		do_action( 'AHEE_event_details_after_venue_details', $post );
+	do_action('AHEE_event_details_before_venue_details', $post);
+	$venue_name = espresso_venue_name(0, 'details', FALSE);
+	if (empty($venue_name) && espresso_is_venue_private()) {
+		do_action('AHEE_event_details_after_venue_details', $post);
 		return '';
 	}
 ?>
 
 <div class="espresso-venue-dv<?php echo espresso_is_venue_private() ? ' espresso-private-venue-dv' : ''; ?>">
 	<h3 class="event-venues-h3 ee-event-h3">
-		<?php _e( 'Location', 'event_espresso' ); ?>
+		<?php _e('Location', 'event_espresso'); ?>
 	</h3>
-	<h4><strong><?php _e( 'Venue:', 'event_espresso' ); ?></strong>&nbsp;&nbsp; <strong> <?php echo $venue_name; ?></strong></h4>
+	<h4><strong><?php _e('Venue:', 'event_espresso'); ?></strong>&nbsp;&nbsp; <strong> <?php echo $venue_name; ?></strong></h4>
 	<p><span class="smaller-text tags-links"><?php echo espresso_venue_categories(); ?></span></p>
-<?php  if ( $venue_phone = espresso_venue_phone( $post->ID, FALSE )) : ?>
+<?php  if ($venue_phone = espresso_venue_phone($post->ID, FALSE)) : ?>
 	<p>
-		<span class="small-text"><strong><?php _e( 'Venue Phone:', 'event_espresso' ); ?></strong></span> <?php echo $venue_phone; ?>
+		<span class="small-text"><strong><?php _e('Venue Phone:', 'event_espresso'); ?></strong></span> <?php echo $venue_phone; ?>
 	</p>
-<?php endif;  ?>
-<?php  if ( espresso_venue_has_address( $post->ID )) : ?>
-	<strong><span class="dashicons dashicons-location-alt"></span><?php _e( 'Address:', 'event_espresso' ); ?></strong>
-	<?php espresso_venue_address( 'inline' ); ?>
-	<?php espresso_venue_gmap( $post->ID ); ?>
+<?php endif; ?>
+<?php  if (espresso_venue_has_address($post->ID)) : ?>
+	<strong><span class="dashicons dashicons-location-alt"></span><?php _e('Address:', 'event_espresso'); ?></strong>
+	<?php espresso_venue_address('inline'); ?>
+	<?php espresso_venue_gmap($post->ID); ?>
 	<div class="clear"><br/></div>
-<?php endif;  ?>
+<?php endif; ?>
 
-	<?php $VNU_ID = espresso_venue_id( $post->ID ); ?>
-	<?php if ( is_single() ) : ?>
-		<?php $venue_description = espresso_venue_description( $VNU_ID, FALSE ); ?>
-		<?php if ( $venue_description ) : ?>
+	<?php $VNU_ID = espresso_venue_id($post->ID); ?>
+	<?php if (is_single()) : ?>
+		<?php $venue_description = espresso_venue_description($VNU_ID, FALSE); ?>
+		<?php if ($venue_description) : ?>
 	<p>
-		<strong><?php _e( 'Description:', 'event_espresso' ); ?></strong><br/>
-		<?php echo do_shortcode( $venue_description ); ?>
+		<strong><?php _e('Description:', 'event_espresso'); ?></strong><br/>
+		<?php echo do_shortcode($venue_description); ?>
 	</p>
-		<?php endif;  ?>
+		<?php endif; ?>
 	<?php else : ?>
-		<?php $venue_excerpt = espresso_venue_excerpt( $VNU_ID, FALSE ); ?>
-		<?php if ( $venue_excerpt ) : ?>
+		<?php $venue_excerpt = espresso_venue_excerpt($VNU_ID, FALSE); ?>
+		<?php if ($venue_excerpt) : ?>
 	<p>
-		<strong><?php _e( 'Description:', 'event_espresso' ); ?></strong><br/>
+		<strong><?php _e('Description:', 'event_espresso'); ?></strong><br/>
 		<?php echo $venue_excerpt; ?>
 	</p>
-			<?php endif;  ?>
-		<?php endif;  ?>
+			<?php endif; ?>
+		<?php endif; ?>
 </div>
 <!-- .espresso-venue-dv -->
 <?php
-do_action( 'AHEE_event_details_after_venue_details', $post );
+do_action('AHEE_event_details_after_venue_details', $post);
 endif;
 ?>

Please login to merge, or discard this patch.

public/Espresso_Arabica_2014/content-espresso_events.php 1 patch

Spacing +24 added lines, -24 removed lines patch added patch discarded remove patch

@@ -18,52 +18,52 @@
 block discarded – undo
  * and/or use any of the template tags functions found in:
  * \wp-content\plugins\event-espresso-core\public\template_tags.php
  ************************** IMPORTANT **************************/
-add_filter( 'FHEE__content_espresso_events__template_loaded', '__return_true' );
+add_filter('FHEE__content_espresso_events__template_loaded', '__return_true');
 
 //echo '<br/><h6 style="color:#2EA2CC;">'. __FILE__ . ' &nbsp; <span style="font-weight:normal;color:#E76700"> Line #: ' . __LINE__ . '</span></h6>';
 
 global $post;
-$event_class = has_excerpt( $post->ID ) ? ' has-excerpt' : '';
-$event_class = apply_filters( 'FHEE__content_espresso_events__event_class', $event_class );
+$event_class = has_excerpt($post->ID) ? ' has-excerpt' : '';
+$event_class = apply_filters('FHEE__content_espresso_events__event_class', $event_class);
 ?>
-<?php do_action( 'AHEE_event_details_before_post', $post ); ?>
-<article id="post-<?php the_ID(); ?>" <?php post_class( $event_class ); ?>>
+<?php do_action('AHEE_event_details_before_post', $post); ?>
+<article id="post-<?php the_ID(); ?>" <?php post_class($event_class); ?>>
 
-<?php if ( is_single() ) : ?>
+<?php if (is_single()) : ?>
 
-	<div id="espresso-event-header-dv-<?php echo $post->ID;?>" class="espresso-event-header-dv">
-		<?php espresso_get_template_part( 'content', 'espresso_events-thumbnail' ); ?>
-		<?php espresso_get_template_part( 'content', 'espresso_events-header' ); ?>
+	<div id="espresso-event-header-dv-<?php echo $post->ID; ?>" class="espresso-event-header-dv">
+		<?php espresso_get_template_part('content', 'espresso_events-thumbnail'); ?>
+		<?php espresso_get_template_part('content', 'espresso_events-header'); ?>
 	</div>
 
 	<div class="espresso-event-wrapper-dv">
-		<?php espresso_get_template_part( 'content', 'espresso_events-tickets' ); ?>
-		<?php espresso_get_template_part( 'content', 'espresso_events-datetimes' ); ?>
-		<?php espresso_get_template_part( 'content', 'espresso_events-details' ); ?>
-		<?php espresso_get_template_part( 'content', 'espresso_events-venues' ); ?>
+		<?php espresso_get_template_part('content', 'espresso_events-tickets'); ?>
+		<?php espresso_get_template_part('content', 'espresso_events-datetimes'); ?>
+		<?php espresso_get_template_part('content', 'espresso_events-details'); ?>
+		<?php espresso_get_template_part('content', 'espresso_events-venues'); ?>
 		<footer class="event-meta">
-			<?php do_action( 'AHEE_event_details_footer_top', $post ); ?>
-			<?php do_action( 'AHEE_event_details_footer_bottom', $post ); ?>
+			<?php do_action('AHEE_event_details_footer_top', $post); ?>
+			<?php do_action('AHEE_event_details_footer_bottom', $post); ?>
 		</footer>
 	</div>
 
-<?php elseif ( is_archive() ) : ?>
+<?php elseif (is_archive()) : ?>
 
-	<div id="espresso-event-list-header-dv-<?php echo $post->ID;?>" class="espresso-event-header-dv">
-		<?php espresso_get_template_part( 'content', 'espresso_events-thumbnail' ); ?>
-		<?php espresso_get_template_part( 'content', 'espresso_events-header' ); ?>
+	<div id="espresso-event-list-header-dv-<?php echo $post->ID; ?>" class="espresso-event-header-dv">
+		<?php espresso_get_template_part('content', 'espresso_events-thumbnail'); ?>
+		<?php espresso_get_template_part('content', 'espresso_events-header'); ?>
 	</div>
 
 	<div class="espresso-event-list-wrapper-dv">
-		<?php espresso_get_template_part( 'content', 'espresso_events-tickets' ); ?>
-		<?php espresso_get_template_part( 'content', 'espresso_events-datetimes' ); ?>
-		<?php espresso_get_template_part( 'content', 'espresso_events-details' ); ?>
-		<?php espresso_get_template_part( 'content', 'espresso_events-venues' ); ?>
+		<?php espresso_get_template_part('content', 'espresso_events-tickets'); ?>
+		<?php espresso_get_template_part('content', 'espresso_events-datetimes'); ?>
+		<?php espresso_get_template_part('content', 'espresso_events-details'); ?>
+		<?php espresso_get_template_part('content', 'espresso_events-venues'); ?>
 	</div>
 
 <?php endif; ?>
 
 </article>
 <!-- #post -->
-<?php do_action( 'AHEE_event_details_after_post', $post );
+<?php do_action('AHEE_event_details_after_post', $post);
 

Please login to merge, or discard this patch.

public/Espresso_Arabica_2014/loop-espresso_events.php 1 patch

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

@@ -11,22 +11,22 @@  discard block
 block discarded – undo
  * @ version		4+
  */
 
- if ( have_posts() ) : ?>
+ if (have_posts()) : ?>
 
 	<header class="page-header">
 		<h1 class="page-title">
 			<?php
-				if ( is_day() ) :
-					printf( __( 'Today\'s Events: %s', 'event_espresso' ), get_the_date() );
+				if (is_day()) :
+					printf(__('Today\'s Events: %s', 'event_espresso'), get_the_date());
 
-				elseif ( is_month() ) :
-					printf( __( 'Events This Month: %s', 'event_espresso' ), get_the_date( _x( 'F Y', 'monthly archives date format', 'event_espresso' ) ) );
+				elseif (is_month()) :
+					printf(__('Events This Month: %s', 'event_espresso'), get_the_date(_x('F Y', 'monthly archives date format', 'event_espresso')));
 
-				elseif ( is_year() ) :
-					printf( __( 'Events This Year: %s', 'event_espresso' ), get_the_date( _x( 'Y', 'yearly archives date format', 'event_espresso' ) ) );
+				elseif (is_year()) :
+					printf(__('Events This Year: %s', 'event_espresso'), get_the_date(_x('Y', 'yearly archives date format', 'event_espresso')));
 
 				else :
-					echo apply_filters( 'FHEE__archive_espresso_events_template__upcoming_events_h1', __( 'Upcoming Events', 'event_espresso' ));
+					echo apply_filters('FHEE__archive_espresso_events_template__upcoming_events_h1', __('Upcoming Events', 'event_espresso'));
 
 				endif;
 			?>
@@ -36,20 +36,20 @@  discard block
 block discarded – undo
 
 	<?php
 		// allow other stuff
-		do_action( 'AHEE__archive_espresso_events_template__before_loop' );
+		do_action('AHEE__archive_espresso_events_template__before_loop');
 		// Start the Loop.
-		while ( have_posts() ) : the_post();
+		while (have_posts()) : the_post();
 			// Include the post TYPE-specific template for the content.
-			espresso_get_template_part( 'content', 'espresso_events-shortcode' );
+			espresso_get_template_part('content', 'espresso_events-shortcode');
 		endwhile;
 		// Previous/next page navigation.
 		espresso_pagination();
 		// allow moar other stuff
-		do_action( 'AHEE__archive_espresso_events_template__after_loop' );
+		do_action('AHEE__archive_espresso_events_template__after_loop');
 
 	else :
 		// If no content, include the "No posts found" template.
-		espresso_get_template_part( 'content', 'none' );
+		espresso_get_template_part('content', 'none');
 
 	endif;
 

Please login to merge, or discard this patch.

		@@ -40,7 +40,7 @@ discard block
		block discarded – undo
40	40	* @return \EE_Response
41	41	*/
42	42	public function __construct() {
43		- $this->terminate_request( false );
	43	+ $this->terminate_request(false);
44	44	}
45	45
46	46
		@@ -53,8 +53,8 @@ discard block
		block discarded – undo
53	53	* @param $value
54	54	* @return void
55	55	*/
56		- public function set_notice( $key, $value ) {
57		- $this->_notice[ $key ] = $value;
	56	+ public function set_notice($key, $value) {
	57	+ $this->_notice[$key] = $value;
58	58	}
59	59
60	60
		@@ -66,8 +66,8 @@ discard block
		block discarded – undo
66	66	* @param $key
67	67	* @return mixed
68	68	*/
69		- public function get_notice( $key ) {
70		- return isset( $this->_notice[ $key ] ) ? $this->_notice[ $key ] : NULL;
	69	+ public function get_notice($key) {
	70	+ return isset($this->_notice[$key]) ? $this->_notice[$key] : NULL;
71	71	}
72	72
73	73
		@@ -91,8 +91,8 @@ discard block
		block discarded – undo
91	91	* @param $string
92	92	* @param bool $append
93	93	*/
94		- public function add_output( $string, $append = true ) {
95		- $this->_output = $append ? $this->_output . $string : $string . $this->_output;
	94	+ public function add_output($string, $append = true) {
	95	+ $this->_output = $append ? $this->_output.$string : $string.$this->_output;
96	96	}
97	97
98	98
		@@ -121,8 +121,8 @@ discard block
		block discarded – undo
121	121	/**
122	122	* @param boolean $request_terminated
123	123	*/
124		- public function terminate_request( $request_terminated = true ) {
125		- $this->request_terminated = filter_var( $request_terminated, FILTER_VALIDATE_BOOLEAN );
	124	+ public function terminate_request($request_terminated = true) {
	125	+ $this->request_terminated = filter_var($request_terminated, FILTER_VALIDATE_BOOLEAN);
126	126	}
127	127
128	128

		@@ -19,13 +19,13 @@
		block discarded – undo
19	19	<html>
20	20	<head>
21	21	<title><?php _e('Ticket Selector', 'event_espresso'); ?></title>
22		- <?php foreach ( $css as $url ) : ?>
23		- <link rel="stylesheet" type="text/css" href="<?php echo $url;?>">
	22	+ <?php foreach ($css as $url) : ?>
	23	+ <link rel="stylesheet" type="text/css" href="<?php echo $url; ?>">
24	24	<?php endforeach; ?>
25	25	<script type="text/javascript">
26	26	<?php echo $eei18n; ?>
27	27	</script>
28		- <?php foreach ( $js as $jsurl ) : ?>
	28	+ <?php foreach ($js as $jsurl) : ?>
29	29	<script type="text/javascript" src="<?php echo $jsurl; ?>"></script>
30	30	<?php endforeach; ?>
31	31	</head>

		@@ -1,6 +1,6 @@ discard block
		block discarded – undo
1	1	<?php
2	2
3		-if (!defined('EVENT_ESPRESSO_VERSION'))
	3	+if ( ! defined('EVENT_ESPRESSO_VERSION'))
4	4	exit('No direct script access allowed');
5	5
6	6	/**
		@@ -25,7 +25,7 @@ discard block
		block discarded – undo
25	25	*
26	26	* ------------------------------------------------------------------------
27	27	*/
28		-class EE_PMT_Bank extends EE_PMT_Base{
	28	+class EE_PMT_Bank extends EE_PMT_Base {
29	29
30	30
31	31
		@@ -38,7 +38,7 @@ discard block
		block discarded – undo
38	38	$this->_pretty_name = __("Bank", 'event_espresso');
39	39	parent::__construct($pm_instance);
40	40	$this->_default_button_url = $this->file_url().'lib'.DS.'bank-logo.png';
41		- $this->_default_description = __( 'Make payment using an electronic funds transfer from your bank.', 'event_espresso' );
	41	+ $this->_default_description = __('Make payment using an electronic funds transfer from your bank.', 'event_espresso');
42	42	}
43	43
44	44
		@@ -48,7 +48,7 @@ discard block
		block discarded – undo
48	48	* @param \EE_Transaction $transaction
49	49	* @return NULL
50	50	*/
51		- public function generate_new_billing_form( EE_Transaction $transaction = NULL ) {
	51	+ public function generate_new_billing_form(EE_Transaction $transaction = NULL) {
52	52	return NULL;
53	53	}
54	54
		@@ -62,17 +62,17 @@ discard block
		block discarded – undo
62	62	return new EE_Payment_Method_Form(array(
63	63	'extra_meta_inputs'=>array(
64	64	'page_title'=>new EE_Text_Input(array(
65		- 'html_label_text'=> sprintf(__("Title %s", "event_espresso"), $this->get_help_tab_link()),
	65	+ 'html_label_text'=> sprintf(__("Title %s", "event_espresso"), $this->get_help_tab_link()),
66	66	'default'=> __("Electronic Funds Transfers", 'event_espresso')
67	67	)),
68		- 'payment_instructions'=>new EE_Text_Area_Input( array(
69		- 'html_label_text'=> sprintf(__("Payment Instructions %s", "event_espresso"), $this->get_help_tab_link()),
70		- 'html_help_text' => __( 'Provide instructions on how registrants can send the bank draft payment. Eg, mention your account name, bank account number, bank name, bank routing code, and bank address, etc.', 'event_espresso' ),
	68	+ 'payment_instructions'=>new EE_Text_Area_Input(array(
	69	+ 'html_label_text'=> sprintf(__("Payment Instructions %s", "event_espresso"), $this->get_help_tab_link()),
	70	+ 'html_help_text' => __('Provide instructions on how registrants can send the bank draft payment. Eg, mention your account name, bank account number, bank name, bank routing code, and bank address, etc.', 'event_espresso'),
71	71	'default'=> sprintf(
72	72	__('Please initiate an electronic payment using the following bank information: %1$sAccount Owner: Luke Skywalker%1$sBank Account # 1234567890%1$sBank Name: Rebellion Bank%1$sRouting Number: 12345%1$sBank Address: 12345 Wookie Rd., Planet Corellian.%1$sPayment must be received within 48 hours of event date.', 'event_espresso'),
73	73	"\n"
74	74	),
75		- 'validation_strategies' => array( new EE_Full_HTML_Validation_Strategy() ),
	75	+ 'validation_strategies' => array(new EE_Full_HTML_Validation_Strategy()),
76	76	)),
77	77	),
78	78	'exclude'=>array('PMD_debug_mode')
		@@ -86,7 +86,7 @@ discard block
		block discarded – undo
86	86	* @see EE_PMT_Base::help_tabs_config()
87	87	* @return array
88	88	*/
89		- public function help_tabs_config(){
	89	+ public function help_tabs_config() {
90	90	return array(
91	91	$this->get_help_tab_name() => array(
92	92	'title' => __('Bank Draft Settings', 'event_espresso'),
		@@ -103,7 +103,7 @@ discard block
		block discarded – undo
103	103	* Other gateways may want to override this, such as offline gateways.
104	104	* @return string
105	105	*/
106		- public function payment_overview_content(EE_Payment $payment){
	106	+ public function payment_overview_content(EE_Payment $payment) {
107	107	EE_Registry::instance()->load_helper('Template');
108	108	$extra_meta_for_payment_method = $this->_pm_instance->all_extra_meta_array();
109	109	$template_vars = array_merge(
		@@ -115,7 +115,7 @@ discard block
		block discarded – undo
115	115	),
116	116	$extra_meta_for_payment_method);
117	117	return EEH_Template::locate_template(
118		- 'payment_methods' . DS . 'Bank'. DS . 'templates' . DS . 'bank_payment_details_content.template.php',
	118	+ 'payment_methods'.DS.'Bank'.DS.'templates'.DS.'bank_payment_details_content.template.php',
119	119	$template_vars);
120	120	}
121	121

		@@ -3,30 +3,30 @@
		block discarded – undo
3	3	global $post;
4	4	?>
5	5	<div class="event-content">
6		-<?php if ( apply_filters( 'FHEE__content_espresso_events_details_template__display_entry_meta', TRUE )): ?>
	6	+<?php if (apply_filters('FHEE__content_espresso_events_details_template__display_entry_meta', TRUE)): ?>
7	7	<div class="entry-meta">
8		- <span class="tags-links"><?php espresso_event_categories( $post->ID, TRUE, TRUE ); ?></span>
	8	+ <span class="tags-links"><?php espresso_event_categories($post->ID, TRUE, TRUE); ?></span>
9	9	<?php
10		- if ( ! post_password_required() && ( comments_open() \|\| get_comments_number() ) ) :
	10	+ if ( ! post_password_required() && (comments_open() \|\| get_comments_number())) :
11	11	?>
12		- <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'event_espresso' ), __( '1 Comment', 'event_espresso' ), __( '% Comments', 'event_espresso' ) ); ?></span>
	12	+ <span class="comments-link"><?php comments_popup_link(__('Leave a comment', 'event_espresso'), __('1 Comment', 'event_espresso'), __('% Comments', 'event_espresso')); ?></span>
13	13	<?php
14	14	endif;
15		- edit_post_link( __( 'Edit', 'event_espresso' ), '<span class="edit-link">', '</span>' );
	15	+ edit_post_link(__('Edit', 'event_espresso'), '<span class="edit-link">', '</span>');
16	16	?>
17	17	</div>
18	18	<?php endif;
19		- $event_phone = espresso_event_phone( $post->ID, FALSE );
20		- if ( $event_phone != '' ) : ?>
	19	+ $event_phone = espresso_event_phone($post->ID, FALSE);
	20	+ if ($event_phone != '') : ?>
21	21	<p>
22		- <span class="small-text"><strong><?php _e( 'Event Phone:', 'event_espresso' ); ?> </strong></span> <?php echo $event_phone; ?>
	22	+ <span class="small-text"><strong><?php _e('Event Phone:', 'event_espresso'); ?> </strong></span> <?php echo $event_phone; ?>
23	23	</p>
24		-<?php endif; ?>
	24	+<?php endif; ?>
25	25	<?php
26		- if ( apply_filters( 'FHEE__content_espresso_events_details_template__display_the_content', true ) ) {
27		- do_action( 'AHEE_event_details_before_the_content', $post );
28		- apply_filters( 'FHEE__content_espresso_events_details_template__the_content', espresso_event_content_or_excerpt() );
29		- do_action( 'AHEE_event_details_after_the_content', $post );
	26	+ if (apply_filters('FHEE__content_espresso_events_details_template__display_the_content', true)) {
	27	+ do_action('AHEE_event_details_before_the_content', $post);
	28	+ apply_filters('FHEE__content_espresso_events_details_template__the_content', espresso_event_content_or_excerpt());
	29	+ do_action('AHEE_event_details_after_the_content', $post);
30	30	}
31	31	?>
32	32	</div>

		@@ -21,22 +21,22 @@ discard block
		block discarded – undo
21	21	* and/or use any of the template tags functions found in:
22	22	* \wp-content\plugins\event-espresso-core\public\template_tags.php
23	23	************************ IMPORTANT ************************/
24		-add_filter( 'FHEE__content_espresso_events__template_loaded', '__return_false' );
	24	+add_filter('FHEE__content_espresso_events__template_loaded', '__return_false');
25	25
26	26	//echo '<br/><h6 style="color:#2EA2CC;">'. __FILE__ . '   <span style="font-weight:normal;color:#E76700"> Line #: ' . __LINE__ . '</span></h6>';
27	27
28	28	global $post;
29		-$event_class = has_excerpt( $post->ID ) ? ' has-excerpt' : '';
30		-$event_class = apply_filters( 'FHEE__content_espresso_events__event_class', $event_class );
	29	+$event_class = has_excerpt($post->ID) ? ' has-excerpt' : '';
	30	+$event_class = apply_filters('FHEE__content_espresso_events__event_class', $event_class);
31	31	?>
32		-<?php do_action( 'AHEE_event_details_before_post', $post ); ?>
33		-<article id="post-<?php the_ID(); ?>" <?php post_class( $event_class ); ?>>
	32	+<?php do_action('AHEE_event_details_before_post', $post); ?>
	33	+<article id="post-<?php the_ID(); ?>" <?php post_class($event_class); ?>>
34	34
35		-<?php if ( is_single() ) : ?>
	35	+<?php if (is_single()) : ?>
36	36
37		- <div id="espresso-event-header-dv-<?php echo $post->ID;?>" class="espresso-event-header-dv">
38		- <?php espresso_get_template_part( 'content', 'espresso_events-thumbnail' ); ?>
39		- <?php espresso_get_template_part( 'content', 'espresso_events-header' ); ?>
	37	+ <div id="espresso-event-header-dv-<?php echo $post->ID; ?>" class="espresso-event-header-dv">
	38	+ <?php espresso_get_template_part('content', 'espresso_events-thumbnail'); ?>
	39	+ <?php espresso_get_template_part('content', 'espresso_events-header'); ?>
40	40	</div>
41	41
42	42	<div class="espresso-event-wrapper-dv">
		@@ -46,16 +46,16 @@ discard block
		block discarded – undo
46	46	<?php //espresso_get_template_part( 'content', 'espresso_events-details' ); ?>
47	47	<?php //espresso_get_template_part( 'content', 'espresso_events-venues' ); ?>
48	48	<footer class="event-meta">
49		- <?php do_action( 'AHEE_event_details_footer_top', $post ); ?>
50		- <?php do_action( 'AHEE_event_details_footer_bottom', $post ); ?>
	49	+ <?php do_action('AHEE_event_details_footer_top', $post); ?>
	50	+ <?php do_action('AHEE_event_details_footer_bottom', $post); ?>
51	51	</footer>
52	52	</div>
53	53
54		-<?php elseif ( is_archive() ) : ?>
	54	+<?php elseif (is_archive()) : ?>
55	55
56		- <div id="espresso-event-list-header-dv-<?php echo $post->ID;?>" class="espresso-event-header-dv">
57		- <?php espresso_get_template_part( 'content', 'espresso_events-thumbnail' ); ?>
58		- <?php espresso_get_template_part( 'content', 'espresso_events-header' ); ?>
	56	+ <div id="espresso-event-list-header-dv-<?php echo $post->ID; ?>" class="espresso-event-header-dv">
	57	+ <?php espresso_get_template_part('content', 'espresso_events-thumbnail'); ?>
	58	+ <?php espresso_get_template_part('content', 'espresso_events-header'); ?>
59	59	</div>
60	60
61	61	<div class="espresso-event-list-wrapper-dv">
		@@ -70,5 +70,5 @@ discard block
		block discarded – undo
70	70
71	71	</article>
72	72	<!-- #post -->
73		-<?php do_action( 'AHEE_event_details_after_post', $post );
	73	+<?php do_action('AHEE_event_details_after_post', $post);
74	74

		@@ -1,54 +1,54 @@
		block discarded – undo
1	1	<?php
2	2	//echo '<br/><h6 style="color:#2EA2CC;">'. __FILE__ . '   <span style="font-weight:normal;color:#E76700"> Line #: ' . __LINE__ . '</span></h6>';
3		-if (( is_single() && espresso_display_venue_in_event_details() ) \|\| ( is_archive() && espresso_display_venue_in_event_list() ) ) :
	3	+if ((is_single() && espresso_display_venue_in_event_details()) \|\| (is_archive() && espresso_display_venue_in_event_list())) :
4	4	global $post;
5		- do_action( 'AHEE_event_details_before_venue_details', $post );
6		- $venue_name = espresso_venue_name( 0, 'details', FALSE );
7		- if ( empty( $venue_name ) && espresso_is_venue_private() ) {
8		- do_action( 'AHEE_event_details_after_venue_details', $post );
	5	+ do_action('AHEE_event_details_before_venue_details', $post);
	6	+ $venue_name = espresso_venue_name(0, 'details', FALSE);
	7	+ if (empty($venue_name) && espresso_is_venue_private()) {
	8	+ do_action('AHEE_event_details_after_venue_details', $post);
9	9	return '';
10	10	}
11	11	?>
12	12
13	13	<div class="espresso-venue-dv<?php echo espresso_is_venue_private() ? ' espresso-private-venue-dv' : ''; ?>">
14	14	<h3 class="event-venues-h3 ee-event-h3">
15		- <?php _e( 'Location', 'event_espresso' ); ?>
	15	+ <?php _e('Location', 'event_espresso'); ?>
16	16	</h3>
17		- <h4><strong><?php _e( 'Venue:', 'event_espresso' ); ?></strong>   <strong> <?php echo $venue_name; ?></strong></h4>
	17	+ <h4><strong><?php _e('Venue:', 'event_espresso'); ?></strong>   <strong> <?php echo $venue_name; ?></strong></h4>
18	18	<p><span class="smaller-text tags-links"><?php echo espresso_venue_categories(); ?></span></p>
19		-<?php if ( $venue_phone = espresso_venue_phone( $post->ID, FALSE )) : ?>
	19	+<?php if ($venue_phone = espresso_venue_phone($post->ID, FALSE)) : ?>
20	20	<p>
21		- <span class="small-text"><strong><?php _e( 'Venue Phone:', 'event_espresso' ); ?></strong></span> <?php echo $venue_phone; ?>
	21	+ <span class="small-text"><strong><?php _e('Venue Phone:', 'event_espresso'); ?></strong></span> <?php echo $venue_phone; ?>
22	22	</p>
23		-<?php endif; ?>
24		-<?php if ( espresso_venue_has_address( $post->ID )) : ?>
25		- <strong><span class="dashicons dashicons-location-alt"></span><?php _e( 'Address:', 'event_espresso' ); ?></strong>
26		- <?php espresso_venue_address( 'inline' ); ?>
27		- <?php espresso_venue_gmap( $post->ID ); ?>
	23	+<?php endif; ?>
	24	+<?php if (espresso_venue_has_address($post->ID)) : ?>
	25	+ <strong><span class="dashicons dashicons-location-alt"></span><?php _e('Address:', 'event_espresso'); ?></strong>
	26	+ <?php espresso_venue_address('inline'); ?>
	27	+ <?php espresso_venue_gmap($post->ID); ?>
28	28	<div class="clear"><br/></div>
29		-<?php endif; ?>
	29	+<?php endif; ?>
30	30
31		- <?php $VNU_ID = espresso_venue_id( $post->ID ); ?>
32		- <?php if ( is_single() ) : ?>
33		- <?php $venue_description = espresso_venue_description( $VNU_ID, FALSE ); ?>
34		- <?php if ( $venue_description ) : ?>
	31	+ <?php $VNU_ID = espresso_venue_id($post->ID); ?>
	32	+ <?php if (is_single()) : ?>
	33	+ <?php $venue_description = espresso_venue_description($VNU_ID, FALSE); ?>
	34	+ <?php if ($venue_description) : ?>
35	35	<p>
36		- <strong><?php _e( 'Description:', 'event_espresso' ); ?></strong><br/>
37		- <?php echo do_shortcode( $venue_description ); ?>
	36	+ <strong><?php _e('Description:', 'event_espresso'); ?></strong><br/>
	37	+ <?php echo do_shortcode($venue_description); ?>
38	38	</p>
39		- <?php endif; ?>
	39	+ <?php endif; ?>
40	40	<?php else : ?>
41		- <?php $venue_excerpt = espresso_venue_excerpt( $VNU_ID, FALSE ); ?>
42		- <?php if ( $venue_excerpt ) : ?>
	41	+ <?php $venue_excerpt = espresso_venue_excerpt($VNU_ID, FALSE); ?>
	42	+ <?php if ($venue_excerpt) : ?>
43	43	<p>
44		- <strong><?php _e( 'Description:', 'event_espresso' ); ?></strong><br/>
	44	+ <strong><?php _e('Description:', 'event_espresso'); ?></strong><br/>
45	45	<?php echo $venue_excerpt; ?>
46	46	</p>
47		- <?php endif; ?>
48		- <?php endif; ?>
	47	+ <?php endif; ?>
	48	+ <?php endif; ?>
49	49	</div>
50	50	<!-- .espresso-venue-dv -->
51	51	<?php
52		-do_action( 'AHEE_event_details_after_venue_details', $post );
	52	+do_action('AHEE_event_details_after_venue_details', $post);
53	53	endif;
54	54	?>

		@@ -18,52 +18,52 @@
		block discarded – undo
18	18	* and/or use any of the template tags functions found in:
19	19	* \wp-content\plugins\event-espresso-core\public\template_tags.php
20	20	************************ IMPORTANT ************************/
21		-add_filter( 'FHEE__content_espresso_events__template_loaded', '__return_true' );
	21	+add_filter('FHEE__content_espresso_events__template_loaded', '__return_true');
22	22
23	23	//echo '<br/><h6 style="color:#2EA2CC;">'. __FILE__ . '   <span style="font-weight:normal;color:#E76700"> Line #: ' . __LINE__ . '</span></h6>';
24	24
25	25	global $post;
26		-$event_class = has_excerpt( $post->ID ) ? ' has-excerpt' : '';
27		-$event_class = apply_filters( 'FHEE__content_espresso_events__event_class', $event_class );
	26	+$event_class = has_excerpt($post->ID) ? ' has-excerpt' : '';
	27	+$event_class = apply_filters('FHEE__content_espresso_events__event_class', $event_class);
28	28	?>
29		-<?php do_action( 'AHEE_event_details_before_post', $post ); ?>
30		-<article id="post-<?php the_ID(); ?>" <?php post_class( $event_class ); ?>>
	29	+<?php do_action('AHEE_event_details_before_post', $post); ?>
	30	+<article id="post-<?php the_ID(); ?>" <?php post_class($event_class); ?>>
31	31
32		-<?php if ( is_single() ) : ?>
	32	+<?php if (is_single()) : ?>
33	33
34		- <div id="espresso-event-header-dv-<?php echo $post->ID;?>" class="espresso-event-header-dv">
35		- <?php espresso_get_template_part( 'content', 'espresso_events-thumbnail' ); ?>
36		- <?php espresso_get_template_part( 'content', 'espresso_events-header' ); ?>
	34	+ <div id="espresso-event-header-dv-<?php echo $post->ID; ?>" class="espresso-event-header-dv">
	35	+ <?php espresso_get_template_part('content', 'espresso_events-thumbnail'); ?>
	36	+ <?php espresso_get_template_part('content', 'espresso_events-header'); ?>
37	37	</div>
38	38
39	39	<div class="espresso-event-wrapper-dv">
40		- <?php espresso_get_template_part( 'content', 'espresso_events-tickets' ); ?>
41		- <?php espresso_get_template_part( 'content', 'espresso_events-datetimes' ); ?>
42		- <?php espresso_get_template_part( 'content', 'espresso_events-details' ); ?>
43		- <?php espresso_get_template_part( 'content', 'espresso_events-venues' ); ?>
	40	+ <?php espresso_get_template_part('content', 'espresso_events-tickets'); ?>
	41	+ <?php espresso_get_template_part('content', 'espresso_events-datetimes'); ?>
	42	+ <?php espresso_get_template_part('content', 'espresso_events-details'); ?>
	43	+ <?php espresso_get_template_part('content', 'espresso_events-venues'); ?>
44	44	<footer class="event-meta">
45		- <?php do_action( 'AHEE_event_details_footer_top', $post ); ?>
46		- <?php do_action( 'AHEE_event_details_footer_bottom', $post ); ?>
	45	+ <?php do_action('AHEE_event_details_footer_top', $post); ?>
	46	+ <?php do_action('AHEE_event_details_footer_bottom', $post); ?>
47	47	</footer>
48	48	</div>
49	49
50		-<?php elseif ( is_archive() ) : ?>
	50	+<?php elseif (is_archive()) : ?>
51	51
52		- <div id="espresso-event-list-header-dv-<?php echo $post->ID;?>" class="espresso-event-header-dv">
53		- <?php espresso_get_template_part( 'content', 'espresso_events-thumbnail' ); ?>
54		- <?php espresso_get_template_part( 'content', 'espresso_events-header' ); ?>
	52	+ <div id="espresso-event-list-header-dv-<?php echo $post->ID; ?>" class="espresso-event-header-dv">
	53	+ <?php espresso_get_template_part('content', 'espresso_events-thumbnail'); ?>
	54	+ <?php espresso_get_template_part('content', 'espresso_events-header'); ?>
55	55	</div>
56	56
57	57	<div class="espresso-event-list-wrapper-dv">
58		- <?php espresso_get_template_part( 'content', 'espresso_events-tickets' ); ?>
59		- <?php espresso_get_template_part( 'content', 'espresso_events-datetimes' ); ?>
60		- <?php espresso_get_template_part( 'content', 'espresso_events-details' ); ?>
61		- <?php espresso_get_template_part( 'content', 'espresso_events-venues' ); ?>
	58	+ <?php espresso_get_template_part('content', 'espresso_events-tickets'); ?>
	59	+ <?php espresso_get_template_part('content', 'espresso_events-datetimes'); ?>
	60	+ <?php espresso_get_template_part('content', 'espresso_events-details'); ?>
	61	+ <?php espresso_get_template_part('content', 'espresso_events-venues'); ?>
62	62	</div>
63	63
64	64	<?php endif; ?>
65	65
66	66	</article>
67	67	<!-- #post -->
68		-<?php do_action( 'AHEE_event_details_after_post', $post );
	68	+<?php do_action('AHEE_event_details_after_post', $post);
69	69

		@@ -11,22 +11,22 @@ discard block
		block discarded – undo
11	11	* @ version 4+
12	12	*/
13	13
14		- if ( have_posts() ) : ?>
	14	+ if (have_posts()) : ?>
15	15
16	16	<header class="page-header">
17	17	<h1 class="page-title">
18	18	<?php
19		- if ( is_day() ) :
20		- printf( __( 'Today\'s Events: %s', 'event_espresso' ), get_the_date() );
	19	+ if (is_day()) :
	20	+ printf(__('Today\'s Events: %s', 'event_espresso'), get_the_date());
21	21
22		- elseif ( is_month() ) :
23		- printf( __( 'Events This Month: %s', 'event_espresso' ), get_the_date( _x( 'F Y', 'monthly archives date format', 'event_espresso' ) ) );
	22	+ elseif (is_month()) :
	23	+ printf(__('Events This Month: %s', 'event_espresso'), get_the_date(_x('F Y', 'monthly archives date format', 'event_espresso')));
24	24
25		- elseif ( is_year() ) :
26		- printf( __( 'Events This Year: %s', 'event_espresso' ), get_the_date( _x( 'Y', 'yearly archives date format', 'event_espresso' ) ) );
	25	+ elseif (is_year()) :
	26	+ printf(__('Events This Year: %s', 'event_espresso'), get_the_date(_x('Y', 'yearly archives date format', 'event_espresso')));
27	27
28	28	else :
29		- echo apply_filters( 'FHEE__archive_espresso_events_template__upcoming_events_h1', __( 'Upcoming Events', 'event_espresso' ));
	29	+ echo apply_filters('FHEE__archive_espresso_events_template__upcoming_events_h1', __('Upcoming Events', 'event_espresso'));
30	30
31	31	endif;
32	32	?>
		@@ -36,20 +36,20 @@ discard block
		block discarded – undo
36	36
37	37	<?php
38	38	// allow other stuff
39		- do_action( 'AHEE__archive_espresso_events_template__before_loop' );
	39	+ do_action('AHEE__archive_espresso_events_template__before_loop');
40	40	// Start the Loop.
41		- while ( have_posts() ) : the_post();
	41	+ while (have_posts()) : the_post();
42	42	// Include the post TYPE-specific template for the content.
43		- espresso_get_template_part( 'content', 'espresso_events-shortcode' );
	43	+ espresso_get_template_part('content', 'espresso_events-shortcode');
44	44	endwhile;
45	45	// Previous/next page navigation.
46	46	espresso_pagination();
47	47	// allow moar other stuff
48		- do_action( 'AHEE__archive_espresso_events_template__after_loop' );
	48	+ do_action('AHEE__archive_espresso_events_template__after_loop');
49	49
50	50	else :
51	51	// If no content, include the "No posts found" template.
52		- espresso_get_template_part( 'content', 'none' );
	52	+ espresso_get_template_part('content', 'none');
53	53
54	54	endif;
55	55

eventespresso / event-espresso-core

Branch — BETA-4.9-messages-queue-fixed (941081)

Status

Category

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +12 added lines, -12 removed lines patch added patch discarded remove patch

Spacing +25 added lines, -25 removed lines patch added patch discarded remove patch

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

Spacing +16 added lines, -16 removed lines patch added patch discarded remove patch

Spacing +28 added lines, -28 removed lines patch added patch discarded remove patch

Spacing +24 added lines, -24 removed lines patch added patch discarded remove patch

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch