eventespresso / event-espresso-core

core/db_models/fields/EE_Enum_Text_Field.php

Indentation +127 added lines, -127 removed lines

@@ -12,131 +12,131 @@
 class EE_Enum_Text_Field extends EE_Text_Field_Base
 {
 
-    /**
-     * @var array $_allowed_enum_values
-     */
-    public $_allowed_enum_values;
-
-    /**
-     * @param string  $table_column
-     * @param string  $nice_name
-     * @param boolean $nullable
-     * @param mixed   $default_value
-     * @param array   $allowed_enum_values keys are values to be used in the DB, values are how they should be displayed
-     */
-    function __construct($table_column, $nice_name, $nullable, $default_value, $allowed_enum_values)
-    {
-        $this->_allowed_enum_values = $allowed_enum_values;
-        parent::__construct($table_column, $nice_name, $nullable, $default_value);
-        $this->setSchemaType('object');
-    }
-
-
-
-    /**
-     * Returns the list of allowed enum options, but filterable.
-     * This is used internally
-     *
-     * @return array
-     */
-    protected function _allowed_enum_values()
-    {
-        return apply_filters(
-            'FHEE__EE_Enum_Text_Field___allowed_enum_options',
-            $this->_allowed_enum_values,
-            $this
-        );
-    }
-
-
-
-    /**
-     * When setting, just verify that the value being used matches what we've defined as allowable enum values.
-     * If not, throw an error (but if WP_DEBUG is false, just set the value to default).
-     *
-     * @param string $value_inputted_for_field_on_model_object
-     * @return string
-     * @throws EE_Error
-     */
-    public function prepare_for_set($value_inputted_for_field_on_model_object)
-    {
-        if (
-            $value_inputted_for_field_on_model_object !== null
-            && ! array_key_exists($value_inputted_for_field_on_model_object, $this->_allowed_enum_values())
-        ) {
-            if (defined('WP_DEBUG') && WP_DEBUG) {
-                $msg = sprintf(
-                    __('System is assigning incompatible value "%1$s" to field "%2$s"', 'event_espresso'),
-                    $value_inputted_for_field_on_model_object,
-                    $this->_name
-                );
-                $msg2 = sprintf(
-                    __('Allowed values for "%1$s" are "%2$s". You provided: "%3$s"', 'event_espresso'),
-                    $this->_name,
-                    implode(', ', array_keys($this->_allowed_enum_values())),
-                    $value_inputted_for_field_on_model_object
-                );
-                EE_Error::add_error("{$msg}||{$msg2}", __FILE__, __FUNCTION__, __LINE__);
-            }
-            return $this->get_default_value();
-        }
-        return $value_inputted_for_field_on_model_object;
-    }
-
-
-    /**
-     * Gets the pretty version of the enum's value.
-     *
-     * @param     int |string $value_on_field_to_be_outputted
-     * @param    null         $schema
-     * @return    string
-     */
-    public function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
-    {
-        $options = $this->_allowed_enum_values();
-        if (isset($options[$value_on_field_to_be_outputted])) {
-            return $options[$value_on_field_to_be_outputted];
-        } else {
-            return $value_on_field_to_be_outputted;
-        }
-    }
-
-
-
-    /**
-     * When retrieving something from the DB, don't enforce the enum's options. If it's in the DB, we just have to live
-     * with that. Note also: when we're saving to the DB again, we also don't enforce the enum options. It's ONLY
-     * when we're receiving USER input from prepare_for_set() that we enforce the enum options.
-     *
-     * @param mixed $value_in_db
-     * @return mixed
-     */
-    public function prepare_for_set_from_db($value_in_db)
-    {
-        return $value_in_db;
-    }
-
-
-    public function getSchemaProperties()
-    {
-        return array(
-            'raw' => array(
-                'description' =>  sprintf(
-                    __('%s - the value in the database.', 'event_espresso'),
-                    $this->get_nicename()
-                ),
-                'type' => 'string',
-                'enum' => array_keys($this->_allowed_enum_values)
-            ),
-            'pretty' => array(
-                'description' =>  sprintf(
-                    __('%s - the value for display.', 'event_espresso'),
-                    $this->get_nicename()
-                ),
-                'type' => 'string',
-                'enum' => array_values($this->_allowed_enum_values),
-                'read_only' => true
-            )
-        );
-    }
+	/**
+	 * @var array $_allowed_enum_values
+	 */
+	public $_allowed_enum_values;
+
+	/**
+	 * @param string  $table_column
+	 * @param string  $nice_name
+	 * @param boolean $nullable
+	 * @param mixed   $default_value
+	 * @param array   $allowed_enum_values keys are values to be used in the DB, values are how they should be displayed
+	 */
+	function __construct($table_column, $nice_name, $nullable, $default_value, $allowed_enum_values)
+	{
+		$this->_allowed_enum_values = $allowed_enum_values;
+		parent::__construct($table_column, $nice_name, $nullable, $default_value);
+		$this->setSchemaType('object');
+	}
+
+
+
+	/**
+	 * Returns the list of allowed enum options, but filterable.
+	 * This is used internally
+	 *
+	 * @return array
+	 */
+	protected function _allowed_enum_values()
+	{
+		return apply_filters(
+			'FHEE__EE_Enum_Text_Field___allowed_enum_options',
+			$this->_allowed_enum_values,
+			$this
+		);
+	}
+
+
+
+	/**
+	 * When setting, just verify that the value being used matches what we've defined as allowable enum values.
+	 * If not, throw an error (but if WP_DEBUG is false, just set the value to default).
+	 *
+	 * @param string $value_inputted_for_field_on_model_object
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function prepare_for_set($value_inputted_for_field_on_model_object)
+	{
+		if (
+			$value_inputted_for_field_on_model_object !== null
+			&& ! array_key_exists($value_inputted_for_field_on_model_object, $this->_allowed_enum_values())
+		) {
+			if (defined('WP_DEBUG') && WP_DEBUG) {
+				$msg = sprintf(
+					__('System is assigning incompatible value "%1$s" to field "%2$s"', 'event_espresso'),
+					$value_inputted_for_field_on_model_object,
+					$this->_name
+				);
+				$msg2 = sprintf(
+					__('Allowed values for "%1$s" are "%2$s". You provided: "%3$s"', 'event_espresso'),
+					$this->_name,
+					implode(', ', array_keys($this->_allowed_enum_values())),
+					$value_inputted_for_field_on_model_object
+				);
+				EE_Error::add_error("{$msg}||{$msg2}", __FILE__, __FUNCTION__, __LINE__);
+			}
+			return $this->get_default_value();
+		}
+		return $value_inputted_for_field_on_model_object;
+	}
+
+
+	/**
+	 * Gets the pretty version of the enum's value.
+	 *
+	 * @param     int |string $value_on_field_to_be_outputted
+	 * @param    null         $schema
+	 * @return    string
+	 */
+	public function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
+	{
+		$options = $this->_allowed_enum_values();
+		if (isset($options[$value_on_field_to_be_outputted])) {
+			return $options[$value_on_field_to_be_outputted];
+		} else {
+			return $value_on_field_to_be_outputted;
+		}
+	}
+
+
+
+	/**
+	 * When retrieving something from the DB, don't enforce the enum's options. If it's in the DB, we just have to live
+	 * with that. Note also: when we're saving to the DB again, we also don't enforce the enum options. It's ONLY
+	 * when we're receiving USER input from prepare_for_set() that we enforce the enum options.
+	 *
+	 * @param mixed $value_in_db
+	 * @return mixed
+	 */
+	public function prepare_for_set_from_db($value_in_db)
+	{
+		return $value_in_db;
+	}
+
+
+	public function getSchemaProperties()
+	{
+		return array(
+			'raw' => array(
+				'description' =>  sprintf(
+					__('%s - the value in the database.', 'event_espresso'),
+					$this->get_nicename()
+				),
+				'type' => 'string',
+				'enum' => array_keys($this->_allowed_enum_values)
+			),
+			'pretty' => array(
+				'description' =>  sprintf(
+					__('%s - the value for display.', 'event_espresso'),
+					$this->get_nicename()
+				),
+				'type' => 'string',
+				'enum' => array_values($this->_allowed_enum_values),
+				'read_only' => true
+			)
+		);
+	}
 }

core/db_models/fields/EE_Full_HTML_Field.php

Indentation +48 added lines, -48 removed lines

@@ -15,57 +15,57 @@
 class EE_Full_HTML_Field extends EE_Text_Field_Base
 {
 
-    /**
-     * @param string $table_column
-     * @param string $nicename
-     * @param bool   $nullable
-     * @param null   $default_value
-     */
-    public function __construct($table_column, $nicename, $nullable, $default_value = null)
-    {
-        parent::__construct($table_column, $nicename, $nullable, $default_value);
-        $this->setSchemaType('object');
-    }
+	/**
+	 * @param string $table_column
+	 * @param string $nicename
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 */
+	public function __construct($table_column, $nicename, $nullable, $default_value = null)
+	{
+		parent::__construct($table_column, $nicename, $nullable, $default_value);
+		$this->setSchemaType('object');
+	}
 
 
-    /**
-     * Does shortcodes and auto-paragraphs the content (unless schema is 'no_wpautop')
-     *
-     * @param type $value_on_field_to_be_outputted
-     * @param type $schema
-     * @return string
-     */
-    function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
-    {
-        if ($schema == 'form_input') {
-            return parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema);
-        } elseif ($schema == 'no_wpautop') {
-            return do_shortcode(parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema));
-        } else {
-            return wpautop(do_shortcode(parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema)));
-        }
-    }
+	/**
+	 * Does shortcodes and auto-paragraphs the content (unless schema is 'no_wpautop')
+	 *
+	 * @param type $value_on_field_to_be_outputted
+	 * @param type $schema
+	 * @return string
+	 */
+	function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
+	{
+		if ($schema == 'form_input') {
+			return parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema);
+		} elseif ($schema == 'no_wpautop') {
+			return do_shortcode(parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema));
+		} else {
+			return wpautop(do_shortcode(parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema)));
+		}
+	}
 
 
 
-    public function getSchemaProperties()
-    {
-        return array(
-            'raw' => array(
-                'description' =>  sprintf(
-                    __('%s - the value in the database.', 'event_espresso'),
-                    $this->get_nicename()
-                ),
-                'type' => 'string'
-            ),
-            'rendered' => array(
-                'description' =>  sprintf(
-                    __('%s - transformed for display.', 'event_espresso'),
-                    $this->get_nicename()
-                ),
-                'type' => 'string',
-                'readonly' => true
-            )
-        );
-    }
+	public function getSchemaProperties()
+	{
+		return array(
+			'raw' => array(
+				'description' =>  sprintf(
+					__('%s - the value in the database.', 'event_espresso'),
+					$this->get_nicename()
+				),
+				'type' => 'string'
+			),
+			'rendered' => array(
+				'description' =>  sprintf(
+					__('%s - transformed for display.', 'event_espresso'),
+					$this->get_nicename()
+				),
+				'type' => 'string',
+				'readonly' => true
+			)
+		);
+	}
 }
\ No newline at end of file

Doc Comments +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
      * @param string $table_column
      * @param string $nicename
      * @param bool   $nullable
-     * @param null   $default_value
+     * @param string   $default_value
      */
     public function __construct($table_column, $nicename, $nullable, $default_value = null)
     {

widgets/EspressoWidget.php

Indentation +25 added lines, -25 removed lines

@@ -18,31 +18,31 @@
 
 
 
-    /**
-     * @param string $name
-     * @param array  $widget_options
-     * @param array  $control_options
-     */
-    public function __construct($name = '', array $widget_options = array(), array $control_options = array())
-    {
-        $id_base = EspressoWidget::getIdBase(get_class($this));
-        $control_options['id_base'] = $id_base;
-        $control_options['height'] = isset($control_options['height']) ? $control_options['height'] : 300;
-        $control_options['width'] = isset($control_options['width']) ? $control_options['width'] : 350;
-        // Register widget with WordPress
-        parent::__construct($id_base, $name, $widget_options, $control_options);
-    }
-
-
-
-    /**
-     * @param string $widget_class
-     * @return string
-     */
-    public static function getIdBase($widget_class)
-    {
-        return sanitize_title(str_replace(array('EEW_', '_'), array('EE_', '-'), $widget_class)) . '-widget';
-    }
+	/**
+	 * @param string $name
+	 * @param array  $widget_options
+	 * @param array  $control_options
+	 */
+	public function __construct($name = '', array $widget_options = array(), array $control_options = array())
+	{
+		$id_base = EspressoWidget::getIdBase(get_class($this));
+		$control_options['id_base'] = $id_base;
+		$control_options['height'] = isset($control_options['height']) ? $control_options['height'] : 300;
+		$control_options['width'] = isset($control_options['width']) ? $control_options['width'] : 350;
+		// Register widget with WordPress
+		parent::__construct($id_base, $name, $widget_options, $control_options);
+	}
+
+
+
+	/**
+	 * @param string $widget_class
+	 * @return string
+	 */
+	public static function getIdBase($widget_class)
+	{
+		return sanitize_title(str_replace(array('EEW_', '_'), array('EE_', '-'), $widget_class)) . '-widget';
+	}
 
 
 }

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
      */
     public static function getIdBase($widget_class)
     {
-        return sanitize_title(str_replace(array('EEW_', '_'), array('EE_', '-'), $widget_class)) . '-widget';
+        return sanitize_title(str_replace(array('EEW_', '_'), array('EE_', '-'), $widget_class)).'-widget';
     }
 
 

core/data_migration_scripts/4_1_0_stages/EE_DMS_4_1_0_shortcodes.dmsstage.php

Indentation +1 added lines, -2 removed lines

