eventespresso / event-espresso-core

shortcodes/espresso_cancelled/EES_Espresso_Cancelled.shortcode.php

Indentation +42 added lines, -42 removed lines

@@ -11,55 +11,55 @@
 class EES_Espresso_Cancelled extends EES_Shortcode
 {
 
-    /**
-     * @deprecated 4.9.27
-     * @return    void
-     */
-    public static function set_hooks()
-    {
-    }
+	/**
+	 * @deprecated 4.9.27
+	 * @return    void
+	 */
+	public static function set_hooks()
+	{
+	}
 
 
 
-    /**
-     * @deprecated 4.9.27
-     * @return    void
-     */
-    public static function set_hooks_admin()
-    {
-    }
+	/**
+	 * @deprecated 4.9.27
+	 * @return    void
+	 */
+	public static function set_hooks_admin()
+	{
+	}
 
 
 
-    /**
-     * @deprecated 4.9.27
-     * @param WP $WP
-     * @return    void
-     */
-    public function run(WP $WP)
-    {
-    }
+	/**
+	 * @deprecated 4.9.27
+	 * @param WP $WP
+	 * @return    void
+	 */
+	public function run(WP $WP)
+	{
+	}
 
 
 
-    /**
-     * process_shortcode - ESPRESSO_CANCELLED
-     *
-     * @deprecated 4.9.27
-     * @param        array $attributes
-     * @return    string
-     * @throws \EE_Error
-     */
-    public function process_shortcode($attributes = array())
-    {
-        \EE_Error::doing_it_wrong(
-            __METHOD__,
-            __(
-                'Usage is deprecated. Please use \EventEspresso\core\domain\entities\shortcodes\EspressoCancelled instead.',
-                'event_espresso'
-            ),
-            '4.9.27'
-        );
-        return '';
-    }
+	/**
+	 * process_shortcode - ESPRESSO_CANCELLED
+	 *
+	 * @deprecated 4.9.27
+	 * @param        array $attributes
+	 * @return    string
+	 * @throws \EE_Error
+	 */
+	public function process_shortcode($attributes = array())
+	{
+		\EE_Error::doing_it_wrong(
+			__METHOD__,
+			__(
+				'Usage is deprecated. Please use \EventEspresso\core\domain\entities\shortcodes\EspressoCancelled instead.',
+				'event_espresso'
+			),
+			'4.9.27'
+		);
+		return '';
+	}
 }

widgets/upcoming_events/EEW_Upcoming_Events.widget.php

Indentation +304 added lines, -304 removed lines

