eventespresso / event-espresso-core

core/domain/services/admin/registrations/list_table/page_header/AttendeeFilterHeader.php

Spacing +2 added lines, -2 removed lines

@@ -59,13 +59,13 @@
                         'event_espresso'
                     ),
                     '<h3 style="line-height:1.5em;">',
-                    '<a href="' . EE_Admin_Page::add_query_args_and_nonce(
+                    '<a href="'.EE_Admin_Page::add_query_args_and_nonce(
                         array(
                             'action' => 'edit_attendee',
                             'post'   => $ATT_ID,
                         ),
                         REG_ADMIN_URL
-                    ) . '">' . $attendee->full_name() . '</a>',
+                    ).'">'.$attendee->full_name().'</a>',
                     '</h3>'
                 );
             }

Indentation +48 added lines, -48 removed lines

@@ -20,56 +20,56 @@
 class AttendeeFilterHeader extends AdminPageHeaderDecorator
 {
 
-    /**
-     * @var EEM_Attendee $attendee_model
-     */
-    private $attendee_model;
+	/**
+	 * @var EEM_Attendee $attendee_model
+	 */
+	private $attendee_model;
 
 
-    /**
-     * AttendeeFilterHeader constructor.
-     *
-     * @param RequestInterface $request
-     * @param EEM_Attendee     $attendee_model
-     */
-    public function __construct(RequestInterface $request, EEM_Attendee $attendee_model)
-    {
-        parent::__construct($request);
-        $this->attendee_model = $attendee_model;
-    }
+	/**
+	 * AttendeeFilterHeader constructor.
+	 *
+	 * @param RequestInterface $request
+	 * @param EEM_Attendee     $attendee_model
+	 */
+	public function __construct(RequestInterface $request, EEM_Attendee $attendee_model)
+	{
+		parent::__construct($request);
+		$this->attendee_model = $attendee_model;
+	}
 
 
-    /**
-     * @param string $text
-     * @return string
-     * @throws EE_Error
-     * @since $VID:$
-     */
-    public function getHeaderText($text = '')
-    {
-        $ATT_ID = $this->request->getRequestParam('ATT_ID');
-        $ATT_ID = $this->request->getRequestParam('attendee_id', $ATT_ID);
-        $ATT_ID = absint($ATT_ID);
-        if ($ATT_ID) {
-            $attendee = $this->attendee_model->get_one_by_ID($ATT_ID);
-            if ($attendee instanceof EE_Attendee) {
-                $text .= sprintf(
-                    esc_html__(
-                        '%1$s Viewing registrations for %2$s%3$s',
-                        'event_espresso'
-                    ),
-                    '<h3 style="line-height:1.5em;">',
-                    '<a href="' . EE_Admin_Page::add_query_args_and_nonce(
-                        array(
-                            'action' => 'edit_attendee',
-                            'post'   => $ATT_ID,
-                        ),
-                        REG_ADMIN_URL
-                    ) . '">' . $attendee->full_name() . '</a>',
-                    '</h3>'
-                );
-            }
-        }
-        return $text;
-    }
+	/**
+	 * @param string $text
+	 * @return string
+	 * @throws EE_Error
+	 * @since $VID:$
+	 */
+	public function getHeaderText($text = '')
+	{
+		$ATT_ID = $this->request->getRequestParam('ATT_ID');
+		$ATT_ID = $this->request->getRequestParam('attendee_id', $ATT_ID);
+		$ATT_ID = absint($ATT_ID);
+		if ($ATT_ID) {
+			$attendee = $this->attendee_model->get_one_by_ID($ATT_ID);
+			if ($attendee instanceof EE_Attendee) {
+				$text .= sprintf(
+					esc_html__(
+						'%1$s Viewing registrations for %2$s%3$s',
+						'event_espresso'
+					),
+					'<h3 style="line-height:1.5em;">',
+					'<a href="' . EE_Admin_Page::add_query_args_and_nonce(
+						array(
+							'action' => 'edit_attendee',
+							'post'   => $ATT_ID,
+						),
+						REG_ADMIN_URL
+					) . '">' . $attendee->full_name() . '</a>',
+					'</h3>'
+				);
+			}
+		}
+		return $text;
+	}
 }

core/libraries/form_sections/strategies/layout/EE_Div_Per_Section_Layout.strategy.php

Indentation +132 added lines, -132 removed lines

@@ -14,136 +14,136 @@
 class EE_Div_Per_Section_Layout extends EE_Form_Section_Layout_Base
 {
 
-    /**
-     * opening div tag for a form
-     *
-     * @return string
-     */
-    public function layout_form_begin()
-    {
-        return EEH_HTML::div(
-            '',
-            $this->_form_section->html_id(),
-            $this->_form_section->html_class(),
-            $this->_form_section->html_style()
-        );
-    }
-
-
-
-    /**
-     * Lays out the row for the input, including label and errors
-     *
-     * @param EE_Form_Input_Base $input
-     * @return string
-     * @throws \EE_Error
-     */
-    public function layout_input($input)
-    {
-        $html = '';
-        // set something unique for the id
-        $html_id = (string) $input->html_id() !== ''
-            ? (string) $input->html_id()
-            : spl_object_hash($input);
-        // and add a generic input type class
-        $html_class = sanitize_key(str_replace('_', '-', get_class($input))) . '-dv';
-        if ($input instanceof EE_Hidden_Input) {
-            $html .= EEH_HTML::nl() . $input->get_html_for_input();
-        } elseif ($input instanceof EE_Submit_Input) {
-            $html .= EEH_HTML::div(
-                $input->get_html_for_input(),
-                $html_id . '-submit-dv',
-                "{$input->html_class()}-submit-dv {$html_class}"
-            );
-        } elseif ($input instanceof EE_Select_Input) {
-            $html .= EEH_HTML::div(
-                EEH_HTML::nl(1) . $input->get_html_for_label() .
-                EEH_HTML::nl() . $input->get_html_for_errors() .
-                EEH_HTML::nl() . $input->get_html_for_input() .
-                EEH_HTML::nl() . $input->get_html_for_help(),
-                $html_id . '-input-dv',
-                "{$input->html_class()}-input-dv {$html_class}"
-            );
-        } elseif ($input instanceof EE_Form_Input_With_Options_Base) {
-            $html .= EEH_HTML::div(
-                EEH_HTML::nl() . $this->_display_label_for_option_type_question($input) .
-                EEH_HTML::nl() . $input->get_html_for_errors() .
-                EEH_HTML::nl() . $input->get_html_for_input() .
-                EEH_HTML::nl() . $input->get_html_for_help(),
-                $html_id . '-input-dv',
-                "{$input->html_class()}-input-dv {$html_class}"
-            );
-        } else {
-            $html .= EEH_HTML::div(
-                EEH_HTML::nl(1) . $input->get_html_for_label() .
-                EEH_HTML::nl() . $input->get_html_for_errors() .
-                EEH_HTML::nl() . $input->get_html_for_input() .
-                EEH_HTML::nl() . $input->get_html_for_help(),
-                $html_id . '-input-dv',
-                "{$input->html_class()}-input-dv {$html_class}"
-            );
-        }
-        return $html;
-    }
-
-
-
-    /**
-     *
-     * _display_label_for_option_type_question
-     * Gets the HTML for the 'label', which is just text for this (because labels
-     * should be for each input)
-     *
-     * @param EE_Form_Input_With_Options_Base $input
-     * @return string
-     */
-    protected function _display_label_for_option_type_question(EE_Form_Input_With_Options_Base $input)
-    {
-        if ($input->display_html_label_text()) {
-            $html_label_text = $input->html_label_text();
-            $label_html = EEH_HTML::div(
-                $input->required()
-                    ? $html_label_text . EEH_HTML::span('*', '', 'ee-asterisk')
-                    : $html_label_text,
-                $input->html_label_id(),
-                $input->required()
-                    ? 'ee-required-label ' . $input->html_label_class()
-                    : $input->html_label_class(),
-                $input->html_label_style(),
-                $input->other_html_attributes()
-            );
-            // if no content was provided to EEH_HTML::div() above (ie: an empty label),
-            // then we need to close the div manually
-            if (empty($html_label_text)) {
-                $label_html .= EEH_HTML::divx($input->html_label_id(), $input->html_label_class());
-            }
-            return $label_html;
-        }
-        return '';
-    }
-
-
-
-    /**
-     * Lays out a row for the subsection
-     *
-     * @param EE_Form_Section_Proper $form_section
-     * @return string
-     */
-    public function layout_subsection($form_section)
-    {
-        return EEH_HTML::nl(1) . $form_section->get_html() . EEH_HTML::nl(-1);
-    }
-
-
-
-    /**
-     * closing div tag for a form
-     *
-     * @return string
-     */
-    public function layout_form_end()
-    {
-        return EEH_HTML::divx($this->_form_section->html_id(), $this->_form_section->html_class());
-    }
+	/**
+	 * opening div tag for a form
+	 *
+	 * @return string
+	 */
+	public function layout_form_begin()
+	{
+		return EEH_HTML::div(
+			'',
+			$this->_form_section->html_id(),
+			$this->_form_section->html_class(),
+			$this->_form_section->html_style()
+		);
+	}
+
+
+
+	/**
+	 * Lays out the row for the input, including label and errors
+	 *
+	 * @param EE_Form_Input_Base $input
+	 * @return string
+	 * @throws \EE_Error
+	 */
+	public function layout_input($input)
+	{
+		$html = '';
+		// set something unique for the id
+		$html_id = (string) $input->html_id() !== ''
+			? (string) $input->html_id()
+			: spl_object_hash($input);
+		// and add a generic input type class
+		$html_class = sanitize_key(str_replace('_', '-', get_class($input))) . '-dv';
+		if ($input instanceof EE_Hidden_Input) {
+			$html .= EEH_HTML::nl() . $input->get_html_for_input();
+		} elseif ($input instanceof EE_Submit_Input) {
+			$html .= EEH_HTML::div(
+				$input->get_html_for_input(),
+				$html_id . '-submit-dv',
+				"{$input->html_class()}-submit-dv {$html_class}"
+			);
+		} elseif ($input instanceof EE_Select_Input) {
+			$html .= EEH_HTML::div(
+				EEH_HTML::nl(1) . $input->get_html_for_label() .
+				EEH_HTML::nl() . $input->get_html_for_errors() .
+				EEH_HTML::nl() . $input->get_html_for_input() .
+				EEH_HTML::nl() . $input->get_html_for_help(),
+				$html_id . '-input-dv',
+				"{$input->html_class()}-input-dv {$html_class}"
+			);
+		} elseif ($input instanceof EE_Form_Input_With_Options_Base) {
+			$html .= EEH_HTML::div(
+				EEH_HTML::nl() . $this->_display_label_for_option_type_question($input) .
+				EEH_HTML::nl() . $input->get_html_for_errors() .
+				EEH_HTML::nl() . $input->get_html_for_input() .
+				EEH_HTML::nl() . $input->get_html_for_help(),
+				$html_id . '-input-dv',
+				"{$input->html_class()}-input-dv {$html_class}"
+			);
+		} else {
+			$html .= EEH_HTML::div(
+				EEH_HTML::nl(1) . $input->get_html_for_label() .
+				EEH_HTML::nl() . $input->get_html_for_errors() .
+				EEH_HTML::nl() . $input->get_html_for_input() .
+				EEH_HTML::nl() . $input->get_html_for_help(),
+				$html_id . '-input-dv',
+				"{$input->html_class()}-input-dv {$html_class}"
+			);
+		}
+		return $html;
+	}
+
+
+
+	/**
+	 *
+	 * _display_label_for_option_type_question
+	 * Gets the HTML for the 'label', which is just text for this (because labels
+	 * should be for each input)
+	 *
+	 * @param EE_Form_Input_With_Options_Base $input
+	 * @return string
+	 */
+	protected function _display_label_for_option_type_question(EE_Form_Input_With_Options_Base $input)
+	{
+		if ($input->display_html_label_text()) {
+			$html_label_text = $input->html_label_text();
+			$label_html = EEH_HTML::div(
+				$input->required()
+					? $html_label_text . EEH_HTML::span('*', '', 'ee-asterisk')
+					: $html_label_text,
+				$input->html_label_id(),
+				$input->required()
+					? 'ee-required-label ' . $input->html_label_class()
+					: $input->html_label_class(),
+				$input->html_label_style(),
+				$input->other_html_attributes()
+			);
+			// if no content was provided to EEH_HTML::div() above (ie: an empty label),
+			// then we need to close the div manually
+			if (empty($html_label_text)) {
+				$label_html .= EEH_HTML::divx($input->html_label_id(), $input->html_label_class());
+			}
+			return $label_html;
+		}
+		return '';
+	}
+
+
+
+	/**
+	 * Lays out a row for the subsection
+	 *
+	 * @param EE_Form_Section_Proper $form_section
+	 * @return string
+	 */
+	public function layout_subsection($form_section)
+	{
+		return EEH_HTML::nl(1) . $form_section->get_html() . EEH_HTML::nl(-1);
+	}
+
+
+
+	/**
+	 * closing div tag for a form
+	 *
+	 * @return string
+	 */
+	public function layout_form_end()
+	{
+		return EEH_HTML::divx($this->_form_section->html_id(), $this->_form_section->html_class());
+	}
 }

Spacing +21 added lines, -21 removed lines

@@ -46,40 +46,40 @@ 
             ? (string) $input->html_id()
             : spl_object_hash($input);
         // and add a generic input type class
-        $html_class = sanitize_key(str_replace('_', '-', get_class($input))) . '-dv';
+        $html_class = sanitize_key(str_replace('_', '-', get_class($input))).'-dv';
         if ($input instanceof EE_Hidden_Input) {
-            $html .= EEH_HTML::nl() . $input->get_html_for_input();
+            $html .= EEH_HTML::nl().$input->get_html_for_input();
         } elseif ($input instanceof EE_Submit_Input) {
             $html .= EEH_HTML::div(
                 $input->get_html_for_input(),
-                $html_id . '-submit-dv',
+                $html_id.'-submit-dv',
                 "{$input->html_class()}-submit-dv {$html_class}"
             );
         } elseif ($input instanceof EE_Select_Input) {
             $html .= EEH_HTML::div(
-                EEH_HTML::nl(1) . $input->get_html_for_label() .
-                EEH_HTML::nl() . $input->get_html_for_errors() .
-                EEH_HTML::nl() . $input->get_html_for_input() .
-                EEH_HTML::nl() . $input->get_html_for_help(),
-                $html_id . '-input-dv',
+                EEH_HTML::nl(1).$input->get_html_for_label().
+                EEH_HTML::nl().$input->get_html_for_errors().
+                EEH_HTML::nl().$input->get_html_for_input().
+                EEH_HTML::nl().$input->get_html_for_help(),
+                $html_id.'-input-dv',
                 "{$input->html_class()}-input-dv {$html_class}"
             );
         } elseif ($input instanceof EE_Form_Input_With_Options_Base) {
             $html .= EEH_HTML::div(
-                EEH_HTML::nl() . $this->_display_label_for_option_type_question($input) .
-                EEH_HTML::nl() . $input->get_html_for_errors() .
-                EEH_HTML::nl() . $input->get_html_for_input() .
-                EEH_HTML::nl() . $input->get_html_for_help(),
-                $html_id . '-input-dv',
+                EEH_HTML::nl().$this->_display_label_for_option_type_question($input).
+                EEH_HTML::nl().$input->get_html_for_errors().
+                EEH_HTML::nl().$input->get_html_for_input().
+                EEH_HTML::nl().$input->get_html_for_help(),
+                $html_id.'-input-dv',
                 "{$input->html_class()}-input-dv {$html_class}"
             );
         } else {
             $html .= EEH_HTML::div(
-                EEH_HTML::nl(1) . $input->get_html_for_label() .
-                EEH_HTML::nl() . $input->get_html_for_errors() .
-                EEH_HTML::nl() . $input->get_html_for_input() .
-                EEH_HTML::nl() . $input->get_html_for_help(),
-                $html_id . '-input-dv',
+                EEH_HTML::nl(1).$input->get_html_for_label().
+                EEH_HTML::nl().$input->get_html_for_errors().
+                EEH_HTML::nl().$input->get_html_for_input().
+                EEH_HTML::nl().$input->get_html_for_help(),
+                $html_id.'-input-dv',
                 "{$input->html_class()}-input-dv {$html_class}"
             );
         }
@@ -103,11 +103,11 @@ 
             $html_label_text = $input->html_label_text();
             $label_html = EEH_HTML::div(
                 $input->required()
-                    ? $html_label_text . EEH_HTML::span('*', '', 'ee-asterisk')
+                    ? $html_label_text.EEH_HTML::span('*', '', 'ee-asterisk')
                     : $html_label_text,
                 $input->html_label_id(),
                 $input->required()
-                    ? 'ee-required-label ' . $input->html_label_class()
+                    ? 'ee-required-label '.$input->html_label_class()
                     : $input->html_label_class(),
                 $input->html_label_style(),
                 $input->other_html_attributes()
@@ -132,7 +132,7 @@ 
      */
     public function layout_subsection($form_section)
     {
-        return EEH_HTML::nl(1) . $form_section->get_html() . EEH_HTML::nl(-1);
+        return EEH_HTML::nl(1).$form_section->get_html().EEH_HTML::nl(-1);
     }
 
 

core/libraries/form_sections/strategies/display/EE_Checkbox_Dropdown_Selector_Display_Strategy.strategy.php

Indentation +163 added lines, -163 removed lines

@@ -12,180 +12,180 @@
 {
 
 
-    /**
-     * enqueues css and js, so that this can be called statically
-     */
-    public static function enqueue_styles_and_scripts()
-    {
-        wp_register_style(
-            'checkbox_dropdown_selector',
-            EE_GLOBAL_ASSETS_URL . 'css/checkbox_dropdown_selector.css',
-            array('espresso_default'),
-            EVENT_ESPRESSO_VERSION
-        );
-        wp_register_style(
-            'espresso_default',
-            EE_GLOBAL_ASSETS_URL . 'css/espresso_default.css',
-            array('dashicons'),
-            EVENT_ESPRESSO_VERSION
-        );
-        wp_enqueue_style('checkbox_dropdown_selector');
-        wp_register_script(
-            'checkbox_dropdown_selector',
-            EE_GLOBAL_ASSETS_URL . 'scripts/checkbox_dropdown_selector.js',
-            array('jquery'),
-            EVENT_ESPRESSO_VERSION,
-            true
-        );
-        wp_localize_script(
-            'ticket_selector',
-            'eeDTS',
-            array(
-                'maxChecked' => EE_Registry::instance()
-                    ->CFG
-                    ->template_settings
-                    ->EED_Ticket_Selector
-                    ->getDatetimeSelectorMaxChecked()
-            )
-        );
-        wp_enqueue_script('checkbox_dropdown_selector');
-    }
+	/**
+	 * enqueues css and js, so that this can be called statically
+	 */
+	public static function enqueue_styles_and_scripts()
+	{
+		wp_register_style(
+			'checkbox_dropdown_selector',
+			EE_GLOBAL_ASSETS_URL . 'css/checkbox_dropdown_selector.css',
+			array('espresso_default'),
+			EVENT_ESPRESSO_VERSION
+		);
+		wp_register_style(
+			'espresso_default',
+			EE_GLOBAL_ASSETS_URL . 'css/espresso_default.css',
+			array('dashicons'),
+			EVENT_ESPRESSO_VERSION
+		);
+		wp_enqueue_style('checkbox_dropdown_selector');
+		wp_register_script(
+			'checkbox_dropdown_selector',
+			EE_GLOBAL_ASSETS_URL . 'scripts/checkbox_dropdown_selector.js',
+			array('jquery'),
+			EVENT_ESPRESSO_VERSION,
+			true
+		);
+		wp_localize_script(
+			'ticket_selector',
+			'eeDTS',
+			array(
+				'maxChecked' => EE_Registry::instance()
+					->CFG
+					->template_settings
+					->EED_Ticket_Selector
+					->getDatetimeSelectorMaxChecked()
+			)
+		);
+		wp_enqueue_script('checkbox_dropdown_selector');
+	}
 
 
 
-    /**
-     * Informs the rest of the forms system what CSS and JS is needed to display the input
-     */
-    public function enqueue_js()
-    {
-        EE_Checkbox_Dropdown_Selector_Display_Strategy::enqueue_styles_and_scripts();
-    }
+	/**
+	 * Informs the rest of the forms system what CSS and JS is needed to display the input
+	 */
+	public function enqueue_js()
+	{
+		EE_Checkbox_Dropdown_Selector_Display_Strategy::enqueue_styles_and_scripts();
+	}
 
 
 
-    /**
-     * callback for Iframe::addStylesheets() child class methods
-     *
-     * @param array $iframe_css
-     * @return array
-     */
-    public function iframe_css(array $iframe_css)
-    {
-        $iframe_css['checkbox_dropdown_selector'] = EE_GLOBAL_ASSETS_URL . 'css/checkbox_dropdown_selector.css';
-        return $iframe_css;
-    }
+	/**
+	 * callback for Iframe::addStylesheets() child class methods
+	 *
+	 * @param array $iframe_css
+	 * @return array
+	 */
+	public function iframe_css(array $iframe_css)
+	{
+		$iframe_css['checkbox_dropdown_selector'] = EE_GLOBAL_ASSETS_URL . 'css/checkbox_dropdown_selector.css';
+		return $iframe_css;
+	}
 
 
 
-    /**
-     * callback for Iframe::addScripts() child class methods
-     *
-     * @param array $iframe_js
-     * @return array
-     */
-    public function iframe_js(array $iframe_js)
-    {
-        $iframe_js['checkbox_dropdown_selector'] = EE_GLOBAL_ASSETS_URL . 'scripts/checkbox_dropdown_selector.js';
-        return $iframe_js;
-    }
+	/**
+	 * callback for Iframe::addScripts() child class methods
+	 *
+	 * @param array $iframe_js
+	 * @return array
+	 */
+	public function iframe_js(array $iframe_js)
+	{
+		$iframe_js['checkbox_dropdown_selector'] = EE_GLOBAL_ASSETS_URL . 'scripts/checkbox_dropdown_selector.js';
+		return $iframe_js;
+	}
 
 
-    /**
-     * @throws EE_Error
-     * @return string of html to display the field
-     */
-    public function display()
-    {
-        $input = $this->get_input();
-        $select_button_text = $input instanceof EE_Checkbox_Dropdown_Selector_Input ? $input->select_button_text() : '';
-        // $multi = count( $input->options() ) > 1 ? TRUE : FALSE;
-        $input->set_label_sizes();
-        $label_size_class = $input->get_label_size_class();
-        if (! is_array($input->raw_value()) && $input->raw_value() !== null) {
-            EE_Error::doing_it_wrong(
-                'EE_Checkbox_Display_Strategy::display()',
-                sprintf(
-                    esc_html__(
-                        'Input values for checkboxes should be an array of values, but the value for input "%1$s" is "%2$s". Please verify that the input name is exactly "%3$s"',
-                        'event_espresso'
-                    ),
-                    $input->html_id(),
-                    var_export($input->raw_value(), true),
-                    $input->html_name() . '[]'
-                ),
-                '4.8.1'
-            );
-        }
+	/**
+	 * @throws EE_Error
+	 * @return string of html to display the field
+	 */
+	public function display()
+	{
+		$input = $this->get_input();
+		$select_button_text = $input instanceof EE_Checkbox_Dropdown_Selector_Input ? $input->select_button_text() : '';
+		// $multi = count( $input->options() ) > 1 ? TRUE : FALSE;
+		$input->set_label_sizes();
+		$label_size_class = $input->get_label_size_class();
+		if (! is_array($input->raw_value()) && $input->raw_value() !== null) {
+			EE_Error::doing_it_wrong(
+				'EE_Checkbox_Display_Strategy::display()',
+				sprintf(
+					esc_html__(
+						'Input values for checkboxes should be an array of values, but the value for input "%1$s" is "%2$s". Please verify that the input name is exactly "%3$s"',
+						'event_espresso'
+					),
+					$input->html_id(),
+					var_export($input->raw_value(), true),
+					$input->html_name() . '[]'
+				),
+				'4.8.1'
+			);
+		}
 
 
-        $html = \EEH_HTML::div('', '', 'checkbox-dropdown-selector-wrap-dv');
-        $html .= '<button id="' . $input->html_id() . '-btn"';
-        // $html .= ' name="' . $input->html_name() . '"';
-        $html .= ' class="' . $input->html_class() . ' checkbox-dropdown-selector-btn button-secondary button"';
-        $html .= ' style="' . $input->html_style() . '"';
-        $html .= ' data-target="' . $input->html_id() . '-options-dv"';
-        $html .= ' ' . $input->other_html_attributes() . '>';
-        $html .= '<span class="checkbox-dropdown-selector-selected-spn">';
-        $html .= $select_button_text;
-        $html .= '</span> <span class="dashicons dashicons-arrow-down"></span>';
-        $html .= '</button>';
-        $html .= EEH_HTML::div(
-            '',
-            $input->html_id() . '-options-dv',
-            'checkbox-dropdown-selector'
-        );
-        $html .= EEH_HTML::link(
-            '',
-            '<span class="dashicons dashicons-no"></span>',
-            esc_html__('close datetime selector', 'event_espresso'),
-            '',
-            'close-espresso-notice'
-        );
-        $html .= EEH_HTML::ul();
-        $input_raw_value = (array) $input->raw_value();
-        foreach ($input->options() as $value => $display_text) {
-            $html .= EEH_HTML::li();
-            $value = $input->get_normalization_strategy()->unnormalize_one($value);
-            $html_id = $this->get_sub_input_id($value);
-            $html .= EEH_HTML::nl(0, 'checkbox');
-            $html .= '<label for="'
-                     . $html_id
-                     . '" id="'
-                     . $html_id
-                     . '-lbl" class="ee-checkbox-label-after'
-                     . $label_size_class
-                     . '">';
-            $html .= EEH_HTML::nl(1, 'checkbox');
-            $html .= '<input type="checkbox"';
-            $html .= ' name="' . $input->html_name() . '[]"';
-            $html .= ' id="' . $html_id . '"';
-            $html .= ' class="' . $input->html_class() . '-option"';
-            $html .= $input->html_style() ? ' style="' . $input->html_style() . '"' : '';
-            $html .= ' value="' . esc_attr($value) . '"';
-            $html .= ! empty($input_raw_value) && in_array($value, $input_raw_value, true)
-                ? ' checked="checked"'
-                : '';
-            $html .= ' ' . $this->_input->other_html_attributes();
-            $html .= '>';
-            $html .= '<span class="datetime-selector-option-text-spn">' . $display_text . '</span>';
-            $html .= EEH_HTML::nl(-1, 'checkbox') . '</label>';
-            $html .= EEH_HTML::lix();
-        }
-        $html .= EEH_HTML::ulx();
-        $html .= EEH_HTML::divx();
-        $html .= EEH_HTML::divx();
-        $html .= EEH_HTML::p(
-            apply_filters(
-                'FHEE__EE_Checkbox_Dropdown_Selector_Display_Strategy__display__html',
-                esc_html__(
-                    'To view additional ticket options, click the "Filter by Date" button and select more dates.',
-                    'event_espresso'
-                )
-            ),
-            $input->html_id() . '-date-time-filter-notice-pg',
-            'date-time-filter-notice-pg small-text lt-grey-text'
-        );
-        $html .= \EEH_HTML::br();
-        return $html;
-    }
+		$html = \EEH_HTML::div('', '', 'checkbox-dropdown-selector-wrap-dv');
+		$html .= '<button id="' . $input->html_id() . '-btn"';
+		// $html .= ' name="' . $input->html_name() . '"';
+		$html .= ' class="' . $input->html_class() . ' checkbox-dropdown-selector-btn button-secondary button"';
+		$html .= ' style="' . $input->html_style() . '"';
+		$html .= ' data-target="' . $input->html_id() . '-options-dv"';
+		$html .= ' ' . $input->other_html_attributes() . '>';
+		$html .= '<span class="checkbox-dropdown-selector-selected-spn">';
+		$html .= $select_button_text;
+		$html .= '</span> <span class="dashicons dashicons-arrow-down"></span>';
+		$html .= '</button>';
+		$html .= EEH_HTML::div(
+			'',
+			$input->html_id() . '-options-dv',
+			'checkbox-dropdown-selector'
+		);
+		$html .= EEH_HTML::link(
+			'',
+			'<span class="dashicons dashicons-no"></span>',
+			esc_html__('close datetime selector', 'event_espresso'),
+			'',
+			'close-espresso-notice'
+		);
+		$html .= EEH_HTML::ul();
+		$input_raw_value = (array) $input->raw_value();
+		foreach ($input->options() as $value => $display_text) {
+			$html .= EEH_HTML::li();
+			$value = $input->get_normalization_strategy()->unnormalize_one($value);
+			$html_id = $this->get_sub_input_id($value);
+			$html .= EEH_HTML::nl(0, 'checkbox');
+			$html .= '<label for="'
+					 . $html_id
+					 . '" id="'
+					 . $html_id
+					 . '-lbl" class="ee-checkbox-label-after'
+					 . $label_size_class
+					 . '">';
+			$html .= EEH_HTML::nl(1, 'checkbox');
+			$html .= '<input type="checkbox"';
+			$html .= ' name="' . $input->html_name() . '[]"';
+			$html .= ' id="' . $html_id . '"';
+			$html .= ' class="' . $input->html_class() . '-option"';
+			$html .= $input->html_style() ? ' style="' . $input->html_style() . '"' : '';
+			$html .= ' value="' . esc_attr($value) . '"';
+			$html .= ! empty($input_raw_value) && in_array($value, $input_raw_value, true)
+				? ' checked="checked"'
+				: '';
+			$html .= ' ' . $this->_input->other_html_attributes();
+			$html .= '>';
+			$html .= '<span class="datetime-selector-option-text-spn">' . $display_text . '</span>';
+			$html .= EEH_HTML::nl(-1, 'checkbox') . '</label>';
+			$html .= EEH_HTML::lix();
+		}
+		$html .= EEH_HTML::ulx();
+		$html .= EEH_HTML::divx();
+		$html .= EEH_HTML::divx();
+		$html .= EEH_HTML::p(
+			apply_filters(
+				'FHEE__EE_Checkbox_Dropdown_Selector_Display_Strategy__display__html',
+				esc_html__(
+					'To view additional ticket options, click the "Filter by Date" button and select more dates.',
+					'event_espresso'
+				)
+			),
+			$input->html_id() . '-date-time-filter-notice-pg',
+			'date-time-filter-notice-pg small-text lt-grey-text'
+		);
+		$html .= \EEH_HTML::br();
+		return $html;
+	}
 }

Spacing +22 added lines, -22 removed lines

@@ -19,20 +19,20 @@ 
     {
         wp_register_style(
             'checkbox_dropdown_selector',
-            EE_GLOBAL_ASSETS_URL . 'css/checkbox_dropdown_selector.css',
+            EE_GLOBAL_ASSETS_URL.'css/checkbox_dropdown_selector.css',
             array('espresso_default'),
             EVENT_ESPRESSO_VERSION
         );
         wp_register_style(
             'espresso_default',
-            EE_GLOBAL_ASSETS_URL . 'css/espresso_default.css',
+            EE_GLOBAL_ASSETS_URL.'css/espresso_default.css',
             array('dashicons'),
             EVENT_ESPRESSO_VERSION
         );
         wp_enqueue_style('checkbox_dropdown_selector');
         wp_register_script(
             'checkbox_dropdown_selector',
-            EE_GLOBAL_ASSETS_URL . 'scripts/checkbox_dropdown_selector.js',
+            EE_GLOBAL_ASSETS_URL.'scripts/checkbox_dropdown_selector.js',
             array('jquery'),
             EVENT_ESPRESSO_VERSION,
             true
@@ -71,7 +71,7 @@ 
      */
     public function iframe_css(array $iframe_css)
     {
-        $iframe_css['checkbox_dropdown_selector'] = EE_GLOBAL_ASSETS_URL . 'css/checkbox_dropdown_selector.css';
+        $iframe_css['checkbox_dropdown_selector'] = EE_GLOBAL_ASSETS_URL.'css/checkbox_dropdown_selector.css';
         return $iframe_css;
     }
 
@@ -85,7 +85,7 @@ 
      */
     public function iframe_js(array $iframe_js)
     {
-        $iframe_js['checkbox_dropdown_selector'] = EE_GLOBAL_ASSETS_URL . 'scripts/checkbox_dropdown_selector.js';
+        $iframe_js['checkbox_dropdown_selector'] = EE_GLOBAL_ASSETS_URL.'scripts/checkbox_dropdown_selector.js';
         return $iframe_js;
     }
 
@@ -101,7 +101,7 @@ 
         // $multi = count( $input->options() ) > 1 ? TRUE : FALSE;
         $input->set_label_sizes();
         $label_size_class = $input->get_label_size_class();
-        if (! is_array($input->raw_value()) && $input->raw_value() !== null) {
+        if ( ! is_array($input->raw_value()) && $input->raw_value() !== null) {
             EE_Error::doing_it_wrong(
                 'EE_Checkbox_Display_Strategy::display()',
                 sprintf(
@@ -111,7 +111,7 @@ 
                     ),
                     $input->html_id(),
                     var_export($input->raw_value(), true),
-                    $input->html_name() . '[]'
+                    $input->html_name().'[]'
                 ),
                 '4.8.1'
             );
@@ -119,19 +119,19 @@ 
 
 
         $html = \EEH_HTML::div('', '', 'checkbox-dropdown-selector-wrap-dv');
-        $html .= '<button id="' . $input->html_id() . '-btn"';
+        $html .= '<button id="'.$input->html_id().'-btn"';
         // $html .= ' name="' . $input->html_name() . '"';
-        $html .= ' class="' . $input->html_class() . ' checkbox-dropdown-selector-btn button-secondary button"';
-        $html .= ' style="' . $input->html_style() . '"';
-        $html .= ' data-target="' . $input->html_id() . '-options-dv"';
-        $html .= ' ' . $input->other_html_attributes() . '>';
+        $html .= ' class="'.$input->html_class().' checkbox-dropdown-selector-btn button-secondary button"';
+        $html .= ' style="'.$input->html_style().'"';
+        $html .= ' data-target="'.$input->html_id().'-options-dv"';
+        $html .= ' '.$input->other_html_attributes().'>';
         $html .= '<span class="checkbox-dropdown-selector-selected-spn">';
         $html .= $select_button_text;
         $html .= '</span> <span class="dashicons dashicons-arrow-down"></span>';
         $html .= '</button>';
         $html .= EEH_HTML::div(
             '',
-            $input->html_id() . '-options-dv',
+            $input->html_id().'-options-dv',
             'checkbox-dropdown-selector'
         );
         $html .= EEH_HTML::link(
@@ -157,18 +157,18 @@ 
                      . '">';
             $html .= EEH_HTML::nl(1, 'checkbox');
             $html .= '<input type="checkbox"';
-            $html .= ' name="' . $input->html_name() . '[]"';
-            $html .= ' id="' . $html_id . '"';
-            $html .= ' class="' . $input->html_class() . '-option"';
-            $html .= $input->html_style() ? ' style="' . $input->html_style() . '"' : '';
-            $html .= ' value="' . esc_attr($value) . '"';
+            $html .= ' name="'.$input->html_name().'[]"';
+            $html .= ' id="'.$html_id.'"';
+            $html .= ' class="'.$input->html_class().'-option"';
+            $html .= $input->html_style() ? ' style="'.$input->html_style().'"' : '';
+            $html .= ' value="'.esc_attr($value).'"';
             $html .= ! empty($input_raw_value) && in_array($value, $input_raw_value, true)
                 ? ' checked="checked"'
                 : '';
-            $html .= ' ' . $this->_input->other_html_attributes();
+            $html .= ' '.$this->_input->other_html_attributes();
             $html .= '>';
-            $html .= '<span class="datetime-selector-option-text-spn">' . $display_text . '</span>';
-            $html .= EEH_HTML::nl(-1, 'checkbox') . '</label>';
+            $html .= '<span class="datetime-selector-option-text-spn">'.$display_text.'</span>';
+            $html .= EEH_HTML::nl(-1, 'checkbox').'</label>';
             $html .= EEH_HTML::lix();
         }
         $html .= EEH_HTML::ulx();
@@ -182,7 +182,7 @@ 
                     'event_espresso'
                 )
             ),
-            $input->html_id() . '-date-time-filter-notice-pg',
+            $input->html_id().'-date-time-filter-notice-pg',
             'date-time-filter-notice-pg small-text lt-grey-text'
         );
         $html .= \EEH_HTML::br();

core/libraries/form_sections/inputs/EE_Form_Input_Base.input.php

Indentation +1253 added lines, -1253 removed lines

@@ -11,1257 +11,1257 @@
 abstract class EE_Form_Input_Base extends EE_Form_Section_Validatable
 {
 
-    /**
-     * the input's name attribute
-     *
-     * @var string
-     */
-    protected $_html_name;
-
-    /**
-     * id for the html label tag
-     *
-     * @var string
-     */
-    protected $_html_label_id;
-
-    /**
-     * class for teh html label tag
-     *
-     * @var string
-     */
-    protected $_html_label_class;
-
-    /**
-     * style for teh html label tag
-     *
-     * @var string
-     */
-    protected $_html_label_style;
-
-    /**
-     * text to be placed in the html label
-     *
-     * @var string
-     */
-    protected $_html_label_text;
-
-    /**
-     * the full html label. If used, all other html_label_* properties are invalid
-     *
-     * @var string
-     */
-    protected $_html_label;
-
-    /**
-     * HTML to use for help text (normally placed below form input), in a span which normally
-     * has a class of 'description'
-     *
-     * @var string
-     */
-    protected $_html_help_text;
-
-    /**
-     * CSS classes for displaying the help span
-     *
-     * @var string
-     */
-    protected $_html_help_class = 'description';
-
-    /**
-     * CSS to put in the style attribute on the help span
-     *
-     * @var string
-     */
-    protected $_html_help_style;
-
-    /**
-     * Stores whether or not this input's response is required.
-     * Because certain styling elements may also want to know that this
-     * input is required etc.
-     *
-     * @var boolean
-     */
-    protected $_required;
-
-    /**
-     * css class added to required inputs
-     *
-     * @var string
-     */
-    protected $_required_css_class = 'ee-required';
-
-    /**
-     * css styles applied to button type inputs
-     *
-     * @var string
-     */
-    protected $_button_css_attributes;
-
-    /**
-     * The raw data submitted for this, like in the $_POST super global.
-     * Generally unsafe for usage in client code
-     *
-     * @var mixed string or array
-     */
-    protected $_raw_value;
-
-    /**
-     * Value normalized according to the input's normalization strategy.
-     * The normalization strategy dictates whether this is a string, int, float,
-     * boolean, or array of any of those.
-     *
-     * @var mixed
-     */
-    protected $_normalized_value;
-
-
-    /**
-     * Normalized default value either initially set on the input, or provided by calling
-     * set_default().
-     * @var mixed
-     */
-    protected $_default;
-
-    /**
-     * Strategy used for displaying this field.
-     * Child classes must use _get_display_strategy to access it.
-     *
-     * @var EE_Display_Strategy_Base
-     */
-    private $_display_strategy;
-
-    /**
-     * Gets all the validation strategies used on this field
-     *
-     * @var EE_Validation_Strategy_Base[]
-     */
-    private $_validation_strategies = array();
-
-    /**
-     * The normalization strategy for this field
-     *
-     * @var EE_Normalization_Strategy_Base
-     */
-    private $_normalization_strategy;
-
-    /**
-     * Strategy for removing sensitive data after we're done with the form input
-     *
-     * @var EE_Sensitive_Data_Removal_Base
-     */
-    protected $_sensitive_data_removal_strategy;
-
-    /**
-     * Whether this input has been disabled or not.
-     * If it's disabled while rendering, an extra hidden input is added that indicates it has been knowingly disabled.
-     * (Client-side code that wants to dynamically disable it must also add this hidden input).
-     * When the form is submitted, if the input is disabled in the PHP formsection, then input is ignored.
-     * If the input is missing from the $_REQUEST data but the hidden input indicating the input is disabled, then the input is again ignored.
-     *
-     * @var boolean
-     */
-    protected $disabled = false;
-
-
-
-    /**
-     * @param array                         $input_args       {
-     * @type string                         $html_name        the html name for the input
-     * @type string                         $html_label_id    the id attribute to give to the html label tag
-     * @type string                         $html_label_class the class attribute to give to the html label tag
-     * @type string                         $html_label_style the style attribute to give ot teh label tag
-     * @type string                         $html_label_text  the text to put in the label tag
-     * @type string                         $html_label       the full html label. If used,
-     *                                                        all other html_label_* args are invalid
-     * @type string                         $html_help_text   text to put in help element
-     * @type string                         $html_help_style  style attribute to give to teh help element
-     * @type string                         $html_help_class  class attribute to give to the help element
-     * @type string                         $default          default value NORMALIZED (eg, if providing the default
-     *       for a Yes_No_Input, you should provide TRUE or FALSE, not '1' or '0')
-     * @type EE_Display_Strategy_Base       $display          strategy
-     * @type EE_Normalization_Strategy_Base $normalization_strategy
-     * @type EE_Validation_Strategy_Base[]  $validation_strategies
-     * @type boolean                        $ignore_input special argument which can be used to avoid adding any validation strategies,
-     *                                                    and sets the normalization strategy to the Null normalization. This is good
-     *                                                    when you want the input to be totally ignored server-side (like when using
-     *                                                    React.js form inputs)
-     *                                                        }
-     */
-    public function __construct($input_args = array())
-    {
-        $input_args = (array) apply_filters('FHEE__EE_Form_Input_Base___construct__input_args', $input_args, $this);
-        // the following properties must be cast as arrays
-        if (isset($input_args['validation_strategies'])) {
-            foreach ((array) $input_args['validation_strategies'] as $validation_strategy) {
-                if ($validation_strategy instanceof EE_Validation_Strategy_Base && empty($input_args['ignore_input'])) {
-                    $this->_validation_strategies[ get_class($validation_strategy) ] = $validation_strategy;
-                }
-            }
-            unset($input_args['validation_strategies']);
-        }
-        if (isset($input_args['ignore_input'])) {
-            $this->_validation_strategies = array();
-        }
-        // loop thru incoming options
-        foreach ($input_args as $key => $value) {
-            // add underscore to $key to match property names
-            $_key = '_' . $key;
-            if (property_exists($this, $_key)) {
-                $this->{$_key} = $value;
-            }
-        }
-        // ensure that "required" is set correctly
-        $this->set_required(
-            $this->_required,
-            isset($input_args['required_validation_error_message'])
-            ? $input_args['required_validation_error_message']
-            : null
-        );
-        // $this->_html_name_specified = isset( $input_args['html_name'] ) ? TRUE : FALSE;
-        $this->_display_strategy->_construct_finalize($this);
-        foreach ($this->_validation_strategies as $validation_strategy) {
-            $validation_strategy->_construct_finalize($this);
-        }
-        if (isset($input_args['ignore_input'])) {
-            $this->_normalization_strategy = new EE_Null_Normalization();
-        }
-        if (! $this->_normalization_strategy) {
-                $this->_normalization_strategy = new EE_Text_Normalization();
-        }
-        $this->_normalization_strategy->_construct_finalize($this);
-        // at least we can use the normalization strategy to populate the default
-        if (isset($input_args['default'])) {
-            $this->set_default($input_args['default']);
-            unset($input_args['default']);
-        }
-        if (! $this->_sensitive_data_removal_strategy) {
-            $this->_sensitive_data_removal_strategy = new EE_No_Sensitive_Data_Removal();
-        }
-        $this->_sensitive_data_removal_strategy->_construct_finalize($this);
-        parent::__construct($input_args);
-    }
-
-
-
-    /**
-     * Sets the html_name to its default value, if none was specified in teh constructor.
-     * Calculation involves using the name and the parent's html_name
-     *
-     * @throws \EE_Error
-     */
-    protected function _set_default_html_name_if_empty()
-    {
-        if (! $this->_html_name) {
-            $this->_html_name = $this->name();
-            if ($this->_parent_section && $this->_parent_section instanceof EE_Form_Section_Proper) {
-                $this->_html_name = $this->_parent_section->html_name_prefix() . "[{$this->name()}]";
-            }
-        }
-    }
-
-
-
-    /**
-     * @param $parent_form_section
-     * @param $name
-     * @throws \EE_Error
-     */
-    public function _construct_finalize($parent_form_section, $name)
-    {
-        parent::_construct_finalize($parent_form_section, $name);
-        if ($this->_html_label === null && $this->_html_label_text === null) {
-            $this->_html_label_text = ucwords(str_replace("_", " ", $name));
-        }
-        do_action('AHEE__EE_Form_Input_Base___construct_finalize__end', $this, $parent_form_section, $name);
-    }
-
-
-
-    /**
-     * Returns the strategy for displaying this form input. If none is set, throws an exception.
-     *
-     * @return EE_Display_Strategy_Base
-     * @throws EE_Error
-     */
-    protected function _get_display_strategy()
-    {
-        $this->ensure_construct_finalized_called();
-        if (! $this->_display_strategy || ! $this->_display_strategy instanceof EE_Display_Strategy_Base) {
-            throw new EE_Error(
-                sprintf(
-                    __(
-                        "Cannot get display strategy for form input with name %s and id %s, because it has not been set in the constructor",
-                        "event_espresso"
-                    ),
-                    $this->html_name(),
-                    $this->html_id()
-                )
-            );
-        } else {
-            return $this->_display_strategy;
-        }
-    }
-
-
-
-    /**
-     * Sets the display strategy.
-     *
-     * @param EE_Display_Strategy_Base $strategy
-     */
-    protected function _set_display_strategy(EE_Display_Strategy_Base $strategy)
-    {
-        $this->_display_strategy = $strategy;
-    }
-
-
-
-    /**
-     * Sets the sanitization strategy
-     *
-     * @param EE_Normalization_Strategy_Base $strategy
-     */
-    protected function _set_normalization_strategy(EE_Normalization_Strategy_Base $strategy)
-    {
-        $this->_normalization_strategy = $strategy;
-    }
-
-
-
-    /**
-     * Gets sensitive_data_removal_strategy
-     *
-     * @return EE_Sensitive_Data_Removal_Base
-     */
-    public function get_sensitive_data_removal_strategy()
-    {
-        return $this->_sensitive_data_removal_strategy;
-    }
-
-
-
-    /**
-     * Sets sensitive_data_removal_strategy
-     *
-     * @param EE_Sensitive_Data_Removal_Base $sensitive_data_removal_strategy
-     * @return boolean
-     */
-    public function set_sensitive_data_removal_strategy($sensitive_data_removal_strategy)
-    {
-        $this->_sensitive_data_removal_strategy = $sensitive_data_removal_strategy;
-    }
-
-
-
-    /**
-     * Gets the display strategy for this input
-     *
-     * @return EE_Display_Strategy_Base
-     */
-    public function get_display_strategy()
-    {
-        return $this->_display_strategy;
-    }
-
-
-
-    /**
-     * Overwrites the display strategy
-     *
-     * @param EE_Display_Strategy_Base $display_strategy
-     */
-    public function set_display_strategy($display_strategy)
-    {
-        $this->_display_strategy = $display_strategy;
-        $this->_display_strategy->_construct_finalize($this);
-    }
-
-
-
-    /**
-     * Gets the normalization strategy set on this input
-     *
-     * @return EE_Normalization_Strategy_Base
-     */
-    public function get_normalization_strategy()
-    {
-        return $this->_normalization_strategy;
-    }
-
-
-
-    /**
-     * Overwrites the normalization strategy
-     *
-     * @param EE_Normalization_Strategy_Base $normalization_strategy
-     */
-    public function set_normalization_strategy($normalization_strategy)
-    {
-        $this->_normalization_strategy = $normalization_strategy;
-        $this->_normalization_strategy->_construct_finalize($this);
-    }
-
-
-
-    /**
-     * Returns all teh validation strategies which apply to this field, numerically indexed
-     *
-     * @return EE_Validation_Strategy_Base[]
-     */
-    public function get_validation_strategies()
-    {
-        return $this->_validation_strategies;
-    }
-
-
-
-    /**
-     * Adds this strategy to the field so it will be used in both JS validation and server-side validation
-     *
-     * @param EE_Validation_Strategy_Base $validation_strategy
-     * @return void
-     */
-    protected function _add_validation_strategy(EE_Validation_Strategy_Base $validation_strategy)
-    {
-        $validation_strategy->_construct_finalize($this);
-        $this->_validation_strategies[] = $validation_strategy;
-    }
-
-
-
-    /**
-     * Adds a new validation strategy onto the form input
-     *
-     * @param EE_Validation_Strategy_Base $validation_strategy
-     * @return void
-     */
-    public function add_validation_strategy(EE_Validation_Strategy_Base $validation_strategy)
-    {
-        $this->_add_validation_strategy($validation_strategy);
-    }
-
-
-
-    /**
-     * The classname of the validation strategy to remove
-     *
-     * @param string $validation_strategy_classname
-     */
-    public function remove_validation_strategy($validation_strategy_classname)
-    {
-        foreach ($this->_validation_strategies as $key => $validation_strategy) {
-            if ($validation_strategy instanceof $validation_strategy_classname
-                || is_subclass_of($validation_strategy, $validation_strategy_classname)
-            ) {
-                unset($this->_validation_strategies[ $key ]);
-            }
-        }
-    }
-
-
-
-    /**
-     * returns true if input employs any of the validation strategy defined by the supplied array of classnames
-     *
-     * @param array $validation_strategy_classnames
-     * @return bool
-     */
-    public function has_validation_strategy($validation_strategy_classnames)
-    {
-        $validation_strategy_classnames = is_array($validation_strategy_classnames)
-            ? $validation_strategy_classnames
-            : array($validation_strategy_classnames);
-        foreach ($this->_validation_strategies as $key => $validation_strategy) {
-            if (in_array($key, $validation_strategy_classnames)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-
-
-    /**
-     * Gets the HTML
-     *
-     * @return string
-     */
-    public function get_html()
-    {
-        return $this->_parent_section->get_html_for_input($this);
-    }
-
-
-
-    /**
-     * Gets the HTML for the input itself (no label or errors) according to the
-     * input's display strategy
-     * Makes sure the JS and CSS are enqueued for it
-     *
-     * @return string
-     * @throws \EE_Error
-     */
-    public function get_html_for_input()
-    {
-        return $this->_form_html_filter
-            ? $this->_form_html_filter->filterHtml(
-                $this->_get_display_strategy()->display(),
-                $this
-            )
-            : $this->_get_display_strategy()->display();
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function html_other_attributes()
-    {
-        EE_Error::doing_it_wrong(
-            __METHOD__,
-            sprintf(
-                esc_html__(
-                    'This method is no longer in use. You should replace it by %s',
-                    'event_espresso'
-                ),
-                'EE_Form_Section_Base::other_html_attributes()'
-            ),
-            '$VID:$'
-        );
-
-        return $this->other_html_attributes();
-    }
-
-
-
-    /**
-     * @param string $html_other_attributes
-     */
-    public function set_html_other_attributes($html_other_attributes)
-    {
-        EE_Error::doing_it_wrong(
-            __METHOD__,
-            sprintf(
-                esc_html__(
-                    'This method is no longer in use. You should replace it by %s',
-                    'event_espresso'
-                ),
-                'EE_Form_Section_Base::set_other_html_attributes()'
-            ),
-            '$VID:$'
-        );
-
-        $this->set_other_html_attributes($html_other_attributes);
-    }
-
-
-
-    /**
-     * Gets the HTML for displaying the label for this form input
-     * according to the form section's layout strategy
-     *
-     * @return string
-     */
-    public function get_html_for_label()
-    {
-        return $this->_parent_section->get_layout_strategy()->display_label($this);
-    }
-
-
-
-    /**
-     * Gets the HTML for displaying the errors section for this form input
-     * according to the form section's layout strategy
-     *
-     * @return string
-     */
-    public function get_html_for_errors()
-    {
-        return $this->_parent_section->get_layout_strategy()->display_errors($this);
-    }
-
-
-
-    /**
-     * Gets the HTML for displaying the help text for this form input
-     * according to the form section's layout strategy
-     *
-     * @return string
-     */
-    public function get_html_for_help()
-    {
-        return $this->_parent_section->get_layout_strategy()->display_help_text($this);
-    }
-
-
-
-    /**
-     * Validates the input's sanitized value (assumes _sanitize() has already been called)
-     * and returns whether or not the form input's submitted value is value
-     *
-     * @return boolean
-     */
-    protected function _validate()
-    {
-        if ($this->isDisabled()) {
-            return true;
-        }
-        foreach ($this->_validation_strategies as $validation_strategy) {
-            if ($validation_strategy instanceof EE_Validation_Strategy_Base) {
-                try {
-                    $validation_strategy->validate($this->normalized_value());
-                } catch (EE_Validation_Error $e) {
-                    $this->add_validation_error($e);
-                }
-            }
-        }
-        if ($this->get_validation_errors()) {
-            return false;
-        } else {
-            return true;
-        }
-    }
-
-
-
-    /**
-     * Performs basic sanitization on this value. But what sanitization can be performed anyways?
-     * This value MIGHT be allowed to have tags, so we can't really remove them.
-     *
-     * @param string $value
-     * @return null|string
-     */
-    protected function _sanitize($value)
-    {
-        return $value !== null ? stripslashes(html_entity_decode(trim($value))) : null;
-    }
-
-
-
-    /**
-     * Picks out the form value that relates to this form input,
-     * and stores it as the sanitized value on the form input, and sets the normalized value.
-     * Returns whether or not any validation errors occurred
-     *
-     * @param array $req_data like $_POST
-     * @return boolean whether or not there was an error
-     * @throws \EE_Error
-     */
-    protected function _normalize($req_data)
-    {
-        // any existing validation errors don't apply so clear them
-        $this->_validation_errors = array();
-        // if the input is disabled, ignore whatever input was sent in
-        if ($this->isDisabled()) {
-            $this->_set_raw_value(null);
-            $this->_set_normalized_value($this->get_default());
-            return false;
-        }
-        try {
-            $raw_input = $this->find_form_data_for_this_section($req_data);
-            // super simple sanitization for now
-            if (is_array($raw_input)) {
-                $raw_value = array();
-                foreach ($raw_input as $key => $value) {
-                    $raw_value[ $key ] = $this->_sanitize($value);
-                }
-                $this->_set_raw_value($raw_value);
-            } else {
-                $this->_set_raw_value($this->_sanitize($raw_input));
-            }
-            // we want to mostly leave the input alone in case we need to re-display it to the user
-            $this->_set_normalized_value($this->_normalization_strategy->normalize($this->raw_value()));
-            return false;
-        } catch (EE_Validation_Error $e) {
-            $this->add_validation_error($e);
-            return true;
-        }
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function html_name()
-    {
-        $this->_set_default_html_name_if_empty();
-        return $this->_html_name;
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function html_label_id()
-    {
-        return ! empty($this->_html_label_id) ? $this->_html_label_id : $this->html_id() . '-lbl';
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function html_label_class()
-    {
-        return $this->_html_label_class;
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function html_label_style()
-    {
-        return $this->_html_label_style;
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function html_label_text()
-    {
-        return $this->_html_label_text;
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function html_help_text()
-    {
-        return $this->_html_help_text;
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function html_help_class()
-    {
-        return $this->_html_help_class;
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function html_help_style()
-    {
-        return $this->_html_style;
-    }
-
-
-
-    /**
-     * returns the raw, UNSAFE, input, almost exactly as the user submitted it.
-     * Please note that almost all client code should instead use the normalized_value;
-     * or possibly raw_value_in_form (which prepares the string for displaying in an HTML attribute on a tag,
-     * mostly by escaping quotes)
-     * Note, we do not store the exact original value sent in the user's request because
-     * it may have malicious content, and we MIGHT want to store the form input in a transient or something...
-     * in which case, we would have stored the malicious content to our database.
-     *
-     * @return string
-     */
-    public function raw_value()
-    {
-        return $this->_raw_value;
-    }
-
-
-
-    /**
-     * Returns a string safe to usage in form inputs when displaying, because
-     * it escapes all html entities
-     *
-     * @return string
-     */
-    public function raw_value_in_form()
-    {
-        return htmlentities($this->raw_value(), ENT_QUOTES, 'UTF-8');
-    }
-
-
-
-    /**
-     * returns the value after it's been sanitized, and then converted into it's proper type
-     * in PHP. Eg, a string, an int, an array,
-     *
-     * @return mixed
-     */
-    public function normalized_value()
-    {
-        return $this->_normalized_value;
-    }
-
-
-
-    /**
-     * Returns the normalized value is a presentable way. By default this is just
-     * the normalized value by itself, but it can be overridden for when that's not
-     * the best thing to display
-     *
-     * @return string
-     */
-    public function pretty_value()
-    {
-        return $this->_normalized_value;
-    }
-
-
-
-    /**
-     * When generating the JS for the jquery validation rules like<br>
-     * <code>$( "#myform" ).validate({
-     * rules: {
-     * password: "required",
-     * password_again: {
-     * equalTo: "#password"
-     * }
-     * }
-     * });</code>
-     * if this field had the name 'password_again', it should return
-     * <br><code>password_again: {
-     * equalTo: "#password"
-     * }</code>
-     *
-     * @return array
-     */
-    public function get_jquery_validation_rules()
-    {
-        $jquery_validation_js = array();
-        $jquery_validation_rules = array();
-        foreach ($this->get_validation_strategies() as $validation_strategy) {
-            $jquery_validation_rules = array_replace_recursive(
-                $jquery_validation_rules,
-                $validation_strategy->get_jquery_validation_rule_array()
-            );
-        }
-        if (! empty($jquery_validation_rules)) {
-            foreach ($this->get_display_strategy()->get_html_input_ids(true) as $html_id_with_pound_sign) {
-                $jquery_validation_js[ $html_id_with_pound_sign ] = $jquery_validation_rules;
-            }
-        }
-        return $jquery_validation_js;
-    }
-
-
-
-    /**
-     * Sets the input's default value for use in displaying in the form. Note: value should be
-     * normalized (Eg, if providing a default of ra Yes_NO_Input you would provide TRUE or FALSE, not '1' or '0')
-     *
-     * @param mixed $value
-     * @return void
-     */
-    public function set_default($value)
-    {
-        $this->_default = $value;
-        $this->_set_normalized_value($value);
-        $this->_set_raw_value($value);
-    }
-
-
-
-    /**
-     * Sets the normalized value on this input
-     *
-     * @param mixed $value
-     */
-    protected function _set_normalized_value($value)
-    {
-        $this->_normalized_value = $value;
-    }
-
-
-
-    /**
-     * Sets the raw value on this input (ie, exactly as the user submitted it)
-     *
-     * @param mixed $value
-     */
-    protected function _set_raw_value($value)
-    {
-        $this->_raw_value = $this->_normalization_strategy->unnormalize($value);
-    }
-
-
-
-    /**
-     * Sets the HTML label text after it has already been defined
-     *
-     * @param string $label
-     * @return void
-     */
-    public function set_html_label_text($label)
-    {
-        $this->_html_label_text = $label;
-    }
-
-
-
-    /**
-     * Sets whether or not this field is required, and adjusts the validation strategy.
-     * If you want to use the EE_Conditionally_Required_Validation_Strategy,
-     * please add it as a validation strategy using add_validation_strategy as normal
-     *
-     * @param boolean $required boolean
-     * @param null    $required_text
-     */
-    public function set_required($required = true, $required_text = null)
-    {
-        $required = filter_var($required, FILTER_VALIDATE_BOOLEAN);
-        // whether $required is a string or a boolean, we want to add a required validation strategy
-        if ($required) {
-            $this->_add_validation_strategy(new EE_Required_Validation_Strategy($required_text));
-        } else {
-            $this->remove_validation_strategy('EE_Required_Validation_Strategy');
-        }
-        $this->_required = $required;
-    }
-
-
-
-    /**
-     * Returns whether or not this field is required
-     *
-     * @return boolean
-     */
-    public function required()
-    {
-        return $this->_required;
-    }
-
-
-
-    /**
-     * @param string $required_css_class
-     */
-    public function set_required_css_class($required_css_class)
-    {
-        $this->_required_css_class = $required_css_class;
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function required_css_class()
-    {
-        return $this->_required_css_class;
-    }
-
-
-
-    /**
-     * @param bool $add_required
-     * @return string
-     */
-    public function html_class($add_required = false)
-    {
-        return $add_required && $this->required()
-            ? $this->required_css_class() . ' ' . $this->_html_class
-            : $this->_html_class;
-    }
-
-
-    /**
-     * Sets the help text, in case
-     *
-     * @param string $text
-     */
-    public function set_html_help_text($text)
-    {
-        $this->_html_help_text = $text;
-    }
-
-
-
-    /**
-     * Uses the sensitive data removal strategy to remove the sensitive data from this
-     * input. If there is any kind of sensitive data removal on this input, we clear
-     * out the raw value completely
-     *
-     * @return void
-     */
-    public function clean_sensitive_data()
-    {
-        // if we do ANY kind of sensitive data removal on this, then just clear out the raw value
-        // if we need more logic than this we'll make a strategy for it
-        if ($this->_sensitive_data_removal_strategy
-            && ! $this->_sensitive_data_removal_strategy instanceof EE_No_Sensitive_Data_Removal
-        ) {
-            $this->_set_raw_value(null);
-        }
-        // and clean the normalized value according to the appropriate strategy
-        $this->_set_normalized_value(
-            $this->get_sensitive_data_removal_strategy()->remove_sensitive_data(
-                $this->_normalized_value
-            )
-        );
-    }
-
-
-
-    /**
-     * @param bool   $primary
-     * @param string $button_size
-     * @param string $other_attributes
-     */
-    public function set_button_css_attributes($primary = true, $button_size = '', $other_attributes = '')
-    {
-        $button_css_attributes = 'button';
-        $button_css_attributes .= $primary === true ? ' button-primary' : ' button-secondary';
-        switch ($button_size) {
-            case 'xs':
-            case 'extra-small':
-                $button_css_attributes .= ' button-xs';
-                break;
-            case 'sm':
-            case 'small':
-                $button_css_attributes .= ' button-sm';
-                break;
-            case 'lg':
-            case 'large':
-                $button_css_attributes .= ' button-lg';
-                break;
-            case 'block':
-                $button_css_attributes .= ' button-block';
-                break;
-            case 'md':
-            case 'medium':
-            default:
-                $button_css_attributes .= '';
-        }
-        $this->_button_css_attributes .= ! empty($other_attributes)
-            ? $button_css_attributes . ' ' . $other_attributes
-            : $button_css_attributes;
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function button_css_attributes()
-    {
-        if (empty($this->_button_css_attributes)) {
-            $this->set_button_css_attributes();
-        }
-        return $this->_button_css_attributes;
-    }
-
-
-
-    /**
-     * find_form_data_for_this_section
-     * using this section's name and its parents, finds the value of the form data that corresponds to it.
-     * For example, if this form section's HTML name is my_form[subform][form_input_1],
-     * then it's value should be in $_REQUEST at $_REQUEST['my_form']['subform']['form_input_1'].
-     * (If that doesn't exist, we also check for this subsection's name
-     * at the TOP LEVEL of the request data. Eg $_REQUEST['form_input_1'].)
-     * This function finds its value in the form.
-     *
-     * @param array $req_data
-     * @return mixed whatever the raw value of this form section is in the request data
-     * @throws \EE_Error
-     */
-    public function find_form_data_for_this_section($req_data)
-    {
-        $name_parts = $this->getInputNameParts();
-        // now get the value for the input
-        $value = $this->findRequestForSectionUsingNameParts($name_parts, $req_data);
-        // check if this thing's name is at the TOP level of the request data
-        if ($value === null && isset($req_data[ $this->name() ])) {
-            $value = $req_data[ $this->name() ];
-        }
-        return $value;
-    }
-
-
-
-    /**
-     * If this input's name is something like "foo[bar][baz]"
-     * returns an array like `array('foo','bar',baz')`
-     * @return array
-     */
-    protected function getInputNameParts()
-    {
-        // break up the html name by "[]"
-        if (strpos($this->html_name(), '[') !== false) {
-            $before_any_brackets = substr($this->html_name(), 0, strpos($this->html_name(), '['));
-        } else {
-            $before_any_brackets = $this->html_name();
-        }
-        // grab all of the segments
-        preg_match_all('~\[([^]]*)\]~', $this->html_name(), $matches);
-        if (isset($matches[1]) && is_array($matches[1])) {
-            $name_parts = $matches[1];
-            array_unshift($name_parts, $before_any_brackets);
-        } else {
-            $name_parts = array($before_any_brackets);
-        }
-        return $name_parts;
-    }
-
-
-
-    /**
-     * @param array $html_name_parts
-     * @param array $req_data
-     * @return array | NULL
-     */
-    public function findRequestForSectionUsingNameParts($html_name_parts, $req_data)
-    {
-        $first_part_to_consider = array_shift($html_name_parts);
-        if (isset($req_data[ $first_part_to_consider ])) {
-            if (empty($html_name_parts)) {
-                return $req_data[ $first_part_to_consider ];
-            } else {
-                return $this->findRequestForSectionUsingNameParts(
-                    $html_name_parts,
-                    $req_data[ $first_part_to_consider ]
-                );
-            }
-        } else {
-            return null;
-        }
-    }
-
-
-
-    /**
-     * Checks if this form input's data is in the request data
-     *
-     * @param array $req_data like $_POST
-     * @return boolean
-     * @throws \EE_Error
-     */
-    public function form_data_present_in($req_data = null)
-    {
-        if ($req_data === null) {
-            $req_data = $_POST;
-        }
-        $checked_value = $this->find_form_data_for_this_section($req_data);
-        if ($checked_value !== null) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-
-
-    /**
-     * Overrides parent to add js data from validation and display strategies
-     *
-     * @param array $form_other_js_data
-     * @return array
-     */
-    public function get_other_js_data($form_other_js_data = array())
-    {
-        $form_other_js_data = $this->get_other_js_data_from_strategies($form_other_js_data);
-        return $form_other_js_data;
-    }
-
-
-
-    /**
-     * Gets other JS data for localization from this input's strategies, like
-     * the validation strategies and the display strategy
-     *
-     * @param array $form_other_js_data
-     * @return array
-     */
-    public function get_other_js_data_from_strategies($form_other_js_data = array())
-    {
-        $form_other_js_data = $this->get_display_strategy()->get_other_js_data($form_other_js_data);
-        foreach ($this->get_validation_strategies() as $validation_strategy) {
-            $form_other_js_data = $validation_strategy->get_other_js_data($form_other_js_data);
-        }
-        return $form_other_js_data;
-    }
-
-
-
-    /**
-     * Override parent because we want to give our strategies an opportunity to enqueue some js and css
-     *
-     * @return void
-     */
-    public function enqueue_js()
-    {
-        // ask our display strategy and validation strategies if they have js to enqueue
-        $this->enqueue_js_from_strategies();
-    }
-
-
-
-    /**
-     * Tells strategies when its ok to enqueue their js and css
-     *
-     * @return void
-     */
-    public function enqueue_js_from_strategies()
-    {
-        $this->get_display_strategy()->enqueue_js();
-        foreach ($this->get_validation_strategies() as $validation_strategy) {
-            $validation_strategy->enqueue_js();
-        }
-    }
-
-
-
-    /**
-     * Gets the default value set on the input (not the current value, which may have been
-     * changed because of a form submission). If no default was set, this us null.
-     * @return mixed
-     */
-    public function get_default()
-    {
-        return $this->_default;
-    }
-
-
-
-    /**
-     * Makes this input disabled. That means it will have the HTML attribute 'disabled="disabled"',
-     * and server-side if any input was received it will be ignored
-     */
-    public function disable($disable = true)
-    {
-        $disabled_attribute = ' disabled="disabled"';
-        $this->disabled = filter_var($disable, FILTER_VALIDATE_BOOLEAN);
-        if ($this->disabled) {
-            if (strpos($this->_other_html_attributes, $disabled_attribute) === false) {
-                $this->_other_html_attributes .= $disabled_attribute;
-            }
-            $this->_set_normalized_value($this->get_default());
-        } else {
-            $this->_other_html_attributes = str_replace($disabled_attribute, '', $this->_other_html_attributes);
-        }
-    }
-
-
-
-    /**
-     * Returns whether or not this input is currently disabled.
-     * @return bool
-     */
-    public function isDisabled()
-    {
-        return $this->disabled;
-    }
+	/**
+	 * the input's name attribute
+	 *
+	 * @var string
+	 */
+	protected $_html_name;
+
+	/**
+	 * id for the html label tag
+	 *
+	 * @var string
+	 */
+	protected $_html_label_id;
+
+	/**
+	 * class for teh html label tag
+	 *
+	 * @var string
+	 */
+	protected $_html_label_class;
+
+	/**
+	 * style for teh html label tag
+	 *
+	 * @var string
+	 */
+	protected $_html_label_style;
+
+	/**
+	 * text to be placed in the html label
+	 *
+	 * @var string
+	 */
+	protected $_html_label_text;
+
+	/**
+	 * the full html label. If used, all other html_label_* properties are invalid
+	 *
+	 * @var string
+	 */
+	protected $_html_label;
+
+	/**
+	 * HTML to use for help text (normally placed below form input), in a span which normally
+	 * has a class of 'description'
+	 *
+	 * @var string
+	 */
+	protected $_html_help_text;
+
+	/**
+	 * CSS classes for displaying the help span
+	 *
+	 * @var string
+	 */
+	protected $_html_help_class = 'description';
+
+	/**
+	 * CSS to put in the style attribute on the help span
+	 *
+	 * @var string
+	 */
+	protected $_html_help_style;
+
+	/**
+	 * Stores whether or not this input's response is required.
+	 * Because certain styling elements may also want to know that this
+	 * input is required etc.
+	 *
+	 * @var boolean
+	 */
+	protected $_required;
+
+	/**
+	 * css class added to required inputs
+	 *
+	 * @var string
+	 */
+	protected $_required_css_class = 'ee-required';
+
+	/**
+	 * css styles applied to button type inputs
+	 *
+	 * @var string
+	 */
+	protected $_button_css_attributes;
+
+	/**
+	 * The raw data submitted for this, like in the $_POST super global.
+	 * Generally unsafe for usage in client code
+	 *
+	 * @var mixed string or array
+	 */
+	protected $_raw_value;
+
+	/**
+	 * Value normalized according to the input's normalization strategy.
+	 * The normalization strategy dictates whether this is a string, int, float,
+	 * boolean, or array of any of those.
+	 *
+	 * @var mixed
+	 */
+	protected $_normalized_value;
+
+
+	/**
+	 * Normalized default value either initially set on the input, or provided by calling
+	 * set_default().
+	 * @var mixed
+	 */
+	protected $_default;
+
+	/**
+	 * Strategy used for displaying this field.
+	 * Child classes must use _get_display_strategy to access it.
+	 *
+	 * @var EE_Display_Strategy_Base
+	 */
+	private $_display_strategy;
+
+	/**
+	 * Gets all the validation strategies used on this field
+	 *
+	 * @var EE_Validation_Strategy_Base[]
+	 */
+	private $_validation_strategies = array();
+
+	/**
+	 * The normalization strategy for this field
+	 *
+	 * @var EE_Normalization_Strategy_Base
+	 */
+	private $_normalization_strategy;
+
+	/**
+	 * Strategy for removing sensitive data after we're done with the form input
+	 *
+	 * @var EE_Sensitive_Data_Removal_Base
+	 */
+	protected $_sensitive_data_removal_strategy;
+
+	/**
+	 * Whether this input has been disabled or not.
+	 * If it's disabled while rendering, an extra hidden input is added that indicates it has been knowingly disabled.
+	 * (Client-side code that wants to dynamically disable it must also add this hidden input).
+	 * When the form is submitted, if the input is disabled in the PHP formsection, then input is ignored.
+	 * If the input is missing from the $_REQUEST data but the hidden input indicating the input is disabled, then the input is again ignored.
+	 *
+	 * @var boolean
+	 */
+	protected $disabled = false;
+
+
+
+	/**
+	 * @param array                         $input_args       {
+	 * @type string                         $html_name        the html name for the input
+	 * @type string                         $html_label_id    the id attribute to give to the html label tag
+	 * @type string                         $html_label_class the class attribute to give to the html label tag
+	 * @type string                         $html_label_style the style attribute to give ot teh label tag
+	 * @type string                         $html_label_text  the text to put in the label tag
+	 * @type string                         $html_label       the full html label. If used,
+	 *                                                        all other html_label_* args are invalid
+	 * @type string                         $html_help_text   text to put in help element
+	 * @type string                         $html_help_style  style attribute to give to teh help element
+	 * @type string                         $html_help_class  class attribute to give to the help element
+	 * @type string                         $default          default value NORMALIZED (eg, if providing the default
+	 *       for a Yes_No_Input, you should provide TRUE or FALSE, not '1' or '0')
+	 * @type EE_Display_Strategy_Base       $display          strategy
+	 * @type EE_Normalization_Strategy_Base $normalization_strategy
+	 * @type EE_Validation_Strategy_Base[]  $validation_strategies
+	 * @type boolean                        $ignore_input special argument which can be used to avoid adding any validation strategies,
+	 *                                                    and sets the normalization strategy to the Null normalization. This is good
+	 *                                                    when you want the input to be totally ignored server-side (like when using
+	 *                                                    React.js form inputs)
+	 *                                                        }
+	 */
+	public function __construct($input_args = array())
+	{
+		$input_args = (array) apply_filters('FHEE__EE_Form_Input_Base___construct__input_args', $input_args, $this);
+		// the following properties must be cast as arrays
+		if (isset($input_args['validation_strategies'])) {
+			foreach ((array) $input_args['validation_strategies'] as $validation_strategy) {
+				if ($validation_strategy instanceof EE_Validation_Strategy_Base && empty($input_args['ignore_input'])) {
+					$this->_validation_strategies[ get_class($validation_strategy) ] = $validation_strategy;
+				}
+			}
+			unset($input_args['validation_strategies']);
+		}
+		if (isset($input_args['ignore_input'])) {
+			$this->_validation_strategies = array();
+		}
+		// loop thru incoming options
+		foreach ($input_args as $key => $value) {
+			// add underscore to $key to match property names
+			$_key = '_' . $key;
+			if (property_exists($this, $_key)) {
+				$this->{$_key} = $value;
+			}
+		}
+		// ensure that "required" is set correctly
+		$this->set_required(
+			$this->_required,
+			isset($input_args['required_validation_error_message'])
+			? $input_args['required_validation_error_message']
+			: null
+		);
+		// $this->_html_name_specified = isset( $input_args['html_name'] ) ? TRUE : FALSE;
+		$this->_display_strategy->_construct_finalize($this);
+		foreach ($this->_validation_strategies as $validation_strategy) {
+			$validation_strategy->_construct_finalize($this);
+		}
+		if (isset($input_args['ignore_input'])) {
+			$this->_normalization_strategy = new EE_Null_Normalization();
+		}
+		if (! $this->_normalization_strategy) {
+				$this->_normalization_strategy = new EE_Text_Normalization();
+		}
+		$this->_normalization_strategy->_construct_finalize($this);
+		// at least we can use the normalization strategy to populate the default
+		if (isset($input_args['default'])) {
+			$this->set_default($input_args['default']);
+			unset($input_args['default']);
+		}
+		if (! $this->_sensitive_data_removal_strategy) {
+			$this->_sensitive_data_removal_strategy = new EE_No_Sensitive_Data_Removal();
+		}
+		$this->_sensitive_data_removal_strategy->_construct_finalize($this);
+		parent::__construct($input_args);
+	}
+
+
+
+	/**
+	 * Sets the html_name to its default value, if none was specified in teh constructor.
+	 * Calculation involves using the name and the parent's html_name
+	 *
+	 * @throws \EE_Error
+	 */
+	protected function _set_default_html_name_if_empty()
+	{
+		if (! $this->_html_name) {
+			$this->_html_name = $this->name();
+			if ($this->_parent_section && $this->_parent_section instanceof EE_Form_Section_Proper) {
+				$this->_html_name = $this->_parent_section->html_name_prefix() . "[{$this->name()}]";
+			}
+		}
+	}
+
+
+
+	/**
+	 * @param $parent_form_section
+	 * @param $name
+	 * @throws \EE_Error
+	 */
+	public function _construct_finalize($parent_form_section, $name)
+	{
+		parent::_construct_finalize($parent_form_section, $name);
+		if ($this->_html_label === null && $this->_html_label_text === null) {
+			$this->_html_label_text = ucwords(str_replace("_", " ", $name));
+		}
+		do_action('AHEE__EE_Form_Input_Base___construct_finalize__end', $this, $parent_form_section, $name);
+	}
+
+
+
+	/**
+	 * Returns the strategy for displaying this form input. If none is set, throws an exception.
+	 *
+	 * @return EE_Display_Strategy_Base
+	 * @throws EE_Error
+	 */
+	protected function _get_display_strategy()
+	{
+		$this->ensure_construct_finalized_called();
+		if (! $this->_display_strategy || ! $this->_display_strategy instanceof EE_Display_Strategy_Base) {
+			throw new EE_Error(
+				sprintf(
+					__(
+						"Cannot get display strategy for form input with name %s and id %s, because it has not been set in the constructor",
+						"event_espresso"
+					),
+					$this->html_name(),
+					$this->html_id()
+				)
+			);
+		} else {
+			return $this->_display_strategy;
+		}
+	}
+
+
+
+	/**
+	 * Sets the display strategy.
+	 *
+	 * @param EE_Display_Strategy_Base $strategy
+	 */
+	protected function _set_display_strategy(EE_Display_Strategy_Base $strategy)
+	{
+		$this->_display_strategy = $strategy;
+	}
+
+
+
+	/**
+	 * Sets the sanitization strategy
+	 *
+	 * @param EE_Normalization_Strategy_Base $strategy
+	 */
+	protected function _set_normalization_strategy(EE_Normalization_Strategy_Base $strategy)
+	{
+		$this->_normalization_strategy = $strategy;
+	}
+
+
+
+	/**
+	 * Gets sensitive_data_removal_strategy
+	 *
+	 * @return EE_Sensitive_Data_Removal_Base
+	 */
+	public function get_sensitive_data_removal_strategy()
+	{
+		return $this->_sensitive_data_removal_strategy;
+	}
+
+
+
+	/**
+	 * Sets sensitive_data_removal_strategy
+	 *
+	 * @param EE_Sensitive_Data_Removal_Base $sensitive_data_removal_strategy
+	 * @return boolean
+	 */
+	public function set_sensitive_data_removal_strategy($sensitive_data_removal_strategy)
+	{
+		$this->_sensitive_data_removal_strategy = $sensitive_data_removal_strategy;
+	}
+
+
+
+	/**
+	 * Gets the display strategy for this input
+	 *
+	 * @return EE_Display_Strategy_Base
+	 */
+	public function get_display_strategy()
+	{
+		return $this->_display_strategy;
+	}
+
+
+
+	/**
+	 * Overwrites the display strategy
+	 *
+	 * @param EE_Display_Strategy_Base $display_strategy
+	 */
+	public function set_display_strategy($display_strategy)
+	{
+		$this->_display_strategy = $display_strategy;
+		$this->_display_strategy->_construct_finalize($this);
+	}
+
+
+
+	/**
+	 * Gets the normalization strategy set on this input
+	 *
+	 * @return EE_Normalization_Strategy_Base
+	 */
+	public function get_normalization_strategy()
+	{
+		return $this->_normalization_strategy;
+	}
+
+
+
+	/**
+	 * Overwrites the normalization strategy
+	 *
+	 * @param EE_Normalization_Strategy_Base $normalization_strategy
+	 */
+	public function set_normalization_strategy($normalization_strategy)
+	{
+		$this->_normalization_strategy = $normalization_strategy;
+		$this->_normalization_strategy->_construct_finalize($this);
+	}
+
+
+
+	/**
+	 * Returns all teh validation strategies which apply to this field, numerically indexed
+	 *
+	 * @return EE_Validation_Strategy_Base[]
+	 */
+	public function get_validation_strategies()
+	{
+		return $this->_validation_strategies;
+	}
+
+
+
+	/**
+	 * Adds this strategy to the field so it will be used in both JS validation and server-side validation
+	 *
+	 * @param EE_Validation_Strategy_Base $validation_strategy
+	 * @return void
+	 */
+	protected function _add_validation_strategy(EE_Validation_Strategy_Base $validation_strategy)
+	{
+		$validation_strategy->_construct_finalize($this);
+		$this->_validation_strategies[] = $validation_strategy;
+	}
+
+
+
+	/**
+	 * Adds a new validation strategy onto the form input
+	 *
+	 * @param EE_Validation_Strategy_Base $validation_strategy
+	 * @return void
+	 */
+	public function add_validation_strategy(EE_Validation_Strategy_Base $validation_strategy)
+	{
+		$this->_add_validation_strategy($validation_strategy);
+	}
+
+
+
+	/**
+	 * The classname of the validation strategy to remove
+	 *
+	 * @param string $validation_strategy_classname
+	 */
+	public function remove_validation_strategy($validation_strategy_classname)
+	{
+		foreach ($this->_validation_strategies as $key => $validation_strategy) {
+			if ($validation_strategy instanceof $validation_strategy_classname
+				|| is_subclass_of($validation_strategy, $validation_strategy_classname)
+			) {
+				unset($this->_validation_strategies[ $key ]);
+			}
+		}
+	}
+
+
+
+	/**
+	 * returns true if input employs any of the validation strategy defined by the supplied array of classnames
+	 *
+	 * @param array $validation_strategy_classnames
+	 * @return bool
+	 */
+	public function has_validation_strategy($validation_strategy_classnames)
+	{
+		$validation_strategy_classnames = is_array($validation_strategy_classnames)
+			? $validation_strategy_classnames
+			: array($validation_strategy_classnames);
+		foreach ($this->_validation_strategies as $key => $validation_strategy) {
+			if (in_array($key, $validation_strategy_classnames)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+
+
+	/**
+	 * Gets the HTML
+	 *
+	 * @return string
+	 */
+	public function get_html()
+	{
+		return $this->_parent_section->get_html_for_input($this);
+	}
+
+
+
+	/**
+	 * Gets the HTML for the input itself (no label or errors) according to the
+	 * input's display strategy
+	 * Makes sure the JS and CSS are enqueued for it
+	 *
+	 * @return string
+	 * @throws \EE_Error
+	 */
+	public function get_html_for_input()
+	{
+		return $this->_form_html_filter
+			? $this->_form_html_filter->filterHtml(
+				$this->_get_display_strategy()->display(),
+				$this
+			)
+			: $this->_get_display_strategy()->display();
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function html_other_attributes()
+	{
+		EE_Error::doing_it_wrong(
+			__METHOD__,
+			sprintf(
+				esc_html__(
+					'This method is no longer in use. You should replace it by %s',
+					'event_espresso'
+				),
+				'EE_Form_Section_Base::other_html_attributes()'
+			),
+			'$VID:$'
+		);
+
+		return $this->other_html_attributes();
+	}
+
+
+
+	/**
+	 * @param string $html_other_attributes
+	 */
+	public function set_html_other_attributes($html_other_attributes)
+	{
+		EE_Error::doing_it_wrong(
+			__METHOD__,
+			sprintf(
+				esc_html__(
+					'This method is no longer in use. You should replace it by %s',
+					'event_espresso'
+				),
+				'EE_Form_Section_Base::set_other_html_attributes()'
+			),
+			'$VID:$'
+		);
+
+		$this->set_other_html_attributes($html_other_attributes);
+	}
+
+
+
+	/**
+	 * Gets the HTML for displaying the label for this form input
+	 * according to the form section's layout strategy
+	 *
+	 * @return string
+	 */
+	public function get_html_for_label()
+	{
+		return $this->_parent_section->get_layout_strategy()->display_label($this);
+	}
+
+
+
+	/**
+	 * Gets the HTML for displaying the errors section for this form input
+	 * according to the form section's layout strategy
+	 *
+	 * @return string
+	 */
+	public function get_html_for_errors()
+	{
+		return $this->_parent_section->get_layout_strategy()->display_errors($this);
+	}
+
+
+
+	/**
+	 * Gets the HTML for displaying the help text for this form input
+	 * according to the form section's layout strategy
+	 *
+	 * @return string
+	 */
+	public function get_html_for_help()
+	{
+		return $this->_parent_section->get_layout_strategy()->display_help_text($this);
+	}
+
+
+
+	/**
+	 * Validates the input's sanitized value (assumes _sanitize() has already been called)
+	 * and returns whether or not the form input's submitted value is value
+	 *
+	 * @return boolean
+	 */
+	protected function _validate()
+	{
+		if ($this->isDisabled()) {
+			return true;
+		}
+		foreach ($this->_validation_strategies as $validation_strategy) {
+			if ($validation_strategy instanceof EE_Validation_Strategy_Base) {
+				try {
+					$validation_strategy->validate($this->normalized_value());
+				} catch (EE_Validation_Error $e) {
+					$this->add_validation_error($e);
+				}
+			}
+		}
+		if ($this->get_validation_errors()) {
+			return false;
+		} else {
+			return true;
+		}
+	}
+
+
+
+	/**
+	 * Performs basic sanitization on this value. But what sanitization can be performed anyways?
+	 * This value MIGHT be allowed to have tags, so we can't really remove them.
+	 *
+	 * @param string $value
+	 * @return null|string
+	 */
+	protected function _sanitize($value)
+	{
+		return $value !== null ? stripslashes(html_entity_decode(trim($value))) : null;
+	}
+
+
+
+	/**
+	 * Picks out the form value that relates to this form input,
+	 * and stores it as the sanitized value on the form input, and sets the normalized value.
+	 * Returns whether or not any validation errors occurred
+	 *
+	 * @param array $req_data like $_POST
+	 * @return boolean whether or not there was an error
+	 * @throws \EE_Error
+	 */
+	protected function _normalize($req_data)
+	{
+		// any existing validation errors don't apply so clear them
+		$this->_validation_errors = array();
+		// if the input is disabled, ignore whatever input was sent in
+		if ($this->isDisabled()) {
+			$this->_set_raw_value(null);
+			$this->_set_normalized_value($this->get_default());
+			return false;
+		}
+		try {
+			$raw_input = $this->find_form_data_for_this_section($req_data);
+			// super simple sanitization for now
+			if (is_array($raw_input)) {
+				$raw_value = array();
+				foreach ($raw_input as $key => $value) {
+					$raw_value[ $key ] = $this->_sanitize($value);
+				}
+				$this->_set_raw_value($raw_value);
+			} else {
+				$this->_set_raw_value($this->_sanitize($raw_input));
+			}
+			// we want to mostly leave the input alone in case we need to re-display it to the user
+			$this->_set_normalized_value($this->_normalization_strategy->normalize($this->raw_value()));
+			return false;
+		} catch (EE_Validation_Error $e) {
+			$this->add_validation_error($e);
+			return true;
+		}
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function html_name()
+	{
+		$this->_set_default_html_name_if_empty();
+		return $this->_html_name;
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function html_label_id()
+	{
+		return ! empty($this->_html_label_id) ? $this->_html_label_id : $this->html_id() . '-lbl';
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function html_label_class()
+	{
+		return $this->_html_label_class;
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function html_label_style()
+	{
+		return $this->_html_label_style;
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function html_label_text()
+	{
+		return $this->_html_label_text;
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function html_help_text()
+	{
+		return $this->_html_help_text;
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function html_help_class()
+	{
+		return $this->_html_help_class;
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function html_help_style()
+	{
+		return $this->_html_style;
+	}
+
+
+
+	/**
+	 * returns the raw, UNSAFE, input, almost exactly as the user submitted it.
+	 * Please note that almost all client code should instead use the normalized_value;
+	 * or possibly raw_value_in_form (which prepares the string for displaying in an HTML attribute on a tag,
+	 * mostly by escaping quotes)
+	 * Note, we do not store the exact original value sent in the user's request because
+	 * it may have malicious content, and we MIGHT want to store the form input in a transient or something...
+	 * in which case, we would have stored the malicious content to our database.
+	 *
+	 * @return string
+	 */
+	public function raw_value()
+	{
+		return $this->_raw_value;
+	}
+
+
+
+	/**
+	 * Returns a string safe to usage in form inputs when displaying, because
+	 * it escapes all html entities
+	 *
+	 * @return string
+	 */
+	public function raw_value_in_form()
+	{
+		return htmlentities($this->raw_value(), ENT_QUOTES, 'UTF-8');
+	}
+
+
+
+	/**
+	 * returns the value after it's been sanitized, and then converted into it's proper type
+	 * in PHP. Eg, a string, an int, an array,
+	 *
+	 * @return mixed
+	 */
+	public function normalized_value()
+	{
+		return $this->_normalized_value;
+	}
+
+
+
+	/**
+	 * Returns the normalized value is a presentable way. By default this is just
+	 * the normalized value by itself, but it can be overridden for when that's not
+	 * the best thing to display
+	 *
+	 * @return string
+	 */
+	public function pretty_value()
+	{
+		return $this->_normalized_value;
+	}
+
+
+
+	/**
+	 * When generating the JS for the jquery validation rules like<br>
+	 * <code>$( "#myform" ).validate({
+	 * rules: {
+	 * password: "required",
+	 * password_again: {
+	 * equalTo: "#password"
+	 * }
+	 * }
+	 * });</code>
+	 * if this field had the name 'password_again', it should return
+	 * <br><code>password_again: {
+	 * equalTo: "#password"
+	 * }</code>
+	 *
+	 * @return array
+	 */
+	public function get_jquery_validation_rules()
+	{
+		$jquery_validation_js = array();
+		$jquery_validation_rules = array();
+		foreach ($this->get_validation_strategies() as $validation_strategy) {
+			$jquery_validation_rules = array_replace_recursive(
+				$jquery_validation_rules,
+				$validation_strategy->get_jquery_validation_rule_array()
+			);
+		}
+		if (! empty($jquery_validation_rules)) {
+			foreach ($this->get_display_strategy()->get_html_input_ids(true) as $html_id_with_pound_sign) {
+				$jquery_validation_js[ $html_id_with_pound_sign ] = $jquery_validation_rules;
+			}
+		}
+		return $jquery_validation_js;
+	}
+
+
+
+	/**
+	 * Sets the input's default value for use in displaying in the form. Note: value should be
+	 * normalized (Eg, if providing a default of ra Yes_NO_Input you would provide TRUE or FALSE, not '1' or '0')
+	 *
+	 * @param mixed $value
+	 * @return void
+	 */
+	public function set_default($value)
+	{
+		$this->_default = $value;
+		$this->_set_normalized_value($value);
+		$this->_set_raw_value($value);
+	}
+
+
+
+	/**
+	 * Sets the normalized value on this input
+	 *
+	 * @param mixed $value
+	 */
+	protected function _set_normalized_value($value)
+	{
+		$this->_normalized_value = $value;
+	}
+
+
+
+	/**
+	 * Sets the raw value on this input (ie, exactly as the user submitted it)
+	 *
+	 * @param mixed $value
+	 */
+	protected function _set_raw_value($value)
+	{
+		$this->_raw_value = $this->_normalization_strategy->unnormalize($value);
+	}
+
+
+
+	/**
+	 * Sets the HTML label text after it has already been defined
+	 *
+	 * @param string $label
+	 * @return void
+	 */
+	public function set_html_label_text($label)
+	{
+		$this->_html_label_text = $label;
+	}
+
+
+
+	/**
+	 * Sets whether or not this field is required, and adjusts the validation strategy.
+	 * If you want to use the EE_Conditionally_Required_Validation_Strategy,
+	 * please add it as a validation strategy using add_validation_strategy as normal
+	 *
+	 * @param boolean $required boolean
+	 * @param null    $required_text
+	 */
+	public function set_required($required = true, $required_text = null)
+	{
+		$required = filter_var($required, FILTER_VALIDATE_BOOLEAN);
+		// whether $required is a string or a boolean, we want to add a required validation strategy
+		if ($required) {
+			$this->_add_validation_strategy(new EE_Required_Validation_Strategy($required_text));
+		} else {
+			$this->remove_validation_strategy('EE_Required_Validation_Strategy');
+		}
+		$this->_required = $required;
+	}
+
+
+
+	/**
+	 * Returns whether or not this field is required
+	 *
+	 * @return boolean
+	 */
+	public function required()
+	{
+		return $this->_required;
+	}
+
+
+
+	/**
+	 * @param string $required_css_class
+	 */
+	public function set_required_css_class($required_css_class)
+	{
+		$this->_required_css_class = $required_css_class;
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function required_css_class()
+	{
+		return $this->_required_css_class;
+	}
+
+
+
+	/**
+	 * @param bool $add_required
+	 * @return string
+	 */
+	public function html_class($add_required = false)
+	{
+		return $add_required && $this->required()
+			? $this->required_css_class() . ' ' . $this->_html_class
+			: $this->_html_class;
+	}
+
+
+	/**
+	 * Sets the help text, in case
+	 *
+	 * @param string $text
+	 */
+	public function set_html_help_text($text)
+	{
+		$this->_html_help_text = $text;
+	}
+
+
+
+	/**
+	 * Uses the sensitive data removal strategy to remove the sensitive data from this
+	 * input. If there is any kind of sensitive data removal on this input, we clear
+	 * out the raw value completely
+	 *
+	 * @return void
+	 */
+	public function clean_sensitive_data()
+	{
+		// if we do ANY kind of sensitive data removal on this, then just clear out the raw value
+		// if we need more logic than this we'll make a strategy for it
+		if ($this->_sensitive_data_removal_strategy
+			&& ! $this->_sensitive_data_removal_strategy instanceof EE_No_Sensitive_Data_Removal
+		) {
+			$this->_set_raw_value(null);
+		}
+		// and clean the normalized value according to the appropriate strategy
+		$this->_set_normalized_value(
+			$this->get_sensitive_data_removal_strategy()->remove_sensitive_data(
+				$this->_normalized_value
+			)
+		);
+	}
+
+
+
+	/**
+	 * @param bool   $primary
+	 * @param string $button_size
+	 * @param string $other_attributes
+	 */
+	public function set_button_css_attributes($primary = true, $button_size = '', $other_attributes = '')
+	{
+		$button_css_attributes = 'button';
+		$button_css_attributes .= $primary === true ? ' button-primary' : ' button-secondary';
+		switch ($button_size) {
+			case 'xs':
+			case 'extra-small':
+				$button_css_attributes .= ' button-xs';
+				break;
+			case 'sm':
+			case 'small':
+				$button_css_attributes .= ' button-sm';
+				break;
+			case 'lg':
+			case 'large':
+				$button_css_attributes .= ' button-lg';
+				break;
+			case 'block':
+				$button_css_attributes .= ' button-block';
+				break;
+			case 'md':
+			case 'medium':
+			default:
+				$button_css_attributes .= '';
+		}
+		$this->_button_css_attributes .= ! empty($other_attributes)
+			? $button_css_attributes . ' ' . $other_attributes
+			: $button_css_attributes;
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function button_css_attributes()
+	{
+		if (empty($this->_button_css_attributes)) {
+			$this->set_button_css_attributes();
+		}
+		return $this->_button_css_attributes;
+	}
+
+
+
+	/**
+	 * find_form_data_for_this_section
+	 * using this section's name and its parents, finds the value of the form data that corresponds to it.
+	 * For example, if this form section's HTML name is my_form[subform][form_input_1],
+	 * then it's value should be in $_REQUEST at $_REQUEST['my_form']['subform']['form_input_1'].
+	 * (If that doesn't exist, we also check for this subsection's name
+	 * at the TOP LEVEL of the request data. Eg $_REQUEST['form_input_1'].)
+	 * This function finds its value in the form.
+	 *
+	 * @param array $req_data
+	 * @return mixed whatever the raw value of this form section is in the request data
+	 * @throws \EE_Error
+	 */
+	public function find_form_data_for_this_section($req_data)
+	{
+		$name_parts = $this->getInputNameParts();
+		// now get the value for the input
+		$value = $this->findRequestForSectionUsingNameParts($name_parts, $req_data);
+		// check if this thing's name is at the TOP level of the request data
+		if ($value === null && isset($req_data[ $this->name() ])) {
+			$value = $req_data[ $this->name() ];
+		}
+		return $value;
+	}
+
+
+
+	/**
+	 * If this input's name is something like "foo[bar][baz]"
+	 * returns an array like `array('foo','bar',baz')`
+	 * @return array
+	 */
+	protected function getInputNameParts()
+	{
+		// break up the html name by "[]"
+		if (strpos($this->html_name(), '[') !== false) {
+			$before_any_brackets = substr($this->html_name(), 0, strpos($this->html_name(), '['));
+		} else {
+			$before_any_brackets = $this->html_name();
+		}
+		// grab all of the segments
+		preg_match_all('~\[([^]]*)\]~', $this->html_name(), $matches);
+		if (isset($matches[1]) && is_array($matches[1])) {
+			$name_parts = $matches[1];
+			array_unshift($name_parts, $before_any_brackets);
+		} else {
+			$name_parts = array($before_any_brackets);
+		}
+		return $name_parts;
+	}
+
+
+
+	/**
+	 * @param array $html_name_parts
+	 * @param array $req_data
+	 * @return array | NULL
+	 */
+	public function findRequestForSectionUsingNameParts($html_name_parts, $req_data)
+	{
+		$first_part_to_consider = array_shift($html_name_parts);
+		if (isset($req_data[ $first_part_to_consider ])) {
+			if (empty($html_name_parts)) {
+				return $req_data[ $first_part_to_consider ];
+			} else {
+				return $this->findRequestForSectionUsingNameParts(
+					$html_name_parts,
+					$req_data[ $first_part_to_consider ]
+				);
+			}
+		} else {
+			return null;
+		}
+	}
+
+
+
+	/**
+	 * Checks if this form input's data is in the request data
+	 *
+	 * @param array $req_data like $_POST
+	 * @return boolean
+	 * @throws \EE_Error
+	 */
+	public function form_data_present_in($req_data = null)
+	{
+		if ($req_data === null) {
+			$req_data = $_POST;
+		}
+		$checked_value = $this->find_form_data_for_this_section($req_data);
+		if ($checked_value !== null) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+
+
+	/**
+	 * Overrides parent to add js data from validation and display strategies
+	 *
+	 * @param array $form_other_js_data
+	 * @return array
+	 */
+	public function get_other_js_data($form_other_js_data = array())
+	{
+		$form_other_js_data = $this->get_other_js_data_from_strategies($form_other_js_data);
+		return $form_other_js_data;
+	}
+
+
+
+	/**
+	 * Gets other JS data for localization from this input's strategies, like
+	 * the validation strategies and the display strategy
+	 *
+	 * @param array $form_other_js_data
+	 * @return array
+	 */
+	public function get_other_js_data_from_strategies($form_other_js_data = array())
+	{
+		$form_other_js_data = $this->get_display_strategy()->get_other_js_data($form_other_js_data);
+		foreach ($this->get_validation_strategies() as $validation_strategy) {
+			$form_other_js_data = $validation_strategy->get_other_js_data($form_other_js_data);
+		}
+		return $form_other_js_data;
+	}
+
+
+
+	/**
+	 * Override parent because we want to give our strategies an opportunity to enqueue some js and css
+	 *
+	 * @return void
+	 */
+	public function enqueue_js()
+	{
+		// ask our display strategy and validation strategies if they have js to enqueue
+		$this->enqueue_js_from_strategies();
+	}
+
+
+
+	/**
+	 * Tells strategies when its ok to enqueue their js and css
+	 *
+	 * @return void
+	 */
+	public function enqueue_js_from_strategies()
+	{
+		$this->get_display_strategy()->enqueue_js();
+		foreach ($this->get_validation_strategies() as $validation_strategy) {
+			$validation_strategy->enqueue_js();
+		}
+	}
+
+
+
+	/**
+	 * Gets the default value set on the input (not the current value, which may have been
+	 * changed because of a form submission). If no default was set, this us null.
+	 * @return mixed
+	 */
+	public function get_default()
+	{
+		return $this->_default;
+	}
+
+
+
+	/**
+	 * Makes this input disabled. That means it will have the HTML attribute 'disabled="disabled"',
+	 * and server-side if any input was received it will be ignored
+	 */
+	public function disable($disable = true)
+	{
+		$disabled_attribute = ' disabled="disabled"';
+		$this->disabled = filter_var($disable, FILTER_VALIDATE_BOOLEAN);
+		if ($this->disabled) {
+			if (strpos($this->_other_html_attributes, $disabled_attribute) === false) {
+				$this->_other_html_attributes .= $disabled_attribute;
+			}
+			$this->_set_normalized_value($this->get_default());
+		} else {
+			$this->_other_html_attributes = str_replace($disabled_attribute, '', $this->_other_html_attributes);
+		}
+	}
+
+
+
+	/**
+	 * Returns whether or not this input is currently disabled.
+	 * @return bool
+	 */
+	public function isDisabled()
+	{
+		return $this->disabled;
+	}
 }

Spacing +19 added lines, -19 removed lines

@@ -195,7 +195,7 @@ 
         if (isset($input_args['validation_strategies'])) {
             foreach ((array) $input_args['validation_strategies'] as $validation_strategy) {
                 if ($validation_strategy instanceof EE_Validation_Strategy_Base && empty($input_args['ignore_input'])) {
-                    $this->_validation_strategies[ get_class($validation_strategy) ] = $validation_strategy;
+                    $this->_validation_strategies[get_class($validation_strategy)] = $validation_strategy;
                 }
             }
             unset($input_args['validation_strategies']);
@@ -206,7 +206,7 @@ 
         // loop thru incoming options
         foreach ($input_args as $key => $value) {
             // add underscore to $key to match property names
-            $_key = '_' . $key;
+            $_key = '_'.$key;
             if (property_exists($this, $_key)) {
                 $this->{$_key} = $value;
             }
@@ -226,7 +226,7 @@ 
         if (isset($input_args['ignore_input'])) {
             $this->_normalization_strategy = new EE_Null_Normalization();
         }
-        if (! $this->_normalization_strategy) {
+        if ( ! $this->_normalization_strategy) {
                 $this->_normalization_strategy = new EE_Text_Normalization();
         }
         $this->_normalization_strategy->_construct_finalize($this);
@@ -235,7 +235,7 @@ 
             $this->set_default($input_args['default']);
             unset($input_args['default']);
         }
-        if (! $this->_sensitive_data_removal_strategy) {
+        if ( ! $this->_sensitive_data_removal_strategy) {
             $this->_sensitive_data_removal_strategy = new EE_No_Sensitive_Data_Removal();
         }
         $this->_sensitive_data_removal_strategy->_construct_finalize($this);
@@ -252,10 +252,10 @@ 
      */
     protected function _set_default_html_name_if_empty()
     {
-        if (! $this->_html_name) {
+        if ( ! $this->_html_name) {
             $this->_html_name = $this->name();
             if ($this->_parent_section && $this->_parent_section instanceof EE_Form_Section_Proper) {
-                $this->_html_name = $this->_parent_section->html_name_prefix() . "[{$this->name()}]";
+                $this->_html_name = $this->_parent_section->html_name_prefix()."[{$this->name()}]";
             }
         }
     }
@@ -287,7 +287,7 @@ 
     protected function _get_display_strategy()
     {
         $this->ensure_construct_finalized_called();
-        if (! $this->_display_strategy || ! $this->_display_strategy instanceof EE_Display_Strategy_Base) {
+        if ( ! $this->_display_strategy || ! $this->_display_strategy instanceof EE_Display_Strategy_Base) {
             throw new EE_Error(
                 sprintf(
                     __(
@@ -454,7 +454,7 @@ 
             if ($validation_strategy instanceof $validation_strategy_classname
                 || is_subclass_of($validation_strategy, $validation_strategy_classname)
             ) {
-                unset($this->_validation_strategies[ $key ]);
+                unset($this->_validation_strategies[$key]);
             }
         }
     }
@@ -665,7 +665,7 @@ 
             if (is_array($raw_input)) {
                 $raw_value = array();
                 foreach ($raw_input as $key => $value) {
-                    $raw_value[ $key ] = $this->_sanitize($value);
+                    $raw_value[$key] = $this->_sanitize($value);
                 }
                 $this->_set_raw_value($raw_value);
             } else {
@@ -698,7 +698,7 @@ 
      */
     public function html_label_id()
     {
-        return ! empty($this->_html_label_id) ? $this->_html_label_id : $this->html_id() . '-lbl';
+        return ! empty($this->_html_label_id) ? $this->_html_label_id : $this->html_id().'-lbl';
     }
 
 
@@ -848,9 +848,9 @@ 
                 $validation_strategy->get_jquery_validation_rule_array()
             );
         }
-        if (! empty($jquery_validation_rules)) {
+        if ( ! empty($jquery_validation_rules)) {
             foreach ($this->get_display_strategy()->get_html_input_ids(true) as $html_id_with_pound_sign) {
-                $jquery_validation_js[ $html_id_with_pound_sign ] = $jquery_validation_rules;
+                $jquery_validation_js[$html_id_with_pound_sign] = $jquery_validation_rules;
             }
         }
         return $jquery_validation_js;
@@ -972,7 +972,7 @@ 
     public function html_class($add_required = false)
     {
         return $add_required && $this->required()
-            ? $this->required_css_class() . ' ' . $this->_html_class
+            ? $this->required_css_class().' '.$this->_html_class
             : $this->_html_class;
     }
 
@@ -1046,7 +1046,7 @@ 
                 $button_css_attributes .= '';
         }
         $this->_button_css_attributes .= ! empty($other_attributes)
-            ? $button_css_attributes . ' ' . $other_attributes
+            ? $button_css_attributes.' '.$other_attributes
             : $button_css_attributes;
     }
 
@@ -1084,8 +1084,8 @@ 
         // now get the value for the input
         $value = $this->findRequestForSectionUsingNameParts($name_parts, $req_data);
         // check if this thing's name is at the TOP level of the request data
-        if ($value === null && isset($req_data[ $this->name() ])) {
-            $value = $req_data[ $this->name() ];
+        if ($value === null && isset($req_data[$this->name()])) {
+            $value = $req_data[$this->name()];
         }
         return $value;
     }
@@ -1126,13 +1126,13 @@ 
     public function findRequestForSectionUsingNameParts($html_name_parts, $req_data)
     {
         $first_part_to_consider = array_shift($html_name_parts);
-        if (isset($req_data[ $first_part_to_consider ])) {
+        if (isset($req_data[$first_part_to_consider])) {
             if (empty($html_name_parts)) {
-                return $req_data[ $first_part_to_consider ];
+                return $req_data[$first_part_to_consider];
             } else {
                 return $this->findRequestForSectionUsingNameParts(
                     $html_name_parts,
-                    $req_data[ $first_part_to_consider ]
+                    $req_data[$first_part_to_consider]
                 );
             }
         } else {

modules/add_new_state/EED_Add_New_State.module.php

Indentation +814 added lines, -814 removed lines

@@ -17,818 +17,818 @@
 {
 
 
-    /**
-     * @return EED_Module|EED_Add_New_State
-     */
-    public static function instance()
-    {
-        return parent::get_instance(__CLASS__);
-    }
-
-
-    /**
-     * set_hooks - for hooking into EE Core, other modules, etc
-     *
-     * @return void
-     */
-    public static function set_hooks()
-    {
-        add_action('wp_loaded', array('EED_Add_New_State', 'set_definitions'), 2);
-        add_action('wp_enqueue_scripts', array('EED_Add_New_State', 'translate_js_strings'), 0);
-        add_action('wp_enqueue_scripts', array('EED_Add_New_State', 'wp_enqueue_scripts'), 10);
-        add_filter(
-            'FHEE__EE_SPCO_Reg_Step_Attendee_Information___question_group_reg_form__question_group_reg_form',
-            array('EED_Add_New_State', 'display_add_new_state_micro_form'),
-            1,
-            1
-        );
-        add_filter(
-            'FHEE__EE_SPCO_Reg_Step_Payment_Options___get_billing_form_for_payment_method__billing_form',
-            array('EED_Add_New_State', 'display_add_new_state_micro_form'),
-            1,
-            1
-        );
-        add_filter(
-            'FHEE__EE_Single_Page_Checkout__process_attendee_information__valid_data_line_item',
-            array('EED_Add_New_State', 'unset_new_state_request_params'),
-            10,
-            1
-        );
-        add_filter(
-            'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__state_options',
-            array('EED_Add_New_State', 'inject_new_reg_state_into_options'),
-            10,
-            5
-        );
-        add_filter(
-            'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__country_options',
-            array('EED_Add_New_State', 'inject_new_reg_country_into_options'),
-            10,
-            5
-        );
-        add_filter(
-            'FHEE__EE_State_Select_Input____construct__state_options',
-            array('EED_Add_New_State', 'state_options'),
-            10,
-            1
-        );
-        add_filter(
-            'FHEE__EE_Country_Select_Input____construct__country_options',
-            array('EED_Add_New_State', 'country_options'),
-            10,
-            1
-        );
-    }
-
-
-    /**
-     * set_hooks_admin - for hooking into EE Admin Core, other modules, etc
-     *
-     * @return void
-     */
-    public static function set_hooks_admin()
-    {
-        add_action('wp_loaded', array('EED_Add_New_State', 'set_definitions'), 2);
-        add_filter(
-            'FHEE__EE_SPCO_Reg_Step_Attendee_Information___question_group_reg_form__question_group_reg_form',
-            array('EED_Add_New_State', 'display_add_new_state_micro_form'),
-            1,
-            1
-        );
-        add_filter(
-            'FHEE__EE_SPCO_Reg_Step_Payment_Options___get_billing_form_for_payment_method__billing_form',
-            array('EED_Add_New_State', 'display_add_new_state_micro_form'),
-            1,
-            1
-        );
-        add_action('wp_ajax_espresso_add_new_state', array('EED_Add_New_State', 'add_new_state'));
-        add_action('wp_ajax_nopriv_espresso_add_new_state', array('EED_Add_New_State', 'add_new_state'));
-        add_filter(
-            'FHEE__EE_Single_Page_Checkout__process_attendee_information__valid_data_line_item',
-            array('EED_Add_New_State', 'unset_new_state_request_params'),
-            10,
-            1
-        );
-        add_action(
-            'AHEE__General_Settings_Admin_Page__update_country_settings__state_saved',
-            array('EED_Add_New_State', 'update_country_settings'),
-            10,
-            3
-        );
-        add_action(
-            'AHEE__General_Settings_Admin_Page__delete_state__state_deleted',
-            array('EED_Add_New_State', 'update_country_settings'),
-            10,
-            3
-        );
-        add_filter(
-            'FHEE__EE_State_Select_Input____construct__state_options',
-            array('EED_Add_New_State', 'state_options'),
-            10,
-            1
-        );
-        add_filter(
-            'FHEE__EE_Country_Select_Input____construct__country_options',
-            array('EED_Add_New_State', 'country_options'),
-            10,
-            1
-        );
-        add_filter(
-            'FHEE__EE_Form_Section_Proper__receive_form_submission__request_data',
-            array('EED_Add_New_State', 'filter_checkout_request_params'),
-            10,
-            1
-        );
-        add_filter(
-            'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__state_options',
-            array('EED_Add_New_State', 'inject_new_reg_state_into_options'),
-            10,
-            5
-        );
-        add_filter(
-            'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__country_options',
-            array('EED_Add_New_State', 'inject_new_reg_country_into_options'),
-            10,
-            5
-        );
-    }
-
-
-    /**
-     * @return void
-     */
-    public static function set_definitions()
-    {
-        define('ANS_ASSETS_URL', plugin_dir_url(__FILE__) . 'assets/');
-        define(
-            'ANS_TEMPLATES_PATH',
-            str_replace(
-                '\\',
-                '/',
-                plugin_dir_path(__FILE__)
-            ) . 'templates/'
-        );
-    }
-
-
-    /**
-     * @param WP $WP
-     * @return void
-     */
-    public function run($WP)
-    {
-    }
-
-
-    /**
-     * @return void
-     */
-    public static function translate_js_strings()
-    {
-        EE_Registry::$i18n_js_strings['ans_no_country'] = esc_html__(
-            'In order to proceed, you need to select the Country that your State/Province belongs to.',
-            'event_espresso'
-        );
-        EE_Registry::$i18n_js_strings['ans_no_name'] = esc_html__(
-            'In order to proceed, you need to enter the name of your State/Province.',
-            'event_espresso'
-        );
-        EE_Registry::$i18n_js_strings['ans_no_abbreviation'] = esc_html__(
-            'In order to proceed, you need to enter an abbreviation for the name of your State/Province.',
-            'event_espresso'
-        );
-        EE_Registry::$i18n_js_strings['ans_save_success'] = esc_html__(
-            'The new state was successfully saved to the database.',
-            'event_espresso'
-        );
-        EE_Registry::$i18n_js_strings['ans_server_save_error'] = esc_html__(
-            'An unknown error has occurred on the server while saving the new state to the database.',
-            'event_espresso'
-        );
-    }
-
-
-    /**
-     * @return void
-     */
-    public static function wp_enqueue_scripts()
-    {
-        if (apply_filters('EED_Single_Page_Checkout__SPCO_active', false)) {
-            wp_register_script(
-                'add_new_state',
-                ANS_ASSETS_URL . 'add_new_state.js',
-                array('espresso_core', 'single_page_checkout'),
-                EVENT_ESPRESSO_VERSION,
-                true
-            );
-            wp_enqueue_script('add_new_state');
-        }
-    }
-
-
-
-    /**
-     * display_add_new_state_micro_form
-     *
-     * @param EE_Form_Section_Proper $question_group_reg_form
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function display_add_new_state_micro_form(EE_Form_Section_Proper $question_group_reg_form)
-    {
-        // only add the 'new_state_micro_form' when displaying reg forms,
-        // not during processing since we process the 'new_state_micro_form' in it's own AJAX request
-        $action = EE_Registry::instance()->REQ->get('action', '');
-        // is the "state" question in this form section?
-        $input = $question_group_reg_form->get_subsection('state');
-        if ($action === 'process_reg_step' || $action === 'update_reg_step') {
-            // ok then all we need to do is make sure the input's HTML name is consistent
-            // by forcing it to set it now, like it did while getting the form for display
-            if ($input instanceof EE_State_Select_Input) {
-                $input->html_name();
-            }
-            return $question_group_reg_form;
-        }
-        // we're only doing this for state select inputs
-        if ($input instanceof EE_State_Select_Input
-            && ! $input->get_display_strategy() instanceof EE_Hidden_Display_Strategy
-        ) {
-            // grab any set values from the request
-            $country_name = str_replace('state', 'nsmf_new_state_country', $input->html_name());
-            $state_name = str_replace('state', 'nsmf_new_state_name', $input->html_name());
-            $abbrv_name = str_replace('state', 'nsmf_new_state_abbrv', $input->html_name());
-            $new_state_submit_id = str_replace('state', 'new_state', $input->html_id());
-            $country_options = array();
-            $countries = EEM_Country::instance()->get_all_countries();
-            if (! empty($countries)) {
-                foreach ($countries as $country) {
-                    if ($country instanceof EE_Country) {
-                        $country_options[ $country->ID() ] = $country->name();
-                    }
-                }
-            }
-            $new_state_micro_form = new EE_Form_Section_Proper(
-                array(
-                    'name'            => 'new_state_micro_form',
-                    'html_id'         => 'new_state_micro_form',
-                    'layout_strategy' => new EE_Div_Per_Section_Layout(),
-                    'subsections'     => array(
-                        // add hidden input to indicate that a new state is being added
-                        'add_new_state'               => new EE_Hidden_Input(
-                            array(
-                                'html_name' => str_replace(
-                                    'state',
-                                    'nsmf_add_new_state',
-                                    $input->html_name()
-                                ),
-                                'html_id'   => str_replace(
-                                    'state',
-                                    'nsmf_add_new_state',
-                                    $input->html_id()
-                                ),
-                                'default'   => 0,
-                            )
-                        ),
-                        // add link for displaying hidden container
-                        'click_here_link'             => new EE_Form_Section_HTML(
-                            apply_filters(
-                                'FHEE__EED_Add_New_State__display_add_new_state_micro_form__click_here_link',
-                                EEH_HTML::link(
-                                    '',
-                                    esc_html__('click here to add a new state/province', 'event_espresso'),
-                                    '',
-                                    'display-' . $input->html_id(),
-                                    'ee-form-add-new-state-lnk display-the-hidden smaller-text hide-if-no-js',
-                                    '',
-                                    'data-target="' . $input->html_id() . '"'
-                                )
-                            )
-                        ),
-                        // add initial html for hidden container
-                        'add_new_state_micro_form'    => new EE_Form_Section_HTML(
-                            apply_filters(
-                                'FHEE__EED_Add_New_State__display_add_new_state_micro_form__add_new_state_micro_form',
-                                EEH_HTML::div(
-                                    '',
-                                    $input->html_id() . '-dv',
-                                    'ee-form-add-new-state-dv',
-                                    'display: none;'
-                                ) .
-                                EEH_HTML::h6(
-                                    esc_html__(
-                                        'Is your state/province missing from the dropdown menu above? You can add it by completing the following steps:',
-                                        'event_espresso'
-                                    )
-                                ) .
-                                EEH_HTML::ul() .
-                                EEH_HTML::li(
-                                    esc_html__(
-                                        'first select the Country that your State/Province belongs to',
-                                        'event_espresso'
-                                    )
-                                ) .
-                                EEH_HTML::li(
-                                    esc_html__('enter the name of your State/Province', 'event_espresso')
-                                ) .
-                                EEH_HTML::li(
-                                    esc_html__(
-                                        'enter a two to six letter abbreviation for the name of your State/Province',
-                                        'event_espresso'
-                                    )
-                                ) .
-                                EEH_HTML::li(esc_html__('click the ADD button', 'event_espresso')) .
-                                EEH_HTML::ulx()
-                            )
-                        ),
-                        // NEW STATE COUNTRY
-                        'new_state_country'           => new EE_Country_Select_Input(
-                            $country_options,
-                            array(
-                                'html_name'       => $country_name,
-                                'html_id'         => str_replace(
-                                    'state',
-                                    'nsmf_new_state_country',
-                                    $input->html_id()
-                                ),
-                                'html_class'      => $input->html_class() . ' new-state-country',
-                                'html_label_text' => esc_html__('New State/Province Country', 'event_espresso'),
-                                'default'         => EE_Registry::instance()->REQ->get($country_name, ''),
-                                'required'        => false,
-                            )
-                        ),
-                        // NEW STATE NAME
-                        'new_state_name'              => new EE_Text_Input(
-                            array(
-                                'html_name'       => $state_name,
-                                'html_id'         => str_replace(
-                                    'state',
-                                    'nsmf_new_state_name',
-                                    $input->html_id()
-                                ),
-                                'html_class'      => $input->html_class() . ' new-state-state',
-                                'html_label_text' => esc_html__(
-                                    'New State/Province Name',
-                                    'event_espresso'
-                                ),
-                                'default'         => EE_Registry::instance()->REQ->get($state_name, ''),
-                                'required'        => false,
-                            )
-                        ),
-                        'spacer'                      => new EE_Form_Section_HTML(EEH_HTML::br()),
-                        // NEW STATE NAME
-                        'new_state_abbrv'             => new EE_Text_Input(
-                            array(
-                                'html_name'             => $abbrv_name,
-                                'html_id'               => str_replace(
-                                    'state',
-                                    'nsmf_new_state_abbrv',
-                                    $input->html_id()
-                                ),
-                                'html_class'            => $input->html_class() . ' new-state-abbrv',
-                                'html_label_text'       => esc_html__(
-                                    'New State/Province Abbreviation',
-                                    'event_espresso'
-                                ) . ' *',
-                                'other_html_attributes' => 'size="24"',
-                                'default'               => EE_Registry::instance()->REQ->get($abbrv_name, ''),
-                                'required'              => false,
-                            )
-                        ),
-                        // "submit" button
-                        'add_new_state_submit_button' => new EE_Form_Section_HTML(
-                            apply_filters(
-                                'FHEE__EED_Add_New_State__display_add_new_state_micro_form__add_new_state_submit_button',
-                                EEH_HTML::nbsp(3) .
-                                EEH_HTML::link(
-                                    '',
-                                    esc_html__('ADD', 'event_espresso'),
-                                    '',
-                                    'submit-' . $new_state_submit_id,
-                                    'ee-form-add-new-state-submit button button-secondary',
-                                    '',
-                                    'data-target="' . $new_state_submit_id . '" data-value-field-name="' . $input->valueFieldName(). '"'
-                                )
-                            )
-                        ),
-                        // extra info
-                        'add_new_state_extra'         => new EE_Form_Section_HTML(
-                            apply_filters(
-                                'FHEE__EED_Add_New_State__display_add_new_state_micro_form__add_new_state_extra',
-                                EEH_HTML::br(2)
-                                .
-                                EEH_HTML::div('', '', 'small-text')
-                                .
-                                EEH_HTML::strong(
-                                    '* ' .
-                                    esc_html__(
-                                        'Don\'t know your State/Province Abbreviation?',
-                                        'event_espresso'
-                                    )
-                                )
-                                .
-                                EEH_HTML::br()
-                                .
-                                sprintf(
-                                    esc_html__(
-                                        'You can look here: %s, for a list of Countries and links to their State/Province Abbreviations ("Subdivisions assigned codes" column).',
-                                        'event_espresso'
-                                    ),
-                                    EEH_HTML::link(
-                                        'http://en.wikipedia.org/wiki/ISO_3166-2',
-                                        'http://en.wikipedia.org/wiki/ISO_3166-2',
-                                        '',
-                                        '',
-                                        'ee-form-add-new-state-wiki-lnk',
-                                        '',
-                                        'target="_blank"'
-                                    )
-                                )
-                                .
-                                EEH_HTML::divx()
-                                .
-                                EEH_HTML::br()
-                                .
-                                EEH_HTML::link(
-                                    '',
-                                    esc_html__('cancel new State/Province', 'event_espresso'),
-                                    '',
-                                    'hide-' . $input->html_id(),
-                                    'ee-form-cancel-new-state-lnk smaller-text',
-                                    '',
-                                    'data-target="' . $input->html_id() . '"'
-                                )
-                                .
-                                EEH_HTML::divx()
-                                .
-                                EEH_HTML::br()
-                            )
-                        ),
-                    ),
-                )
-            );
-            $question_group_reg_form->add_subsections(
-                array('new_state_micro_form' => $new_state_micro_form),
-                'state',
-                false
-            );
-        }
-        return $question_group_reg_form;
-    }
-
-
-    /**
-     * set_new_state_input_width
-     *
-     * @return int|string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public static function add_new_state()
-    {
-        $REQ = EE_Registry::instance()->load_core('Request_Handler');
-        if (absint($REQ->get('nsmf_add_new_state')) === 1) {
-            EE_Registry::instance()->load_model('State');
-            // grab country ISO code, new state name, and new state abbreviation
-            $state_country = $REQ->is_set('nsmf_new_state_country')
-                ? sanitize_text_field($REQ->get('nsmf_new_state_country'))
-                : false;
-            $state_name = $REQ->is_set('nsmf_new_state_name')
-                ? sanitize_text_field($REQ->get('nsmf_new_state_name'))
-                : false;
-            $state_abbr = $REQ->is_set('nsmf_new_state_abbrv')
-                ? sanitize_text_field($REQ->get('nsmf_new_state_abbrv'))
-                : false;
-            if ($state_country && $state_name && $state_abbr) {
-                $new_state = EED_Add_New_State::save_new_state_to_db(
-                    array(
-                        'CNT_ISO'    => strtoupper($state_country),
-                        'STA_abbrev' => strtoupper($state_abbr),
-                        'STA_name'   => ucwords($state_name),
-                        'STA_active' => false,
-                    )
-                );
-                if ($new_state instanceof EE_State) {
-                    // clean house
-                    EE_Registry::instance()->REQ->un_set('nsmf_add_new_state');
-                    EE_Registry::instance()->REQ->un_set('nsmf_new_state_country');
-                    EE_Registry::instance()->REQ->un_set('nsmf_new_state_name');
-                    EE_Registry::instance()->REQ->un_set('nsmf_new_state_abbrv');
-                    // get any existing new states
-                    $new_states = EE_Registry::instance()->SSN->get_session_data(
-                        'nsmf_new_states'
-                    );
-                    $new_states[ $new_state->ID() ] = $new_state;
-                    EE_Registry::instance()->SSN->set_session_data(
-                        array('nsmf_new_states' => $new_states)
-                    );
-                    if (EE_Registry::instance()->REQ->ajax) {
-                        echo wp_json_encode(
-                            array(
-                                'success'      => true,
-                                'id'           => $new_state->ID(),
-                                'name'         => $new_state->name(),
-                                'abbrev'       => $new_state->abbrev(),
-                                'country_iso'  => $new_state->country_iso(),
-                                'country_name' => $new_state->country()->name(),
-                            )
-                        );
-                        exit();
-                    }
-                    return $new_state->ID();
-                }
-            } else {
-                $error = esc_html__(
-                    'A new State/Province could not be added because invalid or missing data was received.',
-                    'event_espresso'
-                );
-                if (EE_Registry::instance()->REQ->ajax) {
-                    echo wp_json_encode(array('error' => $error));
-                    exit();
-                }
-                EE_Error::add_error($error, __FILE__, __FUNCTION__, __LINE__);
-            }
-        }
-        return false;
-    }
-
-
-    /**
-     * recursively drills down through request params to remove any that were added by this module
-     *
-     * @param array $request_params
-     * @return array
-     */
-    public static function filter_checkout_request_params($request_params)
-    {
-        foreach ($request_params as $form_section) {
-            if (is_array($form_section)) {
-                EED_Add_New_State::unset_new_state_request_params($form_section);
-                EED_Add_New_State::filter_checkout_request_params($form_section);
-            }
-        }
-        return $request_params;
-    }
-
-
-    /**
-     * @param array $request_params
-     * @return array
-     */
-    public static function unset_new_state_request_params($request_params)
-    {
-        unset(
-            $request_params['new_state_micro_form'],
-            $request_params['new_state_micro_add_new_state'],
-            $request_params['new_state_micro_new_state_country'],
-            $request_params['new_state_micro_new_state_name'],
-            $request_params['new_state_micro_new_state_abbrv']
-        );
-        return $request_params;
-    }
-
-
-    /**
-     * @param array $props_n_values
-     * @return bool
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function save_new_state_to_db($props_n_values = array())
-    {
-        $existing_state = EEM_State::instance()->get_all(array($props_n_values, 'limit' => 1));
-        if (! empty($existing_state)) {
-            return array_pop($existing_state);
-        }
-        $new_state = EE_State::new_instance($props_n_values);
-        if ($new_state instanceof EE_State) {
-            $country_settings_url = add_query_arg(
-                array(
-                    'page'    => 'espresso_general_settings',
-                    'action'  => 'country_settings',
-                    'country' => $new_state->country_iso(),
-                ),
-                admin_url('admin.php')
-            );
-            // if not non-ajax admin
-            new PersistentAdminNotice(
-                'new-state-added-' . $new_state->country_iso() . '-' . $new_state->abbrev(),
-                sprintf(
-                    esc_html__(
-                        'A new State named "%1$s (%2$s)" was dynamically added from an Event Espresso form for the Country of "%3$s".%5$sTo verify, edit, and/or delete this new State, please go to the %4$s and update the States / Provinces section.%5$sCheck "Yes" to have this new State added to dropdown select lists in forms.',
-                        'event_espresso'
-                    ),
-                    '<b>' . $new_state->name() . '</b>',
-                    '<b>' . $new_state->abbrev() . '</b>',
-                    '<b>' . $new_state->country()->name() . '</b>',
-                    '<a href="'
-                    . $country_settings_url
-                    . '">'
-                    . esc_html__(
-                        'Event Espresso - General Settings > Countries Tab',
-                        'event_espresso'
-                    )
-                    . '</a>',
-                    '<br />'
-                )
-            );
-            $new_state->save();
-            EEM_State::instance()->reset_cached_states();
-            return $new_state;
-        }
-        return false;
-    }
-
-
-    /**
-     * @param string $CNT_ISO
-     * @param string $STA_ID
-     * @param array  $cols_n_values
-     * @return void
-     * @throws DomainException
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function update_country_settings($CNT_ISO = '', $STA_ID = '', $cols_n_values = array())
-    {
-        if (! $CNT_ISO) {
-            EE_Error::add_error(
-                esc_html__('An invalid or missing Country ISO Code was received.', 'event_espresso'),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-        }
-        $STA_abbrev = is_array($cols_n_values) && isset($cols_n_values['STA_abbrev']) ? $cols_n_values['STA_abbrev']
-            : false;
-        if (! $STA_abbrev && ! empty($STA_ID)) {
-            $state = EEM_State::instance()->get_one_by_ID($STA_ID);
-            if ($state instanceof EE_State) {
-                $STA_abbrev = $state->abbrev();
-            }
-        }
-        if (! $STA_abbrev) {
-            EE_Error::add_error(
-                esc_html__('An invalid or missing State Abbreviation was received.', 'event_espresso'),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-        }
-        /** @var PersistentAdminNoticeManager $persistent_admin_notice_manager */
-        $persistent_admin_notice_manager = LoaderFactory::getLoader()->getShared(
-            'EventEspresso\core\services\notifications\PersistentAdminNoticeManager'
-        );
-        $persistent_admin_notice_manager->dismissNotice($CNT_ISO . '-' . $STA_abbrev, true, true);
-    }
-
-
-    /**
-     * @param EE_State[]                            $state_options
-     * @param EE_SPCO_Reg_Step_Attendee_Information $reg_step
-     * @param EE_Registration                       $registration
-     * @param EE_Question                           $question
-     * @param                                       $answer
-     * @return array
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function inject_new_reg_state_into_options(
-        $state_options = array(),
-        EE_SPCO_Reg_Step_Attendee_Information $reg_step,
-        EE_Registration $registration,
-        EE_Question $question,
-        $answer
-    ) {
-        if ($answer instanceof EE_Answer && $question instanceof EE_Question
-            && $question->type() === EEM_Question::QST_type_state
-        ) {
-            $STA_ID = $answer->value();
-            if (! empty($STA_ID)) {
-                $state = EEM_State::instance()->get_one_by_ID($STA_ID);
-                if ($state instanceof EE_State) {
-                    $country = $state->country();
-                    if ($country instanceof EE_Country) {
-                        if (! isset($state_options[ $country->name() ])) {
-                            $state_options[ $country->name() ] = array();
-                        }
-                        if (! isset($state_options[ $country->name() ][ $STA_ID ])) {
-                            $state_options[ $country->name() ][ $STA_ID ] = $state->name();
-                        }
-                    }
-                }
-            }
-        }
-        return $state_options;
-    }
-
-
-    /**
-     * @param EE_Country[]                          $country_options
-     * @param EE_SPCO_Reg_Step_Attendee_Information $reg_step
-     * @param EE_Registration                       $registration
-     * @param EE_Question                           $question
-     * @param                                       $answer
-     * @return array
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function inject_new_reg_country_into_options(
-        $country_options = array(),
-        EE_SPCO_Reg_Step_Attendee_Information $reg_step,
-        EE_Registration $registration,
-        EE_Question $question,
-        $answer
-    ) {
-        if ($answer instanceof EE_Answer && $question instanceof EE_Question
-            && $question->type()
-               === EEM_Question::QST_type_country
-        ) {
-            $CNT_ISO = $answer->value();
-            if (! empty($CNT_ISO)) {
-                $country = EEM_Country::instance()->get_one_by_ID($CNT_ISO);
-                if ($country instanceof EE_Country) {
-                    if (! isset($country_options[ $CNT_ISO ])) {
-                        $country_options[ $CNT_ISO ] = $country->name();
-                    }
-                }
-            }
-        }
-        return $country_options;
-    }
-
-
-    /**
-     * @param EE_State[] $state_options
-     * @return array
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function state_options($state_options = array())
-    {
-        $new_states = EED_Add_New_State::_get_new_states();
-        foreach ($new_states as $new_state) {
-            if ($new_state instanceof EE_State
-                && $new_state->country() instanceof EE_Country
-            ) {
-                $state_options[ $new_state->country()->name() ][ $new_state->ID() ] = $new_state->name();
-            }
-        }
-        return $state_options;
-    }
-
-
-    /**
-     * @return array
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    protected static function _get_new_states()
-    {
-        $new_states = array();
-        if (EE_Registry::instance()->SSN instanceof EE_Session) {
-            $new_states = EE_Registry::instance()->SSN->get_session_data(
-                'nsmf_new_states'
-            );
-        }
-        return is_array($new_states) ? $new_states : array();
-    }
-
-
-    /**
-     * @param EE_Country[] $country_options
-     * @return array
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function country_options($country_options = array())
-    {
-        $new_states = EED_Add_New_State::_get_new_states();
-        foreach ($new_states as $new_state) {
-            if ($new_state instanceof EE_State
-                && $new_state->country() instanceof EE_Country
-            ) {
-                $country_options[ $new_state->country()->ID() ] = $new_state->country()->name();
-            }
-        }
-        return $country_options;
-    }
+	/**
+	 * @return EED_Module|EED_Add_New_State
+	 */
+	public static function instance()
+	{
+		return parent::get_instance(__CLASS__);
+	}
+
+
+	/**
+	 * set_hooks - for hooking into EE Core, other modules, etc
+	 *
+	 * @return void
+	 */
+	public static function set_hooks()
+	{
+		add_action('wp_loaded', array('EED_Add_New_State', 'set_definitions'), 2);
+		add_action('wp_enqueue_scripts', array('EED_Add_New_State', 'translate_js_strings'), 0);
+		add_action('wp_enqueue_scripts', array('EED_Add_New_State', 'wp_enqueue_scripts'), 10);
+		add_filter(
+			'FHEE__EE_SPCO_Reg_Step_Attendee_Information___question_group_reg_form__question_group_reg_form',
+			array('EED_Add_New_State', 'display_add_new_state_micro_form'),
+			1,
+			1
+		);
+		add_filter(
+			'FHEE__EE_SPCO_Reg_Step_Payment_Options___get_billing_form_for_payment_method__billing_form',
+			array('EED_Add_New_State', 'display_add_new_state_micro_form'),
+			1,
+			1
+		);
+		add_filter(
+			'FHEE__EE_Single_Page_Checkout__process_attendee_information__valid_data_line_item',
+			array('EED_Add_New_State', 'unset_new_state_request_params'),
+			10,
+			1
+		);
+		add_filter(
+			'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__state_options',
+			array('EED_Add_New_State', 'inject_new_reg_state_into_options'),
+			10,
+			5
+		);
+		add_filter(
+			'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__country_options',
+			array('EED_Add_New_State', 'inject_new_reg_country_into_options'),
+			10,
+			5
+		);
+		add_filter(
+			'FHEE__EE_State_Select_Input____construct__state_options',
+			array('EED_Add_New_State', 'state_options'),
+			10,
+			1
+		);
+		add_filter(
+			'FHEE__EE_Country_Select_Input____construct__country_options',
+			array('EED_Add_New_State', 'country_options'),
+			10,
+			1
+		);
+	}
+
+
+	/**
+	 * set_hooks_admin - for hooking into EE Admin Core, other modules, etc
+	 *
+	 * @return void
+	 */
+	public static function set_hooks_admin()
+	{
+		add_action('wp_loaded', array('EED_Add_New_State', 'set_definitions'), 2);
+		add_filter(
+			'FHEE__EE_SPCO_Reg_Step_Attendee_Information___question_group_reg_form__question_group_reg_form',
+			array('EED_Add_New_State', 'display_add_new_state_micro_form'),
+			1,
+			1
+		);
+		add_filter(
+			'FHEE__EE_SPCO_Reg_Step_Payment_Options___get_billing_form_for_payment_method__billing_form',
+			array('EED_Add_New_State', 'display_add_new_state_micro_form'),
+			1,
+			1
+		);
+		add_action('wp_ajax_espresso_add_new_state', array('EED_Add_New_State', 'add_new_state'));
+		add_action('wp_ajax_nopriv_espresso_add_new_state', array('EED_Add_New_State', 'add_new_state'));
+		add_filter(
+			'FHEE__EE_Single_Page_Checkout__process_attendee_information__valid_data_line_item',
+			array('EED_Add_New_State', 'unset_new_state_request_params'),
+			10,
+			1
+		);
+		add_action(
+			'AHEE__General_Settings_Admin_Page__update_country_settings__state_saved',
+			array('EED_Add_New_State', 'update_country_settings'),
+			10,
+			3
+		);
+		add_action(
+			'AHEE__General_Settings_Admin_Page__delete_state__state_deleted',
+			array('EED_Add_New_State', 'update_country_settings'),
+			10,
+			3
+		);
+		add_filter(
+			'FHEE__EE_State_Select_Input____construct__state_options',
+			array('EED_Add_New_State', 'state_options'),
+			10,
+			1
+		);
+		add_filter(
+			'FHEE__EE_Country_Select_Input____construct__country_options',
+			array('EED_Add_New_State', 'country_options'),
+			10,
+			1
+		);
+		add_filter(
+			'FHEE__EE_Form_Section_Proper__receive_form_submission__request_data',
+			array('EED_Add_New_State', 'filter_checkout_request_params'),
+			10,
+			1
+		);
+		add_filter(
+			'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__state_options',
+			array('EED_Add_New_State', 'inject_new_reg_state_into_options'),
+			10,
+			5
+		);
+		add_filter(
+			'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__country_options',
+			array('EED_Add_New_State', 'inject_new_reg_country_into_options'),
+			10,
+			5
+		);
+	}
+
+
+	/**
+	 * @return void
+	 */
+	public static function set_definitions()
+	{
+		define('ANS_ASSETS_URL', plugin_dir_url(__FILE__) . 'assets/');
+		define(
+			'ANS_TEMPLATES_PATH',
+			str_replace(
+				'\\',
+				'/',
+				plugin_dir_path(__FILE__)
+			) . 'templates/'
+		);
+	}
+
+
+	/**
+	 * @param WP $WP
+	 * @return void
+	 */
+	public function run($WP)
+	{
+	}
+
+
+	/**
+	 * @return void
+	 */
+	public static function translate_js_strings()
+	{
+		EE_Registry::$i18n_js_strings['ans_no_country'] = esc_html__(
+			'In order to proceed, you need to select the Country that your State/Province belongs to.',
+			'event_espresso'
+		);
+		EE_Registry::$i18n_js_strings['ans_no_name'] = esc_html__(
+			'In order to proceed, you need to enter the name of your State/Province.',
+			'event_espresso'
+		);
+		EE_Registry::$i18n_js_strings['ans_no_abbreviation'] = esc_html__(
+			'In order to proceed, you need to enter an abbreviation for the name of your State/Province.',
+			'event_espresso'
+		);
+		EE_Registry::$i18n_js_strings['ans_save_success'] = esc_html__(
+			'The new state was successfully saved to the database.',
+			'event_espresso'
+		);
+		EE_Registry::$i18n_js_strings['ans_server_save_error'] = esc_html__(
+			'An unknown error has occurred on the server while saving the new state to the database.',
+			'event_espresso'
+		);
+	}
+
+
+	/**
+	 * @return void
+	 */
+	public static function wp_enqueue_scripts()
+	{
+		if (apply_filters('EED_Single_Page_Checkout__SPCO_active', false)) {
+			wp_register_script(
+				'add_new_state',
+				ANS_ASSETS_URL . 'add_new_state.js',
+				array('espresso_core', 'single_page_checkout'),
+				EVENT_ESPRESSO_VERSION,
+				true
+			);
+			wp_enqueue_script('add_new_state');
+		}
+	}
+
+
+
+	/**
+	 * display_add_new_state_micro_form
+	 *
+	 * @param EE_Form_Section_Proper $question_group_reg_form
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function display_add_new_state_micro_form(EE_Form_Section_Proper $question_group_reg_form)
+	{
+		// only add the 'new_state_micro_form' when displaying reg forms,
+		// not during processing since we process the 'new_state_micro_form' in it's own AJAX request
+		$action = EE_Registry::instance()->REQ->get('action', '');
+		// is the "state" question in this form section?
+		$input = $question_group_reg_form->get_subsection('state');
+		if ($action === 'process_reg_step' || $action === 'update_reg_step') {
+			// ok then all we need to do is make sure the input's HTML name is consistent
+			// by forcing it to set it now, like it did while getting the form for display
+			if ($input instanceof EE_State_Select_Input) {
+				$input->html_name();
+			}
+			return $question_group_reg_form;
+		}
+		// we're only doing this for state select inputs
+		if ($input instanceof EE_State_Select_Input
+			&& ! $input->get_display_strategy() instanceof EE_Hidden_Display_Strategy
+		) {
+			// grab any set values from the request
+			$country_name = str_replace('state', 'nsmf_new_state_country', $input->html_name());
+			$state_name = str_replace('state', 'nsmf_new_state_name', $input->html_name());
+			$abbrv_name = str_replace('state', 'nsmf_new_state_abbrv', $input->html_name());
+			$new_state_submit_id = str_replace('state', 'new_state', $input->html_id());
+			$country_options = array();
+			$countries = EEM_Country::instance()->get_all_countries();
+			if (! empty($countries)) {
+				foreach ($countries as $country) {
+					if ($country instanceof EE_Country) {
+						$country_options[ $country->ID() ] = $country->name();
+					}
+				}
+			}
+			$new_state_micro_form = new EE_Form_Section_Proper(
+				array(
+					'name'            => 'new_state_micro_form',
+					'html_id'         => 'new_state_micro_form',
+					'layout_strategy' => new EE_Div_Per_Section_Layout(),
+					'subsections'     => array(
+						// add hidden input to indicate that a new state is being added
+						'add_new_state'               => new EE_Hidden_Input(
+							array(
+								'html_name' => str_replace(
+									'state',
+									'nsmf_add_new_state',
+									$input->html_name()
+								),
+								'html_id'   => str_replace(
+									'state',
+									'nsmf_add_new_state',
+									$input->html_id()
+								),
+								'default'   => 0,
+							)
+						),
+						// add link for displaying hidden container
+						'click_here_link'             => new EE_Form_Section_HTML(
+							apply_filters(
+								'FHEE__EED_Add_New_State__display_add_new_state_micro_form__click_here_link',
+								EEH_HTML::link(
+									'',
+									esc_html__('click here to add a new state/province', 'event_espresso'),
+									'',
+									'display-' . $input->html_id(),
+									'ee-form-add-new-state-lnk display-the-hidden smaller-text hide-if-no-js',
+									'',
+									'data-target="' . $input->html_id() . '"'
+								)
+							)
+						),
+						// add initial html for hidden container
+						'add_new_state_micro_form'    => new EE_Form_Section_HTML(
+							apply_filters(
+								'FHEE__EED_Add_New_State__display_add_new_state_micro_form__add_new_state_micro_form',
+								EEH_HTML::div(
+									'',
+									$input->html_id() . '-dv',
+									'ee-form-add-new-state-dv',
+									'display: none;'
+								) .
+								EEH_HTML::h6(
+									esc_html__(
+										'Is your state/province missing from the dropdown menu above? You can add it by completing the following steps:',
+										'event_espresso'
+									)
+								) .
+								EEH_HTML::ul() .
+								EEH_HTML::li(
+									esc_html__(
+										'first select the Country that your State/Province belongs to',
+										'event_espresso'
+									)
+								) .
+								EEH_HTML::li(
+									esc_html__('enter the name of your State/Province', 'event_espresso')
+								) .
+								EEH_HTML::li(
+									esc_html__(
+										'enter a two to six letter abbreviation for the name of your State/Province',
+										'event_espresso'
+									)
+								) .
+								EEH_HTML::li(esc_html__('click the ADD button', 'event_espresso')) .
+								EEH_HTML::ulx()
+							)
+						),
+						// NEW STATE COUNTRY
+						'new_state_country'           => new EE_Country_Select_Input(
+							$country_options,
+							array(
+								'html_name'       => $country_name,
+								'html_id'         => str_replace(
+									'state',
+									'nsmf_new_state_country',
+									$input->html_id()
+								),
+								'html_class'      => $input->html_class() . ' new-state-country',
+								'html_label_text' => esc_html__('New State/Province Country', 'event_espresso'),
+								'default'         => EE_Registry::instance()->REQ->get($country_name, ''),
+								'required'        => false,
+							)
+						),
+						// NEW STATE NAME
+						'new_state_name'              => new EE_Text_Input(
+							array(
+								'html_name'       => $state_name,
+								'html_id'         => str_replace(
+									'state',
+									'nsmf_new_state_name',
+									$input->html_id()
+								),
+								'html_class'      => $input->html_class() . ' new-state-state',
+								'html_label_text' => esc_html__(
+									'New State/Province Name',
+									'event_espresso'
+								),
+								'default'         => EE_Registry::instance()->REQ->get($state_name, ''),
+								'required'        => false,
+							)
+						),
+						'spacer'                      => new EE_Form_Section_HTML(EEH_HTML::br()),
+						// NEW STATE NAME
+						'new_state_abbrv'             => new EE_Text_Input(
+							array(
+								'html_name'             => $abbrv_name,
+								'html_id'               => str_replace(
+									'state',
+									'nsmf_new_state_abbrv',
+									$input->html_id()
+								),
+								'html_class'            => $input->html_class() . ' new-state-abbrv',
+								'html_label_text'       => esc_html__(
+									'New State/Province Abbreviation',
+									'event_espresso'
+								) . ' *',
+								'other_html_attributes' => 'size="24"',
+								'default'               => EE_Registry::instance()->REQ->get($abbrv_name, ''),
+								'required'              => false,
+							)
+						),
+						// "submit" button
+						'add_new_state_submit_button' => new EE_Form_Section_HTML(
+							apply_filters(
+								'FHEE__EED_Add_New_State__display_add_new_state_micro_form__add_new_state_submit_button',
+								EEH_HTML::nbsp(3) .
+								EEH_HTML::link(
+									'',
+									esc_html__('ADD', 'event_espresso'),
+									'',
+									'submit-' . $new_state_submit_id,
+									'ee-form-add-new-state-submit button button-secondary',
+									'',
+									'data-target="' . $new_state_submit_id . '" data-value-field-name="' . $input->valueFieldName(). '"'
+								)
+							)
+						),
+						// extra info
+						'add_new_state_extra'         => new EE_Form_Section_HTML(
+							apply_filters(
+								'FHEE__EED_Add_New_State__display_add_new_state_micro_form__add_new_state_extra',
+								EEH_HTML::br(2)
+								.
+								EEH_HTML::div('', '', 'small-text')
+								.
+								EEH_HTML::strong(
+									'* ' .
+									esc_html__(
+										'Don\'t know your State/Province Abbreviation?',
+										'event_espresso'
+									)
+								)
+								.
+								EEH_HTML::br()
+								.
+								sprintf(
+									esc_html__(
+										'You can look here: %s, for a list of Countries and links to their State/Province Abbreviations ("Subdivisions assigned codes" column).',
+										'event_espresso'
+									),
+									EEH_HTML::link(
+										'http://en.wikipedia.org/wiki/ISO_3166-2',
+										'http://en.wikipedia.org/wiki/ISO_3166-2',
+										'',
+										'',
+										'ee-form-add-new-state-wiki-lnk',
+										'',
+										'target="_blank"'
+									)
+								)
+								.
+								EEH_HTML::divx()
+								.
+								EEH_HTML::br()
+								.
+								EEH_HTML::link(
+									'',
+									esc_html__('cancel new State/Province', 'event_espresso'),
+									'',
+									'hide-' . $input->html_id(),
+									'ee-form-cancel-new-state-lnk smaller-text',
+									'',
+									'data-target="' . $input->html_id() . '"'
+								)
+								.
+								EEH_HTML::divx()
+								.
+								EEH_HTML::br()
+							)
+						),
+					),
+				)
+			);
+			$question_group_reg_form->add_subsections(
+				array('new_state_micro_form' => $new_state_micro_form),
+				'state',
+				false
+			);
+		}
+		return $question_group_reg_form;
+	}
+
+
+	/**
+	 * set_new_state_input_width
+	 *
+	 * @return int|string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public static function add_new_state()
+	{
+		$REQ = EE_Registry::instance()->load_core('Request_Handler');
+		if (absint($REQ->get('nsmf_add_new_state')) === 1) {
+			EE_Registry::instance()->load_model('State');
+			// grab country ISO code, new state name, and new state abbreviation
+			$state_country = $REQ->is_set('nsmf_new_state_country')
+				? sanitize_text_field($REQ->get('nsmf_new_state_country'))
+				: false;
+			$state_name = $REQ->is_set('nsmf_new_state_name')
+				? sanitize_text_field($REQ->get('nsmf_new_state_name'))
+				: false;
+			$state_abbr = $REQ->is_set('nsmf_new_state_abbrv')
+				? sanitize_text_field($REQ->get('nsmf_new_state_abbrv'))
+				: false;
+			if ($state_country && $state_name && $state_abbr) {
+				$new_state = EED_Add_New_State::save_new_state_to_db(
+					array(
+						'CNT_ISO'    => strtoupper($state_country),
+						'STA_abbrev' => strtoupper($state_abbr),
+						'STA_name'   => ucwords($state_name),
+						'STA_active' => false,
+					)
+				);
+				if ($new_state instanceof EE_State) {
+					// clean house
+					EE_Registry::instance()->REQ->un_set('nsmf_add_new_state');
+					EE_Registry::instance()->REQ->un_set('nsmf_new_state_country');
+					EE_Registry::instance()->REQ->un_set('nsmf_new_state_name');
+					EE_Registry::instance()->REQ->un_set('nsmf_new_state_abbrv');
+					// get any existing new states
+					$new_states = EE_Registry::instance()->SSN->get_session_data(
+						'nsmf_new_states'
+					);
+					$new_states[ $new_state->ID() ] = $new_state;
+					EE_Registry::instance()->SSN->set_session_data(
+						array('nsmf_new_states' => $new_states)
+					);
+					if (EE_Registry::instance()->REQ->ajax) {
+						echo wp_json_encode(
+							array(
+								'success'      => true,
+								'id'           => $new_state->ID(),
+								'name'         => $new_state->name(),
+								'abbrev'       => $new_state->abbrev(),
+								'country_iso'  => $new_state->country_iso(),
+								'country_name' => $new_state->country()->name(),
+							)
+						);
+						exit();
+					}
+					return $new_state->ID();
+				}
+			} else {
+				$error = esc_html__(
+					'A new State/Province could not be added because invalid or missing data was received.',
+					'event_espresso'
+				);
+				if (EE_Registry::instance()->REQ->ajax) {
+					echo wp_json_encode(array('error' => $error));
+					exit();
+				}
+				EE_Error::add_error($error, __FILE__, __FUNCTION__, __LINE__);
+			}
+		}
+		return false;
+	}
+
+
+	/**
+	 * recursively drills down through request params to remove any that were added by this module
+	 *
+	 * @param array $request_params
+	 * @return array
+	 */
+	public static function filter_checkout_request_params($request_params)
+	{
+		foreach ($request_params as $form_section) {
+			if (is_array($form_section)) {
+				EED_Add_New_State::unset_new_state_request_params($form_section);
+				EED_Add_New_State::filter_checkout_request_params($form_section);
+			}
+		}
+		return $request_params;
+	}
+
+
+	/**
+	 * @param array $request_params
+	 * @return array
+	 */
+	public static function unset_new_state_request_params($request_params)
+	{
+		unset(
+			$request_params['new_state_micro_form'],
+			$request_params['new_state_micro_add_new_state'],
+			$request_params['new_state_micro_new_state_country'],
+			$request_params['new_state_micro_new_state_name'],
+			$request_params['new_state_micro_new_state_abbrv']
+		);
+		return $request_params;
+	}
+
+
+	/**
+	 * @param array $props_n_values
+	 * @return bool
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function save_new_state_to_db($props_n_values = array())
+	{
+		$existing_state = EEM_State::instance()->get_all(array($props_n_values, 'limit' => 1));
+		if (! empty($existing_state)) {
+			return array_pop($existing_state);
+		}
+		$new_state = EE_State::new_instance($props_n_values);
+		if ($new_state instanceof EE_State) {
+			$country_settings_url = add_query_arg(
+				array(
+					'page'    => 'espresso_general_settings',
+					'action'  => 'country_settings',
+					'country' => $new_state->country_iso(),
+				),
+				admin_url('admin.php')
+			);
+			// if not non-ajax admin
+			new PersistentAdminNotice(
+				'new-state-added-' . $new_state->country_iso() . '-' . $new_state->abbrev(),
+				sprintf(
+					esc_html__(
+						'A new State named "%1$s (%2$s)" was dynamically added from an Event Espresso form for the Country of "%3$s".%5$sTo verify, edit, and/or delete this new State, please go to the %4$s and update the States / Provinces section.%5$sCheck "Yes" to have this new State added to dropdown select lists in forms.',
+						'event_espresso'
+					),
+					'<b>' . $new_state->name() . '</b>',
+					'<b>' . $new_state->abbrev() . '</b>',
+					'<b>' . $new_state->country()->name() . '</b>',
+					'<a href="'
+					. $country_settings_url
+					. '">'
+					. esc_html__(
+						'Event Espresso - General Settings > Countries Tab',
+						'event_espresso'
+					)
+					. '</a>',
+					'<br />'
+				)
+			);
+			$new_state->save();
+			EEM_State::instance()->reset_cached_states();
+			return $new_state;
+		}
+		return false;
+	}
+
+
+	/**
+	 * @param string $CNT_ISO
+	 * @param string $STA_ID
+	 * @param array  $cols_n_values
+	 * @return void
+	 * @throws DomainException
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function update_country_settings($CNT_ISO = '', $STA_ID = '', $cols_n_values = array())
+	{
+		if (! $CNT_ISO) {
+			EE_Error::add_error(
+				esc_html__('An invalid or missing Country ISO Code was received.', 'event_espresso'),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+		}
+		$STA_abbrev = is_array($cols_n_values) && isset($cols_n_values['STA_abbrev']) ? $cols_n_values['STA_abbrev']
+			: false;
+		if (! $STA_abbrev && ! empty($STA_ID)) {
+			$state = EEM_State::instance()->get_one_by_ID($STA_ID);
+			if ($state instanceof EE_State) {
+				$STA_abbrev = $state->abbrev();
+			}
+		}
+		if (! $STA_abbrev) {
+			EE_Error::add_error(
+				esc_html__('An invalid or missing State Abbreviation was received.', 'event_espresso'),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+		}
+		/** @var PersistentAdminNoticeManager $persistent_admin_notice_manager */
+		$persistent_admin_notice_manager = LoaderFactory::getLoader()->getShared(
+			'EventEspresso\core\services\notifications\PersistentAdminNoticeManager'
+		);
+		$persistent_admin_notice_manager->dismissNotice($CNT_ISO . '-' . $STA_abbrev, true, true);
+	}
+
+
+	/**
+	 * @param EE_State[]                            $state_options
+	 * @param EE_SPCO_Reg_Step_Attendee_Information $reg_step
+	 * @param EE_Registration                       $registration
+	 * @param EE_Question                           $question
+	 * @param                                       $answer
+	 * @return array
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function inject_new_reg_state_into_options(
+		$state_options = array(),
+		EE_SPCO_Reg_Step_Attendee_Information $reg_step,
+		EE_Registration $registration,
+		EE_Question $question,
+		$answer
+	) {
+		if ($answer instanceof EE_Answer && $question instanceof EE_Question
+			&& $question->type() === EEM_Question::QST_type_state
+		) {
+			$STA_ID = $answer->value();
+			if (! empty($STA_ID)) {
+				$state = EEM_State::instance()->get_one_by_ID($STA_ID);
+				if ($state instanceof EE_State) {
+					$country = $state->country();
+					if ($country instanceof EE_Country) {
+						if (! isset($state_options[ $country->name() ])) {
+							$state_options[ $country->name() ] = array();
+						}
+						if (! isset($state_options[ $country->name() ][ $STA_ID ])) {
+							$state_options[ $country->name() ][ $STA_ID ] = $state->name();
+						}
+					}
+				}
+			}
+		}
+		return $state_options;
+	}
+
+
+	/**
+	 * @param EE_Country[]                          $country_options
+	 * @param EE_SPCO_Reg_Step_Attendee_Information $reg_step
+	 * @param EE_Registration                       $registration
+	 * @param EE_Question                           $question
+	 * @param                                       $answer
+	 * @return array
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function inject_new_reg_country_into_options(
+		$country_options = array(),
+		EE_SPCO_Reg_Step_Attendee_Information $reg_step,
+		EE_Registration $registration,
+		EE_Question $question,
+		$answer
+	) {
+		if ($answer instanceof EE_Answer && $question instanceof EE_Question
+			&& $question->type()
+			   === EEM_Question::QST_type_country
+		) {
+			$CNT_ISO = $answer->value();
+			if (! empty($CNT_ISO)) {
+				$country = EEM_Country::instance()->get_one_by_ID($CNT_ISO);
+				if ($country instanceof EE_Country) {
+					if (! isset($country_options[ $CNT_ISO ])) {
+						$country_options[ $CNT_ISO ] = $country->name();
+					}
+				}
+			}
+		}
+		return $country_options;
+	}
+
+
+	/**
+	 * @param EE_State[] $state_options
+	 * @return array
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function state_options($state_options = array())
+	{
+		$new_states = EED_Add_New_State::_get_new_states();
+		foreach ($new_states as $new_state) {
+			if ($new_state instanceof EE_State
+				&& $new_state->country() instanceof EE_Country
+			) {
+				$state_options[ $new_state->country()->name() ][ $new_state->ID() ] = $new_state->name();
+			}
+		}
+		return $state_options;
+	}
+
+
+	/**
+	 * @return array
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	protected static function _get_new_states()
+	{
+		$new_states = array();
+		if (EE_Registry::instance()->SSN instanceof EE_Session) {
+			$new_states = EE_Registry::instance()->SSN->get_session_data(
+				'nsmf_new_states'
+			);
+		}
+		return is_array($new_states) ? $new_states : array();
+	}
+
+
+	/**
+	 * @param EE_Country[] $country_options
+	 * @return array
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function country_options($country_options = array())
+	{
+		$new_states = EED_Add_New_State::_get_new_states();
+		foreach ($new_states as $new_state) {
+			if ($new_state instanceof EE_State
+				&& $new_state->country() instanceof EE_Country
+			) {
+				$country_options[ $new_state->country()->ID() ] = $new_state->country()->name();
+			}
+		}
+		return $country_options;
+	}
 }

Spacing +45 added lines, -45 removed lines

@@ -159,14 +159,14 @@ 
      */
     public static function set_definitions()
     {
-        define('ANS_ASSETS_URL', plugin_dir_url(__FILE__) . 'assets/');
+        define('ANS_ASSETS_URL', plugin_dir_url(__FILE__).'assets/');
         define(
             'ANS_TEMPLATES_PATH',
             str_replace(
                 '\\',
                 '/',
                 plugin_dir_path(__FILE__)
-            ) . 'templates/'
+            ).'templates/'
         );
     }
 
@@ -216,7 +216,7 @@ 
         if (apply_filters('EED_Single_Page_Checkout__SPCO_active', false)) {
             wp_register_script(
                 'add_new_state',
-                ANS_ASSETS_URL . 'add_new_state.js',
+                ANS_ASSETS_URL.'add_new_state.js',
                 array('espresso_core', 'single_page_checkout'),
                 EVENT_ESPRESSO_VERSION,
                 true
@@ -263,10 +263,10 @@ 
             $new_state_submit_id = str_replace('state', 'new_state', $input->html_id());
             $country_options = array();
             $countries = EEM_Country::instance()->get_all_countries();
-            if (! empty($countries)) {
+            if ( ! empty($countries)) {
                 foreach ($countries as $country) {
                     if ($country instanceof EE_Country) {
-                        $country_options[ $country->ID() ] = $country->name();
+                        $country_options[$country->ID()] = $country->name();
                     }
                 }
             }
@@ -300,10 +300,10 @@ 
                                     '',
                                     esc_html__('click here to add a new state/province', 'event_espresso'),
                                     '',
-                                    'display-' . $input->html_id(),
+                                    'display-'.$input->html_id(),
                                     'ee-form-add-new-state-lnk display-the-hidden smaller-text hide-if-no-js',
                                     '',
-                                    'data-target="' . $input->html_id() . '"'
+                                    'data-target="'.$input->html_id().'"'
                                 )
                             )
                         ),
@@ -313,33 +313,33 @@ 
                                 'FHEE__EED_Add_New_State__display_add_new_state_micro_form__add_new_state_micro_form',
                                 EEH_HTML::div(
                                     '',
-                                    $input->html_id() . '-dv',
+                                    $input->html_id().'-dv',
                                     'ee-form-add-new-state-dv',
                                     'display: none;'
-                                ) .
+                                ).
                                 EEH_HTML::h6(
                                     esc_html__(
                                         'Is your state/province missing from the dropdown menu above? You can add it by completing the following steps:',
                                         'event_espresso'
                                     )
-                                ) .
-                                EEH_HTML::ul() .
+                                ).
+                                EEH_HTML::ul().
                                 EEH_HTML::li(
                                     esc_html__(
                                         'first select the Country that your State/Province belongs to',
                                         'event_espresso'
                                     )
-                                ) .
+                                ).
                                 EEH_HTML::li(
                                     esc_html__('enter the name of your State/Province', 'event_espresso')
-                                ) .
+                                ).
                                 EEH_HTML::li(
                                     esc_html__(
                                         'enter a two to six letter abbreviation for the name of your State/Province',
                                         'event_espresso'
                                     )
-                                ) .
-                                EEH_HTML::li(esc_html__('click the ADD button', 'event_espresso')) .
+                                ).
+                                EEH_HTML::li(esc_html__('click the ADD button', 'event_espresso')).
                                 EEH_HTML::ulx()
                             )
                         ),
@@ -353,7 +353,7 @@ 
                                     'nsmf_new_state_country',
                                     $input->html_id()
                                 ),
-                                'html_class'      => $input->html_class() . ' new-state-country',
+                                'html_class'      => $input->html_class().' new-state-country',
                                 'html_label_text' => esc_html__('New State/Province Country', 'event_espresso'),
                                 'default'         => EE_Registry::instance()->REQ->get($country_name, ''),
                                 'required'        => false,
@@ -368,7 +368,7 @@ 
                                     'nsmf_new_state_name',
                                     $input->html_id()
                                 ),
-                                'html_class'      => $input->html_class() . ' new-state-state',
+                                'html_class'      => $input->html_class().' new-state-state',
                                 'html_label_text' => esc_html__(
                                     'New State/Province Name',
                                     'event_espresso'
@@ -387,11 +387,11 @@ 
                                     'nsmf_new_state_abbrv',
                                     $input->html_id()
                                 ),
-                                'html_class'            => $input->html_class() . ' new-state-abbrv',
+                                'html_class'            => $input->html_class().' new-state-abbrv',
                                 'html_label_text'       => esc_html__(
                                     'New State/Province Abbreviation',
                                     'event_espresso'
-                                ) . ' *',
+                                ).' *',
                                 'other_html_attributes' => 'size="24"',
                                 'default'               => EE_Registry::instance()->REQ->get($abbrv_name, ''),
                                 'required'              => false,
@@ -401,15 +401,15 @@ 
                         'add_new_state_submit_button' => new EE_Form_Section_HTML(
                             apply_filters(
                                 'FHEE__EED_Add_New_State__display_add_new_state_micro_form__add_new_state_submit_button',
-                                EEH_HTML::nbsp(3) .
+                                EEH_HTML::nbsp(3).
                                 EEH_HTML::link(
                                     '',
                                     esc_html__('ADD', 'event_espresso'),
                                     '',
-                                    'submit-' . $new_state_submit_id,
+                                    'submit-'.$new_state_submit_id,
                                     'ee-form-add-new-state-submit button button-secondary',
                                     '',
-                                    'data-target="' . $new_state_submit_id . '" data-value-field-name="' . $input->valueFieldName(). '"'
+                                    'data-target="'.$new_state_submit_id.'" data-value-field-name="'.$input->valueFieldName().'"'
                                 )
                             )
                         ),
@@ -422,7 +422,7 @@ 
                                 EEH_HTML::div('', '', 'small-text')
                                 .
                                 EEH_HTML::strong(
-                                    '* ' .
+                                    '* '.
                                     esc_html__(
                                         'Don\'t know your State/Province Abbreviation?',
                                         'event_espresso'
@@ -455,10 +455,10 @@ 
                                     '',
                                     esc_html__('cancel new State/Province', 'event_espresso'),
                                     '',
-                                    'hide-' . $input->html_id(),
+                                    'hide-'.$input->html_id(),
                                     'ee-form-cancel-new-state-lnk smaller-text',
                                     '',
-                                    'data-target="' . $input->html_id() . '"'
+                                    'data-target="'.$input->html_id().'"'
                                 )
                                 .
                                 EEH_HTML::divx()
@@ -523,7 +523,7 @@ 
                     $new_states = EE_Registry::instance()->SSN->get_session_data(
                         'nsmf_new_states'
                     );
-                    $new_states[ $new_state->ID() ] = $new_state;
+                    $new_states[$new_state->ID()] = $new_state;
                     EE_Registry::instance()->SSN->set_session_data(
                         array('nsmf_new_states' => $new_states)
                     );
@@ -604,7 +604,7 @@ 
     public static function save_new_state_to_db($props_n_values = array())
     {
         $existing_state = EEM_State::instance()->get_all(array($props_n_values, 'limit' => 1));
-        if (! empty($existing_state)) {
+        if ( ! empty($existing_state)) {
             return array_pop($existing_state);
         }
         $new_state = EE_State::new_instance($props_n_values);
@@ -619,15 +619,15 @@ 
             );
             // if not non-ajax admin
             new PersistentAdminNotice(
-                'new-state-added-' . $new_state->country_iso() . '-' . $new_state->abbrev(),
+                'new-state-added-'.$new_state->country_iso().'-'.$new_state->abbrev(),
                 sprintf(
                     esc_html__(
                         'A new State named "%1$s (%2$s)" was dynamically added from an Event Espresso form for the Country of "%3$s".%5$sTo verify, edit, and/or delete this new State, please go to the %4$s and update the States / Provinces section.%5$sCheck "Yes" to have this new State added to dropdown select lists in forms.',
                         'event_espresso'
                     ),
-                    '<b>' . $new_state->name() . '</b>',
-                    '<b>' . $new_state->abbrev() . '</b>',
-                    '<b>' . $new_state->country()->name() . '</b>',
+                    '<b>'.$new_state->name().'</b>',
+                    '<b>'.$new_state->abbrev().'</b>',
+                    '<b>'.$new_state->country()->name().'</b>',
                     '<a href="'
                     . $country_settings_url
                     . '">'
@@ -660,7 +660,7 @@ 
      */
     public static function update_country_settings($CNT_ISO = '', $STA_ID = '', $cols_n_values = array())
     {
-        if (! $CNT_ISO) {
+        if ( ! $CNT_ISO) {
             EE_Error::add_error(
                 esc_html__('An invalid or missing Country ISO Code was received.', 'event_espresso'),
                 __FILE__,
@@ -670,13 +670,13 @@ 
         }
         $STA_abbrev = is_array($cols_n_values) && isset($cols_n_values['STA_abbrev']) ? $cols_n_values['STA_abbrev']
             : false;
-        if (! $STA_abbrev && ! empty($STA_ID)) {
+        if ( ! $STA_abbrev && ! empty($STA_ID)) {
             $state = EEM_State::instance()->get_one_by_ID($STA_ID);
             if ($state instanceof EE_State) {
                 $STA_abbrev = $state->abbrev();
             }
         }
-        if (! $STA_abbrev) {
+        if ( ! $STA_abbrev) {
             EE_Error::add_error(
                 esc_html__('An invalid or missing State Abbreviation was received.', 'event_espresso'),
                 __FILE__,
@@ -688,7 +688,7 @@ 
         $persistent_admin_notice_manager = LoaderFactory::getLoader()->getShared(
             'EventEspresso\core\services\notifications\PersistentAdminNoticeManager'
         );
-        $persistent_admin_notice_manager->dismissNotice($CNT_ISO . '-' . $STA_abbrev, true, true);
+        $persistent_admin_notice_manager->dismissNotice($CNT_ISO.'-'.$STA_abbrev, true, true);
     }
 
 
@@ -715,16 +715,16 @@ 
             && $question->type() === EEM_Question::QST_type_state
         ) {
             $STA_ID = $answer->value();
-            if (! empty($STA_ID)) {
+            if ( ! empty($STA_ID)) {
                 $state = EEM_State::instance()->get_one_by_ID($STA_ID);
                 if ($state instanceof EE_State) {
                     $country = $state->country();
                     if ($country instanceof EE_Country) {
-                        if (! isset($state_options[ $country->name() ])) {
-                            $state_options[ $country->name() ] = array();
+                        if ( ! isset($state_options[$country->name()])) {
+                            $state_options[$country->name()] = array();
                         }
-                        if (! isset($state_options[ $country->name() ][ $STA_ID ])) {
-                            $state_options[ $country->name() ][ $STA_ID ] = $state->name();
+                        if ( ! isset($state_options[$country->name()][$STA_ID])) {
+                            $state_options[$country->name()][$STA_ID] = $state->name();
                         }
                     }
                 }
@@ -758,11 +758,11 @@ 
                === EEM_Question::QST_type_country
         ) {
             $CNT_ISO = $answer->value();
-            if (! empty($CNT_ISO)) {
+            if ( ! empty($CNT_ISO)) {
                 $country = EEM_Country::instance()->get_one_by_ID($CNT_ISO);
                 if ($country instanceof EE_Country) {
-                    if (! isset($country_options[ $CNT_ISO ])) {
-                        $country_options[ $CNT_ISO ] = $country->name();
+                    if ( ! isset($country_options[$CNT_ISO])) {
+                        $country_options[$CNT_ISO] = $country->name();
                     }
                 }
             }
@@ -786,7 +786,7 @@ 
             if ($new_state instanceof EE_State
                 && $new_state->country() instanceof EE_Country
             ) {
-                $state_options[ $new_state->country()->name() ][ $new_state->ID() ] = $new_state->name();
+                $state_options[$new_state->country()->name()][$new_state->ID()] = $new_state->name();
             }
         }
         return $state_options;
@@ -826,7 +826,7 @@ 
             if ($new_state instanceof EE_State
                 && $new_state->country() instanceof EE_Country
             ) {
-                $country_options[ $new_state->country()->ID() ] = $new_state->country()->name();
+                $country_options[$new_state->country()->ID()] = $new_state->country()->name();
             }
         }
         return $country_options;

caffeinated/admin/new/pricing/espresso_events_Pricing_Hooks.class.php

Indentation +2134 added lines, -2134 removed lines

@@ -15,2194 +15,2194 @@
 class espresso_events_Pricing_Hooks extends EE_Admin_Hooks
 {
 
-    /**
-     * This property is just used to hold the status of whether an event is currently being
-     * created (true) or edited (false)
-     *
-     * @access protected
-     * @var bool
-     */
-    protected $_is_creating_event;
+	/**
+	 * This property is just used to hold the status of whether an event is currently being
+	 * created (true) or edited (false)
+	 *
+	 * @access protected
+	 * @var bool
+	 */
+	protected $_is_creating_event;
 
-    /**
-     * Used to contain the format strings for date and time that will be used for php date and
-     * time.
-     * Is set in the _set_hooks_properties() method.
-     *
-     * @var array
-     */
-    protected $_date_format_strings;
+	/**
+	 * Used to contain the format strings for date and time that will be used for php date and
+	 * time.
+	 * Is set in the _set_hooks_properties() method.
+	 *
+	 * @var array
+	 */
+	protected $_date_format_strings;
 
-    /**
-     * @var string $_date_time_format
-     */
-    protected $_date_time_format;
+	/**
+	 * @var string $_date_time_format
+	 */
+	protected $_date_time_format;
 
 
-    /**
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     */
-    protected function _set_hooks_properties()
-    {
-        $this->_name = 'pricing';
-        // capability check
-        if (! EE_Registry::instance()->CAP->current_user_can(
-            'ee_read_default_prices',
-            'advanced_ticket_datetime_metabox'
-        )) {
-            return;
-        }
-        $this->_setup_metaboxes();
-        $this->_set_date_time_formats();
-        $this->_validate_format_strings();
-        $this->_set_scripts_styles();
-        // commented out temporarily until logic is implemented in callback
-        // add_action(
-        //     'AHEE__EE_Admin_Page_CPT__do_extra_autosave_stuff__after_Extend_Events_Admin_Page',
-        //     array($this, 'autosave_handling')
-        // );
-        add_filter(
-            'FHEE__Events_Admin_Page___insert_update_cpt_item__event_update_callbacks',
-            array($this, 'caf_updates')
-        );
-    }
+	/**
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 */
+	protected function _set_hooks_properties()
+	{
+		$this->_name = 'pricing';
+		// capability check
+		if (! EE_Registry::instance()->CAP->current_user_can(
+			'ee_read_default_prices',
+			'advanced_ticket_datetime_metabox'
+		)) {
+			return;
+		}
+		$this->_setup_metaboxes();
+		$this->_set_date_time_formats();
+		$this->_validate_format_strings();
+		$this->_set_scripts_styles();
+		// commented out temporarily until logic is implemented in callback
+		// add_action(
+		//     'AHEE__EE_Admin_Page_CPT__do_extra_autosave_stuff__after_Extend_Events_Admin_Page',
+		//     array($this, 'autosave_handling')
+		// );
+		add_filter(
+			'FHEE__Events_Admin_Page___insert_update_cpt_item__event_update_callbacks',
+			array($this, 'caf_updates')
+		);
+	}
 
 
-    /**
-     * @return void
-     */
-    protected function _setup_metaboxes()
-    {
-        // if we were going to add our own metaboxes we'd use the below.
-        $this->_metaboxes = array(
-            0 => array(
-                'page_route' => array('edit', 'create_new'),
-                'func'       => 'pricing_metabox',
-                'label'      => esc_html__('Event Tickets & Datetimes', 'event_espresso'),
-                'priority'   => 'high',
-                'context'    => 'normal',
-            ),
-        );
-        $this->_remove_metaboxes = array(
-            0 => array(
-                'page_route' => array('edit', 'create_new'),
-                'id'         => 'espresso_event_editor_tickets',
-                'context'    => 'normal',
-            ),
-        );
-    }
+	/**
+	 * @return void
+	 */
+	protected function _setup_metaboxes()
+	{
+		// if we were going to add our own metaboxes we'd use the below.
+		$this->_metaboxes = array(
+			0 => array(
+				'page_route' => array('edit', 'create_new'),
+				'func'       => 'pricing_metabox',
+				'label'      => esc_html__('Event Tickets & Datetimes', 'event_espresso'),
+				'priority'   => 'high',
+				'context'    => 'normal',
+			),
+		);
+		$this->_remove_metaboxes = array(
+			0 => array(
+				'page_route' => array('edit', 'create_new'),
+				'id'         => 'espresso_event_editor_tickets',
+				'context'    => 'normal',
+			),
+		);
+	}
 
 
-    /**
-     * @return void
-     */
-    protected function _set_date_time_formats()
-    {
-        /**
-         * Format strings for date and time.  Defaults are existing behaviour from 4.1.
-         * Note, that if you return null as the value for 'date', and 'time' in the array, then
-         * EE will automatically use the set wp_options, 'date_format', and 'time_format'.
-         *
-         * @since 4.6.7
-         * @var array  Expected an array returned with 'date' and 'time' keys.
-         */
-        $this->_date_format_strings = apply_filters(
-            'FHEE__espresso_events_Pricing_Hooks___set_hooks_properties__date_format_strings',
-            array(
-                'date' => 'Y-m-d',
-                'time' => 'h:i a',
-            )
-        );
-        // validate
-        $this->_date_format_strings['date'] = isset($this->_date_format_strings['date'])
-            ? $this->_date_format_strings['date']
-            : null;
-        $this->_date_format_strings['time'] = isset($this->_date_format_strings['time'])
-            ? $this->_date_format_strings['time']
-            : null;
-        $this->_date_time_format = $this->_date_format_strings['date']
-                                   . ' '
-                                   . $this->_date_format_strings['time'];
-    }
+	/**
+	 * @return void
+	 */
+	protected function _set_date_time_formats()
+	{
+		/**
+		 * Format strings for date and time.  Defaults are existing behaviour from 4.1.
+		 * Note, that if you return null as the value for 'date', and 'time' in the array, then
+		 * EE will automatically use the set wp_options, 'date_format', and 'time_format'.
+		 *
+		 * @since 4.6.7
+		 * @var array  Expected an array returned with 'date' and 'time' keys.
+		 */
+		$this->_date_format_strings = apply_filters(
+			'FHEE__espresso_events_Pricing_Hooks___set_hooks_properties__date_format_strings',
+			array(
+				'date' => 'Y-m-d',
+				'time' => 'h:i a',
+			)
+		);
+		// validate
+		$this->_date_format_strings['date'] = isset($this->_date_format_strings['date'])
+			? $this->_date_format_strings['date']
+			: null;
+		$this->_date_format_strings['time'] = isset($this->_date_format_strings['time'])
+			? $this->_date_format_strings['time']
+			: null;
+		$this->_date_time_format = $this->_date_format_strings['date']
+								   . ' '
+								   . $this->_date_format_strings['time'];
+	}
 
 
-    /**
-     * @return void
-     */
-    protected function _validate_format_strings()
-    {
-        // validate format strings
-        $format_validation = EEH_DTT_Helper::validate_format_string(
-            $this->_date_time_format
-        );
-        if (is_array($format_validation)) {
-            $msg = '<p>';
-            $msg .= sprintf(
-                esc_html__(
-                    'The format "%s" was likely added via a filter and is invalid for the following reasons:',
-                    'event_espresso'
-                ),
-                $this->_date_time_format
-            );
-            $msg .= '</p><ul>';
-            foreach ($format_validation as $error) {
-                $msg .= '<li>' . $error . '</li>';
-            }
-            $msg .= '</ul><p>';
-            $msg .= sprintf(
-                esc_html__(
-                    '%sPlease note that your date and time formats have been reset to "Y-m-d" and "h:i a" respectively.%s',
-                    'event_espresso'
-                ),
-                '<span style="color:#D54E21;">',
-                '</span>'
-            );
-            $msg .= '</p>';
-            EE_Error::add_attention($msg, __FILE__, __FUNCTION__, __LINE__);
-            $this->_date_format_strings = array(
-                'date' => 'Y-m-d',
-                'time' => 'h:i a',
-            );
-        }
-    }
+	/**
+	 * @return void
+	 */
+	protected function _validate_format_strings()
+	{
+		// validate format strings
+		$format_validation = EEH_DTT_Helper::validate_format_string(
+			$this->_date_time_format
+		);
+		if (is_array($format_validation)) {
+			$msg = '<p>';
+			$msg .= sprintf(
+				esc_html__(
+					'The format "%s" was likely added via a filter and is invalid for the following reasons:',
+					'event_espresso'
+				),
+				$this->_date_time_format
+			);
+			$msg .= '</p><ul>';
+			foreach ($format_validation as $error) {
+				$msg .= '<li>' . $error . '</li>';
+			}
+			$msg .= '</ul><p>';
+			$msg .= sprintf(
+				esc_html__(
+					'%sPlease note that your date and time formats have been reset to "Y-m-d" and "h:i a" respectively.%s',
+					'event_espresso'
+				),
+				'<span style="color:#D54E21;">',
+				'</span>'
+			);
+			$msg .= '</p>';
+			EE_Error::add_attention($msg, __FILE__, __FUNCTION__, __LINE__);
+			$this->_date_format_strings = array(
+				'date' => 'Y-m-d',
+				'time' => 'h:i a',
+			);
+		}
+	}
 
 
-    /**
-     * @return void
-     */
-    protected function _set_scripts_styles()
-    {
-        $this->_scripts_styles = array(
-            'registers'   => array(
-                'ee-tickets-datetimes-css' => array(
-                    'url'  => PRICING_ASSETS_URL . 'event-tickets-datetimes.css',
-                    'type' => 'css',
-                ),
-                'ee-dtt-ticket-metabox'    => array(
-                    'url'     => PRICING_ASSETS_URL . 'ee-datetime-ticket-metabox.js',
-                    'depends' => array('ee-datepicker', 'ee-dialog', 'underscore'),
-                ),
-            ),
-            'deregisters' => array(
-                'event-editor-css'       => array('type' => 'css'),
-                'event-datetime-metabox' => array('type' => 'js'),
-            ),
-            'enqueues'    => array(
-                'ee-tickets-datetimes-css' => array('edit', 'create_new'),
-                'ee-dtt-ticket-metabox'    => array('edit', 'create_new'),
-            ),
-            'localize'    => array(
-                'ee-dtt-ticket-metabox' => array(
-                    'DTT_TRASH_BLOCK'       => array(
-                        'main_warning'            => esc_html__(
-                            'The Datetime you are attempting to trash is the only datetime selected for the following ticket(s):',
-                            'event_espresso'
-                        ),
-                        'after_warning'           => esc_html__(
-                            'In order to trash this datetime you must first make sure the above ticket(s) are assigned to other datetimes.',
-                            'event_espresso'
-                        ),
-                        'cancel_button'           => '<button class="button-secondary ee-modal-cancel">'
-                                                     . esc_html__('Cancel', 'event_espresso') . '</button>',
-                        'close_button'            => '<button class="button-secondary ee-modal-cancel">'
-                                                     . esc_html__('Close', 'event_espresso') . '</button>',
-                        'single_warning_from_tkt' => esc_html__(
-                            'The Datetime you are attempting to unassign from this ticket is the only remaining datetime for this ticket. Tickets must always have at least one datetime assigned to them.',
-                            'event_espresso'
-                        ),
-                        'single_warning_from_dtt' => esc_html__(
-                            'The ticket you are attempting to unassign from this datetime cannot be unassigned because the datetime is the only remaining datetime for the ticket.  Tickets must always have at least one datetime assigned to them.',
-                            'event_espresso'
-                        ),
-                        'dismiss_button'          => '<button class="button-secondary ee-modal-cancel">'
-                                                     . esc_html__('Dismiss', 'event_espresso') . '</button>',
-                    ),
-                    'DTT_ERROR_MSG'         => array(
-                        'no_ticket_name' => esc_html__('General Admission', 'event_espresso'),
-                        'dismiss_button' => '<div class="save-cancel-button-container">'
-                                            . '<button class="button-secondary ee-modal-cancel">'
-                                            . esc_html__('Dismiss', 'event_espresso')
-                                            . '</button></div>',
-                    ),
-                    'DTT_OVERSELL_WARNING'  => array(
-                        'datetime_ticket' => esc_html__(
-                            'You cannot add this ticket to this datetime because it has a sold amount that is greater than the amount of spots remaining for this datetime.',
-                            'event_espresso'
-                        ),
-                        'ticket_datetime' => esc_html__(
-                            'You cannot add this datetime to this ticket because the ticket has a sold amount that is greater than the amount of spots remaining on the datetime.',
-                            'event_espresso'
-                        ),
-                    ),
-                    'DTT_CONVERTED_FORMATS' => EEH_DTT_Helper::convert_php_to_js_and_moment_date_formats(
-                        $this->_date_format_strings['date'],
-                        $this->_date_format_strings['time']
-                    ),
-                    'DTT_START_OF_WEEK'     => array('dayValue' => (int) get_option('start_of_week')),
-                ),
-            ),
-        );
-    }
+	/**
+	 * @return void
+	 */
+	protected function _set_scripts_styles()
+	{
+		$this->_scripts_styles = array(
+			'registers'   => array(
+				'ee-tickets-datetimes-css' => array(
+					'url'  => PRICING_ASSETS_URL . 'event-tickets-datetimes.css',
+					'type' => 'css',
+				),
+				'ee-dtt-ticket-metabox'    => array(
+					'url'     => PRICING_ASSETS_URL . 'ee-datetime-ticket-metabox.js',
+					'depends' => array('ee-datepicker', 'ee-dialog', 'underscore'),
+				),
+			),
+			'deregisters' => array(
+				'event-editor-css'       => array('type' => 'css'),
+				'event-datetime-metabox' => array('type' => 'js'),
+			),
+			'enqueues'    => array(
+				'ee-tickets-datetimes-css' => array('edit', 'create_new'),
+				'ee-dtt-ticket-metabox'    => array('edit', 'create_new'),
+			),
+			'localize'    => array(
+				'ee-dtt-ticket-metabox' => array(
+					'DTT_TRASH_BLOCK'       => array(
+						'main_warning'            => esc_html__(
+							'The Datetime you are attempting to trash is the only datetime selected for the following ticket(s):',
+							'event_espresso'
+						),
+						'after_warning'           => esc_html__(
+							'In order to trash this datetime you must first make sure the above ticket(s) are assigned to other datetimes.',
+							'event_espresso'
+						),
+						'cancel_button'           => '<button class="button-secondary ee-modal-cancel">'
+													 . esc_html__('Cancel', 'event_espresso') . '</button>',
+						'close_button'            => '<button class="button-secondary ee-modal-cancel">'
+													 . esc_html__('Close', 'event_espresso') . '</button>',
+						'single_warning_from_tkt' => esc_html__(
+							'The Datetime you are attempting to unassign from this ticket is the only remaining datetime for this ticket. Tickets must always have at least one datetime assigned to them.',
+							'event_espresso'
+						),
+						'single_warning_from_dtt' => esc_html__(
+							'The ticket you are attempting to unassign from this datetime cannot be unassigned because the datetime is the only remaining datetime for the ticket.  Tickets must always have at least one datetime assigned to them.',
+							'event_espresso'
+						),
+						'dismiss_button'          => '<button class="button-secondary ee-modal-cancel">'
+													 . esc_html__('Dismiss', 'event_espresso') . '</button>',
+					),
+					'DTT_ERROR_MSG'         => array(
+						'no_ticket_name' => esc_html__('General Admission', 'event_espresso'),
+						'dismiss_button' => '<div class="save-cancel-button-container">'
+											. '<button class="button-secondary ee-modal-cancel">'
+											. esc_html__('Dismiss', 'event_espresso')
+											. '</button></div>',
+					),
+					'DTT_OVERSELL_WARNING'  => array(
+						'datetime_ticket' => esc_html__(
+							'You cannot add this ticket to this datetime because it has a sold amount that is greater than the amount of spots remaining for this datetime.',
+							'event_espresso'
+						),
+						'ticket_datetime' => esc_html__(
+							'You cannot add this datetime to this ticket because the ticket has a sold amount that is greater than the amount of spots remaining on the datetime.',
+							'event_espresso'
+						),
+					),
+					'DTT_CONVERTED_FORMATS' => EEH_DTT_Helper::convert_php_to_js_and_moment_date_formats(
+						$this->_date_format_strings['date'],
+						$this->_date_format_strings['time']
+					),
+					'DTT_START_OF_WEEK'     => array('dayValue' => (int) get_option('start_of_week')),
+				),
+			),
+		);
+	}
 
 
-    /**
-     * @param array $update_callbacks
-     * @return array
-     */
-    public function caf_updates(array $update_callbacks)
-    {
-        foreach ($update_callbacks as $key => $callback) {
-            if ($callback[1] === '_default_tickets_update') {
-                unset($update_callbacks[ $key ]);
-            }
-        }
-        $update_callbacks[] = array($this, 'datetime_and_tickets_caf_update');
-        return $update_callbacks;
-    }
+	/**
+	 * @param array $update_callbacks
+	 * @return array
+	 */
+	public function caf_updates(array $update_callbacks)
+	{
+		foreach ($update_callbacks as $key => $callback) {
+			if ($callback[1] === '_default_tickets_update') {
+				unset($update_callbacks[ $key ]);
+			}
+		}
+		$update_callbacks[] = array($this, 'datetime_and_tickets_caf_update');
+		return $update_callbacks;
+	}
 
 
-    /**
-     * Handles saving everything related to Tickets (datetimes, tickets, prices)
-     *
-     * @param  EE_Event $event The Event object we're attaching data to
-     * @param  array    $data  The request data from the form
-     * @throws ReflectionException
-     * @throws Exception
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     */
-    public function datetime_and_tickets_caf_update($event, $data)
-    {
-        // first we need to start with datetimes cause they are the "root" items attached to events.
-        $saved_datetimes = $this->_update_datetimes($event, $data);
-        // next tackle the tickets (and prices?)
-        $this->_update_tickets($event, $saved_datetimes, $data);
-    }
+	/**
+	 * Handles saving everything related to Tickets (datetimes, tickets, prices)
+	 *
+	 * @param  EE_Event $event The Event object we're attaching data to
+	 * @param  array    $data  The request data from the form
+	 * @throws ReflectionException
+	 * @throws Exception
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 */
+	public function datetime_and_tickets_caf_update($event, $data)
+	{
+		// first we need to start with datetimes cause they are the "root" items attached to events.
+		$saved_datetimes = $this->_update_datetimes($event, $data);
+		// next tackle the tickets (and prices?)
+		$this->_update_tickets($event, $saved_datetimes, $data);
+	}
 
 
-    /**
-     * update event_datetimes
-     *
-     * @param  EE_Event $event Event being updated
-     * @param  array    $data  the request data from the form
-     * @return EE_Datetime[]
-     * @throws Exception
-     * @throws ReflectionException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     * @throws InvalidArgumentException
-     * @throws EE_Error
-     */
-    protected function _update_datetimes($event, $data)
-    {
-        $timezone = isset($data['timezone_string']) ? $data['timezone_string'] : null;
-        $saved_dtt_ids = array();
-        $saved_dtt_objs = array();
-        if (empty($data['edit_event_datetimes']) || ! is_array($data['edit_event_datetimes'])) {
-            throw new InvalidArgumentException(
-                esc_html__(
-                    'The "edit_event_datetimes" array is invalid therefore the event can not be updated.',
-                    'event_espresso'
-                )
-            );
-        }
-        foreach ($data['edit_event_datetimes'] as $row => $datetime_data) {
-            // trim all values to ensure any excess whitespace is removed.
-            $datetime_data = array_map(
-                function ($datetime_data) {
-                    return is_array($datetime_data) ? $datetime_data : trim($datetime_data);
-                },
-                $datetime_data
-            );
-            $datetime_data['DTT_EVT_end'] = isset($datetime_data['DTT_EVT_end'])
-                                            && ! empty($datetime_data['DTT_EVT_end'])
-                ? $datetime_data['DTT_EVT_end']
-                : $datetime_data['DTT_EVT_start'];
-            $datetime_values = array(
-                'DTT_ID'          => ! empty($datetime_data['DTT_ID'])
-                    ? $datetime_data['DTT_ID']
-                    : null,
-                'DTT_name'        => ! empty($datetime_data['DTT_name'])
-                    ? $datetime_data['DTT_name']
-                    : '',
-                'DTT_description' => ! empty($datetime_data['DTT_description'])
-                    ? $datetime_data['DTT_description']
-                    : '',
-                'DTT_EVT_start'   => $datetime_data['DTT_EVT_start'],
-                'DTT_EVT_end'     => $datetime_data['DTT_EVT_end'],
-                'DTT_reg_limit'   => empty($datetime_data['DTT_reg_limit'])
-                    ? EE_INF
-                    : $datetime_data['DTT_reg_limit'],
-                'DTT_order'       => ! isset($datetime_data['DTT_order'])
-                    ? $row
-                    : $datetime_data['DTT_order'],
-            );
-            // if we have an id then let's get existing object first and then set the new values.
-            // Otherwise we instantiate a new object for save.
-            if (! empty($datetime_data['DTT_ID'])) {
-                $datetime = EE_Registry::instance()
-                                       ->load_model('Datetime', array($timezone))
-                                       ->get_one_by_ID($datetime_data['DTT_ID']);
-                // set date and time format according to what is set in this class.
-                $datetime->set_date_format($this->_date_format_strings['date']);
-                $datetime->set_time_format($this->_date_format_strings['time']);
-                foreach ($datetime_values as $field => $value) {
-                    $datetime->set($field, $value);
-                }
-                // make sure the $dtt_id here is saved just in case
-                // after the add_relation_to() the autosave replaces it.
-                // We need to do this so we dont' TRASH the parent DTT.
-                // (save the ID for both key and value to avoid duplications)
-                $saved_dtt_ids[ $datetime->ID() ] = $datetime->ID();
-            } else {
-                $datetime = EE_Registry::instance()->load_class(
-                    'Datetime',
-                    array(
-                        $datetime_values,
-                        $timezone,
-                        array($this->_date_format_strings['date'], $this->_date_format_strings['time']),
-                    ),
-                    false,
-                    false
-                );
-                foreach ($datetime_values as $field => $value) {
-                    $datetime->set($field, $value);
-                }
-            }
-            $datetime->save();
-            $datetime = $event->_add_relation_to($datetime, 'Datetime');
-            // before going any further make sure our dates are setup correctly
-            // so that the end date is always equal or greater than the start date.
-            if ($datetime->get_raw('DTT_EVT_start') > $datetime->get_raw('DTT_EVT_end')) {
-                $datetime->set('DTT_EVT_end', $datetime->get('DTT_EVT_start'));
-                $datetime = EEH_DTT_Helper::date_time_add($datetime, 'DTT_EVT_end', 'days');
-                $datetime->save();
-            }
-            // now we have to make sure we add the new DTT_ID to the $saved_dtt_ids array
-            // because it is possible there was a new one created for the autosave.
-            // (save the ID for both key and value to avoid duplications)
-            $DTT_ID = $datetime->ID();
-            $saved_dtt_ids[ $DTT_ID ] = $DTT_ID;
-            $saved_dtt_objs[ $row ] = $datetime;
-            // @todo if ANY of these updates fail then we want the appropriate global error message.
-        }
-        $event->save();
-        // now we need to REMOVE any datetimes that got deleted.
-        // Keep in mind that this process will only kick in for datetimes that don't have any DTT_sold on them.
-        // So its safe to permanently delete at this point.
-        $old_datetimes = explode(',', $data['datetime_IDs']);
-        $old_datetimes = $old_datetimes[0] === '' ? array() : $old_datetimes;
-        if (is_array($old_datetimes)) {
-            $datetimes_to_delete = array_diff($old_datetimes, $saved_dtt_ids);
-            foreach ($datetimes_to_delete as $id) {
-                $id = absint($id);
-                if (empty($id)) {
-                    continue;
-                }
-                $dtt_to_remove = EE_Registry::instance()->load_model('Datetime')->get_one_by_ID($id);
-                // remove tkt relationships.
-                $related_tickets = $dtt_to_remove->get_many_related('Ticket');
-                foreach ($related_tickets as $tkt) {
-                    $dtt_to_remove->_remove_relation_to($tkt, 'Ticket');
-                }
-                $event->_remove_relation_to($id, 'Datetime');
-                $dtt_to_remove->refresh_cache_of_related_objects();
-            }
-        }
-        return $saved_dtt_objs;
-    }
+	/**
+	 * update event_datetimes
+	 *
+	 * @param  EE_Event $event Event being updated
+	 * @param  array    $data  the request data from the form
+	 * @return EE_Datetime[]
+	 * @throws Exception
+	 * @throws ReflectionException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidArgumentException
+	 * @throws EE_Error
+	 */
+	protected function _update_datetimes($event, $data)
+	{
+		$timezone = isset($data['timezone_string']) ? $data['timezone_string'] : null;
+		$saved_dtt_ids = array();
+		$saved_dtt_objs = array();
+		if (empty($data['edit_event_datetimes']) || ! is_array($data['edit_event_datetimes'])) {
+			throw new InvalidArgumentException(
+				esc_html__(
+					'The "edit_event_datetimes" array is invalid therefore the event can not be updated.',
+					'event_espresso'
+				)
+			);
+		}
+		foreach ($data['edit_event_datetimes'] as $row => $datetime_data) {
+			// trim all values to ensure any excess whitespace is removed.
+			$datetime_data = array_map(
+				function ($datetime_data) {
+					return is_array($datetime_data) ? $datetime_data : trim($datetime_data);
+				},
+				$datetime_data
+			);
+			$datetime_data['DTT_EVT_end'] = isset($datetime_data['DTT_EVT_end'])
+											&& ! empty($datetime_data['DTT_EVT_end'])
+				? $datetime_data['DTT_EVT_end']
+				: $datetime_data['DTT_EVT_start'];
+			$datetime_values = array(
+				'DTT_ID'          => ! empty($datetime_data['DTT_ID'])
+					? $datetime_data['DTT_ID']
+					: null,
+				'DTT_name'        => ! empty($datetime_data['DTT_name'])
+					? $datetime_data['DTT_name']
+					: '',
+				'DTT_description' => ! empty($datetime_data['DTT_description'])
+					? $datetime_data['DTT_description']
+					: '',
+				'DTT_EVT_start'   => $datetime_data['DTT_EVT_start'],
+				'DTT_EVT_end'     => $datetime_data['DTT_EVT_end'],
+				'DTT_reg_limit'   => empty($datetime_data['DTT_reg_limit'])
+					? EE_INF
+					: $datetime_data['DTT_reg_limit'],
+				'DTT_order'       => ! isset($datetime_data['DTT_order'])
+					? $row
+					: $datetime_data['DTT_order'],
+			);
+			// if we have an id then let's get existing object first and then set the new values.
+			// Otherwise we instantiate a new object for save.
+			if (! empty($datetime_data['DTT_ID'])) {
+				$datetime = EE_Registry::instance()
+									   ->load_model('Datetime', array($timezone))
+									   ->get_one_by_ID($datetime_data['DTT_ID']);
+				// set date and time format according to what is set in this class.
+				$datetime->set_date_format($this->_date_format_strings['date']);
+				$datetime->set_time_format($this->_date_format_strings['time']);
+				foreach ($datetime_values as $field => $value) {
+					$datetime->set($field, $value);
+				}
+				// make sure the $dtt_id here is saved just in case
+				// after the add_relation_to() the autosave replaces it.
+				// We need to do this so we dont' TRASH the parent DTT.
+				// (save the ID for both key and value to avoid duplications)
+				$saved_dtt_ids[ $datetime->ID() ] = $datetime->ID();
+			} else {
+				$datetime = EE_Registry::instance()->load_class(
+					'Datetime',
+					array(
+						$datetime_values,
+						$timezone,
+						array($this->_date_format_strings['date'], $this->_date_format_strings['time']),
+					),
+					false,
+					false
+				);
+				foreach ($datetime_values as $field => $value) {
+					$datetime->set($field, $value);
+				}
+			}
+			$datetime->save();
+			$datetime = $event->_add_relation_to($datetime, 'Datetime');
+			// before going any further make sure our dates are setup correctly
+			// so that the end date is always equal or greater than the start date.
+			if ($datetime->get_raw('DTT_EVT_start') > $datetime->get_raw('DTT_EVT_end')) {
+				$datetime->set('DTT_EVT_end', $datetime->get('DTT_EVT_start'));
+				$datetime = EEH_DTT_Helper::date_time_add($datetime, 'DTT_EVT_end', 'days');
+				$datetime->save();
+			}
+			// now we have to make sure we add the new DTT_ID to the $saved_dtt_ids array
+			// because it is possible there was a new one created for the autosave.
+			// (save the ID for both key and value to avoid duplications)
+			$DTT_ID = $datetime->ID();
+			$saved_dtt_ids[ $DTT_ID ] = $DTT_ID;
+			$saved_dtt_objs[ $row ] = $datetime;
+			// @todo if ANY of these updates fail then we want the appropriate global error message.
+		}
+		$event->save();
+		// now we need to REMOVE any datetimes that got deleted.
+		// Keep in mind that this process will only kick in for datetimes that don't have any DTT_sold on them.
+		// So its safe to permanently delete at this point.
+		$old_datetimes = explode(',', $data['datetime_IDs']);
+		$old_datetimes = $old_datetimes[0] === '' ? array() : $old_datetimes;
+		if (is_array($old_datetimes)) {
+			$datetimes_to_delete = array_diff($old_datetimes, $saved_dtt_ids);
+			foreach ($datetimes_to_delete as $id) {
+				$id = absint($id);
+				if (empty($id)) {
+					continue;
+				}
+				$dtt_to_remove = EE_Registry::instance()->load_model('Datetime')->get_one_by_ID($id);
+				// remove tkt relationships.
+				$related_tickets = $dtt_to_remove->get_many_related('Ticket');
+				foreach ($related_tickets as $tkt) {
+					$dtt_to_remove->_remove_relation_to($tkt, 'Ticket');
+				}
+				$event->_remove_relation_to($id, 'Datetime');
+				$dtt_to_remove->refresh_cache_of_related_objects();
+			}
+		}
+		return $saved_dtt_objs;
+	}
 
 
-    /**
-     * update tickets
-     *
-     * @param  EE_Event      $event           Event object being updated
-     * @param  EE_Datetime[] $saved_datetimes an array of datetime ids being updated
-     * @param  array         $data            incoming request data
-     * @return EE_Ticket[]
-     * @throws Exception
-     * @throws ReflectionException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     * @throws InvalidArgumentException
-     * @throws EE_Error
-     */
-    protected function _update_tickets($event, $saved_datetimes, $data)
-    {
-        $new_tkt = null;
-        $new_default = null;
-        // stripslashes because WP filtered the $_POST ($data) array to add slashes
-        $data = stripslashes_deep($data);
-        $timezone = isset($data['timezone_string']) ? $data['timezone_string'] : null;
-        $saved_tickets = $datetimes_on_existing = array();
-        $old_tickets = isset($data['ticket_IDs']) ? explode(',', $data['ticket_IDs']) : array();
-        if (empty($data['edit_tickets']) || ! is_array($data['edit_tickets'])) {
-            throw new InvalidArgumentException(
-                esc_html__(
-                    'The "edit_tickets" array is invalid therefore the event can not be updated.',
-                    'event_espresso'
-                )
-            );
-        }
-        foreach ($data['edit_tickets'] as $row => $tkt) {
-            $update_prices = $create_new_TKT = false;
-            // figure out what datetimes were added to the ticket
-            // and what datetimes were removed from the ticket in the session.
-            $starting_tkt_dtt_rows = explode(',', $data['starting_ticket_datetime_rows'][ $row ]);
-            $tkt_dtt_rows = explode(',', $data['ticket_datetime_rows'][ $row ]);
-            $datetimes_added = array_diff($tkt_dtt_rows, $starting_tkt_dtt_rows);
-            $datetimes_removed = array_diff($starting_tkt_dtt_rows, $tkt_dtt_rows);
-            // trim inputs to ensure any excess whitespace is removed.
-            $tkt = array_map(
-                function ($ticket_data) {
-                    return is_array($ticket_data) ? $ticket_data : trim($ticket_data);
-                },
-                $tkt
-            );
-            // note we are doing conversions to floats here instead of allowing EE_Money_Field to handle
-            // because we're doing calculations prior to using the models.
-            // note incoming ['TKT_price'] value is already in standard notation (via js).
-            $ticket_price = isset($tkt['TKT_price'])
-                ? round((float) $tkt['TKT_price'], 3)
-                : 0;
-            // note incoming base price needs converted from localized value.
-            $base_price = isset($tkt['TKT_base_price'])
-                ? EEH_Money::convert_to_float_from_localized_money($tkt['TKT_base_price'])
-                : 0;
-            // if ticket price == 0 and $base_price != 0 then ticket price == base_price
-            $ticket_price = $ticket_price === 0 && $base_price !== 0
-                ? $base_price
-                : $ticket_price;
-            $base_price_id = isset($tkt['TKT_base_price_ID'])
-                ? $tkt['TKT_base_price_ID']
-                : 0;
-            $price_rows = is_array($data['edit_prices']) && isset($data['edit_prices'][ $row ])
-                ? $data['edit_prices'][ $row ]
-                : array();
-            $now = null;
-            if (empty($tkt['TKT_start_date'])) {
-                // lets' use now in the set timezone.
-                $now = new DateTime('now', new DateTimeZone($event->get_timezone()));
-                $tkt['TKT_start_date'] = $now->format($this->_date_time_format);
-            }
-            if (empty($tkt['TKT_end_date'])) {
-                /**
-                 * set the TKT_end_date to the first datetime attached to the ticket.
-                 */
-                $first_dtt = $saved_datetimes[ reset($tkt_dtt_rows) ];
-                $tkt['TKT_end_date'] = $first_dtt->start_date_and_time($this->_date_time_format);
-            }
-            $TKT_values = array(
-                'TKT_ID'          => ! empty($tkt['TKT_ID']) ? $tkt['TKT_ID'] : null,
-                'TTM_ID'          => ! empty($tkt['TTM_ID']) ? $tkt['TTM_ID'] : 0,
-                'TKT_name'        => ! empty($tkt['TKT_name']) ? $tkt['TKT_name'] : '',
-                'TKT_description' => ! empty($tkt['TKT_description'])
-                                     && $tkt['TKT_description'] !== esc_html__(
-                                         'You can modify this description',
-                                         'event_espresso'
-                                     )
-                    ? $tkt['TKT_description']
-                    : '',
-                'TKT_start_date'  => $tkt['TKT_start_date'],
-                'TKT_end_date'    => $tkt['TKT_end_date'],
-                'TKT_qty'         => ! isset($tkt['TKT_qty']) || $tkt['TKT_qty'] === ''
-                    ? EE_INF
-                    : $tkt['TKT_qty'],
-                'TKT_uses'        => ! isset($tkt['TKT_uses']) || $tkt['TKT_uses'] === ''
-                    ? EE_INF
-                    : $tkt['TKT_uses'],
-                'TKT_min'         => empty($tkt['TKT_min']) ? 0 : $tkt['TKT_min'],
-                'TKT_max'         => empty($tkt['TKT_max']) ? EE_INF : $tkt['TKT_max'],
-                'TKT_row'         => $row,
-                'TKT_order'       => isset($tkt['TKT_order']) ? $tkt['TKT_order'] : 0,
-                'TKT_taxable'     => ! empty($tkt['TKT_taxable']) ? 1 : 0,
-                'TKT_required'    => ! empty($tkt['TKT_required']) ? 1 : 0,
-                'TKT_price'       => $ticket_price,
-            );
-            // if this is a default TKT, then we need to set the TKT_ID to 0 and update accordingly,
-            // which means in turn that the prices will become new prices as well.
-            if (isset($tkt['TKT_is_default']) && $tkt['TKT_is_default']) {
-                $TKT_values['TKT_ID'] = 0;
-                $TKT_values['TKT_is_default'] = 0;
-                $update_prices = true;
-            }
-            // if we have a TKT_ID then we need to get that existing TKT_obj and update it
-            // we actually do our saves ahead of doing any add_relations to
-            // because its entirely possible that this ticket wasn't removed or added to any datetime in the session
-            // but DID have it's items modified.
-            // keep in mind that if the TKT has been sold (and we have changed pricing information),
-            // then we won't be updating the tkt but instead a new tkt will be created and the old one archived.
-            if (absint($TKT_values['TKT_ID'])) {
-                $ticket = EE_Registry::instance()
-                                     ->load_model('Ticket', array($timezone))
-                                     ->get_one_by_ID($tkt['TKT_ID']);
-                if ($ticket instanceof EE_Ticket) {
-                    $ticket = $this->_update_ticket_datetimes(
-                        $ticket,
-                        $saved_datetimes,
-                        $datetimes_added,
-                        $datetimes_removed
-                    );
-                    // are there any registrations using this ticket ?
-                    $tickets_sold = $ticket->count_related(
-                        'Registration',
-                        array(
-                            array(
-                                'STS_ID' => array('NOT IN', array(EEM_Registration::status_id_incomplete)),
-                            ),
-                        )
-                    );
-                    // set ticket formats
-                    $ticket->set_date_format($this->_date_format_strings['date']);
-                    $ticket->set_time_format($this->_date_format_strings['time']);
-                    // let's just check the total price for the existing ticket
-                    // and determine if it matches the new total price.
-                    // if they are different then we create a new ticket (if tickets sold)
-                    // if they aren't different then we go ahead and modify existing ticket.
-                    $create_new_TKT = $tickets_sold > 0 && $ticket_price !== $ticket->price() && ! $ticket->deleted();
-                    // set new values
-                    foreach ($TKT_values as $field => $value) {
-                        if ($field === 'TKT_qty') {
-                            $ticket->set_qty($value);
-                        } else {
-                            $ticket->set($field, $value);
-                        }
-                    }
-                    // if $create_new_TKT is false then we can safely update the existing ticket.
-                    // Otherwise we have to create a new ticket.
-                    if ($create_new_TKT) {
-                        $new_tkt = $this->_duplicate_ticket(
-                            $ticket,
-                            $price_rows,
-                            $ticket_price,
-                            $base_price,
-                            $base_price_id
-                        );
-                    }
-                }
-            } else {
-                // no TKT_id so a new TKT
-                $ticket = EE_Ticket::new_instance(
-                    $TKT_values,
-                    $timezone,
-                    array($this->_date_format_strings['date'], $this->_date_format_strings['time'])
-                );
-                if ($ticket instanceof EE_Ticket) {
-                    // make sure ticket has an ID of setting relations won't work
-                    $ticket->save();
-                    $ticket = $this->_update_ticket_datetimes(
-                        $ticket,
-                        $saved_datetimes,
-                        $datetimes_added,
-                        $datetimes_removed
-                    );
-                    $update_prices = true;
-                }
-            }
-            // make sure any current values have been saved.
-            // $ticket->save();
-            // before going any further make sure our dates are setup correctly
-            // so that the end date is always equal or greater than the start date.
-            if ($ticket->get_raw('TKT_start_date') > $ticket->get_raw('TKT_end_date')) {
-                $ticket->set('TKT_end_date', $ticket->get('TKT_start_date'));
-                $ticket = EEH_DTT_Helper::date_time_add($ticket, 'TKT_end_date', 'days');
-            }
-            // let's make sure the base price is handled
-            $ticket = ! $create_new_TKT
-                ? $this->_add_prices_to_ticket(
-                    array(),
-                    $ticket,
-                    $update_prices,
-                    $base_price,
-                    $base_price_id
-                )
-                : $ticket;
-            // add/update price_modifiers
-            $ticket = ! $create_new_TKT
-                ? $this->_add_prices_to_ticket($price_rows, $ticket, $update_prices)
-                : $ticket;
-            // need to make sue that the TKT_price is accurate after saving the prices.
-            $ticket->ensure_TKT_Price_correct();
-            // handle CREATING a default tkt from the incoming tkt but ONLY if this isn't an autosave.
-            if (! defined('DOING_AUTOSAVE') && ! empty($tkt['TKT_is_default_selector'])) {
-                $update_prices = true;
-                $new_default = clone $ticket;
-                $new_default->set('TKT_ID', 0);
-                $new_default->set('TKT_is_default', 1);
-                $new_default->set('TKT_row', 1);
-                $new_default->set('TKT_price', $ticket_price);
-                // remove any dtt relations cause we DON'T want dtt relations attached
-                // (note this is just removing the cached relations in the object)
-                $new_default->_remove_relations('Datetime');
-                // @todo we need to add the current attached prices as new prices to the new default ticket.
-                $new_default = $this->_add_prices_to_ticket(
-                    $price_rows,
-                    $new_default,
-                    $update_prices
-                );
-                // don't forget the base price!
-                $new_default = $this->_add_prices_to_ticket(
-                    array(),
-                    $new_default,
-                    $update_prices,
-                    $base_price,
-                    $base_price_id
-                );
-                $new_default->save();
-                do_action(
-                    'AHEE__espresso_events_Pricing_Hooks___update_tkts_new_default_ticket',
-                    $new_default,
-                    $row,
-                    $ticket,
-                    $data
-                );
-            }
-            // DO ALL dtt relationships for both current tickets and any archived tickets
-            // for the given dtt that are related to the current ticket.
-            // TODO... not sure exactly how we're going to do this considering we don't know
-            // what current ticket the archived tickets are related to
-            // (and TKT_parent is used for autosaves so that's not a field we can reliably use).
-            // let's assign any tickets that have been setup to the saved_tickets tracker
-            // save existing TKT
-            $ticket->save();
-            if ($create_new_TKT && $new_tkt instanceof EE_Ticket) {
-                // save new TKT
-                $new_tkt->save();
-                // add new ticket to array
-                $saved_tickets[ $new_tkt->ID() ] = $new_tkt;
-                do_action(
-                    'AHEE__espresso_events_Pricing_Hooks___update_tkts_new_ticket',
-                    $new_tkt,
-                    $row,
-                    $tkt,
-                    $data
-                );
-            } else {
-                // add tkt to saved tkts
-                $saved_tickets[ $ticket->ID() ] = $ticket;
-                do_action(
-                    'AHEE__espresso_events_Pricing_Hooks___update_tkts_update_ticket',
-                    $ticket,
-                    $row,
-                    $tkt,
-                    $data
-                );
-            }
-        }
-        // now we need to handle tickets actually "deleted permanently".
-        // There are cases where we'd want this to happen
-        // (i.e. autosaves are happening and then in between autosaves the user trashes a ticket).
-        // Or a draft event was saved and in the process of editing a ticket is trashed.
-        // No sense in keeping all the related data in the db!
-        $old_tickets = isset($old_tickets[0]) && $old_tickets[0] === '' ? array() : $old_tickets;
-        $tickets_removed = array_diff($old_tickets, array_keys($saved_tickets));
-        foreach ($tickets_removed as $id) {
-            $id = absint($id);
-            // get the ticket for this id
-            $tkt_to_remove = EE_Registry::instance()->load_model('Ticket')->get_one_by_ID($id);
-            // if this tkt is a default tkt we leave it alone cause it won't be attached to the datetime
-            if ($tkt_to_remove->get('TKT_is_default')) {
-                continue;
-            }
-            // if this tkt has any registrations attached so then we just ARCHIVE
-            // because we don't actually permanently delete these tickets.
-            if ($tkt_to_remove->count_related('Registration') > 0) {
-                $tkt_to_remove->delete();
-                continue;
-            }
-            // need to get all the related datetimes on this ticket and remove from every single one of them
-            // (remember this process can ONLY kick off if there are NO tkts_sold)
-            $datetimes = $tkt_to_remove->get_many_related('Datetime');
-            foreach ($datetimes as $datetime) {
-                $tkt_to_remove->_remove_relation_to($datetime, 'Datetime');
-            }
-            // need to do the same for prices (except these prices can also be deleted because again,
-            // tickets can only be trashed if they don't have any TKTs sold (otherwise they are just archived))
-            $tkt_to_remove->delete_related_permanently('Price');
-            do_action('AHEE__espresso_events_Pricing_Hooks___update_tkts_delete_ticket', $tkt_to_remove);
-            // finally let's delete this ticket
-            // (which should not be blocked at this point b/c we've removed all our relationships)
-            $tkt_to_remove->delete_permanently();
-        }
-        return $saved_tickets;
-    }
+	/**
+	 * update tickets
+	 *
+	 * @param  EE_Event      $event           Event object being updated
+	 * @param  EE_Datetime[] $saved_datetimes an array of datetime ids being updated
+	 * @param  array         $data            incoming request data
+	 * @return EE_Ticket[]
+	 * @throws Exception
+	 * @throws ReflectionException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidArgumentException
+	 * @throws EE_Error
+	 */
+	protected function _update_tickets($event, $saved_datetimes, $data)
+	{
+		$new_tkt = null;
+		$new_default = null;
+		// stripslashes because WP filtered the $_POST ($data) array to add slashes
+		$data = stripslashes_deep($data);
+		$timezone = isset($data['timezone_string']) ? $data['timezone_string'] : null;
+		$saved_tickets = $datetimes_on_existing = array();
+		$old_tickets = isset($data['ticket_IDs']) ? explode(',', $data['ticket_IDs']) : array();
+		if (empty($data['edit_tickets']) || ! is_array($data['edit_tickets'])) {
+			throw new InvalidArgumentException(
+				esc_html__(
+					'The "edit_tickets" array is invalid therefore the event can not be updated.',
+					'event_espresso'
+				)
+			);
+		}
+		foreach ($data['edit_tickets'] as $row => $tkt) {
+			$update_prices = $create_new_TKT = false;
+			// figure out what datetimes were added to the ticket
+			// and what datetimes were removed from the ticket in the session.
+			$starting_tkt_dtt_rows = explode(',', $data['starting_ticket_datetime_rows'][ $row ]);
+			$tkt_dtt_rows = explode(',', $data['ticket_datetime_rows'][ $row ]);
+			$datetimes_added = array_diff($tkt_dtt_rows, $starting_tkt_dtt_rows);
+			$datetimes_removed = array_diff($starting_tkt_dtt_rows, $tkt_dtt_rows);
+			// trim inputs to ensure any excess whitespace is removed.
+			$tkt = array_map(
+				function ($ticket_data) {
+					return is_array($ticket_data) ? $ticket_data : trim($ticket_data);
+				},
+				$tkt
+			);
+			// note we are doing conversions to floats here instead of allowing EE_Money_Field to handle
+			// because we're doing calculations prior to using the models.
+			// note incoming ['TKT_price'] value is already in standard notation (via js).
+			$ticket_price = isset($tkt['TKT_price'])
+				? round((float) $tkt['TKT_price'], 3)
+				: 0;
+			// note incoming base price needs converted from localized value.
+			$base_price = isset($tkt['TKT_base_price'])
+				? EEH_Money::convert_to_float_from_localized_money($tkt['TKT_base_price'])
+				: 0;
+			// if ticket price == 0 and $base_price != 0 then ticket price == base_price
+			$ticket_price = $ticket_price === 0 && $base_price !== 0
+				? $base_price
+				: $ticket_price;
+			$base_price_id = isset($tkt['TKT_base_price_ID'])
+				? $tkt['TKT_base_price_ID']
+				: 0;
+			$price_rows = is_array($data['edit_prices']) && isset($data['edit_prices'][ $row ])
+				? $data['edit_prices'][ $row ]
+				: array();
+			$now = null;
+			if (empty($tkt['TKT_start_date'])) {
+				// lets' use now in the set timezone.
+				$now = new DateTime('now', new DateTimeZone($event->get_timezone()));
+				$tkt['TKT_start_date'] = $now->format($this->_date_time_format);
+			}
+			if (empty($tkt['TKT_end_date'])) {
+				/**
+				 * set the TKT_end_date to the first datetime attached to the ticket.
+				 */
+				$first_dtt = $saved_datetimes[ reset($tkt_dtt_rows) ];
+				$tkt['TKT_end_date'] = $first_dtt->start_date_and_time($this->_date_time_format);
+			}
+			$TKT_values = array(
+				'TKT_ID'          => ! empty($tkt['TKT_ID']) ? $tkt['TKT_ID'] : null,
+				'TTM_ID'          => ! empty($tkt['TTM_ID']) ? $tkt['TTM_ID'] : 0,
+				'TKT_name'        => ! empty($tkt['TKT_name']) ? $tkt['TKT_name'] : '',
+				'TKT_description' => ! empty($tkt['TKT_description'])
+									 && $tkt['TKT_description'] !== esc_html__(
+										 'You can modify this description',
+										 'event_espresso'
+									 )
+					? $tkt['TKT_description']
+					: '',
+				'TKT_start_date'  => $tkt['TKT_start_date'],
+				'TKT_end_date'    => $tkt['TKT_end_date'],
+				'TKT_qty'         => ! isset($tkt['TKT_qty']) || $tkt['TKT_qty'] === ''
+					? EE_INF
+					: $tkt['TKT_qty'],
+				'TKT_uses'        => ! isset($tkt['TKT_uses']) || $tkt['TKT_uses'] === ''
+					? EE_INF
+					: $tkt['TKT_uses'],
+				'TKT_min'         => empty($tkt['TKT_min']) ? 0 : $tkt['TKT_min'],
+				'TKT_max'         => empty($tkt['TKT_max']) ? EE_INF : $tkt['TKT_max'],
+				'TKT_row'         => $row,
+				'TKT_order'       => isset($tkt['TKT_order']) ? $tkt['TKT_order'] : 0,
+				'TKT_taxable'     => ! empty($tkt['TKT_taxable']) ? 1 : 0,
+				'TKT_required'    => ! empty($tkt['TKT_required']) ? 1 : 0,
+				'TKT_price'       => $ticket_price,
+			);
+			// if this is a default TKT, then we need to set the TKT_ID to 0 and update accordingly,
+			// which means in turn that the prices will become new prices as well.
+			if (isset($tkt['TKT_is_default']) && $tkt['TKT_is_default']) {
+				$TKT_values['TKT_ID'] = 0;
+				$TKT_values['TKT_is_default'] = 0;
+				$update_prices = true;
+			}
+			// if we have a TKT_ID then we need to get that existing TKT_obj and update it
+			// we actually do our saves ahead of doing any add_relations to
+			// because its entirely possible that this ticket wasn't removed or added to any datetime in the session
+			// but DID have it's items modified.
+			// keep in mind that if the TKT has been sold (and we have changed pricing information),
+			// then we won't be updating the tkt but instead a new tkt will be created and the old one archived.
+			if (absint($TKT_values['TKT_ID'])) {
+				$ticket = EE_Registry::instance()
+									 ->load_model('Ticket', array($timezone))
+									 ->get_one_by_ID($tkt['TKT_ID']);
+				if ($ticket instanceof EE_Ticket) {
+					$ticket = $this->_update_ticket_datetimes(
+						$ticket,
+						$saved_datetimes,
+						$datetimes_added,
+						$datetimes_removed
+					);
+					// are there any registrations using this ticket ?
+					$tickets_sold = $ticket->count_related(
+						'Registration',
+						array(
+							array(
+								'STS_ID' => array('NOT IN', array(EEM_Registration::status_id_incomplete)),
+							),
+						)
+					);
+					// set ticket formats
+					$ticket->set_date_format($this->_date_format_strings['date']);
+					$ticket->set_time_format($this->_date_format_strings['time']);
+					// let's just check the total price for the existing ticket
+					// and determine if it matches the new total price.
+					// if they are different then we create a new ticket (if tickets sold)
+					// if they aren't different then we go ahead and modify existing ticket.
+					$create_new_TKT = $tickets_sold > 0 && $ticket_price !== $ticket->price() && ! $ticket->deleted();
+					// set new values
+					foreach ($TKT_values as $field => $value) {
+						if ($field === 'TKT_qty') {
+							$ticket->set_qty($value);
+						} else {
+							$ticket->set($field, $value);
+						}
+					}
+					// if $create_new_TKT is false then we can safely update the existing ticket.
+					// Otherwise we have to create a new ticket.
+					if ($create_new_TKT) {
+						$new_tkt = $this->_duplicate_ticket(
+							$ticket,
+							$price_rows,
+							$ticket_price,
+							$base_price,
+							$base_price_id
+						);
+					}
+				}
+			} else {
+				// no TKT_id so a new TKT
+				$ticket = EE_Ticket::new_instance(
+					$TKT_values,
+					$timezone,
+					array($this->_date_format_strings['date'], $this->_date_format_strings['time'])
+				);
+				if ($ticket instanceof EE_Ticket) {
+					// make sure ticket has an ID of setting relations won't work
+					$ticket->save();
+					$ticket = $this->_update_ticket_datetimes(
+						$ticket,
+						$saved_datetimes,
+						$datetimes_added,
+						$datetimes_removed
+					);
+					$update_prices = true;
+				}
+			}
+			// make sure any current values have been saved.
+			// $ticket->save();
+			// before going any further make sure our dates are setup correctly
+			// so that the end date is always equal or greater than the start date.
+			if ($ticket->get_raw('TKT_start_date') > $ticket->get_raw('TKT_end_date')) {
+				$ticket->set('TKT_end_date', $ticket->get('TKT_start_date'));
+				$ticket = EEH_DTT_Helper::date_time_add($ticket, 'TKT_end_date', 'days');
+			}
+			// let's make sure the base price is handled
+			$ticket = ! $create_new_TKT
+				? $this->_add_prices_to_ticket(
+					array(),
+					$ticket,
+					$update_prices,
+					$base_price,
+					$base_price_id
+				)
+				: $ticket;
+			// add/update price_modifiers
+			$ticket = ! $create_new_TKT
+				? $this->_add_prices_to_ticket($price_rows, $ticket, $update_prices)
+				: $ticket;
+			// need to make sue that the TKT_price is accurate after saving the prices.
+			$ticket->ensure_TKT_Price_correct();
+			// handle CREATING a default tkt from the incoming tkt but ONLY if this isn't an autosave.
+			if (! defined('DOING_AUTOSAVE') && ! empty($tkt['TKT_is_default_selector'])) {
+				$update_prices = true;
+				$new_default = clone $ticket;
+				$new_default->set('TKT_ID', 0);
+				$new_default->set('TKT_is_default', 1);
+				$new_default->set('TKT_row', 1);
+				$new_default->set('TKT_price', $ticket_price);
+				// remove any dtt relations cause we DON'T want dtt relations attached
+				// (note this is just removing the cached relations in the object)
+				$new_default->_remove_relations('Datetime');
+				// @todo we need to add the current attached prices as new prices to the new default ticket.
+				$new_default = $this->_add_prices_to_ticket(
+					$price_rows,
+					$new_default,
+					$update_prices
+				);
+				// don't forget the base price!
+				$new_default = $this->_add_prices_to_ticket(
+					array(),
+					$new_default,
+					$update_prices,
+					$base_price,
+					$base_price_id
+				);
+				$new_default->save();
+				do_action(
+					'AHEE__espresso_events_Pricing_Hooks___update_tkts_new_default_ticket',
+					$new_default,
+					$row,
+					$ticket,
+					$data
+				);
+			}
+			// DO ALL dtt relationships for both current tickets and any archived tickets
+			// for the given dtt that are related to the current ticket.
+			// TODO... not sure exactly how we're going to do this considering we don't know
+			// what current ticket the archived tickets are related to
+			// (and TKT_parent is used for autosaves so that's not a field we can reliably use).
+			// let's assign any tickets that have been setup to the saved_tickets tracker
+			// save existing TKT
+			$ticket->save();
+			if ($create_new_TKT && $new_tkt instanceof EE_Ticket) {
+				// save new TKT
+				$new_tkt->save();
+				// add new ticket to array
+				$saved_tickets[ $new_tkt->ID() ] = $new_tkt;
+				do_action(
+					'AHEE__espresso_events_Pricing_Hooks___update_tkts_new_ticket',
+					$new_tkt,
+					$row,
+					$tkt,
+					$data
+				);
+			} else {
+				// add tkt to saved tkts
+				$saved_tickets[ $ticket->ID() ] = $ticket;
+				do_action(
+					'AHEE__espresso_events_Pricing_Hooks___update_tkts_update_ticket',
+					$ticket,
+					$row,
+					$tkt,
+					$data
+				);
+			}
+		}
+		// now we need to handle tickets actually "deleted permanently".
+		// There are cases where we'd want this to happen
+		// (i.e. autosaves are happening and then in between autosaves the user trashes a ticket).
+		// Or a draft event was saved and in the process of editing a ticket is trashed.
+		// No sense in keeping all the related data in the db!
+		$old_tickets = isset($old_tickets[0]) && $old_tickets[0] === '' ? array() : $old_tickets;
+		$tickets_removed = array_diff($old_tickets, array_keys($saved_tickets));
+		foreach ($tickets_removed as $id) {
+			$id = absint($id);
+			// get the ticket for this id
+			$tkt_to_remove = EE_Registry::instance()->load_model('Ticket')->get_one_by_ID($id);
+			// if this tkt is a default tkt we leave it alone cause it won't be attached to the datetime
+			if ($tkt_to_remove->get('TKT_is_default')) {
+				continue;
+			}
+			// if this tkt has any registrations attached so then we just ARCHIVE
+			// because we don't actually permanently delete these tickets.
+			if ($tkt_to_remove->count_related('Registration') > 0) {
+				$tkt_to_remove->delete();
+				continue;
+			}
+			// need to get all the related datetimes on this ticket and remove from every single one of them
+			// (remember this process can ONLY kick off if there are NO tkts_sold)
+			$datetimes = $tkt_to_remove->get_many_related('Datetime');
+			foreach ($datetimes as $datetime) {
+				$tkt_to_remove->_remove_relation_to($datetime, 'Datetime');
+			}
+			// need to do the same for prices (except these prices can also be deleted because again,
+			// tickets can only be trashed if they don't have any TKTs sold (otherwise they are just archived))
+			$tkt_to_remove->delete_related_permanently('Price');
+			do_action('AHEE__espresso_events_Pricing_Hooks___update_tkts_delete_ticket', $tkt_to_remove);
+			// finally let's delete this ticket
+			// (which should not be blocked at this point b/c we've removed all our relationships)
+			$tkt_to_remove->delete_permanently();
+		}
+		return $saved_tickets;
+	}
 
 
-    /**
-     * @access  protected
-     * @param EE_Ticket      $ticket
-     * @param \EE_Datetime[] $saved_datetimes
-     * @param \EE_Datetime[] $added_datetimes
-     * @param \EE_Datetime[] $removed_datetimes
-     * @return EE_Ticket
-     * @throws EE_Error
-     */
-    protected function _update_ticket_datetimes(
-        EE_Ticket $ticket,
-        $saved_datetimes = array(),
-        $added_datetimes = array(),
-        $removed_datetimes = array()
-    ) {
-        // to start we have to add the ticket to all the datetimes its supposed to be with,
-        // and removing the ticket from datetimes it got removed from.
-        // first let's add datetimes
-        if (! empty($added_datetimes) && is_array($added_datetimes)) {
-            foreach ($added_datetimes as $row_id) {
-                $row_id = (int) $row_id;
-                if (isset($saved_datetimes[ $row_id ]) && $saved_datetimes[ $row_id ] instanceof EE_Datetime) {
-                    $ticket->_add_relation_to($saved_datetimes[ $row_id ], 'Datetime');
-                    // Is this an existing ticket (has an ID) and does it have any sold?
-                    // If so, then we need to add that to the DTT sold because this DTT is getting added.
-                    if ($ticket->ID() && $ticket->sold() > 0) {
-                        $saved_datetimes[ $row_id ]->increaseSold($ticket->sold(), false);
-                    }
-                }
-            }
-        }
-        // then remove datetimes
-        if (! empty($removed_datetimes) && is_array($removed_datetimes)) {
-            foreach ($removed_datetimes as $row_id) {
-                $row_id = (int) $row_id;
-                // its entirely possible that a datetime got deleted (instead of just removed from relationship.
-                // So make sure we skip over this if the dtt isn't in the $saved_datetimes array)
-                if (isset($saved_datetimes[ $row_id ]) && $saved_datetimes[ $row_id ] instanceof EE_Datetime) {
-                    $ticket->_remove_relation_to($saved_datetimes[ $row_id ], 'Datetime');
-                    // Is this an existing ticket (has an ID) and does it have any sold?
-                    // If so, then we need to remove it's sold from the DTT_sold.
-                    if ($ticket->ID() && $ticket->sold() > 0) {
-                        $saved_datetimes[ $row_id ]->decreaseSold($ticket->sold());
-                    }
-                }
-            }
-        }
-        // cap ticket qty by datetime reg limits
-        $ticket->set_qty(min($ticket->qty(), $ticket->qty('reg_limit')));
-        return $ticket;
-    }
+	/**
+	 * @access  protected
+	 * @param EE_Ticket      $ticket
+	 * @param \EE_Datetime[] $saved_datetimes
+	 * @param \EE_Datetime[] $added_datetimes
+	 * @param \EE_Datetime[] $removed_datetimes
+	 * @return EE_Ticket
+	 * @throws EE_Error
+	 */
+	protected function _update_ticket_datetimes(
+		EE_Ticket $ticket,
+		$saved_datetimes = array(),
+		$added_datetimes = array(),
+		$removed_datetimes = array()
+	) {
+		// to start we have to add the ticket to all the datetimes its supposed to be with,
+		// and removing the ticket from datetimes it got removed from.
+		// first let's add datetimes
+		if (! empty($added_datetimes) && is_array($added_datetimes)) {
+			foreach ($added_datetimes as $row_id) {
+				$row_id = (int) $row_id;
+				if (isset($saved_datetimes[ $row_id ]) && $saved_datetimes[ $row_id ] instanceof EE_Datetime) {
+					$ticket->_add_relation_to($saved_datetimes[ $row_id ], 'Datetime');
+					// Is this an existing ticket (has an ID) and does it have any sold?
+					// If so, then we need to add that to the DTT sold because this DTT is getting added.
+					if ($ticket->ID() && $ticket->sold() > 0) {
+						$saved_datetimes[ $row_id ]->increaseSold($ticket->sold(), false);
+					}
+				}
+			}
+		}
+		// then remove datetimes
+		if (! empty($removed_datetimes) && is_array($removed_datetimes)) {
+			foreach ($removed_datetimes as $row_id) {
+				$row_id = (int) $row_id;
+				// its entirely possible that a datetime got deleted (instead of just removed from relationship.
+				// So make sure we skip over this if the dtt isn't in the $saved_datetimes array)
+				if (isset($saved_datetimes[ $row_id ]) && $saved_datetimes[ $row_id ] instanceof EE_Datetime) {
+					$ticket->_remove_relation_to($saved_datetimes[ $row_id ], 'Datetime');
+					// Is this an existing ticket (has an ID) and does it have any sold?
+					// If so, then we need to remove it's sold from the DTT_sold.
+					if ($ticket->ID() && $ticket->sold() > 0) {
+						$saved_datetimes[ $row_id ]->decreaseSold($ticket->sold());
+					}
+				}
+			}
+		}
+		// cap ticket qty by datetime reg limits
+		$ticket->set_qty(min($ticket->qty(), $ticket->qty('reg_limit')));
+		return $ticket;
+	}
 
 
-    /**
-     * @access  protected
-     * @param EE_Ticket $ticket
-     * @param array     $price_rows
-     * @param int       $ticket_price
-     * @param int       $base_price
-     * @param int       $base_price_id
-     * @return EE_Ticket
-     * @throws ReflectionException
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     * @throws EE_Error
-     */
-    protected function _duplicate_ticket(
-        EE_Ticket $ticket,
-        $price_rows = array(),
-        $ticket_price = 0,
-        $base_price = 0,
-        $base_price_id = 0
-    ) {
-        // create new ticket that's a copy of the existing
-        // except a new id of course (and not archived)
-        // AND has the new TKT_price associated with it.
-        $new_ticket = clone $ticket;
-        $new_ticket->set('TKT_ID', 0);
-        $new_ticket->set_deleted(0);
-        $new_ticket->set_price($ticket_price);
-        $new_ticket->set_sold(0);
-        // let's get a new ID for this ticket
-        $new_ticket->save();
-        // we also need to make sure this new ticket gets the same datetime attachments as the archived ticket
-        $datetimes_on_existing = $ticket->datetimes();
-        $new_ticket = $this->_update_ticket_datetimes(
-            $new_ticket,
-            $datetimes_on_existing,
-            array_keys($datetimes_on_existing)
-        );
-        // $ticket will get archived later b/c we are NOT adding it to the saved_tickets array.
-        // if existing $ticket has sold amount, then we need to adjust the qty for the new TKT to = the remaining
-        // available.
-        if ($ticket->sold() > 0) {
-            $new_qty = $ticket->qty() - $ticket->sold();
-            $new_ticket->set_qty($new_qty);
-        }
-        // now we update the prices just for this ticket
-        $new_ticket = $this->_add_prices_to_ticket($price_rows, $new_ticket, true);
-        // and we update the base price
-        $new_ticket = $this->_add_prices_to_ticket(
-            array(),
-            $new_ticket,
-            true,
-            $base_price,
-            $base_price_id
-        );
-        return $new_ticket;
-    }
+	/**
+	 * @access  protected
+	 * @param EE_Ticket $ticket
+	 * @param array     $price_rows
+	 * @param int       $ticket_price
+	 * @param int       $base_price
+	 * @param int       $base_price_id
+	 * @return EE_Ticket
+	 * @throws ReflectionException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 * @throws EE_Error
+	 */
+	protected function _duplicate_ticket(
+		EE_Ticket $ticket,
+		$price_rows = array(),
+		$ticket_price = 0,
+		$base_price = 0,
+		$base_price_id = 0
+	) {
+		// create new ticket that's a copy of the existing
+		// except a new id of course (and not archived)
+		// AND has the new TKT_price associated with it.
+		$new_ticket = clone $ticket;
+		$new_ticket->set('TKT_ID', 0);
+		$new_ticket->set_deleted(0);
+		$new_ticket->set_price($ticket_price);
+		$new_ticket->set_sold(0);
+		// let's get a new ID for this ticket
+		$new_ticket->save();
+		// we also need to make sure this new ticket gets the same datetime attachments as the archived ticket
+		$datetimes_on_existing = $ticket->datetimes();
+		$new_ticket = $this->_update_ticket_datetimes(
+			$new_ticket,
+			$datetimes_on_existing,
+			array_keys($datetimes_on_existing)
+		);
+		// $ticket will get archived later b/c we are NOT adding it to the saved_tickets array.
+		// if existing $ticket has sold amount, then we need to adjust the qty for the new TKT to = the remaining
+		// available.
+		if ($ticket->sold() > 0) {
+			$new_qty = $ticket->qty() - $ticket->sold();
+			$new_ticket->set_qty($new_qty);
+		}
+		// now we update the prices just for this ticket
+		$new_ticket = $this->_add_prices_to_ticket($price_rows, $new_ticket, true);
+		// and we update the base price
+		$new_ticket = $this->_add_prices_to_ticket(
+			array(),
+			$new_ticket,
+			true,
+			$base_price,
+			$base_price_id
+		);
+		return $new_ticket;
+	}
 
 
-    /**
-     * This attaches a list of given prices to a ticket.
-     * Note we dont' have to worry about ever removing relationships (or archiving prices) because if there is a change
-     * in price information on a ticket, a new ticket is created anyways so the archived ticket will retain the old
-     * price info and prices are automatically "archived" via the ticket.
-     *
-     * @access  private
-     * @param array     $prices        Array of prices from the form.
-     * @param EE_Ticket $ticket        EE_Ticket object that prices are being attached to.
-     * @param bool      $new_prices    Whether attach existing incoming prices or create new ones.
-     * @param int|bool  $base_price    if FALSE then NOT doing a base price add.
-     * @param int|bool  $base_price_id if present then this is the base_price_id being updated.
-     * @return EE_Ticket
-     * @throws ReflectionException
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     * @throws EE_Error
-     */
-    protected function _add_prices_to_ticket(
-        $prices = array(),
-        EE_Ticket $ticket,
-        $new_prices = false,
-        $base_price = false,
-        $base_price_id = false
-    ) {
-        // let's just get any current prices that may exist on the given ticket
-        // so we can remove any prices that got trashed in this session.
-        $current_prices_on_ticket = $base_price !== false
-            ? $ticket->base_price(true)
-            : $ticket->price_modifiers();
-        $updated_prices = array();
-        // if $base_price ! FALSE then updating a base price.
-        if ($base_price !== false) {
-            $prices[1] = array(
-                'PRC_ID'     => $new_prices || $base_price_id === 1 ? null : $base_price_id,
-                'PRT_ID'     => 1,
-                'PRC_amount' => $base_price,
-                'PRC_name'   => $ticket->get('TKT_name'),
-                'PRC_desc'   => $ticket->get('TKT_description'),
-            );
-        }
-        // possibly need to save tkt
-        if (! $ticket->ID()) {
-            $ticket->save();
-        }
-        foreach ($prices as $row => $prc) {
-            $prt_id = ! empty($prc['PRT_ID']) ? $prc['PRT_ID'] : null;
-            if (empty($prt_id)) {
-                continue;
-            } //prices MUST have a price type id.
-            $PRC_values = array(
-                'PRC_ID'         => ! empty($prc['PRC_ID']) ? $prc['PRC_ID'] : null,
-                'PRT_ID'         => $prt_id,
-                'PRC_amount'     => ! empty($prc['PRC_amount']) ? $prc['PRC_amount'] : 0,
-                'PRC_name'       => ! empty($prc['PRC_name']) ? $prc['PRC_name'] : '',
-                'PRC_desc'       => ! empty($prc['PRC_desc']) ? $prc['PRC_desc'] : '',
-                'PRC_is_default' => false,
-                // make sure we set PRC_is_default to false for all ticket saves from event_editor
-                'PRC_order'      => $row,
-            );
-            if ($new_prices || empty($PRC_values['PRC_ID'])) {
-                $PRC_values['PRC_ID'] = 0;
-                $price = EE_Registry::instance()->load_class(
-                    'Price',
-                    array($PRC_values),
-                    false,
-                    false
-                );
-            } else {
-                $price = EE_Registry::instance()->load_model('Price')->get_one_by_ID($prc['PRC_ID']);
-                // update this price with new values
-                foreach ($PRC_values as $field => $value) {
-                    $price->set($field, $value);
-                }
-            }
-            $price->save();
-            $updated_prices[ $price->ID() ] = $price;
-            $ticket->_add_relation_to($price, 'Price');
-        }
-        // now let's remove any prices that got removed from the ticket
-        if (! empty($current_prices_on_ticket)) {
-            $current = array_keys($current_prices_on_ticket);
-            $updated = array_keys($updated_prices);
-            $prices_to_remove = array_diff($current, $updated);
-            if (! empty($prices_to_remove)) {
-                foreach ($prices_to_remove as $prc_id) {
-                    $p = $current_prices_on_ticket[ $prc_id ];
-                    $ticket->_remove_relation_to($p, 'Price');
-                    // delete permanently the price
-                    $p->delete_permanently();
-                }
-            }
-        }
-        return $ticket;
-    }
+	/**
+	 * This attaches a list of given prices to a ticket.
+	 * Note we dont' have to worry about ever removing relationships (or archiving prices) because if there is a change
+	 * in price information on a ticket, a new ticket is created anyways so the archived ticket will retain the old
+	 * price info and prices are automatically "archived" via the ticket.
+	 *
+	 * @access  private
+	 * @param array     $prices        Array of prices from the form.
+	 * @param EE_Ticket $ticket        EE_Ticket object that prices are being attached to.
+	 * @param bool      $new_prices    Whether attach existing incoming prices or create new ones.
+	 * @param int|bool  $base_price    if FALSE then NOT doing a base price add.
+	 * @param int|bool  $base_price_id if present then this is the base_price_id being updated.
+	 * @return EE_Ticket
+	 * @throws ReflectionException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 * @throws EE_Error
+	 */
+	protected function _add_prices_to_ticket(
+		$prices = array(),
+		EE_Ticket $ticket,
+		$new_prices = false,
+		$base_price = false,
+		$base_price_id = false
+	) {
+		// let's just get any current prices that may exist on the given ticket
+		// so we can remove any prices that got trashed in this session.
+		$current_prices_on_ticket = $base_price !== false
+			? $ticket->base_price(true)
+			: $ticket->price_modifiers();
+		$updated_prices = array();
+		// if $base_price ! FALSE then updating a base price.
+		if ($base_price !== false) {
+			$prices[1] = array(
+				'PRC_ID'     => $new_prices || $base_price_id === 1 ? null : $base_price_id,
+				'PRT_ID'     => 1,
+				'PRC_amount' => $base_price,
+				'PRC_name'   => $ticket->get('TKT_name'),
+				'PRC_desc'   => $ticket->get('TKT_description'),
+			);
+		}
+		// possibly need to save tkt
+		if (! $ticket->ID()) {
+			$ticket->save();
+		}
+		foreach ($prices as $row => $prc) {
+			$prt_id = ! empty($prc['PRT_ID']) ? $prc['PRT_ID'] : null;
+			if (empty($prt_id)) {
+				continue;
+			} //prices MUST have a price type id.
+			$PRC_values = array(
+				'PRC_ID'         => ! empty($prc['PRC_ID']) ? $prc['PRC_ID'] : null,
+				'PRT_ID'         => $prt_id,
+				'PRC_amount'     => ! empty($prc['PRC_amount']) ? $prc['PRC_amount'] : 0,
+				'PRC_name'       => ! empty($prc['PRC_name']) ? $prc['PRC_name'] : '',
+				'PRC_desc'       => ! empty($prc['PRC_desc']) ? $prc['PRC_desc'] : '',
+				'PRC_is_default' => false,
+				// make sure we set PRC_is_default to false for all ticket saves from event_editor
+				'PRC_order'      => $row,
+			);
+			if ($new_prices || empty($PRC_values['PRC_ID'])) {
+				$PRC_values['PRC_ID'] = 0;
+				$price = EE_Registry::instance()->load_class(
+					'Price',
+					array($PRC_values),
+					false,
+					false
+				);
+			} else {
+				$price = EE_Registry::instance()->load_model('Price')->get_one_by_ID($prc['PRC_ID']);
+				// update this price with new values
+				foreach ($PRC_values as $field => $value) {
+					$price->set($field, $value);
+				}
+			}
+			$price->save();
+			$updated_prices[ $price->ID() ] = $price;
+			$ticket->_add_relation_to($price, 'Price');
+		}
+		// now let's remove any prices that got removed from the ticket
+		if (! empty($current_prices_on_ticket)) {
+			$current = array_keys($current_prices_on_ticket);
+			$updated = array_keys($updated_prices);
+			$prices_to_remove = array_diff($current, $updated);
+			if (! empty($prices_to_remove)) {
+				foreach ($prices_to_remove as $prc_id) {
+					$p = $current_prices_on_ticket[ $prc_id ];
+					$ticket->_remove_relation_to($p, 'Price');
+					// delete permanently the price
+					$p->delete_permanently();
+				}
+			}
+		}
+		return $ticket;
+	}
 
 
-    /**
-     * @param Events_Admin_Page $event_admin_obj
-     * @return Events_Admin_Page
-     */
-    public function autosave_handling(Events_Admin_Page $event_admin_obj)
-    {
-        return $event_admin_obj;
-        // doing nothing for the moment.
-        // todo when I get to this remember that I need to set the template args on the $event_admin_obj
-        // (use the set_template_args() method)
-        /**
-         * need to remember to handle TICKET DEFAULT saves correctly:  I've got two input fields in the dom:
-         * 1. TKT_is_default_selector (visible)
-         * 2. TKT_is_default (hidden)
-         * I think we'll use the TKT_is_default for recording whether the ticket displayed IS a default ticket
-         * (on new event creations). Whereas the TKT_is_default_selector is for the user to indicate they want
-         * this ticket to be saved as a default.
-         * The tricky part is, on an initial display on create or edit (or after manually updating),
-         * the TKT_is_default_selector will always be unselected and the TKT_is_default will only be true
-         * if this is a create.  However, after an autosave, users will want some sort of indicator that
-         * the TKT HAS been saved as a default..
-         * in other words we don't want to remove the check on TKT_is_default_selector. So here's what I'm thinking.
-         * On Autosave:
-         * 1. If TKT_is_default is true: we create a new TKT, send back the new id and add id to related elements,
-         * then set the TKT_is_default to false.
-         * 2. If TKT_is_default_selector is true: we create/edit existing ticket (following conditions above as well).
-         *  We do NOT create a new default ticket.  The checkbox stays selected after autosave.
-         * 3. only on MANUAL update do we check for the selection and if selected create the new default ticket.
-         */
-    }
+	/**
+	 * @param Events_Admin_Page $event_admin_obj
+	 * @return Events_Admin_Page
+	 */
+	public function autosave_handling(Events_Admin_Page $event_admin_obj)
+	{
+		return $event_admin_obj;
+		// doing nothing for the moment.
+		// todo when I get to this remember that I need to set the template args on the $event_admin_obj
+		// (use the set_template_args() method)
+		/**
+		 * need to remember to handle TICKET DEFAULT saves correctly:  I've got two input fields in the dom:
+		 * 1. TKT_is_default_selector (visible)
+		 * 2. TKT_is_default (hidden)
+		 * I think we'll use the TKT_is_default for recording whether the ticket displayed IS a default ticket
+		 * (on new event creations). Whereas the TKT_is_default_selector is for the user to indicate they want
+		 * this ticket to be saved as a default.
+		 * The tricky part is, on an initial display on create or edit (or after manually updating),
+		 * the TKT_is_default_selector will always be unselected and the TKT_is_default will only be true
+		 * if this is a create.  However, after an autosave, users will want some sort of indicator that
+		 * the TKT HAS been saved as a default..
+		 * in other words we don't want to remove the check on TKT_is_default_selector. So here's what I'm thinking.
+		 * On Autosave:
+		 * 1. If TKT_is_default is true: we create a new TKT, send back the new id and add id to related elements,
+		 * then set the TKT_is_default to false.
+		 * 2. If TKT_is_default_selector is true: we create/edit existing ticket (following conditions above as well).
+		 *  We do NOT create a new default ticket.  The checkbox stays selected after autosave.
+		 * 3. only on MANUAL update do we check for the selection and if selected create the new default ticket.
+		 */
+	}
 
 
-    /**
-     * @throws ReflectionException
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     * @throws DomainException
-     * @throws EE_Error
-     */
-    public function pricing_metabox()
-    {
-        $existing_datetime_ids = $existing_ticket_ids = $datetime_tickets = $ticket_datetimes = array();
-        $event = $this->_adminpage_obj->get_cpt_model_obj();
-        // set is_creating_event property.
-        $EVT_ID = $event->ID();
-        $this->_is_creating_event = empty($this->_req_data['post']);
-        // default main template args
-        $main_template_args = array(
-            'event_datetime_help_link' => EEH_Template::get_help_tab_link(
-                'event_editor_event_datetimes_help_tab',
-                $this->_adminpage_obj->page_slug,
-                $this->_adminpage_obj->get_req_action(),
-                false,
-                false
-            ),
-            // todo need to add a filter to the template for the help text
-            // in the Events_Admin_Page core file so we can add further help
-            'existing_datetime_ids'    => '',
-            'total_dtt_rows'           => 1,
-            'add_new_dtt_help_link'    => EEH_Template::get_help_tab_link(
-                'add_new_dtt_info',
-                $this->_adminpage_obj->page_slug,
-                $this->_adminpage_obj->get_req_action(),
-                false,
-                false
-            ),
-            // todo need to add this help info id to the Events_Admin_Page core file so we can access it here.
-            'datetime_rows'            => '',
-            'show_tickets_container'   => '',
-            // $this->_adminpage_obj->get_cpt_model_obj()->ID() > 1 ? ' style="display:none;"' : '',
-            'ticket_rows'              => '',
-            'existing_ticket_ids'      => '',
-            'total_ticket_rows'        => 1,
-            'ticket_js_structure'      => '',
-            'ee_collapsible_status'    => ' ee-collapsible-open'
-            // $this->_adminpage_obj->get_cpt_model_obj()->ID() > 0 ? ' ee-collapsible-closed' : ' ee-collapsible-open'
-        );
-        $timezone = $event instanceof EE_Event ? $event->timezone_string() : null;
-        do_action('AHEE_log', __FILE__, __FUNCTION__, '');
-        /**
-         * 1. Start with retrieving Datetimes
-         * 2. For each datetime get related tickets
-         * 3. For each ticket get related prices
-         */
-        /** @var EEM_Datetime $datetime_model */
-        $datetime_model = EE_Registry::instance()->load_model('Datetime', array($timezone));
-        $datetimes = $datetime_model->get_all_event_dates($EVT_ID);
-        $main_template_args['total_dtt_rows'] = count($datetimes);
-        /**
-         * @see https://events.codebasehq.com/projects/event-espresso/tickets/9486
-         * for why we are counting $datetime_row and then setting that on the Datetime object
-         */
-        $datetime_row = 1;
-        foreach ($datetimes as $datetime) {
-            $DTT_ID = $datetime->get('DTT_ID');
-            $datetime->set('DTT_order', $datetime_row);
-            $existing_datetime_ids[] = $DTT_ID;
-            // tickets attached
-            $related_tickets = $datetime->ID() > 0
-                ? $datetime->get_many_related(
-                    'Ticket',
-                    array(
-                        array(
-                            'OR' => array('TKT_deleted' => 1, 'TKT_deleted*' => 0),
-                        ),
-                        'default_where_conditions' => 'none',
-                        'order_by'                 => array('TKT_order' => 'ASC'),
-                    )
-                )
-                : array();
-            // if there are no related tickets this is likely a new event OR autodraft
-            // event so we need to generate the default tickets because datetimes
-            // ALWAYS have at least one related ticket!!.  EXCEPT, we dont' do this if there is already more than one
-            // datetime on the event.
-            if (empty($related_tickets) && count($datetimes) < 2) {
-                /** @var EEM_Ticket $ticket_model */
-                $ticket_model = EE_Registry::instance()->load_model('Ticket');
-                $related_tickets = $ticket_model->get_all_default_tickets();
-                // this should be ordered by TKT_ID, so let's grab the first default ticket
-                // (which will be the main default) and ensure it has any default prices added to it (but do NOT save).
-                $default_prices = EEM_Price::instance()->get_all_default_prices();
-                $main_default_ticket = reset($related_tickets);
-                if ($main_default_ticket instanceof EE_Ticket) {
-                    foreach ($default_prices as $default_price) {
-                        if ($default_price instanceof EE_Price && $default_price->is_base_price()) {
-                            continue;
-                        }
-                        $main_default_ticket->cache('Price', $default_price);
-                    }
-                }
-            }
-            // we can't actually setup rows in this loop yet cause we don't know all
-            // the unique tickets for this event yet (tickets are linked through all datetimes).
-            // So we're going to temporarily cache some of that information.
-            // loop through and setup the ticket rows and make sure the order is set.
-            foreach ($related_tickets as $ticket) {
-                $TKT_ID = $ticket->get('TKT_ID');
-                $ticket_row = $ticket->get('TKT_row');
-                // we only want unique tickets in our final display!!
-                if (! in_array($TKT_ID, $existing_ticket_ids, true)) {
-                    $existing_ticket_ids[] = $TKT_ID;
-                    $all_tickets[] = $ticket;
-                }
-                // temporary cache of this ticket info for this datetime for later processing of datetime rows.
-                $datetime_tickets[ $DTT_ID ][] = $ticket_row;
-                // temporary cache of this datetime info for this ticket for later processing of ticket rows.
-                if (! isset($ticket_datetimes[ $TKT_ID ])
-                    || ! in_array($datetime_row, $ticket_datetimes[ $TKT_ID ], true)
-                ) {
-                    $ticket_datetimes[ $TKT_ID ][] = $datetime_row;
-                }
-            }
-            $datetime_row++;
-        }
-        $main_template_args['total_ticket_rows'] = count($existing_ticket_ids);
-        $main_template_args['existing_ticket_ids'] = implode(',', $existing_ticket_ids);
-        $main_template_args['existing_datetime_ids'] = implode(',', $existing_datetime_ids);
-        // sort $all_tickets by order
-        usort(
-            $all_tickets,
-            function (EE_Ticket $a, EE_Ticket $b) {
-                $a_order = (int) $a->get('TKT_order');
-                $b_order = (int) $b->get('TKT_order');
-                if ($a_order === $b_order) {
-                    return 0;
-                }
-                return ($a_order < $b_order) ? -1 : 1;
-            }
-        );
-        // k NOW we have all the data we need for setting up the dtt rows
-        // and ticket rows so we start our dtt loop again.
-        $datetime_row = 1;
-        foreach ($datetimes as $datetime) {
-            $main_template_args['datetime_rows'] .= $this->_get_datetime_row(
-                $datetime_row,
-                $datetime,
-                $datetime_tickets,
-                $all_tickets,
-                false,
-                $datetimes
-            );
-            $datetime_row++;
-        }
-        // then loop through all tickets for the ticket rows.
-        $ticket_row = 1;
-        foreach ($all_tickets as $ticket) {
-            $main_template_args['ticket_rows'] .= $this->_get_ticket_row(
-                $ticket_row,
-                $ticket,
-                $ticket_datetimes,
-                $datetimes,
-                false,
-                $all_tickets
-            );
-            $ticket_row++;
-        }
-        $main_template_args['ticket_js_structure'] = $this->_get_ticket_js_structure($datetimes, $all_tickets);
-        EEH_Template::display_template(
-            PRICING_TEMPLATE_PATH . 'event_tickets_metabox_main.template.php',
-            $main_template_args
-        );
-    }
+	/**
+	 * @throws ReflectionException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 * @throws DomainException
+	 * @throws EE_Error
+	 */
+	public function pricing_metabox()
+	{
+		$existing_datetime_ids = $existing_ticket_ids = $datetime_tickets = $ticket_datetimes = array();
+		$event = $this->_adminpage_obj->get_cpt_model_obj();
+		// set is_creating_event property.
+		$EVT_ID = $event->ID();
+		$this->_is_creating_event = empty($this->_req_data['post']);
+		// default main template args
+		$main_template_args = array(
+			'event_datetime_help_link' => EEH_Template::get_help_tab_link(
+				'event_editor_event_datetimes_help_tab',
+				$this->_adminpage_obj->page_slug,
+				$this->_adminpage_obj->get_req_action(),
+				false,
+				false
+			),
+			// todo need to add a filter to the template for the help text
+			// in the Events_Admin_Page core file so we can add further help
+			'existing_datetime_ids'    => '',
+			'total_dtt_rows'           => 1,
+			'add_new_dtt_help_link'    => EEH_Template::get_help_tab_link(
+				'add_new_dtt_info',
+				$this->_adminpage_obj->page_slug,
+				$this->_adminpage_obj->get_req_action(),
+				false,
+				false
+			),
+			// todo need to add this help info id to the Events_Admin_Page core file so we can access it here.
+			'datetime_rows'            => '',
+			'show_tickets_container'   => '',
+			// $this->_adminpage_obj->get_cpt_model_obj()->ID() > 1 ? ' style="display:none;"' : '',
+			'ticket_rows'              => '',
+			'existing_ticket_ids'      => '',
+			'total_ticket_rows'        => 1,
+			'ticket_js_structure'      => '',
+			'ee_collapsible_status'    => ' ee-collapsible-open'
+			// $this->_adminpage_obj->get_cpt_model_obj()->ID() > 0 ? ' ee-collapsible-closed' : ' ee-collapsible-open'
+		);
+		$timezone = $event instanceof EE_Event ? $event->timezone_string() : null;
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		/**
+		 * 1. Start with retrieving Datetimes
+		 * 2. For each datetime get related tickets
+		 * 3. For each ticket get related prices
+		 */
+		/** @var EEM_Datetime $datetime_model */
+		$datetime_model = EE_Registry::instance()->load_model('Datetime', array($timezone));
+		$datetimes = $datetime_model->get_all_event_dates($EVT_ID);
+		$main_template_args['total_dtt_rows'] = count($datetimes);
+		/**
+		 * @see https://events.codebasehq.com/projects/event-espresso/tickets/9486
+		 * for why we are counting $datetime_row and then setting that on the Datetime object
+		 */
+		$datetime_row = 1;
+		foreach ($datetimes as $datetime) {
+			$DTT_ID = $datetime->get('DTT_ID');
+			$datetime->set('DTT_order', $datetime_row);
+			$existing_datetime_ids[] = $DTT_ID;
+			// tickets attached
+			$related_tickets = $datetime->ID() > 0
+				? $datetime->get_many_related(
+					'Ticket',
+					array(
+						array(
+							'OR' => array('TKT_deleted' => 1, 'TKT_deleted*' => 0),
+						),
+						'default_where_conditions' => 'none',
+						'order_by'                 => array('TKT_order' => 'ASC'),
+					)
+				)
+				: array();
+			// if there are no related tickets this is likely a new event OR autodraft
+			// event so we need to generate the default tickets because datetimes
+			// ALWAYS have at least one related ticket!!.  EXCEPT, we dont' do this if there is already more than one
+			// datetime on the event.
+			if (empty($related_tickets) && count($datetimes) < 2) {
+				/** @var EEM_Ticket $ticket_model */
+				$ticket_model = EE_Registry::instance()->load_model('Ticket');
+				$related_tickets = $ticket_model->get_all_default_tickets();
+				// this should be ordered by TKT_ID, so let's grab the first default ticket
+				// (which will be the main default) and ensure it has any default prices added to it (but do NOT save).
+				$default_prices = EEM_Price::instance()->get_all_default_prices();
+				$main_default_ticket = reset($related_tickets);
+				if ($main_default_ticket instanceof EE_Ticket) {
+					foreach ($default_prices as $default_price) {
+						if ($default_price instanceof EE_Price && $default_price->is_base_price()) {
+							continue;
+						}
+						$main_default_ticket->cache('Price', $default_price);
+					}
+				}
+			}
+			// we can't actually setup rows in this loop yet cause we don't know all
+			// the unique tickets for this event yet (tickets are linked through all datetimes).
+			// So we're going to temporarily cache some of that information.
+			// loop through and setup the ticket rows and make sure the order is set.
+			foreach ($related_tickets as $ticket) {
+				$TKT_ID = $ticket->get('TKT_ID');
+				$ticket_row = $ticket->get('TKT_row');
+				// we only want unique tickets in our final display!!
+				if (! in_array($TKT_ID, $existing_ticket_ids, true)) {
+					$existing_ticket_ids[] = $TKT_ID;
+					$all_tickets[] = $ticket;
+				}
+				// temporary cache of this ticket info for this datetime for later processing of datetime rows.
+				$datetime_tickets[ $DTT_ID ][] = $ticket_row;
+				// temporary cache of this datetime info for this ticket for later processing of ticket rows.
+				if (! isset($ticket_datetimes[ $TKT_ID ])
+					|| ! in_array($datetime_row, $ticket_datetimes[ $TKT_ID ], true)
+				) {
+					$ticket_datetimes[ $TKT_ID ][] = $datetime_row;
+				}
+			}
+			$datetime_row++;
+		}
+		$main_template_args['total_ticket_rows'] = count($existing_ticket_ids);
+		$main_template_args['existing_ticket_ids'] = implode(',', $existing_ticket_ids);
+		$main_template_args['existing_datetime_ids'] = implode(',', $existing_datetime_ids);
+		// sort $all_tickets by order
+		usort(
+			$all_tickets,
+			function (EE_Ticket $a, EE_Ticket $b) {
+				$a_order = (int) $a->get('TKT_order');
+				$b_order = (int) $b->get('TKT_order');
+				if ($a_order === $b_order) {
+					return 0;
+				}
+				return ($a_order < $b_order) ? -1 : 1;
+			}
+		);
+		// k NOW we have all the data we need for setting up the dtt rows
+		// and ticket rows so we start our dtt loop again.
+		$datetime_row = 1;
+		foreach ($datetimes as $datetime) {
+			$main_template_args['datetime_rows'] .= $this->_get_datetime_row(
+				$datetime_row,
+				$datetime,
+				$datetime_tickets,
+				$all_tickets,
+				false,
+				$datetimes
+			);
+			$datetime_row++;
+		}
+		// then loop through all tickets for the ticket rows.
+		$ticket_row = 1;
+		foreach ($all_tickets as $ticket) {
+			$main_template_args['ticket_rows'] .= $this->_get_ticket_row(
+				$ticket_row,
+				$ticket,
+				$ticket_datetimes,
+				$datetimes,
+				false,
+				$all_tickets
+			);
+			$ticket_row++;
+		}
+		$main_template_args['ticket_js_structure'] = $this->_get_ticket_js_structure($datetimes, $all_tickets);
+		EEH_Template::display_template(
+			PRICING_TEMPLATE_PATH . 'event_tickets_metabox_main.template.php',
+			$main_template_args
+		);
+	}
 
 
-    /**
-     * @param int         $datetime_row
-     * @param EE_Datetime $datetime
-     * @param array       $datetime_tickets
-     * @param array       $all_tickets
-     * @param bool        $default
-     * @param array       $all_datetimes
-     * @return mixed
-     * @throws DomainException
-     * @throws EE_Error
-     */
-    protected function _get_datetime_row(
-        $datetime_row,
-        EE_Datetime $datetime,
-        $datetime_tickets = array(),
-        $all_tickets = array(),
-        $default = false,
-        $all_datetimes = array()
-    ) {
-        $dtt_display_template_args = array(
-            'dtt_edit_row'             => $this->_get_dtt_edit_row(
-                $datetime_row,
-                $datetime,
-                $default,
-                $all_datetimes
-            ),
-            'dtt_attached_tickets_row' => $this->_get_dtt_attached_tickets_row(
-                $datetime_row,
-                $datetime,
-                $datetime_tickets,
-                $all_tickets,
-                $default
-            ),
-            'dtt_row'                  => $default ? 'DTTNUM' : $datetime_row,
-        );
-        return EEH_Template::display_template(
-            PRICING_TEMPLATE_PATH . 'event_tickets_datetime_row_wrapper.template.php',
-            $dtt_display_template_args,
-            true
-        );
-    }
+	/**
+	 * @param int         $datetime_row
+	 * @param EE_Datetime $datetime
+	 * @param array       $datetime_tickets
+	 * @param array       $all_tickets
+	 * @param bool        $default
+	 * @param array       $all_datetimes
+	 * @return mixed
+	 * @throws DomainException
+	 * @throws EE_Error
+	 */
+	protected function _get_datetime_row(
+		$datetime_row,
+		EE_Datetime $datetime,
+		$datetime_tickets = array(),
+		$all_tickets = array(),
+		$default = false,
+		$all_datetimes = array()
+	) {
+		$dtt_display_template_args = array(
+			'dtt_edit_row'             => $this->_get_dtt_edit_row(
+				$datetime_row,
+				$datetime,
+				$default,
+				$all_datetimes
+			),
+			'dtt_attached_tickets_row' => $this->_get_dtt_attached_tickets_row(
+				$datetime_row,
+				$datetime,
+				$datetime_tickets,
+				$all_tickets,
+				$default
+			),
+			'dtt_row'                  => $default ? 'DTTNUM' : $datetime_row,
+		);
+		return EEH_Template::display_template(
+			PRICING_TEMPLATE_PATH . 'event_tickets_datetime_row_wrapper.template.php',
+			$dtt_display_template_args,
+			true
+		);
+	}
 
 
-    /**
-     * This method is used to generate a dtt fields  edit row.
-     * The same row is used to generate a row with valid DTT objects
-     * and the default row that is used as the skeleton by the js.
-     *
-     * @param int           $datetime_row  The row number for the row being generated.
-     * @param EE_Datetime   $datetime
-     * @param bool          $default       Whether a default row is being generated or not.
-     * @param EE_Datetime[] $all_datetimes This is the array of all datetimes used in the editor.
-     * @return string
-     * @throws DomainException
-     * @throws EE_Error
-     */
-    protected function _get_dtt_edit_row($datetime_row, $datetime, $default, $all_datetimes)
-    {
-        // if the incoming $datetime object is NOT an instance of EE_Datetime then force default to true.
-        $default = ! $datetime instanceof EE_Datetime ? true : $default;
-        $template_args = array(
-            'dtt_row'              => $default ? 'DTTNUM' : $datetime_row,
-            'event_datetimes_name' => $default ? 'DTTNAMEATTR' : 'edit_event_datetimes',
-            'edit_dtt_expanded'    => '',
-            'DTT_ID'               => $default ? '' : $datetime->ID(),
-            'DTT_name'             => $default ? '' : $datetime->get_f('DTT_name'),
-            'DTT_description'      => $default ? '' : $datetime->get_f('DTT_description'),
-            'DTT_EVT_start'        => $default ? '' : $datetime->start_date($this->_date_time_format),
-            'DTT_EVT_end'          => $default ? '' : $datetime->end_date($this->_date_time_format),
-            'DTT_reg_limit'        => $default
-                ? ''
-                : $datetime->get_pretty(
-                    'DTT_reg_limit',
-                    'input'
-                ),
-            'DTT_order'            => $default ? 'DTTNUM' : $datetime_row,
-            'dtt_sold'             => $default ? '0' : $datetime->get('DTT_sold'),
-            'dtt_reserved'         => $default ? '0' : $datetime->reserved(),
-            'clone_icon'           => ! empty($datetime) && $datetime->get('DTT_sold') > 0
-                ? ''
-                : 'clone-icon ee-icon ee-icon-clone clickable',
-            'trash_icon'           => ! empty($datetime) && $datetime->get('DTT_sold') > 0
-                ? 'ee-lock-icon'
-                : 'trash-icon dashicons dashicons-post-trash clickable',
-            'reg_list_url'         => $default || ! $datetime->event() instanceof \EE_Event
-                ? ''
-                : EE_Admin_Page::add_query_args_and_nonce(
-                    array('event_id' => $datetime->event()->ID(), 'datetime_id' => $datetime->ID()),
-                    REG_ADMIN_URL
-                ),
-        );
-        $template_args['show_trash'] = count($all_datetimes) === 1 && $template_args['trash_icon'] !== 'ee-lock-icon'
-            ? ' style="display:none"'
-            : '';
-        // allow filtering of template args at this point.
-        $template_args = apply_filters(
-            'FHEE__espresso_events_Pricing_Hooks___get_dtt_edit_row__template_args',
-            $template_args,
-            $datetime_row,
-            $datetime,
-            $default,
-            $all_datetimes,
-            $this->_is_creating_event
-        );
-        return EEH_Template::display_template(
-            PRICING_TEMPLATE_PATH . 'event_tickets_datetime_edit_row.template.php',
-            $template_args,
-            true
-        );
-    }
+	/**
+	 * This method is used to generate a dtt fields  edit row.
+	 * The same row is used to generate a row with valid DTT objects
+	 * and the default row that is used as the skeleton by the js.
+	 *
+	 * @param int           $datetime_row  The row number for the row being generated.
+	 * @param EE_Datetime   $datetime
+	 * @param bool          $default       Whether a default row is being generated or not.
+	 * @param EE_Datetime[] $all_datetimes This is the array of all datetimes used in the editor.
+	 * @return string
+	 * @throws DomainException
+	 * @throws EE_Error
+	 */
+	protected function _get_dtt_edit_row($datetime_row, $datetime, $default, $all_datetimes)
+	{
+		// if the incoming $datetime object is NOT an instance of EE_Datetime then force default to true.
+		$default = ! $datetime instanceof EE_Datetime ? true : $default;
+		$template_args = array(
+			'dtt_row'              => $default ? 'DTTNUM' : $datetime_row,
+			'event_datetimes_name' => $default ? 'DTTNAMEATTR' : 'edit_event_datetimes',
+			'edit_dtt_expanded'    => '',
+			'DTT_ID'               => $default ? '' : $datetime->ID(),
+			'DTT_name'             => $default ? '' : $datetime->get_f('DTT_name'),
+			'DTT_description'      => $default ? '' : $datetime->get_f('DTT_description'),
+			'DTT_EVT_start'        => $default ? '' : $datetime->start_date($this->_date_time_format),
+			'DTT_EVT_end'          => $default ? '' : $datetime->end_date($this->_date_time_format),
+			'DTT_reg_limit'        => $default
+				? ''
+				: $datetime->get_pretty(
+					'DTT_reg_limit',
+					'input'
+				),
+			'DTT_order'            => $default ? 'DTTNUM' : $datetime_row,
+			'dtt_sold'             => $default ? '0' : $datetime->get('DTT_sold'),
+			'dtt_reserved'         => $default ? '0' : $datetime->reserved(),
+			'clone_icon'           => ! empty($datetime) && $datetime->get('DTT_sold') > 0
+				? ''
+				: 'clone-icon ee-icon ee-icon-clone clickable',
+			'trash_icon'           => ! empty($datetime) && $datetime->get('DTT_sold') > 0
+				? 'ee-lock-icon'
+				: 'trash-icon dashicons dashicons-post-trash clickable',
+			'reg_list_url'         => $default || ! $datetime->event() instanceof \EE_Event
+				? ''
+				: EE_Admin_Page::add_query_args_and_nonce(
+					array('event_id' => $datetime->event()->ID(), 'datetime_id' => $datetime->ID()),
+					REG_ADMIN_URL
+				),
+		);
+		$template_args['show_trash'] = count($all_datetimes) === 1 && $template_args['trash_icon'] !== 'ee-lock-icon'
+			? ' style="display:none"'
+			: '';
+		// allow filtering of template args at this point.
+		$template_args = apply_filters(
+			'FHEE__espresso_events_Pricing_Hooks___get_dtt_edit_row__template_args',
+			$template_args,
+			$datetime_row,
+			$datetime,
+			$default,
+			$all_datetimes,
+			$this->_is_creating_event
+		);
+		return EEH_Template::display_template(
+			PRICING_TEMPLATE_PATH . 'event_tickets_datetime_edit_row.template.php',
+			$template_args,
+			true
+		);
+	}
 
 
-    /**
-     * @param int         $datetime_row
-     * @param EE_Datetime $datetime
-     * @param array       $datetime_tickets
-     * @param array       $all_tickets
-     * @param bool        $default
-     * @return mixed
-     * @throws DomainException
-     * @throws EE_Error
-     */
-    protected function _get_dtt_attached_tickets_row(
-        $datetime_row,
-        $datetime,
-        $datetime_tickets = array(),
-        $all_tickets = array(),
-        $default
-    ) {
-        $template_args = array(
-            'dtt_row'                           => $default ? 'DTTNUM' : $datetime_row,
-            'event_datetimes_name'              => $default ? 'DTTNAMEATTR' : 'edit_event_datetimes',
-            'DTT_description'                   => $default ? '' : $datetime->get_f('DTT_description'),
-            'datetime_tickets_list'             => $default ? '<li class="hidden"></li>' : '',
-            'show_tickets_row'                  => ' style="display:none;"',
-            'add_new_datetime_ticket_help_link' => EEH_Template::get_help_tab_link(
-                'add_new_ticket_via_datetime',
-                $this->_adminpage_obj->page_slug,
-                $this->_adminpage_obj->get_req_action(),
-                false,
-                false
-            ),
-            // todo need to add this help info id to the Events_Admin_Page core file so we can access it here.
-            'DTT_ID'                            => $default ? '' : $datetime->ID(),
-        );
-        // need to setup the list items (but only if this isn't a default skeleton setup)
-        if (! $default) {
-            $ticket_row = 1;
-            foreach ($all_tickets as $ticket) {
-                $template_args['datetime_tickets_list'] .= $this->_get_datetime_tickets_list_item(
-                    $datetime_row,
-                    $ticket_row,
-                    $datetime,
-                    $ticket,
-                    $datetime_tickets,
-                    $default
-                );
-                $ticket_row++;
-            }
-        }
-        // filter template args at this point
-        $template_args = apply_filters(
-            'FHEE__espresso_events_Pricing_Hooks___get_dtt_attached_ticket_row__template_args',
-            $template_args,
-            $datetime_row,
-            $datetime,
-            $datetime_tickets,
-            $all_tickets,
-            $default,
-            $this->_is_creating_event
-        );
-        return EEH_Template::display_template(
-            PRICING_TEMPLATE_PATH . 'event_tickets_datetime_attached_tickets_row.template.php',
-            $template_args,
-            true
-        );
-    }
+	/**
+	 * @param int         $datetime_row
+	 * @param EE_Datetime $datetime
+	 * @param array       $datetime_tickets
+	 * @param array       $all_tickets
+	 * @param bool        $default
+	 * @return mixed
+	 * @throws DomainException
+	 * @throws EE_Error
+	 */
+	protected function _get_dtt_attached_tickets_row(
+		$datetime_row,
+		$datetime,
+		$datetime_tickets = array(),
+		$all_tickets = array(),
+		$default
+	) {
+		$template_args = array(
+			'dtt_row'                           => $default ? 'DTTNUM' : $datetime_row,
+			'event_datetimes_name'              => $default ? 'DTTNAMEATTR' : 'edit_event_datetimes',
+			'DTT_description'                   => $default ? '' : $datetime->get_f('DTT_description'),
+			'datetime_tickets_list'             => $default ? '<li class="hidden"></li>' : '',
+			'show_tickets_row'                  => ' style="display:none;"',
+			'add_new_datetime_ticket_help_link' => EEH_Template::get_help_tab_link(
+				'add_new_ticket_via_datetime',
+				$this->_adminpage_obj->page_slug,
+				$this->_adminpage_obj->get_req_action(),
+				false,
+				false
+			),
+			// todo need to add this help info id to the Events_Admin_Page core file so we can access it here.
+			'DTT_ID'                            => $default ? '' : $datetime->ID(),
+		);
+		// need to setup the list items (but only if this isn't a default skeleton setup)
+		if (! $default) {
+			$ticket_row = 1;
+			foreach ($all_tickets as $ticket) {
+				$template_args['datetime_tickets_list'] .= $this->_get_datetime_tickets_list_item(
+					$datetime_row,
+					$ticket_row,
+					$datetime,
+					$ticket,
+					$datetime_tickets,
+					$default
+				);
+				$ticket_row++;
+			}
+		}
+		// filter template args at this point
+		$template_args = apply_filters(
+			'FHEE__espresso_events_Pricing_Hooks___get_dtt_attached_ticket_row__template_args',
+			$template_args,
+			$datetime_row,
+			$datetime,
+			$datetime_tickets,
+			$all_tickets,
+			$default,
+			$this->_is_creating_event
+		);
+		return EEH_Template::display_template(
+			PRICING_TEMPLATE_PATH . 'event_tickets_datetime_attached_tickets_row.template.php',
+			$template_args,
+			true
+		);
+	}
 
 
-    /**
-     * @param int         $datetime_row
-     * @param int         $ticket_row
-     * @param EE_Datetime $datetime
-     * @param EE_Ticket   $ticket
-     * @param array       $datetime_tickets
-     * @param bool        $default
-     * @return mixed
-     * @throws DomainException
-     * @throws EE_Error
-     */
-    protected function _get_datetime_tickets_list_item(
-        $datetime_row,
-        $ticket_row,
-        $datetime,
-        $ticket,
-        $datetime_tickets = array(),
-        $default
-    ) {
-        $dtt_tkts = $datetime instanceof EE_Datetime && isset($datetime_tickets[ $datetime->ID() ])
-            ? $datetime_tickets[ $datetime->ID() ]
-            : array();
-        $display_row = $ticket instanceof EE_Ticket ? $ticket->get('TKT_row') : 0;
-        $no_ticket = $default && empty($ticket);
-        $template_args = array(
-            'dtt_row'                 => $default
-                ? 'DTTNUM'
-                : $datetime_row,
-            'tkt_row'                 => $no_ticket
-                ? 'TICKETNUM'
-                : $ticket_row,
-            'datetime_ticket_checked' => in_array($display_row, $dtt_tkts, true)
-                ? ' checked="checked"'
-                : '',
-            'ticket_selected'         => in_array($display_row, $dtt_tkts, true)
-                ? ' ticket-selected'
-                : '',
-            'TKT_name'                => $no_ticket
-                ? 'TKTNAME'
-                : $ticket->get('TKT_name'),
-            'tkt_status_class'        => $no_ticket || $this->_is_creating_event
-                ? ' tkt-status-' . EE_Ticket::onsale
-                : ' tkt-status-' . $ticket->ticket_status(),
-        );
-        // filter template args
-        $template_args = apply_filters(
-            'FHEE__espresso_events_Pricing_Hooks___get_datetime_tickets_list_item__template_args',
-            $template_args,
-            $datetime_row,
-            $ticket_row,
-            $datetime,
-            $ticket,
-            $datetime_tickets,
-            $default,
-            $this->_is_creating_event
-        );
-        return EEH_Template::display_template(
-            PRICING_TEMPLATE_PATH . 'event_tickets_datetime_dtt_tickets_list.template.php',
-            $template_args,
-            true
-        );
-    }
+	/**
+	 * @param int         $datetime_row
+	 * @param int         $ticket_row
+	 * @param EE_Datetime $datetime
+	 * @param EE_Ticket   $ticket
+	 * @param array       $datetime_tickets
+	 * @param bool        $default
+	 * @return mixed
+	 * @throws DomainException
+	 * @throws EE_Error
+	 */
+	protected function _get_datetime_tickets_list_item(
+		$datetime_row,
+		$ticket_row,
+		$datetime,
+		$ticket,
+		$datetime_tickets = array(),
+		$default
+	) {
+		$dtt_tkts = $datetime instanceof EE_Datetime && isset($datetime_tickets[ $datetime->ID() ])
+			? $datetime_tickets[ $datetime->ID() ]
+			: array();
+		$display_row = $ticket instanceof EE_Ticket ? $ticket->get('TKT_row') : 0;
+		$no_ticket = $default && empty($ticket);
+		$template_args = array(
+			'dtt_row'                 => $default
+				? 'DTTNUM'
+				: $datetime_row,
+			'tkt_row'                 => $no_ticket
+				? 'TICKETNUM'
+				: $ticket_row,
+			'datetime_ticket_checked' => in_array($display_row, $dtt_tkts, true)
+				? ' checked="checked"'
+				: '',
+			'ticket_selected'         => in_array($display_row, $dtt_tkts, true)
+				? ' ticket-selected'
+				: '',
+			'TKT_name'                => $no_ticket
+				? 'TKTNAME'
+				: $ticket->get('TKT_name'),
+			'tkt_status_class'        => $no_ticket || $this->_is_creating_event
+				? ' tkt-status-' . EE_Ticket::onsale
+				: ' tkt-status-' . $ticket->ticket_status(),
+		);
+		// filter template args
+		$template_args = apply_filters(
+			'FHEE__espresso_events_Pricing_Hooks___get_datetime_tickets_list_item__template_args',
+			$template_args,
+			$datetime_row,
+			$ticket_row,
+			$datetime,
+			$ticket,
+			$datetime_tickets,
+			$default,
+			$this->_is_creating_event
+		);
+		return EEH_Template::display_template(
+			PRICING_TEMPLATE_PATH . 'event_tickets_datetime_dtt_tickets_list.template.php',
+			$template_args,
+			true
+		);
+	}
 
 
-    /**
-     * This generates the ticket row for tickets.
-     * This same method is used to generate both the actual rows and the js skeleton row
-     * (when default === true)
-     *
-     * @param int           $ticket_row       Represents the row number being generated.
-     * @param               $ticket
-     * @param EE_Datetime[] $ticket_datetimes Either an array of all datetimes on all tickets indexed by each ticket
-     *                                        or empty for default
-     * @param EE_Datetime[] $all_datetimes    All Datetimes on the event or empty for default.
-     * @param bool          $default          Whether default row being generated or not.
-     * @param EE_Ticket[]   $all_tickets      This is an array of all tickets attached to the event
-     *                                        (or empty in the case of defaults)
-     * @return mixed
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     * @throws DomainException
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function _get_ticket_row(
-        $ticket_row,
-        $ticket,
-        $ticket_datetimes,
-        $all_datetimes,
-        $default = false,
-        $all_tickets = array()
-    ) {
-        // if $ticket is not an instance of EE_Ticket then force default to true.
-        $default = ! $ticket instanceof EE_Ticket ? true : $default;
-        $prices = ! empty($ticket) && ! $default
-            ? $ticket->get_many_related(
-                'Price',
-                array('default_where_conditions' => 'none', 'order_by' => array('PRC_order' => 'ASC'))
-            )
-            : array();
-        // if there is only one price (which would be the base price)
-        // or NO prices and this ticket is a default ticket,
-        // let's just make sure there are no cached default prices on the object.
-        // This is done by not including any query_params.
-        if ($ticket instanceof EE_Ticket && $ticket->is_default() && (count($prices) === 1 || empty($prices))) {
-            $prices = $ticket->prices();
-        }
-        // check if we're dealing with a default ticket in which case
-        // we don't want any starting_ticket_datetime_row values set
-        // (otherwise there won't be any new relationships created for tickets based off of the default ticket).
-        // This will future proof in case there is ever any behaviour change between what the primary_key defaults to.
-        $default_dtt = $default || ($ticket instanceof EE_Ticket && $ticket->is_default());
-        $tkt_datetimes = $ticket instanceof EE_Ticket && isset($ticket_datetimes[ $ticket->ID() ])
-            ? $ticket_datetimes[ $ticket->ID() ]
-            : array();
-        $ticket_subtotal = $default ? 0 : $ticket->get_ticket_subtotal();
-        $base_price = $default ? null : $ticket->base_price();
-        $count_price_mods = EEM_Price::instance()->get_all_default_prices(true);
-        // breaking out complicated condition for ticket_status
-        if ($default) {
-            $ticket_status_class = ' tkt-status-' . EE_Ticket::onsale;
-        } else {
-            $ticket_status_class = $ticket->is_default()
-                ? ' tkt-status-' . EE_Ticket::onsale
-                : ' tkt-status-' . $ticket->ticket_status();
-        }
-        // breaking out complicated condition for TKT_taxable
-        if ($default) {
-            $TKT_taxable = '';
-        } else {
-            $TKT_taxable = $ticket->taxable()
-                ? ' checked="checked"'
-                : '';
-        }
-        if ($default) {
-            $TKT_status = EEH_Template::pretty_status(EE_Ticket::onsale, false, 'sentence');
-        } elseif ($ticket->is_default()) {
-            $TKT_status = EEH_Template::pretty_status(EE_Ticket::onsale, false, 'sentence');
-        } else {
-            $TKT_status = $ticket->ticket_status(true);
-        }
-        if ($default) {
-            $TKT_min = '';
-        } else {
-            $TKT_min = $ticket->min();
-            if ($TKT_min === -1 || $TKT_min === 0) {
-                $TKT_min = '';
-            }
-        }
-        $template_args = array(
-            'tkt_row'                       => $default ? 'TICKETNUM' : $ticket_row,
-            'TKT_order'                     => $default ? 'TICKETNUM' : $ticket_row,
-            // on initial page load this will always be the correct order.
-            'tkt_status_class'              => $ticket_status_class,
-            'display_edit_tkt_row'          => ' style="display:none;"',
-            'edit_tkt_expanded'             => '',
-            'edit_tickets_name'             => $default ? 'TICKETNAMEATTR' : 'edit_tickets',
-            'TKT_name'                      => $default ? '' : $ticket->get_f('TKT_name'),
-            'TKT_start_date'                => $default
-                ? ''
-                : $ticket->get_date('TKT_start_date', $this->_date_time_format),
-            'TKT_end_date'                  => $default
-                ? ''
-                : $ticket->get_date('TKT_end_date', $this->_date_time_format),
-            'TKT_status'                    => $TKT_status,
-            'TKT_price'                     => $default
-                ? ''
-                : EEH_Template::format_currency(
-                    $ticket->get_ticket_total_with_taxes(),
-                    false,
-                    false
-                ),
-            'TKT_price_code'                => EE_Registry::instance()->CFG->currency->code,
-            'TKT_price_amount'              => $default ? 0 : $ticket_subtotal,
-            'TKT_qty'                       => $default
-                ? ''
-                : $ticket->get_pretty('TKT_qty', 'symbol'),
-            'TKT_qty_for_input'             => $default
-                ? ''
-                : $ticket->get_pretty('TKT_qty', 'input'),
-            'TKT_uses'                      => $default
-                ? ''
-                : $ticket->get_pretty('TKT_uses', 'input'),
-            'TKT_min'                       => $TKT_min,
-            'TKT_max'                       => $default
-                ? ''
-                : $ticket->get_pretty('TKT_max', 'input'),
-            'TKT_sold'                      => $default ? 0 : $ticket->tickets_sold('ticket'),
-            'TKT_reserved'                  => $default ? 0 : $ticket->reserved(),
-            'TKT_registrations'             => $default
-                ? 0
-                : $ticket->count_registrations(
-                    array(
-                        array(
-                            'STS_ID' => array(
-                                '!=',
-                                EEM_Registration::status_id_incomplete,
-                            ),
-                        ),
-                    )
-                ),
-            'TKT_ID'                        => $default ? 0 : $ticket->ID(),
-            'TKT_description'               => $default ? '' : $ticket->get_f('TKT_description'),
-            'TKT_is_default'                => $default ? 0 : $ticket->is_default(),
-            'TKT_required'                  => $default ? 0 : $ticket->required(),
-            'TKT_is_default_selector'       => '',
-            'ticket_price_rows'             => '',
-            'TKT_base_price'                => $default || ! $base_price instanceof EE_Price
-                ? ''
-                : $base_price->get_pretty('PRC_amount', 'localized_float'),
-            'TKT_base_price_ID'             => $default || ! $base_price instanceof EE_Price ? 0 : $base_price->ID(),
-            'show_price_modifier'           => count($prices) > 1 || ($default && $count_price_mods > 0)
-                ? ''
-                : ' style="display:none;"',
-            'show_price_mod_button'         => count($prices) > 1
-                                               || ($default && $count_price_mods > 0)
-                                               || (! $default && $ticket->deleted())
-                ? ' style="display:none;"'
-                : '',
-            'total_price_rows'              => count($prices) > 1 ? count($prices) : 1,
-            'ticket_datetimes_list'         => $default ? '<li class="hidden"></li>' : '',
-            'starting_ticket_datetime_rows' => $default || $default_dtt ? '' : implode(',', $tkt_datetimes),
-            'ticket_datetime_rows'          => $default ? '' : implode(',', $tkt_datetimes),
-            'existing_ticket_price_ids'     => $default ? '' : implode(',', array_keys($prices)),
-            'ticket_template_id'            => $default ? 0 : $ticket->get('TTM_ID'),
-            'TKT_taxable'                   => $TKT_taxable,
-            'display_subtotal'              => $ticket instanceof EE_Ticket && $ticket->taxable()
-                ? ''
-                : ' style="display:none"',
-            'price_currency_symbol'         => EE_Registry::instance()->CFG->currency->sign,
-            'TKT_subtotal_amount_display'   => EEH_Template::format_currency(
-                $ticket_subtotal,
-                false,
-                false
-            ),
-            'TKT_subtotal_amount'           => $ticket_subtotal,
-            'tax_rows'                      => $this->_get_tax_rows($ticket_row, $ticket),
-            'disabled'                      => $ticket instanceof EE_Ticket && $ticket->deleted(),
-            'ticket_archive_class'          => $ticket instanceof EE_Ticket && $ticket->deleted()
-                ? ' ticket-archived'
-                : '',
-            'trash_icon'                    => $ticket instanceof EE_Ticket
-                                               && $ticket->deleted()
-                                               && ! $ticket->is_permanently_deleteable()
-                ? 'ee-lock-icon '
-                : 'trash-icon dashicons dashicons-post-trash clickable',
-            'clone_icon'                    => $ticket instanceof EE_Ticket && $ticket->deleted()
-                ? ''
-                : 'clone-icon ee-icon ee-icon-clone clickable',
-        );
-        $template_args['trash_hidden'] = count($all_tickets) === 1 && $template_args['trash_icon'] !== 'ee-lock-icon'
-            ? ' style="display:none"'
-            : '';
-        // handle rows that should NOT be empty
-        if (empty($template_args['TKT_start_date'])) {
-            // if empty then the start date will be now.
-            $template_args['TKT_start_date'] = date(
-                $this->_date_time_format,
-                current_time('timestamp')
-            );
-            $template_args['tkt_status_class'] = ' tkt-status-' . EE_Ticket::onsale;
-        }
-        if (empty($template_args['TKT_end_date'])) {
-            // get the earliest datetime (if present);
-            $earliest_dtt = $this->_adminpage_obj->get_cpt_model_obj()->ID() > 0
-                ? $this->_adminpage_obj->get_cpt_model_obj()->get_first_related(
-                    'Datetime',
-                    array('order_by' => array('DTT_EVT_start' => 'ASC'))
-                )
-                : null;
-            if (! empty($earliest_dtt)) {
-                $template_args['TKT_end_date'] = $earliest_dtt->get_datetime(
-                    'DTT_EVT_start',
-                    $this->_date_time_format
-                );
-            } else {
-                // default so let's just use what's been set for the default date-time which is 30 days from now.
-                $template_args['TKT_end_date'] = date(
-                    $this->_date_time_format,
-                    mktime(
-                        24,
-                        0,
-                        0,
-                        date('m'),
-                        date('d') + 29,
-                        date('Y')
-                    )
-                );
-            }
-            $template_args['tkt_status_class'] = ' tkt-status-' . EE_Ticket::onsale;
-        }
-        // generate ticket_datetime items
-        if (! $default) {
-            $datetime_row = 1;
-            foreach ($all_datetimes as $datetime) {
-                $template_args['ticket_datetimes_list'] .= $this->_get_ticket_datetime_list_item(
-                    $datetime_row,
-                    $ticket_row,
-                    $datetime,
-                    $ticket,
-                    $ticket_datetimes,
-                    $default
-                );
-                $datetime_row++;
-            }
-        }
-        $price_row = 1;
-        foreach ($prices as $price) {
-            if (! $price instanceof EE_Price) {
-                continue;
-            }
-            if ($price->is_base_price()) {
-                $price_row++;
-                continue;
-            }
-            $show_trash = ! ((count($prices) > 1 && $price_row === 1) || count($prices) === 1);
-            $show_create = ! (count($prices) > 1 && count($prices) !== $price_row);
-            $template_args['ticket_price_rows'] .= $this->_get_ticket_price_row(
-                $ticket_row,
-                $price_row,
-                $price,
-                $default,
-                $ticket,
-                $show_trash,
-                $show_create
-            );
-            $price_row++;
-        }
-        // filter $template_args
-        $template_args = apply_filters(
-            'FHEE__espresso_events_Pricing_Hooks___get_ticket_row__template_args',
-            $template_args,
-            $ticket_row,
-            $ticket,
-            $ticket_datetimes,
-            $all_datetimes,
-            $default,
-            $all_tickets,
-            $this->_is_creating_event
-        );
-        return EEH_Template::display_template(
-            PRICING_TEMPLATE_PATH . 'event_tickets_datetime_ticket_row.template.php',
-            $template_args,
-            true
-        );
-    }
+	/**
+	 * This generates the ticket row for tickets.
+	 * This same method is used to generate both the actual rows and the js skeleton row
+	 * (when default === true)
+	 *
+	 * @param int           $ticket_row       Represents the row number being generated.
+	 * @param               $ticket
+	 * @param EE_Datetime[] $ticket_datetimes Either an array of all datetimes on all tickets indexed by each ticket
+	 *                                        or empty for default
+	 * @param EE_Datetime[] $all_datetimes    All Datetimes on the event or empty for default.
+	 * @param bool          $default          Whether default row being generated or not.
+	 * @param EE_Ticket[]   $all_tickets      This is an array of all tickets attached to the event
+	 *                                        (or empty in the case of defaults)
+	 * @return mixed
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 * @throws DomainException
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function _get_ticket_row(
+		$ticket_row,
+		$ticket,
+		$ticket_datetimes,
+		$all_datetimes,
+		$default = false,
+		$all_tickets = array()
+	) {
+		// if $ticket is not an instance of EE_Ticket then force default to true.
+		$default = ! $ticket instanceof EE_Ticket ? true : $default;
+		$prices = ! empty($ticket) && ! $default
+			? $ticket->get_many_related(
+				'Price',
+				array('default_where_conditions' => 'none', 'order_by' => array('PRC_order' => 'ASC'))
+			)
+			: array();
+		// if there is only one price (which would be the base price)
+		// or NO prices and this ticket is a default ticket,
+		// let's just make sure there are no cached default prices on the object.
+		// This is done by not including any query_params.
+		if ($ticket instanceof EE_Ticket && $ticket->is_default() && (count($prices) === 1 || empty($prices))) {
+			$prices = $ticket->prices();
+		}
+		// check if we're dealing with a default ticket in which case
+		// we don't want any starting_ticket_datetime_row values set
+		// (otherwise there won't be any new relationships created for tickets based off of the default ticket).
+		// This will future proof in case there is ever any behaviour change between what the primary_key defaults to.
+		$default_dtt = $default || ($ticket instanceof EE_Ticket && $ticket->is_default());
+		$tkt_datetimes = $ticket instanceof EE_Ticket && isset($ticket_datetimes[ $ticket->ID() ])
+			? $ticket_datetimes[ $ticket->ID() ]
+			: array();
+		$ticket_subtotal = $default ? 0 : $ticket->get_ticket_subtotal();
+		$base_price = $default ? null : $ticket->base_price();
+		$count_price_mods = EEM_Price::instance()->get_all_default_prices(true);
+		// breaking out complicated condition for ticket_status
+		if ($default) {
+			$ticket_status_class = ' tkt-status-' . EE_Ticket::onsale;
+		} else {
+			$ticket_status_class = $ticket->is_default()
+				? ' tkt-status-' . EE_Ticket::onsale
+				: ' tkt-status-' . $ticket->ticket_status();
+		}
+		// breaking out complicated condition for TKT_taxable
+		if ($default) {
+			$TKT_taxable = '';
+		} else {
+			$TKT_taxable = $ticket->taxable()
+				? ' checked="checked"'
+				: '';
+		}
+		if ($default) {
+			$TKT_status = EEH_Template::pretty_status(EE_Ticket::onsale, false, 'sentence');
+		} elseif ($ticket->is_default()) {
+			$TKT_status = EEH_Template::pretty_status(EE_Ticket::onsale, false, 'sentence');
+		} else {
+			$TKT_status = $ticket->ticket_status(true);
+		}
+		if ($default) {
+			$TKT_min = '';
+		} else {
+			$TKT_min = $ticket->min();
+			if ($TKT_min === -1 || $TKT_min === 0) {
+				$TKT_min = '';
+			}
+		}
+		$template_args = array(
+			'tkt_row'                       => $default ? 'TICKETNUM' : $ticket_row,
+			'TKT_order'                     => $default ? 'TICKETNUM' : $ticket_row,
+			// on initial page load this will always be the correct order.
+			'tkt_status_class'              => $ticket_status_class,
+			'display_edit_tkt_row'          => ' style="display:none;"',
+			'edit_tkt_expanded'             => '',
+			'edit_tickets_name'             => $default ? 'TICKETNAMEATTR' : 'edit_tickets',
+			'TKT_name'                      => $default ? '' : $ticket->get_f('TKT_name'),
+			'TKT_start_date'                => $default
+				? ''
+				: $ticket->get_date('TKT_start_date', $this->_date_time_format),
+			'TKT_end_date'                  => $default
+				? ''
+				: $ticket->get_date('TKT_end_date', $this->_date_time_format),
+			'TKT_status'                    => $TKT_status,
+			'TKT_price'                     => $default
+				? ''
+				: EEH_Template::format_currency(
+					$ticket->get_ticket_total_with_taxes(),
+					false,
+					false
+				),
+			'TKT_price_code'                => EE_Registry::instance()->CFG->currency->code,
+			'TKT_price_amount'              => $default ? 0 : $ticket_subtotal,
+			'TKT_qty'                       => $default
+				? ''
+				: $ticket->get_pretty('TKT_qty', 'symbol'),
+			'TKT_qty_for_input'             => $default
+				? ''
+				: $ticket->get_pretty('TKT_qty', 'input'),
+			'TKT_uses'                      => $default
+				? ''
+				: $ticket->get_pretty('TKT_uses', 'input'),
+			'TKT_min'                       => $TKT_min,
+			'TKT_max'                       => $default
+				? ''
+				: $ticket->get_pretty('TKT_max', 'input'),
+			'TKT_sold'                      => $default ? 0 : $ticket->tickets_sold('ticket'),
+			'TKT_reserved'                  => $default ? 0 : $ticket->reserved(),
+			'TKT_registrations'             => $default
+				? 0
+				: $ticket->count_registrations(
+					array(
+						array(
+							'STS_ID' => array(
+								'!=',
+								EEM_Registration::status_id_incomplete,
+							),
+						),
+					)
+				),
+			'TKT_ID'                        => $default ? 0 : $ticket->ID(),
+			'TKT_description'               => $default ? '' : $ticket->get_f('TKT_description'),
+			'TKT_is_default'                => $default ? 0 : $ticket->is_default(),
+			'TKT_required'                  => $default ? 0 : $ticket->required(),
+			'TKT_is_default_selector'       => '',
+			'ticket_price_rows'             => '',
+			'TKT_base_price'                => $default || ! $base_price instanceof EE_Price
+				? ''
+				: $base_price->get_pretty('PRC_amount', 'localized_float'),
+			'TKT_base_price_ID'             => $default || ! $base_price instanceof EE_Price ? 0 : $base_price->ID(),
+			'show_price_modifier'           => count($prices) > 1 || ($default && $count_price_mods > 0)
+				? ''
+				: ' style="display:none;"',
+			'show_price_mod_button'         => count($prices) > 1
+											   || ($default && $count_price_mods > 0)
+											   || (! $default && $ticket->deleted())
+				? ' style="display:none;"'
+				: '',
+			'total_price_rows'              => count($prices) > 1 ? count($prices) : 1,
+			'ticket_datetimes_list'         => $default ? '<li class="hidden"></li>' : '',
+			'starting_ticket_datetime_rows' => $default || $default_dtt ? '' : implode(',', $tkt_datetimes),
+			'ticket_datetime_rows'          => $default ? '' : implode(',', $tkt_datetimes),
+			'existing_ticket_price_ids'     => $default ? '' : implode(',', array_keys($prices)),
+			'ticket_template_id'            => $default ? 0 : $ticket->get('TTM_ID'),
+			'TKT_taxable'                   => $TKT_taxable,
+			'display_subtotal'              => $ticket instanceof EE_Ticket && $ticket->taxable()
+				? ''
+				: ' style="display:none"',
+			'price_currency_symbol'         => EE_Registry::instance()->CFG->currency->sign,
+			'TKT_subtotal_amount_display'   => EEH_Template::format_currency(
+				$ticket_subtotal,
+				false,
+				false
+			),
+			'TKT_subtotal_amount'           => $ticket_subtotal,
+			'tax_rows'                      => $this->_get_tax_rows($ticket_row, $ticket),
+			'disabled'                      => $ticket instanceof EE_Ticket && $ticket->deleted(),
+			'ticket_archive_class'          => $ticket instanceof EE_Ticket && $ticket->deleted()
+				? ' ticket-archived'
+				: '',
+			'trash_icon'                    => $ticket instanceof EE_Ticket
+											   && $ticket->deleted()
+											   && ! $ticket->is_permanently_deleteable()
+				? 'ee-lock-icon '
+				: 'trash-icon dashicons dashicons-post-trash clickable',
+			'clone_icon'                    => $ticket instanceof EE_Ticket && $ticket->deleted()
+				? ''
+				: 'clone-icon ee-icon ee-icon-clone clickable',
+		);
+		$template_args['trash_hidden'] = count($all_tickets) === 1 && $template_args['trash_icon'] !== 'ee-lock-icon'
+			? ' style="display:none"'
+			: '';
+		// handle rows that should NOT be empty
+		if (empty($template_args['TKT_start_date'])) {
+			// if empty then the start date will be now.
+			$template_args['TKT_start_date'] = date(
+				$this->_date_time_format,
+				current_time('timestamp')
+			);
+			$template_args['tkt_status_class'] = ' tkt-status-' . EE_Ticket::onsale;
+		}
+		if (empty($template_args['TKT_end_date'])) {
+			// get the earliest datetime (if present);
+			$earliest_dtt = $this->_adminpage_obj->get_cpt_model_obj()->ID() > 0
+				? $this->_adminpage_obj->get_cpt_model_obj()->get_first_related(
+					'Datetime',
+					array('order_by' => array('DTT_EVT_start' => 'ASC'))
+				)
+				: null;
+			if (! empty($earliest_dtt)) {
+				$template_args['TKT_end_date'] = $earliest_dtt->get_datetime(
+					'DTT_EVT_start',
+					$this->_date_time_format
+				);
+			} else {
+				// default so let's just use what's been set for the default date-time which is 30 days from now.
+				$template_args['TKT_end_date'] = date(
+					$this->_date_time_format,
+					mktime(
+						24,
+						0,
+						0,
+						date('m'),
+						date('d') + 29,
+						date('Y')
+					)
+				);
+			}
+			$template_args['tkt_status_class'] = ' tkt-status-' . EE_Ticket::onsale;
+		}
+		// generate ticket_datetime items
+		if (! $default) {
+			$datetime_row = 1;
+			foreach ($all_datetimes as $datetime) {
+				$template_args['ticket_datetimes_list'] .= $this->_get_ticket_datetime_list_item(
+					$datetime_row,
+					$ticket_row,
+					$datetime,
+					$ticket,
+					$ticket_datetimes,
+					$default
+				);
+				$datetime_row++;
+			}
+		}
+		$price_row = 1;
+		foreach ($prices as $price) {
+			if (! $price instanceof EE_Price) {
+				continue;
+			}
+			if ($price->is_base_price()) {
+				$price_row++;
+				continue;
+			}
+			$show_trash = ! ((count($prices) > 1 && $price_row === 1) || count($prices) === 1);
+			$show_create = ! (count($prices) > 1 && count($prices) !== $price_row);
+			$template_args['ticket_price_rows'] .= $this->_get_ticket_price_row(
+				$ticket_row,
+				$price_row,
+				$price,
+				$default,
+				$ticket,
+				$show_trash,
+				$show_create
+			);
+			$price_row++;
+		}
+		// filter $template_args
+		$template_args = apply_filters(
+			'FHEE__espresso_events_Pricing_Hooks___get_ticket_row__template_args',
+			$template_args,
+			$ticket_row,
+			$ticket,
+			$ticket_datetimes,
+			$all_datetimes,
+			$default,
+			$all_tickets,
+			$this->_is_creating_event
+		);
+		return EEH_Template::display_template(
+			PRICING_TEMPLATE_PATH . 'event_tickets_datetime_ticket_row.template.php',
+			$template_args,
+			true
+		);
+	}
 
 
-    /**
-     * @param int            $ticket_row
-     * @param EE_Ticket|null $ticket
-     * @return string
-     * @throws DomainException
-     * @throws EE_Error
-     */
-    protected function _get_tax_rows($ticket_row, $ticket)
-    {
-        $tax_rows = '';
-        /** @var EE_Price[] $taxes */
-        $taxes = empty($ticket) ? EE_Taxes::get_taxes_for_admin() : $ticket->get_ticket_taxes_for_admin();
-        foreach ($taxes as $tax) {
-            $tax_added = $this->_get_tax_added($tax, $ticket);
-            $template_args = array(
-                'display_tax'       => ! empty($ticket) && $ticket->get('TKT_taxable')
-                    ? ''
-                    : ' style="display:none;"',
-                'tax_id'            => $tax->ID(),
-                'tkt_row'           => $ticket_row,
-                'tax_label'         => $tax->get('PRC_name'),
-                'tax_added'         => $tax_added,
-                'tax_added_display' => EEH_Template::format_currency($tax_added, false, false),
-                'tax_amount'        => $tax->get('PRC_amount'),
-            );
-            $template_args = apply_filters(
-                'FHEE__espresso_events_Pricing_Hooks___get_tax_rows__template_args',
-                $template_args,
-                $ticket_row,
-                $ticket,
-                $this->_is_creating_event
-            );
-            $tax_rows .= EEH_Template::display_template(
-                PRICING_TEMPLATE_PATH . 'event_tickets_datetime_ticket_tax_row.template.php',
-                $template_args,
-                true
-            );
-        }
-        return $tax_rows;
-    }
+	/**
+	 * @param int            $ticket_row
+	 * @param EE_Ticket|null $ticket
+	 * @return string
+	 * @throws DomainException
+	 * @throws EE_Error
+	 */
+	protected function _get_tax_rows($ticket_row, $ticket)
+	{
+		$tax_rows = '';
+		/** @var EE_Price[] $taxes */
+		$taxes = empty($ticket) ? EE_Taxes::get_taxes_for_admin() : $ticket->get_ticket_taxes_for_admin();
+		foreach ($taxes as $tax) {
+			$tax_added = $this->_get_tax_added($tax, $ticket);
+			$template_args = array(
+				'display_tax'       => ! empty($ticket) && $ticket->get('TKT_taxable')
+					? ''
+					: ' style="display:none;"',
+				'tax_id'            => $tax->ID(),
+				'tkt_row'           => $ticket_row,
+				'tax_label'         => $tax->get('PRC_name'),
+				'tax_added'         => $tax_added,
+				'tax_added_display' => EEH_Template::format_currency($tax_added, false, false),
+				'tax_amount'        => $tax->get('PRC_amount'),
+			);
+			$template_args = apply_filters(
+				'FHEE__espresso_events_Pricing_Hooks___get_tax_rows__template_args',
+				$template_args,
+				$ticket_row,
+				$ticket,
+				$this->_is_creating_event
+			);
+			$tax_rows .= EEH_Template::display_template(
+				PRICING_TEMPLATE_PATH . 'event_tickets_datetime_ticket_tax_row.template.php',
+				$template_args,
+				true
+			);
+		}
+		return $tax_rows;
+	}
 
 
-    /**
-     * @param EE_Price       $tax
-     * @param EE_Ticket|null $ticket
-     * @return float|int
-     * @throws EE_Error
-     */
-    protected function _get_tax_added(EE_Price $tax, $ticket)
-    {
-        $subtotal = empty($ticket) ? 0 : $ticket->get_ticket_subtotal();
-        return $subtotal * $tax->get('PRC_amount') / 100;
-    }
+	/**
+	 * @param EE_Price       $tax
+	 * @param EE_Ticket|null $ticket
+	 * @return float|int
+	 * @throws EE_Error
+	 */
+	protected function _get_tax_added(EE_Price $tax, $ticket)
+	{
+		$subtotal = empty($ticket) ? 0 : $ticket->get_ticket_subtotal();
+		return $subtotal * $tax->get('PRC_amount') / 100;
+	}
 
 
-    /**
-     * @param int            $ticket_row
-     * @param int            $price_row
-     * @param EE_Price|null  $price
-     * @param bool           $default
-     * @param EE_Ticket|null $ticket
-     * @param bool           $show_trash
-     * @param bool           $show_create
-     * @return mixed
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     * @throws DomainException
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function _get_ticket_price_row(
-        $ticket_row,
-        $price_row,
-        $price,
-        $default,
-        $ticket,
-        $show_trash = true,
-        $show_create = true
-    ) {
-        $send_disabled = ! empty($ticket) && $ticket->get('TKT_deleted');
-        $template_args = array(
-            'tkt_row'               => $default && empty($ticket)
-                ? 'TICKETNUM'
-                : $ticket_row,
-            'PRC_order'             => $default && empty($price)
-                ? 'PRICENUM'
-                : $price_row,
-            'edit_prices_name'      => $default && empty($price)
-                ? 'PRICENAMEATTR'
-                : 'edit_prices',
-            'price_type_selector'   => $default && empty($price)
-                ? $this->_get_base_price_template($ticket_row, $price_row, $price, $default)
-                : $this->_get_price_type_selector(
-                    $ticket_row,
-                    $price_row,
-                    $price,
-                    $default,
-                    $send_disabled
-                ),
-            'PRC_ID'                => $default && empty($price)
-                ? 0
-                : $price->ID(),
-            'PRC_is_default'        => $default && empty($price)
-                ? 0
-                : $price->get('PRC_is_default'),
-            'PRC_name'              => $default && empty($price)
-                ? ''
-                : $price->get('PRC_name'),
-            'price_currency_symbol' => EE_Registry::instance()->CFG->currency->sign,
-            'show_plus_or_minus'    => $default && empty($price)
-                ? ''
-                : ' style="display:none;"',
-            'show_plus'             => ($default && empty($price)) || ($price->is_discount() || $price->is_base_price())
-                ? ' style="display:none;"'
-                : '',
-            'show_minus'            => ($default && empty($price)) || ! $price->is_discount()
-                ? ' style="display:none;"'
-                : '',
-            'show_currency_symbol'  => ($default && empty($price)) || $price->is_percent()
-                ? ' style="display:none"'
-                : '',
-            'PRC_amount'            => $default && empty($price)
-                ? 0
-                : $price->get_pretty('PRC_amount', 'localized_float'),
-            'show_percentage'       => ($default && empty($price)) || ! $price->is_percent()
-                ? ' style="display:none;"'
-                : '',
-            'show_trash_icon'       => $show_trash
-                ? ''
-                : ' style="display:none;"',
-            'show_create_button'    => $show_create
-                ? ''
-                : ' style="display:none;"',
-            'PRC_desc'              => $default && empty($price)
-                ? ''
-                : $price->get('PRC_desc'),
-            'disabled'              => ! empty($ticket) && $ticket->get('TKT_deleted'),
-        );
-        $template_args = apply_filters(
-            'FHEE__espresso_events_Pricing_Hooks___get_ticket_price_row__template_args',
-            $template_args,
-            $ticket_row,
-            $price_row,
-            $price,
-            $default,
-            $ticket,
-            $show_trash,
-            $show_create,
-            $this->_is_creating_event
-        );
-        return EEH_Template::display_template(
-            PRICING_TEMPLATE_PATH . 'event_tickets_datetime_ticket_price_row.template.php',
-            $template_args,
-            true
-        );
-    }
+	/**
+	 * @param int            $ticket_row
+	 * @param int            $price_row
+	 * @param EE_Price|null  $price
+	 * @param bool           $default
+	 * @param EE_Ticket|null $ticket
+	 * @param bool           $show_trash
+	 * @param bool           $show_create
+	 * @return mixed
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 * @throws DomainException
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function _get_ticket_price_row(
+		$ticket_row,
+		$price_row,
+		$price,
+		$default,
+		$ticket,
+		$show_trash = true,
+		$show_create = true
+	) {
+		$send_disabled = ! empty($ticket) && $ticket->get('TKT_deleted');
+		$template_args = array(
+			'tkt_row'               => $default && empty($ticket)
+				? 'TICKETNUM'
+				: $ticket_row,
+			'PRC_order'             => $default && empty($price)
+				? 'PRICENUM'
+				: $price_row,
+			'edit_prices_name'      => $default && empty($price)
+				? 'PRICENAMEATTR'
+				: 'edit_prices',
+			'price_type_selector'   => $default && empty($price)
+				? $this->_get_base_price_template($ticket_row, $price_row, $price, $default)
+				: $this->_get_price_type_selector(
+					$ticket_row,
+					$price_row,
+					$price,
+					$default,
+					$send_disabled
+				),
+			'PRC_ID'                => $default && empty($price)
+				? 0
+				: $price->ID(),
+			'PRC_is_default'        => $default && empty($price)
+				? 0
+				: $price->get('PRC_is_default'),
+			'PRC_name'              => $default && empty($price)
+				? ''
+				: $price->get('PRC_name'),
+			'price_currency_symbol' => EE_Registry::instance()->CFG->currency->sign,
+			'show_plus_or_minus'    => $default && empty($price)
+				? ''
+				: ' style="display:none;"',
+			'show_plus'             => ($default && empty($price)) || ($price->is_discount() || $price->is_base_price())
+				? ' style="display:none;"'
+				: '',
+			'show_minus'            => ($default && empty($price)) || ! $price->is_discount()
+				? ' style="display:none;"'
+				: '',
+			'show_currency_symbol'  => ($default && empty($price)) || $price->is_percent()
+				? ' style="display:none"'
+				: '',
+			'PRC_amount'            => $default && empty($price)
+				? 0
+				: $price->get_pretty('PRC_amount', 'localized_float'),
+			'show_percentage'       => ($default && empty($price)) || ! $price->is_percent()
+				? ' style="display:none;"'
+				: '',
+			'show_trash_icon'       => $show_trash
+				? ''
+				: ' style="display:none;"',
+			'show_create_button'    => $show_create
+				? ''
+				: ' style="display:none;"',
+			'PRC_desc'              => $default && empty($price)
+				? ''
+				: $price->get('PRC_desc'),
+			'disabled'              => ! empty($ticket) && $ticket->get('TKT_deleted'),
+		);
+		$template_args = apply_filters(
+			'FHEE__espresso_events_Pricing_Hooks___get_ticket_price_row__template_args',
+			$template_args,
+			$ticket_row,
+			$price_row,
+			$price,
+			$default,
+			$ticket,
+			$show_trash,
+			$show_create,
+			$this->_is_creating_event
+		);
+		return EEH_Template::display_template(
+			PRICING_TEMPLATE_PATH . 'event_tickets_datetime_ticket_price_row.template.php',
+			$template_args,
+			true
+		);
+	}
 
 
-    /**
-     * @param int      $ticket_row
-     * @param int      $price_row
-     * @param EE_Price $price
-     * @param bool     $default
-     * @param bool     $disabled
-     * @return mixed
-     * @throws ReflectionException
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     * @throws DomainException
-     * @throws EE_Error
-     */
-    protected function _get_price_type_selector($ticket_row, $price_row, $price, $default, $disabled = false)
-    {
-        if ($price->is_base_price()) {
-            return $this->_get_base_price_template(
-                $ticket_row,
-                $price_row,
-                $price,
-                $default
-            );
-        }
-        return $this->_get_price_modifier_template(
-            $ticket_row,
-            $price_row,
-            $price,
-            $default,
-            $disabled
-        );
-    }
+	/**
+	 * @param int      $ticket_row
+	 * @param int      $price_row
+	 * @param EE_Price $price
+	 * @param bool     $default
+	 * @param bool     $disabled
+	 * @return mixed
+	 * @throws ReflectionException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 * @throws DomainException
+	 * @throws EE_Error
+	 */
+	protected function _get_price_type_selector($ticket_row, $price_row, $price, $default, $disabled = false)
+	{
+		if ($price->is_base_price()) {
+			return $this->_get_base_price_template(
+				$ticket_row,
+				$price_row,
+				$price,
+				$default
+			);
+		}
+		return $this->_get_price_modifier_template(
+			$ticket_row,
+			$price_row,
+			$price,
+			$default,
+			$disabled
+		);
+	}
 
 
-    /**
-     * @param int      $ticket_row
-     * @param int      $price_row
-     * @param EE_Price $price
-     * @param bool     $default
-     * @return mixed
-     * @throws DomainException
-     * @throws EE_Error
-     */
-    protected function _get_base_price_template($ticket_row, $price_row, $price, $default)
-    {
-        $template_args = array(
-            'tkt_row'                   => $default ? 'TICKETNUM' : $ticket_row,
-            'PRC_order'                 => $default && empty($price) ? 'PRICENUM' : $price_row,
-            'PRT_ID'                    => $default && empty($price) ? 1 : $price->get('PRT_ID'),
-            'PRT_name'                  => esc_html__('Price', 'event_espresso'),
-            'price_selected_operator'   => '+',
-            'price_selected_is_percent' => 0,
-        );
-        $template_args = apply_filters(
-            'FHEE__espresso_events_Pricing_Hooks___get_base_price_template__template_args',
-            $template_args,
-            $ticket_row,
-            $price_row,
-            $price,
-            $default,
-            $this->_is_creating_event
-        );
-        return EEH_Template::display_template(
-            PRICING_TEMPLATE_PATH . 'event_tickets_datetime_price_type_base.template.php',
-            $template_args,
-            true
-        );
-    }
+	/**
+	 * @param int      $ticket_row
+	 * @param int      $price_row
+	 * @param EE_Price $price
+	 * @param bool     $default
+	 * @return mixed
+	 * @throws DomainException
+	 * @throws EE_Error
+	 */
+	protected function _get_base_price_template($ticket_row, $price_row, $price, $default)
+	{
+		$template_args = array(
+			'tkt_row'                   => $default ? 'TICKETNUM' : $ticket_row,
+			'PRC_order'                 => $default && empty($price) ? 'PRICENUM' : $price_row,
+			'PRT_ID'                    => $default && empty($price) ? 1 : $price->get('PRT_ID'),
+			'PRT_name'                  => esc_html__('Price', 'event_espresso'),
+			'price_selected_operator'   => '+',
+			'price_selected_is_percent' => 0,
+		);
+		$template_args = apply_filters(
+			'FHEE__espresso_events_Pricing_Hooks___get_base_price_template__template_args',
+			$template_args,
+			$ticket_row,
+			$price_row,
+			$price,
+			$default,
+			$this->_is_creating_event
+		);
+		return EEH_Template::display_template(
+			PRICING_TEMPLATE_PATH . 'event_tickets_datetime_price_type_base.template.php',
+			$template_args,
+			true
+		);
+	}
 
 
-    /**
-     * @param int      $ticket_row
-     * @param int      $price_row
-     * @param EE_Price $price
-     * @param bool     $default
-     * @param bool     $disabled
-     * @return mixed
-     * @throws ReflectionException
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     * @throws DomainException
-     * @throws EE_Error
-     */
-    protected function _get_price_modifier_template(
-        $ticket_row,
-        $price_row,
-        $price,
-        $default,
-        $disabled = false
-    ) {
-        $select_name = $default && ! $price instanceof EE_Price
-            ? 'edit_prices[TICKETNUM][PRICENUM][PRT_ID]'
-            : 'edit_prices[' . $ticket_row . '][' . $price_row . '][PRT_ID]';
-        /** @var EEM_Price_Type $price_type_model */
-        $price_type_model = EE_Registry::instance()->load_model('Price_Type');
-        $price_types = $price_type_model->get_all(array(
-            array(
-                'OR' => array(
-                    'PBT_ID'  => '2',
-                    'PBT_ID*' => '3',
-                ),
-            ),
-        ));
-        $all_price_types = $default && ! $price instanceof EE_Price
-            ? array(esc_html__('Select Modifier', 'event_espresso'))
-            : array();
-        $selected_price_type_id = $default && ! $price instanceof EE_Price ? 0 : $price->type();
-        $price_option_spans = '';
-        // setup price types for selector
-        foreach ($price_types as $price_type) {
-            if (! $price_type instanceof EE_Price_Type) {
-                continue;
-            }
-            $all_price_types[ $price_type->ID() ] = $price_type->get('PRT_name');
-            // while we're in the loop let's setup the option spans used by js
-            $span_args = array(
-                'PRT_ID'         => $price_type->ID(),
-                'PRT_operator'   => $price_type->is_discount() ? '-' : '+',
-                'PRT_is_percent' => $price_type->get('PRT_is_percent') ? 1 : 0,
-            );
-            $price_option_spans .= EEH_Template::display_template(
-                PRICING_TEMPLATE_PATH . 'event_tickets_datetime_price_option_span.template.php',
-                $span_args,
-                true
-            );
-        }
-        $select_name = $disabled ? 'archive_price[' . $ticket_row . '][' . $price_row . '][PRT_ID]'
-            : $select_name;
-        $select_input = new EE_Select_Input(
-            $all_price_types,
-            array(
-                'default'               => $selected_price_type_id,
-                'html_name'             => $select_name,
-                'html_class'            => 'edit-price-PRT_ID',
-                'other_html_attributes' => $disabled ? 'style="width:auto;" disabled' : 'style="width:auto;"',
-            )
-        );
-        $price_selected_operator = $price instanceof EE_Price && $price->is_discount() ? '-' : '+';
-        $price_selected_operator = $default && ! $price instanceof EE_Price ? '' : $price_selected_operator;
-        $price_selected_is_percent = $price instanceof EE_Price && $price->is_percent() ? 1 : 0;
-        $price_selected_is_percent = $default && ! $price instanceof EE_Price ? '' : $price_selected_is_percent;
-        $template_args = array(
-            'tkt_row'                   => $default ? 'TICKETNUM' : $ticket_row,
-            'PRC_order'                 => $default && ! $price instanceof EE_Price ? 'PRICENUM' : $price_row,
-            'price_modifier_selector'   => $select_input->get_html_for_input(),
-            'main_name'                 => $select_name,
-            'selected_price_type_id'    => $selected_price_type_id,
-            'price_option_spans'        => $price_option_spans,
-            'price_selected_operator'   => $price_selected_operator,
-            'price_selected_is_percent' => $price_selected_is_percent,
-            'disabled'                  => $disabled,
-        );
-        $template_args = apply_filters(
-            'FHEE__espresso_events_Pricing_Hooks___get_price_modifier_template__template_args',
-            $template_args,
-            $ticket_row,
-            $price_row,
-            $price,
-            $default,
-            $disabled,
-            $this->_is_creating_event
-        );
-        return EEH_Template::display_template(
-            PRICING_TEMPLATE_PATH . 'event_tickets_datetime_price_modifier_selector.template.php',
-            $template_args,
-            true
-        );
-    }
+	/**
+	 * @param int      $ticket_row
+	 * @param int      $price_row
+	 * @param EE_Price $price
+	 * @param bool     $default
+	 * @param bool     $disabled
+	 * @return mixed
+	 * @throws ReflectionException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 * @throws DomainException
+	 * @throws EE_Error
+	 */
+	protected function _get_price_modifier_template(
+		$ticket_row,
+		$price_row,
+		$price,
+		$default,
+		$disabled = false
+	) {
+		$select_name = $default && ! $price instanceof EE_Price
+			? 'edit_prices[TICKETNUM][PRICENUM][PRT_ID]'
+			: 'edit_prices[' . $ticket_row . '][' . $price_row . '][PRT_ID]';
+		/** @var EEM_Price_Type $price_type_model */
+		$price_type_model = EE_Registry::instance()->load_model('Price_Type');
+		$price_types = $price_type_model->get_all(array(
+			array(
+				'OR' => array(
+					'PBT_ID'  => '2',
+					'PBT_ID*' => '3',
+				),
+			),
+		));
+		$all_price_types = $default && ! $price instanceof EE_Price
+			? array(esc_html__('Select Modifier', 'event_espresso'))
+			: array();
+		$selected_price_type_id = $default && ! $price instanceof EE_Price ? 0 : $price->type();
+		$price_option_spans = '';
+		// setup price types for selector
+		foreach ($price_types as $price_type) {
+			if (! $price_type instanceof EE_Price_Type) {
+				continue;
+			}
+			$all_price_types[ $price_type->ID() ] = $price_type->get('PRT_name');
+			// while we're in the loop let's setup the option spans used by js
+			$span_args = array(
+				'PRT_ID'         => $price_type->ID(),
+				'PRT_operator'   => $price_type->is_discount() ? '-' : '+',
+				'PRT_is_percent' => $price_type->get('PRT_is_percent') ? 1 : 0,
+			);
+			$price_option_spans .= EEH_Template::display_template(
+				PRICING_TEMPLATE_PATH . 'event_tickets_datetime_price_option_span.template.php',
+				$span_args,
+				true
+			);
+		}
+		$select_name = $disabled ? 'archive_price[' . $ticket_row . '][' . $price_row . '][PRT_ID]'
+			: $select_name;
+		$select_input = new EE_Select_Input(
+			$all_price_types,
+			array(
+				'default'               => $selected_price_type_id,
+				'html_name'             => $select_name,
+				'html_class'            => 'edit-price-PRT_ID',
+				'other_html_attributes' => $disabled ? 'style="width:auto;" disabled' : 'style="width:auto;"',
+			)
+		);
+		$price_selected_operator = $price instanceof EE_Price && $price->is_discount() ? '-' : '+';
+		$price_selected_operator = $default && ! $price instanceof EE_Price ? '' : $price_selected_operator;
+		$price_selected_is_percent = $price instanceof EE_Price && $price->is_percent() ? 1 : 0;
+		$price_selected_is_percent = $default && ! $price instanceof EE_Price ? '' : $price_selected_is_percent;
+		$template_args = array(
+			'tkt_row'                   => $default ? 'TICKETNUM' : $ticket_row,
+			'PRC_order'                 => $default && ! $price instanceof EE_Price ? 'PRICENUM' : $price_row,
+			'price_modifier_selector'   => $select_input->get_html_for_input(),
+			'main_name'                 => $select_name,
+			'selected_price_type_id'    => $selected_price_type_id,
+			'price_option_spans'        => $price_option_spans,
+			'price_selected_operator'   => $price_selected_operator,
+			'price_selected_is_percent' => $price_selected_is_percent,
+			'disabled'                  => $disabled,
+		);
+		$template_args = apply_filters(
+			'FHEE__espresso_events_Pricing_Hooks___get_price_modifier_template__template_args',
+			$template_args,
+			$ticket_row,
+			$price_row,
+			$price,
+			$default,
+			$disabled,
+			$this->_is_creating_event
+		);
+		return EEH_Template::display_template(
+			PRICING_TEMPLATE_PATH . 'event_tickets_datetime_price_modifier_selector.template.php',
+			$template_args,
+			true
+		);
+	}
 
 
-    /**
-     * @param int              $datetime_row
-     * @param int              $ticket_row
-     * @param EE_Datetime|null $datetime
-     * @param EE_Ticket|null   $ticket
-     * @param array            $ticket_datetimes
-     * @param bool             $default
-     * @return mixed
-     * @throws DomainException
-     * @throws EE_Error
-     */
-    protected function _get_ticket_datetime_list_item(
-        $datetime_row,
-        $ticket_row,
-        $datetime,
-        $ticket,
-        $ticket_datetimes = array(),
-        $default
-    ) {
-        $tkt_datetimes = $ticket instanceof EE_Ticket && isset($ticket_datetimes[ $ticket->ID() ])
-            ? $ticket_datetimes[ $ticket->ID() ]
-            : array();
-        $template_args = array(
-            'dtt_row'                  => $default && ! $datetime instanceof EE_Datetime
-                ? 'DTTNUM'
-                : $datetime_row,
-            'tkt_row'                  => $default
-                ? 'TICKETNUM'
-                : $ticket_row,
-            'ticket_datetime_selected' => in_array($datetime_row, $tkt_datetimes, true)
-                ? ' ticket-selected'
-                : '',
-            'ticket_datetime_checked'  => in_array($datetime_row, $tkt_datetimes, true)
-                ? ' checked="checked"'
-                : '',
-            'DTT_name'                 => $default && empty($datetime)
-                ? 'DTTNAME'
-                : $datetime->get_dtt_display_name(true),
-            'tkt_status_class'         => '',
-        );
-        $template_args = apply_filters(
-            'FHEE__espresso_events_Pricing_Hooks___get_ticket_datetime_list_item__template_args',
-            $template_args,
-            $datetime_row,
-            $ticket_row,
-            $datetime,
-            $ticket,
-            $ticket_datetimes,
-            $default,
-            $this->_is_creating_event
-        );
-        return EEH_Template::display_template(
-            PRICING_TEMPLATE_PATH . 'event_tickets_datetime_ticket_datetimes_list_item.template.php',
-            $template_args,
-            true
-        );
-    }
+	/**
+	 * @param int              $datetime_row
+	 * @param int              $ticket_row
+	 * @param EE_Datetime|null $datetime
+	 * @param EE_Ticket|null   $ticket
+	 * @param array            $ticket_datetimes
+	 * @param bool             $default
+	 * @return mixed
+	 * @throws DomainException
+	 * @throws EE_Error
+	 */
+	protected function _get_ticket_datetime_list_item(
+		$datetime_row,
+		$ticket_row,
+		$datetime,
+		$ticket,
+		$ticket_datetimes = array(),
+		$default
+	) {
+		$tkt_datetimes = $ticket instanceof EE_Ticket && isset($ticket_datetimes[ $ticket->ID() ])
+			? $ticket_datetimes[ $ticket->ID() ]
+			: array();
+		$template_args = array(
+			'dtt_row'                  => $default && ! $datetime instanceof EE_Datetime
+				? 'DTTNUM'
+				: $datetime_row,
+			'tkt_row'                  => $default
+				? 'TICKETNUM'
+				: $ticket_row,
+			'ticket_datetime_selected' => in_array($datetime_row, $tkt_datetimes, true)
+				? ' ticket-selected'
+				: '',
+			'ticket_datetime_checked'  => in_array($datetime_row, $tkt_datetimes, true)
+				? ' checked="checked"'
+				: '',
+			'DTT_name'                 => $default && empty($datetime)
+				? 'DTTNAME'
+				: $datetime->get_dtt_display_name(true),
+			'tkt_status_class'         => '',
+		);
+		$template_args = apply_filters(
+			'FHEE__espresso_events_Pricing_Hooks___get_ticket_datetime_list_item__template_args',
+			$template_args,
+			$datetime_row,
+			$ticket_row,
+			$datetime,
+			$ticket,
+			$ticket_datetimes,
+			$default,
+			$this->_is_creating_event
+		);
+		return EEH_Template::display_template(
+			PRICING_TEMPLATE_PATH . 'event_tickets_datetime_ticket_datetimes_list_item.template.php',
+			$template_args,
+			true
+		);
+	}
 
 
-    /**
-     * @param array $all_datetimes
-     * @param array $all_tickets
-     * @return mixed
-     * @throws ReflectionException
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     * @throws DomainException
-     * @throws EE_Error
-     */
-    protected function _get_ticket_js_structure($all_datetimes = array(), $all_tickets = array())
-    {
-        $template_args = array(
-            'default_datetime_edit_row'                => $this->_get_dtt_edit_row(
-                'DTTNUM',
-                null,
-                true,
-                $all_datetimes
-            ),
-            'default_ticket_row'                       => $this->_get_ticket_row(
-                'TICKETNUM',
-                null,
-                array(),
-                array(),
-                true
-            ),
-            'default_price_row'                        => $this->_get_ticket_price_row(
-                'TICKETNUM',
-                'PRICENUM',
-                null,
-                true,
-                null
-            ),
-            'default_price_rows'                       => '',
-            'default_base_price_amount'                => 0,
-            'default_base_price_name'                  => '',
-            'default_base_price_description'           => '',
-            'default_price_modifier_selector_row'      => $this->_get_price_modifier_template(
-                'TICKETNUM',
-                'PRICENUM',
-                null,
-                true
-            ),
-            'default_available_tickets_for_datetime'   => $this->_get_dtt_attached_tickets_row(
-                'DTTNUM',
-                null,
-                array(),
-                array(),
-                true
-            ),
-            'existing_available_datetime_tickets_list' => '',
-            'existing_available_ticket_datetimes_list' => '',
-            'new_available_datetime_ticket_list_item'  => $this->_get_datetime_tickets_list_item(
-                'DTTNUM',
-                'TICKETNUM',
-                null,
-                null,
-                array(),
-                true
-            ),
-            'new_available_ticket_datetime_list_item'  => $this->_get_ticket_datetime_list_item(
-                'DTTNUM',
-                'TICKETNUM',
-                null,
-                null,
-                array(),
-                true
-            ),
-        );
-        $ticket_row = 1;
-        foreach ($all_tickets as $ticket) {
-            $template_args['existing_available_datetime_tickets_list'] .= $this->_get_datetime_tickets_list_item(
-                'DTTNUM',
-                $ticket_row,
-                null,
-                $ticket,
-                array(),
-                true
-            );
-            $ticket_row++;
-        }
-        $datetime_row = 1;
-        foreach ($all_datetimes as $datetime) {
-            $template_args['existing_available_ticket_datetimes_list'] .= $this->_get_ticket_datetime_list_item(
-                $datetime_row,
-                'TICKETNUM',
-                $datetime,
-                null,
-                array(),
-                true
-            );
-            $datetime_row++;
-        }
-        /** @var EEM_Price $price_model */
-        $price_model = EE_Registry::instance()->load_model('Price');
-        $default_prices = $price_model->get_all_default_prices();
-        $price_row = 1;
-        foreach ($default_prices as $price) {
-            if (! $price instanceof EE_Price) {
-                continue;
-            }
-            if ($price->is_base_price()) {
-                $template_args['default_base_price_amount'] = $price->get_pretty(
-                    'PRC_amount',
-                    'localized_float'
-                );
-                $template_args['default_base_price_name'] = $price->get('PRC_name');
-                $template_args['default_base_price_description'] = $price->get('PRC_desc');
-                $price_row++;
-                continue;
-            }
-            $show_trash = ! ((count($default_prices) > 1 && $price_row === 1)
-                             || count($default_prices) === 1);
-            $show_create = ! (count($default_prices) > 1
-                              && count($default_prices)
-                                 !== $price_row);
-            $template_args['default_price_rows'] .= $this->_get_ticket_price_row(
-                'TICKETNUM',
-                $price_row,
-                $price,
-                true,
-                null,
-                $show_trash,
-                $show_create
-            );
-            $price_row++;
-        }
-        $template_args = apply_filters(
-            'FHEE__espresso_events_Pricing_Hooks___get_ticket_js_structure__template_args',
-            $template_args,
-            $all_datetimes,
-            $all_tickets,
-            $this->_is_creating_event
-        );
-        return EEH_Template::display_template(
-            PRICING_TEMPLATE_PATH . 'event_tickets_datetime_ticket_js_structure.template.php',
-            $template_args,
-            true
-        );
-    }
+	/**
+	 * @param array $all_datetimes
+	 * @param array $all_tickets
+	 * @return mixed
+	 * @throws ReflectionException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 * @throws DomainException
+	 * @throws EE_Error
+	 */
+	protected function _get_ticket_js_structure($all_datetimes = array(), $all_tickets = array())
+	{
+		$template_args = array(
+			'default_datetime_edit_row'                => $this->_get_dtt_edit_row(
+				'DTTNUM',
+				null,
+				true,
+				$all_datetimes
+			),
+			'default_ticket_row'                       => $this->_get_ticket_row(
+				'TICKETNUM',
+				null,
+				array(),
+				array(),
+				true
+			),
+			'default_price_row'                        => $this->_get_ticket_price_row(
+				'TICKETNUM',
+				'PRICENUM',
+				null,
+				true,
+				null
+			),
+			'default_price_rows'                       => '',
+			'default_base_price_amount'                => 0,
+			'default_base_price_name'                  => '',
+			'default_base_price_description'           => '',
+			'default_price_modifier_selector_row'      => $this->_get_price_modifier_template(
+				'TICKETNUM',
+				'PRICENUM',
+				null,
+				true
+			),
+			'default_available_tickets_for_datetime'   => $this->_get_dtt_attached_tickets_row(
+				'DTTNUM',
+				null,
+				array(),
+				array(),
+				true
+			),
+			'existing_available_datetime_tickets_list' => '',
+			'existing_available_ticket_datetimes_list' => '',
+			'new_available_datetime_ticket_list_item'  => $this->_get_datetime_tickets_list_item(
+				'DTTNUM',
+				'TICKETNUM',
+				null,
+				null,
+				array(),
+				true
+			),
+			'new_available_ticket_datetime_list_item'  => $this->_get_ticket_datetime_list_item(
+				'DTTNUM',
+				'TICKETNUM',
+				null,
+				null,
+				array(),
+				true
+			),
+		);
+		$ticket_row = 1;
+		foreach ($all_tickets as $ticket) {
+			$template_args['existing_available_datetime_tickets_list'] .= $this->_get_datetime_tickets_list_item(
+				'DTTNUM',
+				$ticket_row,
+				null,
+				$ticket,
+				array(),
+				true
+			);
+			$ticket_row++;
+		}
+		$datetime_row = 1;
+		foreach ($all_datetimes as $datetime) {
+			$template_args['existing_available_ticket_datetimes_list'] .= $this->_get_ticket_datetime_list_item(
+				$datetime_row,
+				'TICKETNUM',
+				$datetime,
+				null,
+				array(),
+				true
+			);
+			$datetime_row++;
+		}
+		/** @var EEM_Price $price_model */
+		$price_model = EE_Registry::instance()->load_model('Price');
+		$default_prices = $price_model->get_all_default_prices();
+		$price_row = 1;
+		foreach ($default_prices as $price) {
+			if (! $price instanceof EE_Price) {
+				continue;
+			}
+			if ($price->is_base_price()) {
+				$template_args['default_base_price_amount'] = $price->get_pretty(
+					'PRC_amount',
+					'localized_float'
+				);
+				$template_args['default_base_price_name'] = $price->get('PRC_name');
+				$template_args['default_base_price_description'] = $price->get('PRC_desc');
+				$price_row++;
+				continue;
+			}
+			$show_trash = ! ((count($default_prices) > 1 && $price_row === 1)
+							 || count($default_prices) === 1);
+			$show_create = ! (count($default_prices) > 1
+							  && count($default_prices)
+								 !== $price_row);
+			$template_args['default_price_rows'] .= $this->_get_ticket_price_row(
+				'TICKETNUM',
+				$price_row,
+				$price,
+				true,
+				null,
+				$show_trash,
+				$show_create
+			);
+			$price_row++;
+		}
+		$template_args = apply_filters(
+			'FHEE__espresso_events_Pricing_Hooks___get_ticket_js_structure__template_args',
+			$template_args,
+			$all_datetimes,
+			$all_tickets,
+			$this->_is_creating_event
+		);
+		return EEH_Template::display_template(
+			PRICING_TEMPLATE_PATH . 'event_tickets_datetime_ticket_js_structure.template.php',
+			$template_args,
+			true
+		);
+	}
 }

core/services/request/RequestInterface.php

Indentation +132 added lines, -132 removed lines

@@ -16,155 +16,155 @@
 interface RequestInterface extends RequestTypeContextCheckerInterface
 {
 
-    /**
-     * @param RequestTypeContextCheckerInterface $type
-     */
-    public function setRequestTypeContextChecker(RequestTypeContextCheckerInterface $type);
-
-    /**
-     * @return array
-     */
-    public function getParams();
-
-
-    /**
-     * @return array
-     */
-    public function postParams();
-
-
-    /**
-     * @return array
-     */
-    public function cookieParams();
-
-
-    /**
-     * @return array
-     */
-    public function serverParams();
-
-
-    /**
-     * @return array
-     */
-    public function filesParams();
-
+	/**
+	 * @param RequestTypeContextCheckerInterface $type
+	 */
+	public function setRequestTypeContextChecker(RequestTypeContextCheckerInterface $type);
+
+	/**
+	 * @return array
+	 */
+	public function getParams();
+
+
+	/**
+	 * @return array
+	 */
+	public function postParams();
+
+
+	/**
+	 * @return array
+	 */
+	public function cookieParams();
+
+
+	/**
+	 * @return array
+	 */
+	public function serverParams();
+
+
+	/**
+	 * @return array
+	 */
+	public function filesParams();
+
 
-    /**
-     * returns contents of $_REQUEST
-     *
-     * @return array
-     */
-    public function requestParams();
+	/**
+	 * returns contents of $_REQUEST
+	 *
+	 * @return array
+	 */
+	public function requestParams();
 
 
-    /**
-     * @param string $key
-     * @param string $value
-     * @param bool   $override_ee
-     * @return    void
-     */
-    public function setRequestParam($key, $value, $override_ee = false);
+	/**
+	 * @param string $key
+	 * @param string $value
+	 * @param bool   $override_ee
+	 * @return    void
+	 */
+	public function setRequestParam($key, $value, $override_ee = false);
 
 
-    /**
-     * returns the value for a request param if the given key exists
-     *
-     * @param string $key
-     * @param null   $default
-     * @return mixed
-     */
-    public function getRequestParam($key, $default = null);
+	/**
+	 * returns the value for a request param if the given key exists
+	 *
+	 * @param string $key
+	 * @param null   $default
+	 * @return mixed
+	 */
+	public function getRequestParam($key, $default = null);
 
 
-    /**
-     * check if param exists
-     *
-     * @param string $key
-     * @return bool
-     */
-    public function requestParamIsSet($key);
+	/**
+	 * check if param exists
+	 *
+	 * @param string $key
+	 * @return bool
+	 */
+	public function requestParamIsSet($key);
 
 
-    /**
-     * check if a request parameter exists whose key that matches the supplied wildcard pattern
-     * and return the value for the first match found
-     * wildcards can be either of the following:
-     *      ? to represent a single character of any type
-     *      * to represent one or more characters of any type
-     *
-     * @param string     $pattern
-     * @param null|mixed $default
-     * @return false|int
-     */
-    public function getMatch($pattern, $default = null);
+	/**
+	 * check if a request parameter exists whose key that matches the supplied wildcard pattern
+	 * and return the value for the first match found
+	 * wildcards can be either of the following:
+	 *      ? to represent a single character of any type
+	 *      * to represent one or more characters of any type
+	 *
+	 * @param string     $pattern
+	 * @param null|mixed $default
+	 * @return false|int
+	 */
+	public function getMatch($pattern, $default = null);
 
 
-    /**
-     * check if a request parameter exists whose key matches the supplied wildcard pattern
-     * wildcards can be either of the following:
-     *      ? to represent a single character of any type
-     *      * to represent one or more characters of any type
-     * returns true if a match is found or false if not
-     *
-     * @param string $pattern
-     * @return false|int
-     */
-    public function matches($pattern);
+	/**
+	 * check if a request parameter exists whose key matches the supplied wildcard pattern
+	 * wildcards can be either of the following:
+	 *      ? to represent a single character of any type
+	 *      * to represent one or more characters of any type
+	 * returns true if a match is found or false if not
+	 *
+	 * @param string $pattern
+	 * @return false|int
+	 */
+	public function matches($pattern);
 
 
-    /**
-     * remove param
-     *
-     * @param string $key
-     * @param bool   $unset_from_global_too
-     */
-    public function unSetRequestParam($key, $unset_from_global_too = false);
+	/**
+	 * remove param
+	 *
+	 * @param string $key
+	 * @param bool   $unset_from_global_too
+	 */
+	public function unSetRequestParam($key, $unset_from_global_too = false);
 
 
-    /**
-     * remove params
-     *
-     * @param array $keys
-     * @param bool   $unset_from_global_too
-     */
-    public function unSetRequestParams(array $keys, $unset_from_global_too = false);
+	/**
+	 * remove params
+	 *
+	 * @param array $keys
+	 * @param bool   $unset_from_global_too
+	 */
+	public function unSetRequestParams(array $keys, $unset_from_global_too = false);
 
 
-    /**
-     * @return string
-     */
-    public function ipAddress();
+	/**
+	 * @return string
+	 */
+	public function ipAddress();
 
 
-    /**
-     * @param boolean $relativeToWpRoot whether to return the uri relative to WordPress' home URL, or not.
-     * @return string
-     */
-    public function requestUri($relativeToWpRoot = false);
-
-
-    /**
-     * @return string
-     */
-    public function userAgent();
-
-
-    /**
-     * @param string $user_agent
-     */
-    public function setUserAgent($user_agent = '');
-
-
-    /**
-     * @return bool
-     */
-    public function isBot();
-
-
-    /**
-     * @param bool $is_bot
-     */
-    public function setIsBot($is_bot);
+	/**
+	 * @param boolean $relativeToWpRoot whether to return the uri relative to WordPress' home URL, or not.
+	 * @return string
+	 */
+	public function requestUri($relativeToWpRoot = false);
+
+
+	/**
+	 * @return string
+	 */
+	public function userAgent();
+
+
+	/**
+	 * @param string $user_agent
+	 */
+	public function setUserAgent($user_agent = '');
+
+
+	/**
+	 * @return bool
+	 */
+	public function isBot();
+
+
+	/**
+	 * @param bool $is_bot
+	 */
+	public function setIsBot($is_bot);
 }

core/services/request/Request.php

Indentation +652 added lines, -652 removed lines

@@ -17,656 +17,656 @@
 class Request implements InterminableInterface, RequestInterface, ReservedInstanceInterface
 {
 
-    /**
-     * $_GET parameters
-     *
-     * @var array $get
-     */
-    private $get;
-
-    /**
-     * $_POST parameters
-     *
-     * @var array $post
-     */
-    private $post;
-
-    /**
-     * $_COOKIE parameters
-     *
-     * @var array $cookie
-     */
-    private $cookie;
-
-    /**
-     * $_SERVER parameters
-     *
-     * @var array $server
-     */
-    private $server;
-
-    /**
-     * $_FILES parameters
-     *
-     * @var array $files
-     */
-    private $files;
-
-    /**
-     * $_REQUEST parameters
-     *
-     * @var array $request
-     */
-    private $request;
-
-    /**
-     * @var RequestTypeContextCheckerInterface
-     */
-    private $request_type;
-
-    /**
-     * IP address for request
-     *
-     * @var string $ip_address
-     */
-    private $ip_address;
-
-    /**
-     * @var string $user_agent
-     */
-    private $user_agent;
-
-    /**
-     * true if current user appears to be some kind of bot
-     *
-     * @var bool $is_bot
-     */
-    private $is_bot;
-
-
-    /**
-     * @param array $get
-     * @param array $post
-     * @param array $cookie
-     * @param array $server
-     * @param array $files
-     */
-    public function __construct(array $get, array $post, array $cookie, array $server, array $files = array())
-    {
-        // grab request vars
-        $this->get = $get;
-        $this->post = $post;
-        $this->cookie = $cookie;
-        $this->server = $server;
-        $this->files = $files;
-        $this->request = array_merge($this->get, $this->post);
-        $this->ip_address = $this->visitorIp();
-    }
-
-
-    /**
-     * @param RequestTypeContextCheckerInterface $type
-     */
-    public function setRequestTypeContextChecker(RequestTypeContextCheckerInterface $type)
-    {
-        $this->request_type = $type;
-    }
-
-
-    /**
-     * @return array
-     */
-    public function getParams()
-    {
-        return $this->get;
-    }
-
-
-    /**
-     * @return array
-     */
-    public function postParams()
-    {
-        return $this->post;
-    }
-
-
-    /**
-     * @return array
-     */
-    public function cookieParams()
-    {
-        return $this->cookie;
-    }
-
-
-    /**
-     * @return array
-     */
-    public function serverParams()
-    {
-        return $this->server;
-    }
-
-
-    /**
-     * @return array
-     */
-    public function filesParams()
-    {
-        return $this->files;
-    }
-
-
-    /**
-     * returns contents of $_REQUEST
-     *
-     * @return array
-     */
-    public function requestParams()
-    {
-        return $this->request;
-    }
-
-
-    /**
-     * @param      $key
-     * @param      $value
-     * @param bool $override_ee
-     * @return    void
-     */
-    public function setRequestParam($key, $value, $override_ee = false)
-    {
-        // don't allow "ee" to be overwritten unless explicitly instructed to do so
-        if ($key !== 'ee'
-            || ($key === 'ee' && empty($this->request['ee']))
-            || ($key === 'ee' && ! empty($this->request['ee']) && $override_ee)
-        ) {
-            $this->request[ $key ] = $value;
-        }
-    }
-
-
-    /**
-     * returns   the value for a request param if the given key exists
-     *
-     * @param       $key
-     * @param null  $default
-     * @return mixed
-     */
-    public function getRequestParam($key, $default = null)
-    {
-        return $this->requestParameterDrillDown($key, $default, 'get');
-    }
-
-
-    /**
-     * check if param exists
-     *
-     * @param       $key
-     * @return bool
-     */
-    public function requestParamIsSet($key)
-    {
-        return $this->requestParameterDrillDown($key);
-    }
-
-
-    /**
-     * check if a request parameter exists whose key that matches the supplied wildcard pattern
-     * and return the value for the first match found
-     * wildcards can be either of the following:
-     *      ? to represent a single character of any type
-     *      * to represent one or more characters of any type
-     *
-     * @param string     $pattern
-     * @param null|mixed $default
-     * @return mixed
-     */
-    public function getMatch($pattern, $default = null)
-    {
-        return $this->requestParameterDrillDown($pattern, $default, 'match');
-    }
-
-
-    /**
-     * check if a request parameter exists whose key matches the supplied wildcard pattern
-     * wildcards can be either of the following:
-     *      ? to represent a single character of any type
-     *      * to represent one or more characters of any type
-     * returns true if a match is found or false if not
-     *
-     * @param string $pattern
-     * @return bool
-     */
-    public function matches($pattern)
-    {
-        return $this->requestParameterDrillDown($pattern, null, 'match') !== null;
-    }
-
-
-    /**
-     * @see https://stackoverflow.com/questions/6163055/php-string-matching-with-wildcard
-     * @param string $pattern               A string including wildcards to be converted to a regex pattern
-     *                                      and used to search through the current request's parameter keys
-     * @param array  $request_params        The array of request parameters to search through
-     * @param mixed  $default               [optional] The value to be returned if no match is found.
-     *                                      Default is null
-     * @param string $return                [optional] Controls what kind of value is returned.
-     *                                      Options are:
-     *                                      'bool' will return true or false if match is found or not
-     *                                      'key' will return the first key found that matches the supplied pattern
-     *                                      'value' will return the value for the first request parameter
-     *                                      whose key matches the supplied pattern
-     *                                      Default is 'value'
-     * @return boolean|string
-     */
-    private function match($pattern, array $request_params, $default = null, $return = 'value')
-    {
-        $return = in_array($return, array('bool', 'key', 'value'), true)
-            ? $return
-            : 'is_set';
-        // replace wildcard chars with regex chars
-        $pattern = str_replace(
-            array("\*", "\?"),
-            array('.*', '.'),
-            preg_quote($pattern, '/')
-        );
-        foreach ($request_params as $key => $request_param) {
-            if (preg_match('/^' . $pattern . '$/is', $key)) {
-                // return value for request param
-                if ($return === 'value') {
-                    return $request_params[ $key ];
-                }
-                // or actual key or true just to indicate it was found
-                return $return === 'key' ? $key : true;
-            }
-        }
-        // match not found so return default value or false
-        return $return === 'value' ? $default : false;
-    }
-
-
-    /**
-     * the supplied key can be a simple string to represent a "top-level" request parameter
-     * or represent a key for a request parameter that is nested deeper within the request parameter array,
-     * by using square brackets to surround keys for deeper array elements.
-     * For example :
-     * if the supplied $key was: "first[second][third]"
-     * then this will attempt to drill down into the request parameter array to find a value.
-     * Given the following request parameters:
-     *  array(
-     *      'first' => array(
-     *          'second' => array(
-     *              'third' => 'has a value'
-     *          )
-     *      )
-     *  )
-     * would return true if default parameters were set
-     *
-     * @param string $callback
-     * @param        $key
-     * @param null   $default
-     * @param array  $request_params
-     * @return bool|mixed|null
-     */
-    private function requestParameterDrillDown(
-        $key,
-        $default = null,
-        $callback = 'is_set',
-        array $request_params = array()
-    ) {
-        $callback = in_array($callback, array('is_set', 'get', 'match'), true)
-            ? $callback
-            : 'is_set';
-        $request_params = ! empty($request_params)
-            ? $request_params
-            : $this->request;
-        // does incoming key represent an array like 'first[second][third]'  ?
-        if (strpos($key, '[') !== false) {
-            // turn it into an actual array
-            $key = str_replace(']', '', $key);
-            $keys = explode('[', $key);
-            $key = array_shift($keys);
-            if ($callback === 'match') {
-                $real_key = $this->match($key, $request_params, $default, 'key');
-                $key = $real_key ? $real_key : $key;
-            }
-            // check if top level key exists
-            if (isset($request_params[ $key ])) {
-                // build a new key to pass along like: 'second[third]'
-                // or just 'second' depending on depth of keys
-                $key_string = array_shift($keys);
-                if (! empty($keys)) {
-                    $key_string .= '[' . implode('][', $keys) . ']';
-                }
-                return $this->requestParameterDrillDown(
-                    $key_string,
-                    $default,
-                    $callback,
-                    $request_params[ $key ]
-                );
-            }
-        }
-        if ($callback === 'is_set') {
-            return isset($request_params[ $key ]);
-        }
-        if ($callback === 'match') {
-            return $this->match($key, $request_params, $default);
-        }
-        return isset($request_params[ $key ])
-            ? $request_params[ $key ]
-            : $default;
-    }
-
-
-    /**
-     * remove param
-     *
-     * @param      $key
-     * @param bool $unset_from_global_too
-     */
-    public function unSetRequestParam($key, $unset_from_global_too = false)
-    {
-        // because unset may not actually remove var
-        $this->request[ $key ] = null;
-        unset($this->request[ $key ]);
-        if ($unset_from_global_too) {
-            unset($_REQUEST[ $key ]);
-        }
-    }
-
-
-    /**
-     * remove params
-     *
-     * @param array $keys
-     * @param bool  $unset_from_global_too
-     */
-    public function unSetRequestParams(array $keys, $unset_from_global_too = false)
-    {
-        foreach ($keys as $key) {
-            $this->unSetRequestParam($key, $unset_from_global_too);
-        }
-    }
-
-
-    /**
-     * @return string
-     */
-    public function ipAddress()
-    {
-        return $this->ip_address;
-    }
-
-
-    /**
-     * attempt to get IP address of current visitor from server
-     * plz see: http://stackoverflow.com/a/2031935/1475279
-     *
-     * @access public
-     * @return string
-     */
-    private function visitorIp()
-    {
-        $visitor_ip = '0.0.0.0';
-        $server_keys = array(
-            'HTTP_CLIENT_IP',
-            'HTTP_X_FORWARDED_FOR',
-            'HTTP_X_FORWARDED',
-            'HTTP_X_CLUSTER_CLIENT_IP',
-            'HTTP_FORWARDED_FOR',
-            'HTTP_FORWARDED',
-            'REMOTE_ADDR',
-        );
-        foreach ($server_keys as $key) {
-            if (isset($this->server[ $key ])) {
-                foreach (array_map('trim', explode(',', $this->server[ $key ])) as $ip) {
-                    if ($ip === '127.0.0.1' || filter_var($ip, FILTER_VALIDATE_IP) !== false) {
-                        $visitor_ip = $ip;
-                    }
-                }
-            }
-        }
-        return $visitor_ip;
-    }
-
-
-    /**
-     * Gets the request's literal URI. Related to `requestUriAfterSiteHomeUri`, see its description for a comparison.
-     * @param boolean $relativeToWpRoot If home_url() is "http://mysite.com/wp/", and a request comes to
-     *                                  "http://mysite.com/wp/wp-json", setting $relativeToWpRoot=true will return
-     *                                  "/wp-json", whereas $relativeToWpRoot=false will return "/wp/wp-json/".
-     * @return string
-     */
-    public function requestUri($relativeToWpRoot = false)
-    {
-        $request_uri = filter_input(
-            INPUT_SERVER,
-            'REQUEST_URI',
-            FILTER_SANITIZE_URL,
-            FILTER_NULL_ON_FAILURE
-        );
-        if (empty($request_uri)) {
-            // fallback sanitization if the above fails
-            $request_uri = wp_sanitize_redirect($this->server['REQUEST_URI']);
-        }
-        if ($relativeToWpRoot) {
-            $home_path = untrailingslashit(
-                parse_url(
-                    home_url(),
-                    PHP_URL_PATH
-                )
-            );
-            $request_uri = str_replace(
-                $home_path,
-                '',
-                $request_uri
-            );
-        }
-        return $request_uri;
-    }
-
-    /**
-     * @return string
-     */
-    public function userAgent()
-    {
-        return $this->user_agent;
-    }
-
-
-    /**
-     * @param string $user_agent
-     */
-    public function setUserAgent($user_agent = '')
-    {
-        if ($user_agent === '' || ! is_string($user_agent)) {
-            $user_agent = isset($_SERVER['HTTP_USER_AGENT']) ? (string) esc_attr($_SERVER['HTTP_USER_AGENT']) : '';
-        }
-        $this->user_agent = $user_agent;
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function isBot()
-    {
-        return $this->is_bot;
-    }
-
-
-    /**
-     * @param bool $is_bot
-     */
-    public function setIsBot($is_bot)
-    {
-        $this->is_bot = filter_var($is_bot, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function isActivation()
-    {
-        return $this->request_type->isActivation();
-    }
-
-
-    /**
-     * @param $is_activation
-     * @return bool
-     */
-    public function setIsActivation($is_activation)
-    {
-        return $this->request_type->setIsActivation($is_activation);
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function isAdmin()
-    {
-        return $this->request_type->isAdmin();
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function isAdminAjax()
-    {
-        return $this->request_type->isAdminAjax();
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function isAjax()
-    {
-        return $this->request_type->isAjax();
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function isEeAjax()
-    {
-        return $this->request_type->isEeAjax();
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function isOtherAjax()
-    {
-        return $this->request_type->isOtherAjax();
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function isApi()
-    {
-        return $this->request_type->isApi();
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function isCli()
-    {
-        return $this->request_type->isCli();
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function isCron()
-    {
-        return $this->request_type->isCron();
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function isFeed()
-    {
-        return $this->request_type->isFeed();
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function isFrontend()
-    {
-        return $this->request_type->isFrontend();
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function isFrontAjax()
-    {
-        return $this->request_type->isFrontAjax();
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function isIframe()
-    {
-        return $this->request_type->isIframe();
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function isWordPressApi()
-    {
-        return $this->request_type->isWordPressApi();
-    }
-
-
-
-    /**
-     * @return bool
-     */
-    public function isWordPressHeartbeat()
-    {
-        return $this->request_type->isWordPressHeartbeat();
-    }
-
-
-
-    /**
-     * @return bool
-     */
-    public function isWordPressScrape()
-    {
-        return $this->request_type->isWordPressScrape();
-    }
-
-
-    /**
-     * @return string
-     */
-    public function slug()
-    {
-        return $this->request_type->slug();
-    }
+	/**
+	 * $_GET parameters
+	 *
+	 * @var array $get
+	 */
+	private $get;
+
+	/**
+	 * $_POST parameters
+	 *
+	 * @var array $post
+	 */
+	private $post;
+
+	/**
+	 * $_COOKIE parameters
+	 *
+	 * @var array $cookie
+	 */
+	private $cookie;
+
+	/**
+	 * $_SERVER parameters
+	 *
+	 * @var array $server
+	 */
+	private $server;
+
+	/**
+	 * $_FILES parameters
+	 *
+	 * @var array $files
+	 */
+	private $files;
+
+	/**
+	 * $_REQUEST parameters
+	 *
+	 * @var array $request
+	 */
+	private $request;
+
+	/**
+	 * @var RequestTypeContextCheckerInterface
+	 */
+	private $request_type;
+
+	/**
+	 * IP address for request
+	 *
+	 * @var string $ip_address
+	 */
+	private $ip_address;
+
+	/**
+	 * @var string $user_agent
+	 */
+	private $user_agent;
+
+	/**
+	 * true if current user appears to be some kind of bot
+	 *
+	 * @var bool $is_bot
+	 */
+	private $is_bot;
+
+
+	/**
+	 * @param array $get
+	 * @param array $post
+	 * @param array $cookie
+	 * @param array $server
+	 * @param array $files
+	 */
+	public function __construct(array $get, array $post, array $cookie, array $server, array $files = array())
+	{
+		// grab request vars
+		$this->get = $get;
+		$this->post = $post;
+		$this->cookie = $cookie;
+		$this->server = $server;
+		$this->files = $files;
+		$this->request = array_merge($this->get, $this->post);
+		$this->ip_address = $this->visitorIp();
+	}
+
+
+	/**
+	 * @param RequestTypeContextCheckerInterface $type
+	 */
+	public function setRequestTypeContextChecker(RequestTypeContextCheckerInterface $type)
+	{
+		$this->request_type = $type;
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function getParams()
+	{
+		return $this->get;
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function postParams()
+	{
+		return $this->post;
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function cookieParams()
+	{
+		return $this->cookie;
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function serverParams()
+	{
+		return $this->server;
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function filesParams()
+	{
+		return $this->files;
+	}
+
+
+	/**
+	 * returns contents of $_REQUEST
+	 *
+	 * @return array
+	 */
+	public function requestParams()
+	{
+		return $this->request;
+	}
+
+
+	/**
+	 * @param      $key
+	 * @param      $value
+	 * @param bool $override_ee
+	 * @return    void
+	 */
+	public function setRequestParam($key, $value, $override_ee = false)
+	{
+		// don't allow "ee" to be overwritten unless explicitly instructed to do so
+		if ($key !== 'ee'
+			|| ($key === 'ee' && empty($this->request['ee']))
+			|| ($key === 'ee' && ! empty($this->request['ee']) && $override_ee)
+		) {
+			$this->request[ $key ] = $value;
+		}
+	}
+
+
+	/**
+	 * returns   the value for a request param if the given key exists
+	 *
+	 * @param       $key
+	 * @param null  $default
+	 * @return mixed
+	 */
+	public function getRequestParam($key, $default = null)
+	{
+		return $this->requestParameterDrillDown($key, $default, 'get');
+	}
+
+
+	/**
+	 * check if param exists
+	 *
+	 * @param       $key
+	 * @return bool
+	 */
+	public function requestParamIsSet($key)
+	{
+		return $this->requestParameterDrillDown($key);
+	}
+
+
+	/**
+	 * check if a request parameter exists whose key that matches the supplied wildcard pattern
+	 * and return the value for the first match found
+	 * wildcards can be either of the following:
+	 *      ? to represent a single character of any type
+	 *      * to represent one or more characters of any type
+	 *
+	 * @param string     $pattern
+	 * @param null|mixed $default
+	 * @return mixed
+	 */
+	public function getMatch($pattern, $default = null)
+	{
+		return $this->requestParameterDrillDown($pattern, $default, 'match');
+	}
+
+
+	/**
+	 * check if a request parameter exists whose key matches the supplied wildcard pattern
+	 * wildcards can be either of the following:
+	 *      ? to represent a single character of any type
+	 *      * to represent one or more characters of any type
+	 * returns true if a match is found or false if not
+	 *
+	 * @param string $pattern
+	 * @return bool
+	 */
+	public function matches($pattern)
+	{
+		return $this->requestParameterDrillDown($pattern, null, 'match') !== null;
+	}
+
+
+	/**
+	 * @see https://stackoverflow.com/questions/6163055/php-string-matching-with-wildcard
+	 * @param string $pattern               A string including wildcards to be converted to a regex pattern
+	 *                                      and used to search through the current request's parameter keys
+	 * @param array  $request_params        The array of request parameters to search through
+	 * @param mixed  $default               [optional] The value to be returned if no match is found.
+	 *                                      Default is null
+	 * @param string $return                [optional] Controls what kind of value is returned.
+	 *                                      Options are:
+	 *                                      'bool' will return true or false if match is found or not
+	 *                                      'key' will return the first key found that matches the supplied pattern
+	 *                                      'value' will return the value for the first request parameter
+	 *                                      whose key matches the supplied pattern
+	 *                                      Default is 'value'
+	 * @return boolean|string
+	 */
+	private function match($pattern, array $request_params, $default = null, $return = 'value')
+	{
+		$return = in_array($return, array('bool', 'key', 'value'), true)
+			? $return
+			: 'is_set';
+		// replace wildcard chars with regex chars
+		$pattern = str_replace(
+			array("\*", "\?"),
+			array('.*', '.'),
+			preg_quote($pattern, '/')
+		);
+		foreach ($request_params as $key => $request_param) {
+			if (preg_match('/^' . $pattern . '$/is', $key)) {
+				// return value for request param
+				if ($return === 'value') {
+					return $request_params[ $key ];
+				}
+				// or actual key or true just to indicate it was found
+				return $return === 'key' ? $key : true;
+			}
+		}
+		// match not found so return default value or false
+		return $return === 'value' ? $default : false;
+	}
+
+
+	/**
+	 * the supplied key can be a simple string to represent a "top-level" request parameter
+	 * or represent a key for a request parameter that is nested deeper within the request parameter array,
+	 * by using square brackets to surround keys for deeper array elements.
+	 * For example :
+	 * if the supplied $key was: "first[second][third]"
+	 * then this will attempt to drill down into the request parameter array to find a value.
+	 * Given the following request parameters:
+	 *  array(
+	 *      'first' => array(
+	 *          'second' => array(
+	 *              'third' => 'has a value'
+	 *          )
+	 *      )
+	 *  )
+	 * would return true if default parameters were set
+	 *
+	 * @param string $callback
+	 * @param        $key
+	 * @param null   $default
+	 * @param array  $request_params
+	 * @return bool|mixed|null
+	 */
+	private function requestParameterDrillDown(
+		$key,
+		$default = null,
+		$callback = 'is_set',
+		array $request_params = array()
+	) {
+		$callback = in_array($callback, array('is_set', 'get', 'match'), true)
+			? $callback
+			: 'is_set';
+		$request_params = ! empty($request_params)
+			? $request_params
+			: $this->request;
+		// does incoming key represent an array like 'first[second][third]'  ?
+		if (strpos($key, '[') !== false) {
+			// turn it into an actual array
+			$key = str_replace(']', '', $key);
+			$keys = explode('[', $key);
+			$key = array_shift($keys);
+			if ($callback === 'match') {
+				$real_key = $this->match($key, $request_params, $default, 'key');
+				$key = $real_key ? $real_key : $key;
+			}
+			// check if top level key exists
+			if (isset($request_params[ $key ])) {
+				// build a new key to pass along like: 'second[third]'
+				// or just 'second' depending on depth of keys
+				$key_string = array_shift($keys);
+				if (! empty($keys)) {
+					$key_string .= '[' . implode('][', $keys) . ']';
+				}
+				return $this->requestParameterDrillDown(
+					$key_string,
+					$default,
+					$callback,
+					$request_params[ $key ]
+				);
+			}
+		}
+		if ($callback === 'is_set') {
+			return isset($request_params[ $key ]);
+		}
+		if ($callback === 'match') {
+			return $this->match($key, $request_params, $default);
+		}
+		return isset($request_params[ $key ])
+			? $request_params[ $key ]
+			: $default;
+	}
+
+
+	/**
+	 * remove param
+	 *
+	 * @param      $key
+	 * @param bool $unset_from_global_too
+	 */
+	public function unSetRequestParam($key, $unset_from_global_too = false)
+	{
+		// because unset may not actually remove var
+		$this->request[ $key ] = null;
+		unset($this->request[ $key ]);
+		if ($unset_from_global_too) {
+			unset($_REQUEST[ $key ]);
+		}
+	}
+
+
+	/**
+	 * remove params
+	 *
+	 * @param array $keys
+	 * @param bool  $unset_from_global_too
+	 */
+	public function unSetRequestParams(array $keys, $unset_from_global_too = false)
+	{
+		foreach ($keys as $key) {
+			$this->unSetRequestParam($key, $unset_from_global_too);
+		}
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function ipAddress()
+	{
+		return $this->ip_address;
+	}
+
+
+	/**
+	 * attempt to get IP address of current visitor from server
+	 * plz see: http://stackoverflow.com/a/2031935/1475279
+	 *
+	 * @access public
+	 * @return string
+	 */
+	private function visitorIp()
+	{
+		$visitor_ip = '0.0.0.0';
+		$server_keys = array(
+			'HTTP_CLIENT_IP',
+			'HTTP_X_FORWARDED_FOR',
+			'HTTP_X_FORWARDED',
+			'HTTP_X_CLUSTER_CLIENT_IP',
+			'HTTP_FORWARDED_FOR',
+			'HTTP_FORWARDED',
+			'REMOTE_ADDR',
+		);
+		foreach ($server_keys as $key) {
+			if (isset($this->server[ $key ])) {
+				foreach (array_map('trim', explode(',', $this->server[ $key ])) as $ip) {
+					if ($ip === '127.0.0.1' || filter_var($ip, FILTER_VALIDATE_IP) !== false) {
+						$visitor_ip = $ip;
+					}
+				}
+			}
+		}
+		return $visitor_ip;
+	}
+
+
+	/**
+	 * Gets the request's literal URI. Related to `requestUriAfterSiteHomeUri`, see its description for a comparison.
+	 * @param boolean $relativeToWpRoot If home_url() is "http://mysite.com/wp/", and a request comes to
+	 *                                  "http://mysite.com/wp/wp-json", setting $relativeToWpRoot=true will return
+	 *                                  "/wp-json", whereas $relativeToWpRoot=false will return "/wp/wp-json/".
+	 * @return string
+	 */
+	public function requestUri($relativeToWpRoot = false)
+	{
+		$request_uri = filter_input(
+			INPUT_SERVER,
+			'REQUEST_URI',
+			FILTER_SANITIZE_URL,
+			FILTER_NULL_ON_FAILURE
+		);
+		if (empty($request_uri)) {
+			// fallback sanitization if the above fails
+			$request_uri = wp_sanitize_redirect($this->server['REQUEST_URI']);
+		}
+		if ($relativeToWpRoot) {
+			$home_path = untrailingslashit(
+				parse_url(
+					home_url(),
+					PHP_URL_PATH
+				)
+			);
+			$request_uri = str_replace(
+				$home_path,
+				'',
+				$request_uri
+			);
+		}
+		return $request_uri;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function userAgent()
+	{
+		return $this->user_agent;
+	}
+
+
+	/**
+	 * @param string $user_agent
+	 */
+	public function setUserAgent($user_agent = '')
+	{
+		if ($user_agent === '' || ! is_string($user_agent)) {
+			$user_agent = isset($_SERVER['HTTP_USER_AGENT']) ? (string) esc_attr($_SERVER['HTTP_USER_AGENT']) : '';
+		}
+		$this->user_agent = $user_agent;
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isBot()
+	{
+		return $this->is_bot;
+	}
+
+
+	/**
+	 * @param bool $is_bot
+	 */
+	public function setIsBot($is_bot)
+	{
+		$this->is_bot = filter_var($is_bot, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isActivation()
+	{
+		return $this->request_type->isActivation();
+	}
+
+
+	/**
+	 * @param $is_activation
+	 * @return bool
+	 */
+	public function setIsActivation($is_activation)
+	{
+		return $this->request_type->setIsActivation($is_activation);
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isAdmin()
+	{
+		return $this->request_type->isAdmin();
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isAdminAjax()
+	{
+		return $this->request_type->isAdminAjax();
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isAjax()
+	{
+		return $this->request_type->isAjax();
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isEeAjax()
+	{
+		return $this->request_type->isEeAjax();
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isOtherAjax()
+	{
+		return $this->request_type->isOtherAjax();
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isApi()
+	{
+		return $this->request_type->isApi();
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isCli()
+	{
+		return $this->request_type->isCli();
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isCron()
+	{
+		return $this->request_type->isCron();
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isFeed()
+	{
+		return $this->request_type->isFeed();
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isFrontend()
+	{
+		return $this->request_type->isFrontend();
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isFrontAjax()
+	{
+		return $this->request_type->isFrontAjax();
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isIframe()
+	{
+		return $this->request_type->isIframe();
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isWordPressApi()
+	{
+		return $this->request_type->isWordPressApi();
+	}
+
+
+
+	/**
+	 * @return bool
+	 */
+	public function isWordPressHeartbeat()
+	{
+		return $this->request_type->isWordPressHeartbeat();
+	}
+
+
+
+	/**
+	 * @return bool
+	 */
+	public function isWordPressScrape()
+	{
+		return $this->request_type->isWordPressScrape();
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function slug()
+	{
+		return $this->request_type->slug();
+	}
 }

Spacing +15 added lines, -15 removed lines

@@ -182,7 +182,7 @@ 
             || ($key === 'ee' && empty($this->request['ee']))
             || ($key === 'ee' && ! empty($this->request['ee']) && $override_ee)
         ) {
-            $this->request[ $key ] = $value;
+            $this->request[$key] = $value;
         }
     }
 
@@ -273,10 +273,10 @@ 
             preg_quote($pattern, '/')
         );
         foreach ($request_params as $key => $request_param) {
-            if (preg_match('/^' . $pattern . '$/is', $key)) {
+            if (preg_match('/^'.$pattern.'$/is', $key)) {
                 // return value for request param
                 if ($return === 'value') {
-                    return $request_params[ $key ];
+                    return $request_params[$key];
                 }
                 // or actual key or true just to indicate it was found
                 return $return === 'key' ? $key : true;
@@ -333,29 +333,29 @@ 
                 $key = $real_key ? $real_key : $key;
             }
             // check if top level key exists
-            if (isset($request_params[ $key ])) {
+            if (isset($request_params[$key])) {
                 // build a new key to pass along like: 'second[third]'
                 // or just 'second' depending on depth of keys
                 $key_string = array_shift($keys);
-                if (! empty($keys)) {
-                    $key_string .= '[' . implode('][', $keys) . ']';
+                if ( ! empty($keys)) {
+                    $key_string .= '['.implode('][', $keys).']';
                 }
                 return $this->requestParameterDrillDown(
                     $key_string,
                     $default,
                     $callback,
-                    $request_params[ $key ]
+                    $request_params[$key]
                 );
             }
         }
         if ($callback === 'is_set') {
-            return isset($request_params[ $key ]);
+            return isset($request_params[$key]);
         }
         if ($callback === 'match') {
             return $this->match($key, $request_params, $default);
         }
-        return isset($request_params[ $key ])
-            ? $request_params[ $key ]
+        return isset($request_params[$key])
+            ? $request_params[$key]
             : $default;
     }
 
@@ -369,10 +369,10 @@ 
     public function unSetRequestParam($key, $unset_from_global_too = false)
     {
         // because unset may not actually remove var
-        $this->request[ $key ] = null;
-        unset($this->request[ $key ]);
+        $this->request[$key] = null;
+        unset($this->request[$key]);
         if ($unset_from_global_too) {
-            unset($_REQUEST[ $key ]);
+            unset($_REQUEST[$key]);
         }
     }
 
@@ -420,8 +420,8 @@ 
             'REMOTE_ADDR',
         );
         foreach ($server_keys as $key) {
-            if (isset($this->server[ $key ])) {
-                foreach (array_map('trim', explode(',', $this->server[ $key ])) as $ip) {
+            if (isset($this->server[$key])) {
+                foreach (array_map('trim', explode(',', $this->server[$key])) as $ip) {
                     if ($ip === '127.0.0.1' || filter_var($ip, FILTER_VALIDATE_IP) !== false) {
                         $visitor_ip = $ip;
                     }

core/services/admin/AdminPageHeaderDecoratorInterface.php

Indentation +6 added lines, -6 removed lines

@@ -13,10 +13,10 @@
 interface AdminPageHeaderDecoratorInterface
 {
 
-    /**
-     * @param string $text
-     * @return string
-     * @since $VID:$
-     */
-    public function getHeaderText($text = '');
+	/**
+	 * @param string $text
+	 * @return string
+	 * @since $VID:$
+	 */
+	public function getHeaderText($text = '');
 }