eventespresso / event-espresso-core

modules/ticket_selector/TicketDetails.php

Indentation +152 added lines, -152 removed lines

@@ -17,158 +17,158 @@
 {
 
 
-    /**
-     * @var \EE_Ticket $ticket
-     */
-    protected $ticket;
-
-    /**
-     * @var \EE_Ticket_Selector_Config $template_settings
-     */
-    protected $template_settings;
-
-    /**
-     * @var string $date_format
-     */
-    protected $date_format;
-
-    /**
-     * @var string $time_format
-     */
-    protected $time_format;
-
-    /**
-     * @var boolean $event_is_expired
-     */
-    protected $event_is_expired;
-
-
-
-    /**
-     * TicketDetails constructor.
-     *
-     * @param \EE_Ticket                 $ticket
-     * @param \EE_Ticket_Selector_Config $template_settings
-     * @param array                      $template_args
-     */
-    public function __construct(
-        \EE_Ticket $ticket,
-        \EE_Ticket_Selector_Config $template_settings,
-        array $template_args
-    )
-    {
-        $this->ticket            = $ticket;
-        $this->template_settings = $template_settings;
-        $this->date_format       = $template_args['date_format'];
-        $this->time_format       = $template_args['time_format'];
-        $this->event_is_expired  = $template_args['event_is_expired'];
-    }
-
-
-
-    /**
-     * @return bool
-     */
-    public function showTicketDetails()
-    {
-        return $this->template_settings->show_ticket_details;
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function getShowHideLinks()
-    {
-        if ( ! $this->showTicketDetails()) {
-            return '';
-        }
-        return \EEH_HTML::link(
-            '',
-            sprintf(__('show%1$sdetails%1$s+', 'event_espresso'), ' '),
-            esc_attr(
-                apply_filters(
-                    'FHEE__ticket_selector_chart_template__show_ticket_details_link_title',
-                    __('click to show additional ticket details', 'event_espresso')
-                )
-            ),
-            "display-{$this->cssId()}",
-            'display-tckt-slctr-tkt-details display-the-hidden lt-grey-text smaller-text hide-if-no-js',
-            '',
-            'rel="' . $this->cssId() . '"'
-        ) . \EEH_HTML::link(
-            '',
-            sprintf(__('hide%1$sdetails%1$s-', 'event_espresso'), ' '),
-            esc_attr(
-                apply_filters(
-                    'FHEE__ticket_selector_chart_template__hide_ticket_details_link_title',
-                    __('click to hide additional ticket details', 'event_espresso')
-                )
-            ),
-            "hide-{$this->cssId()}",
-            'hide-tckt-slctr-tkt-details hide-the-displayed lt-grey-text smaller-text hide-if-no-js',
-            'display:none;',
-            'rel="' . $this->cssId() . '"'
-        );
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function cssId()
-    {
-        return apply_filters(
-            'FHEE__ticket_selector_chart_template__ticket_details_css_id',
-            "tckt-slctr-tkt-details-{$this->ticket->get_event_ID()}-{$this->ticket->ID()}"
-        );
-    }
-
-
-
-    /**
-     * @param float $ticket_price
-     * @param int   $remaining
-     * @param int   $cols
-     * @return string
-     */
-    public function display(
-        $ticket_price = 0.00,
-        $remaining,
-        $cols = 2
-    ) {
-        $template_args = array();
-        $template_args['ticket'] = $this->ticket;
-        $template_args['ticket_price'] = $ticket_price;
-        $template_args['remaining'] = $remaining;
-        $template_args['cols'] = $cols;
-        $template_args['show_ticket_details'] = $this->template_settings->show_ticket_details;
-        $template_args['show_ticket_sale_columns'] = $this->template_settings->show_ticket_sale_columns;
-        $template_args['ticket_details_row_class'] = espresso_get_object_css_class($this->ticket, '', 'details');
-        $template_args['ticket_details_css_id'] = $this->cssId();
-        $template_args['display_ticket_price'] = $ticket_price !== 0 && apply_filters(
-            'FHEE__ticket_selector_chart_template__display_ticket_price_details',
-            true
-        );
-        $template_args['price_breakdown_heading'] = apply_filters(
-            'FHEE__ticket_selector_chart_template__ticket_details_price_breakdown_heading',
-            esc_html__('Price', 'event_espresso')
-        );
-        $template_args['date_format'] = $this->date_format;
-        $template_args['time_format'] = $this->time_format;
-        $template_args['event_is_expired'] = $this->event_is_expired;
-
-        return \EEH_Template::locate_template(
-            apply_filters(
-                'FHEE__EventEspresso_modules_ticket_selector_TicketDetails__display__template_path',
-                TICKET_SELECTOR_TEMPLATES_PATH . 'ticket_details.template.php',
-                $this->ticket
-            ),
-            $template_args
-        );
-    }
+	/**
+	 * @var \EE_Ticket $ticket
+	 */
+	protected $ticket;
+
+	/**
+	 * @var \EE_Ticket_Selector_Config $template_settings
+	 */
+	protected $template_settings;
+
+	/**
+	 * @var string $date_format
+	 */
+	protected $date_format;
+
+	/**
+	 * @var string $time_format
+	 */
+	protected $time_format;
+
+	/**
+	 * @var boolean $event_is_expired
+	 */
+	protected $event_is_expired;
+
+
+
+	/**
+	 * TicketDetails constructor.
+	 *
+	 * @param \EE_Ticket                 $ticket
+	 * @param \EE_Ticket_Selector_Config $template_settings
+	 * @param array                      $template_args
+	 */
+	public function __construct(
+		\EE_Ticket $ticket,
+		\EE_Ticket_Selector_Config $template_settings,
+		array $template_args
+	)
+	{
+		$this->ticket            = $ticket;
+		$this->template_settings = $template_settings;
+		$this->date_format       = $template_args['date_format'];
+		$this->time_format       = $template_args['time_format'];
+		$this->event_is_expired  = $template_args['event_is_expired'];
+	}
+
+
+
+	/**
+	 * @return bool
+	 */
+	public function showTicketDetails()
+	{
+		return $this->template_settings->show_ticket_details;
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function getShowHideLinks()
+	{
+		if ( ! $this->showTicketDetails()) {
+			return '';
+		}
+		return \EEH_HTML::link(
+			'',
+			sprintf(__('show%1$sdetails%1$s+', 'event_espresso'), ' '),
+			esc_attr(
+				apply_filters(
+					'FHEE__ticket_selector_chart_template__show_ticket_details_link_title',
+					__('click to show additional ticket details', 'event_espresso')
+				)
+			),
+			"display-{$this->cssId()}",
+			'display-tckt-slctr-tkt-details display-the-hidden lt-grey-text smaller-text hide-if-no-js',
+			'',
+			'rel="' . $this->cssId() . '"'
+		) . \EEH_HTML::link(
+			'',
+			sprintf(__('hide%1$sdetails%1$s-', 'event_espresso'), ' '),
+			esc_attr(
+				apply_filters(
+					'FHEE__ticket_selector_chart_template__hide_ticket_details_link_title',
+					__('click to hide additional ticket details', 'event_espresso')
+				)
+			),
+			"hide-{$this->cssId()}",
+			'hide-tckt-slctr-tkt-details hide-the-displayed lt-grey-text smaller-text hide-if-no-js',
+			'display:none;',
+			'rel="' . $this->cssId() . '"'
+		);
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function cssId()
+	{
+		return apply_filters(
+			'FHEE__ticket_selector_chart_template__ticket_details_css_id',
+			"tckt-slctr-tkt-details-{$this->ticket->get_event_ID()}-{$this->ticket->ID()}"
+		);
+	}
+
+
+
+	/**
+	 * @param float $ticket_price
+	 * @param int   $remaining
+	 * @param int   $cols
+	 * @return string
+	 */
+	public function display(
+		$ticket_price = 0.00,
+		$remaining,
+		$cols = 2
+	) {
+		$template_args = array();
+		$template_args['ticket'] = $this->ticket;
+		$template_args['ticket_price'] = $ticket_price;
+		$template_args['remaining'] = $remaining;
+		$template_args['cols'] = $cols;
+		$template_args['show_ticket_details'] = $this->template_settings->show_ticket_details;
+		$template_args['show_ticket_sale_columns'] = $this->template_settings->show_ticket_sale_columns;
+		$template_args['ticket_details_row_class'] = espresso_get_object_css_class($this->ticket, '', 'details');
+		$template_args['ticket_details_css_id'] = $this->cssId();
+		$template_args['display_ticket_price'] = $ticket_price !== 0 && apply_filters(
+			'FHEE__ticket_selector_chart_template__display_ticket_price_details',
+			true
+		);
+		$template_args['price_breakdown_heading'] = apply_filters(
+			'FHEE__ticket_selector_chart_template__ticket_details_price_breakdown_heading',
+			esc_html__('Price', 'event_espresso')
+		);
+		$template_args['date_format'] = $this->date_format;
+		$template_args['time_format'] = $this->time_format;
+		$template_args['event_is_expired'] = $this->event_is_expired;
+
+		return \EEH_Template::locate_template(
+			apply_filters(
+				'FHEE__EventEspresso_modules_ticket_selector_TicketDetails__display__template_path',
+				TICKET_SELECTOR_TEMPLATES_PATH . 'ticket_details.template.php',
+				$this->ticket
+			),
+			$template_args
+		);
+	}
 
 }
 // End of file TicketDetails.php

Spacing +4 added lines, -4 removed lines

@@ -96,8 +96,8 @@ 
             "display-{$this->cssId()}",
             'display-tckt-slctr-tkt-details display-the-hidden lt-grey-text smaller-text hide-if-no-js',
             '',
-            'rel="' . $this->cssId() . '"'
-        ) . \EEH_HTML::link(
+            'rel="'.$this->cssId().'"'
+        ).\EEH_HTML::link(
             '',
             sprintf(__('hide%1$sdetails%1$s-', 'event_espresso'), ' '),
             esc_attr(
@@ -109,7 +109,7 @@ 
             "hide-{$this->cssId()}",
             'hide-tckt-slctr-tkt-details hide-the-displayed lt-grey-text smaller-text hide-if-no-js',
             'display:none;',
-            'rel="' . $this->cssId() . '"'
+            'rel="'.$this->cssId().'"'
         );
     }
 
@@ -163,7 +163,7 @@ 
         return \EEH_Template::locate_template(
             apply_filters(
                 'FHEE__EventEspresso_modules_ticket_selector_TicketDetails__display__template_path',
-                TICKET_SELECTOR_TEMPLATES_PATH . 'ticket_details.template.php',
+                TICKET_SELECTOR_TEMPLATES_PATH.'ticket_details.template.php',
                 $this->ticket
             ),
             $template_args

modules/ticket_selector/templates/simple_ticket_selector.template.php

Indentation +9 added lines, -9 removed lines

@@ -6,14 +6,14 @@ 
 <input type="hidden" name="tkt-slctr-ticket-id-<?php echo $EVT_ID; ?>[]" value="<?php echo $TKT_ID; ?>"/>
 <?php
 if ( $ticket instanceof EE_Ticket ) {
-    do_action( 'AHEE__ticket_selector_chart__template__before_ticket_selector', $event );
-    $ticket_description = $ticket->description();
-    $ticket_description .= ! empty( $ticket_description )
-        ? '<br />' . $ticket_status_display
-        : $ticket_status_display;
-    if ( ! strpos( $ticket_description, '<div' ) ) {
-        $ticket_description = "<p>{$ticket_description}</p>";
-    }
+	do_action( 'AHEE__ticket_selector_chart__template__before_ticket_selector', $event );
+	$ticket_description = $ticket->description();
+	$ticket_description .= ! empty( $ticket_description )
+		? '<br />' . $ticket_status_display
+		: $ticket_status_display;
+	if ( ! strpos( $ticket_description, '<div' ) ) {
+		$ticket_description = "<p>{$ticket_description}</p>";
+	}
 ?>
 <div id="no-tkt-slctr-ticket-dv-<?php echo $EVT_ID; ?>" class="no-tkt-slctr-ticket-dv">
 <div class="no-tkt-slctr-ticket-content-dv">
@@ -23,6 +23,6 @@ 
     <?php } ?>
 </div>
 <?php
-    do_action( 'AHEE__ticket_selector_chart__template__after_ticket_selector', $EVT_ID, $event );
+	do_action( 'AHEE__ticket_selector_chart__template__after_ticket_selector', $EVT_ID, $event );
 }
 ?>

Spacing +7 added lines, -7 removed lines

@@ -5,24 +5,24 @@
 <input type="hidden" name="tkt-slctr-qty-<?php echo $EVT_ID; ?>[]" value="1"/>
 <input type="hidden" name="tkt-slctr-ticket-id-<?php echo $EVT_ID; ?>[]" value="<?php echo $TKT_ID; ?>"/>
 <?php
-if ( $ticket instanceof EE_Ticket ) {
-    do_action( 'AHEE__ticket_selector_chart__template__before_ticket_selector', $event );
+if ($ticket instanceof EE_Ticket) {
+    do_action('AHEE__ticket_selector_chart__template__before_ticket_selector', $event);
     $ticket_description = $ticket->description();
-    $ticket_description .= ! empty( $ticket_description )
-        ? '<br />' . $ticket_status_display
+    $ticket_description .= ! empty($ticket_description)
+        ? '<br />'.$ticket_status_display
         : $ticket_status_display;
-    if ( ! strpos( $ticket_description, '<div' ) ) {
+    if ( ! strpos($ticket_description, '<div')) {
         $ticket_description = "<p>{$ticket_description}</p>";
     }
 ?>
 <div id="no-tkt-slctr-ticket-dv-<?php echo $EVT_ID; ?>" class="no-tkt-slctr-ticket-dv">
 <div class="no-tkt-slctr-ticket-content-dv">
     <h5><?php echo $ticket->name(); ?></h5>
-    <?php if ( ! empty( $ticket_description ) ) { ?>
+    <?php if ( ! empty($ticket_description)) { ?>
     <?php echo $ticket_description; ?>
     <?php } ?>
 </div>
 <?php
-    do_action( 'AHEE__ticket_selector_chart__template__after_ticket_selector', $EVT_ID, $event );
+    do_action('AHEE__ticket_selector_chart__template__after_ticket_selector', $EVT_ID, $event);
 }
 ?>

modules/ticket_selector/TicketSelectorSimple.php

Indentation +34 added lines, -34 removed lines

@@ -18,46 +18,46 @@
 class TicketSelectorSimple extends TicketSelector
 {
 
-    /**
-     * @var \EE_Ticket $ticket
-     */
-    protected $ticket;
+	/**
+	 * @var \EE_Ticket $ticket
+	 */
+	protected $ticket;
 
 
 
-    /**
-     * TicketSelectorSimple constructor.
-     *
-     * @param \EE_Event  $event
-     * @param \EE_Ticket $ticket
-     * @param int        $max_attendees
-     * @param array      $template_args
-     */
-    public function __construct(\EE_Event $event, \EE_Ticket $ticket, $max_attendees, array $template_args)
-    {
-        $this->ticket = $ticket;
-        parent::__construct($event, array($this->ticket), $max_attendees, $template_args);
-    }
+	/**
+	 * TicketSelectorSimple constructor.
+	 *
+	 * @param \EE_Event  $event
+	 * @param \EE_Ticket $ticket
+	 * @param int        $max_attendees
+	 * @param array      $template_args
+	 */
+	public function __construct(\EE_Event $event, \EE_Ticket $ticket, $max_attendees, array $template_args)
+	{
+		$this->ticket = $ticket;
+		parent::__construct($event, array($this->ticket), $max_attendees, $template_args);
+	}
 
 
 
-    /**
-     * sets any and all template args that are required for this Ticket Selector
-     *
-     * @return void
-     */
-    protected function addTemplateArgs()
-    {
-        unset($this->template_args['tickets']);
-        $this->template_args['ticket'] = $this->ticket;
-        $ticket_selector_row = new TicketSelectorRowSimple(
-            $this->ticket,
-            $this->max_attendees,
-            $this->template_args['date_format']
-        );
-        $this->template_args['ticket_status_display'] = $ticket_selector_row->getTicketStatusDisplay();
-        $this->template_args['template_path'] = TICKET_SELECTOR_TEMPLATES_PATH . 'simple_ticket_selector.template.php';
-    }
+	/**
+	 * sets any and all template args that are required for this Ticket Selector
+	 *
+	 * @return void
+	 */
+	protected function addTemplateArgs()
+	{
+		unset($this->template_args['tickets']);
+		$this->template_args['ticket'] = $this->ticket;
+		$ticket_selector_row = new TicketSelectorRowSimple(
+			$this->ticket,
+			$this->max_attendees,
+			$this->template_args['date_format']
+		);
+		$this->template_args['ticket_status_display'] = $ticket_selector_row->getTicketStatusDisplay();
+		$this->template_args['template_path'] = TICKET_SELECTOR_TEMPLATES_PATH . 'simple_ticket_selector.template.php';
+	}
 
 
 }

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
             $this->template_args['date_format']
         );
         $this->template_args['ticket_status_display'] = $ticket_selector_row->getTicketStatusDisplay();
-        $this->template_args['template_path'] = TICKET_SELECTOR_TEMPLATES_PATH . 'simple_ticket_selector.template.php';
+        $this->template_args['template_path'] = TICKET_SELECTOR_TEMPLATES_PATH.'simple_ticket_selector.template.php';
     }
 
 

modules/ticket_selector/TicketSelector.php

Indentation +84 added lines, -84 removed lines

@@ -16,90 +16,90 @@
 abstract class TicketSelector
 {
 
-    /**
-     * @var \EE_Event $event
-     */
-    protected $event;
-
-    /**
-     * @var \EE_Ticket[] $tickets
-     */
-    protected $tickets;
-
-    /**
-     * @var int max_attendees
-     */
-    protected $max_attendees;
-
-    /**
-     * @var array $template_args
-     */
-    protected $template_args;
-
-
-
-    /**
-     * TicketSelectorSimple constructor.
-     *
-     * @param \EE_Event    $event
-     * @param \EE_Ticket[] $tickets
-     * @param int          $max_attendees
-     * @param array        $template_args
-     */
-    public function __construct(\EE_Event $event, array $tickets, $max_attendees, array $template_args)
-    {
-        $this->event         = $event;
-        $this->tickets       = $tickets;
-        $this->max_attendees = $max_attendees;
-        $this->template_args = $template_args;
-        $this->addTemplateArgs();
-    }
-
-
-
-    /**
-     * sets any and all template args that are required for this Ticket Selector
-     *
-     * @return void
-     */
-    abstract protected function addTemplateArgs();
-
-
-
-    /**
-     * loadTicketSelectorTemplate
-     *
-     * @return string
-     */
-    protected function loadTicketSelectorTemplate()
-    {
-        try {
-            return \EEH_Template::locate_template(
-                apply_filters(
-                    'FHEE__EE_Ticket_Selector__display_ticket_selector__template_path',
-                    $this->template_args['template_path'],
-                    $this->event
-                ),
-                $this->template_args
-            );
-        } catch (\Exception $e) {
-            \EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
-        }
-        return '';
-    }
-
-
-
-    /**
-     * The __toString method allows a class to decide how it will react when it is converted to a string.
-     *
-     * @return string
-     * @link http://php.net/manual/en/language.oop5.magic.php#language.oop5.magic.tostring
-     */
-    public function __toString()
-    {
-        return $this->loadTicketSelectorTemplate();
-    }
+	/**
+	 * @var \EE_Event $event
+	 */
+	protected $event;
+
+	/**
+	 * @var \EE_Ticket[] $tickets
+	 */
+	protected $tickets;
+
+	/**
+	 * @var int max_attendees
+	 */
+	protected $max_attendees;
+
+	/**
+	 * @var array $template_args
+	 */
+	protected $template_args;
+
+
+
+	/**
+	 * TicketSelectorSimple constructor.
+	 *
+	 * @param \EE_Event    $event
+	 * @param \EE_Ticket[] $tickets
+	 * @param int          $max_attendees
+	 * @param array        $template_args
+	 */
+	public function __construct(\EE_Event $event, array $tickets, $max_attendees, array $template_args)
+	{
+		$this->event         = $event;
+		$this->tickets       = $tickets;
+		$this->max_attendees = $max_attendees;
+		$this->template_args = $template_args;
+		$this->addTemplateArgs();
+	}
+
+
+
+	/**
+	 * sets any and all template args that are required for this Ticket Selector
+	 *
+	 * @return void
+	 */
+	abstract protected function addTemplateArgs();
+
+
+
+	/**
+	 * loadTicketSelectorTemplate
+	 *
+	 * @return string
+	 */
+	protected function loadTicketSelectorTemplate()
+	{
+		try {
+			return \EEH_Template::locate_template(
+				apply_filters(
+					'FHEE__EE_Ticket_Selector__display_ticket_selector__template_path',
+					$this->template_args['template_path'],
+					$this->event
+				),
+				$this->template_args
+			);
+		} catch (\Exception $e) {
+			\EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
+		}
+		return '';
+	}
+
+
+
+	/**
+	 * The __toString method allows a class to decide how it will react when it is converted to a string.
+	 *
+	 * @return string
+	 * @link http://php.net/manual/en/language.oop5.magic.php#language.oop5.magic.tostring
+	 */
+	public function __toString()
+	{
+		return $this->loadTicketSelectorTemplate();
+	}
 
 
 

core/libraries/form_sections/form_handlers/FormHandler.php

Indentation +27 added lines, -27 removed lines

@@ -119,19 +119,19 @@ 
 
 
 
-    /**
-     * Form constructor.
-     *
-     * @param string       $form_name
-     * @param string       $admin_name
-     * @param string       $slug
-     * @param string       $form_action
-     * @param string       $form_config
-     * @param \EE_Registry $registry
-     * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
-     * @throws \DomainException
-     * @throws \InvalidArgumentException
-     */
+	/**
+	 * Form constructor.
+	 *
+	 * @param string       $form_name
+	 * @param string       $admin_name
+	 * @param string       $slug
+	 * @param string       $form_action
+	 * @param string       $form_config
+	 * @param \EE_Registry $registry
+	 * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
+	 * @throws \DomainException
+	 * @throws \InvalidArgumentException
+	 */
 	public function __construct(
 		$form_name,
 		$admin_name,
@@ -172,7 +172,7 @@ 
 	 * @throws \LogicException
 	 */
 	public function form( $for_display = false ) {
-        if ( ! $this->formIsValid() ) {
+		if ( ! $this->formIsValid() ) {
 			return null;
 		}
 		if ( $for_display ) {
@@ -195,14 +195,14 @@ 
 	 * @throws LogicException
 	 */
 	public function formIsValid() {
-        if ( ! $this->form instanceof \EE_Form_Section_Proper ) {
+		if ( ! $this->form instanceof \EE_Form_Section_Proper ) {
 			static $generated = false;
 			if ( ! $generated ) {
 				$generated = true;
 				$form = $this->generate();
-                if ( $form instanceof \EE_Form_Section_Proper) {
-                    $this->setForm($form);
-                }
+				if ( $form instanceof \EE_Form_Section_Proper) {
+					$this->setForm($form);
+				}
 			}
 			return $this->verifyForm();
 		}
@@ -337,11 +337,11 @@ 
 
 
 
-    /**
-     * @param string $submit_btn_text
-     * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
-     * @throws \InvalidArgumentException
-     */
+	/**
+	 * @param string $submit_btn_text
+	 * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
+	 * @throws \InvalidArgumentException
+	 */
 	public function setSubmitBtnText( $submit_btn_text ) {
 		if ( ! is_string( $submit_btn_text ) ) {
 			throw new InvalidDataTypeException( '$submit_btn_text', $submit_btn_text, 'string' );
@@ -574,7 +574,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function display() {
-        $form_html = apply_filters(
+		$form_html = apply_filters(
 			'FHEE__EventEspresso_core_libraries_form_sections_form_handlers_FormHandler__display__before_form',
 			''
 		);
@@ -613,11 +613,11 @@ 
 	 */
 	public function process( $submitted_form_data = array() ) {
 		if ( ! $this->form()->was_submitted( $submitted_form_data ) ) {
-            throw new InvalidFormSubmissionException( $this->form_name );
+			throw new InvalidFormSubmissionException( $this->form_name );
 		}
-        $this->form( true )->receive_form_submission( $submitted_form_data );
+		$this->form( true )->receive_form_submission( $submitted_form_data );
 		if ( ! $this->form()->is_valid() ) {
-            throw new InvalidFormSubmissionException(
+			throw new InvalidFormSubmissionException(
 				$this->form_name,
 				sprintf(
 					__(

Spacing +71 added lines, -71 removed lines

@@ -10,8 +10,8 @@ 
 use EventEspresso\core\exceptions\InvalidDataTypeException;
 use EventEspresso\core\exceptions\InvalidFormSubmissionException;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -27,7 +27,7 @@ 
  * @author        Brent Christensen
  * @since         4.9.0
  */
-abstract class FormHandler implements FormHandlerInterface{
+abstract class FormHandler implements FormHandlerInterface {
 
 	/**
 	 * will add opening and closing HTML form tags as well as a submit button
@@ -140,12 +140,12 @@ 
 		$form_config = FormHandler::ADD_FORM_TAGS_AND_SUBMIT,
 		\EE_Registry $registry
 	) {
-		$this->setFormName( $form_name );
-		$this->setAdminName( $admin_name );
-		$this->setSlug( $slug );
-		$this->setFormAction( $form_action );
-		$this->setFormConfig( $form_config );
-		$this->setSubmitBtnText( __( 'Submit', 'event_espresso' ) );
+		$this->setFormName($form_name);
+		$this->setAdminName($admin_name);
+		$this->setSlug($slug);
+		$this->setFormAction($form_action);
+		$this->setFormConfig($form_config);
+		$this->setSubmitBtnText(__('Submit', 'event_espresso'));
 		$this->registry = $registry;
 	}
 
@@ -171,11 +171,11 @@ 
 	 * @throws \EE_Error
 	 * @throws \LogicException
 	 */
-	public function form( $for_display = false ) {
-        if ( ! $this->formIsValid() ) {
+	public function form($for_display = false) {
+        if ( ! $this->formIsValid()) {
 			return null;
 		}
-		if ( $for_display ) {
+		if ($for_display) {
 			$form_config = $this->formConfig();
 			if (
 				$form_config === FormHandler::ADD_FORM_TAGS_AND_SUBMIT
@@ -195,12 +195,12 @@ 
 	 * @throws LogicException
 	 */
 	public function formIsValid() {
-        if ( ! $this->form instanceof \EE_Form_Section_Proper ) {
+        if ( ! $this->form instanceof \EE_Form_Section_Proper) {
 			static $generated = false;
-			if ( ! $generated ) {
+			if ( ! $generated) {
 				$generated = true;
 				$form = $this->generate();
-                if ( $form instanceof \EE_Form_Section_Proper) {
+                if ($form instanceof \EE_Form_Section_Proper) {
                     $this->setForm($form);
                 }
 			}
@@ -216,12 +216,12 @@ 
 	 * @throws LogicException
 	 */
 	public function verifyForm() {
-		if ( $this->form instanceof \EE_Form_Section_Proper ) {
+		if ($this->form instanceof \EE_Form_Section_Proper) {
 			return true;
 		}
 		throw new LogicException(
 			sprintf(
-				__( 'The "%1$s" form is invalid or missing', 'event_espresso' ),
+				__('The "%1$s" form is invalid or missing', 'event_espresso'),
 				$this->form_name
 			)
 		);
@@ -232,7 +232,7 @@ 
 	/**
 	 * @param \EE_Form_Section_Proper $form
 	 */
-	public function setForm( \EE_Form_Section_Proper $form ) {
+	public function setForm(\EE_Form_Section_Proper $form) {
 		$this->form = $form;
 	}
 
@@ -250,8 +250,8 @@ 
 	/**
 	 * @param boolean $displayable
 	 */
-	public function setDisplayable( $displayable = false ) {
-		$this->displayable = filter_var( $displayable, FILTER_VALIDATE_BOOLEAN );
+	public function setDisplayable($displayable = false) {
+		$this->displayable = filter_var($displayable, FILTER_VALIDATE_BOOLEAN);
 	}
 
 
@@ -271,9 +271,9 @@ 
 	 * @param string $form_name
 	 * @throws InvalidDataTypeException
 	 */
-	public function setFormName( $form_name ) {
-		if ( ! is_string( $form_name ) ) {
-			throw new InvalidDataTypeException( '$form_name', $form_name, 'string' );
+	public function setFormName($form_name) {
+		if ( ! is_string($form_name)) {
+			throw new InvalidDataTypeException('$form_name', $form_name, 'string');
 		}
 		$this->form_name = $form_name;
 	}
@@ -295,9 +295,9 @@ 
 	 * @param string $admin_name
 	 * @throws InvalidDataTypeException
 	 */
-	public function setAdminName( $admin_name ) {
-		if ( ! is_string( $admin_name ) ) {
-			throw new InvalidDataTypeException( '$admin_name', $admin_name, 'string' );
+	public function setAdminName($admin_name) {
+		if ( ! is_string($admin_name)) {
+			throw new InvalidDataTypeException('$admin_name', $admin_name, 'string');
 		}
 		$this->admin_name = $admin_name;
 	}
@@ -319,9 +319,9 @@ 
 	 * @param string $slug
 	 * @throws InvalidDataTypeException
 	 */
-	public function setSlug( $slug ) {
-		if ( ! is_string( $slug ) ) {
-			throw new InvalidDataTypeException( '$slug', $slug, 'string' );
+	public function setSlug($slug) {
+		if ( ! is_string($slug)) {
+			throw new InvalidDataTypeException('$slug', $slug, 'string');
 		}
 		$this->slug = $slug;
 	}
@@ -342,13 +342,13 @@ 
      * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
      * @throws \InvalidArgumentException
      */
-	public function setSubmitBtnText( $submit_btn_text ) {
-		if ( ! is_string( $submit_btn_text ) ) {
-			throw new InvalidDataTypeException( '$submit_btn_text', $submit_btn_text, 'string' );
+	public function setSubmitBtnText($submit_btn_text) {
+		if ( ! is_string($submit_btn_text)) {
+			throw new InvalidDataTypeException('$submit_btn_text', $submit_btn_text, 'string');
 		}
-		if ( empty( $submit_btn_text ) ) {
+		if (empty($submit_btn_text)) {
 			throw new InvalidArgumentException(
-				__( 'Can not set Submit button text because an empty string was provided.', 'event_espresso' )
+				__('Can not set Submit button text because an empty string was provided.', 'event_espresso')
 			);
 		}
 		$this->submit_btn_text = $submit_btn_text;
@@ -360,8 +360,8 @@ 
 	 * @return string
 	 */
 	public function formAction() {
-		return ! empty( $this->form_args )
-			? add_query_arg( $this->form_args, $this->form_action )
+		return ! empty($this->form_args)
+			? add_query_arg($this->form_args, $this->form_action)
 			: $this->form_action;
 	}
 
@@ -371,9 +371,9 @@ 
 	 * @param string $form_action
 	 * @throws InvalidDataTypeException
 	 */
-	public function setFormAction( $form_action ) {
-		if ( ! is_string( $form_action ) ) {
-			throw new InvalidDataTypeException( '$form_action', $form_action, 'string' );
+	public function setFormAction($form_action) {
+		if ( ! is_string($form_action)) {
+			throw new InvalidDataTypeException('$form_action', $form_action, 'string');
 		}
 		$this->form_action = $form_action;
 	}
@@ -385,20 +385,20 @@ 
 	 * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
 	 * @throws \InvalidArgumentException
 	 */
-	public function addFormActionArgs( $form_args = array() ) {
-		if ( is_object( $form_args ) ) {
+	public function addFormActionArgs($form_args = array()) {
+		if (is_object($form_args)) {
 			throw new InvalidDataTypeException(
 				'$form_args',
 				$form_args,
 				'anything other than an object was expected.'
 			);
 		}
-		if ( empty( $form_args ) ) {
+		if (empty($form_args)) {
 			throw new InvalidArgumentException(
-				__( 'The redirect arguments can not be an empty array.', 'event_espresso' )
+				__('The redirect arguments can not be an empty array.', 'event_espresso')
 			);
 		}
-		$this->form_args = array_merge( $this->form_args, $form_args );
+		$this->form_args = array_merge($this->form_args, $form_args);
 	}
 
 
@@ -416,7 +416,7 @@ 
 	 * @param string $form_config
 	 * @throws DomainException
 	 */
-	public function setFormConfig( $form_config ) {
+	public function setFormConfig($form_config) {
 		if (
 			! in_array(
 				$form_config,
@@ -430,7 +430,7 @@ 
 		) {
 			throw new DomainException(
 				sprintf(
-					__( '"%1$s" is not a valid value for the form config. Please use one of the class constants on \EventEspresso\core\libraries\form_sections\form_handlers\Form', 'event_espresso' ),
+					__('"%1$s" is not a valid value for the form config. Please use one of the class constants on \EventEspresso\core\libraries\form_sections\form_handlers\Form', 'event_espresso'),
 					$form_config
 				)
 			);
@@ -450,7 +450,7 @@ 
 	 * @return boolean
 	 */
 	public function initialize() {
-		$this->form_has_errors = \EE_Error::has_error( true );
+		$this->form_has_errors = \EE_Error::has_error(true);
 		return true;
 	}
 
@@ -464,7 +464,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function enqueueStylesAndScripts() {
-		$this->form( false )->enqueue_js();
+		$this->form(false)->enqueue_js();
 
 	}
 
@@ -475,7 +475,7 @@ 
 	 *
 	 * @return EE_Form_Section_Proper
 	 */
-	abstract public function generate() ;
+	abstract public function generate();
 
 
 
@@ -485,15 +485,15 @@ 
 	 * @param string $text
 	 * @return \EE_Submit_Input
 	 */
-	public function generateSubmitButton( $text = '' ) {
-		$text = ! empty( $text ) ? $text : $this->submitBtnText();
+	public function generateSubmitButton($text = '') {
+		$text = ! empty($text) ? $text : $this->submitBtnText();
 		return new EE_Submit_Input(
 			array(
-				'html_name'             => 'ee-form-submit-' . $this->slug(),
-				'html_id'               => 'ee-form-submit-' . $this->slug(),
+				'html_name'             => 'ee-form-submit-'.$this->slug(),
+				'html_id'               => 'ee-form-submit-'.$this->slug(),
 				'html_class'            => 'ee-form-submit',
 				'html_label'            => ' ',
-				'other_html_attributes' => ' rel="' . $this->slug() . '"',
+				'other_html_attributes' => ' rel="'.$this->slug().'"',
 				'default'               => $text
 			)
 		);
@@ -509,12 +509,12 @@ 
 	 * @throws \LogicException
 	 * @throws \EE_Error
 	 */
-	public function appendSubmitButton( $text = '' ) {
-		if ( $this->form->subsection_exists( $this->slug() . '-submit-btn' ) ) {
+	public function appendSubmitButton($text = '') {
+		if ($this->form->subsection_exists($this->slug().'-submit-btn')) {
 			return;
 		}
 		$this->form->add_subsections(
-			array( $this->slug() . '-submit-btn' => $this->generateSubmitButton( $text ) ),
+			array($this->slug().'-submit-btn' => $this->generateSubmitButton($text)),
 			null,
 			false
 		);
@@ -528,18 +528,18 @@ 
 	 * @param string $text
 	 * @return \EE_Submit_Input
 	 */
-	public function generateCancelButton( $text = '' ) {
+	public function generateCancelButton($text = '') {
 		$cancel_button = new EE_Submit_Input(
 			array(
-				'html_name'             => 'ee-form-submit-' . $this->slug(), // YES! Same name as submit !!!
-				'html_id'               => 'ee-cancel-form-' . $this->slug(),
+				'html_name'             => 'ee-form-submit-'.$this->slug(), // YES! Same name as submit !!!
+				'html_id'               => 'ee-cancel-form-'.$this->slug(),
 				'html_class'            => 'ee-cancel-form',
 				'html_label'            => ' ',
-				'other_html_attributes' => ' rel="' . $this->slug() . '"',
-				'default'               => ! empty( $text ) ? $text : __( 'Cancel', 'event_espresso' )
+				'other_html_attributes' => ' rel="'.$this->slug().'"',
+				'default'               => ! empty($text) ? $text : __('Cancel', 'event_espresso')
 			)
 		);
-		$cancel_button->set_button_css_attributes( false );
+		$cancel_button->set_button_css_attributes(false);
 		return $cancel_button;
 	}
 
@@ -555,7 +555,7 @@ 
 		$this->form->add_subsections(
 			array(
 				'clear-submit-btn-float' => new \EE_Form_Section_HTML(
-					EEH_HTML::div( '', '', 'clear-float' ) . EEH_HTML::divx()
+					EEH_HTML::div('', '', 'clear-float').EEH_HTML::divx()
 				)
 			),
 			null,
@@ -583,9 +583,9 @@ 
 			$form_config === FormHandler::ADD_FORM_TAGS_AND_SUBMIT
 			|| $form_config === FormHandler::ADD_FORM_TAGS_ONLY
 		) {
-			$form_html .= $this->form()->form_open( $this->formAction() );
+			$form_html .= $this->form()->form_open($this->formAction());
 		}
-		$form_html .= $this->form( true )->get_html( $this->form_has_errors );
+		$form_html .= $this->form(true)->get_html($this->form_has_errors);
 		if (
 			$form_config === FormHandler::ADD_FORM_TAGS_AND_SUBMIT
 			|| $form_config === FormHandler::ADD_FORM_TAGS_ONLY
@@ -611,12 +611,12 @@ 
 	 * @throws \LogicException
 	 * @throws InvalidFormSubmissionException
 	 */
-	public function process( $submitted_form_data = array() ) {
-		if ( ! $this->form()->was_submitted( $submitted_form_data ) ) {
-            throw new InvalidFormSubmissionException( $this->form_name );
+	public function process($submitted_form_data = array()) {
+		if ( ! $this->form()->was_submitted($submitted_form_data)) {
+            throw new InvalidFormSubmissionException($this->form_name);
 		}
-        $this->form( true )->receive_form_submission( $submitted_form_data );
-		if ( ! $this->form()->is_valid() ) {
+        $this->form(true)->receive_form_submission($submitted_form_data);
+		if ( ! $this->form()->is_valid()) {
             throw new InvalidFormSubmissionException(
 				$this->form_name,
 				sprintf(

public/Espresso_Arabica_2014/content-espresso_events-datetimes.php

Spacing +4 added lines, -4 removed lines

@@ -1,15 +1,15 @@
 <?php
 //echo '<br/><h6 style="color:#2EA2CC;">'. __FILE__ . ' &nbsp; <span style="font-weight:normal;color:#E76700"> Line #: ' . __LINE__ . '</span></h6>';
 
-if ( is_single() || ( is_archive() && espresso_display_datetimes_in_event_list() ) ) :
+if (is_single() || (is_archive() && espresso_display_datetimes_in_event_list())) :
 global $post;
-do_action( 'AHEE_event_details_before_event_date', $post );
+do_action('AHEE_event_details_before_event_date', $post);
 ?>
 	<div class="event-datetimes">
-		<?php espresso_list_of_event_dates( $post->ID );?>
+		<?php espresso_list_of_event_dates($post->ID); ?>
 	</div>
 	<!-- .event-datetimes -->
 <?php
-do_action( 'AHEE_event_details_after_event_date', $post );
+do_action('AHEE_event_details_after_event_date', $post);
 endif;
 ?>
\ No newline at end of file

core/db_classes/EE_Event.class.php

Indentation +1276 added lines, -1276 removed lines

@@ -1,5 +1,5 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 
@@ -14,1368 +14,1368 @@ 
 class EE_Event extends EE_CPT_Base implements EEI_Line_Item_Object, EEI_Admin_Links, EEI_Has_Icon, EEI_Event
 {
 
-    /**
-     * cached value for the the logical active status for the event
-     *
-     * @see get_active_status()
-     * @var string
-     */
-    protected $_active_status = '';
-
-    /**
-     * This is just used for caching the Primary Datetime for the Event on initial retrieval
-     *
-     * @var EE_Datetime
-     */
-    protected $_Primary_Datetime;
-
-
-
-    /**
-     * @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_Event
-     */
-    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_Event
-     */
-    public static function new_instance_from_db($props_n_values = array(), $timezone = null)
-    {
-        return new self($props_n_values, true, $timezone);
-    }
-
-
-
-    /**
-     * Overrides parent set() method so that all calls to set( 'status', $status ) can be routed to internal methods
-     *
-     * @param string $field_name
-     * @param mixed  $field_value
-     * @param bool   $use_default
-     */
-    public function set($field_name, $field_value, $use_default = false)
-    {
-        switch ($field_name) {
-            case 'status' :
-                $this->set_status($field_value, $use_default);
-                break;
-            default :
-                parent::set($field_name, $field_value, $use_default);
-        }
-    }
-
-
-
-    /**
-     *    set_status
-     * Checks if event status is being changed to SOLD OUT
-     * and updates event meta data with previous event status
-     * so that we can revert things if/when the event is no longer sold out
-     *
-     * @access public
-     * @param string $new_status
-     * @param bool   $use_default
-     * @return bool|void
-     * @throws \EE_Error
-     */
-    public function set_status($new_status = null, $use_default = false)
-    {
-        // get current Event status
-        $old_status = $this->status();
-        // if status has changed
-        if ($old_status != $new_status) {
-            // TO sold_out
-            if ($new_status == EEM_Event::sold_out) {
-                // save the previous event status so that we can revert if the event is no longer sold out
-                $this->add_post_meta('_previous_event_status', $old_status);
-                do_action('AHEE__EE_Event__set_status__to_sold_out', $this, $old_status, $new_status);
-                // OR FROM  sold_out
-            } else if ($old_status == EEM_Event::sold_out) {
-                $this->delete_post_meta('_previous_event_status');
-                do_action('AHEE__EE_Event__set_status__from_sold_out', $this, $old_status, $new_status);
-            }
-            // update status
-            parent::set('status', $new_status, $use_default);
-            do_action('AHEE__EE_Event__set_status__after_update', $this);
-            return true;
-        } else {
-            // even though the old value matches the new value, it's still good to
-            // allow the parent set method to have a say
-            parent::set('status', $new_status, $use_default);
-            return true;
-        }
-    }
-
-
-
-    /**
-     * Gets all the datetimes for this event
-     *
-     * @param array $query_params like EEM_Base::get_all
-     * @return EE_Datetime[]
-     */
-    public function datetimes($query_params = array())
-    {
-        return $this->get_many_related('Datetime', $query_params);
-    }
-
-
-
-    /**
-     * Gets all the datetimes for this event, ordered by DTT_EVT_start in ascending order
-     *
-     * @return EE_Datetime[]
-     */
-    public function datetimes_in_chronological_order()
-    {
-        return $this->get_many_related('Datetime', array('order_by' => array('DTT_EVT_start' => 'ASC')));
-    }
-
-
-
-    /**
-     * Gets all the datetimes for this event, ordered by the DTT_order on the datetime.
-     * @darren, we should probably UNSET timezone on the EEM_Datetime model
-     * after running our query, so that this timezone isn't set for EVERY query
-     * on EEM_Datetime for the rest of the request, no?
-     *
-     * @param boolean $show_expired whether or not to include expired events
-     * @param boolean $show_deleted whether or not to include deleted events
-     * @param null    $limit
-     * @return \EE_Datetime[]
-     * @throws \EE_Error
-     */
-    public function datetimes_ordered($show_expired = true, $show_deleted = false, $limit = null)
-    {
-        return EEM_Datetime::instance($this->_timezone)->get_datetimes_for_event_ordered_by_DTT_order(
-            $this->ID(),
-            $show_expired,
-            $show_deleted,
-            $limit
-        );
-    }
-
-
-
-    /**
-     * Returns one related datetime. Mostly only used by some legacy code.
-     *
-     * @return EE_Datetime
-     */
-    public function first_datetime()
-    {
-        return $this->get_first_related('Datetime');
-    }
-
-
-
-    /**
-     * Returns the 'primary' datetime for the event
-     *
-     * @param bool $try_to_exclude_expired
-     * @param bool $try_to_exclude_deleted
-     * @return EE_Datetime
-     */
-    public function primary_datetime($try_to_exclude_expired = true, $try_to_exclude_deleted = true)
-    {
-        if ( ! empty ($this->_Primary_Datetime)) {
-            return $this->_Primary_Datetime;
-        }
-        $this->_Primary_Datetime = EEM_Datetime::instance($this->_timezone)
-                                               ->get_primary_datetime_for_event($this->ID(), $try_to_exclude_expired,
-                                                   $try_to_exclude_deleted);
-        return $this->_Primary_Datetime;
-    }
-
-
-
-    /**
-     * Gets all the tickets available for purchase of this event
-     *
-     * @param array $query_params like EEM_Base::get_all
-     * @return EE_Ticket[]
-     */
-    public function tickets($query_params = array())
-    {
-        //first get all datetimes
-        $datetimes = $this->datetimes_ordered();
-        if ( ! $datetimes) {
-            return array();
-        }
-        $datetime_ids = array();
-        foreach ($datetimes as $datetime) {
-            $datetime_ids[] = $datetime->ID();
-        }
-        $where_params = array('Datetime.DTT_ID' => array('IN', $datetime_ids));
-        //if incoming $query_params has where conditions let's merge but not override existing.
-        if (is_array($query_params) && isset($query_params[0])) {
-            $where_params = array_merge($query_params[0], $where_params);
-            unset($query_params[0]);
-        }
-        //now add $where_params to $query_params
-        $query_params[0] = $where_params;
-        return EEM_Ticket::instance()->get_all($query_params);
-    }
-
-
-
-    /**
-     * @return bool
-     */
-    public function additional_limit()
-    {
-        return $this->get('EVT_additional_limit');
-    }
-
-
-
-    /**
-     * @return bool
-     */
-    public function allow_overflow()
-    {
-        return $this->get('EVT_allow_overflow');
-    }
-
-
-
-    /**
-     * @return bool
-     */
-    public function created()
-    {
-        return $this->get('EVT_created');
-    }
-
-
-
-    /**
-     * @return bool
-     */
-    public function description()
-    {
-        return $this->get('EVT_desc');
-    }
-
-
-
-    /**
-     * Runs do_shortcode and wpautop on the description
-     *
-     * @return string of html
-     */
-    public function description_filtered()
-    {
-        return $this->get_pretty('EVT_desc');
-    }
-
-
-
-    /**
-     * @return bool
-     */
-    public function display_description()
-    {
-        return $this->get('EVT_display_desc');
-    }
-
-
-
-    /**
-     * @return bool
-     */
-    public function display_ticket_selector()
-    {
-        return (bool)$this->get('EVT_display_ticket_selector');
-    }
-
+	/**
+	 * cached value for the the logical active status for the event
+	 *
+	 * @see get_active_status()
+	 * @var string
+	 */
+	protected $_active_status = '';
+
+	/**
+	 * This is just used for caching the Primary Datetime for the Event on initial retrieval
+	 *
+	 * @var EE_Datetime
+	 */
+	protected $_Primary_Datetime;
+
+
+
+	/**
+	 * @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_Event
+	 */
+	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_Event
+	 */
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null)
+	{
+		return new self($props_n_values, true, $timezone);
+	}
+
+
+
+	/**
+	 * Overrides parent set() method so that all calls to set( 'status', $status ) can be routed to internal methods
+	 *
+	 * @param string $field_name
+	 * @param mixed  $field_value
+	 * @param bool   $use_default
+	 */
+	public function set($field_name, $field_value, $use_default = false)
+	{
+		switch ($field_name) {
+			case 'status' :
+				$this->set_status($field_value, $use_default);
+				break;
+			default :
+				parent::set($field_name, $field_value, $use_default);
+		}
+	}
+
+
+
+	/**
+	 *    set_status
+	 * Checks if event status is being changed to SOLD OUT
+	 * and updates event meta data with previous event status
+	 * so that we can revert things if/when the event is no longer sold out
+	 *
+	 * @access public
+	 * @param string $new_status
+	 * @param bool   $use_default
+	 * @return bool|void
+	 * @throws \EE_Error
+	 */
+	public function set_status($new_status = null, $use_default = false)
+	{
+		// get current Event status
+		$old_status = $this->status();
+		// if status has changed
+		if ($old_status != $new_status) {
+			// TO sold_out
+			if ($new_status == EEM_Event::sold_out) {
+				// save the previous event status so that we can revert if the event is no longer sold out
+				$this->add_post_meta('_previous_event_status', $old_status);
+				do_action('AHEE__EE_Event__set_status__to_sold_out', $this, $old_status, $new_status);
+				// OR FROM  sold_out
+			} else if ($old_status == EEM_Event::sold_out) {
+				$this->delete_post_meta('_previous_event_status');
+				do_action('AHEE__EE_Event__set_status__from_sold_out', $this, $old_status, $new_status);
+			}
+			// update status
+			parent::set('status', $new_status, $use_default);
+			do_action('AHEE__EE_Event__set_status__after_update', $this);
+			return true;
+		} else {
+			// even though the old value matches the new value, it's still good to
+			// allow the parent set method to have a say
+			parent::set('status', $new_status, $use_default);
+			return true;
+		}
+	}
+
+
+
+	/**
+	 * Gets all the datetimes for this event
+	 *
+	 * @param array $query_params like EEM_Base::get_all
+	 * @return EE_Datetime[]
+	 */
+	public function datetimes($query_params = array())
+	{
+		return $this->get_many_related('Datetime', $query_params);
+	}
+
+
+
+	/**
+	 * Gets all the datetimes for this event, ordered by DTT_EVT_start in ascending order
+	 *
+	 * @return EE_Datetime[]
+	 */
+	public function datetimes_in_chronological_order()
+	{
+		return $this->get_many_related('Datetime', array('order_by' => array('DTT_EVT_start' => 'ASC')));
+	}
+
+
+
+	/**
+	 * Gets all the datetimes for this event, ordered by the DTT_order on the datetime.
+	 * @darren, we should probably UNSET timezone on the EEM_Datetime model
+	 * after running our query, so that this timezone isn't set for EVERY query
+	 * on EEM_Datetime for the rest of the request, no?
+	 *
+	 * @param boolean $show_expired whether or not to include expired events
+	 * @param boolean $show_deleted whether or not to include deleted events
+	 * @param null    $limit
+	 * @return \EE_Datetime[]
+	 * @throws \EE_Error
+	 */
+	public function datetimes_ordered($show_expired = true, $show_deleted = false, $limit = null)
+	{
+		return EEM_Datetime::instance($this->_timezone)->get_datetimes_for_event_ordered_by_DTT_order(
+			$this->ID(),
+			$show_expired,
+			$show_deleted,
+			$limit
+		);
+	}
+
+
+
+	/**
+	 * Returns one related datetime. Mostly only used by some legacy code.
+	 *
+	 * @return EE_Datetime
+	 */
+	public function first_datetime()
+	{
+		return $this->get_first_related('Datetime');
+	}
+
+
+
+	/**
+	 * Returns the 'primary' datetime for the event
+	 *
+	 * @param bool $try_to_exclude_expired
+	 * @param bool $try_to_exclude_deleted
+	 * @return EE_Datetime
+	 */
+	public function primary_datetime($try_to_exclude_expired = true, $try_to_exclude_deleted = true)
+	{
+		if ( ! empty ($this->_Primary_Datetime)) {
+			return $this->_Primary_Datetime;
+		}
+		$this->_Primary_Datetime = EEM_Datetime::instance($this->_timezone)
+											   ->get_primary_datetime_for_event($this->ID(), $try_to_exclude_expired,
+												   $try_to_exclude_deleted);
+		return $this->_Primary_Datetime;
+	}
+
+
+
+	/**
+	 * Gets all the tickets available for purchase of this event
+	 *
+	 * @param array $query_params like EEM_Base::get_all
+	 * @return EE_Ticket[]
+	 */
+	public function tickets($query_params = array())
+	{
+		//first get all datetimes
+		$datetimes = $this->datetimes_ordered();
+		if ( ! $datetimes) {
+			return array();
+		}
+		$datetime_ids = array();
+		foreach ($datetimes as $datetime) {
+			$datetime_ids[] = $datetime->ID();
+		}
+		$where_params = array('Datetime.DTT_ID' => array('IN', $datetime_ids));
+		//if incoming $query_params has where conditions let's merge but not override existing.
+		if (is_array($query_params) && isset($query_params[0])) {
+			$where_params = array_merge($query_params[0], $where_params);
+			unset($query_params[0]);
+		}
+		//now add $where_params to $query_params
+		$query_params[0] = $where_params;
+		return EEM_Ticket::instance()->get_all($query_params);
+	}
+
+
+
+	/**
+	 * @return bool
+	 */
+	public function additional_limit()
+	{
+		return $this->get('EVT_additional_limit');
+	}
+
+
+
+	/**
+	 * @return bool
+	 */
+	public function allow_overflow()
+	{
+		return $this->get('EVT_allow_overflow');
+	}
+
+
+
+	/**
+	 * @return bool
+	 */
+	public function created()
+	{
+		return $this->get('EVT_created');
+	}
+
+
+
+	/**
+	 * @return bool
+	 */
+	public function description()
+	{
+		return $this->get('EVT_desc');
+	}
+
+
+
+	/**
+	 * Runs do_shortcode and wpautop on the description
+	 *
+	 * @return string of html
+	 */
+	public function description_filtered()
+	{
+		return $this->get_pretty('EVT_desc');
+	}
+
+
+
+	/**
+	 * @return bool
+	 */
+	public function display_description()
+	{
+		return $this->get('EVT_display_desc');
+	}
+
+
+
+	/**
+	 * @return bool
+	 */
+	public function display_ticket_selector()
+	{
+		return (bool)$this->get('EVT_display_ticket_selector');
+	}
+
 
 
-    /**
-     * @return bool
-     */
-    public function external_url()
-    {
-        return $this->get('EVT_external_URL');
-    }
+	/**
+	 * @return bool
+	 */
+	public function external_url()
+	{
+		return $this->get('EVT_external_URL');
+	}
 
 
 
-    /**
-     * @return bool
-     */
-    public function member_only()
-    {
-        return $this->get('EVT_member_only');
-    }
+	/**
+	 * @return bool
+	 */
+	public function member_only()
+	{
+		return $this->get('EVT_member_only');
+	}
 
 
 
-    /**
-     * @return bool
-     */
-    public function phone()
-    {
-        return $this->get('EVT_phone');
-    }
+	/**
+	 * @return bool
+	 */
+	public function phone()
+	{
+		return $this->get('EVT_phone');
+	}
 
 
 
-    /**
-     * @return bool
-     */
-    public function modified()
-    {
-        return $this->get('EVT_modified');
-    }
+	/**
+	 * @return bool
+	 */
+	public function modified()
+	{
+		return $this->get('EVT_modified');
+	}
 
 
 
-    /**
-     * @return bool
-     */
-    public function name()
-    {
-        return $this->get('EVT_name');
-    }
+	/**
+	 * @return bool
+	 */
+	public function name()
+	{
+		return $this->get('EVT_name');
+	}
 
 
 
-    /**
-     * @return bool
-     */
-    public function order()
-    {
-        return $this->get('EVT_order');
-    }
+	/**
+	 * @return bool
+	 */
+	public function order()
+	{
+		return $this->get('EVT_order');
+	}
 
 
 
-    /**
-     * @return bool|string
-     */
-    public function default_registration_status()
-    {
-        $event_default_registration_status = $this->get('EVT_default_registration_status');
-        return ! empty($event_default_registration_status) ? $event_default_registration_status
-            : EE_Registry::instance()->CFG->registration->default_STS_ID;
-    }
+	/**
+	 * @return bool|string
+	 */
+	public function default_registration_status()
+	{
+		$event_default_registration_status = $this->get('EVT_default_registration_status');
+		return ! empty($event_default_registration_status) ? $event_default_registration_status
+			: EE_Registry::instance()->CFG->registration->default_STS_ID;
+	}
 
 
 
-    /**
-     * @param int  $num_words
-     * @param null $more
-     * @param bool $not_full_desc
-     * @return bool|string
-     */
-    public function short_description($num_words = 55, $more = null, $not_full_desc = false)
-    {
-        $short_desc = $this->get('EVT_short_desc');
-        if ( ! empty($short_desc) || $not_full_desc) {
-            return $short_desc;
-        } else {
-            $full_desc = $this->get('EVT_desc');
-            return wp_trim_words($full_desc, $num_words, $more);
-        }
-    }
+	/**
+	 * @param int  $num_words
+	 * @param null $more
+	 * @param bool $not_full_desc
+	 * @return bool|string
+	 */
+	public function short_description($num_words = 55, $more = null, $not_full_desc = false)
+	{
+		$short_desc = $this->get('EVT_short_desc');
+		if ( ! empty($short_desc) || $not_full_desc) {
+			return $short_desc;
+		} else {
+			$full_desc = $this->get('EVT_desc');
+			return wp_trim_words($full_desc, $num_words, $more);
+		}
+	}
 
 
 
-    /**
-     * @return bool
-     */
-    public function slug()
-    {
-        return $this->get('EVT_slug');
-    }
+	/**
+	 * @return bool
+	 */
+	public function slug()
+	{
+		return $this->get('EVT_slug');
+	}
 
 
 
-    /**
-     * @return bool
-     */
-    public function timezone_string()
-    {
-        return $this->get('EVT_timezone_string');
-    }
+	/**
+	 * @return bool
+	 */
+	public function timezone_string()
+	{
+		return $this->get('EVT_timezone_string');
+	}
 
 
 
-    /**
-     * @return bool
-     */
-    public function visible_on()
-    {
-        return $this->get('EVT_visible_on');
-    }
+	/**
+	 * @return bool
+	 */
+	public function visible_on()
+	{
+		return $this->get('EVT_visible_on');
+	}
 
 
 
-    /**
-     * @return int
-     */
-    public function wp_user()
-    {
-        return $this->get('EVT_wp_user');
-    }
+	/**
+	 * @return int
+	 */
+	public function wp_user()
+	{
+		return $this->get('EVT_wp_user');
+	}
 
 
 
-    /**
-     * @return bool
-     */
-    public function donations()
-    {
-        return $this->get('EVT_donations');
-    }
+	/**
+	 * @return bool
+	 */
+	public function donations()
+	{
+		return $this->get('EVT_donations');
+	}
 
 
 
-    /**
-     * @param $limit
-     */
-    public function set_additional_limit($limit)
-    {
-        $this->set('EVT_additional_limit', $limit);
-    }
+	/**
+	 * @param $limit
+	 */
+	public function set_additional_limit($limit)
+	{
+		$this->set('EVT_additional_limit', $limit);
+	}
 
 
 
-    /**
-     * @param $created
-     */
-    public function set_created($created)
-    {
-        $this->set('EVT_created', $created);
-    }
+	/**
+	 * @param $created
+	 */
+	public function set_created($created)
+	{
+		$this->set('EVT_created', $created);
+	}
 
 
 
-    /**
-     * @param $desc
-     */
-    public function set_description($desc)
-    {
-        $this->set('EVT_desc', $desc);
-    }
+	/**
+	 * @param $desc
+	 */
+	public function set_description($desc)
+	{
+		$this->set('EVT_desc', $desc);
+	}
 
 
 
-    /**
-     * @param $display_desc
-     */
-    public function set_display_description($display_desc)
-    {
-        $this->set('EVT_display_desc', $display_desc);
-    }
+	/**
+	 * @param $display_desc
+	 */
+	public function set_display_description($display_desc)
+	{
+		$this->set('EVT_display_desc', $display_desc);
+	}
 
 
 
-    /**
-     * @param $display_ticket_selector
-     */
-    public function set_display_ticket_selector($display_ticket_selector)
-    {
-        $this->set('EVT_display_ticket_selector', $display_ticket_selector);
-    }
+	/**
+	 * @param $display_ticket_selector
+	 */
+	public function set_display_ticket_selector($display_ticket_selector)
+	{
+		$this->set('EVT_display_ticket_selector', $display_ticket_selector);
+	}
 
 
 
-    /**
-     * @param $external_url
-     */
-    public function set_external_url($external_url)
-    {
-        $this->set('EVT_external_URL', $external_url);
-    }
+	/**
+	 * @param $external_url
+	 */
+	public function set_external_url($external_url)
+	{
+		$this->set('EVT_external_URL', $external_url);
+	}
 
 
 
-    /**
-     * @param $member_only
-     */
-    public function set_member_only($member_only)
-    {
-        $this->set('EVT_member_only', $member_only);
-    }
+	/**
+	 * @param $member_only
+	 */
+	public function set_member_only($member_only)
+	{
+		$this->set('EVT_member_only', $member_only);
+	}
 
 
 
-    /**
-     * @param $event_phone
-     */
-    public function set_event_phone($event_phone)
-    {
-        $this->set('EVT_phone', $event_phone);
-    }
+	/**
+	 * @param $event_phone
+	 */
+	public function set_event_phone($event_phone)
+	{
+		$this->set('EVT_phone', $event_phone);
+	}
 
 
 
-    /**
-     * @param $modified
-     */
-    public function set_modified($modified)
-    {
-        $this->set('EVT_modified', $modified);
-    }
+	/**
+	 * @param $modified
+	 */
+	public function set_modified($modified)
+	{
+		$this->set('EVT_modified', $modified);
+	}
 
 
 
-    /**
-     * @param $name
-     */
-    public function set_name($name)
-    {
-        $this->set('EVT_name', $name);
-    }
+	/**
+	 * @param $name
+	 */
+	public function set_name($name)
+	{
+		$this->set('EVT_name', $name);
+	}
 
 
 
-    /**
-     * @param $order
-     */
-    public function set_order($order)
-    {
-        $this->set('EVT_order', $order);
-    }
+	/**
+	 * @param $order
+	 */
+	public function set_order($order)
+	{
+		$this->set('EVT_order', $order);
+	}
 
 
 
-    /**
-     * @param $short_desc
-     */
-    public function set_short_description($short_desc)
-    {
-        $this->set('EVT_short_desc', $short_desc);
-    }
+	/**
+	 * @param $short_desc
+	 */
+	public function set_short_description($short_desc)
+	{
+		$this->set('EVT_short_desc', $short_desc);
+	}
 
 
 
-    /**
-     * @param $slug
-     */
-    public function set_slug($slug)
-    {
-        $this->set('EVT_slug', $slug);
-    }
+	/**
+	 * @param $slug
+	 */
+	public function set_slug($slug)
+	{
+		$this->set('EVT_slug', $slug);
+	}
 
 
 
-    /**
-     * @param $timezone_string
-     */
-    public function set_timezone_string($timezone_string)
-    {
-        $this->set('EVT_timezone_string', $timezone_string);
-    }
+	/**
+	 * @param $timezone_string
+	 */
+	public function set_timezone_string($timezone_string)
+	{
+		$this->set('EVT_timezone_string', $timezone_string);
+	}
 
 
 
-    /**
-     * @param $visible_on
-     */
-    public function set_visible_on($visible_on)
-    {
-        $this->set('EVT_visible_on', $visible_on);
-    }
+	/**
+	 * @param $visible_on
+	 */
+	public function set_visible_on($visible_on)
+	{
+		$this->set('EVT_visible_on', $visible_on);
+	}
 
 
 
-    /**
-     * @param $wp_user
-     */
-    public function set_wp_user($wp_user)
-    {
-        $this->set('EVT_wp_user', $wp_user);
-    }
+	/**
+	 * @param $wp_user
+	 */
+	public function set_wp_user($wp_user)
+	{
+		$this->set('EVT_wp_user', $wp_user);
+	}
 
 
-
-    /**
-     * @param $default_registration_status
-     */
-    public function set_default_registration_status($default_registration_status)
-    {
-        $this->set('EVT_default_registration_status', $default_registration_status);
-    }
-
-
-
-    /**
-     * @param $donations
-     */
-    public function set_donations($donations)
-    {
-        $this->set('EVT_donations', $donations);
-    }
-
-
-
-    /**
-     * Adds a venue to this event
-     *
-     * @param EE_Venue /int $venue_id_or_obj
-     * @return EE_Venue
-     */
-    public function add_venue($venue_id_or_obj)
-    {
-        return $this->_add_relation_to($venue_id_or_obj, 'Venue');
-    }
-
-
-
-    /**
-     * Removes a venue from the event
-     *
-     * @param EE_Venue /int $venue_id_or_obj
-     * @return EE_Venue
-     */
-    public function remove_venue($venue_id_or_obj)
-    {
-        return $this->_remove_relation_to($venue_id_or_obj, 'Venue');
-    }
-
-
-
-    /**
-     * Gets all the venues related ot the event. May provide additional $query_params if desired
-     *
-     * @param array $query_params like EEM_Base::get_all's $query_params
-     * @return EE_Venue[]
-     */
-    public function venues($query_params = array())
-    {
-        return $this->get_many_related('Venue', $query_params);
-    }
-
-
-
-    /**
-     * check if event id is present and if event is published
-     *
-     * @access public
-     * @return boolean true yes, false no
-     */
-    private function _has_ID_and_is_published()
-    {
-        // first check if event id is present and not NULL, then check if this event is published (or any of the equivalent "published" statuses)
-        return ($this->ID() && $this->ID() !== null
-                && ($this->status() == 'publish'
-                    || $this->status()
-                       == EEM_Event::sold_out
-                    || $this->status() == EEM_Event::postponed
-                    || $this->status() == EEM_Event::cancelled)) ? true : false;
-    }
-
-
-
-    /**
-     * This simply compares the internal dates with NOW and determines if the event is upcoming or not.
-     *
-     * @access public
-     * @return boolean true yes, false no
-     */
-    public function is_upcoming()
-    {
-        // check if event id is present and if this event is published
-        if ($this->is_inactive()) {
-            return false;
-        }
-        // set initial value
-        $upcoming = false;
-        //next let's get all datetimes and loop through them
-        $datetimes = $this->datetimes_in_chronological_order();
-        foreach ($datetimes as $datetime) {
-            if ($datetime instanceof EE_Datetime) {
-                //if this dtt is expired then we continue cause one of the other datetimes might be upcoming.
-                if ($datetime->is_expired()) {
-                    continue;
-                }
-                //if this dtt is active then we return false.
-                if ($datetime->is_active()) {
-                    return false;
-                }
-                //otherwise let's check upcoming status
-                $upcoming = $datetime->is_upcoming();
-            }
-        }
-        return $upcoming;
-    }
-
-
-
-    /**
-     * @return bool
-     */
-    public function is_active()
-    {
-        // check if event id is present and if this event is published
-        if ($this->is_inactive()) {
-            return false;
-        }
-        // set initial value
-        $active = false;
-        //next let's get all datetimes and loop through them
-        $datetimes = $this->datetimes_in_chronological_order();
-        foreach ($datetimes as $datetime) {
-            if ($datetime instanceof EE_Datetime) {
-                //if this dtt is expired then we continue cause one of the other datetimes might be active.
-                if ($datetime->is_expired()) {
-                    continue;
-                }
-                //if this dtt is upcoming then we return false.
-                if ($datetime->is_upcoming()) {
-                    return false;
-                }
-                //otherwise let's check active status
-                $active = $datetime->is_active();
-            }
-        }
-        return $active;
-    }
-
-
-
-    /**
-     * @return bool
-     */
-    public function is_expired()
-    {
-        // check if event id is present and if this event is published
-        if ($this->is_inactive()) {
-            return false;
-        }
-        // set initial value
-        $expired = false;
-        //first let's get all datetimes and loop through them
-        $datetimes = $this->datetimes_in_chronological_order();
-        foreach ($datetimes as $datetime) {
-            if ($datetime instanceof EE_Datetime) {
-                //if this dtt is upcoming or active then we return false.
-                if ($datetime->is_upcoming() || $datetime->is_active()) {
-                    return false;
-                }
-                //otherwise let's check active status
-                $expired = $datetime->is_expired();
-            }
-        }
-        return $expired;
-    }
-
-
-
-    /**
-     * @return bool
-     */
-    public function is_inactive()
-    {
-        // check if event id is present and if this event is published
-        if ($this->_has_ID_and_is_published()) {
-            return false;
-        }
-        return true;
-    }
-
-
-
-    /**
-     *    perform_sold_out_status_check
-     *    checks all of this events's datetime  reg_limit - sold values to determine if ANY datetimes have spaces
-     *    available... if NOT, then the event status will get toggled to 'sold_out'
-     *
-     * @access public
-     * @return bool    return the ACTUAL sold out state.
-     */
-    public function perform_sold_out_status_check()
-    {
-        // get all unexpired untrashed tickets
-        $tickets = $this->tickets(array(
-            array(
-                'TKT_end_date' => array('>=', EEM_Ticket::instance()->current_time_for_query('TKT_end_date')),
-                'TKT_deleted'  => false,
-            ),
-        ));
-        // if all the tickets are just expired, then don't update the event status to sold out
-        if (empty($tickets)) {
-            return true;
-        }
-        // set initial value
-        $spaces_remaining = 0;
-        foreach ($tickets as $ticket) {
-            if ($ticket instanceof EE_Ticket) {
-                $spaces_remaining += $ticket->qty('saleable');
-            }
-        }
-        if ($spaces_remaining === 0) {
-            $this->set_status(EEM_Event::sold_out);
-            if ( ! is_admin() || (is_admin() && defined('DOING_AJAX'))) {
-                $this->save();
-            }
-            $sold_out = true;
-        } else {
-            $sold_out = false;
-            // was event previously marked as sold out ?
-            if ($this->status() == EEM_Event::sold_out) {
-                // revert status to previous value, if it was set
-                $previous_event_status = $this->get_post_meta('_previous_event_status', true);
-                if ($previous_event_status) {
-                    $this->set_status($previous_event_status);
-                }
-            }
-        }
-        //note: I considered changing the EEM_Event status away from sold_out if this status check reveals that it's no longer sold out (yet the status is still set as sold out) but the problem is... what do we change the status BACK to?  We can't always assume that the previous event status was 'published' because this status check is always done in the admin and its entirely possible the event admin manually changes to sold_out status from some other status.  We also don't want a draft event to become a "publish event" because the sold out check reveals its NOT sold out.
-        // So I'll forgo the automatic switch away from sold out status for now and instead just return the $sold out status... so this check can be used to validate the TRUE sold out status regardless of what the Event status is set to.
-        return $sold_out;
-    }
-
-
-
-    /**
-     * This returns the total remaining spaces for sale on this event.
-     * ############################
-     * VERY IMPORTANT FOR DEVELOPERS:
-     * While included here, this method is still being tested internally, so its signature and behaviour COULD change.
-     * While this comment block is in place, usage is at your own risk and know that it may change in future builds.
-     * ############################
-     *
-     * @uses EE_Event::total_available_spaces()
-     * @return float|int  (EE_INF is returned as float)
-     */
-    public function spaces_remaining_for_sale()
-    {
-        //first get total available spaces including consideration for tickets that have already sold.
-        $spaces_available = $this->total_available_spaces(true);
-        //if total available = 0, then exit right away because that means everything is expired.
-        if ($spaces_available === 0) {
-            return 0;
-        }
-        //subtract total approved registrations from spaces available to get how many are remaining.
-        $spots_taken = EEM_Registration::instance()->count(array(
-            array(
-                'EVT_ID' => $this->ID(),
-                'STS_ID' => EEM_Registration::status_id_approved,
-            ),
-        ), 'REG_ID', true);
-        $spaces_remaining = $spaces_available - $spots_taken;
-        return $spaces_remaining > 0 ? $spaces_remaining : 0;
-    }
-
-
-
-    /**
-     * This returns the total spaces available for an event while considering all the qtys on the tickets and the reg
-     * limits on the datetimes attached to this event.
-     * ############################
-     * VERY IMPORTANT FOR DEVELOPERS:
-     * While included here, this method is still being tested internally, so its signature and behaviour COULD change.
-     * While this comment block is in place, usage is at your own risk and know that it may change in future builds.
-     * ############################
-     * Note: by "spaces available" we are not returning how many spaces remain.  That is a calculation involving using
-     * the value from this method and subtracting the approved registrations for the event.
-     *
-     * @param   bool $current_total_available       Whether to consider any tickets that have already sold in our
-     *                                              calculation. If this is false, then we return the most tickets that
-     *                                              could ever be sold for this event with the datetime and tickets
-     *                                              setup on the event under optimal selling conditions.  Otherwise we
-     *                                              return a live calculation of spaces available based on tickets
-     *                                              sold.  Depending on setup and stage of sales, this may appear to
-     *                                              equal remaining tickets.  However, the more tickets are sold out,
-     *                                              the more accurate the "live" total is.
-     * @return  int|float  (Note: if EE_INF is returned its considered a float by PHP)
-     */
-    public function total_available_spaces($current_total_available = false)
-    {
-        $spaces_available = 0;
-        //first get all tickets on the event and include expired tickets
-        $tickets = $this->tickets(array('default_where_conditions' => 'none'));
-        $ticket_sums = array();
-        $datetime_limits = array();
-        //loop through tickets and normalize them
-        foreach ($tickets as $ticket) {
-            $datetimes = $ticket->datetimes(array('order_by' => array('DTT_reg_limit' => 'ASC')));
-            if (empty($datetimes)) {
-                continue;
-            }
-            //first datetime should be the lowest datetime
-            $least_datetime = reset($datetimes);
-            //lets reset the ticket quantity to be the lower of either the lowest datetime reg limit or the ticket quantity
-            //IF datetimes sold (and we're not doing current live total available, then use spaces remaining for datetime, not reg_limit.
-            if ($current_total_available) {
-                if ($ticket->is_remaining()) {
-                    $remaining = $ticket->remaining();
-                } else {
-                    $spaces_available += $ticket->sold();
-                    //and we don't cache this ticket to our list because its sold out.
-                    continue;
-                }
-            } else {
-                $remaining = min($ticket->qty(), $least_datetime->reg_limit());
-            }
-            //if $ticket_limit == infinity then let's drop out right away and just return that because any infinity amount trumps all other "available" amounts.
-            if ($remaining === EE_INF) {
-                return EE_INF;
-            }
-            //multiply normalized $tkt quantity by the number of datetimes on the ticket as the "sum"
-            //also include the sum of all the datetime reg limits on the ticket for breaking ties.
-            $ticket_sums[$ticket->ID()]['sum'] = $remaining * count($datetimes);
-            $ticket_sums[$ticket->ID()]['datetime_sums'] = 0;
-            foreach ($datetimes as $datetime) {
-                if ($datetime->reg_limit() === EE_INF) {
-                    $ticket_sums[$ticket->ID()]['datetime_sums'] = EE_INF;
-                } else {
-                    $ticket_sums[$ticket->ID()]['datetime_sums'] += $current_total_available
-                        ? $datetime->spaces_remaining() : $datetime->reg_limit();
-                }
-                $datetime_limits[$datetime->ID()] = $current_total_available ? $datetime->spaces_remaining()
-                    : $datetime->reg_limit();
-            }
-            $ticket_sums[$ticket->ID()]['ticket'] = $ticket;
-        }
-        //The order is sorted by lowest available first (which is calculated for each ticket by multiplying the normalized
-        //ticket quantity by the number of datetimes on the ticket).  For tie-breakers, then the next sort is based on the
-        //ticket with the greatest sum of all remaining datetime->spaces_remaining() ( or $datetime->reg_limit() if not
-        //$current_total_available ) for the datetimes on the ticket.
-        usort($ticket_sums, function ($a, $b) {
-            if ($a['sum'] == $b['sum']) {
-                if ($a['datetime_sums'] == $b['datetime_sums']) {
-                    return 0;
-                }
-                return $a['datetime_sums'] < $b['datetime_sums'] ? 1 : -1;
-            }
-            return ($a['sum'] < $b['sum']) ? -1 : 1;
-        });
-        //now let's loop through the sorted tickets and simulate sellouts
-        foreach ($ticket_sums as $ticket_info) {
-            if ($ticket_info['ticket'] instanceof EE_Ticket) {
-                $datetimes = $ticket_info['ticket']->datetimes(array('order_by' => array('DTT_reg_limit' => 'ASC')));
-                //need to sort these $datetimes by remaining (only if $current_total_available)
-                //setup datetimes for simulation
-                $ticket_datetimes_remaining = array();
-                foreach ($datetimes as $datetime) {
-                    $ticket_datetimes_remaining[$datetime->ID()]['rem'] = $datetime_limits[$datetime->ID()];
-                    $ticket_datetimes_remaining[$datetime->ID()]['datetime'] = $datetime;
-                }
-                usort($ticket_datetimes_remaining, function ($a, $b) {
-                    if ($a['rem'] == $b['rem']) {
-                        return 0;
-                    }
-                    return ($a['rem'] < $b['rem']) ? -1 : 1;
-                });
-                //get the remaining on the first datetime (which should be the one with the least remaining) and that is
-                //what we add to the spaces_available running total.  Then we need to decrease the remaining on our datetime tracker.
-                $lowest_datetime = reset($ticket_datetimes_remaining);
-                //need to get the lower of; what the remaining is on the lowest datetime, and the remaining on the ticket.
-                // If this ends up being 0 (because of previous tickets in our simulation selling out), then it has already
-                // been tracked on $spaces available and this ticket is now sold out for the simulation, so we can continue
-                // to the next ticket.
-                if ($current_total_available) {
-                    $remaining = min($lowest_datetime['rem'], $ticket_info['ticket']->remaining());
-                } else {
-                    $remaining = min($lowest_datetime['rem'], $ticket_info['ticket']->qty());
-                }
-                //if $remaining is infinite that means that all datetimes on this ticket are infinite but we've made it here because all
-                //tickets have a quantity.  So we don't have to track datetimes, we can just use ticket quantities for total
-                //available.
-                if ($remaining === EE_INF) {
-                    $spaces_available += $ticket_info['ticket']->qty();
-                    continue;
-                }
-                //if ticket has sold amounts then we also need to add that (but only if doing live counts)
-                if ($current_total_available) {
-                    $spaces_available += $ticket_info['ticket']->sold();
-                }
-                if ($remaining <= 0) {
-                    continue;
-                } else {
-                    $spaces_available += $remaining;
-                }
-                //loop through the datetimes and sell them out!
-                foreach ($ticket_datetimes_remaining as $datetime_info) {
-                    if ($datetime_info['datetime'] instanceof EE_Datetime) {
-                        $datetime_limits[$datetime_info['datetime']->ID()] += -$remaining;
-                    }
-                }
-            }
-        }
-        return $spaces_available;
-    }
-
-
-
-    /**
-     * Checks if the event is set to sold out
-     *
-     * @param  bool $actual whether or not to perform calculations to not only figure the actual status but also to
-     *                      flip the status if necessary to sold out If false, we just check the existing status of the
-     *                      event
-     * @return boolean
-     */
-    public function is_sold_out($actual = false)
-    {
-        if ( ! $actual) {
-            return $this->status() == EEM_Event::sold_out;
-        } else {
-            return $this->perform_sold_out_status_check();
-        }
-    }
-
-
-
-    /**
-     * Checks if the event is marked as postponed
-     *
-     * @return boolean
-     */
-    public function is_postponed()
-    {
-        return $this->status() == EEM_Event::postponed;
-    }
-
-
-
-    /**
-     * Checks if the event is marked as cancelled
-     *
-     * @return boolean
-     */
-    public function is_cancelled()
-    {
-        return $this->status() == EEM_Event::cancelled;
-    }
-
-
-
-    /**
-     * Get the logical active status in a hierarchical order for all the datetimes.  Note
-     * Basically, we order the datetimes by EVT_start_date.  Then first test on whether the event is published.  If its
-     * NOT published then we test for whether its expired or not.  IF it IS published then we test first on whether an
-     * event has any active dates.  If no active dates then we check for any upcoming dates.  If no upcoming dates then
-     * the event is considered expired.
-     * NOTE: this method does NOT calculate whether the datetimes are sold out when event is published.  Sold Out is a
-     * status set on the EVENT when it is not published and thus is done
-     *
-     * @param bool $reset
-     * @return bool | string - based on EE_Datetime active constants or FALSE if error.
-     */
-    public function get_active_status($reset = false)
-    {
-        // if the active status has already been set, then just use that value (unless we are resetting it)
-        if ( ! empty($this->_active_status) && ! $reset) {
-            return $this->_active_status;
-        }
-        //first check if event id is present on this object
-        if ( ! $this->ID()) {
-            return false;
-        }
-        $where_params_for_event = array(array('EVT_ID' => $this->ID()));
-        //if event is published:
-        if ($this->status() === 'publish') {
-            //active?
-            if (EEM_Datetime::instance()->get_datetime_count_for_status(EE_Datetime::active, $where_params_for_event)
-                > 0
-            ) {
-                $this->_active_status = EE_Datetime::active;
-            } else {
-                //upcoming?
-                if (EEM_Datetime::instance()
-                                ->get_datetime_count_for_status(EE_Datetime::upcoming, $where_params_for_event) > 0
-                ) {
-                    $this->_active_status = EE_Datetime::upcoming;
-                } else {
-                    //expired?
-                    if (EEM_Datetime::instance()
-                                    ->get_datetime_count_for_status(EE_Datetime::expired, $where_params_for_event) > 0
-                    ) {
-                        $this->_active_status = EE_Datetime::expired;
-                    } else {
-                        //it would be odd if things make it this far because it basically means there are no datetime's
-                        //attached to the event.  So in this case it will just be considered inactive.
-                        $this->_active_status = EE_Datetime::inactive;
-                    }
-                }
-            }
-        } else {
-            //the event is not published, so let's just set it's active status according to its' post status
-            switch ($this->status()) {
-                case EEM_Event::sold_out :
-                    $this->_active_status = EE_Datetime::sold_out;
-                    break;
-                case EEM_Event::cancelled :
-                    $this->_active_status = EE_Datetime::cancelled;
-                    break;
-                case EEM_Event::postponed :
-                    $this->_active_status = EE_Datetime::postponed;
-                    break;
-                default :
-                    $this->_active_status = EE_Datetime::inactive;
-            }
-        }
-        return $this->_active_status;
-    }
-
-
-
-    /**
-     *    pretty_active_status
-     *
-     * @access public
-     * @param boolean $echo whether to return (FALSE), or echo out the result (TRUE)
-     * @return mixed void|string
-     */
-    public function pretty_active_status($echo = true)
-    {
-        $active_status = $this->get_active_status();
-        $status = '<span class="ee-status event-active-status-'
-                  . $active_status
-                  . '">'
-                  . EEH_Template::pretty_status($active_status, false, 'sentence')
-                  . '</span>';
-        if ($echo) {
-            echo $status;
-            return '';
-        }
-        return $status;
-    }
-
-
-
-    /**
-     * @return bool|int
-     */
-    public function get_number_of_tickets_sold()
-    {
-        $tkt_sold = 0;
-        if ( ! $this->ID()) {
-            return 0;
-        }
-        $datetimes = $this->datetimes();
-        foreach ($datetimes as $datetime) {
-            if ($datetime instanceof EE_Datetime) {
-                $tkt_sold += $datetime->sold();
-            }
-        }
-        return $tkt_sold;
-    }
-
-
-
-    /**
-     * This just returns a count of all the registrations for this event
-     *
-     * @access  public
-     * @return int
-     */
-    public function get_count_of_all_registrations()
-    {
-        return EEM_Event::instance()->count_related($this, 'Registration');
-    }
-
-
-
-    /**
-     * This returns the ticket with the earliest start time that is available for this event (across all datetimes
-     * attached to the event)
-     *
-     * @return EE_Ticket
-     */
-    public function get_ticket_with_earliest_start_time()
-    {
-        $where['Datetime.EVT_ID'] = $this->ID();
-        $query_params = array($where, 'order_by' => array('TKT_start_date' => 'ASC'));
-        return EE_Registry::instance()->load_model('Ticket')->get_one($query_params);
-    }
-
-
-
-    /**
-     * This returns the ticket with the latest end time that is available for this event (across all datetimes attached
-     * to the event)
-     *
-     * @return EE_Ticket
-     */
-    public function get_ticket_with_latest_end_time()
-    {
-        $where['Datetime.EVT_ID'] = $this->ID();
-        $query_params = array($where, 'order_by' => array('TKT_end_date' => 'DESC'));
-        return EE_Registry::instance()->load_model('Ticket')->get_one($query_params);
-    }
-
-
-
-    /**
-     * This returns whether there are any tickets on sale for this event.
-     *
-     * @return bool true = YES tickets on sale.
-     */
-    public function tickets_on_sale()
-    {
-        $earliest_ticket = $this->get_ticket_with_earliest_start_time();
-        $latest_ticket = $this->get_ticket_with_latest_end_time();
-        if ( ! $latest_ticket instanceof EE_Ticket && ! $earliest_ticket instanceof EE_Ticket) {
-            return false;
-        }
-        //check on sale for these two tickets.
-        if ($latest_ticket->is_on_sale() || $earliest_ticket->is_on_sale()) {
-            return true;
-        }
-        return false;
-    }
-
-
-
-    /**
-     * Gets the URL for viewing this event on the front-end. Overrides parent
-     * to check for an external URL first
-     *
-     * @return string
-     */
-    public function get_permalink()
-    {
-        if ($this->external_url()) {
-            return $this->external_url();
-        } else {
-            return parent::get_permalink();
-        }
-    }
-
-
-
-    /**
-     * Gets the first term for 'espresso_event_categories' we can find
-     *
-     * @param array $query_params like EEM_Base::get_all
-     * @return EE_Term
-     */
-    public function first_event_category($query_params = array())
-    {
-        $query_params[0]['Term_Taxonomy.taxonomy'] = 'espresso_event_categories';
-        $query_params[0]['Term_Taxonomy.Event.EVT_ID'] = $this->ID();
-        return EEM_Term::instance()->get_one($query_params);
-    }
-
-
-
-    /**
-     * Gets all terms for 'espresso_event_categories' we can find
-     *
-     * @param array $query_params
-     * @return EE_Term[]
-     */
-    public function get_all_event_categories($query_params = array())
-    {
-        $query_params[0]['Term_Taxonomy.taxonomy'] = 'espresso_event_categories';
-        $query_params[0]['Term_Taxonomy.Event.EVT_ID'] = $this->ID();
-        return EEM_Term::instance()->get_all($query_params);
-    }
-
-
-
-    /**
-     * Gets all the question groups, ordering them by QSG_order ascending
-     *
-     * @param array $query_params @see EEM_Base::get_all
-     * @return EE_Question_Group[]
-     */
-    public function question_groups($query_params = array())
-    {
-        $query_params = ! empty($query_params) ? $query_params : array('order_by' => array('QSG_order' => 'ASC'));
-        return $this->get_many_related('Question_Group', $query_params);
-    }
-
-
-
-    /**
-     * Implementation for EEI_Has_Icon interface method.
-     *
-     * @see EEI_Visual_Representation for comments
-     * @return string
-     */
-    public function get_icon()
-    {
-        return '<span class="dashicons dashicons-flag"></span>';
-    }
-
-
-
-    /**
-     * Implementation for EEI_Admin_Links interface method.
-     *
-     * @see EEI_Admin_Links for comments
-     * @return string
-     */
-    public function get_admin_details_link()
-    {
-        return $this->get_admin_edit_link();
-    }
-
-
-
-    /**
-     * Implementation for EEI_Admin_Links interface method.
-     *
-     * @see EEI_Admin_Links for comments
-     * @return string
-     */
-    public function get_admin_edit_link()
-    {
-        return EEH_URL::add_query_args_and_nonce(array(
-            'page'   => 'espresso_events',
-            'action' => 'edit',
-            'post'   => $this->ID(),
-        ),
-            admin_url('admin.php')
-        );
-    }
-
-
-
-    /**
-     * Implementation for EEI_Admin_Links interface method.
-     *
-     * @see EEI_Admin_Links for comments
-     * @return string
-     */
-    public function get_admin_settings_link()
-    {
-        return EEH_URL::add_query_args_and_nonce(array(
-            'page'   => 'espresso_events',
-            'action' => 'default_event_settings',
-        ),
-            admin_url('admin.php')
-        );
-    }
-
-
-
-    /**
-     * Implementation for EEI_Admin_Links interface method.
-     *
-     * @see EEI_Admin_Links for comments
-     * @return string
-     */
-    public function get_admin_overview_link()
-    {
-        return EEH_URL::add_query_args_and_nonce(array(
-            'page'   => 'espresso_events',
-            'action' => 'default'
-        ),
-            admin_url('admin.php')
-        );
-    }
+
+	/**
+	 * @param $default_registration_status
+	 */
+	public function set_default_registration_status($default_registration_status)
+	{
+		$this->set('EVT_default_registration_status', $default_registration_status);
+	}
+
+
+
+	/**
+	 * @param $donations
+	 */
+	public function set_donations($donations)
+	{
+		$this->set('EVT_donations', $donations);
+	}
+
+
+
+	/**
+	 * Adds a venue to this event
+	 *
+	 * @param EE_Venue /int $venue_id_or_obj
+	 * @return EE_Venue
+	 */
+	public function add_venue($venue_id_or_obj)
+	{
+		return $this->_add_relation_to($venue_id_or_obj, 'Venue');
+	}
+
+
+
+	/**
+	 * Removes a venue from the event
+	 *
+	 * @param EE_Venue /int $venue_id_or_obj
+	 * @return EE_Venue
+	 */
+	public function remove_venue($venue_id_or_obj)
+	{
+		return $this->_remove_relation_to($venue_id_or_obj, 'Venue');
+	}
+
+
+
+	/**
+	 * Gets all the venues related ot the event. May provide additional $query_params if desired
+	 *
+	 * @param array $query_params like EEM_Base::get_all's $query_params
+	 * @return EE_Venue[]
+	 */
+	public function venues($query_params = array())
+	{
+		return $this->get_many_related('Venue', $query_params);
+	}
+
+
+
+	/**
+	 * check if event id is present and if event is published
+	 *
+	 * @access public
+	 * @return boolean true yes, false no
+	 */
+	private function _has_ID_and_is_published()
+	{
+		// first check if event id is present and not NULL, then check if this event is published (or any of the equivalent "published" statuses)
+		return ($this->ID() && $this->ID() !== null
+				&& ($this->status() == 'publish'
+					|| $this->status()
+					   == EEM_Event::sold_out
+					|| $this->status() == EEM_Event::postponed
+					|| $this->status() == EEM_Event::cancelled)) ? true : false;
+	}
+
+
+
+	/**
+	 * This simply compares the internal dates with NOW and determines if the event is upcoming or not.
+	 *
+	 * @access public
+	 * @return boolean true yes, false no
+	 */
+	public function is_upcoming()
+	{
+		// check if event id is present and if this event is published
+		if ($this->is_inactive()) {
+			return false;
+		}
+		// set initial value
+		$upcoming = false;
+		//next let's get all datetimes and loop through them
+		$datetimes = $this->datetimes_in_chronological_order();
+		foreach ($datetimes as $datetime) {
+			if ($datetime instanceof EE_Datetime) {
+				//if this dtt is expired then we continue cause one of the other datetimes might be upcoming.
+				if ($datetime->is_expired()) {
+					continue;
+				}
+				//if this dtt is active then we return false.
+				if ($datetime->is_active()) {
+					return false;
+				}
+				//otherwise let's check upcoming status
+				$upcoming = $datetime->is_upcoming();
+			}
+		}
+		return $upcoming;
+	}
+
+
+
+	/**
+	 * @return bool
+	 */
+	public function is_active()
+	{
+		// check if event id is present and if this event is published
+		if ($this->is_inactive()) {
+			return false;
+		}
+		// set initial value
+		$active = false;
+		//next let's get all datetimes and loop through them
+		$datetimes = $this->datetimes_in_chronological_order();
+		foreach ($datetimes as $datetime) {
+			if ($datetime instanceof EE_Datetime) {
+				//if this dtt is expired then we continue cause one of the other datetimes might be active.
+				if ($datetime->is_expired()) {
+					continue;
+				}
+				//if this dtt is upcoming then we return false.
+				if ($datetime->is_upcoming()) {
+					return false;
+				}
+				//otherwise let's check active status
+				$active = $datetime->is_active();
+			}
+		}
+		return $active;
+	}
+
+
+
+	/**
+	 * @return bool
+	 */
+	public function is_expired()
+	{
+		// check if event id is present and if this event is published
+		if ($this->is_inactive()) {
+			return false;
+		}
+		// set initial value
+		$expired = false;
+		//first let's get all datetimes and loop through them
+		$datetimes = $this->datetimes_in_chronological_order();
+		foreach ($datetimes as $datetime) {
+			if ($datetime instanceof EE_Datetime) {
+				//if this dtt is upcoming or active then we return false.
+				if ($datetime->is_upcoming() || $datetime->is_active()) {
+					return false;
+				}
+				//otherwise let's check active status
+				$expired = $datetime->is_expired();
+			}
+		}
+		return $expired;
+	}
+
+
+
+	/**
+	 * @return bool
+	 */
+	public function is_inactive()
+	{
+		// check if event id is present and if this event is published
+		if ($this->_has_ID_and_is_published()) {
+			return false;
+		}
+		return true;
+	}
+
+
+
+	/**
+	 *    perform_sold_out_status_check
+	 *    checks all of this events's datetime  reg_limit - sold values to determine if ANY datetimes have spaces
+	 *    available... if NOT, then the event status will get toggled to 'sold_out'
+	 *
+	 * @access public
+	 * @return bool    return the ACTUAL sold out state.
+	 */
+	public function perform_sold_out_status_check()
+	{
+		// get all unexpired untrashed tickets
+		$tickets = $this->tickets(array(
+			array(
+				'TKT_end_date' => array('>=', EEM_Ticket::instance()->current_time_for_query('TKT_end_date')),
+				'TKT_deleted'  => false,
+			),
+		));
+		// if all the tickets are just expired, then don't update the event status to sold out
+		if (empty($tickets)) {
+			return true;
+		}
+		// set initial value
+		$spaces_remaining = 0;
+		foreach ($tickets as $ticket) {
+			if ($ticket instanceof EE_Ticket) {
+				$spaces_remaining += $ticket->qty('saleable');
+			}
+		}
+		if ($spaces_remaining === 0) {
+			$this->set_status(EEM_Event::sold_out);
+			if ( ! is_admin() || (is_admin() && defined('DOING_AJAX'))) {
+				$this->save();
+			}
+			$sold_out = true;
+		} else {
+			$sold_out = false;
+			// was event previously marked as sold out ?
+			if ($this->status() == EEM_Event::sold_out) {
+				// revert status to previous value, if it was set
+				$previous_event_status = $this->get_post_meta('_previous_event_status', true);
+				if ($previous_event_status) {
+					$this->set_status($previous_event_status);
+				}
+			}
+		}
+		//note: I considered changing the EEM_Event status away from sold_out if this status check reveals that it's no longer sold out (yet the status is still set as sold out) but the problem is... what do we change the status BACK to?  We can't always assume that the previous event status was 'published' because this status check is always done in the admin and its entirely possible the event admin manually changes to sold_out status from some other status.  We also don't want a draft event to become a "publish event" because the sold out check reveals its NOT sold out.
+		// So I'll forgo the automatic switch away from sold out status for now and instead just return the $sold out status... so this check can be used to validate the TRUE sold out status regardless of what the Event status is set to.
+		return $sold_out;
+	}
+
+
+
+	/**
+	 * This returns the total remaining spaces for sale on this event.
+	 * ############################
+	 * VERY IMPORTANT FOR DEVELOPERS:
+	 * While included here, this method is still being tested internally, so its signature and behaviour COULD change.
+	 * While this comment block is in place, usage is at your own risk and know that it may change in future builds.
+	 * ############################
+	 *
+	 * @uses EE_Event::total_available_spaces()
+	 * @return float|int  (EE_INF is returned as float)
+	 */
+	public function spaces_remaining_for_sale()
+	{
+		//first get total available spaces including consideration for tickets that have already sold.
+		$spaces_available = $this->total_available_spaces(true);
+		//if total available = 0, then exit right away because that means everything is expired.
+		if ($spaces_available === 0) {
+			return 0;
+		}
+		//subtract total approved registrations from spaces available to get how many are remaining.
+		$spots_taken = EEM_Registration::instance()->count(array(
+			array(
+				'EVT_ID' => $this->ID(),
+				'STS_ID' => EEM_Registration::status_id_approved,
+			),
+		), 'REG_ID', true);
+		$spaces_remaining = $spaces_available - $spots_taken;
+		return $spaces_remaining > 0 ? $spaces_remaining : 0;
+	}
+
+
+
+	/**
+	 * This returns the total spaces available for an event while considering all the qtys on the tickets and the reg
+	 * limits on the datetimes attached to this event.
+	 * ############################
+	 * VERY IMPORTANT FOR DEVELOPERS:
+	 * While included here, this method is still being tested internally, so its signature and behaviour COULD change.
+	 * While this comment block is in place, usage is at your own risk and know that it may change in future builds.
+	 * ############################
+	 * Note: by "spaces available" we are not returning how many spaces remain.  That is a calculation involving using
+	 * the value from this method and subtracting the approved registrations for the event.
+	 *
+	 * @param   bool $current_total_available       Whether to consider any tickets that have already sold in our
+	 *                                              calculation. If this is false, then we return the most tickets that
+	 *                                              could ever be sold for this event with the datetime and tickets
+	 *                                              setup on the event under optimal selling conditions.  Otherwise we
+	 *                                              return a live calculation of spaces available based on tickets
+	 *                                              sold.  Depending on setup and stage of sales, this may appear to
+	 *                                              equal remaining tickets.  However, the more tickets are sold out,
+	 *                                              the more accurate the "live" total is.
+	 * @return  int|float  (Note: if EE_INF is returned its considered a float by PHP)
+	 */
+	public function total_available_spaces($current_total_available = false)
+	{
+		$spaces_available = 0;
+		//first get all tickets on the event and include expired tickets
+		$tickets = $this->tickets(array('default_where_conditions' => 'none'));
+		$ticket_sums = array();
+		$datetime_limits = array();
+		//loop through tickets and normalize them
+		foreach ($tickets as $ticket) {
+			$datetimes = $ticket->datetimes(array('order_by' => array('DTT_reg_limit' => 'ASC')));
+			if (empty($datetimes)) {
+				continue;
+			}
+			//first datetime should be the lowest datetime
+			$least_datetime = reset($datetimes);
+			//lets reset the ticket quantity to be the lower of either the lowest datetime reg limit or the ticket quantity
+			//IF datetimes sold (and we're not doing current live total available, then use spaces remaining for datetime, not reg_limit.
+			if ($current_total_available) {
+				if ($ticket->is_remaining()) {
+					$remaining = $ticket->remaining();
+				} else {
+					$spaces_available += $ticket->sold();
+					//and we don't cache this ticket to our list because its sold out.
+					continue;
+				}
+			} else {
+				$remaining = min($ticket->qty(), $least_datetime->reg_limit());
+			}
+			//if $ticket_limit == infinity then let's drop out right away and just return that because any infinity amount trumps all other "available" amounts.
+			if ($remaining === EE_INF) {
+				return EE_INF;
+			}
+			//multiply normalized $tkt quantity by the number of datetimes on the ticket as the "sum"
+			//also include the sum of all the datetime reg limits on the ticket for breaking ties.
+			$ticket_sums[$ticket->ID()]['sum'] = $remaining * count($datetimes);
+			$ticket_sums[$ticket->ID()]['datetime_sums'] = 0;
+			foreach ($datetimes as $datetime) {
+				if ($datetime->reg_limit() === EE_INF) {
+					$ticket_sums[$ticket->ID()]['datetime_sums'] = EE_INF;
+				} else {
+					$ticket_sums[$ticket->ID()]['datetime_sums'] += $current_total_available
+						? $datetime->spaces_remaining() : $datetime->reg_limit();
+				}
+				$datetime_limits[$datetime->ID()] = $current_total_available ? $datetime->spaces_remaining()
+					: $datetime->reg_limit();
+			}
+			$ticket_sums[$ticket->ID()]['ticket'] = $ticket;
+		}
+		//The order is sorted by lowest available first (which is calculated for each ticket by multiplying the normalized
+		//ticket quantity by the number of datetimes on the ticket).  For tie-breakers, then the next sort is based on the
+		//ticket with the greatest sum of all remaining datetime->spaces_remaining() ( or $datetime->reg_limit() if not
+		//$current_total_available ) for the datetimes on the ticket.
+		usort($ticket_sums, function ($a, $b) {
+			if ($a['sum'] == $b['sum']) {
+				if ($a['datetime_sums'] == $b['datetime_sums']) {
+					return 0;
+				}
+				return $a['datetime_sums'] < $b['datetime_sums'] ? 1 : -1;
+			}
+			return ($a['sum'] < $b['sum']) ? -1 : 1;
+		});
+		//now let's loop through the sorted tickets and simulate sellouts
+		foreach ($ticket_sums as $ticket_info) {
+			if ($ticket_info['ticket'] instanceof EE_Ticket) {
+				$datetimes = $ticket_info['ticket']->datetimes(array('order_by' => array('DTT_reg_limit' => 'ASC')));
+				//need to sort these $datetimes by remaining (only if $current_total_available)
+				//setup datetimes for simulation
+				$ticket_datetimes_remaining = array();
+				foreach ($datetimes as $datetime) {
+					$ticket_datetimes_remaining[$datetime->ID()]['rem'] = $datetime_limits[$datetime->ID()];
+					$ticket_datetimes_remaining[$datetime->ID()]['datetime'] = $datetime;
+				}
+				usort($ticket_datetimes_remaining, function ($a, $b) {
+					if ($a['rem'] == $b['rem']) {
+						return 0;
+					}
+					return ($a['rem'] < $b['rem']) ? -1 : 1;
+				});
+				//get the remaining on the first datetime (which should be the one with the least remaining) and that is
+				//what we add to the spaces_available running total.  Then we need to decrease the remaining on our datetime tracker.
+				$lowest_datetime = reset($ticket_datetimes_remaining);
+				//need to get the lower of; what the remaining is on the lowest datetime, and the remaining on the ticket.
+				// If this ends up being 0 (because of previous tickets in our simulation selling out), then it has already
+				// been tracked on $spaces available and this ticket is now sold out for the simulation, so we can continue
+				// to the next ticket.
+				if ($current_total_available) {
+					$remaining = min($lowest_datetime['rem'], $ticket_info['ticket']->remaining());
+				} else {
+					$remaining = min($lowest_datetime['rem'], $ticket_info['ticket']->qty());
+				}
+				//if $remaining is infinite that means that all datetimes on this ticket are infinite but we've made it here because all
+				//tickets have a quantity.  So we don't have to track datetimes, we can just use ticket quantities for total
+				//available.
+				if ($remaining === EE_INF) {
+					$spaces_available += $ticket_info['ticket']->qty();
+					continue;
+				}
+				//if ticket has sold amounts then we also need to add that (but only if doing live counts)
+				if ($current_total_available) {
+					$spaces_available += $ticket_info['ticket']->sold();
+				}
+				if ($remaining <= 0) {
+					continue;
+				} else {
+					$spaces_available += $remaining;
+				}
+				//loop through the datetimes and sell them out!
+				foreach ($ticket_datetimes_remaining as $datetime_info) {
+					if ($datetime_info['datetime'] instanceof EE_Datetime) {
+						$datetime_limits[$datetime_info['datetime']->ID()] += -$remaining;
+					}
+				}
+			}
+		}
+		return $spaces_available;
+	}
+
+
+
+	/**
+	 * Checks if the event is set to sold out
+	 *
+	 * @param  bool $actual whether or not to perform calculations to not only figure the actual status but also to
+	 *                      flip the status if necessary to sold out If false, we just check the existing status of the
+	 *                      event
+	 * @return boolean
+	 */
+	public function is_sold_out($actual = false)
+	{
+		if ( ! $actual) {
+			return $this->status() == EEM_Event::sold_out;
+		} else {
+			return $this->perform_sold_out_status_check();
+		}
+	}
+
+
+
+	/**
+	 * Checks if the event is marked as postponed
+	 *
+	 * @return boolean
+	 */
+	public function is_postponed()
+	{
+		return $this->status() == EEM_Event::postponed;
+	}
+
+
+
+	/**
+	 * Checks if the event is marked as cancelled
+	 *
+	 * @return boolean
+	 */
+	public function is_cancelled()
+	{
+		return $this->status() == EEM_Event::cancelled;
+	}
+
+
+
+	/**
+	 * Get the logical active status in a hierarchical order for all the datetimes.  Note
+	 * Basically, we order the datetimes by EVT_start_date.  Then first test on whether the event is published.  If its
+	 * NOT published then we test for whether its expired or not.  IF it IS published then we test first on whether an
+	 * event has any active dates.  If no active dates then we check for any upcoming dates.  If no upcoming dates then
+	 * the event is considered expired.
+	 * NOTE: this method does NOT calculate whether the datetimes are sold out when event is published.  Sold Out is a
+	 * status set on the EVENT when it is not published and thus is done
+	 *
+	 * @param bool $reset
+	 * @return bool | string - based on EE_Datetime active constants or FALSE if error.
+	 */
+	public function get_active_status($reset = false)
+	{
+		// if the active status has already been set, then just use that value (unless we are resetting it)
+		if ( ! empty($this->_active_status) && ! $reset) {
+			return $this->_active_status;
+		}
+		//first check if event id is present on this object
+		if ( ! $this->ID()) {
+			return false;
+		}
+		$where_params_for_event = array(array('EVT_ID' => $this->ID()));
+		//if event is published:
+		if ($this->status() === 'publish') {
+			//active?
+			if (EEM_Datetime::instance()->get_datetime_count_for_status(EE_Datetime::active, $where_params_for_event)
+				> 0
+			) {
+				$this->_active_status = EE_Datetime::active;
+			} else {
+				//upcoming?
+				if (EEM_Datetime::instance()
+								->get_datetime_count_for_status(EE_Datetime::upcoming, $where_params_for_event) > 0
+				) {
+					$this->_active_status = EE_Datetime::upcoming;
+				} else {
+					//expired?
+					if (EEM_Datetime::instance()
+									->get_datetime_count_for_status(EE_Datetime::expired, $where_params_for_event) > 0
+					) {
+						$this->_active_status = EE_Datetime::expired;
+					} else {
+						//it would be odd if things make it this far because it basically means there are no datetime's
+						//attached to the event.  So in this case it will just be considered inactive.
+						$this->_active_status = EE_Datetime::inactive;
+					}
+				}
+			}
+		} else {
+			//the event is not published, so let's just set it's active status according to its' post status
+			switch ($this->status()) {
+				case EEM_Event::sold_out :
+					$this->_active_status = EE_Datetime::sold_out;
+					break;
+				case EEM_Event::cancelled :
+					$this->_active_status = EE_Datetime::cancelled;
+					break;
+				case EEM_Event::postponed :
+					$this->_active_status = EE_Datetime::postponed;
+					break;
+				default :
+					$this->_active_status = EE_Datetime::inactive;
+			}
+		}
+		return $this->_active_status;
+	}
+
+
+
+	/**
+	 *    pretty_active_status
+	 *
+	 * @access public
+	 * @param boolean $echo whether to return (FALSE), or echo out the result (TRUE)
+	 * @return mixed void|string
+	 */
+	public function pretty_active_status($echo = true)
+	{
+		$active_status = $this->get_active_status();
+		$status = '<span class="ee-status event-active-status-'
+				  . $active_status
+				  . '">'
+				  . EEH_Template::pretty_status($active_status, false, 'sentence')
+				  . '</span>';
+		if ($echo) {
+			echo $status;
+			return '';
+		}
+		return $status;
+	}
+
+
+
+	/**
+	 * @return bool|int
+	 */
+	public function get_number_of_tickets_sold()
+	{
+		$tkt_sold = 0;
+		if ( ! $this->ID()) {
+			return 0;
+		}
+		$datetimes = $this->datetimes();
+		foreach ($datetimes as $datetime) {
+			if ($datetime instanceof EE_Datetime) {
+				$tkt_sold += $datetime->sold();
+			}
+		}
+		return $tkt_sold;
+	}
+
+
+
+	/**
+	 * This just returns a count of all the registrations for this event
+	 *
+	 * @access  public
+	 * @return int
+	 */
+	public function get_count_of_all_registrations()
+	{
+		return EEM_Event::instance()->count_related($this, 'Registration');
+	}
+
+
+
+	/**
+	 * This returns the ticket with the earliest start time that is available for this event (across all datetimes
+	 * attached to the event)
+	 *
+	 * @return EE_Ticket
+	 */
+	public function get_ticket_with_earliest_start_time()
+	{
+		$where['Datetime.EVT_ID'] = $this->ID();
+		$query_params = array($where, 'order_by' => array('TKT_start_date' => 'ASC'));
+		return EE_Registry::instance()->load_model('Ticket')->get_one($query_params);
+	}
+
+
+
+	/**
+	 * This returns the ticket with the latest end time that is available for this event (across all datetimes attached
+	 * to the event)
+	 *
+	 * @return EE_Ticket
+	 */
+	public function get_ticket_with_latest_end_time()
+	{
+		$where['Datetime.EVT_ID'] = $this->ID();
+		$query_params = array($where, 'order_by' => array('TKT_end_date' => 'DESC'));
+		return EE_Registry::instance()->load_model('Ticket')->get_one($query_params);
+	}
+
+
+
+	/**
+	 * This returns whether there are any tickets on sale for this event.
+	 *
+	 * @return bool true = YES tickets on sale.
+	 */
+	public function tickets_on_sale()
+	{
+		$earliest_ticket = $this->get_ticket_with_earliest_start_time();
+		$latest_ticket = $this->get_ticket_with_latest_end_time();
+		if ( ! $latest_ticket instanceof EE_Ticket && ! $earliest_ticket instanceof EE_Ticket) {
+			return false;
+		}
+		//check on sale for these two tickets.
+		if ($latest_ticket->is_on_sale() || $earliest_ticket->is_on_sale()) {
+			return true;
+		}
+		return false;
+	}
+
+
+
+	/**
+	 * Gets the URL for viewing this event on the front-end. Overrides parent
+	 * to check for an external URL first
+	 *
+	 * @return string
+	 */
+	public function get_permalink()
+	{
+		if ($this->external_url()) {
+			return $this->external_url();
+		} else {
+			return parent::get_permalink();
+		}
+	}
+
+
+
+	/**
+	 * Gets the first term for 'espresso_event_categories' we can find
+	 *
+	 * @param array $query_params like EEM_Base::get_all
+	 * @return EE_Term
+	 */
+	public function first_event_category($query_params = array())
+	{
+		$query_params[0]['Term_Taxonomy.taxonomy'] = 'espresso_event_categories';
+		$query_params[0]['Term_Taxonomy.Event.EVT_ID'] = $this->ID();
+		return EEM_Term::instance()->get_one($query_params);
+	}
+
+
+
+	/**
+	 * Gets all terms for 'espresso_event_categories' we can find
+	 *
+	 * @param array $query_params
+	 * @return EE_Term[]
+	 */
+	public function get_all_event_categories($query_params = array())
+	{
+		$query_params[0]['Term_Taxonomy.taxonomy'] = 'espresso_event_categories';
+		$query_params[0]['Term_Taxonomy.Event.EVT_ID'] = $this->ID();
+		return EEM_Term::instance()->get_all($query_params);
+	}
+
+
+
+	/**
+	 * Gets all the question groups, ordering them by QSG_order ascending
+	 *
+	 * @param array $query_params @see EEM_Base::get_all
+	 * @return EE_Question_Group[]
+	 */
+	public function question_groups($query_params = array())
+	{
+		$query_params = ! empty($query_params) ? $query_params : array('order_by' => array('QSG_order' => 'ASC'));
+		return $this->get_many_related('Question_Group', $query_params);
+	}
+
+
+
+	/**
+	 * Implementation for EEI_Has_Icon interface method.
+	 *
+	 * @see EEI_Visual_Representation for comments
+	 * @return string
+	 */
+	public function get_icon()
+	{
+		return '<span class="dashicons dashicons-flag"></span>';
+	}
+
+
+
+	/**
+	 * Implementation for EEI_Admin_Links interface method.
+	 *
+	 * @see EEI_Admin_Links for comments
+	 * @return string
+	 */
+	public function get_admin_details_link()
+	{
+		return $this->get_admin_edit_link();
+	}
+
+
+
+	/**
+	 * Implementation for EEI_Admin_Links interface method.
+	 *
+	 * @see EEI_Admin_Links for comments
+	 * @return string
+	 */
+	public function get_admin_edit_link()
+	{
+		return EEH_URL::add_query_args_and_nonce(array(
+			'page'   => 'espresso_events',
+			'action' => 'edit',
+			'post'   => $this->ID(),
+		),
+			admin_url('admin.php')
+		);
+	}
+
+
+
+	/**
+	 * Implementation for EEI_Admin_Links interface method.
+	 *
+	 * @see EEI_Admin_Links for comments
+	 * @return string
+	 */
+	public function get_admin_settings_link()
+	{
+		return EEH_URL::add_query_args_and_nonce(array(
+			'page'   => 'espresso_events',
+			'action' => 'default_event_settings',
+		),
+			admin_url('admin.php')
+		);
+	}
+
+
+
+	/**
+	 * Implementation for EEI_Admin_Links interface method.
+	 *
+	 * @see EEI_Admin_Links for comments
+	 * @return string
+	 */
+	public function get_admin_overview_link()
+	{
+		return EEH_URL::add_query_args_and_nonce(array(
+			'page'   => 'espresso_events',
+			'action' => 'default'
+		),
+			admin_url('admin.php')
+		);
+	}
 
 }

Spacing +3 added lines, -3 removed lines

@@ -300,7 +300,7 @@ 
      */
     public function display_ticket_selector()
     {
-        return (bool)$this->get('EVT_display_ticket_selector');
+        return (bool) $this->get('EVT_display_ticket_selector');
     }
 
 
@@ -950,7 +950,7 @@ 
         //ticket quantity by the number of datetimes on the ticket).  For tie-breakers, then the next sort is based on the
         //ticket with the greatest sum of all remaining datetime->spaces_remaining() ( or $datetime->reg_limit() if not
         //$current_total_available ) for the datetimes on the ticket.
-        usort($ticket_sums, function ($a, $b) {
+        usort($ticket_sums, function($a, $b) {
             if ($a['sum'] == $b['sum']) {
                 if ($a['datetime_sums'] == $b['datetime_sums']) {
                     return 0;
@@ -970,7 +970,7 @@ 
                     $ticket_datetimes_remaining[$datetime->ID()]['rem'] = $datetime_limits[$datetime->ID()];
                     $ticket_datetimes_remaining[$datetime->ID()]['datetime'] = $datetime;
                 }
-                usort($ticket_datetimes_remaining, function ($a, $b) {
+                usort($ticket_datetimes_remaining, function($a, $b) {
                     if ($a['rem'] == $b['rem']) {
                         return 0;
                     }

Doc Comments +1 added lines, -1 removed lines

@@ -1135,7 +1135,7 @@
      *
      * @access public
      * @param boolean $echo whether to return (FALSE), or echo out the result (TRUE)
-     * @return mixed void|string
+     * @return string void|string
      */
     public function pretty_active_status($echo = true)
     {

caffeinated/admin/extend/registration_form/Extend_Registration_Form_Admin_Page.core.php

Indentation +1085 added lines, -1085 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 if (! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('NO direct script access allowed');
+	exit('NO direct script access allowed');
 }
 
 /**
@@ -25,1090 +25,1090 @@ 
 {
 
 
-    /**
-     * @Constructor
-     * @param bool $routing indicate whether we want to just load the object and handle routing or just load the object.
-     * @access public
-     */
-    public function __construct($routing = true)
-    {
-        define('REGISTRATION_FORM_CAF_ADMIN', EE_CORE_CAF_ADMIN_EXTEND . 'registration_form' . DS);
-        define('REGISTRATION_FORM_CAF_ASSETS_PATH', REGISTRATION_FORM_CAF_ADMIN . 'assets' . DS);
-        define('REGISTRATION_FORM_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'registration_form/assets/');
-        define('REGISTRATION_FORM_CAF_TEMPLATE_PATH', REGISTRATION_FORM_CAF_ADMIN . 'templates' . DS);
-        define('REGISTRATION_FORM_CAF_TEMPLATE_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'registration_form/templates/');
-        parent::__construct($routing);
-    }
-
-
-    protected function _extend_page_config()
-    {
-        $this->_admin_base_path = REGISTRATION_FORM_CAF_ADMIN;
-        $qst_id = ! empty($this->_req_data['QST_ID']) && ! is_array($this->_req_data['QST_ID']) ? $this->_req_data['QST_ID'] : 0;
-        $qsg_id = ! empty($this->_req_data['QSG_ID']) && ! is_array($this->_req_data['QSG_ID']) ? $this->_req_data['QSG_ID'] : 0;
-
-        $new_page_routes    = array(
-            'question_groups'    => array(
-                'func'       => '_question_groups_overview_list_table',
-                'capability' => 'ee_read_question_groups',
-            ),
-            'add_question'       => array(
-                'func'       => '_edit_question',
-                'capability' => 'ee_edit_questions',
-            ),
-            'insert_question'    => array(
-                'func'       => '_insert_or_update_question',
-                'args'       => array('new_question' => true),
-                'capability' => 'ee_edit_questions',
-                'noheader'   => true,
-            ),
-            'duplicate_question' => array(
-                'func'       => '_duplicate_question',
-                'capability' => 'ee_edit_questions',
-                'noheader'   => true,
-            ),
-            'trash_question'     => array(
-                'func'       => '_trash_question',
-                'capability' => 'ee_delete_question',
-                'obj_id'     => $qst_id,
-                'noheader'   => true,
-            ),
-
-            'restore_question' => array(
-                'func'       => '_trash_or_restore_questions',
-                'capability' => 'ee_delete_question',
-                'obj_id'     => $qst_id,
-                'args'       => array('trash' => false),
-                'noheader'   => true,
-            ),
-
-            'delete_question' => array(
-                'func'       => '_delete_question',
-                'capability' => 'ee_delete_question',
-                'obj_id'     => $qst_id,
-                'noheader'   => true,
-            ),
-
-            'trash_questions' => array(
-                'func'       => '_trash_or_restore_questions',
-                'capability' => 'ee_delete_questions',
-                'args'       => array('trash' => true),
-                'noheader'   => true,
-            ),
-
-            'restore_questions' => array(
-                'func'       => '_trash_or_restore_questions',
-                'capability' => 'ee_delete_questions',
-                'args'       => array('trash' => false),
-                'noheader'   => true,
-            ),
-
-            'delete_questions' => array(
-                'func'       => '_delete_questions',
-                'args'       => array(),
-                'capability' => 'ee_delete_questions',
-                'noheader'   => true,
-            ),
-
-            'add_question_group' => array(
-                'func'       => '_edit_question_group',
-                'capability' => 'ee_edit_question_groups',
-            ),
-
-            'edit_question_group' => array(
-                'func'       => '_edit_question_group',
-                'capability' => 'ee_edit_question_group',
-                'obj_id'     => $qsg_id,
-                'args'       => array('edit'),
-            ),
-
-            'delete_question_groups' => array(
-                'func'       => '_delete_question_groups',
-                'capability' => 'ee_delete_question_groups',
-                'noheader'   => true,
-            ),
-
-            'delete_question_group' => array(
-                'func'       => '_delete_question_groups',
-                'capability' => 'ee_delete_question_group',
-                'obj_id'     => $qsg_id,
-                'noheader'   => true,
-            ),
-
-            'trash_question_group' => array(
-                'func'       => '_trash_or_restore_question_groups',
-                'args'       => array('trash' => true),
-                'capability' => 'ee_delete_question_group',
-                'obj_id'     => $qsg_id,
-                'noheader'   => true,
-            ),
-
-            'restore_question_group' => array(
-                'func'       => '_trash_or_restore_question_groups',
-                'args'       => array('trash' => false),
-                'capability' => 'ee_delete_question_group',
-                'obj_id'     => $qsg_id,
-                'noheader'   => true,
-            ),
-
-            'insert_question_group' => array(
-                'func'       => '_insert_or_update_question_group',
-                'args'       => array('new_question_group' => true),
-                'capability' => 'ee_edit_question_groups',
-                'noheader'   => true,
-            ),
-
-            'update_question_group' => array(
-                'func'       => '_insert_or_update_question_group',
-                'args'       => array('new_question_group' => false),
-                'capability' => 'ee_edit_question_group',
-                'obj_id'     => $qsg_id,
-                'noheader'   => true,
-            ),
-
-            'trash_question_groups' => array(
-                'func'       => '_trash_or_restore_question_groups',
-                'args'       => array('trash' => true),
-                'capability' => 'ee_delete_question_groups',
-                'noheader'   => array('trash' => false),
-            ),
-
-            'restore_question_groups' => array(
-                'func'       => '_trash_or_restore_question_groups',
-                'args'       => array('trash' => false),
-                'capability' => 'ee_delete_question_groups',
-                'noheader'   => true,
-            ),
-
-
-            'espresso_update_question_group_order' => array(
-                'func'       => 'update_question_group_order',
-                'capability' => 'ee_edit_question_groups',
-                'noheader'   => true,
-            ),
-
-            'view_reg_form_settings' => array(
-                'func'       => '_reg_form_settings',
-                'capability' => 'manage_options',
-            ),
-
-            'update_reg_form_settings' => array(
-                'func'       => '_update_reg_form_settings',
-                'capability' => 'manage_options',
-                'noheader'   => true,
-            ),
-        );
-        $this->_page_routes = array_merge($this->_page_routes, $new_page_routes);
-
-        $new_page_config    = array(
-
-            'question_groups' => array(
-                'nav'           => array(
-                    'label' => esc_html__('Question Groups', 'event_espresso'),
-                    'order' => 20,
-                ),
-                'list_table'    => 'Registration_Form_Question_Groups_Admin_List_Table',
-                'help_tabs'     => array(
-                    'registration_form_question_groups_help_tab'                           => array(
-                        'title'    => esc_html__('Question Groups', 'event_espresso'),
-                        'filename' => 'registration_form_question_groups',
-                    ),
-                    'registration_form_question_groups_table_column_headings_help_tab'     => array(
-                        'title'    => esc_html__('Question Groups Table Column Headings', 'event_espresso'),
-                        'filename' => 'registration_form_question_groups_table_column_headings',
-                    ),
-                    'registration_form_question_groups_views_bulk_actions_search_help_tab' => array(
-                        'title'    => esc_html__('Question Groups Views & Bulk Actions & Search', 'event_espresso'),
-                        'filename' => 'registration_form_question_groups_views_bulk_actions_search',
-                    ),
-                ),
-                'help_tour'     => array('Registration_Form_Question_Groups_Help_Tour'),
-                'metaboxes'     => $this->_default_espresso_metaboxes,
-                'require_nonce' => false,
-                'qtips'         => array(
-                    'EE_Registration_Form_Tips',
-                ),
-            ),
-
-            'add_question' => array(
-                'nav'           => array(
-                    'label'      => esc_html__('Add Question', 'event_espresso'),
-                    'order'      => 5,
-                    'persistent' => false,
-                ),
-                'metaboxes'     => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
-                'help_tabs'     => array(
-                    'registration_form_add_question_help_tab' => array(
-                        'title'    => esc_html__('Add Question', 'event_espresso'),
-                        'filename' => 'registration_form_add_question',
-                    ),
-                ),
-                'help_tour'     => array('Registration_Form_Add_Question_Help_Tour'),
-                'require_nonce' => false,
-            ),
-
-            'add_question_group' => array(
-                'nav'           => array(
-                    'label'      => esc_html__('Add Question Group', 'event_espresso'),
-                    'order'      => 5,
-                    'persistent' => false,
-                ),
-                'metaboxes'     => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
-                'help_tabs'     => array(
-                    'registration_form_add_question_group_help_tab' => array(
-                        'title'    => esc_html__('Add Question Group', 'event_espresso'),
-                        'filename' => 'registration_form_add_question_group',
-                    ),
-                ),
-                'help_tour'     => array('Registration_Form_Add_Question_Group_Help_Tour'),
-                'require_nonce' => false,
-            ),
-
-            'edit_question_group' => array(
-                'nav'           => array(
-                    'label'      => esc_html__('Edit Question Group', 'event_espresso'),
-                    'order'      => 5,
-                    'persistent' => false,
-                    'url'        => isset($this->_req_data['question_group_id']) ? add_query_arg(array('question_group_id' => $this->_req_data['question_group_id']),
-                        $this->_current_page_view_url) : $this->_admin_base_url,
-                ),
-                'metaboxes'     => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
-                'help_tabs'     => array(
-                    'registration_form_edit_question_group_help_tab' => array(
-                        'title'    => esc_html__('Edit Question Group', 'event_espresso'),
-                        'filename' => 'registration_form_edit_question_group',
-                    ),
-                ),
-                'help_tour'     => array('Registration_Form_Edit_Question_Group_Help_Tour'),
-                'require_nonce' => false,
-            ),
-
-            'view_reg_form_settings' => array(
-                'nav'           => array(
-                    'label' => esc_html__('Reg Form Settings', 'event_espresso'),
-                    'order' => 40,
-                ),
-                'labels'        => array(
-                    'publishbox' => esc_html__('Update Settings', 'event_espresso'),
-                ),
-                'metaboxes'     => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
-                'help_tabs'     => array(
-                    'registration_form_reg_form_settings_help_tab' => array(
-                        'title'    => esc_html__('Registration Form Settings', 'event_espresso'),
-                        'filename' => 'registration_form_reg_form_settings',
-                    ),
-                ),
-                'help_tour'     => array('Registration_Form_Settings_Help_Tour'),
-                'require_nonce' => false,
-            ),
-
-        );
-        $this->_page_config = array_merge($this->_page_config, $new_page_config);
-
-        //change the list table we're going to use so it's the NEW list table!
-        $this->_page_config['default']['list_table'] = 'Extend_Registration_Form_Questions_Admin_List_Table';
-
-
-        //additional labels
-        $new_labels               = array(
-            'add_question'          => esc_html__('Add New Question', 'event_espresso'),
-            'delete_question'       => esc_html__('Delete Question', 'event_espresso'),
-            'add_question_group'    => esc_html__('Add New Question Group', 'event_espresso'),
-            'edit_question_group'   => esc_html__('Edit Question Group', 'event_espresso'),
-            'delete_question_group' => esc_html__('Delete Question Group', 'event_espresso'),
-        );
-        $this->_labels['buttons'] = array_merge($this->_labels['buttons'], $new_labels);
-
-    }
-
-
-    protected function _ajax_hooks()
-    {
-        add_action('wp_ajax_espresso_update_question_group_order', array($this, 'update_question_group_order'));
-    }
-
-
-    public function load_scripts_styles_question_groups()
-    {
-        wp_enqueue_script('espresso_ajax_table_sorting');
-    }
-
-
-    public function load_scripts_styles_add_question_group()
-    {
-        $this->load_scripts_styles_forms();
-        $this->load_sortable_question_script();
-    }
-
-    public function load_scripts_styles_edit_question_group()
-    {
-        $this->load_scripts_styles_forms();
-        $this->load_sortable_question_script();
-    }
-
-
-    /**
-     * registers and enqueues script for questions
-     *
-     * @return void
-     */
-    public function load_sortable_question_script()
-    {
-        wp_register_script('ee-question-sortable', REGISTRATION_FORM_CAF_ASSETS_URL . 'ee_question_order.js',
-            array('jquery-ui-sortable'), EVENT_ESPRESSO_VERSION, true);
-        wp_enqueue_script('ee-question-sortable');
-    }
-
-
-    protected function _set_list_table_views_default()
-    {
-        $this->_views = array(
-            'all' => array(
-                'slug'        => 'all',
-                'label'       => esc_html__('View All Questions', 'event_espresso'),
-                'count'       => 0,
-                'bulk_action' => array(
-                    'trash_questions' => esc_html__('Trash', 'event_espresso'),
-                ),
-            ),
-        );
-
-        if (EE_Registry::instance()->CAP->current_user_can('ee_delete_questions',
-            'espresso_registration_form_trash_questions')
-        ) {
-            $this->_views['trash'] = array(
-                'slug'        => 'trash',
-                'label'       => esc_html__('Trash', 'event_espresso'),
-                'count'       => 0,
-                'bulk_action' => array(
-                    'delete_questions'  => esc_html__('Delete Permanently', 'event_espresso'),
-                    'restore_questions' => esc_html__('Restore', 'event_espresso'),
-                ),
-            );
-        }
-    }
-
-
-    protected function _set_list_table_views_question_groups()
-    {
-        $this->_views = array(
-            'all' => array(
-                'slug'        => 'all',
-                'label'       => esc_html__('All', 'event_espresso'),
-                'count'       => 0,
-                'bulk_action' => array(
-                    'trash_question_groups' => esc_html__('Trash', 'event_espresso'),
-                ),
-            ),
-        );
-
-        if (EE_Registry::instance()->CAP->current_user_can('ee_delete_question_groups',
-            'espresso_registration_form_trash_question_groups')
-        ) {
-            $this->_views['trash'] = array(
-                'slug'        => 'trash',
-                'label'       => esc_html__('Trash', 'event_espresso'),
-                'count'       => 0,
-                'bulk_action' => array(
-                    'delete_question_groups'  => esc_html__('Delete Permanently', 'event_espresso'),
-                    'restore_question_groups' => esc_html__('Restore', 'event_espresso'),
-                ),
-            );
-        }
-    }
-
-
-    protected function _questions_overview_list_table()
-    {
-        $this->_admin_page_title .= ' ' . $this->get_action_link_or_button(
-                'add_question',
-                'add_question',
-                array(),
-                'add-new-h2'
-            );
-        parent::_questions_overview_list_table();
-    }
-
-
-    protected function _question_groups_overview_list_table()
-    {
-        $this->_search_btn_label = esc_html__('Question Groups', 'event_espresso');
-        $this->_admin_page_title .= ' ' . $this->get_action_link_or_button(
-                'add_question_group',
-                'add_question_group',
-                array(),
-                'add-new-h2'
-            );
-        $this->display_admin_list_table_page_with_sidebar();
-    }
-
-
-    protected function _delete_question()
-    {
-        $success = $this->_delete_items($this->_question_model);
-        $this->_redirect_after_action(
-            $success,
-            $this->_question_model->item_name($success),
-            'deleted',
-            array('action' => 'default', 'status' => 'all')
-        );
-    }
-
-
-    protected function _delete_questions()
-    {
-        $success = $this->_delete_items($this->_question_model);
-        $this->_redirect_after_action(
-            $success,
-            $this->_question_model->item_name($success),
-            'deleted permanently',
-            array('action' => 'default', 'status' => 'trash')
-        );
-    }
-
-
-    /**
-     * Performs the deletion of a single or multiple questions or question groups.
-     *
-     * @param EEM_Soft_Delete_Base $model
-     * @return int number of items deleted permanently
-     */
-    private function _delete_items(EEM_Soft_Delete_Base $model)
-    {
-        $success = 0;
-        do_action('AHEE_log', __FILE__, __FUNCTION__, '');
-        if (! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
-            // if array has more than one element than success message should be plural
-            $success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
-            // cycle thru bulk action checkboxes
-            while (list($ID, $value) = each($this->_req_data['checkbox'])) {
-                if (! $this->_delete_item($ID, $model)) {
-                    $success = 0;
-                }
-            }
-
-        } elseif (! empty($this->_req_data['QSG_ID'])) {
-            $success = $this->_delete_item($this->_req_data['QSG_ID'], $model);
-
-        } elseif (! empty($this->_req_data['QST_ID'])) {
-            $success = $this->_delete_item($this->_req_data['QST_ID'], $model);
-        } else {
-            EE_Error::add_error(sprintf(esc_html__("No Questions or Question Groups were selected for deleting. This error usually shows when you've attempted to delete via bulk action but there were no selections.",
-                "event_espresso")), __FILE__, __FUNCTION__, __LINE__);
-        }
-        return $success;
-    }
-
-    /**
-     * Deletes the specified question (and its associated question options) or question group
-     *
-     * @param int                  $id
-     * @param EEM_Soft_Delete_Base $model
-     * @return boolean
-     */
-    protected function _delete_item($id, $model)
-    {
-        if ($model instanceof EEM_Question) {
-            EEM_Question_Option::instance()->delete_permanently(array(array('QST_ID' => absint($id))));
-        }
-        return $model->delete_permanently_by_ID(absint($id));
-    }
-
-
-    /******************************    QUESTION GROUPS    ******************************/
-
-
-    protected function _edit_question_group($type = 'add')
-    {
-        do_action('AHEE_log', __FILE__, __FUNCTION__, '');
-        $ID = isset($this->_req_data['QSG_ID']) && ! empty($this->_req_data['QSG_ID']) ? absint($this->_req_data['QSG_ID']) : false;
-
-        switch ($this->_req_action) {
-            case 'add_question_group' :
-                $this->_admin_page_title = esc_html__('Add Question Group', 'event_espresso');
-                break;
-            case 'edit_question_group' :
-                $this->_admin_page_title = esc_html__('Edit Question Group', 'event_espresso');
-                break;
-            default :
-                $this->_admin_page_title = ucwords(str_replace('_', ' ', $this->_req_action));
-        }
-        // add ID to title if editing
-        $this->_admin_page_title = $ID ? $this->_admin_page_title . ' # ' . $ID : $this->_admin_page_title;
-        if ($ID) {
-            /** @var EE_Question_Group $questionGroup */
-            $questionGroup            = $this->_question_group_model->get_one_by_ID($ID);
-            $additional_hidden_fields = array('QSG_ID' => array('type' => 'hidden', 'value' => $ID));
-            $this->_set_add_edit_form_tags('update_question_group', $additional_hidden_fields);
-        } else {
-            /** @var EE_Question_Group $questionGroup */
-            $questionGroup = EEM_Question_Group::instance()->create_default_object();
-            $questionGroup->set_order_to_latest();
-            $this->_set_add_edit_form_tags('insert_question_group');
-        }
-        $this->_template_args['values']         = $this->_yes_no_values;
-        $this->_template_args['all_questions']  = $questionGroup->questions_in_and_not_in_group();
-        $this->_template_args['QSG_ID']         = $ID ? $ID : true;
-        $this->_template_args['question_group'] = $questionGroup;
-
-        $redirect_URL = add_query_arg(array('action' => 'question_groups'), $this->_admin_base_url);
-        $this->_set_publish_post_box_vars('id', $ID, false, $redirect_URL);
-        $this->_template_args['admin_page_content'] = EEH_Template::display_template(REGISTRATION_FORM_CAF_TEMPLATE_PATH . 'question_groups_main_meta_box.template.php',
-            $this->_template_args, true);
-
-        // the details template wrapper
-        $this->display_admin_page_with_sidebar();
-    }
-
-
-    protected function _delete_question_groups()
-    {
-        $success = $this->_delete_items($this->_question_group_model);
-        $this->_redirect_after_action($success, $this->_question_group_model->item_name($success),
-            'deleted permanently', array('action' => 'question_groups', 'status' => 'trash'));
-    }
-
-
-    /**
-     * @param bool $new_question_group
-     */
-    protected function _insert_or_update_question_group($new_question_group = true)
-    {
-        do_action('AHEE_log', __FILE__, __FUNCTION__, '');
-        $set_column_values = $this->_set_column_values_for($this->_question_group_model);
-        if ($new_question_group) {
-            $QSG_ID  = $this->_question_group_model->insert($set_column_values);
-            $success = $QSG_ID ? 1 : 0;
-        } else {
-            $QSG_ID = absint($this->_req_data['QSG_ID']);
-            unset($set_column_values['QSG_ID']);
-            $success = $this->_question_group_model->update($set_column_values, array(array('QSG_ID' => $QSG_ID)));
-        }
-        $phone_question_id = EEM_Question::instance()->get_Question_ID_from_system_string(EEM_Attendee::system_question_phone);
-        // update the existing related questions
-        // BUT FIRST...  delete the phone question from the Question_Group_Question if it is being added to this question group (therefore removed from the existing group)
-        if (isset($this->_req_data['questions'], $this->_req_data['questions'][$phone_question_id])) {
-            // delete where QST ID = system phone question ID and Question Group ID is NOT this group
-            EEM_Question_Group_Question::instance()->delete(array(
-                array(
-                    'QST_ID' => $phone_question_id,
-                    'QSG_ID' => array('!=', $QSG_ID),
-                ),
-            ));
-        }
-        /** @type EE_Question_Group $question_group */
-        $question_group = $this->_question_group_model->get_one_by_ID($QSG_ID);
-        $questions      = $question_group->questions();
-        // make sure system phone question is added to list of questions for this group
-        if (! isset($questions[$phone_question_id])) {
-            $questions[$phone_question_id] = EEM_Question::instance()->get_one_by_ID($phone_question_id);
-        }
-
-        foreach ($questions as $question_ID => $question) {
-            // first we always check for order.
-            if (! empty($this->_req_data['question_orders'][$question_ID])) {
-                //update question order
-                $question_group->update_question_order($question_ID, $this->_req_data['question_orders'][$question_ID]);
-            }
-
-            // then we always check if adding or removing.
-            if (isset($this->_req_data['questions'], $this->_req_data['questions'][$question_ID])) {
-                $question_group->add_question($question_ID);
-            } else {
-                // not found, remove it (but only if not a system question for the personal group with the exception of lname system question - we allow removal of it)
-                if (
-                in_array(
-                    $question->system_ID(),
-                    EEM_Question::instance()->required_system_questions_in_system_question_group($question_group->system_group())
-                )
-                ) {
-                    continue;
-                } else {
-                    $question_group->remove_question($question_ID);
-                }
-            }
-        }
-        // save new related questions
-        if (isset($this->_req_data['questions'])) {
-            foreach ($this->_req_data['questions'] as $QST_ID) {
-                $question_group->add_question($QST_ID);
-                if (isset($this->_req_data['question_orders'][$QST_ID])) {
-                    $question_group->update_question_order($QST_ID, $this->_req_data['question_orders'][$QST_ID]);
-                }
-            }
-        }
-
-        if ($success !== false) {
-            $msg = $new_question_group ? sprintf(esc_html__('The %s has been created', 'event_espresso'),
-                $this->_question_group_model->item_name()) : sprintf(esc_html__('The %s has been updated',
-                'event_espresso'), $this->_question_group_model->item_name());
-            EE_Error::add_success($msg);
-        }
-        $this->_redirect_after_action(false, '', '', array('action' => 'edit_question_group', 'QSG_ID' => $QSG_ID),
-            true);
-
-    }
-
-    /**
-     * duplicates a question and all its question options and redirects to the new question.
-     */
-    public function _duplicate_question()
-    {
-        $question_ID = (int)$this->_req_data['QST_ID'];
-        $question    = EEM_Question::instance()->get_one_by_ID($question_ID);
-        if ($question instanceof EE_Question) {
-            $new_question = $question->duplicate();
-            if ($new_question instanceof EE_Question) {
-                $this->_redirect_after_action(true, esc_html__('Question', 'event_espresso'),
-                    esc_html__('Duplicated', 'event_espresso'),
-                    array('action' => 'edit_question', 'QST_ID' => $new_question->ID()), true);
-            } else {
-                global $wpdb;
-                EE_Error::add_error(sprintf(esc_html__('Could not duplicate question with ID %1$d because: %2$s',
-                    'event_espresso'), $question_ID, $wpdb->last_error), __FILE__, __FUNCTION__, __LINE__);
-                $this->_redirect_after_action(false, '', '', array('action' => 'default'), false);
-            }
-        } else {
-            EE_Error::add_error(sprintf(esc_html__('Could not duplicate question with ID %d because it didn\'t exist!',
-                'event_espresso'), $question_ID), __FILE__, __FUNCTION__, __LINE__);
-            $this->_redirect_after_action(false, '', '', array('action' => 'default'), false);
-        }
-    }
-
-
-    /**
-     * @param bool $trash
-     */
-    protected function _trash_or_restore_question_groups($trash = true)
-    {
-        $this->_trash_or_restore_items($this->_question_group_model, $trash);
-    }
-
-
-    /**
-     *_trash_question
-     */
-    protected function _trash_question()
-    {
-        $success    = $this->_question_model->delete_by_ID((int)$this->_req_data['QST_ID']);
-        $query_args = array('action' => 'default', 'status' => 'all');
-        $this->_redirect_after_action($success, $this->_question_model->item_name($success), 'trashed', $query_args);
-    }
-
-
-    /**
-     * @param bool $trash
-     */
-    protected function _trash_or_restore_questions($trash = true)
-    {
-        $this->_trash_or_restore_items($this->_question_model, $trash);
-    }
-
-
-    /**
-     * Internally used to delete or restore items, using the request data. Meant to be
-     * flexible between question or question groups
-     *
-     * @param EEM_Soft_Delete_Base $model
-     * @param boolean              $trash whether to trash or restore
-     */
-    private function _trash_or_restore_items(EEM_Soft_Delete_Base $model, $trash = true)
-    {
-
-        do_action('AHEE_log', __FILE__, __FUNCTION__, '');
-
-        $success = 1;
-        //Checkboxes
-        //echo "trash $trash";
-        //var_dump($this->_req_data['checkbox']);die;
-        if (isset($this->_req_data['checkbox'])) {
-            if (! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
-                // if array has more than one element than success message should be plural
-                $success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
-                // cycle thru bulk action checkboxes
-                while (list($ID, $value) = each($this->_req_data['checkbox'])) {
-                    if (! $model->delete_or_restore_by_ID($trash, absint($ID))) {
-                        $success = 0;
-                    }
-                }
-
-            } else {
-                // grab single id and delete
-                $ID = absint($this->_req_data['checkbox']);
-                if (! $model->delete_or_restore_by_ID($trash, $ID)) {
-                    $success = 0;
-                }
-            }
-
-        } else {
-            // delete via trash link
-            // grab single id and delete
-            $ID = absint($this->_req_data[$model->primary_key_name()]);
-            if (! $model->delete_or_restore_by_ID($trash, $ID)) {
-                $success = 0;
-            }
-
-        }
-
-
-        $action = $model instanceof EEM_Question ? 'default' : 'question_groups';//strtolower( $model->item_name(2) );
-        //echo "action :$action";
-        //$action = 'questions' ? 'default' : $action;
-        if ($trash) {
-            $action_desc = 'trashed';
-            $status      = 'trash';
-        } else {
-            $action_desc = 'restored';
-            $status      = 'all';
-        }
-        $this->_redirect_after_action($success, $model->item_name($success), $action_desc,
-            array('action' => $action, 'status' => $status));
-    }
-
-
-    /**
-     * @param            $per_page
-     * @param int        $current_page
-     * @param bool|false $count
-     * @return \EE_Soft_Delete_Base_Class[]|int
-     */
-    public function get_trashed_questions($per_page, $current_page = 1, $count = false)
-    {
-        $query_params = $this->get_query_params(EEM_Question::instance(), $per_page, $current_page);
-
-        if ($count) {
-            //note: this a subclass of EEM_Soft_Delete_Base, so this is actually only getting non-trashed items
-            $where   = isset($query_params[0]) ? array($query_params[0]) : array();
-            $results = $this->_question_model->count_deleted($where);
-        } else {
-            //note: this a subclass of EEM_Soft_Delete_Base, so this is actually only getting non-trashed items
-            $results = $this->_question_model->get_all_deleted($query_params);
-        }
-        return $results;
-    }
-
-
-    /**
-     * @param            $per_page
-     * @param int        $current_page
-     * @param bool|false $count
-     * @return \EE_Soft_Delete_Base_Class[]
-     */
-    public function get_question_groups($per_page, $current_page = 1, $count = false)
-    {
-        $questionGroupModel = EEM_Question_Group::instance();
-        $query_params       = $this->get_query_params($questionGroupModel, $per_page, $current_page);
-        if ($count) {
-            $where   = isset($query_params[0]) ? array($query_params[0]) : array();
-            $results = $questionGroupModel->count($where);
-        } else {
-            $results = $questionGroupModel->get_all($query_params);
-        }
-        return $results;
-    }
-
-
-    /**
-     * @param      $per_page
-     * @param int  $current_page
-     * @param bool $count
-     * @return \EE_Soft_Delete_Base_Class[]|int
-     */
-    public function get_trashed_question_groups($per_page, $current_page = 1, $count = false)
-    {
-        $questionGroupModel = EEM_Question_Group::instance();
-        $query_params       = $this->get_query_params($questionGroupModel, $per_page, $current_page);
-        if ($count) {
-            $where                 = isset($query_params[0]) ? array($query_params[0]) : array();
-            $query_params['limit'] = null;
-            $results               = $questionGroupModel->count_deleted($where);
-        } else {
-            $results = $questionGroupModel->get_all_deleted($query_params);
-        }
-        return $results;
-    }
-
-
-    /**
-     * method for performing updates to question order
-     *
-     * @return array results array
-     */
-    public function update_question_group_order()
-    {
-
-        $success = esc_html__('Question group order was updated successfully.', 'event_espresso');
-
-        // grab our row IDs
-        $row_ids = isset($this->_req_data['row_ids']) && ! empty($this->_req_data['row_ids'])
-            ? explode(',', rtrim($this->_req_data['row_ids'], ','))
-            : array();
-
-        $perpage = ! empty($this->_req_data['perpage'])
-            ? (int)$this->_req_data['perpage']
-            : null;
-        $curpage = ! empty($this->_req_data['curpage'])
-            ? (int)$this->_req_data['curpage']
-            : null;
-
-        if (! empty($row_ids)) {
-            //figure out where we start the row_id count at for the current page.
-            $qsgcount = empty($curpage) ? 0 : ($curpage - 1) * $perpage;
-
-            $row_count = count($row_ids);
-            for ($i = 0; $i < $row_count; $i++) {
-                //Update the questions when re-ordering
-                $updated = EEM_Question_Group::instance()->update(
-                    array('QSG_order' => $qsgcount),
-                    array(array('QSG_ID' => $row_ids[$i]))
-                );
-                if ($updated === false) {
-                    $success = false;
-                }
-                $qsgcount++;
-            }
-        } else {
-            $success = false;
-        }
-
-        $errors = ! $success
-            ? esc_html__('An error occurred. The question group order was not updated.', 'event_espresso')
-            : false;
-
-        echo wp_json_encode(array('return_data' => false, 'success' => $success, 'errors' => $errors));
-        die();
-
-    }
-
-
-
-    /***************************************        REGISTRATION SETTINGS        ***************************************/
-
-
-    /**
-     * _reg_form_settings
-     *
-     * @throws \EE_Error
-     */
-    protected function _reg_form_settings()
-    {
-        $this->_template_args['values'] = $this->_yes_no_values;
-        add_action(
-            'AHEE__Extend_Registration_Form_Admin_Page___reg_form_settings_template',
-            array($this, 'email_validation_settings_form'),
-            2
-        );
-        $this->_template_args = (array)apply_filters(
-            'FHEE__Extend_Registration_Form_Admin_Page___reg_form_settings___template_args',
-            $this->_template_args
-        );
-        $this->_set_add_edit_form_tags('update_reg_form_settings');
-        $this->_set_publish_post_box_vars(null, false, false, null, false);
-        $this->_template_args['admin_page_content'] = EEH_Template::display_template(
-            REGISTRATION_FORM_CAF_TEMPLATE_PATH . 'reg_form_settings.template.php',
-            $this->_template_args,
-            true
-        );
-        $this->display_admin_page_with_sidebar();
-    }
-
-
-    /**
-     * _update_reg_form_settings
-     */
-    protected function _update_reg_form_settings()
-    {
-        EE_Registry::instance()->CFG->registration = $this->update_email_validation_settings_form(
-            EE_Registry::instance()->CFG->registration
-        );
-        EE_Registry::instance()->CFG->registration = apply_filters(
-            'FHEE__Extend_Registration_Form_Admin_Page___update_reg_form_settings__CFG_registration',
-            EE_Registry::instance()->CFG->registration
-        );
-        $success                                   = $this->_update_espresso_configuration(
-            esc_html__('Registration Form Options', 'event_espresso'),
-            EE_Registry::instance()->CFG,
-            __FILE__, __FUNCTION__, __LINE__
-        );
-        $this->_redirect_after_action($success, esc_html__('Registration Form Options', 'event_espresso'), 'updated',
-            array('action' => 'view_reg_form_settings'));
-    }
-
-
-    /**
-     * email_validation_settings_form
-     *
-     * @access    public
-     * @return    void
-     * @throws \EE_Error
-     */
-    public function email_validation_settings_form()
-    {
-        echo $this->_email_validation_settings_form()->get_html();
-    }
-
-
-    /**
-     * _email_validation_settings_form
-     *
-     * @access protected
-     * @return EE_Form_Section_Proper
-     * @throws \EE_Error
-     */
-    protected function _email_validation_settings_form()
-    {
-        return new EE_Form_Section_Proper(
-            array(
-                'name'            => 'email_validation_settings',
-                'html_id'         => 'email_validation_settings',
-                'layout_strategy' => new EE_Admin_Two_Column_Layout(),
-                'subsections'     => array(
-                    'email_validation_hdr'   => new EE_Form_Section_HTML(
-                        EEH_HTML::h2(esc_html__('Email Validation Settings', 'event_espresso'))
-                    ),
-                    'email_validation_level' => new EE_Select_Input(
-                        array(
-                            'basic'      => esc_html__('Basic', 'event_espresso'),
-                            'wp_default' => esc_html__('WordPress Default', 'event_espresso'),
-                            'i18n'       => esc_html__('International', 'event_espresso'),
-                            'i18n_dns'   => esc_html__('International + DNS Check', 'event_espresso'),
-                        ),
-                        array(
-                            'html_label_text' => esc_html__('Email Validation Level', 'event_espresso')
-                                                 . EEH_Template::get_help_tab_link('email_validation_info'),
-                            'html_help_text'  => esc_html__('These levels range from basic validation ( ie: text@text.text ) to more advanced checks against international email addresses (ie: üñîçøðé@example.com ) with additional MX and A record checks to confirm the domain actually exists. More information on on each level can be found within the help section.',
-                                'event_espresso'),
-                            'default'         => isset(EE_Registry::instance()->CFG->registration->email_validation_level)
-                                ? EE_Registry::instance()->CFG->registration->email_validation_level
-                                : 'wp_default',
-                            'required'        => false,
-                        )
-                    ),
-                ),
-            )
-        );
-    }
-
-
-    /**
-     * update_email_validation_settings_form
-     *
-     * @access    public
-     * @param \EE_Registration_Config $EE_Registration_Config
-     * @return \EE_Registration_Config
-     */
-    public function update_email_validation_settings_form(EE_Registration_Config $EE_Registration_Config)
-    {
-        $prev_email_validation_level = $EE_Registration_Config->email_validation_level;
-        try {
-            $email_validation_settings_form = $this->_email_validation_settings_form();
-            // if not displaying a form, then check for form submission
-            if ($email_validation_settings_form->was_submitted()) {
-                // capture form data
-                $email_validation_settings_form->receive_form_submission();
-                // validate form data
-                if ($email_validation_settings_form->is_valid()) {
-                    // grab validated data from form
-                    $valid_data = $email_validation_settings_form->valid_data();
-                    if (isset($valid_data['email_validation_level'])) {
-                        $email_validation_level = $valid_data['email_validation_level'];
-                        // now if they want to use international email addresses
-                        if ($email_validation_level === 'i18n' || $email_validation_level === 'i18n_dns') {
-                            // in case we need to reset their email validation level,
-                            // make sure that the previous value wasn't already set to one of the i18n options.
-                            if ($prev_email_validation_level === 'i18n' || $prev_email_validation_level === 'i18n_dns') {
-                                // if so, then reset it back to "basic" since that is the only other option that,
-                                // despite offering poor validation, supports i18n email addresses
-                                $prev_email_validation_level = 'basic';
-                            }
-                            // confirm our i18n email validation will work on the server
-                            if (! $this->_verify_pcre_support($EE_Registration_Config, $email_validation_level)) {
-                                // or reset email validation level to previous value
-                                $email_validation_level = $prev_email_validation_level;
-                            }
-                        }
-                        $EE_Registration_Config->email_validation_level = $email_validation_level;
-                    } else {
-                        EE_Error::add_error(
-                            esc_html__(
-                                'Invalid or missing Email Validation settings. Please refresh the form and try again.',
-                                'event_espresso'
-                            ),
-                            __FILE__, __FUNCTION__, __LINE__
-                        );
-                    }
-                } else {
-                    if ($email_validation_settings_form->submission_error_message() !== '') {
-                        EE_Error::add_error(
-                            $email_validation_settings_form->submission_error_message(),
-                            __FILE__, __FUNCTION__, __LINE__
-                        );
-                    }
-                }
-            }
-        } catch (EE_Error $e) {
-            $e->get_error();
-        }
-        return $EE_Registration_Config;
-    }
-
-
-    /**
-     * confirms that the server's PHP version has the PCRE module enabled,
-     * and that the PCRE version works with our i18n email validation
-     *
-     * @param \EE_Registration_Config $EE_Registration_Config
-     * @param string                  $email_validation_level
-     * @return bool
-     */
-    private function _verify_pcre_support(EE_Registration_Config $EE_Registration_Config, $email_validation_level)
-    {
-        // first check that PCRE is enabled
-        if (! defined('PREG_BAD_UTF8_ERROR')) {
-            EE_Error::add_error(
-                sprintf(
-                    esc_html__(
-                        'We\'re sorry, but it appears that your server\'s version of PHP was not compiled with PCRE unicode support.%1$sPlease contact your hosting company and ask them whether the PCRE compiled with your version of PHP on your server can be been built with the "--enable-unicode-properties" and "--enable-utf8" configuration switches to enable more complex regex expressions.%1$sIf they are unable, or unwilling to do so, then your server will not support international email addresses using UTF-8 unicode characters. This means you will either have to lower your email validation level to "Basic" or "WordPress Default", or switch to a hosting company that has/can enable PCRE unicode support on the server.',
-                        'event_espresso'
-                    ),
-                    '<br />'
-                ),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-            return false;
-        } else {
-            // PCRE support is enabled, but let's still
-            // perform a test to see if the server will support it.
-            // but first, save the updated validation level to the config,
-            // so that the validation strategy picks it up.
-            // this will get bumped back down if it doesn't work
-            $EE_Registration_Config->email_validation_level = $email_validation_level;
-            try {
-                $email_validator    = new EE_Email_Validation_Strategy();
-                $i18n_email_address = apply_filters(
-                    'FHEE__Extend_Registration_Form_Admin_Page__update_email_validation_settings_form__i18n_email_address',
-                    'jägerjürgen@deutschland.com'
-                );
-                $email_validator->validate($i18n_email_address);
-            } catch (Exception $e) {
-                EE_Error::add_error(
-                    sprintf(
-                        esc_html__(
-                            'We\'re sorry, but it appears that your server\'s configuration will not support the "International" or "International + DNS Check" email validation levels.%1$sTo correct this issue, please consult with your hosting company regarding your server\'s PCRE settings.%1$sIt is recommended that your PHP version be configured to use PCRE 8.10 or newer.%1$sMore information regarding PCRE versions and installation can be found here: %2$s',
-                            'event_espresso'
-                        ),
-                        '<br />',
-                        '<a href="http://php.net/manual/en/pcre.installation.php" target="_blank">http://php.net/manual/en/pcre.installation.php</a>'
-                    ),
-                    __FILE__, __FUNCTION__, __LINE__
-                );
-                return false;
-            }
-        }
-        return true;
-    }
+	/**
+	 * @Constructor
+	 * @param bool $routing indicate whether we want to just load the object and handle routing or just load the object.
+	 * @access public
+	 */
+	public function __construct($routing = true)
+	{
+		define('REGISTRATION_FORM_CAF_ADMIN', EE_CORE_CAF_ADMIN_EXTEND . 'registration_form' . DS);
+		define('REGISTRATION_FORM_CAF_ASSETS_PATH', REGISTRATION_FORM_CAF_ADMIN . 'assets' . DS);
+		define('REGISTRATION_FORM_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'registration_form/assets/');
+		define('REGISTRATION_FORM_CAF_TEMPLATE_PATH', REGISTRATION_FORM_CAF_ADMIN . 'templates' . DS);
+		define('REGISTRATION_FORM_CAF_TEMPLATE_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'registration_form/templates/');
+		parent::__construct($routing);
+	}
+
+
+	protected function _extend_page_config()
+	{
+		$this->_admin_base_path = REGISTRATION_FORM_CAF_ADMIN;
+		$qst_id = ! empty($this->_req_data['QST_ID']) && ! is_array($this->_req_data['QST_ID']) ? $this->_req_data['QST_ID'] : 0;
+		$qsg_id = ! empty($this->_req_data['QSG_ID']) && ! is_array($this->_req_data['QSG_ID']) ? $this->_req_data['QSG_ID'] : 0;
+
+		$new_page_routes    = array(
+			'question_groups'    => array(
+				'func'       => '_question_groups_overview_list_table',
+				'capability' => 'ee_read_question_groups',
+			),
+			'add_question'       => array(
+				'func'       => '_edit_question',
+				'capability' => 'ee_edit_questions',
+			),
+			'insert_question'    => array(
+				'func'       => '_insert_or_update_question',
+				'args'       => array('new_question' => true),
+				'capability' => 'ee_edit_questions',
+				'noheader'   => true,
+			),
+			'duplicate_question' => array(
+				'func'       => '_duplicate_question',
+				'capability' => 'ee_edit_questions',
+				'noheader'   => true,
+			),
+			'trash_question'     => array(
+				'func'       => '_trash_question',
+				'capability' => 'ee_delete_question',
+				'obj_id'     => $qst_id,
+				'noheader'   => true,
+			),
+
+			'restore_question' => array(
+				'func'       => '_trash_or_restore_questions',
+				'capability' => 'ee_delete_question',
+				'obj_id'     => $qst_id,
+				'args'       => array('trash' => false),
+				'noheader'   => true,
+			),
+
+			'delete_question' => array(
+				'func'       => '_delete_question',
+				'capability' => 'ee_delete_question',
+				'obj_id'     => $qst_id,
+				'noheader'   => true,
+			),
+
+			'trash_questions' => array(
+				'func'       => '_trash_or_restore_questions',
+				'capability' => 'ee_delete_questions',
+				'args'       => array('trash' => true),
+				'noheader'   => true,
+			),
+
+			'restore_questions' => array(
+				'func'       => '_trash_or_restore_questions',
+				'capability' => 'ee_delete_questions',
+				'args'       => array('trash' => false),
+				'noheader'   => true,
+			),
+
+			'delete_questions' => array(
+				'func'       => '_delete_questions',
+				'args'       => array(),
+				'capability' => 'ee_delete_questions',
+				'noheader'   => true,
+			),
+
+			'add_question_group' => array(
+				'func'       => '_edit_question_group',
+				'capability' => 'ee_edit_question_groups',
+			),
+
+			'edit_question_group' => array(
+				'func'       => '_edit_question_group',
+				'capability' => 'ee_edit_question_group',
+				'obj_id'     => $qsg_id,
+				'args'       => array('edit'),
+			),
+
+			'delete_question_groups' => array(
+				'func'       => '_delete_question_groups',
+				'capability' => 'ee_delete_question_groups',
+				'noheader'   => true,
+			),
+
+			'delete_question_group' => array(
+				'func'       => '_delete_question_groups',
+				'capability' => 'ee_delete_question_group',
+				'obj_id'     => $qsg_id,
+				'noheader'   => true,
+			),
+
+			'trash_question_group' => array(
+				'func'       => '_trash_or_restore_question_groups',
+				'args'       => array('trash' => true),
+				'capability' => 'ee_delete_question_group',
+				'obj_id'     => $qsg_id,
+				'noheader'   => true,
+			),
+
+			'restore_question_group' => array(
+				'func'       => '_trash_or_restore_question_groups',
+				'args'       => array('trash' => false),
+				'capability' => 'ee_delete_question_group',
+				'obj_id'     => $qsg_id,
+				'noheader'   => true,
+			),
+
+			'insert_question_group' => array(
+				'func'       => '_insert_or_update_question_group',
+				'args'       => array('new_question_group' => true),
+				'capability' => 'ee_edit_question_groups',
+				'noheader'   => true,
+			),
+
+			'update_question_group' => array(
+				'func'       => '_insert_or_update_question_group',
+				'args'       => array('new_question_group' => false),
+				'capability' => 'ee_edit_question_group',
+				'obj_id'     => $qsg_id,
+				'noheader'   => true,
+			),
+
+			'trash_question_groups' => array(
+				'func'       => '_trash_or_restore_question_groups',
+				'args'       => array('trash' => true),
+				'capability' => 'ee_delete_question_groups',
+				'noheader'   => array('trash' => false),
+			),
+
+			'restore_question_groups' => array(
+				'func'       => '_trash_or_restore_question_groups',
+				'args'       => array('trash' => false),
+				'capability' => 'ee_delete_question_groups',
+				'noheader'   => true,
+			),
+
+
+			'espresso_update_question_group_order' => array(
+				'func'       => 'update_question_group_order',
+				'capability' => 'ee_edit_question_groups',
+				'noheader'   => true,
+			),
+
+			'view_reg_form_settings' => array(
+				'func'       => '_reg_form_settings',
+				'capability' => 'manage_options',
+			),
+
+			'update_reg_form_settings' => array(
+				'func'       => '_update_reg_form_settings',
+				'capability' => 'manage_options',
+				'noheader'   => true,
+			),
+		);
+		$this->_page_routes = array_merge($this->_page_routes, $new_page_routes);
+
+		$new_page_config    = array(
+
+			'question_groups' => array(
+				'nav'           => array(
+					'label' => esc_html__('Question Groups', 'event_espresso'),
+					'order' => 20,
+				),
+				'list_table'    => 'Registration_Form_Question_Groups_Admin_List_Table',
+				'help_tabs'     => array(
+					'registration_form_question_groups_help_tab'                           => array(
+						'title'    => esc_html__('Question Groups', 'event_espresso'),
+						'filename' => 'registration_form_question_groups',
+					),
+					'registration_form_question_groups_table_column_headings_help_tab'     => array(
+						'title'    => esc_html__('Question Groups Table Column Headings', 'event_espresso'),
+						'filename' => 'registration_form_question_groups_table_column_headings',
+					),
+					'registration_form_question_groups_views_bulk_actions_search_help_tab' => array(
+						'title'    => esc_html__('Question Groups Views & Bulk Actions & Search', 'event_espresso'),
+						'filename' => 'registration_form_question_groups_views_bulk_actions_search',
+					),
+				),
+				'help_tour'     => array('Registration_Form_Question_Groups_Help_Tour'),
+				'metaboxes'     => $this->_default_espresso_metaboxes,
+				'require_nonce' => false,
+				'qtips'         => array(
+					'EE_Registration_Form_Tips',
+				),
+			),
+
+			'add_question' => array(
+				'nav'           => array(
+					'label'      => esc_html__('Add Question', 'event_espresso'),
+					'order'      => 5,
+					'persistent' => false,
+				),
+				'metaboxes'     => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
+				'help_tabs'     => array(
+					'registration_form_add_question_help_tab' => array(
+						'title'    => esc_html__('Add Question', 'event_espresso'),
+						'filename' => 'registration_form_add_question',
+					),
+				),
+				'help_tour'     => array('Registration_Form_Add_Question_Help_Tour'),
+				'require_nonce' => false,
+			),
+
+			'add_question_group' => array(
+				'nav'           => array(
+					'label'      => esc_html__('Add Question Group', 'event_espresso'),
+					'order'      => 5,
+					'persistent' => false,
+				),
+				'metaboxes'     => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
+				'help_tabs'     => array(
+					'registration_form_add_question_group_help_tab' => array(
+						'title'    => esc_html__('Add Question Group', 'event_espresso'),
+						'filename' => 'registration_form_add_question_group',
+					),
+				),
+				'help_tour'     => array('Registration_Form_Add_Question_Group_Help_Tour'),
+				'require_nonce' => false,
+			),
+
+			'edit_question_group' => array(
+				'nav'           => array(
+					'label'      => esc_html__('Edit Question Group', 'event_espresso'),
+					'order'      => 5,
+					'persistent' => false,
+					'url'        => isset($this->_req_data['question_group_id']) ? add_query_arg(array('question_group_id' => $this->_req_data['question_group_id']),
+						$this->_current_page_view_url) : $this->_admin_base_url,
+				),
+				'metaboxes'     => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
+				'help_tabs'     => array(
+					'registration_form_edit_question_group_help_tab' => array(
+						'title'    => esc_html__('Edit Question Group', 'event_espresso'),
+						'filename' => 'registration_form_edit_question_group',
+					),
+				),
+				'help_tour'     => array('Registration_Form_Edit_Question_Group_Help_Tour'),
+				'require_nonce' => false,
+			),
+
+			'view_reg_form_settings' => array(
+				'nav'           => array(
+					'label' => esc_html__('Reg Form Settings', 'event_espresso'),
+					'order' => 40,
+				),
+				'labels'        => array(
+					'publishbox' => esc_html__('Update Settings', 'event_espresso'),
+				),
+				'metaboxes'     => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
+				'help_tabs'     => array(
+					'registration_form_reg_form_settings_help_tab' => array(
+						'title'    => esc_html__('Registration Form Settings', 'event_espresso'),
+						'filename' => 'registration_form_reg_form_settings',
+					),
+				),
+				'help_tour'     => array('Registration_Form_Settings_Help_Tour'),
+				'require_nonce' => false,
+			),
+
+		);
+		$this->_page_config = array_merge($this->_page_config, $new_page_config);
+
+		//change the list table we're going to use so it's the NEW list table!
+		$this->_page_config['default']['list_table'] = 'Extend_Registration_Form_Questions_Admin_List_Table';
+
+
+		//additional labels
+		$new_labels               = array(
+			'add_question'          => esc_html__('Add New Question', 'event_espresso'),
+			'delete_question'       => esc_html__('Delete Question', 'event_espresso'),
+			'add_question_group'    => esc_html__('Add New Question Group', 'event_espresso'),
+			'edit_question_group'   => esc_html__('Edit Question Group', 'event_espresso'),
+			'delete_question_group' => esc_html__('Delete Question Group', 'event_espresso'),
+		);
+		$this->_labels['buttons'] = array_merge($this->_labels['buttons'], $new_labels);
+
+	}
+
+
+	protected function _ajax_hooks()
+	{
+		add_action('wp_ajax_espresso_update_question_group_order', array($this, 'update_question_group_order'));
+	}
+
+
+	public function load_scripts_styles_question_groups()
+	{
+		wp_enqueue_script('espresso_ajax_table_sorting');
+	}
+
+
+	public function load_scripts_styles_add_question_group()
+	{
+		$this->load_scripts_styles_forms();
+		$this->load_sortable_question_script();
+	}
+
+	public function load_scripts_styles_edit_question_group()
+	{
+		$this->load_scripts_styles_forms();
+		$this->load_sortable_question_script();
+	}
+
+
+	/**
+	 * registers and enqueues script for questions
+	 *
+	 * @return void
+	 */
+	public function load_sortable_question_script()
+	{
+		wp_register_script('ee-question-sortable', REGISTRATION_FORM_CAF_ASSETS_URL . 'ee_question_order.js',
+			array('jquery-ui-sortable'), EVENT_ESPRESSO_VERSION, true);
+		wp_enqueue_script('ee-question-sortable');
+	}
+
+
+	protected function _set_list_table_views_default()
+	{
+		$this->_views = array(
+			'all' => array(
+				'slug'        => 'all',
+				'label'       => esc_html__('View All Questions', 'event_espresso'),
+				'count'       => 0,
+				'bulk_action' => array(
+					'trash_questions' => esc_html__('Trash', 'event_espresso'),
+				),
+			),
+		);
+
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_questions',
+			'espresso_registration_form_trash_questions')
+		) {
+			$this->_views['trash'] = array(
+				'slug'        => 'trash',
+				'label'       => esc_html__('Trash', 'event_espresso'),
+				'count'       => 0,
+				'bulk_action' => array(
+					'delete_questions'  => esc_html__('Delete Permanently', 'event_espresso'),
+					'restore_questions' => esc_html__('Restore', 'event_espresso'),
+				),
+			);
+		}
+	}
+
+
+	protected function _set_list_table_views_question_groups()
+	{
+		$this->_views = array(
+			'all' => array(
+				'slug'        => 'all',
+				'label'       => esc_html__('All', 'event_espresso'),
+				'count'       => 0,
+				'bulk_action' => array(
+					'trash_question_groups' => esc_html__('Trash', 'event_espresso'),
+				),
+			),
+		);
+
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_question_groups',
+			'espresso_registration_form_trash_question_groups')
+		) {
+			$this->_views['trash'] = array(
+				'slug'        => 'trash',
+				'label'       => esc_html__('Trash', 'event_espresso'),
+				'count'       => 0,
+				'bulk_action' => array(
+					'delete_question_groups'  => esc_html__('Delete Permanently', 'event_espresso'),
+					'restore_question_groups' => esc_html__('Restore', 'event_espresso'),
+				),
+			);
+		}
+	}
+
+
+	protected function _questions_overview_list_table()
+	{
+		$this->_admin_page_title .= ' ' . $this->get_action_link_or_button(
+				'add_question',
+				'add_question',
+				array(),
+				'add-new-h2'
+			);
+		parent::_questions_overview_list_table();
+	}
+
+
+	protected function _question_groups_overview_list_table()
+	{
+		$this->_search_btn_label = esc_html__('Question Groups', 'event_espresso');
+		$this->_admin_page_title .= ' ' . $this->get_action_link_or_button(
+				'add_question_group',
+				'add_question_group',
+				array(),
+				'add-new-h2'
+			);
+		$this->display_admin_list_table_page_with_sidebar();
+	}
+
+
+	protected function _delete_question()
+	{
+		$success = $this->_delete_items($this->_question_model);
+		$this->_redirect_after_action(
+			$success,
+			$this->_question_model->item_name($success),
+			'deleted',
+			array('action' => 'default', 'status' => 'all')
+		);
+	}
+
+
+	protected function _delete_questions()
+	{
+		$success = $this->_delete_items($this->_question_model);
+		$this->_redirect_after_action(
+			$success,
+			$this->_question_model->item_name($success),
+			'deleted permanently',
+			array('action' => 'default', 'status' => 'trash')
+		);
+	}
+
+
+	/**
+	 * Performs the deletion of a single or multiple questions or question groups.
+	 *
+	 * @param EEM_Soft_Delete_Base $model
+	 * @return int number of items deleted permanently
+	 */
+	private function _delete_items(EEM_Soft_Delete_Base $model)
+	{
+		$success = 0;
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		if (! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
+			// if array has more than one element than success message should be plural
+			$success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
+			// cycle thru bulk action checkboxes
+			while (list($ID, $value) = each($this->_req_data['checkbox'])) {
+				if (! $this->_delete_item($ID, $model)) {
+					$success = 0;
+				}
+			}
+
+		} elseif (! empty($this->_req_data['QSG_ID'])) {
+			$success = $this->_delete_item($this->_req_data['QSG_ID'], $model);
+
+		} elseif (! empty($this->_req_data['QST_ID'])) {
+			$success = $this->_delete_item($this->_req_data['QST_ID'], $model);
+		} else {
+			EE_Error::add_error(sprintf(esc_html__("No Questions or Question Groups were selected for deleting. This error usually shows when you've attempted to delete via bulk action but there were no selections.",
+				"event_espresso")), __FILE__, __FUNCTION__, __LINE__);
+		}
+		return $success;
+	}
+
+	/**
+	 * Deletes the specified question (and its associated question options) or question group
+	 *
+	 * @param int                  $id
+	 * @param EEM_Soft_Delete_Base $model
+	 * @return boolean
+	 */
+	protected function _delete_item($id, $model)
+	{
+		if ($model instanceof EEM_Question) {
+			EEM_Question_Option::instance()->delete_permanently(array(array('QST_ID' => absint($id))));
+		}
+		return $model->delete_permanently_by_ID(absint($id));
+	}
+
+
+	/******************************    QUESTION GROUPS    ******************************/
+
+
+	protected function _edit_question_group($type = 'add')
+	{
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$ID = isset($this->_req_data['QSG_ID']) && ! empty($this->_req_data['QSG_ID']) ? absint($this->_req_data['QSG_ID']) : false;
+
+		switch ($this->_req_action) {
+			case 'add_question_group' :
+				$this->_admin_page_title = esc_html__('Add Question Group', 'event_espresso');
+				break;
+			case 'edit_question_group' :
+				$this->_admin_page_title = esc_html__('Edit Question Group', 'event_espresso');
+				break;
+			default :
+				$this->_admin_page_title = ucwords(str_replace('_', ' ', $this->_req_action));
+		}
+		// add ID to title if editing
+		$this->_admin_page_title = $ID ? $this->_admin_page_title . ' # ' . $ID : $this->_admin_page_title;
+		if ($ID) {
+			/** @var EE_Question_Group $questionGroup */
+			$questionGroup            = $this->_question_group_model->get_one_by_ID($ID);
+			$additional_hidden_fields = array('QSG_ID' => array('type' => 'hidden', 'value' => $ID));
+			$this->_set_add_edit_form_tags('update_question_group', $additional_hidden_fields);
+		} else {
+			/** @var EE_Question_Group $questionGroup */
+			$questionGroup = EEM_Question_Group::instance()->create_default_object();
+			$questionGroup->set_order_to_latest();
+			$this->_set_add_edit_form_tags('insert_question_group');
+		}
+		$this->_template_args['values']         = $this->_yes_no_values;
+		$this->_template_args['all_questions']  = $questionGroup->questions_in_and_not_in_group();
+		$this->_template_args['QSG_ID']         = $ID ? $ID : true;
+		$this->_template_args['question_group'] = $questionGroup;
+
+		$redirect_URL = add_query_arg(array('action' => 'question_groups'), $this->_admin_base_url);
+		$this->_set_publish_post_box_vars('id', $ID, false, $redirect_URL);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(REGISTRATION_FORM_CAF_TEMPLATE_PATH . 'question_groups_main_meta_box.template.php',
+			$this->_template_args, true);
+
+		// the details template wrapper
+		$this->display_admin_page_with_sidebar();
+	}
+
+
+	protected function _delete_question_groups()
+	{
+		$success = $this->_delete_items($this->_question_group_model);
+		$this->_redirect_after_action($success, $this->_question_group_model->item_name($success),
+			'deleted permanently', array('action' => 'question_groups', 'status' => 'trash'));
+	}
+
+
+	/**
+	 * @param bool $new_question_group
+	 */
+	protected function _insert_or_update_question_group($new_question_group = true)
+	{
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$set_column_values = $this->_set_column_values_for($this->_question_group_model);
+		if ($new_question_group) {
+			$QSG_ID  = $this->_question_group_model->insert($set_column_values);
+			$success = $QSG_ID ? 1 : 0;
+		} else {
+			$QSG_ID = absint($this->_req_data['QSG_ID']);
+			unset($set_column_values['QSG_ID']);
+			$success = $this->_question_group_model->update($set_column_values, array(array('QSG_ID' => $QSG_ID)));
+		}
+		$phone_question_id = EEM_Question::instance()->get_Question_ID_from_system_string(EEM_Attendee::system_question_phone);
+		// update the existing related questions
+		// BUT FIRST...  delete the phone question from the Question_Group_Question if it is being added to this question group (therefore removed from the existing group)
+		if (isset($this->_req_data['questions'], $this->_req_data['questions'][$phone_question_id])) {
+			// delete where QST ID = system phone question ID and Question Group ID is NOT this group
+			EEM_Question_Group_Question::instance()->delete(array(
+				array(
+					'QST_ID' => $phone_question_id,
+					'QSG_ID' => array('!=', $QSG_ID),
+				),
+			));
+		}
+		/** @type EE_Question_Group $question_group */
+		$question_group = $this->_question_group_model->get_one_by_ID($QSG_ID);
+		$questions      = $question_group->questions();
+		// make sure system phone question is added to list of questions for this group
+		if (! isset($questions[$phone_question_id])) {
+			$questions[$phone_question_id] = EEM_Question::instance()->get_one_by_ID($phone_question_id);
+		}
+
+		foreach ($questions as $question_ID => $question) {
+			// first we always check for order.
+			if (! empty($this->_req_data['question_orders'][$question_ID])) {
+				//update question order
+				$question_group->update_question_order($question_ID, $this->_req_data['question_orders'][$question_ID]);
+			}
+
+			// then we always check if adding or removing.
+			if (isset($this->_req_data['questions'], $this->_req_data['questions'][$question_ID])) {
+				$question_group->add_question($question_ID);
+			} else {
+				// not found, remove it (but only if not a system question for the personal group with the exception of lname system question - we allow removal of it)
+				if (
+				in_array(
+					$question->system_ID(),
+					EEM_Question::instance()->required_system_questions_in_system_question_group($question_group->system_group())
+				)
+				) {
+					continue;
+				} else {
+					$question_group->remove_question($question_ID);
+				}
+			}
+		}
+		// save new related questions
+		if (isset($this->_req_data['questions'])) {
+			foreach ($this->_req_data['questions'] as $QST_ID) {
+				$question_group->add_question($QST_ID);
+				if (isset($this->_req_data['question_orders'][$QST_ID])) {
+					$question_group->update_question_order($QST_ID, $this->_req_data['question_orders'][$QST_ID]);
+				}
+			}
+		}
+
+		if ($success !== false) {
+			$msg = $new_question_group ? sprintf(esc_html__('The %s has been created', 'event_espresso'),
+				$this->_question_group_model->item_name()) : sprintf(esc_html__('The %s has been updated',
+				'event_espresso'), $this->_question_group_model->item_name());
+			EE_Error::add_success($msg);
+		}
+		$this->_redirect_after_action(false, '', '', array('action' => 'edit_question_group', 'QSG_ID' => $QSG_ID),
+			true);
+
+	}
+
+	/**
+	 * duplicates a question and all its question options and redirects to the new question.
+	 */
+	public function _duplicate_question()
+	{
+		$question_ID = (int)$this->_req_data['QST_ID'];
+		$question    = EEM_Question::instance()->get_one_by_ID($question_ID);
+		if ($question instanceof EE_Question) {
+			$new_question = $question->duplicate();
+			if ($new_question instanceof EE_Question) {
+				$this->_redirect_after_action(true, esc_html__('Question', 'event_espresso'),
+					esc_html__('Duplicated', 'event_espresso'),
+					array('action' => 'edit_question', 'QST_ID' => $new_question->ID()), true);
+			} else {
+				global $wpdb;
+				EE_Error::add_error(sprintf(esc_html__('Could not duplicate question with ID %1$d because: %2$s',
+					'event_espresso'), $question_ID, $wpdb->last_error), __FILE__, __FUNCTION__, __LINE__);
+				$this->_redirect_after_action(false, '', '', array('action' => 'default'), false);
+			}
+		} else {
+			EE_Error::add_error(sprintf(esc_html__('Could not duplicate question with ID %d because it didn\'t exist!',
+				'event_espresso'), $question_ID), __FILE__, __FUNCTION__, __LINE__);
+			$this->_redirect_after_action(false, '', '', array('action' => 'default'), false);
+		}
+	}
+
+
+	/**
+	 * @param bool $trash
+	 */
+	protected function _trash_or_restore_question_groups($trash = true)
+	{
+		$this->_trash_or_restore_items($this->_question_group_model, $trash);
+	}
+
+
+	/**
+	 *_trash_question
+	 */
+	protected function _trash_question()
+	{
+		$success    = $this->_question_model->delete_by_ID((int)$this->_req_data['QST_ID']);
+		$query_args = array('action' => 'default', 'status' => 'all');
+		$this->_redirect_after_action($success, $this->_question_model->item_name($success), 'trashed', $query_args);
+	}
+
+
+	/**
+	 * @param bool $trash
+	 */
+	protected function _trash_or_restore_questions($trash = true)
+	{
+		$this->_trash_or_restore_items($this->_question_model, $trash);
+	}
+
+
+	/**
+	 * Internally used to delete or restore items, using the request data. Meant to be
+	 * flexible between question or question groups
+	 *
+	 * @param EEM_Soft_Delete_Base $model
+	 * @param boolean              $trash whether to trash or restore
+	 */
+	private function _trash_or_restore_items(EEM_Soft_Delete_Base $model, $trash = true)
+	{
+
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+
+		$success = 1;
+		//Checkboxes
+		//echo "trash $trash";
+		//var_dump($this->_req_data['checkbox']);die;
+		if (isset($this->_req_data['checkbox'])) {
+			if (! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
+				// if array has more than one element than success message should be plural
+				$success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
+				// cycle thru bulk action checkboxes
+				while (list($ID, $value) = each($this->_req_data['checkbox'])) {
+					if (! $model->delete_or_restore_by_ID($trash, absint($ID))) {
+						$success = 0;
+					}
+				}
+
+			} else {
+				// grab single id and delete
+				$ID = absint($this->_req_data['checkbox']);
+				if (! $model->delete_or_restore_by_ID($trash, $ID)) {
+					$success = 0;
+				}
+			}
+
+		} else {
+			// delete via trash link
+			// grab single id and delete
+			$ID = absint($this->_req_data[$model->primary_key_name()]);
+			if (! $model->delete_or_restore_by_ID($trash, $ID)) {
+				$success = 0;
+			}
+
+		}
+
+
+		$action = $model instanceof EEM_Question ? 'default' : 'question_groups';//strtolower( $model->item_name(2) );
+		//echo "action :$action";
+		//$action = 'questions' ? 'default' : $action;
+		if ($trash) {
+			$action_desc = 'trashed';
+			$status      = 'trash';
+		} else {
+			$action_desc = 'restored';
+			$status      = 'all';
+		}
+		$this->_redirect_after_action($success, $model->item_name($success), $action_desc,
+			array('action' => $action, 'status' => $status));
+	}
+
+
+	/**
+	 * @param            $per_page
+	 * @param int        $current_page
+	 * @param bool|false $count
+	 * @return \EE_Soft_Delete_Base_Class[]|int
+	 */
+	public function get_trashed_questions($per_page, $current_page = 1, $count = false)
+	{
+		$query_params = $this->get_query_params(EEM_Question::instance(), $per_page, $current_page);
+
+		if ($count) {
+			//note: this a subclass of EEM_Soft_Delete_Base, so this is actually only getting non-trashed items
+			$where   = isset($query_params[0]) ? array($query_params[0]) : array();
+			$results = $this->_question_model->count_deleted($where);
+		} else {
+			//note: this a subclass of EEM_Soft_Delete_Base, so this is actually only getting non-trashed items
+			$results = $this->_question_model->get_all_deleted($query_params);
+		}
+		return $results;
+	}
+
+
+	/**
+	 * @param            $per_page
+	 * @param int        $current_page
+	 * @param bool|false $count
+	 * @return \EE_Soft_Delete_Base_Class[]
+	 */
+	public function get_question_groups($per_page, $current_page = 1, $count = false)
+	{
+		$questionGroupModel = EEM_Question_Group::instance();
+		$query_params       = $this->get_query_params($questionGroupModel, $per_page, $current_page);
+		if ($count) {
+			$where   = isset($query_params[0]) ? array($query_params[0]) : array();
+			$results = $questionGroupModel->count($where);
+		} else {
+			$results = $questionGroupModel->get_all($query_params);
+		}
+		return $results;
+	}
+
+
+	/**
+	 * @param      $per_page
+	 * @param int  $current_page
+	 * @param bool $count
+	 * @return \EE_Soft_Delete_Base_Class[]|int
+	 */
+	public function get_trashed_question_groups($per_page, $current_page = 1, $count = false)
+	{
+		$questionGroupModel = EEM_Question_Group::instance();
+		$query_params       = $this->get_query_params($questionGroupModel, $per_page, $current_page);
+		if ($count) {
+			$where                 = isset($query_params[0]) ? array($query_params[0]) : array();
+			$query_params['limit'] = null;
+			$results               = $questionGroupModel->count_deleted($where);
+		} else {
+			$results = $questionGroupModel->get_all_deleted($query_params);
+		}
+		return $results;
+	}
+
+
+	/**
+	 * method for performing updates to question order
+	 *
+	 * @return array results array
+	 */
+	public function update_question_group_order()
+	{
+
+		$success = esc_html__('Question group order was updated successfully.', 'event_espresso');
+
+		// grab our row IDs
+		$row_ids = isset($this->_req_data['row_ids']) && ! empty($this->_req_data['row_ids'])
+			? explode(',', rtrim($this->_req_data['row_ids'], ','))
+			: array();
+
+		$perpage = ! empty($this->_req_data['perpage'])
+			? (int)$this->_req_data['perpage']
+			: null;
+		$curpage = ! empty($this->_req_data['curpage'])
+			? (int)$this->_req_data['curpage']
+			: null;
+
+		if (! empty($row_ids)) {
+			//figure out where we start the row_id count at for the current page.
+			$qsgcount = empty($curpage) ? 0 : ($curpage - 1) * $perpage;
+
+			$row_count = count($row_ids);
+			for ($i = 0; $i < $row_count; $i++) {
+				//Update the questions when re-ordering
+				$updated = EEM_Question_Group::instance()->update(
+					array('QSG_order' => $qsgcount),
+					array(array('QSG_ID' => $row_ids[$i]))
+				);
+				if ($updated === false) {
+					$success = false;
+				}
+				$qsgcount++;
+			}
+		} else {
+			$success = false;
+		}
+
+		$errors = ! $success
+			? esc_html__('An error occurred. The question group order was not updated.', 'event_espresso')
+			: false;
+
+		echo wp_json_encode(array('return_data' => false, 'success' => $success, 'errors' => $errors));
+		die();
+
+	}
+
+
+
+	/***************************************        REGISTRATION SETTINGS        ***************************************/
+
+
+	/**
+	 * _reg_form_settings
+	 *
+	 * @throws \EE_Error
+	 */
+	protected function _reg_form_settings()
+	{
+		$this->_template_args['values'] = $this->_yes_no_values;
+		add_action(
+			'AHEE__Extend_Registration_Form_Admin_Page___reg_form_settings_template',
+			array($this, 'email_validation_settings_form'),
+			2
+		);
+		$this->_template_args = (array)apply_filters(
+			'FHEE__Extend_Registration_Form_Admin_Page___reg_form_settings___template_args',
+			$this->_template_args
+		);
+		$this->_set_add_edit_form_tags('update_reg_form_settings');
+		$this->_set_publish_post_box_vars(null, false, false, null, false);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(
+			REGISTRATION_FORM_CAF_TEMPLATE_PATH . 'reg_form_settings.template.php',
+			$this->_template_args,
+			true
+		);
+		$this->display_admin_page_with_sidebar();
+	}
+
+
+	/**
+	 * _update_reg_form_settings
+	 */
+	protected function _update_reg_form_settings()
+	{
+		EE_Registry::instance()->CFG->registration = $this->update_email_validation_settings_form(
+			EE_Registry::instance()->CFG->registration
+		);
+		EE_Registry::instance()->CFG->registration = apply_filters(
+			'FHEE__Extend_Registration_Form_Admin_Page___update_reg_form_settings__CFG_registration',
+			EE_Registry::instance()->CFG->registration
+		);
+		$success                                   = $this->_update_espresso_configuration(
+			esc_html__('Registration Form Options', 'event_espresso'),
+			EE_Registry::instance()->CFG,
+			__FILE__, __FUNCTION__, __LINE__
+		);
+		$this->_redirect_after_action($success, esc_html__('Registration Form Options', 'event_espresso'), 'updated',
+			array('action' => 'view_reg_form_settings'));
+	}
+
+
+	/**
+	 * email_validation_settings_form
+	 *
+	 * @access    public
+	 * @return    void
+	 * @throws \EE_Error
+	 */
+	public function email_validation_settings_form()
+	{
+		echo $this->_email_validation_settings_form()->get_html();
+	}
+
+
+	/**
+	 * _email_validation_settings_form
+	 *
+	 * @access protected
+	 * @return EE_Form_Section_Proper
+	 * @throws \EE_Error
+	 */
+	protected function _email_validation_settings_form()
+	{
+		return new EE_Form_Section_Proper(
+			array(
+				'name'            => 'email_validation_settings',
+				'html_id'         => 'email_validation_settings',
+				'layout_strategy' => new EE_Admin_Two_Column_Layout(),
+				'subsections'     => array(
+					'email_validation_hdr'   => new EE_Form_Section_HTML(
+						EEH_HTML::h2(esc_html__('Email Validation Settings', 'event_espresso'))
+					),
+					'email_validation_level' => new EE_Select_Input(
+						array(
+							'basic'      => esc_html__('Basic', 'event_espresso'),
+							'wp_default' => esc_html__('WordPress Default', 'event_espresso'),
+							'i18n'       => esc_html__('International', 'event_espresso'),
+							'i18n_dns'   => esc_html__('International + DNS Check', 'event_espresso'),
+						),
+						array(
+							'html_label_text' => esc_html__('Email Validation Level', 'event_espresso')
+												 . EEH_Template::get_help_tab_link('email_validation_info'),
+							'html_help_text'  => esc_html__('These levels range from basic validation ( ie: text@text.text ) to more advanced checks against international email addresses (ie: üñîçøðé@example.com ) with additional MX and A record checks to confirm the domain actually exists. More information on on each level can be found within the help section.',
+								'event_espresso'),
+							'default'         => isset(EE_Registry::instance()->CFG->registration->email_validation_level)
+								? EE_Registry::instance()->CFG->registration->email_validation_level
+								: 'wp_default',
+							'required'        => false,
+						)
+					),
+				),
+			)
+		);
+	}
+
+
+	/**
+	 * update_email_validation_settings_form
+	 *
+	 * @access    public
+	 * @param \EE_Registration_Config $EE_Registration_Config
+	 * @return \EE_Registration_Config
+	 */
+	public function update_email_validation_settings_form(EE_Registration_Config $EE_Registration_Config)
+	{
+		$prev_email_validation_level = $EE_Registration_Config->email_validation_level;
+		try {
+			$email_validation_settings_form = $this->_email_validation_settings_form();
+			// if not displaying a form, then check for form submission
+			if ($email_validation_settings_form->was_submitted()) {
+				// capture form data
+				$email_validation_settings_form->receive_form_submission();
+				// validate form data
+				if ($email_validation_settings_form->is_valid()) {
+					// grab validated data from form
+					$valid_data = $email_validation_settings_form->valid_data();
+					if (isset($valid_data['email_validation_level'])) {
+						$email_validation_level = $valid_data['email_validation_level'];
+						// now if they want to use international email addresses
+						if ($email_validation_level === 'i18n' || $email_validation_level === 'i18n_dns') {
+							// in case we need to reset their email validation level,
+							// make sure that the previous value wasn't already set to one of the i18n options.
+							if ($prev_email_validation_level === 'i18n' || $prev_email_validation_level === 'i18n_dns') {
+								// if so, then reset it back to "basic" since that is the only other option that,
+								// despite offering poor validation, supports i18n email addresses
+								$prev_email_validation_level = 'basic';
+							}
+							// confirm our i18n email validation will work on the server
+							if (! $this->_verify_pcre_support($EE_Registration_Config, $email_validation_level)) {
+								// or reset email validation level to previous value
+								$email_validation_level = $prev_email_validation_level;
+							}
+						}
+						$EE_Registration_Config->email_validation_level = $email_validation_level;
+					} else {
+						EE_Error::add_error(
+							esc_html__(
+								'Invalid or missing Email Validation settings. Please refresh the form and try again.',
+								'event_espresso'
+							),
+							__FILE__, __FUNCTION__, __LINE__
+						);
+					}
+				} else {
+					if ($email_validation_settings_form->submission_error_message() !== '') {
+						EE_Error::add_error(
+							$email_validation_settings_form->submission_error_message(),
+							__FILE__, __FUNCTION__, __LINE__
+						);
+					}
+				}
+			}
+		} catch (EE_Error $e) {
+			$e->get_error();
+		}
+		return $EE_Registration_Config;
+	}
+
+
+	/**
+	 * confirms that the server's PHP version has the PCRE module enabled,
+	 * and that the PCRE version works with our i18n email validation
+	 *
+	 * @param \EE_Registration_Config $EE_Registration_Config
+	 * @param string                  $email_validation_level
+	 * @return bool
+	 */
+	private function _verify_pcre_support(EE_Registration_Config $EE_Registration_Config, $email_validation_level)
+	{
+		// first check that PCRE is enabled
+		if (! defined('PREG_BAD_UTF8_ERROR')) {
+			EE_Error::add_error(
+				sprintf(
+					esc_html__(
+						'We\'re sorry, but it appears that your server\'s version of PHP was not compiled with PCRE unicode support.%1$sPlease contact your hosting company and ask them whether the PCRE compiled with your version of PHP on your server can be been built with the "--enable-unicode-properties" and "--enable-utf8" configuration switches to enable more complex regex expressions.%1$sIf they are unable, or unwilling to do so, then your server will not support international email addresses using UTF-8 unicode characters. This means you will either have to lower your email validation level to "Basic" or "WordPress Default", or switch to a hosting company that has/can enable PCRE unicode support on the server.',
+						'event_espresso'
+					),
+					'<br />'
+				),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+			return false;
+		} else {
+			// PCRE support is enabled, but let's still
+			// perform a test to see if the server will support it.
+			// but first, save the updated validation level to the config,
+			// so that the validation strategy picks it up.
+			// this will get bumped back down if it doesn't work
+			$EE_Registration_Config->email_validation_level = $email_validation_level;
+			try {
+				$email_validator    = new EE_Email_Validation_Strategy();
+				$i18n_email_address = apply_filters(
+					'FHEE__Extend_Registration_Form_Admin_Page__update_email_validation_settings_form__i18n_email_address',
+					'jägerjürgen@deutschland.com'
+				);
+				$email_validator->validate($i18n_email_address);
+			} catch (Exception $e) {
+				EE_Error::add_error(
+					sprintf(
+						esc_html__(
+							'We\'re sorry, but it appears that your server\'s configuration will not support the "International" or "International + DNS Check" email validation levels.%1$sTo correct this issue, please consult with your hosting company regarding your server\'s PCRE settings.%1$sIt is recommended that your PHP version be configured to use PCRE 8.10 or newer.%1$sMore information regarding PCRE versions and installation can be found here: %2$s',
+							'event_espresso'
+						),
+						'<br />',
+						'<a href="http://php.net/manual/en/pcre.installation.php" target="_blank">http://php.net/manual/en/pcre.installation.php</a>'
+					),
+					__FILE__, __FUNCTION__, __LINE__
+				);
+				return false;
+			}
+		}
+		return true;
+	}
 
 
 }

Spacing +34 added lines, -34 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (! defined('EVENT_ESPRESSO_VERSION')) {
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
     exit('NO direct script access allowed');
 }
 
@@ -32,11 +32,11 @@ 
      */
     public function __construct($routing = true)
     {
-        define('REGISTRATION_FORM_CAF_ADMIN', EE_CORE_CAF_ADMIN_EXTEND . 'registration_form' . DS);
-        define('REGISTRATION_FORM_CAF_ASSETS_PATH', REGISTRATION_FORM_CAF_ADMIN . 'assets' . DS);
-        define('REGISTRATION_FORM_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'registration_form/assets/');
-        define('REGISTRATION_FORM_CAF_TEMPLATE_PATH', REGISTRATION_FORM_CAF_ADMIN . 'templates' . DS);
-        define('REGISTRATION_FORM_CAF_TEMPLATE_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'registration_form/templates/');
+        define('REGISTRATION_FORM_CAF_ADMIN', EE_CORE_CAF_ADMIN_EXTEND.'registration_form'.DS);
+        define('REGISTRATION_FORM_CAF_ASSETS_PATH', REGISTRATION_FORM_CAF_ADMIN.'assets'.DS);
+        define('REGISTRATION_FORM_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL.'registration_form/assets/');
+        define('REGISTRATION_FORM_CAF_TEMPLATE_PATH', REGISTRATION_FORM_CAF_ADMIN.'templates'.DS);
+        define('REGISTRATION_FORM_CAF_TEMPLATE_URL', EE_CORE_CAF_ADMIN_EXTEND_URL.'registration_form/templates/');
         parent::__construct($routing);
     }
 
@@ -47,7 +47,7 @@ 
         $qst_id = ! empty($this->_req_data['QST_ID']) && ! is_array($this->_req_data['QST_ID']) ? $this->_req_data['QST_ID'] : 0;
         $qsg_id = ! empty($this->_req_data['QSG_ID']) && ! is_array($this->_req_data['QSG_ID']) ? $this->_req_data['QSG_ID'] : 0;
 
-        $new_page_routes    = array(
+        $new_page_routes = array(
             'question_groups'    => array(
                 'func'       => '_question_groups_overview_list_table',
                 'capability' => 'ee_read_question_groups',
@@ -310,7 +310,7 @@ 
 
 
         //additional labels
-        $new_labels               = array(
+        $new_labels = array(
             'add_question'          => esc_html__('Add New Question', 'event_espresso'),
             'delete_question'       => esc_html__('Delete Question', 'event_espresso'),
             'add_question_group'    => esc_html__('Add New Question Group', 'event_espresso'),
@@ -354,7 +354,7 @@ 
      */
     public function load_sortable_question_script()
     {
-        wp_register_script('ee-question-sortable', REGISTRATION_FORM_CAF_ASSETS_URL . 'ee_question_order.js',
+        wp_register_script('ee-question-sortable', REGISTRATION_FORM_CAF_ASSETS_URL.'ee_question_order.js',
             array('jquery-ui-sortable'), EVENT_ESPRESSO_VERSION, true);
         wp_enqueue_script('ee-question-sortable');
     }
@@ -420,7 +420,7 @@ 
 
     protected function _questions_overview_list_table()
     {
-        $this->_admin_page_title .= ' ' . $this->get_action_link_or_button(
+        $this->_admin_page_title .= ' '.$this->get_action_link_or_button(
                 'add_question',
                 'add_question',
                 array(),
@@ -433,7 +433,7 @@ 
     protected function _question_groups_overview_list_table()
     {
         $this->_search_btn_label = esc_html__('Question Groups', 'event_espresso');
-        $this->_admin_page_title .= ' ' . $this->get_action_link_or_button(
+        $this->_admin_page_title .= ' '.$this->get_action_link_or_button(
                 'add_question_group',
                 'add_question_group',
                 array(),
@@ -477,20 +477,20 @@ 
     {
         $success = 0;
         do_action('AHEE_log', __FILE__, __FUNCTION__, '');
-        if (! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
+        if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
             // if array has more than one element than success message should be plural
             $success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
             // cycle thru bulk action checkboxes
             while (list($ID, $value) = each($this->_req_data['checkbox'])) {
-                if (! $this->_delete_item($ID, $model)) {
+                if ( ! $this->_delete_item($ID, $model)) {
                     $success = 0;
                 }
             }
 
-        } elseif (! empty($this->_req_data['QSG_ID'])) {
+        } elseif ( ! empty($this->_req_data['QSG_ID'])) {
             $success = $this->_delete_item($this->_req_data['QSG_ID'], $model);
 
-        } elseif (! empty($this->_req_data['QST_ID'])) {
+        } elseif ( ! empty($this->_req_data['QST_ID'])) {
             $success = $this->_delete_item($this->_req_data['QST_ID'], $model);
         } else {
             EE_Error::add_error(sprintf(esc_html__("No Questions or Question Groups were selected for deleting. This error usually shows when you've attempted to delete via bulk action but there were no selections.",
@@ -534,7 +534,7 @@ 
                 $this->_admin_page_title = ucwords(str_replace('_', ' ', $this->_req_action));
         }
         // add ID to title if editing
-        $this->_admin_page_title = $ID ? $this->_admin_page_title . ' # ' . $ID : $this->_admin_page_title;
+        $this->_admin_page_title = $ID ? $this->_admin_page_title.' # '.$ID : $this->_admin_page_title;
         if ($ID) {
             /** @var EE_Question_Group $questionGroup */
             $questionGroup            = $this->_question_group_model->get_one_by_ID($ID);
@@ -553,7 +553,7 @@ 
 
         $redirect_URL = add_query_arg(array('action' => 'question_groups'), $this->_admin_base_url);
         $this->_set_publish_post_box_vars('id', $ID, false, $redirect_URL);
-        $this->_template_args['admin_page_content'] = EEH_Template::display_template(REGISTRATION_FORM_CAF_TEMPLATE_PATH . 'question_groups_main_meta_box.template.php',
+        $this->_template_args['admin_page_content'] = EEH_Template::display_template(REGISTRATION_FORM_CAF_TEMPLATE_PATH.'question_groups_main_meta_box.template.php',
             $this->_template_args, true);
 
         // the details template wrapper
@@ -600,13 +600,13 @@ 
         $question_group = $this->_question_group_model->get_one_by_ID($QSG_ID);
         $questions      = $question_group->questions();
         // make sure system phone question is added to list of questions for this group
-        if (! isset($questions[$phone_question_id])) {
+        if ( ! isset($questions[$phone_question_id])) {
             $questions[$phone_question_id] = EEM_Question::instance()->get_one_by_ID($phone_question_id);
         }
 
         foreach ($questions as $question_ID => $question) {
             // first we always check for order.
-            if (! empty($this->_req_data['question_orders'][$question_ID])) {
+            if ( ! empty($this->_req_data['question_orders'][$question_ID])) {
                 //update question order
                 $question_group->update_question_order($question_ID, $this->_req_data['question_orders'][$question_ID]);
             }
@@ -654,7 +654,7 @@ 
      */
     public function _duplicate_question()
     {
-        $question_ID = (int)$this->_req_data['QST_ID'];
+        $question_ID = (int) $this->_req_data['QST_ID'];
         $question    = EEM_Question::instance()->get_one_by_ID($question_ID);
         if ($question instanceof EE_Question) {
             $new_question = $question->duplicate();
@@ -690,7 +690,7 @@ 
      */
     protected function _trash_question()
     {
-        $success    = $this->_question_model->delete_by_ID((int)$this->_req_data['QST_ID']);
+        $success    = $this->_question_model->delete_by_ID((int) $this->_req_data['QST_ID']);
         $query_args = array('action' => 'default', 'status' => 'all');
         $this->_redirect_after_action($success, $this->_question_model->item_name($success), 'trashed', $query_args);
     }
@@ -722,12 +722,12 @@ 
         //echo "trash $trash";
         //var_dump($this->_req_data['checkbox']);die;
         if (isset($this->_req_data['checkbox'])) {
-            if (! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
+            if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
                 // if array has more than one element than success message should be plural
                 $success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
                 // cycle thru bulk action checkboxes
                 while (list($ID, $value) = each($this->_req_data['checkbox'])) {
-                    if (! $model->delete_or_restore_by_ID($trash, absint($ID))) {
+                    if ( ! $model->delete_or_restore_by_ID($trash, absint($ID))) {
                         $success = 0;
                     }
                 }
@@ -735,7 +735,7 @@ 
             } else {
                 // grab single id and delete
                 $ID = absint($this->_req_data['checkbox']);
-                if (! $model->delete_or_restore_by_ID($trash, $ID)) {
+                if ( ! $model->delete_or_restore_by_ID($trash, $ID)) {
                     $success = 0;
                 }
             }
@@ -744,14 +744,14 @@ 
             // delete via trash link
             // grab single id and delete
             $ID = absint($this->_req_data[$model->primary_key_name()]);
-            if (! $model->delete_or_restore_by_ID($trash, $ID)) {
+            if ( ! $model->delete_or_restore_by_ID($trash, $ID)) {
                 $success = 0;
             }
 
         }
 
 
-        $action = $model instanceof EEM_Question ? 'default' : 'question_groups';//strtolower( $model->item_name(2) );
+        $action = $model instanceof EEM_Question ? 'default' : 'question_groups'; //strtolower( $model->item_name(2) );
         //echo "action :$action";
         //$action = 'questions' ? 'default' : $action;
         if ($trash) {
@@ -845,13 +845,13 @@ 
             : array();
 
         $perpage = ! empty($this->_req_data['perpage'])
-            ? (int)$this->_req_data['perpage']
+            ? (int) $this->_req_data['perpage']
             : null;
         $curpage = ! empty($this->_req_data['curpage'])
-            ? (int)$this->_req_data['curpage']
+            ? (int) $this->_req_data['curpage']
             : null;
 
-        if (! empty($row_ids)) {
+        if ( ! empty($row_ids)) {
             //figure out where we start the row_id count at for the current page.
             $qsgcount = empty($curpage) ? 0 : ($curpage - 1) * $perpage;
 
@@ -898,14 +898,14 @@ 
             array($this, 'email_validation_settings_form'),
             2
         );
-        $this->_template_args = (array)apply_filters(
+        $this->_template_args = (array) apply_filters(
             'FHEE__Extend_Registration_Form_Admin_Page___reg_form_settings___template_args',
             $this->_template_args
         );
         $this->_set_add_edit_form_tags('update_reg_form_settings');
         $this->_set_publish_post_box_vars(null, false, false, null, false);
         $this->_template_args['admin_page_content'] = EEH_Template::display_template(
-            REGISTRATION_FORM_CAF_TEMPLATE_PATH . 'reg_form_settings.template.php',
+            REGISTRATION_FORM_CAF_TEMPLATE_PATH.'reg_form_settings.template.php',
             $this->_template_args,
             true
         );
@@ -925,7 +925,7 @@ 
             'FHEE__Extend_Registration_Form_Admin_Page___update_reg_form_settings__CFG_registration',
             EE_Registry::instance()->CFG->registration
         );
-        $success                                   = $this->_update_espresso_configuration(
+        $success = $this->_update_espresso_configuration(
             esc_html__('Registration Form Options', 'event_espresso'),
             EE_Registry::instance()->CFG,
             __FILE__, __FUNCTION__, __LINE__
@@ -1022,7 +1022,7 @@ 
                                 $prev_email_validation_level = 'basic';
                             }
                             // confirm our i18n email validation will work on the server
-                            if (! $this->_verify_pcre_support($EE_Registration_Config, $email_validation_level)) {
+                            if ( ! $this->_verify_pcre_support($EE_Registration_Config, $email_validation_level)) {
                                 // or reset email validation level to previous value
                                 $email_validation_level = $prev_email_validation_level;
                             }
@@ -1064,7 +1064,7 @@ 
     private function _verify_pcre_support(EE_Registration_Config $EE_Registration_Config, $email_validation_level)
     {
         // first check that PCRE is enabled
-        if (! defined('PREG_BAD_UTF8_ERROR')) {
+        if ( ! defined('PREG_BAD_UTF8_ERROR')) {
             EE_Error::add_error(
                 sprintf(
                     esc_html__(

core/libraries/form_sections/strategies/normalization/EE_Int_Normalization.strategy.php

Doc Comments +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 
 	/**
 	 * @param string $value_to_normalize
-	 * @return int|mixed|string
+	 * @return integer|null
 	 * @throws \EE_Validation_Error
 	 */
 	public function normalize($value_to_normalize) {

Indentation +5 added lines, -5 removed lines

@@ -20,8 +20,8 @@ 
 		}
 
 		if ( is_null( $value_to_normalize ) || $value_to_normalize === '' ) {
-		    return null;
-        }
+			return null;
+		}
 
 		if( ! is_string( $value_to_normalize )){
 			throw new EE_Validation_Error( sprintf( __( 'The value "%s" must be a string submitted for normalization, it was %s', 'event_espresso' ), print_r( $value_to_normalize, TRUE), gettype( $value_to_normalize ) ) );
@@ -56,9 +56,9 @@ 
 	 * @return string
 	 */
 	public function unnormalize( $normalized_value ) {
-	    if ($normalized_value === null) {
-	        return '';
-        }elseif( empty( $normalized_value ) ){
+		if ($normalized_value === null) {
+			return '';
+		}elseif( empty( $normalized_value ) ){
 			return '0';
 		}else{
 			return "$normalized_value";

Spacing +16 added lines, -16 removed lines

@@ -7,7 +7,7 @@ 
  * @subpackage
  * @author				Mike Nelson
  */
-class EE_Int_Normalization extends EE_Normalization_Strategy_Base{
+class EE_Int_Normalization extends EE_Normalization_Strategy_Base {
 
 	/**
 	 * @param string $value_to_normalize
@@ -15,38 +15,38 @@ 
 	 * @throws \EE_Validation_Error
 	 */
 	public function normalize($value_to_normalize) {
-		if( is_int( $value_to_normalize ) ){
+		if (is_int($value_to_normalize)) {
 			return $value_to_normalize;
 		}
 
-		if ( is_null( $value_to_normalize ) || $value_to_normalize === '' ) {
+		if (is_null($value_to_normalize) || $value_to_normalize === '') {
 		    return null;
         }
 
-		if( ! is_string( $value_to_normalize )){
-			throw new EE_Validation_Error( sprintf( __( 'The value "%s" must be a string submitted for normalization, it was %s', 'event_espresso' ), print_r( $value_to_normalize, TRUE), gettype( $value_to_normalize ) ) );
+		if ( ! is_string($value_to_normalize)) {
+			throw new EE_Validation_Error(sprintf(__('The value "%s" must be a string submitted for normalization, it was %s', 'event_espresso'), print_r($value_to_normalize, TRUE), gettype($value_to_normalize)));
 		}
 		$thousands_separator = EE_Config::instance()->currency->thsnds;
-		$value_to_normalize = str_replace( $thousands_separator, "", $value_to_normalize );
-		$value_to_normalize = str_replace( array(" ","\t"), '', $value_to_normalize );
-		if ( preg_match( '/^\d+$/', $value_to_normalize )) {
-			return intval( $value_to_normalize );
+		$value_to_normalize = str_replace($thousands_separator, "", $value_to_normalize);
+		$value_to_normalize = str_replace(array(" ", "\t"), '', $value_to_normalize);
+		if (preg_match('/^\d+$/', $value_to_normalize)) {
+			return intval($value_to_normalize);
 		} else {
 			//find if this input has a int validation strategy
 			//in which case, use its message
 			$validation_error_message = NULL;
-			foreach( $this->_input->get_validation_strategies() as $validation_strategy ){
-				if( $validation_strategy instanceof EE_Int_Validation_Strategy ){
+			foreach ($this->_input->get_validation_strategies() as $validation_strategy) {
+				if ($validation_strategy instanceof EE_Int_Validation_Strategy) {
 					$validation_error_message = $validation_strategy->get_validation_error_message();
 				}
 			}
 			//this really shouldn't ever happen because fields with a int normalization strategy
 			//should also have a int validation strategy, but in case it doesnt use the default
-			if( ! $validation_error_message ){
+			if ( ! $validation_error_message) {
 				$default_validation_strategy = new EE_Int_Validation_Strategy();
 				$validation_error_message = $default_validation_strategy->get_validation_error_message();
 			}
-			throw new EE_Validation_Error( $validation_error_message, 'numeric_only' );
+			throw new EE_Validation_Error($validation_error_message, 'numeric_only');
 		}
 	}
 
@@ -55,12 +55,12 @@ 
 	 * @param int $normalized_value
 	 * @return string
 	 */
-	public function unnormalize( $normalized_value ) {
+	public function unnormalize($normalized_value) {
 	    if ($normalized_value === null) {
 	        return '';
-        }elseif( empty( $normalized_value ) ){
+        }elseif (empty($normalized_value)) {
 			return '0';
-		}else{
+		} else {
 			return "$normalized_value";
 		}
 	}

Braces +2 added lines, -2 removed lines

@@ -58,9 +58,9 @@
 	public function unnormalize( $normalized_value ) {
 	    if ($normalized_value === null) {
 	        return '';
-        }elseif( empty( $normalized_value ) ){
+        } elseif( empty( $normalized_value ) ){
 			return '0';
-		}else{
+		} else{
 			return "$normalized_value";
 		}
 	}