@@ -28,58 +28,58 @@ 
 {
 
 
-    /**
-     * Register widget with WordPress.
-     */
-    public function __construct()
-    {
-        parent::__construct(
-            __('Event Espresso Upcoming Events', 'event_espresso'),
-            array( 'description' => __('A widget to display your upcoming events.', 'event_espresso'))
-        );
-    }
+	/**
+	 * Register widget with WordPress.
+	 */
+	public function __construct()
+	{
+		parent::__construct(
+			__('Event Espresso Upcoming Events', 'event_espresso'),
+			array( 'description' => __('A widget to display your upcoming events.', 'event_espresso'))
+		);
+	}
 
 
 
-    /**
-     * Back-end widget form.
-     *
-     * @see WP_Widget::form()
-     * @param array $instance Previously saved values from database.
-     * @return string|void
-     */
-    public function form($instance)
-    {
+	/**
+	 * Back-end widget form.
+	 *
+	 * @see WP_Widget::form()
+	 * @param array $instance Previously saved values from database.
+	 * @return string|void
+	 */
+	public function form($instance)
+	{
 
-        EE_Registry::instance()->load_class('Question_Option', array(), false, false, true);
-        // Set up some default widget settings.
-        $defaults = array(
-            'title' => __('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'
-        );
+		EE_Registry::instance()->load_class('Question_Option', array(), false, false, true);
+		// Set up some default widget settings.
+		$defaults = array(
+			'title' => __('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 = array(
-            EE_Question_Option::new_instance(array( 'QSO_value' => false, 'QSO_desc' => __('No', 'event_espresso'))),
-            EE_Question_Option::new_instance(array( 'QSO_value' => true, 'QSO_desc' => __('Yes', 'event_espresso')))
-        );
-        $sort_values = array(
-            EE_Question_Option::new_instance(array( 'QSO_value' => 'ASC', 'QSO_desc' => __('ASC', 'event_espresso'))),
-            EE_Question_Option::new_instance(array( 'QSO_value' => 'DESC', 'QSO_desc' => __('DESC', 'event_espresso')))
-        );
+		$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 = array(
+			EE_Question_Option::new_instance(array( 'QSO_value' => false, 'QSO_desc' => __('No', 'event_espresso'))),
+			EE_Question_Option::new_instance(array( 'QSO_value' => true, 'QSO_desc' => __('Yes', 'event_espresso')))
+		);
+		$sort_values = array(
+			EE_Question_Option::new_instance(array( 'QSO_value' => 'ASC', 'QSO_desc' => __('ASC', 'event_espresso'))),
+			EE_Question_Option::new_instance(array( 'QSO_value' => 'DESC', 'QSO_desc' => __('DESC', 'event_espresso')))
+		);
 
-    ?>
+	?>
 
         <!-- Widget Title: Text Input -->
 
@@ -94,26 +94,26 @@ 
                 <?php _e('Event Category:', 'event_espresso'); ?>
             </label>
             <?php
-            $event_categories = array();
-            /** @type EEM_Term $EEM_Term */
-            $EEM_Term = EE_Registry::instance()->load_model('Term');
-            $categories = $EEM_Term->get_all_ee_categories(true);
-            if ($categories) {
-                foreach ($categories as $category) {
-                    if ($category instanceof EE_Term) {
-                        $event_categories[] = EE_Question_Option::new_instance(array( 'QSO_value' => $category->get('slug'), 'QSO_desc' => $category->get('name')));
-                    }
-                }
-            }
-            array_unshift($event_categories, EE_Question_Option::new_instance(array( 'QSO_value' => '', 'QSO_desc' => __(' - display all - ', 'event_espresso'))));
-            echo EEH_Form_Fields::select(
-                __('Event Category:', 'event_espresso'),
-                $instance['category_name'],
-                $event_categories,
-                $this->get_field_name('category_name'),
-                $this->get_field_id('category_name')
-            );
-            ?>
+			$event_categories = array();
+			/** @type EEM_Term $EEM_Term */
+			$EEM_Term = EE_Registry::instance()->load_model('Term');
+			$categories = $EEM_Term->get_all_ee_categories(true);
+			if ($categories) {
+				foreach ($categories as $category) {
+					if ($category instanceof EE_Term) {
+						$event_categories[] = EE_Question_Option::new_instance(array( 'QSO_value' => $category->get('slug'), 'QSO_desc' => $category->get('name')));
+					}
+				}
+			}
+			array_unshift($event_categories, EE_Question_Option::new_instance(array( 'QSO_value' => '', 'QSO_desc' => __(' - display all - ', 'event_espresso'))));
+			echo EEH_Form_Fields::select(
+				__('Event Category:', 'event_espresso'),
+				$instance['category_name'],
+				$event_categories,
+				$this->get_field_name('category_name'),
+				$this->get_field_id('category_name')
+			);
+			?>
         </p>
         <p>
             <label for="<?php echo $this->get_field_id('limit'); ?>">
@@ -126,59 +126,59 @@ 
                 <?php _e('Show Expired Events:', 'event_espresso'); ?>
             </label>
             <?php
-            echo EEH_Form_Fields::select(
-                __('Show Expired Events:', 'event_espresso'),
-                $instance['show_expired'],
-                array(
-                    EE_Question_Option::new_instance(array( 'QSO_value' => 0, 'QSO_desc' => __('No', 'event_espresso'))),
-                    EE_Question_Option::new_instance(array( 'QSO_value' => 1, 'QSO_desc' => __('Yes', 'event_espresso'))),
-                    EE_Question_Option::new_instance(array( 'QSO_value' => 2, 'QSO_desc' => __('Show Only Expired', 'event_espresso'))),
-                ),
-                $this->get_field_name('show_expired'),
-                $this->get_field_id('show_expired')
-            );
-            ?>
+			echo EEH_Form_Fields::select(
+				__('Show Expired Events:', 'event_espresso'),
+				$instance['show_expired'],
+				array(
+					EE_Question_Option::new_instance(array( 'QSO_value' => 0, 'QSO_desc' => __('No', 'event_espresso'))),
+					EE_Question_Option::new_instance(array( 'QSO_value' => 1, 'QSO_desc' => __('Yes', 'event_espresso'))),
+					EE_Question_Option::new_instance(array( 'QSO_value' => 2, 'QSO_desc' => __('Show Only Expired', 'event_espresso'))),
+				),
+				$this->get_field_name('show_expired'),
+				$this->get_field_id('show_expired')
+			);
+			?>
         </p>
         <p>
             <label for="<?php echo $this->get_field_id('sort'); ?>">
                 <?php _e('Sort Events:', 'event_espresso'); ?>
             </label>
             <?php
-            echo EEH_Form_Fields::select(
-                __('Sort Events:', 'event_espresso'),
-                $instance['sort'],
-                $sort_values,
-                $this->get_field_name('sort'),
-                $this->get_field_id('sort')
-            );
-            ?>
+			echo EEH_Form_Fields::select(
+				__('Sort Events:', 'event_espresso'),
+				$instance['sort'],
+				$sort_values,
+				$this->get_field_name('sort'),
+				$this->get_field_id('sort')
+			);
+			?>
         </p>
         <p>
             <label for="<?php echo $this->get_field_id('image_size'); ?>">
                 <?php _e('Image Size:', 'event_espresso'); ?>
             </label>
             <?php
-            $image_sizes = array();
-            $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, array( 'large', 'post-thumbnail' ))) {
-                        $image_sizes[] = EE_Question_Option::new_instance(array( 'QSO_value' => $image_size, 'QSO_desc' => $image_size ));
-                    }
-                }
-                $image_sizes[] = EE_Question_Option::new_instance(array( 'QSO_value' => 'none', 'QSO_desc' =>  __('don\'t show images', 'event_espresso') ));
-            }
-            echo EEH_Form_Fields::select(
-                __('Image Size:', 'event_espresso'),
-                $instance['image_size'],
-                $image_sizes,
-                $this->get_field_name('image_size'),
-                $this->get_field_id('image_size')
-            );
-            ?>
+			$image_sizes = array();
+			$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, array( 'large', 'post-thumbnail' ))) {
+						$image_sizes[] = EE_Question_Option::new_instance(array( 'QSO_value' => $image_size, 'QSO_desc' => $image_size ));
+					}
+				}
+				$image_sizes[] = EE_Question_Option::new_instance(array( 'QSO_value' => 'none', 'QSO_desc' =>  __('don\'t show images', 'event_espresso') ));
+			}
+			echo EEH_Form_Fields::select(
+				__('Image Size:', 'event_espresso'),
+				$instance['image_size'],
+				$image_sizes,
+				$this->get_field_name('image_size'),
+				$this->get_field_id('image_size')
+			);
+			?>
 
         </p>
         <p>
