eventespresso / event-espresso-core

core/admin/templates/admin_details_metabox_column_wrapper.template.php

Indentation +5 added lines, -5 removed lines

@@ -19,11 +19,11 @@
         </div> <!-- post-body-content -->
 
         <?php
-        // let's loop through the columns
-        for ($i = 1; $i <= $num_columns; $i++) {
-            $context = ($i === 1) ? 'normal' : 'side';
-            $context = ($i > 2) ? 'column' . $i : $context;
-            ?>
+		// let's loop through the columns
+		for ($i = 1; $i <= $num_columns; $i++) {
+			$context = ($i === 1) ? 'normal' : 'side';
+			$context = ($i > 2) ? 'column' . $i : $context;
+			?>
         <div id='postbox-container-<?php echo absint($i); ?>' class='postbox-container'>
             <?php do_meta_boxes($current_page, $context, null); ?>
         </div>

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
         // let's loop through the columns
         for ($i = 1; $i <= $num_columns; $i++) {
             $context = ($i === 1) ? 'normal' : 'side';
-            $context = ($i > 2) ? 'column' . $i : $context;
+            $context = ($i > 2) ? 'column'.$i : $context;
             ?>
         <div id='postbox-container-<?php echo absint($i); ?>' class='postbox-container'>
             <?php do_meta_boxes($current_page, $context, null); ?>

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 $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 $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 $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 $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 $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 esc_attr(parent::get_field_id($field_name));
-    }
-
-
-    /**
-     * @param string $field_name
-     * @return string
-     * @since   4.10.14.p
-     */
-    public function fieldName($field_name)
-    {
-        return esc_attr(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 esc_attr(parent::get_field_id($field_name));
+	}
+
+
+	/**
+	 * @param string $field_name
+	 * @return string
+	 * @since   4.10.14.p
+	 */
+	public function fieldName($field_name)
+	{
+		return esc_attr(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-' . absint($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
+		);
+	}
 }

Spacing +19 added lines, -19 removed lines

@@ -109,7 +109,7 @@ 
             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   = [
+        $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')]),
         ];
@@ -326,8 +326,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;
                 }
                 echo $this->widgetContent($post);
                 // After widget (defined by themes).
@@ -346,7 +346,7 @@ 
      */
     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>';
     }
 
 
@@ -427,7 +427,7 @@ 
             foreach ($sizes as $image_size) {
                 $image_size = trim($image_size);
                 // no big images plz
-                if (! in_array($image_size, ['large', 'post-thumbnail'])) {
+                if ( ! in_array($image_size, ['large', 'post-thumbnail'])) {
                     $image_sizes[] =
                         EE_Question_Option::new_instance(['QSO_value' => $image_size, 'QSO_desc' => $image_size]);
                 }
@@ -454,7 +454,7 @@ 
     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'])
+        $this->events_category = isset($instance['category_name']) && ! empty($instance['category_name'])
             ? $instance['category_name']
             : false;
         $this->show_expired = isset($instance['show_expired'])
@@ -512,24 +512,24 @@ 
         }
         $list_items = '';
         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())) {
                 $event_url = $this->eventUrl($event);
                 $list_items .= '
-                <li id="ee-upcoming-events-widget-li-' . absint($event->ID()) . '" 
+                <li id="ee-upcoming-events-widget-li-' . absint($event->ID()).'" 
                     class="ee-upcoming-events-widget-li"
                 >
                     <h5 class="ee-upcoming-events-widget-title-h5">
-                        <a class="ee-widget-event-name-a' . $this->linkClass($event) . '" href="' . $event_url . '">
-                            ' . esc_html($event->name()) . '
+                        <a class="ee-widget-event-name-a' . $this->linkClass($event).'" href="'.$event_url.'">
+                            ' . esc_html($event->name()).'
                         </a>
                     </h5>
-                    ' . $this->eventWidgetContent($event, $event_url) . '
+                    ' . $this->eventWidgetContent($event, $event_url).'
                 </li>';
             }
         }
         return '
             <ul class="ee-upcoming-events-widget-ul">
-                ' . $list_items . '
+                ' . $list_items.'
             </ul>';
     }
 
