eventespresso / event-espresso-core

core/libraries/payment_methods/EEI_Payment_Method_Interfaces.php

Indentation +35 added lines, -35 removed lines

@@ -99,34 +99,34 @@ 
 	 */
 	public function set_extra_accntng($extra_accounting_info);
 
-    /**
-     * Gets the first event for this payment (it's possible that it could be for multiple)
-     *
-     * @param EE_Payment $payment
-     * @return EE_Event|null
-     */
-    public function get_first_event();
-
-    /**
-     * Gets the name of the first event for which is being paid
-     *
-     * @param EE_Payment $payment
-     * @return string
-     */
-    public function get_first_event_name();
-
-    /**
-     * Returns the payment's transaction's primary registration
-     *
-     * @return EE_Registration|null
-     */
-    public function get_primary_registration();
-
-    /**
-     * Gets the payment's transaction's primary registration's attendee, or null
-     * @return EE_Attendee|null
-     */
-    public function get_primary_attendee();
+	/**
+	 * Gets the first event for this payment (it's possible that it could be for multiple)
+	 *
+	 * @param EE_Payment $payment
+	 * @return EE_Event|null
+	 */
+	public function get_first_event();
+
+	/**
+	 * Gets the name of the first event for which is being paid
+	 *
+	 * @param EE_Payment $payment
+	 * @return string
+	 */
+	public function get_first_event_name();
+
+	/**
+	 * Returns the payment's transaction's primary registration
+	 *
+	 * @return EE_Registration|null
+	 */
+	public function get_primary_registration();
+
+	/**
+	 * Gets the payment's transaction's primary registration's attendee, or null
+	 * @return EE_Attendee|null
+	 */
+	public function get_primary_attendee();
 }
 
 
@@ -164,13 +164,13 @@ 
 
 
 
-    /**
-     * Function that returns an instance of this class.
-     *
-     * @param null              $timezone
-     * @param ModelFieldFactory $model_field_factory If not provided, this class needs to find it itself
-     * @return EEMI_Payment
-     */
+	/**
+	 * Function that returns an instance of this class.
+	 *
+	 * @param null              $timezone
+	 * @param ModelFieldFactory $model_field_factory If not provided, this class needs to find it itself
+	 * @return EEMI_Payment
+	 */
 	public static function instance($timezone = null, ModelFieldFactory $model_field_factory = null);
 
 	/**

admin_pages/events/Events_Admin_List_Table.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -165,7 +165,7 @@
 
     /**
      * @param EE_Event $item
-     * @return mixed|string
+     * @return string
      */
     public function column_id(EE_Event $item)
     {

Indentation +401 added lines, -401 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 if (! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('NO direct script access allowed');
+	exit('NO direct script access allowed');
 }
 
 /**
@@ -26,406 +26,406 @@ 
 {
 
 
-    /**
-     * @var EE_Datetime
-     */
-    private $_dtt;
-
-
-    /**
-     * Events_Admin_List_Table constructor.
-     *
-     * @param EE_Admin_Page $admin_page
-     */
-    public function __construct($admin_page)
-    {
-        parent::__construct($admin_page);
-        require_once(EE_HELPERS . 'EEH_DTT_Helper.helper.php');
-    }
-
-
-    /**
-     * Initial setup of data properties for the list table.
-     */
-    protected function _setup_data()
-    {
-        $this->_data           = $this->_admin_page->get_events($this->_per_page, $this->_current_page);
-        $this->_all_data_count = $this->_admin_page->get_events(0, 0, true);
-    }
-
-
-    /**
-     * Set up of additional properties for the list table.
-     */
-    protected function _set_properties()
-    {
-        $this->_wp_list_args = array(
-            'singular' => __('event', 'event_espresso'),
-            'plural'   => __('events', 'event_espresso'),
-            'ajax'     => true, //for now
-            'screen'   => $this->_admin_page->get_current_screen()->id,
-        );
-
-
-        $this->_columns = array(
-            'cb'              => '<input type="checkbox" />',
-            'id'              => __('ID', 'event_espresso'),
-            'name'            => __('Name', 'event_espresso'),
-            'author'          => __('Author', 'event_espresso'),
-            'venue'           => __('Venue', 'event_espresso'),
-            'start_date_time' => __('Event Start', 'event_espresso'),
-            'reg_begins'      => __('On Sale', 'event_espresso'),
-            'attendees'       => '<span class="dashicons dashicons-groups ee-icon-color-ee-green ee-icon-size-20"></span>',
-            //'tkts_sold' => __('Tickets Sold', 'event_espresso'),
-            'actions'         => __('Actions', 'event_espresso'),
-        );
-
-
-        $this->_sortable_columns = array(
-            'id'              => array('EVT_ID' => true),
-            'name'            => array('EVT_name' => false),
-            'author'          => array('EVT_wp_user' => false),
-            'venue'           => array('Venue.VNU_name' => false),
-            'start_date_time' => array('Datetime.DTT_EVT_start' => false),
-            'reg_begins'      => array('Datetime.Ticket.TKT_start_date' => false),
-        );
-
-        $this->_primary_column = 'id';
-
-        $this->_hidden_columns = array('author');
-    }
-
-
-    /**
-     * @return array
-     */
-    protected function _get_table_filters()
-    {
-        return array(); //no filters with decaf
-    }
-
-
-    /**
-     * Setup of views properties.
-     */
-    protected function _add_view_counts()
-    {
-        $this->_views['all']['count']   = $this->_admin_page->total_events();
-        $this->_views['draft']['count'] = $this->_admin_page->total_events_draft();
-        if (EE_Registry::instance()->CAP->current_user_can('ee_delete_events', 'espresso_events_trash_events')) {
-            $this->_views['trash']['count'] = $this->_admin_page->total_trashed_events();
-        }
-    }
-
-
-    /**
-     * @param EE_Event $item
-     * @return string
-     */
-    protected function _get_row_class($item)
-    {
-        $class = parent::_get_row_class($item);
-        //add status class
-        $class .= $item instanceof EE_Event ? ' ee-status-strip event-status-' . $item->get_active_status() : '';
-        if ($this->_has_checkbox_column) {
-            $class .= ' has-checkbox-column';
-        }
-        return $class;
-    }
-
-
-    /**
-     * @param EE_Event $item
-     * @return string
-     */
-    public function column_status(EE_Event $item)
-    {
-        return '<span class="ee-status-strip ee-status-strip-td event-status-' . $item->get_active_status() . '"></span>';
-    }/**/
-
-
-    /**
-     * @param  EE_Event $item
-     * @return string
-     */
-    public function column_cb($item)
-    {
-        if (! $item instanceof EE_Event) {
-            return '';
-        }
-        $this->_dtt = $item->primary_datetime(); //set this for use in other columns
-
-        //does event have any attached registrations?
-        $regs = $item->count_related('Registration');
-        return $regs > 0 && $this->_view == 'trash' ? '<span class="ee-lock-icon"></span>' : sprintf(
-            '<input type="checkbox" name="EVT_IDs[]" value="%s" />', $item->ID()
-        );
-    }
-
-
-    /**
-     * @param EE_Event $item
-     * @return mixed|string
-     */
-    public function column_id(EE_Event $item)
-    {
-        $content = $item->ID();
-        $content .= '  <span class="show-on-mobile-view-only">' . $item->name() . '</span>';
-        return $content;
-    }
-
-
-    /**
-     * @param EE_Event $item
-     * @return string
-     */
-    public function column_name(EE_Event $item)
-    {
-        $edit_query_args = array(
-            'action' => 'edit',
-            'post'   => $item->ID(),
-        );
-        $edit_link       = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EVENTS_ADMIN_URL);
-        $actions         = $this->_column_name_action_setup($item);
-        $status          = ''; //$item->status() !== 'publish' ? ' (' . $item->status() . ')' : '';
-        $content         = '<strong><a class="row-title" href="' . $edit_link . '">' . $item->name() . '</a></strong>' . $status;
-        $content         .= '<br><span class="ee-status-text-small">' . EEH_Template::pretty_status($item->get_active_status(),
-                false, 'sentence') . '</span>';
-        $content         .= $this->row_actions($actions);
-        return $content;
-
-    }
-
-
-    /**
-     * Just a method for setting up the actions for the name column
-     *
-     * @param EE_Event $item
-     * @return array array of actions
-     */
-    protected function _column_name_action_setup(EE_Event $item)
-    {
-        //todo: remove when attendees is active
-        if (! defined('REG_ADMIN_URL')) {
-            define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
-        }
-
-        $actions = array();
-
-        if (EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'espresso_events_edit', $item->ID())) {
-            $edit_query_args = array(
-                'action' => 'edit',
-                'post'   => $item->ID(),
-            );
-            $edit_link       = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EVENTS_ADMIN_URL);
-            $actions['edit'] = '<a href="' . $edit_link . '" title="' . esc_attr__('Edit Event',
-                    'event_espresso') . '">' . __('Edit', 'event_espresso') . '</a>';
-
-        }
-
-        if (EE_Registry::instance()->CAP->current_user_can('ee_read_registration',
-            'espresso_registrations_view_registration', $item->ID())) {
-            $attendees_query_args = array(
-                'action'   => 'default',
-                'event_id' => $item->ID(),
-            );
-            $attendees_link       = EE_Admin_Page::add_query_args_and_nonce($attendees_query_args, REG_ADMIN_URL);
-            $actions['attendees'] = '<a href="' . $attendees_link . '" title="' . esc_attr__('View Registrations',
-                    'event_espresso') . '">' . __('Registrations', 'event_espresso') . '</a>';
-        }
-
-        if (EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_trash_event',
-            $item->ID())) {
-            $trash_event_query_args = array(
-                'action' => 'trash_event',
-                'EVT_ID' => $item->ID(),
-            );
-            $trash_event_link       = EE_Admin_Page::add_query_args_and_nonce($trash_event_query_args,
-                EVENTS_ADMIN_URL);
-        }
-
-        if (EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_restore_event',
-            $item->ID())) {
-            $restore_event_query_args = array(
-                'action' => 'restore_event',
-                'EVT_ID' => $item->ID(),
-            );
-            $restore_event_link       = EE_Admin_Page::add_query_args_and_nonce($restore_event_query_args,
-                EVENTS_ADMIN_URL);
-        }
-
-        if (EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_delete_event',
-            $item->ID())) {
-            $delete_event_query_args = array(
-                'action' => 'delete_event',
-                'EVT_ID' => $item->ID(),
-            );
-            $delete_event_link       = EE_Admin_Page::add_query_args_and_nonce($delete_event_query_args,
-                EVENTS_ADMIN_URL);
-        }
-
-        $view_link = get_permalink($item->ID());
-
-        $actions['view'] = '<a href="' . $view_link . '" title="' . esc_attr__('View Event',
-                'event_espresso') . '">' . __('View', 'event_espresso') . '</a>';
-
-        switch ($item->get('status')) {
-            case 'trash' :
-                if (EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_restore_event',
-                    $item->ID())) {
-                    $actions['restore_from_trash'] = '<a href="' . $restore_event_link . '" title="' . esc_attr__('Restore from Trash',
-                            'event_espresso') . '">' . __('Restore from Trash', 'event_espresso') . '</a>';
-                }
-                if ($item->count_related('Registration') === 0 && EE_Registry::instance()->CAP->current_user_can('ee_delete_event',
-                        'espresso_events_delete_event', $item->ID())) {
-                    $actions['delete'] = '<a href="' . $delete_event_link . '" title="' . esc_attr__('Delete Permanently',
-                            'event_espresso') . '">' . __('Delete Permanently', 'event_espresso') . '</a>';
-                }
-                break;
-            default :
-                if (EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_trash_event',
-                    $item->ID())) {
-                    $actions['move to trash'] = '<a href="' . $trash_event_link . '" title="' . esc_attr__('Trash Event',
-                            'event_espresso') . '">' . __('Trash', 'event_espresso') . '</a>';
-                }
-        }
-        return $actions;
-    }
-
-
-    /**
-     * @param EE_Event $item
-     * @return string
-     */
-    public function column_author(EE_Event $item)
-    {
-        //user author info
-        $event_author = get_userdata($item->wp_user());
-        $gravatar     = get_avatar($item->wp_user(), '15');
-        //filter link
-        $query_args = array(
-            'action'      => 'default',
-            'EVT_wp_user' => $item->wp_user(),
-        );
-        $filter_url = EE_Admin_Page::add_query_args_and_nonce($query_args, EVENTS_ADMIN_URL);
-        return $gravatar . '  <a href="' . $filter_url . '" title="' . esc_attr__('Click to filter events by this author.',
-                'event_espresso') . '">' . $event_author->display_name . '</a>';
-    }
-
-
-    /**
-     * @param EE_Event $item
-     * @return string
-     */
-    public function column_venue(EE_Event $item)
-    {
-        $venue = $item->get_first_related('Venue');
-        return ! empty($venue) ? $venue->name() : '';
-    }
-
-
-    /**
-     * @param EE_Event $item
-     * @throws EE_Error
-     */
-    public function column_start_date_time(EE_Event $item)
-    {
-        echo ! empty($this->_dtt) ? $this->_dtt->get_i18n_datetime('DTT_EVT_start') : __('No Date was saved for this Event',
-            'event_espresso');
-        //display in user's timezone?
-        echo ! empty($this->_dtt) ? $this->_dtt->display_in_my_timezone('DTT_EVT_start', 'get_i18n_datetime', '',
-            'My Timezone: ') : '';
-
-    }
-
-
-    /**
-     * @param EE_Event $item
-     * @throws EE_Error
-     */
-    public function column_reg_begins(EE_Event $item)
-    {
-        $reg_start = $item->get_ticket_with_earliest_start_time();
-        echo ! empty($reg_start) ? $reg_start->get_i18n_datetime('TKT_start_date') : __('No Tickets have been setup for this Event',
-            'event_espresso');
-        //display in user's timezone?
-        echo ! empty($reg_start) ? $reg_start->display_in_my_timezone('TKT_start_date', 'get_i18n_datetime', '',
-            'My Timezone: ') : '';/**/
-    }
-
-
-    /**
-     * @param EE_Event $item
-     * @return int|string
-     */
-    public function column_attendees(EE_Event $item)
-    {
-        $attendees_query_args = array(
-            'action'   => 'default',
-            'event_id' => $item->ID(),
-        );
-        $attendees_link       = EE_Admin_Page::add_query_args_and_nonce($attendees_query_args, REG_ADMIN_URL);
-        $registered_attendees = EEM_Registration::instance()->get_event_registration_count($item->ID());
-        return EE_Registry::instance()->CAP->current_user_can('ee_read_registration',
-            'espresso_registrations_view_registration',
-            $item->ID()) ? '<a href="' . $attendees_link . '">' . $registered_attendees . '</a>' : $registered_attendees;
-    }
-
-
-    /**
-     * @param EE_Event $item
-     * @return float
-     */
-    public function column_tkts_sold(EE_Event $item)
-    {
-        return EEM_Ticket::instance()->sum(array(array('Datetime.EVT_ID' => $item->ID())), 'TKT_sold');
-    }
-
-
-    /**
-     * @param EE_Event $item
-     * @return string
-     */
-    public function column_actions(EE_Event $item)
-    {
-        //todo: remove when attendees is active
-        if (! defined('REG_ADMIN_URL')) {
-            define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
-        }
-        $actionlinks = array();
-
-        $view_link = get_permalink($item->ID());
-
-        $actionlinks[] = '<a href="' . $view_link . '" title="' . esc_attr__('View Event',
-                'event_espresso') . '" target="_blank">';
-        $actionlinks[] = '<div class="dashicons dashicons-search"></div></a>';
-
-        if (EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'espresso_events_edit', $item->ID())) {
-            $edit_query_args = array(
-                'action' => 'edit',
-                'post'   => $item->ID(),
-            );
-            $edit_link       = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EVENTS_ADMIN_URL);
-            $actionlinks[]   = '<a href="' . $edit_link . '" title="' . esc_attr__('Edit Event',
-                    'event_espresso') . '"><div class="ee-icon ee-icon-calendar-edit"></div></a>';
-        }
-
-        if (EE_Registry::instance()->CAP->current_user_can('ee_read_registration',
-            'espresso_registrations_view_registration', $item->ID())) {
-            $attendees_query_args = array(
-                'action'   => 'default',
-                'event_id' => $item->ID(),
-            );
-            $attendees_link       = EE_Admin_Page::add_query_args_and_nonce($attendees_query_args, REG_ADMIN_URL);
-            $actionlinks[]        = '<a href="' . $attendees_link . '" title="' . esc_attr__('View Registrants',
-                    'event_espresso') . '"><div class="dashicons dashicons-groups"></div></a>';
-        }
-
-        $actionlinks = apply_filters('FHEE__Events_Admin_List_Table__column_actions__action_links', $actionlinks,
-            $item);
-
-        return $this->_action_string(implode("\n\t", $actionlinks), $item, 'div');
-    }
+	/**
+	 * @var EE_Datetime
+	 */
+	private $_dtt;
+
+
+	/**
+	 * Events_Admin_List_Table constructor.
+	 *
+	 * @param EE_Admin_Page $admin_page
+	 */
+	public function __construct($admin_page)
+	{
+		parent::__construct($admin_page);
+		require_once(EE_HELPERS . 'EEH_DTT_Helper.helper.php');
+	}
+
+
+	/**
+	 * Initial setup of data properties for the list table.
+	 */
+	protected function _setup_data()
+	{
+		$this->_data           = $this->_admin_page->get_events($this->_per_page, $this->_current_page);
+		$this->_all_data_count = $this->_admin_page->get_events(0, 0, true);
+	}
+
+
+	/**
+	 * Set up of additional properties for the list table.
+	 */
+	protected function _set_properties()
+	{
+		$this->_wp_list_args = array(
+			'singular' => __('event', 'event_espresso'),
+			'plural'   => __('events', 'event_espresso'),
+			'ajax'     => true, //for now
+			'screen'   => $this->_admin_page->get_current_screen()->id,
+		);
+
+
+		$this->_columns = array(
+			'cb'              => '<input type="checkbox" />',
+			'id'              => __('ID', 'event_espresso'),
+			'name'            => __('Name', 'event_espresso'),
+			'author'          => __('Author', 'event_espresso'),
+			'venue'           => __('Venue', 'event_espresso'),
+			'start_date_time' => __('Event Start', 'event_espresso'),
+			'reg_begins'      => __('On Sale', 'event_espresso'),
+			'attendees'       => '<span class="dashicons dashicons-groups ee-icon-color-ee-green ee-icon-size-20"></span>',
+			//'tkts_sold' => __('Tickets Sold', 'event_espresso'),
+			'actions'         => __('Actions', 'event_espresso'),
+		);
+
+
+		$this->_sortable_columns = array(
+			'id'              => array('EVT_ID' => true),
+			'name'            => array('EVT_name' => false),
+			'author'          => array('EVT_wp_user' => false),
+			'venue'           => array('Venue.VNU_name' => false),
+			'start_date_time' => array('Datetime.DTT_EVT_start' => false),
+			'reg_begins'      => array('Datetime.Ticket.TKT_start_date' => false),
+		);
+
+		$this->_primary_column = 'id';
+
+		$this->_hidden_columns = array('author');
+	}
+
+
+	/**
+	 * @return array
+	 */
+	protected function _get_table_filters()
+	{
+		return array(); //no filters with decaf
+	}
+
+
+	/**
+	 * Setup of views properties.
+	 */
+	protected function _add_view_counts()
+	{
+		$this->_views['all']['count']   = $this->_admin_page->total_events();
+		$this->_views['draft']['count'] = $this->_admin_page->total_events_draft();
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_events', 'espresso_events_trash_events')) {
+			$this->_views['trash']['count'] = $this->_admin_page->total_trashed_events();
+		}
+	}
+
+
+	/**
+	 * @param EE_Event $item
+	 * @return string
+	 */
+	protected function _get_row_class($item)
+	{
+		$class = parent::_get_row_class($item);
+		//add status class
+		$class .= $item instanceof EE_Event ? ' ee-status-strip event-status-' . $item->get_active_status() : '';
+		if ($this->_has_checkbox_column) {
+			$class .= ' has-checkbox-column';
+		}
+		return $class;
+	}
+
+
+	/**
+	 * @param EE_Event $item
+	 * @return string
+	 */
+	public function column_status(EE_Event $item)
+	{
+		return '<span class="ee-status-strip ee-status-strip-td event-status-' . $item->get_active_status() . '"></span>';
+	}/**/
+
+
+	/**
+	 * @param  EE_Event $item
+	 * @return string
+	 */
+	public function column_cb($item)
+	{
+		if (! $item instanceof EE_Event) {
+			return '';
+		}
+		$this->_dtt = $item->primary_datetime(); //set this for use in other columns
+
+		//does event have any attached registrations?
+		$regs = $item->count_related('Registration');
+		return $regs > 0 && $this->_view == 'trash' ? '<span class="ee-lock-icon"></span>' : sprintf(
+			'<input type="checkbox" name="EVT_IDs[]" value="%s" />', $item->ID()
+		);
+	}
+
+
+	/**
+	 * @param EE_Event $item
+	 * @return mixed|string
+	 */
+	public function column_id(EE_Event $item)
+	{
+		$content = $item->ID();
+		$content .= '  <span class="show-on-mobile-view-only">' . $item->name() . '</span>';
+		return $content;
+	}
+
+
+	/**
+	 * @param EE_Event $item
+	 * @return string
+	 */
+	public function column_name(EE_Event $item)
+	{
+		$edit_query_args = array(
+			'action' => 'edit',
+			'post'   => $item->ID(),
+		);
+		$edit_link       = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EVENTS_ADMIN_URL);
+		$actions         = $this->_column_name_action_setup($item);
+		$status          = ''; //$item->status() !== 'publish' ? ' (' . $item->status() . ')' : '';
+		$content         = '<strong><a class="row-title" href="' . $edit_link . '">' . $item->name() . '</a></strong>' . $status;
+		$content         .= '<br><span class="ee-status-text-small">' . EEH_Template::pretty_status($item->get_active_status(),
+				false, 'sentence') . '</span>';
+		$content         .= $this->row_actions($actions);
+		return $content;
+
+	}
+
+
+	/**
+	 * Just a method for setting up the actions for the name column
+	 *
+	 * @param EE_Event $item
+	 * @return array array of actions
+	 */
+	protected function _column_name_action_setup(EE_Event $item)
+	{
+		//todo: remove when attendees is active
+		if (! defined('REG_ADMIN_URL')) {
+			define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
+		}
+
+		$actions = array();
+
+		if (EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'espresso_events_edit', $item->ID())) {
+			$edit_query_args = array(
+				'action' => 'edit',
+				'post'   => $item->ID(),
+			);
+			$edit_link       = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EVENTS_ADMIN_URL);
+			$actions['edit'] = '<a href="' . $edit_link . '" title="' . esc_attr__('Edit Event',
+					'event_espresso') . '">' . __('Edit', 'event_espresso') . '</a>';
+
+		}
+
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_registration',
+			'espresso_registrations_view_registration', $item->ID())) {
+			$attendees_query_args = array(
+				'action'   => 'default',
+				'event_id' => $item->ID(),
+			);
+			$attendees_link       = EE_Admin_Page::add_query_args_and_nonce($attendees_query_args, REG_ADMIN_URL);
+			$actions['attendees'] = '<a href="' . $attendees_link . '" title="' . esc_attr__('View Registrations',
+					'event_espresso') . '">' . __('Registrations', 'event_espresso') . '</a>';
+		}
+
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_trash_event',
+			$item->ID())) {
+			$trash_event_query_args = array(
+				'action' => 'trash_event',
+				'EVT_ID' => $item->ID(),
+			);
+			$trash_event_link       = EE_Admin_Page::add_query_args_and_nonce($trash_event_query_args,
+				EVENTS_ADMIN_URL);
+		}
+
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_restore_event',
+			$item->ID())) {
+			$restore_event_query_args = array(
+				'action' => 'restore_event',
+				'EVT_ID' => $item->ID(),
+			);
+			$restore_event_link       = EE_Admin_Page::add_query_args_and_nonce($restore_event_query_args,
+				EVENTS_ADMIN_URL);
+		}
+
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_delete_event',
+			$item->ID())) {
+			$delete_event_query_args = array(
+				'action' => 'delete_event',
+				'EVT_ID' => $item->ID(),
+			);
+			$delete_event_link       = EE_Admin_Page::add_query_args_and_nonce($delete_event_query_args,
+				EVENTS_ADMIN_URL);
+		}
+
+		$view_link = get_permalink($item->ID());
+
+		$actions['view'] = '<a href="' . $view_link . '" title="' . esc_attr__('View Event',
+				'event_espresso') . '">' . __('View', 'event_espresso') . '</a>';
+
+		switch ($item->get('status')) {
+			case 'trash' :
+				if (EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_restore_event',
+					$item->ID())) {
+					$actions['restore_from_trash'] = '<a href="' . $restore_event_link . '" title="' . esc_attr__('Restore from Trash',
+							'event_espresso') . '">' . __('Restore from Trash', 'event_espresso') . '</a>';
+				}
+				if ($item->count_related('Registration') === 0 && EE_Registry::instance()->CAP->current_user_can('ee_delete_event',
+						'espresso_events_delete_event', $item->ID())) {
+					$actions['delete'] = '<a href="' . $delete_event_link . '" title="' . esc_attr__('Delete Permanently',
+							'event_espresso') . '">' . __('Delete Permanently', 'event_espresso') . '</a>';
+				}
+				break;
+			default :
+				if (EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_trash_event',
+					$item->ID())) {
+					$actions['move to trash'] = '<a href="' . $trash_event_link . '" title="' . esc_attr__('Trash Event',
+							'event_espresso') . '">' . __('Trash', 'event_espresso') . '</a>';
+				}
+		}
+		return $actions;
+	}
+
+
+	/**
+	 * @param EE_Event $item
+	 * @return string
+	 */
+	public function column_author(EE_Event $item)
+	{
+		//user author info
+		$event_author = get_userdata($item->wp_user());
+		$gravatar     = get_avatar($item->wp_user(), '15');
+		//filter link
+		$query_args = array(
+			'action'      => 'default',
+			'EVT_wp_user' => $item->wp_user(),
+		);
+		$filter_url = EE_Admin_Page::add_query_args_and_nonce($query_args, EVENTS_ADMIN_URL);
+		return $gravatar . '  <a href="' . $filter_url . '" title="' . esc_attr__('Click to filter events by this author.',
+				'event_espresso') . '">' . $event_author->display_name . '</a>';
+	}
+
+
+	/**
+	 * @param EE_Event $item
+	 * @return string
+	 */
+	public function column_venue(EE_Event $item)
+	{
+		$venue = $item->get_first_related('Venue');
+		return ! empty($venue) ? $venue->name() : '';
+	}
+
+
+	/**
+	 * @param EE_Event $item
+	 * @throws EE_Error
+	 */
+	public function column_start_date_time(EE_Event $item)
+	{
+		echo ! empty($this->_dtt) ? $this->_dtt->get_i18n_datetime('DTT_EVT_start') : __('No Date was saved for this Event',
+			'event_espresso');
+		//display in user's timezone?
+		echo ! empty($this->_dtt) ? $this->_dtt->display_in_my_timezone('DTT_EVT_start', 'get_i18n_datetime', '',
+			'My Timezone: ') : '';
+
+	}
+
+
+	/**
+	 * @param EE_Event $item
+	 * @throws EE_Error
+	 */
+	public function column_reg_begins(EE_Event $item)
+	{
+		$reg_start = $item->get_ticket_with_earliest_start_time();
+		echo ! empty($reg_start) ? $reg_start->get_i18n_datetime('TKT_start_date') : __('No Tickets have been setup for this Event',
+			'event_espresso');
+		//display in user's timezone?
+		echo ! empty($reg_start) ? $reg_start->display_in_my_timezone('TKT_start_date', 'get_i18n_datetime', '',
+			'My Timezone: ') : '';/**/
+	}
+
+
+	/**
+	 * @param EE_Event $item
+	 * @return int|string
+	 */
+	public function column_attendees(EE_Event $item)
+	{
+		$attendees_query_args = array(
+			'action'   => 'default',
+			'event_id' => $item->ID(),
+		);
+		$attendees_link       = EE_Admin_Page::add_query_args_and_nonce($attendees_query_args, REG_ADMIN_URL);
+		$registered_attendees = EEM_Registration::instance()->get_event_registration_count($item->ID());
+		return EE_Registry::instance()->CAP->current_user_can('ee_read_registration',
+			'espresso_registrations_view_registration',
+			$item->ID()) ? '<a href="' . $attendees_link . '">' . $registered_attendees . '</a>' : $registered_attendees;
+	}
+
+
+	/**
+	 * @param EE_Event $item
+	 * @return float
+	 */
+	public function column_tkts_sold(EE_Event $item)
+	{
+		return EEM_Ticket::instance()->sum(array(array('Datetime.EVT_ID' => $item->ID())), 'TKT_sold');
+	}
+
+
+	/**
+	 * @param EE_Event $item
+	 * @return string
+	 */
+	public function column_actions(EE_Event $item)
+	{
+		//todo: remove when attendees is active
+		if (! defined('REG_ADMIN_URL')) {
+			define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
+		}
+		$actionlinks = array();
+
+		$view_link = get_permalink($item->ID());
+
+		$actionlinks[] = '<a href="' . $view_link . '" title="' . esc_attr__('View Event',
+				'event_espresso') . '" target="_blank">';
+		$actionlinks[] = '<div class="dashicons dashicons-search"></div></a>';
+
+		if (EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'espresso_events_edit', $item->ID())) {
+			$edit_query_args = array(
+				'action' => 'edit',
+				'post'   => $item->ID(),
+			);
+			$edit_link       = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EVENTS_ADMIN_URL);
+			$actionlinks[]   = '<a href="' . $edit_link . '" title="' . esc_attr__('Edit Event',
+					'event_espresso') . '"><div class="ee-icon ee-icon-calendar-edit"></div></a>';
+		}
+
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_registration',
+			'espresso_registrations_view_registration', $item->ID())) {
+			$attendees_query_args = array(
+				'action'   => 'default',
+				'event_id' => $item->ID(),
+			);
+			$attendees_link       = EE_Admin_Page::add_query_args_and_nonce($attendees_query_args, REG_ADMIN_URL);
+			$actionlinks[]        = '<a href="' . $attendees_link . '" title="' . esc_attr__('View Registrants',
+					'event_espresso') . '"><div class="dashicons dashicons-groups"></div></a>';
+		}
+
+		$actionlinks = apply_filters('FHEE__Events_Admin_List_Table__column_actions__action_links', $actionlinks,
+			$item);
+
+		return $this->_action_string(implode("\n\t", $actionlinks), $item, 'div');
+	}
 
 
 }

