eventespresso / event-espresso-core

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

Indentation +11 added lines, -11 removed lines

@@ -10,15 +10,15 @@
 class EE_Credit_Card_Year_Input extends EE_Year_Input
 {
 
-    /**
-     * @param array $input_settings
-     * @param bool  $four_digit_year
-     * @param int   $years_behind
-     * @param int   $years_ahead
-     */
-    public function __construct($input_settings = array(), $four_digit_year = true, $years_behind = 0, $years_ahead = 15)
-    {
-        $this->set_sensitive_data_removal_strategy(new EE_All_Sensitive_Data_Removal());
-        parent::__construct($input_settings, $four_digit_year, $years_behind, $years_ahead);
-    }
+	/**
+	 * @param array $input_settings
+	 * @param bool  $four_digit_year
+	 * @param int   $years_behind
+	 * @param int   $years_ahead
+	 */
+	public function __construct($input_settings = array(), $four_digit_year = true, $years_behind = 0, $years_ahead = 15)
+	{
+		$this->set_sensitive_data_removal_strategy(new EE_All_Sensitive_Data_Removal());
+		parent::__construct($input_settings, $four_digit_year, $years_behind, $years_ahead);
+	}
 }

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

Spacing +7 added lines, -7 removed lines

@@ -67,7 +67,7 @@ 
         );
         // make sure limit and caps are always set
         $query_params = array_merge(
-            array( 'limit' => 10, 'caps' => EEM_Base::caps_read_admin ),
+            array('limit' => 10, 'caps' => EEM_Base::caps_read_admin),
             $query_params
         );
         $this->_value_field_name = EEH_Array::is_set(
@@ -146,12 +146,12 @@ 
         $values_for_options = (array) $value;
         $value_field = $this->_get_model()->field_settings_for($this->_value_field_name);
         $display_field = $this->_get_model()->field_settings_for($this->_display_field_name);
-        $this->_extra_select_columns[] = $value_field->get_qualified_column() . ' AS ' . $this->_value_field_name;
-        $this->_extra_select_columns[] = $display_field->get_qualified_column() . ' AS ' . $this->_display_field_name;
+        $this->_extra_select_columns[] = $value_field->get_qualified_column().' AS '.$this->_value_field_name;
+        $this->_extra_select_columns[] = $display_field->get_qualified_column().' AS '.$this->_display_field_name;
         $display_values = $this->_get_model()->get_all_wpdb_results(
             array(
                 array(
-                    $this->_value_field_name => array( 'IN', $values_for_options )
+                    $this->_value_field_name => array('IN', $values_for_options)
                 )
             ),
             ARRAY_A,
@@ -161,9 +161,9 @@ 
         if (is_array($select_options)) {
             foreach ($display_values as $db_rows) {
                 $db_rows = (array) $db_rows;
-                $select_options[ $db_rows[ $this->_value_field_name ] ] = apply_filters(
+                $select_options[$db_rows[$this->_value_field_name]] = apply_filters(
                     'FHEE__EE_Select_Ajax_Model_Rest_Input___set_raw_value__select_option_value',
-                    $db_rows[ $this->_display_field_name ],
+                    $db_rows[$this->_display_field_name],
                     $db_rows
                 );
             }
@@ -179,7 +179,7 @@ 
      */
     protected function _get_model()
     {
-        if (! EE_Registry::instance()->is_model_name($this->_model_name)) {
+        if ( ! EE_Registry::instance()->is_model_name($this->_model_name)) {
             throw new EE_Error(
                 sprintf(
                     __(

Indentation +176 added lines, -176 removed lines

@@ -17,189 +17,189 @@
 class EE_Select_Ajax_Model_Rest_Input extends EE_Form_Input_With_Options_Base
 {
 
-    /**
-     * @var string $_model_name
-     */
-    protected $_model_name;
+	/**
+	 * @var string $_model_name
+	 */
+	protected $_model_name;
 
-    /**
-     * @var string $_display_field_name
-     */
-    protected $_display_field_name;
+	/**
+	 * @var string $_display_field_name
+	 */
+	protected $_display_field_name;
 
-    /**
-     * @var string $_value_field_name
-     */
-    protected $_value_field_name;
+	/**
+	 * @var string $_value_field_name
+	 */
+	protected $_value_field_name;
 
-    /**
-     * @var array $_extra_select_columns
-     */
-    protected $_extra_select_columns = array();
+	/**
+	 * @var array $_extra_select_columns
+	 */
+	protected $_extra_select_columns = array();
 
 
-    /**
-     * @param array $input_settings     {
-     * @type string $model_name         the name of model to be used for searching, both via the REST API and server-side model queries
-     * @type array  $query_params       default query parameters which will apply to both REST API queries and server-side queries. This should be
-     *                                  in the exact format that will be used for server-side model usage (eg use index 0 for where conditions, not
-     *                                  the string "where")
-     * @type string $value_field_name   the name of the model field on this model to
-     *                                  be used for the HTML select's option's values
-     * @type string $display_field_name the name of the model field on this model
-     *                                  to be used for the HTML select's option's display text
-     * @type array  $select2_args       arguments to be passed directly into the select2's JS constructor
-     *                                  }
-     *                                  And the arguments accepted by EE_Form_Input_With_Options_Base
-     * }
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function __construct($input_settings = array())
-    {
-        // needed input settings:
-        // select2_args
-        $this->_model_name = EEH_Array::is_set(
-            $input_settings,
-            'model_name',
-            null
-        );
-        $model = $this->_get_model();
-        $query_params = EEH_Array::is_set(
-            $input_settings,
-            'query_params',
-            array()
-        );
-        // make sure limit and caps are always set
-        $query_params = array_merge(
-            array( 'limit' => 10, 'caps' => EEM_Base::caps_read_admin ),
-            $query_params
-        );
-        $this->_value_field_name = EEH_Array::is_set(
-            $input_settings,
-            'value_field_name',
-            $model->primary_key_name()
-        );
-        $this->_display_field_name = EEH_Array::is_set(
-            $input_settings,
-            'display_field_name',
-            $model->get_a_field_of_type('EE_Text_Field_Base')->get_name()
-        );
-        $this->_extra_select_columns = EEH_Array::is_set(
-            $input_settings,
-            'extra_select_columns',
-            array()
-        );
-        $this->_add_validation_strategy(
-            new EE_Model_Matching_Query_Validation_Strategy(
-                '',
-                $this->_model_name,
-                $query_params,
-                $this->_value_field_name
-            )
-        );
-        // get resource endpoint
-        $rest_controller = LoaderFactory::getLoader()->getNew(
-            'EventEspresso\core\libraries\rest_api\controllers\model\Read'
-        );
-        $rest_controller->setRequestedVersion(EED_Core_Rest_Api::latest_rest_api_version());
-        $default_select2_args = array(
-            'ajax' => array(
-                'url' => $rest_controller->getVersionedLinkTo(
-                    EEH_Inflector::pluralize_and_lower($this->_model_name)
-                ),
-                'dataType' => 'json',
-                'delay' => '250',
-                'data_interface' => 'EE_Select2_REST_API_Interface',
-                'data_interface_args' => array(
-                    'default_query_params' => (object) ModelDataTranslator::prepareQueryParamsForRestApi(
-                        $query_params,
-                        $model
-                    ),
-                    'display_field' => $this->_display_field_name,
-                    'value_field' => $this->_value_field_name,
-                    'nonce' => wp_create_nonce('wp_rest'),
-                    'locale' => str_replace('_', '-', strtolower(get_locale()))
-                ),
-            ),
-            'cache' => true,
-            'width' => 'resolve'
-        );
-        $select2_args = array_replace_recursive(
-            $default_select2_args,
-            (array) EEH_Array::is_set($input_settings, 'select2_args', array())
-        );
-        $this->set_display_strategy(new EE_Select2_Display_Strategy($select2_args));
-        parent::__construct(array(), $input_settings);
-    }
+	/**
+	 * @param array $input_settings     {
+	 * @type string $model_name         the name of model to be used for searching, both via the REST API and server-side model queries
+	 * @type array  $query_params       default query parameters which will apply to both REST API queries and server-side queries. This should be
+	 *                                  in the exact format that will be used for server-side model usage (eg use index 0 for where conditions, not
+	 *                                  the string "where")
+	 * @type string $value_field_name   the name of the model field on this model to
+	 *                                  be used for the HTML select's option's values
+	 * @type string $display_field_name the name of the model field on this model
+	 *                                  to be used for the HTML select's option's display text
+	 * @type array  $select2_args       arguments to be passed directly into the select2's JS constructor
+	 *                                  }
+	 *                                  And the arguments accepted by EE_Form_Input_With_Options_Base
+	 * }
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function __construct($input_settings = array())
+	{
+		// needed input settings:
+		// select2_args
+		$this->_model_name = EEH_Array::is_set(
+			$input_settings,
+			'model_name',
+			null
+		);
+		$model = $this->_get_model();
+		$query_params = EEH_Array::is_set(
+			$input_settings,
+			'query_params',
+			array()
+		);
+		// make sure limit and caps are always set
+		$query_params = array_merge(
+			array( 'limit' => 10, 'caps' => EEM_Base::caps_read_admin ),
+			$query_params
+		);
+		$this->_value_field_name = EEH_Array::is_set(
+			$input_settings,
+			'value_field_name',
+			$model->primary_key_name()
+		);
+		$this->_display_field_name = EEH_Array::is_set(
+			$input_settings,
+			'display_field_name',
+			$model->get_a_field_of_type('EE_Text_Field_Base')->get_name()
+		);
+		$this->_extra_select_columns = EEH_Array::is_set(
+			$input_settings,
+			'extra_select_columns',
+			array()
+		);
+		$this->_add_validation_strategy(
+			new EE_Model_Matching_Query_Validation_Strategy(
+				'',
+				$this->_model_name,
+				$query_params,
+				$this->_value_field_name
+			)
+		);
+		// get resource endpoint
+		$rest_controller = LoaderFactory::getLoader()->getNew(
+			'EventEspresso\core\libraries\rest_api\controllers\model\Read'
+		);
+		$rest_controller->setRequestedVersion(EED_Core_Rest_Api::latest_rest_api_version());
+		$default_select2_args = array(
+			'ajax' => array(
+				'url' => $rest_controller->getVersionedLinkTo(
+					EEH_Inflector::pluralize_and_lower($this->_model_name)
+				),
+				'dataType' => 'json',
+				'delay' => '250',
+				'data_interface' => 'EE_Select2_REST_API_Interface',
+				'data_interface_args' => array(
+					'default_query_params' => (object) ModelDataTranslator::prepareQueryParamsForRestApi(
+						$query_params,
+						$model
+					),
+					'display_field' => $this->_display_field_name,
+					'value_field' => $this->_value_field_name,
+					'nonce' => wp_create_nonce('wp_rest'),
+					'locale' => str_replace('_', '-', strtolower(get_locale()))
+				),
+			),
+			'cache' => true,
+			'width' => 'resolve'
+		);
+		$select2_args = array_replace_recursive(
+			$default_select2_args,
+			(array) EEH_Array::is_set($input_settings, 'select2_args', array())
+		);
+		$this->set_display_strategy(new EE_Select2_Display_Strategy($select2_args));
+		parent::__construct(array(), $input_settings);
+	}
 
 
 
-    /**
-     * Before setting the raw value (usually because we're setting the default,
-     * or we've received a form submission and this might be re-displayed to the user),
-     * sets the options so that the current selections appear on initial display.
-     *
-     * Note: because this input uses EE_Model_Matching_Query_Validation_Strategy
-     * for validation, this input's options only affect DISPLAY and NOT validation,
-     * which is why its ok to just assume the provided $value to be in the list of acceptable values
-     *
-     * @param mixed $value
-     * @return void
-     * @throws \EE_Error
-     */
-    public function _set_raw_value($value)
-    {
-        $values_for_options = (array) $value;
-        $value_field = $this->_get_model()->field_settings_for($this->_value_field_name);
-        $display_field = $this->_get_model()->field_settings_for($this->_display_field_name);
-        $this->_extra_select_columns[] = $value_field->get_qualified_column() . ' AS ' . $this->_value_field_name;
-        $this->_extra_select_columns[] = $display_field->get_qualified_column() . ' AS ' . $this->_display_field_name;
-        $display_values = $this->_get_model()->get_all_wpdb_results(
-            array(
-                array(
-                    $this->_value_field_name => array( 'IN', $values_for_options )
-                )
-            ),
-            ARRAY_A,
-            implode(',', $this->_extra_select_columns)
-        );
-        $select_options = array();
-        if (is_array($select_options)) {
-            foreach ($display_values as $db_rows) {
-                $db_rows = (array) $db_rows;
-                $select_options[ $db_rows[ $this->_value_field_name ] ] = apply_filters(
-                    'FHEE__EE_Select_Ajax_Model_Rest_Input___set_raw_value__select_option_value',
-                    $db_rows[ $this->_display_field_name ],
-                    $db_rows
-                );
-            }
-        }
-        $this->set_select_options($select_options);
-        parent::_set_raw_value($value);
-    }
+	/**
+	 * Before setting the raw value (usually because we're setting the default,
+	 * or we've received a form submission and this might be re-displayed to the user),
+	 * sets the options so that the current selections appear on initial display.
+	 *
+	 * Note: because this input uses EE_Model_Matching_Query_Validation_Strategy
+	 * for validation, this input's options only affect DISPLAY and NOT validation,
+	 * which is why its ok to just assume the provided $value to be in the list of acceptable values
+	 *
+	 * @param mixed $value
+	 * @return void
+	 * @throws \EE_Error
+	 */
+	public function _set_raw_value($value)
+	{
+		$values_for_options = (array) $value;
+		$value_field = $this->_get_model()->field_settings_for($this->_value_field_name);
+		$display_field = $this->_get_model()->field_settings_for($this->_display_field_name);
+		$this->_extra_select_columns[] = $value_field->get_qualified_column() . ' AS ' . $this->_value_field_name;
+		$this->_extra_select_columns[] = $display_field->get_qualified_column() . ' AS ' . $this->_display_field_name;
+		$display_values = $this->_get_model()->get_all_wpdb_results(
+			array(
+				array(
+					$this->_value_field_name => array( 'IN', $values_for_options )
+				)
+			),
+			ARRAY_A,
+			implode(',', $this->_extra_select_columns)
+		);
+		$select_options = array();
+		if (is_array($select_options)) {
+			foreach ($display_values as $db_rows) {
+				$db_rows = (array) $db_rows;
+				$select_options[ $db_rows[ $this->_value_field_name ] ] = apply_filters(
+					'FHEE__EE_Select_Ajax_Model_Rest_Input___set_raw_value__select_option_value',
+					$db_rows[ $this->_display_field_name ],
+					$db_rows
+				);
+			}
+		}
+		$this->set_select_options($select_options);
+		parent::_set_raw_value($value);
+	}
 
-    /**
-     * Returns the model, or throws an exception if the model name provided in constructor doesn't exist
-     * @return EEM_Base
-     * @throws EE_Error
-     */
-    protected function _get_model()
-    {
-        if (! EE_Registry::instance()->is_model_name($this->_model_name)) {
-            throw new EE_Error(
-                sprintf(
-                    __(
-                        '%1$s is not a proper model name. Please provide a model name in the "model_name" form input argument',
-                        'event_espresso'
-                    ),
-                    $this->_model_name
-                )
-            );
-        } else {
-            return EE_Registry::instance()->load_model($this->_model_name);
-        }
-    }
+	/**
+	 * Returns the model, or throws an exception if the model name provided in constructor doesn't exist
+	 * @return EEM_Base
+	 * @throws EE_Error
+	 */
+	protected function _get_model()
+	{
+		if (! EE_Registry::instance()->is_model_name($this->_model_name)) {
+			throw new EE_Error(
+				sprintf(
+					__(
+						'%1$s is not a proper model name. Please provide a model name in the "model_name" form input argument',
+						'event_espresso'
+					),
+					$this->_model_name
+				)
+			);
+		} else {
+			return EE_Registry::instance()->load_model($this->_model_name);
+		}
+	}
 }

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

Indentation +12 added lines, -12 removed lines

@@ -10,16 +10,16 @@
 class EE_Credit_Card_Input extends EE_Form_Input_Base
 {
 
-    /**
-     * @param array $input_settings
-     */
-    public function __construct($input_settings = array())
-    {
-        $input_settings['required'] = isset($input_settings['required']) ? $input_settings['required'] : true;
-        $this->_set_display_strategy(new EE_Text_Input_Display_Strategy());
-        $this->_set_normalization_strategy(new EE_Credit_Card_Normalization());
-        $this->_add_validation_strategy(new EE_Credit_Card_Validation_Strategy(isset($input_settings['validation_error_message']) ? $input_settings['validation_error_message'] : null));
-        $this->set_sensitive_data_removal_strategy(new EE_Credit_Card_Sensitive_Data_Removal());
-        parent::__construct($input_settings);
-    }
+	/**
+	 * @param array $input_settings
+	 */
+	public function __construct($input_settings = array())
+	{
+		$input_settings['required'] = isset($input_settings['required']) ? $input_settings['required'] : true;
+		$this->_set_display_strategy(new EE_Text_Input_Display_Strategy());
+		$this->_set_normalization_strategy(new EE_Credit_Card_Normalization());
+		$this->_add_validation_strategy(new EE_Credit_Card_Validation_Strategy(isset($input_settings['validation_error_message']) ? $input_settings['validation_error_message'] : null));
+		$this->set_sensitive_data_removal_strategy(new EE_Credit_Card_Sensitive_Data_Removal());
+		parent::__construct($input_settings);
+	}
 }

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

Indentation +317 added lines, -317 removed lines

@@ -11,321 +11,321 @@
 class EE_Form_Input_With_Options_Base extends EE_Form_Input_Base
 {
 
-    /**
-     * array of available options to choose as an answer
-     *
-     * @var array
-     */
-    protected $_options = array();
-
-    /**
-     * whether to display the html_label_text above the checkbox/radio button options
-     *
-     * @var boolean
-     */
-    protected $_display_html_label_text = true;
-
-    /**
-     * whether to display an question option description as part of the input label
-     *
-     * @var boolean
-     */
-    protected $_use_desc_in_label = true;
-
-    /**
-     * strlen() result for the longest input value (what gets displayed in the label)
-     * this is used to apply a css class to the input label
-     *
-     * @var int
-     */
-    protected $_label_size = 0;
-
-    /**
-     * whether to enforce the label size value passed in the constructor
-     *
-     * @var boolean
-     */
-    protected $_enforce_label_size = false;
-
-    /**
-     * whether to allow multiple selections (ie, the value of this input should be an array)
-     * or not (ie, the value should be a simple int, string, etc)
-     *
-     * @var boolean
-     */
-    protected $_multiple_selections = false;
-
-
-
-    /**
-     * @param array     $answer_options
-     * @param array     $input_settings {
-     * @type int|string $label_size
-     * @type boolean    $display_html_label_text
-     *                                  }
-     *                                  And all the options accepted by EE_Form_Input_Base
-     */
-    public function __construct($answer_options = array(), $input_settings = array())
-    {
-        if (isset($input_settings['label_size'])) {
-            $this->_set_label_size($input_settings['label_size']);
-            if (isset($input_settings['enforce_label_size']) && $input_settings['enforce_label_size']) {
-                $this->_enforce_label_size = true;
-            }
-        }
-        if (isset($input_settings['display_html_label_text'])) {
-            $this->set_display_html_label_text($input_settings['display_html_label_text']);
-        }
-        $this->set_select_options($answer_options);
-        parent::__construct($input_settings);
-    }
-
-
-
-    /**
-     * Sets the allowed options for this input. Also has the side-effect of
-     * updating the normalization strategy to match the keys provided in the array
-     *
-     * @param array $answer_options
-     * @return void  just has the side-effect of setting the options for this input
-     */
-    public function set_select_options($answer_options = array())
-    {
-        $answer_options = is_array($answer_options) ? $answer_options : array($answer_options);
-        // get the first item in the select options and check it's type
-        $this->_options = reset($answer_options) instanceof EE_Question_Option
-            ? $this->_process_question_options($answer_options)
-            : $answer_options;
-        // d( $this->_options );
-        $select_option_keys = array_keys($this->_options);
-        // attempt to determine data type for values in order to set normalization type
-        // purposefully only
-        if (count($this->_options) === 2
-            && (
-                (in_array(true, $select_option_keys, true) && in_array(false, $select_option_keys, true))
-                || (in_array(1, $select_option_keys, true) && in_array(0, $select_option_keys, true))
-            )
-        ) {
-            // values appear to be boolean, like TRUE, FALSE, 1, 0
-            $normalization = new EE_Boolean_Normalization();
-        } else {
-            // are ALL the options ints (even if we're using a multi-dimensional array)? If so use int validation
-            $all_ints = true;
-            array_walk_recursive(
-                $this->_options,
-                function ($value, $key) use (&$all_ints) {
-                    // is this a top-level key? ignore it
-                    if (! is_array($value)
-                        && ! is_int($key)
-                       && $key !== ''
-                       && $key !== null) {
-                        $all_ints = false;
-                    }
-                }
-            );
-            if ($all_ints) {
-                $normalization = new EE_Int_Normalization();
-            } else {
-                $normalization = new EE_Text_Normalization();
-            }
-        }
-        // does input type have multiple options ?
-        if ($this->_multiple_selections) {
-            $this->_set_normalization_strategy(new EE_Many_Valued_Normalization($normalization));
-        } else {
-            $this->_set_normalization_strategy($normalization);
-        }
-    }
-
-
-
-    /**
-     * @return array
-     */
-    public function options()
-    {
-        return $this->_options;
-    }
-
-
-
-    /**
-     * Returns an array which is guaranteed to not be multidimensional
-     *
-     * @return array
-     */
-    public function flat_options()
-    {
-        return $this->_flatten_select_options($this->options());
-    }
-
-
-
-    /**
-     * Makes sure $arr is a flat array, not a multidimensional one
-     *
-     * @param array $arr
-     * @return array
-     */
-    protected function _flatten_select_options($arr)
-    {
-        $flat_array = array();
-        if (EEH_Array::is_multi_dimensional_array($arr)) {
-            foreach ($arr as $sub_array) {
-                foreach ((array) $sub_array as $key => $value) {
-                    $flat_array[ $key ] = $value;
-                    $this->_set_label_size($value);
-                }
-            }
-        } else {
-            foreach ($arr as $key => $value) {
-                $flat_array[ $key ] = $value;
-                $this->_set_label_size($value);
-            }
-        }
-        return $flat_array;
-    }
-
-
-
-    /**
-     * @param EE_Question_Option[] $question_options_array
-     * @return array
-     */
-    protected function _process_question_options($question_options_array = array())
-    {
-        $flat_array = array();
-        foreach ($question_options_array as $question_option) {
-            if ($question_option instanceof EE_Question_Option) {
-                $desc = '';
-                if ($this->_use_desc_in_label) {
-                    $desc = $question_option->desc();
-                    $desc = ! empty($desc) ? '<span class="ee-question-option-desc">' . $desc . '</span>' : '';
-                }
-                $value = $question_option->value();
-                // add value even if it's empty
-                $flat_array[ $value ] = $value;
-                // if both value and desc are not empty, then separate with a dash
-                if (! empty($value) && ! empty($desc)) {
-                    $flat_array[ $value ] .= ' - ' . $desc;
-                } else {
-                    // otherwise, just add desc, since either or both of the vars is empty, and no dash is necessary
-                    $flat_array[ $value ] .= $desc;
-                }
-            } elseif (is_array($question_option)) {
-                $flat_array += $this->_flatten_select_options($question_option);
-            }
-        }
-        return $flat_array;
-    }
-
-
-
-    /**
-     *    set_label_sizes
-     *
-     * @return void
-     */
-    public function set_label_sizes()
-    {
-        // did the input settings specifically say to NOT set the label size dynamically ?
-        if (! $this->_enforce_label_size) {
-            foreach ($this->_options as $option) {
-                // calculate the strlen of the label
-                $this->_set_label_size($option);
-            }
-        }
-    }
-
-
-
-    /**
-     *    _set_label_size_class
-     *
-     * @param int|string $value
-     * @return void
-     */
-    private function _set_label_size($value = '')
-    {
-        // don't change label size if it has already been set and is being enforced
-        if ($this->_enforce_label_size && $this->_label_size >  0) {
-            return;
-        }
-        // determine length of option value
-        $val_size = is_int($value) ? $value : strlen($value);
-        // use new value if bigger than existing
-        $this->_label_size = $val_size > $this->_label_size ? $val_size : $this->_label_size;
-    }
-
-
-
-    /**
-     *    get_label_size_class
-     *
-     * @return string
-     */
-    public function get_label_size_class()
-    {
-        $size = ' medium-lbl';
-        // use maximum option value length to determine label size
-        if ($this->_label_size < 3) {
-            $size = ' nano-lbl';
-        } elseif ($this->_label_size < 6) {
-            $size = ' micro-lbl';
-        } elseif ($this->_label_size < 12) {
-            $size = ' tiny-lbl';
-        } elseif ($this->_label_size < 25) {
-            $size = ' small-lbl';
-        } elseif ($this->_label_size < 50) {
-            $size = ' medium-lbl';
-        } elseif ($this->_label_size >= 100) {
-            $size = ' big-lbl';
-        }
-        return $size;
-    }
-
-
-
-    /**
-     * Returns the pretty value for the normalized value
-     *
-     * @return string
-     */
-    public function pretty_value()
-    {
-        $options = $this->flat_options();
-        $unnormalized_value_choices = $this->get_normalization_strategy()->unnormalize($this->_normalized_value);
-        if (! $this->_multiple_selections) {
-            $unnormalized_value_choices = array($unnormalized_value_choices);
-        }
-        $pretty_strings = array();
-        foreach ((array) $unnormalized_value_choices as $unnormalized_value_choice) {
-            if (isset($options[ $unnormalized_value_choice ])) {
-                $pretty_strings[] = $options[ $unnormalized_value_choice ];
-            } else {
-                $pretty_strings[] = $this->normalized_value();
-            }
-        }
-        return implode(', ', $pretty_strings);
-    }
-
-
-
-    /**
-     * @return boolean
-     */
-    public function display_html_label_text()
-    {
-        return $this->_display_html_label_text;
-    }
-
-
-
-    /**
-     * @param boolean $display_html_label_text
-     */
-    public function set_display_html_label_text($display_html_label_text)
-    {
-        $this->_display_html_label_text = filter_var($display_html_label_text, FILTER_VALIDATE_BOOLEAN);
-    }
+	/**
+	 * array of available options to choose as an answer
+	 *
+	 * @var array
+	 */
+	protected $_options = array();
+
+	/**
+	 * whether to display the html_label_text above the checkbox/radio button options
+	 *
+	 * @var boolean
+	 */
+	protected $_display_html_label_text = true;
+
+	/**
+	 * whether to display an question option description as part of the input label
+	 *
+	 * @var boolean
+	 */
+	protected $_use_desc_in_label = true;
+
+	/**
+	 * strlen() result for the longest input value (what gets displayed in the label)
+	 * this is used to apply a css class to the input label
+	 *
+	 * @var int
+	 */
+	protected $_label_size = 0;
+
+	/**
+	 * whether to enforce the label size value passed in the constructor
+	 *
+	 * @var boolean
+	 */
+	protected $_enforce_label_size = false;
+
+	/**
+	 * whether to allow multiple selections (ie, the value of this input should be an array)
+	 * or not (ie, the value should be a simple int, string, etc)
+	 *
+	 * @var boolean
+	 */
+	protected $_multiple_selections = false;
+
+
+
+	/**
+	 * @param array     $answer_options
+	 * @param array     $input_settings {
+	 * @type int|string $label_size
+	 * @type boolean    $display_html_label_text
+	 *                                  }
+	 *                                  And all the options accepted by EE_Form_Input_Base
+	 */
+	public function __construct($answer_options = array(), $input_settings = array())
+	{
+		if (isset($input_settings['label_size'])) {
+			$this->_set_label_size($input_settings['label_size']);
+			if (isset($input_settings['enforce_label_size']) && $input_settings['enforce_label_size']) {
+				$this->_enforce_label_size = true;
+			}
+		}
+		if (isset($input_settings['display_html_label_text'])) {
+			$this->set_display_html_label_text($input_settings['display_html_label_text']);
+		}
+		$this->set_select_options($answer_options);
+		parent::__construct($input_settings);
+	}
+
+
+
+	/**
+	 * Sets the allowed options for this input. Also has the side-effect of
+	 * updating the normalization strategy to match the keys provided in the array
+	 *
+	 * @param array $answer_options
+	 * @return void  just has the side-effect of setting the options for this input
+	 */
+	public function set_select_options($answer_options = array())
+	{
+		$answer_options = is_array($answer_options) ? $answer_options : array($answer_options);
+		// get the first item in the select options and check it's type
+		$this->_options = reset($answer_options) instanceof EE_Question_Option
+			? $this->_process_question_options($answer_options)
+			: $answer_options;
+		// d( $this->_options );
+		$select_option_keys = array_keys($this->_options);
+		// attempt to determine data type for values in order to set normalization type
+		// purposefully only
+		if (count($this->_options) === 2
+			&& (
+				(in_array(true, $select_option_keys, true) && in_array(false, $select_option_keys, true))
+				|| (in_array(1, $select_option_keys, true) && in_array(0, $select_option_keys, true))
+			)
+		) {
+			// values appear to be boolean, like TRUE, FALSE, 1, 0
+			$normalization = new EE_Boolean_Normalization();
+		} else {
+			// are ALL the options ints (even if we're using a multi-dimensional array)? If so use int validation
+			$all_ints = true;
+			array_walk_recursive(
+				$this->_options,
+				function ($value, $key) use (&$all_ints) {
+					// is this a top-level key? ignore it
+					if (! is_array($value)
+						&& ! is_int($key)
+					   && $key !== ''
+					   && $key !== null) {
+						$all_ints = false;
+					}
+				}
+			);
+			if ($all_ints) {
+				$normalization = new EE_Int_Normalization();
+			} else {
+				$normalization = new EE_Text_Normalization();
+			}
+		}
+		// does input type have multiple options ?
+		if ($this->_multiple_selections) {
+			$this->_set_normalization_strategy(new EE_Many_Valued_Normalization($normalization));
+		} else {
+			$this->_set_normalization_strategy($normalization);
+		}
+	}
+
+
+
+	/**
+	 * @return array
+	 */
+	public function options()
+	{
+		return $this->_options;
+	}
+
+
+
+	/**
+	 * Returns an array which is guaranteed to not be multidimensional
+	 *
+	 * @return array
+	 */
+	public function flat_options()
+	{
+		return $this->_flatten_select_options($this->options());
+	}
+
+
+
+	/**
+	 * Makes sure $arr is a flat array, not a multidimensional one
+	 *
+	 * @param array $arr
+	 * @return array
+	 */
+	protected function _flatten_select_options($arr)
+	{
+		$flat_array = array();
+		if (EEH_Array::is_multi_dimensional_array($arr)) {
+			foreach ($arr as $sub_array) {
+				foreach ((array) $sub_array as $key => $value) {
+					$flat_array[ $key ] = $value;
+					$this->_set_label_size($value);
+				}
+			}
+		} else {
+			foreach ($arr as $key => $value) {
+				$flat_array[ $key ] = $value;
+				$this->_set_label_size($value);
+			}
+		}
+		return $flat_array;
+	}
+
+
+
+	/**
+	 * @param EE_Question_Option[] $question_options_array
+	 * @return array
+	 */
+	protected function _process_question_options($question_options_array = array())
+	{
+		$flat_array = array();
+		foreach ($question_options_array as $question_option) {
+			if ($question_option instanceof EE_Question_Option) {
+				$desc = '';
+				if ($this->_use_desc_in_label) {
+					$desc = $question_option->desc();
+					$desc = ! empty($desc) ? '<span class="ee-question-option-desc">' . $desc . '</span>' : '';
+				}
+				$value = $question_option->value();
+				// add value even if it's empty
+				$flat_array[ $value ] = $value;
+				// if both value and desc are not empty, then separate with a dash
+				if (! empty($value) && ! empty($desc)) {
+					$flat_array[ $value ] .= ' - ' . $desc;
+				} else {
+					// otherwise, just add desc, since either or both of the vars is empty, and no dash is necessary
+					$flat_array[ $value ] .= $desc;
+				}
+			} elseif (is_array($question_option)) {
+				$flat_array += $this->_flatten_select_options($question_option);
+			}
+		}
+		return $flat_array;
+	}
+
+
+
+	/**
+	 *    set_label_sizes
+	 *
+	 * @return void
+	 */
+	public function set_label_sizes()
+	{
+		// did the input settings specifically say to NOT set the label size dynamically ?
+		if (! $this->_enforce_label_size) {
+			foreach ($this->_options as $option) {
+				// calculate the strlen of the label
+				$this->_set_label_size($option);
+			}
+		}
+	}
+
+
+
+	/**
+	 *    _set_label_size_class
+	 *
+	 * @param int|string $value
+	 * @return void
+	 */
+	private function _set_label_size($value = '')
+	{
+		// don't change label size if it has already been set and is being enforced
+		if ($this->_enforce_label_size && $this->_label_size >  0) {
+			return;
+		}
+		// determine length of option value
+		$val_size = is_int($value) ? $value : strlen($value);
+		// use new value if bigger than existing
+		$this->_label_size = $val_size > $this->_label_size ? $val_size : $this->_label_size;
+	}
+
+
+
+	/**
+	 *    get_label_size_class
+	 *
+	 * @return string
+	 */
+	public function get_label_size_class()
+	{
+		$size = ' medium-lbl';
+		// use maximum option value length to determine label size
+		if ($this->_label_size < 3) {
+			$size = ' nano-lbl';
+		} elseif ($this->_label_size < 6) {
+			$size = ' micro-lbl';
+		} elseif ($this->_label_size < 12) {
+			$size = ' tiny-lbl';
+		} elseif ($this->_label_size < 25) {
+			$size = ' small-lbl';
+		} elseif ($this->_label_size < 50) {
+			$size = ' medium-lbl';
+		} elseif ($this->_label_size >= 100) {
+			$size = ' big-lbl';
+		}
+		return $size;
+	}
+
+
+
+	/**
+	 * Returns the pretty value for the normalized value
+	 *
+	 * @return string
+	 */
+	public function pretty_value()
+	{
+		$options = $this->flat_options();
+		$unnormalized_value_choices = $this->get_normalization_strategy()->unnormalize($this->_normalized_value);
+		if (! $this->_multiple_selections) {
+			$unnormalized_value_choices = array($unnormalized_value_choices);
+		}
+		$pretty_strings = array();
+		foreach ((array) $unnormalized_value_choices as $unnormalized_value_choice) {
+			if (isset($options[ $unnormalized_value_choice ])) {
+				$pretty_strings[] = $options[ $unnormalized_value_choice ];
+			} else {
+				$pretty_strings[] = $this->normalized_value();
+			}
+		}
+		return implode(', ', $pretty_strings);
+	}
+
+
+
+	/**
+	 * @return boolean
+	 */
+	public function display_html_label_text()
+	{
+		return $this->_display_html_label_text;
+	}
+
+
+
+	/**
+	 * @param boolean $display_html_label_text
+	 */
+	public function set_display_html_label_text($display_html_label_text)
+	{
+		$this->_display_html_label_text = filter_var($display_html_label_text, FILTER_VALIDATE_BOOLEAN);
+	}
 }

Spacing +14 added lines, -14 removed lines

@@ -113,9 +113,9 @@ 
             $all_ints = true;
             array_walk_recursive(
                 $this->_options,
-                function ($value, $key) use (&$all_ints) {
+                function($value, $key) use (&$all_ints) {
                     // is this a top-level key? ignore it
-                    if (! is_array($value)
+                    if ( ! is_array($value)
                         && ! is_int($key)
                        && $key !== ''
                        && $key !== null) {
@@ -173,13 +173,13 @@ 
         if (EEH_Array::is_multi_dimensional_array($arr)) {
             foreach ($arr as $sub_array) {
                 foreach ((array) $sub_array as $key => $value) {
-                    $flat_array[ $key ] = $value;
+                    $flat_array[$key] = $value;
                     $this->_set_label_size($value);
                 }
             }
         } else {
             foreach ($arr as $key => $value) {
-                $flat_array[ $key ] = $value;
+                $flat_array[$key] = $value;
                 $this->_set_label_size($value);
             }
         }
@@ -200,17 +200,17 @@ 
                 $desc = '';
                 if ($this->_use_desc_in_label) {
                     $desc = $question_option->desc();
-                    $desc = ! empty($desc) ? '<span class="ee-question-option-desc">' . $desc . '</span>' : '';
+                    $desc = ! empty($desc) ? '<span class="ee-question-option-desc">'.$desc.'</span>' : '';
                 }
                 $value = $question_option->value();
                 // add value even if it's empty
-                $flat_array[ $value ] = $value;
+                $flat_array[$value] = $value;
                 // if both value and desc are not empty, then separate with a dash
-                if (! empty($value) && ! empty($desc)) {
-                    $flat_array[ $value ] .= ' - ' . $desc;
+                if ( ! empty($value) && ! empty($desc)) {
+                    $flat_array[$value] .= ' - '.$desc;
                 } else {
                     // otherwise, just add desc, since either or both of the vars is empty, and no dash is necessary
-                    $flat_array[ $value ] .= $desc;
+                    $flat_array[$value] .= $desc;
                 }
             } elseif (is_array($question_option)) {
                 $flat_array += $this->_flatten_select_options($question_option);
@@ -229,7 +229,7 @@ 
     public function set_label_sizes()
     {
         // did the input settings specifically say to NOT set the label size dynamically ?
-        if (! $this->_enforce_label_size) {
+        if ( ! $this->_enforce_label_size) {
             foreach ($this->_options as $option) {
                 // calculate the strlen of the label
                 $this->_set_label_size($option);
@@ -248,7 +248,7 @@ 
     private function _set_label_size($value = '')
     {
         // don't change label size if it has already been set and is being enforced
-        if ($this->_enforce_label_size && $this->_label_size >  0) {
+        if ($this->_enforce_label_size && $this->_label_size > 0) {
             return;
         }
         // determine length of option value
@@ -295,13 +295,13 @@ 
     {
         $options = $this->flat_options();
         $unnormalized_value_choices = $this->get_normalization_strategy()->unnormalize($this->_normalized_value);
-        if (! $this->_multiple_selections) {
+        if ( ! $this->_multiple_selections) {
             $unnormalized_value_choices = array($unnormalized_value_choices);
         }
         $pretty_strings = array();
         foreach ((array) $unnormalized_value_choices as $unnormalized_value_choice) {
-            if (isset($options[ $unnormalized_value_choice ])) {
-                $pretty_strings[] = $options[ $unnormalized_value_choice ];
+            if (isset($options[$unnormalized_value_choice])) {
+                $pretty_strings[] = $options[$unnormalized_value_choice];
             } else {
                 $pretty_strings[] = $this->normalized_value();
             }

core/libraries/form_sections/inputs/EE_Integer_Input.php

Indentation +31 added lines, -31 removed lines

@@ -12,35 +12,35 @@
 {
 
 
-    /**
-     * @param array $input_settings
-     */
-    public function __construct($input_settings = array())
-    {
-        $this->_set_display_strategy(
-            new EE_Number_Input_Display_Strategy(
-                isset($input_settings['min_value'])
-                    ? $input_settings['min_value']
-                    : null,
-                isset($input_settings['max_value'])
-                    ? $input_settings['max_value']
-                    : null
-            )
-        );
-        $this->_set_normalization_strategy(
-            new EE_Int_Normalization(
-                isset($input_settings['validation_error_message'])
-                    ? $input_settings['validation_error_message']
-                    : null
-            )
-        );
-        $this->_add_validation_strategy(
-            new EE_Int_Validation_Strategy(
-                isset($input_settings['validation_error_message'])
-                    ? $input_settings['validation_error_message']
-                    : null
-            )
-        );
-        parent::__construct($input_settings);
-    }
+	/**
+	 * @param array $input_settings
+	 */
+	public function __construct($input_settings = array())
+	{
+		$this->_set_display_strategy(
+			new EE_Number_Input_Display_Strategy(
+				isset($input_settings['min_value'])
+					? $input_settings['min_value']
+					: null,
+				isset($input_settings['max_value'])
+					? $input_settings['max_value']
+					: null
+			)
+		);
+		$this->_set_normalization_strategy(
+			new EE_Int_Normalization(
+				isset($input_settings['validation_error_message'])
+					? $input_settings['validation_error_message']
+					: null
+			)
+		);
+		$this->_add_validation_strategy(
+			new EE_Int_Validation_Strategy(
+				isset($input_settings['validation_error_message'])
+					? $input_settings['validation_error_message']
+					: null
+			)
+		);
+		parent::__construct($input_settings);
+	}
 }

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

Indentation +21 added lines, -21 removed lines

@@ -9,28 +9,28 @@
 class EE_Hidden_Input extends EE_Form_Input_Base
 {
 
-    /**
-     * @param array $input_settings
-     */
-    public function __construct($input_settings = array())
-    {
-        // require_once('strategies/display_strategies/EE_Text_Input_Display_Strategy.strategy.php');
-        $this->_set_display_strategy(new EE_Hidden_Display_Strategy());
-        if (isset($input_settings['normalization_strategy']) && $input_settings['normalization_strategy'] instanceof EE_Normalization_Strategy_Base) {
-            $this->_set_normalization_strategy($input_settings['normalization_strategy']);
-        } else {
-            $this->_set_normalization_strategy(new EE_Text_Normalization());
-        }
-        parent::__construct($input_settings);
-    }
+	/**
+	 * @param array $input_settings
+	 */
+	public function __construct($input_settings = array())
+	{
+		// require_once('strategies/display_strategies/EE_Text_Input_Display_Strategy.strategy.php');
+		$this->_set_display_strategy(new EE_Hidden_Display_Strategy());
+		if (isset($input_settings['normalization_strategy']) && $input_settings['normalization_strategy'] instanceof EE_Normalization_Strategy_Base) {
+			$this->_set_normalization_strategy($input_settings['normalization_strategy']);
+		} else {
+			$this->_set_normalization_strategy(new EE_Text_Normalization());
+		}
+		parent::__construct($input_settings);
+	}
 
 
 
-    /**
-     * @return string
-     */
-    public function get_html_for_label()
-    {
-        return '';
-    }
+	/**
+	 * @return string
+	 */
+	public function get_html_for_label()
+	{
+		return '';
+	}
 }

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

Indentation +61 added lines, -61 removed lines

@@ -12,75 +12,75 @@
 {
 
 
-    protected $_naming_method;
+	protected $_naming_method;
 
 
 
-    /**
-     *
-     * @param EE_Base_Class[] $answer_options
-     * @param array $input_settings {
-     *      @var EE_Base_Class[] or array $default
-     *      @var string $naming_method function name on the class which will be used for getting the displayed-name.
-     *     example:     if the class were an EE_Event, this could be slug(), description(), name() (default)
-     * }
-     */
-    public function __construct($answer_options = array(), $input_settings = array())
-    {
-        if (isset($input_settings['naming_method'])) {
-            $this->set_option_naming_method($input_settings['naming_method']);
-        }
-        parent::__construct($answer_options, $input_settings);
-    }
+	/**
+	 *
+	 * @param EE_Base_Class[] $answer_options
+	 * @param array $input_settings {
+	 *      @var EE_Base_Class[] or array $default
+	 *      @var string $naming_method function name on the class which will be used for getting the displayed-name.
+	 *     example:     if the class were an EE_Event, this could be slug(), description(), name() (default)
+	 * }
+	 */
+	public function __construct($answer_options = array(), $input_settings = array())
+	{
+		if (isset($input_settings['naming_method'])) {
+			$this->set_option_naming_method($input_settings['naming_method']);
+		}
+		parent::__construct($answer_options, $input_settings);
+	}
 
-    /**
-     * Sets the method name which will be called when outputting the options list
-     * @param string $method
-     */
-    public function set_option_naming_method($method)
-    {
-        $this->_naming_method = $method;
-    }
+	/**
+	 * Sets the method name which will be called when outputting the options list
+	 * @param string $method
+	 */
+	public function set_option_naming_method($method)
+	{
+		$this->_naming_method = $method;
+	}
 
 
 
-    /**
-     * You CAN pass an array of model objects instead of simple values for teh options
-     * @param EE_Base_Class[] $answer_options
-     * @return null|void
-     */
-    public function set_select_options($answer_options = array())
-    {
-        // convert the model objects to select from into normal select options
-        $select_options = array();
-        foreach ($answer_options as $model_obj) {
-            if ($this->_naming_method) {
-                $display_value = call_user_func(array( $model_obj, $this->_naming_method ));
-            } else {
-                $display_value = $model_obj->name();
-            }
-            $select_options[ $model_obj->ID() ] = $display_value;
-        }
-        parent::set_select_options($select_options);
-    }
+	/**
+	 * You CAN pass an array of model objects instead of simple values for teh options
+	 * @param EE_Base_Class[] $answer_options
+	 * @return null|void
+	 */
+	public function set_select_options($answer_options = array())
+	{
+		// convert the model objects to select from into normal select options
+		$select_options = array();
+		foreach ($answer_options as $model_obj) {
+			if ($this->_naming_method) {
+				$display_value = call_user_func(array( $model_obj, $this->_naming_method ));
+			} else {
+				$display_value = $model_obj->name();
+			}
+			$select_options[ $model_obj->ID() ] = $display_value;
+		}
+		parent::set_select_options($select_options);
+	}
 
 
 
-    /**
-     * if they passed in an array of model objects for the default, convert it
-     * into the format EE_Select_Multiple expects
-     * @param EE_Base_Class[]|array $values
-     */
-    public function set_default($values)
-    {
-        $defaults_as_simple_ids = array();
-        foreach ($values as $key => $value) {
-            if ($value instanceof EE_Base_Class) {
-                $defaults_as_simple_ids[] = $value->ID();
-            } else {
-                $defaults_as_simple_ids[] = $value;
-            }
-        }
-        parent::set_default($defaults_as_simple_ids);
-    }
+	/**
+	 * if they passed in an array of model objects for the default, convert it
+	 * into the format EE_Select_Multiple expects
+	 * @param EE_Base_Class[]|array $values
+	 */
+	public function set_default($values)
+	{
+		$defaults_as_simple_ids = array();
+		foreach ($values as $key => $value) {
+			if ($value instanceof EE_Base_Class) {
+				$defaults_as_simple_ids[] = $value->ID();
+			} else {
+				$defaults_as_simple_ids[] = $value;
+			}
+		}
+		parent::set_default($defaults_as_simple_ids);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -55,11 +55,11 @@
         $select_options = array();
         foreach ($answer_options as $model_obj) {
             if ($this->_naming_method) {
-                $display_value = call_user_func(array( $model_obj, $this->_naming_method ));
+                $display_value = call_user_func(array($model_obj, $this->_naming_method));
             } else {
                 $display_value = $model_obj->name();
             }
-            $select_options[ $model_obj->ID() ] = $display_value;
+            $select_options[$model_obj->ID()] = $display_value;
         }
         parent::set_select_options($select_options);
     }

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

Indentation +217 added lines, -217 removed lines

@@ -15,221 +15,221 @@
 class EE_Invisible_Recaptcha_Input extends EE_Form_Input_Base
 {
 
-    const SCRIPT_HANDLE_GOOGLE_INVISIBLE_RECAPTCHA   = 'google_invisible_recaptcha';
-
-    const SCRIPT_HANDLE_ESPRESSO_INVISIBLE_RECAPTCHA = 'espresso_invisible_recaptcha';
-
-    /**
-     * @var EE_Registration_Config $config
-     */
-    private $config;
-
-    /**
-     * @var string $recaptcha_id
-     */
-    private $recaptcha_id;
-
-    /**
-     * @var string $submit_button_id
-     */
-    private $submit_button_id;
-
-
-    /**
-     * @param array                  $input_settings
-     * @param EE_Registration_Config $registration_config
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws DomainException
-     */
-    public function __construct(array $input_settings = array(), EE_Registration_Config $registration_config = null)
-    {
-        $this->_set_display_strategy(new EE_Invisible_Recaptcha_Display_Strategy());
-        parent::__construct($input_settings);
-        $registration_config    = $registration_config instanceof EE_Registration_Config
-            ? $registration_config
-            : EE_Registry::instance()->CFG->registration;
-        $this->config           = $registration_config;
-        $this->recaptcha_id     = isset($input_settings['recaptcha_id'])
-            ? $input_settings['recaptcha_id']
-            : substr(spl_object_hash($this), 8, 8);
-        $this->submit_button_id = isset($input_settings['submit_button_id'])
-            ? $input_settings['submit_button_id']
-            : '';
-        if (isset($input_settings['localized_vars'])
-            && filter_var($input_settings['iframe'], FILTER_VALIDATE_BOOLEAN)
-        ) {
-            $this->addIframeAssets($input_settings['localized_vars']);
-        } else {
-            $this->registerScripts();
-        }
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function useCaptcha()
-    {
-        return $this->config->use_captcha && $this->config->recaptcha_theme === 'invisible';
-    }
-
-
-    /**
-     * @return string
-     */
-    public function badge()
-    {
-        return $this->config->recaptcha_badge;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function language()
-    {
-        return $this->config->recaptcha_language;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function siteKey()
-    {
-        return $this->config->recaptcha_publickey;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function secretKey()
-    {
-        return $this->config->recaptcha_privatekey;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function recaptchaId()
-    {
-        return $this->recaptcha_id;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function submitButtonId()
-    {
-        return $this->submit_button_id;
-    }
-
-
-    /**
-     * @param array $localized_vars
-     * @throws DomainException
-     */
-    private function addIframeAssets(array $localized_vars)
-    {
-        if (! $this->useCaptcha()) {
-            return;
-        }
-        add_filter(
-            'FHEE__EED_Ticket_Selector__ticket_selector_iframe__js',
-            function (array $iframe_assets) {
-                $iframe_assets[ EE_Invisible_Recaptcha_Input::SCRIPT_HANDLE_ESPRESSO_INVISIBLE_RECAPTCHA ] =
-                    EED_Recaptcha_Invisible::assetsUrl()
-                    . 'espresso_invisible_recaptcha.js?ver='
-                    . EVENT_ESPRESSO_VERSION;
-                $iframe_assets[ EE_Invisible_Recaptcha_Input::SCRIPT_HANDLE_GOOGLE_INVISIBLE_RECAPTCHA ] =
-                    add_query_arg(
-                        array(
-                            'onload' => 'espressoLoadRecaptcha',
-                            'render' => 'explicit',
-                            'hl'     => $this->language(),
-                        ),
-                        'https://www.google.com/recaptcha/api.js?'
-                    );
-                return $iframe_assets;
-            }
-        );
-        add_filter(
-            'FHEE__EventEspresso_modules_ticket_selector_TicketSelectorIframe__construct__js_attributes',
-            function (array $iframe_asset_attributes) {
-                $iframe_asset_attributes[ EE_Invisible_Recaptcha_Input::SCRIPT_HANDLE_GOOGLE_INVISIBLE_RECAPTCHA ]
-                    = ' async="async" defer="defer"';
-                return $iframe_asset_attributes;
-            }
-        );
-        add_action(
-            'AHEE__EventEspresso_modules_ticket_selector_TicketSelectorIframe__construct__complete',
-            function (EventEspresso\modules\ticket_selector\TicketSelectorIframe $ticket_selector_iframe) use ($localized_vars) {
-                $ticket_selector_iframe->addLocalizedVars($localized_vars, 'eeRecaptcha');
-            }
-        );
-    }
-
-
-    /**
-     * @return void
-     */
-    private function registerScripts()
-    {
-        if (! $this->useCaptcha()) {
-            return;
-        }
-        add_filter('script_loader_tag', array($this, 'addScriptAttributes'), 10, 2);
-        wp_register_script(
-            EE_Invisible_Recaptcha_Input::SCRIPT_HANDLE_ESPRESSO_INVISIBLE_RECAPTCHA,
-            EED_Recaptcha_Invisible::assetsUrl() . 'espresso_invisible_recaptcha.js',
-            array('espresso_core'),
-            EVENT_ESPRESSO_VERSION,
-            true
-        );
-        wp_register_script(
-            EE_Invisible_Recaptcha_Input::SCRIPT_HANDLE_GOOGLE_INVISIBLE_RECAPTCHA,
-            add_query_arg(
-                array(
-                    'onload' => 'espressoLoadRecaptcha',
-                    'render' => 'explicit',
-                    'hl'     => $this->language(),
-                ),
-                'https://www.google.com/recaptcha/api.js?'
-            ),
-            array(EE_Invisible_Recaptcha_Input::SCRIPT_HANDLE_ESPRESSO_INVISIBLE_RECAPTCHA),
-            false,
-            true
-        );
-    }
-
-
-    /**
-     * @param string $tag
-     * @param string $handle
-     * @return string
-     */
-    public function addScriptAttributes($tag, $handle)
-    {
-        if ($handle === EE_Invisible_Recaptcha_Input::SCRIPT_HANDLE_GOOGLE_INVISIBLE_RECAPTCHA) {
-            $tag = str_replace('></script>', ' async="async" defer="defer"></script>', $tag);
-        }
-        return $tag;
-    }
-
-
-    /**
-     * 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 '';
-    }
+	const SCRIPT_HANDLE_GOOGLE_INVISIBLE_RECAPTCHA   = 'google_invisible_recaptcha';
+
+	const SCRIPT_HANDLE_ESPRESSO_INVISIBLE_RECAPTCHA = 'espresso_invisible_recaptcha';
+
+	/**
+	 * @var EE_Registration_Config $config
+	 */
+	private $config;
+
+	/**
+	 * @var string $recaptcha_id
+	 */
+	private $recaptcha_id;
+
+	/**
+	 * @var string $submit_button_id
+	 */
+	private $submit_button_id;
+
+
+	/**
+	 * @param array                  $input_settings
+	 * @param EE_Registration_Config $registration_config
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws DomainException
+	 */
+	public function __construct(array $input_settings = array(), EE_Registration_Config $registration_config = null)
+	{
+		$this->_set_display_strategy(new EE_Invisible_Recaptcha_Display_Strategy());
+		parent::__construct($input_settings);
+		$registration_config    = $registration_config instanceof EE_Registration_Config
+			? $registration_config
+			: EE_Registry::instance()->CFG->registration;
+		$this->config           = $registration_config;
+		$this->recaptcha_id     = isset($input_settings['recaptcha_id'])
+			? $input_settings['recaptcha_id']
+			: substr(spl_object_hash($this), 8, 8);
+		$this->submit_button_id = isset($input_settings['submit_button_id'])
+			? $input_settings['submit_button_id']
+			: '';
+		if (isset($input_settings['localized_vars'])
+			&& filter_var($input_settings['iframe'], FILTER_VALIDATE_BOOLEAN)
+		) {
+			$this->addIframeAssets($input_settings['localized_vars']);
+		} else {
+			$this->registerScripts();
+		}
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function useCaptcha()
+	{
+		return $this->config->use_captcha && $this->config->recaptcha_theme === 'invisible';
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function badge()
+	{
+		return $this->config->recaptcha_badge;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function language()
+	{
+		return $this->config->recaptcha_language;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function siteKey()
+	{
+		return $this->config->recaptcha_publickey;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function secretKey()
+	{
+		return $this->config->recaptcha_privatekey;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function recaptchaId()
+	{
+		return $this->recaptcha_id;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function submitButtonId()
+	{
+		return $this->submit_button_id;
+	}
+
+
+	/**
+	 * @param array $localized_vars
+	 * @throws DomainException
+	 */
+	private function addIframeAssets(array $localized_vars)
+	{
+		if (! $this->useCaptcha()) {
+			return;
+		}
+		add_filter(
+			'FHEE__EED_Ticket_Selector__ticket_selector_iframe__js',
+			function (array $iframe_assets) {
+				$iframe_assets[ EE_Invisible_Recaptcha_Input::SCRIPT_HANDLE_ESPRESSO_INVISIBLE_RECAPTCHA ] =
+					EED_Recaptcha_Invisible::assetsUrl()
+					. 'espresso_invisible_recaptcha.js?ver='
+					. EVENT_ESPRESSO_VERSION;
+				$iframe_assets[ EE_Invisible_Recaptcha_Input::SCRIPT_HANDLE_GOOGLE_INVISIBLE_RECAPTCHA ] =
+					add_query_arg(
+						array(
+							'onload' => 'espressoLoadRecaptcha',
+							'render' => 'explicit',
+							'hl'     => $this->language(),
+						),
+						'https://www.google.com/recaptcha/api.js?'
+					);
+				return $iframe_assets;
+			}
+		);
+		add_filter(
+			'FHEE__EventEspresso_modules_ticket_selector_TicketSelectorIframe__construct__js_attributes',
+			function (array $iframe_asset_attributes) {
+				$iframe_asset_attributes[ EE_Invisible_Recaptcha_Input::SCRIPT_HANDLE_GOOGLE_INVISIBLE_RECAPTCHA ]
+					= ' async="async" defer="defer"';
+				return $iframe_asset_attributes;
+			}
+		);
+		add_action(
+			'AHEE__EventEspresso_modules_ticket_selector_TicketSelectorIframe__construct__complete',
+			function (EventEspresso\modules\ticket_selector\TicketSelectorIframe $ticket_selector_iframe) use ($localized_vars) {
+				$ticket_selector_iframe->addLocalizedVars($localized_vars, 'eeRecaptcha');
+			}
+		);
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function registerScripts()
+	{
+		if (! $this->useCaptcha()) {
+			return;
+		}
+		add_filter('script_loader_tag', array($this, 'addScriptAttributes'), 10, 2);
+		wp_register_script(
+			EE_Invisible_Recaptcha_Input::SCRIPT_HANDLE_ESPRESSO_INVISIBLE_RECAPTCHA,
+			EED_Recaptcha_Invisible::assetsUrl() . 'espresso_invisible_recaptcha.js',
+			array('espresso_core'),
+			EVENT_ESPRESSO_VERSION,
+			true
+		);
+		wp_register_script(
+			EE_Invisible_Recaptcha_Input::SCRIPT_HANDLE_GOOGLE_INVISIBLE_RECAPTCHA,
+			add_query_arg(
+				array(
+					'onload' => 'espressoLoadRecaptcha',
+					'render' => 'explicit',
+					'hl'     => $this->language(),
+				),
+				'https://www.google.com/recaptcha/api.js?'
+			),
+			array(EE_Invisible_Recaptcha_Input::SCRIPT_HANDLE_ESPRESSO_INVISIBLE_RECAPTCHA),
+			false,
+			true
+		);
+	}
+
+
+	/**
+	 * @param string $tag
+	 * @param string $handle
+	 * @return string
+	 */
+	public function addScriptAttributes($tag, $handle)
+	{
+		if ($handle === EE_Invisible_Recaptcha_Input::SCRIPT_HANDLE_GOOGLE_INVISIBLE_RECAPTCHA) {
+			$tag = str_replace('></script>', ' async="async" defer="defer"></script>', $tag);
+		}
+		return $tag;
+	}
+
+
+	/**
+	 * 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 '';
+	}
 }

Spacing +9 added lines, -9 removed lines

@@ -136,17 +136,17 @@ 
      */
     private function addIframeAssets(array $localized_vars)
     {
-        if (! $this->useCaptcha()) {
+        if ( ! $this->useCaptcha()) {
             return;
         }
         add_filter(
             'FHEE__EED_Ticket_Selector__ticket_selector_iframe__js',
-            function (array $iframe_assets) {
-                $iframe_assets[ EE_Invisible_Recaptcha_Input::SCRIPT_HANDLE_ESPRESSO_INVISIBLE_RECAPTCHA ] =
+            function(array $iframe_assets) {
+                $iframe_assets[EE_Invisible_Recaptcha_Input::SCRIPT_HANDLE_ESPRESSO_INVISIBLE_RECAPTCHA] =
                     EED_Recaptcha_Invisible::assetsUrl()
                     . 'espresso_invisible_recaptcha.js?ver='
                     . EVENT_ESPRESSO_VERSION;
-                $iframe_assets[ EE_Invisible_Recaptcha_Input::SCRIPT_HANDLE_GOOGLE_INVISIBLE_RECAPTCHA ] =
+                $iframe_assets[EE_Invisible_Recaptcha_Input::SCRIPT_HANDLE_GOOGLE_INVISIBLE_RECAPTCHA] =
                     add_query_arg(
                         array(
                             'onload' => 'espressoLoadRecaptcha',
@@ -160,15 +160,15 @@ 
         );
         add_filter(
             'FHEE__EventEspresso_modules_ticket_selector_TicketSelectorIframe__construct__js_attributes',
-            function (array $iframe_asset_attributes) {
-                $iframe_asset_attributes[ EE_Invisible_Recaptcha_Input::SCRIPT_HANDLE_GOOGLE_INVISIBLE_RECAPTCHA ]
+            function(array $iframe_asset_attributes) {
+                $iframe_asset_attributes[EE_Invisible_Recaptcha_Input::SCRIPT_HANDLE_GOOGLE_INVISIBLE_RECAPTCHA]
                     = ' async="async" defer="defer"';
                 return $iframe_asset_attributes;
             }
         );
         add_action(
             'AHEE__EventEspresso_modules_ticket_selector_TicketSelectorIframe__construct__complete',
-            function (EventEspresso\modules\ticket_selector\TicketSelectorIframe $ticket_selector_iframe) use ($localized_vars) {
+            function(EventEspresso\modules\ticket_selector\TicketSelectorIframe $ticket_selector_iframe) use ($localized_vars) {
                 $ticket_selector_iframe->addLocalizedVars($localized_vars, 'eeRecaptcha');
             }
         );
@@ -180,13 +180,13 @@ 
      */
     private function registerScripts()
     {
-        if (! $this->useCaptcha()) {
+        if ( ! $this->useCaptcha()) {
             return;
         }
         add_filter('script_loader_tag', array($this, 'addScriptAttributes'), 10, 2);
         wp_register_script(
             EE_Invisible_Recaptcha_Input::SCRIPT_HANDLE_ESPRESSO_INVISIBLE_RECAPTCHA,
-            EED_Recaptcha_Invisible::assetsUrl() . 'espresso_invisible_recaptcha.js',
+            EED_Recaptcha_Invisible::assetsUrl().'espresso_invisible_recaptcha.js',
             array('espresso_core'),
             EVENT_ESPRESSO_VERSION,
             true

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(
-                __('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(
+				__('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);
+	}
 }