@@ -2,8 +2,7 @@
 
 /**
  * Goes through all the posts and pages, and converts old shortcodes to new ones
-
-*/
+ */
 
 class EE_DMS_4_1_0_shortcodes extends EE_Data_Migration_Script_Stage{
 	function __construct() {

Spacing +9 added lines, -9 removed lines

@@ -5,7 +5,7 @@ 
 
 */
 
-class EE_DMS_4_1_0_shortcodes extends EE_Data_Migration_Script_Stage{
+class EE_DMS_4_1_0_shortcodes extends EE_Data_Migration_Script_Stage {
 	function __construct() {
 		global $wpdb;
 		$this->_pretty_name = __("Shortcodes", "event_espresso");
@@ -15,27 +15,27 @@ 
 	protected function _migrate_old_row($old_row) {
 		$new_post_content = $this->_change_event_list_shortcode($old_row['post_content']);
 		global $wpdb;
-		$wpdb->query($wpdb->prepare("UPDATE ".$this->_old_table." SET post_content=%s WHERE ID=%d",$new_post_content,$old_row['ID']));
+		$wpdb->query($wpdb->prepare("UPDATE ".$this->_old_table." SET post_content=%s WHERE ID=%d", $new_post_content, $old_row['ID']));
 	}
 
 	/**
 	 * replaces [EVENT_LIST... with [ESPRESSO_EVENTS...]
 	 * @param string $old_content
 	 */
-	private function _change_event_list_shortcode($old_content){
-		return str_replace("[EVENT_LIST","[ESPRESSO_EVENTS",$old_content);
+	private function _change_event_list_shortcode($old_content) {
+		return str_replace("[EVENT_LIST", "[ESPRESSO_EVENTS", $old_content);
 	}
 
-	function _migration_step($num_items=50){
+	function _migration_step($num_items = 50) {
 		global $wpdb;
 		$start_at_record = $this->count_records_migrated();
-		$rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table {$this->_sql_to_only_select_non_drafts()} LIMIT %d,%d",$start_at_record,$num_items),ARRAY_A);
+		$rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table {$this->_sql_to_only_select_non_drafts()} LIMIT %d,%d", $start_at_record, $num_items), ARRAY_A);
 		$items_actually_migrated = 0;
-		foreach($rows as $old_row){
+		foreach ($rows as $old_row) {
 			$this->_migrate_old_row($old_row);
 			$items_actually_migrated++;
 		}
-		if($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()){
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
 			$this->set_completed();
 		}
 		return $items_actually_migrated;
@@ -46,7 +46,7 @@ 
 		return $count;
 	}
 
-	private function _sql_to_only_select_non_drafts(){
+	private function _sql_to_only_select_non_drafts() {
 		return " WHERE post_type NOT IN ('revision','auto-draft') ";
 	}
 

core/admin/PostShortcodeTracking.php

Indentation +144 added lines, -144 removed lines

@@ -13,150 +13,150 @@
 class PostShortcodeTracking
 {
 
-    /**
-     * @deprecated 4.9.26
-     * @return    void
-     */
-    public static function set_hooks_admin()
-    {
-        \EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
-    }
-
-
-
-    /**
-     * @deprecated 4.9.26
-     * @param $post_ID
-     * @param $post
-     * @return void
-     */
-    public static function parse_post_content_on_save( $post_ID, $post )
-    {
-        \EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
-    }
-
-
-
-    /**
-     * @deprecated 4.9.26
-     * @param $page_for_posts
-     * @return void
-     */
-    protected static function set_post_shortcodes_for_posts_page( $page_for_posts )
-    {
-        \EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
-    }
-
-
-
-    /**
-     * @deprecated 4.9.26
-     * @param $page_for_posts
-     * @param $EES_Shortcode
-     * @param $post_ID
-     * @return void
-     */
-    protected static function set_post_shortcode_for_posts_page( $page_for_posts, $EES_Shortcode, $post_ID )
-    {
-        \EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
-    }
-
-
-
-    /**
-     * @deprecated 4.9.26
-     * @param $ID
-     * @return void
-     */
-    public static function unset_post_shortcodes_on_delete( $ID )
-    {
-        \EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
-    }
-
-
-
-    /**
-     * @deprecated 4.9.26
-     * @param      $ID
-     * @param      $shortcode_class
-     * @param      $shortcode_posts
-     * @param      $page_for_posts
-     * @param bool $update_post_shortcodes
-     * @return void
-     */
-    protected static function unset_posts_page_shortcode_for_post(
-        $ID,
-        $shortcode_class,
-        $shortcode_posts,
-        $page_for_posts,
-        $update_post_shortcodes = false
-    ) {
-        \EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
-    }
-
-
-
-    /**
-     * @deprecated 4.9.26
-     * @param string $page_for_posts
-     * @return void
-     */
-    public static function update_post_shortcodes( $page_for_posts = '' )
-    {
-        \EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
-    }
-
-
-
-    /**
-     * @deprecated 4.9.26
-     * @param $option
-     * @param $value
-     * @return void
-     */
-    public static function reset_page_for_posts_on_initial_set( $option, $value )
-    {
-        \EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
-    }
-
-
-
-    /**
-     * @deprecated 4.9.26
-     * @param        $option
-     * @param string $old_value
-     * @param string $value
-     * @return void
-     */
-    public static function reset_page_for_posts_on_change( $option, $old_value = '', $value = '' )
-    {
-        \EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
-    }
-
-
-
-    /**
-     * @deprecated 4.9.26
-     * @param $option
-     * @return void
-     */
-    public static function reset_page_for_posts_on_delete( $option )
-    {
-        \EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
-    }
-
-
-
-    /**
-     * @deprecated 4.9.26
-     * @param      $shortcodes
-     * @param bool $index_results
-     * @return void
-     */
-    public static function get_post_ids_for_shortcode( $shortcodes, $index_results = true )
-    {
-        \EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
-    }
+	/**
+	 * @deprecated 4.9.26
+	 * @return    void
+	 */
+	public static function set_hooks_admin()
+	{
+		\EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
+	}
+
+
+
+	/**
+	 * @deprecated 4.9.26
+	 * @param $post_ID
+	 * @param $post
+	 * @return void
+	 */
+	public static function parse_post_content_on_save( $post_ID, $post )
+	{
+		\EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
+	}
+
+
+
+	/**
+	 * @deprecated 4.9.26
+	 * @param $page_for_posts
+	 * @return void
+	 */
+	protected static function set_post_shortcodes_for_posts_page( $page_for_posts )
+	{
+		\EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
+	}
+
+
+
+	/**
+	 * @deprecated 4.9.26
+	 * @param $page_for_posts
+	 * @param $EES_Shortcode
+	 * @param $post_ID
+	 * @return void
+	 */
+	protected static function set_post_shortcode_for_posts_page( $page_for_posts, $EES_Shortcode, $post_ID )
+	{
+		\EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
+	}
+
+
+
+	/**
+	 * @deprecated 4.9.26
+	 * @param $ID
+	 * @return void
+	 */
+	public static function unset_post_shortcodes_on_delete( $ID )
+	{
+		\EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
+	}
+
+
+
+	/**
+	 * @deprecated 4.9.26
+	 * @param      $ID
+	 * @param      $shortcode_class
+	 * @param      $shortcode_posts
+	 * @param      $page_for_posts
+	 * @param bool $update_post_shortcodes
+	 * @return void
+	 */
+	protected static function unset_posts_page_shortcode_for_post(
+		$ID,
+		$shortcode_class,
+		$shortcode_posts,
+		$page_for_posts,
+		$update_post_shortcodes = false
+	) {
+		\EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
+	}
+
+
+
+	/**
+	 * @deprecated 4.9.26
+	 * @param string $page_for_posts
+	 * @return void
+	 */
+	public static function update_post_shortcodes( $page_for_posts = '' )
+	{
+		\EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
+	}
+
+
+
+	/**
+	 * @deprecated 4.9.26
+	 * @param $option
+	 * @param $value
+	 * @return void
+	 */
+	public static function reset_page_for_posts_on_initial_set( $option, $value )
+	{
+		\EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
+	}
+
+
+
+	/**
+	 * @deprecated 4.9.26
+	 * @param        $option
+	 * @param string $old_value
+	 * @param string $value
+	 * @return void
+	 */
+	public static function reset_page_for_posts_on_change( $option, $old_value = '', $value = '' )
+	{
+		\EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
+	}
+
+
+
+	/**
+	 * @deprecated 4.9.26
+	 * @param $option
+	 * @return void
+	 */
+	public static function reset_page_for_posts_on_delete( $option )
+	{
+		\EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
+	}
+
+
+
+	/**
+	 * @deprecated 4.9.26
+	 * @param      $shortcodes
+	 * @param bool $index_results
+	 * @return void
+	 */
+	public static function get_post_ids_for_shortcode( $shortcodes, $index_results = true )
+	{
+		\EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
+	}
 
 
 

Spacing +10 added lines, -10 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 namespace EventEspresso\core\admin;
 
-defined( 'EVENT_ESPRESSO_VERSION' ) || exit();
+defined('EVENT_ESPRESSO_VERSION') || exit();
 
 
 
@@ -30,7 +30,7 @@ 
      * @param $post
      * @return void
      */
-    public static function parse_post_content_on_save( $post_ID, $post )
+    public static function parse_post_content_on_save($post_ID, $post)
     {
         \EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
     }
@@ -42,7 +42,7 @@ 
      * @param $page_for_posts
      * @return void
      */
-    protected static function set_post_shortcodes_for_posts_page( $page_for_posts )
+    protected static function set_post_shortcodes_for_posts_page($page_for_posts)
     {
         \EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
     }
@@ -56,7 +56,7 @@ 
      * @param $post_ID
      * @return void
      */
-    protected static function set_post_shortcode_for_posts_page( $page_for_posts, $EES_Shortcode, $post_ID )
+    protected static function set_post_shortcode_for_posts_page($page_for_posts, $EES_Shortcode, $post_ID)
     {
         \EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
     }
@@ -68,7 +68,7 @@ 
      * @param $ID
      * @return void
      */
-    public static function unset_post_shortcodes_on_delete( $ID )
+    public static function unset_post_shortcodes_on_delete($ID)
     {
         \EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
     }
@@ -101,7 +101,7 @@ 
      * @param string $page_for_posts
      * @return void
      */
-    public static function update_post_shortcodes( $page_for_posts = '' )
+    public static function update_post_shortcodes($page_for_posts = '')
     {
         \EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
     }
@@ -114,7 +114,7 @@ 
      * @param $value
      * @return void
      */
-    public static function reset_page_for_posts_on_initial_set( $option, $value )
+    public static function reset_page_for_posts_on_initial_set($option, $value)
     {
         \EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
     }
@@ -128,7 +128,7 @@ 
      * @param string $value
      * @return void
      */
-    public static function reset_page_for_posts_on_change( $option, $old_value = '', $value = '' )
+    public static function reset_page_for_posts_on_change($option, $old_value = '', $value = '')
     {
         \EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
     }
@@ -140,7 +140,7 @@ 
      * @param $option
      * @return void
      */
-    public static function reset_page_for_posts_on_delete( $option )
+    public static function reset_page_for_posts_on_delete($option)
     {
         \EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
     }
@@ -153,7 +153,7 @@ 
      * @param bool $index_results
      * @return void
      */
-    public static function get_post_ids_for_shortcode( $shortcodes, $index_results = true )
+    public static function get_post_ids_for_shortcode($shortcodes, $index_results = true)
     {
         \EE_Error::doing_it_wrong(__METHOD__, __('Usage is deprecated.', 'event_espresso'), '4.9.26');
     }

core/CPTs/EE_Register_CPTs.core.php

Spacing +3 added lines, -3 removed lines

@@ -555,7 +555,7 @@ 
      */
     public function set_must_use_terms($taxonomy, $term_details)
     {
-        $term_details = (array)$term_details;
+        $term_details = (array) $term_details;
         foreach ($term_details as $slug => $details) {
             if ( ! term_exists($slug, $taxonomy)) {
                 $insert_arr = array(
@@ -600,7 +600,7 @@ 
                 if ($post->post_status === 'publish' && in_array($post->post_type, $default_obj->cpt_slugs, true)) {
                     //note some error proofing going on here to save unnecessary db queries
                     $taxonomies = get_object_taxonomies($post->post_type);
-                    foreach ((array)$taxonomies as $taxonomy) {
+                    foreach ((array) $taxonomies as $taxonomy) {
                         $terms = wp_get_post_terms($post_id, $taxonomy);
                         if (empty($terms) && $taxonomy === $default_obj->taxonomy) {
                             wp_set_object_terms($post_id, array($default_obj->term_slug), $taxonomy);
@@ -642,7 +642,7 @@ 
     public function __construct($taxonomy, $term_slug, $cpt_slugs = array())
     {
         $this->taxonomy = $taxonomy;
-        $this->cpt_slugs = (array)$cpt_slugs;
+        $this->cpt_slugs = (array) $cpt_slugs;
         $this->term_slug = $term_slug;
     }
 

Indentation +616 added lines, -616 removed lines

@@ -1,5 +1,5 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 
@@ -14,604 +14,604 @@ 
 class EE_Register_CPTs
 {
 
-    /**
-     * This property is used to hold an array of EE_default_term objects assigned to a custom post type when the post
-     * for that post type is published with no terms set for the taxonomy.
-     *
-     * @var array of EE_Default_Term objects
-     */
-    protected $_default_terms = array();
-
-
-
-    /**
-     *    constructor
-     * instantiated at init priority 5
-     */
-    public function __construct()
-    {
-        // register taxonomies
-        $taxonomies = self::get_taxonomies();
-        foreach ($taxonomies as $taxonomy => $tax) {
-            $this->register_taxonomy($taxonomy, $tax['singular_name'], $tax['plural_name'], $tax['args']);
-        }
-        // register CPTs
-        $CPTs = self::get_CPTs();
-        foreach ($CPTs as $CPT_name => $CPT) {
-            $this->register_CPT($CPT_name, $CPT['singular_name'], $CPT['plural_name'], $CPT['args'],
-                $CPT['singular_slug'], $CPT['plural_slug']);
-        }
-        // setup default terms in any of our taxonomies (but only if we're in admin).
-        // Why not added via register_activation_hook?
-        // Because it's possible that in future iterations of EE we may add new defaults for specialized taxonomies
-        // (think event_types) and register_activation_hook only reliably runs when a user manually activates the plugin.
-        // Keep in mind that this will READ these terms if they are deleted by the user.  Hence MUST use terms.
-        // if ( is_admin() ) {
-        // 	$this->set_must_use_event_types();
-        // }
-        //set default terms
-        $this->set_default_term('espresso_event_type', 'single-event', array('espresso_events'));
-        add_action('AHEE__EE_System__initialize_last', array(__CLASS__, 'maybe_flush_rewrite_rules'), 10);
-        // hook into save_post so that we can make sure that the default terms get saved on publish of registered cpts
-        // IF they don't have a term for that taxonomy set.
-        add_action('save_post', array($this, 'save_default_term'), 100, 2);
-        // remove no html restrictions from core wp saving of term descriptions.
-        // Note. this will affect only registered EE taxonomies.
-        $this->_allow_html_descriptions_for_ee_taxonomies();
-        do_action('AHEE__EE_Register_CPTs__construct_end', $this);
-    }
-
-
-
-    /**
-     * This will flush rewrite rules on demand.  This actually gets called around wp init priority level 100.
-     *
-     * @since 4.5.0
-     * @return void
-     */
-    public static function maybe_flush_rewrite_rules()
-    {
-        if (get_option('ee_flush_rewrite_rules', true)) {
-            flush_rewrite_rules();
-            update_option('ee_flush_rewrite_rules', false);
-        }
-    }
-
-
-
-    /**
-     * 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.
-     *
-     * @since 4.7.8
-     */
-    protected function _allow_html_descriptions_for_ee_taxonomies()
-    {
-        // first 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.
-        add_filter('pre_term_description', array($this, 'ee_filter_ee_term_description_not_wp'), 1, 2);
-    }
-
-
-
-    /**
-     * Callback for pre_term_description hook.
-     *
-     * @param string $description The description content.
-     * @param string $taxonomy    The taxonomy name for the taxonomy being filtered.
-     * @return string
-     */
-    public function ee_filter_ee_term_description_not_wp($description, $taxonomy)
-    {
-        //get a list of EE taxonomies
-        $ee_taxonomies = array_keys(self::get_taxonomies());
-        //only do our own thing if the taxonomy listed is an ee taxonomy.
-        if (in_array($taxonomy, $ee_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;
-    }
-
-
-
-    /**
-     *    get_taxonomies
-     *
-     * @access    public
-     * @return    array
-     */
-    public static function get_taxonomies()
-    {
-        // define taxonomies
-        return apply_filters('FHEE__EE_Register_CPTs__get_taxonomies__taxonomies', array(
-            'espresso_event_categories' => array(
-                'singular_name' => __("Event Category", "event_espresso"),
-                'plural_name'   => __("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' => __('event-category', 'event_espresso')),
-                ),
-            ),
-            'espresso_venue_categories' => array(
-                'singular_name' => __("Venue Category", "event_espresso"),
-                'plural_name'   => __("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' => __('venue-category', 'event_espresso')),
-                ),
-            ),
-            'espresso_event_type'       => array(
-                'singular_name' => __("Event Type", "event_espresso"),
-                'plural_name'   => __("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' => __('event-type', 'event_espresso')),
-                    'hierarchical' => true,
-                ),
-            ),
-        ));
-    }
-
-
-
-    /**
-     * This returns the corresponding model name for cpts registered by EE.
-     *
-     * @since 4.6.16.rc.000
-     * @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 static function get_cpt_model_names($post_type_slug = '')
-    {
-        $cpts = self::get_CPTs();
-        //first if slug passed in...
-        if ( ! empty($post_type_slug)) {
-            //match?
-            if (
-                ! isset($cpts[$post_type_slug])
-                || (isset($cpts[$post_type_slug]) && empty($cpts[$post_type_slug]['class_name']))
-            ) {
-                return array();
-            }
-            //k let's get the model name for this cpt.
-            return array($post_type_slug => str_replace('EE', 'EEM', $cpts[$post_type_slug]['class_name']));
-        }
-        //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) {
-            if ( ! empty($args['class_name'])) {
-                $cpt_models[$slug] = str_replace('EE', 'EEM', $args['class_name']);
-            }
-        }
-        return $cpt_models;
-    }
-
-
-
-    /**
-     * 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 static function instantiate_cpt_models($post_type_slug = '')
-    {
-        $cpt_model_names = self::get_cpt_model_names($post_type_slug);
-        $instantiated = array();
-        foreach ($cpt_model_names as $slug => $model_name) {
-            $instance = EE_Registry::instance()->load_model(str_replace('EEM_', '', $model_name));
-            if ($instance instanceof EEM_CPT_Base) {
-                $instantiated[$slug] = $instance;
-            }
-        }
-        return $instantiated;
-    }
-
-
-
-    /**
-     *    get_CPTs
-     *
-     * @access    public
-     * @return    array
-     */
-    public static function get_CPTs()
-    {
-        // define CPTs
-        // NOTE the ['args']['page_templates'] array index is something specific to our CPTs
-        // and not part of the WP custom post type api.
-        return apply_filters('FHEE__EE_Register_CPTs__get_CPTs__cpts', array(
-            'espresso_events'    => array(
-                'singular_name' => __("Event", "event_espresso"),
-                'plural_name'   => __("Events", "event_espresso"),
-                'singular_slug' => __("event", "event_espresso"),
-                'plural_slug'   => EE_Registry::instance()->CFG->core->event_cpt_slug,
-                'class_name'    => 'EE_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' => __("Venue", "event_espresso"),
-                'plural_name'   => __("Venues", "event_espresso"),
-                'singular_slug' => __("venue", "event_espresso"),
-                'plural_slug'   => __("venues", "event_espresso"),
-                'class_name'    => 'EE_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' => __("Contact", "event_espresso"),
-                'plural_name'   => __("Contacts", "event_espresso"),
-                'singular_slug' => __("contact", "event_espresso"),
-                'plural_slug'   => __("contacts", "event_espresso"),
-                'class_name'    => 'EE_Attendee',
-                'args'          => array(
-                    'public'             => false,
-                    'publicly_queryable' => false,
-                    'hierarchical'       => false,
-                    'has_archive'        => false,
-                    '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',
-                    ),
-                    'supports'           => array('editor', 'thumbnail', 'excerpt', 'custom-fields', 'comments'),
-                ),
-            ),
-        ));
-    }
-
-
-
-    /**
-     * This basically goes through the CPT array and returns only CPT's
-     * that have the ['args']['public'] option set as false
-     *
-     * @return array
-     */
-    public static function get_private_CPTs()
-    {
-        $CPTs = self::get_CPTs();
-        $private_CPTs = array();
-        foreach ($CPTs as $CPT => $details) {
-            if (empty($details['args']['public'])) {
-                $private_CPTs[$CPT] = $details;
-            }
-        }
-        return $private_CPTs;
-    }
-
-
-
-    /**
-     * Registers a custom taxonomy. Should be called before registering custom post types,
-     * otherwise you should link the taxonomy to the custom post type using 'register_taxonomy_for_object_type'.
-     *
-     * @param string $taxonomy_name , eg 'books'
-     * @param string $singular_name internationalized singular name
-     * @param string $plural_name   internationalized plural name
-     * @param array  $override_args like $args on http://codex.wordpress.org/Function_Reference/register_taxonomy
-     */
-    public function register_taxonomy($taxonomy_name, $singular_name, $plural_name, $override_args = array())
-    {
-        $args = array(
-            'hierarchical'      => true,
-            'labels'            => array(
-                'name'          => $plural_name,
-                'singular_name' => $singular_name,
-            ),
-            'show_ui'           => true,
-            'show_ee_ui'        => true,
-            'show_admin_column' => true,
-            'query_var'         => true,
-            'show_in_nav_menus' => false,
-            'map_meta_cap'      => true
-            //'rewrite'           => array( 'slug' => 'genre' ),
-        );
-        if ($override_args) {
-            if (isset($override_args['labels'])) {
-                $labels = array_merge($args['labels'], $override_args['labels']);
-                $args['labels'] = $labels;
-            }
-            $args = array_merge($args, $override_args);
-        }
-        register_taxonomy($taxonomy_name, null, $args);
-    }
-
-
-
-    /**
-     * Registers a new custom post type. Sets default settings given only the following params.
-     *
-     * @param string $post_type     the actual post type name
-     *                              (VERY IMPORTANT: this much match what the slug is for admin pages related to this
-     *                              cpt Also any models must use this slug as well)
-     * @param string $singular_name a pre-internationalized string for the singular name of the objects
-     * @param string $plural_name   a pre-internalized string for the plural name of the objects
-     * @param array  $override_args exactly like $args as described in
-     *                              http://codex.wordpress.org/Function_Reference/register_post_type The default values
-     *                              set in this function will be overridden by whatever you set in $override_args
-     * @param string $singular_slug
-     * @param string $plural_slug
-     * @return void , but registers the custom post type
-     */
-    public function register_CPT(
-        $post_type,
-        $singular_name,
-        $plural_name,
-        $override_args = array(),
-        $singular_slug = '',
-        $plural_slug = ''
-    ) {
-        $labels = array(
-            'name'               => $plural_name,
-            'singular_name'      => $singular_name,
-            'singular_slug'      => $singular_slug,
-            'plural_slug'        => $plural_slug,
-            'add_new'            => sprintf(__("Add %s", "event_espresso"), $singular_name),
-            'add_new_item'       => sprintf(__("Add New %s", "event_espresso"), $singular_name),
-            'edit_item'          => sprintf(__("Edit %s", "event_espresso"), $singular_name),
-            'new_item'           => sprintf(__("New %s", "event_espresso"), $singular_name),
-            'all_items'          => sprintf(__("All %s", "event_espresso"), $plural_name),
-            'view_item'          => sprintf(__("View %s", "event_espresso"), $singular_name),
-            'search_items'       => sprintf(__("Search %s", "event_espresso"), $plural_name),
-            'not_found'          => sprintf(__("No %s found", "event_espresso"), $plural_name),
-            'not_found_in_trash' => sprintf(__("No %s found in Trash", "event_espresso"), $plural_name),
-            'parent_item_colon'  => '',
-            'menu_name'          => sprintf(__("%s", "event_espresso"), $plural_name),
-        );
-        //verify plural slug and singular slug, if they aren't we'll use $singular_name and $plural_name
-        // $singular_slug = ! empty($singular_slug) ? $singular_slug : $singular_name;
-        $plural_slug = ! empty($plural_slug) ? $plural_slug : $plural_name;
-        //note the page_templates arg in the supports index is something specific to EE.
-        //  WordPress doesn't actually have that in their register_post_type api.
-        $args = array(
-            'labels'             => $labels,
-            'public'             => true,
-            'publicly_queryable' => true,
-            'show_ui'            => false,
-            'show_ee_ui'         => true,
-            'show_in_menu'       => false,
-            'show_in_nav_menus'  => false,
-            'query_var'          => true,
-            'rewrite'            => apply_filters(
-                'FHEE__EE_Register_CPTs__register_CPT__rewrite',
-                array('slug' => $plural_slug),
-                $post_type
-            ),
-            'capability_type'    => 'post',
-            'map_meta_cap'       => true,
-            'has_archive'        => true,
-            'hierarchical'       => false,
-            'menu_position'      => null,
-            'supports'           => array(
-                'title',
-                'editor',
-                'author',
-                'thumbnail',
-                'excerpt',
-                'custom-fields',
-                'comments',
-            ),
-        );
-        if ($override_args) {
-            if (isset($override_args['labels'])) {
-                $labels = array_merge($args['labels'], $override_args['labels']);
-            }
-            $args = array_merge($args, $override_args);
-            $args['labels'] = $labels;
-        }
-        register_post_type($post_type, $args);
-    }
-
-
-
-    public function set_must_use_event_types()
-    {
-        $term_details = array(
-            //Attendee's register for the first date-time only
-            'single-event'    => array(
-                __('Single Event', 'event_espresso'),
-                __('A single event that spans one or more consecutive days.', 'event_espresso'),
-            ),
-            //example: a party or two-day long workshop
-            //Attendee's can register for any of the date-times
-            'multi-event'     => array(
-                __('Multi Event', 'event_espresso'),
-                __('Multiple, separate, but related events that occur on consecutive days.', 'event_espresso'),
-            ),
-            //example: a three day music festival or week long conference
-            //Attendee's register for the first date-time only
-            'event-series'    => array(
-                __('Event Series', 'event_espresso'),
-                __(' Multiple events that occur over multiple non-consecutive days.', 'event_espresso'),
-            ),
-            //example: an 8 week introduction to basket weaving course
-            //Attendee's can register for any of the date-times.
-            'recurring-event' => array(
-                __('Recurring Event', 'event_espresso'),
-                __('Multiple events that occur over multiple non-consecutive days.', 'event_espresso'),
-            ),
-            //example: a yoga class
-            'ongoing' => array(
-                __('Ongoing Event', 'event_espresso'),
-                __('An "event" that people can purchase tickets to gain access for anytime for this event regardless of date times on the event',
-                    'event_espresso'),
-            )
-            //example: access to a museum
-            //'walk-in' => array( __('Walk In', 'event_espresso'), __('Single datetime and single entry recurring events. Attendees register for one or multiple datetimes individually.', 'event_espresso') ),
-            //'reservation' => array( __('Reservation', 'event_espresso'), __('Reservations are created by specifying available datetimes and quantities. Attendees choose from the available datetimes and specify the quantity available (if the maximum is greater than 1)') ), //@TODO to avoid confusion we'll implement this in a later iteration > EE4.1
-            // 'multiple-session' => array( __('Multiple Session', 'event_espresso'), __('Multiple event, multiple datetime, hierarchically organized, custom entry events. Attendees may be required to register for a parent event before being allowed to register for child events. Attendees can register for any combination of child events as long as the datetimes do not conflict. Parent and child events may have additional fees or registration questions.') ), //@TODO to avoid confusion we'll implement this in a later iteration > EE4.1
-            //'appointment' => array( __('Appointments', 'event_espresso'), __('Time slotted events where datetimes are generally in hours or minutes. For example, attendees can register for a single 15 minute or 1 hour time slot and this type of availability frequently reoccurs.', 'event_espresso') )
-        );
-        $this->set_must_use_terms('espresso_event_type', $term_details);
-    }
-
-
-
-    /**
-     * wrapper method for handling the setting up of initial terms in the db (if they don't already exist).
-     * Note this should ONLY be used for terms that always must be present.  Be aware that if an initial term is
-     * deleted then it WILL be recreated.
-     *
-     * @param string $taxonomy     The name of the taxonomy
-     * @param array  $term_details An array of term details indexed by slug and containing Name of term, and
-     *                             description as the elements in the array
-     * @return void
-     */
-    public function set_must_use_terms($taxonomy, $term_details)
-    {
-        $term_details = (array)$term_details;
-        foreach ($term_details as $slug => $details) {
-            if ( ! term_exists($slug, $taxonomy)) {
-                $insert_arr = array(
-                    'slug'        => $slug,
-                    'description' => $details[1],
-                );
-                wp_insert_term($details[0], $taxonomy, $insert_arr);
-            }
-        }
-    }
-
-
-
-    /**
-     * Allows us to set what the default will be for terms when a cpt is PUBLISHED.
-     *
-     * @param string $taxonomy  The taxonomy we're using for the default term
-     * @param string $term_slug The slug of the term that will be the default.
-     * @param array  $cpt_slugs An array of custom post types we want the default assigned to
-     */
-    public function set_default_term($taxonomy, $term_slug, $cpt_slugs = array())
-    {
-        $this->_default_terms[][$term_slug] = new EE_Default_Term($taxonomy, $term_slug, $cpt_slugs);
-    }
-
-
-
-    /**
-     * hooked into the wp 'save_post' action hook for setting our default terms found in the $_default_terms property
-     *
-     * @param  int    $post_id ID of CPT being saved
-     * @param  object $post    Post object
-     * @return void
-     */
-    public function save_default_term($post_id, $post)
-    {
-        if (empty($this->_default_terms)) {
-            return;
-        } //no default terms set so lets just exit.
-        foreach ($this->_default_terms as $defaults) {
-            foreach ($defaults as $default_obj) {
-                if ($post->post_status === 'publish' && in_array($post->post_type, $default_obj->cpt_slugs, true)) {
-                    //note some error proofing going on here to save unnecessary db queries
-                    $taxonomies = get_object_taxonomies($post->post_type);
-                    foreach ((array)$taxonomies as $taxonomy) {
-                        $terms = wp_get_post_terms($post_id, $taxonomy);
-                        if (empty($terms) && $taxonomy === $default_obj->taxonomy) {
-                            wp_set_object_terms($post_id, array($default_obj->term_slug), $taxonomy);
-                        }
-                    }
-                }
-            }
-        }
-    }
+	/**
+	 * This property is used to hold an array of EE_default_term objects assigned to a custom post type when the post
+	 * for that post type is published with no terms set for the taxonomy.
+	 *
+	 * @var array of EE_Default_Term objects
+	 */
+	protected $_default_terms = array();
+
+
+
+	/**
+	 *    constructor
+	 * instantiated at init priority 5
+	 */
+	public function __construct()
+	{
+		// register taxonomies
+		$taxonomies = self::get_taxonomies();
+		foreach ($taxonomies as $taxonomy => $tax) {
+			$this->register_taxonomy($taxonomy, $tax['singular_name'], $tax['plural_name'], $tax['args']);
+		}
+		// register CPTs
+		$CPTs = self::get_CPTs();
+		foreach ($CPTs as $CPT_name => $CPT) {
+			$this->register_CPT($CPT_name, $CPT['singular_name'], $CPT['plural_name'], $CPT['args'],
+				$CPT['singular_slug'], $CPT['plural_slug']);
+		}
+		// setup default terms in any of our taxonomies (but only if we're in admin).
+		// Why not added via register_activation_hook?
+		// Because it's possible that in future iterations of EE we may add new defaults for specialized taxonomies
+		// (think event_types) and register_activation_hook only reliably runs when a user manually activates the plugin.
+		// Keep in mind that this will READ these terms if they are deleted by the user.  Hence MUST use terms.
+		// if ( is_admin() ) {
+		// 	$this->set_must_use_event_types();
+		// }
+		//set default terms
+		$this->set_default_term('espresso_event_type', 'single-event', array('espresso_events'));
+		add_action('AHEE__EE_System__initialize_last', array(__CLASS__, 'maybe_flush_rewrite_rules'), 10);
+		// hook into save_post so that we can make sure that the default terms get saved on publish of registered cpts
+		// IF they don't have a term for that taxonomy set.
+		add_action('save_post', array($this, 'save_default_term'), 100, 2);
+		// remove no html restrictions from core wp saving of term descriptions.
+		// Note. this will affect only registered EE taxonomies.
+		$this->_allow_html_descriptions_for_ee_taxonomies();
+		do_action('AHEE__EE_Register_CPTs__construct_end', $this);
+	}
+
+
+
+	/**
+	 * This will flush rewrite rules on demand.  This actually gets called around wp init priority level 100.
+	 *
+	 * @since 4.5.0
+	 * @return void
+	 */
+	public static function maybe_flush_rewrite_rules()
+	{
+		if (get_option('ee_flush_rewrite_rules', true)) {
+			flush_rewrite_rules();
+			update_option('ee_flush_rewrite_rules', false);
+		}
+	}
+
+
+
+	/**
+	 * 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.
+	 *
+	 * @since 4.7.8
+	 */
+	protected function _allow_html_descriptions_for_ee_taxonomies()
+	{
+		// first 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.
+		add_filter('pre_term_description', array($this, 'ee_filter_ee_term_description_not_wp'), 1, 2);
+	}
+
+
+
+	/**
+	 * Callback for pre_term_description hook.
+	 *
+	 * @param string $description The description content.
+	 * @param string $taxonomy    The taxonomy name for the taxonomy being filtered.
+	 * @return string
+	 */
+	public function ee_filter_ee_term_description_not_wp($description, $taxonomy)
+	{
+		//get a list of EE taxonomies
+		$ee_taxonomies = array_keys(self::get_taxonomies());
+		//only do our own thing if the taxonomy listed is an ee taxonomy.
+		if (in_array($taxonomy, $ee_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;
+	}
+
+
+
+	/**
+	 *    get_taxonomies
+	 *
+	 * @access    public
+	 * @return    array
+	 */
+	public static function get_taxonomies()
+	{
+		// define taxonomies
+		return apply_filters('FHEE__EE_Register_CPTs__get_taxonomies__taxonomies', array(
+			'espresso_event_categories' => array(
+				'singular_name' => __("Event Category", "event_espresso"),
+				'plural_name'   => __("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' => __('event-category', 'event_espresso')),
+				),
+			),
+			'espresso_venue_categories' => array(
+				'singular_name' => __("Venue Category", "event_espresso"),
+				'plural_name'   => __("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' => __('venue-category', 'event_espresso')),
+				),
+			),
+			'espresso_event_type'       => array(
+				'singular_name' => __("Event Type", "event_espresso"),
+				'plural_name'   => __("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' => __('event-type', 'event_espresso')),
+					'hierarchical' => true,
+				),
+			),
+		));
+	}
+
+
+
+	/**
+	 * This returns the corresponding model name for cpts registered by EE.
+	 *
+	 * @since 4.6.16.rc.000
+	 * @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 static function get_cpt_model_names($post_type_slug = '')
+	{
+		$cpts = self::get_CPTs();
+		//first if slug passed in...
+		if ( ! empty($post_type_slug)) {
+			//match?
+			if (
+				! isset($cpts[$post_type_slug])
+				|| (isset($cpts[$post_type_slug]) && empty($cpts[$post_type_slug]['class_name']))
+			) {
+				return array();
+			}
+			//k let's get the model name for this cpt.
+			return array($post_type_slug => str_replace('EE', 'EEM', $cpts[$post_type_slug]['class_name']));
+		}
+		//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) {
+			if ( ! empty($args['class_name'])) {
+				$cpt_models[$slug] = str_replace('EE', 'EEM', $args['class_name']);
+			}
+		}
+		return $cpt_models;
+	}
+
+
+
+	/**
+	 * 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 static function instantiate_cpt_models($post_type_slug = '')
+	{
+		$cpt_model_names = self::get_cpt_model_names($post_type_slug);
+		$instantiated = array();
+		foreach ($cpt_model_names as $slug => $model_name) {
+			$instance = EE_Registry::instance()->load_model(str_replace('EEM_', '', $model_name));
+			if ($instance instanceof EEM_CPT_Base) {
+				$instantiated[$slug] = $instance;
+			}
+		}
+		return $instantiated;
+	}
+
+
+
+	/**
+	 *    get_CPTs
+	 *
+	 * @access    public
+	 * @return    array
+	 */
+	public static function get_CPTs()
+	{
+		// define CPTs
+		// NOTE the ['args']['page_templates'] array index is something specific to our CPTs
+		// and not part of the WP custom post type api.
+		return apply_filters('FHEE__EE_Register_CPTs__get_CPTs__cpts', array(
+			'espresso_events'    => array(
+				'singular_name' => __("Event", "event_espresso"),
+				'plural_name'   => __("Events", "event_espresso"),
+				'singular_slug' => __("event", "event_espresso"),
+				'plural_slug'   => EE_Registry::instance()->CFG->core->event_cpt_slug,
+				'class_name'    => 'EE_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' => __("Venue", "event_espresso"),
+				'plural_name'   => __("Venues", "event_espresso"),
+				'singular_slug' => __("venue", "event_espresso"),
+				'plural_slug'   => __("venues", "event_espresso"),
+				'class_name'    => 'EE_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' => __("Contact", "event_espresso"),
+				'plural_name'   => __("Contacts", "event_espresso"),
+				'singular_slug' => __("contact", "event_espresso"),
+				'plural_slug'   => __("contacts", "event_espresso"),
+				'class_name'    => 'EE_Attendee',
+				'args'          => array(
+					'public'             => false,
+					'publicly_queryable' => false,
+					'hierarchical'       => false,
+					'has_archive'        => false,
+					'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',
+					),
+					'supports'           => array('editor', 'thumbnail', 'excerpt', 'custom-fields', 'comments'),
+				),
+			),
+		));
+	}
+
+
+
+	/**
+	 * This basically goes through the CPT array and returns only CPT's
+	 * that have the ['args']['public'] option set as false
+	 *
+	 * @return array
+	 */
+	public static function get_private_CPTs()
+	{
+		$CPTs = self::get_CPTs();
+		$private_CPTs = array();
+		foreach ($CPTs as $CPT => $details) {
+			if (empty($details['args']['public'])) {
+				$private_CPTs[$CPT] = $details;
+			}
+		}
+		return $private_CPTs;
+	}
+
+
+
+	/**
+	 * Registers a custom taxonomy. Should be called before registering custom post types,
+	 * otherwise you should link the taxonomy to the custom post type using 'register_taxonomy_for_object_type'.
+	 *
+	 * @param string $taxonomy_name , eg 'books'
+	 * @param string $singular_name internationalized singular name
+	 * @param string $plural_name   internationalized plural name
+	 * @param array  $override_args like $args on http://codex.wordpress.org/Function_Reference/register_taxonomy
+	 */
+	public function register_taxonomy($taxonomy_name, $singular_name, $plural_name, $override_args = array())
+	{
+		$args = array(
+			'hierarchical'      => true,
+			'labels'            => array(
+				'name'          => $plural_name,
+				'singular_name' => $singular_name,
+			),
+			'show_ui'           => true,
+			'show_ee_ui'        => true,
+			'show_admin_column' => true,
+			'query_var'         => true,
+			'show_in_nav_menus' => false,
+			'map_meta_cap'      => true
+			//'rewrite'           => array( 'slug' => 'genre' ),
+		);
+		if ($override_args) {
+			if (isset($override_args['labels'])) {
+				$labels = array_merge($args['labels'], $override_args['labels']);
+				$args['labels'] = $labels;
+			}
+			$args = array_merge($args, $override_args);
+		}
+		register_taxonomy($taxonomy_name, null, $args);
+	}
+
+
+
+	/**
+	 * Registers a new custom post type. Sets default settings given only the following params.
+	 *
+	 * @param string $post_type     the actual post type name
+	 *                              (VERY IMPORTANT: this much match what the slug is for admin pages related to this
+	 *                              cpt Also any models must use this slug as well)
+	 * @param string $singular_name a pre-internationalized string for the singular name of the objects
+	 * @param string $plural_name   a pre-internalized string for the plural name of the objects
+	 * @param array  $override_args exactly like $args as described in
+	 *                              http://codex.wordpress.org/Function_Reference/register_post_type The default values
+	 *                              set in this function will be overridden by whatever you set in $override_args
+	 * @param string $singular_slug
+	 * @param string $plural_slug
+	 * @return void , but registers the custom post type
+	 */
+	public function register_CPT(
+		$post_type,
+		$singular_name,
+		$plural_name,
+		$override_args = array(),
+		$singular_slug = '',
+		$plural_slug = ''
+	) {
+		$labels = array(
+			'name'               => $plural_name,
+			'singular_name'      => $singular_name,
+			'singular_slug'      => $singular_slug,
+			'plural_slug'        => $plural_slug,
+			'add_new'            => sprintf(__("Add %s", "event_espresso"), $singular_name),
+			'add_new_item'       => sprintf(__("Add New %s", "event_espresso"), $singular_name),
+			'edit_item'          => sprintf(__("Edit %s", "event_espresso"), $singular_name),
+			'new_item'           => sprintf(__("New %s", "event_espresso"), $singular_name),
+			'all_items'          => sprintf(__("All %s", "event_espresso"), $plural_name),
+			'view_item'          => sprintf(__("View %s", "event_espresso"), $singular_name),
+			'search_items'       => sprintf(__("Search %s", "event_espresso"), $plural_name),
+			'not_found'          => sprintf(__("No %s found", "event_espresso"), $plural_name),
+			'not_found_in_trash' => sprintf(__("No %s found in Trash", "event_espresso"), $plural_name),
+			'parent_item_colon'  => '',
+			'menu_name'          => sprintf(__("%s", "event_espresso"), $plural_name),
+		);
+		//verify plural slug and singular slug, if they aren't we'll use $singular_name and $plural_name
+		// $singular_slug = ! empty($singular_slug) ? $singular_slug : $singular_name;
+		$plural_slug = ! empty($plural_slug) ? $plural_slug : $plural_name;
+		//note the page_templates arg in the supports index is something specific to EE.
+		//  WordPress doesn't actually have that in their register_post_type api.
+		$args = array(
+			'labels'             => $labels,
+			'public'             => true,
+			'publicly_queryable' => true,
+			'show_ui'            => false,
+			'show_ee_ui'         => true,
+			'show_in_menu'       => false,
+			'show_in_nav_menus'  => false,
+			'query_var'          => true,
+			'rewrite'            => apply_filters(
+				'FHEE__EE_Register_CPTs__register_CPT__rewrite',
+				array('slug' => $plural_slug),
+				$post_type
+			),
+			'capability_type'    => 'post',
+			'map_meta_cap'       => true,
+			'has_archive'        => true,
+			'hierarchical'       => false,
+			'menu_position'      => null,
+			'supports'           => array(
+				'title',
+				'editor',
+				'author',
+				'thumbnail',
+				'excerpt',
+				'custom-fields',
+				'comments',
+			),
+		);
+		if ($override_args) {
+			if (isset($override_args['labels'])) {
+				$labels = array_merge($args['labels'], $override_args['labels']);
+			}
+			$args = array_merge($args, $override_args);
+			$args['labels'] = $labels;
+		}
+		register_post_type($post_type, $args);
+	}
+
+
+
+	public function set_must_use_event_types()
+	{
+		$term_details = array(
+			//Attendee's register for the first date-time only
+			'single-event'    => array(
+				__('Single Event', 'event_espresso'),
+				__('A single event that spans one or more consecutive days.', 'event_espresso'),
+			),
+			//example: a party or two-day long workshop
+			//Attendee's can register for any of the date-times
+			'multi-event'     => array(
+				__('Multi Event', 'event_espresso'),
+				__('Multiple, separate, but related events that occur on consecutive days.', 'event_espresso'),
+			),
+			//example: a three day music festival or week long conference
+			//Attendee's register for the first date-time only
+			'event-series'    => array(
+				__('Event Series', 'event_espresso'),
+				__(' Multiple events that occur over multiple non-consecutive days.', 'event_espresso'),
+			),
+			//example: an 8 week introduction to basket weaving course
+			//Attendee's can register for any of the date-times.
+			'recurring-event' => array(
+				__('Recurring Event', 'event_espresso'),
+				__('Multiple events that occur over multiple non-consecutive days.', 'event_espresso'),
+			),
+			//example: a yoga class
+			'ongoing' => array(
+				__('Ongoing Event', 'event_espresso'),
+				__('An "event" that people can purchase tickets to gain access for anytime for this event regardless of date times on the event',
+					'event_espresso'),
+			)
+			//example: access to a museum
+			//'walk-in' => array( __('Walk In', 'event_espresso'), __('Single datetime and single entry recurring events. Attendees register for one or multiple datetimes individually.', 'event_espresso') ),
+			//'reservation' => array( __('Reservation', 'event_espresso'), __('Reservations are created by specifying available datetimes and quantities. Attendees choose from the available datetimes and specify the quantity available (if the maximum is greater than 1)') ), //@TODO to avoid confusion we'll implement this in a later iteration > EE4.1
+			// 'multiple-session' => array( __('Multiple Session', 'event_espresso'), __('Multiple event, multiple datetime, hierarchically organized, custom entry events. Attendees may be required to register for a parent event before being allowed to register for child events. Attendees can register for any combination of child events as long as the datetimes do not conflict. Parent and child events may have additional fees or registration questions.') ), //@TODO to avoid confusion we'll implement this in a later iteration > EE4.1
+			//'appointment' => array( __('Appointments', 'event_espresso'), __('Time slotted events where datetimes are generally in hours or minutes. For example, attendees can register for a single 15 minute or 1 hour time slot and this type of availability frequently reoccurs.', 'event_espresso') )
+		);
+		$this->set_must_use_terms('espresso_event_type', $term_details);
+	}
+
+
+
+	/**
+	 * wrapper method for handling the setting up of initial terms in the db (if they don't already exist).
+	 * Note this should ONLY be used for terms that always must be present.  Be aware that if an initial term is
+	 * deleted then it WILL be recreated.
+	 *
+	 * @param string $taxonomy     The name of the taxonomy
+	 * @param array  $term_details An array of term details indexed by slug and containing Name of term, and
+	 *                             description as the elements in the array
+	 * @return void
+	 */
+	public function set_must_use_terms($taxonomy, $term_details)
+	{
+		$term_details = (array)$term_details;
+		foreach ($term_details as $slug => $details) {
+			if ( ! term_exists($slug, $taxonomy)) {
+				$insert_arr = array(
+					'slug'        => $slug,
+					'description' => $details[1],
+				);
+				wp_insert_term($details[0], $taxonomy, $insert_arr);
+			}
+		}
+	}
+
+
+
+	/**
+	 * Allows us to set what the default will be for terms when a cpt is PUBLISHED.
+	 *
+	 * @param string $taxonomy  The taxonomy we're using for the default term
+	 * @param string $term_slug The slug of the term that will be the default.
+	 * @param array  $cpt_slugs An array of custom post types we want the default assigned to
+	 */
+	public function set_default_term($taxonomy, $term_slug, $cpt_slugs = array())
+	{
+		$this->_default_terms[][$term_slug] = new EE_Default_Term($taxonomy, $term_slug, $cpt_slugs);
+	}
+
+
+
+	/**
+	 * hooked into the wp 'save_post' action hook for setting our default terms found in the $_default_terms property
+	 *
+	 * @param  int    $post_id ID of CPT being saved
+	 * @param  object $post    Post object
+	 * @return void
+	 */
+	public function save_default_term($post_id, $post)
+	{
+		if (empty($this->_default_terms)) {
+			return;
+		} //no default terms set so lets just exit.
+		foreach ($this->_default_terms as $defaults) {
+			foreach ($defaults as $default_obj) {
+				if ($post->post_status === 'publish' && in_array($post->post_type, $default_obj->cpt_slugs, true)) {
+					//note some error proofing going on here to save unnecessary db queries
+					$taxonomies = get_object_taxonomies($post->post_type);
+					foreach ((array)$taxonomies as $taxonomy) {
+						$terms = wp_get_post_terms($post_id, $taxonomy);
+						if (empty($terms) && $taxonomy === $default_obj->taxonomy) {
+							wp_set_object_terms($post_id, array($default_obj->term_slug), $taxonomy);
+						}
+					}
+				}
+			}
+		}
+	}
 
 }
 
@@ -625,27 +625,27 @@ 
 {
 
 
-    //props holding the items
-    public $taxonomy  = '';
+	//props holding the items
+	public $taxonomy  = '';
 
-    public $cpt_slugs = array();
+	public $cpt_slugs = array();
 
-    public $term_slug = '';
+	public $term_slug = '';
 
 
 
-    /**
-     * constructor
-     *
-     * @param string $taxonomy  The taxonomy the default term belongs to
-     * @param string $term_slug The slug of the term that will be the default.
-     * @param array  $cpt_slugs The custom post type the default term gets saved with
-     */
-    public function __construct($taxonomy, $term_slug, $cpt_slugs = array())
-    {
-        $this->taxonomy = $taxonomy;
-        $this->cpt_slugs = (array)$cpt_slugs;
-        $this->term_slug = $term_slug;
-    }
+	/**
+	 * constructor
+	 *
+	 * @param string $taxonomy  The taxonomy the default term belongs to
+	 * @param string $term_slug The slug of the term that will be the default.
+	 * @param array  $cpt_slugs The custom post type the default term gets saved with
+	 */
+	public function __construct($taxonomy, $term_slug, $cpt_slugs = array())
+	{
+		$this->taxonomy = $taxonomy;
+		$this->cpt_slugs = (array)$cpt_slugs;
+		$this->term_slug = $term_slug;
+	}
 
 }

modules/ticket_selector/ProcessTicketSelector.php

Doc Comments +4 added lines, -4 removed lines

@@ -32,7 +32,7 @@ 
     /**
      * cancelTicketSelections
      *
-     * @return        string
+     * @return        false|null
      */
     public function cancelTicketSelections()
     {
@@ -99,7 +99,7 @@ 
     /**
      * process_ticket_selections
      *
-     * @return array|bool
+     * @return boolean|null
      * @throws \EE_Error
      */
     public function processTicketSelections()
@@ -273,7 +273,7 @@ 
      * validate_post_data
      *
      * @param int $id
-     * @return array|FALSE
+     * @return string
      */
     private function validatePostData($id = 0)
     {
@@ -390,7 +390,7 @@ 
      *
      * @param \EE_Ticket $ticket
      * @param int        $qty
-     * @return TRUE on success, FALSE on fail
+     * @return boolean on success, FALSE on fail
      * @throws \EE_Error
      */
     private function addTicketToCart(\EE_Ticket $ticket = null, $qty = 1)

Spacing +8 added lines, -8 removed lines

@@ -49,7 +49,7 @@ 
             );
         } else {
             wp_safe_redirect(
-                site_url('/' . \EE_Registry::instance()->CFG->core->event_cpt_slug . '/')
+                site_url('/'.\EE_Registry::instance()->CFG->core->event_cpt_slug.'/')
             );
         }
         exit();
@@ -165,7 +165,7 @@ 
                 'event_espresso'
             );
             $limit_error_2 = sprintf($max_atndz_string, $valid['max_atndz'], $valid['max_atndz']);
-            \EE_Error::add_error($limit_error_1 . '<br/>' . $limit_error_2, __FILE__, __FUNCTION__, __LINE__);
+            \EE_Error::add_error($limit_error_1.'<br/>'.$limit_error_2, __FILE__, __FUNCTION__, __LINE__);
         } else {
             // all data appears to be valid
             $tckts_slctd = false;
@@ -305,9 +305,9 @@ 
         // cycle through $inputs_to_clean array
         foreach ($inputs_to_clean as $what => $input_to_clean) {
             // check for POST data
-            if (\EE_Registry::instance()->REQ->is_set($input_to_clean . $id)) {
+            if (\EE_Registry::instance()->REQ->is_set($input_to_clean.$id)) {
                 // grab value
-                $input_value = \EE_Registry::instance()->REQ->get($input_to_clean . $id);
+                $input_value = \EE_Registry::instance()->REQ->get($input_to_clean.$id);
                 switch ($what) {
                     // integers
                     case 'event_id':
@@ -328,8 +328,8 @@ 
                         // if qty is coming from a radio button input, then we need to assemble an array of rows
                         if ( ! is_array($row_qty)) {
                             // get number of rows
-                            $rows = \EE_Registry::instance()->REQ->is_set('tkt-slctr-rows-' . $id)
-                                ? absint(\EE_Registry::instance()->REQ->get('tkt-slctr-rows-' . $id))
+                            $rows = \EE_Registry::instance()->REQ->is_set('tkt-slctr-rows-'.$id)
+                                ? absint(\EE_Registry::instance()->REQ->get('tkt-slctr-rows-'.$id))
                                 : 1;
                             // explode ints by the dash
                             $row_qty = explode('-', $row_qty);
@@ -355,7 +355,7 @@ 
                     case 'ticket_id':
                         $value_array = array();
                         // cycle thru values
-                        foreach ((array)$input_value as $key => $value) {
+                        foreach ((array) $input_value as $key => $value) {
                             // allow only numbers, letters,  spaces, commas and dashes
                             $value_array[$key] = wp_strip_all_tags($value);
                             // get ticket via the ticket id we put in the form
@@ -373,7 +373,7 @@ 
                             $input_value = explode('#', $input_value);
                             $input_value = end($input_value);
                             // use event list url instead, but append anchor
-                            $input_value = \EEH_Event_View::event_archive_url() . '#' . $input_value;
+                            $input_value = \EEH_Event_View::event_archive_url().'#'.$input_value;
                         }
                         $valid_data[$what] = $input_value;
                         break;

Indentation +565 added lines, -565 removed lines

@@ -2,7 +2,7 @@ 
 namespace EventEspresso\modules\ticket_selector;
 
 if ( ! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 
@@ -19,570 +19,570 @@ 
 class ProcessTicketSelector
 {
 
-    /**
-     * array of datetimes and the spaces available for them
-     *
-     * @access private
-     * @var array
-     */
-    private static $_available_spaces = array();
-
-
-
-    /**
-     * cancelTicketSelections
-     *
-     * @return        string
-     */
-    public function cancelTicketSelections()
-    {
-        // check nonce
-        if ( ! $this->processTicketSelectorNonce('cancel_ticket_selections')) {
-            return false;
-        }
-        \EE_Registry::instance()->SSN->clear_session(__CLASS__, __FUNCTION__);
-        if (\EE_Registry::instance()->REQ->is_set('event_id')) {
-            wp_safe_redirect(
-                \EEH_Event_View::event_link_url(
-                    \EE_Registry::instance()->REQ->get('event_id')
-                )
-            );
-        } else {
-            wp_safe_redirect(
-                site_url('/' . \EE_Registry::instance()->CFG->core->event_cpt_slug . '/')
-            );
-        }
-        exit();
-    }
-
-
-
-    /**
-     * processTicketSelectorNonce
-     *
-     * @param  string $nonce_name
-     * @param string  $id
-     * @return bool
-     */
-    private function processTicketSelectorNonce($nonce_name, $id = '')
-    {
-        $nonce_name_with_id = ! empty($id) ? "{$nonce_name}_nonce_{$id}" : "{$nonce_name}_nonce";
-        if (
-            ! is_admin()
-            && (
-                ! \EE_Registry::instance()->REQ->is_set($nonce_name_with_id)
-                || ! wp_verify_nonce(
-                    \EE_Registry::instance()->REQ->get($nonce_name_with_id),
-                    $nonce_name
-                )
-            )
-        ) {
-            \EE_Error::add_error(
-                sprintf(
-                    __(
-                        'We\'re sorry but your request failed to pass a security check.%sPlease click the back button on your browser and try again.',
-                        'event_espresso'
-                    ),
-                    '<br/>'
-                ),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-            return false;
-        }
-        return true;
-    }
-
-
-
-    /**
-     * process_ticket_selections
-     *
-     * @return array|bool
-     * @throws \EE_Error
-     */
-    public function processTicketSelections()
-    {
-        do_action('EED_Ticket_Selector__process_ticket_selections__before');
-        // do we have an event id?
-        if ( ! \EE_Registry::instance()->REQ->is_set('tkt-slctr-event-id')) {
-            // $_POST['tkt-slctr-event-id'] was not set ?!?!?!?
-            \EE_Error::add_error(
-                sprintf(
-                    __(
-                        'An event id was not provided or was not received.%sPlease click the back button on your browser and try again.',
-                        'event_espresso'
-                    ),
-                    '<br/>'
-                ),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-        }
-        //if event id is valid
-        $id = absint(\EE_Registry::instance()->REQ->get('tkt-slctr-event-id'));
-        //		d( \EE_Registry::instance()->REQ );
-        self::$_available_spaces = array(
-            'tickets'   => array(),
-            'datetimes' => array(),
-        );
-        //we should really only have 1 registration in the works now (ie, no MER) so clear any previous items in the cart.
-        // When MER happens this will probably need to be tweaked, possibly wrapped in a conditional checking for some constant defined in MER etc.
-        \EE_Registry::instance()->load_core('Session');
-        // unless otherwise requested, clear the session
-        if (apply_filters('FHEE__EE_Ticket_Selector__process_ticket_selections__clear_session', true)) {
-            \EE_Registry::instance()->SSN->clear_session(__CLASS__, __FUNCTION__);
-        }
-        //d( \EE_Registry::instance()->SSN );
-        do_action('AHEE_log', __FILE__, __FUNCTION__, '');
-        // validate/sanitize data
-        $valid = $this->validatePostData($id);
-        //EEH_Debug_Tools::printr( $_REQUEST, '$_REQUEST', __FILE__, __LINE__ );
-        //EEH_Debug_Tools::printr( $valid, '$valid', __FILE__, __LINE__ );
-        //EEH_Debug_Tools::printr( $valid[ 'total_tickets' ], 'total_tickets', __FILE__, __LINE__ );
-        //EEH_Debug_Tools::printr( $valid[ 'max_atndz' ], 'max_atndz', __FILE__, __LINE__ );
-        //check total tickets ordered vs max number of attendees that can register
-        if ($valid['total_tickets'] > $valid['max_atndz']) {
-            // ordering too many tickets !!!
-            $total_tickets_string = _n(
-                'You have attempted to purchase %s ticket.',
-                'You have attempted to purchase %s tickets.',
-                $valid['total_tickets'],
-                'event_espresso'
-            );
-            $limit_error_1 = sprintf($total_tickets_string, $valid['total_tickets']);
-            // dev only message
-            $max_atndz_string = _n(
-                'The registration limit for this event is %s ticket per registration, therefore the total number of tickets you may purchase at a time can not exceed %s.',
-                'The registration limit for this event is %s tickets per registration, therefore the total number of tickets you may purchase at a time can not exceed %s.',
-                $valid['max_atndz'],
-                'event_espresso'
-            );
-            $limit_error_2 = sprintf($max_atndz_string, $valid['max_atndz'], $valid['max_atndz']);
-            \EE_Error::add_error($limit_error_1 . '<br/>' . $limit_error_2, __FILE__, __FUNCTION__, __LINE__);
-        } else {
-            // all data appears to be valid
-            $tckts_slctd = false;
-            $tickets_added = 0;
-            $valid = apply_filters('FHEE__EED_Ticket_Selector__process_ticket_selections__valid_post_data', $valid);
-            if ($valid['total_tickets'] > 0) {
-                // load cart
-                \EE_Registry::instance()->load_core('Cart');
-                // cycle thru the number of data rows sent from the event listing
-                for ($x = 0; $x < $valid['rows']; $x++) {
-                    // does this row actually contain a ticket quantity?
-                    if (isset($valid['qty'][$x]) && $valid['qty'][$x] > 0) {
-                        // YES we have a ticket quantity
-                        $tckts_slctd = true;
-                        //						d( $valid['ticket_obj'][$x] );
-                        if ($valid['ticket_obj'][$x] instanceof \EE_Ticket) {
-                            // then add ticket to cart
-                            $tickets_added += $this->addTicketToCart(
-                                $valid['ticket_obj'][$x],
-                                $valid['qty'][$x]
-                            );
-                            if (\EE_Error::has_error()) {
-                                break;
-                            }
-                        } else {
-                            // nothing added to cart retrieved
-                            \EE_Error::add_error(
-                                sprintf(
-                                    __(
-                                        'A valid ticket could not be retrieved for the event.%sPlease click the back button on your browser and try again.',
-                                        'event_espresso'
-                                    ),
-                                    '<br/>'
-                                ),
-                                __FILE__, __FUNCTION__, __LINE__
-                            );
-                        }
-                    }
-                }
-            }
-            do_action(
-                'AHEE__EE_Ticket_Selector__process_ticket_selections__after_tickets_added_to_cart',
-                \EE_Registry::instance()->CART,
-                $this
-            );
-            //d( \EE_Registry::instance()->CART );
-            //die(); // <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< KILL REDIRECT HERE BEFORE CART UPDATE
-            if (apply_filters('FHEE__EED_Ticket_Selector__process_ticket_selections__tckts_slctd', $tckts_slctd)) {
-                if (apply_filters('FHEE__EED_Ticket_Selector__process_ticket_selections__success', $tickets_added)) {
-                    do_action(
-                        'FHEE__EE_Ticket_Selector__process_ticket_selections__before_redirecting_to_checkout',
-                        \EE_Registry::instance()->CART,
-                        $this
-                    );
-                    \EE_Registry::instance()->CART->recalculate_all_cart_totals();
-                    \EE_Registry::instance()->CART->save_cart(false);
-                    // exit('KILL REDIRECT AFTER CART UPDATE'); // <<<<<<<<  OR HERE TO KILL REDIRECT AFTER CART UPDATE
-                    // just return TRUE for registrations being made from admin
-                    if (is_admin()) {
-                        return true;
-                    }
-                    \EE_Error::get_notices(false, true);
-                    wp_safe_redirect(
-                        apply_filters(
-                            'FHEE__EE_Ticket_Selector__process_ticket_selections__success_redirect_url',
-                            \EE_Registry::instance()->CFG->core->reg_page_url()
-                        )
-                    );
-                    exit();
-                } else {
-                    if ( ! \EE_Error::has_error() && ! \EE_Error::has_error(true, 'attention')) {
-                        // nothing added to cart
-                        \EE_Error::add_attention(__('No tickets were added for the event', 'event_espresso'),
-                            __FILE__, __FUNCTION__, __LINE__);
-                    }
-                }
-            } else {
-                // no ticket quantities were selected
-                \EE_Error::add_error(__('You need to select a ticket quantity before you can proceed.',
-                    'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
-            }
-        }
-        //die(); // <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< KILL BEFORE REDIRECT
-        // at this point, just return if registration is being made from admin
-        if (is_admin()) {
-            return false;
-        }
-        if ($valid['return_url']) {
-            \EE_Error::get_notices(false, true);
-            wp_safe_redirect($valid['return_url']);
-            exit();
-        } elseif (isset($event_to_add['id'])) {
-            \EE_Error::get_notices(false, true);
-            wp_safe_redirect(get_permalink($event_to_add['id']));
-            exit();
-        } else {
-            echo \EE_Error::get_notices();
-        }
-        return false;
-    }
-
-
-
-    /**
-     * validate_post_data
-     *
-     * @param int $id
-     * @return array|FALSE
-     */
-    private function validatePostData($id = 0)
-    {
-        do_action('AHEE_log', __FILE__, __FUNCTION__, '');
-        if ( ! $id) {
-            \EE_Error::add_error(
-                __('The event id provided was not valid.', 'event_espresso'),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-            return false;
-        }
-        // start with an empty array()
-        $valid_data = array();
-        // grab valid id
-        $valid_data['id'] = $id;
-        // array of other form names
-        $inputs_to_clean = array(
-            'event_id'   => 'tkt-slctr-event-id',
-            'max_atndz'  => 'tkt-slctr-max-atndz-',
-            'rows'       => 'tkt-slctr-rows-',
-            'qty'        => 'tkt-slctr-qty-',
-            'ticket_id'  => 'tkt-slctr-ticket-id-',
-            'return_url' => 'tkt-slctr-return-url-',
-        );
-        // let's track the total number of tickets ordered.'
-        $valid_data['total_tickets'] = 0;
-        // cycle through $inputs_to_clean array
-        foreach ($inputs_to_clean as $what => $input_to_clean) {
-            // check for POST data
-            if (\EE_Registry::instance()->REQ->is_set($input_to_clean . $id)) {
-                // grab value
-                $input_value = \EE_Registry::instance()->REQ->get($input_to_clean . $id);
-                switch ($what) {
-                    // integers
-                    case 'event_id':
-                        $valid_data[$what] = absint($input_value);
-                        // get event via the event id we put in the form
-                        $valid_data['event'] = \EE_Registry::instance()
-                                                           ->load_model('Event')
-                                                           ->get_one_by_ID($valid_data['event_id']);
-                        break;
-                    case 'rows':
-                    case 'max_atndz':
-                        $valid_data[$what] = absint($input_value);
-                        break;
-                    // arrays of integers
-                    case 'qty':
-                        /** @var array $row_qty */
-                        $row_qty = $input_value;
-                        // if qty is coming from a radio button input, then we need to assemble an array of rows
-                        if ( ! is_array($row_qty)) {
-                            // get number of rows
-                            $rows = \EE_Registry::instance()->REQ->is_set('tkt-slctr-rows-' . $id)
-                                ? absint(\EE_Registry::instance()->REQ->get('tkt-slctr-rows-' . $id))
-                                : 1;
-                            // explode ints by the dash
-                            $row_qty = explode('-', $row_qty);
-                            $row = isset($row_qty[0]) ? absint($row_qty[0]) : 1;
-                            $qty = isset($row_qty[1]) ? absint($row_qty[1]) : 0;
-                            $row_qty = array($row => $qty);
-                            for ($x = 1; $x <= $rows; $x++) {
-                                if ( ! isset($row_qty[$x])) {
-                                    $row_qty[$x] = 0;
-                                }
-                            }
-                        }
-                        ksort($row_qty);
-                        // cycle thru values
-                        foreach ($row_qty as $qty) {
-                            $qty = absint($qty);
-                            // sanitize as integers
-                            $valid_data[$what][] = $qty;
-                            $valid_data['total_tickets'] += $qty;
-                        }
-                        break;
-                    // array of integers
-                    case 'ticket_id':
-                        $value_array = array();
-                        // cycle thru values
-                        foreach ((array)$input_value as $key => $value) {
-                            // allow only numbers, letters,  spaces, commas and dashes
-                            $value_array[$key] = wp_strip_all_tags($value);
-                            // get ticket via the ticket id we put in the form
-                            $ticket_obj = \EE_Registry::instance()->load_model('Ticket')->get_one_by_ID($value);
-                            $valid_data['ticket_obj'][$key] = $ticket_obj;
-                        }
-                        $valid_data[$what] = $value_array;
-                        break;
-                    case 'return_url' :
-                        // grab and sanitize return-url
-                        $input_value = esc_url_raw($input_value);
-                        // was the request coming from an iframe ? if so, then:
-                        if (strpos($input_value, 'event_list=iframe')) {
-                            // get anchor fragment
-                            $input_value = explode('#', $input_value);
-                            $input_value = end($input_value);
-                            // use event list url instead, but append anchor
-                            $input_value = \EEH_Event_View::event_archive_url() . '#' . $input_value;
-                        }
-                        $valid_data[$what] = $input_value;
-                        break;
-                }    // end switch $what
-            }
-        }    // end foreach $inputs_to_clean
-        return $valid_data;
-    }
-
-
-
-    /**
-     * adds a ticket to the cart
-     *
-     * @param \EE_Ticket $ticket
-     * @param int        $qty
-     * @return TRUE on success, FALSE on fail
-     * @throws \EE_Error
-     */
-    private function addTicketToCart(\EE_Ticket $ticket = null, $qty = 1)
-    {
-        do_action('AHEE_log', __FILE__, __FUNCTION__, '');
-        // get the number of spaces left for this datetime ticket
-        $available_spaces = $this->ticketDatetimeAvailability($ticket);
-        // compare available spaces against the number of tickets being purchased
-        if ($available_spaces >= $qty) {
-            // allow addons to prevent a ticket from being added to cart
-            if (
-            ! apply_filters(
-                'FHEE__EE_Ticket_Selector___add_ticket_to_cart__allow_add_to_cart',
-                true,
-                $ticket,
-                $qty,
-                $available_spaces
-            )
-            ) {
-                return false;
-            }
-            $qty = absint(apply_filters('FHEE__EE_Ticket_Selector___add_ticket_to_cart__ticket_qty', $qty, $ticket));
-            // add event to cart
-            if (\EE_Registry::instance()->CART->add_ticket_to_cart($ticket, $qty)) {
-                $this->recalculateTicketDatetimeAvailability($ticket, $qty);
-                return true;
-            }
-            return false;
-        }
-        // tickets can not be purchased but let's find the exact number left
-        // for the last ticket selected PRIOR to subtracting tickets
-        $available_spaces = $this->ticketDatetimeAvailability($ticket, true);
-        // greedy greedy greedy eh?
-        if ($available_spaces > 0) {
-            if (
-            apply_filters(
-                'FHEE__EE_Ticket_Selector___add_ticket_to_cart__allow_display_availability_error',
-                true,
-                $ticket,
-                $qty,
-                $available_spaces
-            )
-            ) {
-                $this->displayAvailabilityError($available_spaces);
-            }
-        } else {
-            \EE_Error::add_error(
-                __(
-                    'We\'re sorry, but there are no available spaces left for this event at this particular date and time.',
-                    'event_espresso'
-                ),
-                __FILE__, __FUNCTION__, __LINE__
-            );
-        }
-        return false;
-    }
-
-
-
-    /**
-     * @param int $available_spaces
-     * @throws \EE_Error
-     */
-    private function displayAvailabilityError($available_spaces = 1)
-    {
-        // add error messaging - we're using the _n function that will generate
-        // the appropriate singular or plural message based on the number of $available_spaces
-        if (\EE_Registry::instance()->CART->all_ticket_quantity_count()) {
-            $msg = sprintf(
-                _n(
-                    'We\'re sorry, but there is only %1$s available space left for this event at this particular date and time. Please select a different number (or different combination) of tickets by cancelling the current selection and choosing again, or proceed to registration.',
-                    'We\'re sorry, but there are only %1$s available spaces left for this event at this particular date and time. Please select a different number (or different combination) of tickets by cancelling the current selection and choosing again, or proceed to registration.',
-                    $available_spaces,
-                    'event_espresso'
-                ),
-                $available_spaces,
-                '<br />'
-            );
-        } else {
-            $msg = sprintf(
-                _n(
-                    'We\'re sorry, but there is only %1$s available space left for this event at this particular date and time. Please select a different number (or different combination) of tickets.',
-                    'We\'re sorry, but there are only %1$s available spaces left for this event at this particular date and time. Please select a different number (or different combination) of tickets.',
-                    $available_spaces,
-                    'event_espresso'
-                ),
-                $available_spaces,
-                '<br />'
-            );
-        }
-        \EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
-    }
-
-
-
-    /**
-     * ticketDatetimeAvailability
-     * creates an array of tickets plus all of the datetimes available to each ticket
-     * and tracks the spaces remaining for each of those datetimes
-     *
-     * @param \EE_Ticket $ticket - selected ticket
-     * @param bool       $get_original_ticket_spaces
-     * @return int
-     * @throws \EE_Error
-     */
-    private function ticketDatetimeAvailability(\EE_Ticket $ticket, $get_original_ticket_spaces = false)
-    {
-        // if the $_available_spaces array has not been set up yet...
-        if ( ! isset(self::$_available_spaces['tickets'][$ticket->ID()])) {
-            $this->setInitialTicketDatetimeAvailability($ticket);
-        }
-        $available_spaces = $ticket->qty() - $ticket->sold();
-        if (isset(self::$_available_spaces['tickets'][$ticket->ID()])) {
-            // loop thru tickets, which will ALSO include individual ticket records AND a total
-            foreach (self::$_available_spaces['tickets'][$ticket->ID()] as $DTD_ID => $spaces) {
-                // if we want the original datetime availability BEFORE we started subtracting tickets ?
-                if ($get_original_ticket_spaces) {
-                    // then grab the available spaces from the "tickets" array
-                    // and compare with the above to get the lowest number
-                    $available_spaces = min(
-                        $available_spaces,
-                        self::$_available_spaces['tickets'][$ticket->ID()][$DTD_ID]
-                    );
-                } else {
-                    // we want the updated ticket availability as stored in the "datetimes" array
-                    $available_spaces = min($available_spaces, self::$_available_spaces['datetimes'][$DTD_ID]);
-                }
-            }
-        }
-        return $available_spaces;
-    }
-
-
-
-    /**
-     * @param \EE_Ticket $ticket
-     * @return void
-     * @throws \EE_Error
-     */
-    private function setInitialTicketDatetimeAvailability(\EE_Ticket $ticket)
-    {
-        // first, get all of the datetimes that are available to this ticket
-        $datetimes = $ticket->get_many_related(
-            'Datetime',
-            array(
-                array(
-                    'DTT_EVT_end' => array(
-                        '>=',
-                        \EEM_Datetime::instance()->current_time_for_query('DTT_EVT_end'),
-                    ),
-                ),
-                'order_by' => array('DTT_EVT_start' => 'ASC'),
-            )
-        );
-        if ( ! empty($datetimes)) {
-            // now loop thru all of the datetimes
-            foreach ($datetimes as $datetime) {
-                if ($datetime instanceof \EE_Datetime) {
-                    // the number of spaces available for the datetime without considering individual ticket quantities
-                    $spaces_remaining = $datetime->spaces_remaining();
-                    // save the total available spaces ( the lesser of the ticket qty minus the number of tickets sold
-                    // or the datetime spaces remaining) to this ticket using the datetime ID as the key
-                    self::$_available_spaces['tickets'][$ticket->ID()][$datetime->ID()] = min(
-                        $ticket->qty() - $ticket->sold(),
-                        $spaces_remaining
-                    );
-                    // if the remaining spaces for this datetime is already set,
-                    // then compare that against the datetime spaces remaining, and take the lowest number,
-                    // else just take the datetime spaces remaining, and assign to the datetimes array
-                    self::$_available_spaces['datetimes'][$datetime->ID()] = isset(
-                        self::$_available_spaces['datetimes'][$datetime->ID()]
-                    )
-                        ? min(self::$_available_spaces['datetimes'][$datetime->ID()], $spaces_remaining)
-                        : $spaces_remaining;
-                }
-            }
-        }
-    }
-
-
-
-    /**
-     * @param    \EE_Ticket $ticket
-     * @param    int        $qty
-     * @return    void
-     */
-    private function recalculateTicketDatetimeAvailability(\EE_Ticket $ticket, $qty = 0)
-    {
-        if (isset(self::$_available_spaces['tickets'][$ticket->ID()])) {
-            // loop thru tickets, which will ALSO include individual ticket records AND a total
-            foreach (self::$_available_spaces['tickets'][$ticket->ID()] as $DTD_ID => $spaces) {
-                // subtract the qty of selected tickets from each datetime's available spaces this ticket has access to,
-                self::$_available_spaces['datetimes'][$DTD_ID] -= $qty;
-            }
-        }
-    }
+	/**
+	 * array of datetimes and the spaces available for them
+	 *
+	 * @access private
+	 * @var array
+	 */
+	private static $_available_spaces = array();
+
+
+
+	/**
+	 * cancelTicketSelections
+	 *
+	 * @return        string
+	 */
+	public function cancelTicketSelections()
+	{
+		// check nonce
+		if ( ! $this->processTicketSelectorNonce('cancel_ticket_selections')) {
+			return false;
+		}
+		\EE_Registry::instance()->SSN->clear_session(__CLASS__, __FUNCTION__);
+		if (\EE_Registry::instance()->REQ->is_set('event_id')) {
+			wp_safe_redirect(
+				\EEH_Event_View::event_link_url(
+					\EE_Registry::instance()->REQ->get('event_id')
+				)
+			);
+		} else {
+			wp_safe_redirect(
+				site_url('/' . \EE_Registry::instance()->CFG->core->event_cpt_slug . '/')
+			);
+		}
+		exit();
+	}
+
+
+
+	/**
+	 * processTicketSelectorNonce
+	 *
+	 * @param  string $nonce_name
+	 * @param string  $id
+	 * @return bool
+	 */
+	private function processTicketSelectorNonce($nonce_name, $id = '')
+	{
+		$nonce_name_with_id = ! empty($id) ? "{$nonce_name}_nonce_{$id}" : "{$nonce_name}_nonce";
+		if (
+			! is_admin()
+			&& (
+				! \EE_Registry::instance()->REQ->is_set($nonce_name_with_id)
+				|| ! wp_verify_nonce(
+					\EE_Registry::instance()->REQ->get($nonce_name_with_id),
+					$nonce_name
+				)
+			)
+		) {
+			\EE_Error::add_error(
+				sprintf(
+					__(
+						'We\'re sorry but your request failed to pass a security check.%sPlease click the back button on your browser and try again.',
+						'event_espresso'
+					),
+					'<br/>'
+				),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+			return false;
+		}
+		return true;
+	}
+
+
+
+	/**
+	 * process_ticket_selections
+	 *
+	 * @return array|bool
+	 * @throws \EE_Error
+	 */
+	public function processTicketSelections()
+	{
+		do_action('EED_Ticket_Selector__process_ticket_selections__before');
+		// do we have an event id?
+		if ( ! \EE_Registry::instance()->REQ->is_set('tkt-slctr-event-id')) {
+			// $_POST['tkt-slctr-event-id'] was not set ?!?!?!?
+			\EE_Error::add_error(
+				sprintf(
+					__(
+						'An event id was not provided or was not received.%sPlease click the back button on your browser and try again.',
+						'event_espresso'
+					),
+					'<br/>'
+				),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+		}
+		//if event id is valid
+		$id = absint(\EE_Registry::instance()->REQ->get('tkt-slctr-event-id'));
+		//		d( \EE_Registry::instance()->REQ );
+		self::$_available_spaces = array(
+			'tickets'   => array(),
+			'datetimes' => array(),
+		);
+		//we should really only have 1 registration in the works now (ie, no MER) so clear any previous items in the cart.
+		// When MER happens this will probably need to be tweaked, possibly wrapped in a conditional checking for some constant defined in MER etc.
+		\EE_Registry::instance()->load_core('Session');
+		// unless otherwise requested, clear the session
+		if (apply_filters('FHEE__EE_Ticket_Selector__process_ticket_selections__clear_session', true)) {
+			\EE_Registry::instance()->SSN->clear_session(__CLASS__, __FUNCTION__);
+		}
+		//d( \EE_Registry::instance()->SSN );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		// validate/sanitize data
+		$valid = $this->validatePostData($id);
+		//EEH_Debug_Tools::printr( $_REQUEST, '$_REQUEST', __FILE__, __LINE__ );
+		//EEH_Debug_Tools::printr( $valid, '$valid', __FILE__, __LINE__ );
+		//EEH_Debug_Tools::printr( $valid[ 'total_tickets' ], 'total_tickets', __FILE__, __LINE__ );
+		//EEH_Debug_Tools::printr( $valid[ 'max_atndz' ], 'max_atndz', __FILE__, __LINE__ );
+		//check total tickets ordered vs max number of attendees that can register
+		if ($valid['total_tickets'] > $valid['max_atndz']) {
+			// ordering too many tickets !!!
+			$total_tickets_string = _n(
+				'You have attempted to purchase %s ticket.',
+				'You have attempted to purchase %s tickets.',
+				$valid['total_tickets'],
+				'event_espresso'
+			);
+			$limit_error_1 = sprintf($total_tickets_string, $valid['total_tickets']);
+			// dev only message
+			$max_atndz_string = _n(
+				'The registration limit for this event is %s ticket per registration, therefore the total number of tickets you may purchase at a time can not exceed %s.',
+				'The registration limit for this event is %s tickets per registration, therefore the total number of tickets you may purchase at a time can not exceed %s.',
+				$valid['max_atndz'],
+				'event_espresso'
+			);
+			$limit_error_2 = sprintf($max_atndz_string, $valid['max_atndz'], $valid['max_atndz']);
+			\EE_Error::add_error($limit_error_1 . '<br/>' . $limit_error_2, __FILE__, __FUNCTION__, __LINE__);
+		} else {
+			// all data appears to be valid
+			$tckts_slctd = false;
+			$tickets_added = 0;
+			$valid = apply_filters('FHEE__EED_Ticket_Selector__process_ticket_selections__valid_post_data', $valid);
+			if ($valid['total_tickets'] > 0) {
+				// load cart
+				\EE_Registry::instance()->load_core('Cart');
+				// cycle thru the number of data rows sent from the event listing
+				for ($x = 0; $x < $valid['rows']; $x++) {
+					// does this row actually contain a ticket quantity?
+					if (isset($valid['qty'][$x]) && $valid['qty'][$x] > 0) {
+						// YES we have a ticket quantity
+						$tckts_slctd = true;
+						//						d( $valid['ticket_obj'][$x] );
+						if ($valid['ticket_obj'][$x] instanceof \EE_Ticket) {
+							// then add ticket to cart
+							$tickets_added += $this->addTicketToCart(
+								$valid['ticket_obj'][$x],
+								$valid['qty'][$x]
+							);
+							if (\EE_Error::has_error()) {
+								break;
+							}
+						} else {
+							// nothing added to cart retrieved
+							\EE_Error::add_error(
+								sprintf(
+									__(
+										'A valid ticket could not be retrieved for the event.%sPlease click the back button on your browser and try again.',
+										'event_espresso'
+									),
+									'<br/>'
+								),
+								__FILE__, __FUNCTION__, __LINE__
+							);
+						}
+					}
+				}
+			}
+			do_action(
+				'AHEE__EE_Ticket_Selector__process_ticket_selections__after_tickets_added_to_cart',
+				\EE_Registry::instance()->CART,
+				$this
+			);
+			//d( \EE_Registry::instance()->CART );
+			//die(); // <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< KILL REDIRECT HERE BEFORE CART UPDATE
+			if (apply_filters('FHEE__EED_Ticket_Selector__process_ticket_selections__tckts_slctd', $tckts_slctd)) {
+				if (apply_filters('FHEE__EED_Ticket_Selector__process_ticket_selections__success', $tickets_added)) {
+					do_action(
+						'FHEE__EE_Ticket_Selector__process_ticket_selections__before_redirecting_to_checkout',
+						\EE_Registry::instance()->CART,
+						$this
+					);
+					\EE_Registry::instance()->CART->recalculate_all_cart_totals();
+					\EE_Registry::instance()->CART->save_cart(false);
+					// exit('KILL REDIRECT AFTER CART UPDATE'); // <<<<<<<<  OR HERE TO KILL REDIRECT AFTER CART UPDATE
+					// just return TRUE for registrations being made from admin
+					if (is_admin()) {
+						return true;
+					}
+					\EE_Error::get_notices(false, true);
+					wp_safe_redirect(
+						apply_filters(
+							'FHEE__EE_Ticket_Selector__process_ticket_selections__success_redirect_url',
+							\EE_Registry::instance()->CFG->core->reg_page_url()
+						)
+					);
+					exit();
+				} else {
+					if ( ! \EE_Error::has_error() && ! \EE_Error::has_error(true, 'attention')) {
+						// nothing added to cart
+						\EE_Error::add_attention(__('No tickets were added for the event', 'event_espresso'),
+							__FILE__, __FUNCTION__, __LINE__);
+					}
+				}
+			} else {
+				// no ticket quantities were selected
+				\EE_Error::add_error(__('You need to select a ticket quantity before you can proceed.',
+					'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
+			}
+		}
+		//die(); // <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< KILL BEFORE REDIRECT
+		// at this point, just return if registration is being made from admin
+		if (is_admin()) {
+			return false;
+		}
+		if ($valid['return_url']) {
+			\EE_Error::get_notices(false, true);
+			wp_safe_redirect($valid['return_url']);
+			exit();
+		} elseif (isset($event_to_add['id'])) {
+			\EE_Error::get_notices(false, true);
+			wp_safe_redirect(get_permalink($event_to_add['id']));
+			exit();
+		} else {
+			echo \EE_Error::get_notices();
+		}
+		return false;
+	}
+
+
+
+	/**
+	 * validate_post_data
+	 *
+	 * @param int $id
+	 * @return array|FALSE
+	 */
+	private function validatePostData($id = 0)
+	{
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		if ( ! $id) {
+			\EE_Error::add_error(
+				__('The event id provided was not valid.', 'event_espresso'),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+			return false;
+		}
+		// start with an empty array()
+		$valid_data = array();
+		// grab valid id
+		$valid_data['id'] = $id;
+		// array of other form names
+		$inputs_to_clean = array(
+			'event_id'   => 'tkt-slctr-event-id',
+			'max_atndz'  => 'tkt-slctr-max-atndz-',
+			'rows'       => 'tkt-slctr-rows-',
+			'qty'        => 'tkt-slctr-qty-',
+			'ticket_id'  => 'tkt-slctr-ticket-id-',
+			'return_url' => 'tkt-slctr-return-url-',
+		);
+		// let's track the total number of tickets ordered.'
+		$valid_data['total_tickets'] = 0;
+		// cycle through $inputs_to_clean array
+		foreach ($inputs_to_clean as $what => $input_to_clean) {
+			// check for POST data
+			if (\EE_Registry::instance()->REQ->is_set($input_to_clean . $id)) {
+				// grab value
+				$input_value = \EE_Registry::instance()->REQ->get($input_to_clean . $id);
+				switch ($what) {
+					// integers
+					case 'event_id':
+						$valid_data[$what] = absint($input_value);
+						// get event via the event id we put in the form
+						$valid_data['event'] = \EE_Registry::instance()
+														   ->load_model('Event')
+														   ->get_one_by_ID($valid_data['event_id']);
+						break;
+					case 'rows':
+					case 'max_atndz':
+						$valid_data[$what] = absint($input_value);
+						break;
+					// arrays of integers
+					case 'qty':
+						/** @var array $row_qty */
+						$row_qty = $input_value;
+						// if qty is coming from a radio button input, then we need to assemble an array of rows
+						if ( ! is_array($row_qty)) {
+							// get number of rows
+							$rows = \EE_Registry::instance()->REQ->is_set('tkt-slctr-rows-' . $id)
+								? absint(\EE_Registry::instance()->REQ->get('tkt-slctr-rows-' . $id))
+								: 1;
+							// explode ints by the dash
+							$row_qty = explode('-', $row_qty);
+							$row = isset($row_qty[0]) ? absint($row_qty[0]) : 1;
+							$qty = isset($row_qty[1]) ? absint($row_qty[1]) : 0;
+							$row_qty = array($row => $qty);
+							for ($x = 1; $x <= $rows; $x++) {
+								if ( ! isset($row_qty[$x])) {
+									$row_qty[$x] = 0;
+								}
+							}
+						}
+						ksort($row_qty);
+						// cycle thru values
+						foreach ($row_qty as $qty) {
+							$qty = absint($qty);
+							// sanitize as integers
+							$valid_data[$what][] = $qty;
+							$valid_data['total_tickets'] += $qty;
+						}
+						break;
+					// array of integers
+					case 'ticket_id':
+						$value_array = array();
+						// cycle thru values
+						foreach ((array)$input_value as $key => $value) {
+							// allow only numbers, letters,  spaces, commas and dashes
+							$value_array[$key] = wp_strip_all_tags($value);
+							// get ticket via the ticket id we put in the form
+							$ticket_obj = \EE_Registry::instance()->load_model('Ticket')->get_one_by_ID($value);
+							$valid_data['ticket_obj'][$key] = $ticket_obj;
+						}
+						$valid_data[$what] = $value_array;
+						break;
+					case 'return_url' :
+						// grab and sanitize return-url
+						$input_value = esc_url_raw($input_value);
+						// was the request coming from an iframe ? if so, then:
+						if (strpos($input_value, 'event_list=iframe')) {
+							// get anchor fragment
+							$input_value = explode('#', $input_value);
+							$input_value = end($input_value);
+							// use event list url instead, but append anchor
+							$input_value = \EEH_Event_View::event_archive_url() . '#' . $input_value;
+						}
+						$valid_data[$what] = $input_value;
+						break;
+				}    // end switch $what
+			}
+		}    // end foreach $inputs_to_clean
+		return $valid_data;
+	}
+
+
+
+	/**
+	 * adds a ticket to the cart
+	 *
+	 * @param \EE_Ticket $ticket
+	 * @param int        $qty
+	 * @return TRUE on success, FALSE on fail
+	 * @throws \EE_Error
+	 */
+	private function addTicketToCart(\EE_Ticket $ticket = null, $qty = 1)
+	{
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		// get the number of spaces left for this datetime ticket
+		$available_spaces = $this->ticketDatetimeAvailability($ticket);
+		// compare available spaces against the number of tickets being purchased
+		if ($available_spaces >= $qty) {
+			// allow addons to prevent a ticket from being added to cart
+			if (
+			! apply_filters(
+				'FHEE__EE_Ticket_Selector___add_ticket_to_cart__allow_add_to_cart',
+				true,
+				$ticket,
+				$qty,
+				$available_spaces
+			)
+			) {
+				return false;
+			}
+			$qty = absint(apply_filters('FHEE__EE_Ticket_Selector___add_ticket_to_cart__ticket_qty', $qty, $ticket));
+			// add event to cart
+			if (\EE_Registry::instance()->CART->add_ticket_to_cart($ticket, $qty)) {
+				$this->recalculateTicketDatetimeAvailability($ticket, $qty);
+				return true;
+			}
+			return false;
+		}
+		// tickets can not be purchased but let's find the exact number left
+		// for the last ticket selected PRIOR to subtracting tickets
+		$available_spaces = $this->ticketDatetimeAvailability($ticket, true);
+		// greedy greedy greedy eh?
+		if ($available_spaces > 0) {
+			if (
+			apply_filters(
+				'FHEE__EE_Ticket_Selector___add_ticket_to_cart__allow_display_availability_error',
+				true,
+				$ticket,
+				$qty,
+				$available_spaces
+			)
+			) {
+				$this->displayAvailabilityError($available_spaces);
+			}
+		} else {
+			\EE_Error::add_error(
+				__(
+					'We\'re sorry, but there are no available spaces left for this event at this particular date and time.',
+					'event_espresso'
+				),
+				__FILE__, __FUNCTION__, __LINE__
+			);
+		}
+		return false;
+	}
+
+
+
+	/**
+	 * @param int $available_spaces
+	 * @throws \EE_Error
+	 */
+	private function displayAvailabilityError($available_spaces = 1)
+	{
+		// add error messaging - we're using the _n function that will generate
+		// the appropriate singular or plural message based on the number of $available_spaces
+		if (\EE_Registry::instance()->CART->all_ticket_quantity_count()) {
+			$msg = sprintf(
+				_n(
+					'We\'re sorry, but there is only %1$s available space left for this event at this particular date and time. Please select a different number (or different combination) of tickets by cancelling the current selection and choosing again, or proceed to registration.',
+					'We\'re sorry, but there are only %1$s available spaces left for this event at this particular date and time. Please select a different number (or different combination) of tickets by cancelling the current selection and choosing again, or proceed to registration.',
+					$available_spaces,
+					'event_espresso'
+				),
+				$available_spaces,
+				'<br />'
+			);
+		} else {
+			$msg = sprintf(
+				_n(
+					'We\'re sorry, but there is only %1$s available space left for this event at this particular date and time. Please select a different number (or different combination) of tickets.',
+					'We\'re sorry, but there are only %1$s available spaces left for this event at this particular date and time. Please select a different number (or different combination) of tickets.',
+					$available_spaces,
+					'event_espresso'
+				),
+				$available_spaces,
+				'<br />'
+			);
+		}
+		\EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+	}
+
+
+
+	/**
+	 * ticketDatetimeAvailability
+	 * creates an array of tickets plus all of the datetimes available to each ticket
+	 * and tracks the spaces remaining for each of those datetimes
+	 *
+	 * @param \EE_Ticket $ticket - selected ticket
+	 * @param bool       $get_original_ticket_spaces
+	 * @return int
+	 * @throws \EE_Error
+	 */
+	private function ticketDatetimeAvailability(\EE_Ticket $ticket, $get_original_ticket_spaces = false)
+	{
+		// if the $_available_spaces array has not been set up yet...
+		if ( ! isset(self::$_available_spaces['tickets'][$ticket->ID()])) {
+			$this->setInitialTicketDatetimeAvailability($ticket);
+		}
+		$available_spaces = $ticket->qty() - $ticket->sold();
+		if (isset(self::$_available_spaces['tickets'][$ticket->ID()])) {
+			// loop thru tickets, which will ALSO include individual ticket records AND a total
+			foreach (self::$_available_spaces['tickets'][$ticket->ID()] as $DTD_ID => $spaces) {
+				// if we want the original datetime availability BEFORE we started subtracting tickets ?
+				if ($get_original_ticket_spaces) {
+					// then grab the available spaces from the "tickets" array
+					// and compare with the above to get the lowest number
+					$available_spaces = min(
+						$available_spaces,
+						self::$_available_spaces['tickets'][$ticket->ID()][$DTD_ID]
+					);
+				} else {
+					// we want the updated ticket availability as stored in the "datetimes" array
+					$available_spaces = min($available_spaces, self::$_available_spaces['datetimes'][$DTD_ID]);
+				}
+			}
+		}
+		return $available_spaces;
+	}
+
+
+
+	/**
+	 * @param \EE_Ticket $ticket
+	 * @return void
+	 * @throws \EE_Error
+	 */
+	private function setInitialTicketDatetimeAvailability(\EE_Ticket $ticket)
+	{
+		// first, get all of the datetimes that are available to this ticket
+		$datetimes = $ticket->get_many_related(
+			'Datetime',
+			array(
+				array(
+					'DTT_EVT_end' => array(
+						'>=',
+						\EEM_Datetime::instance()->current_time_for_query('DTT_EVT_end'),
+					),
+				),
+				'order_by' => array('DTT_EVT_start' => 'ASC'),
+			)
+		);
+		if ( ! empty($datetimes)) {
+			// now loop thru all of the datetimes
+			foreach ($datetimes as $datetime) {
+				if ($datetime instanceof \EE_Datetime) {
+					// the number of spaces available for the datetime without considering individual ticket quantities
+					$spaces_remaining = $datetime->spaces_remaining();
+					// save the total available spaces ( the lesser of the ticket qty minus the number of tickets sold
+					// or the datetime spaces remaining) to this ticket using the datetime ID as the key
+					self::$_available_spaces['tickets'][$ticket->ID()][$datetime->ID()] = min(
+						$ticket->qty() - $ticket->sold(),
+						$spaces_remaining
+					);
+					// if the remaining spaces for this datetime is already set,
+					// then compare that against the datetime spaces remaining, and take the lowest number,
+					// else just take the datetime spaces remaining, and assign to the datetimes array
+					self::$_available_spaces['datetimes'][$datetime->ID()] = isset(
+						self::$_available_spaces['datetimes'][$datetime->ID()]
+					)
+						? min(self::$_available_spaces['datetimes'][$datetime->ID()], $spaces_remaining)
+						: $spaces_remaining;
+				}
+			}
+		}
+	}
+
+
+
+	/**
+	 * @param    \EE_Ticket $ticket
+	 * @param    int        $qty
+	 * @return    void
+	 */
+	private function recalculateTicketDatetimeAvailability(\EE_Ticket $ticket, $qty = 0)
+	{
+		if (isset(self::$_available_spaces['tickets'][$ticket->ID()])) {
+			// loop thru tickets, which will ALSO include individual ticket records AND a total
+			foreach (self::$_available_spaces['tickets'][$ticket->ID()] as $DTD_ID => $spaces) {
+				// subtract the qty of selected tickets from each datetime's available spaces this ticket has access to,
+				self::$_available_spaces['datetimes'][$DTD_ID] -= $qty;
+			}
+		}
+	}
 
 
 }

modules/ical/EED_Ical.module.php

Indentation +24 added lines, -24 removed lines

@@ -33,11 +33,11 @@ 
 	public static function set_hooks() {
 		// create download buttons
 		add_filter(
-		    'FHEE__espresso_list_of_event_dates__datetime_html',
-            array( 'EED_Ical', 'generate_add_to_iCal_button' ),
-            10,
-            2
-        );
+			'FHEE__espresso_list_of_event_dates__datetime_html',
+			array( 'EED_Ical', 'generate_add_to_iCal_button' ),
+			10,
+			2
+		);
 		 // process ics download request
 		EE_Config::register_route( 'download_ics_file', 'EED_Ical', 'download_ics_file' );
 	}
@@ -66,15 +66,15 @@ 
 
 
 
-    /**
-     *    generate_add_to_iCal_button
-     *
-     * @access    public
-     * @param $html
-     * @param $datetime
-     * @return    string
-     * @throws \EE_Error
-     */
+	/**
+	 *    generate_add_to_iCal_button
+	 *
+	 * @access    public
+	 * @param $html
+	 * @param $datetime
+	 * @return    string
+	 * @throws \EE_Error
+	 */
 	public static function generate_add_to_iCal_button( $html, $datetime ) {
 		// first verify a proper datetime object has been received
 		if ( $datetime instanceof EE_Datetime ) {
@@ -93,7 +93,7 @@ 
 					$html .= '</form>';
 					break;
 				// buttons are just links that have been styled to appear as buttons,
-                // but may not be blend with a theme as well as submit buttons
+				// but may not be blend with a theme as well as submit buttons
 				case 'button' :
 					$html .= '<a class="ee-ical-btn small ee-button ee-roundish" href="' . $URL;
 					$html .= '" title="' . __( 'Add to iCal Calendar', 'event_espresso' ) . '">';
@@ -114,13 +114,13 @@ 
 
 
 
-    /**
-     *    download_ics_file
-     *
-     * @access    public
-     * @return    void
-     * @throws \EE_Error
-     */
+	/**
+	 *    download_ics_file
+	 *
+	 * @access    public
+	 * @return    void
+	 * @throws \EE_Error
+	 */
 	public static function download_ics_file() {
 		if ( EE_Registry::instance()->REQ->is_set( 'ics_id' )) {
 			$DTT_ID = absint( EE_Registry::instance()->REQ->get( 'ics_id' ));
@@ -228,8 +228,8 @@ 
 			//Escape special chars within the description
 			$description = EED_Ical::_escape_ICal_data( $description );
 
-		    //Remove line breaks and output in iCal format
-		    $description = str_replace( array( "\r\n", "\n"), '\n', $description );
+			//Remove line breaks and output in iCal format
+			$description = str_replace( array( "\r\n", "\n"), '\n', $description );
 
 		return $description;
 	}

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 
 /**
  * EED_Ical Class

Spacing +64 added lines, -64 removed lines

@@ -19,7 +19,7 @@ 
 	 * @return EED_Ical|EED_Module
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -34,12 +34,12 @@ 
 		// create download buttons
 		add_filter(
 		    'FHEE__espresso_list_of_event_dates__datetime_html',
-            array( 'EED_Ical', 'generate_add_to_iCal_button' ),
+            array('EED_Ical', 'generate_add_to_iCal_button'),
             10,
             2
         );
 		 // process ics download request
-		EE_Config::register_route( 'download_ics_file', 'EED_Ical', 'download_ics_file' );
+		EE_Config::register_route('download_ics_file', 'EED_Ical', 'download_ics_file');
 	}
 
 
@@ -62,7 +62,7 @@ 
 	 * @param    WP $WP
 	 * @return    void
 	 */
-	public function run( $WP ) {}
+	public function run($WP) {}
 
 
 
@@ -75,35 +75,35 @@ 
      * @return    string
      * @throws \EE_Error
      */
-	public static function generate_add_to_iCal_button( $html, $datetime ) {
+	public static function generate_add_to_iCal_button($html, $datetime) {
 		// first verify a proper datetime object has been received
-		if ( $datetime instanceof EE_Datetime ) {
+		if ($datetime instanceof EE_Datetime) {
 			// set whether a link or submit button is shown
-			$iCal_type = apply_filters( 'FHEE__EED_Ical__generate_add_to_iCal_button__iCal_type', 'submit' );
+			$iCal_type = apply_filters('FHEE__EED_Ical__generate_add_to_iCal_button__iCal_type', 'submit');
 			// generate a link to the route we registered in set_hooks()
-			$URL = add_query_arg( array( 'ee' => 'download_ics_file', 'ics_id' => $datetime->ID() ), site_url() );
+			$URL = add_query_arg(array('ee' => 'download_ics_file', 'ics_id' => $datetime->ID()), site_url());
 			// what type ?
-			switch ( $iCal_type ) {
+			switch ($iCal_type) {
 				// submit buttons appear as buttons and are very compatible with a theme's style
 				case 'submit' :
-					$html .= '<form id="download-iCal-frm-' . $datetime->ID();
-					$html .= '" class="download-iCal-frm" action="' . $URL . '" method="post" >';
+					$html .= '<form id="download-iCal-frm-'.$datetime->ID();
+					$html .= '" class="download-iCal-frm" action="'.$URL.'" method="post" >';
 					$html .= '<input type="submit" class="ee-ical-sbmt" value="&#xf145;" title="';
-					$html .= __( 'Add to iCal Calendar', 'event_espresso' ) . '"/>';
+					$html .= __('Add to iCal Calendar', 'event_espresso').'"/>';
 					$html .= '</form>';
 					break;
 				// buttons are just links that have been styled to appear as buttons,
                 // but may not be blend with a theme as well as submit buttons
 				case 'button' :
-					$html .= '<a class="ee-ical-btn small ee-button ee-roundish" href="' . $URL;
-					$html .= '" title="' . __( 'Add to iCal Calendar', 'event_espresso' ) . '">';
+					$html .= '<a class="ee-ical-btn small ee-button ee-roundish" href="'.$URL;
+					$html .= '" title="'.__('Add to iCal Calendar', 'event_espresso').'">';
 					$html .= ' <span class="dashicons dashicons-calendar"></span>';
 					$html .= '</a>';
 					break;
 				// links are just links that use the calendar dashicon
 				case 'icon' :
-					$html .= '<a class="ee-ical-lnk" href="' . $URL . '" title="';
-					$html .= __( 'Add to iCal Calendar', 'event_espresso' ) . '">';
+					$html .= '<a class="ee-ical-lnk" href="'.$URL.'" title="';
+					$html .= __('Add to iCal Calendar', 'event_espresso').'">';
 					$html .= ' <span class="dashicons dashicons-calendar"></span>';
 					$html .= '</a>';
 					break;
@@ -122,29 +122,29 @@ 
      * @throws \EE_Error
      */
 	public static function download_ics_file() {
-		if ( EE_Registry::instance()->REQ->is_set( 'ics_id' )) {
-			$DTT_ID = absint( EE_Registry::instance()->REQ->get( 'ics_id' ));
-			$datetime = EE_Registry::instance()->load_model( 'Datetime' )->get_one_by_ID( $DTT_ID );
-			if ( $datetime instanceof EE_Datetime ) {
+		if (EE_Registry::instance()->REQ->is_set('ics_id')) {
+			$DTT_ID = absint(EE_Registry::instance()->REQ->get('ics_id'));
+			$datetime = EE_Registry::instance()->load_model('Datetime')->get_one_by_ID($DTT_ID);
+			if ($datetime instanceof EE_Datetime) {
 				// get related event, venues, and event categories
 				$event = $datetime->event();
 				// get related category Term object and it's name
 				$category = $event->first_event_category();
-				if ( $category instanceof EE_Term ) {
+				if ($category instanceof EE_Term) {
 					$category = $category->name();
 				}
 				$location = '';
 				// get first related venue and convert to CSV string
-				$venue = $event->venues(array( 'limit'=>1 ));
-				if ( is_array( $venue ) && ! empty( $venue )) {
-					$venue = array_shift( $venue );
-					if ( $venue instanceof EE_Venue ) {
-						$location = espresso_venue_raw_address( 'inline', $venue->ID(), FALSE );
+				$venue = $event->venues(array('limit'=>1));
+				if (is_array($venue) && ! empty($venue)) {
+					$venue = array_shift($venue);
+					if ($venue instanceof EE_Venue) {
+						$location = espresso_venue_raw_address('inline', $venue->ID(), FALSE);
 					}
 				}
 
 				//Generate filename
-				$filename = $event->slug() . '-' . $datetime->start_date( 'Y-m-d' ) . '.ics';
+				$filename = $event->slug().'-'.$datetime->start_date('Y-m-d').'.ics';
 
 				//Check the datetime status has not been cancelled and set the ics value accordingly
 				$status = $datetime->get_active_status();
@@ -153,62 +153,62 @@ 
 				// Create array of ics details, escape strings, convert timestamps to ics format, etc
 				$ics_data = array(
 					'ORGANIZER_NAME' => EE_Registry::instance()->CFG->organization->name,
-					'UID' => md5( $event->name() . $event->ID() . $datetime->ID() ),
+					'UID' => md5($event->name().$event->ID().$datetime->ID()),
 					'ORGANIZER' => EE_Registry::instance()->CFG->organization->email,
-					'DTSTAMP' => date( EED_Ical::iCal_datetime_format ),
+					'DTSTAMP' => date(EED_Ical::iCal_datetime_format),
 					'LOCATION' => $location,
 					'SUMMARY' => $event->name(),
-					'DESCRIPTION' => wp_strip_all_tags( $event->description() ),
+					'DESCRIPTION' => wp_strip_all_tags($event->description()),
 					'STATUS' => $status,
 					'CATEGORIES' => $category,
-					'URL;VALUE=URI' => get_permalink( $event->ID() ),
-					'DTSTART' => date( EED_Ical::iCal_datetime_format, $datetime->start() ),
-					'DTEND' => date( EED_Ical::iCal_datetime_format, $datetime->end() ),
+					'URL;VALUE=URI' => get_permalink($event->ID()),
+					'DTSTART' => date(EED_Ical::iCal_datetime_format, $datetime->start()),
+					'DTEND' => date(EED_Ical::iCal_datetime_format, $datetime->end()),
 				);
 
 				//Filter the values used within the ics output.
 				//NOTE - all values within ics_data will be escaped automatically.
-				$ics_data = apply_filters( 'FHEE__EED_Ical__download_ics_file_ics_data', $ics_data, $datetime );
+				$ics_data = apply_filters('FHEE__EED_Ical__download_ics_file_ics_data', $ics_data, $datetime);
 
 				//Escape all ics data
-				foreach( $ics_data as $key => $value ) {
+				foreach ($ics_data as $key => $value) {
 					//Description is escaped differently from all all values
-					if( $key === 'DESCRIPTION' ) {
-						$ics_data[$key] = EED_Ical::_escape_ICal_description( wp_strip_all_tags( $value ) );
+					if ($key === 'DESCRIPTION') {
+						$ics_data[$key] = EED_Ical::_escape_ICal_description(wp_strip_all_tags($value));
 					} else {
-						$ics_data[$key] = EED_Ical::_escape_ICal_data( $value );
+						$ics_data[$key] = EED_Ical::_escape_ICal_data($value);
 					}
 				}
 
 				//Pull the organizer name from ics_data and remove it from the array.
-				$organizer_name = isset( $ics_data['ORGANIZER_NAME'] ) ? $ics_data['ORGANIZER_NAME'] : '';
-				unset( $ics_data['ORGANIZER_NAME'] );
+				$organizer_name = isset($ics_data['ORGANIZER_NAME']) ? $ics_data['ORGANIZER_NAME'] : '';
+				unset($ics_data['ORGANIZER_NAME']);
 
 				// set headers
-				header( 'Content-type: text/calendar; charset=utf-8' );
-				header( 'Content-Disposition: attachment; filename="' . $filename . '"' );
-				header( 'Cache-Control: private, max-age=0, must-revalidate' );
-				header( 'Pragma: public' );
-				header( 'Content-Type: application/octet-stream' );
-				header( 'Content-Type: application/force-download' );
-				header( 'Cache-Control: no-cache, must-revalidate' );
-				header( 'Content-Transfer-Encoding: binary' );
-				header( 'Expires: Sat, 26 Jul 1997 05:00:00 GMT' ); // past date
-				ini_set( 'zlib.output_compression', '0' );
+				header('Content-type: text/calendar; charset=utf-8');
+				header('Content-Disposition: attachment; filename="'.$filename.'"');
+				header('Cache-Control: private, max-age=0, must-revalidate');
+				header('Pragma: public');
+				header('Content-Type: application/octet-stream');
+				header('Content-Type: application/force-download');
+				header('Cache-Control: no-cache, must-revalidate');
+				header('Content-Transfer-Encoding: binary');
+				header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); // past date
+				ini_set('zlib.output_compression', '0');
 				// echo the output
-				echo "BEGIN:VCALENDAR" . PHP_EOL;
-				echo "VERSION:2.0" . PHP_EOL;
-				echo "PRODID:-//{$organizer_name}//NONSGML PDA Calendar Version 1.0//EN" . PHP_EOL;
-				echo "CALSCALE:GREGORIAN" . PHP_EOL;
-				echo "BEGIN:VEVENT" . PHP_EOL;
+				echo "BEGIN:VCALENDAR".PHP_EOL;
+				echo "VERSION:2.0".PHP_EOL;
+				echo "PRODID:-//{$organizer_name}//NONSGML PDA Calendar Version 1.0//EN".PHP_EOL;
+				echo "CALSCALE:GREGORIAN".PHP_EOL;
+				echo "BEGIN:VEVENT".PHP_EOL;
 				
 				//Output all remaining values from ics_data.
-				foreach( $ics_data as $key => $value ) {
-					echo $key . ':' . $value . PHP_EOL;
+				foreach ($ics_data as $key => $value) {
+					echo $key.':'.$value.PHP_EOL;
 				}
 
-				echo "END:VEVENT" . PHP_EOL;
-				echo "END:VCALENDAR" . PHP_EOL;
+				echo "END:VEVENT".PHP_EOL;
+				echo "END:VCALENDAR".PHP_EOL;
 			}
 		}
 		die();
@@ -223,8 +223,8 @@ 
 	 *  	@param	string $string
 	 *  	@return	string
 	 */
-	private static function _escape_ICal_data( $string = '' ) {
-		return preg_replace( '/([\,;])/', '\\\$1', $string );
+	private static function _escape_ICal_data($string = '') {
+		return preg_replace('/([\,;])/', '\\\$1', $string);
 	}
 
 	/**
@@ -234,13 +234,13 @@ 
 	 *  	@param	string $description
 	 *  	@return	string
 	 */
-	private static function _escape_ICal_description( $description = '' ) {
+	private static function _escape_ICal_description($description = '') {
 
 			//Escape special chars within the description
-			$description = EED_Ical::_escape_ICal_data( $description );
+			$description = EED_Ical::_escape_ICal_data($description);
 
 		    //Remove line breaks and output in iCal format
-		    $description = str_replace( array( "\r\n", "\n"), '\n', $description );
+		    $description = str_replace(array("\r\n", "\n"), '\n', $description);
 
 		return $description;
 	}

core/domain/services/wp_queries/EventListQuery.php

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
     /**
      * @var integer $limit
      */
-    private $limit        = 10;
+    private $limit = 10;
 
     /**
      * @var string $css_class
@@ -68,7 +68,7 @@ 
      */
     public function __construct($args = array())
     {
-        $args = $this->parseArgs((array)$args);
+        $args = $this->parseArgs((array) $args);
         $this->setupEventQueryHelper();
         $this->setupFilters();
         $args = $this->getQueryArgs($args);

Indentation +200 added lines, -200 removed lines

@@ -19,206 +19,206 @@
 class EventListQuery extends WP_Query
 {
 
-    /**
-     * @var string $title
-     */
-    private $title;
-
-    /**
-     * @var integer $limit
-     */
-    private $limit        = 10;
-
-    /**
-     * @var string $css_class
-     */
-    private $css_class;
-
-    /**
-     * @var boolean $show_expired
-     */
-    private $show_expired = false;
-
-    /**
-     * @var string $month
-     */
-    private $month;
-
-    /**
-     * @var string $category_slug
-     */
-    private $category_slug;
-
-    /**
-     * @var string $order_by
-     */
-    private $order_by;
-
-    /**
-     * @var string $sort
-     */
-    private $sort;
-
-    /**
-     * @var boolean $show_title
-     */
-    private $show_title = true;
-
-
-
-    /**
-     * EE_Event_List_Query Constructor     *
-     *
-     * @param array $args
-     */
-    public function __construct($args = array())
-    {
-        $args = $this->parseArgs((array)$args);
-        $this->setupEventQueryHelper();
-        $this->setupFilters();
-        $args = $this->getQueryArgs($args);
-        // run the query
-        parent::__construct($args);
-    }
-
-
-
-    /**
-     * @param array $args
-     * @return array
-     */
-    private function parseArgs(array $args)
-    {
-        // incoming args could be a mix of WP query args + EE shortcode args
-        foreach ($args as $property => $value) {
-            // if the arg is a property of this class, then it's an EE shortcode arg
-            if (property_exists($this, $property) && ! property_exists('WP_Query', $property)) {
-                // set the property value
-                $this->{$property} = $value;
-                // then remove it from the array of args that will later be passed to WP_Query()
-                unset($args[$property]);
-            }
-        }
-        return $args;
-    }
-
-
-
-    private function setupEventQueryHelper()
-    {
-        //add query filters
-        EEH_Event_Query::add_query_filters();
-        // set params that will get used by the filters
-        EEH_Event_Query::set_query_params(
-            $this->month,
-            $this->category_slug,
-            $this->show_expired,
-            $this->order_by,
-            $this->sort
-        );
-    }
-
-
-
-    private function setupFilters()
-    {
-        // first off, let's remove any filters from previous queries
-        remove_filter(
-            'FHEE__archive_espresso_events_template__show_header',
-            array($this, 'show_event_list_title')
-        );
-        remove_filter(
-            'FHEE__archive_espresso_events_template__upcoming_events_h1',
-            array($this, 'event_list_title')
-        );
-        remove_all_filters('FHEE__content_espresso_events__event_class');
-        // Event List Title ?
-        add_filter(
-            'FHEE__archive_espresso_events_template__show_header',
-            array($this, 'show_event_list_title')
-        );
-        add_filter(
-            'FHEE__archive_espresso_events_template__upcoming_events_h1',
-            array($this, 'event_list_title'),
-            10,
-            1
-        );
-        // add the css class
-        add_filter(
-            'FHEE__content_espresso_events__event_class',
-            array($this, 'event_list_css'),
-            10,
-            1
-        );
-    }
-
-
-
-    private function getQueryArgs(array $args)
-    {
-        // the current "page" we are viewing
-        $paged = max(1, get_query_var('paged'));
-        // Force these args
-        return array_merge(
-            $args,
-            array(
-                'post_type'              => 'espresso_events',
-                'posts_per_page'         => $this->limit,
-                'update_post_term_cache' => false,
-                'update_post_meta_cache' => false,
-                'paged'                  => $paged,
-                'offset'                 => ($paged - 1) * $this->limit,
-            )
-        );
-    }
-
-
-
-    /**
-     * show_event_list_title
-     *
-     * @return boolean
-     */
-    public function show_event_list_title()
-    {
-        return filter_var(
-            $this->show_title,
-            FILTER_VALIDATE_BOOLEAN
-        );
-    }
-
-
-
-    /**
-     * callback for FHEE__archive_espresso_events_template__upcoming_events_h1 filter
-     *
-     * @param string $event_list_title
-     * @return    string
-     */
-    public function event_list_title($event_list_title = '')
-    {
-        if ( ! empty($this->title)) {
-            return $this->title;
-        }
-        return $event_list_title;
-    }
-
-
-
-    /**
-     * callback for FHEE__content_espresso_events__event_class filter
-     *
-     * @param string $event_list_css
-     * @return string
-     */
-    public function event_list_css($event_list_css = '')
-    {
-        $event_list_css .= ! empty($event_list_css) ? ' ' : '';
-        $event_list_css .= ! empty($this->css_class) ? $this->css_class : '';
-        $event_list_css .= ! empty($event_list_css) ? ' ' : '';
-        $event_list_css .= ! empty($this->category_slug) ? $this->category_slug : '';
-        return $event_list_css;
-    }
+	/**
+	 * @var string $title
+	 */
+	private $title;
+
+	/**
+	 * @var integer $limit
+	 */
+	private $limit        = 10;
+
+	/**
+	 * @var string $css_class
+	 */
+	private $css_class;
+
+	/**
+	 * @var boolean $show_expired
+	 */
+	private $show_expired = false;
+
+	/**
+	 * @var string $month
+	 */
+	private $month;
+
+	/**
+	 * @var string $category_slug
+	 */
+	private $category_slug;
+
+	/**
+	 * @var string $order_by
+	 */
+	private $order_by;
+
+	/**
+	 * @var string $sort
+	 */
+	private $sort;
+
+	/**
+	 * @var boolean $show_title
+	 */
+	private $show_title = true;
+
+
+
+	/**
+	 * EE_Event_List_Query Constructor     *
+	 *
+	 * @param array $args
+	 */
+	public function __construct($args = array())
+	{
+		$args = $this->parseArgs((array)$args);
+		$this->setupEventQueryHelper();
+		$this->setupFilters();
+		$args = $this->getQueryArgs($args);
+		// run the query
+		parent::__construct($args);
+	}
+
+
+
+	/**
+	 * @param array $args
+	 * @return array
+	 */
+	private function parseArgs(array $args)
+	{
+		// incoming args could be a mix of WP query args + EE shortcode args
+		foreach ($args as $property => $value) {
+			// if the arg is a property of this class, then it's an EE shortcode arg
+			if (property_exists($this, $property) && ! property_exists('WP_Query', $property)) {
+				// set the property value
+				$this->{$property} = $value;
+				// then remove it from the array of args that will later be passed to WP_Query()
+				unset($args[$property]);
+			}
+		}
+		return $args;
+	}
+
+
+
+	private function setupEventQueryHelper()
+	{
+		//add query filters
+		EEH_Event_Query::add_query_filters();
+		// set params that will get used by the filters
+		EEH_Event_Query::set_query_params(
+			$this->month,
+			$this->category_slug,
+			$this->show_expired,
+			$this->order_by,
+			$this->sort
+		);
+	}
+
+
+
+	private function setupFilters()
+	{
+		// first off, let's remove any filters from previous queries
+		remove_filter(
+			'FHEE__archive_espresso_events_template__show_header',
+			array($this, 'show_event_list_title')
+		);
+		remove_filter(
+			'FHEE__archive_espresso_events_template__upcoming_events_h1',
+			array($this, 'event_list_title')
+		);
+		remove_all_filters('FHEE__content_espresso_events__event_class');
+		// Event List Title ?
+		add_filter(
+			'FHEE__archive_espresso_events_template__show_header',
+			array($this, 'show_event_list_title')
+		);
+		add_filter(
+			'FHEE__archive_espresso_events_template__upcoming_events_h1',
+			array($this, 'event_list_title'),
+			10,
+			1
+		);
+		// add the css class
+		add_filter(
+			'FHEE__content_espresso_events__event_class',
+			array($this, 'event_list_css'),
+			10,
+			1
+		);
+	}
+
+
+
+	private function getQueryArgs(array $args)
+	{
+		// the current "page" we are viewing
+		$paged = max(1, get_query_var('paged'));
+		// Force these args
+		return array_merge(
+			$args,
+			array(
+				'post_type'              => 'espresso_events',
+				'posts_per_page'         => $this->limit,
+				'update_post_term_cache' => false,
+				'update_post_meta_cache' => false,
+				'paged'                  => $paged,
+				'offset'                 => ($paged - 1) * $this->limit,
+			)
+		);
+	}
+
+
+
+	/**
+	 * show_event_list_title
+	 *
+	 * @return boolean
+	 */
+	public function show_event_list_title()
+	{
+		return filter_var(
+			$this->show_title,
+			FILTER_VALIDATE_BOOLEAN
+		);
+	}
+
+
+
+	/**
+	 * callback for FHEE__archive_espresso_events_template__upcoming_events_h1 filter
+	 *
+	 * @param string $event_list_title
+	 * @return    string
+	 */
+	public function event_list_title($event_list_title = '')
+	{
+		if ( ! empty($this->title)) {
+			return $this->title;
+		}
+		return $event_list_title;
+	}
+
+
+
+	/**
+	 * callback for FHEE__content_espresso_events__event_class filter
+	 *
+	 * @param string $event_list_css
+	 * @return string
+	 */
+	public function event_list_css($event_list_css = '')
+	{
+		$event_list_css .= ! empty($event_list_css) ? ' ' : '';
+		$event_list_css .= ! empty($this->css_class) ? $this->css_class : '';
+		$event_list_css .= ! empty($event_list_css) ? ' ' : '';
+		$event_list_css .= ! empty($this->category_slug) ? $this->category_slug : '';
+		return $event_list_css;
+	}
 
 }
 // End of file EventListQuery.php