eventespresso / event-espresso-core

core/domain/entities/contexts/Context.php

Indentation +47 added lines, -47 removed lines

@@ -14,62 +14,62 @@
 class Context implements ContextInterface
 {
 
-    /**
-     * @var string $slug
-     */
-    private $slug;
+	/**
+	 * @var string $slug
+	 */
+	private $slug;
 
-    /**
-     * @var string $description
-     */
-    private $description;
+	/**
+	 * @var string $description
+	 */
+	private $description;
 
 
-    /**
-     * Context constructor.
-     *
-     * @param string $slug
-     * @param string $description
-     */
-    public function __construct($slug, $description)
-    {
-        $this->setSlug($slug);
-        $this->setDescription($description);
-    }
+	/**
+	 * Context constructor.
+	 *
+	 * @param string $slug
+	 * @param string $description
+	 */
+	public function __construct($slug, $description)
+	{
+		$this->setSlug($slug);
+		$this->setDescription($description);
+	}
 
 
-    /**
-     * @return string
-     */
-    public function slug()
-    {
-        return $this->slug;
-    }
+	/**
+	 * @return string
+	 */
+	public function slug()
+	{
+		return $this->slug;
+	}
 
 
-    /**
-     * @param string $slug
-     */
-    private function setSlug($slug)
-    {
-        $this->slug = sanitize_key($slug);
-    }
+	/**
+	 * @param string $slug
+	 */
+	private function setSlug($slug)
+	{
+		$this->slug = sanitize_key($slug);
+	}
 
 
-    /**
-     * @return string
-     */
-    public function description()
-    {
-        return $this->description;
-    }
+	/**
+	 * @return string
+	 */
+	public function description()
+	{
+		return $this->description;
+	}
 
 
-    /**
-     * @param string $description
-     */
-    private function setDescription($description)
-    {
-        $this->description = sanitize_text_field($description);
-    }
+	/**
+	 * @param string $description
+	 */
+	private function setDescription($description)
+	{
+		$this->description = sanitize_text_field($description);
+	}
 }

core/domain/entities/custom_post_types/CustomTaxonomyTerm.php

Indentation +46 added lines, -46 removed lines

@@ -13,60 +13,60 @@
 class CustomTaxonomyTerm
 {
 
-    /**
-     * @var string $taxonomy_slug
-     */
-    public $taxonomy_slug;
+	/**
+	 * @var string $taxonomy_slug
+	 */
+	public $taxonomy_slug;
 
-    /**
-     * @var string $term_slug
-     */
-    public $term_slug;
+	/**
+	 * @var string $term_slug
+	 */
+	public $term_slug;
 
-    /**
-     * @var array $custom_post_type_slugs
-     */
-    public $custom_post_type_slugs;
+	/**
+	 * @var array $custom_post_type_slugs
+	 */
+	public $custom_post_type_slugs;
 
 
-    /**
-     * CustomTaxonomyTerm constructor.
-     *
-     * @param string $taxonomy_slug
-     * @param string $term_slug
-     * @param array  $custom_post_type_slugs
-     */
-    public function __construct($taxonomy_slug, $term_slug, array $custom_post_type_slugs = array())
-    {
-        $this->taxonomy_slug = $taxonomy_slug;
-        $this->term_slug = $term_slug;
-        $this->custom_post_type_slugs = $custom_post_type_slugs;
-    }
+	/**
+	 * CustomTaxonomyTerm constructor.
+	 *
+	 * @param string $taxonomy_slug
+	 * @param string $term_slug
+	 * @param array  $custom_post_type_slugs
+	 */
+	public function __construct($taxonomy_slug, $term_slug, array $custom_post_type_slugs = array())
+	{
+		$this->taxonomy_slug = $taxonomy_slug;
+		$this->term_slug = $term_slug;
+		$this->custom_post_type_slugs = $custom_post_type_slugs;
+	}
 
 
-    /**
-     * @return string
-     */
-    public function taxonomySlug()
-    {
-        return $this->taxonomy_slug;
-    }
+	/**
+	 * @return string
+	 */
+	public function taxonomySlug()
+	{
+		return $this->taxonomy_slug;
+	}
 
 
-    /**
-     * @return string
-     */
-    public function termSlug()
-    {
-        return $this->term_slug;
-    }
+	/**
+	 * @return string
+	 */
+	public function termSlug()
+	{
+		return $this->term_slug;
+	}
 
 
-    /**
-     * @return array
-     */
-    public function customPostTypeSlugs()
-    {
-        return $this->custom_post_type_slugs;
-    }
+	/**
+	 * @return array
+	 */
+	public function customPostTypeSlugs()
+	{
+		return $this->custom_post_type_slugs;
+	}
 }

core/domain/entities/custom_post_types/CustomPostTypeDefinitions.php

Indentation +263 added lines, -263 removed lines