@@ -561,7 +561,7 @@ 
         return EEM_Event::instance()->get_all(
             [
                 $this->queryWhereParams(),
-                'limit'    => '0,' . $this->limit,
+                'limit'    => '0,'.$this->limit,
                 'order_by' => 'Datetime.DTT_EVT_start',
                 'order'    => $this->order,
                 'group_by' => 'EVT_ID',
@@ -649,8 +649,8 @@ 
         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 class="ee-upcoming-events-widget-img" href="' . $event_url.'">
+                        ' . get_the_post_thumbnail($event->ID(), $this->image_size).'
                     </a>
                 </div>';
         }
@@ -661,8 +661,8 @@ 
 
         if ($this->show_desc) {
             global $allowedtags;
-            $desc    = $event->short_description(25);
-            $content .= $desc ? '<p style="margin-top: .5em">' . wp_kses($desc, $allowedtags) . '</p>' : '';
+            $desc = $event->short_description(25);
+            $content .= $desc ? '<p style="margin-top: .5em">'.wp_kses($desc, $allowedtags).'</p>' : '';
         }
 
         return $content;
@@ -678,11 +678,11 @@ 
      */
     private function eventDates(EE_Event $event)
     {
-        $date_format        = apply_filters(
+        $date_format = apply_filters(
             'FHEE__espresso_event_date_range__date_format',
             get_option('date_format')
         );
-        $time_format        = apply_filters(
+        $time_format = apply_filters(
             'FHEE__espresso_event_date_range__time_format',
             get_option('time_format')
         );

caffeinated/admin/new/pricing/templates/event_tickets_datetime_attached_tickets_row.template.php

Indentation +26 added lines, -26 removed lines

@@ -23,10 +23,10 @@ 
                           placeholder="Datetime Description (optional)"><?php echo esc_textarea($DTT_description); ?></textarea>
             </div>
             <?php do_action(
-                'AHEE__event_tickets_datetime_attached_tickets_row_template__advanced_details_after_dtt_description',
-                $dtt_row,
-                $DTT_ID
-            ); ?>
+				'AHEE__event_tickets_datetime_attached_tickets_row_template__advanced_details_after_dtt_description',
+				$dtt_row,
+				$DTT_ID
+			); ?>
             <h4 class="datetime-tickets-heading"><?php esc_html_e('Assigned Tickets', 'event_espresso'); ?></h4>
 
             <ul class="datetime-tickets-list">
@@ -36,28 +36,28 @@ 
 
             <div class="add-datetime-ticket-container">
                 <h4 class="datetime-tickets-heading"><?php
-                    esc_html_e(
-                        'Add New Ticket',
-                        'event_espresso'
-                    ); ?></h4><?php echo $add_new_datetime_ticket_help_link; ?><br>
+					esc_html_e(
+						'Add New Ticket',
+						'event_espresso'
+					); ?></h4><?php echo $add_new_datetime_ticket_help_link; ?><br>
                 <table class="add-new-ticket-table">
                     <thead>
                     <tr valign="top">
                         <td><span class="ANT_TKT_name_label"><?php
-                                esc_html_e(
-                                    'Ticket Name',
-                                    'event_espresso'
-                                ); ?></span></td>
+								esc_html_e(
+									'Ticket Name',
+									'event_espresso'
+								); ?></span></td>
                         <td><span class="ANT_TKT_goes_on_sale_label"><?php
-                                esc_html_e(
-                                    'Sale Starts',
-                                    'event_espresso'
-                                ); ?></span></td>
+								esc_html_e(
+									'Sale Starts',
+									'event_espresso'
+								); ?></span></td>
                         <td><span class="ANT_TKT_sell_until_label"><?php
-                                esc_html_e(
-                                    'Sell Until',
-                                    'event_espresso'
-                                ); ?></span></td>
+								esc_html_e(
+									'Sell Until',
+									'event_espresso'
+								); ?></span></td>
                         <td><span class="ANT_TKT_price_label"><?php esc_html_e('Price', 'event_espresso'); ?></span>
                         </td>
                         <td><span class="ANT_TKT_qty_label"><?php esc_html_e('Qty', 'event_espresso'); ?></span></td>
@@ -107,12 +107,12 @@ 
                 <div class="ee-editor-footer-container">
                     <div class="ee-editor-id-container">
                         <span class="ee-item-id"><?php
-                            echo $DTT_ID
-                                ? sprintf(
-                                    esc_html__('Datetime ID: %d', 'event_espresso'),
-                                    $DTT_ID
-                                )
-                                : ''; ?></span>
+							echo $DTT_ID
+								? sprintf(
+									esc_html__('Datetime ID: %d', 'event_espresso'),
+									$DTT_ID
+								)
+								: ''; ?></span>
                     </div>
                     <div class="save-cancel-button-container">
                         <button data-context="short-ticket" data-datetime-row="<?php echo absint($dtt_row); ?>"

caffeinated/admin/new/pricing/templates/event_tickets_datetime_ticket_price_row.template.php

Braces +10 added lines, -4 removed lines

@@ -61,9 +61,12 @@ 
             <input type="text" size="1" class="edit-price-PRC_amount ee-numeric"
                    name="prices_archive[<?php echo absint($tkt_row); ?>][<?php echo absint($PRC_order); ?>][PRC_amount]"
                    value="<?php echo esc_attr($PRC_amount); ?>" disabled>
-        <?php else : ?>
+        <?php else {
+	: ?>
             <input type="text" size="1" class="edit-price-PRC_amount ee-numeric"
-                   name="<?php echo esc_attr($edit_prices_name); ?>[<?php echo absint($tkt_row); ?>][<?php echo absint($PRC_order); ?>][PRC_amount]"
+                   name="<?php echo esc_attr($edit_prices_name);
+}
+?>[<?php echo absint($tkt_row); ?>][<?php echo absint($PRC_order); ?>][PRC_amount]"
                    value="<?php echo esc_attr($PRC_amount); ?>">
         <?php endif; ?>
     </td>
@@ -74,8 +77,11 @@ 
     <td>
         <?php if ($disabled) : ?>
             <span class="ee-lock-icon"></span>
-        <?php else : ?>
-            <!-- <span class="gear-icon dashicons dashicons-admin-generic clickable" data-ticket-row="<?php echo absint($tkt_row); ?>" data-context="price" data-price-row="<?php echo absint($PRC_order); ?>"></span> -->
+        <?php else {
+	: ?>
+            <!-- <span class="gear-icon dashicons dashicons-admin-generic clickable" data-ticket-row="<?php echo absint($tkt_row);
+}
+?>" data-context="price" data-price-row="<?php echo absint($PRC_order); ?>"></span> -->
             <span class="trash-icon dashicons dashicons-post-trash clickable" data-ticket-row="<?php echo absint($tkt_row); ?>"
                   data-context="price" data-price-row="<?php echo absint($PRC_order); ?>"<?php echo $show_trash_icon; ?>></span>
             <button data-ticket-row="<?php echo absint($tkt_row); ?>" data-price-row="<?php echo absint($PRC_order); ?>"

caffeinated/admin/new/pricing/templates/event_tickets_datetime_dtt_tickets_list.template.php

Indentation +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 
 <li data-datetime-row="<?php echo absint($dtt_row); ?>" data-context="datetime-ticket" data-ticket-row="<?php echo absint($tkt_row); ?>"
     class="datetime-ticket clickable<?php echo $ticket_selected;
-    echo $tkt_status_class; ?>">
+	echo $tkt_status_class; ?>">
     <input type="checkbox" name="datetime_ticket[<?php echo absint($dtt_row); ?>][<?php echo absint($tkt_row); ?>]"
            class="datetime-ticket-checkbox" value="1"<?php echo $datetime_ticket_checked; ?>>
     <span class="ee-icon ee-icon-tickets ticket-list-ticket-name"><?php echo $TKT_name; ?></span>

caffeinated/admin/new/pricing/templates/event_tickets_datetime_ticket_row.template.php

Indentation +62 added lines, -62 removed lines

@@ -58,7 +58,7 @@ 
 ?>
 <tr valign="top" class="ee-ticket-sortable ticket-row <?php echo sanitize_html_class($ticket_archive_class);
 if (WP_DEBUG) {
-    echo ' ee-wp-debug';
+	echo ' ee-wp-debug';
 } ?>" id="display-ticketrow-<?php echo absint($tkt_row); ?>">
     <!--<td class="ee-tkt-order-field"><span class="dashicons dashicons-sort <?php echo sanitize_html_class($tkt_status_class); ?>">
     <input type="hidden" name="<?php echo esc_attr($edit_tickets_name); ?>[<?php echo absint($tkt_row); ?>][TKT_order]" class="edit-ticket-TKT_order" value ="<?php echo esc_attr($TKT_order); ?>" ></span></td>-->
@@ -167,9 +167,9 @@ 
                    class="edit-ticket-TKT_row" value="<?php echo absint($tkt_row); ?>">
 
             <!--<div class="total-price-container"><?php printf(
-                esc_html__('Total Final Price: %s', 'event_espresso'),
-                '<span class="ticket-price-amount">' . $TKT_price . '</span>'
-            ); ?> </div>-->
+				esc_html__('Total Final Price: %s', 'event_espresso'),
+				'<span class="ticket-price-amount">' . $TKT_price . '</span>'
+			); ?> </div>-->
             <textarea name="<?php echo esc_attr($edit_tickets_name); ?>[<?php echo absint($tkt_row); ?>][TKT_description]"
                       class="edit-ticket-TKT_description ee-full-textarea-inp"
                       placeholder="Ticket Description"><?php echo esc_textarea($TKT_description); ?></textarea>
@@ -183,20 +183,20 @@ 
                     <thead>
                     <tr valign="bottom">
                         <td><span class="TD_TKT_number_datetimes_label"><?php
-                                esc_html_e(
-                                    '# Datetimes',
-                                    'event_espresso'
-                                ); ?></span></td>
+								esc_html_e(
+									'# Datetimes',
+									'event_espresso'
+								); ?></span></td>
                         <td><span class="TD_TKT_min_qty_label"><?php
-                                esc_html_e(
-                                    'Minimum Quantity',
-                                    'event_espresso'
-                                ); ?></span></td>
+								esc_html_e(
+									'Minimum Quantity',
+									'event_espresso'
+								); ?></span></td>
                         <td><span class="TD_TKT_max_qty_label"><?php
-                                esc_html_e(
-                                    'Maximum Quantity',
-                                    'event_espresso'
-                                ); ?></span></td>
+								esc_html_e(
+									'Maximum Quantity',
+									'event_espresso'
+								); ?></span></td>
                     </tr>
                     </thead>
                     <tbody>
@@ -254,24 +254,24 @@ 
                     <input type="checkbox"
                            name="<?php echo esc_attr($edit_tickets_name); ?>[<?php echo absint($tkt_row); ?>][TKT_required]"
                            class="edit-ticket-TKT_required" value="1"<?php
-                            echo $TKT_required
-                                ? ' checked="checked"'
-                                : '';
-                            echo $disabled
-                                ? ' disabled'
-                                : ''; ?>>
+							echo $TKT_required
+								? ' checked="checked"'
+								: '';
+							echo $disabled
+								? ' disabled'
+								: ''; ?>>
                     <label for="edit-ticket-TKT_required"><?php
-                        esc_html_e(
-                            'This ticket is required (will appear first in frontend ticket lists).',
-                            'event_espresso'
-                        ); ?></label>
+						esc_html_e(
+							'This ticket is required (will appear first in frontend ticket lists).',
+							'event_espresso'
+						); ?></label>
                 </div>
                 <div class="ticket-is-taxable-container">
                     <?php if (! empty($tax_rows)) { ?>
                         <?php if ($disabled) : ?>
                             <?php
-                            $tax_value = ! empty($TKT_taxable) ? 1 : 0;
-                            ?>
+							$tax_value = ! empty($TKT_taxable) ? 1 : 0;
+							?>
                         <input class="TKT-taxable-checkbox" type="hidden"
                                name="<?php echo esc_attr($edit_tickets_name); ?>[<?php echo absint($tkt_row); ?>][TKT_taxable]"
                                value="<?php echo esc_attr($tax_value); ?>">
@@ -285,16 +285,16 @@ 
                                value="1"<?php echo $TKT_taxable; ?>>
                         <?php endif; ?>
                     <label for="edit-ticket-TKT_taxable-<?php echo absint($tkt_row); ?>"> <?php
-                        esc_html_e('This ticket is taxable.', 'event_espresso'); ?>
+						esc_html_e('This ticket is taxable.', 'event_espresso'); ?>
                     <?php } //end tax_rows check ?>
                 </div>
             </div>
             <div class="price-table-container">
                 <h4 class="tickets-heading price-table-info"<?php echo $show_price_modifier; ?>><?php
-                    esc_html_e(
-                        'Price Modifiers',
-                        'event_espresso'
-                    ); ?></h4>
+					esc_html_e(
+						'Price Modifiers',
+						'event_espresso'
+					); ?></h4>
                 <table class="price-table">
                     <thead class="price-table-info"<?php echo $show_price_modifier; ?>>
                     <tr>
@@ -314,10 +314,10 @@ 
                     <tr class="price-subtotal-row TKT-taxes-display"<?php echo $display_subtotal; ?>>
                         <td colspan="4" class="ee-numeric">
                             <span class="TKT-taxable-subtotal-label"><strong><?php
-                                    esc_html_e(
-                                        'Subtotal',
-                                        'event_espresso'
-                                    ); ?></strong></span>
+									esc_html_e(
+										'Subtotal',
+										'event_espresso'
+									); ?></strong></span>
                         </td>
                         <td class="ee-numeric">
                             <span
@@ -350,51 +350,51 @@ 
             <div style="clear:both"></div>
             <h4 class="tickets-heading"><?php esc_html_e('Event Datetimes', 'event_espresso'); ?></h4>
             <p><?php
-                esc_html_e(
-                    'This ticket will be usable (allow entrance) for the following selected event datetimes (click to select).  The "# Datetimes" amount (above) indicates how many of the assigned datetimes the ticket holder can gain access to:',
-                    'event_espresso'
-                ); ?></p>
+				esc_html_e(
+					'This ticket will be usable (allow entrance) for the following selected event datetimes (click to select).  The "# Datetimes" amount (above) indicates how many of the assigned datetimes the ticket holder can gain access to:',
+					'event_espresso'
+				); ?></p>
             <ul class="datetime-tickets-list">
                 <?php echo $ticket_datetimes_list; ?>
             </ul>
 
             <?php do_action(
-                'AHEE__event_tickets_datetime_ticket_row_template__advanced_details_end',
-                $tkt_row,
-                $TKT_ID
-            ); ?>
+				'AHEE__event_tickets_datetime_ticket_row_template__advanced_details_end',
+				$tkt_row,
+				$TKT_ID
+			); ?>
             <div class="ee-editor-footer-container">
                 <div class="ee-editor-id-container">
                     <span class="ee-item-id"><?php echo
-                        $TKT_ID
-                            ? sprintf(
-                                esc_html__('Ticket ID: %d', 'event_espresso'),
-                                $TKT_ID
-                            )
-                                             : ''; ?></span>
+						$TKT_ID
+							? sprintf(
+								esc_html__('Ticket ID: %d', 'event_espresso'),
+								$TKT_ID
+							)
+											 : ''; ?></span>
                 </div>
                 <div class="save-cancel-button-container">
                     <label for="edit-ticket-TKT_is_default_selector"><?php
-                        esc_html_e(
-                            'use this new ticket as a default ticket for any new events',
-                            'event_espresso'
-                        ); ?></label>
+						esc_html_e(
+							'use this new ticket as a default ticket for any new events',
+							'event_espresso'
+						); ?></label>
                     <input type="checkbox"
                            name="<?php echo esc_attr($edit_tickets_name); ?>[<?php echo absint($tkt_row); ?>][TKT_is_default_selector]"
                            class="edit-ticket-TKT_is_default_selector" value="1"<?php
-                            echo $disabled
-                                ? ' disabled'
-                                : ''; ?>>
+							echo $disabled
+								? ' disabled'
+								: ''; ?>>
                     <input type="hidden"
                            name="<?php echo esc_attr($edit_tickets_name); ?>[<?php echo absint($tkt_row); ?>][TKT_is_default]"
                            class="edit-ticket-TKT_is_default" value="<?php echo esc_attr($TKT_is_default); ?>">
                     <!--<button class="button-primary ee-save-button" data-context="ticket" data-ticket-row="<?php echo absint($tkt_row); ?>"><?php esc_html_e(
-                        'Update Ticket',
-                        'event_espresso'
-                    ); ?></button>-->
+						'Update Ticket',
+						'event_espresso'
+					); ?></button>-->
                     <button class="button-secondary ee-cancel-button" data-context="ticket"
                             data-ticket-row="<?php echo absint($tkt_row); ?>"><?php