@@ -186,42 +186,42 @@ 
                 <?php _e('Show Description:', 'event_espresso'); ?>
             </label>
             <?php
-            echo EEH_Form_Fields::select(
-                __('Show Description:', 'event_espresso'),
-                $instance['show_desc'],
-                $yes_no_values,
-                $this->get_field_name('show_desc'),
-                $this->get_field_id('show_desc')
-            );
-            ?>
+			echo EEH_Form_Fields::select(
+				__('Show Description:', 'event_espresso'),
+				$instance['show_desc'],
+				$yes_no_values,
+				$this->get_field_name('show_desc'),
+				$this->get_field_id('show_desc')
+			);
+			?>
         </p>
         <p>
             <label for="<?php echo $this->get_field_id('show_dates'); ?>">
                 <?php _e('Show Dates:', 'event_espresso'); ?>
             </label>
             <?php
-            echo EEH_Form_Fields::select(
-                __('Show Dates:', 'event_espresso'),
-                $instance['show_dates'],
-                $yes_no_values,
-                $this->get_field_name('show_dates'),
-                $this->get_field_id('show_dates')
-            );
-            ?>
+			echo EEH_Form_Fields::select(
+				__('Show Dates:', 'event_espresso'),
+				$instance['show_dates'],
+				$yes_no_values,
+				$this->get_field_name('show_dates'),
+				$this->get_field_id('show_dates')
+			);
+			?>
         </p>
         <p>
             <label for="<?php echo $this->get_field_id('show_everywhere'); ?>">
                 <?php _e('Show on all Pages:', 'event_espresso'); ?>
             </label>
             <?php
-            echo EEH_Form_Fields::select(
-                __('Show on all Pages:', 'event_espresso'),
-                $instance['show_everywhere'],
-                $yes_no_values,
-                $this->get_field_name('show_everywhere'),
-                $this->get_field_id('show_everywhere')
-            );
-            ?>
+			echo EEH_Form_Fields::select(
+				__('Show on all Pages:', 'event_espresso'),
+				$instance['show_everywhere'],
+				$yes_no_values,
+				$this->get_field_name('show_everywhere'),
+				$this->get_field_id('show_everywhere')
+			);
+			?>
         </p>
         <p>
             <label for="<?php echo $this->get_field_id('date_limit'); ?>">
@@ -234,198 +234,198 @@ 
                 <?php _e('Show Date Range:', 'event_espresso'); ?>
             </label>
             <?php
-            echo EEH_Form_Fields::select(
-                __('Show Date Range:', 'event_espresso'),
-                $instance['date_range'],
-                $yes_no_values,
-                $this->get_field_name('date_range'),
-                $this->get_field_id('date_range')
-            );
-            ?><span class="description"><br /><?php _e('This setting will replace the list of dates in the widget.', 'event_espresso'); ?></span>
+			echo EEH_Form_Fields::select(
+				__('Show Date Range:', 'event_espresso'),
+				$instance['date_range'],
+				$yes_no_values,
+				$this->get_field_name('date_range'),
+				$this->get_field_id('date_range')
+			);
+			?><span class="description"><br /><?php _e('This setting will replace the list of dates in the widget.', 'event_espresso'); ?></span>
         </p>
 
         <?php
-    }
+	}
 
 
 
-    /**
-     * Sanitize widget form values as they are saved.
-     *
-     * @see WP_Widget::update()
-     *
-     * @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.
-     */
-    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;
-    }
+	/**
+	 * Sanitize widget form values as they are saved.
+	 *
+	 * @see WP_Widget::update()
+	 *
+	 * @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.
+	 */
+	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.
-     *
-     * @see WP_Widget::widget()
-     *
-     * @param array $args     Widget arguments.
-     * @param array $instance Saved values from database.
-     */
-    public function widget($args, $instance)
-    {
+	/**
+	 * Front-end display of widget.
+	 *
+	 * @see WP_Widget::widget()
+	 *
+	 * @param array $args     Widget arguments.
+	 * @param array $instance Saved values from database.
+	 */
+	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']) ? (bool) absint($instance['show_everywhere']) : true;
-            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
+		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']) ? (bool) absint($instance['show_everywhere']) : true;
+			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);
+				extract($args);
 
-                // add function to make the title a link
-                add_filter('widget_title', array($this, 'make_the_title_a_link'), 15);
+				// add function to make the title a link
+				add_filter('widget_title', array($this, 'make_the_title_a_link'), 15);
 