Spacing +36 added lines, -36 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (! defined('EVENT_ESPRESSO_VERSION')) {
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
     exit('NO direct script access allowed');
 }
 
@@ -40,7 +40,7 @@ 
     public function __construct($admin_page)
     {
         parent::__construct($admin_page);
-        require_once(EE_HELPERS . 'EEH_DTT_Helper.helper.php');
+        require_once(EE_HELPERS.'EEH_DTT_Helper.helper.php');
     }
 
 
@@ -126,7 +126,7 @@ 
     {
         $class = parent::_get_row_class($item);
         //add status class
-        $class .= $item instanceof EE_Event ? ' ee-status-strip event-status-' . $item->get_active_status() : '';
+        $class .= $item instanceof EE_Event ? ' ee-status-strip event-status-'.$item->get_active_status() : '';
         if ($this->_has_checkbox_column) {
             $class .= ' has-checkbox-column';
         }
@@ -140,7 +140,7 @@ 
      */
     public function column_status(EE_Event $item)
     {
-        return '<span class="ee-status-strip ee-status-strip-td event-status-' . $item->get_active_status() . '"></span>';
+        return '<span class="ee-status-strip ee-status-strip-td event-status-'.$item->get_active_status().'"></span>';
     }/**/
 
 
@@ -150,7 +150,7 @@ 
      */
     public function column_cb($item)
     {
-        if (! $item instanceof EE_Event) {
+        if ( ! $item instanceof EE_Event) {
             return '';
         }
         $this->_dtt = $item->primary_datetime(); //set this for use in other columns
@@ -170,7 +170,7 @@ 
     public function column_id(EE_Event $item)
     {
         $content = $item->ID();
-        $content .= '  <span class="show-on-mobile-view-only">' . $item->name() . '</span>';
+        $content .= '  <span class="show-on-mobile-view-only">'.$item->name().'</span>';
         return $content;
     }
 
@@ -188,9 +188,9 @@ 
         $edit_link       = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EVENTS_ADMIN_URL);
         $actions         = $this->_column_name_action_setup($item);
         $status          = ''; //$item->status() !== 'publish' ? ' (' . $item->status() . ')' : '';
-        $content         = '<strong><a class="row-title" href="' . $edit_link . '">' . $item->name() . '</a></strong>' . $status;
-        $content         .= '<br><span class="ee-status-text-small">' . EEH_Template::pretty_status($item->get_active_status(),
-                false, 'sentence') . '</span>';
+        $content         = '<strong><a class="row-title" href="'.$edit_link.'">'.$item->name().'</a></strong>'.$status;
+        $content         .= '<br><span class="ee-status-text-small">'.EEH_Template::pretty_status($item->get_active_status(),
+                false, 'sentence').'</span>';
         $content         .= $this->row_actions($actions);
         return $content;
 
@@ -206,7 +206,7 @@ 
     protected function _column_name_action_setup(EE_Event $item)
     {
         //todo: remove when attendees is active
-        if (! defined('REG_ADMIN_URL')) {
+        if ( ! defined('REG_ADMIN_URL')) {
             define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
         }
 
@@ -218,8 +218,8 @@ 
                 'post'   => $item->ID(),
             );
             $edit_link       = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EVENTS_ADMIN_URL);
-            $actions['edit'] = '<a href="' . $edit_link . '" title="' . esc_attr__('Edit Event',
-                    'event_espresso') . '">' . __('Edit', 'event_espresso') . '</a>';
+            $actions['edit'] = '<a href="'.$edit_link.'" title="'.esc_attr__('Edit Event',
+                    'event_espresso').'">'.__('Edit', 'event_espresso').'</a>';
 
         }
 
@@ -230,8 +230,8 @@ 
                 'event_id' => $item->ID(),
             );
             $attendees_link       = EE_Admin_Page::add_query_args_and_nonce($attendees_query_args, REG_ADMIN_URL);
-            $actions['attendees'] = '<a href="' . $attendees_link . '" title="' . esc_attr__('View Registrations',
-                    'event_espresso') . '">' . __('Registrations', 'event_espresso') . '</a>';
+            $actions['attendees'] = '<a href="'.$attendees_link.'" title="'.esc_attr__('View Registrations',
+                    'event_espresso').'">'.__('Registrations', 'event_espresso').'</a>';
         }
 
         if (EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_trash_event',
@@ -240,7 +240,7 @@ 
                 'action' => 'trash_event',
                 'EVT_ID' => $item->ID(),
             );
-            $trash_event_link       = EE_Admin_Page::add_query_args_and_nonce($trash_event_query_args,
+            $trash_event_link = EE_Admin_Page::add_query_args_and_nonce($trash_event_query_args,
                 EVENTS_ADMIN_URL);
         }
 
@@ -250,7 +250,7 @@ 
                 'action' => 'restore_event',
                 'EVT_ID' => $item->ID(),
             );
-            $restore_event_link       = EE_Admin_Page::add_query_args_and_nonce($restore_event_query_args,
+            $restore_event_link = EE_Admin_Page::add_query_args_and_nonce($restore_event_query_args,
                 EVENTS_ADMIN_URL);
         }
 
@@ -260,33 +260,33 @@ 
                 'action' => 'delete_event',
                 'EVT_ID' => $item->ID(),
             );
-            $delete_event_link       = EE_Admin_Page::add_query_args_and_nonce($delete_event_query_args,
+            $delete_event_link = EE_Admin_Page::add_query_args_and_nonce($delete_event_query_args,
                 EVENTS_ADMIN_URL);
         }
 
         $view_link = get_permalink($item->ID());
 
-        $actions['view'] = '<a href="' . $view_link . '" title="' . esc_attr__('View Event',
-                'event_espresso') . '">' . __('View', 'event_espresso') . '</a>';
+        $actions['view'] = '<a href="'.$view_link.'" title="'.esc_attr__('View Event',
+                'event_espresso').'">'.__('View', 'event_espresso').'</a>';
 
         switch ($item->get('status')) {
             case 'trash' :
                 if (EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_restore_event',
                     $item->ID())) {
-                    $actions['restore_from_trash'] = '<a href="' . $restore_event_link . '" title="' . esc_attr__('Restore from Trash',
-                            'event_espresso') . '">' . __('Restore from Trash', 'event_espresso') . '</a>';
+                    $actions['restore_from_trash'] = '<a href="'.$restore_event_link.'" title="'.esc_attr__('Restore from Trash',
+                            'event_espresso').'">'.__('Restore from Trash', 'event_espresso').'</a>';
                 }
                 if ($item->count_related('Registration') === 0 && EE_Registry::instance()->CAP->current_user_can('ee_delete_event',
                         'espresso_events_delete_event', $item->ID())) {
-                    $actions['delete'] = '<a href="' . $delete_event_link . '" title="' . esc_attr__('Delete Permanently',
-                            'event_espresso') . '">' . __('Delete Permanently', 'event_espresso') . '</a>';
+                    $actions['delete'] = '<a href="'.$delete_event_link.'" title="'.esc_attr__('Delete Permanently',
+                            'event_espresso').'">'.__('Delete Permanently', 'event_espresso').'</a>';
                 }
                 break;
             default :
                 if (EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_trash_event',
                     $item->ID())) {
-                    $actions['move to trash'] = '<a href="' . $trash_event_link . '" title="' . esc_attr__('Trash Event',
-                            'event_espresso') . '">' . __('Trash', 'event_espresso') . '</a>';
+                    $actions['move to trash'] = '<a href="'.$trash_event_link.'" title="'.esc_attr__('Trash Event',
+                            'event_espresso').'">'.__('Trash', 'event_espresso').'</a>';
                 }
         }
         return $actions;
@@ -308,8 +308,8 @@ 
             'EVT_wp_user' => $item->wp_user(),
         );
         $filter_url = EE_Admin_Page::add_query_args_and_nonce($query_args, EVENTS_ADMIN_URL);
-        return $gravatar . '  <a href="' . $filter_url . '" title="' . esc_attr__('Click to filter events by this author.',
-                'event_espresso') . '">' . $event_author->display_name . '</a>';
+        return $gravatar.'  <a href="'.$filter_url.'" title="'.esc_attr__('Click to filter events by this author.',
+                'event_espresso').'">'.$event_author->display_name.'</a>';
     }
 
 
@@ -350,7 +350,7 @@ 
             'event_espresso');
         //display in user's timezone?
         echo ! empty($reg_start) ? $reg_start->display_in_my_timezone('TKT_start_date', 'get_i18n_datetime', '',
-            'My Timezone: ') : '';/**/
+            'My Timezone: ') : ''; /**/
     }
 
 
@@ -368,7 +368,7 @@ 
         $registered_attendees = EEM_Registration::instance()->get_event_registration_count($item->ID());
         return EE_Registry::instance()->CAP->current_user_can('ee_read_registration',
             'espresso_registrations_view_registration',
-            $item->ID()) ? '<a href="' . $attendees_link . '">' . $registered_attendees . '</a>' : $registered_attendees;
+            $item->ID()) ? '<a href="'.$attendees_link.'">'.$registered_attendees.'</a>' : $registered_attendees;
     }
 
 
@@ -389,15 +389,15 @@ 
     public function column_actions(EE_Event $item)
     {
         //todo: remove when attendees is active
-        if (! defined('REG_ADMIN_URL')) {
+        if ( ! defined('REG_ADMIN_URL')) {
             define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
         }
         $actionlinks = array();
 
         $view_link = get_permalink($item->ID());
 
-        $actionlinks[] = '<a href="' . $view_link . '" title="' . esc_attr__('View Event',
-                'event_espresso') . '" target="_blank">';
+        $actionlinks[] = '<a href="'.$view_link.'" title="'.esc_attr__('View Event',
+                'event_espresso').'" target="_blank">';
         $actionlinks[] = '<div class="dashicons dashicons-search"></div></a>';
 
         if (EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'espresso_events_edit', $item->ID())) {
@@ -406,8 +406,8 @@ 
                 'post'   => $item->ID(),
             );
             $edit_link       = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EVENTS_ADMIN_URL);
