eventespresso / event-espresso-core

core/CPTs/EE_CPT_Strategy.core.php

Indentation +441 added lines, -441 removed lines

@@ -16,445 +16,445 @@
 class EE_CPT_Strategy extends EE_Base
 {
 
-    /**
-     * @var EE_CPT_Strategy $_instance
-     */
-    private static $_instance;
-
-    /**
-     * the current page, if it utilizes CPTs
-     *
-     * @var array $CPT
-     */
-    protected $CPT;
-
-    /**
-     * return value from CustomPostTypeDefinitions::getDefinitions()
-     *
-     * @var array $_CPTs
-     */
-    protected $_CPTs = array();
-
-    /**
-     * @var array $_CPT_taxonomies
-     */
-    protected $_CPT_taxonomies = array();
-
-    /**
-     * @var array $_CPT_terms
-     */
-    protected $_CPT_terms = array();
-
-    /**
-     * @var array $_CPT_endpoints
-     */
-    protected $_CPT_endpoints = array();
-
-    /**
-     * @var EEM_Base $CPT_model
-     */
-    protected $CPT_model;
-
-    /**
-     * @var EventEspresso\Core\CPTs\CptQueryModifier $query_modifier
-     */
-    protected $query_modifier;
-
-
-    /**
-     * @singleton method used to instantiate class object
-     * @param CustomPostTypeDefinitions|null $custom_post_types
-     * @param CustomTaxonomyDefinitions|null $taxonomies
-     * @return EE_CPT_Strategy
-     */
-    public static function instance(
-        CustomPostTypeDefinitions $custom_post_types = null,
-        CustomTaxonomyDefinitions $taxonomies = null
-    ) {
-        // check if class object is instantiated
-        if (! self::$_instance instanceof EE_CPT_Strategy
-            && $custom_post_types instanceof CustomPostTypeDefinitions
-            && $taxonomies instanceof CustomTaxonomyDefinitions
-        ) {
-            self::$_instance = new self($custom_post_types, $taxonomies);
-        }
-        return self::$_instance;
-    }
-
-
-    /**
-     * @param CustomPostTypeDefinitions $custom_post_types
-     * @param CustomTaxonomyDefinitions $taxonomies
-     */
-    protected function __construct(
-        CustomPostTypeDefinitions $custom_post_types,
-        CustomTaxonomyDefinitions $taxonomies
-    ) {
-        // get CPT data
-        $this->_CPTs = $custom_post_types->getDefinitions();
-        $this->_CPT_endpoints = $this->_set_CPT_endpoints();
-        $this->_CPT_taxonomies = $taxonomies->getCustomTaxonomyDefinitions();
-        add_action('pre_get_posts', array($this, 'pre_get_posts'), 5);
-    }
-
-
-    /**
-     * @return array
-     */
-    public function get_CPT_endpoints()
-    {
-        return $this->_CPT_endpoints;
-    }
-
-
-    /**
-     * @return array
-     */
-    public function get_CPT_taxonomies()
-    {
-        return $this->_CPT_taxonomies;
-    }
-
-
-    /**
-     * add CPT "slugs" to array of default espresso "pages"
-     *
-     * @return array
-     */
-    private function _set_CPT_endpoints()
-    {
-        $_CPT_endpoints = array();
-        if (is_array($this->_CPTs)) {
-            foreach ($this->_CPTs as $CPT_type => $CPT) {
-                $_CPT_endpoints [ $CPT['plural_slug'] ] = $CPT_type;
-            }
-        }
-        return $_CPT_endpoints;
-    }
-
-
-    /**
-     * If this query (not just "main" queries (ie, for WP's infamous "loop")) is for an EE CPT, then we want to
-     * supercharge the get_posts query to add our EE stuff (like joining to our tables, selecting extra columns, and
-     * adding EE objects to the post to facilitate further querying of related data etc)
-     *
-     * @param WP_Query $WP_Query
-     * @return void
-     * @throws \EE_Error
-     * @throws \InvalidArgumentException
-     * @throws \EventEspresso\core\exceptions\InvalidInterfaceException
-     * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
-     */
-    public function pre_get_posts($WP_Query)
-    {
-        // check that post-type is set
-        if (! $WP_Query instanceof WP_Query) {
-            return;
-        }
-        // add our conditionals
-        $this->_set_EE_tags_on_WP_Query($WP_Query);
-        // check for terms
-        $this->_set_post_type_for_terms($WP_Query);
-        // make sure paging is always set
-        $this->_set_paging($WP_Query);
-        // is a taxonomy set ?
-        $this->_set_CPT_taxonomies_on_WP_Query($WP_Query);
-        // loop thru post_types if set
-        $this->_process_WP_Query_post_types($WP_Query);
-    }
-
-
-    /**
-     * @param WP_Query $WP_Query
-     * @return void
-     */
-    private function _set_EE_tags_on_WP_Query(WP_Query $WP_Query)
-    {
-        $WP_Query->is_espresso_event_single = false;
-        $WP_Query->is_espresso_event_archive = false;
-        $WP_Query->is_espresso_event_taxonomy = false;
-        $WP_Query->is_espresso_venue_single = false;
-        $WP_Query->is_espresso_venue_archive = false;
-        $WP_Query->is_espresso_venue_taxonomy = false;
-    }
-
-
-    /**
-     * @return void
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    private function _set_CPT_terms()
-    {
-        if (empty($this->_CPT_terms)) {
-            $terms = EEM_Term::instance()->get_all_CPT_post_tags();
-            foreach ($terms as $term) {
-                if ($term instanceof EE_Term) {
-                    $this->_CPT_terms[ $term->slug() ] = $term;
-                }
-            }
-        }
-    }
-
-
-    /**
-     * @param WP_Query $WP_Query
-     * @return void
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    private function _set_post_type_for_terms(WP_Query $WP_Query)
-    {
-        // is a tag set ?
-        if (isset($WP_Query->query['tag'])) {
-            // get term for tag
-            $term = EEM_Term::instance()->get_post_tag_for_event_or_venue($WP_Query->query['tag']);
-            // verify the term
-            if ($term instanceof EE_Term) {
-                $term->post_type = array_merge(array('post', 'page'), (array) $term->post_type);
-                $term->post_type = apply_filters(
-                    'FHEE__EE_CPT_Strategy___set_post_type_for_terms__term_post_type',
-                    $term->post_type,
-                    $term
-                );
-                // if a post type is already set
-                if (isset($WP_Query->query_vars['post_type'])) {
-                    // add to existing array
-                    $term->post_type = array_merge((array) $WP_Query->query_vars['post_type'], $term->post_type);
-                }
-                // just set post_type to our CPT
-                $WP_Query->set('post_type', array_unique($term->post_type));
-            }
-        }
-    }
-
-
-    /**
-     * @param WP_Query $WP_Query
-     * @return void
-     */
-    public function _set_paging($WP_Query)
-    {
-        if ($WP_Query->is_main_query() && apply_filters('FHEE__EE_CPT_Strategy___set_paging', true)) {
-            $page = get_query_var('page') ? get_query_var('page') : null;
-            $paged = get_query_var('paged') ? get_query_var('paged') : $page;
-            $WP_Query->set('paged', $paged);
-        }
-    }
-
-
-    /**
-     * @param \WP_Query $WP_Query
-     */
-    protected function _set_CPT_taxonomies_on_WP_Query(WP_Query $WP_Query)
-    {
-        // is a taxonomy set ?
-        if ($WP_Query->is_tax) {
-            // loop thru our taxonomies
-            foreach ($this->_CPT_taxonomies as $CPT_taxonomy => $CPT_taxonomy_details) {
-                // check if one of our taxonomies is set as a query var
-                if (isset($WP_Query->query[ $CPT_taxonomy ])) {
-                    // but which CPT does that correspond to??? hmmm... guess we gotta go looping
-                    foreach ($this->_CPTs as $post_type => $CPT) {
-                        // verify our CPT has args, is public and has taxonomies set
-                        if (isset($CPT['args']['public'])
-                            && $CPT['args']['public']
-                            && ! empty($CPT['args']['taxonomies'])
-                            && in_array($CPT_taxonomy, $CPT['args']['taxonomies'], true)
-                        ) {
-                            // if so, then add this CPT post_type to the current query's array of post_types'
-                            $WP_Query->query_vars['post_type'] = isset($WP_Query->query_vars['post_type'])
-                                ? (array) $WP_Query->query_vars['post_type']
-                                : array();
-                            $WP_Query->query_vars['post_type'][] = $post_type;
-                            switch ($post_type) {
-                                case 'espresso_events':
-                                    $WP_Query->is_espresso_event_taxonomy = true;
-                                    break;
-                                case 'espresso_venues':
-                                    $WP_Query->is_espresso_venue_taxonomy = true;
-                                    break;
-                                default:
-                                    do_action(
-                                        'AHEE__EE_CPT_Strategy___set_CPT_taxonomies_on_WP_Query__for_' . $post_type . '_post_type',
-                                        $WP_Query,
-                                        $this
-                                    );
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-
-    /**
-     * @param \WP_Query $WP_Query
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    protected function _process_WP_Query_post_types(WP_Query $WP_Query)
-    {
-        if (isset($WP_Query->query_vars['post_type'])) {
-            // loop thru post_types as array
-            foreach ((array) $WP_Query->query_vars['post_type'] as $post_type) {
-                // is current query for an EE CPT ?
-                if (isset($this->_CPTs[ $post_type ])) {
-                    // is EE on or off ?
-                    if (EE_Maintenance_Mode::instance()->level()) {
-                        // reroute CPT template view to maintenance_mode.template.php
-                        if (! has_filter('template_include', array('EE_Maintenance_Mode', 'template_include'))) {
-                            add_filter('template_include', array('EE_Maintenance_Mode', 'template_include'), 99999);
-                        }
-                        if (has_filter('the_content', array(EE_Maintenance_Mode::instance(), 'the_content'))) {
-                            add_filter('the_content', array($this, 'inject_EE_shortcode_placeholder'), 1);
-                        }
-                        return;
-                    }
-                    $this->_generate_CptQueryModifier($WP_Query, $post_type);
-                }
-            }
-        }
-    }
-
-
-    /**
-     * @param \WP_Query $WP_Query
-     * @param string    $post_type
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    protected function _generate_CptQueryModifier(WP_Query $WP_Query, $post_type)
-    {
-        $this->query_modifier = LoaderFactory::getLoader()->getShared(
-            'EventEspresso\core\CPTs\CptQueryModifier',
-            array(
-                $post_type,
-                $this->_CPTs[ $post_type ],
-                $WP_Query,
-            )
-        );
-        $this->_CPT_taxonomies = $this->query_modifier->taxonomies();
-    }
-
-
-    /**
-     * inject_EE_shortcode_placeholder
-     * in order to display the M-Mode notice on our CPT routes,
-     * we need to first inject what looks like one of our shortcodes,
-     * so that it can be replaced with the actual M-Mode notice
-     *
-     * @return string
-     */
-    public function inject_EE_shortcode_placeholder()
-    {
-        return '[ESPRESSO_';
-    }
-
-
-    /**
-     * @deprecated
-     * @since  4.8.41
-     * @return void
-     */
-    public function _possibly_set_ee_request_var()
-    {
-        $this->query_modifier->setRequestVarsIfCpt();
-    }
-
-
-    /**
-     * @deprecated
-     * @since  4.8.41
-     * @param  $SQL
-     * @return string
-     */
-    public function posts_fields($SQL)
-    {
-        if ($this->query_modifier instanceof EventEspresso\Core\CPTs\CptQueryModifier) {
-            return $this->query_modifier->postsFields($SQL);
-        }
-        return $SQL;
-    }
-
-
-    /**
-     * @deprecated
-     * @since  4.8.41
-     * @param  $SQL
-     * @return string
-     */
-    public function posts_join($SQL)
-    {
-        if ($this->query_modifier instanceof EventEspresso\Core\CPTs\CptQueryModifier) {
-            return $this->query_modifier->postsJoin($SQL);
-        }
-        return $SQL;
-    }
-
-
-    /**
-     * @deprecated
-     * @since  4.8.41
-     * @param  \WP_Post[] $posts
-     * @return \WP_Post[]
-     */
-    public function the_posts($posts)
-    {
-        if ($this->query_modifier instanceof EventEspresso\Core\CPTs\CptQueryModifier) {
-            $this->query_modifier->thePosts($posts);
-        }
-        return $posts;
-    }
-
-
-    /**
-     * @deprecated
-     * @since  4.8.41
-     * @param $url
-     * @param $ID
-     * @return string
-     */
-    public function get_edit_post_link($url, $ID)
-    {
-        if ($this->query_modifier instanceof EventEspresso\Core\CPTs\CptQueryModifier) {
-            return $this->query_modifier->getEditPostLink($url, $ID);
-        }
-        return '';
-    }
-
-
-    /**
-     * @deprecated
-     * @since  4.8.41
-     * @param null $WP_Query
-     */
-    protected function _do_template_filters($WP_Query = null)
-    {
-        if ($this->query_modifier instanceof EventEspresso\Core\CPTs\CptQueryModifier) {
-            $this->query_modifier->addTemplateFilters();
-        }
-    }
-
-
-    /**
-     * @deprecated
-     * @since  4.8.41
-     * @param string $current_template Existing default template path derived for this page call.
-     * @return string the path to the full template file.
-     */
-    public function single_cpt_template($current_template)
-    {
-        if ($this->query_modifier instanceof EventEspresso\Core\CPTs\CptQueryModifier) {
-            return $this->query_modifier->singleCptTemplate($current_template);
-        }
-        return $current_template;
-    }
+	/**
+	 * @var EE_CPT_Strategy $_instance
+	 */
+	private static $_instance;
+
+	/**
+	 * the current page, if it utilizes CPTs
+	 *
+	 * @var array $CPT
+	 */
+	protected $CPT;
+
+	/**
+	 * return value from CustomPostTypeDefinitions::getDefinitions()
+	 *
+	 * @var array $_CPTs
+	 */
+	protected $_CPTs = array();
+
+	/**
+	 * @var array $_CPT_taxonomies
+	 */
+	protected $_CPT_taxonomies = array();
+
+	/**
+	 * @var array $_CPT_terms
+	 */
+	protected $_CPT_terms = array();
+
+	/**
+	 * @var array $_CPT_endpoints
+	 */
+	protected $_CPT_endpoints = array();
+
+	/**
+	 * @var EEM_Base $CPT_model
+	 */
+	protected $CPT_model;
+
+	/**
+	 * @var EventEspresso\Core\CPTs\CptQueryModifier $query_modifier
+	 */
+	protected $query_modifier;
+
+
+	/**
+	 * @singleton method used to instantiate class object
+	 * @param CustomPostTypeDefinitions|null $custom_post_types
+	 * @param CustomTaxonomyDefinitions|null $taxonomies
+	 * @return EE_CPT_Strategy
+	 */
+	public static function instance(
+		CustomPostTypeDefinitions $custom_post_types = null,
+		CustomTaxonomyDefinitions $taxonomies = null
+	) {
+		// check if class object is instantiated
+		if (! self::$_instance instanceof EE_CPT_Strategy
+			&& $custom_post_types instanceof CustomPostTypeDefinitions
+			&& $taxonomies instanceof CustomTaxonomyDefinitions
+		) {
+			self::$_instance = new self($custom_post_types, $taxonomies);
+		}
+		return self::$_instance;
+	}
+
+
+	/**
+	 * @param CustomPostTypeDefinitions $custom_post_types
+	 * @param CustomTaxonomyDefinitions $taxonomies
+	 */
+	protected function __construct(
+		CustomPostTypeDefinitions $custom_post_types,
+		CustomTaxonomyDefinitions $taxonomies
+	) {
+		// get CPT data
+		$this->_CPTs = $custom_post_types->getDefinitions();
+		$this->_CPT_endpoints = $this->_set_CPT_endpoints();
+		$this->_CPT_taxonomies = $taxonomies->getCustomTaxonomyDefinitions();
+		add_action('pre_get_posts', array($this, 'pre_get_posts'), 5);
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function get_CPT_endpoints()
+	{
+		return $this->_CPT_endpoints;
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function get_CPT_taxonomies()
+	{
+		return $this->_CPT_taxonomies;
+	}
+
+
+	/**
+	 * add CPT "slugs" to array of default espresso "pages"
+	 *
+	 * @return array
+	 */
+	private function _set_CPT_endpoints()
+	{
+		$_CPT_endpoints = array();
+		if (is_array($this->_CPTs)) {
+			foreach ($this->_CPTs as $CPT_type => $CPT) {
+				$_CPT_endpoints [ $CPT['plural_slug'] ] = $CPT_type;
+			}
+		}
+		return $_CPT_endpoints;
+	}
+
+
+	/**
+	 * If this query (not just "main" queries (ie, for WP's infamous "loop")) is for an EE CPT, then we want to
+	 * supercharge the get_posts query to add our EE stuff (like joining to our tables, selecting extra columns, and
+	 * adding EE objects to the post to facilitate further querying of related data etc)
+	 *
+	 * @param WP_Query $WP_Query
+	 * @return void
+	 * @throws \EE_Error
+	 * @throws \InvalidArgumentException
+	 * @throws \EventEspresso\core\exceptions\InvalidInterfaceException
+	 * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
+	 */
+	public function pre_get_posts($WP_Query)
+	{
+		// check that post-type is set
+		if (! $WP_Query instanceof WP_Query) {
+			return;
+		}
+		// add our conditionals
+		$this->_set_EE_tags_on_WP_Query($WP_Query);
+		// check for terms
+		$this->_set_post_type_for_terms($WP_Query);
+		// make sure paging is always set
+		$this->_set_paging($WP_Query);
+		// is a taxonomy set ?
+		$this->_set_CPT_taxonomies_on_WP_Query($WP_Query);
+		// loop thru post_types if set
+		$this->_process_WP_Query_post_types($WP_Query);
+	}
+
+
+	/**
+	 * @param WP_Query $WP_Query
+	 * @return void
+	 */
+	private function _set_EE_tags_on_WP_Query(WP_Query $WP_Query)
+	{
+		$WP_Query->is_espresso_event_single = false;
+		$WP_Query->is_espresso_event_archive = false;
+		$WP_Query->is_espresso_event_taxonomy = false;
+		$WP_Query->is_espresso_venue_single = false;
+		$WP_Query->is_espresso_venue_archive = false;
+		$WP_Query->is_espresso_venue_taxonomy = false;
+	}
+
+
+	/**
+	 * @return void
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	private function _set_CPT_terms()
+	{
+		if (empty($this->_CPT_terms)) {
+			$terms = EEM_Term::instance()->get_all_CPT_post_tags();
+			foreach ($terms as $term) {
+				if ($term instanceof EE_Term) {
+					$this->_CPT_terms[ $term->slug() ] = $term;
+				}
+			}
+		}
+	}
+
+
+	/**
+	 * @param WP_Query $WP_Query
+	 * @return void
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	private function _set_post_type_for_terms(WP_Query $WP_Query)
+	{
+		// is a tag set ?
+		if (isset($WP_Query->query['tag'])) {
+			// get term for tag
+			$term = EEM_Term::instance()->get_post_tag_for_event_or_venue($WP_Query->query['tag']);
+			// verify the term
+			if ($term instanceof EE_Term) {
+				$term->post_type = array_merge(array('post', 'page'), (array) $term->post_type);
+				$term->post_type = apply_filters(
+					'FHEE__EE_CPT_Strategy___set_post_type_for_terms__term_post_type',
+					$term->post_type,
+					$term
+				);
+				// if a post type is already set
+				if (isset($WP_Query->query_vars['post_type'])) {
+					// add to existing array
+					$term->post_type = array_merge((array) $WP_Query->query_vars['post_type'], $term->post_type);
+				}
+				// just set post_type to our CPT
+				$WP_Query->set('post_type', array_unique($term->post_type));
+			}
+		}
+	}
+
+
+	/**
+	 * @param WP_Query $WP_Query
+	 * @return void
+	 */
+	public function _set_paging($WP_Query)
+	{
+		if ($WP_Query->is_main_query() && apply_filters('FHEE__EE_CPT_Strategy___set_paging', true)) {
+			$page = get_query_var('page') ? get_query_var('page') : null;
+			$paged = get_query_var('paged') ? get_query_var('paged') : $page;
+			$WP_Query->set('paged', $paged);
+		}
+	}
+
+
+	/**
+	 * @param \WP_Query $WP_Query
+	 */
+	protected function _set_CPT_taxonomies_on_WP_Query(WP_Query $WP_Query)
+	{
+		// is a taxonomy set ?
+		if ($WP_Query->is_tax) {
+			// loop thru our taxonomies
+			foreach ($this->_CPT_taxonomies as $CPT_taxonomy => $CPT_taxonomy_details) {
+				// check if one of our taxonomies is set as a query var
+				if (isset($WP_Query->query[ $CPT_taxonomy ])) {
+					// but which CPT does that correspond to??? hmmm... guess we gotta go looping
+					foreach ($this->_CPTs as $post_type => $CPT) {
+						// verify our CPT has args, is public and has taxonomies set
+						if (isset($CPT['args']['public'])
+							&& $CPT['args']['public']
+							&& ! empty($CPT['args']['taxonomies'])
+							&& in_array($CPT_taxonomy, $CPT['args']['taxonomies'], true)
+						) {
+							// if so, then add this CPT post_type to the current query's array of post_types'
+							$WP_Query->query_vars['post_type'] = isset($WP_Query->query_vars['post_type'])
+								? (array) $WP_Query->query_vars['post_type']
+								: array();
+							$WP_Query->query_vars['post_type'][] = $post_type;
+							switch ($post_type) {
+								case 'espresso_events':
+									$WP_Query->is_espresso_event_taxonomy = true;
+									break;
+								case 'espresso_venues':
+									$WP_Query->is_espresso_venue_taxonomy = true;
+									break;
+								default:
+									do_action(
+										'AHEE__EE_CPT_Strategy___set_CPT_taxonomies_on_WP_Query__for_' . $post_type . '_post_type',
+										$WP_Query,
+										$this
+									);
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+
+	/**
+	 * @param \WP_Query $WP_Query
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	protected function _process_WP_Query_post_types(WP_Query $WP_Query)
+	{
+		if (isset($WP_Query->query_vars['post_type'])) {
+			// loop thru post_types as array
+			foreach ((array) $WP_Query->query_vars['post_type'] as $post_type) {
+				// is current query for an EE CPT ?
+				if (isset($this->_CPTs[ $post_type ])) {
+					// is EE on or off ?
+					if (EE_Maintenance_Mode::instance()->level()) {
+						// reroute CPT template view to maintenance_mode.template.php
+						if (! has_filter('template_include', array('EE_Maintenance_Mode', 'template_include'))) {
+							add_filter('template_include', array('EE_Maintenance_Mode', 'template_include'), 99999);
+						}
+						if (has_filter('the_content', array(EE_Maintenance_Mode::instance(), 'the_content'))) {
+							add_filter('the_content', array($this, 'inject_EE_shortcode_placeholder'), 1);
+						}
+						return;
+					}
+					$this->_generate_CptQueryModifier($WP_Query, $post_type);
+				}
+			}
+		}
+	}
+
+
+	/**
+	 * @param \WP_Query $WP_Query
+	 * @param string    $post_type
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	protected function _generate_CptQueryModifier(WP_Query $WP_Query, $post_type)
+	{
+		$this->query_modifier = LoaderFactory::getLoader()->getShared(
+			'EventEspresso\core\CPTs\CptQueryModifier',
+			array(
+				$post_type,
+				$this->_CPTs[ $post_type ],
+				$WP_Query,
+			)
+		);
+		$this->_CPT_taxonomies = $this->query_modifier->taxonomies();
+	}
+
+
+	/**
+	 * inject_EE_shortcode_placeholder
+	 * in order to display the M-Mode notice on our CPT routes,
+	 * we need to first inject what looks like one of our shortcodes,
+	 * so that it can be replaced with the actual M-Mode notice
+	 *
+	 * @return string
+	 */
+	public function inject_EE_shortcode_placeholder()
+	{
+		return '[ESPRESSO_';
+	}
+
+
+	/**
+	 * @deprecated
+	 * @since  4.8.41
+	 * @return void
+	 */
+	public function _possibly_set_ee_request_var()
+	{
+		$this->query_modifier->setRequestVarsIfCpt();
+	}
+
+
+	/**
+	 * @deprecated
+	 * @since  4.8.41
+	 * @param  $SQL
+	 * @return string
+	 */
+	public function posts_fields($SQL)
+	{
+		if ($this->query_modifier instanceof EventEspresso\Core\CPTs\CptQueryModifier) {
+			return $this->query_modifier->postsFields($SQL);
+		}
+		return $SQL;
+	}
+
+
+	/**
+	 * @deprecated
+	 * @since  4.8.41
+	 * @param  $SQL
+	 * @return string
+	 */
+	public function posts_join($SQL)
+	{
+		if ($this->query_modifier instanceof EventEspresso\Core\CPTs\CptQueryModifier) {
+			return $this->query_modifier->postsJoin($SQL);
+		}
+		return $SQL;
+	}
+
+
+	/**
+	 * @deprecated
+	 * @since  4.8.41
+	 * @param  \WP_Post[] $posts
+	 * @return \WP_Post[]
+	 */
+	public function the_posts($posts)
+	{
+		if ($this->query_modifier instanceof EventEspresso\Core\CPTs\CptQueryModifier) {
+			$this->query_modifier->thePosts($posts);
+		}
+		return $posts;
+	}
+
+
+	/**
+	 * @deprecated
+	 * @since  4.8.41
+	 * @param $url
+	 * @param $ID
+	 * @return string
+	 */
+	public function get_edit_post_link($url, $ID)
+	{
+		if ($this->query_modifier instanceof EventEspresso\Core\CPTs\CptQueryModifier) {
+			return $this->query_modifier->getEditPostLink($url, $ID);
+		}
+		return '';
+	}
+
+
+	/**
+	 * @deprecated
+	 * @since  4.8.41
+	 * @param null $WP_Query
+	 */
+	protected function _do_template_filters($WP_Query = null)
+	{
+		if ($this->query_modifier instanceof EventEspresso\Core\CPTs\CptQueryModifier) {
+			$this->query_modifier->addTemplateFilters();
+		}
+	}
+
+
+	/**
+	 * @deprecated
+	 * @since  4.8.41
+	 * @param string $current_template Existing default template path derived for this page call.
+	 * @return string the path to the full template file.
+	 */
+	public function single_cpt_template($current_template)
+	{
+		if ($this->query_modifier instanceof EventEspresso\Core\CPTs\CptQueryModifier) {
+			return $this->query_modifier->singleCptTemplate($current_template);
+		}
+		return $current_template;
+	}
 }

Spacing +9 added lines, -9 removed lines

@@ -72,7 +72,7 @@ 
         CustomTaxonomyDefinitions $taxonomies = null
     ) {
         // check if class object is instantiated
-        if (! self::$_instance instanceof EE_CPT_Strategy
+        if ( ! self::$_instance instanceof EE_CPT_Strategy
             && $custom_post_types instanceof CustomPostTypeDefinitions
             && $taxonomies instanceof CustomTaxonomyDefinitions
         ) {
@@ -126,7 +126,7 @@ 
         $_CPT_endpoints = array();
         if (is_array($this->_CPTs)) {
             foreach ($this->_CPTs as $CPT_type => $CPT) {
-                $_CPT_endpoints [ $CPT['plural_slug'] ] = $CPT_type;
+                $_CPT_endpoints [$CPT['plural_slug']] = $CPT_type;
             }
         }
         return $_CPT_endpoints;
@@ -148,7 +148,7 @@ 
     public function pre_get_posts($WP_Query)
     {
         // check that post-type is set
-        if (! $WP_Query instanceof WP_Query) {
+        if ( ! $WP_Query instanceof WP_Query) {
             return;
         }
         // add our conditionals
@@ -192,7 +192,7 @@ 
             $terms = EEM_Term::instance()->get_all_CPT_post_tags();
             foreach ($terms as $term) {
                 if ($term instanceof EE_Term) {
-                    $this->_CPT_terms[ $term->slug() ] = $term;
+                    $this->_CPT_terms[$term->slug()] = $term;
                 }
             }
         }
@@ -257,7 +257,7 @@ 
             // loop thru our taxonomies
             foreach ($this->_CPT_taxonomies as $CPT_taxonomy => $CPT_taxonomy_details) {
                 // check if one of our taxonomies is set as a query var
-                if (isset($WP_Query->query[ $CPT_taxonomy ])) {
+                if (isset($WP_Query->query[$CPT_taxonomy])) {
                     // but which CPT does that correspond to??? hmmm... guess we gotta go looping
                     foreach ($this->_CPTs as $post_type => $CPT) {
                         // verify our CPT has args, is public and has taxonomies set
@@ -280,7 +280,7 @@ 
                                     break;
                                 default:
                                     do_action(
-                                        'AHEE__EE_CPT_Strategy___set_CPT_taxonomies_on_WP_Query__for_' . $post_type . '_post_type',
+                                        'AHEE__EE_CPT_Strategy___set_CPT_taxonomies_on_WP_Query__for_'.$post_type.'_post_type',
                                         $WP_Query,
                                         $this
                                     );
@@ -305,11 +305,11 @@ 
             // loop thru post_types as array
             foreach ((array) $WP_Query->query_vars['post_type'] as $post_type) {
                 // is current query for an EE CPT ?
-                if (isset($this->_CPTs[ $post_type ])) {
+                if (isset($this->_CPTs[$post_type])) {
                     // is EE on or off ?
                     if (EE_Maintenance_Mode::instance()->level()) {
                         // reroute CPT template view to maintenance_mode.template.php
-                        if (! has_filter('template_include', array('EE_Maintenance_Mode', 'template_include'))) {
+                        if ( ! has_filter('template_include', array('EE_Maintenance_Mode', 'template_include'))) {
                             add_filter('template_include', array('EE_Maintenance_Mode', 'template_include'), 99999);
                         }
                         if (has_filter('the_content', array(EE_Maintenance_Mode::instance(), 'the_content'))) {
@@ -337,7 +337,7 @@ 
             'EventEspresso\core\CPTs\CptQueryModifier',
             array(
                 $post_type,
-                $this->_CPTs[ $post_type ],
+                $this->_CPTs[$post_type],
                 $WP_Query,
             )
         );

core/db_models/EEM_Term.model.php

Indentation +237 added lines, -237 removed lines

@@ -14,263 +14,263 @@
 class EEM_Term extends EEM_Base
 {
 
-    // private instance of the Attendee object
-    protected static $_instance = null;
+	// private instance of the Attendee object
+	protected static $_instance = null;
 
 
 
-    /**
-     *__construct
-     *
-     * @param string $timezone
-     */
-    protected function __construct($timezone = null)
-    {
-        $this->singular_item = __('Term', 'event_espresso');
-        $this->plural_item = __('Terms', 'event_espresso');
-        $this->_tables = array(
-            'Term' => new EE_Primary_Table('terms', 'term_id'),
-        );
-        $this->_fields = array(
-            'Term' => array(
-                'term_id'    => new EE_Primary_Key_Int_Field('term_id', __('Term ID', 'event_espresso')),
-                'name'       => new EE_Plain_Text_Field('name', __('Term Name', 'event_espresso'), false, ''),
-                'slug'       => new EE_Slug_Field('slug', __('Term Slug', 'event_espresso'), false),
-                'term_group' => new EE_Integer_Field('term_group', __("Term Group", "event_espresso"), false, 0),
-            ),
-        );
-        $this->_model_relations = array(
-            'Term_Taxonomy' => new EE_Has_Many_Relation(),
-        );
-        $this->_wp_core_model = true;
-        $path_to_tax_model = 'Term_Taxonomy';
-        $this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
-        $this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Taxonomy_Protected(
-            $path_to_tax_model
-        );
-        $this->_cap_restriction_generators[ EEM_Base::caps_edit ] = false;
-        $this->_cap_restriction_generators[ EEM_Base::caps_delete ] = false;
-        $path_to_tax_model = $path_to_tax_model . '.';
-        // add cap restrictions for editing relating to the "ee_edit_*"
-        $this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_event_category'] = new EE_Default_Where_Conditions(
-            array(
-                $path_to_tax_model . 'taxonomy*ee_edit_event_category' => array('!=', 'espresso_event_categories'),
-            )
-        );
-        $this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_venue_category'] = new EE_Default_Where_Conditions(
-            array(
-                $path_to_tax_model . 'taxonomy*ee_edit_venue_category' => array('!=', 'espresso_venue_categories'),
-            )
-        );
-        $this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_event_type'] = new EE_Default_Where_Conditions(
-            array(
-                $path_to_tax_model . 'taxonomy*ee_edit_event_type' => array('!=', 'espresso_event_type'),
-            )
-        );
-        // add cap restrictions for deleting relating to the "ee_deleting_*"
-        $this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_event_category'] = new EE_Default_Where_Conditions(
-            array(
-                $path_to_tax_model . 'taxonomy*ee_delete_event_category' => array('!=', 'espresso_event_categories'),
-            )
-        );
-        $this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_venue_category'] = new EE_Default_Where_Conditions(
-            array(
-                $path_to_tax_model . 'taxonomy*ee_delete_venue_category' => array('!=', 'espresso_venue_categories'),
-            )
-        );
-        $this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_event_type'] = new EE_Default_Where_Conditions(
-            array(
-                $path_to_tax_model . 'taxonomy*ee_delete_event_type' => array('!=', 'espresso_event_type'),
-            )
-        );
-        parent::__construct($timezone);
-        add_filter('FHEE__Read__create_model_query_params', array('EEM_Term', 'rest_api_query_params'), 10, 3);
-    }
+	/**
+	 *__construct
+	 *
+	 * @param string $timezone
+	 */
+	protected function __construct($timezone = null)
+	{
+		$this->singular_item = __('Term', 'event_espresso');
+		$this->plural_item = __('Terms', 'event_espresso');
+		$this->_tables = array(
+			'Term' => new EE_Primary_Table('terms', 'term_id'),
+		);
+		$this->_fields = array(
+			'Term' => array(
+				'term_id'    => new EE_Primary_Key_Int_Field('term_id', __('Term ID', 'event_espresso')),
+				'name'       => new EE_Plain_Text_Field('name', __('Term Name', 'event_espresso'), false, ''),
+				'slug'       => new EE_Slug_Field('slug', __('Term Slug', 'event_espresso'), false),
+				'term_group' => new EE_Integer_Field('term_group', __("Term Group", "event_espresso"), false, 0),
+			),
+		);
+		$this->_model_relations = array(
+			'Term_Taxonomy' => new EE_Has_Many_Relation(),
+		);
+		$this->_wp_core_model = true;
+		$path_to_tax_model = 'Term_Taxonomy';
+		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
+		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Taxonomy_Protected(
+			$path_to_tax_model
+		);
+		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = false;
+		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = false;
+		$path_to_tax_model = $path_to_tax_model . '.';
+		// add cap restrictions for editing relating to the "ee_edit_*"
+		$this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_event_category'] = new EE_Default_Where_Conditions(
+			array(
+				$path_to_tax_model . 'taxonomy*ee_edit_event_category' => array('!=', 'espresso_event_categories'),
+			)
+		);
+		$this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_venue_category'] = new EE_Default_Where_Conditions(
+			array(
+				$path_to_tax_model . 'taxonomy*ee_edit_venue_category' => array('!=', 'espresso_venue_categories'),
+			)
+		);
+		$this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_event_type'] = new EE_Default_Where_Conditions(
+			array(
+				$path_to_tax_model . 'taxonomy*ee_edit_event_type' => array('!=', 'espresso_event_type'),
+			)
+		);
+		// add cap restrictions for deleting relating to the "ee_deleting_*"
+		$this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_event_category'] = new EE_Default_Where_Conditions(
+			array(
+				$path_to_tax_model . 'taxonomy*ee_delete_event_category' => array('!=', 'espresso_event_categories'),
+			)
+		);
+		$this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_venue_category'] = new EE_Default_Where_Conditions(
+			array(
+				$path_to_tax_model . 'taxonomy*ee_delete_venue_category' => array('!=', 'espresso_venue_categories'),
+			)
+		);
+		$this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_event_type'] = new EE_Default_Where_Conditions(
+			array(
+				$path_to_tax_model . 'taxonomy*ee_delete_event_type' => array('!=', 'espresso_event_type'),
+			)
+		);
+		parent::__construct($timezone);
+		add_filter('FHEE__Read__create_model_query_params', array('EEM_Term', 'rest_api_query_params'), 10, 3);
+	}
 
 
 
-    /**
-     * retrieves a list of all EE event categories
-     *
-     * @access public
-     * @param bool $show_uncategorized
-     * @return \EE_Base_Class[]
-     */
-    public function get_all_ee_categories($show_uncategorized = false)
-    {
-        $where_params = array(
-            'Term_Taxonomy.taxonomy' => 'espresso_event_categories',
-            'NOT'                    => array('name' => __('Uncategorized', 'event_espresso')),
-        );
-        if ($show_uncategorized) {
-            unset($where_params['NOT']);
-        }
-        return EEM_Term::instance()->get_all(
-            array(
-                $where_params,
-                'order_by' => array('name' => 'ASC'),
-            )
-        );
-    }
+	/**
+	 * retrieves a list of all EE event categories
+	 *
+	 * @access public
+	 * @param bool $show_uncategorized
+	 * @return \EE_Base_Class[]
+	 */
+	public function get_all_ee_categories($show_uncategorized = false)
+	{
+		$where_params = array(
+			'Term_Taxonomy.taxonomy' => 'espresso_event_categories',
+			'NOT'                    => array('name' => __('Uncategorized', 'event_espresso')),
+		);
+		if ($show_uncategorized) {
+			unset($where_params['NOT']);
+		}
+		return EEM_Term::instance()->get_all(
+			array(
+				$where_params,
+				'order_by' => array('name' => 'ASC'),
+			)
+		);
+	}
 
 
 
-    /**
-     * retrieves a list of all post_tags associated with an EE CPT
-     *
-     * @access public
-     * @param string $post_type
-     * @return array
-     */
-    public function get_all_CPT_post_tags($post_type = '')
-    {
-        switch ($post_type) {
-            case 'espresso_events':
-                return $this->get_all_event_post_tags();
-                break;
-            case 'espresso_venues':
-                return $this->get_all_venue_post_tags();
-                break;
-            default:
-                $event_tags = $this->get_all_event_post_tags();
-                $venue_tags = $this->get_all_venue_post_tags();
-                return array_merge($event_tags, $venue_tags);
-        }
-    }
+	/**
+	 * retrieves a list of all post_tags associated with an EE CPT
+	 *
+	 * @access public
+	 * @param string $post_type
+	 * @return array
+	 */
+	public function get_all_CPT_post_tags($post_type = '')
+	{
+		switch ($post_type) {
+			case 'espresso_events':
+				return $this->get_all_event_post_tags();
+				break;
+			case 'espresso_venues':
+				return $this->get_all_venue_post_tags();
+				break;
+			default:
+				$event_tags = $this->get_all_event_post_tags();
+				$venue_tags = $this->get_all_venue_post_tags();
+				return array_merge($event_tags, $venue_tags);
+		}
+	}
 
 
-    /**
-     * returns an EE_Term object for the given tag
-     * if it has been utilized by any EE_Events or EE_Venues
-     *
-     * @param string $tag
-     * @return EE_Term|null
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function get_post_tag_for_event_or_venue($tag)
-    {
-        $post_tag_results = $this->get_all_wpdb_results(
-            array(
-                array(
-                    'slug' => $tag,
-                    'Term_Taxonomy.taxonomy' => 'post_tag',
-                    'OR' => array(
-                        'Term_Taxonomy.Venue.post_type' => 'espresso_venues',
-                        'Term_Taxonomy.Event.post_type' => 'espresso_events',
-                    ),
-                ),
-                'default_where_conditions' => 'none',
-                'extra_selects' => array(
-                    'event_post_type' => array('Term_Taxonomy___Event_CPT.post_type', '%s'),
-                    'venue_post_type' => array('Term_Taxonomy___Venue_CPT.post_type', '%s')
-                ),
-                'group_by' => array(
-                    'event_post_type',
-                    'venue_post_type',
-                ),
-                'limit' => 2
-            )
-        );
+	/**
+	 * returns an EE_Term object for the given tag
+	 * if it has been utilized by any EE_Events or EE_Venues
+	 *
+	 * @param string $tag
+	 * @return EE_Term|null
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function get_post_tag_for_event_or_venue($tag)
+	{
+		$post_tag_results = $this->get_all_wpdb_results(
+			array(
+				array(
+					'slug' => $tag,
+					'Term_Taxonomy.taxonomy' => 'post_tag',
+					'OR' => array(
+						'Term_Taxonomy.Venue.post_type' => 'espresso_venues',
+						'Term_Taxonomy.Event.post_type' => 'espresso_events',
+					),
+				),
+				'default_where_conditions' => 'none',
+				'extra_selects' => array(
+					'event_post_type' => array('Term_Taxonomy___Event_CPT.post_type', '%s'),
+					'venue_post_type' => array('Term_Taxonomy___Venue_CPT.post_type', '%s')
+				),
+				'group_by' => array(
+					'event_post_type',
+					'venue_post_type',
+				),
+				'limit' => 2
+			)
+		);
 
-        $post_types = array();
-        foreach ((array) $post_tag_results as $row) {
-            if ($row['event_post_type'] === 'espresso_events') {
-                $post_types[] = EEM_Event::instance()->post_type();
-            } elseif ($row['venue_post_type'] === 'espresso_venues') {
-                $post_types[] = EEM_Venue::instance()->post_type();
-            }
-        }
-        $post_tag_row = reset($post_tag_results);
-        $post_tag = $this->instantiate_class_from_array_or_object($post_tag_row);
-        if (! $post_tag instanceof EE_Term) {
-            return null;
-        }
+		$post_types = array();
+		foreach ((array) $post_tag_results as $row) {
+			if ($row['event_post_type'] === 'espresso_events') {
+				$post_types[] = EEM_Event::instance()->post_type();
+			} elseif ($row['venue_post_type'] === 'espresso_venues') {
+				$post_types[] = EEM_Venue::instance()->post_type();
+			}
+		}
+		$post_tag_row = reset($post_tag_results);
+		$post_tag = $this->instantiate_class_from_array_or_object($post_tag_row);
+		if (! $post_tag instanceof EE_Term) {
+			return null;
+		}
 
-        if ($post_tag->post_type === null) {
-            $post_tag->post_type = array();
-        }
-        $post_tag->post_type = array_merge($post_tag->post_type, array_unique($post_types));
-        return $post_tag;
-    }
+		if ($post_tag->post_type === null) {
+			$post_tag->post_type = array();
+		}
+		$post_tag->post_type = array_merge($post_tag->post_type, array_unique($post_types));
+		return $post_tag;
+	}
 
 
 
-    /**
-     * get_all_event_post_tags
-     *
-     * @return EE_Base_Class[]
-     */
-    public function get_all_event_post_tags()
-    {
-        $post_tags = EEM_Term::instance()->get_all(
-            array(
-                array(
-                    'Term_Taxonomy.taxonomy'        => 'post_tag',
-                    'Term_Taxonomy.Event.post_type' => 'espresso_events',
-                ),
-                'order_by'   => array('name' => 'ASC'),
-                'force_join' => array('Term_Taxonomy.Event'),
-            )
-        );
-        foreach ($post_tags as $key => $post_tag) {
-            if (! isset($post_tags[ $key ]->post_type)) {
-                $post_tags[ $key ]->post_type = array();
-            }
-            $post_tags[ $key ]->post_type[] = 'espresso_events';
-        }
-        return $post_tags;
-    }
+	/**
+	 * get_all_event_post_tags
+	 *
+	 * @return EE_Base_Class[]
+	 */
+	public function get_all_event_post_tags()
+	{
+		$post_tags = EEM_Term::instance()->get_all(
+			array(
+				array(
+					'Term_Taxonomy.taxonomy'        => 'post_tag',
+					'Term_Taxonomy.Event.post_type' => 'espresso_events',
+				),
+				'order_by'   => array('name' => 'ASC'),
+				'force_join' => array('Term_Taxonomy.Event'),
+			)
+		);
+		foreach ($post_tags as $key => $post_tag) {
+			if (! isset($post_tags[ $key ]->post_type)) {
+				$post_tags[ $key ]->post_type = array();
+			}
+			$post_tags[ $key ]->post_type[] = 'espresso_events';
+		}
+		return $post_tags;
+	}
 
 
 
-    /**
-     * get_all_venue_post_tags
-     *
-     * @return EE_Base_Class[]
-     */
-    public function get_all_venue_post_tags()
-    {
-        $post_tags = EEM_Term::instance()->get_all(
-            array(
-                array(
-                    'Term_Taxonomy.taxonomy'        => 'post_tag',
-                    'Term_Taxonomy.Venue.post_type' => 'espresso_venues',
-                ),
-                'order_by'   => array('name' => 'ASC'),
-                'force_join' => array('Term_Taxonomy'),
-            )
-        );
-        foreach ($post_tags as $key => $post_tag) {
-            if (! isset($post_tags[ $key ]->post_type)) {
-                $post_tags[ $key ]->post_type = array();
-            }
-            $post_tags[ $key ]->post_type[] = 'espresso_venues';
-        }
-        return $post_tags;
-    }
+	/**
+	 * get_all_venue_post_tags
+	 *
+	 * @return EE_Base_Class[]
+	 */
+	public function get_all_venue_post_tags()
+	{
+		$post_tags = EEM_Term::instance()->get_all(
+			array(
+				array(
+					'Term_Taxonomy.taxonomy'        => 'post_tag',
+					'Term_Taxonomy.Venue.post_type' => 'espresso_venues',
+				),
+				'order_by'   => array('name' => 'ASC'),
+				'force_join' => array('Term_Taxonomy'),
+			)
+		);
+		foreach ($post_tags as $key => $post_tag) {
+			if (! isset($post_tags[ $key ]->post_type)) {
+				$post_tags[ $key ]->post_type = array();
+			}
+			$post_tags[ $key ]->post_type[] = 'espresso_venues';
+		}
+		return $post_tags;
+	}
 
 
 
-    /**
-     * Makes sure that during REST API queries, we only return terms
-     * for term taxonomies which should be shown in the rest api
-     *
-     * @param array    $model_query_params
-     * @param array    $querystring_query_params
-     * @param EEM_Base $model
-     * @return array
-     */
-    public static function rest_api_query_params($model_query_params, $querystring_query_params, $model)
-    {
-        if ($model === EEM_Term::instance()) {
-            $taxonomies = get_taxonomies(array('show_in_rest' => true));
-            if (! empty($taxonomies)) {
-                $model_query_params[0]['Term_Taxonomy.taxonomy'] = array('IN', $taxonomies);
-            }
-        }
-        return $model_query_params;
-    }
+	/**
+	 * Makes sure that during REST API queries, we only return terms
+	 * for term taxonomies which should be shown in the rest api
+	 *
+	 * @param array    $model_query_params
+	 * @param array    $querystring_query_params
+	 * @param EEM_Base $model
+	 * @return array
+	 */
+	public static function rest_api_query_params($model_query_params, $querystring_query_params, $model)
+	{
+		if ($model === EEM_Term::instance()) {
+			$taxonomies = get_taxonomies(array('show_in_rest' => true));
+			if (! empty($taxonomies)) {
+				$model_query_params[0]['Term_Taxonomy.taxonomy'] = array('IN', $taxonomies);
+			}
+		}
+		return $model_query_params;
+	}
 }

Spacing +25 added lines, -25 removed lines

@@ -44,43 +44,43 @@ 
         );
         $this->_wp_core_model = true;
         $path_to_tax_model = 'Term_Taxonomy';
-        $this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
-        $this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Taxonomy_Protected(
+        $this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
+        $this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Taxonomy_Protected(
             $path_to_tax_model
         );
-        $this->_cap_restriction_generators[ EEM_Base::caps_edit ] = false;
-        $this->_cap_restriction_generators[ EEM_Base::caps_delete ] = false;
-        $path_to_tax_model = $path_to_tax_model . '.';
+        $this->_cap_restriction_generators[EEM_Base::caps_edit] = false;
+        $this->_cap_restriction_generators[EEM_Base::caps_delete] = false;
+        $path_to_tax_model = $path_to_tax_model.'.';
         // add cap restrictions for editing relating to the "ee_edit_*"
-        $this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_event_category'] = new EE_Default_Where_Conditions(
+        $this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_event_category'] = new EE_Default_Where_Conditions(
             array(
-                $path_to_tax_model . 'taxonomy*ee_edit_event_category' => array('!=', 'espresso_event_categories'),
+                $path_to_tax_model.'taxonomy*ee_edit_event_category' => array('!=', 'espresso_event_categories'),
             )
         );
-        $this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_venue_category'] = new EE_Default_Where_Conditions(
+        $this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_venue_category'] = new EE_Default_Where_Conditions(
             array(
-                $path_to_tax_model . 'taxonomy*ee_edit_venue_category' => array('!=', 'espresso_venue_categories'),
+                $path_to_tax_model.'taxonomy*ee_edit_venue_category' => array('!=', 'espresso_venue_categories'),
             )
         );
-        $this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_event_type'] = new EE_Default_Where_Conditions(
+        $this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_event_type'] = new EE_Default_Where_Conditions(
             array(
-                $path_to_tax_model . 'taxonomy*ee_edit_event_type' => array('!=', 'espresso_event_type'),
+                $path_to_tax_model.'taxonomy*ee_edit_event_type' => array('!=', 'espresso_event_type'),
             )
         );
         // add cap restrictions for deleting relating to the "ee_deleting_*"
-        $this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_event_category'] = new EE_Default_Where_Conditions(
+        $this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_event_category'] = new EE_Default_Where_Conditions(
             array(
-                $path_to_tax_model . 'taxonomy*ee_delete_event_category' => array('!=', 'espresso_event_categories'),
+                $path_to_tax_model.'taxonomy*ee_delete_event_category' => array('!=', 'espresso_event_categories'),
             )
         );
-        $this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_venue_category'] = new EE_Default_Where_Conditions(
+        $this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_venue_category'] = new EE_Default_Where_Conditions(
             array(
-                $path_to_tax_model . 'taxonomy*ee_delete_venue_category' => array('!=', 'espresso_venue_categories'),
+                $path_to_tax_model.'taxonomy*ee_delete_venue_category' => array('!=', 'espresso_venue_categories'),
             )
         );
-        $this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_event_type'] = new EE_Default_Where_Conditions(
+        $this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_event_type'] = new EE_Default_Where_Conditions(
             array(
-                $path_to_tax_model . 'taxonomy*ee_delete_event_type' => array('!=', 'espresso_event_type'),
+                $path_to_tax_model.'taxonomy*ee_delete_event_type' => array('!=', 'espresso_event_type'),
             )
         );
         parent::__construct($timezone);
@@ -185,7 +185,7 @@ 
         }
         $post_tag_row = reset($post_tag_results);
         $post_tag = $this->instantiate_class_from_array_or_object($post_tag_row);
-        if (! $post_tag instanceof EE_Term) {
+        if ( ! $post_tag instanceof EE_Term) {
             return null;
         }
 
@@ -216,10 +216,10 @@ 
             )
         );
         foreach ($post_tags as $key => $post_tag) {
-            if (! isset($post_tags[ $key ]->post_type)) {
-                $post_tags[ $key ]->post_type = array();
+            if ( ! isset($post_tags[$key]->post_type)) {
+                $post_tags[$key]->post_type = array();
             }
-            $post_tags[ $key ]->post_type[] = 'espresso_events';
+            $post_tags[$key]->post_type[] = 'espresso_events';
         }
         return $post_tags;
     }
@@ -244,10 +244,10 @@ 
             )
         );
         foreach ($post_tags as $key => $post_tag) {
-            if (! isset($post_tags[ $key ]->post_type)) {
-                $post_tags[ $key ]->post_type = array();
+            if ( ! isset($post_tags[$key]->post_type)) {
+                $post_tags[$key]->post_type = array();
             }
-            $post_tags[ $key ]->post_type[] = 'espresso_venues';
+            $post_tags[$key]->post_type[] = 'espresso_venues';
         }
         return $post_tags;
     }
@@ -267,7 +267,7 @@ 
     {
         if ($model === EEM_Term::instance()) {
             $taxonomies = get_taxonomies(array('show_in_rest' => true));
-            if (! empty($taxonomies)) {
+            if ( ! empty($taxonomies)) {
                 $model_query_params[0]['Term_Taxonomy.taxonomy'] = array('IN', $taxonomies);
             }
         }

core/helpers/EEH_Schema.helper.php

Indentation +270 added lines, -270 removed lines

@@ -12,274 +12,274 @@
 {
 
 
-    /**
-     * generates JSON-based linked data for an event
-     *
-     * @param EE_Event $event
-     * @throws EE_Error
-     */
-    public static function add_json_linked_data_for_event(EE_Event $event)
-    {
-        // Check we have a valid datetime for the event
-        if (! $event->primary_datetime() instanceof EE_Datetime) {
-            return;
-        }
-
-        $template_args = array(
-            'event_permalink' => '',
-            'event_name' => '',
-            'event_description' => '',
-            'event_start' => '',
-            'event_end' => '',
-            'currency' => '',
-            'event_tickets' => array(),
-            'venue_name' => '',
-            'venue_url' => '',
-            'venue_locality' => '',
-            'venue_region' => '',
-            'event_image' => '',
-        );
-        $template_args['event_permalink'] = $event->get_permalink();
-        $template_args['event_name'] = $event->name();
-        $template_args['event_description'] = wp_strip_all_tags($event->short_description(200));
-        // clone datetime so that date formats don't override those for the original datetime
-        $primary_datetime = clone $event->primary_datetime();
-        $template_args['event_start'] = $primary_datetime->start_date(DateTime::ATOM);
-        $template_args['event_end'] = $primary_datetime->end_date(DateTime::ATOM);
-        unset($primary_datetime);
-        $template_args['currency'] = EE_Registry::instance()->CFG->currency->code;
-        foreach ($event->tickets() as $original_ticket) {
-            // clone tickets so that date formats don't override those for the original ticket
-            $ticket= clone $original_ticket;
-            $ID = $ticket->ID();
-            $template_args['event_tickets'][ $ID ]['start_date'] = $ticket->start_date(DateTime::ATOM, null);
-            $template_args['event_tickets'][ $ID ]['end_date'] = $ticket->end_date(DateTime::ATOM, null);
-            $template_args['event_tickets'][ $ID ]['price'] = number_format(
-                $ticket->price(),
-                EE_Registry::instance()->CFG->currency->dec_plc,
-                EE_Registry::instance()->CFG->currency->dec_mrk,
-                EE_Registry::instance()->CFG->currency->thsnds
-            );
-            switch ($ticket->ticket_status()) {
-                case 'TKO':
-                    $availability = 'InStock';
-                    break;
-                case 'TKS':
-                    $availability = 'SoldOut';
-                    break;
-                default:
-                    $availability = null;
-                    break;
-            }
-            $template_args['event_tickets'][ $ID ]['availability'] = $availability;
-            unset($ticket);
-        }
-        $VNU_ID = espresso_venue_id();
-        if (! empty($VNU_ID) && ! espresso_is_venue_private($VNU_ID)) {
-            $venue = EEH_Venue_View::get_venue($VNU_ID);
-            $template_args['venue_name'] = get_the_title($VNU_ID);
-            $template_args['venue_url'] = get_permalink($VNU_ID);
-            $template_args['venue_locality'] = $venue->city();
-            $template_args['venue_region'] = $venue->state_name();
-        }
-        $template_args['event_image'] = $event->feature_image_url();
-        $template_args = apply_filters(
-            'FHEE__EEH_Schema__add_json_linked_data_for_event__template_args',
-            $template_args,
-            $event,
-            $VNU_ID
-        );
-        extract($template_args, EXTR_OVERWRITE);
-        include EE_TEMPLATES . 'json_linked_data_for_event.template.php';
-    }
-
-
-    /**
-     *    location
-     *    The location of the event, organization or action.
-     *    Should include the Venue name AND schema formatted address info
-     *
-     * @access public
-     * @param string $location
-     * @return string
-     */
-    public static function location($location = null)
-    {
-        return ! empty($location) ? '<div itemprop="location" itemscope itemtype="http://schema.org/Place">'
-                                      . $location
-                                      . '</div>' : '';
-    }
-
-
-
-    /**
-     *    name
-     *    The name of the Event or Venue.
-     *
-     * @access public
-     * @param string $name
-     * @return string
-     */
-    public static function name($name = null)
-    {
-        return ! empty($name) ? '<span itemprop="name">' . $name . '</span>' : '';
-    }
-
-
-
-    /**
-     *    streetAddress
-     *    The street address. For example, 1600 Amphitheatre Pkwy.
-     *
-     * @access public
-     * @param EEI_Address $obj_with_address
-     * @return string
-     */
-    public static function streetAddress(EEI_Address $obj_with_address = null)
-    {
-        return $obj_with_address->address() !== null && $obj_with_address->address() !== ''
-            ? '<span itemprop="streetAddress">' . $obj_with_address->address() . '</span>' : '';
-    }
-
-
-
-    /**
-     *    postOfficeBoxNumber
-     *    The post office box number for PO box addresses.
-     *
-     * @access public
-     * @param EEI_Address $obj_with_address
-     * @return string
-     */
-    public static function postOfficeBoxNumber(EEI_Address $obj_with_address = null)
-    {
-        // regex check for some form of PO Box or P.O. Box, etc, etc, etc
-        if (preg_match(
-            "/^\s*((P(OST)?.?\s*(O(FF(ICE)?)?)?.?\s+(B(IN|OX))?)|B(IN|OX))/i",
-            $obj_with_address->address2()
-        ) ) {
-            return $obj_with_address->address2() !== null && $obj_with_address->address2() !== ''
-                ? '<span itemprop="postOfficeBoxNumber">' . $obj_with_address->address2() . '</span>' : '';
-        } else {
-            return $obj_with_address->address2();
-        }
-    }
-
-
-
-    /**
-     *    addressLocality
-     *    The locality (city, town, etc). For example, Mountain View.
-     *
-     * @access public
-     * @param EEI_Address $obj_with_address
-     * @return string
-     */
-    public static function addressLocality(EEI_Address $obj_with_address = null)
-    {
-        return $obj_with_address->city() !== null && $obj_with_address->city() !== ''
-            ? '<span itemprop="addressLocality">' . $obj_with_address->city() . '</span>' : '';
-    }
-
-
-
-    /**
-     *    addressRegion
-     *    The region (state, province, etc). For example, CA.
-     *
-     * @access public
-     * @param EEI_Address $obj_with_address
-     * @return string
-     */
-    public static function addressRegion(EEI_Address $obj_with_address = null)
-    {
-        $state = $obj_with_address->state_name();
-        if (! empty($state)) {
-            return '<span itemprop="addressRegion">' . $state . '</span>';
-        } else {
-            return '';
-        }
-    }
-
-
-
-    /**
-     *    addressCountry
-     *    The country. For example, USA. You can also provide the two-letter ISO 3166-1 alpha-2 country code.
-     *
-     * @access public
-     * @param EEI_Address $obj_with_address
-     * @return string
-     */
-    public static function addressCountry(EEI_Address $obj_with_address = null)
-    {
-        $country = $obj_with_address->country_name();
-        if (! empty($country)) {
-            return '<span itemprop="addressCountry">' . $country . '</span>';
-        } else {
-            return '';
-        }
-    }
-
-
-
-    /**
-     *    postalCode
-     *    The postal code. For example, 94043.
-     *
-     * @access public
-     * @param EEI_Address $obj_with_address
-     * @return string
-     */
-    public static function postalCode(EEI_Address $obj_with_address = null)
-    {
-        return $obj_with_address->zip() !== null && $obj_with_address->zip() !== '' ? '<span itemprop="postalCode">'
-                                                                                      . $obj_with_address->zip()
-                                                                                      . '</span>' : '';
-    }
-
-
-
-    /**
-     *    telephone
-     *    The telephone number.
-     *
-     * @access public
-     * @param string $phone_nmbr
-     * @return string
-     */
-    public static function telephone($phone_nmbr = null)
-    {
-        return $phone_nmbr !== null && $phone_nmbr !== '' ? '<span itemprop="telephone">' . $phone_nmbr . '</span>'
-            : '';
-    }
-
-
-
-    /**
-     *    URL
-     *    URL of the item as a clickable link
-     *
-     * @access public
-     * @param string $url        - the URL that the link will resolve to
-     * @param string $text       - the text that will be used for the visible link
-     * @param array  $attributes - array of additional link attributes in  attribute_name => value pairs. ie: array( 'title' => 'click here', 'class' => 'link-class' )
-     * @return string (link)
-     */
-    public static function url($url = null, $text = null, $attributes = array())
-    {
-        // Check the URL includes a scheme
-        $parsed_url = parse_url($url);
-        if (empty($parsed_url['scheme'])) {
-            $url = 'http://' . ltrim($url, '/');
-        }
-
-        $atts = '';
-        foreach ($attributes as $attribute => $value) {
-            $atts .= ' ' . $attribute . '="' . $value . '"';
-        }
-        $text = $text !== null && $text !== '' ? $text : $url;
-        return $url !== null && $url !== '' ? '<a itemprop="url" href="' . $url . '"' . $atts . '>' . $text . '</a>'
-            : '';
-    }
+	/**
+	 * generates JSON-based linked data for an event
+	 *
+	 * @param EE_Event $event
+	 * @throws EE_Error
+	 */
+	public static function add_json_linked_data_for_event(EE_Event $event)
+	{
+		// Check we have a valid datetime for the event
+		if (! $event->primary_datetime() instanceof EE_Datetime) {
+			return;
+		}
+
+		$template_args = array(
+			'event_permalink' => '',
+			'event_name' => '',
+			'event_description' => '',
+			'event_start' => '',
+			'event_end' => '',
+			'currency' => '',
+			'event_tickets' => array(),
+			'venue_name' => '',
+			'venue_url' => '',
+			'venue_locality' => '',
+			'venue_region' => '',
+			'event_image' => '',
+		);
+		$template_args['event_permalink'] = $event->get_permalink();
+		$template_args['event_name'] = $event->name();
+		$template_args['event_description'] = wp_strip_all_tags($event->short_description(200));
+		// clone datetime so that date formats don't override those for the original datetime
+		$primary_datetime = clone $event->primary_datetime();
+		$template_args['event_start'] = $primary_datetime->start_date(DateTime::ATOM);
+		$template_args['event_end'] = $primary_datetime->end_date(DateTime::ATOM);
+		unset($primary_datetime);
+		$template_args['currency'] = EE_Registry::instance()->CFG->currency->code;
+		foreach ($event->tickets() as $original_ticket) {
+			// clone tickets so that date formats don't override those for the original ticket
+			$ticket= clone $original_ticket;
+			$ID = $ticket->ID();
+			$template_args['event_tickets'][ $ID ]['start_date'] = $ticket->start_date(DateTime::ATOM, null);
+			$template_args['event_tickets'][ $ID ]['end_date'] = $ticket->end_date(DateTime::ATOM, null);
+			$template_args['event_tickets'][ $ID ]['price'] = number_format(
+				$ticket->price(),
+				EE_Registry::instance()->CFG->currency->dec_plc,
+				EE_Registry::instance()->CFG->currency->dec_mrk,
+				EE_Registry::instance()->CFG->currency->thsnds
+			);
+			switch ($ticket->ticket_status()) {
+				case 'TKO':
+					$availability = 'InStock';
+					break;
+				case 'TKS':
+					$availability = 'SoldOut';
+					break;
+				default:
+					$availability = null;
+					break;
+			}
+			$template_args['event_tickets'][ $ID ]['availability'] = $availability;
+			unset($ticket);
+		}
+		$VNU_ID = espresso_venue_id();
+		if (! empty($VNU_ID) && ! espresso_is_venue_private($VNU_ID)) {
+			$venue = EEH_Venue_View::get_venue($VNU_ID);
+			$template_args['venue_name'] = get_the_title($VNU_ID);
+			$template_args['venue_url'] = get_permalink($VNU_ID);
+			$template_args['venue_locality'] = $venue->city();
+			$template_args['venue_region'] = $venue->state_name();
+		}
+		$template_args['event_image'] = $event->feature_image_url();
+		$template_args = apply_filters(
+			'FHEE__EEH_Schema__add_json_linked_data_for_event__template_args',
+			$template_args,
+			$event,
+			$VNU_ID
+		);
+		extract($template_args, EXTR_OVERWRITE);
+		include EE_TEMPLATES . 'json_linked_data_for_event.template.php';
+	}
+
+
+	/**
+	 *    location
+	 *    The location of the event, organization or action.
+	 *    Should include the Venue name AND schema formatted address info
+	 *
+	 * @access public
+	 * @param string $location
+	 * @return string
+	 */
+	public static function location($location = null)
+	{
+		return ! empty($location) ? '<div itemprop="location" itemscope itemtype="http://schema.org/Place">'
+									  . $location
+									  . '</div>' : '';
+	}
+
+
+
+	/**
+	 *    name
+	 *    The name of the Event or Venue.
+	 *
+	 * @access public
+	 * @param string $name
+	 * @return string
+	 */
+	public static function name($name = null)
+	{
+		return ! empty($name) ? '<span itemprop="name">' . $name . '</span>' : '';
+	}
+
+
+
+	/**
+	 *    streetAddress
+	 *    The street address. For example, 1600 Amphitheatre Pkwy.
+	 *
+	 * @access public
+	 * @param EEI_Address $obj_with_address
+	 * @return string
+	 */
+	public static function streetAddress(EEI_Address $obj_with_address = null)
+	{
+		return $obj_with_address->address() !== null && $obj_with_address->address() !== ''
+			? '<span itemprop="streetAddress">' . $obj_with_address->address() . '</span>' : '';
+	}
+
+
+
+	/**
+	 *    postOfficeBoxNumber
+	 *    The post office box number for PO box addresses.
+	 *
+	 * @access public
+	 * @param EEI_Address $obj_with_address
+	 * @return string
+	 */
+	public static function postOfficeBoxNumber(EEI_Address $obj_with_address = null)
+	{
+		// regex check for some form of PO Box or P.O. Box, etc, etc, etc
+		if (preg_match(
+			"/^\s*((P(OST)?.?\s*(O(FF(ICE)?)?)?.?\s+(B(IN|OX))?)|B(IN|OX))/i",
+			$obj_with_address->address2()
+		) ) {
+			return $obj_with_address->address2() !== null && $obj_with_address->address2() !== ''
+				? '<span itemprop="postOfficeBoxNumber">' . $obj_with_address->address2() . '</span>' : '';
+		} else {
+			return $obj_with_address->address2();
+		}
+	}
+
+
+
+	/**
+	 *    addressLocality
+	 *    The locality (city, town, etc). For example, Mountain View.
+	 *
+	 * @access public
+	 * @param EEI_Address $obj_with_address
+	 * @return string
+	 */
+	public static function addressLocality(EEI_Address $obj_with_address = null)
+	{
+		return $obj_with_address->city() !== null && $obj_with_address->city() !== ''
+			? '<span itemprop="addressLocality">' . $obj_with_address->city() . '</span>' : '';
+	}
+
+
+
+	/**
+	 *    addressRegion
+	 *    The region (state, province, etc). For example, CA.
+	 *
+	 * @access public
+	 * @param EEI_Address $obj_with_address
+	 * @return string
+	 */
+	public static function addressRegion(EEI_Address $obj_with_address = null)
+	{
+		$state = $obj_with_address->state_name();
+		if (! empty($state)) {
+			return '<span itemprop="addressRegion">' . $state . '</span>';
+		} else {
+			return '';
+		}
+	}
+
+
+
+	/**
+	 *    addressCountry
+	 *    The country. For example, USA. You can also provide the two-letter ISO 3166-1 alpha-2 country code.
+	 *
+	 * @access public
+	 * @param EEI_Address $obj_with_address
+	 * @return string
+	 */
+	public static function addressCountry(EEI_Address $obj_with_address = null)
+	{
+		$country = $obj_with_address->country_name();
+		if (! empty($country)) {
+			return '<span itemprop="addressCountry">' . $country . '</span>';
+		} else {
+			return '';
+		}
+	}
+
+
+
+	/**
+	 *    postalCode
+	 *    The postal code. For example, 94043.
+	 *
+	 * @access public
+	 * @param EEI_Address $obj_with_address
+	 * @return string
+	 */
+	public static function postalCode(EEI_Address $obj_with_address = null)
+	{
+		return $obj_with_address->zip() !== null && $obj_with_address->zip() !== '' ? '<span itemprop="postalCode">'
+																					  . $obj_with_address->zip()
+																					  . '</span>' : '';
+	}
+
+
+
+	/**
+	 *    telephone
+	 *    The telephone number.
+	 *
+	 * @access public
+	 * @param string $phone_nmbr
+	 * @return string
+	 */
+	public static function telephone($phone_nmbr = null)
+	{
+		return $phone_nmbr !== null && $phone_nmbr !== '' ? '<span itemprop="telephone">' . $phone_nmbr . '</span>'
+			: '';
+	}
+
+
+
+	/**
+	 *    URL
+	 *    URL of the item as a clickable link
+	 *
+	 * @access public
+	 * @param string $url        - the URL that the link will resolve to
+	 * @param string $text       - the text that will be used for the visible link
+	 * @param array  $attributes - array of additional link attributes in  attribute_name => value pairs. ie: array( 'title' => 'click here', 'class' => 'link-class' )
+	 * @return string (link)
+	 */
+	public static function url($url = null, $text = null, $attributes = array())
+	{
+		// Check the URL includes a scheme
+		$parsed_url = parse_url($url);
+		if (empty($parsed_url['scheme'])) {
+			$url = 'http://' . ltrim($url, '/');
+		}
+
+		$atts = '';
+		foreach ($attributes as $attribute => $value) {
+			$atts .= ' ' . $attribute . '="' . $value . '"';
+		}
+		$text = $text !== null && $text !== '' ? $text : $url;
+		return $url !== null && $url !== '' ? '<a itemprop="url" href="' . $url . '"' . $atts . '>' . $text . '</a>'
+			: '';
+	}
 }

Spacing +21 added lines, -21 removed lines

@@ -21,7 +21,7 @@ 
     public static function add_json_linked_data_for_event(EE_Event $event)
     {
         // Check we have a valid datetime for the event
-        if (! $event->primary_datetime() instanceof EE_Datetime) {
+        if ( ! $event->primary_datetime() instanceof EE_Datetime) {
             return;
         }
 
@@ -50,11 +50,11 @@ 
         $template_args['currency'] = EE_Registry::instance()->CFG->currency->code;
         foreach ($event->tickets() as $original_ticket) {
             // clone tickets so that date formats don't override those for the original ticket
-            $ticket= clone $original_ticket;
+            $ticket = clone $original_ticket;
             $ID = $ticket->ID();
-            $template_args['event_tickets'][ $ID ]['start_date'] = $ticket->start_date(DateTime::ATOM, null);
-            $template_args['event_tickets'][ $ID ]['end_date'] = $ticket->end_date(DateTime::ATOM, null);
-            $template_args['event_tickets'][ $ID ]['price'] = number_format(
+            $template_args['event_tickets'][$ID]['start_date'] = $ticket->start_date(DateTime::ATOM, null);
+            $template_args['event_tickets'][$ID]['end_date'] = $ticket->end_date(DateTime::ATOM, null);
+            $template_args['event_tickets'][$ID]['price'] = number_format(
                 $ticket->price(),
                 EE_Registry::instance()->CFG->currency->dec_plc,
                 EE_Registry::instance()->CFG->currency->dec_mrk,
@@ -71,11 +71,11 @@ 
                     $availability = null;
                     break;
             }
-            $template_args['event_tickets'][ $ID ]['availability'] = $availability;
+            $template_args['event_tickets'][$ID]['availability'] = $availability;
             unset($ticket);
         }
         $VNU_ID = espresso_venue_id();
-        if (! empty($VNU_ID) && ! espresso_is_venue_private($VNU_ID)) {
+        if ( ! empty($VNU_ID) && ! espresso_is_venue_private($VNU_ID)) {
             $venue = EEH_Venue_View::get_venue($VNU_ID);
             $template_args['venue_name'] = get_the_title($VNU_ID);
             $template_args['venue_url'] = get_permalink($VNU_ID);
@@ -90,7 +90,7 @@ 
             $VNU_ID
         );
         extract($template_args, EXTR_OVERWRITE);
-        include EE_TEMPLATES . 'json_linked_data_for_event.template.php';
+        include EE_TEMPLATES.'json_linked_data_for_event.template.php';
     }
 
 
@@ -122,7 +122,7 @@ 
      */
     public static function name($name = null)
     {
-        return ! empty($name) ? '<span itemprop="name">' . $name . '</span>' : '';
+        return ! empty($name) ? '<span itemprop="name">'.$name.'</span>' : '';
     }
 
 
@@ -138,7 +138,7 @@ 
     public static function streetAddress(EEI_Address $obj_with_address = null)
     {
         return $obj_with_address->address() !== null && $obj_with_address->address() !== ''
-            ? '<span itemprop="streetAddress">' . $obj_with_address->address() . '</span>' : '';
+            ? '<span itemprop="streetAddress">'.$obj_with_address->address().'</span>' : '';
     }
 
 
@@ -157,9 +157,9 @@ 
         if (preg_match(
             "/^\s*((P(OST)?.?\s*(O(FF(ICE)?)?)?.?\s+(B(IN|OX))?)|B(IN|OX))/i",
             $obj_with_address->address2()
-        ) ) {
+        )) {
             return $obj_with_address->address2() !== null && $obj_with_address->address2() !== ''
-                ? '<span itemprop="postOfficeBoxNumber">' . $obj_with_address->address2() . '</span>' : '';
+                ? '<span itemprop="postOfficeBoxNumber">'.$obj_with_address->address2().'</span>' : '';
         } else {
             return $obj_with_address->address2();
         }
@@ -178,7 +178,7 @@ 
     public static function addressLocality(EEI_Address $obj_with_address = null)
     {
         return $obj_with_address->city() !== null && $obj_with_address->city() !== ''
-            ? '<span itemprop="addressLocality">' . $obj_with_address->city() . '</span>' : '';
+            ? '<span itemprop="addressLocality">'.$obj_with_address->city().'</span>' : '';
     }
 
 
@@ -194,8 +194,8 @@ 
     public static function addressRegion(EEI_Address $obj_with_address = null)
     {
         $state = $obj_with_address->state_name();
-        if (! empty($state)) {
-            return '<span itemprop="addressRegion">' . $state . '</span>';
+        if ( ! empty($state)) {
+            return '<span itemprop="addressRegion">'.$state.'</span>';
         } else {
             return '';
         }
@@ -214,8 +214,8 @@ 
     public static function addressCountry(EEI_Address $obj_with_address = null)
     {
         $country = $obj_with_address->country_name();
-        if (! empty($country)) {
-            return '<span itemprop="addressCountry">' . $country . '</span>';
+        if ( ! empty($country)) {
+            return '<span itemprop="addressCountry">'.$country.'</span>';
         } else {
             return '';
         }
@@ -250,7 +250,7 @@ 
      */
     public static function telephone($phone_nmbr = null)
     {
-        return $phone_nmbr !== null && $phone_nmbr !== '' ? '<span itemprop="telephone">' . $phone_nmbr . '</span>'
+        return $phone_nmbr !== null && $phone_nmbr !== '' ? '<span itemprop="telephone">'.$phone_nmbr.'</span>'
             : '';
     }
 
@@ -271,15 +271,15 @@ 
         // Check the URL includes a scheme
         $parsed_url = parse_url($url);
         if (empty($parsed_url['scheme'])) {
-            $url = 'http://' . ltrim($url, '/');
+            $url = 'http://'.ltrim($url, '/');
         }
 
         $atts = '';
         foreach ($attributes as $attribute => $value) {
-            $atts .= ' ' . $attribute . '="' . $value . '"';
+            $atts .= ' '.$attribute.'="'.$value.'"';
         }
         $text = $text !== null && $text !== '' ? $text : $url;
-        return $url !== null && $url !== '' ? '<a itemprop="url" href="' . $url . '"' . $atts . '>' . $text . '</a>'
+        return $url !== null && $url !== '' ? '<a itemprop="url" href="'.$url.'"'.$atts.'>'.$text.'</a>'
             : '';
     }
 }

core/templates/json_linked_data_for_event.template.php

Indentation +13 added lines, -13 removed lines

@@ -24,7 +24,7 @@ 
   "url": "<?php echo $event_permalink; ?>",
   "offers": [
     <?php
-    foreach ($event_tickets as $ticket) {?>
+	foreach ($event_tickets as $ticket) {?>
     {
       "@type": "Offer",
       "url": "<?php echo $event_permalink; ?>",
@@ -33,17 +33,17 @@ 
       "price": "<?php echo $ticket['price']; ?>",
       "priceCurrency": "<?php echo $currency; ?>"
         <?php if (isset($ticket['availability'])) {
-            ?>,"availability": "http://schema.org/<?php echo $ticket['availability']; ?>"
+			?>,"availability": "http://schema.org/<?php echo $ticket['availability']; ?>"
         <?php } ?>
     }<?php
-    if (is_array($event_tickets) && end($event_tickets) !== $ticket) {
-            echo ',';
-    }
-    }
-    ?>
+	if (is_array($event_tickets) && end($event_tickets) !== $ticket) {
+			echo ',';
+	}
+	}
+	?>
     ]<?php
-    if ($venue_name) {
-        ?>,
+	if ($venue_name) {
+		?>,
   "location": {
     "@type": "Place",
     "name": <?php echo wp_json_encode($venue_name); ?>,
@@ -55,13 +55,13 @@ 
     }
   }
     <?php
-    } ?>
+	} ?>
     <?php
-    if ($event_image) {
-        ?>,
+	if ($event_image) {
+		?>,
   "image": "<?php echo $event_image; ?>"
     <?php
-    } ?>
+	} ?>
     <?php do_action('AHEE__json_linked_data_for_event__template'); ?>
 }
 

espresso.php

Indentation +80 added lines, -80 removed lines

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