-                                    esc_html_e('Close', 'event_espresso'); ?></button>
+									esc_html_e('Close', 'event_espresso'); ?></button>
                 </div>
             </div>
             <!-- these hidden inputs are for tracking changes in dtts attached to tickets during a js session -->

Spacing +2 added lines, -2 removed lines

@@ -168,7 +168,7 @@ 
 
             <!--<div class="total-price-container"><?php printf(
                 esc_html__('Total Final Price: %s', 'event_espresso'),
-                '<span class="ticket-price-amount">' . $TKT_price . '</span>'
+                '<span class="ticket-price-amount">'.$TKT_price.'</span>'
             ); ?> </div>-->
             <textarea name="<?php echo esc_attr($edit_tickets_name); ?>[<?php echo absint($tkt_row); ?>][TKT_description]"
                       class="edit-ticket-TKT_description ee-full-textarea-inp"
@@ -267,7 +267,7 @@ 
                         ); ?></label>
                 </div>
                 <div class="ticket-is-taxable-container">
-                    <?php if (! empty($tax_rows)) { ?>
+                    <?php if ( ! empty($tax_rows)) { ?>
                         <?php if ($disabled) : ?>
                             <?php
                             $tax_value = ! empty($TKT_taxable) ? 1 : 0;

Braces +40 added lines, -16 removed lines

@@ -79,8 +79,11 @@ 
                    class="edit-ticket-TKT_start_date ee-text-inp" value="<?php echo esc_attr($TKT_start_date); ?>">
             <input type="text" name="archived_ticket[TKT_start_date]" class="edit-ticket-TKT_start_date ee-text-inp"
                    value="<?php echo esc_attr($TKT_start_date); ?>" disabled>
-        <?php else : ?>
-            <input id="edit-ticket-TKT_start_date-<?php echo absint($tkt_row); ?>" type="text"
+        <?php else {
+	: ?>
+            <input id="edit-ticket-TKT_start_date-<?php echo absint($tkt_row);
+}
+?>" type="text"
                    name="<?php echo esc_attr($edit_tickets_name); ?>[<?php echo absint($tkt_row); ?>][TKT_start_date]"
                    class="edit-ticket-TKT_start_date ee-text-inp ee-datepicker" value="<?php echo esc_attr($TKT_start_date); ?>"
                    data-context="start-ticket" data-date-field-context="#display-ticketrow-<?php echo absint($tkt_row); ?>"
@@ -94,8 +97,11 @@ 
                    class="edit-ticket-TKT_end_date ee-text-inp" value="<?php echo esc_attr($TKT_end_date); ?>">
             <input type="text" name="archived_ticket[TKT_end_date]" class="edit-ticket-TKT_end_date ee-text-inp"
                    value="<?php echo esc_attr($TKT_end_date); ?>" disabled>
-        <?php else : ?>
-            <input id="edit-ticket-TKT_end_date-<?php echo absint($tkt_row); ?>" type="text"
+        <?php else {
+	: ?>
+            <input id="edit-ticket-TKT_end_date-<?php echo absint($tkt_row);
+}
+?>" type="text"
                    name="<?php echo esc_attr($edit_tickets_name); ?>[<?php echo absint($tkt_row); ?>][TKT_end_date]"
                    class="edit-ticket-TKT_end_date ee-text-inp ee-datepicker" value="<?php echo esc_attr($TKT_end_date); ?>"
                    data-context="end-ticket" data-date-field-context="#display-ticketrow-<?php echo absint($tkt_row); ?>"
@@ -111,8 +117,11 @@ 
             <input type="text" name="archived_ticket[<?php echo absint($tkt_row); ?>][TKT_base_price]"
                    class="edit-ticket-TKT_base_price ee-small-text-inp edit-price-PRC_amount ee-numeric"
                    value="<?php echo esc_attr($TKT_base_price); ?>" disabled>
-        <?php else : ?>
-            <input id="edit-ticket-TKT_base_price-<?php echo absint($tkt_row); ?>" type="text"
+        <?php else {
+	: ?>
+            <input id="edit-ticket-TKT_base_price-<?php echo absint($tkt_row);
+}
+?>" type="text"
                    name="<?php echo esc_attr($edit_tickets_name); ?>[<?php echo absint($tkt_row); ?>][TKT_base_price]"
                    class="edit-ticket-TKT_base_price ee-small-text-inp edit-price-PRC_amount ee-numeric"
                    value="<?php echo esc_attr($TKT_base_price); ?>">
@@ -129,8 +138,11 @@ 
             <input type="text" class="edit-ticket-TKT_qty ee-small-text-inp ee-numeric"
                    name="archived_ticket[<?php echo absint($tkt_row); ?>][TKT_qty]" value="<?php echo esc_attr($TKT_qty_for_input); ?>"
                    disabled>
-        <?php else : ?>
-            <input type="text" id="edit-ticket-TKT_qty-<?php echo absint($tkt_row); ?>"
+        <?php else {
+	: ?>
+            <input type="text" id="edit-ticket-TKT_qty-<?php echo absint($tkt_row);
+}
+?>"
                    class="edit-ticket-TKT_qty ee-small-text-inp ee-numeric"
                    name="<?php echo esc_attr($edit_tickets_name); ?>[<?php echo absint($tkt_row); ?>][TKT_qty]"
                    value="<?php echo esc_attr($TKT_qty_for_input); ?>">
@@ -209,9 +221,12 @@ 
                                 <input type="text" class="edit-ticket-TKT_uses ee-small-text-inp ee-numeric"
                                        name="archived_ticket[<?php echo absint($tkt_row); ?>][TKT_uses]"
                                        value="<?php echo esc_attr($TKT_uses); ?>" disabled>
-                            <?php else : ?>
+                            <?php else {
+	: ?>
                                 <input type="text" class="edit-ticket-TKT_uses ee-small-text-inp ee-numeric"
-                                       name="<?php echo esc_attr($edit_tickets_name); ?>[<?php echo absint($tkt_row); ?>][TKT_uses]"
+                                       name="<?php echo esc_attr($edit_tickets_name);
+}
+?>[<?php echo absint($tkt_row); ?>][TKT_uses]"
                                        value="<?php echo esc_attr($TKT_uses); ?>">
                             <?php endif; ?>
                         </td>
@@ -223,9 +238,12 @@ 
                                 <input type="text" class="edit-ticket-TKT_min ee-small-text-inp ee-numeric"
                                        name="archived_ticket[<?php echo absint($tkt_row); ?>][TKT_min]"
                                        value="<?php echo esc_attr($TKT_min); ?>" disabled>
-                            <?php else : ?>
+                            <?php else {
+	: ?>
                                 <input type="text" class="edit-ticket-TKT_min ee-small-text-inp ee-numeric"
-                                       name="<?php echo esc_attr($edit_tickets_name); ?>[<?php echo absint($tkt_row); ?>][TKT_min]"
+                                       name="<?php echo esc_attr($edit_tickets_name);
+}
+?>[<?php echo absint($tkt_row); ?>][TKT_min]"
                                        value="<?php echo esc_attr($TKT_min); ?>">
                             <?php endif; ?>
                         </td>
@@ -237,9 +255,12 @@ 
                                 <input type="text" class="edit-ticket-TKT_max ee-small-text-inp ee-numeric"
                                        name="<?php echo esc_attr($edit_tickets_name); ?>[<?php echo absint($tkt_row); ?>][TKT_max]"
                                        value="<?php echo esc_attr($TKT_max); ?>" disabled>
-                            <?php else : ?>
+                            <?php else {
+	: ?>
                                 <input type="text" class="edit-ticket-TKT_max ee-small-text-inp ee-numeric"
-                                       name="<?php echo esc_attr($edit_tickets_name); ?>[<?php echo absint($tkt_row); ?>][TKT_max]"
+                                       name="<?php echo esc_attr($edit_tickets_name);
+}
+?>[<?php echo absint($tkt_row); ?>][TKT_max]"
                                        value="<?php echo esc_attr($TKT_max); ?>">
                             <?php endif; ?>
                         </td>
@@ -278,8 +299,11 @@ 
                         <input class="TKT-taxable-checkbox" id="edit-ticket-TKT_taxable-<?php echo absint($tkt_row); ?>"
                                type="checkbox" name="archived_ticket[<?php echo absint($tkt_row); ?>][TKT_taxable]"
                                value="1"<?php echo $TKT_taxable; ?> disabled>
-                        <?php else : ?>
-                        <input class="TKT-taxable-checkbox" id="edit-ticket-TKT_taxable-<?php echo absint($tkt_row); ?>"
+                        <?php else {
+	: ?>
+                        <input class="TKT-taxable-checkbox" id="edit-ticket-TKT_taxable-<?php echo absint($tkt_row);
+}
+?>"
                                type="checkbox"
                                name="<?php echo esc_attr($edit_tickets_name); ?>[<?php echo absint($tkt_row); ?>][TKT_taxable]"
                                value="1"<?php echo $TKT_taxable; ?>>

caffeinated/admin/extend/registration_form/templates/question_groups_main_meta_box.template.php

Indentation +84 added lines, -84 removed lines

@@ -13,8 +13,8 @@ 
 /* @var EE_Question[] $all_questions */
 assert(isset($all_questions) && (empty($all_questions) || is_array($all_questions)));// list of unused questions
 foreach ($all_questions as $unused_question) {
-    assert($unused_question);
-    assert($unused_question instanceof EE_Question);
+	assert($unused_question);
+	assert($unused_question instanceof EE_Question);
 }
 /* @var array $values . Array of arrays, where each sub-array contains 2 keys: 'id' (internal value) and 'name' (label for displaying) */
 assert(is_array($values));
@@ -33,8 +33,8 @@ 
             <th>
                 <label for="QSG_name">
                     <?php esc_html_e('Group Name', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link(
-                        'group_name_info'
-                    ); ?>
+						'group_name_info'
+					); ?>
                 </label>
             </th>
             <td>
@@ -48,8 +48,8 @@ 
             <th>
                 <label for="QSG_identifier">
                     <?php esc_html_e('Group Identifier', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link(
-                        'group_identifier_info'
-                    ); ?>
+						'group_identifier_info'
+					); ?>
                 </label>
             </th>
             <td>
@@ -68,8 +68,8 @@ 
             <th>
                 <label for="QSG_desc">
                     <?php esc_html_e('Description', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link(
-                        'group_description_info'
-                    ); ?>
+						'group_description_info'
+					); ?>
                 </label>
             </th>
             <td>
@@ -82,8 +82,8 @@ 
             <th>
                 <label for="QSG_order">
                     <?php esc_html_e('Question Group Order', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link(
-                        'group_order_info'
-                    ); ?>
+						'group_order_info'
+					); ?>
                 </label>
             </th>
             <td>
@@ -96,17 +96,17 @@ 
             <th>
                 <label>
                     <?php esc_html_e('Show Name', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link(
-                        'show_group_name_info'
-                    ); ?>
+						'show_group_name_info'
+					); ?>
                 </label>
             </th>
             <td>
                 <label for="QSG_show_group_name">
                     <?php echo EEH_Form_Fields::select_input(
-                        'QSG_show_group_name',
-                        $values,
-                        $question_group->show_group_name()
-                    ); ?>
+						'QSG_show_group_name',
+						$values,
+						$question_group->show_group_name()
+					); ?>
                     <p class="description"><?php esc_html_e('Show Group Name on Registration Page?', 'event_espresso'); ?></p>
                 </label>
             </td>
@@ -116,20 +116,20 @@ 
             <th>
                 <label>
                     <?php esc_html_e(' Show Description', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link(
-                        'show_group_description_info'
-                    ); ?>
+						'show_group_description_info'
+					); ?>
                 </label>
             </th>
             <td>
                 <label for="QSG_show_group_order">
                     <?php echo EEH_Form_Fields::select_input(
-                        'QSG_show_group_desc',
-                        $values,
-                        $question_group->show_group_desc()
-                    ); ?>
+						'QSG_show_group_desc',
+						$values,
+						$question_group->show_group_desc()
+					); ?>
                     <p class="description"><?php
