eventespresso / event-espresso-core

public/Espresso_Arabica_2014/content-espresso_venues-header.php

Spacing +2 added lines, -2 removed lines

@@ -1,11 +1,11 @@
 <?php //echo '<h1>' . __FILE__ . '</h1>'; ?>
 <?php global $post; 
-$wrap_class = has_excerpt( $post->ID ) ? 'has-excerpt' : '';
+$wrap_class = has_excerpt($post->ID) ? 'has-excerpt' : '';
 ?>
 <header class="venue-header <?php echo sanitize_html_class($wrap_class); ?>">
 	<h1 id="venue-details-h1" class="entry-title">
 		<a class="" href="<?php the_permalink(); ?>"><?php the_title(); ?></a>
 	</h1>
-	<?php if ( has_excerpt( $post->ID )) { the_excerpt(); } ?>
+	<?php if (has_excerpt($post->ID)) { the_excerpt(); } ?>
 </header>
 <!-- .venue-content -->

public/Espresso_Arabica_2014/content-espresso_events.php

Spacing +22 added lines, -22 removed lines

@@ -18,52 +18,52 @@
  * 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 esc_attr($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' ); ?>
+		<?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 esc_attr($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' ); ?>
+		<?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);
 

public/Espresso_Arabica_2014/content-espresso_events-thumbnail.php

Spacing +7 added lines, -7 removed lines

@@ -1,15 +1,15 @@ 
 <?php
 
 global $post;
-do_action( 'AHEE_event_details_before_featured_img', $post );
+do_action('AHEE_event_details_before_featured_img', $post);
 
-if ( has_post_thumbnail( $post->ID )) :
-	if ( $img_ID = get_post_thumbnail_id( $post->ID )) :
-		if ( $featured_img = wp_get_attachment_image_src( $img_ID, 'large' )) :
-			$caption = get_post( get_post( $img_ID ))->post_excerpt;
+if (has_post_thumbnail($post->ID)) :
+	if ($img_ID = get_post_thumbnail_id($post->ID)) :
+		if ($featured_img = wp_get_attachment_image_src($img_ID, 'large')) :
+			$caption = get_post(get_post($img_ID))->post_excerpt;
 			?>
 <div id="ee-event-img-dv-<?php echo esc_attr($post->ID); ?>" class="ee-event-img-dv">
-	<a class="ee-event-img-lnk" href="<?php the_permalink(); ?>"<?php echo EED_Events_Archive::link_target();?>>
+	<a class="ee-event-img-lnk" href="<?php the_permalink(); ?>"<?php echo EED_Events_Archive::link_target(); ?>>
 		<img alt="<?php echo esc_attr($caption); ?>"
              class="ee-event-img"
              height="<?php echo esc_attr($featured_img[2]); ?>"
@@ -23,4 +23,4 @@ 
 	endif;
 endif;
 ?>
-<?php do_action( 'AHEE_event_details_after_featured_img', $post );?>
+<?php do_action('AHEE_event_details_after_featured_img', $post); ?>

public/Espresso_Arabica_2014/content-espresso_venues.php

Spacing +15 added lines, -15 removed lines

@@ -11,41 +11,41 @@
  */
 
 global $post;
-$wrap_class = has_excerpt( $post->ID ) ? ' has-excerpt' : '';
+$wrap_class = has_excerpt($post->ID) ? ' has-excerpt' : '';
 ?>
-<?php do_action( 'AHEE__content_espresso_venues_template__before_post', $post ); ?>
-<article id="post-<?php the_ID(); ?>" <?php post_class( 'espresso-venue-details entry-content ' . $wrap_class ); ?>>
+<?php do_action('AHEE__content_espresso_venues_template__before_post', $post); ?>
+<article id="post-<?php the_ID(); ?>" <?php post_class('espresso-venue-details entry-content '.$wrap_class); ?>>
 
-<?php if ( is_single() ) : ?>
+<?php if (is_single()) : ?>
 
 	<div id="espresso-venue-header-dv-<?php echo esc_attr($post->ID); ?>" class="espresso-venue-header-dv">
-		<?php espresso_get_template_part( 'content', 'espresso_venues-thumbnail' ); ?>
-		<?php espresso_get_template_part( 'content', 'espresso_venues-header' ); ?>
+		<?php espresso_get_template_part('content', 'espresso_venues-thumbnail'); ?>
+		<?php espresso_get_template_part('content', 'espresso_venues-header'); ?>
 	</div>
 
 	<div class="espresso-venue-wrapper-dv">
-		<?php espresso_get_template_part( 'content', 'espresso_venues-details' ); ?>
-		<?php espresso_get_template_part( 'content', 'espresso_venues-location' ); ?>
+		<?php espresso_get_template_part('content', 'espresso_venues-details'); ?>
+		<?php espresso_get_template_part('content', 'espresso_venues-location'); ?>
 		<footer class="venue-meta">
-			<?php do_action( 'AHEE__content_espresso_venues_template__footer_top', $post ); ?>
-			<?php do_action( 'AHEE__content_espresso_venues_template__footer_bottom', $post ); ?>
+			<?php do_action('AHEE__content_espresso_venues_template__footer_top', $post); ?>
+			<?php do_action('AHEE__content_espresso_venues_template__footer_bottom', $post); ?>
 		</footer>
 	</div>
 
-<?php elseif ( is_archive() ) : ?>
+<?php elseif (is_archive()) : ?>
 
 	<div id="espresso-venue-header-dv-<?php echo esc_attr($post->ID); ?>" class="espresso-venue-header-dv">
-		<?php espresso_get_template_part( 'content', 'espresso_venues-thumbnail' ); ?>
-		<?php espresso_get_template_part( 'content', 'espresso_venues-header' ); ?>
+		<?php espresso_get_template_part('content', 'espresso_venues-thumbnail'); ?>
+		<?php espresso_get_template_part('content', 'espresso_venues-header'); ?>
 	</div>
 
 	<div class="espresso-venue-wrapper-dv">
-		<?php espresso_get_template_part( 'content', 'espresso_venues-details' ); ?>
+		<?php espresso_get_template_part('content', 'espresso_venues-details'); ?>
 	</div>
 
 <?php endif; ?>
 
 </article>
 <!-- #post -->
-<?php do_action( 'AHEE__content_espresso_venues_template__after_post', $post );
+<?php do_action('AHEE__content_espresso_venues_template__after_post', $post);
 

public/Espresso_Arabica_2014/content-espresso_events-shortcode.php

Spacing +15 added lines, -15 removed lines

@@ -21,21 +21,21 @@ 
  * 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');
 
 
 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 esc_attr($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 esc_attr($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">
@@ -45,16 +45,16 @@ 
 		<?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 esc_attr($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' ); ?>
+		<?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">
@@ -69,5 +69,5 @@ 
 
 </article>
 <!-- #post -->
-<?php do_action( 'AHEE_event_details_after_post', $post );
+<?php do_action('AHEE_event_details_after_post', $post);
 

widgets/upcoming_events/EEW_Upcoming_Events.widget.php

Indentation +594 added lines, -594 removed lines

@@ -12,109 +12,109 @@ 
 class EEW_Upcoming_Events extends EspressoWidget
 {
 
-    /**
-     * @var string
-     */
-    private $title;
-    /**
-     * @var string
-     */
-    private $events_category;
-
-    /**
-     * @var bool
-     */
-    private $show_expired;
-
-    /**
-     * @var string
-     */
-    private $image_size;
-
-    /**
-     * @var bool
-     */
-    private $show_desc;
-
-    /**
-     * @var bool
-     */
-    private $show_dates;
-
-    /**
-     * @var string
-     */
-    private $date_limit;
-
-    /**
-     * @var string
-     */
-    private $date_range;
-
-    /**
-     * @var string
-     */
-    private $limit;
-
-    /**
-     * @var string
-     */
-    private $order;
-
-
-    /**
-     * Register widget with WordPress.
-     */
-    public function __construct()
-    {
-        parent::__construct(
-            esc_html__('Event Espresso Upcoming Events', 'event_espresso'),
-            ['description' => esc_html__('A widget to display your upcoming events.', 'event_espresso')]
-        );
-    }
-
-
-    /**
-     * Back-end widget form.
-     *
-     * @param array $instance Previously saved values from database.
-     * @return void
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @see WP_Widget::form()
-     */
-    public function form($instance)
-    {
-
-        EE_Registry::instance()->load_class('Question_Option', [], false, false, true);
-        // Set up some default widget settings.
-        $defaults = [
-            'title'           => esc_html__('Upcoming Events', 'event_espresso'),
-            'category_name'   => '',
-            'show_expired'    => 0,
-            'show_desc'       => true,
-            'show_dates'      => true,
-            'show_everywhere' => false,
-            'date_limit'      => 2,
-            'limit'           => 10,
-            'sort'            => 'ASC',
-            'date_range'      => false,
-            'image_size'      => 'medium',
-        ];
-
-        $instance = wp_parse_args((array) $instance, $defaults);
-        // don't add HTML labels for EE_Form_Fields generated inputs
-        add_filter('FHEE__EEH_Form_Fields__label_html', '__return_empty_string');
-        $yes_no_values = [
-            EE_Question_Option::new_instance(['QSO_value' => false, 'QSO_desc' => esc_html__('No', 'event_espresso')]),
-            EE_Question_Option::new_instance(['QSO_value' => true, 'QSO_desc' => esc_html__('Yes', 'event_espresso')]),
-        ];
-        $sort_values   = [
-            EE_Question_Option::new_instance(['QSO_value' => 'ASC', 'QSO_desc' => esc_html__('ASC', 'event_espresso')]),
-            EE_Question_Option::new_instance(['QSO_value' => 'DESC', 'QSO_desc' => esc_html__('DESC', 'event_espresso')]),
-        ];
-
-        ?>
+	/**
+	 * @var string
+	 */
+	private $title;
+	/**
+	 * @var string
+	 */
+	private $events_category;
+
+	/**
+	 * @var bool
+	 */
+	private $show_expired;
+
+	/**
+	 * @var string
+	 */
+	private $image_size;
+
+	/**
+	 * @var bool
+	 */
+	private $show_desc;
+
+	/**
+	 * @var bool
+	 */
+	private $show_dates;
+
+	/**
+	 * @var string
+	 */
+	private $date_limit;
+
+	/**
+	 * @var string
+	 */
+	private $date_range;
+
+	/**
+	 * @var string
+	 */
+	private $limit;
+
+	/**
+	 * @var string
+	 */
+	private $order;
+
+
+	/**
+	 * Register widget with WordPress.
+	 */
+	public function __construct()
+	{
+		parent::__construct(
+			esc_html__('Event Espresso Upcoming Events', 'event_espresso'),
+			['description' => esc_html__('A widget to display your upcoming events.', 'event_espresso')]
+		);
+	}
+
+
+	/**
+	 * Back-end widget form.
+	 *
+	 * @param array $instance Previously saved values from database.
+	 * @return void
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @see WP_Widget::form()
+	 */
+	public function form($instance)
+	{
+
+		EE_Registry::instance()->load_class('Question_Option', [], false, false, true);
+		// Set up some default widget settings.
+		$defaults = [
+			'title'           => esc_html__('Upcoming Events', 'event_espresso'),
+			'category_name'   => '',
+			'show_expired'    => 0,
+			'show_desc'       => true,
+			'show_dates'      => true,
+			'show_everywhere' => false,
+			'date_limit'      => 2,
+			'limit'           => 10,
+			'sort'            => 'ASC',
+			'date_range'      => false,
+			'image_size'      => 'medium',
+		];
+
+		$instance = wp_parse_args((array) $instance, $defaults);
+		// don't add HTML labels for EE_Form_Fields generated inputs
+		add_filter('FHEE__EEH_Form_Fields__label_html', '__return_empty_string');
+		$yes_no_values = [
+			EE_Question_Option::new_instance(['QSO_value' => false, 'QSO_desc' => esc_html__('No', 'event_espresso')]),
+			EE_Question_Option::new_instance(['QSO_value' => true, 'QSO_desc' => esc_html__('Yes', 'event_espresso')]),
+		];
+		$sort_values   = [
+			EE_Question_Option::new_instance(['QSO_value' => 'ASC', 'QSO_desc' => esc_html__('ASC', 'event_espresso')]),
+			EE_Question_Option::new_instance(['QSO_value' => 'DESC', 'QSO_desc' => esc_html__('DESC', 'event_espresso')]),
+		];
+
+		?>
 
         <!-- Widget Title: Text Input -->
 
@@ -151,32 +151,32 @@ 
                 <?php esc_html_e('Show Expired Events:', 'event_espresso'); ?>
             </label>
             <?php
-            $show_expired_options   = $yes_no_values;
-            $show_expired_options[] = EE_Question_Option::new_instance(
-                ['QSO_value' => 2, 'QSO_desc' => esc_html__('Show Only Expired', 'event_espresso')]
-            );
-            echo EEH_Form_Fields::select(
-                esc_html__('Show Expired Events:', 'event_espresso'),
-                $instance['show_expired'],
-                $show_expired_options,
-                $this->fieldName('show_expired'),
-                $this->fieldID('show_expired')
-            );
-            ?>
+			$show_expired_options   = $yes_no_values;
+			$show_expired_options[] = EE_Question_Option::new_instance(
+				['QSO_value' => 2, 'QSO_desc' => esc_html__('Show Only Expired', 'event_espresso')]
+			);
+			echo EEH_Form_Fields::select(
+				esc_html__('Show Expired Events:', 'event_espresso'),
+				$instance['show_expired'],
+				$show_expired_options,
+				$this->fieldName('show_expired'),
+				$this->fieldID('show_expired')
+			);
+			?>
         </p>
         <p>
             <label for="<?php echo esc_attr($this->fieldID('sort')); ?>">
                 <?php esc_html_e('Sort Events:', 'event_espresso'); ?>
             </label>
             <?php
-            echo EEH_Form_Fields::select(
-                esc_html__('Sort Events:', 'event_espresso'),
-                $instance['sort'],
-                $sort_values,
-                $this->fieldName('sort'),
-                $this->fieldID('sort')
-            );
-            ?>
+			echo EEH_Form_Fields::select(
+				esc_html__('Sort Events:', 'event_espresso'),
+				$instance['sort'],
+				$sort_values,
+				$this->fieldName('sort'),
+				$this->fieldID('sort')
+			);
+			?>
         </p>
         <p>
             <label for="<?php echo esc_attr($this->fieldID('image_size')); ?>">
@@ -190,42 +190,42 @@ 
                 <?php esc_html_e('Show Description:', 'event_espresso'); ?>
             </label>
             <?php
-            echo EEH_Form_Fields::select(
-                esc_html__('Show Description:', 'event_espresso'),
-                $instance['show_desc'],
-                $yes_no_values,
-                $this->fieldName('show_desc'),
-                $this->fieldID('show_desc')
-            );
-            ?>
+			echo EEH_Form_Fields::select(
+				esc_html__('Show Description:', 'event_espresso'),
+				$instance['show_desc'],
+				$yes_no_values,
+				$this->fieldName('show_desc'),
+				$this->fieldID('show_desc')
+			);
+			?>
         </p>
         <p>
             <label for="<?php echo esc_attr($this->fieldID('show_dates')); ?>">
                 <?php esc_html_e('Show Dates:', 'event_espresso'); ?>
             </label>
             <?php
-            echo EEH_Form_Fields::select(
-                esc_html__('Show Dates:', 'event_espresso'),
-                $instance['show_dates'],
-                $yes_no_values,
-                $this->fieldName('show_dates'),
-                $this->fieldID('show_dates')
-            );
-            ?>
+			echo EEH_Form_Fields::select(
+				esc_html__('Show Dates:', 'event_espresso'),
+				$instance['show_dates'],
+				$yes_no_values,
+				$this->fieldName('show_dates'),
+				$this->fieldID('show_dates')
+			);
+			?>
         </p>
         <p>
             <label for="<?php echo esc_attr($this->fieldID('show_everywhere')); ?>">
                 <?php esc_html_e('Show on all Pages:', 'event_espresso'); ?>
             </label>
             <?php
-            echo EEH_Form_Fields::select(
-                esc_html__('Show on all Pages:', 'event_espresso'),
-                $instance['show_everywhere'],
-                $yes_no_values,
-                $this->fieldName('show_everywhere'),
-                $this->fieldID('show_everywhere')
-            );
-            ?>
+			echo EEH_Form_Fields::select(
+				esc_html__('Show on all Pages:', 'event_espresso'),
+				$instance['show_everywhere'],
+				$yes_no_values,
+				$this->fieldName('show_everywhere'),
+				$this->fieldID('show_everywhere')
+			);
+			?>
         </p>
         <p>
             <label for="<?php echo esc_attr($this->fieldID('date_limit')); ?>">
@@ -243,278 +243,278 @@ 
                 <?php esc_html_e('Show Date Range:', 'event_espresso'); ?>
             </label>
             <?php
-            echo EEH_Form_Fields::select(
-                esc_html__('Show Date Range:', 'event_espresso'),
-                $instance['date_range'],
-                $yes_no_values,
-                $this->fieldName('date_range'),
-                $this->fieldID('date_range')
-            );
-            ?>
+			echo EEH_Form_Fields::select(
+				esc_html__('Show Date Range:', 'event_espresso'),
+				$instance['date_range'],
+				$yes_no_values,
+				$this->fieldName('date_range'),
+				$this->fieldID('date_range')
+			);
+			?>
             <span class="description">
                 <br />
                 <?php esc_html_e(
-                    'This setting will replace the list of dates in the widget.',
-                    'event_espresso'
-                ); ?>
+					'This setting will replace the list of dates in the widget.',
+					'event_espresso'
+				); ?>
             </span>
         </p>
 
         <?php
-    }
-
-
-    /**
-     * Sanitize widget form values as they are saved.
-     *
-     * @param array $new_instance Values just sent to be saved.
-     * @param array $old_instance Previously saved values from database.
-     *
-     * @return array Updated safe values to be saved.
-     * @see WP_Widget::update()
-     *
-     */
-    public function update($new_instance, $old_instance)
-    {
-        $instance                    = $old_instance;
-        $instance['title']           = ! empty($new_instance['title']) ? strip_tags($new_instance['title']) : '';
-        $instance['category_name']   = $new_instance['category_name'];
-        $instance['show_expired']    = $new_instance['show_expired'];
-        $instance['limit']           = $new_instance['limit'];
-        $instance['sort']            = $new_instance['sort'];
-        $instance['image_size']      = $new_instance['image_size'];
-        $instance['show_desc']       = $new_instance['show_desc'];
-        $instance['show_dates']      = $new_instance['show_dates'];
-        $instance['show_everywhere'] = $new_instance['show_everywhere'];
-        $instance['date_limit']      = $new_instance['date_limit'];
-        $instance['date_range']      = $new_instance['date_range'];
-        return $instance;
-    }
-
-
-    /**
-     * Front-end display of widget.
-     *
-     * @param array $args     Widget arguments.
-     * @param array $instance Saved values from database.
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @see WP_Widget::widget()
-     *
-     */
-    public function widget($args, $instance)
-    {
-
-        global $post;
-        // make sure there is some kinda post object
-        if ($post instanceof WP_Post) {
-            $before_widget = '';
-            $before_title  = '';
-            $after_title   = '';
-            $after_widget  = '';
-            // but NOT an events archives page, cuz that would be like two event lists on the same page
-            $show_everywhere = ! isset($instance['show_everywhere']) || absint($instance['show_everywhere']);
-            if ($show_everywhere || ! ($post->post_type == 'espresso_events' && is_archive())) {
-                // let's use some of the event helper functions'
-                // make separate vars out of attributes
-                extract($args);
-
-                // grab widget settings
-                $this->parseWidgetSettings($instance);
-                $title = $this->widgetTitle();
-
-                // Before widget (defined by themes).
-                echo $before_widget;
-                // Display the widget title if one was input (before and after defined by themes).
-                if (! empty($title)) {
-                    echo $before_title . $title . $after_title;
-                }
-                echo $this->widgetContent($post);
-                // After widget (defined by themes).
-                echo $after_widget;
-            }
-        }
-    }
-
-
-    /**
-     * make_the_title_a_link
-     * callback for widget_title filter
-     *
-     * @param $title
-     * @return string
-     */
-    public function make_the_title_a_link($title)
-    {
-        return '<a href="' . EEH_Event_View::event_archive_url() . '">' . $title . '</a>';
-    }
-
-
-    /**
-     * @param string $field_name
-     * @return string
-     * @since   4.10.14.p
-     */
-    public function fieldID($field_name)
-    {
-        return parent::get_field_id($field_name);
-    }
-
-
-    /**
-     * @param string $field_name
-     * @return string
-     * @since   4.10.14.p
-     */
-    public function fieldName($field_name)
-    {
-        return parent::get_field_name($field_name);
-    }
-
-
-    /**
-     * @param array $instance
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @since   4.10.14.p
-     */
-    private function eventCategoriesSelector(array $instance)
-    {
-        $event_categories = [];
-        $categories       = EEM_Term::instance()->get_all_ee_categories(true);
-        if ($categories) {
-            foreach ($categories as $category) {
-                if ($category instanceof EE_Term) {
-                    $event_categories[] =
-                        EE_Question_Option::new_instance(
-                            [
-                                'QSO_value' => $category->get('slug'),
-                                'QSO_desc'  => $category->get('name'),
-                            ]
-                        );
-                }
-            }
-        }
-        array_unshift(
-            $event_categories,
-            EE_Question_Option::new_instance(
-                [
-                    'QSO_value' => '',
-                    'QSO_desc'  => esc_html__(' - display all - ', 'event_espresso'),
-                ]
-            )
-        );
-        echo EEH_Form_Fields::select(
-            esc_html__('Event Category:', 'event_espresso'),
-            $instance['category_name'],
-            $event_categories,
-            $this->fieldName('category_name'),
-            $this->fieldID('category_name')
-        );
-    }
-
-
-    /**
-     * @param array $instance
-     * @since   4.10.14.p
-     */
-    private function imageSizeSelector(array $instance)
-    {
-        $image_sizes = [];
-        $sizes       = get_intermediate_image_sizes();
-        if ($sizes) {
-            // loop thru images and create option objects out of them
-            foreach ($sizes as $image_size) {
-                $image_size = trim($image_size);
-                // no big images plz
-                if (! in_array($image_size, ['large', 'post-thumbnail'])) {
-                    $image_sizes[] =
-                        EE_Question_Option::new_instance(['QSO_value' => $image_size, 'QSO_desc' => $image_size]);
-                }
-            }
-            $image_sizes[] =
-                EE_Question_Option::new_instance(
-                    ['QSO_value' => 'none', 'QSO_desc' => esc_html__('don\'t show images', 'event_espresso')]
-                );
-        }
-        echo EEH_Form_Fields::select(
-            esc_html__('Image Size:', 'event_espresso'),
-            $instance['image_size'],
-            $image_sizes,
-            $this->fieldName('image_size'),
-            $this->fieldID('image_size')
-        );
-    }
-
-
-    /**
-     * @param array $instance
-     * @since   4.10.14.p
-     */
-    private function parseWidgetSettings(array $instance)
-    {
-        $this->title = isset($instance['title']) && ! empty($instance['title']) ? $instance['title'] : '';
-        $this->events_category     = isset($instance['category_name']) && ! empty($instance['category_name'])
-            ? $instance['category_name']
-            : false;
-        $this->show_expired = isset($instance['show_expired'])
-            ? filter_var($instance['show_expired'], FILTER_VALIDATE_BOOLEAN)
-            : 0;
-        $this->image_size   = isset($instance['image_size']) && ! empty($instance['image_size'])
-            ? $instance['image_size']
-            : 'medium';
-        $this->show_desc    = ! isset($instance['show_desc'])
-                              || filter_var($instance['show_desc'], FILTER_VALIDATE_BOOLEAN);
-        $this->show_dates   = ! isset($instance['show_dates'])
-                              || filter_var($instance['show_dates'], FILTER_VALIDATE_BOOLEAN);
-        $this->date_limit   = isset($instance['date_limit']) && ! empty($instance['date_limit'])
-            ? $instance['date_limit']
-            : null;
-        $this->date_range   = isset($instance['date_range']) && ! empty($instance['date_range'])
-            ? $instance['date_range']
-            : false;
-        $this->limit        = isset($instance['limit']) ? absint($instance['limit']) : 10;
-        $this->order        = isset($instance['sort']) && $instance['sort'] === 'DESC'
-            ? 'DESC'
-            : 'ASC';
-    }
-
-
-    /**
-     * @return mixed|void
-     * @since   4.10.14.p
-     */
-    private function widgetTitle()
-    {
-        // add function to make the title a link
-        add_filter('widget_title', [$this, 'make_the_title_a_link'], 15);
-        // filter the title
-        $title = apply_filters('widget_title', $this->title);
-        // remove the function from the filter, so it does not affect other widgets
-        remove_filter('widget_title', [$this, 'make_the_title_a_link'], 15);
-        return $title;
-    }
-
-
-    /**
-     * @param WP_Post $post
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @since   4.10.14.p
-     */
-    private function widgetContent(WP_Post $post)
-    {
-        // run the query
-        $events = $this->getUpcomingEvents();
-        if (empty($events)) {
-            return '';
-        }
-        $list_items = '';
-        foreach ($events as $event) {
-            if ($event instanceof EE_Event && (! is_single() || $post->ID != $event->ID())) {
-                $event_url = $this->eventUrl($event);
-                $list_items .= '
+	}
+
+
+	/**
+	 * Sanitize widget form values as they are saved.
+	 *
+	 * @param array $new_instance Values just sent to be saved.
+	 * @param array $old_instance Previously saved values from database.
+	 *
+	 * @return array Updated safe values to be saved.
+	 * @see WP_Widget::update()
+	 *
+	 */
+	public function update($new_instance, $old_instance)
+	{
+		$instance                    = $old_instance;
+		$instance['title']           = ! empty($new_instance['title']) ? strip_tags($new_instance['title']) : '';
+		$instance['category_name']   = $new_instance['category_name'];
+		$instance['show_expired']    = $new_instance['show_expired'];
+		$instance['limit']           = $new_instance['limit'];
+		$instance['sort']            = $new_instance['sort'];
+		$instance['image_size']      = $new_instance['image_size'];
+		$instance['show_desc']       = $new_instance['show_desc'];
+		$instance['show_dates']      = $new_instance['show_dates'];
+		$instance['show_everywhere'] = $new_instance['show_everywhere'];
+		$instance['date_limit']      = $new_instance['date_limit'];
+		$instance['date_range']      = $new_instance['date_range'];
+		return $instance;
+	}
+
+
+	/**
+	 * Front-end display of widget.
+	 *
+	 * @param array $args     Widget arguments.
+	 * @param array $instance Saved values from database.
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @see WP_Widget::widget()
+	 *
+	 */
+	public function widget($args, $instance)
+	{
+
+		global $post;
+		// make sure there is some kinda post object
+		if ($post instanceof WP_Post) {
+			$before_widget = '';
+			$before_title  = '';
+			$after_title   = '';
+			$after_widget  = '';
+			// but NOT an events archives page, cuz that would be like two event lists on the same page
+			$show_everywhere = ! isset($instance['show_everywhere']) || absint($instance['show_everywhere']);
+			if ($show_everywhere || ! ($post->post_type == 'espresso_events' && is_archive())) {
+				// let's use some of the event helper functions'
+				// make separate vars out of attributes
+				extract($args);
+
+				// grab widget settings
+				$this->parseWidgetSettings($instance);
+				$title = $this->widgetTitle();
+
+				// Before widget (defined by themes).
+				echo $before_widget;
+				// Display the widget title if one was input (before and after defined by themes).
+				if (! empty($title)) {
+					echo $before_title . $title . $after_title;
+				}
+				echo $this->widgetContent($post);
+				// After widget (defined by themes).
+				echo $after_widget;
+			}
+		}
+	}
+
+
+	/**
+	 * make_the_title_a_link
+	 * callback for widget_title filter
+	 *
+	 * @param $title
+	 * @return string
+	 */
+	public function make_the_title_a_link($title)
+	{
+		return '<a href="' . EEH_Event_View::event_archive_url() . '">' . $title . '</a>';
+	}
+
+
+	/**
+	 * @param string $field_name
+	 * @return string
+	 * @since   4.10.14.p
+	 */
+	public function fieldID($field_name)
+	{
+		return parent::get_field_id($field_name);
+	}
+
+
+	/**
+	 * @param string $field_name
+	 * @return string
+	 * @since   4.10.14.p
+	 */
+	public function fieldName($field_name)
+	{
+		return parent::get_field_name($field_name);
+	}
+
+
+	/**
+	 * @param array $instance
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @since   4.10.14.p
+	 */
+	private function eventCategoriesSelector(array $instance)
+	{
+		$event_categories = [];
+		$categories       = EEM_Term::instance()->get_all_ee_categories(true);
+		if ($categories) {
+			foreach ($categories as $category) {
+				if ($category instanceof EE_Term) {
+					$event_categories[] =
+						EE_Question_Option::new_instance(
+							[
+								'QSO_value' => $category->get('slug'),
+								'QSO_desc'  => $category->get('name'),
+							]
+						);
+				}
+			}
+		}
+		array_unshift(
+			$event_categories,
+			EE_Question_Option::new_instance(
+				[
+					'QSO_value' => '',
+					'QSO_desc'  => esc_html__(' - display all - ', 'event_espresso'),
+				]
+			)
+		);
+		echo EEH_Form_Fields::select(
+			esc_html__('Event Category:', 'event_espresso'),
+			$instance['category_name'],
+			$event_categories,
+			$this->fieldName('category_name'),
+			$this->fieldID('category_name')
+		);
+	}
+
+
+	/**
+	 * @param array $instance
+	 * @since   4.10.14.p
+	 */
+	private function imageSizeSelector(array $instance)
+	{
+		$image_sizes = [];
+		$sizes       = get_intermediate_image_sizes();
+		if ($sizes) {
+			// loop thru images and create option objects out of them
+			foreach ($sizes as $image_size) {
+				$image_size = trim($image_size);
+				// no big images plz
+				if (! in_array($image_size, ['large', 'post-thumbnail'])) {
+					$image_sizes[] =
+						EE_Question_Option::new_instance(['QSO_value' => $image_size, 'QSO_desc' => $image_size]);
+				}
+			}
+			$image_sizes[] =
+				EE_Question_Option::new_instance(
+					['QSO_value' => 'none', 'QSO_desc' => esc_html__('don\'t show images', 'event_espresso')]
+				);
+		}
+		echo EEH_Form_Fields::select(
+			esc_html__('Image Size:', 'event_espresso'),
+			$instance['image_size'],
+			$image_sizes,
+			$this->fieldName('image_size'),
+			$this->fieldID('image_size')
+		);
+	}
+
+
+	/**
+	 * @param array $instance
+	 * @since   4.10.14.p
+	 */
+	private function parseWidgetSettings(array $instance)
+	{
+		$this->title = isset($instance['title']) && ! empty($instance['title']) ? $instance['title'] : '';
+		$this->events_category     = isset($instance['category_name']) && ! empty($instance['category_name'])
+			? $instance['category_name']
+			: false;
+		$this->show_expired = isset($instance['show_expired'])
+			? filter_var($instance['show_expired'], FILTER_VALIDATE_BOOLEAN)
+			: 0;
+		$this->image_size   = isset($instance['image_size']) && ! empty($instance['image_size'])
+			? $instance['image_size']
+			: 'medium';
+		$this->show_desc    = ! isset($instance['show_desc'])
+							  || filter_var($instance['show_desc'], FILTER_VALIDATE_BOOLEAN);
+		$this->show_dates   = ! isset($instance['show_dates'])
+							  || filter_var($instance['show_dates'], FILTER_VALIDATE_BOOLEAN);
+		$this->date_limit   = isset($instance['date_limit']) && ! empty($instance['date_limit'])
+			? $instance['date_limit']
+			: null;
+		$this->date_range   = isset($instance['date_range']) && ! empty($instance['date_range'])
+			? $instance['date_range']
+			: false;
+		$this->limit        = isset($instance['limit']) ? absint($instance['limit']) : 10;
+		$this->order        = isset($instance['sort']) && $instance['sort'] === 'DESC'
+			? 'DESC'
+			: 'ASC';
+	}
+
+
+	/**
+	 * @return mixed|void
+	 * @since   4.10.14.p
+	 */
+	private function widgetTitle()
+	{
+		// add function to make the title a link
+		add_filter('widget_title', [$this, 'make_the_title_a_link'], 15);
+		// filter the title
+		$title = apply_filters('widget_title', $this->title);
+		// remove the function from the filter, so it does not affect other widgets
+		remove_filter('widget_title', [$this, 'make_the_title_a_link'], 15);
+		return $title;
+	}
+
+
+	/**
+	 * @param WP_Post $post
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @since   4.10.14.p
+	 */
+	private function widgetContent(WP_Post $post)
+	{
+		// run the query
+		$events = $this->getUpcomingEvents();
+		if (empty($events)) {
+			return '';
+		}
+		$list_items = '';
+		foreach ($events as $event) {
+			if ($event instanceof EE_Event && (! is_single() || $post->ID != $event->ID())) {
+				$event_url = $this->eventUrl($event);
+				$list_items .= '
                 <li id="ee-upcoming-events-widget-li-' . esc_attr($event->ID()) . '" 
                     class="ee-upcoming-events-widget-li"
                 >
@@ -525,194 +525,194 @@ 
                     </h5>
                     ' . $this->eventWidgetContent($event, $event_url) . '
                 </li>';
-            }
-        }
-        return '
+			}
+		}
+		return '
             <ul class="ee-upcoming-events-widget-ul">
                 ' . $list_items . '
             </ul>';
-    }
-
-
-    /**
-     * @param EE_Event $event
-     * @return string|null
-     * @throws EE_Error
-     * @since   4.10.14.p
-     */
-    private function eventUrl(EE_Event $event)
-    {
-        return esc_url_raw(
-            apply_filters(
-                'FHEE_EEW_Upcoming_Events__widget__event_url',
-                $event->get_permalink(),
-                $event
-            )
-        );
-    }
-
-
-    /**
-     * @return EE_Base_Class[]
-     * @throws EE_Error
-     */
-    private function getUpcomingEvents()
-    {
-        return EEM_Event::instance()->get_all(
-            [
-                $this->queryWhereParams(),
-                'limit'    => '0,' . $this->limit,
-                'order_by' => 'Datetime.DTT_EVT_start',
-                'order'    => $this->order,
-                'group_by' => 'EVT_ID',
-            ]
-        );
-    }
-
-
-    /**
-     * @return mixed|void
-     * @throws EE_Error
-     * @since   4.10.14.p
-     */
-    private function queryWhereParams()
-    {
-        // start to build our where clause
-        $where = [
-            'status' => ['IN', ['publish', 'sold_out']],
-        ];
-        // add category
-        if ($this->events_category) {
-            $where['Term_Taxonomy.taxonomy']  = 'espresso_event_categories';
-            $where['Term_Taxonomy.Term.slug'] = $this->events_category;
-        }
-        // if NOT expired then we want events that start today or in the future
-        // if NOT show expired then we want events that start today or in the future
-        if ($this->show_expired == 0) {
-            $where['Datetime.DTT_EVT_end'] = [
-                '>=',
-                EEM_Datetime::instance()->current_time_for_query('DTT_EVT_end'),
-            ];
-        }
-        // if show ONLY expired we want events that ended prior to today
-        if ($this->show_expired == 2) {
-            $where['Datetime.DTT_EVT_end'] = [
-                '<=',
-                EEM_Datetime::instance()->current_time_for_query('DTT_EVT_start'),
-            ];
-        }
-        // allow $where to be filtered
-        return apply_filters('FHEE__EEW_Upcoming_Events__widget__where', $where, $this->events_category, $this->show_expired);
-    }
-
-
-    /**
-     * @param EE_Event $event
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @since   4.10.14.p
-     */
-    private function linkClass(EE_Event $event)
-    {
-        // how big is the event name ?
-        $name_length = strlen($event->name());
-        switch ($name_length) {
-            case $name_length > 70:
-                return ' three-line';
-            case $name_length > 35:
-                return ' two-line';
-        }
-        return ' one-line';
-    }
-
-
-    /**
-     * @param EE_Event $event
-     * @param string   $event_url
-     * @return mixed|string|void
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @since   4.10.14.p
-     */
-    private function eventWidgetContent(EE_Event $event, $event_url = '')
-    {
-        if (post_password_required($event->ID())) {
-            return apply_filters(
-                'FHEE_EEW_Upcoming_Events__widget__password_form',
-                get_the_password_form($event->ID()),
-                $event
-            );
-        }
-
-        $content = '';
-        if (has_post_thumbnail($event->ID()) && $this->image_size != 'none') {
-            $content .= '
+	}
+
+
+	/**
+	 * @param EE_Event $event
+	 * @return string|null
+	 * @throws EE_Error
+	 * @since   4.10.14.p
+	 */
+	private function eventUrl(EE_Event $event)
+	{
+		return esc_url_raw(
+			apply_filters(
+				'FHEE_EEW_Upcoming_Events__widget__event_url',
+				$event->get_permalink(),
+				$event
+			)
+		);
+	}
+
+
+	/**
+	 * @return EE_Base_Class[]
+	 * @throws EE_Error
+	 */
+	private function getUpcomingEvents()
+	{
+		return EEM_Event::instance()->get_all(
+			[
+				$this->queryWhereParams(),
+				'limit'    => '0,' . $this->limit,
+				'order_by' => 'Datetime.DTT_EVT_start',
+				'order'    => $this->order,
+				'group_by' => 'EVT_ID',
+			]
+		);
+	}
+
+
+	/**
+	 * @return mixed|void
+	 * @throws EE_Error
+	 * @since   4.10.14.p
+	 */
+	private function queryWhereParams()
+	{
+		// start to build our where clause
+		$where = [
+			'status' => ['IN', ['publish', 'sold_out']],
+		];
+		// add category
+		if ($this->events_category) {
+			$where['Term_Taxonomy.taxonomy']  = 'espresso_event_categories';
+			$where['Term_Taxonomy.Term.slug'] = $this->events_category;
+		}
+		// if NOT expired then we want events that start today or in the future
+		// if NOT show expired then we want events that start today or in the future
+		if ($this->show_expired == 0) {
+			$where['Datetime.DTT_EVT_end'] = [
+				'>=',
+				EEM_Datetime::instance()->current_time_for_query('DTT_EVT_end'),
+			];
+		}
+		// if show ONLY expired we want events that ended prior to today
+		if ($this->show_expired == 2) {
+			$where['Datetime.DTT_EVT_end'] = [
+				'<=',
+				EEM_Datetime::instance()->current_time_for_query('DTT_EVT_start'),
+			];
+		}
+		// allow $where to be filtered
+		return apply_filters('FHEE__EEW_Upcoming_Events__widget__where', $where, $this->events_category, $this->show_expired);
+	}
+
+
+	/**
+	 * @param EE_Event $event
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @since   4.10.14.p
+	 */
+	private function linkClass(EE_Event $event)
+	{
+		// how big is the event name ?
+		$name_length = strlen($event->name());
+		switch ($name_length) {
+			case $name_length > 70:
+				return ' three-line';
+			case $name_length > 35:
+				return ' two-line';
+		}
+		return ' one-line';
+	}
+
+
+	/**
+	 * @param EE_Event $event
+	 * @param string   $event_url
+	 * @return mixed|string|void
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @since   4.10.14.p
+	 */
+	private function eventWidgetContent(EE_Event $event, $event_url = '')
+	{
+		if (post_password_required($event->ID())) {
+			return apply_filters(
+				'FHEE_EEW_Upcoming_Events__widget__password_form',
+				get_the_password_form($event->ID()),
+				$event
+			);
+		}
+
+		$content = '';
+		if (has_post_thumbnail($event->ID()) && $this->image_size != 'none') {
+			$content .= '
                 <div class="ee-upcoming-events-widget-img-dv">
                     <a class="ee-upcoming-events-widget-img" href="' . $event_url . '">
                         ' . get_the_post_thumbnail($event->ID(), $this->image_size) . '
                     </a>
                 </div>';
-        }
-
-        if ($this->show_dates) {
-            $content .= $this->eventDates($event);
-        }
-
-        if ($this->show_desc) {
-            global $allowedtags;
-            $desc    = $event->short_description(25);
-            $content .= $desc ? '<p style="margin-top: .5em">' . wp_kses($desc, $allowedtags) . '</p>' : '';
-        }
-
-        return $content;
-    }
-
-
-    /**
-     * @param EE_Event $event
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @since   4.10.14.p
-     */
-    private function eventDates(EE_Event $event)
-    {
-        $date_format        = apply_filters(
-            'FHEE__espresso_event_date_range__date_format',
-            get_option('date_format')
-        );
-        $time_format        = apply_filters(
-            'FHEE__espresso_event_date_range__time_format',
-            get_option('time_format')
-        );
-        $single_date_format = apply_filters(
-            'FHEE__espresso_event_date_range__single_date_format',
-            get_option('date_format')
-        );
-        $single_time_format = apply_filters(
-            'FHEE__espresso_event_date_range__single_time_format',
-            get_option('time_format')
-        );
-        if ($this->date_range == true) {
-            return espresso_event_date_range(
-                $date_format,
-                $time_format,
-                $single_date_format,
-                $single_time_format,
-                $event->ID(),
-                false
-            );
-        }
-        return espresso_list_of_event_dates(
-            $event->ID(),
-            $date_format,
-            $time_format,
-            false,
-            null,
-            true,
-            true,
-            $this->date_limit
-        );
-    }
+		}
+
+		if ($this->show_dates) {
+			$content .= $this->eventDates($event);
+		}
+
+		if ($this->show_desc) {
+			global $allowedtags;
+			$desc    = $event->short_description(25);
+			$content .= $desc ? '<p style="margin-top: .5em">' . wp_kses($desc, $allowedtags) . '</p>' : '';
+		}
+
+		return $content;
+	}
+
+
+	/**
+	 * @param EE_Event $event
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @since   4.10.14.p
+	 */
+	private function eventDates(EE_Event $event)
+	{
+		$date_format        = apply_filters(
+			'FHEE__espresso_event_date_range__date_format',
+			get_option('date_format')
+		);
+		$time_format        = apply_filters(
+			'FHEE__espresso_event_date_range__time_format',
+			get_option('time_format')
+		);
+		$single_date_format = apply_filters(
+			'FHEE__espresso_event_date_range__single_date_format',
+			get_option('date_format')
+		);
+		$single_time_format = apply_filters(
+			'FHEE__espresso_event_date_range__single_time_format',
+			get_option('time_format')
+		);
+		if ($this->date_range == true) {
+			return espresso_event_date_range(
+				$date_format,
+				$time_format,
+				$single_date_format,
+				$single_time_format,
+				$event->ID(),
+				false
+			);
+		}
+		return espresso_list_of_event_dates(
+			$event->ID(),
+			$date_format,
+			$time_format,
+			false,
+			null,
+			true,
+			true,
+			$this->date_limit
+		);
+	}
 }

shortcodes/espresso_thank_you/templates/thank-you-page-transaction-details.template.php

Indentation +9 added lines, -9 removed lines

@@ -26,10 +26,10 @@ 
                     <label><?php esc_html_e('Amount Owing: ', 'event_espresso'); ?></label>
                 </td>
                 <td class="<?php
-                echo ($transaction->paid() == $transaction->total())
-                    ? 'ee-transaction-paid'
-                    : 'ee-transaction-unpaid'
-                ?>"
+				echo ($transaction->paid() == $transaction->total())
+					? 'ee-transaction-paid'
+					: 'ee-transaction-unpaid'
+				?>"
                 >
                     <?php echo EEH_Template::format_currency($transaction->remaining()); ?>
                 </td>
@@ -40,7 +40,7 @@ 
                 </td>
                 <td>
                     <?php $transaction->e_pretty_status(true);
-                    if ($show_try_pay_again_link && ! $transaction->is_completed()) { ?>
+					if ($show_try_pay_again_link && ! $transaction->is_completed()) { ?>
                         <span class="small-text">
                         <a href='<?php echo esc_url_raw($SPCO_payment_options_url); ?>'>
                             <?php esc_html_e('View Payment Options', 'event_espresso'); ?>
@@ -58,16 +58,16 @@ 
                 </td>
             </tr>
             <?php do_action(
-                'AHEE__thank_you_page_transaction_details_template__after_transaction_table_row',
-                $transaction
-            ); ?>
+				'AHEE__thank_you_page_transaction_details_template__after_transaction_table_row',
+				$transaction
+			); ?>
         </tbody>
     </table>
 
     <?php if ($show_try_pay_again_link && ! $transaction->is_completed()) { ?>
         <p class="small-text jst-rght">
             <a href='<?php echo esc_url_raw($SPCO_payment_options_url); ?>'><?php
-                esc_html_e("Click here to view Payment Options", 'event_espresso'); ?></a>
+				esc_html_e("Click here to view Payment Options", 'event_espresso'); ?></a>
         </p>
         <br />
 

espresso.php

Indentation +80 added lines, -80 removed lines

@@ -38,103 +38,103 @@
  * @since           4.0
  */
 if (function_exists('espresso_version')) {
-    if (! function_exists('espresso_duplicate_plugin_error')) {
-        /**
-         *    espresso_duplicate_plugin_error
-         *    displays if more than one version of EE is activated at the same time
-         */
-        function espresso_duplicate_plugin_error()
-        {
-            ?>
+	if (! function_exists('espresso_duplicate_plugin_error')) {
+		/**
+		 *    espresso_duplicate_plugin_error
+		 *    displays if more than one version of EE is activated at the same time
+		 */
+		function espresso_duplicate_plugin_error()
+		{
+			?>
             <div class="error">
                 <p>
                     <?php
-                    echo esc_html__(
-                        'Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.',
-                        'event_espresso'
-                    ); ?>
+					echo esc_html__(
+						'Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.',
+						'event_espresso'
+					); ?>
                 </p>
             </div>
             <?php
-            espresso_deactivate_plugin(plugin_basename(__FILE__));
-        }
-    }
-    add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
+			espresso_deactivate_plugin(plugin_basename(__FILE__));
+		}
+	}
+	add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
 } else {
-    define('EE_MIN_PHP_VER_REQUIRED', '5.6.2');
-    if (! version_compare(PHP_VERSION, EE_MIN_PHP_VER_REQUIRED, '>=')) {
-        /**
-         * espresso_minimum_php_version_error
-         *
-         * @return void
-         */
-        function espresso_minimum_php_version_error()
-        {
-            ?>
+	define('EE_MIN_PHP_VER_REQUIRED', '5.6.2');
+	if (! version_compare(PHP_VERSION, EE_MIN_PHP_VER_REQUIRED, '>=')) {
+		/**
+		 * espresso_minimum_php_version_error
+		 *
+		 * @return void
+		 */
+		function espresso_minimum_php_version_error()
+		{
+			?>
             <div class="error">
                 <p>
                     <?php
-                    printf(
-                        esc_html__(
-                            'We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
-                            'event_espresso'
-                        ),
-                        EE_MIN_PHP_VER_REQUIRED,
-                        PHP_VERSION,
-                        '<br/>',
-                        '<a href="http://php.net/downloads.php">http://php.net/downloads.php</a>'
-                    );
-                    ?>
+					printf(
+						esc_html__(
+							'We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
+							'event_espresso'
+						),
+						EE_MIN_PHP_VER_REQUIRED,
+						PHP_VERSION,
+						'<br/>',
+						'<a href="http://php.net/downloads.php">http://php.net/downloads.php</a>'
+					);
+					?>
                 </p>
             </div>
             <?php
-            espresso_deactivate_plugin(plugin_basename(__FILE__));
-        }
+			espresso_deactivate_plugin(plugin_basename(__FILE__));
+		}
 
-        add_action('admin_notices', 'espresso_minimum_php_version_error', 1);
-    } else {
-        define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
-        /**
-         * espresso_version
-         * Returns the plugin version
-         *
-         * @return string
-         */
-        function espresso_version()
-        {
-            return apply_filters('FHEE__espresso__espresso_version', '4.10.29.rc.022');
-        }
+		add_action('admin_notices', 'espresso_minimum_php_version_error', 1);
+	} else {
+		define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
+		/**
+		 * espresso_version
+		 * Returns the plugin version
+		 *
+		 * @return string
+		 */
+		function espresso_version()
+		{
+			return apply_filters('FHEE__espresso__espresso_version', '4.10.29.rc.022');
+		}
 
-        /**
-         * espresso_plugin_activation
-         * 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);
-        }
+		/**
+		 * espresso_plugin_activation
+		 * 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);
+		}
 
-        register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
+		register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
 
-        require_once __DIR__ . '/core/bootstrap_espresso.php';
-        bootstrap_espresso();
-    }
+		require_once __DIR__ . '/core/bootstrap_espresso.php';
+		bootstrap_espresso();
+	}
 }
 if (! function_exists('espresso_deactivate_plugin')) {
-    /**
-     *    deactivate_plugin
-     * usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
-     *
-     * @access public
-     * @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file
-     * @return    void
-     */
-    function espresso_deactivate_plugin($plugin_basename = '')
-    {
-        if (! function_exists('deactivate_plugins')) {
-            require_once ABSPATH . 'wp-admin/includes/plugin.php';
-        }
-        unset($_GET['activate'], $_REQUEST['activate']);
-        deactivate_plugins($plugin_basename);
-    }
+	/**
+	 *    deactivate_plugin
+	 * usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
+	 *
+	 * @access public
+	 * @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file
+	 * @return    void
+	 */
+	function espresso_deactivate_plugin($plugin_basename = '')
+	{
+		if (! function_exists('deactivate_plugins')) {
+			require_once ABSPATH . 'wp-admin/includes/plugin.php';
+		}
+		unset($_GET['activate'], $_REQUEST['activate']);
+		deactivate_plugins($plugin_basename);
+	}
 }