eventespresso / event-espresso-core

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

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

Indentation +11 added lines, -11 removed lines

@@ -9,15 +9,15 @@
 class EE_Select_Multiple_Input extends EE_Form_Input_With_Options_Base
 {
 
-    /**
-     * @param array | EE_Question_Option[] $answer_options
-     * @param array $input_settings
-     */
-    public function __construct($answer_options, $input_settings = array())
-    {
-        $this->_set_display_strategy(new EE_Select_Multiple_Display_Strategy());
-        $this->_add_validation_strategy(new EE_Many_Valued_Validation_Strategy(array( new EE_Enum_Validation_Strategy(isset($input_settings['validation_error_message']) ? $input_settings['validation_error_message'] : null) )));
-        $this->_multiple_selections = true;
-        parent::__construct($answer_options, $input_settings);
-    }
+	/**
+	 * @param array | EE_Question_Option[] $answer_options
+	 * @param array $input_settings
+	 */
+	public function __construct($answer_options, $input_settings = array())
+	{
+		$this->_set_display_strategy(new EE_Select_Multiple_Display_Strategy());
+		$this->_add_validation_strategy(new EE_Many_Valued_Validation_Strategy(array( new EE_Enum_Validation_Strategy(isset($input_settings['validation_error_message']) ? $input_settings['validation_error_message'] : null) )));
+		$this->_multiple_selections = true;
+		parent::__construct($answer_options, $input_settings);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
     public function __construct($answer_options, $input_settings = array())
     {
         $this->_set_display_strategy(new EE_Select_Multiple_Display_Strategy());
-        $this->_add_validation_strategy(new EE_Many_Valued_Validation_Strategy(array( new EE_Enum_Validation_Strategy(isset($input_settings['validation_error_message']) ? $input_settings['validation_error_message'] : null) )));
+        $this->_add_validation_strategy(new EE_Many_Valued_Validation_Strategy(array(new EE_Enum_Validation_Strategy(isset($input_settings['validation_error_message']) ? $input_settings['validation_error_message'] : null))));
         $this->_multiple_selections = true;
         parent::__construct($answer_options, $input_settings);
     }

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

Indentation +58 added lines, -58 removed lines

@@ -14,64 +14,64 @@
 class EE_Select_Reveal_Input extends EE_Select_Input
 {
 
-    /**
-     * @param array $answer_options Array keys which match a sibling section's name
-     *              will show/unhide that sibling subsection. Otherwise, siblings whose names
-     *              match array keys of $answer_options are hidden.
-     *              Note: internally each array key is considered a relative form input path
-     *              (see EE_Form_Section_Base::find_section_from_path) but relative
-     *              to THIS INPUT's PARENT section, not this input itself. ie,
-     *              a '../' is automatically added onto each each array key, to produce
-     *              the relative form input path.
-     *              Note however: array keys which are an EMPTY STRING are left as-is
-     *
-     * @param array $input_settings
-     */
-    public function __construct($answer_options, $input_settings = array())
-    {
-        parent::__construct($answer_options, $input_settings);
-    }
+	/**
+	 * @param array $answer_options Array keys which match a sibling section's name
+	 *              will show/unhide that sibling subsection. Otherwise, siblings whose names
+	 *              match array keys of $answer_options are hidden.
+	 *              Note: internally each array key is considered a relative form input path
+	 *              (see EE_Form_Section_Base::find_section_from_path) but relative
+	 *              to THIS INPUT's PARENT section, not this input itself. ie,
+	 *              a '../' is automatically added onto each each array key, to produce
+	 *              the relative form input path.
+	 *              Note however: array keys which are an EMPTY STRING are left as-is
+	 *
+	 * @param array $input_settings
+	 */
+	public function __construct($answer_options, $input_settings = array())
+	{
+		parent::__construct($answer_options, $input_settings);
+	}
 
-    /**
-     * Gets all the sibling sections controlled by this reveal select input
-     * @return \EE_Form_Section_Base[] keys are their form section paths
-     */
-    public function sibling_sections_controlled()
-    {
-        $sibling_sections = array();
-        foreach ($this->options() as $sibling_section_name => $sibling_section) {
-            // if it's an empty string just leave it alone
-            if (empty($sibling_section_name)) {
-                continue;
-            }
-            $sibling_section = $this->find_section_from_path('../' . $sibling_section_name);
-            if ($sibling_section instanceof EE_Form_Section_Base
-                && ! empty($sibling_section_name)
-            ) {
-                $sibling_sections[ $sibling_section_name ] = $sibling_section;
-            }
-        }
-        return $sibling_sections;
-    }
+	/**
+	 * Gets all the sibling sections controlled by this reveal select input
+	 * @return \EE_Form_Section_Base[] keys are their form section paths
+	 */
+	public function sibling_sections_controlled()
+	{
+		$sibling_sections = array();
+		foreach ($this->options() as $sibling_section_name => $sibling_section) {
+			// if it's an empty string just leave it alone
+			if (empty($sibling_section_name)) {
+				continue;
+			}
+			$sibling_section = $this->find_section_from_path('../' . $sibling_section_name);
+			if ($sibling_section instanceof EE_Form_Section_Base
+				&& ! empty($sibling_section_name)
+			) {
+				$sibling_sections[ $sibling_section_name ] = $sibling_section;
+			}
+		}
+		return $sibling_sections;
+	}
 
-    /**
-     * Adds an entry of 'select_reveal_inputs' to the js data, which is an array
-     * whose top-level keys are select reveal input html ids; values are arrays
-     * whose keys are select option values and values are the sections they reveal
-     * @param array $form_other_js_data
-     * @return array
-     */
-    public function get_other_js_data($form_other_js_data = array())
-    {
-        $form_other_js_data = parent::get_other_js_data($form_other_js_data);
-        if (! isset($form_other_js_data['select_reveal_inputs'])) {
-            $form_other_js_data['select_reveal_inputs'] = array();
-        }
-        $sibling_input_to_html_id_map = array();
-        foreach ($this->sibling_sections_controlled() as $sibling_section_path => $sibling_section) {
-            $sibling_input_to_html_id_map[ $sibling_section_path ] = $sibling_section->html_id();
-        }
-        $form_other_js_data['select_reveal_inputs'][ $this->html_id() ] = $sibling_input_to_html_id_map;
-        return $form_other_js_data;
-    }
+	/**
+	 * Adds an entry of 'select_reveal_inputs' to the js data, which is an array
+	 * whose top-level keys are select reveal input html ids; values are arrays
+	 * whose keys are select option values and values are the sections they reveal
+	 * @param array $form_other_js_data
+	 * @return array
+	 */
+	public function get_other_js_data($form_other_js_data = array())
+	{
+		$form_other_js_data = parent::get_other_js_data($form_other_js_data);
+		if (! isset($form_other_js_data['select_reveal_inputs'])) {
+			$form_other_js_data['select_reveal_inputs'] = array();
+		}
+		$sibling_input_to_html_id_map = array();
+		foreach ($this->sibling_sections_controlled() as $sibling_section_path => $sibling_section) {
+			$sibling_input_to_html_id_map[ $sibling_section_path ] = $sibling_section->html_id();
+		}
+		$form_other_js_data['select_reveal_inputs'][ $this->html_id() ] = $sibling_input_to_html_id_map;
+		return $form_other_js_data;
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -44,11 +44,11 @@ 
             if (empty($sibling_section_name)) {
                 continue;
             }
-            $sibling_section = $this->find_section_from_path('../' . $sibling_section_name);
+            $sibling_section = $this->find_section_from_path('../'.$sibling_section_name);
             if ($sibling_section instanceof EE_Form_Section_Base
                 && ! empty($sibling_section_name)
             ) {
-                $sibling_sections[ $sibling_section_name ] = $sibling_section;
+                $sibling_sections[$sibling_section_name] = $sibling_section;
             }
         }
         return $sibling_sections;
@@ -64,14 +64,14 @@ 
     public function get_other_js_data($form_other_js_data = array())
     {
         $form_other_js_data = parent::get_other_js_data($form_other_js_data);
-        if (! isset($form_other_js_data['select_reveal_inputs'])) {
+        if ( ! isset($form_other_js_data['select_reveal_inputs'])) {
             $form_other_js_data['select_reveal_inputs'] = array();
         }
         $sibling_input_to_html_id_map = array();
         foreach ($this->sibling_sections_controlled() as $sibling_section_path => $sibling_section) {
-            $sibling_input_to_html_id_map[ $sibling_section_path ] = $sibling_section->html_id();
+            $sibling_input_to_html_id_map[$sibling_section_path] = $sibling_section->html_id();
         }
-        $form_other_js_data['select_reveal_inputs'][ $this->html_id() ] = $sibling_input_to_html_id_map;
+        $form_other_js_data['select_reveal_inputs'][$this->html_id()] = $sibling_input_to_html_id_map;
         return $form_other_js_data;
     }
 }

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

Indentation +13 added lines, -13 removed lines

@@ -12,17 +12,17 @@
 class EE_Year_Input extends EE_Select_Input
 {
 
-    public function __construct($input_settings = array(), $four_digit_year = true, $years_behind = 100, $years_ahead = 0)
-    {
-        if ($four_digit_year) {
-            $current_year_int = intval(date('Y'));
-        } else {
-            $current_year_int = intval(date('y'));
-        }
-        $answer_options = array();
-        for ($start = $current_year_int - $years_behind; $start <= ($current_year_int + $years_ahead); $start++) {
-            $answer_options[ $start ] = $start;
-        }
-        parent::__construct($answer_options, $input_settings);
-    }
+	public function __construct($input_settings = array(), $four_digit_year = true, $years_behind = 100, $years_ahead = 0)
+	{
+		if ($four_digit_year) {
+			$current_year_int = intval(date('Y'));
+		} else {
+			$current_year_int = intval(date('y'));
+		}
+		$answer_options = array();
+		for ($start = $current_year_int - $years_behind; $start <= ($current_year_int + $years_ahead); $start++) {
+			$answer_options[ $start ] = $start;
+		}
+		parent::__construct($answer_options, $input_settings);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
         }
         $answer_options = array();
         for ($start = $current_year_int - $years_behind; $start <= ($current_year_int + $years_ahead); $start++) {
-            $answer_options[ $start ] = $start;
+            $answer_options[$start] = $start;
         }
         parent::__construct($answer_options, $input_settings);
     }

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

Indentation +19 added lines, -19 removed lines

@@ -11,23 +11,23 @@
 class EE_Currency_Input extends EE_Select_Input
 {
 
-    /**
-     *
-     * @param array $only_specific_currency_codes numerically-indexed array of allowed currency codes. By default, all are allowed
-     * @param array $input_settings
-     */
-    public function __construct($only_specific_currency_codes = array(), $input_settings = array())
-    {
-        $query_params = array('order_by'=>array('CNT_name'=>'asc'));
-        if ($only_specific_currency_codes) {
-            $query_params[0]['CNT_cur_code'] = array('IN',$only_specific_currency_codes);
-        }
-        $all_countries = EEM_Country::instance()->get_all($query_params);
-        $country_options = array();
-        foreach ($all_countries as $country) {
-            /* @var $country EE_Country */
-            $country_options[ $country->currency_code() ] = $country->name().": ".$country->currency_name_single() ." (".$country->currency_sign().")";
-        }
-        parent::__construct($country_options, 'int', $input_settings);
-    }
+	/**
+	 *
+	 * @param array $only_specific_currency_codes numerically-indexed array of allowed currency codes. By default, all are allowed
+	 * @param array $input_settings
+	 */
+	public function __construct($only_specific_currency_codes = array(), $input_settings = array())
+	{
+		$query_params = array('order_by'=>array('CNT_name'=>'asc'));
+		if ($only_specific_currency_codes) {
+			$query_params[0]['CNT_cur_code'] = array('IN',$only_specific_currency_codes);
+		}
+		$all_countries = EEM_Country::instance()->get_all($query_params);
+		$country_options = array();
+		foreach ($all_countries as $country) {
+			/* @var $country EE_Country */
+			$country_options[ $country->currency_code() ] = $country->name().": ".$country->currency_name_single() ." (".$country->currency_sign().")";
+		}
+		parent::__construct($country_options, 'int', $input_settings);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -20,13 +20,13 @@
     {
         $query_params = array('order_by'=>array('CNT_name'=>'asc'));
         if ($only_specific_currency_codes) {
-            $query_params[0]['CNT_cur_code'] = array('IN',$only_specific_currency_codes);
+            $query_params[0]['CNT_cur_code'] = array('IN', $only_specific_currency_codes);
         }
         $all_countries = EEM_Country::instance()->get_all($query_params);
         $country_options = array();
         foreach ($all_countries as $country) {
             /* @var $country EE_Country */
-            $country_options[ $country->currency_code() ] = $country->name().": ".$country->currency_name_single() ." (".$country->currency_sign().")";
+            $country_options[$country->currency_code()] = $country->name().": ".$country->currency_name_single()." (".$country->currency_sign().")";
         }
         parent::__construct($country_options, 'int', $input_settings);
     }

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

Indentation +10 added lines, -10 removed lines

@@ -10,14 +10,14 @@
 {
 
 
-    /**
-     * @param array $input_settings
-     */
-    public function __construct($input_settings = array())
-    {
-        $this->_set_display_strategy(new EE_Text_Input_Display_Strategy('password'));
-        $this->_set_normalization_strategy(new EE_Text_Normalization());
-        parent::__construct($input_settings);
-        $this->set_html_class($this->html_class() . 'password');
-    }
+	/**
+	 * @param array $input_settings
+	 */
+	public function __construct($input_settings = array())
+	{
+		$this->_set_display_strategy(new EE_Text_Input_Display_Strategy('password'));
+		$this->_set_normalization_strategy(new EE_Text_Normalization());
+		parent::__construct($input_settings);
+		$this->set_html_class($this->html_class() . 'password');
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -18,6 +18,6 @@
         $this->_set_display_strategy(new EE_Text_Input_Display_Strategy('password'));
         $this->_set_normalization_strategy(new EE_Text_Normalization());
         parent::__construct($input_settings);
-        $this->set_html_class($this->html_class() . 'password');
+        $this->set_html_class($this->html_class().'password');
     }
 }