-            $actionlinks[]   = '<a href="' . $edit_link . '" title="' . esc_attr__('Edit Event',
-                    'event_espresso') . '"><div class="ee-icon ee-icon-calendar-edit"></div></a>';
+            $actionlinks[]   = '<a href="'.$edit_link.'" title="'.esc_attr__('Edit Event',
+                    'event_espresso').'"><div class="ee-icon ee-icon-calendar-edit"></div></a>';
         }
 
         if (EE_Registry::instance()->CAP->current_user_can('ee_read_registration',
@@ -417,8 +417,8 @@ 
                 'event_id' => $item->ID(),
             );
             $attendees_link       = EE_Admin_Page::add_query_args_and_nonce($attendees_query_args, REG_ADMIN_URL);
-            $actionlinks[]        = '<a href="' . $attendees_link . '" title="' . esc_attr__('View Registrants',
-                    'event_espresso') . '"><div class="dashicons dashicons-groups"></div></a>';
+            $actionlinks[]        = '<a href="'.$attendees_link.'" title="'.esc_attr__('View Registrants',
+                    'event_espresso').'"><div class="dashicons dashicons-groups"></div></a>';
         }
 
         $actionlinks = apply_filters('FHEE__Events_Admin_List_Table__column_actions__action_links', $actionlinks,

core/EE_Module_Request_Router.core.php

Indentation +215 added lines, -215 removed lines

@@ -17,243 +17,243 @@
 final class EE_Module_Request_Router implements InterminableInterface
 {
 
-    /**
-     * @var array $_previous_routes
-     */
-    private static $_previous_routes = array();
+	/**
+	 * @var array $_previous_routes
+	 */
+	private static $_previous_routes = array();
 
-    /**
-     * @var WP_Query $WP_Query
-     */
-    public $WP_Query;
+	/**
+	 * @var WP_Query $WP_Query
+	 */
+	public $WP_Query;
 
 
 
-    /**
-     * EE_Module_Request_Router constructor.
-     */
-    public function __construct()
-    {
-    }
+	/**
+	 * EE_Module_Request_Router constructor.
+	 */
+	public function __construct()
+	{
+	}
 
 
 
-    /**
-     * on the first call  to this method, it checks the EE_Request_Handler for a "route"
-     * on subsequent calls to this method,
-     * instead of checking the EE_Request_Handler for a route, it checks the previous routes array,
-     * and checks if the last called route has any forwarding routes registered for it
-     *
-     * @param WP_Query $WP_Query
-     * @return NULL|string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function get_route(WP_Query $WP_Query)
-    {
-        $this->WP_Query = $WP_Query;
-        // assume this if first route being called
-        $previous_route = false;
-        // but is it really ???
-        if (! empty(self::$_previous_routes)) {
-            // get last run route
-            $previous_routes = array_values(self::$_previous_routes);
-            $previous_route = array_pop($previous_routes);
-        }
-        //  has another route already been run ?
-        if ($previous_route) {
-            // check if  forwarding has been set
-            $current_route = $this->get_forward($previous_route);
-            try {
-                //check for recursive forwarding
-                if (isset(self::$_previous_routes[$current_route])) {
-                    throw new EE_Error(
-                        sprintf(
-                            __(
-                                'An error occurred. The %s route has already been called, and therefore can not be forwarded to, because an infinite loop would be created and break the interweb.',
-                                'event_espresso'
-                            ),
-                            $current_route
-                        )
-                    );
-                }
-            } catch (EE_Error $e) {
-                $e->get_error();
-                return null;
-            }
-        } else {
-            // first route called
-            $current_route = null;
-            // grab all routes
-            $routes = EE_Config::get_routes();
-            //d( $routes );
-            foreach ($routes as $key => $route) {
-                // check request for module route
-                if (EE_Registry::instance()->REQ->is_set($key)) {
-                    //echo '<b style="color:#2EA2CC;">key : <span style="color:#E76700">' . $key . '</span></b><br />';
-                    $current_route = sanitize_text_field(EE_Registry::instance()->REQ->get($key));
-                    if ($current_route) {
-                        $current_route = array($key, $current_route);
-                        //echo '<b style="color:#2EA2CC;">current_route : <span style="color:#E76700">' . $current_route . '</span></b><br />';
-                        break;
-                    }
-                }
-            }
-        }
-        // sorry, but I can't read what you route !
-        if (empty($current_route)) {
-            return null;
-        }
-        //add route to previous routes array
-        self::$_previous_routes[] = $current_route;
-        return $current_route;
-    }
+	/**
+	 * on the first call  to this method, it checks the EE_Request_Handler for a "route"
+	 * on subsequent calls to this method,
+	 * instead of checking the EE_Request_Handler for a route, it checks the previous routes array,
+	 * and checks if the last called route has any forwarding routes registered for it
+	 *
+	 * @param WP_Query $WP_Query
+	 * @return NULL|string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function get_route(WP_Query $WP_Query)
+	{
+		$this->WP_Query = $WP_Query;
+		// assume this if first route being called
+		$previous_route = false;
+		// but is it really ???
+		if (! empty(self::$_previous_routes)) {
+			// get last run route
+			$previous_routes = array_values(self::$_previous_routes);
+			$previous_route = array_pop($previous_routes);
+		}
+		//  has another route already been run ?
+		if ($previous_route) {
+			// check if  forwarding has been set
+			$current_route = $this->get_forward($previous_route);
+			try {
+				//check for recursive forwarding
+				if (isset(self::$_previous_routes[$current_route])) {
+					throw new EE_Error(
+						sprintf(
+							__(
+								'An error occurred. The %s route has already been called, and therefore can not be forwarded to, because an infinite loop would be created and break the interweb.',
+								'event_espresso'
+							),
+							$current_route
+						)
+					);
+				}
+			} catch (EE_Error $e) {
+				$e->get_error();
+				return null;
+			}
+		} else {
+			// first route called
+			$current_route = null;
+			// grab all routes
+			$routes = EE_Config::get_routes();
+			//d( $routes );
+			foreach ($routes as $key => $route) {
+				// check request for module route
+				if (EE_Registry::instance()->REQ->is_set($key)) {
+					//echo '<b style="color:#2EA2CC;">key : <span style="color:#E76700">' . $key . '</span></b><br />';
+					$current_route = sanitize_text_field(EE_Registry::instance()->REQ->get($key));
+					if ($current_route) {
+						$current_route = array($key, $current_route);
+						//echo '<b style="color:#2EA2CC;">current_route : <span style="color:#E76700">' . $current_route . '</span></b><br />';
+						break;
+					}
+				}
+			}
+		}
+		// sorry, but I can't read what you route !
+		if (empty($current_route)) {
+			return null;
+		}
+		//add route to previous routes array
+		self::$_previous_routes[] = $current_route;
+		return $current_route;
+	}
 
 
 
-    /**
-     * this method simply takes a valid route, and resolves what module class method the route points to
-     *
-     * @param string $key
-     * @param string $current_route
-     * @return mixed EED_Module | boolean
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function resolve_route($key, $current_route)
-    {
-        // get module method that route has been mapped to
-        $module_method = EE_Config::get_route($current_route, $key);
-        //EEH_Debug_Tools::printr( $module_method, '$module_method  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-        // verify result was returned
-        if (empty($module_method)) {
-            $msg = sprintf(
-                __('The requested route %s could not be mapped to any registered modules.', 'event_espresso'),
-                $current_route
-            );
-            EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
-            return false;
-        }
-        // verify that result is an array
-        if (! is_array($module_method)) {
-            $msg = sprintf(__('The %s  route has not been properly registered.', 'event_espresso'), $current_route);
-            EE_Error::add_error($msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__);
-            return false;
-        }
-        // grab module name
-        $module_name = $module_method[0];
-        // verify that a class method was registered properly
-        if (! isset($module_method[1])) {
-            $msg = sprintf(
-                __('A class method for the %s  route has not been properly registered.', 'event_espresso'),
-                $current_route
-            );
-            EE_Error::add_error($msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__);
-            return false;
-        }
-        // grab method
-        $method = $module_method[1];
-        // verify that class exists
-        if (! class_exists($module_name)) {
-            $msg = sprintf(__('The requested %s class could not be found.', 'event_espresso'), $module_name);
-            EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
-            return false;
-        }
-        // verify that method exists
-        if (! method_exists($module_name, $method)) {
-            $msg = sprintf(
-                __('The class method %s for the %s route is in invalid.', 'event_espresso'), $method, $current_route
-            );
-            EE_Error::add_error($msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__);
-            return false;
-        }
-        // instantiate module and call route method
-        return $this->_module_router($module_name, $method);
-    }
+	/**
+	 * this method simply takes a valid route, and resolves what module class method the route points to
+	 *
+	 * @param string $key
+	 * @param string $current_route
+	 * @return mixed EED_Module | boolean
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function resolve_route($key, $current_route)
+	{
+		// get module method that route has been mapped to
+		$module_method = EE_Config::get_route($current_route, $key);
+		//EEH_Debug_Tools::printr( $module_method, '$module_method  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
+		// verify result was returned
+		if (empty($module_method)) {
+			$msg = sprintf(
+				__('The requested route %s could not be mapped to any registered modules.', 'event_espresso'),
+				$current_route
+			);
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+			return false;
+		}
+		// verify that result is an array
+		if (! is_array($module_method)) {
+			$msg = sprintf(__('The %s  route has not been properly registered.', 'event_espresso'), $current_route);
+			EE_Error::add_error($msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__);
+			return false;
+		}
+		// grab module name
+		$module_name = $module_method[0];
+		// verify that a class method was registered properly
+		if (! isset($module_method[1])) {
+			$msg = sprintf(
+				__('A class method for the %s  route has not been properly registered.', 'event_espresso'),
+				$current_route
+			);
+			EE_Error::add_error($msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__);
+			return false;
+		}
+		// grab method
+		$method = $module_method[1];
+		// verify that class exists
+		if (! class_exists($module_name)) {
+			$msg = sprintf(__('The requested %s class could not be found.', 'event_espresso'), $module_name);
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+			return false;
+		}
+		// verify that method exists
+		if (! method_exists($module_name, $method)) {
+			$msg = sprintf(
+				__('The class method %s for the %s route is in invalid.', 'event_espresso'), $method, $current_route
+			);
+			EE_Error::add_error($msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__);
+			return false;
+		}
+		// instantiate module and call route method
+		return $this->_module_router($module_name, $method);
+	}
 
 
 
-    /**
-     * this method instantiates modules and calls the method that was defined when the route was registered
-     *
-     * @param string $module_name
-     * @return EED_Module|object|null
-     * @throws ReflectionException
-     */
-    public static function module_factory($module_name)
-    {
-        if ($module_name === 'EED_Module') {
-            EE_Error::add_error(
-                sprintf(
-                    __(
-                        'EED_Module is an abstract parent class an can not be instantiated. Please provide a proper module name.',
-                        'event_espresso'
-                    ), $module_name
-                ), __FILE__, __FUNCTION__, __LINE__
-            );
-            return null;
-        }
-        // instantiate module class
-        $module = new $module_name();
-        // ensure that class is actually a module
-        if (! $module instanceof EED_Module) {
-            EE_Error::add_error(
-                sprintf(__('The requested %s module is not of the class EED_Module.', 'event_espresso'), $module_name),
-                __FILE__, __FUNCTION__, __LINE__
-            );
-            return null;
-        }
-        return $module;
-    }
+	/**
+	 * this method instantiates modules and calls the method that was defined when the route was registered
+	 *
+	 * @param string $module_name
+	 * @return EED_Module|object|null
+	 * @throws ReflectionException
+	 */
+	public static function module_factory($module_name)
+	{
+		if ($module_name === 'EED_Module') {
+			EE_Error::add_error(
+				sprintf(
+					__(
+						'EED_Module is an abstract parent class an can not be instantiated. Please provide a proper module name.',
+						'event_espresso'
+					), $module_name
+				), __FILE__, __FUNCTION__, __LINE__
+			);
+			return null;
+		}
+		// instantiate module class
+		$module = new $module_name();
+		// ensure that class is actually a module
+		if (! $module instanceof EED_Module) {
+			EE_Error::add_error(
+				sprintf(__('The requested %s module is not of the class EED_Module.', 'event_espresso'), $module_name),
+				__FILE__, __FUNCTION__, __LINE__
+			);
+			return null;
+		}
+		return $module;
+	}
 
 
 
-    /**
-     * this method instantiates modules and calls the method that was defined when the route was registered
-     *
-     * @param string $module_name
-     * @param string $method
-     * @return EED_Module|null
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function _module_router($module_name, $method)
-    {
-        // instantiate module class
-        $module = EE_Module_Request_Router::module_factory($module_name);
-        if ($module instanceof EED_Module) {
-            // and call whatever action the route was for
-            try {
-                call_user_func(array($module, $method), $this->WP_Query);
-            } catch (EE_Error $e) {
-                $e->get_error();
-                return null;
-            }
-        }
-        return $module;
-    }
+	/**
+	 * this method instantiates modules and calls the method that was defined when the route was registered
+	 *
+	 * @param string $module_name
+	 * @param string $method
+	 * @return EED_Module|null
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function _module_router($module_name, $method)
+	{
+		// instantiate module class
+		$module = EE_Module_Request_Router::module_factory($module_name);
+		if ($module instanceof EED_Module) {
+			// and call whatever action the route was for
+			try {
+				call_user_func(array($module, $method), $this->WP_Query);
+			} catch (EE_Error $e) {
+				$e->get_error();
+				return null;
+			}
+		}
+		return $module;
+	}
 
 
 
-    /**
-     * @param $current_route
-     * @return string
-     */
-    public function get_forward($current_route)
-    {
-        return EE_Config::get_forward($current_route);
-    }
+	/**
+	 * @param $current_route
+	 * @return string
+	 */
+	public function get_forward($current_route)
+	{
+		return EE_Config::get_forward($current_route);
+	}
 
 
 
-    /**
-     * @param $current_route
-     * @return string
-     */
-    public function get_view($current_route)
-    {
-        return EE_Config::get_view($current_route);
-    }
+	/**
+	 * @param $current_route
+	 * @return string
+	 */
+	public function get_view($current_route)
+	{
+		return EE_Config::get_view($current_route);
+	}
 
 
 }

Spacing +9 added lines, -9 removed lines

@@ -55,7 +55,7 @@ 
         // assume this if first route being called
         $previous_route = false;
         // but is it really ???
-        if (! empty(self::$_previous_routes)) {
+        if ( ! empty(self::$_previous_routes)) {
             // get last run route
             $previous_routes = array_values(self::$_previous_routes);
             $previous_route = array_pop($previous_routes);
@@ -135,36 +135,36 @@ 
             return false;
         }
         // verify that result is an array
-        if (! is_array($module_method)) {
+        if ( ! is_array($module_method)) {
             $msg = sprintf(__('The %s  route has not been properly registered.', 'event_espresso'), $current_route);
-            EE_Error::add_error($msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__);
+            EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
             return false;
         }
         // grab module name
         $module_name = $module_method[0];
         // verify that a class method was registered properly
-        if (! isset($module_method[1])) {
+        if ( ! isset($module_method[1])) {
             $msg = sprintf(
                 __('A class method for the %s  route has not been properly registered.', 'event_espresso'),
                 $current_route
             );
-            EE_Error::add_error($msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__);
+            EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
             return false;
         }
         // grab method
         $method = $module_method[1];
         // verify that class exists
-        if (! class_exists($module_name)) {
+        if ( ! class_exists($module_name)) {
             $msg = sprintf(__('The requested %s class could not be found.', 'event_espresso'), $module_name);
             EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
             return false;
         }
         // verify that method exists
-        if (! method_exists($module_name, $method)) {
+        if ( ! method_exists($module_name, $method)) {
             $msg = sprintf(
                 __('The class method %s for the %s route is in invalid.', 'event_espresso'), $method, $current_route
             );
-            EE_Error::add_error($msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__);
+            EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
             return false;
         }
         // instantiate module and call route method
@@ -196,7 +196,7 @@ 
         // instantiate module class
         $module = new $module_name();
         // ensure that class is actually a module
-        if (! $module instanceof EED_Module) {
+        if ( ! $module instanceof EED_Module) {
             EE_Error::add_error(
                 sprintf(__('The requested %s module is not of the class EED_Module.', 'event_espresso'), $module_name),
                 __FILE__, __FUNCTION__, __LINE__

caffeinated/admin/extend/registrations/Extend_EE_Registrations_List_Table.class.php

Indentation +91 added lines, -91 removed lines

@@ -1,5 +1,5 @@ 
 <?php if (! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 /**
@@ -23,104 +23,104 @@ 
 {
 
 
-    /**
-     *        REG_date
-     */
-    function column_REG_date(EE_Registration $item)
-    {
+	/**
+	 *        REG_date
+	 */
+	function column_REG_date(EE_Registration $item)
+	{
 
-        //Build row actions
-        $actions = array();
+		//Build row actions
+		$actions = array();
 
-        //Build row actions
-        $check_in_url        = EE_Admin_Page::add_query_args_and_nonce(array(
-            'action'   => 'event_registrations',
-            'event_id' => $item->event_ID(),
-        ), REG_ADMIN_URL);
-        $actions['check_in'] = EE_Registry::instance()->CAP->current_user_can('ee_read_checkin',
-            'espresso_registrations_registration_checkins', $item->ID()) ? '
+		//Build row actions
+		$check_in_url        = EE_Admin_Page::add_query_args_and_nonce(array(
+			'action'   => 'event_registrations',
+			'event_id' => $item->event_ID(),
+		), REG_ADMIN_URL);
+		$actions['check_in'] = EE_Registry::instance()->CAP->current_user_can('ee_read_checkin',
+			'espresso_registrations_registration_checkins', $item->ID()) ? '
 			<a href="' . $check_in_url . '" title="' . esc_attr__('The Check-In List allows you to easily toggle check-in status for this event',
-                'event_espresso') . '">' . __('View Check-ins', 'event_espresso') . '</a>' : __('View Check-ins',
-            'event_espresso');
+				'event_espresso') . '">' . __('View Check-ins', 'event_espresso') . '</a>' : __('View Check-ins',
+			'event_espresso');
 
-        $view_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array(
-            'action' => 'view_transaction',
-            'TXN_ID' => $item->transaction()->ID(),
-        ), TXN_ADMIN_URL);
-        $REG_date     = EE_Regisry::instance()->CAP->current_user_can('ee_read_transaction',
-            'espresso_transactions_view_transaction') ? '<a href="' . $view_lnk_url . '" title="' . esc_attr__('View Transaction Details',
-                'event_espresso') . '">' . $item->get_i18n_datetime('REG_date') . '</a>' : $item->get_i18n_datetime('REG_date');
+		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array(
+			'action' => 'view_transaction',
+			'TXN_ID' => $item->transaction()->ID(),
+		), TXN_ADMIN_URL);
+		$REG_date     = EE_Regisry::instance()->CAP->current_user_can('ee_read_transaction',
+			'espresso_transactions_view_transaction') ? '<a href="' . $view_lnk_url . '" title="' . esc_attr__('View Transaction Details',
+				'event_espresso') . '">' . $item->get_i18n_datetime('REG_date') . '</a>' : $item->get_i18n_datetime('REG_date');
 
-        return sprintf('%1$s %2$s', $REG_date, $this->row_actions($actions));
+		return sprintf('%1$s %2$s', $REG_date, $this->row_actions($actions));
 
-    }
+	}
 
 
-    /**
-     *        column_default
-     *
-     * @param \EE_Registration $item
-     * @return string
-     */
-    public function column_DTT_EVT_start(EE_Registration $item)
-    {
-        $remove_defaults = array('default_where_conditions' => 'none');
-        $ticket          = $item->ticket();
-        $datetimes       = $ticket instanceof EE_Ticket ? $ticket->datetimes($remove_defaults) : array();
-        $EVT_ID          = $item->event_ID();
-        $datetime_string = '';
-        foreach ($datetimes as $datetime) {
-            if (
-            EE_Registry::instance()->CAP->current_user_can(
-                'ee_read_checkin',
-                'espresso_registrations_registration_checkins',
-                $item->ID()
-            )
-            ) {
-                // open "a" tag and "href"
-                $datetime_string .= '<a href="';
-                // checkin URL
-                $datetime_string .= EE_Admin_Page::add_query_args_and_nonce(
-                    array(
-                        'action'   => 'event_registrations',
-                        'event_id' => $EVT_ID,
-                        'DTT_ID'   => $datetime->ID(),
-                    ),
-                    REG_ADMIN_URL
-                );
-                // close "href"
-                $datetime_string .= '"';
-                // open "title" tag
-                $datetime_string .= ' title="';
-                // link title text
-                $datetime_string .= esc_attr__('View Checkins for this Event', 'event_espresso');
-                // close "title" tag and end of "a" tag opening
-                $datetime_string .= '">';
-                // link text
-                $datetime_string .= $datetime->get_i18n_datetime('DTT_EVT_start');
-                // close "a" tag
-                $datetime_string .= '</a>';
-            } else {
-                $datetime_string .= $datetime->get_i18n_datetime('DTT_EVT_start');
-            }
-            // add a "View Registrations" link that filters list by event AND datetime
-            $datetime_string .= $this->row_actions(
-                array(
-                    'event_datetime_filter' => '<a href="' . EE_Admin_Page::add_query_args_and_nonce(
-                            array('event_id' => $EVT_ID, 'datetime_id' => $datetime->ID()),
-                            REG_ADMIN_URL
-                        ) . '" title="' . sprintf(
-                                                   esc_attr__(
-                                                       'Filter this list to only show registrations for this datetime %s',
-                                                       'event_espresso'
-                                                   ),
-                                                   $datetime->name()
-                                               ) . '">' . __('View Registrations', 'event_espresso') . '</a>',
-                )
-            );
-        }
-        return $datetime_string;
-    }
+	/**
+	 *        column_default
+	 *
+	 * @param \EE_Registration $item
+	 * @return string
+	 */
+	public function column_DTT_EVT_start(EE_Registration $item)
+	{
+		$remove_defaults = array('default_where_conditions' => 'none');
+		$ticket          = $item->ticket();
+		$datetimes       = $ticket instanceof EE_Ticket ? $ticket->datetimes($remove_defaults) : array();
+		$EVT_ID          = $item->event_ID();
+		$datetime_string = '';
+		foreach ($datetimes as $datetime) {
+			if (
+			EE_Registry::instance()->CAP->current_user_can(
+				'ee_read_checkin',
+				'espresso_registrations_registration_checkins',
+				$item->ID()
+			)
+			) {
+				// open "a" tag and "href"
+				$datetime_string .= '<a href="';
+				// checkin URL
+				$datetime_string .= EE_Admin_Page::add_query_args_and_nonce(
+					array(
+						'action'   => 'event_registrations',
+						'event_id' => $EVT_ID,
+						'DTT_ID'   => $datetime->ID(),
+					),
+					REG_ADMIN_URL
+				);
+				// close "href"
+				$datetime_string .= '"';
+				// open "title" tag
+				$datetime_string .= ' title="';
+				// link title text
+				$datetime_string .= esc_attr__('View Checkins for this Event', 'event_espresso');
+				// close "title" tag and end of "a" tag opening
+				$datetime_string .= '">';
+				// link text
+				$datetime_string .= $datetime->get_i18n_datetime('DTT_EVT_start');
+				// close "a" tag
+				$datetime_string .= '</a>';
+			} else {
+				$datetime_string .= $datetime->get_i18n_datetime('DTT_EVT_start');
+			}
+			// add a "View Registrations" link that filters list by event AND datetime
+			$datetime_string .= $this->row_actions(
+				array(
+					'event_datetime_filter' => '<a href="' . EE_Admin_Page::add_query_args_and_nonce(
+							array('event_id' => $EVT_ID, 'datetime_id' => $datetime->ID()),
+							REG_ADMIN_URL
+						) . '" title="' . sprintf(
+												   esc_attr__(
+													   'Filter this list to only show registrations for this datetime %s',
+													   'event_espresso'
+												   ),
+												   $datetime->name()
+											   ) . '">' . __('View Registrations', 'event_espresso') . '</a>',
+				)
+			);
+		}
+		return $datetime_string;
+	}
 
 
 } //end Extend_EE_Registrations_List_Table

Spacing +10 added lines, -10 removed lines

@@ -1,4 +1,4 @@ 
-<?php if (! defined('EVENT_ESPRESSO_VERSION')) {
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
     exit('No direct script access allowed');
 }
 
@@ -33,23 +33,23 @@ 
         $actions = array();
 
         //Build row actions
-        $check_in_url        = EE_Admin_Page::add_query_args_and_nonce(array(
+        $check_in_url = EE_Admin_Page::add_query_args_and_nonce(array(
             'action'   => 'event_registrations',
             'event_id' => $item->event_ID(),
         ), REG_ADMIN_URL);
         $actions['check_in'] = EE_Registry::instance()->CAP->current_user_can('ee_read_checkin',
             'espresso_registrations_registration_checkins', $item->ID()) ? '
-			<a href="' . $check_in_url . '" title="' . esc_attr__('The Check-In List allows you to easily toggle check-in status for this event',
-                'event_espresso') . '">' . __('View Check-ins', 'event_espresso') . '</a>' : __('View Check-ins',
+			<a href="' . $check_in_url.'" title="'.esc_attr__('The Check-In List allows you to easily toggle check-in status for this event',
+                'event_espresso').'">'.__('View Check-ins', 'event_espresso').'</a>' : __('View Check-ins',
             'event_espresso');
 
         $view_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array(
             'action' => 'view_transaction',
             'TXN_ID' => $item->transaction()->ID(),
         ), TXN_ADMIN_URL);
-        $REG_date     = EE_Regisry::instance()->CAP->current_user_can('ee_read_transaction',
-            'espresso_transactions_view_transaction') ? '<a href="' . $view_lnk_url . '" title="' . esc_attr__('View Transaction Details',
-                'event_espresso') . '">' . $item->get_i18n_datetime('REG_date') . '</a>' : $item->get_i18n_datetime('REG_date');
+        $REG_date = EE_Regisry::instance()->CAP->current_user_can('ee_read_transaction',
+            'espresso_transactions_view_transaction') ? '<a href="'.$view_lnk_url.'" title="'.esc_attr__('View Transaction Details',
+                'event_espresso').'">'.$item->get_i18n_datetime('REG_date').'</a>' : $item->get_i18n_datetime('REG_date');
 
         return sprintf('%1$s %2$s', $REG_date, $this->row_actions($actions));
 
@@ -106,16 +106,16 @@ 
             // add a "View Registrations" link that filters list by event AND datetime
             $datetime_string .= $this->row_actions(
                 array(
-                    'event_datetime_filter' => '<a href="' . EE_Admin_Page::add_query_args_and_nonce(
+                    'event_datetime_filter' => '<a href="'.EE_Admin_Page::add_query_args_and_nonce(
                             array('event_id' => $EVT_ID, 'datetime_id' => $datetime->ID()),
                             REG_ADMIN_URL
-                        ) . '" title="' . sprintf(
+                        ).'" title="'.sprintf(
                                                    esc_attr__(
                                                        'Filter this list to only show registrations for this datetime %s',
                                                        'event_espresso'
                                                    ),
                                                    $datetime->name()
-                                               ) . '">' . __('View Registrations', 'event_espresso') . '</a>',
+                                               ).'">'.__('View Registrations', 'event_espresso').'</a>',
                 )
             );
         }

core/db_models/EEM_Event.model.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php use EventEspresso\core\services\orm\ModelFieldFactory;
+<?php 
 
 if (! defined('EVENT_ESPRESSO_VERSION')) {
     exit('No direct script access allowed');

Indentation +767 added lines, -767 removed lines

@@ -1,7 +1,7 @@ 
 <?php use EventEspresso\core\services\orm\ModelFieldFactory;
 
 if (! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 require_once(EE_MODELS . 'EEM_CPT_Base.model.php');
 
@@ -18,772 +18,772 @@ 
 class EEM_Event extends EEM_CPT_Base
 {
 
-    /**
-     * constant used by status(), indicating that no more tickets can be purchased for any of the datetimes for the
-     * event
-     */
-    const sold_out = 'sold_out';
-
-    /**
-     * constant used by status(), indicating that upcoming event dates have been postponed (may be pushed to a later
-     * date)
-     */
-    const postponed = 'postponed';
-
-    /**
-     * constant used by status(), indicating that the event will no longer occur
-     */
-    const cancelled = 'cancelled';
-
-
-    /**
-     * @var string
-     */
-    protected static $_default_reg_status;
-
-
-    /**
-     * This is the default for the additional limit field.
-     * @var int
-     */
-    protected static $_default_additional_limit = 10;
-
-
-    /**
-     * private instance of the Event object
-     *
-     * @var EEM_Event
-     */
-    protected static $_instance;
-
-
-
-
-    /**
-     * Adds a relationship to Term_Taxonomy for each CPT_Base
-     *
-     * @param string $timezone
-     * @throws \EE_Error
-     */
-    protected function __construct($timezone = null)
-    {
-        EE_Registry::instance()->load_model('Registration');
-        $this->singular_item = esc_html__('Event', 'event_espresso');
-        $this->plural_item = esc_html__('Events', 'event_espresso');
-        // to remove Cancelled events from the frontend, copy the following filter to your functions.php file
-        // add_filter( 'AFEE__EEM_Event__construct___custom_stati__cancelled__Public', '__return_false' );
-        // to remove Postponed events from the frontend, copy the following filter to your functions.php file
-        // add_filter( 'AFEE__EEM_Event__construct___custom_stati__postponed__Public', '__return_false' );
-        // to remove Sold Out events from the frontend, copy the following filter to your functions.php file
-        //	add_filter( 'AFEE__EEM_Event__construct___custom_stati__sold_out__Public', '__return_false' );
-        $this->_custom_stati = apply_filters(
-            'AFEE__EEM_Event__construct___custom_stati',
-            array(
-                EEM_Event::cancelled => array(
-                    'label'  => esc_html__('Cancelled', 'event_espresso'),
-                    'public' => apply_filters('AFEE__EEM_Event__construct___custom_stati__cancelled__Public', true),
-                ),
-                EEM_Event::postponed => array(
-                    'label'  => esc_html__('Postponed', 'event_espresso'),
-                    'public' => apply_filters('AFEE__EEM_Event__construct___custom_stati__postponed__Public', true),
-                ),
-                EEM_Event::sold_out  => array(
-                    'label'  => esc_html__('Sold Out', 'event_espresso'),
-                    'public' => apply_filters('AFEE__EEM_Event__construct___custom_stati__sold_out__Public', true),
-                ),
-            )
-        );
-        self::$_default_reg_status = empty(self::$_default_reg_status) ? EEM_Registration::status_id_pending_payment
-            : self::$_default_reg_status;
-        $this->_tables = array(
-            'Event_CPT'  => new EE_Primary_Table('posts', 'ID'),
-            'Event_Meta' => new EE_Secondary_Table('esp_event_meta', 'EVTM_ID', 'EVT_ID'),
-        );
-        $this->_fields = array(
-            'Event_CPT'  => array(
-                'EVT_ID'         => new EE_Primary_Key_Int_Field('ID',
-                    esc_html__('Post ID for Event', 'event_espresso')),
-                'EVT_name'       => new EE_Plain_Text_Field('post_title', esc_html__('Event Name', 'event_espresso'),
-                    false,
-                    ''),
-                'EVT_desc'       => new EE_Post_Content_Field('post_content',
-                    esc_html__('Event Description', 'event_espresso'),
-                    false, ''),
-                'EVT_slug'       => new EE_Slug_Field('post_name', esc_html__('Event Slug', 'event_espresso'), false,
-                    ''),
-                'EVT_created'    => new EE_Datetime_Field('post_date',
-                    esc_html__('Date/Time Event Created', 'event_espresso'),
-                    false, EE_Datetime_Field::now),
-                'EVT_short_desc' => new EE_Simple_HTML_Field('post_excerpt',
-                    esc_html__('Event Short Description', 'event_espresso'), false, ''),
-                'EVT_modified'   => new EE_Datetime_Field('post_modified',
-                    esc_html__('Date/Time Event Modified', 'event_espresso'), false, EE_Datetime_Field::now),
-                'EVT_wp_user'    => new EE_WP_User_Field('post_author',
-                    esc_html__('Event Creator ID', 'event_espresso'),
-                    false),
-                'parent'         => new EE_Integer_Field('post_parent', esc_html__('Event Parent ID', 'event_espresso'),
-                    false,
-                    0),
-                'EVT_order'      => new EE_Integer_Field('menu_order', esc_html__('Event Menu Order', 'event_espresso'),
-                    false,
-                    1),
-                'post_type'      => new EE_WP_Post_Type_Field('espresso_events'),
-                // EE_Plain_Text_Field( 'post_type', esc_html__( 'Event Post Type', 'event_espresso' ), FALSE, 'espresso_events' ),
-                'status'         => new EE_WP_Post_Status_Field('post_status',
-                    esc_html__('Event Status', 'event_espresso'),
-                    false, 'draft', $this->_custom_stati),
-            ),
-            'Event_Meta' => array(
-                'EVTM_ID'                         => new EE_DB_Only_Float_Field('EVTM_ID',
-                    esc_html__('Event Meta Row ID', 'event_espresso'), false),
-                'EVT_ID_fk'                       => new EE_DB_Only_Int_Field('EVT_ID',
-                    esc_html__('Foreign key to Event ID from Event Meta table', 'event_espresso'), false),
-                'EVT_display_desc'                => new EE_Boolean_Field('EVT_display_desc',
-                    esc_html__('Display Description Flag', 'event_espresso'), false, 1),
-                'EVT_display_ticket_selector'     => new EE_Boolean_Field('EVT_display_ticket_selector',
-                    esc_html__('Display Ticket Selector Flag', 'event_espresso'), false, 1),
-                'EVT_visible_on'                  => new EE_Datetime_Field('EVT_visible_on',
-                    esc_html__('Event Visible Date', 'event_espresso'), true, EE_Datetime_Field::now),
-                'EVT_additional_limit'            => new EE_Integer_Field(
-                    'EVT_additional_limit',
-                    esc_html__('Limit of Additional Registrations on Same Transaction', 'event_espresso'),
-                    true,
-                    self::$_default_additional_limit
-                ),
-                'EVT_default_registration_status' => new EE_Enum_Text_Field(
-                    'EVT_default_registration_status',
-                    esc_html__('Default Registration Status on this Event', 'event_espresso'), false,
-                    EEM_Event::$_default_reg_status, EEM_Registration::reg_status_array()
-                ),
-                'EVT_member_only'                 => new EE_Boolean_Field('EVT_member_only',
-                    esc_html__('Member-Only Event Flag', 'event_espresso'), false, false),
-                'EVT_phone'                       => new EE_Plain_Text_Field('EVT_phone',
-                    esc_html__('Event Phone Number', 'event_espresso'), false,''),
-                'EVT_allow_overflow'              => new EE_Boolean_Field('EVT_allow_overflow',
-                    esc_html__('Allow Overflow on Event', 'event_espresso'), false, false),
-                'EVT_timezone_string'             => new EE_Plain_Text_Field('EVT_timezone_string',
-                    esc_html__('Timezone (name) for Event times', 'event_espresso'), false,''),
-                'EVT_external_URL'                => new EE_Plain_Text_Field('EVT_external_URL',
-                    esc_html__('URL of Event Page if hosted elsewhere', 'event_espresso'), true),
-                'EVT_donations'                   => new EE_Boolean_Field('EVT_donations',
-                    esc_html__('Accept Donations?', 'event_espresso'), false, false),
-            ),
-        );
-        $this->_model_relations = array(
-            'Registration'           => new EE_Has_Many_Relation(),
-            'Datetime'               => new EE_Has_Many_Relation(),
-            'Question_Group'         => new EE_HABTM_Relation('Event_Question_Group'),
-            'Venue'                  => new EE_HABTM_Relation('Event_Venue'),
-            'Term_Relationship'      => new EE_Has_Many_Relation(),
-            'Term_Taxonomy'          => new EE_HABTM_Relation('Term_Relationship'),
-            'Message_Template_Group' => new EE_HABTM_Relation('Event_Message_Template'),
-            'Attendee'               => new EE_HABTM_Relation('Registration'),
-            'WP_User'                => new EE_Belongs_To_Relation(),
-        );
-        //this model is generally available for reading
-        $this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
-        parent::__construct($timezone);
-    }
-
-
-
-    /**
-     * @param string $default_reg_status
-     */
-    public static function set_default_reg_status($default_reg_status)
-    {
-        self::$_default_reg_status = $default_reg_status;
-        // if EEM_Event has already been instantiated,
-        // then we need to reset the `EVT_default_reg_status` field to use the new default.
-        if (self::$_instance instanceof EEM_Event) {
-            $default_reg_status = new EE_Enum_Text_Field(
-                'EVT_default_registration_status',
-                esc_html__('Default Registration Status on this Event', 'event_espresso'),
-                false,
-                $default_reg_status,
-                EEM_Registration::reg_status_array()
-            );
-            $default_reg_status->_construct_finalize(
-                'Event_Meta',
-                'EVT_default_registration_status',
-                'EEM_Event'
-            );
-            self::$_instance->_fields['Event_Meta']['EVT_default_registration_status'] = $default_reg_status;
-        }
-    }
-
-
-    /**
-     * Used to override the default for the additional limit field.
-     * @param $additional_limit
-     */
-    public static function set_default_additional_limit($additional_limit)
-    {
-        self::$_default_additional_limit = (int) $additional_limit;
-        if (self::$_instance instanceof EEM_Event) {
-            self::$_instance->_fields['Event_Meta']['EVT_additional_limit'] = new EE_Integer_Field(
-                'EVT_additional_limit',
-                __('Limit of Additional Registrations on Same Transaction', 'event_espresso'),
-                true,
-                self::$_default_additional_limit
-            );
-            self::$_instance->_fields['Event_Meta']['EVT_additional_limit']->_construct_finalize(
-                'Event_Meta',
-                'EVT_additional_limit',
-                'EEM_Event'
-            );
-        }
-    }
-
-
-    /**
-     * Return what is currently set as the default additional limit for the event.
-     * @return int
-     */
-    public static function get_default_additional_limit()
-    {
-        return apply_filters('FHEE__EEM_Event__get_default_additional_limit', self::$_default_additional_limit);
-    }
-
-
-    /**
-     * get_question_groups
-     *
-     * @return array
-     * @throws \EE_Error
-     */
-    public function get_all_question_groups()
-    {
-        return EE_Registry::instance()->load_model('Question_Group')->get_all(
-            array(
-                array('QSG_deleted' => false),
-                'order_by' => array('QSG_order' => 'ASC'),
-            )
-        );
-    }
-
-
-
-    /**
-     * get_question_groups
-     *
-     * @param int $EVT_ID
-     * @return array|bool
-     * @throws \EE_Error
-     */
-    public function get_all_event_question_groups($EVT_ID = 0)
-    {
-        if (! isset($EVT_ID) || ! absint($EVT_ID)) {
-            EE_Error::add_error(
-                esc_html__(
-                    'An error occurred. No Event Question Groups could be retrieved because an Event ID was not received.',
-                    'event_espresso'
-                ),
-                __FILE__, __FUNCTION__, __LINE__
-            );
-            return false;
-        }
-        return EE_Registry::instance()->load_model('Event_Question_Group')->get_all(
-            array(
-                array('EVT_ID' => $EVT_ID),
-            )
-        );
-    }
-
-
-
-    /**
-     * get_question_groups
-     *
-     * @param int     $EVT_ID
-     * @param boolean $for_primary_attendee
-     * @return array|bool
-     * @throws \EE_Error
-     */
-    public function get_event_question_groups($EVT_ID = 0, $for_primary_attendee = true)
-    {
-        if (! isset($EVT_ID) || ! absint($EVT_ID)) {
-            EE_Error::add_error(
-                esc_html__(
-                    'An error occurred. No Event Question Groups could be retrieved because an Event ID was not received.',
-                    'event_espresso'
-                ),
-                __FILE__, __FUNCTION__, __LINE__
-            );
-            return false;
-        }
-        return EE_Registry::instance()->load_model('Event_Question_Group')->get_all(
-            array(
-                array(
-                    'EVT_ID'      => $EVT_ID,
-                    'EQG_primary' => $for_primary_attendee,
-                ),
-            )
-        );
-    }
-
-
-
-    /**
-     * get_question_groups
-     *
-     * @param int             $EVT_ID
-     * @param EE_Registration $registration
-     * @return array|bool
-     * @throws \EE_Error
-     */
-    public function get_question_groups_for_event($EVT_ID = 0, EE_Registration $registration)
-    {
-        if (! isset($EVT_ID) || ! absint($EVT_ID)) {
-            EE_Error::add_error(
-                esc_html__(
-                    'An error occurred. No Question Groups could be retrieved because an Event ID was not received.',
-                    'event_espresso'
-                ),
-                __FILE__, __FUNCTION__, __LINE__
-            );
-            return false;
-        }
-        $where_params = array(
-            'Event_Question_Group.EVT_ID'      => $EVT_ID,
-            'Event_Question_Group.EQG_primary' => $registration->count() === 1 ? true : false,
-            'QSG_deleted'                      => false,
-        );
-        return EE_Registry::instance()->load_model('Question_Group')->get_all(
-            array(
-                $where_params,
-                'order_by' => array('QSG_order' => 'ASC'),
-            )
-        );
-    }
-
-
-
-    /**
-     * get_question_target_db_column
-     *
-     * @param string $QSG_IDs csv list of $QSG IDs
-     * @return array|bool
-     * @throws \EE_Error
-     */
-    public function get_questions_in_groups($QSG_IDs = '')
-    {
-        if (empty($QSG_IDs)) {
-            EE_Error::add_error(
-                esc_html__('An error occurred. No Question Group IDs were received.', 'event_espresso'),
-                __FILE__, __FUNCTION__, __LINE__
-            );
-            return false;
-        }
-        return EE_Registry::instance()->load_model('Question')->get_all(
-            array(
-                array(
-                    'Question_Group.QSG_ID' => array('IN', $QSG_IDs),
-                    'QST_deleted'           => false,
-                    'QST_admin_only'        => is_admin(),
-                ),
-                'order_by' => 'QST_order',
-            )
-        );
-    }
-
-
-
-    /**
-     * get_options_for_question
-     *
-     * @param string $QST_IDs csv list of $QST IDs
-     * @return array|bool
-     * @throws \EE_Error
-     */
-    public function get_options_for_question($QST_IDs)
-    {
-        if (empty($QST_IDs)) {
-            EE_Error::add_error(
-                esc_html__('An error occurred. No Question IDs were received.', 'event_espresso'),
-                __FILE__, __FUNCTION__, __LINE__
-            );
-            return false;
-        }
-        return EE_Registry::instance()->load_model('Question_Option')->get_all(
-            array(
-                array(
-                    'Question.QST_ID' => array('IN', $QST_IDs),
-                    'QSO_deleted'     => false,
-                ),
-                'order_by' => 'QSO_ID',
-            )
-        );
-    }
-
-
-
-
-
-
-
-    /**
-     * Gets all events that are published
-     * and have event start time earlier than now and an event end time later than now
-     *
-     * @param  array $query_params An array of query params to further filter on
-     *                             (note that status and DTT_EVT_start and DTT_EVT_end will be overridden)
-     * @param bool   $count        whether to return the count or not (default FALSE)
-     * @return EE_Event[]|int
-     * @throws \EE_Error
-     */
-    public function get_active_events($query_params, $count = false)
-    {
-        if (array_key_exists(0, $query_params)) {
-            $where_params = $query_params[0];
-            unset($query_params[0]);
-        } else {
-            $where_params = array();
-        }
-        // if we have count make sure we don't include group by
-        if ($count && isset($query_params['group_by'])) {
-            unset($query_params['group_by']);
-        }
-        // let's add specific query_params for active_events
-        // keep in mind this will override any sent status in the query AND any date queries.
-        $where_params['status'] = array('IN', array('publish', EEM_Event::sold_out));
-        //if already have where params for DTT_EVT_start or DTT_EVT_end then append these conditions
-        if (isset($where_params['Datetime.DTT_EVT_start'])) {
-            $where_params['Datetime.DTT_EVT_start******'] = array(
-                '<',
-                EEM_Datetime::instance()->current_time_for_query('DTT_EVT_start'),
-            );
-        } else {
-            $where_params['Datetime.DTT_EVT_start'] = array(
-                '<',
-                EEM_Datetime::instance()->current_time_for_query('DTT_EVT_start'),
-            );
-        }
-        if (isset($where_params['Datetime.DTT_EVT_end'])) {
-            $where_params['Datetime.DTT_EVT_end*****'] = array(
-                '>',
-                EEM_Datetime::instance()->current_time_for_query('DTT_EVT_end'),
-            );
-        } else {
-            $where_params['Datetime.DTT_EVT_end'] = array(
-                '>',
-                EEM_Datetime::instance()->current_time_for_query('DTT_EVT_end'),
-            );
-        }
-        $query_params[0] = $where_params;
-        // don't use $query_params with count()
-        // because we don't want to include additional query clauses like "GROUP BY"
-        return $count
-            ? $this->count(array($where_params), 'EVT_ID', true)
-            : $this->get_all($query_params);
-    }
-
-
-
-    /**
-     * get all events that are published and have an event start time later than now
-     *
-     * @param  array $query_params An array of query params to further filter on
-     *                             (Note that status and DTT_EVT_start will be overridden)
-     * @param bool   $count        whether to return the count or not (default FALSE)
-     * @return EE_Event[]|int
-     * @throws \EE_Error
-     */
-    public function get_upcoming_events($query_params, $count = false)
-    {
-        if (array_key_exists(0, $query_params)) {
-            $where_params = $query_params[0];
-            unset($query_params[0]);
-        } else {
-            $where_params = array();
-        }
-        // if we have count make sure we don't include group by
-        if ($count && isset($query_params['group_by'])) {
-            unset($query_params['group_by']);
-        }
-        // let's add specific query_params for active_events
-        // keep in mind this will override any sent status in the query AND any date queries.
-        $where_params['status'] = array('IN', array('publish', EEM_Event::sold_out));
-        // if there are already query_params matching DTT_EVT_start then we need to modify that to add them.
-        if (isset($where_params['Datetime.DTT_EVT_start'])) {
-            $where_params['Datetime.DTT_EVT_start*****'] = array(
-                '>',
-                EEM_Datetime::instance()->current_time_for_query('DTT_EVT_start'),
-            );
-        } else {
-            $where_params['Datetime.DTT_EVT_start'] = array(
-                '>',
-                EEM_Datetime::instance()->current_time_for_query('DTT_EVT_start'),
-            );
-        }
-        $query_params[0] = $where_params;
-        // don't use $query_params with count()
-        // because we don't want to include additional query clauses like "GROUP BY"
-        return $count
-            ? $this->count(array($where_params), 'EVT_ID', true)
-            : $this->get_all($query_params);
-    }
-
-
-
-    /**
-     * Gets all events that are published
-     * and have an event end time later than now
-     *
-     * @param  array $query_params An array of query params to further filter on
-     *                             (note that status and DTT_EVT_end will be overridden)
-     * @param bool   $count        whether to return the count or not (default FALSE)
-     * @return EE_Event[]|int
-     * @throws \EE_Error
-     */
-    public function get_active_and_upcoming_events($query_params, $count = false)
-    {
-        if (array_key_exists(0, $query_params)) {
-            $where_params = $query_params[0];
-            unset($query_params[0]);
-        } else {
-            $where_params = array();
-        }
-        // if we have count make sure we don't include group by
-        if ($count && isset($query_params['group_by'])) {
-            unset($query_params['group_by']);
-        }
-        // let's add specific query_params for active_events
-        // keep in mind this will override any sent status in the query AND any date queries.
-        $where_params['status'] = array('IN', array('publish', EEM_Event::sold_out));
-        // add where params for DTT_EVT_end
-        if (isset($where_params['Datetime.DTT_EVT_end'])) {
-            $where_params['Datetime.DTT_EVT_end*****'] = array(
-                '>',
-                EEM_Datetime::instance()->current_time_for_query('DTT_EVT_end'),
-            );
-        } else {
-            $where_params['Datetime.DTT_EVT_end'] = array(
-                '>',
-                EEM_Datetime::instance()->current_time_for_query('DTT_EVT_end'),
-            );
-        }
-        $query_params[0] = $where_params;
-        // don't use $query_params with count()
-        // because we don't want to include additional query clauses like "GROUP BY"
-        return $count
-            ? $this->count(array($where_params), 'EVT_ID', true)
-            : $this->get_all($query_params);
-    }
-
-
-
-    /**
-     * This only returns events that are expired.
-     * They may still be published but all their datetimes have expired.
-     *
-     * @param  array $query_params An array of query params to further filter on
-     *                             (note that status and DTT_EVT_end will be overridden)
-     * @param bool   $count        whether to return the count or not (default FALSE)
-     * @return EE_Event[]|int
-     * @throws \EE_Error
-     */
-    public function get_expired_events($query_params, $count = false)
-    {
-        $where_params = isset($query_params[0]) ? $query_params[0] : array();
-        // if we have count make sure we don't include group by
-        if ($count && isset($query_params['group_by'])) {
-            unset($query_params['group_by']);
-        }
-        // let's add specific query_params for active_events
-        // keep in mind this will override any sent status in the query AND any date queries.
-        if (isset($where_params['status'])) {
-            unset($where_params['status']);
-        }
-        $exclude_query = $query_params;
-        if (isset($exclude_query[0])) {
-            unset($exclude_query[0]);
-        }
-        $exclude_query[0] = array(
-            'Datetime.DTT_EVT_end' => array(
-                '>',
-                EEM_Datetime::instance()->current_time_for_query('DTT_EVT_end'),
-            ),
-        );
-        // first get all events that have datetimes where its not expired.
-        $event_ids = $this->_get_all_wpdb_results($exclude_query, OBJECT_K, 'Event_CPT.ID');
-        $event_ids = array_keys($event_ids);
-        // if we have any additional query_params, let's add them to the 'AND' condition
-        $and_condition = array(
-            'Datetime.DTT_EVT_end' => array('<', EEM_Datetime::instance()->current_time_for_query('DTT_EVT_end')),
-            'EVT_ID'               => array('NOT IN', $event_ids),
-        );
-        if (isset($where_params['OR'])) {
-            $and_condition['OR'] = $where_params['OR'];
-            unset($where_params['OR']);
-        }
-        if (isset($where_params['Datetime.DTT_EVT_end'])) {
-            $and_condition['Datetime.DTT_EVT_end****'] = $where_params['Datetime.DTT_EVT_end'];
-            unset($where_params['Datetime.DTT_EVT_end']);
-        }
-        if (isset($where_params['Datetime.DTT_EVT_start'])) {
-            $and_condition['Datetime.DTT_EVT_start'] = $where_params['Datetime.DTT_EVT_start'];
-            unset($where_params['Datetime.DTT_EVT_start']);
-        }
-        // merge remaining $where params with the and conditions.
-        $where_params['AND'] = array_merge($and_condition, $where_params);
-        $query_params[0] = $where_params;
-        // don't use $query_params with count()
-        // because we don't want to include additional query clauses like "GROUP BY"
-        return $count
-            ? $this->count(array($where_params), 'EVT_ID', true)
-            : $this->get_all($query_params);
-    }
-
-
-
-    /**
-     * This basically just returns the events that do not have the publish status.
-     *
-     * @param  array   $query_params An array of query params to further filter on
-     *                               (note that status will be overwritten)
-     * @param  boolean $count        whether to return the count or not (default FALSE)
-     * @return EE_Event[]|int
-     * @throws \EE_Error
-     */
-    public function get_inactive_events($query_params, $count = false)
-    {
-        $where_params = isset($query_params[0]) ? $query_params[0] : array();
-        // let's add in specific query_params for inactive events.
-        if (isset($where_params['status'])) {
-            unset($where_params['status']);
-        }
-        // if we have count make sure we don't include group by
-        if ($count && isset($query_params['group_by'])) {
-            unset($query_params['group_by']);
-        }
-        // if we have any additional query_params, let's add them to the 'AND' condition
-        $where_params['AND']['status'] = array('!=', 'publish');
-        if (isset($where_params['OR'])) {
-            $where_params['AND']['OR'] = $where_params['OR'];
-            unset($where_params['OR']);
-        }
-        if (isset($where_params['Datetime.DTT_EVT_end'])) {
-            $where_params['AND']['Datetime.DTT_EVT_end****'] = $where_params['Datetime.DTT_EVT_end'];
-            unset($where_params['Datetime.DTT_EVT_end']);
-        }
-        if (isset($where_params['Datetime.DTT_EVT_start'])) {
-            $where_params['AND']['Datetime.DTT_EVT_start'] = $where_params['Datetime.DTT_EVT_start'];
-            unset($where_params['Datetime.DTT_EVT_start']);
-        }
-        $query_params[0] = $where_params;
-        // don't use $query_params with count()
-        // because we don't want to include additional query clauses like "GROUP BY"
-        return $count
-            ? $this->count(array($where_params), 'EVT_ID', true)
-            : $this->get_all($query_params);
-    }
-
-
-
-    /**
-     * This is just injecting into the parent add_relationship_to so we do special handling on price relationships
-     * because we don't want to override any existing global default prices but instead insert NEW prices that get
-     * attached to the event. See parent for param descriptions
-     *
-     * @param        $id_or_obj
-     * @param        $other_model_id_or_obj
-     * @param string $relationName
-     * @param array  $where_query
-     * @return EE_Base_Class
-     * @throws EE_Error
-     */
-    public function add_relationship_to($id_or_obj, $other_model_id_or_obj, $relationName, $where_query = array())
-    {
-        if ($relationName === 'Price') {
-            //let's get the PRC object for the given ID to make sure that we aren't dealing with a default
-            $prc_chk = $this->get_related_model_obj($relationName)->ensure_is_obj($other_model_id_or_obj);
-            //if EVT_ID = 0, then this is a default
-            if ((int) $prc_chk->get('EVT_ID') === 0) {
-                //let's set the prc_id as 0 so we force an insert on the add_relation_to carried out by relation
-                $prc_chk->set('PRC_ID', 0);
-            }
-            //run parent
-            return parent::add_relationship_to($id_or_obj, $prc_chk, $relationName, $where_query);
-        }
-        //otherwise carry on as normal
-        return parent::add_relationship_to($id_or_obj, $other_model_id_or_obj, $relationName, $where_query);
-    }
-
-
-
-    /******************** DEPRECATED METHODS ********************/
-
-
-
-    /**
-     * _get_question_target_db_column
-     *
-     * @deprecated as of 4.8.32.rc.001. Instead consider using
-     *             EE_Registration_Custom_Questions_Form located in
-     *             admin_pages/registrations/form_sections/EE_Registration_Custom_Questions_Form.form.php
-     * @access     public
-     * @param    EE_Registration $registration (so existing answers for registration are included)
-     * @param    int             $EVT_ID       so all question groups are included for event (not just answers from
-     *                                         registration).
-     * @throws EE_Error
-     * @return    array
-     */
-    public function assemble_array_of_groups_questions_and_options(EE_Registration $registration, $EVT_ID = 0)
-    {
-        if (empty($EVT_ID)) {
-            throw new EE_Error(__('An error occurred. No EVT_ID is included.  Needed to know which question groups to retrieve.',
-                'event_espresso'));
-        }
-        $questions = array();
-        // get all question groups for event
-        $qgs = $this->get_question_groups_for_event($EVT_ID, $registration);
-        if (! empty($qgs)) {
-            foreach ($qgs as $qg) {
-                $qsts = $qg->questions();
-                $questions[$qg->ID()] = $qg->model_field_array();
-                $questions[$qg->ID()]['QSG_questions'] = array();
-                foreach ($qsts as $qst) {
-                    if ($qst->is_system_question()) {
-                        continue;
-                    }
-                    $answer = EEM_Answer::instance()->get_one(array(
-                        array(
-                            'QST_ID' => $qst->ID(),
-                            'REG_ID' => $registration->ID(),
-                        ),
-                    ));
-                    $answer = $answer instanceof EE_Answer ? $answer : EEM_Answer::instance()->create_default_object();
-                    $qst_name = $qstn_id = $qst->ID();
-                    $ans_id = $answer->ID();
-                    $qst_name = ! empty($ans_id) ? '[' . $qst_name . '][' . $ans_id . ']' : '[' . $qst_name . ']';
-                    $input_name = '';
-                    $input_id = sanitize_key($qst->display_text());
-                    $input_class = '';
-                    $questions[$qg->ID()]['QSG_questions'][$qst->ID()] = $qst->model_field_array();
-                    $questions[$qg->ID()]['QSG_questions'][$qst->ID()]['QST_input_name'] = 'qstn'
-                                                                                           . $input_name
-                                                                                           . $qst_name;
-                    $questions[$qg->ID()]['QSG_questions'][$qst->ID()]['QST_input_id'] = $input_id . '-' . $qstn_id;
-                    $questions[$qg->ID()]['QSG_questions'][$qst->ID()]['QST_input_class'] = $input_class;
-                    $questions[$qg->ID()]['QSG_questions'][$qst->ID()]['QST_options'] = array();
-                    $questions[$qg->ID()]['QSG_questions'][$qst->ID()]['qst_obj'] = $qst;
-                    $questions[$qg->ID()]['QSG_questions'][$qst->ID()]['ans_obj'] = $answer;
-                    //leave responses as-is, don't convert stuff into html entities please!
-                    $questions[$qg->ID()]['QSG_questions'][$qst->ID()]['htmlentities'] = false;
-                    if ($qst->type() == 'RADIO_BTN' || $qst->type() == 'CHECKBOX' || $qst->type() == 'DROPDOWN') {
-                        $QSOs = $qst->options(true, $answer->value());
-                        if (is_array($QSOs)) {
-                            foreach ($QSOs as $QSO_ID => $QSO) {
-                                $questions[$qg->ID()]['QSG_questions'][$qst->ID()]['QST_options'][$QSO_ID] = $QSO->model_field_array();
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return $questions;
-    }
+	/**
+	 * constant used by status(), indicating that no more tickets can be purchased for any of the datetimes for the
+	 * event
+	 */
+	const sold_out = 'sold_out';
+
+	/**
+	 * constant used by status(), indicating that upcoming event dates have been postponed (may be pushed to a later
+	 * date)
+	 */
+	const postponed = 'postponed';
+
+	/**
+	 * constant used by status(), indicating that the event will no longer occur
+	 */
+	const cancelled = 'cancelled';
+
+
+	/**
+	 * @var string
+	 */
+	protected static $_default_reg_status;
+
+
+	/**
+	 * This is the default for the additional limit field.
+	 * @var int
+	 */
+	protected static $_default_additional_limit = 10;
+
+
+	/**
+	 * private instance of the Event object
+	 *
+	 * @var EEM_Event
+	 */
+	protected static $_instance;
+
+
+
+
+	/**
+	 * Adds a relationship to Term_Taxonomy for each CPT_Base
+	 *
+	 * @param string $timezone
+	 * @throws \EE_Error
+	 */
+	protected function __construct($timezone = null)
+	{
+		EE_Registry::instance()->load_model('Registration');
+		$this->singular_item = esc_html__('Event', 'event_espresso');
+		$this->plural_item = esc_html__('Events', 'event_espresso');
+		// to remove Cancelled events from the frontend, copy the following filter to your functions.php file
+		// add_filter( 'AFEE__EEM_Event__construct___custom_stati__cancelled__Public', '__return_false' );
+		// to remove Postponed events from the frontend, copy the following filter to your functions.php file
+		// add_filter( 'AFEE__EEM_Event__construct___custom_stati__postponed__Public', '__return_false' );
+		// to remove Sold Out events from the frontend, copy the following filter to your functions.php file
+		//	add_filter( 'AFEE__EEM_Event__construct___custom_stati__sold_out__Public', '__return_false' );
+		$this->_custom_stati = apply_filters(
+			'AFEE__EEM_Event__construct___custom_stati',
+			array(
+				EEM_Event::cancelled => array(
+					'label'  => esc_html__('Cancelled', 'event_espresso'),
+					'public' => apply_filters('AFEE__EEM_Event__construct___custom_stati__cancelled__Public', true),
+				),
+				EEM_Event::postponed => array(
+					'label'  => esc_html__('Postponed', 'event_espresso'),
+					'public' => apply_filters('AFEE__EEM_Event__construct___custom_stati__postponed__Public', true),
+				),
+				EEM_Event::sold_out  => array(
+					'label'  => esc_html__('Sold Out', 'event_espresso'),
+					'public' => apply_filters('AFEE__EEM_Event__construct___custom_stati__sold_out__Public', true),
+				),
+			)
+		);
+		self::$_default_reg_status = empty(self::$_default_reg_status) ? EEM_Registration::status_id_pending_payment
+			: self::$_default_reg_status;
+		$this->_tables = array(
+			'Event_CPT'  => new EE_Primary_Table('posts', 'ID'),
+			'Event_Meta' => new EE_Secondary_Table('esp_event_meta', 'EVTM_ID', 'EVT_ID'),
+		);
+		$this->_fields = array(
+			'Event_CPT'  => array(
+				'EVT_ID'         => new EE_Primary_Key_Int_Field('ID',
+					esc_html__('Post ID for Event', 'event_espresso')),
+				'EVT_name'       => new EE_Plain_Text_Field('post_title', esc_html__('Event Name', 'event_espresso'),
+					false,
+					''),
+				'EVT_desc'       => new EE_Post_Content_Field('post_content',
+					esc_html__('Event Description', 'event_espresso'),
+					false, ''),
+				'EVT_slug'       => new EE_Slug_Field('post_name', esc_html__('Event Slug', 'event_espresso'), false,
+					''),
+				'EVT_created'    => new EE_Datetime_Field('post_date',
+					esc_html__('Date/Time Event Created', 'event_espresso'),
+					false, EE_Datetime_Field::now),
+				'EVT_short_desc' => new EE_Simple_HTML_Field('post_excerpt',
+					esc_html__('Event Short Description', 'event_espresso'), false, ''),
+				'EVT_modified'   => new EE_Datetime_Field('post_modified',
+					esc_html__('Date/Time Event Modified', 'event_espresso'), false, EE_Datetime_Field::now),
+				'EVT_wp_user'    => new EE_WP_User_Field('post_author',
+					esc_html__('Event Creator ID', 'event_espresso'),
+					false),
+				'parent'         => new EE_Integer_Field('post_parent', esc_html__('Event Parent ID', 'event_espresso'),
+					false,
+					0),
+				'EVT_order'      => new EE_Integer_Field('menu_order', esc_html__('Event Menu Order', 'event_espresso'),
+					false,
+					1),
+				'post_type'      => new EE_WP_Post_Type_Field('espresso_events'),
+				// EE_Plain_Text_Field( 'post_type', esc_html__( 'Event Post Type', 'event_espresso' ), FALSE, 'espresso_events' ),
+				'status'         => new EE_WP_Post_Status_Field('post_status',
+					esc_html__('Event Status', 'event_espresso'),
+					false, 'draft', $this->_custom_stati),
+			),
+			'Event_Meta' => array(
+				'EVTM_ID'                         => new EE_DB_Only_Float_Field('EVTM_ID',
+					esc_html__('Event Meta Row ID', 'event_espresso'), false),
+				'EVT_ID_fk'                       => new EE_DB_Only_Int_Field('EVT_ID',
+					esc_html__('Foreign key to Event ID from Event Meta table', 'event_espresso'), false),
+				'EVT_display_desc'                => new EE_Boolean_Field('EVT_display_desc',
+					esc_html__('Display Description Flag', 'event_espresso'), false, 1),
+				'EVT_display_ticket_selector'     => new EE_Boolean_Field('EVT_display_ticket_selector',
+					esc_html__('Display Ticket Selector Flag', 'event_espresso'), false, 1),
+				'EVT_visible_on'                  => new EE_Datetime_Field('EVT_visible_on',
+					esc_html__('Event Visible Date', 'event_espresso'), true, EE_Datetime_Field::now),
+				'EVT_additional_limit'            => new EE_Integer_Field(
+					'EVT_additional_limit',
+					esc_html__('Limit of Additional Registrations on Same Transaction', 'event_espresso'),
+					true,
+					self::$_default_additional_limit
+				),
+				'EVT_default_registration_status' => new EE_Enum_Text_Field(
+					'EVT_default_registration_status',
+					esc_html__('Default Registration Status on this Event', 'event_espresso'), false,
+					EEM_Event::$_default_reg_status, EEM_Registration::reg_status_array()
+				),
+				'EVT_member_only'                 => new EE_Boolean_Field('EVT_member_only',
+					esc_html__('Member-Only Event Flag', 'event_espresso'), false, false),
+				'EVT_phone'                       => new EE_Plain_Text_Field('EVT_phone',
+					esc_html__('Event Phone Number', 'event_espresso'), false,''),
+				'EVT_allow_overflow'              => new EE_Boolean_Field('EVT_allow_overflow',
+					esc_html__('Allow Overflow on Event', 'event_espresso'), false, false),
+				'EVT_timezone_string'             => new EE_Plain_Text_Field('EVT_timezone_string',
+					esc_html__('Timezone (name) for Event times', 'event_espresso'), false,''),
+				'EVT_external_URL'                => new EE_Plain_Text_Field('EVT_external_URL',
+					esc_html__('URL of Event Page if hosted elsewhere', 'event_espresso'), true),
+				'EVT_donations'                   => new EE_Boolean_Field('EVT_donations',
+					esc_html__('Accept Donations?', 'event_espresso'), false, false),
+			),
+		);
+		$this->_model_relations = array(
+			'Registration'           => new EE_Has_Many_Relation(),
+			'Datetime'               => new EE_Has_Many_Relation(),
+			'Question_Group'         => new EE_HABTM_Relation('Event_Question_Group'),
+			'Venue'                  => new EE_HABTM_Relation('Event_Venue'),
+			'Term_Relationship'      => new EE_Has_Many_Relation(),
+			'Term_Taxonomy'          => new EE_HABTM_Relation('Term_Relationship'),
+			'Message_Template_Group' => new EE_HABTM_Relation('Event_Message_Template'),
+			'Attendee'               => new EE_HABTM_Relation('Registration'),
+			'WP_User'                => new EE_Belongs_To_Relation(),
+		);
+		//this model is generally available for reading
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
+		parent::__construct($timezone);
+	}
+
+
+
+	/**
+	 * @param string $default_reg_status
+	 */
+	public static function set_default_reg_status($default_reg_status)
+	{
+		self::$_default_reg_status = $default_reg_status;
+		// if EEM_Event has already been instantiated,
+		// then we need to reset the `EVT_default_reg_status` field to use the new default.
+		if (self::$_instance instanceof EEM_Event) {
+			$default_reg_status = new EE_Enum_Text_Field(
+				'EVT_default_registration_status',
+				esc_html__('Default Registration Status on this Event', 'event_espresso'),
+				false,
+				$default_reg_status,
+				EEM_Registration::reg_status_array()
+			);
+			$default_reg_status->_construct_finalize(
+				'Event_Meta',
+				'EVT_default_registration_status',
+				'EEM_Event'
+			);
+			self::$_instance->_fields['Event_Meta']['EVT_default_registration_status'] = $default_reg_status;
+		}
+	}
+
+
+	/**
+	 * Used to override the default for the additional limit field.
+	 * @param $additional_limit
+	 */
+	public static function set_default_additional_limit($additional_limit)
+	{
+		self::$_default_additional_limit = (int) $additional_limit;
+		if (self::$_instance instanceof EEM_Event) {
+			self::$_instance->_fields['Event_Meta']['EVT_additional_limit'] = new EE_Integer_Field(
+				'EVT_additional_limit',
+				__('Limit of Additional Registrations on Same Transaction', 'event_espresso'),
+				true,
+				self::$_default_additional_limit
+			);
+			self::$_instance->_fields['Event_Meta']['EVT_additional_limit']->_construct_finalize(
+				'Event_Meta',
+				'EVT_additional_limit',
+				'EEM_Event'
+			);
+		}
+	}
+
+
+	/**
+	 * Return what is currently set as the default additional limit for the event.
+	 * @return int
+	 */
+	public static function get_default_additional_limit()
+	{
+		return apply_filters('FHEE__EEM_Event__get_default_additional_limit', self::$_default_additional_limit);
+	}
+
+
+	/**
+	 * get_question_groups
+	 *
+	 * @return array
+	 * @throws \EE_Error
+	 */
+	public function get_all_question_groups()
+	{
+		return EE_Registry::instance()->load_model('Question_Group')->get_all(
+			array(
+				array('QSG_deleted' => false),
+				'order_by' => array('QSG_order' => 'ASC'),
+			)
+		);
+	}
+
+
+
+	/**
+	 * get_question_groups
+	 *
+	 * @param int $EVT_ID
+	 * @return array|bool
+	 * @throws \EE_Error
+	 */
+	public function get_all_event_question_groups($EVT_ID = 0)
+	{
+		if (! isset($EVT_ID) || ! absint($EVT_ID)) {
+			EE_Error::add_error(
+				esc_html__(
+					'An error occurred. No Event Question Groups could be retrieved because an Event ID was not received.',
+					'event_espresso'
+				),
+				__FILE__, __FUNCTION__, __LINE__
+			);
+			return false;
+		}
+		return EE_Registry::instance()->load_model('Event_Question_Group')->get_all(
+			array(
+				array('EVT_ID' => $EVT_ID),
+			)
+		);
+	}
+
+
+
+	/**
+	 * get_question_groups
+	 *
+	 * @param int     $EVT_ID
+	 * @param boolean $for_primary_attendee
+	 * @return array|bool
+	 * @throws \EE_Error
+	 */
+	public function get_event_question_groups($EVT_ID = 0, $for_primary_attendee = true)
+	{
+		if (! isset($EVT_ID) || ! absint($EVT_ID)) {
+			EE_Error::add_error(
+				esc_html__(
+					'An error occurred. No Event Question Groups could be retrieved because an Event ID was not received.',
+					'event_espresso'
+				),
+				__FILE__, __FUNCTION__, __LINE__
+			);
+			return false;
+		}
+		return EE_Registry::instance()->load_model('Event_Question_Group')->get_all(
+			array(
+				array(
+					'EVT_ID'      => $EVT_ID,
+					'EQG_primary' => $for_primary_attendee,
+				),
+			)
+		);
+	}
+
+
+
+	/**
+	 * get_question_groups
+	 *
+	 * @param int             $EVT_ID
+	 * @param EE_Registration $registration
+	 * @return array|bool
+	 * @throws \EE_Error
+	 */
+	public function get_question_groups_for_event($EVT_ID = 0, EE_Registration $registration)
+	{
+		if (! isset($EVT_ID) || ! absint($EVT_ID)) {
+			EE_Error::add_error(
+				esc_html__(
+					'An error occurred. No Question Groups could be retrieved because an Event ID was not received.',
+					'event_espresso'
+				),
+				__FILE__, __FUNCTION__, __LINE__
+			);
+			return false;
+		}
+		$where_params = array(
+			'Event_Question_Group.EVT_ID'      => $EVT_ID,
+			'Event_Question_Group.EQG_primary' => $registration->count() === 1 ? true : false,
+			'QSG_deleted'                      => false,
+		);
+		return EE_Registry::instance()->load_model('Question_Group')->get_all(
+			array(
+				$where_params,
+				'order_by' => array('QSG_order' => 'ASC'),
+			)
+		);
+	}
+
+
+
+	/**
+	 * get_question_target_db_column
+	 *
+	 * @param string $QSG_IDs csv list of $QSG IDs
+	 * @return array|bool
+	 * @throws \EE_Error
+	 */
+	public function get_questions_in_groups($QSG_IDs = '')
+	{
+		if (empty($QSG_IDs)) {
+			EE_Error::add_error(
+				esc_html__('An error occurred. No Question Group IDs were received.', 'event_espresso'),
+				__FILE__, __FUNCTION__, __LINE__
+			);
+			return false;
+		}
+		return EE_Registry::instance()->load_model('Question')->get_all(
+			array(
+				array(
+					'Question_Group.QSG_ID' => array('IN', $QSG_IDs),
+					'QST_deleted'           => false,
+					'QST_admin_only'        => is_admin(),
+				),
+				'order_by' => 'QST_order',
+			)
+		);
+	}
+
+
+
+	/**
+	 * get_options_for_question
+	 *
+	 * @param string $QST_IDs csv list of $QST IDs
+	 * @return array|bool
+	 * @throws \EE_Error
+	 */
+	public function get_options_for_question($QST_IDs)
+	{
+		if (empty($QST_IDs)) {
+			EE_Error::add_error(
+				esc_html__('An error occurred. No Question IDs were received.', 'event_espresso'),
+				__FILE__, __FUNCTION__, __LINE__
+			);
+			return false;
+		}
+		return EE_Registry::instance()->load_model('Question_Option')->get_all(
+			array(
+				array(
+					'Question.QST_ID' => array('IN', $QST_IDs),
+					'QSO_deleted'     => false,
+				),
+				'order_by' => 'QSO_ID',
+			)
+		);
+	}
+
+
+
+
+
+
+
+	/**
+	 * Gets all events that are published
+	 * and have event start time earlier than now and an event end time later than now
+	 *
+	 * @param  array $query_params An array of query params to further filter on
+	 *                             (note that status and DTT_EVT_start and DTT_EVT_end will be overridden)
+	 * @param bool   $count        whether to return the count or not (default FALSE)
+	 * @return EE_Event[]|int
+	 * @throws \EE_Error
+	 */
+	public function get_active_events($query_params, $count = false)
+	{
+		if (array_key_exists(0, $query_params)) {
+			$where_params = $query_params[0];
+			unset($query_params[0]);
+		} else {
+			$where_params = array();
+		}
+		// if we have count make sure we don't include group by
+		if ($count && isset($query_params['group_by'])) {
+			unset($query_params['group_by']);
+		}
+		// let's add specific query_params for active_events
+		// keep in mind this will override any sent status in the query AND any date queries.
+		$where_params['status'] = array('IN', array('publish', EEM_Event::sold_out));
+		//if already have where params for DTT_EVT_start or DTT_EVT_end then append these conditions
+		if (isset($where_params['Datetime.DTT_EVT_start'])) {
+			$where_params['Datetime.DTT_EVT_start******'] = array(
+				'<',
+				EEM_Datetime::instance()->current_time_for_query('DTT_EVT_start'),
+			);
+		} else {
+			$where_params['Datetime.DTT_EVT_start'] = array(
+				'<',
+				EEM_Datetime::instance()->current_time_for_query('DTT_EVT_start'),
+			);
+		}
+		if (isset($where_params['Datetime.DTT_EVT_end'])) {
+			$where_params['Datetime.DTT_EVT_end*****'] = array(
+				'>',
+				EEM_Datetime::instance()->current_time_for_query('DTT_EVT_end'),
+			);
+		} else {
+			$where_params['Datetime.DTT_EVT_end'] = array(
+				'>',
+				EEM_Datetime::instance()->current_time_for_query('DTT_EVT_end'),
+			);
+		}
+		$query_params[0] = $where_params;
+		// don't use $query_params with count()
+		// because we don't want to include additional query clauses like "GROUP BY"
+		return $count
+			? $this->count(array($where_params), 'EVT_ID', true)
+			: $this->get_all($query_params);
+	}
+
+
+
+	/**
+	 * get all events that are published and have an event start time later than now
+	 *
+	 * @param  array $query_params An array of query params to further filter on
+	 *                             (Note that status and DTT_EVT_start will be overridden)
+	 * @param bool   $count        whether to return the count or not (default FALSE)
+	 * @return EE_Event[]|int
+	 * @throws \EE_Error
+	 */
+	public function get_upcoming_events($query_params, $count = false)
+	{
+		if (array_key_exists(0, $query_params)) {
+			$where_params = $query_params[0];
+			unset($query_params[0]);
+		} else {
+			$where_params = array();
+		}
+		// if we have count make sure we don't include group by
+		if ($count && isset($query_params['group_by'])) {
+			unset($query_params['group_by']);
+		}
+		// let's add specific query_params for active_events
+		// keep in mind this will override any sent status in the query AND any date queries.
+		$where_params['status'] = array('IN', array('publish', EEM_Event::sold_out));
+		// if there are already query_params matching DTT_EVT_start then we need to modify that to add them.
+		if (isset($where_params['Datetime.DTT_EVT_start'])) {
+			$where_params['Datetime.DTT_EVT_start*****'] = array(
+				'>',
+				EEM_Datetime::instance()->current_time_for_query('DTT_EVT_start'),
+			);
+		} else {
+			$where_params['Datetime.DTT_EVT_start'] = array(
+				'>',
+				EEM_Datetime::instance()->current_time_for_query('DTT_EVT_start'),
+			);
+		}
+		$query_params[0] = $where_params;
+		// don't use $query_params with count()
+		// because we don't want to include additional query clauses like "GROUP BY"
+		return $count
+			? $this->count(array($where_params), 'EVT_ID', true)
+			: $this->get_all($query_params);
+	}
+
+
+
+	/**
+	 * Gets all events that are published
+	 * and have an event end time later than now
+	 *
+	 * @param  array $query_params An array of query params to further filter on
+	 *                             (note that status and DTT_EVT_end will be overridden)
+	 * @param bool   $count        whether to return the count or not (default FALSE)
+	 * @return EE_Event[]|int
+	 * @throws \EE_Error
+	 */
+	public function get_active_and_upcoming_events($query_params, $count = false)
+	{
+		if (array_key_exists(0, $query_params)) {
+			$where_params = $query_params[0];
+			unset($query_params[0]);
+		} else {
+			$where_params = array();
+		}
+		// if we have count make sure we don't include group by
+		if ($count && isset($query_params['group_by'])) {
+			unset($query_params['group_by']);
+		}
+		// let's add specific query_params for active_events
+		// keep in mind this will override any sent status in the query AND any date queries.
+		$where_params['status'] = array('IN', array('publish', EEM_Event::sold_out));
+		// add where params for DTT_EVT_end
+		if (isset($where_params['Datetime.DTT_EVT_end'])) {
+			$where_params['Datetime.DTT_EVT_end*****'] = array(
+				'>',
+				EEM_Datetime::instance()->current_time_for_query('DTT_EVT_end'),
+			);
+		} else {
+			$where_params['Datetime.DTT_EVT_end'] = array(
+				'>',
+				EEM_Datetime::instance()->current_time_for_query('DTT_EVT_end'),
+			);
+		}
+		$query_params[0] = $where_params;
+		// don't use $query_params with count()
+		// because we don't want to include additional query clauses like "GROUP BY"
+		return $count
+			? $this->count(array($where_params), 'EVT_ID', true)
+			: $this->get_all($query_params);
+	}
+
+
+
+	/**
+	 * This only returns events that are expired.
+	 * They may still be published but all their datetimes have expired.
+	 *
+	 * @param  array $query_params An array of query params to further filter on
+	 *                             (note that status and DTT_EVT_end will be overridden)
+	 * @param bool   $count        whether to return the count or not (default FALSE)
+	 * @return EE_Event[]|int
+	 * @throws \EE_Error
+	 */
+	public function get_expired_events($query_params, $count = false)
+	{
+		$where_params = isset($query_params[0]) ? $query_params[0] : array();
+		// if we have count make sure we don't include group by
+		if ($count && isset($query_params['group_by'])) {
+			unset($query_params['group_by']);
+		}
+		// let's add specific query_params for active_events
+		// keep in mind this will override any sent status in the query AND any date queries.
+		if (isset($where_params['status'])) {
+			unset($where_params['status']);
+		}
+		$exclude_query = $query_params;
+		if (isset($exclude_query[0])) {
+			unset($exclude_query[0]);
+		}
+		$exclude_query[0] = array(
+			'Datetime.DTT_EVT_end' => array(
+				'>',
+				EEM_Datetime::instance()->current_time_for_query('DTT_EVT_end'),
+			),
+		);
+		// first get all events that have datetimes where its not expired.
+		$event_ids = $this->_get_all_wpdb_results($exclude_query, OBJECT_K, 'Event_CPT.ID');
+		$event_ids = array_keys($event_ids);
+		// if we have any additional query_params, let's add them to the 'AND' condition
+		$and_condition = array(
+			'Datetime.DTT_EVT_end' => array('<', EEM_Datetime::instance()->current_time_for_query('DTT_EVT_end')),
+			'EVT_ID'               => array('NOT IN', $event_ids),
+		);
+		if (isset($where_params['OR'])) {
+			$and_condition['OR'] = $where_params['OR'];
+			unset($where_params['OR']);
+		}
+		if (isset($where_params['Datetime.DTT_EVT_end'])) {
+			$and_condition['Datetime.DTT_EVT_end****'] = $where_params['Datetime.DTT_EVT_end'];
+			unset($where_params['Datetime.DTT_EVT_end']);
+		}
+		if (isset($where_params['Datetime.DTT_EVT_start'])) {
+			$and_condition['Datetime.DTT_EVT_start'] = $where_params['Datetime.DTT_EVT_start'];
+			unset($where_params['Datetime.DTT_EVT_start']);
+		}
+		// merge remaining $where params with the and conditions.
+		$where_params['AND'] = array_merge($and_condition, $where_params);
+		$query_params[0] = $where_params;
+		// don't use $query_params with count()
+		// because we don't want to include additional query clauses like "GROUP BY"
+		return $count
+			? $this->count(array($where_params), 'EVT_ID', true)
+			: $this->get_all($query_params);
+	}
+
+
+
+	/**
+	 * This basically just returns the events that do not have the publish status.
+	 *
+	 * @param  array   $query_params An array of query params to further filter on
+	 *                               (note that status will be overwritten)
+	 * @param  boolean $count        whether to return the count or not (default FALSE)
+	 * @return EE_Event[]|int
+	 * @throws \EE_Error
+	 */
+	public function get_inactive_events($query_params, $count = false)
+	{
+		$where_params = isset($query_params[0]) ? $query_params[0] : array();
+		// let's add in specific query_params for inactive events.
+		if (isset($where_params['status'])) {
+			unset($where_params['status']);
+		}
+		// if we have count make sure we don't include group by
+		if ($count && isset($query_params['group_by'])) {
+			unset($query_params['group_by']);
+		}
+		// if we have any additional query_params, let's add them to the 'AND' condition
+		$where_params['AND']['status'] = array('!=', 'publish');
+		if (isset($where_params['OR'])) {
+			$where_params['AND']['OR'] = $where_params['OR'];
+			unset($where_params['OR']);
+		}
+		if (isset($where_params['Datetime.DTT_EVT_end'])) {
+			$where_params['AND']['Datetime.DTT_EVT_end****'] = $where_params['Datetime.DTT_EVT_end'];
+			unset($where_params['Datetime.DTT_EVT_end']);
+		}
+		if (isset($where_params['Datetime.DTT_EVT_start'])) {
+			$where_params['AND']['Datetime.DTT_EVT_start'] = $where_params['Datetime.DTT_EVT_start'];
+			unset($where_params['Datetime.DTT_EVT_start']);
+		}
+		$query_params[0] = $where_params;
+		// don't use $query_params with count()
+		// because we don't want to include additional query clauses like "GROUP BY"
+		return $count
+			? $this->count(array($where_params), 'EVT_ID', true)
+			: $this->get_all($query_params);
+	}
+
+
+
+	/**
+	 * This is just injecting into the parent add_relationship_to so we do special handling on price relationships
+	 * because we don't want to override any existing global default prices but instead insert NEW prices that get
+	 * attached to the event. See parent for param descriptions
+	 *
+	 * @param        $id_or_obj
+	 * @param        $other_model_id_or_obj
+	 * @param string $relationName
+	 * @param array  $where_query
+	 * @return EE_Base_Class
+	 * @throws EE_Error
+	 */
+	public function add_relationship_to($id_or_obj, $other_model_id_or_obj, $relationName, $where_query = array())
+	{
+		if ($relationName === 'Price') {
+			//let's get the PRC object for the given ID to make sure that we aren't dealing with a default
+			$prc_chk = $this->get_related_model_obj($relationName)->ensure_is_obj($other_model_id_or_obj);
+			//if EVT_ID = 0, then this is a default
+			if ((int) $prc_chk->get('EVT_ID') === 0) {
+				//let's set the prc_id as 0 so we force an insert on the add_relation_to carried out by relation
+				$prc_chk->set('PRC_ID', 0);
+			}
+			//run parent
+			return parent::add_relationship_to($id_or_obj, $prc_chk, $relationName, $where_query);
+		}
+		//otherwise carry on as normal
+		return parent::add_relationship_to($id_or_obj, $other_model_id_or_obj, $relationName, $where_query);
+	}
+
+
+
+	/******************** DEPRECATED METHODS ********************/
+
+
+
+	/**
+	 * _get_question_target_db_column
+	 *
+	 * @deprecated as of 4.8.32.rc.001. Instead consider using
+	 *             EE_Registration_Custom_Questions_Form located in
+	 *             admin_pages/registrations/form_sections/EE_Registration_Custom_Questions_Form.form.php
+	 * @access     public
+	 * @param    EE_Registration $registration (so existing answers for registration are included)
+	 * @param    int             $EVT_ID       so all question groups are included for event (not just answers from
+	 *                                         registration).
+	 * @throws EE_Error
+	 * @return    array
+	 */
+	public function assemble_array_of_groups_questions_and_options(EE_Registration $registration, $EVT_ID = 0)
+	{
+		if (empty($EVT_ID)) {
+			throw new EE_Error(__('An error occurred. No EVT_ID is included.  Needed to know which question groups to retrieve.',
+				'event_espresso'));
+		}
+		$questions = array();
+		// get all question groups for event
+		$qgs = $this->get_question_groups_for_event($EVT_ID, $registration);
+		if (! empty($qgs)) {
+			foreach ($qgs as $qg) {
+				$qsts = $qg->questions();
+				$questions[$qg->ID()] = $qg->model_field_array();
+				$questions[$qg->ID()]['QSG_questions'] = array();
+				foreach ($qsts as $qst) {
+					if ($qst->is_system_question()) {
+						continue;
+					}
+					$answer = EEM_Answer::instance()->get_one(array(
+						array(
+							'QST_ID' => $qst->ID(),
+							'REG_ID' => $registration->ID(),
+						),
+					));
+					$answer = $answer instanceof EE_Answer ? $answer : EEM_Answer::instance()->create_default_object();
+					$qst_name = $qstn_id = $qst->ID();
+					$ans_id = $answer->ID();
+					$qst_name = ! empty($ans_id) ? '[' . $qst_name . '][' . $ans_id . ']' : '[' . $qst_name . ']';
+					$input_name = '';
+					$input_id = sanitize_key($qst->display_text());
+					$input_class = '';
+					$questions[$qg->ID()]['QSG_questions'][$qst->ID()] = $qst->model_field_array();
+					$questions[$qg->ID()]['QSG_questions'][$qst->ID()]['QST_input_name'] = 'qstn'
+																						   . $input_name
+																						   . $qst_name;
+					$questions[$qg->ID()]['QSG_questions'][$qst->ID()]['QST_input_id'] = $input_id . '-' . $qstn_id;
+					$questions[$qg->ID()]['QSG_questions'][$qst->ID()]['QST_input_class'] = $input_class;
+					$questions[$qg->ID()]['QSG_questions'][$qst->ID()]['QST_options'] = array();
+					$questions[$qg->ID()]['QSG_questions'][$qst->ID()]['qst_obj'] = $qst;
+					$questions[$qg->ID()]['QSG_questions'][$qst->ID()]['ans_obj'] = $answer;
+					//leave responses as-is, don't convert stuff into html entities please!
+					$questions[$qg->ID()]['QSG_questions'][$qst->ID()]['htmlentities'] = false;
+					if ($qst->type() == 'RADIO_BTN' || $qst->type() == 'CHECKBOX' || $qst->type() == 'DROPDOWN') {
+						$QSOs = $qst->options(true, $answer->value());
+						if (is_array($QSOs)) {
+							foreach ($QSOs as $QSO_ID => $QSO) {
+								$questions[$qg->ID()]['QSG_questions'][$qst->ID()]['QST_options'][$QSO_ID] = $QSO->model_field_array();
+							}
+						}
+					}
+				}
+			}
+		}
+		return $questions;
+	}
 
 
 }

Spacing +10 added lines, -10 removed lines

@@ -1,9 +1,9 @@ 
 <?php use EventEspresso\core\services\orm\ModelFieldFactory;
 
-if (! defined('EVENT_ESPRESSO_VERSION')) {
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
     exit('No direct script access allowed');
 }
-require_once(EE_MODELS . 'EEM_CPT_Base.model.php');
+require_once(EE_MODELS.'EEM_CPT_Base.model.php');
 
 
 
@@ -158,11 +158,11 @@ 
                 'EVT_member_only'                 => new EE_Boolean_Field('EVT_member_only',
                     esc_html__('Member-Only Event Flag', 'event_espresso'), false, false),
                 'EVT_phone'                       => new EE_Plain_Text_Field('EVT_phone',
-                    esc_html__('Event Phone Number', 'event_espresso'), false,''),
+                    esc_html__('Event Phone Number', 'event_espresso'), false, ''),
                 'EVT_allow_overflow'              => new EE_Boolean_Field('EVT_allow_overflow',
                     esc_html__('Allow Overflow on Event', 'event_espresso'), false, false),
                 'EVT_timezone_string'             => new EE_Plain_Text_Field('EVT_timezone_string',
-                    esc_html__('Timezone (name) for Event times', 'event_espresso'), false,''),
+                    esc_html__('Timezone (name) for Event times', 'event_espresso'), false, ''),
                 'EVT_external_URL'                => new EE_Plain_Text_Field('EVT_external_URL',
                     esc_html__('URL of Event Page if hosted elsewhere', 'event_espresso'), true),
                 'EVT_donations'                   => new EE_Boolean_Field('EVT_donations',
@@ -273,7 +273,7 @@ 
      */
     public function get_all_event_question_groups($EVT_ID = 0)
     {
-        if (! isset($EVT_ID) || ! absint($EVT_ID)) {
+        if ( ! isset($EVT_ID) || ! absint($EVT_ID)) {
             EE_Error::add_error(
                 esc_html__(
                     'An error occurred. No Event Question Groups could be retrieved because an Event ID was not received.',
@@ -302,7 +302,7 @@ 
      */
     public function get_event_question_groups($EVT_ID = 0, $for_primary_attendee = true)
     {
-        if (! isset($EVT_ID) || ! absint($EVT_ID)) {
+        if ( ! isset($EVT_ID) || ! absint($EVT_ID)) {
             EE_Error::add_error(
                 esc_html__(
                     'An error occurred. No Event Question Groups could be retrieved because an Event ID was not received.',
@@ -334,7 +334,7 @@ 
      */
     public function get_question_groups_for_event($EVT_ID = 0, EE_Registration $registration)
     {
-        if (! isset($EVT_ID) || ! absint($EVT_ID)) {
+        if ( ! isset($EVT_ID) || ! absint($EVT_ID)) {
             EE_Error::add_error(
                 esc_html__(
                     'An error occurred. No Question Groups could be retrieved because an Event ID was not received.',
@@ -738,7 +738,7 @@ 
         $questions = array();
         // get all question groups for event
         $qgs = $this->get_question_groups_for_event($EVT_ID, $registration);
-        if (! empty($qgs)) {
+        if ( ! empty($qgs)) {
             foreach ($qgs as $qg) {
                 $qsts = $qg->questions();
                 $questions[$qg->ID()] = $qg->model_field_array();
@@ -756,7 +756,7 @@ 
                     $answer = $answer instanceof EE_Answer ? $answer : EEM_Answer::instance()->create_default_object();
                     $qst_name = $qstn_id = $qst->ID();
                     $ans_id = $answer->ID();
-                    $qst_name = ! empty($ans_id) ? '[' . $qst_name . '][' . $ans_id . ']' : '[' . $qst_name . ']';
+                    $qst_name = ! empty($ans_id) ? '['.$qst_name.']['.$ans_id.']' : '['.$qst_name.']';
                     $input_name = '';
                     $input_id = sanitize_key($qst->display_text());
                     $input_class = '';
@@ -764,7 +764,7 @@ 
                     $questions[$qg->ID()]['QSG_questions'][$qst->ID()]['QST_input_name'] = 'qstn'
                                                                                            . $input_name
                                                                                            . $qst_name;
-                    $questions[$qg->ID()]['QSG_questions'][$qst->ID()]['QST_input_id'] = $input_id . '-' . $qstn_id;
+                    $questions[$qg->ID()]['QSG_questions'][$qst->ID()]['QST_input_id'] = $input_id.'-'.$qstn_id;
                     $questions[$qg->ID()]['QSG_questions'][$qst->ID()]['QST_input_class'] = $input_class;
                     $questions[$qg->ID()]['QSG_questions'][$qst->ID()]['QST_options'] = array();
                     $questions[$qg->ID()]['QSG_questions'][$qst->ID()]['qst_obj'] = $qst;

core/services/orm/ModelFieldFactory.php

Doc Comments +4 added lines, -5 removed lines

@@ -132,7 +132,6 @@ 
     /**
      * @param string $table_column
      * @param string $nice_name
-     * @param string $timezone_string
      * @param bool   $nullable
      * @param string $default_value
      * @throws EE_Error
@@ -179,7 +178,7 @@ 
      * @param string $table_column
      * @param string $nice_name
      * @param bool   $nullable
-     * @param null   $default_value
+     * @param integer   $default_value
      * @return EE_DB_Only_Int_Field
      */
     public function createDbOnlyIntField($table_column, $nice_name, $nullable, $default_value = null)
@@ -295,7 +294,7 @@ 
      * @param string $table_column
      * @param string $nice_name
      * @param bool   $nullable
-     * @param null   $default_value
+     * @param integer   $default_value
      * @param string $model_name
      * @return EE_Foreign_Key_Int_Field
      */
@@ -313,7 +312,7 @@ 
      * @param string $table_column
      * @param string $nice_name
      * @param bool   $nullable
-     * @param null   $default_value
+     * @param string   $default_value
      * @param string $model_name
      * @return EE_Foreign_Key_String_Field
      */
@@ -564,7 +563,7 @@ 
      * @param string $table_column
      * @param string $nice_name
      * @param bool   $nullable
-     * @param mixed  $default_value
+     * @param string  $default_value
      * @param array  $values        If additional stati are to be used other than the default WP statuses,
      *                              then they can be registered via this property.
      *                              The format of the array should be as follows:

Unused Use Statements -3 removed lines

@@ -33,9 +33,6 @@
 use EE_WP_Post_Status_Field;
 use EE_WP_Post_Type_Field;
 use EE_WP_User_Field;
-use EventEspresso\core\exceptions\InvalidDataTypeException;
-use EventEspresso\core\exceptions\InvalidInterfaceException;
-use EventEspresso\core\services\loaders\LoaderFactory;
 use EventEspresso\core\services\loaders\LoaderInterface;
 use InvalidArgumentException;
 

Indentation +570 added lines, -570 removed lines

@@ -53,576 +53,576 @@
 class ModelFieldFactory
 {
 
-    /**
-     * @var LoaderInterface $loader
-     */
-    private $loader;
-
-
-
-    /**
-     * ModelFieldFactory constructor.
-     *
-     * @param LoaderInterface $loader
-     */
-    public function __construct(LoaderInterface $loader)
-    {
-        $this->loader = $loader;
-    }
-
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_All_Caps_Text_Field
-     */
-    public function createAllCapsTextField($table_column, $nice_name, $nullable, $default_value = null)
-    {
-        return $this->loader->getNew(
-            'EE_All_Caps_Text_Field',
-            array($table_column, $nice_name, $nullable, $default_value)
-        );
-    }
-
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @param string $model_name
-     * @return EE_Any_Foreign_Model_Name_Field
-     */
-    public function createAnyForeignModelNameField(
-        $table_column,
-        $nice_name,
-        $nullable,
-        $default_value = null,
-        $model_name
-    ) {
-        return $this->loader->getNew(
-            'EE_Any_Foreign_Model_Name_Field',
-            array($table_column, $nice_name, $nullable, $default_value, $model_name)
-        );
-    }
-
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_Boolean_Field
-     */
-    public function createBooleanField($table_column, $nice_name, $nullable, $default_value = null)
-    {
-        return $this->loader->getNew(
-            'EE_Boolean_Field',
-            array($table_column, $nice_name, $nullable, $default_value)
-        );
-    }
-
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param string $timezone_string
-     * @param bool   $nullable
-     * @param string $default_value
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @return EE_Datetime_Field
-     */
-    public function createDatetimeField(
-        $table_column,
-        $nice_name,
-        $nullable = false,
-        $default_value = EE_Datetime_Field::now
-    ) {
-        return $this->loader->getNew(
-            'EE_Datetime_Field',
-            array(
-                $table_column,
-                $nice_name,
-                $nullable,
-                $default_value
-            )
-        );
-    }
-
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_DB_Only_Float_Field
-     */
-    public function createDbOnlyFloatField($table_column, $nice_name, $nullable, $default_value = null)
-    {
-        return $this->loader->getNew(
-            'EE_DB_Only_Float_Field',
-            array($table_column, $nice_name, $nullable, $default_value)
-        );
-    }
-
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_DB_Only_Int_Field
-     */
-    public function createDbOnlyIntField($table_column, $nice_name, $nullable, $default_value = null)
-    {
-        return $this->loader->getNew(
-            'EE_DB_Only_Int_Field',
-            array($table_column, $nice_name, $nullable, $default_value)
-        );
-    }
-
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_DB_Only_Text_Field
-     */
-    public function createDbOnlyTextField($table_column, $nice_name, $nullable, $default_value = null)
-    {
-        return $this->loader->getNew(
-            'EE_DB_Only_Text_Field',
-            array($table_column, $nice_name, $nullable, $default_value)
-        );
-    }
-
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param string $default_value
-     * @return EE_Email_Field
-     */
-    public function createEmailField($table_column, $nice_name, $nullable = true, $default_value = '')
-    {
-        return $this->loader->getNew(
-            'EE_Email_Field',
-            array($table_column, $nice_name, $nullable, $default_value)
-        );
-    }
-
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @param array  $allowed_enum_values keys are values to be used in the DB,
-     *                                    values are how they should be displayed
-     * @return EE_Enum_Integer_Field
-     */
-    public function createEnumIntegerField(
-        $table_column,
-        $nice_name,
-        $nullable,
-        $default_value = null,
-        array $allowed_enum_values
-    ) {
-        return $this->loader->getNew(
-            'EE_Enum_Integer_Field',
-            array($table_column, $nice_name, $nullable, $default_value, $allowed_enum_values)
-        );
-    }
-
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @param array  $allowed_enum_values keys are values to be used in the DB,
-     *                                    values are how they should be displayed
-     * @return EE_Enum_Text_Field
-     */
-    public function createEnumTextField(
-        $table_column,
-        $nice_name,
-        $nullable,
-        $default_value,
-        array $allowed_enum_values
-    ) {
-        return $this->loader->getNew(
-            'EE_Enum_Text_Field',
-            array($table_column, $nice_name, $nullable, $default_value, $allowed_enum_values)
-        );
-    }
-
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_Float_Field
-     */
-    public function createFloatField($table_column, $nice_name, $nullable, $default_value = null)
-    {
-        return $this->loader->getNew(
-            'EE_Float_Field',
-            array($table_column, $nice_name, $nullable, $default_value)
-        );
-    }
-
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @param string $model_name
-     * @return EE_Foreign_Key_Int_Field
-     */
-    public function createForeignKeyIntField($table_column, $nice_name, $nullable, $default_value, $model_name)
-    {
-        return $this->loader->getNew(
-            'EE_Foreign_Key_Int_Field',
-            array($table_column, $nice_name, $nullable, $default_value, $model_name)
-        );
-    }
-
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @param string $model_name
-     * @return EE_Foreign_Key_String_Field
-     */
-    public function createForeignKeyStringField(
-        $table_column,
-        $nice_name,
-        $nullable,
-        $default_value,
-        $model_name
-    ) {
-        return $this->loader->getNew(
-            'EE_Foreign_Key_String_Field',
-            array($table_column, $nice_name, $nullable, $default_value, $model_name)
-        );
-    }
-
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_Full_HTML_Field
-     */
-    public function createFullHtmlField($table_column, $nice_name, $nullable, $default_value = null)
-    {
-        return $this->loader->getNew(
-            'EE_Full_HTML_Field',
-            array($table_column, $nice_name, $nullable, $default_value)
-        );
-    }
-
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_Infinite_Integer_Field
-     */
-    public function createInfiniteIntegerField($table_column, $nice_name, $nullable, $default_value = null)
-    {
-        return $this->loader->getNew(
-            'EE_Infinite_Integer_Field',
-            array($table_column, $nice_name, $nullable, $default_value)
-        );
-    }
-
-
-
-    /**
-     * @param string  $table_column
-     * @param string  $nice_name
-     * @param bool    $nullable
-     * @param integer $default_value
-     * @return EE_Integer_Field
-     */
-    public function createIntegerField($table_column, $nice_name, $nullable = false, $default_value = 0)
-    {
-        return $this->loader->getNew(
-            'EE_Integer_Field',
-            array($table_column, $nice_name, $nullable, $default_value)
-        );
-    }
-
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_Maybe_Serialized_Simple_HTML_Field
-     */
-    public function createMaybeSerializedSimpleHtmlField($table_column, $nice_name, $nullable, $default_value = null)
-    {
-        return $this->loader->getNew(
-            'EE_Maybe_Serialized_Simple_HTML_Field',
-            array($table_column, $nice_name, $nullable, $default_value)
-        );
-    }
-
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_Maybe_Serialized_Text_Field
-     */
-    public function createMaybeSerializedTextField($table_column, $nice_name, $nullable, $default_value = null)
-    {
-        return $this->loader->getNew(
-            'EE_Maybe_Serialized_Text_Field',
-            array($table_column, $nice_name, $nullable, $default_value)
-        );
-    }
-
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_Money_Field
-     */
-    public function createMoneyField($table_column, $nice_name, $nullable, $default_value = null)
-    {
-        return $this->loader->getNew(
-            'EE_Money_Field',
-            array($table_column, $nice_name, $nullable, $default_value)
-        );
-    }
-
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param string $default_value
-     * @return EE_Plain_Text_Field
-     */
-    public function createPlainTextField($table_column, $nice_name, $nullable = true, $default_value = '')
-    {
-        return $this->loader->getNew(
-            'EE_Plain_Text_Field',
-            array($table_column, $nice_name, $nullable, $default_value)
-        );
-    }
-
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_Post_Content_Field
-     */
-    public function createPostContentField($table_column, $nice_name, $nullable, $default_value = null)
-    {
-        return $this->loader->getNew(
-            'EE_Post_Content_Field',
-            array($table_column, $nice_name, $nullable, $default_value)
-        );
-    }
-
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @return EE_Primary_Key_Int_Field
-     */
-    public function createPrimaryKeyIntField($table_column, $nice_name)
-    {
-        return $this->loader->getNew('EE_Primary_Key_Int_Field', array($table_column, $nice_name));
-    }
-
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @return EE_Primary_Key_String_Field
-     */
-    public function createPrimaryKeyStringField($table_column, $nice_name)
-    {
-        return $this->loader->getNew('EE_Primary_Key_String_Field', array($table_column, $nice_name));
-    }
-
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_Serialized_Text_Field
-     */
-    public function createSerializedTextField($table_column, $nice_name, $nullable, $default_value = null)
-    {
-        return $this->loader->getNew(
-            'EE_Serialized_Text_Field',
-            array($table_column, $nice_name, $nullable, $default_value)
-        );
-    }
-
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_Simple_HTML_Field
-     */
-    public function createSimpleHtmlField($table_column, $nice_name, $nullable, $default_value = null)
-    {
-        return $this->loader->getNew(
-            'EE_Simple_HTML_Field',
-            array($table_column, $nice_name, $nullable, $default_value)
-        );
-    }
-
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_Slug_Field
-     */
-    public function createSlugField($table_column, $nice_name, $nullable = false, $default_value = null)
-    {
-        return $this->loader->getNew(
-            'EE_Slug_Field',
-            array($table_column, $nice_name, $nullable, $default_value)
-        );
-    }
-
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param null   $default_value
-     * @return EE_Trashed_Flag_Field
-     */
-    public function createTrashedFlagField($table_column, $nice_name, $nullable, $default_value = null)
-    {
-        return $this->loader->getNew(
-            'EE_Trashed_Flag_Field',
-            array($table_column, $nice_name, $nullable, $default_value)
-        );
-    }
-
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @param mixed  $default_value
-     * @param array  $values        If additional stati are to be used other than the default WP statuses,
-     *                              then they can be registered via this property.
-     *                              The format of the array should be as follows:
-     *  array(
-     *      'status_reference' => array(
-     *          'label' => __('Status Reference Label', 'event_espresso'),
-     *          'public' => true,                 // whether this status should be shown on the frontend of the site
-     *          'exclude_from_search' => false,   // whether this status should be excluded from wp searches
-     *          'show_in_admin_all_list' => true, // whether this status is included in queries
-     *                                               for the admin "all" view in list table views.
-     *          'show_in_admin_status_list' => true, // show in the list of statuses with post counts at the top
-     *                                                  of the admin list tables (i.e. Status Reference(2) )
-     *          'label_count' => _n_noop(
-     *              'Status Reference <span class="count">(%s)</span>',
-     *              'Status References <span class="count">(%s)</span>'
-     *          ),                                   // the text to display on the admin screen
-     *                                                  ( or you won't see your status count ).
-     *      )
-     *  )
-     * @link http://codex.wordpress.org/Function_Reference/register_post_status for more info
-     * @return EE_WP_Post_Status_Field
-     */
-    public function createWpPostStatusField(
-        $table_column,
-        $nice_name,
-        $nullable,
-        $default_value = null,
-        array $values = array()
-    ) {
-        return $this->loader->getNew(
-            'EE_WP_Post_Status_Field',
-            array($table_column, $nice_name, $nullable, $default_value, $values)
-        );
-    }
-
-
-
-    /**
-     * @param string $post_type
-     * @return EE_WP_Post_Type_Field
-     */
-    public function createWpPostTypeField($post_type)
-    {
-        return $this->loader->getNew('EE_WP_Post_Type_Field', array($post_type));
-    }
-
-
-
-    /**
-     * @param string $table_column
-     * @param string $nice_name
-     * @param bool   $nullable
-     * @return EE_WP_User_Field
-     */
-    public function createWpUserField($table_column, $nice_name, $nullable)
-    {
-        return $this->loader->getNew('EE_WP_User_Field', array($table_column, $nice_name, $nullable));
-    }
+	/**
+	 * @var LoaderInterface $loader
+	 */
+	private $loader;
+
+
+
+	/**
+	 * ModelFieldFactory constructor.
+	 *
+	 * @param LoaderInterface $loader
+	 */
+	public function __construct(LoaderInterface $loader)
+	{
+		$this->loader = $loader;
+	}
+
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_All_Caps_Text_Field
+	 */
+	public function createAllCapsTextField($table_column, $nice_name, $nullable, $default_value = null)
+	{
+		return $this->loader->getNew(
+			'EE_All_Caps_Text_Field',
+			array($table_column, $nice_name, $nullable, $default_value)
+		);
+	}
+
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @param string $model_name
+	 * @return EE_Any_Foreign_Model_Name_Field
+	 */
+	public function createAnyForeignModelNameField(
+		$table_column,
+		$nice_name,
+		$nullable,
+		$default_value = null,
+		$model_name
+	) {
+		return $this->loader->getNew(
+			'EE_Any_Foreign_Model_Name_Field',
+			array($table_column, $nice_name, $nullable, $default_value, $model_name)
+		);
+	}
+
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_Boolean_Field
+	 */
+	public function createBooleanField($table_column, $nice_name, $nullable, $default_value = null)
+	{
+		return $this->loader->getNew(
+			'EE_Boolean_Field',
+			array($table_column, $nice_name, $nullable, $default_value)
+		);
+	}
+
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param string $timezone_string
+	 * @param bool   $nullable
+	 * @param string $default_value
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @return EE_Datetime_Field
+	 */
+	public function createDatetimeField(
+		$table_column,
+		$nice_name,
+		$nullable = false,
+		$default_value = EE_Datetime_Field::now
+	) {
+		return $this->loader->getNew(
+			'EE_Datetime_Field',
+			array(
+				$table_column,
+				$nice_name,
+				$nullable,
+				$default_value
+			)
+		);
+	}
+
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_DB_Only_Float_Field
+	 */
+	public function createDbOnlyFloatField($table_column, $nice_name, $nullable, $default_value = null)
+	{
+		return $this->loader->getNew(
+			'EE_DB_Only_Float_Field',
+			array($table_column, $nice_name, $nullable, $default_value)
+		);
+	}
+
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_DB_Only_Int_Field
+	 */
+	public function createDbOnlyIntField($table_column, $nice_name, $nullable, $default_value = null)
+	{
+		return $this->loader->getNew(
+			'EE_DB_Only_Int_Field',
+			array($table_column, $nice_name, $nullable, $default_value)
+		);
+	}
+
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_DB_Only_Text_Field
+	 */
+	public function createDbOnlyTextField($table_column, $nice_name, $nullable, $default_value = null)
+	{
+		return $this->loader->getNew(
+			'EE_DB_Only_Text_Field',
+			array($table_column, $nice_name, $nullable, $default_value)
+		);
+	}
+
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param string $default_value
+	 * @return EE_Email_Field
+	 */
+	public function createEmailField($table_column, $nice_name, $nullable = true, $default_value = '')
+	{
+		return $this->loader->getNew(
+			'EE_Email_Field',
+			array($table_column, $nice_name, $nullable, $default_value)
+		);
+	}
+
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @param array  $allowed_enum_values keys are values to be used in the DB,
+	 *                                    values are how they should be displayed
+	 * @return EE_Enum_Integer_Field
+	 */
+	public function createEnumIntegerField(
+		$table_column,
+		$nice_name,
+		$nullable,
+		$default_value = null,
+		array $allowed_enum_values
+	) {
+		return $this->loader->getNew(
+			'EE_Enum_Integer_Field',
+			array($table_column, $nice_name, $nullable, $default_value, $allowed_enum_values)
+		);
+	}
+
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @param array  $allowed_enum_values keys are values to be used in the DB,
+	 *                                    values are how they should be displayed
+	 * @return EE_Enum_Text_Field
+	 */
+	public function createEnumTextField(
+		$table_column,
+		$nice_name,
+		$nullable,
+		$default_value,
+		array $allowed_enum_values
+	) {
+		return $this->loader->getNew(
+			'EE_Enum_Text_Field',
+			array($table_column, $nice_name, $nullable, $default_value, $allowed_enum_values)
+		);
+	}
+
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_Float_Field
+	 */
+	public function createFloatField($table_column, $nice_name, $nullable, $default_value = null)
+	{
+		return $this->loader->getNew(
+			'EE_Float_Field',
+			array($table_column, $nice_name, $nullable, $default_value)
+		);
+	}
+
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @param string $model_name
+	 * @return EE_Foreign_Key_Int_Field
+	 */
+	public function createForeignKeyIntField($table_column, $nice_name, $nullable, $default_value, $model_name)
+	{
+		return $this->loader->getNew(
+			'EE_Foreign_Key_Int_Field',
+			array($table_column, $nice_name, $nullable, $default_value, $model_name)
+		);
+	}
+
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @param string $model_name
+	 * @return EE_Foreign_Key_String_Field
+	 */
+	public function createForeignKeyStringField(
+		$table_column,
+		$nice_name,
+		$nullable,
+		$default_value,
+		$model_name
+	) {
+		return $this->loader->getNew(
+			'EE_Foreign_Key_String_Field',
+			array($table_column, $nice_name, $nullable, $default_value, $model_name)
+		);
+	}
+
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_Full_HTML_Field
+	 */
+	public function createFullHtmlField($table_column, $nice_name, $nullable, $default_value = null)
+	{
+		return $this->loader->getNew(
+			'EE_Full_HTML_Field',
+			array($table_column, $nice_name, $nullable, $default_value)
+		);
+	}
+
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_Infinite_Integer_Field
+	 */
+	public function createInfiniteIntegerField($table_column, $nice_name, $nullable, $default_value = null)
+	{
+		return $this->loader->getNew(
+			'EE_Infinite_Integer_Field',
+			array($table_column, $nice_name, $nullable, $default_value)
+		);
+	}
+
+
+
+	/**
+	 * @param string  $table_column
+	 * @param string  $nice_name
+	 * @param bool    $nullable
+	 * @param integer $default_value
+	 * @return EE_Integer_Field
+	 */
+	public function createIntegerField($table_column, $nice_name, $nullable = false, $default_value = 0)
+	{
+		return $this->loader->getNew(
+			'EE_Integer_Field',
+			array($table_column, $nice_name, $nullable, $default_value)
+		);
+	}
+
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_Maybe_Serialized_Simple_HTML_Field
+	 */
+	public function createMaybeSerializedSimpleHtmlField($table_column, $nice_name, $nullable, $default_value = null)
+	{
+		return $this->loader->getNew(
+			'EE_Maybe_Serialized_Simple_HTML_Field',
+			array($table_column, $nice_name, $nullable, $default_value)
+		);
+	}
+
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_Maybe_Serialized_Text_Field
+	 */
+	public function createMaybeSerializedTextField($table_column, $nice_name, $nullable, $default_value = null)
+	{
+		return $this->loader->getNew(
+			'EE_Maybe_Serialized_Text_Field',
+			array($table_column, $nice_name, $nullable, $default_value)
+		);
+	}
+
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_Money_Field
+	 */
+	public function createMoneyField($table_column, $nice_name, $nullable, $default_value = null)
+	{
+		return $this->loader->getNew(
+			'EE_Money_Field',
+			array($table_column, $nice_name, $nullable, $default_value)
+		);
+	}
+
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param string $default_value
+	 * @return EE_Plain_Text_Field
+	 */
+	public function createPlainTextField($table_column, $nice_name, $nullable = true, $default_value = '')
+	{
+		return $this->loader->getNew(
+			'EE_Plain_Text_Field',
+			array($table_column, $nice_name, $nullable, $default_value)
+		);
+	}
+
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_Post_Content_Field
+	 */
+	public function createPostContentField($table_column, $nice_name, $nullable, $default_value = null)
+	{
+		return $this->loader->getNew(
+			'EE_Post_Content_Field',
+			array($table_column, $nice_name, $nullable, $default_value)
+		);
+	}
+
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @return EE_Primary_Key_Int_Field
+	 */
+	public function createPrimaryKeyIntField($table_column, $nice_name)
+	{
+		return $this->loader->getNew('EE_Primary_Key_Int_Field', array($table_column, $nice_name));
+	}
+
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @return EE_Primary_Key_String_Field
+	 */
+	public function createPrimaryKeyStringField($table_column, $nice_name)
+	{
+		return $this->loader->getNew('EE_Primary_Key_String_Field', array($table_column, $nice_name));
+	}
+
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_Serialized_Text_Field
+	 */
+	public function createSerializedTextField($table_column, $nice_name, $nullable, $default_value = null)
+	{
+		return $this->loader->getNew(
+			'EE_Serialized_Text_Field',
+			array($table_column, $nice_name, $nullable, $default_value)
+		);
+	}
+
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_Simple_HTML_Field
+	 */
+	public function createSimpleHtmlField($table_column, $nice_name, $nullable, $default_value = null)
+	{
+		return $this->loader->getNew(
+			'EE_Simple_HTML_Field',
+			array($table_column, $nice_name, $nullable, $default_value)
+		);
+	}
+
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_Slug_Field
+	 */
+	public function createSlugField($table_column, $nice_name, $nullable = false, $default_value = null)
+	{
+		return $this->loader->getNew(
+			'EE_Slug_Field',
+			array($table_column, $nice_name, $nullable, $default_value)
+		);
+	}
+
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 * @return EE_Trashed_Flag_Field
+	 */
+	public function createTrashedFlagField($table_column, $nice_name, $nullable, $default_value = null)
+	{
+		return $this->loader->getNew(
+			'EE_Trashed_Flag_Field',
+			array($table_column, $nice_name, $nullable, $default_value)
+		);
+	}
+
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @param mixed  $default_value
+	 * @param array  $values        If additional stati are to be used other than the default WP statuses,
+	 *                              then they can be registered via this property.
+	 *                              The format of the array should be as follows:
+	 *  array(
+	 *      'status_reference' => array(
+	 *          'label' => __('Status Reference Label', 'event_espresso'),
+	 *          'public' => true,                 // whether this status should be shown on the frontend of the site
+	 *          'exclude_from_search' => false,   // whether this status should be excluded from wp searches
+	 *          'show_in_admin_all_list' => true, // whether this status is included in queries
+	 *                                               for the admin "all" view in list table views.
+	 *          'show_in_admin_status_list' => true, // show in the list of statuses with post counts at the top
+	 *                                                  of the admin list tables (i.e. Status Reference(2) )
+	 *          'label_count' => _n_noop(
+	 *              'Status Reference <span class="count">(%s)</span>',
+	 *              'Status References <span class="count">(%s)</span>'
+	 *          ),                                   // the text to display on the admin screen
+	 *                                                  ( or you won't see your status count ).
+	 *      )
+	 *  )
+	 * @link http://codex.wordpress.org/Function_Reference/register_post_status for more info
+	 * @return EE_WP_Post_Status_Field
+	 */
+	public function createWpPostStatusField(
+		$table_column,
+		$nice_name,
+		$nullable,
+		$default_value = null,
+		array $values = array()
+	) {
+		return $this->loader->getNew(
+			'EE_WP_Post_Status_Field',
+			array($table_column, $nice_name, $nullable, $default_value, $values)
+		);
+	}
+
+
+
+	/**
+	 * @param string $post_type
+	 * @return EE_WP_Post_Type_Field
+	 */
+	public function createWpPostTypeField($post_type)
+	{
+		return $this->loader->getNew('EE_WP_Post_Type_Field', array($post_type));
+	}
+
+
+
+	/**
+	 * @param string $table_column
+	 * @param string $nice_name
+	 * @param bool   $nullable
+	 * @return EE_WP_User_Field
+	 */
+	public function createWpUserField($table_column, $nice_name, $nullable)
+	{
+		return $this->loader->getNew('EE_WP_User_Field', array($table_column, $nice_name, $nullable));
+	}
 
 
 

core/db_models/EEM_Change_Log.model.php

Spacing +3 added lines, -3 removed lines

@@ -106,7 +106,7 @@ 
                 ),
             ),
         );
-        $this->_model_relations    = array();
+        $this->_model_relations = array();
         foreach ($models_this_can_attach_to as $model) {
             if ($model == 'WP_User') {
                 $this->_model_relations[$model] = new EE_Belongs_To_Relation();
@@ -163,7 +163,7 @@ 
      */
     public function gateway_log($message, $related_obj_id, $related_obj_type)
     {
-        if (! EE_Registry::instance()->is_model_name($related_obj_type)) {
+        if ( ! EE_Registry::instance()->is_model_name($related_obj_type)) {
             throw new EE_Error(
                 sprintf(
                     esc_html__(
@@ -212,7 +212,7 @@ 
         global $wpdb;
         return $wpdb->query(
             $wpdb->prepare(
-                'DELETE FROM ' . $this->table() . ' WHERE LOG_type = %s AND LOG_time < %s',
+                'DELETE FROM '.$this->table().' WHERE LOG_type = %s AND LOG_time < %s',
                 EEM_Change_Log::type_gateway,
                 $datetime->format(EE_Datetime_Field::mysql_timestamp_format)
             )

Indentation +228 added lines, -228 removed lines

@@ -13,246 +13,246 @@
 class EEM_Change_Log extends EEM_Base
 {
 
-    /**
-     * the related object was created log type
-     */
-    const type_create = 'create';
-    /**
-     * the related object was updated (changed, or soft-deleted)
-     */
-    const type_update = 'update';
-    /**
-     * the related object was deleted permanently
-     */
-    const type_delete = 'delete';
-    /**
-     * the related item had something worth noting happen on it, but
-     * only for the purposes of debugging problems
-     */
-    const type_debug = 'debug';
-    /**
-     * the related item had an error occur on it
-     */
-    const type_error = 'error';
-    /**
-     * the related item is regarding some gateway interaction, like an IPN
-     * or request to process a payment
-     */
-    const type_gateway = 'gateway';
+	/**
+	 * the related object was created log type
+	 */
+	const type_create = 'create';
+	/**
+	 * the related object was updated (changed, or soft-deleted)
+	 */
+	const type_update = 'update';
+	/**
+	 * the related object was deleted permanently
+	 */
+	const type_delete = 'delete';
+	/**
+	 * the related item had something worth noting happen on it, but
+	 * only for the purposes of debugging problems
+	 */
+	const type_debug = 'debug';
+	/**
+	 * the related item had an error occur on it
+	 */
+	const type_error = 'error';
+	/**
+	 * the related item is regarding some gateway interaction, like an IPN
+	 * or request to process a payment
+	 */
+	const type_gateway = 'gateway';
 
-    /**
-     * private instance of the EEM_Change_Log object
-     *
-     * @access private
-     * @var EEM_Change_Log $_instance
-     */
-    protected static $_instance = null;
+	/**
+	 * private instance of the EEM_Change_Log object
+	 *
+	 * @access private
+	 * @var EEM_Change_Log $_instance
+	 */
+	protected static $_instance = null;
 
 
-    /**
-     * constructor
-     *
-     * @access protected
-     * @param null $timezone
-     * @throws EE_Error
-     */
-    protected function __construct($timezone = null)
-    {
-        global $current_user;
-        $this->singular_item       = esc_html__('Log', 'event_espresso');
-        $this->plural_item         = esc_html__('Logs', 'event_espresso');
-        $this->_tables             = array(
-            'Log' => new EE_Primary_Table('esp_log', 'LOG_ID'),
-        );
-        $models_this_can_attach_to = array_keys(EE_Registry::instance()->non_abstract_db_models);
-        $this->_fields             = array(
-            'Log' => array(
-                'LOG_ID'      => new EE_Primary_Key_Int_Field('LOG_ID', esc_html__('Log ID', 'event_espresso')),
-                'LOG_time'    => new EE_Datetime_Field(
-                    'LOG_time',
-                    esc_html__("Log Time", 'event_espresso'),
-                    false,
-                    EE_Datetime_Field::now
-                ),
-                'OBJ_ID'      => new EE_Foreign_Key_String_Field(
-                    'OBJ_ID',
-                    esc_html__("Object ID (int or string)", 'event_espresso'),
-                    true,
-                    null,
-                    $models_this_can_attach_to
-                ),
-                'OBJ_type'    => new EE_Any_Foreign_Model_Name_Field(
-                    'OBJ_type',
-                    esc_html__("Object Type", 'event_espresso'),
-                    true,
-                    null,
-                    $models_this_can_attach_to
-                ),
-                'LOG_type'    => new EE_Plain_Text_Field(
-                    'LOG_type',
-                    esc_html__("Type of log entry", "event_espresso"),
-                    false,
-                    self::type_debug
-                ),
-                'LOG_message' => new EE_Maybe_Serialized_Text_Field(
-                    'LOG_message',
-                    esc_html__("Log Message (body)", 'event_espresso'),
-                    true
-                ),
-                'LOG_wp_user' => new EE_WP_User_Field(
-                    'LOG_wp_user',
-                    esc_html__("User who was logged in while this occurred", 'event_espresso'),
-                    true
-                ),
-            ),
-        );
-        $this->_model_relations    = array();
-        foreach ($models_this_can_attach_to as $model) {
-            if ($model == 'WP_User') {
-                $this->_model_relations[$model] = new EE_Belongs_To_Relation();
-            } elseif ($model != 'Change_Log') {
-                $this->_model_relations[$model] = new EE_Belongs_To_Any_Relation();
-            }
-        }
-        //use completely custom caps for this
-        $this->_cap_restriction_generators = false;
-        //caps-wise this is all-or-nothing: if you have the default role you can access anything, otherwise nothing
-        foreach ($this->_cap_contexts_to_cap_action_map as $cap_context => $action) {
-            $this->_cap_restrictions[$cap_context][EE_Restriction_Generator_Base::get_default_restrictions_cap()]
-                = new EE_Return_None_Where_Conditions();
-        }
-        parent::__construct($timezone);
-    }
+	/**
+	 * constructor
+	 *
+	 * @access protected
+	 * @param null $timezone
+	 * @throws EE_Error
+	 */
+	protected function __construct($timezone = null)
+	{
+		global $current_user;
+		$this->singular_item       = esc_html__('Log', 'event_espresso');
+		$this->plural_item         = esc_html__('Logs', 'event_espresso');
+		$this->_tables             = array(
+			'Log' => new EE_Primary_Table('esp_log', 'LOG_ID'),
+		);
+		$models_this_can_attach_to = array_keys(EE_Registry::instance()->non_abstract_db_models);
+		$this->_fields             = array(
+			'Log' => array(
+				'LOG_ID'      => new EE_Primary_Key_Int_Field('LOG_ID', esc_html__('Log ID', 'event_espresso')),
+				'LOG_time'    => new EE_Datetime_Field(
+					'LOG_time',
+					esc_html__("Log Time", 'event_espresso'),
+					false,
+					EE_Datetime_Field::now
+				),
+				'OBJ_ID'      => new EE_Foreign_Key_String_Field(
+					'OBJ_ID',
+					esc_html__("Object ID (int or string)", 'event_espresso'),
+					true,
+					null,
+					$models_this_can_attach_to
+				),
+				'OBJ_type'    => new EE_Any_Foreign_Model_Name_Field(
+					'OBJ_type',
+					esc_html__("Object Type", 'event_espresso'),
+					true,
+					null,
+					$models_this_can_attach_to
+				),
+				'LOG_type'    => new EE_Plain_Text_Field(
+					'LOG_type',
+					esc_html__("Type of log entry", "event_espresso"),
+					false,
+					self::type_debug
+				),
+				'LOG_message' => new EE_Maybe_Serialized_Text_Field(
+					'LOG_message',
+					esc_html__("Log Message (body)", 'event_espresso'),
+					true
+				),
+				'LOG_wp_user' => new EE_WP_User_Field(
+					'LOG_wp_user',
+					esc_html__("User who was logged in while this occurred", 'event_espresso'),
+					true
+				),
+			),
+		);
+		$this->_model_relations    = array();
+		foreach ($models_this_can_attach_to as $model) {
+			if ($model == 'WP_User') {
+				$this->_model_relations[$model] = new EE_Belongs_To_Relation();
+			} elseif ($model != 'Change_Log') {
+				$this->_model_relations[$model] = new EE_Belongs_To_Any_Relation();
+			}
+		}
+		//use completely custom caps for this
+		$this->_cap_restriction_generators = false;
+		//caps-wise this is all-or-nothing: if you have the default role you can access anything, otherwise nothing
+		foreach ($this->_cap_contexts_to_cap_action_map as $cap_context => $action) {
+			$this->_cap_restrictions[$cap_context][EE_Restriction_Generator_Base::get_default_restrictions_cap()]
+				= new EE_Return_None_Where_Conditions();
+		}
+		parent::__construct($timezone);
+	}
 
-    /**
-     * @param string        $log_type !see the acceptable values of LOG_type in EEM__Change_Log::__construct
-     * @param mixed         $message  array|string of the message you want to record
-     * @param EE_Base_Class $related_model_obj
-     * @return EE_Change_Log
-     * @throws EE_Error
-     */
-    public function log($log_type, $message, $related_model_obj)
-    {
-        if ($related_model_obj instanceof EE_Base_Class) {
-            $obj_id   = $related_model_obj->ID();
-            $obj_type = $related_model_obj->get_model()->get_this_model_name();
-        } else {
-            $obj_id   = null;
-            $obj_type = null;
-        }
-        /** @var EE_Change_Log $log */
-        $log = EE_Change_Log::new_instance(array(
-            'LOG_type'    => $log_type,
-            'LOG_message' => $message,
-            'OBJ_ID'      => $obj_id,
-            'OBJ_type'    => $obj_type,
-        ));
-        $log->save();
-        return $log;
-    }
+	/**
+	 * @param string        $log_type !see the acceptable values of LOG_type in EEM__Change_Log::__construct
+	 * @param mixed         $message  array|string of the message you want to record
+	 * @param EE_Base_Class $related_model_obj
+	 * @return EE_Change_Log
+	 * @throws EE_Error
+	 */
+	public function log($log_type, $message, $related_model_obj)
+	{
+		if ($related_model_obj instanceof EE_Base_Class) {
+			$obj_id   = $related_model_obj->ID();
+			$obj_type = $related_model_obj->get_model()->get_this_model_name();
+		} else {
+			$obj_id   = null;
+			$obj_type = null;
+		}
+		/** @var EE_Change_Log $log */
+		$log = EE_Change_Log::new_instance(array(
+			'LOG_type'    => $log_type,
+			'LOG_message' => $message,
+			'OBJ_ID'      => $obj_id,
+			'OBJ_type'    => $obj_type,
+		));
+		$log->save();
+		return $log;
+	}
 
 
-    /**
-     * Adds a gateway log for the specified object, given its ID and type
-     *
-     * @param string $message
-     * @param mixed  $related_obj_id
-     * @param string $related_obj_type
-     * @throws EE_Error
-     * @return EE_Change_Log
-     */
-    public function gateway_log($message, $related_obj_id, $related_obj_type)
-    {
-        if (! EE_Registry::instance()->is_model_name($related_obj_type)) {
-            throw new EE_Error(
-                sprintf(
-                    esc_html__(
-                        "'%s' is not a model name. A model name must be provided when making a gateway log. Eg, 'Payment', 'Payment_Method', etc",
-                        "event_espresso"
-                    ),
-                    $related_obj_type
-                )
-            );
-        }
-        /** @var EE_Change_Log $log */
-        $log = EE_Change_Log::new_instance(array(
-            'LOG_type'    => EEM_Change_Log::type_gateway,
-            'LOG_message' => $message,
-            'OBJ_ID'      => $related_obj_id,
-            'OBJ_type'    => $related_obj_type,
-        ));
-        $log->save();
-        return $log;
-    }
+	/**
+	 * Adds a gateway log for the specified object, given its ID and type
+	 *
+	 * @param string $message
+	 * @param mixed  $related_obj_id
+	 * @param string $related_obj_type
+	 * @throws EE_Error
+	 * @return EE_Change_Log
+	 */
+	public function gateway_log($message, $related_obj_id, $related_obj_type)
+	{
+		if (! EE_Registry::instance()->is_model_name($related_obj_type)) {
+			throw new EE_Error(
+				sprintf(
+					esc_html__(
+						"'%s' is not a model name. A model name must be provided when making a gateway log. Eg, 'Payment', 'Payment_Method', etc",
+						"event_espresso"
+					),
+					$related_obj_type
+				)
+			);
+		}
+		/** @var EE_Change_Log $log */
+		$log = EE_Change_Log::new_instance(array(
+			'LOG_type'    => EEM_Change_Log::type_gateway,
+			'LOG_message' => $message,
+			'OBJ_ID'      => $related_obj_id,
+			'OBJ_type'    => $related_obj_type,
+		));
+		$log->save();
+		return $log;
+	}
 
 
-    /**
-     * Just gets the bare-bones wpdb results as an array in cases where efficiency is essential
-     *
-     * @param array $query_params @see EEM_Base::get_all
-     * @return array of arrays
-     * @throws EE_Error
-     */
-    public function get_all_efficiently($query_params)
-    {
-        return $this->_get_all_wpdb_results($query_params);
-    }
+	/**
+	 * Just gets the bare-bones wpdb results as an array in cases where efficiency is essential
+	 *
+	 * @param array $query_params @see EEM_Base::get_all
+	 * @return array of arrays
+	 * @throws EE_Error
+	 */
+	public function get_all_efficiently($query_params)
+	{
+		return $this->_get_all_wpdb_results($query_params);
+	}
 
 
-    /**
-     * Executes a database query to delete gateway logs. Does not affect model objects, so if you attempt to use
-     * models after this, they may be out-of-sync with the database
-     *
-     * @param DateTime $datetime
-     * @return false|int
-     * @throws EE_Error
-     */
-    public function delete_gateway_logs_older_than(DateTime $datetime)
-    {
-        global $wpdb;
-        return $wpdb->query(
-            $wpdb->prepare(
-                'DELETE FROM ' . $this->table() . ' WHERE LOG_type = %s AND LOG_time < %s',
-                EEM_Change_Log::type_gateway,
-                $datetime->format(EE_Datetime_Field::mysql_timestamp_format)
-            )
-        );
-    }
+	/**
+	 * Executes a database query to delete gateway logs. Does not affect model objects, so if you attempt to use
+	 * models after this, they may be out-of-sync with the database
+	 *
+	 * @param DateTime $datetime
+	 * @return false|int
+	 * @throws EE_Error
+	 */
+	public function delete_gateway_logs_older_than(DateTime $datetime)
+	{
+		global $wpdb;
+		return $wpdb->query(
+			$wpdb->prepare(
+				'DELETE FROM ' . $this->table() . ' WHERE LOG_type = %s AND LOG_time < %s',
+				EEM_Change_Log::type_gateway,
+				$datetime->format(EE_Datetime_Field::mysql_timestamp_format)
+			)
+		);
+	}
 
 
-    /**
-     * Returns the map of type to pretty label for identifiers used for `LOG_type`.  Client code can register their own
-     * map vai the given filter.
-     *
-     * @return array
-     */
-    public static function get_pretty_label_map_for_registered_types()
-    {
-        return apply_filters(
-            'FHEE__EEM_Change_Log__get_pretty_label_map_for_registered_types',
-            array(
-                self::type_create=>  esc_html__("Create", "event_espresso"),
-                self::type_update=>  esc_html__("Update", "event_espresso"),
-                self::type_delete => esc_html__("Delete", "event_espresso"),
-                self::type_debug=>  esc_html__("Debug", "event_espresso"),
-                self::type_error=>  esc_html__("Error", "event_espresso"),
-                self::type_gateway=> esc_html__("Gateway Interaction (IPN or Direct Payment)", 'event_espresso')
-            )
-        );
-    }
+	/**
+	 * Returns the map of type to pretty label for identifiers used for `LOG_type`.  Client code can register their own
+	 * map vai the given filter.
+	 *
+	 * @return array
+	 */
+	public static function get_pretty_label_map_for_registered_types()
+	{
+		return apply_filters(
+			'FHEE__EEM_Change_Log__get_pretty_label_map_for_registered_types',
+			array(
+				self::type_create=>  esc_html__("Create", "event_espresso"),
+				self::type_update=>  esc_html__("Update", "event_espresso"),
+				self::type_delete => esc_html__("Delete", "event_espresso"),
+				self::type_debug=>  esc_html__("Debug", "event_espresso"),
+				self::type_error=>  esc_html__("Error", "event_espresso"),
+				self::type_gateway=> esc_html__("Gateway Interaction (IPN or Direct Payment)", 'event_espresso')
+			)
+		);
+	}
 
 
-    /**
-     * Return the pretty (localized) label for the given log type identifier.
-     * @param string $type_identifier
-     * @return string
-     */
-    public static function get_pretty_label_for_type($type_identifier)
-    {
-        $type_identifier_map = self::get_pretty_label_map_for_registered_types();
-        //we fallback to the incoming type identifier if there is no localized label for it.
-        return isset($type_identifier_map[$type_identifier])
-            ? $type_identifier_map[$type_identifier]
-            : $type_identifier;
-    }
+	/**
+	 * Return the pretty (localized) label for the given log type identifier.
+	 * @param string $type_identifier
+	 * @return string
+	 */
+	public static function get_pretty_label_for_type($type_identifier)
+	{
+		$type_identifier_map = self::get_pretty_label_map_for_registered_types();
+		//we fallback to the incoming type identifier if there is no localized label for it.
+		return isset($type_identifier_map[$type_identifier])
+			? $type_identifier_map[$type_identifier]
+			: $type_identifier;
+	}
 }

core/db_classes/EE_Change_Log.class.php

Indentation +212 added lines, -212 removed lines

@@ -13,216 +13,216 @@
 class EE_Change_Log extends EE_Base_Class
 {
 
-    /**
-     * @param array  $props_n_values          incoming values
-     * @param string $timezone                incoming timezone (if not set the timezone set for the website will be
-     *                                        used.)
-     * @param array  $date_formats            incoming date_formats in an array where the first value is the
-     *                                        date_format and the second value is the time format
-     * @return EE_Change_Log
-     * @throws EE_Error
-     */
-    public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array())
-    {
-        $has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats);
-        return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
-    }
-
-
-    /**
-     * @param array  $props_n_values  incoming values from the database
-     * @param string $timezone        incoming timezone as set by the model.  If not set the timezone for
-     *                                the website will be used.
-     * @return EE_Change_Log
-     */
-    public static function new_instance_from_db($props_n_values = array(), $timezone = null)
-    {
-        return new self($props_n_values, true, $timezone);
-    }
-
-    /**
-     * Gets message
-     *
-     * @return mixed
-     * @throws EE_Error
-     */
-    public function message()
-    {
-        return $this->get('LOG_message');
-    }
-
-    /**
-     * Sets message
-     *
-     * @param mixed $message
-     * @throws EE_Error
-     */
-    public function set_message($message)
-    {
-        $this->set('LOG_message', $message);
-    }
-
-    /**
-     * Gets time
-     *
-     * @return string
-     * @throws EE_Error
-     */
-    public function time()
-    {
-        return $this->get('LOG_time');
-    }
-
-    /**
-     * Sets time
-     *
-     * @param string $time
-     * @throws EE_Error
-     */
-    public function set_time($time)
-    {
-        $this->set('LOG_time', $time);
-    }
-
-    /**
-     * Gets log_type
-     *
-     * @return string
-     * @throws EE_Error
-     */
-    public function log_type()
-    {
-        return $this->get('LOG_type');
-    }
-
-
-    /**
-     * Return the localized log type label.
-     * @return string
-     * @throws EE_Error
-     */
-    public function log_type_label()
-    {
-        return EEM_Change_Log::get_pretty_label_for_type($this->log_type());
-    }
-
-    /**
-     * Sets log_type
-     *
-     * @param string $log_type
-     * @throws EE_Error
-     */
-    public function set_log_type($log_type)
-    {
-        $this->set('LOG_type', $log_type);
-    }
-
-    /**
-     * Gets type of the model object related to this log
-     *
-     * @return string
-     * @throws EE_Error
-     */
-    public function OBJ_type()
-    {
-        return $this->get('OBJ_type');
-    }
-
-    /**
-     * Sets type
-     *
-     * @param string $type
-     * @throws EE_Error
-     */
-    public function set_OBJ_type($type)
-    {
-        $this->set('OBJ_type', $type);
-    }
-
-    /**
-     * Gets OBJ_ID (the ID of the item related to this log)
-     *
-     * @return mixed
-     * @throws EE_Error
-     */
-    public function OBJ_ID()
-    {
-        return $this->get('OBJ_ID');
-    }
-
-    /**
-     * Sets OBJ_ID
-     *
-     * @param mixed $OBJ_ID
-     * @throws EE_Error
-     */
-    public function set_OBJ_ID($OBJ_ID)
-    {
-        $this->set('OBJ_ID', $OBJ_ID);
-    }
-
-    /**
-     * Gets wp_user
-     *
-     * @return int
-     * @throws EE_Error
-     */
-    public function wp_user()
-    {
-        return $this->get('LOG_wp_user');
-    }
-
-    /**
-     * Sets wp_user
-     *
-     * @param int $wp_user_id
-     * @throws EE_Error
-     */
-    public function set_wp_user($wp_user_id)
-    {
-        $this->set('LOG_wp_user', $wp_user_id);
-    }
-
-    /**
-     * Gets the model object attached to this log
-     *
-     * @return EE_Base_Class
-     * @throws EE_Error
-     */
-    public function object()
-    {
-        $model_name_of_related_obj = $this->OBJ_type();
-        $is_model_name             = EE_Registry::instance()->is_model_name($model_name_of_related_obj);
-        if (! $is_model_name) {
-            return null;
-        } else {
-            return $this->get_first_related($model_name_of_related_obj);
-        }
-    }
-
-    /**
-     * Shorthand for setting the OBJ_ID and OBJ_type. Slightly handier than using
-     * _add_relation_to because you don't have to specify what type of model you're
-     * associating it with
-     *
-     * @param EE_Base_Class $object
-     * @param boolean       $save
-     * @return bool if $save=true, NULL is $save=false
-     * @throws EE_Error
-     */
-    public function set_object($object, $save = true)
-    {
-        if ($object instanceof EE_Base_Class) {
-            $this->set_OBJ_type($object->get_model()->get_this_model_name());
-            $this->set_OBJ_ID($object->ID());
-        } else {
-            $this->set_OBJ_type(null);
-            $this->set_OBJ_ID(null);
-        }
-        if ($save) {
-            return $this->save();
-        } else {
-            return null;
-        }
-    }
+	/**
+	 * @param array  $props_n_values          incoming values
+	 * @param string $timezone                incoming timezone (if not set the timezone set for the website will be
+	 *                                        used.)
+	 * @param array  $date_formats            incoming date_formats in an array where the first value is the
+	 *                                        date_format and the second value is the time format
+	 * @return EE_Change_Log
+	 * @throws EE_Error
+	 */
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array())
+	{
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
+	}
+
+
+	/**
+	 * @param array  $props_n_values  incoming values from the database
+	 * @param string $timezone        incoming timezone as set by the model.  If not set the timezone for
+	 *                                the website will be used.
+	 * @return EE_Change_Log
+	 */
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null)
+	{
+		return new self($props_n_values, true, $timezone);
+	}
+
+	/**
+	 * Gets message
+	 *
+	 * @return mixed
+	 * @throws EE_Error
+	 */
+	public function message()
+	{
+		return $this->get('LOG_message');
+	}
+
+	/**
+	 * Sets message
+	 *
+	 * @param mixed $message
+	 * @throws EE_Error
+	 */
+	public function set_message($message)
+	{
+		$this->set('LOG_message', $message);
+	}
+
+	/**
+	 * Gets time
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function time()
+	{
+		return $this->get('LOG_time');
+	}
+
+	/**
+	 * Sets time
+	 *
+	 * @param string $time
+	 * @throws EE_Error
+	 */
+	public function set_time($time)
+	{
+		$this->set('LOG_time', $time);
+	}
+
+	/**
+	 * Gets log_type
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function log_type()
+	{
+		return $this->get('LOG_type');
+	}
+
+
+	/**
+	 * Return the localized log type label.
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function log_type_label()
+	{
+		return EEM_Change_Log::get_pretty_label_for_type($this->log_type());
+	}
+
+	/**
+	 * Sets log_type
+	 *
+	 * @param string $log_type
+	 * @throws EE_Error
+	 */
+	public function set_log_type($log_type)
+	{
+		$this->set('LOG_type', $log_type);
+	}
+
+	/**
+	 * Gets type of the model object related to this log
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function OBJ_type()
+	{
+		return $this->get('OBJ_type');
+	}
+
+	/**
+	 * Sets type
+	 *
+	 * @param string $type
+	 * @throws EE_Error
+	 */
+	public function set_OBJ_type($type)
+	{
+		$this->set('OBJ_type', $type);
+	}
+
+	/**
+	 * Gets OBJ_ID (the ID of the item related to this log)
+	 *
+	 * @return mixed
+	 * @throws EE_Error
+	 */
+	public function OBJ_ID()
+	{
+		return $this->get('OBJ_ID');
+	}
+
+	/**
+	 * Sets OBJ_ID
+	 *
+	 * @param mixed $OBJ_ID
+	 * @throws EE_Error
+	 */
+	public function set_OBJ_ID($OBJ_ID)
+	{
+		$this->set('OBJ_ID', $OBJ_ID);
+	}
+
+	/**
+	 * Gets wp_user
+	 *
+	 * @return int
+	 * @throws EE_Error
+	 */
+	public function wp_user()
+	{
+		return $this->get('LOG_wp_user');
+	}
+
+	/**
+	 * Sets wp_user
+	 *
+	 * @param int $wp_user_id
+	 * @throws EE_Error
+	 */
+	public function set_wp_user($wp_user_id)
+	{
+		$this->set('LOG_wp_user', $wp_user_id);
+	}
+
+	/**
+	 * Gets the model object attached to this log
+	 *
+	 * @return EE_Base_Class
+	 * @throws EE_Error
+	 */
+	public function object()
+	{
+		$model_name_of_related_obj = $this->OBJ_type();
+		$is_model_name             = EE_Registry::instance()->is_model_name($model_name_of_related_obj);
+		if (! $is_model_name) {
+			return null;
+		} else {
+			return $this->get_first_related($model_name_of_related_obj);
+		}
+	}
+
+	/**
+	 * Shorthand for setting the OBJ_ID and OBJ_type. Slightly handier than using
+	 * _add_relation_to because you don't have to specify what type of model you're
+	 * associating it with
+	 *
+	 * @param EE_Base_Class $object
+	 * @param boolean       $save
+	 * @return bool if $save=true, NULL is $save=false
+	 * @throws EE_Error
+	 */
+	public function set_object($object, $save = true)
+	{
+		if ($object instanceof EE_Base_Class) {
+			$this->set_OBJ_type($object->get_model()->get_this_model_name());
+			$this->set_OBJ_ID($object->ID());
+		} else {
+			$this->set_OBJ_type(null);
+			$this->set_OBJ_ID(null);
+		}
+		if ($save) {
+			return $this->save();
+		} else {
+			return null;
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -193,7 +193,7 @@
     {
         $model_name_of_related_obj = $this->OBJ_type();
         $is_model_name             = EE_Registry::instance()->is_model_name($model_name_of_related_obj);
-        if (! $is_model_name) {
+        if ( ! $is_model_name) {
             return null;
         } else {
             return $this->get_first_related($model_name_of_related_obj);

core/services/Benchmark.php

Spacing +11 added lines, -11 removed lines

@@ -126,7 +126,7 @@ 
     {
         add_action(
             'shutdown',
-            function () use ($formatted) {
+            function() use ($formatted) {
                 Benchmark::displayResults(true, $formatted);
             }
         );
@@ -146,7 +146,7 @@ 
     {
         add_action(
             'shutdown',
-            function () use ($filepath, $formatted, $append) {
+            function() use ($filepath, $formatted, $append) {
                 Benchmark::writeResultsToFile($filepath, $formatted, $append);
             }
         );
@@ -164,17 +164,17 @@ 
             return '';
         }
         $output = '';
-        if (! empty(Benchmark::$times)) {
+        if ( ! empty(Benchmark::$times)) {
             $total = 0;
             $output .= $formatted
                 ? '<span style="color:#999999; font-size:.8em;">( time in milliseconds )</span><br />'
                 : '';
             foreach (Benchmark::$times as $timer_name => $total_time) {
                 $output .= Benchmark::formatTime($timer_name, $total_time, $formatted);
-                $output .= $formatted ? '<br />'  : "\n";
+                $output .= $formatted ? '<br />' : "\n";
                 $total += $total_time;
             }
-            if($formatted) {
+            if ($formatted) {
                 $output .= '<br />';
                 $output .= '<h4>TOTAL TIME</h4>';
                 $output .= Benchmark::formatTime('', $total, $formatted);
@@ -189,9 +189,9 @@ 
                 $output .= '<span style="color:red">Like...HEEELLLP</span><br />';
             }
         }
-        if (! empty(Benchmark::$memory_usage)) {
+        if ( ! empty(Benchmark::$memory_usage)) {
             $output .= $formatted
-                ? '<h5>Memory</h5>' . implode('<br />', Benchmark::$memory_usage)
+                ? '<h5>Memory</h5>'.implode('<br />', Benchmark::$memory_usage)
                 : implode("\n", Benchmark::$memory_usage);
         }
         if (empty($output)) {
@@ -239,12 +239,12 @@ 
         $filepath = ! empty($filepath) && is_readable(dirname($filepath))
             ? $filepath
             : '';
-        if( empty($filepath)) {
-            $filepath = EVENT_ESPRESSO_UPLOAD_DIR . 'logs/benchmarking-' . date('Y-m-d') . '.html';
+        if (empty($filepath)) {
+            $filepath = EVENT_ESPRESSO_UPLOAD_DIR.'logs/benchmarking-'.date('Y-m-d').'.html';
         }
         file_put_contents(
             $filepath,
-            "\n" . date('Y-m-d H:i:s') . Benchmark::generateResults($formatted),
+            "\n".date('Y-m-d H:i:s').Benchmark::generateResults($formatted),
             $append ? FILE_APPEND | LOCK_EX : LOCK_EX
         );
     }
@@ -263,7 +263,7 @@ 
         return round(
             $size / pow(1024, $i = floor(log($size, 1024))),
             2
-        ) . ' ' . $unit[absint($i)];
+        ).' '.$unit[absint($i)];
     }
 
 

Indentation +297 added lines, -297 removed lines

@@ -17,303 +17,303 @@
 class Benchmark
 {
 
-    /**
-     * array containing the start time for the timers
-     */
-    private static $start_times;
-
-    /**
-     * array containing all the timer'd times, which can be outputted via show_times()
-     */
-    private static $times = array();
-
-    /**
-     * @var array
-     */
-    protected static $memory_usage = array();
-
-
-
-    /**
-     * whether to benchmark code or not
-     */
-    public static function doNotRun()
-    {
-        return ! WP_DEBUG || (defined('DOING_AJAX') && DOING_AJAX);
-    }
-
-
-
-    /**
-     * resetTimes
-     */
-    public static function resetTimes()
-    {
-        Benchmark::$times = array();
-    }
-
-
-
-    /**
-     * Add Benchmark::startTimer() before a block of code you want to measure the performance of
-     *
-     * @param null $timer_name
-     */
-    public static function startTimer($timer_name = null)
-    {
-        if (Benchmark::doNotRun()) {
-            return;
-        }
-        $timer_name = $timer_name !== '' ? $timer_name : get_called_class();
-        Benchmark::$start_times[$timer_name] = microtime(true);
-    }
-
-
-
-    /**
-     * Add Benchmark::stopTimer() after a block of code you want to measure the performance of
-     *
-     * @param string $timer_name
-     */
-    public static function stopTimer($timer_name = '')
-    {
-        if (Benchmark::doNotRun()) {
-            return;
-        }
-        $timer_name = $timer_name !== '' ? $timer_name : get_called_class();
-        if (isset(Benchmark::$start_times[$timer_name])) {
-            $start_time = Benchmark::$start_times[$timer_name];
-            unset(Benchmark::$start_times[$timer_name]);
-        } else {
-            $start_time = array_pop(Benchmark::$start_times);
-        }
-        Benchmark::$times[$timer_name] = number_format(microtime(true) - $start_time, 8);
-    }
-
-
-
-    /**
-     * Measure the memory usage by PHP so far.
-     *
-     * @param string  $label      The label to show for this time eg "Start of calling Some_Class::some_function"
-     * @param boolean $output_now whether to echo now, or wait until EEH_Debug_Tools::show_times() is called
-     * @param bool    $formatted
-     * @return void
-     */
-    public static function measureMemory($label = 'memory usage', $output_now = false, $formatted = true)
-    {
-        if (Benchmark::doNotRun()) {
-            return;
-        }
-        $memory_used = Benchmark::convert(memory_get_usage(true));
-        Benchmark::$memory_usage[$label] = $memory_used;
-        if ($output_now) {
-            echo $formatted
-                ? "<br>{$label} : {$memory_used}"
-                : "\n {$label} : {$memory_used}";
-        }
-    }
-
-
-
-    /**
-     * will display the benchmarking results at shutdown
-     *
-     * @param bool $formatted
-     * @return void
-     */
-    public static function displayResultsAtShutdown($formatted = true)
-    {
-        add_action(
-            'shutdown',
-            function () use ($formatted) {
-                Benchmark::displayResults(true, $formatted);
-            }
-        );
-    }
-
-
-
-    /**
-     * will display the benchmarking results at shutdown
-     *
-     * @param string $filepath
-     * @param bool   $formatted
-     * @param bool   $append
-     * @return void
-     */
-    public static function writeResultsAtShutdown($filepath = '', $formatted = true, $append = true)
-    {
-        add_action(
-            'shutdown',
-            function () use ($filepath, $formatted, $append) {
-                Benchmark::writeResultsToFile($filepath, $formatted, $append);
-            }
-        );
-    }
-
-
-
-    /**
-     * @param bool $formatted
-     * @return string
-     */
-    private static function generateResults($formatted = true)
-    {
-        if (Benchmark::doNotRun()) {
-            return '';
-        }
-        $output = '';
-        if (! empty(Benchmark::$times)) {
-            $total = 0;
-            $output .= $formatted
-                ? '<span style="color:#999999; font-size:.8em;">( time in milliseconds )</span><br />'
-                : '';
-            foreach (Benchmark::$times as $timer_name => $total_time) {
-                $output .= Benchmark::formatTime($timer_name, $total_time, $formatted);
-                $output .= $formatted ? '<br />'  : "\n";
-                $total += $total_time;
-            }
-            if($formatted) {
-                $output .= '<br />';
-                $output .= '<h4>TOTAL TIME</h4>';
-                $output .= Benchmark::formatTime('', $total, $formatted);
-                $output .= '<span style="color:#999999; font-size:.8em;"> milliseconds</span><br />';
-                $output .= '<br />';
-                $output .= '<h5>Performance scale (from best to worse)</h5>';
-                $output .= '<span style="color:mediumpurple">Like wow! How about a Scooby snack?</span><br />';
-                $output .= '<span style="color:deepskyblue">Like...no way man!</span><br />';
-                $output .= '<span style="color:limegreen">Like...groovy!</span><br />';
-                $output .= '<span style="color:gold">Ruh Oh</span><br />';
-                $output .= '<span style="color:darkorange">Zoinks!</span><br />';
-                $output .= '<span style="color:red">Like...HEEELLLP</span><br />';
-            }
-        }
-        if (! empty(Benchmark::$memory_usage)) {
-            $output .= $formatted
-                ? '<h5>Memory</h5>' . implode('<br />', Benchmark::$memory_usage)
-                : implode("\n", Benchmark::$memory_usage);
-        }
-        if (empty($output)) {
-            return '';
-        }
-        $output = $formatted
-            ? '<div style="border:1px solid #dddddd; background-color:#ffffff;'
-              . (is_admin()
-                ? ' margin:2em 2em 2em 180px;'
-                : ' margin:2em;')
-              . ' padding:2em;">'
-              . '<h4>BENCHMARKING</h4>'
-              . $output
-              . '</div>'
-            : $output;
-        return $output;
-    }
-
-
-
-    /**
-     * @param bool $echo
-     * @param bool $formatted
-     * @return string
-     */
-    public static function displayResults($echo = true, $formatted = true)
-    {
-        $results = Benchmark::generateResults($formatted);
-        if ($echo) {
-            echo $results;
-            $results = '';
-        }
-        return $results;
-    }
-
-
-
-    /**
-     * @param string $filepath
-     * @param bool   $formatted
-     * @param bool   $append
-     */
-    public static function writeResultsToFile($filepath = '', $formatted = true, $append = true)
-    {
-        $filepath = ! empty($filepath) && is_readable(dirname($filepath))
-            ? $filepath
-            : '';
-        if( empty($filepath)) {
-            $filepath = EVENT_ESPRESSO_UPLOAD_DIR . 'logs/benchmarking-' . date('Y-m-d') . '.html';
-        }
-        file_put_contents(
-            $filepath,
-            "\n" . date('Y-m-d H:i:s') . Benchmark::generateResults($formatted),
-            $append ? FILE_APPEND | LOCK_EX : LOCK_EX
-        );
-    }
-
-
-
-    /**
-     * Converts a measure of memory bytes into the most logical units (eg kb, mb, etc)
-     *
-     * @param int $size
-     * @return string
-     */
-    public static function convert($size)
-    {
-        $unit = array('b', 'kb', 'mb', 'gb', 'tb', 'pb');
-        return round(
-            $size / pow(1024, $i = floor(log($size, 1024))),
-            2
-        ) . ' ' . $unit[absint($i)];
-    }
-
-
-
-    /**
-     * @param string $timer_name
-     * @param float  $total_time
-     * @param bool   $formatted
-     * @return string
-     */
-    public static function formatTime($timer_name, $total_time, $formatted = true)
-    {
-        $total_time *= 1000;
-        switch ($total_time) {
-            case $total_time > 12500 :
-                $color = 'red';
-                $bold = 'bold';
-                break;
-            case $total_time > 2500 :
-                $color = 'darkorange';
-                $bold = 'bold';
-                break;
-            case $total_time > 500 :
-                $color = 'gold';
-                $bold = 'bold';
-                break;
-            case $total_time > 100 :
-                $color = 'limegreen';
-                $bold = 'normal';
-                break;
-            case $total_time > 20 :
-                $color = 'deepskyblue';
-                $bold = 'normal';
-                break;
-            default :
-                $color = 'mediumpurple';
-                $bold = 'normal';
-                break;
-        }
-        return $formatted
-            ? '<span style="min-width: 10px; margin:0 1em; color:'
-               . $color
-               . '; font-weight:'
-               . $bold
-               . '; font-size:1.2em;">'
-               . str_pad(number_format($total_time, 3), 9, '0', STR_PAD_LEFT)
-               . '</span> '
-               . $timer_name
-            :  str_pad(number_format($total_time, 3), 9, '0', STR_PAD_LEFT);
-    }
+	/**
+	 * array containing the start time for the timers
+	 */
+	private static $start_times;
+
+	/**
+	 * array containing all the timer'd times, which can be outputted via show_times()
+	 */
+	private static $times = array();
+
+	/**
+	 * @var array
+	 */
+	protected static $memory_usage = array();
+
+
+
+	/**
+	 * whether to benchmark code or not
+	 */
+	public static function doNotRun()
+	{
+		return ! WP_DEBUG || (defined('DOING_AJAX') && DOING_AJAX);
+	}
+
+
+
+	/**
+	 * resetTimes
+	 */
+	public static function resetTimes()
+	{
+		Benchmark::$times = array();
+	}
+
+
+
+	/**
+	 * Add Benchmark::startTimer() before a block of code you want to measure the performance of
+	 *
+	 * @param null $timer_name
+	 */
+	public static function startTimer($timer_name = null)
+	{
+		if (Benchmark::doNotRun()) {
+			return;
+		}
+		$timer_name = $timer_name !== '' ? $timer_name : get_called_class();
+		Benchmark::$start_times[$timer_name] = microtime(true);
+	}
+
+
+
+	/**
+	 * Add Benchmark::stopTimer() after a block of code you want to measure the performance of
+	 *
+	 * @param string $timer_name
+	 */
+	public static function stopTimer($timer_name = '')
+	{
+		if (Benchmark::doNotRun()) {
+			return;
+		}
+		$timer_name = $timer_name !== '' ? $timer_name : get_called_class();
+		if (isset(Benchmark::$start_times[$timer_name])) {
+			$start_time = Benchmark::$start_times[$timer_name];
+			unset(Benchmark::$start_times[$timer_name]);
+		} else {
+			$start_time = array_pop(Benchmark::$start_times);
+		}
+		Benchmark::$times[$timer_name] = number_format(microtime(true) - $start_time, 8);
+	}
+
+
+
+	/**
+	 * Measure the memory usage by PHP so far.
+	 *
+	 * @param string  $label      The label to show for this time eg "Start of calling Some_Class::some_function"
+	 * @param boolean $output_now whether to echo now, or wait until EEH_Debug_Tools::show_times() is called
+	 * @param bool    $formatted
+	 * @return void
+	 */
+	public static function measureMemory($label = 'memory usage', $output_now = false, $formatted = true)
+	{
+		if (Benchmark::doNotRun()) {
+			return;
+		}
+		$memory_used = Benchmark::convert(memory_get_usage(true));
+		Benchmark::$memory_usage[$label] = $memory_used;
+		if ($output_now) {
+			echo $formatted
+				? "<br>{$label} : {$memory_used}"
+				: "\n {$label} : {$memory_used}";
+		}
+	}
+
+
+
+	/**
+	 * will display the benchmarking results at shutdown
+	 *
+	 * @param bool $formatted
+	 * @return void
+	 */
+	public static function displayResultsAtShutdown($formatted = true)
+	{
+		add_action(
+			'shutdown',
+			function () use ($formatted) {
+				Benchmark::displayResults(true, $formatted);
+			}
+		);
+	}
+
+
+
+	/**
+	 * will display the benchmarking results at shutdown
+	 *
+	 * @param string $filepath
+	 * @param bool   $formatted
+	 * @param bool   $append
+	 * @return void
+	 */
+	public static function writeResultsAtShutdown($filepath = '', $formatted = true, $append = true)
+	{
+		add_action(
+			'shutdown',
+			function () use ($filepath, $formatted, $append) {
+				Benchmark::writeResultsToFile($filepath, $formatted, $append);
+			}
+		);
+	}
+
+
+
+	/**
+	 * @param bool $formatted
+	 * @return string
+	 */
+	private static function generateResults($formatted = true)
+	{
+		if (Benchmark::doNotRun()) {
+			return '';
+		}
+		$output = '';
+		if (! empty(Benchmark::$times)) {
+			$total = 0;
+			$output .= $formatted
+				? '<span style="color:#999999; font-size:.8em;">( time in milliseconds )</span><br />'
+				: '';
+			foreach (Benchmark::$times as $timer_name => $total_time) {
+				$output .= Benchmark::formatTime($timer_name, $total_time, $formatted);
+				$output .= $formatted ? '<br />'  : "\n";
+				$total += $total_time;
+			}
+			if($formatted) {
+				$output .= '<br />';
+				$output .= '<h4>TOTAL TIME</h4>';
+				$output .= Benchmark::formatTime('', $total, $formatted);
+				$output .= '<span style="color:#999999; font-size:.8em;"> milliseconds</span><br />';
+				$output .= '<br />';
+				$output .= '<h5>Performance scale (from best to worse)</h5>';
+				$output .= '<span style="color:mediumpurple">Like wow! How about a Scooby snack?</span><br />';
+				$output .= '<span style="color:deepskyblue">Like...no way man!</span><br />';
+				$output .= '<span style="color:limegreen">Like...groovy!</span><br />';
+				$output .= '<span style="color:gold">Ruh Oh</span><br />';
+				$output .= '<span style="color:darkorange">Zoinks!</span><br />';
+				$output .= '<span style="color:red">Like...HEEELLLP</span><br />';
+			}
+		}
+		if (! empty(Benchmark::$memory_usage)) {
+			$output .= $formatted
+				? '<h5>Memory</h5>' . implode('<br />', Benchmark::$memory_usage)
+				: implode("\n", Benchmark::$memory_usage);
+		}
+		if (empty($output)) {
+			return '';
+		}
+		$output = $formatted
+			? '<div style="border:1px solid #dddddd; background-color:#ffffff;'
+			  . (is_admin()
+				? ' margin:2em 2em 2em 180px;'
+				: ' margin:2em;')
+			  . ' padding:2em;">'
+			  . '<h4>BENCHMARKING</h4>'
+			  . $output
+			  . '</div>'
+			: $output;
+		return $output;
+	}
+
+
+
+	/**
+	 * @param bool $echo
+	 * @param bool $formatted
+	 * @return string
+	 */
+	public static function displayResults($echo = true, $formatted = true)
+	{
+		$results = Benchmark::generateResults($formatted);
+		if ($echo) {
+			echo $results;
+			$results = '';
+		}
+		return $results;
+	}
+
+
+
+	/**
+	 * @param string $filepath
+	 * @param bool   $formatted
+	 * @param bool   $append
+	 */
+	public static function writeResultsToFile($filepath = '', $formatted = true, $append = true)
+	{
+		$filepath = ! empty($filepath) && is_readable(dirname($filepath))
+			? $filepath
+			: '';
+		if( empty($filepath)) {
+			$filepath = EVENT_ESPRESSO_UPLOAD_DIR . 'logs/benchmarking-' . date('Y-m-d') . '.html';
+		}
+		file_put_contents(
+			$filepath,
+			"\n" . date('Y-m-d H:i:s') . Benchmark::generateResults($formatted),
+			$append ? FILE_APPEND | LOCK_EX : LOCK_EX
+		);
+	}
+
+
+
+	/**
+	 * Converts a measure of memory bytes into the most logical units (eg kb, mb, etc)
+	 *
+	 * @param int $size
+	 * @return string
+	 */
+	public static function convert($size)
+	{
+		$unit = array('b', 'kb', 'mb', 'gb', 'tb', 'pb');
+		return round(
+			$size / pow(1024, $i = floor(log($size, 1024))),
+			2
+		) . ' ' . $unit[absint($i)];
+	}
+
+
+
+	/**
+	 * @param string $timer_name
+	 * @param float  $total_time
+	 * @param bool   $formatted
+	 * @return string
+	 */
+	public static function formatTime($timer_name, $total_time, $formatted = true)
+	{
+		$total_time *= 1000;
+		switch ($total_time) {
+			case $total_time > 12500 :
+				$color = 'red';
+				$bold = 'bold';
+				break;
+			case $total_time > 2500 :
+				$color = 'darkorange';
+				$bold = 'bold';
+				break;
+			case $total_time > 500 :
+				$color = 'gold';
+				$bold = 'bold';
+				break;
+			case $total_time > 100 :
+				$color = 'limegreen';
+				$bold = 'normal';
+				break;
+			case $total_time > 20 :
+				$color = 'deepskyblue';
+				$bold = 'normal';
+				break;
+			default :
+				$color = 'mediumpurple';
+				$bold = 'normal';
+				break;
+		}
+		return $formatted
+			? '<span style="min-width: 10px; margin:0 1em; color:'
+			   . $color
+			   . '; font-weight:'
+			   . $bold
+			   . '; font-size:1.2em;">'
+			   . str_pad(number_format($total_time, 3), 9, '0', STR_PAD_LEFT)
+			   . '</span> '
+			   . $timer_name
+			:  str_pad(number_format($total_time, 3), 9, '0', STR_PAD_LEFT);
+	}