-                        esc_html_e(' Show Group Description on Registration Page?', 'event_espresso');
-                    ?></p>
+						esc_html_e(' Show Group Description on Registration Page?', 'event_espresso');
+					?></p>
                 </label>
                 <input type="hidden" name="QSG_system" value="<?php echo esc_attr($question_group->system_group()); ?>">
             </td>
@@ -145,85 +145,85 @@ 
     <div class="form-table question-group-questions inside">
         <div class="padding">
             <p><span class="description"><?php
-                    esc_html_e(
-                        'Select which questions should be shown in this group by checking or unchecking boxes. You can drag and drop questions to reorder them. Your changes will be updated when you save.',
-                        'event_espresso'
-                    ); ?></span></p>
+					esc_html_e(
+						'Select which questions should be shown in this group by checking or unchecking boxes. You can drag and drop questions to reorder them. Your changes will be updated when you save.',
+						'event_espresso'
+					); ?></span></p>
             <div>
                 <ul class="question-list-sortable">
                     <?php
-                    $question_order = 0;
-                    $question_group_questions = $question_group->questions();
-                    foreach ($all_questions as $question_ID => $question) {
-                        if ($question instanceof EE_Question) {
-                            /*@var $question EE_Question*/
-                            $checked = isset($question_group_questions[ $question_ID ]) ? ' checked="checked"' : '';
-                            // disable questions from the personal information question group
-                            // is it required in the current question group? if so don't allow admins to remove it
-                            $disabled = in_array(
-                                $question->system_ID(),
-                                EEM_Question::instance()->required_system_questions_in_system_question_group(
-                                    $QSG_system
-                                )
-                            ) ? 'disabled="disabled"' : '';
-                            // limit where system questions can appear
-                            if (
-                                $question->system_ID() &&
-                                ! in_array(
-                                    $question->system_ID(),
-                                    EEM_Question::instance()->allowed_system_questions_in_system_question_group(
-                                        $QSG_system
-                                    )
-                                )
-                            ) {
-                                continue; // skip over system question not assigned to this group except for the address system group cause we want the address questions to display even if they aren't selected (but still not show the personal system questions).  The third condition checks if we're displaying a non system question group and the question is a system question, then we skip because for non-system question groups we only want to show non-system questions.
-                            }
-                            ?>
+					$question_order = 0;
+					$question_group_questions = $question_group->questions();
+					foreach ($all_questions as $question_ID => $question) {
+						if ($question instanceof EE_Question) {
+							/*@var $question EE_Question*/
+							$checked = isset($question_group_questions[ $question_ID ]) ? ' checked="checked"' : '';
+							// disable questions from the personal information question group
+							// is it required in the current question group? if so don't allow admins to remove it
+							$disabled = in_array(
+								$question->system_ID(),
+								EEM_Question::instance()->required_system_questions_in_system_question_group(
+									$QSG_system
+								)
+							) ? 'disabled="disabled"' : '';
+							// limit where system questions can appear
+							if (
+								$question->system_ID() &&
+								! in_array(
+									$question->system_ID(),
+									EEM_Question::instance()->allowed_system_questions_in_system_question_group(
+										$QSG_system
+									)
+								)
+							) {
+								continue; // skip over system question not assigned to this group except for the address system group cause we want the address questions to display even if they aren't selected (but still not show the personal system questions).  The third condition checks if we're displaying a non system question group and the question is a system question, then we skip because for non-system question groups we only want to show non-system questions.
+							}
+							?>
                             <li class="ee-question-sortable">
                                 <label for="question-<?php echo absint($question_ID); ?>">
                                     <input type="checkbox" name="questions[<?php echo absint($question_ID); ?>]"
                                            id="question-<?php echo absint($question_ID); ?>"
                                            value="<?php echo absint($question_ID); ?>"<?php echo $disabled; ?><?php echo $checked; ?>/>
                                     <span class="question-text"><?php
-                                        echo trim($question->display_text())
-                                             . (95 <= strlen(trim($question->display_text()))
-                                                ? "&hellip;"
-                                                : '');
-                                                                ?>
+										echo trim($question->display_text())
+											 . (95 <= strlen(trim($question->display_text()))
+												? "&hellip;"
+												: '');
+																?>
                                     </span>
                                     <input class="question-group-QGQ_order" type="hidden"
                                            name="question_orders[<?php echo absint($question_ID); ?>]"
                                            value="<?php echo esc_attr($question_order); ?>">
                                 </label>
                                 <?php
-                                if (
-                                    EE_Registry::instance()->CAP->current_user_can(
-                                        'ee_edit_question',
-                                        'espresso_registration_form_edit_question',
-                                        $question->ID()
-                                    )
-                                ) {
-                                    $edit_query_args = array(
-                                        'action' => 'edit_question',
-                                        'QST_ID' => $question->ID(),
-                                    );
-                                    $edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EE_FORMS_ADMIN_URL);
+								if (
+									EE_Registry::instance()->CAP->current_user_can(
+										'ee_edit_question',
+										'espresso_registration_form_edit_question',
+										$question->ID()
+									)
+								) {
+									$edit_query_args = array(
+										'action' => 'edit_question',
+										'QST_ID' => $question->ID(),
+									);
+									$edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EE_FORMS_ADMIN_URL);
 
-                                    echo '<a href="' . $edit_link . '" target="_blank" title="' .
-                                        sprintf(
-                                            esc_attr__('Edit %s', 'event_espresso'),
-                                            $question->admin_label()
-                                        )
-                                        . '"><span class="dashicons dashicons-edit"></span>
+									echo '<a href="' . $edit_link . '" target="_blank" title="' .
+										sprintf(
+											esc_attr__('Edit %s', 'event_espresso'),
+											$question->admin_label()
+										)
+										. '"><span class="dashicons dashicons-edit"></span>
                                         </a>';
-                                }
-                                ?>
+								}
+								?>
                             </li>
                             <?php
-                            $question_order++;
-                        }
-                    }
-                    ?>
+							$question_order++;
+						}
+					}
+					?>
                 </ul>
             </div>
         </div>