-                $title = isset($instance['title']) && ! empty($instance['title']) ? $instance['title'] : '';
-                // filter the title
-                $title = apply_filters('widget_title', $title);
+				$title = isset($instance['title']) && ! empty($instance['title']) ? $instance['title'] : '';
+				// filter the title
+				$title = apply_filters('widget_title', $title);
 
-                // remove the function from the filter, so it does not affect other widgets
-                remove_filter('widget_title', array($this, 'make_the_title_a_link'), 15);
+				// remove the function from the filter, so it does not affect other widgets
+				remove_filter('widget_title', array($this, 'make_the_title_a_link'), 15);
 
-                // 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;
-                }
-                // grab widget settings
-                $category = isset($instance['category_name']) && ! empty($instance['category_name']) ? $instance['category_name'] : false;
-                $show_expired = isset($instance['show_expired']) ? absint($instance['show_expired']) : 0;
-                $image_size = isset($instance['image_size']) && ! empty($instance['image_size']) ? $instance['image_size'] : 'medium';
-                $show_desc = isset($instance['show_desc']) ? (bool) absint($instance['show_desc']) : true;
-                $show_dates = isset($instance['show_dates']) ? (bool) absint($instance['show_dates']) : true;
-                $date_limit = isset($instance['date_limit']) && ! empty($instance['date_limit']) ? $instance['date_limit'] : null;
-                $date_range = isset($instance['date_range']) && ! empty($instance['date_range']) ? $instance['date_range'] : false;
-                // start to build our where clause
-                $where = array(
+				// 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;
+				}
+				// grab widget settings
+				$category = isset($instance['category_name']) && ! empty($instance['category_name']) ? $instance['category_name'] : false;
+				$show_expired = isset($instance['show_expired']) ? absint($instance['show_expired']) : 0;
+				$image_size = isset($instance['image_size']) && ! empty($instance['image_size']) ? $instance['image_size'] : 'medium';
+				$show_desc = isset($instance['show_desc']) ? (bool) absint($instance['show_desc']) : true;
+				$show_dates = isset($instance['show_dates']) ? (bool) absint($instance['show_dates']) : true;
+				$date_limit = isset($instance['date_limit']) && ! empty($instance['date_limit']) ? $instance['date_limit'] : null;
+				$date_range = isset($instance['date_range']) && ! empty($instance['date_range']) ? $instance['date_range'] : false;
+				// start to build our where clause
+				$where = array(
 //                  'Datetime.DTT_is_primary' => 1,
-                    'status' => array( 'IN', array( 'publish', 'sold_out' ) )
-                );
-                // add category
-                if ($category) {
-                    $where['Term_Taxonomy.taxonomy'] = 'espresso_event_categories';
-                    $where['Term_Taxonomy.Term.slug'] = $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 ($show_expired == 0) {
-                    $where['Datetime.DTT_EVT_end'] = array( '>=', EEM_Datetime::instance()->current_time_for_query('DTT_EVT_end') );
-                }
-                // if show ONLY expired we want events that ended prior to today
-                if ($show_expired == 2) {
-                    $where['Datetime.DTT_EVT_end'] = array( '<=', EEM_Datetime::instance()->current_time_for_query('DTT_EVT_start') );
-                }
-                // allow $where to be filtered
-                $where = apply_filters('FHEE__EEW_Upcoming_Events__widget__where', $where, $category, $show_expired);
-                // run the query
-                $events = EE_Registry::instance()->load_model('Event')->get_all(array(
-                    $where,
-                    'limit' => isset($instance['limit']) && $instance['limit'] > 0
-                                ? '0,' . $instance['limit']
-                                : '0,10',
-                    'order_by' => 'Datetime.DTT_EVT_start',
-                    'order' => isset($instance['sort']) ? $instance['sort'] : 'ASC',
-                    'group_by' => 'EVT_ID'
-                ));
+					'status' => array( 'IN', array( 'publish', 'sold_out' ) )
+				);
+				// add category
+				if ($category) {
+					$where['Term_Taxonomy.taxonomy'] = 'espresso_event_categories';
+					$where['Term_Taxonomy.Term.slug'] = $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 ($show_expired == 0) {
+					$where['Datetime.DTT_EVT_end'] = array( '>=', EEM_Datetime::instance()->current_time_for_query('DTT_EVT_end') );
+				}
+				// if show ONLY expired we want events that ended prior to today
+				if ($show_expired == 2) {
+					$where['Datetime.DTT_EVT_end'] = array( '<=', EEM_Datetime::instance()->current_time_for_query('DTT_EVT_start') );
+				}
+				// allow $where to be filtered
+				$where = apply_filters('FHEE__EEW_Upcoming_Events__widget__where', $where, $category, $show_expired);
+				// run the query
+				$events = EE_Registry::instance()->load_model('Event')->get_all(array(
+					$where,
+					'limit' => isset($instance['limit']) && $instance['limit'] > 0
+								? '0,' . $instance['limit']
+								: '0,10',
+					'order_by' => 'Datetime.DTT_EVT_start',
+					'order' => isset($instance['sort']) ? $instance['sort'] : 'ASC',
+					'group_by' => 'EVT_ID'
+				));
 
-                if (! empty($events)) {
-                    echo '<ul class="ee-upcoming-events-widget-ul">';
-                    foreach ($events as $event) {
-                        if ($event instanceof EE_Event && ( !is_single() || $post->ID != $event->ID() )) {
-                            // printr( $event, '$event  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-                            echo '<li id="ee-upcoming-events-widget-li-' . $event->ID() . '" class="ee-upcoming-events-widget-li">';
-                            // how big is the event name ?
-                            $name_length = strlen($event->name());
-                            switch ($name_length) {
-                                case $name_length > 70:
-                                    $len_class =  ' three-line';
-                                    break;
-                                case $name_length > 35:
-                                    $len_class =  ' two-line';
-                                    break;
-                                default:
-                                    $len_class =  ' one-line';
-                            }
-                            $event_url = apply_filters('FHEE_EEW_Upcoming_Events__widget__event_url', $event->get_permalink(), $event);
-                            echo '<h5 class="ee-upcoming-events-widget-title-h5"><a class="ee-widget-event-name-a' . $len_class . '" href="' . $event_url . '">' . $event->name() . '</a></h5>';
-                            if (post_password_required($event->ID())) {
-                                $pswd_form = apply_filters('FHEE_EEW_Upcoming_Events__widget__password_form', get_the_password_form($event->ID()), $event);
-                                echo $pswd_form;
-                            } else {
-                                if (has_post_thumbnail($event->ID()) && $image_size != 'none') {
-                                    echo '<div class="ee-upcoming-events-widget-img-dv"><a class="ee-upcoming-events-widget-img" href="' . $event_url . '">' . get_the_post_thumbnail($event->ID(), $image_size) . '</a></div>';
-                                }
-                                $desc = $event->short_description(25);
-                                if ($show_dates) {
-                                    $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 ($date_range == true) {
-                                        echo espresso_event_date_range($date_format, $time_format, $single_date_format, $single_time_format, $event->ID());
-                                    } else {
-                                        echo espresso_list_of_event_dates($event->ID(), $date_format, $time_format, false, null, true, true, $date_limit);
-                                    }
-                                }
-                                if ($show_desc && $desc) {
-                                    echo '<p style="margin-top: .5em">' . $desc . '</p>';
-                                }
-                            }
-                            echo '</li>';
-                        }
-                    }
-                    echo '</ul>';
-                }
-                // After widget (defined by themes).
-                echo $after_widget;
-            }
-        }
-    }
+				if (! empty($events)) {
+					echo '<ul class="ee-upcoming-events-widget-ul">';
+					foreach ($events as $event) {
+						if ($event instanceof EE_Event && ( !is_single() || $post->ID != $event->ID() )) {
+							// printr( $event, '$event  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
+							echo '<li id="ee-upcoming-events-widget-li-' . $event->ID() . '" class="ee-upcoming-events-widget-li">';
+							// how big is the event name ?
+							$name_length = strlen($event->name());
+							switch ($name_length) {
+								case $name_length > 70:
+									$len_class =  ' three-line';
+									break;
+								case $name_length > 35:
+									$len_class =  ' two-line';
+									break;
+								default:
+									$len_class =  ' one-line';
+							}
+							$event_url = apply_filters('FHEE_EEW_Upcoming_Events__widget__event_url', $event->get_permalink(), $event);
+							echo '<h5 class="ee-upcoming-events-widget-title-h5"><a class="ee-widget-event-name-a' . $len_class . '" href="' . $event_url . '">' . $event->name() . '</a></h5>';
+							if (post_password_required($event->ID())) {
+								$pswd_form = apply_filters('FHEE_EEW_Upcoming_Events__widget__password_form', get_the_password_form($event->ID()), $event);
+								echo $pswd_form;
+							} else {
+								if (has_post_thumbnail($event->ID()) && $image_size != 'none') {
+									echo '<div class="ee-upcoming-events-widget-img-dv"><a class="ee-upcoming-events-widget-img" href="' . $event_url . '">' . get_the_post_thumbnail($event->ID(), $image_size) . '</a></div>';
+								}
+								$desc = $event->short_description(25);
+								if ($show_dates) {
+									$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 ($date_range == true) {
+										echo espresso_event_date_range($date_format, $time_format, $single_date_format, $single_time_format, $event->ID());
+									} else {
+										echo espresso_list_of_event_dates($event->ID(), $date_format, $time_format, false, null, true, true, $date_limit);
+									}
+								}
+								if ($show_desc && $desc) {
+									echo '<p style="margin-top: .5em">' . $desc . '</p>';
+								}
+							}
+							echo '</li>';
+						}
+					}
+					echo '</ul>';
+				}
+				// 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>';
-    }
+	/**
+	 * 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>';
+	}
 }

Spacing +30 added lines, -30 removed lines

@@ -35,7 +35,7 @@ 
     {
         parent::__construct(
             __('Event Espresso Upcoming Events', 'event_espresso'),
-            array( 'description' => __('A widget to display your upcoming events.', 'event_espresso'))
+            array('description' => __('A widget to display your upcoming events.', 'event_espresso'))
         );
     }
 
@@ -71,12 +71,12 @@ 
         // 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 = array(
-            EE_Question_Option::new_instance(array( 'QSO_value' => false, 'QSO_desc' => __('No', 'event_espresso'))),
-            EE_Question_Option::new_instance(array( 'QSO_value' => true, 'QSO_desc' => __('Yes', 'event_espresso')))
+            EE_Question_Option::new_instance(array('QSO_value' => false, 'QSO_desc' => __('No', 'event_espresso'))),
+            EE_Question_Option::new_instance(array('QSO_value' => true, 'QSO_desc' => __('Yes', 'event_espresso')))
         );
         $sort_values = array(
-            EE_Question_Option::new_instance(array( 'QSO_value' => 'ASC', 'QSO_desc' => __('ASC', 'event_espresso'))),
-            EE_Question_Option::new_instance(array( 'QSO_value' => 'DESC', 'QSO_desc' => __('DESC', 'event_espresso')))
+            EE_Question_Option::new_instance(array('QSO_value' => 'ASC', 'QSO_desc' => __('ASC', 'event_espresso'))),
+            EE_Question_Option::new_instance(array('QSO_value' => 'DESC', 'QSO_desc' => __('DESC', 'event_espresso')))
         );
 
     ?>
@@ -101,11 +101,11 @@ 
             if ($categories) {
                 foreach ($categories as $category) {
                     if ($category instanceof EE_Term) {
-                        $event_categories[] = EE_Question_Option::new_instance(array( 'QSO_value' => $category->get('slug'), 'QSO_desc' => $category->get('name')));
+                        $event_categories[] = EE_Question_Option::new_instance(array('QSO_value' => $category->get('slug'), 'QSO_desc' => $category->get('name')));
                     }
                 }
             }
-            array_unshift($event_categories, EE_Question_Option::new_instance(array( 'QSO_value' => '', 'QSO_desc' => __(' - display all - ', 'event_espresso'))));
+            array_unshift($event_categories, EE_Question_Option::new_instance(array('QSO_value' => '', 'QSO_desc' => __(' - display all - ', 'event_espresso'))));
             echo EEH_Form_Fields::select(
                 __('Event Category:', 'event_espresso'),
                 $instance['category_name'],
@@ -130,9 +130,9 @@ 
                 __('Show Expired Events:', 'event_espresso'),
                 $instance['show_expired'],
                 array(
-                    EE_Question_Option::new_instance(array( 'QSO_value' => 0, 'QSO_desc' => __('No', 'event_espresso'))),
-                    EE_Question_Option::new_instance(array( 'QSO_value' => 1, 'QSO_desc' => __('Yes', 'event_espresso'))),
-                    EE_Question_Option::new_instance(array( 'QSO_value' => 2, 'QSO_desc' => __('Show Only Expired', 'event_espresso'))),
+                    EE_Question_Option::new_instance(array('QSO_value' => 0, 'QSO_desc' => __('No', 'event_espresso'))),
+                    EE_Question_Option::new_instance(array('QSO_value' => 1, 'QSO_desc' => __('Yes', 'event_espresso'))),
+                    EE_Question_Option::new_instance(array('QSO_value' => 2, 'QSO_desc' => __('Show Only Expired', 'event_espresso'))),
                 ),
                 $this->get_field_name('show_expired'),
                 $this->get_field_id('show_expired')
@@ -165,11 +165,11 @@ 
                 foreach ($sizes as $image_size) {
                     $image_size = trim($image_size);
                     // no big images plz
-                    if (! in_array($image_size, array( 'large', 'post-thumbnail' ))) {
-                        $image_sizes[] = EE_Question_Option::new_instance(array( 'QSO_value' => $image_size, 'QSO_desc' => $image_size ));
+                    if ( ! in_array($image_size, array('large', 'post-thumbnail'))) {
+                        $image_sizes[] = EE_Question_Option::new_instance(array('QSO_value' => $image_size, 'QSO_desc' => $image_size));
                     }
                 }
-                $image_sizes[] = EE_Question_Option::new_instance(array( 'QSO_value' => 'none', 'QSO_desc' =>  __('don\'t show images', 'event_espresso') ));
+                $image_sizes[] = EE_Question_Option::new_instance(array('QSO_value' => 'none', 'QSO_desc' =>  __('don\'t show images', 'event_espresso')));
             }
             echo EEH_Form_Fields::select(
                 __('Image Size:', 'event_espresso'),
@@ -298,7 +298,7 @@ 
             $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']) ? (bool) absint($instance['show_everywhere']) : true;
-            if ($show_everywhere || ! ( $post->post_type == 'espresso_events' && is_archive() )) {
+            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
 
@@ -318,8 +318,8 @@ 
                 // 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;
+                if ( ! empty($title)) {
+                    echo $before_title.$title.$after_title;
                 }
                 // grab widget settings
                 $category = isset($instance['category_name']) && ! empty($instance['category_name']) ? $instance['category_name'] : false;
@@ -332,7 +332,7 @@ 
                 // start to build our where clause
                 $where = array(
 //                  'Datetime.DTT_is_primary' => 1,
-                    'status' => array( 'IN', array( 'publish', 'sold_out' ) )
+                    'status' => array('IN', array('publish', 'sold_out'))
                 );
                 // add category
                 if ($category) {
@@ -342,11 +342,11 @@ 
                 // 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 ($show_expired == 0) {
-                    $where['Datetime.DTT_EVT_end'] = array( '>=', EEM_Datetime::instance()->current_time_for_query('DTT_EVT_end') );
+                    $where['Datetime.DTT_EVT_end'] = array('>=', EEM_Datetime::instance()->current_time_for_query('DTT_EVT_end'));
                 }
                 // if show ONLY expired we want events that ended prior to today
                 if ($show_expired == 2) {
-                    $where['Datetime.DTT_EVT_end'] = array( '<=', EEM_Datetime::instance()->current_time_for_query('DTT_EVT_start') );
+                    $where['Datetime.DTT_EVT_end'] = array('<=', EEM_Datetime::instance()->current_time_for_query('DTT_EVT_start'));
                 }
                 // allow $where to be filtered
                 $where = apply_filters('FHEE__EEW_Upcoming_Events__widget__where', $where, $category, $show_expired);
@@ -354,39 +354,39 @@ 
                 $events = EE_Registry::instance()->load_model('Event')->get_all(array(
                     $where,
                     'limit' => isset($instance['limit']) && $instance['limit'] > 0
-                                ? '0,' . $instance['limit']
+                                ? '0,'.$instance['limit']
                                 : '0,10',
                     'order_by' => 'Datetime.DTT_EVT_start',
                     'order' => isset($instance['sort']) ? $instance['sort'] : 'ASC',
                     'group_by' => 'EVT_ID'
                 ));
 
-                if (! empty($events)) {
+                if ( ! empty($events)) {
                     echo '<ul class="ee-upcoming-events-widget-ul">';
                     foreach ($events as $event) {
-                        if ($event instanceof EE_Event && ( !is_single() || $post->ID != $event->ID() )) {
+                        if ($event instanceof EE_Event && ( ! is_single() || $post->ID != $event->ID())) {
                             // printr( $event, '$event  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-                            echo '<li id="ee-upcoming-events-widget-li-' . $event->ID() . '" class="ee-upcoming-events-widget-li">';
+                            echo '<li id="ee-upcoming-events-widget-li-'.$event->ID().'" class="ee-upcoming-events-widget-li">';
                             // how big is the event name ?
                             $name_length = strlen($event->name());
                             switch ($name_length) {
                                 case $name_length > 70:
-                                    $len_class =  ' three-line';
+                                    $len_class = ' three-line';
                                     break;
                                 case $name_length > 35:
-                                    $len_class =  ' two-line';
+                                    $len_class = ' two-line';
                                     break;
                                 default:
-                                    $len_class =  ' one-line';
+                                    $len_class = ' one-line';
                             }
                             $event_url = apply_filters('FHEE_EEW_Upcoming_Events__widget__event_url', $event->get_permalink(), $event);
-                            echo '<h5 class="ee-upcoming-events-widget-title-h5"><a class="ee-widget-event-name-a' . $len_class . '" href="' . $event_url . '">' . $event->name() . '</a></h5>';
+                            echo '<h5 class="ee-upcoming-events-widget-title-h5"><a class="ee-widget-event-name-a'.$len_class.'" href="'.$event_url.'">'.$event->name().'</a></h5>';
                             if (post_password_required($event->ID())) {
                                 $pswd_form = apply_filters('FHEE_EEW_Upcoming_Events__widget__password_form', get_the_password_form($event->ID()), $event);
                                 echo $pswd_form;
                             } else {
                                 if (has_post_thumbnail($event->ID()) && $image_size != 'none') {
-                                    echo '<div class="ee-upcoming-events-widget-img-dv"><a class="ee-upcoming-events-widget-img" href="' . $event_url . '">' . get_the_post_thumbnail($event->ID(), $image_size) . '</a></div>';
+                                    echo '<div class="ee-upcoming-events-widget-img-dv"><a class="ee-upcoming-events-widget-img" href="'.$event_url.'">'.get_the_post_thumbnail($event->ID(), $image_size).'</a></div>';
                                 }
                                 $desc = $event->short_description(25);
                                 if ($show_dates) {
@@ -401,7 +401,7 @@ 
                                     }
                                 }
                                 if ($show_desc && $desc) {
-                                    echo '<p style="margin-top: .5em">' . $desc . '</p>';
+                                    echo '<p style="margin-top: .5em">'.$desc.'</p>';
                                 }
                             }
                             echo '</li>';
@@ -426,6 +426,6 @@ 
      */
     public function make_the_title_a_link($title)
     {
-        return '<a href="' . EEH_Event_View::event_archive_url() . '">' . $title . '</a>';
+        return '<a href="'.EEH_Event_View::event_archive_url().'">'.$title.'</a>';
     }
 }

