eventespresso / event-espresso-core

core/libraries/form_sections/strategies/validation/EE_Plaintext_Validation_Strategy.strategy.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
      */
     public function __construct($validation_error_message = null)
     {
-        if (! $validation_error_message) {
+        if ( ! $validation_error_message) {
             $validation_error_message = esc_html__("HTML tags are not permitted in this field", "event_espresso");
         }
         parent::__construct($validation_error_message);

Indentation +22 added lines, -22 removed lines

@@ -13,27 +13,27 @@
  */
 class EE_Plaintext_Validation_Strategy extends EE_Validation_Strategy_Base
 {
-    /**
-     * @param null $validation_error_message
-     */
-    public function __construct($validation_error_message = null)
-    {
-        if (! $validation_error_message) {
-            $validation_error_message = esc_html__("HTML tags are not permitted in this field", "event_espresso");
-        }
-        parent::__construct($validation_error_message);
-    }
+	/**
+	 * @param null $validation_error_message
+	 */
+	public function __construct($validation_error_message = null)
+	{
+		if (! $validation_error_message) {
+			$validation_error_message = esc_html__("HTML tags are not permitted in this field", "event_espresso");
+		}
+		parent::__construct($validation_error_message);
+	}
 
-    /**
-     * @param $normalized_value
-     * @throws \EE_Validation_Error
-     */
-    public function validate($normalized_value)
-    {
-        $no_tags = wp_strip_all_tags($normalized_value);
-        if (strlen($no_tags) < strlen(trim($normalized_value))) {
-            throw new EE_Validation_Error($this->get_validation_error_message(), 'no_html_tags');
-        }
-        parent::validate($normalized_value);
-    }
+	/**
+	 * @param $normalized_value
+	 * @throws \EE_Validation_Error
+	 */
+	public function validate($normalized_value)
+	{
+		$no_tags = wp_strip_all_tags($normalized_value);
+		if (strlen($no_tags) < strlen(trim($normalized_value))) {
+			throw new EE_Validation_Error($this->get_validation_error_message(), 'no_html_tags');
+		}
+		parent::validate($normalized_value);
+	}
 }

core/libraries/form_sections/strategies/validation/EE_Conditionally_Required_Validation_Strategy.strategy.php

Spacing +11 added lines, -11 removed lines

@@ -28,7 +28,7 @@ 
      */
     public function __construct($validation_error_message = null, $requirement_conditions = array())
     {
-        if (! $validation_error_message) {
+        if ( ! $validation_error_message) {
             $validation_error_message = esc_html__("This field is required.", "event_espresso");
         }
         $this->set_requirement_conditions($requirement_conditions);
@@ -116,7 +116,7 @@ 
     {
         $requirement_value = '';
         $conditions = $this->get_requirement_conditions();
-        if (! is_array($conditions)) {
+        if ( ! is_array($conditions)) {
             EE_Error::throw_exception_if_debugging(
                 sprintf(
                     esc_html__('Input requirement conditions must be an array. You provided %1$s', 'event_espresso'),
@@ -141,7 +141,7 @@ 
         }
         foreach ($conditions as $input_path => $op_and_value) {
             $input = $this->_input->find_section_from_path($input_path);
-            if (! $input instanceof EE_Form_Input_Base) {
+            if ( ! $input instanceof EE_Form_Input_Base) {
                 EE_Error::throw_exception_if_debugging(
                     sprintf(
                         esc_html__('Error encountered while setting requirement condition for input %1$s. The path %2$s does not correspond to a valid input', 'event_espresso'),
@@ -154,9 +154,9 @@ 
                 );
                 return false;
             }
-            list( $op, $value ) = $this->_validate_op_and_value($op_and_value);
+            list($op, $value) = $this->_validate_op_and_value($op_and_value);
             // ok now the jquery dependency expression depends on the input's display strategy.
-            if (! $input->get_display_strategy() instanceof EE_Select_Display_Strategy) {
+            if ( ! $input->get_display_strategy() instanceof EE_Select_Display_Strategy) {
                 EE_Error::throw_exception_if_debugging(
                     sprintf(
                         esc_html__('Required Validation Strategy can only depend on another input which uses the EE_Select_Display_Strategy, but you specified a field "%1$s" that uses display strategy "%2$s". If you need others, please add support for it! The related input is %3$s', 'event_espresso'),
@@ -169,7 +169,7 @@ 
                     __LINE__
                 );
             }
-            $requirement_value = $input->html_id(true) . ' option[value="' . $value . '"]:selected';
+            $requirement_value = $input->html_id(true).' option[value="'.$value.'"]:selected';
         }
         return $requirement_value;
     }
@@ -190,7 +190,7 @@ 
         $conditions = $this->get_requirement_conditions();
         foreach ($conditions as $input_path => $op_and_value) {
             $input = $this->_input->find_section_from_path($input_path);
-            if (! $input instanceof EE_Form_Input_Base) {
+            if ( ! $input instanceof EE_Form_Input_Base) {
                 EE_Error::throw_exception_if_debugging(
                     sprintf(
                         esc_html__('Error encountered while setting requirement condition for input %1$s. The path %2$s does not correspond to a valid input', 'event_espresso'),
@@ -203,13 +203,13 @@ 
                 );
                 return false;
             }
-            list( $op, $value ) = $this->_validate_op_and_value($op_and_value);
+            list($op, $value) = $this->_validate_op_and_value($op_and_value);
             switch ($op) {
                 case '=':
                 default:
                     $meets_all_requirements = $input->normalized_value() === $value;
             }
-            if (! $meets_all_requirements) {
+            if ( ! $meets_all_requirements) {
                 break;
             }
         }
@@ -228,7 +228,7 @@ 
      */
     protected function _validate_op_and_value($op_and_value)
     {
-        if (! isset($op_and_value[0], $op_and_value[1])) {
+        if ( ! isset($op_and_value[0], $op_and_value[1])) {
                 EE_Error::throw_exception_if_debugging(
                     sprintf(
                         esc_html__('Required Validation Strategy conditions array\'s value must be an array with two elements: an operator, and a value. It didn\'t. The related input is %1$s', 'event_espresso'),
@@ -252,6 +252,6 @@ 
                 __LINE__
             );
         }
-            return array( $operator, $value );
+            return array($operator, $value);
     }
 }

Indentation +222 added lines, -222 removed lines

@@ -11,246 +11,246 @@
  */
 class EE_Conditionally_Required_Validation_Strategy extends EE_Validation_Strategy_Base
 {
-    /**
-     * Array describing conditions necessary to make the input required.
-     * This is used to derive a jquery dependency expression (see http://jqueryvalidation.org/required-method)
-     * or jquery callback; and server-side logic to determine if the field is necessary.
-     * @var array
-     */
-    protected $requirement_conditions;
+	/**
+	 * Array describing conditions necessary to make the input required.
+	 * This is used to derive a jquery dependency expression (see http://jqueryvalidation.org/required-method)
+	 * or jquery callback; and server-side logic to determine if the field is necessary.
+	 * @var array
+	 */
+	protected $requirement_conditions;
 
 
 
-    /**
-     * @param string $validation_error_message
-     * @param array $requirement_conditions
-     */
-    public function __construct($validation_error_message = null, $requirement_conditions = array())
-    {
-        if (! $validation_error_message) {
-            $validation_error_message = esc_html__("This field is required.", "event_espresso");
-        }
-        $this->set_requirement_conditions($requirement_conditions);
-        parent::__construct($validation_error_message);
-    }
+	/**
+	 * @param string $validation_error_message
+	 * @param array $requirement_conditions
+	 */
+	public function __construct($validation_error_message = null, $requirement_conditions = array())
+	{
+		if (! $validation_error_message) {
+			$validation_error_message = esc_html__("This field is required.", "event_espresso");
+		}
+		$this->set_requirement_conditions($requirement_conditions);
+		parent::__construct($validation_error_message);
+	}
 
 
 
-    /**
-     * just checks the field isn't blank, provided the requirement conditions
-     * indicate this input is still required
-     *
-     * @param $normalized_value
-     * @return bool
-     * @throws \EE_Error
-     * @throws \EE_Validation_Error
-     */
-    public function validate($normalized_value)
-    {
-        if (
-            (
-                $normalized_value === ''
-                || $normalized_value === null
-                || $normalized_value === array()
-            )
-            && $this->_input_is_required_server_side()
-        ) {
-            throw new EE_Validation_Error($this->get_validation_error_message(), 'required');
-        } else {
-            return true;
-        }
-    }
+	/**
+	 * just checks the field isn't blank, provided the requirement conditions
+	 * indicate this input is still required
+	 *
+	 * @param $normalized_value
+	 * @return bool
+	 * @throws \EE_Error
+	 * @throws \EE_Validation_Error
+	 */
+	public function validate($normalized_value)
+	{
+		if (
+			(
+				$normalized_value === ''
+				|| $normalized_value === null
+				|| $normalized_value === array()
+			)
+			&& $this->_input_is_required_server_side()
+		) {
+			throw new EE_Validation_Error($this->get_validation_error_message(), 'required');
+		} else {
+			return true;
+		}
+	}
 
 
 
-    /**
-     * @return array
-     * @throws \EE_Error
-     */
-    public function get_jquery_validation_rule_array()
-    {
-        return array(
-            'required' => $this->_get_jquery_requirement_value(),
-            'messages' => array(
-                'required' => $this->get_validation_error_message()
-            )
-        );
-    }
+	/**
+	 * @return array
+	 * @throws \EE_Error
+	 */
+	public function get_jquery_validation_rule_array()
+	{
+		return array(
+			'required' => $this->_get_jquery_requirement_value(),
+			'messages' => array(
+				'required' => $this->get_validation_error_message()
+			)
+		);
+	}
 
-    /**
-     * Sets the "required conditions". This should be an array, its top-level key
-     * is the name of a field, its value is an array. This 2nd level array has two items:
-     * the first is the operator (for now only '=' is accepted), and teh 2nd argument is the
-     * the value the field should be in order to make the field required.
-     * Eg array( 'payment_type' => array( '=', 'credit_card' ).
-     *
-     * @param array $requirement_conditions
-     */
-    public function set_requirement_conditions($requirement_conditions)
-    {
-        $this->requirement_conditions = (array) $requirement_conditions;
-    }
+	/**
+	 * Sets the "required conditions". This should be an array, its top-level key
+	 * is the name of a field, its value is an array. This 2nd level array has two items:
+	 * the first is the operator (for now only '=' is accepted), and teh 2nd argument is the
+	 * the value the field should be in order to make the field required.
+	 * Eg array( 'payment_type' => array( '=', 'credit_card' ).
+	 *
+	 * @param array $requirement_conditions
+	 */
+	public function set_requirement_conditions($requirement_conditions)
+	{
+		$this->requirement_conditions = (array) $requirement_conditions;
+	}
 
-    /**
-     * Gets the array that describes when the related input should be required.
-     * see set_requirement_conditions for a description of how it should be formatted
-     * @return array
-     */
-    public function get_requirement_conditions()
-    {
-        return $this->requirement_conditions;
-    }
+	/**
+	 * Gets the array that describes when the related input should be required.
+	 * see set_requirement_conditions for a description of how it should be formatted
+	 * @return array
+	 */
+	public function get_requirement_conditions()
+	{
+		return $this->requirement_conditions;
+	}
 
 
 
-    /**
-     * gets jQuery dependency expression used for client-side validation
-     * Its possible this could also return a javascript callback used for determining
-     * if the input is required or not. That is not yet implemented, however.
-     *
-     * @return string see http://jqueryvalidation.org/required-method for format
-     * @throws \EE_Error
-     */
-    protected function _get_jquery_requirement_value()
-    {
-        $requirement_value = '';
-        $conditions = $this->get_requirement_conditions();
-        if (! is_array($conditions)) {
-            EE_Error::throw_exception_if_debugging(
-                sprintf(
-                    esc_html__('Input requirement conditions must be an array. You provided %1$s', 'event_espresso'),
-                    $this->_input->name()
-                ),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-            return true;
-        }
-        if (count($conditions) > 1) {
-            EE_Error::throw_exception_if_debugging(
-                sprintf(
-                    esc_html__('Required Validation Strategy does not yet support multiple conditions. You should add it! The related input is %1$s', 'event_espresso'),
-                    $this->_input->name()
-                ),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-        }
-        foreach ($conditions as $input_path => $op_and_value) {
-            $input = $this->_input->find_section_from_path($input_path);
-            if (! $input instanceof EE_Form_Input_Base) {
-                EE_Error::throw_exception_if_debugging(
-                    sprintf(
-                        esc_html__('Error encountered while setting requirement condition for input %1$s. The path %2$s does not correspond to a valid input', 'event_espresso'),
-                        $this->_input->name(),
-                        $input_path
-                    ),
-                    __FILE__,
-                    __FUNCTION__,
-                    __LINE__
-                );
-                return false;
-            }
-            list( $op, $value ) = $this->_validate_op_and_value($op_and_value);
-            // ok now the jquery dependency expression depends on the input's display strategy.
-            if (! $input->get_display_strategy() instanceof EE_Select_Display_Strategy) {
-                EE_Error::throw_exception_if_debugging(
-                    sprintf(
-                        esc_html__('Required Validation Strategy can only depend on another input which uses the EE_Select_Display_Strategy, but you specified a field "%1$s" that uses display strategy "%2$s". If you need others, please add support for it! The related input is %3$s', 'event_espresso'),
-                        $input->name(),
-                        get_class($input->get_display_strategy()),
-                        $this->_input->name()
-                    ),
-                    __FILE__,
-                    __FUNCTION__,
-                    __LINE__
-                );
-            }
-            $requirement_value = $input->html_id(true) . ' option[value="' . $value . '"]:selected';
-        }
-        return $requirement_value;
-    }
+	/**
+	 * gets jQuery dependency expression used for client-side validation
+	 * Its possible this could also return a javascript callback used for determining
+	 * if the input is required or not. That is not yet implemented, however.
+	 *
+	 * @return string see http://jqueryvalidation.org/required-method for format
+	 * @throws \EE_Error
+	 */
+	protected function _get_jquery_requirement_value()
+	{
+		$requirement_value = '';
+		$conditions = $this->get_requirement_conditions();
+		if (! is_array($conditions)) {
+			EE_Error::throw_exception_if_debugging(
+				sprintf(
+					esc_html__('Input requirement conditions must be an array. You provided %1$s', 'event_espresso'),
+					$this->_input->name()
+				),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+			return true;
+		}
+		if (count($conditions) > 1) {
+			EE_Error::throw_exception_if_debugging(
+				sprintf(
+					esc_html__('Required Validation Strategy does not yet support multiple conditions. You should add it! The related input is %1$s', 'event_espresso'),
+					$this->_input->name()
+				),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+		}
+		foreach ($conditions as $input_path => $op_and_value) {
+			$input = $this->_input->find_section_from_path($input_path);
+			if (! $input instanceof EE_Form_Input_Base) {
+				EE_Error::throw_exception_if_debugging(
+					sprintf(
+						esc_html__('Error encountered while setting requirement condition for input %1$s. The path %2$s does not correspond to a valid input', 'event_espresso'),
+						$this->_input->name(),
+						$input_path
+					),
+					__FILE__,
+					__FUNCTION__,
+					__LINE__
+				);
+				return false;
+			}
+			list( $op, $value ) = $this->_validate_op_and_value($op_and_value);
+			// ok now the jquery dependency expression depends on the input's display strategy.
+			if (! $input->get_display_strategy() instanceof EE_Select_Display_Strategy) {
+				EE_Error::throw_exception_if_debugging(
+					sprintf(
+						esc_html__('Required Validation Strategy can only depend on another input which uses the EE_Select_Display_Strategy, but you specified a field "%1$s" that uses display strategy "%2$s". If you need others, please add support for it! The related input is %3$s', 'event_espresso'),
+						$input->name(),
+						get_class($input->get_display_strategy()),
+						$this->_input->name()
+					),
+					__FILE__,
+					__FUNCTION__,
+					__LINE__
+				);
+			}
+			$requirement_value = $input->html_id(true) . ' option[value="' . $value . '"]:selected';
+		}
+		return $requirement_value;
+	}
 
 
 
-    /**
-     * Returns whether or not this input is required based on the _requirement_conditions
-     * (not whether or not the input passes validation. That's for the validate method
-     * to decide)
-     *
-     * @return boolean
-     * @throws \EE_Error
-     */
-    protected function _input_is_required_server_side()
-    {
-        $meets_all_requirements = true;
-        $conditions = $this->get_requirement_conditions();
-        foreach ($conditions as $input_path => $op_and_value) {
-            $input = $this->_input->find_section_from_path($input_path);
-            if (! $input instanceof EE_Form_Input_Base) {
-                EE_Error::throw_exception_if_debugging(
-                    sprintf(
-                        esc_html__('Error encountered while setting requirement condition for input %1$s. The path %2$s does not correspond to a valid input', 'event_espresso'),
-                        $this->_input->name(),
-                        $input_path
-                    ),
-                    __FILE__,
-                    __FUNCTION__,
-                    __LINE__
-                );
-                return false;
-            }
-            list( $op, $value ) = $this->_validate_op_and_value($op_and_value);
-            switch ($op) {
-                case '=':
-                default:
-                    $meets_all_requirements = $input->normalized_value() === $value;
-            }
-            if (! $meets_all_requirements) {
-                break;
-            }
-        }
-        return $meets_all_requirements;
-    }
+	/**
+	 * Returns whether or not this input is required based on the _requirement_conditions
+	 * (not whether or not the input passes validation. That's for the validate method
+	 * to decide)
+	 *
+	 * @return boolean
+	 * @throws \EE_Error
+	 */
+	protected function _input_is_required_server_side()
+	{
+		$meets_all_requirements = true;
+		$conditions = $this->get_requirement_conditions();
+		foreach ($conditions as $input_path => $op_and_value) {
+			$input = $this->_input->find_section_from_path($input_path);
+			if (! $input instanceof EE_Form_Input_Base) {
+				EE_Error::throw_exception_if_debugging(
+					sprintf(
+						esc_html__('Error encountered while setting requirement condition for input %1$s. The path %2$s does not correspond to a valid input', 'event_espresso'),
+						$this->_input->name(),
+						$input_path
+					),
+					__FILE__,
+					__FUNCTION__,
+					__LINE__
+				);
+				return false;
+			}
+			list( $op, $value ) = $this->_validate_op_and_value($op_and_value);
+			switch ($op) {
+				case '=':
+				default:
+					$meets_all_requirements = $input->normalized_value() === $value;
+			}
+			if (! $meets_all_requirements) {
+				break;
+			}
+		}
+		return $meets_all_requirements;
+	}
 
 
 
-    /**
-     * Verifies this is an array with keys 0 and 1, where key 0 is a usable
-     * operator (initially just '=') and key 1 is something that can be cast to a string
-     *
-     * @param array $op_and_value
-     * @return array
-     * @throws \EE_Error
-     */
-    protected function _validate_op_and_value($op_and_value)
-    {
-        if (! isset($op_and_value[0], $op_and_value[1])) {
-                EE_Error::throw_exception_if_debugging(
-                    sprintf(
-                        esc_html__('Required Validation Strategy conditions array\'s value must be an array with two elements: an operator, and a value. It didn\'t. The related input is %1$s', 'event_espresso'),
-                        $this->_input->name()
-                    ),
-                    __FILE__,
-                    __FUNCTION__,
-                    __LINE__
-                );
-        }
-            $operator = $op_and_value[0];
-            $value = (string) $op_and_value[1];
-        if ($operator !== '=') {
-            EE_Error::throw_exception_if_debugging(
-                sprintf(
-                    esc_html__('Required Validation Strategy conditions can currently only use the equals operator. If you need others, please add support for it! The related input is %1$s', 'event_espresso'),
-                    $this->_input->name()
-                ),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-        }
-            return array( $operator, $value );
-    }
+	/**
+	 * Verifies this is an array with keys 0 and 1, where key 0 is a usable
+	 * operator (initially just '=') and key 1 is something that can be cast to a string
+	 *
+	 * @param array $op_and_value
+	 * @return array
+	 * @throws \EE_Error
+	 */
+	protected function _validate_op_and_value($op_and_value)
+	{
+		if (! isset($op_and_value[0], $op_and_value[1])) {
+				EE_Error::throw_exception_if_debugging(
+					sprintf(
+						esc_html__('Required Validation Strategy conditions array\'s value must be an array with two elements: an operator, and a value. It didn\'t. The related input is %1$s', 'event_espresso'),
+						$this->_input->name()
+					),
+					__FILE__,
+					__FUNCTION__,
+					__LINE__
+				);
+		}
+			$operator = $op_and_value[0];
+			$value = (string) $op_and_value[1];
+		if ($operator !== '=') {
+			EE_Error::throw_exception_if_debugging(
+				sprintf(
+					esc_html__('Required Validation Strategy conditions can currently only use the equals operator. If you need others, please add support for it! The related input is %1$s', 'event_espresso'),
+					$this->_input->name()
+				),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+		}
+			return array( $operator, $value );
+	}
 }

core/libraries/form_sections/strategies/validation/EE_Float_Validation_Strategy.strategy.php

Spacing +2 added lines, -2 removed lines

@@ -17,7 +17,7 @@ 
      */
     public function __construct($validation_error_message = null)
     {
-        if (! $validation_error_message) {
+        if ( ! $validation_error_message) {
             $validation_error_message = sprintf(esc_html__("Only numeric characters, commas, periods, and spaces, please!", "event_espresso"));
         }
         parent::__construct($validation_error_message);
@@ -42,6 +42,6 @@ 
      */
     public function get_jquery_validation_rule_array()
     {
-        return array('number' => true, 'messages' => array( 'number' => $this->get_validation_error_message() ) );
+        return array('number' => true, 'messages' => array('number' => $this->get_validation_error_message()));
     }
 }

Indentation +26 added lines, -26 removed lines

@@ -11,36 +11,36 @@
  */
 class EE_Float_Validation_Strategy extends EE_Validation_Strategy_Base
 {
-    /**
-     * @param null $validation_error_message
-     */
-    public function __construct($validation_error_message = null)
-    {
-        if (! $validation_error_message) {
-            $validation_error_message = sprintf(esc_html__("Only numeric characters, commas, periods, and spaces, please!", "event_espresso"));
-        }
-        parent::__construct($validation_error_message);
-    }
+	/**
+	 * @param null $validation_error_message
+	 */
+	public function __construct($validation_error_message = null)
+	{
+		if (! $validation_error_message) {
+			$validation_error_message = sprintf(esc_html__("Only numeric characters, commas, periods, and spaces, please!", "event_espresso"));
+		}
+		parent::__construct($validation_error_message);
+	}
 
 
 
-    /**
-     *
-     * @param $normalized_value
-     * @return bool
-     */
-    public function validate($normalized_value)
-    {
-        // errors should have been detected by the normalization strategy
-    }
+	/**
+	 *
+	 * @param $normalized_value
+	 * @return bool
+	 */
+	public function validate($normalized_value)
+	{
+		// errors should have been detected by the normalization strategy
+	}
 
 
 
-    /**
-     * @return array
-     */
-    public function get_jquery_validation_rule_array()
-    {
-        return array('number' => true, 'messages' => array( 'number' => $this->get_validation_error_message() ) );
-    }
+	/**
+	 * @return array
+	 */
+	public function get_jquery_validation_rule_array()
+	{
+		return array('number' => true, 'messages' => array( 'number' => $this->get_validation_error_message() ) );
+	}
 }

core/libraries/form_sections/strategies/validation/EE_Simple_HTML_Validation_Strategy.strategy.php

Spacing +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@ 
      */
     public function __construct($validation_error_message = null)
     {
-        if (! $validation_error_message) {
+        if ( ! $validation_error_message) {
             $allowedtags = $this->_get_allowed_tags();
             $validation_error_message = sprintf(esc_html__("Only simple HTML tags are allowed. Eg, %s", "event_espresso"), implode(",", array_keys($allowedtags)));
         }
@@ -62,7 +62,7 @@ 
     {
         $allowedtags = $this->_get_allowed_tags();
         parent::validate($normalized_value);
-        $normalized_value_sans_tags =  wp_kses("$normalized_value", $allowedtags);
+        $normalized_value_sans_tags = wp_kses("$normalized_value", $allowedtags);
         if (strlen($normalized_value) > strlen($normalized_value_sans_tags)) {
             throw new EE_Validation_Error($this->get_validation_error_message(), 'complex_html_tags');
         }

Indentation +44 added lines, -44 removed lines

@@ -13,57 +13,57 @@
  */
 class EE_Simple_HTML_Validation_Strategy extends EE_Validation_Strategy_Base
 {
-    /**
-     * @param null $validation_error_message
-     */
-    public function __construct($validation_error_message = null)
-    {
-        if (! $validation_error_message) {
-            $allowedtags = $this->_get_allowed_tags();
-            $validation_error_message = sprintf(esc_html__("Only simple HTML tags are allowed. Eg, %s", "event_espresso"), implode(",", array_keys($allowedtags)));
-        }
-        parent::__construct($validation_error_message);
-    }
+	/**
+	 * @param null $validation_error_message
+	 */
+	public function __construct($validation_error_message = null)
+	{
+		if (! $validation_error_message) {
+			$allowedtags = $this->_get_allowed_tags();
+			$validation_error_message = sprintf(esc_html__("Only simple HTML tags are allowed. Eg, %s", "event_espresso"), implode(",", array_keys($allowedtags)));
+		}
+		parent::__construct($validation_error_message);
+	}
 
 
 
-    /**
-     * get tags allowed
-     */
-    protected function _get_allowed_tags()
-    {
-        return EEH_HTML::get_simple_tags();
-    }
+	/**
+	 * get tags allowed
+	 */
+	protected function _get_allowed_tags()
+	{
+		return EEH_HTML::get_simple_tags();
+	}
 
 
 
-    /**
-     * add_more_tags
-     *
-     * generates and returns a string that lists the top-level HTML tags that are allowable for this input
-     *
-     * @return string
-     */
-    public function get_list_of_allowed_tags()
-    {
-        $allowed_tags = $this->_get_allowed_tags();
-        ksort($allowed_tags);
-        return implode(', ', array_keys($allowed_tags));
-    }
+	/**
+	 * add_more_tags
+	 *
+	 * generates and returns a string that lists the top-level HTML tags that are allowable for this input
+	 *
+	 * @return string
+	 */
+	public function get_list_of_allowed_tags()
+	{
+		$allowed_tags = $this->_get_allowed_tags();
+		ksort($allowed_tags);
+		return implode(', ', array_keys($allowed_tags));
+	}
 
 
 
-    /**
-     * @param $normalized_value
-     * @throws \EE_Validation_Error
-     */
-    public function validate($normalized_value)
-    {
-        $allowedtags = $this->_get_allowed_tags();
-        parent::validate($normalized_value);
-        $normalized_value_sans_tags =  wp_kses("$normalized_value", $allowedtags);
-        if (strlen($normalized_value) > strlen($normalized_value_sans_tags)) {
-            throw new EE_Validation_Error($this->get_validation_error_message(), 'complex_html_tags');
-        }
-    }
+	/**
+	 * @param $normalized_value
+	 * @throws \EE_Validation_Error
+	 */
+	public function validate($normalized_value)
+	{
+		$allowedtags = $this->_get_allowed_tags();
+		parent::validate($normalized_value);
+		$normalized_value_sans_tags =  wp_kses("$normalized_value", $allowedtags);
+		if (strlen($normalized_value) > strlen($normalized_value_sans_tags)) {
+			throw new EE_Validation_Error($this->get_validation_error_message(), 'complex_html_tags');
+		}
+	}
 }

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

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
         if (is_float($value_to_normalize) || is_int($value_to_normalize)) {
             return (float) $value_to_normalize;
         }
-        if (! is_string($value_to_normalize)) {
+        if ( ! is_string($value_to_normalize)) {
             throw new EE_Validation_Error(
                 sprintf(
                     esc_html__('The value "%s" must be a string submitted for normalization, it was %s', 'event_espresso'),
@@ -69,7 +69,7 @@ 
         }
         // this really shouldn't ever happen because fields with a float normalization strategy
         // should also have a float validation strategy, but in case it doesn't use the default
-        if (! $validation_error_message) {
+        if ( ! $validation_error_message) {
             $default_validation_strategy = new EE_Float_Validation_Strategy();
             $validation_error_message = $default_validation_strategy->get_validation_error_message();
         }

Indentation +70 added lines, -70 removed lines

@@ -10,84 +10,84 @@
  */
 class EE_Float_Normalization extends EE_Normalization_Strategy_Base
 {
-    /*
+	/*
      * regex pattern that matches for the following:
      *      * optional negative sign
      *      * one or more digits or decimals
      */
-    const REGEX = '/^(-?)([\d.]+)$/';
+	const REGEX = '/^(-?)([\d.]+)$/';
 
 
 
-    /**
-     * @param string $value_to_normalize
-     * @return float
-     * @throws \EE_Validation_Error
-     */
-    public function normalize($value_to_normalize)
-    {
-        if ($value_to_normalize === null) {
-            return null;
-        }
-        if (is_float($value_to_normalize) || is_int($value_to_normalize)) {
-            return (float) $value_to_normalize;
-        }
-        if (! is_string($value_to_normalize)) {
-            throw new EE_Validation_Error(
-                sprintf(
-                    esc_html__('The value "%s" must be a string submitted for normalization, it was %s', 'event_espresso'),
-                    print_r($value_to_normalize, true),
-                    gettype($value_to_normalize)
-                )
-            );
-        }
-        $normalized_value = filter_var(
-            $value_to_normalize,
-            FILTER_SANITIZE_NUMBER_FLOAT,
-            FILTER_FLAG_ALLOW_FRACTION
-        );
-        if ($normalized_value === '') {
-            return null;
-        }
-        if (preg_match(EE_Float_Normalization::REGEX, $normalized_value, $matches)) {
-            if (count($matches) === 3) {
-                // if first match is the negative sign,
-                // then the number needs to be multiplied by -1 to remain negative
-                return $matches[1] === '-'
-                    ? (float) $matches[2] * -1
-                    : (float) $matches[2];
-            }
-        }
-        // find if this input has a float validation strategy
-        // in which case, use its message
-        $validation_error_message = null;
-        foreach ($this->_input->get_validation_strategies() as $validation_strategy) {
-            if ($validation_strategy instanceof EE_Float_Validation_Strategy) {
-                $validation_error_message = $validation_strategy->get_validation_error_message();
-            }
-        }
-        // this really shouldn't ever happen because fields with a float normalization strategy
-        // should also have a float validation strategy, but in case it doesn't use the default
-        if (! $validation_error_message) {
-            $default_validation_strategy = new EE_Float_Validation_Strategy();
-            $validation_error_message = $default_validation_strategy->get_validation_error_message();
-        }
-        throw new EE_Validation_Error($validation_error_message, 'float_only');
-    }
+	/**
+	 * @param string $value_to_normalize
+	 * @return float
+	 * @throws \EE_Validation_Error
+	 */
+	public function normalize($value_to_normalize)
+	{
+		if ($value_to_normalize === null) {
+			return null;
+		}
+		if (is_float($value_to_normalize) || is_int($value_to_normalize)) {
+			return (float) $value_to_normalize;
+		}
+		if (! is_string($value_to_normalize)) {
+			throw new EE_Validation_Error(
+				sprintf(
+					esc_html__('The value "%s" must be a string submitted for normalization, it was %s', 'event_espresso'),
+					print_r($value_to_normalize, true),
+					gettype($value_to_normalize)
+				)
+			);
+		}
+		$normalized_value = filter_var(
+			$value_to_normalize,
+			FILTER_SANITIZE_NUMBER_FLOAT,
+			FILTER_FLAG_ALLOW_FRACTION
+		);
+		if ($normalized_value === '') {
+			return null;
+		}
+		if (preg_match(EE_Float_Normalization::REGEX, $normalized_value, $matches)) {
+			if (count($matches) === 3) {
+				// if first match is the negative sign,
+				// then the number needs to be multiplied by -1 to remain negative
+				return $matches[1] === '-'
+					? (float) $matches[2] * -1
+					: (float) $matches[2];
+			}
+		}
+		// find if this input has a float validation strategy
+		// in which case, use its message
+		$validation_error_message = null;
+		foreach ($this->_input->get_validation_strategies() as $validation_strategy) {
+			if ($validation_strategy instanceof EE_Float_Validation_Strategy) {
+				$validation_error_message = $validation_strategy->get_validation_error_message();
+			}
+		}
+		// this really shouldn't ever happen because fields with a float normalization strategy
+		// should also have a float validation strategy, but in case it doesn't use the default
+		if (! $validation_error_message) {
+			$default_validation_strategy = new EE_Float_Validation_Strategy();
+			$validation_error_message = $default_validation_strategy->get_validation_error_message();
+		}
+		throw new EE_Validation_Error($validation_error_message, 'float_only');
+	}
 
 
 
-    /**
-     * Converts a float into a string
-     *
-     * @param float $normalized_value
-     * @return string
-     */
-    public function unnormalize($normalized_value)
-    {
-        if (empty($normalized_value)) {
-            return '0.00';
-        }
-        return "{$normalized_value}";
-    }
+	/**
+	 * Converts a float into a string
+	 *
+	 * @param float $normalized_value
+	 * @return string
+	 */
+	public function unnormalize($normalized_value)
+	{
+		if (empty($normalized_value)) {
+			return '0.00';
+		}
+		return "{$normalized_value}";
+	}
 }

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

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
         if (is_int($value_to_normalize) || is_float($value_to_normalize)) {
             return (int) $value_to_normalize;
         }
-        if (! is_string($value_to_normalize)) {
+        if ( ! is_string($value_to_normalize)) {
             throw new EE_Validation_Error(
                 sprintf(
                     esc_html__('The value "%s" must be a string submitted for normalization, it was %s', 'event_espresso'),
@@ -70,7 +70,7 @@ 
         }
         // this really shouldn't ever happen because fields with a int normalization strategy
         // should also have a int validation strategy, but in case it doesn't use the default
-        if (! $validation_error_message) {
+        if ( ! $validation_error_message) {
             $default_validation_strategy = new EE_Int_Validation_Strategy();
             $validation_error_message = $default_validation_strategy->get_validation_error_message();
         }

Indentation +74 added lines, -74 removed lines

@@ -10,88 +10,88 @@
  */
 class EE_Int_Normalization extends EE_Normalization_Strategy_Base
 {
-    /*
+	/*
      * regex pattern that matches for the following:
      *      * optional negative sign
      *      * one or more digits
      */
-    const REGEX = '/^(-?)(\d+)(?:\.0+)?$/';
+	const REGEX = '/^(-?)(\d+)(?:\.0+)?$/';
 
 
 
-    /**
-     * @param string $value_to_normalize
-     * @return int|mixed|string
-     * @throws \EE_Validation_Error
-     */
-    public function normalize($value_to_normalize)
-    {
-        if ($value_to_normalize === null) {
-            return null;
-        }
-        if (is_int($value_to_normalize) || is_float($value_to_normalize)) {
-            return (int) $value_to_normalize;
-        }
-        if (! is_string($value_to_normalize)) {
-            throw new EE_Validation_Error(
-                sprintf(
-                    esc_html__('The value "%s" must be a string submitted for normalization, it was %s', 'event_espresso'),
-                    print_r($value_to_normalize, true),
-                    gettype($value_to_normalize)
-                )
-            );
-        }
-        $value_to_normalize = filter_var(
-            $value_to_normalize,
-            FILTER_SANITIZE_NUMBER_FLOAT,
-            FILTER_FLAG_ALLOW_FRACTION
-        );
-        if ($value_to_normalize === '') {
-            return null;
-        }
-        $matches = array();
-        if (preg_match(EE_Int_Normalization::REGEX, $value_to_normalize, $matches)) {
-            if (count($matches) === 3) {
-                // if first match is the negative sign,
-                // then the number needs to be multiplied by -1 to remain negative
-                return $matches[1] === '-'
-                    ? (int) $matches[2] * -1
-                    : (int) $matches[2];
-            }
-        }
-        // find if this input has a int validation strategy
-        // in which case, use its message
-        $validation_error_message = null;
-        foreach ($this->_input->get_validation_strategies() as $validation_strategy) {
-            if ($validation_strategy instanceof EE_Int_Validation_Strategy) {
-                $validation_error_message = $validation_strategy->get_validation_error_message();
-            }
-        }
-        // this really shouldn't ever happen because fields with a int normalization strategy
-        // should also have a int validation strategy, but in case it doesn't use the default
-        if (! $validation_error_message) {
-            $default_validation_strategy = new EE_Int_Validation_Strategy();
-            $validation_error_message = $default_validation_strategy->get_validation_error_message();
-        }
-        throw new EE_Validation_Error($validation_error_message, 'numeric_only');
-    }
+	/**
+	 * @param string $value_to_normalize
+	 * @return int|mixed|string
+	 * @throws \EE_Validation_Error
+	 */
+	public function normalize($value_to_normalize)
+	{
+		if ($value_to_normalize === null) {
+			return null;
+		}
+		if (is_int($value_to_normalize) || is_float($value_to_normalize)) {
+			return (int) $value_to_normalize;
+		}
+		if (! is_string($value_to_normalize)) {
+			throw new EE_Validation_Error(
+				sprintf(
+					esc_html__('The value "%s" must be a string submitted for normalization, it was %s', 'event_espresso'),
+					print_r($value_to_normalize, true),
+					gettype($value_to_normalize)
+				)
+			);
+		}
+		$value_to_normalize = filter_var(
+			$value_to_normalize,
+			FILTER_SANITIZE_NUMBER_FLOAT,
+			FILTER_FLAG_ALLOW_FRACTION
+		);
+		if ($value_to_normalize === '') {
+			return null;
+		}
+		$matches = array();
+		if (preg_match(EE_Int_Normalization::REGEX, $value_to_normalize, $matches)) {
+			if (count($matches) === 3) {
+				// if first match is the negative sign,
+				// then the number needs to be multiplied by -1 to remain negative
+				return $matches[1] === '-'
+					? (int) $matches[2] * -1
+					: (int) $matches[2];
+			}
+		}
+		// find if this input has a int validation strategy
+		// in which case, use its message
+		$validation_error_message = null;
+		foreach ($this->_input->get_validation_strategies() as $validation_strategy) {
+			if ($validation_strategy instanceof EE_Int_Validation_Strategy) {
+				$validation_error_message = $validation_strategy->get_validation_error_message();
+			}
+		}
+		// this really shouldn't ever happen because fields with a int normalization strategy
+		// should also have a int validation strategy, but in case it doesn't use the default
+		if (! $validation_error_message) {
+			$default_validation_strategy = new EE_Int_Validation_Strategy();
+			$validation_error_message = $default_validation_strategy->get_validation_error_message();
+		}
+		throw new EE_Validation_Error($validation_error_message, 'numeric_only');
+	}
 
 
 
-    /**
-     * Converts the int into a string for use in teh html form
-     *
-     * @param int $normalized_value
-     * @return string
-     */
-    public function unnormalize($normalized_value)
-    {
-        if ($normalized_value === null || $normalized_value === '') {
-            return '';
-        }
-        if (empty($normalized_value)) {
-            return '0';
-        }
-        return "$normalized_value";
-    }
+	/**
+	 * Converts the int into a string for use in teh html form
+	 *
+	 * @param int $normalized_value
+	 * @return string
+	 */
+	public function unnormalize($normalized_value)
+	{
+		if ($normalized_value === null || $normalized_value === '') {
+			return '';
+		}
+		if (empty($normalized_value)) {
+			return '0';
+		}
+		return "$normalized_value";
+	}
 }

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

Spacing +19 added lines, -19 removed lines

@@ -199,7 +199,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']);
@@ -210,7 +210,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;
             }
@@ -230,7 +230,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);
@@ -239,7 +239,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);
@@ -256,10 +256,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()}]";
             }
         }
     }
@@ -291,7 +291,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(
                     esc_html__(
@@ -459,7 +459,7 @@ 
                 $validation_strategy instanceof $validation_strategy_classname
                 || is_subclass_of($validation_strategy, $validation_strategy_classname)
             ) {
-                unset($this->_validation_strategies[ $key ]);
+                unset($this->_validation_strategies[$key]);
             }
         }
     }
@@ -670,7 +670,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 {
@@ -703,7 +703,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';
     }
 
 
@@ -853,9 +853,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;
@@ -977,7 +977,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;
     }
 
@@ -1052,7 +1052,7 @@ 
                 $button_css_attributes .= '';
         }
         $this->_button_css_attributes .= ! empty($other_attributes)
-            ? $button_css_attributes . ' ' . $other_attributes
+            ? $button_css_attributes.' '.$other_attributes
             : $button_css_attributes;
     }
 
@@ -1090,8 +1090,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;
     }
@@ -1133,13 +1133,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 {

Indentation +1257 added lines, -1257 removed lines

@@ -14,1261 +14,1261 @@
  */
 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 post data submitted for this
-     * 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 form section, 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(
-                    esc_html__(
-                        "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 void
-     */
-    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()'
-            ),
-            '4.10.2.p'
-        );
-
-        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()'
-            ),
-            '4.10.2.p'
-        );
-
-        $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
-     * @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
-     * @throws EE_Error
-     */
-    public function html_name()
-    {
-        $this->_set_default_html_name_if_empty();
-        return $this->_html_name;
-    }
-
-
-    /**
-     * @return string
-     * @throws EE_Error
-     */
-    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
-     * @throws EE_Error
-     */
-    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
-     * @return boolean
-     * @throws EE_Error
-     */
-    public function form_data_present_in($req_data = null)
-    {
-        if ($req_data === null) {
-            /** @var RequestInterface $request */
-            $request = LoaderFactory::getLoader()->getShared(RequestInterface::class);
-            $req_data = $request->postParams();
-        }
-        $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())
-    {
-        return $this->get_other_js_data_from_strategies($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 post data submitted for this
+	 * 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 form section, 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(
+					esc_html__(
+						"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 void
+	 */
+	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()'
+			),
+			'4.10.2.p'
+		);
+
+		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()'
+			),
+			'4.10.2.p'
+		);
+
+		$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
+	 * @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
+	 * @throws EE_Error
+	 */
+	public function html_name()
+	{
+		$this->_set_default_html_name_if_empty();
+		return $this->_html_name;
+	}
+
+
+	/**
+	 * @return string
+	 * @throws EE_Error
+	 */
+	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
+	 * @throws EE_Error
+	 */
+	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
+	 * @return boolean
+	 * @throws EE_Error
+	 */
+	public function form_data_present_in($req_data = null)
+	{
+		if ($req_data === null) {
+			/** @var RequestInterface $request */
+			$request = LoaderFactory::getLoader()->getShared(RequestInterface::class);
+			$req_data = $request->postParams();
+		}
+		$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())
+	{
+		return $this->get_other_js_data_from_strategies($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;
+	}
 }

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

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
      */
     public function __construct($options = array())
     {
-        $select_options = array(true =>  esc_html__("Yes", "event_espresso"),false =>  esc_html__("No", "event_espresso"));
+        $select_options = array(true =>  esc_html__("Yes", "event_espresso"), false =>  esc_html__("No", "event_espresso"));
 
         parent::__construct($select_options, $options);
     }

Indentation +8 added lines, -8 removed lines

@@ -9,13 +9,13 @@
  */
 class EE_Yes_No_Input extends EE_Select_Input
 {
-    /**
-     * @param array $options
-     */
-    public function __construct($options = array())
-    {
-        $select_options = array(true =>  esc_html__("Yes", "event_espresso"),false =>  esc_html__("No", "event_espresso"));
+	/**
+	 * @param array $options
+	 */
+	public function __construct($options = array())
+	{
+		$select_options = array(true =>  esc_html__("Yes", "event_espresso"),false =>  esc_html__("No", "event_espresso"));
 
-        parent::__construct($select_options, $options);
-    }
+		parent::__construct($select_options, $options);
+	}
 }

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

Indentation +13 added lines, -13 removed lines

@@ -14,17 +14,17 @@
  */
 class EE_Phone_Input extends EE_Text_Input
 {
-    /**
-     * @param array $options
-     */
-    public function __construct($options = array())
-    {
-        $this->_add_validation_strategy(
-            new EE_Text_Validation_Strategy(
-                esc_html__('Please enter a valid phone number. Eg 123-456-7890 or 1234567890', 'event_espresso'),
-                '~^(([\d]{10})|(^[\d]{3}-[\d]{3}-[\d]{4}))$~'
-            )
-        );
-        parent::__construct($options);
-    }
+	/**
+	 * @param array $options
+	 */
+	public function __construct($options = array())
+	{
+		$this->_add_validation_strategy(
+			new EE_Text_Validation_Strategy(
+				esc_html__('Please enter a valid phone number. Eg 123-456-7890 or 1234567890', 'event_espresso'),
+				'~^(([\d]{10})|(^[\d]{3}-[\d]{3}-[\d]{4}))$~'
+			)
+		);
+		parent::__construct($options);
+	}
 }