Spacing +4 added lines, -4 removed lines

@@ -11,7 +11,7 @@ 
 assert($question_group);
 assert($question_group instanceof EE_Question_Group);
 /* @var EE_Question[] $all_questions */
-assert(isset($all_questions) && (empty($all_questions) || is_array($all_questions)));// list of unused questions
+assert(isset($all_questions) && (empty($all_questions) || is_array($all_questions))); // list of unused questions
 foreach ($all_questions as $unused_question) {
     assert($unused_question);
     assert($unused_question instanceof EE_Question);
@@ -56,7 +56,7 @@ 
                 <input id="QSG_identifier" name="QSG_identifier<?php echo absint($id); ?>"
                        value="<?php echo esc_attr($question_group->get_f('QSG_identifier')); ?>" type="text"
                        class="regular-text"<?php echo $disabled; ?>>
-                <?php if (! empty($QSG_system)) { ?>
+                <?php if ( ! empty($QSG_system)) { ?>
                     <p><span class="description" style="color:#D54E21;">
                             <?php esc_html_e('System question group! This field cannot be changed.', 'event_espresso') ?>
                     </span><br/></p>
@@ -157,7 +157,7 @@ 
                     foreach ($all_questions as $question_ID => $question) {
                         if ($question instanceof EE_Question) {
                             /*@var $question EE_Question*/
-                            $checked = isset($question_group_questions[ $question_ID ]) ? ' checked="checked"' : '';
+                            $checked = isset($question_group_questions[$question_ID]) ? ' checked="checked"' : '';
                             // disable questions from the personal information question group
                             // is it required in the current question group? if so don't allow admins to remove it
                             $disabled = in_array(
@@ -209,7 +209,7 @@ 
                                     );
                                     $edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EE_FORMS_ADMIN_URL);
 
-                                    echo '<a href="' . $edit_link . '" target="_blank" title="' .
+                                    echo '<a href="'.$edit_link.'" target="_blank" title="'.
                                         sprintf(
                                             esc_attr__('Edit %s', 'event_espresso'),
                                             $question->admin_label()

caffeinated/admin/extend/registration_form/templates/questions_in_group_meta_box.template.php

Indentation +6 added lines, -6 removed lines

@@ -3,17 +3,17 @@
 assert($question_group instanceof EE_Question_Group);
 assert(isset($all_questions) && (empty($all_questions) || is_array($all_questions)));// list of unused questions
 foreach ($all_questions as $question_option) {
-    assert($question_option);
-    assert($question_option instanceof EE_Question);
+	assert($question_option);
+	assert($question_option instanceof EE_Question);
 }
 ?>
 <h4><?php esc_html_e('Check off all questions that you wish to appear in this group.', 'event_espresso'); ?></h4>
 <ul>
     <?php
-    foreach ($all_questions as $question_ID => $question) {
-        /*@var $question EE_Question*/
-        $checked = array_key_exists($question_ID, $question_group->questions()) ? ' checked="checked"' : '';
-        ?>
+	foreach ($all_questions as $question_ID => $question) {
+		/*@var $question EE_Question*/
+		$checked = array_key_exists($question_ID, $question_group->questions()) ? ' checked="checked"' : '';
+		?>
         <li>
             <label for="question-<?php echo absint($question_ID); ?>">
                 <input type="checkbox" name="questions[<?php echo absint($question_ID); ?>]"

admin_pages/maintenance/templates/ee_system_stati_page.template.php

Indentation +61 added lines, -61 removed lines

@@ -18,38 +18,38 @@ 
  */
 function ee_recurse_into_array_for_display($data, $depth = 0, $td = true)
 {
-    if (is_object($data) || $data instanceof __PHP_Incomplete_Class) {
-        // is_object($incomplete_class) actually returns false, hence why we check for it
-        $data = json_decode(json_encode($data), true);
-    }
-    if (empty($data)) {
-        return;
-    }
-    if (is_array($data)) {
-        $depth++;
-        ksort($data, SORT_NATURAL | SORT_FLAG_CASE);
-        if (EEH_Array::is_associative_array($data)) { ?>
+	if (is_object($data) || $data instanceof __PHP_Incomplete_Class) {
+		// is_object($incomplete_class) actually returns false, hence why we check for it
+		$data = json_decode(json_encode($data), true);
+	}
+	if (empty($data)) {
+		return;
+	}
+	if (is_array($data)) {
+		$depth++;
+		ksort($data, SORT_NATURAL | SORT_FLAG_CASE);
+		if (EEH_Array::is_associative_array($data)) { ?>
             <table class='ee-system-stati ee-system-stati-<?php echo absint($depth); ?>'>
                 <tbody>
                     <?php foreach ($data as $data_key => $data_value) {
-                        // if the value is a single element array with no key,
-                        // and the value is a primitive (not an array, object, etc.)
-                        if (
-                            is_array($data_value)
-                            && count($data_value) === 1
-                            && empty(key($data_value))
-                            && is_scalar(reset($data_value))
-                        ) {
-                            ?>
+						// if the value is a single element array with no key,
+						// and the value is a primitive (not an array, object, etc.)
+						if (
+							is_array($data_value)
+							&& count($data_value) === 1
+							&& empty(key($data_value))
+							&& is_scalar(reset($data_value))
+						) {
+							?>
                             <tr>
                                 <td class="ee-system-stati-value" colspan="2">
                                     <?php echo esc_html(reset($data_value)); ?>
                                 </td>
                             </tr>
                             <?php
-                            continue;
-                        }
-                        ?>
+							continue;
+						}
+						?>
                         <tr>
                             <td class='ee-system-stati-key'>
                                 <span class="ee-system-stati-label">
@@ -64,31 +64,31 @@ 
                             <?php if (is_scalar($data_value)) { ?>
                                 <?php ee_recurse_into_array_for_display($data_value, $depth); ?>
                             <?php } else {
-                                if (is_array($data_value) && count($data_value) === 1) {
-                                    // verify that values have been set
-                                    $keys_only = empty(
-                                        array_filter(
-                                            array_values($data_value),
-                                            function ($v) {
-                                                return $v !== null && (is_array($v) || trim($v) !== '');
-                                            }
-                                        )
-                                    );
-                                    // if the array only consists of keys (no values)
-                                    if ($keys_only) {
-                                        // then use keys for values
-                                        $data_value = array_keys($data_value);
-                                        // but if there is only one value now
-                                        if (count($data_value) === 1) {
-                                            // then pass that single value back into this function
-                                            // this prevents extra empty layers of nothing being added to the output
-                                            ee_recurse_into_array_for_display(reset($data_value), $depth);
-                                            // need to finish the row off though
-                                            echo '</tr>';
-                                            continue;
-                                        }
-                                    }
-                                } ?>
+								if (is_array($data_value) && count($data_value) === 1) {
+									// verify that values have been set
+									$keys_only = empty(
+										array_filter(
+											array_values($data_value),
+											function ($v) {
+												return $v !== null && (is_array($v) || trim($v) !== '');
+											}
+										)
+									);
+									// if the array only consists of keys (no values)
+									if ($keys_only) {
+										// then use keys for values
+										$data_value = array_keys($data_value);
+										// but if there is only one value now
+										if (count($data_value) === 1) {
+											// then pass that single value back into this function
+											// this prevents extra empty layers of nothing being added to the output
+											ee_recurse_into_array_for_display(reset($data_value), $depth);
+											// need to finish the row off though
+											echo '</tr>';
+											continue;
+										}
+									}
+								} ?>
                                 <td class="ee-system-stati-sub-values">
                                     <?php ee_recurse_into_array_for_display($data_value, $depth); ?>
                                 </td>
@@ -106,19 +106,19 @@ 
                 <?php } ?>
             </ul>
         <?php } else {
-            // there's no key (label) and there's only one value,
-            // so let's just pass that value back into this function,
-            // but reset the depth back to where it was.
-            // this prevents extra empty layers of nothing being added to the output
-            $depth--;
-            ee_recurse_into_array_for_display(reset($data), $depth, false);
-        }
-    } else {
-        echo $td ? '<td class="ee-system-stati-value">' : '';
-        // simple value
-        echo $data;
-        echo $td ? '</td>' : '';
-    }
+			// there's no key (label) and there's only one value,
+			// so let's just pass that value back into this function,
+			// but reset the depth back to where it was.
+			// this prevents extra empty layers of nothing being added to the output
+			$depth--;
+			ee_recurse_into_array_for_display(reset($data), $depth, false);
+		}
+	} else {
+		echo $td ? '<td class="ee-system-stati-value">' : '';
+		// simple value
+		echo $data;
+		echo $td ? '</td>' : '';
+	}
 }
 
 ?>