eventespresso / event-espresso-core

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

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

Indentation +61 added lines, -61 removed lines

@@ -11,75 +11,75 @@
  */
 class EE_Select_Multi_Model_Input extends EE_Select_Multiple_Input
 {
-    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);
+	}
 }

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

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

Indentation +218 added lines, -218 removed lines

@@ -14,222 +14,222 @@
  */
 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 '';
+	}
 }

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

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

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

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

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

Indentation +13 added lines, -13 removed lines

@@ -11,17 +11,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);
+	}
 }

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

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

Indentation +10 added lines, -10 removed lines

@@ -9,14 +9,14 @@
  */
 class EE_Password_Input extends EE_Form_Input_Base
 {
-    /**
-     * @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');
+	}
 }

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

Spacing +1 added lines, -1 removed lines

@@ -24,6 +24,6 @@
             )
         );
         parent::__construct($input_settings);
-        $this->set_html_class($this->html_class() . ' email');
+        $this->set_html_class($this->html_class().' email');
     }
 }

Indentation +17 added lines, -17 removed lines

@@ -9,21 +9,21 @@
  */
 class EE_Email_Input extends EE_Form_Input_Base
 {
-    /**
-     * @param array $input_settings
-     */
-    public function __construct($input_settings = array())
-    {
-        $this->_set_display_strategy(new EE_Text_Input_Display_Strategy('email'));
-        $this->_set_normalization_strategy(new EE_Text_Normalization());
-        $this->_add_validation_strategy(
-            new EE_Email_Validation_Strategy(
-                isset($input_settings['validation_error_message'])
-                    ? $input_settings['validation_error_message']
-                    : null
-            )
-        );
-        parent::__construct($input_settings);
-        $this->set_html_class($this->html_class() . ' email');
-    }
+	/**
+	 * @param array $input_settings
+	 */
+	public function __construct($input_settings = array())
+	{
+		$this->_set_display_strategy(new EE_Text_Input_Display_Strategy('email'));
+		$this->_set_normalization_strategy(new EE_Text_Normalization());
+		$this->_add_validation_strategy(
+			new EE_Email_Validation_Strategy(
+				isset($input_settings['validation_error_message'])
+					? $input_settings['validation_error_message']
+					: null
+			)
+		);
+		parent::__construct($input_settings);
+		$this->set_html_class($this->html_class() . ' email');
+	}
 }

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

Spacing +2 added lines, -2 removed lines

@@ -29,8 +29,8 @@
                     'type'  => 'submit',
                     'value' => $default_value,
                     // overwrite the standard id with the backwards compatible one
-                    'id' => $this->_input->html_id() . '-submit',
-                    'class' => $this->_input->html_class() . ' ' . $this->_input->button_css_attributes()
+                    'id' => $this->_input->html_id().'-submit',
+                    'class' => $this->_input->html_class().' '.$this->_input->button_css_attributes()
                 )
             )
         );

Indentation +25 added lines, -25 removed lines

@@ -9,29 +9,29 @@
  */
 class EE_Submit_Input_Display_Strategy extends EE_Display_Strategy_Base
 {
-    /**
-     * @return string of html to display the input
-     */
-    public function display()
-    {
-        $default_value = $this->_input->get_default();
-        if ($this->_input->get_normalization_strategy() instanceof EE_Normalization_Strategy_Base) {
-            $default_value = $this->_input->get_normalization_strategy()->unnormalize($default_value);
-        }
-        $html = $this->_opening_tag('input');
-        $html .= $this->_attributes_string(
-            array_merge(
-                $this->_standard_attributes_array(),
-                array(
-                    'type'  => 'submit',
-                    'value' => $default_value,
-                    // overwrite the standard id with the backwards compatible one
-                    'id' => $this->_input->html_id() . '-submit',
-                    'class' => $this->_input->html_class() . ' ' . $this->_input->button_css_attributes()
-                )
-            )
-        );
-        $html .= $this->_close_tag();
-        return $html;
-    }
+	/**
+	 * @return string of html to display the input
+	 */
+	public function display()
+	{
+		$default_value = $this->_input->get_default();
+		if ($this->_input->get_normalization_strategy() instanceof EE_Normalization_Strategy_Base) {
+			$default_value = $this->_input->get_normalization_strategy()->unnormalize($default_value);
+		}
+		$html = $this->_opening_tag('input');
+		$html .= $this->_attributes_string(
+			array_merge(
+				$this->_standard_attributes_array(),
+				array(
+					'type'  => 'submit',
+					'value' => $default_value,
+					// overwrite the standard id with the backwards compatible one
+					'id' => $this->_input->html_id() . '-submit',
+					'class' => $this->_input->html_class() . ' ' . $this->_input->button_css_attributes()
+				)
+			)
+		);
+		$html .= $this->_close_tag();
+		return $html;
+	}
 }

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