core/interfaces/EEI_Contact.interface.php

Indentation +4 added lines, -4 removed lines

@@ -6,17 +6,17 @@
 interface EEI_Contact
 {
 
-    public function fname();
+	public function fname();
 
 
 
-    public function lname();
+	public function lname();
 
 
 
-    public function email();
+	public function email();
 
 
 
-    public function phone();
+	public function phone();
 }

core/interfaces/EEI_Has_Address.interface.php

Indentation +8 added lines, -8 removed lines

@@ -6,33 +6,33 @@
 interface EEI_Has_Address
 {
 
-    public function address();
+	public function address();
 
 
 
-    public function address2();
+	public function address2();
 
 
 
-    public function city();
+	public function city();
 
 
 
-    public function state_ID();
+	public function state_ID();
 
 
 
-    public function state_obj();
+	public function state_obj();
 
 
 
-    public function country_ID();
+	public function country_ID();
 
 
 
-    public function country_obj();
+	public function country_obj();
 
 
 
-    public function zip();
+	public function zip();
 }

core/interfaces/EEHI_Template.interface.php

Indentation +18 added lines, -18 removed lines

@@ -6,22 +6,22 @@
 interface EEHI_Template
 {
 
-    /**
-     * EEH_Template::format_currency
-     * This helper takes a raw float value and formats it according to the default config country currency settings, or the country currency settings from the supplied country ISO code
-     *
-     * @param  float   $amount       raw money value
-     * @param  boolean $return_raw   whether to return the formatted float value only with no currency sign or code
-     * @param  boolean $display_code whether to display the country code (USD). Default = TRUE
-     * @param  string  $CNT_ISO      2 letter ISO code for a country
-     * @param string   $cur_code_span_class
-     * @return string the html output for the formatted money value
-     */
-    public static function format_currency(
-        $amount = null,
-        $return_raw = false,
-        $display_code = true,
-        $CNT_ISO = '',
-        $cur_code_span_class = 'currency-code'
-    );
+	/**
+	 * EEH_Template::format_currency
+	 * This helper takes a raw float value and formats it according to the default config country currency settings, or the country currency settings from the supplied country ISO code
+	 *
+	 * @param  float   $amount       raw money value
+	 * @param  boolean $return_raw   whether to return the formatted float value only with no currency sign or code
+	 * @param  boolean $display_code whether to display the country code (USD). Default = TRUE
+	 * @param  string  $CNT_ISO      2 letter ISO code for a country
+	 * @param string   $cur_code_span_class
+	 * @return string the html output for the formatted money value
+	 */
+	public static function format_currency(
+		$amount = null,
+		$return_raw = false,
+		$display_code = true,
+		$CNT_ISO = '',
+		$cur_code_span_class = 'currency-code'
+	);
 }