@@ -17,287 +17,287 @@
 class CustomPostTypeDefinitions
 {
 
-    /**
-     * @var EE_Core_Config
-     */
-    public $core_config;
+	/**
+	 * @var EE_Core_Config
+	 */
+	public $core_config;
 
-    /**
-     * @var array $custom_post_types
-     */
-    private $custom_post_types;
+	/**
+	 * @var array $custom_post_types
+	 */
+	private $custom_post_types;
 
-    /**
-     * @var LoaderInterface $loader
-     */
-    private $loader;
+	/**
+	 * @var LoaderInterface $loader
+	 */
+	private $loader;
 
 
-    /**
-     * EspressoCustomPostTypeDefinitions constructor.
-     *
-     * @param EE_Core_Config  $core_config
-     * @param LoaderInterface $loader
-     */
-    public function __construct(EE_Core_Config $core_config, LoaderInterface $loader)
-    {
-        $this->core_config = $core_config;
-        $this->loader = $loader;
-        $this->setDefinitions();
-    }
+	/**
+	 * EspressoCustomPostTypeDefinitions constructor.
+	 *
+	 * @param EE_Core_Config  $core_config
+	 * @param LoaderInterface $loader
+	 */
+	public function __construct(EE_Core_Config $core_config, LoaderInterface $loader)
+	{
+		$this->core_config = $core_config;
+		$this->loader = $loader;
+		$this->setDefinitions();
+	}
 
 
-    /**
-     * defines Espresso Custom Post Types
-     * NOTE the ['args']['page_templates'] array index is something specific to our CPTs
-     * and not part of the WP custom post type api.
-     *
-     * @return void
-     */
-    private function setDefinitions()
-    {
-        $this->custom_post_types = array(
-            'espresso_events'    => array(
-                'singular_name' => esc_html__('Event', 'event_espresso'),
-                'plural_name'   => esc_html__('Events', 'event_espresso'),
-                'singular_slug' => esc_html__('event', 'event_espresso'),
-                'plural_slug'   => $this->core_config->event_cpt_slug,
-                'class_name'    => 'EE_Event',
-                'model_name'    => 'EEM_Event',
-                'args'          => array(
-                    'public'            => true,
-                    'show_in_nav_menus' => true,
-                    'capability_type'   => 'event',
-                    'capabilities'      => array(
-                        'edit_post'              => 'ee_edit_event',
-                        'read_post'              => 'ee_read_event',
-                        'delete_post'            => 'ee_delete_event',
-                        'edit_posts'             => 'ee_edit_events',
-                        'edit_others_posts'      => 'ee_edit_others_events',
-                        'publish_posts'          => 'ee_publish_events',
-                        'read_private_posts'     => 'ee_read_private_events',
-                        'delete_posts'           => 'ee_delete_events',
-                        'delete_private_posts'   => 'ee_delete_private_events',
-                        'delete_published_posts' => 'ee_delete_published_events',
-                        'delete_others_posts'    => 'ee_delete_others_events',
-                        'edit_private_posts'     => 'ee_edit_private_events',
-                        'edit_published_posts'   => 'ee_edit_published_events',
-                    ),
-                    'taxonomies'        => array(
-                        'espresso_event_categories',
-                        'espresso_event_type',
-                        'post_tag',
-                    ),
-                    'page_templates'    => true,
-                ),
-            ),
-            'espresso_venues'    => array(
-                'singular_name' => esc_html__('Venue', 'event_espresso'),
-                'plural_name'   => esc_html__('Venues', 'event_espresso'),
-                'singular_slug' => esc_html__('venue', 'event_espresso'),
-                'plural_slug'   => esc_html__('venues', 'event_espresso'),
-                'class_name'    => 'EE_Venue',
-                'model_name'    => 'EEM_Venue',
-                'args'          => array(
-                    'public'            => true,
-                    'show_in_nav_menus' => false, // by default this doesn't show for decaf,
-                    'capability_type'   => 'venue',
-                    'capabilities'      => array(
-                        'edit_post'              => 'ee_edit_venue',
-                        'read_post'              => 'ee_read_venue',
-                        'delete_post'            => 'ee_delete_venue',
-                        'edit_posts'             => 'ee_edit_venues',
-                        'edit_others_posts'      => 'ee_edit_others_venues',
-                        'publish_posts'          => 'ee_publish_venues',
-                        'read_private_posts'     => 'ee_read_private_venues',
-                        'delete_posts'           => 'ee_delete_venues',
-                        'delete_private_posts'   => 'ee_delete_private_venues',
-                        'delete_published_posts' => 'ee_delete_published_venues',
-                        'delete_others_posts'    => 'ee_edit_others_venues',
-                        'edit_private_posts'     => 'ee_edit_private_venues',
-                        'edit_published_posts'   => 'ee_edit_published_venues',
-                    ),
-                    'taxonomies'        => array(
-                        'espresso_venue_categories',
-                        'post_tag',
-                    ),
-                    'page_templates'    => true,
-                ),
-            ),
-            'espresso_attendees' => array(
-                'singular_name' => esc_html__('Contact', 'event_espresso'),
-                'plural_name'   => esc_html__('Contacts', 'event_espresso'),
-                'singular_slug' => esc_html__('contact', 'event_espresso'),
-                'plural_slug'   => esc_html__('contacts', 'event_espresso'),
-                'class_name'    => 'EE_Attendee',
-                'model_name'    => 'EEM_Attendee',
-                'args'          => array(
-                    'public'             => false,
-                    'publicly_queryable' => false,
-                    'hierarchical'       => false,
-                    'has_archive'        => false,
-                    'supports'           => array(
-                        'editor',
-                        'thumbnail',
-                        'excerpt',
-                        'custom-fields',
-                        'comments',
-                    ),
-                    'taxonomies'         => array('post_tag'),
-                    'capability_type'    => 'contact',
-                    'capabilities'       => array(
-                        'edit_post'              => 'ee_edit_contact',
-                        'read_post'              => 'ee_read_contact',
-                        'delete_post'            => 'ee_delete_contact',
-                        'edit_posts'             => 'ee_edit_contacts',
-                        'edit_others_posts'      => 'ee_edit_contacts',
-                        'publish_posts'          => 'ee_edit_contacts',
-                        'read_private_posts'     => 'ee_edit_contacts',
-                        'delete_posts'           => 'ee_delete_contacts',
-                        'delete_private_posts'   => 'ee_delete_contacts',
-                        'delete_published_posts' => 'ee_delete_contacts',
-                        'delete_others_posts'    => 'ee_delete_contacts',
-                        'edit_private_posts'     => 'ee_edit_contacts',
-                        'edit_published_posts'   => 'ee_edit_contacts',
-                    ),
-                ),
-            ),
-        );
-    }
+	/**
+	 * defines Espresso Custom Post Types
+	 * NOTE the ['args']['page_templates'] array index is something specific to our CPTs
+	 * and not part of the WP custom post type api.
+	 *
+	 * @return void
+	 */
+	private function setDefinitions()
+	{
+		$this->custom_post_types = array(
+			'espresso_events'    => array(
+				'singular_name' => esc_html__('Event', 'event_espresso'),
+				'plural_name'   => esc_html__('Events', 'event_espresso'),
+				'singular_slug' => esc_html__('event', 'event_espresso'),
+				'plural_slug'   => $this->core_config->event_cpt_slug,
+				'class_name'    => 'EE_Event',
+				'model_name'    => 'EEM_Event',
+				'args'          => array(
+					'public'            => true,
+					'show_in_nav_menus' => true,
+					'capability_type'   => 'event',
+					'capabilities'      => array(
+						'edit_post'              => 'ee_edit_event',
+						'read_post'              => 'ee_read_event',
+						'delete_post'            => 'ee_delete_event',
+						'edit_posts'             => 'ee_edit_events',
+						'edit_others_posts'      => 'ee_edit_others_events',
+						'publish_posts'          => 'ee_publish_events',
+						'read_private_posts'     => 'ee_read_private_events',
+						'delete_posts'           => 'ee_delete_events',
+						'delete_private_posts'   => 'ee_delete_private_events',
+						'delete_published_posts' => 'ee_delete_published_events',
+						'delete_others_posts'    => 'ee_delete_others_events',
+						'edit_private_posts'     => 'ee_edit_private_events',
+						'edit_published_posts'   => 'ee_edit_published_events',
+					),
+					'taxonomies'        => array(
+						'espresso_event_categories',
+						'espresso_event_type',
+						'post_tag',
+					),
+					'page_templates'    => true,
+				),
+			),
+			'espresso_venues'    => array(
+				'singular_name' => esc_html__('Venue', 'event_espresso'),
+				'plural_name'   => esc_html__('Venues', 'event_espresso'),
+				'singular_slug' => esc_html__('venue', 'event_espresso'),
+				'plural_slug'   => esc_html__('venues', 'event_espresso'),
+				'class_name'    => 'EE_Venue',
+				'model_name'    => 'EEM_Venue',
+				'args'          => array(
+					'public'            => true,
+					'show_in_nav_menus' => false, // by default this doesn't show for decaf,
+					'capability_type'   => 'venue',
+					'capabilities'      => array(
+						'edit_post'              => 'ee_edit_venue',
+						'read_post'              => 'ee_read_venue',
+						'delete_post'            => 'ee_delete_venue',
+						'edit_posts'             => 'ee_edit_venues',
+						'edit_others_posts'      => 'ee_edit_others_venues',
+						'publish_posts'          => 'ee_publish_venues',
+						'read_private_posts'     => 'ee_read_private_venues',
+						'delete_posts'           => 'ee_delete_venues',
+						'delete_private_posts'   => 'ee_delete_private_venues',
+						'delete_published_posts' => 'ee_delete_published_venues',
+						'delete_others_posts'    => 'ee_edit_others_venues',
+						'edit_private_posts'     => 'ee_edit_private_venues',
+						'edit_published_posts'   => 'ee_edit_published_venues',
+					),
+					'taxonomies'        => array(
+						'espresso_venue_categories',
+						'post_tag',
+					),
+					'page_templates'    => true,
+				),
+			),
+			'espresso_attendees' => array(
+				'singular_name' => esc_html__('Contact', 'event_espresso'),
+				'plural_name'   => esc_html__('Contacts', 'event_espresso'),
+				'singular_slug' => esc_html__('contact', 'event_espresso'),
+				'plural_slug'   => esc_html__('contacts', 'event_espresso'),
+				'class_name'    => 'EE_Attendee',
+				'model_name'    => 'EEM_Attendee',
+				'args'          => array(
+					'public'             => false,
+					'publicly_queryable' => false,
+					'hierarchical'       => false,
+					'has_archive'        => false,
+					'supports'           => array(
+						'editor',
+						'thumbnail',
+						'excerpt',
+						'custom-fields',
+						'comments',
+					),
+					'taxonomies'         => array('post_tag'),
+					'capability_type'    => 'contact',
+					'capabilities'       => array(
+						'edit_post'              => 'ee_edit_contact',
+						'read_post'              => 'ee_read_contact',
+						'delete_post'            => 'ee_delete_contact',
+						'edit_posts'             => 'ee_edit_contacts',
+						'edit_others_posts'      => 'ee_edit_contacts',
+						'publish_posts'          => 'ee_edit_contacts',
+						'read_private_posts'     => 'ee_edit_contacts',
+						'delete_posts'           => 'ee_delete_contacts',
+						'delete_private_posts'   => 'ee_delete_contacts',
+						'delete_published_posts' => 'ee_delete_contacts',
+						'delete_others_posts'    => 'ee_delete_contacts',
+						'edit_private_posts'     => 'ee_edit_contacts',
+						'edit_published_posts'   => 'ee_edit_contacts',
+					),
+				),
+			),
+		);
+	}
 
 
-    /**
-     * @return array
-     */
-    public function getDefinitions()
-    {
-        return (array)apply_filters(
-            'FHEE__EventEspresso_core_domain_entities_custom_post_types_CustomPostTypeDefinitions__getCustomPostTypes',
-            // legacy filter applied for now,
-            // later on we'll run a has_filter($tag) check and throw a doing_it_wrong() notice
-            apply_filters(
-                'FHEE__EE_Register_CPTs__get_CPTs__cpts',
-                $this->custom_post_types
-            )
-        );
-    }
+	/**
+	 * @return array
+	 */
+	public function getDefinitions()
+	{
+		return (array)apply_filters(
+			'FHEE__EventEspresso_core_domain_entities_custom_post_types_CustomPostTypeDefinitions__getCustomPostTypes',
+			// legacy filter applied for now,
+			// later on we'll run a has_filter($tag) check and throw a doing_it_wrong() notice
+			apply_filters(
+				'FHEE__EE_Register_CPTs__get_CPTs__cpts',
+				$this->custom_post_types
+			)
+		);
+	}
 
 
-    /**
-     * @return array
-     */
-    public function getCustomPostTypeSlugs()
-    {
-        return array_keys($this->getDefinitions());
-    }
+	/**
+	 * @return array
+	 */
+	public function getCustomPostTypeSlugs()
+	{
+		return array_keys($this->getDefinitions());
+	}
 
 
-    /**
-     * This basically goes through the CPT array and returns only CPT's
-     * that have the ['args']['public'] option set as false
-     *
-     * @return array
-     */
-    public function getPrivateCustomPostTypes()
-    {
-        $private_CPTs = array();
-        foreach ($this->getDefinitions() as $CPT => $details) {
-            if (empty($details['args']['public'])) {
-                $private_CPTs[$CPT] = $details;
-            }
-        }
-        return $private_CPTs;
-    }
+	/**
+	 * This basically goes through the CPT array and returns only CPT's
+	 * that have the ['args']['public'] option set as false
+	 *
+	 * @return array
+	 */
+	public function getPrivateCustomPostTypes()
+	{
+		$private_CPTs = array();
+		foreach ($this->getDefinitions() as $CPT => $details) {
+			if (empty($details['args']['public'])) {
+				$private_CPTs[$CPT] = $details;
+			}
+		}
+		return $private_CPTs;
+	}
 
 
-    /**
-     * This returns the corresponding model name for cpts registered by EE.
-     *
-     * @param string $post_type_slug    If a slug is included, then attempt to retrieve
-     *                                  the model name for the given cpt slug.
-     *                                  Otherwise if empty, then we'll return
-     *                                  all cpt model names for cpts registered in EE.
-     * @return array                    Empty array if no matching model names for the given slug
-     *                                  or an array of model names indexed by post type slug.
-     */
-    public function getCustomPostTypeModelNames($post_type_slug = '')
-    {
-        $cpts = $this->getDefinitions();
-        // first if slug passed in...
-        if (! empty($post_type_slug)) {
-            // check that slug and cpt match
-            if (! isset($cpts[$post_type_slug])) {
-                return array();
-            }
-            if (empty($cpts[$post_type_slug]['class_name'])
-                && empty($cpts[$post_type_slug]['model_name'])
-            ) {
-                return array();
-            }
-            // k let's get the model name for this cpt.
-            return $this->getCustomPostTypeModelName($post_type_slug, $cpts[$post_type_slug]);
-        }
-        // if we made it here then we're returning an array of cpt model names indexed by post_type_slug.
-        $cpt_models = array();
-        foreach ($cpts as $slug => $args) {
-            $model = $this->getCustomPostTypeModelName($post_type_slug, $cpts[$post_type_slug]);
-            if (! empty($model)) {
-                $cpt_models[$slug] = $model;
-            }
-        }
-        return $cpt_models;
-    }
+	/**
+	 * This returns the corresponding model name for cpts registered by EE.
+	 *
+	 * @param string $post_type_slug    If a slug is included, then attempt to retrieve
+	 *                                  the model name for the given cpt slug.
+	 *                                  Otherwise if empty, then we'll return
+	 *                                  all cpt model names for cpts registered in EE.
+	 * @return array                    Empty array if no matching model names for the given slug
+	 *                                  or an array of model names indexed by post type slug.
+	 */
+	public function getCustomPostTypeModelNames($post_type_slug = '')
+	{
+		$cpts = $this->getDefinitions();
+		// first if slug passed in...
+		if (! empty($post_type_slug)) {
+			// check that slug and cpt match
+			if (! isset($cpts[$post_type_slug])) {
+				return array();
+			}
+			if (empty($cpts[$post_type_slug]['class_name'])
+				&& empty($cpts[$post_type_slug]['model_name'])
+			) {
+				return array();
+			}
+			// k let's get the model name for this cpt.
+			return $this->getCustomPostTypeModelName($post_type_slug, $cpts[$post_type_slug]);
+		}
+		// if we made it here then we're returning an array of cpt model names indexed by post_type_slug.
+		$cpt_models = array();
+		foreach ($cpts as $slug => $args) {
+			$model = $this->getCustomPostTypeModelName($post_type_slug, $cpts[$post_type_slug]);
+			if (! empty($model)) {
+				$cpt_models[$slug] = $model;
+			}
+		}
+		return $cpt_models;
+	}
 
 
-    /**
-     * @param       $post_type_slug
-     * @param array $cpt
-     * @return array
-     */
-    private function getCustomPostTypeModelName($post_type_slug, array $cpt)
-    {
-        if (! empty($cpt['model_name'])) {
-            return array($post_type_slug => $cpt['model_name']);
-        }
-        if (! empty($cpt['class_name'])) {
-            return array(
-                $post_type_slug => $this->deriveCptModelNameFromClassName($cpt['class_name']),
-            );
-        }
-        return array();
-    }
+	/**
+	 * @param       $post_type_slug
+	 * @param array $cpt
+	 * @return array
+	 */
+	private function getCustomPostTypeModelName($post_type_slug, array $cpt)
+	{
+		if (! empty($cpt['model_name'])) {
+			return array($post_type_slug => $cpt['model_name']);
+		}
+		if (! empty($cpt['class_name'])) {
+			return array(
+				$post_type_slug => $this->deriveCptModelNameFromClassName($cpt['class_name']),
+			);
+		}
+		return array();
+	}
 
 
-    /**
-     * @param string $class_name
-     * @return string
-     */
-    private function deriveCptModelNameFromClassName($class_name)
-    {
-        return str_replace('EE', 'EEM', $class_name);
-    }
+	/**
+	 * @param string $class_name
+	 * @return string
+	 */
+	private function deriveCptModelNameFromClassName($class_name)
+	{
+		return str_replace('EE', 'EEM', $class_name);
+	}
 
 
-    /**
-     * This instantiates cpt models related to the cpts registered via EE.
-     *
-     * @since 4.6.16.rc.000
-     * @param string $post_type_slug If valid slug is provided, then will instantiate the model only for
-     *                               the cpt matching the given slug.  Otherwise all cpt models will be
-     *                               instantiated (if possible).
-     * @return EEM_CPT_Base[]        successful instantiation will return an array of successfully instantiated
-     *                               EEM models indexed by post slug.
-     */
-    public function getCustomPostTypeModels($post_type_slug = '')
-    {
-        $cpt_model_names = $this->getCustomPostTypeModelNames($post_type_slug);
-        $instantiated = array();
-        foreach ($cpt_model_names as $slug => $model_name) {
-            $model = $this->loader->getShared($model_name);
-            if ($model instanceof EEM_CPT_Base) {
-                $instantiated[$slug] = $model;
-            }
-        }
-        return $instantiated;
-    }
+	/**
+	 * This instantiates cpt models related to the cpts registered via EE.
+	 *
+	 * @since 4.6.16.rc.000
+	 * @param string $post_type_slug If valid slug is provided, then will instantiate the model only for
+	 *                               the cpt matching the given slug.  Otherwise all cpt models will be
+	 *                               instantiated (if possible).
+	 * @return EEM_CPT_Base[]        successful instantiation will return an array of successfully instantiated
+	 *                               EEM models indexed by post slug.
+	 */
+	public function getCustomPostTypeModels($post_type_slug = '')
+	{
+		$cpt_model_names = $this->getCustomPostTypeModelNames($post_type_slug);
+		$instantiated = array();
+		foreach ($cpt_model_names as $slug => $model_name) {
+			$model = $this->loader->getShared($model_name);
+			if ($model instanceof EEM_CPT_Base) {
+				$instantiated[$slug] = $model;
+			}
+		}
+		return $instantiated;
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -171,7 +171,7 @@ 
      */
     public function getDefinitions()
     {
-        return (array)apply_filters(
+        return (array) apply_filters(
             'FHEE__EventEspresso_core_domain_entities_custom_post_types_CustomPostTypeDefinitions__getCustomPostTypes',
             // legacy filter applied for now,
             // later on we'll run a has_filter($tag) check and throw a doing_it_wrong() notice
@@ -224,9 +224,9 @@ 
     {
         $cpts = $this->getDefinitions();
         // first if slug passed in...
-        if (! empty($post_type_slug)) {
+        if ( ! empty($post_type_slug)) {
             // check that slug and cpt match
-            if (! isset($cpts[$post_type_slug])) {
+            if ( ! isset($cpts[$post_type_slug])) {
                 return array();
             }
             if (empty($cpts[$post_type_slug]['class_name'])
@@ -241,7 +241,7 @@ 
         $cpt_models = array();
         foreach ($cpts as $slug => $args) {
             $model = $this->getCustomPostTypeModelName($post_type_slug, $cpts[$post_type_slug]);
-            if (! empty($model)) {
+            if ( ! empty($model)) {
                 $cpt_models[$slug] = $model;
             }
         }
@@ -256,10 +256,10 @@ 
      */
     private function getCustomPostTypeModelName($post_type_slug, array $cpt)
     {
-        if (! empty($cpt['model_name'])) {
+        if ( ! empty($cpt['model_name'])) {
             return array($post_type_slug => $cpt['model_name']);
         }
-        if (! empty($cpt['class_name'])) {
+        if ( ! empty($cpt['class_name'])) {
             return array(
                 $post_type_slug => $this->deriveCptModelNameFromClassName($cpt['class_name']),
             );

core/domain/entities/custom_post_types/CustomTaxonomyDefinitions.php

Indentation +116 added lines, -116 removed lines

@@ -13,130 +13,130 @@
 class CustomTaxonomyDefinitions
 {
 
-    /**
-     * @var array $taxonomies
-     */
-    private $taxonomies;
+	/**
+	 * @var array $taxonomies
+	 */
+	private $taxonomies;
 
 
-    /**
-     * EspressoCustomPostTypeDefinitions constructor.
-     */
-    public function __construct()
-    {
-        $this->setTaxonomies();
-        add_filter('pre_term_description', array($this, 'filterCustomTermDescription'), 1, 2);
-    }
+	/**
+	 * EspressoCustomPostTypeDefinitions constructor.
+	 */
+	public function __construct()
+	{
+		$this->setTaxonomies();
+		add_filter('pre_term_description', array($this, 'filterCustomTermDescription'), 1, 2);
+	}
 
 
-    private function setTaxonomies()
-    {
-        $this->taxonomies = array(
-            'espresso_event_categories' => array(
-                'singular_name' => esc_html__('Event Category', 'event_espresso'),
-                'plural_name'   => esc_html__('Event Categories', 'event_espresso'),
-                'args'          => array(
-                    'public'            => true,
-                    'show_in_nav_menus' => true,
-                    'show_in_rest'      => true,
-                    'capabilities'      => array(
-                        'manage_terms' => 'ee_manage_event_categories',
-                        'edit_terms'   => 'ee_edit_event_category',
-                        'delete_terms' => 'ee_delete_event_category',
-                        'assign_terms' => 'ee_assign_event_category',
-                    ),
-                    'rewrite'           => array('slug' => esc_html__('event-category', 'event_espresso')),
-                ),
-            ),
-            'espresso_venue_categories' => array(
-                'singular_name' => esc_html__('Venue Category', 'event_espresso'),
-                'plural_name'   => esc_html__('Venue Categories', 'event_espresso'),
-                'args'          => array(
-                    'public'            => true,
-                    'show_in_nav_menus' => false, // by default this doesn't show for decaf
-                    'show_in_rest'      => true,
-                    'capabilities'      => array(
-                        'manage_terms' => 'ee_manage_venue_categories',
-                        'edit_terms'   => 'ee_edit_venue_category',
-                        'delete_terms' => 'ee_delete_venue_category',
-                        'assign_terms' => 'ee_assign_venue_category',
-                    ),
-                    'rewrite'           => array('slug' => esc_html__('venue-category', 'event_espresso')),
-                ),
-            ),
-            'espresso_event_type'       => array(
-                'singular_name' => esc_html__('Event Type', 'event_espresso'),
-                'plural_name'   => esc_html__('Event Types', 'event_espresso'),
-                'args'          => array(
-                    'public'       => true,
-                    'show_ui'      => false,
-                    'show_in_rest' => true,
-                    'capabilities' => array(
-                        'manage_terms' => 'ee_read_event_type',
-                        'edit_terms'   => 'ee_edit_event_type',
-                        'delete_terms' => 'ee_delete_event_type',
-                        'assign_terms' => 'ee_assign_event_type',
-                    ),
-                    'rewrite'      => array('slug' => esc_html__('event-type', 'event_espresso')),
-                    'hierarchical' => true,
-                ),
-            ),
-        );
-    }
+	private function setTaxonomies()
+	{
+		$this->taxonomies = array(
+			'espresso_event_categories' => array(
+				'singular_name' => esc_html__('Event Category', 'event_espresso'),
+				'plural_name'   => esc_html__('Event Categories', 'event_espresso'),
+				'args'          => array(
+					'public'            => true,
+					'show_in_nav_menus' => true,
+					'show_in_rest'      => true,
+					'capabilities'      => array(
+						'manage_terms' => 'ee_manage_event_categories',
+						'edit_terms'   => 'ee_edit_event_category',
+						'delete_terms' => 'ee_delete_event_category',
+						'assign_terms' => 'ee_assign_event_category',
+					),
+					'rewrite'           => array('slug' => esc_html__('event-category', 'event_espresso')),
+				),
+			),
+			'espresso_venue_categories' => array(
+				'singular_name' => esc_html__('Venue Category', 'event_espresso'),
+				'plural_name'   => esc_html__('Venue Categories', 'event_espresso'),
+				'args'          => array(
+					'public'            => true,
+					'show_in_nav_menus' => false, // by default this doesn't show for decaf
+					'show_in_rest'      => true,
+					'capabilities'      => array(
+						'manage_terms' => 'ee_manage_venue_categories',
+						'edit_terms'   => 'ee_edit_venue_category',
+						'delete_terms' => 'ee_delete_venue_category',
+						'assign_terms' => 'ee_assign_venue_category',
+					),
+					'rewrite'           => array('slug' => esc_html__('venue-category', 'event_espresso')),
+				),
+			),
+			'espresso_event_type'       => array(
+				'singular_name' => esc_html__('Event Type', 'event_espresso'),
+				'plural_name'   => esc_html__('Event Types', 'event_espresso'),
+				'args'          => array(
+					'public'       => true,
+					'show_ui'      => false,
+					'show_in_rest' => true,
+					'capabilities' => array(
+						'manage_terms' => 'ee_read_event_type',
+						'edit_terms'   => 'ee_edit_event_type',
+						'delete_terms' => 'ee_delete_event_type',
+						'assign_terms' => 'ee_assign_event_type',
+					),
+					'rewrite'      => array('slug' => esc_html__('event-type', 'event_espresso')),
+					'hierarchical' => true,
+				),
+			),
+		);
+	}
 
 
-    /**
-     * @return array
-     */
-    public function getCustomTaxonomyDefinitions()
-    {
-        return (array) apply_filters(
-            'FHEE__EventEspresso_core_domain_entities_custom_post_types_TaxonomyDefinitions__getTaxonomies',
-            // legacy filter applied for now,
-            // later on we'll run a has_filter($tag) check and throw a doing_it_wrong() notice
-            apply_filters(
-                'FHEE__EE_Register_CPTs__get_taxonomies__taxonomies',
-                $this->taxonomies
-            )
-        );
-    }
+	/**
+	 * @return array
+	 */
+	public function getCustomTaxonomyDefinitions()
+	{
+		return (array) apply_filters(
+			'FHEE__EventEspresso_core_domain_entities_custom_post_types_TaxonomyDefinitions__getTaxonomies',
+			// legacy filter applied for now,
+			// later on we'll run a has_filter($tag) check and throw a doing_it_wrong() notice
+			apply_filters(
+				'FHEE__EE_Register_CPTs__get_taxonomies__taxonomies',
+				$this->taxonomies
+			)
+		);
+	}
 
 
-    /**
-     * @return array
-     */
-    public function getCustomTaxonomySlugs()
-    {
-        return array_keys($this->getCustomTaxonomyDefinitions());
-    }
+	/**
+	 * @return array
+	 */
+	public function getCustomTaxonomySlugs()
+	{
+		return array_keys($this->getCustomTaxonomyDefinitions());
+	}
 
 
-    /**
-     * By default, WordPress strips all html from term taxonomy description content.
-     * The purpose of this method is to remove that restriction
-     * and ensure that we still run ee term taxonomy descriptions
-     * through some full html sanitization equivalent to the post content field.
-     * So first we remove default filter for term description
-     * but we have to do this earlier before wp sets their own filter
-     * because they just set a global filter on all term descriptions
-     * before the custom term description filter.
-     * Really sux.
-     *
-     * @param string $description The description content.
-     * @param string $taxonomy    The taxonomy name for the taxonomy being filtered.
-     * @return string
-     */
-    public function filterCustomTermDescription($description, $taxonomy)
-    {
-        // get a list of EE taxonomies
-        $custom_taxonomies = $this->getCustomTaxonomySlugs();
-        // only do our own thing if the taxonomy listed is an ee taxonomy.
-        if (in_array($taxonomy, $custom_taxonomies, true)) {
-            // remove default wp filter
-            remove_filter('pre_term_description', 'wp_filter_kses');
-            // sanitize THIS content.
-            $description = wp_kses($description, wp_kses_allowed_html('post'));
-        }
-        return $description;
-    }
+	/**
+	 * By default, WordPress strips all html from term taxonomy description content.
+	 * The purpose of this method is to remove that restriction
+	 * and ensure that we still run ee term taxonomy descriptions
+	 * through some full html sanitization equivalent to the post content field.
+	 * So first we remove default filter for term description
+	 * but we have to do this earlier before wp sets their own filter
+	 * because they just set a global filter on all term descriptions
+	 * before the custom term description filter.
+	 * Really sux.
+	 *
+	 * @param string $description The description content.
+	 * @param string $taxonomy    The taxonomy name for the taxonomy being filtered.
+	 * @return string
+	 */
+	public function filterCustomTermDescription($description, $taxonomy)
+	{
+		// get a list of EE taxonomies
+		$custom_taxonomies = $this->getCustomTaxonomySlugs();
+		// only do our own thing if the taxonomy listed is an ee taxonomy.
+		if (in_array($taxonomy, $custom_taxonomies, true)) {
+			// remove default wp filter
+			remove_filter('pre_term_description', 'wp_filter_kses');
+			// sanitize THIS content.
+			$description = wp_kses($description, wp_kses_allowed_html('post'));
+		}
+		return $description;
+	}
 }

core/domain/entities/RegCode.php

Indentation +43 added lines, -43 removed lines

@@ -14,49 +14,49 @@
 {
 
 
-    /*
+	/*
      * @var string $reg_code
      */
-    private $reg_code;
-
-
-    /**
-     * RegCode constructor.
-     *
-     * @param RegUrlLink      $reg_url_link
-     * @param \EE_Transaction $transaction
-     * @param \EE_Ticket      $ticket
-     */
-    public function __construct(
-        RegUrlLink $reg_url_link,
-        \EE_Transaction $transaction,
-        \EE_Ticket $ticket
-    ) {
-        // figure out where to start parsing the reg code
-        $chars = strpos($reg_url_link, '-') + 5;
-        // TXN_ID + TKT_ID + first 3 and last 3 chars of reg_url_link
-        $this->reg_code = array(
-            $transaction->ID(),
-            $ticket->ID(),
-            substr($reg_url_link, 0, $chars),
-        );
-        // now put it all together
-        $this->reg_code = apply_filters(
-            'FHEE__Create__regCode__new_reg_code',
-            implode('-', $this->reg_code),
-            $transaction,
-            $ticket
-        );
-    }
-
-
-    /**
-     * Return the object as a string
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->reg_code;
-    }
+	private $reg_code;
+
+
+	/**
+	 * RegCode constructor.
+	 *
+	 * @param RegUrlLink      $reg_url_link
+	 * @param \EE_Transaction $transaction
+	 * @param \EE_Ticket      $ticket
+	 */
+	public function __construct(
+		RegUrlLink $reg_url_link,
+		\EE_Transaction $transaction,
+		\EE_Ticket $ticket
+	) {
+		// figure out where to start parsing the reg code
+		$chars = strpos($reg_url_link, '-') + 5;
+		// TXN_ID + TKT_ID + first 3 and last 3 chars of reg_url_link
+		$this->reg_code = array(
+			$transaction->ID(),
+			$ticket->ID(),
+			substr($reg_url_link, 0, $chars),
+		);
+		// now put it all together
+		$this->reg_code = apply_filters(
+			'FHEE__Create__regCode__new_reg_code',
+			implode('-', $this->reg_code),
+			$transaction,
+			$ticket
+		);
+	}
+
+
+	/**
+	 * Return the object as a string
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->reg_code;
+	}
 }

core/domain/entities/shortcodes/EspressoThankYou.php

Indentation +60 added lines, -60 removed lines

@@ -16,71 +16,71 @@
 class EspressoThankYou extends EspressoShortcode
 {
 
-    /**
-     * @var boolean $is_thank_you_page
-     */
-    private $is_thank_you_page = false;
+	/**
+	 * @var boolean $is_thank_you_page
+	 */
+	private $is_thank_you_page = false;
 
-    /**
-     * the actual shortcode tag that gets registered with WordPress
-     *
-     * @return string
-     */
-    public function getTag()
-    {
-        return 'ESPRESSO_THANK_YOU';
-    }
+	/**
+	 * the actual shortcode tag that gets registered with WordPress
+	 *
+	 * @return string
+	 */
+	public function getTag()
+	{
+		return 'ESPRESSO_THANK_YOU';
+	}
 
 
-    /**
-     * the time in seconds to cache the results of the processShortcode() method
-     * 0 means the processShortcode() results will NOT be cached at all
-     *
-     * @return int
-     */
-    public function cacheExpiration()
-    {
-        return 0;
-    }
+	/**
+	 * the time in seconds to cache the results of the processShortcode() method
+	 * 0 means the processShortcode() results will NOT be cached at all
+	 *
+	 * @return int
+	 */
+	public function cacheExpiration()
+	{
+		return 0;
+	}
 
 
-    /**
-     * a place for adding any initialization code that needs to run prior to wp_header().
-     * this may be required for shortcodes that utilize a corresponding module,
-     * and need to enqueue assets for that module
-     *
-     * @return void
-     * @throws \EE_Error
-     */
-    public function initializeShortcode()
-    {
-        global $wp_query;
-        if (empty($wp_query->posts) || count($wp_query->posts) > 1) {
-            return;
-        }
-        $post = reset($wp_query->posts);
-        if (! $post instanceof WP_Post || $post->ID !== EE_Registry::instance()->CFG->core->thank_you_page_id) {
-            return;
-        }
-        $this->is_thank_you_page = true;
-        \EED_Thank_You_Page::instance()->load_resources();
-        $this->shortcodeHasBeenInitialized();
-    }
+	/**
+	 * a place for adding any initialization code that needs to run prior to wp_header().
+	 * this may be required for shortcodes that utilize a corresponding module,
+	 * and need to enqueue assets for that module
+	 *
+	 * @return void
+	 * @throws \EE_Error
+	 */
+	public function initializeShortcode()
+	{
+		global $wp_query;
+		if (empty($wp_query->posts) || count($wp_query->posts) > 1) {
+			return;
+		}
+		$post = reset($wp_query->posts);
+		if (! $post instanceof WP_Post || $post->ID !== EE_Registry::instance()->CFG->core->thank_you_page_id) {
+			return;
+		}
+		$this->is_thank_you_page = true;
+		\EED_Thank_You_Page::instance()->load_resources();
+		$this->shortcodeHasBeenInitialized();
+	}
 
 
-    /**
-     * callback that runs when the shortcode is encountered in post content.
-     * IMPORTANT !!!
-     * remember that shortcode content should be RETURNED and NOT echoed out
-     *
-     * @param array $attributes
-     * @return string
-     * @throws \EE_Error
-     */
-    public function processShortcode($attributes = array())
-    {
-        return $this->is_thank_you_page
-            ? \EED_Thank_You_Page::instance()->thank_you_page_results()
-            : '';
-    }
+	/**
+	 * callback that runs when the shortcode is encountered in post content.
+	 * IMPORTANT !!!
+	 * remember that shortcode content should be RETURNED and NOT echoed out
+	 *
+	 * @param array $attributes
+	 * @return string
+	 * @throws \EE_Error
+	 */
+	public function processShortcode($attributes = array())
+	{
+		return $this->is_thank_you_page
+			? \EED_Thank_You_Page::instance()->thank_you_page_results()
+			: '';
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
             return;
         }
         $post = reset($wp_query->posts);
-        if (! $post instanceof WP_Post || $post->ID !== EE_Registry::instance()->CFG->core->thank_you_page_id) {
+        if ( ! $post instanceof WP_Post || $post->ID !== EE_Registry::instance()->CFG->core->thank_you_page_id) {
             return;
         }
         $this->is_thank_you_page = true;

core/domain/entities/shortcodes/EspressoEvents.php

Indentation +118 added lines, -118 removed lines

@@ -30,132 +30,132 @@
 {
 
 
-    /**
-     * the actual shortcode tag that gets registered with WordPress
-     *
-     * @return string
-     */
-    public function getTag()
-    {
-        return 'ESPRESSO_EVENTS';
-    }
+	/**
+	 * the actual shortcode tag that gets registered with WordPress
+	 *
+	 * @return string
+	 */
+	public function getTag()
+	{
+		return 'ESPRESSO_EVENTS';
+	}
 
 
-    /**
-     * the time in seconds to cache the results of the processShortcode() method
-     * 0 means the processShortcode() results will NOT be cached at all
-     *
-     * @return int
-     */
-    public function cacheExpiration()
-    {
-        return 0;
-    }
+	/**
+	 * the time in seconds to cache the results of the processShortcode() method
+	 * 0 means the processShortcode() results will NOT be cached at all
+	 *
+	 * @return int
+	 */
+	public function cacheExpiration()
+	{
+		return 0;
+	}
 
 
-    /**
-     * a place for adding any initialization code that needs to run prior to wp_header().
-     * this may be required for shortcodes that utilize a corresponding module,
-     * and need to enqueue assets for that module
-     *
-     * @return void
-     */
-    public function initializeShortcode()
-    {
-        EED_Events_Archive::instance()->event_list();
-        $this->shortcodeHasBeenInitialized();
-    }
+	/**
+	 * a place for adding any initialization code that needs to run prior to wp_header().
+	 * this may be required for shortcodes that utilize a corresponding module,
+	 * and need to enqueue assets for that module
+	 *
+	 * @return void
+	 */
+	public function initializeShortcode()
+	{
+		EED_Events_Archive::instance()->event_list();
+		$this->shortcodeHasBeenInitialized();
+	}
 
 
-    /**
-     * callback that runs when the shortcode is encountered in post content.
-     * IMPORTANT !!!
-     * remember that shortcode content should be RETURNED and NOT echoed out
-     *
-     * @param array $attributes
-     * @return string
-     */
-    public function processShortcode($attributes = array())
-    {
-        // grab attributes and merge with defaults
-        $attributes = $this->getAttributes($attributes);
-        // make sure we use the_excerpt()
-        add_filter('FHEE__EES_Espresso_Events__process_shortcode__true', '__return_true');
-        // apply query filters
-        add_filter('FHEE__EEH_Event_Query__apply_query_filters', '__return_true');
-        // run the query
-        global $wp_query;
-        // yes we have to overwrite the main wp query, but it's ok...
-        // we're going to reset it again below, so everything will be Hunky Dory (amazing album)
-        $wp_query = new EventListQuery($attributes);
-        // check what template is loaded and load filters accordingly
-        EED_Events_Archive::instance()->template_include('loop-espresso_events.php');
-        // load our template
-        $event_list = EEH_Template::locate_template(
-            'loop-espresso_events.php',
-            array(),
-            true,
-            true
-        );
-        // now reset the query and post data
-        wp_reset_query();
-        wp_reset_postdata();
-        EED_Events_Archive::remove_all_events_archive_filters();
-        // remove query filters
-        remove_filter('FHEE__EEH_Event_Query__apply_query_filters', '__return_true');
-        // pull our content from the output buffer and return it
-        return $event_list;
-    }
+	/**
+	 * callback that runs when the shortcode is encountered in post content.
+	 * IMPORTANT !!!
+	 * remember that shortcode content should be RETURNED and NOT echoed out
+	 *
+	 * @param array $attributes
+	 * @return string
+	 */
+	public function processShortcode($attributes = array())
+	{
+		// grab attributes and merge with defaults
+		$attributes = $this->getAttributes($attributes);
+		// make sure we use the_excerpt()
+		add_filter('FHEE__EES_Espresso_Events__process_shortcode__true', '__return_true');
+		// apply query filters
+		add_filter('FHEE__EEH_Event_Query__apply_query_filters', '__return_true');
+		// run the query
+		global $wp_query;
+		// yes we have to overwrite the main wp query, but it's ok...
+		// we're going to reset it again below, so everything will be Hunky Dory (amazing album)
+		$wp_query = new EventListQuery($attributes);
+		// check what template is loaded and load filters accordingly
+		EED_Events_Archive::instance()->template_include('loop-espresso_events.php');
+		// load our template
+		$event_list = EEH_Template::locate_template(
+			'loop-espresso_events.php',
+			array(),
+			true,
+			true
+		);
+		// now reset the query and post data
+		wp_reset_query();
+		wp_reset_postdata();
+		EED_Events_Archive::remove_all_events_archive_filters();
+		// remove query filters
+		remove_filter('FHEE__EEH_Event_Query__apply_query_filters', '__return_true');
+		// pull our content from the output buffer and return it
+		return $event_list;
+	}
 
 
-    /**
-     * merge incoming attributes with filtered defaults
-     *
-     * @param array $attributes
-     * @return array
-     */
-    private function getAttributes(array $attributes)
-    {
-        return array_merge(
-            (array)apply_filters(
-                'EES_Espresso_Events__process_shortcode__default_espresso_events_shortcode_atts',
-                array(
-                    'title'         => '',
-                    'limit'         => 10,
-                    'css_class'     => '',
-                    'show_expired'  => false,
-                    'month'         => '',
-                    'category_slug' => '',
-                    'order_by'      => 'start_date',
-                    'sort'          => 'ASC',
-                    'show_title'    => true,
-                )
-            ),
-            $attributes
-        );
-    }
+	/**
+	 * merge incoming attributes with filtered defaults
+	 *
+	 * @param array $attributes
+	 * @return array
+	 */
+	private function getAttributes(array $attributes)
+	{
+		return array_merge(
+			(array)apply_filters(
+				'EES_Espresso_Events__process_shortcode__default_espresso_events_shortcode_atts',
+				array(
+					'title'         => '',
+					'limit'         => 10,
+					'css_class'     => '',
+					'show_expired'  => false,
+					'month'         => '',
+					'category_slug' => '',
+					'order_by'      => 'start_date',
+					'sort'          => 'ASC',
+					'show_title'    => true,
+				)
+			),
+			$attributes
+		);
+	}
 
 
-    /**
-     * array for defining custom attribute sanitization callbacks,
-     * where keys match keys in your attributes array,
-     * and values represent the sanitization function you wish to be applied to that attribute.
-     * So for example, if you had an integer attribute named "event_id"
-     * that you wanted to be sanitized using absint(),
-     * then you would pass the following for your $custom_sanitization array:
-     *      array('event_id' => 'absint')
-     *
-     * @return array
-     */
-    protected function customAttributeSanitizationMap()
-    {
-        // the following get sanitized/whitelisted in EEH_Event_Query
-        return array(
-            'category_slug' => 'skip_sanitization',
-            'show_expired'  => 'skip_sanitization',
-            'order_by'      => 'skip_sanitization',
-            'month'         => 'skip_sanitization',
-            'sort'          => 'skip_sanitization',
-        );
-    }
+	/**
+	 * array for defining custom attribute sanitization callbacks,
+	 * where keys match keys in your attributes array,
+	 * and values represent the sanitization function you wish to be applied to that attribute.
+	 * So for example, if you had an integer attribute named "event_id"
+	 * that you wanted to be sanitized using absint(),
+	 * then you would pass the following for your $custom_sanitization array:
+	 *      array('event_id' => 'absint')
+	 *
+	 * @return array
+	 */
+	protected function customAttributeSanitizationMap()
+	{
+		// the following get sanitized/whitelisted in EEH_Event_Query
+		return array(
+			'category_slug' => 'skip_sanitization',
+			'show_expired'  => 'skip_sanitization',
+			'order_by'      => 'skip_sanitization',
+			'month'         => 'skip_sanitization',
+			'sort'          => 'skip_sanitization',
+		);
+	}
 }

core/domain/entities/shortcodes/EspressoEventAttendees.php

Indentation +303 added lines, -303 removed lines

@@ -27,333 +27,333 @@
 class EspressoEventAttendees extends EspressoShortcode
 {
 
-    private $query_params = array(
-        0 => array(),
-    );
+	private $query_params = array(
+		0 => array(),
+	);
 
-    private $template_args = array(
-        'contacts' => array(),
-        'event'    => null,
-        'datetime' => null,
-        'ticket'   => null,
-    );
+	private $template_args = array(
+		'contacts' => array(),
+		'event'    => null,
+		'datetime' => null,
+		'ticket'   => null,
+	);
 
-    /**
-     * the actual shortcode tag that gets registered with WordPress
-     *
-     * @return string
-     */
-    public function getTag()
-    {
-        return 'ESPRESSO_EVENT_ATTENDEES';
-    }
+	/**
+	 * the actual shortcode tag that gets registered with WordPress
+	 *
+	 * @return string
+	 */
+	public function getTag()
+	{
+		return 'ESPRESSO_EVENT_ATTENDEES';
+	}
 
 
-    /**
-     * the time in seconds to cache the results of the processShortcode() method
-     * 0 means the processShortcode() results will NOT be cached at all
-     *
-     * @return int
-     */
-    public function cacheExpiration()
-    {
-        return 0;
-    }
+	/**
+	 * the time in seconds to cache the results of the processShortcode() method
+	 * 0 means the processShortcode() results will NOT be cached at all
+	 *
+	 * @return int
+	 */
+	public function cacheExpiration()
+	{
+		return 0;
+	}
 
 
-    /**
-     * a place for adding any initialization code that needs to run prior to wp_header().
-     * this may be required for shortcodes that utilize a corresponding module,
-     * and need to enqueue assets for that module
-     *
-     * @return void
-     */
-    public function initializeShortcode()
-    {
-        $this->shortcodeHasBeenInitialized();
-    }
+	/**
+	 * a place for adding any initialization code that needs to run prior to wp_header().
+	 * this may be required for shortcodes that utilize a corresponding module,
+	 * and need to enqueue assets for that module
+	 *
+	 * @return void
+	 */
+	public function initializeShortcode()
+	{
+		$this->shortcodeHasBeenInitialized();
+	}
 
 
-    /**
-     * process_shortcode - ESPRESSO_EVENT_ATTENDEES - Returns a list of attendees to an event.
-     *  [ESPRESSO_EVENT_ATTENDEES]
-     *  - defaults to attendees for earliest active event, or earliest upcoming event.
-     *  [ESPRESSO_EVENT_ATTENDEES event_id=123]
-     *  - attendees for specific event.
-     *  [ESPRESSO_EVENT_ATTENDEES datetime_id=245]
-     *  - attendees for a specific datetime.
-     *  [ESPRESSO_EVENT_ATTENDEES ticket_id=123]
-     *  - attendees for a specific ticket.
-     *  [ESPRESSO_EVENT_ATTENDEES status=all]
-     *  - specific registration status (use status id) or all for all attendees regardless of status.
-     *  Note default is to only return approved attendees
-     *  [ESPRESSO_EVENT_ATTENDEES show_gravatar=true]
-     *  - default is to not return gravatar.  Otherwise if this is set then return gravatar for email address given.
-     *  [ESPRESSO_EVENT_ATTENDEES display_on_archives=true]
-     *  - default is to not display attendees list on archive pages.
-     * Note: because of the relationship between event_id, ticket_id, and datetime_id:
-     * If more than one of those params is included, then preference is given to the following:
-     *  - event_id is used whenever its present and any others are ignored.
-     *  - if no event_id then datetime is used whenever its present and any others are ignored.
-     *  - otherwise ticket_id is used if present.
-     *
-     * @param array $attributes
-     * @return string
-     * @throws EE_Error
-     * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
-     * @throws \EventEspresso\core\exceptions\InvalidInterfaceException
-     * @throws \InvalidArgumentException
-     */
-    public function processShortcode($attributes = array())
-    {
-        // grab attributes and merge with defaults
-        $attributes = $this->getAttributes((array)$attributes);
-        $archive = is_archive();
-        $display_on_archives = filter_var($attributes['display_on_archives'], FILTER_VALIDATE_BOOLEAN);
-        // don't display on archives unless 'display_on_archives' is true
-        if ($archive && ! $display_on_archives) {
-            return '';
-        }
+	/**
+	 * process_shortcode - ESPRESSO_EVENT_ATTENDEES - Returns a list of attendees to an event.
+	 *  [ESPRESSO_EVENT_ATTENDEES]
+	 *  - defaults to attendees for earliest active event, or earliest upcoming event.
+	 *  [ESPRESSO_EVENT_ATTENDEES event_id=123]
+	 *  - attendees for specific event.
+	 *  [ESPRESSO_EVENT_ATTENDEES datetime_id=245]
+	 *  - attendees for a specific datetime.
+	 *  [ESPRESSO_EVENT_ATTENDEES ticket_id=123]
+	 *  - attendees for a specific ticket.
+	 *  [ESPRESSO_EVENT_ATTENDEES status=all]
+	 *  - specific registration status (use status id) or all for all attendees regardless of status.
+	 *  Note default is to only return approved attendees
+	 *  [ESPRESSO_EVENT_ATTENDEES show_gravatar=true]
+	 *  - default is to not return gravatar.  Otherwise if this is set then return gravatar for email address given.
+	 *  [ESPRESSO_EVENT_ATTENDEES display_on_archives=true]
+	 *  - default is to not display attendees list on archive pages.
+	 * Note: because of the relationship between event_id, ticket_id, and datetime_id:
+	 * If more than one of those params is included, then preference is given to the following:
+	 *  - event_id is used whenever its present and any others are ignored.
+	 *  - if no event_id then datetime is used whenever its present and any others are ignored.
+	 *  - otherwise ticket_id is used if present.
+	 *
+	 * @param array $attributes
+	 * @return string
+	 * @throws EE_Error
+	 * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
+	 * @throws \EventEspresso\core\exceptions\InvalidInterfaceException
+	 * @throws \InvalidArgumentException
+	 */
+	public function processShortcode($attributes = array())
+	{
+		// grab attributes and merge with defaults
+		$attributes = $this->getAttributes((array)$attributes);
+		$archive = is_archive();
+		$display_on_archives = filter_var($attributes['display_on_archives'], FILTER_VALIDATE_BOOLEAN);
+		// don't display on archives unless 'display_on_archives' is true
+		if ($archive && ! $display_on_archives) {
+			return '';
+		}
 
-        try {
-            $this->setBaseTemplateArguments($attributes);
-            $this->validateEntities($attributes);
-            $this->setBaseQueryParams();
-        } catch (EntityNotFoundException $e) {
-            if (WP_DEBUG) {
-                return '<div class="important-notice ee-error">'
-                       . $e->getMessage()
-                       . '</div>';
-            }
-            return '';
-        }
-        $this->setAdditionalQueryParams($attributes);
-        // get contacts!
-        $this->template_args['contacts'] = EEM_Attendee::instance()->get_all($this->query_params);
-        // all set let's load up the template and return.
-        return EEH_Template::locate_template(
-            'loop-espresso_event_attendees.php',
-            $this->template_args
-        );
-    }
+		try {
+			$this->setBaseTemplateArguments($attributes);
+			$this->validateEntities($attributes);
+			$this->setBaseQueryParams();
+		} catch (EntityNotFoundException $e) {
+			if (WP_DEBUG) {
+				return '<div class="important-notice ee-error">'
+					   . $e->getMessage()
+					   . '</div>';
+			}
+			return '';
+		}
+		$this->setAdditionalQueryParams($attributes);
+		// get contacts!
+		$this->template_args['contacts'] = EEM_Attendee::instance()->get_all($this->query_params);
+		// all set let's load up the template and return.
+		return EEH_Template::locate_template(
+			'loop-espresso_event_attendees.php',
+			$this->template_args
+		);
+	}
 
 
-    /**
-     * merge incoming attributes with filtered defaults
-     *
-     * @param array $attributes
-     * @return array
-     */
-    private function getAttributes(array $attributes)
-    {
-        return (array)apply_filters(
-            'EES_Espresso_Event_Attendees__process_shortcode__default_shortcode_atts',
-            $attributes + array(
-                'event_id'            => null,
-                'datetime_id'         => null,
-                'ticket_id'           => null,
-                'status'              => EEM_Registration::status_id_approved,
-                'show_gravatar'       => false,
-                'display_on_archives' => false,
-            )
-        );
-    }
+	/**
+	 * merge incoming attributes with filtered defaults
+	 *
+	 * @param array $attributes
+	 * @return array
+	 */
+	private function getAttributes(array $attributes)
+	{
+		return (array)apply_filters(
+			'EES_Espresso_Event_Attendees__process_shortcode__default_shortcode_atts',
+			$attributes + array(
+				'event_id'            => null,
+				'datetime_id'         => null,
+				'ticket_id'           => null,
+				'status'              => EEM_Registration::status_id_approved,
+				'show_gravatar'       => false,
+				'display_on_archives' => false,
+			)
+		);
+	}
 
 
-    /**
-     * Set all the base template arguments from the incoming attributes.
-     * * Note: because of the relationship between event_id, ticket_id, and datetime_id:
-     * If more than one of those params is included, then preference is given to the following:
-     *  - event_id is used whenever its present and any others are ignored.
-     *  - if no event_id then datetime is used whenever its present and any others are ignored.
-     *  - otherwise ticket_id is used if present.
-     *
-     * @param array $attributes
-     * @throws EE_Error
-     * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
-     * @throws \EventEspresso\core\exceptions\InvalidInterfaceException
-     * @throws \InvalidArgumentException
-     */
-    private function setBaseTemplateArguments(array $attributes)
-    {
-        $this->template_args['show_gravatar'] = $attributes['show_gravatar'];
-        $this->template_args['event'] = $this->getEvent($attributes);
-        $this->template_args['datetime'] = empty($attributes['event_id'])
-            ? $this->getDatetime($attributes)
-            : null;
-        $this->template_args['ticket'] = empty($attributes['datetime_id']) && empty($attributes['event_id'])
-            ? $this->getTicket($attributes)
-            : null;
-    }
+	/**
+	 * Set all the base template arguments from the incoming attributes.
+	 * * Note: because of the relationship between event_id, ticket_id, and datetime_id:
+	 * If more than one of those params is included, then preference is given to the following:
+	 *  - event_id is used whenever its present and any others are ignored.
+	 *  - if no event_id then datetime is used whenever its present and any others are ignored.
+	 *  - otherwise ticket_id is used if present.
+	 *
+	 * @param array $attributes
+	 * @throws EE_Error
+	 * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
+	 * @throws \EventEspresso\core\exceptions\InvalidInterfaceException
+	 * @throws \InvalidArgumentException
+	 */
+	private function setBaseTemplateArguments(array $attributes)
+	{
+		$this->template_args['show_gravatar'] = $attributes['show_gravatar'];
+		$this->template_args['event'] = $this->getEvent($attributes);
+		$this->template_args['datetime'] = empty($attributes['event_id'])
+			? $this->getDatetime($attributes)
+			: null;
+		$this->template_args['ticket'] = empty($attributes['datetime_id']) && empty($attributes['event_id'])
+			? $this->getTicket($attributes)
+			: null;
+	}
 
 
-    /**
-     * Validates the presence of entities for the given attribute values.
-     *
-     * @param array $attributes
-     * @throws EntityNotFoundException
-     */
-    private function validateEntities(array $attributes)
-    {
-        if (! $this->template_args['event'] instanceof EE_Event
-            || (
-                empty($attributes['event_id'])
-                && $attributes['datetime_id']
-                && ! $this->template_args['datetime'] instanceof EE_Datetime
-            )
-            || (
-                empty($attributes['event_id'])
-                && empty($attributes['datetime_id'])
-                && $attributes['ticket_id']
-                && ! $this->template_args['ticket'] instanceof EE_Ticket
-            )
-        ) {
-            throw new EntityNotFoundException(
-                '',
-                '',
-                esc_html__(
-                    'The [ESPRESSO_EVENT_ATTENDEES] shortcode has been used incorrectly.  Please double check the arguments you used for any typos.  In the case of ID type arguments, its possible the given ID does not correspond to existing data in the database.',
-                    'event_espresso'
-                )
-            );
-        }
-    }
+	/**
+	 * Validates the presence of entities for the given attribute values.
+	 *
+	 * @param array $attributes
+	 * @throws EntityNotFoundException
+	 */
+	private function validateEntities(array $attributes)
+	{
+		if (! $this->template_args['event'] instanceof EE_Event
+			|| (
+				empty($attributes['event_id'])
+				&& $attributes['datetime_id']
+				&& ! $this->template_args['datetime'] instanceof EE_Datetime
+			)
+			|| (
+				empty($attributes['event_id'])
+				&& empty($attributes['datetime_id'])
+				&& $attributes['ticket_id']
+				&& ! $this->template_args['ticket'] instanceof EE_Ticket
+			)
+		) {
+			throw new EntityNotFoundException(
+				'',
+				'',
+				esc_html__(
+					'The [ESPRESSO_EVENT_ATTENDEES] shortcode has been used incorrectly.  Please double check the arguments you used for any typos.  In the case of ID type arguments, its possible the given ID does not correspond to existing data in the database.',
+					'event_espresso'
+				)
+			);
+		}
+	}
 
 
-    /**
-     * Sets the query params for the base query elements.
-     */
-    private function setBaseQueryParams()
-    {
-        switch (true) {
-            case $this->template_args['datetime'] instanceof EE_Datetime:
-                $this->query_params = array(
-                    0                          => array(
-                        'Registration.Ticket.Datetime.DTT_ID' => $this->template_args['datetime']->ID(),
-                    ),
-                    'default_where_conditions' => 'this_model_only',
-                );
-                break;
-            case $this->template_args['ticket'] instanceof EE_Ticket:
-                $this->query_params[0] = array(
-                    'Registration.TKT_ID' => $this->template_args['ticket']->ID(),
-                );
-                break;
-            case $this->template_args['event'] instanceof EE_Event:
-                $this->query_params[0] = array(
-                    'Registration.EVT_ID' => $this->template_args['event']->ID(),
-                );
-                break;
-        }
-    }
+	/**
+	 * Sets the query params for the base query elements.
+	 */
+	private function setBaseQueryParams()
+	{
+		switch (true) {
+			case $this->template_args['datetime'] instanceof EE_Datetime:
+				$this->query_params = array(
+					0                          => array(
+						'Registration.Ticket.Datetime.DTT_ID' => $this->template_args['datetime']->ID(),
+					),
+					'default_where_conditions' => 'this_model_only',
+				);
+				break;
+			case $this->template_args['ticket'] instanceof EE_Ticket:
+				$this->query_params[0] = array(
+					'Registration.TKT_ID' => $this->template_args['ticket']->ID(),
+				);
+				break;
+			case $this->template_args['event'] instanceof EE_Event:
+				$this->query_params[0] = array(
+					'Registration.EVT_ID' => $this->template_args['event']->ID(),
+				);
+				break;
+		}
+	}
 
 
-    /**
-     * @param array $attributes
-     * @return EE_Event|null
-     * @throws EE_Error
-     * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
-     * @throws \EventEspresso\core\exceptions\InvalidInterfaceException
-     * @throws \InvalidArgumentException
-     */
-    private function getEvent(array $attributes)
-    {
-        switch (true) {
-            case ! empty($attributes['event_id']):
-                $event = EEM_Event::instance()->get_one_by_ID($attributes['event_id']);
-                break;
-            case ! empty($attributes['datetime_id']):
-                $event = EEM_Event::instance()->get_one(array(
-                    array(
-                        'Datetime.DTT_ID' => $attributes['datetime_id'],
-                    ),
-                ));
-                break;
-            case ! empty($attributes['ticket_id']):
-                $event = EEM_Event::instance()->get_one(array(
-                    array(
-                        'Datetime.Ticket.TKT_ID' => $attributes['ticket_id'],
-                    ),
-                ));
-                break;
-            case is_espresso_event():
-                $event = EEH_Event_View::get_event();
-                break;
-            default:
-                // one last shot...
-                // try getting the earliest active event
-                $events = EEM_Event::instance()->get_active_events(array(
-                    'limit'    => 1,
-                    'order_by' => array('Datetime.DTT_EVT_start' => 'ASC'),
-                ));
-                //  if none then get the next upcoming
-                $events = empty($events)
-                    ? EEM_Event::instance()->get_upcoming_events(array(
-                        'limit'    => 1,
-                        'order_by' => array('Datetime.DTT_EVT_start' => 'ASC'),
-                    ))
-                    : $events;
-                $event = reset($events);
-        }
+	/**
+	 * @param array $attributes
+	 * @return EE_Event|null
+	 * @throws EE_Error
+	 * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
+	 * @throws \EventEspresso\core\exceptions\InvalidInterfaceException
+	 * @throws \InvalidArgumentException
+	 */
+	private function getEvent(array $attributes)
+	{
+		switch (true) {
+			case ! empty($attributes['event_id']):
+				$event = EEM_Event::instance()->get_one_by_ID($attributes['event_id']);
+				break;
+			case ! empty($attributes['datetime_id']):
+				$event = EEM_Event::instance()->get_one(array(
+					array(
+						'Datetime.DTT_ID' => $attributes['datetime_id'],
+					),
+				));
+				break;
+			case ! empty($attributes['ticket_id']):
+				$event = EEM_Event::instance()->get_one(array(
+					array(
+						'Datetime.Ticket.TKT_ID' => $attributes['ticket_id'],
+					),
+				));
+				break;
+			case is_espresso_event():
+				$event = EEH_Event_View::get_event();
+				break;
+			default:
+				// one last shot...
+				// try getting the earliest active event
+				$events = EEM_Event::instance()->get_active_events(array(
+					'limit'    => 1,
+					'order_by' => array('Datetime.DTT_EVT_start' => 'ASC'),
+				));
+				//  if none then get the next upcoming
+				$events = empty($events)
+					? EEM_Event::instance()->get_upcoming_events(array(
+						'limit'    => 1,
+						'order_by' => array('Datetime.DTT_EVT_start' => 'ASC'),
+					))
+					: $events;
+				$event = reset($events);
+		}
 
-        return $event instanceof EE_Event ? $event : null;
-    }
+		return $event instanceof EE_Event ? $event : null;
+	}
 
 
-    /**
-     * @param array $attributes
-     * @return EE_Datetime|null
-     * @throws EE_Error
-     * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
-     * @throws \EventEspresso\core\exceptions\InvalidInterfaceException
-     * @throws \InvalidArgumentException
-     */
-    private function getDatetime(array $attributes)
-    {
-        if (! empty($attributes['datetime_id'])) {
-            $datetime = EEM_Datetime::instance()->get_one_by_ID($attributes['datetime_id']);
-            if ($datetime instanceof EE_Datetime) {
-                return $datetime;
-            }
-        }
-        return null;
-    }
+	/**
+	 * @param array $attributes
+	 * @return EE_Datetime|null
+	 * @throws EE_Error
+	 * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
+	 * @throws \EventEspresso\core\exceptions\InvalidInterfaceException
+	 * @throws \InvalidArgumentException
+	 */
+	private function getDatetime(array $attributes)
+	{
+		if (! empty($attributes['datetime_id'])) {
+			$datetime = EEM_Datetime::instance()->get_one_by_ID($attributes['datetime_id']);
+			if ($datetime instanceof EE_Datetime) {
+				return $datetime;
+			}
+		}
+		return null;
+	}
 
 
-    /**
-     * @param array $attributes
-     * @return \EE_Base_Class|EE_Ticket|null
-     * @throws EE_Error
-     * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
-     * @throws \EventEspresso\core\exceptions\InvalidInterfaceException
-     * @throws \InvalidArgumentException
-     */
-    private function getTicket(array $attributes)
-    {
-        if (! empty($attributes['ticket_id'])) {
-            $ticket = EEM_Ticket::instance()->get_one_by_ID($attributes['ticket_id']);
-            if ($ticket instanceof EE_Ticket) {
-                return $ticket;
-            }
-        }
-        return null;
-    }
+	/**
+	 * @param array $attributes
+	 * @return \EE_Base_Class|EE_Ticket|null
+	 * @throws EE_Error
+	 * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
+	 * @throws \EventEspresso\core\exceptions\InvalidInterfaceException
+	 * @throws \InvalidArgumentException
+	 */
+	private function getTicket(array $attributes)
+	{
+		if (! empty($attributes['ticket_id'])) {
+			$ticket = EEM_Ticket::instance()->get_one_by_ID($attributes['ticket_id']);
+			if ($ticket instanceof EE_Ticket) {
+				return $ticket;
+			}
+		}
+		return null;
+	}
 
 
-    /**
-     * @param array $attributes
-     * @throws EE_Error
-     */
-    private function setAdditionalQueryParams(array $attributes)
-    {
-        $reg_status_array = EEM_Registration::reg_status_array();
-        if ($attributes['status'] !== 'all' && isset($reg_status_array[$attributes['status']])) {
-            $this->query_params[0]['Registration.STS_ID'] = $attributes['status'];
-        }
-        $this->query_params['group_by'] = array('ATT_ID');
-        $this->query_params['order_by'] = (array)apply_filters(
-            'FHEE__EES_Espresso_Event_Attendees__process_shortcode__order_by',
-            array('ATT_lname' => 'ASC', 'ATT_fname' => 'ASC')
-        );
-    }
+	/**
+	 * @param array $attributes
+	 * @throws EE_Error
+	 */
+	private function setAdditionalQueryParams(array $attributes)
+	{
+		$reg_status_array = EEM_Registration::reg_status_array();
+		if ($attributes['status'] !== 'all' && isset($reg_status_array[$attributes['status']])) {
+			$this->query_params[0]['Registration.STS_ID'] = $attributes['status'];
+		}
+		$this->query_params['group_by'] = array('ATT_ID');
+		$this->query_params['order_by'] = (array)apply_filters(
+			'FHEE__EES_Espresso_Event_Attendees__process_shortcode__order_by',
+			array('ATT_lname' => 'ASC', 'ATT_fname' => 'ASC')
+		);
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -107,7 +107,7 @@ 
     public function processShortcode($attributes = array())
     {
         // grab attributes and merge with defaults
-        $attributes = $this->getAttributes((array)$attributes);
+        $attributes = $this->getAttributes((array) $attributes);
         $archive = is_archive();
         $display_on_archives = filter_var($attributes['display_on_archives'], FILTER_VALIDATE_BOOLEAN);
         // don't display on archives unless 'display_on_archives' is true
@@ -146,7 +146,7 @@ 
      */
     private function getAttributes(array $attributes)
     {
-        return (array)apply_filters(
+        return (array) apply_filters(
             'EES_Espresso_Event_Attendees__process_shortcode__default_shortcode_atts',
             $attributes + array(
                 'event_id'            => null,
@@ -195,7 +195,7 @@ 
      */
     private function validateEntities(array $attributes)
     {
-        if (! $this->template_args['event'] instanceof EE_Event
+        if ( ! $this->template_args['event'] instanceof EE_Event
             || (
                 empty($attributes['event_id'])
                 && $attributes['datetime_id']
@@ -310,7 +310,7 @@ 
      */
     private function getDatetime(array $attributes)
     {
-        if (! empty($attributes['datetime_id'])) {
+        if ( ! empty($attributes['datetime_id'])) {
             $datetime = EEM_Datetime::instance()->get_one_by_ID($attributes['datetime_id']);
             if ($datetime instanceof EE_Datetime) {
                 return $datetime;
@@ -330,7 +330,7 @@ 
      */
     private function getTicket(array $attributes)
     {
-        if (! empty($attributes['ticket_id'])) {
+        if ( ! empty($attributes['ticket_id'])) {
             $ticket = EEM_Ticket::instance()->get_one_by_ID($attributes['ticket_id']);
             if ($ticket instanceof EE_Ticket) {
                 return $ticket;
@@ -351,7 +351,7 @@ 
             $this->query_params[0]['Registration.STS_ID'] = $attributes['status'];
         }
         $this->query_params['group_by'] = array('ATT_ID');
-        $this->query_params['order_by'] = (array)apply_filters(
+        $this->query_params['order_by'] = (array) apply_filters(
             'FHEE__EES_Espresso_Event_Attendees__process_shortcode__order_by',
             array('ATT_lname' => 'ASC', 'ATT_fname' => 'ASC')
         );

core/domain/entities/shortcodes/EspressoCancelled.php

Indentation +66 added lines, -66 removed lines

@@ -20,76 +20,76 @@
 {
 
 
-    /**
-     * the actual shortcode tag that gets registered with WordPress
-     *
-     * @return string
-     */
-    public function getTag()
-    {
-        return 'ESPRESSO_CANCELLED';
-    }
+	/**
+	 * the actual shortcode tag that gets registered with WordPress
+	 *
+	 * @return string
+	 */
+	public function getTag()
+	{
+		return 'ESPRESSO_CANCELLED';
+	}
 
 
-    /**
-     * the time in seconds to cache the results of the processShortcode() method
-     * 0 means the processShortcode() results will NOT be cached at all
-     *
-     * @return int
-     */
-    public function cacheExpiration()
-    {
-        return 0;
-    }
+	/**
+	 * the time in seconds to cache the results of the processShortcode() method
+	 * 0 means the processShortcode() results will NOT be cached at all
+	 *
+	 * @return int
+	 */
+	public function cacheExpiration()
+	{
+		return 0;
+	}
 
 
-    /**
-     * a place for adding any initialization code that needs to run prior to wp_header().
-     * this may be required for shortcodes that utilize a corresponding module,
-     * and need to enqueue assets for that module
-     *
-     * @return void
-     */
-    public function initializeShortcode()
-    {
-        $this->shortcodeHasBeenInitialized();
-    }
+	/**
+	 * a place for adding any initialization code that needs to run prior to wp_header().
+	 * this may be required for shortcodes that utilize a corresponding module,
+	 * and need to enqueue assets for that module
+	 *
+	 * @return void
+	 */
+	public function initializeShortcode()
+	{
+		$this->shortcodeHasBeenInitialized();
+	}
 
 
-    /**
-     * callback that runs when the shortcode is encountered in post content.
-     * IMPORTANT !!!
-     * remember that shortcode content should be RETURNED and NOT echoed out
-     *
-     * @param array $attributes
-     * @return string
-     * @throws \EE_Error
-     */
-    public function processShortcode($attributes = array())
-    {
-        $transaction = EE_Registry::instance()->SSN->get_session_data('transaction');
-        if ($transaction instanceof EE_Transaction) {
-            do_action('AHEE__EES_Espresso_Cancelled__process_shortcode__transaction', $transaction);
-            $registrations = $transaction->registrations();
-            foreach ($registrations as $registration) {
-                if ($registration instanceof EE_Registration) {
-                    do_action('AHEE__EES_Espresso_Cancelled__process_shortcode__registration', $registration);
-                }
-            }
-        }
-        do_action('AHEE__EES_Espresso_Cancelled__process_shortcode__clear_session');
-        // remove all unwanted records from the db
-        if (EE_Registry::instance()->CART instanceof EE_Cart) {
-            EE_Registry::instance()->CART->delete_cart();
-        }
-        EE_Registry::instance()->SSN->clear_session(__CLASS__, __FUNCTION__);
-        return sprintf(
-            __(
-                '%1$sAll unsaved registration information entered during this session has been deleted.%2$s',
-                'event_espresso'
-            ),
-            '<p class="ee-registrations-cancelled-pg ee-attention">',
-            '</p>'
-        );
-    }
+	/**
+	 * callback that runs when the shortcode is encountered in post content.
+	 * IMPORTANT !!!
+	 * remember that shortcode content should be RETURNED and NOT echoed out
+	 *
+	 * @param array $attributes
+	 * @return string
+	 * @throws \EE_Error
+	 */
+	public function processShortcode($attributes = array())
+	{
+		$transaction = EE_Registry::instance()->SSN->get_session_data('transaction');
+		if ($transaction instanceof EE_Transaction) {
+			do_action('AHEE__EES_Espresso_Cancelled__process_shortcode__transaction', $transaction);
+			$registrations = $transaction->registrations();
+			foreach ($registrations as $registration) {
+				if ($registration instanceof EE_Registration) {
+					do_action('AHEE__EES_Espresso_Cancelled__process_shortcode__registration', $registration);
+				}
+			}
+		}
+		do_action('AHEE__EES_Espresso_Cancelled__process_shortcode__clear_session');
+		// remove all unwanted records from the db
+		if (EE_Registry::instance()->CART instanceof EE_Cart) {
+			EE_Registry::instance()->CART->delete_cart();
+		}
+		EE_Registry::instance()->SSN->clear_session(__CLASS__, __FUNCTION__);
+		return sprintf(
+			__(
+				'%1$sAll unsaved registration information entered during this session has been deleted.%2$s',
+				'event_espresso'
+			),
+			'<p class="ee-registrations-cancelled-pg ee-attention">',
+			'</p>'
+		);
+	}
 }