Indentation +9 added lines, -9 removed lines

@@ -11,13 +11,13 @@
  */
 class EE_Hidden_Display_Strategy extends EE_Display_Strategy_Base
 {
-    /**
-     *
-     * @return string of html to display the HIDDEN field
-     */
-    public function display()
-    {
-        $input = $this->_input;
-        return "<input type='hidden' id='{$input->html_id()}' name='{$input->html_name()}' class='{$input->html_class()}' style='{$input->html_style()}' value='{$input->raw_value_in_form()}' {$input->other_html_attributes()}/>";
-    }
+	/**
+	 *
+	 * @return string of html to display the HIDDEN field
+	 */
+	public function display()
+	{
+		$input = $this->_input;
+		return "<input type='hidden' id='{$input->html_id()}' name='{$input->html_name()}' class='{$input->html_class()}' style='{$input->html_style()}' value='{$input->raw_value_in_form()}' {$input->other_html_attributes()}/>";
+	}
 }

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

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
      */
     protected function _append_chars($string = '', $chars = '-')
     {
-        return $this->_remove_chars($string, $chars) . $chars;
+        return $this->_remove_chars($string, $chars).$chars;
     }
 
 

Indentation +226 added lines, -226 removed lines

@@ -10,236 +10,236 @@
  */
 abstract class EE_Display_Strategy_Base extends EE_Form_Input_Strategy_Base
 {
-    /**
-     * @var string $_tag
-     */
-    protected $_tag = '';
+	/**
+	 * @var string $_tag
+	 */
+	protected $_tag = '';
 
 
 
-
-
-    /**
-     * returns HTML and javascript related to the displaying of this input
-     *
-     * @return string
-     */
-    abstract public function display();
+
+
+	/**
+	 * returns HTML and javascript related to the displaying of this input
+	 *
+	 * @return string
+	 */
+	abstract public function display();
 
 
 
-    /**
-     * _remove_chars - takes an incoming string, and removes the string $chars from the end of it, but only if $chars
-     * is already there
-     *
-     * @param string $string - the string being processed
-     * @param string $chars  - exact string of characters to remove
-     * @return string
-     */
-    protected function _remove_chars($string = '', $chars = '-')
-    {
-        $char_length = strlen($chars) * -1;
-        // if last three characters of string is  " - ", then remove it
-        return substr($string, $char_length) === $chars ? substr($string, 0, $char_length) : $string;
-    }
-
-
-
-    /**
-     * _append_chars - takes an incoming string, and adds the string $chars to the end of it, but only if $chars is not
-     * already there
-     *
-     * @param string $string - the string being processed
-     * @param string $chars  - exact string of characters to be added to end of string
-     * @return string
-     */
-    protected function _append_chars($string = '', $chars = '-')
-    {
-        return $this->_remove_chars($string, $chars) . $chars;
-    }
-
-
-
-    /**
-     * Gets the HTML IDs of all the inputs
-     *
-     * @param bool $add_pound_sign
-     * @return array
-     */
-    public function get_html_input_ids($add_pound_sign = false)
-    {
-        return array($this->get_input()->html_id($add_pound_sign));
-    }
-
-
-
-    /**
-     * Adds js variables for localization to the $other_js_data. These should be put
-     * in each form's "other_data" javascript object.
-     *
-     * @param array $other_js_data
-     * @return array
-     */
-    public function get_other_js_data($other_js_data = array())
-    {
-        return $other_js_data;
-    }
-
-
-
-    /**
-     * Opportunity for this display strategy to call wp_enqueue_script and wp_enqueue_style.
-     * This should be called during wp_enqueue_scripts
-     */
-    public function enqueue_js()
-    {
-    }
-
-
-
-    /**
-     * returns string like: '<tag'
-     *
-     * @param string $tag
-     * @return string
-     */
-    protected function _opening_tag($tag)
-    {
-        $this->_tag = $tag;
-        return "<{$this->_tag}";
-    }
-
-
-
-    /**
-     * returns string like: '</tag>
-     *
-     * @return string
-     */
-    protected function _closing_tag()
-    {
-        return "</{$this->_tag}>";
-    }
-
-
-
-    /**
-     * returns string like: '/>'
-     *
-     * @return string
-     */
-    protected function _close_tag()
-    {
-        return '/>';
-    }
-
-
-
-    /**
-     * returns an array of standard HTML attributes that get added to nearly all inputs,
-     * where string keys represent named attributes like id, class, etc
-     * and numeric keys represent single attributes like 'required'.
-     * Note: this does not include "value" because many inputs (like dropdowns, textareas, and checkboxes) don't use
-     * it.
-     *
-     * @return array
-     */
-    protected function _standard_attributes_array()
-    {
-        return array(
-            'name'  => $this->_input->html_name(),
-            'id'    => $this->_input->html_id(),
-            'class' => $this->_input->html_class(true),
-            0       => array('required', $this->_input->required()),
-            1       => $this->_input->other_html_attributes(),
-            'style' => $this->_input->html_style(),
-        );
-    }
-
-
-
-    /**
-     * sets the attributes using the incoming array
-     * and returns a string of all attributes rendered as valid HTML
-     *
-     * @param array $attributes
-     * @return string
-     */
-    protected function _attributes_string($attributes = array())
-    {
-        $attributes = apply_filters(
-            'FHEE__EE_Display_Strategy_Base__attributes_string__attributes',
-            $attributes,
-            $this,
-            $this->_input
-        );
-        $attributes_string = '';
-        foreach ($attributes as $attribute => $value) {
-            if (is_numeric($attribute)) {
-                $add = true;
-                if (is_array($value)) {
-                    $attribute = isset($value[0]) ? $value[0] : '';
-                    $add = isset($value[1]) ? $value[1] : false;
-                } else {
-                    $attribute = $value;
-                }
-                $attributes_string .= $this->_single_attribute($attribute, $add);
-            } else {
-                $attributes_string .= $this->_attribute($attribute, $value);
-            }
-        }
-        return $attributes_string;
-    }
-
-
-
-    /**
-     * returns string like: ' attribute="value"'
-     * returns an empty string if $value is null
-     *
-     * @param string $attribute
-     * @param string $value
-     * @return string
-     */
-    protected function _attribute($attribute, $value = '')
-    {
-        if ($value === null) {
-            return '';
-        }
-        $value = esc_attr($value);
-        return " {$attribute}=\"{$value}\"";
-    }
-
-
-
-    /**
-     * returns string like: ' data-attribute="value"'
-     * returns an empty string if $value is null
-     *
-     * @param string $attribute
-     * @param string $value
-     * @return string
-     */
-    protected function _data_attribute($attribute, $value = '')
-    {
-        if ($value === null) {
-            return '';
-        }
-        $value = esc_attr($value);
-        return " data-{$attribute}=\"{$value}\"";
-    }
-
-
-
-    /**
-     * returns string like: ' attribute' if $add is true
-     *
-     * @param string  $attribute
-     * @param boolean $add
-     * @return string
-     */
-    protected function _single_attribute($attribute, $add = true)
-    {
-        return $add ? " {$attribute}" : '';
-    }
+	/**
+	 * _remove_chars - takes an incoming string, and removes the string $chars from the end of it, but only if $chars
+	 * is already there
+	 *
+	 * @param string $string - the string being processed
+	 * @param string $chars  - exact string of characters to remove
+	 * @return string
+	 */
+	protected function _remove_chars($string = '', $chars = '-')
+	{
+		$char_length = strlen($chars) * -1;
+		// if last three characters of string is  " - ", then remove it
+		return substr($string, $char_length) === $chars ? substr($string, 0, $char_length) : $string;
+	}
+
+
+
+	/**
+	 * _append_chars - takes an incoming string, and adds the string $chars to the end of it, but only if $chars is not
+	 * already there
+	 *
+	 * @param string $string - the string being processed
+	 * @param string $chars  - exact string of characters to be added to end of string
+	 * @return string
+	 */
+	protected function _append_chars($string = '', $chars = '-')
+	{
+		return $this->_remove_chars($string, $chars) . $chars;
+	}
+
+
+
+	/**
+	 * Gets the HTML IDs of all the inputs
+	 *
+	 * @param bool $add_pound_sign
+	 * @return array
+	 */
+	public function get_html_input_ids($add_pound_sign = false)
+	{
+		return array($this->get_input()->html_id($add_pound_sign));
+	}
+
+
+
+	/**
+	 * Adds js variables for localization to the $other_js_data. These should be put
+	 * in each form's "other_data" javascript object.
+	 *
+	 * @param array $other_js_data
+	 * @return array
+	 */
+	public function get_other_js_data($other_js_data = array())
+	{
+		return $other_js_data;
+	}
+
+
+
+	/**
+	 * Opportunity for this display strategy to call wp_enqueue_script and wp_enqueue_style.
+	 * This should be called during wp_enqueue_scripts
+	 */
+	public function enqueue_js()
+	{
+	}
+
+
+
+	/**
+	 * returns string like: '<tag'
+	 *
+	 * @param string $tag
+	 * @return string
+	 */
+	protected function _opening_tag($tag)
+	{
+		$this->_tag = $tag;
+		return "<{$this->_tag}";
+	}
+
+
+
+	/**
+	 * returns string like: '</tag>
+	 *
+	 * @return string
+	 */
+	protected function _closing_tag()
+	{
+		return "</{$this->_tag}>";
+	}
+
+
+
+	/**
+	 * returns string like: '/>'
+	 *
+	 * @return string
+	 */
+	protected function _close_tag()
+	{
+		return '/>';
+	}
+
+
+
+	/**
+	 * returns an array of standard HTML attributes that get added to nearly all inputs,
+	 * where string keys represent named attributes like id, class, etc
+	 * and numeric keys represent single attributes like 'required'.
+	 * Note: this does not include "value" because many inputs (like dropdowns, textareas, and checkboxes) don't use
+	 * it.
+	 *
+	 * @return array
+	 */
+	protected function _standard_attributes_array()
+	{
+		return array(
+			'name'  => $this->_input->html_name(),
+			'id'    => $this->_input->html_id(),
+			'class' => $this->_input->html_class(true),
+			0       => array('required', $this->_input->required()),
+			1       => $this->_input->other_html_attributes(),
+			'style' => $this->_input->html_style(),
+		);
+	}
+
+
+
+	/**
+	 * sets the attributes using the incoming array
+	 * and returns a string of all attributes rendered as valid HTML
+	 *
+	 * @param array $attributes
+	 * @return string
+	 */
+	protected function _attributes_string($attributes = array())
+	{
+		$attributes = apply_filters(
+			'FHEE__EE_Display_Strategy_Base__attributes_string__attributes',
+			$attributes,
+			$this,
+			$this->_input
+		);
+		$attributes_string = '';
+		foreach ($attributes as $attribute => $value) {
+			if (is_numeric($attribute)) {
+				$add = true;
+				if (is_array($value)) {
+					$attribute = isset($value[0]) ? $value[0] : '';
+					$add = isset($value[1]) ? $value[1] : false;
+				} else {
+					$attribute = $value;
+				}
+				$attributes_string .= $this->_single_attribute($attribute, $add);
+			} else {
+				$attributes_string .= $this->_attribute($attribute, $value);
+			}
+		}
+		return $attributes_string;
+	}
+
+
+
+	/**
+	 * returns string like: ' attribute="value"'
+	 * returns an empty string if $value is null
+	 *
+	 * @param string $attribute
+	 * @param string $value
+	 * @return string
+	 */
+	protected function _attribute($attribute, $value = '')
+	{
+		if ($value === null) {
+			return '';
+		}
+		$value = esc_attr($value);
+		return " {$attribute}=\"{$value}\"";
+	}
+
+
+
+	/**
+	 * returns string like: ' data-attribute="value"'
+	 * returns an empty string if $value is null
+	 *
+	 * @param string $attribute
+	 * @param string $value
+	 * @return string
+	 */
+	protected function _data_attribute($attribute, $value = '')
+	{
+		if ($value === null) {
+			return '';
+		}
+		$value = esc_attr($value);
+		return " data-{$attribute}=\"{$value}\"";
+	}
+
+
+
+	/**
+	 * returns string like: ' attribute' if $add is true
+	 *
+	 * @param string  $attribute
+	 * @param boolean $add
+	 * @return string
+	 */
+	protected function _single_attribute($attribute, $add = true)
+	{
+		return $add ? " {$attribute}" : '';
+	}
 }