core/interfaces/EEHI_File.interface.php

Indentation +18 added lines, -18 removed lines

@@ -6,27 +6,27 @@
 interface EEHI_File
 {
 
-    /**
-     * ensure_file_exists_and_is_writable
-     * ensures that a file exists and is writable, will attempt to create file if it does not exist
-     *
-     * @param string $full_file_path
-     * @throws EE_Error
-     * @return bool
-     */
-    public static function ensure_file_exists_and_is_writable($full_file_path = '');
+	/**
+	 * ensure_file_exists_and_is_writable
+	 * ensures that a file exists and is writable, will attempt to create file if it does not exist
+	 *
+	 * @param string $full_file_path
+	 * @throws EE_Error
+	 * @return bool
+	 */
+	public static function ensure_file_exists_and_is_writable($full_file_path = '');
 
 
 
-    /**
-     * ensure_folder_exists_and_is_writable
-     * ensures that a folder exists and is writable, will attempt to create folder if it does not exist
-     *
-     * @param string $folder
-     * @throws EE_Error
-     * @return bool
-     */
-    public static function ensure_folder_exists_and_is_writable($folder = '');
+	/**
+	 * ensure_folder_exists_and_is_writable
+	 * ensures that a folder exists and is writable, will attempt to create folder if it does not exist
+	 *
+	 * @param string $folder
+	 * @throws EE_Error
+	 * @return bool
+	 */
+	public static function ensure_folder_exists_and_is_writable($folder = '');
 }
 // End of file EEHI_File.interface.php
 // Location: core/interfaces/EEHI_File.interface.php

core/interfaces/EEI_Address_Formatter.interface.php

Indentation +10 added lines, -10 removed lines

@@ -6,14 +6,14 @@
 interface EEI_Address_Formatter
 {
 
-    /**
-     * @param string $address
-     * @param string $address2
-     * @param string $city
-     * @param string $state
-     * @param string $zip
-     * @param string $country
-     * @param string $CNT_ISO
-     */
-    public function format($address, $address2, $city, $state, $zip, $country, $CNT_ISO);
+	/**
+	 * @param string $address
+	 * @param string $address2
+	 * @param string $city
+	 * @param string $state
+	 * @param string $zip
+	 * @param string $country
+	 * @param string $CNT_ISO
+	 */
+	public function format($address, $address2, $city, $state, $zip, $country, $CNT_ISO);
 }

core/interfaces/messages/EEI_Has_Sending_Messenger.interface.php

Indentation +5 added lines, -5 removed lines

@@ -12,9 +12,9 @@
 {
 
 
-    /**
-     * Expect a EE_messenger object back that is serving as the sending messenger for a message.
-     * @return EE_messenger
-     */
-    public function sending_messenger();
+	/**
+	 * Expect a EE_messenger object back that is serving as the sending messenger for a message.
+	 * @return EE_messenger
+	 */
+	public function sending_messenger();
 }

core/interfaces/line_items/EEI_Line_Item_Object.interface.php

Indentation +10 added lines, -10 removed lines

@@ -11,16 +11,16 @@
 interface EEI_Line_Item_Object
 {
 
-    /**
-     * Return the name representing the object (i.e. Event Title, or Ticket Name).
-     * @return string
-     */
-    public function name();
+	/**
+	 * Return the name representing the object (i.e. Event Title, or Ticket Name).
+	 * @return string
+	 */
+	public function name();
 
 
-    /**
-     * Return the ID representation for the object.
-     * @return mixed int|string
-     */
-    public function ID();
+	/**
+	 * Return the ID representation for the object.
+	 * @return mixed int|string
+	 */
+	public function ID();
 }