eventespresso / event-espresso-core

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}" : '';
+	}
 }

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

Spacing +5 added lines, -5 removed lines

@@ -20,12 +20,12 @@
             $cols = 20;
         }
         $html = '<textarea';
-        $html .= ' id="' . $input->html_id() . '"';
-        $html .= ' name="' . $input->html_name() . '"';
-        $html .= ' class="' . $input->html_class() . '"' ;
-        $html .= ' style="' . $input->html_style() . '"';
+        $html .= ' id="'.$input->html_id().'"';
+        $html .= ' name="'.$input->html_name().'"';
+        $html .= ' class="'.$input->html_class().'"';
+        $html .= ' style="'.$input->html_style().'"';
         $html .= $input->other_html_attributes();
-        $html .= ' rows= "' . $rows . '" cols="' . $cols . '">';
+        $html .= ' rows= "'.$rows.'" cols="'.$cols.'">';
         $html .= esc_textarea($raw_value);
         $html .= '</textarea>';
         foreach ($this->_input->get_validation_strategies() as $validation_strategy) {

Indentation +39 added lines, -39 removed lines

@@ -2,43 +2,43 @@
 
 class EE_Text_Area_Display_Strategy extends EE_Display_Strategy_Base
 {
-    /**
-    *
-    * @return string of html to display the field
-    */
-    public function display()
-    {
-        $input = $this->_input;
-        $raw_value = maybe_serialize($input->raw_value());
-        if ($input instanceof EE_Text_Area_Input) {
-            $rows = $input->get_rows();
-            $cols = $input->get_cols();
-        } else {
-            $rows = 4;
-            $cols = 20;
-        }
-        $html = '<textarea';
-        $html .= ' id="' . $input->html_id() . '"';
-        $html .= ' name="' . $input->html_name() . '"';
-        $html .= ' class="' . $input->html_class() . '"' ;
-        $html .= ' style="' . $input->html_style() . '"';
-        $html .= $input->other_html_attributes();
-        $html .= ' rows= "' . $rows . '" cols="' . $cols . '">';
-        $html .= esc_textarea($raw_value);
-        $html .= '</textarea>';
-        foreach ($this->_input->get_validation_strategies() as $validation_strategy) {
-            if (
-                $validation_strategy instanceof EE_Simple_HTML_Validation_Strategy
-                || $validation_strategy instanceof EE_Full_HTML_Validation_Strategy
-            ) {
-                $html .= sprintf(
-                    esc_html__('%1$s(allowed tags: %2$s)%3$s', 'event_espresso'),
-                    '<p class="ee-question-desc">',
-                    $validation_strategy->get_list_of_allowed_tags(),
-                    '</p>'
-                );
-            }
-        }
-        return $html;
-    }
+	/**
+	 *
+	 * @return string of html to display the field
+	 */
+	public function display()
+	{
+		$input = $this->_input;
+		$raw_value = maybe_serialize($input->raw_value());
+		if ($input instanceof EE_Text_Area_Input) {
+			$rows = $input->get_rows();
+			$cols = $input->get_cols();
+		} else {
+			$rows = 4;
+			$cols = 20;
+		}
+		$html = '<textarea';
+		$html .= ' id="' . $input->html_id() . '"';
+		$html .= ' name="' . $input->html_name() . '"';
+		$html .= ' class="' . $input->html_class() . '"' ;
+		$html .= ' style="' . $input->html_style() . '"';
+		$html .= $input->other_html_attributes();
+		$html .= ' rows= "' . $rows . '" cols="' . $cols . '">';
+		$html .= esc_textarea($raw_value);
+		$html .= '</textarea>';
+		foreach ($this->_input->get_validation_strategies() as $validation_strategy) {
+			if (
+				$validation_strategy instanceof EE_Simple_HTML_Validation_Strategy
+				|| $validation_strategy instanceof EE_Full_HTML_Validation_Strategy
+			) {
+				$html .= sprintf(
+					esc_html__('%1$s(allowed tags: %2$s)%3$s', 'event_espresso'),
+					'<p class="ee-question-desc">',
+					$validation_strategy->get_list_of_allowed_tags(),
+					'</p>'
+				);
+			}
+		}
+		return $html;
+	}
 }

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

Spacing +3 added lines, -3 removed lines

@@ -43,7 +43,7 @@ 
         }
         $normalized_array_value = array();
         foreach ($items_to_normalize as $key => $individual_item) {
-            $normalized_array_value[ $key ] = $this->normalize_one($individual_item);
+            $normalized_array_value[$key] = $this->normalize_one($individual_item);
         }
         return $normalized_array_value;
     }
@@ -74,12 +74,12 @@ 
         if ($normalized_values === null) {
             $normalized_values = array();
         }
-        if (! is_array($normalized_values)) {
+        if ( ! is_array($normalized_values)) {
             $normalized_values = array($normalized_values);
         }
         $non_normal_values = array();
         foreach ($normalized_values as $key => $value) {
-            $non_normal_values[ $key ] = $this->unnormalize_one($value);
+            $non_normal_values[$key] = $this->unnormalize_one($value);
         }
         return $non_normal_values;
     }

Indentation +86 added lines, -86 removed lines

@@ -9,90 +9,90 @@
  */
 class EE_Many_Valued_Normalization extends EE_Normalization_Strategy_Base
 {
-    protected $_individual_item_normalization_strategy = array();
-
-
-
-    /**
-     * @param EE_Normalization_Strategy_Base $individual_item_normalization_strategy
-     */
-    public function __construct($individual_item_normalization_strategy)
-    {
-        $this->_individual_item_normalization_strategy = $individual_item_normalization_strategy;
-        parent::__construct();
-    }
-
-
-
-    /**
-     * Normalizes the input into an array, and normalizes each item according to its
-     * individual item normalization strategy
-     *
-     * @param array | string $value_to_normalize
-     * @return array
-     */
-    public function normalize($value_to_normalize)
-    {
-        if (is_array($value_to_normalize)) {
-            $items_to_normalize = $value_to_normalize;
-        } elseif ($value_to_normalize !== null) {
-            $items_to_normalize = array($value_to_normalize);
-        } else {
-            $items_to_normalize = array();
-        }
-        $normalized_array_value = array();
-        foreach ($items_to_normalize as $key => $individual_item) {
-            $normalized_array_value[ $key ] = $this->normalize_one($individual_item);
-        }
-        return $normalized_array_value;
-    }
-
-
-
-    /**
-     * Normalized the one item (called for each array item in EE_Many_values_Normalization::normalize())
-     *
-     * @param string $individual_value_to_normalize but definitely NOT an array
-     * @return mixed
-     */
-    public function normalize_one($individual_value_to_normalize)
-    {
-        return $this->_individual_item_normalization_strategy->normalize($individual_value_to_normalize);
-    }
-
-
-
-    /**
-     * Converts the array of normalized things to an array of raw html values.
-     *
-     * @param array $normalized_values
-     * @return string[]
-     */
-    public function unnormalize($normalized_values)
-    {
-        if ($normalized_values === null) {
-            $normalized_values = array();
-        }
-        if (! is_array($normalized_values)) {
-            $normalized_values = array($normalized_values);
-        }
-        $non_normal_values = array();
-        foreach ($normalized_values as $key => $value) {
-            $non_normal_values[ $key ] = $this->unnormalize_one($value);
-        }
-        return $non_normal_values;
-    }
-
-
-
-    /**
-     * Unnormalizes an individual item in the array of values
-     *
-     * @param mixed $individual_value_to_unnormalize but certainly NOT an array
-     * @return string
-     */
-    public function unnormalize_one($individual_value_to_unnormalize)
-    {
-        return $this->_individual_item_normalization_strategy->unnormalize($individual_value_to_unnormalize);
-    }
+	protected $_individual_item_normalization_strategy = array();
+
+
+
+	/**
+	 * @param EE_Normalization_Strategy_Base $individual_item_normalization_strategy
+	 */
+	public function __construct($individual_item_normalization_strategy)
+	{
+		$this->_individual_item_normalization_strategy = $individual_item_normalization_strategy;
+		parent::__construct();
+	}
+
+
+
+	/**
+	 * Normalizes the input into an array, and normalizes each item according to its
+	 * individual item normalization strategy
+	 *
+	 * @param array | string $value_to_normalize
+	 * @return array
+	 */
+	public function normalize($value_to_normalize)
+	{
+		if (is_array($value_to_normalize)) {
+			$items_to_normalize = $value_to_normalize;
+		} elseif ($value_to_normalize !== null) {
+			$items_to_normalize = array($value_to_normalize);
+		} else {
+			$items_to_normalize = array();
+		}
+		$normalized_array_value = array();
+		foreach ($items_to_normalize as $key => $individual_item) {
+			$normalized_array_value[ $key ] = $this->normalize_one($individual_item);
+		}
+		return $normalized_array_value;
+	}
+
+
+
+	/**
+	 * Normalized the one item (called for each array item in EE_Many_values_Normalization::normalize())
+	 *
+	 * @param string $individual_value_to_normalize but definitely NOT an array
+	 * @return mixed
+	 */
+	public function normalize_one($individual_value_to_normalize)
+	{
+		return $this->_individual_item_normalization_strategy->normalize($individual_value_to_normalize);
+	}
+
+
+
+	/**
+	 * Converts the array of normalized things to an array of raw html values.
+	 *
+	 * @param array $normalized_values
+	 * @return string[]
+	 */
+	public function unnormalize($normalized_values)
+	{
+		if ($normalized_values === null) {
+			$normalized_values = array();
+		}
+		if (! is_array($normalized_values)) {
+			$normalized_values = array($normalized_values);
+		}
+		$non_normal_values = array();
+		foreach ($normalized_values as $key => $value) {
+			$non_normal_values[ $key ] = $this->unnormalize_one($value);
+		}
+		return $non_normal_values;
+	}
+
+
+
+	/**
+	 * Unnormalizes an individual item in the array of values
+	 *
+	 * @param mixed $individual_value_to_unnormalize but certainly NOT an array
+	 * @return string
+	 */
+	public function unnormalize_one($individual_value_to_unnormalize)
+	{
+		return $this->_individual_item_normalization_strategy->unnormalize($individual_value_to_unnormalize);
+	}
 }

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

Spacing +4 added lines, -4 removed lines

@@ -52,7 +52,7 @@ 
         // loop through incoming options
         foreach ($template_options as $key => $value) {
             // add underscore to $key to match property names
-            $_key = '_' . $key;
+            $_key = '_'.$key;
             if (property_exists($this, $_key)) {
                 $this->{$_key} = $value;
             }
@@ -182,9 +182,9 @@ 
             $subsection_name = self::prep_form_subsection_key_name($subsection_name);
             if (strpos($subsection_name, '[') !== false) {
                 $sub_name = explode('[', $subsection_name);
-                $this->_template_args[ $sub_name[0] ][ rtrim($sub_name[1], ']') ] = $this->layout_subsection($subsection);
+                $this->_template_args[$sub_name[0]][rtrim($sub_name[1], ']')] = $this->layout_subsection($subsection);
             } else {
-                $this->_template_args[ $subsection_name ] = $this->layout_subsection($subsection);
+                $this->_template_args[$subsection_name] = $this->layout_subsection($subsection);
             }
         }
         //      d( $this->_template_args );
@@ -203,7 +203,7 @@ 
     public static function prep_form_subsection_key_name($subsection_name = '')
     {
         $subsection_name = str_replace(array('-', ' '), array('', '_'), $subsection_name);
-        return is_numeric(substr($subsection_name, 0, 1)) ? 'form_' . $subsection_name : $subsection_name;
+        return is_numeric(substr($subsection_name, 0, 1)) ? 'form_'.$subsection_name : $subsection_name;
     }
 
 

Indentation +196 added lines, -196 removed lines

@@ -22,200 +22,200 @@
  */
 class EE_Template_Layout extends EE_Div_Per_Section_Layout
 {
-    protected $_layout_template_file       = null;
-
-    protected $_layout_begin_template_file = null;
-
-    protected $_input_template_file        = null;
-
-    protected $_subsection_template_file   = null;
-
-    protected $_layout_end_template_file   = null;
-
-    protected $_template_args              = array();
-
-
-
-    /**
-     * @param array $template_options {
-     * @type string $_layout_template_file
-     * @type string $_begin_template_file
-     * @type string $_input_template_file
-     * @type string $_subsection_template_file
-     * @type string $_end_template_file
-     * @type array  $_template_args
-     *                                }
-     */
-    public function __construct($template_options = array())
-    {
-        // loop through incoming options
-        foreach ($template_options as $key => $value) {
-            // add underscore to $key to match property names
-            $_key = '_' . $key;
-            if (property_exists($this, $_key)) {
-                $this->{$_key} = $value;
-            }
-        }
-        parent::__construct();
-    }
-
-
-
-    /**
-     * Also has the side effect of enqueuing any needed JS and CSS for
-     * this form.
-     * Creates all the HTML necessary for displaying this form, its inputs, and
-     * proper subsections.
-     * Returns the HTML
-     *
-     * @return string
-     */
-    public function layout_form()
-    {
-        if ($this->_layout_template_file) {
-            return EEH_Template::locate_template($this->_layout_template_file, $this->template_args(), true, true);
-        } else {
-            return parent::layout_form();
-        }
-    }
-
-
-
-    /**
-     * opening div tag for a form
-     *
-     * @return string
-     */
-    public function layout_form_begin()
-    {
-        if ($this->_layout_begin_template_file) {
-            return EEH_Template::locate_template(
-                $this->_layout_begin_template_file,
-                $this->template_args(),
-                true,
-                true
-            );
-        } else {
-            return parent::layout_form_begin();
-        }
-    }
-
-
-
-    /**
-     * If an input_template_file was provided upon construction, uses that to layout the input. Otherwise uses parent.
-     *
-     * @see EE_DIv_Per_Section_Layout::layout_input() for documentation
-     * @param EE_Form_Input_Base $input
-     * @return string
-     */
-    public function layout_input($input)
-    {
-        if ($this->_input_template_file) {
-            return EEH_Template::locate_template($this->_input_template_file, array('input' => $input), true, true);
-        }
-        return parent::layout_input($input);
-    }
-
-
-
-    /**
-     * If a subsection_template_file was provided upon construction, uses that to layout the subsection. Otherwise uses parent.
-     *
-     * @see EE_Div_Per_Section_Layout::layout_subsection() for documentation
-     * @param EE_Form_Section_Proper $form_section
-     * @return string
-     */
-    public function layout_subsection($form_section)
-    {
-        if ($this->_subsection_template_file) {
-            return EEH_Template::locate_template($this->_subsection_template_file, $this->template_args(), true, true);
-        }
-        return parent::layout_subsection($form_section);
-    }
-
-
-
-    /**
-     * closing div tag for a form
-     *
-     * @return string
-     */
-    public function layout_form_end()
-    {
-        if ($this->_layout_end_template_file) {
-            return EEH_Template::locate_template($this->_layout_end_template_file, $this->template_args(), true, true);
-        } else {
-            return parent::layout_form_end();
-        }
-    }
-
-
-
-    /**
-     * @param array $template_args
-     */
-    public function set_template_args($template_args = array())
-    {
-        $this->_template_args = $template_args;
-    }
-
-
-
-    /**
-     * @param array $template_args
-     */
-    public function add_template_args($template_args = array())
-    {
-        $this->_template_args = array_merge_recursive($this->_template_args, $template_args);
-    }
-
-
-
-    /**
-     * @return array
-     */
-    public function template_args()
-    {
-        foreach ($this->form_section()->subsections() as $subsection_name => $subsection) {
-            $subsection_name = self::prep_form_subsection_key_name($subsection_name);
-            if (strpos($subsection_name, '[') !== false) {
-                $sub_name = explode('[', $subsection_name);
-                $this->_template_args[ $sub_name[0] ][ rtrim($sub_name[1], ']') ] = $this->layout_subsection($subsection);
-            } else {
-                $this->_template_args[ $subsection_name ] = $this->layout_subsection($subsection);
-            }
-        }
-        //      d( $this->_template_args );
-        return $this->_template_args;
-    }
-
-
-
-    /**
-     * prep_form_section_key_name
-     *
-     * @access public
-     * @param string $subsection_name
-     * @return string
-     */
-    public static function prep_form_subsection_key_name($subsection_name = '')
-    {
-        $subsection_name = str_replace(array('-', ' '), array('', '_'), $subsection_name);
-        return is_numeric(substr($subsection_name, 0, 1)) ? 'form_' . $subsection_name : $subsection_name;
-    }
-
-
-
-    /**
-     * get_subform - just a wrapper for the above method
-     *
-     * @access public
-     * @param string $subsection_name
-     * @return string
-     */
-    public static function get_subform_name($subsection_name = '')
-    {
-        return EE_Template_Layout::prep_form_subsection_key_name($subsection_name);
-    }
+	protected $_layout_template_file       = null;
+
+	protected $_layout_begin_template_file = null;
+
+	protected $_input_template_file        = null;
+
+	protected $_subsection_template_file   = null;
+
+	protected $_layout_end_template_file   = null;
+
+	protected $_template_args              = array();
+
+
+
+	/**
+	 * @param array $template_options {
+	 * @type string $_layout_template_file
+	 * @type string $_begin_template_file
+	 * @type string $_input_template_file
+	 * @type string $_subsection_template_file
+	 * @type string $_end_template_file
+	 * @type array  $_template_args
+	 *                                }
+	 */
+	public function __construct($template_options = array())
+	{
+		// loop through incoming options
+		foreach ($template_options as $key => $value) {
+			// add underscore to $key to match property names
+			$_key = '_' . $key;
+			if (property_exists($this, $_key)) {
+				$this->{$_key} = $value;
+			}
+		}
+		parent::__construct();
+	}
+
+
+
+	/**
+	 * Also has the side effect of enqueuing any needed JS and CSS for
+	 * this form.
+	 * Creates all the HTML necessary for displaying this form, its inputs, and
+	 * proper subsections.
+	 * Returns the HTML
+	 *
+	 * @return string
+	 */
+	public function layout_form()
+	{
+		if ($this->_layout_template_file) {
+			return EEH_Template::locate_template($this->_layout_template_file, $this->template_args(), true, true);
+		} else {
+			return parent::layout_form();
+		}
+	}
+
+
+
+	/**
+	 * opening div tag for a form
+	 *
+	 * @return string
+	 */
+	public function layout_form_begin()
+	{
+		if ($this->_layout_begin_template_file) {
+			return EEH_Template::locate_template(
+				$this->_layout_begin_template_file,
+				$this->template_args(),
+				true,
+				true
+			);
+		} else {
+			return parent::layout_form_begin();
+		}
+	}
+
+
+
+	/**
+	 * If an input_template_file was provided upon construction, uses that to layout the input. Otherwise uses parent.
+	 *
+	 * @see EE_DIv_Per_Section_Layout::layout_input() for documentation
+	 * @param EE_Form_Input_Base $input
+	 * @return string
+	 */
+	public function layout_input($input)
+	{
+		if ($this->_input_template_file) {
+			return EEH_Template::locate_template($this->_input_template_file, array('input' => $input), true, true);
+		}
+		return parent::layout_input($input);
+	}
+
+
+
+	/**
+	 * If a subsection_template_file was provided upon construction, uses that to layout the subsection. Otherwise uses parent.
+	 *
+	 * @see EE_Div_Per_Section_Layout::layout_subsection() for documentation
+	 * @param EE_Form_Section_Proper $form_section
+	 * @return string
+	 */
+	public function layout_subsection($form_section)
+	{
+		if ($this->_subsection_template_file) {
+			return EEH_Template::locate_template($this->_subsection_template_file, $this->template_args(), true, true);
+		}
+		return parent::layout_subsection($form_section);
+	}
+
+
+
+	/**
+	 * closing div tag for a form
+	 *
+	 * @return string
+	 */
+	public function layout_form_end()
+	{
+		if ($this->_layout_end_template_file) {
+			return EEH_Template::locate_template($this->_layout_end_template_file, $this->template_args(), true, true);
+		} else {
+			return parent::layout_form_end();
+		}
+	}
+
+
+
+	/**
+	 * @param array $template_args
+	 */
+	public function set_template_args($template_args = array())
+	{
+		$this->_template_args = $template_args;
+	}
+
+
+
+	/**
+	 * @param array $template_args
+	 */
+	public function add_template_args($template_args = array())
+	{
+		$this->_template_args = array_merge_recursive($this->_template_args, $template_args);
+	}
+
+
+
+	/**
+	 * @return array
+	 */
+	public function template_args()
+	{
+		foreach ($this->form_section()->subsections() as $subsection_name => $subsection) {
+			$subsection_name = self::prep_form_subsection_key_name($subsection_name);
+			if (strpos($subsection_name, '[') !== false) {
+				$sub_name = explode('[', $subsection_name);
+				$this->_template_args[ $sub_name[0] ][ rtrim($sub_name[1], ']') ] = $this->layout_subsection($subsection);
+			} else {
+				$this->_template_args[ $subsection_name ] = $this->layout_subsection($subsection);
+			}
+		}
+		//      d( $this->_template_args );
+		return $this->_template_args;
+	}
+
+
+
+	/**
+	 * prep_form_section_key_name
+	 *
+	 * @access public
+	 * @param string $subsection_name
+	 * @return string
+	 */
+	public static function prep_form_subsection_key_name($subsection_name = '')
+	{
+		$subsection_name = str_replace(array('-', ' '), array('', '_'), $subsection_name);
+		return is_numeric(substr($subsection_name, 0, 1)) ? 'form_' . $subsection_name : $subsection_name;
+	}
+
+
+
+	/**
+	 * get_subform - just a wrapper for the above method
+	 *
+	 * @access public
+	 * @param string $subsection_name
+	 * @return string
+	 */
+	public static function get_subform_name($subsection_name = '')
+	{
+		return EE_Template_Layout::prep_form_subsection_key_name($subsection_name);
+	}
 }

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

Spacing +3 added lines, -3 removed lines

@@ -36,7 +36,7 @@ 
     public function __construct($options = array())
     {
         foreach ($options as $key => $value) {
-            $key = '_' . $key;
+            $key = '_'.$key;
             if (property_exists($this, $key)) {
                 $this->{$key} = $value;
             }
@@ -60,7 +60,7 @@ 
                 . '" style="'
                 . $this->_form_section->html_style()
                 . '">';
-        $html .= '<legend class="' . $this->legend_class() . '">' . $this->legend_text() . '</legend>';
+        $html .= '<legend class="'.$this->legend_class().'">'.$this->legend_text().'</legend>';
         return $html;
     }
 
@@ -73,7 +73,7 @@ 
      */
     public function layout_form_end()
     {
-        return EEH_HTML::nl(-1) . '</fieldset>';
+        return EEH_HTML::nl(-1).'</fieldset>';
     }
 
 

Indentation +103 added lines, -103 removed lines

@@ -11,107 +11,107 @@
  */
 class EE_Fieldset_Section_Layout extends EE_Div_Per_Section_Layout
 {
-    /**
-     * legend_class
-     *
-     * @var string
-     */
-    protected $_legend_class;
-
-    /**
-     * legend_text
-     *
-     * @var string
-     */
-    protected $_legend_text;
-
-
-
-    /**
-     *    construct
-     *
-     * @param array $options
-     */
-    public function __construct($options = array())
-    {
-        foreach ($options as $key => $value) {
-            $key = '_' . $key;
-            if (property_exists($this, $key)) {
-                $this->{$key} = $value;
-            }
-        }
-    }
-
-
-
-    /**
-     * opening div tag for a form
-     *
-     * @return string
-     */
-    public function layout_form_begin()
-    {
-        $html = EEH_HTML::nl(1)
-                . '<fieldset id="'
-                . $this->_form_section->html_id()
-                . '" class="'
-                . $this->_form_section->html_class()
-                . '" style="'
-                . $this->_form_section->html_style()
-                . '">';
-        $html .= '<legend class="' . $this->legend_class() . '">' . $this->legend_text() . '</legend>';
-        return $html;
-    }
-
-
-
-    /**
-     * closing div tag for a form
-     *
-     * @return string
-     */
-    public function layout_form_end()
-    {
-        return EEH_HTML::nl(-1) . '</fieldset>';
-    }
-
-
-
-    /**
-     * @param string $legend_class
-     */
-    public function set_legend_class($legend_class)
-    {
-        $this->_legend_class = $legend_class;
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function legend_class()
-    {
-        return $this->_legend_class;
-    }
-
-
-
-    /**
-     * @param string $legend_text
-     */
-    public function set_legend_text($legend_text)
-    {
-        $this->_legend_text = $legend_text;
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function legend_text()
-    {
-        return $this->_legend_text;
-    }
+	/**
+	 * legend_class
+	 *
+	 * @var string
+	 */
+	protected $_legend_class;
+
+	/**
+	 * legend_text
+	 *
+	 * @var string
+	 */
+	protected $_legend_text;
+
+
+
+	/**
+	 *    construct
+	 *
+	 * @param array $options
+	 */
+	public function __construct($options = array())
+	{
+		foreach ($options as $key => $value) {
+			$key = '_' . $key;
+			if (property_exists($this, $key)) {
+				$this->{$key} = $value;
+			}
+		}
+	}
+
+
+
+	/**
+	 * opening div tag for a form
+	 *
+	 * @return string
+	 */
+	public function layout_form_begin()
+	{
+		$html = EEH_HTML::nl(1)
+				. '<fieldset id="'
+				. $this->_form_section->html_id()
+				. '" class="'
+				. $this->_form_section->html_class()
+				. '" style="'
+				. $this->_form_section->html_style()
+				. '">';
+		$html .= '<legend class="' . $this->legend_class() . '">' . $this->legend_text() . '</legend>';
+		return $html;
+	}
+
+
+
+	/**
+	 * closing div tag for a form
+	 *
+	 * @return string
+	 */
+	public function layout_form_end()
+	{
+		return EEH_HTML::nl(-1) . '</fieldset>';
+	}
+
+
+
+	/**
+	 * @param string $legend_class
+	 */
+	public function set_legend_class($legend_class)
+	{
+		$this->_legend_class = $legend_class;
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function legend_class()
+	{
+		return $this->_legend_class;
+	}
+
+
+
+	/**
+	 * @param string $legend_text
+	 */
+	public function set_legend_text($legend_text)
+	{
+		$this->_legend_text = $legend_text;
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function legend_text()
+	{
+		return $this->_legend_text;
+	}
 }

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

Spacing +5 added lines, -5 removed lines

@@ -15,7 +15,7 @@ 
      */
     public function layout_form_begin($additional_args = array())
     {
-        $this->_form_section->set_html_class($this->_form_section->html_class() . ' form-table');
+        $this->_form_section->set_html_class($this->_form_section->html_class().' form-table');
         return parent::layout_form_begin($additional_args);
     }
 
@@ -52,7 +52,7 @@ 
             || $input->get_display_strategy() instanceof EE_Text_Input_Display_Strategy
             || $input->get_display_strategy() instanceof EE_Admin_File_Uploader_Display_Strategy
         ) {
-            $input->set_html_class($input->html_class() . ' large-text');
+            $input->set_html_class($input->html_class().' large-text');
         }
         if ($input instanceof EE_Text_Area_Input) {
             $input->set_rows(4);
@@ -61,10 +61,10 @@ 
         $input_html = $input->get_html_for_input();
         // maybe add errors and help text ?
         $input_html .= $input->get_html_for_errors() !== ''
-            ? EEH_HTML::nl() . $input->get_html_for_errors()
+            ? EEH_HTML::nl().$input->get_html_for_errors()
             : '';
         $input_html .= $input->get_html_for_help() !== ''
-            ? EEH_HTML::nl() . $input->get_html_for_help()
+            ? EEH_HTML::nl().$input->get_html_for_help()
             : '';
         // overriding parent to add wp admin specific things.
         $html = '';
@@ -78,7 +78,7 @@ 
                     '',
                     '',
                     'scope="row"'
-                ) . EEH_HTML::td($input_html)
+                ).EEH_HTML::td($input_html)
             );
         }
         return $html;

Indentation +56 added lines, -56 removed lines

@@ -6,63 +6,63 @@
  */
 class EE_Admin_Two_Column_Layout extends EE_Two_Column_Layout
 {
-    /**
-     * Overriding the parent table layout to include <tbody> tags
-     *
-     * @param array $additional_args
-     * @return string
-     */
-    public function layout_form_begin($additional_args = array())
-    {
-        $this->_form_section->set_html_class($this->_form_section->html_class() . ' form-table');
-        return parent::layout_form_begin($additional_args);
-    }
+	/**
+	 * Overriding the parent table layout to include <tbody> tags
+	 *
+	 * @param array $additional_args
+	 * @return string
+	 */
+	public function layout_form_begin($additional_args = array())
+	{
+		$this->_form_section->set_html_class($this->_form_section->html_class() . ' form-table');
+		return parent::layout_form_begin($additional_args);
+	}
 
 
 
-    /**
-     * Lays out the row for the input, including label and errors
-     *
-     * @param EE_Form_Input_Base $input
-     * @return string
-     * @throws EE_Error
-     */
-    public function layout_input($input)
-    {
-        if (
-            $input->get_display_strategy() instanceof EE_Text_Area_Display_Strategy
-            || $input->get_display_strategy() instanceof EE_Text_Input_Display_Strategy
-            || $input->get_display_strategy() instanceof EE_Admin_File_Uploader_Display_Strategy
-        ) {
-            $input->set_html_class($input->html_class() . ' large-text');
-        }
-        if ($input instanceof EE_Text_Area_Input) {
-            $input->set_rows(4);
-            $input->set_cols(60);
-        }
-        $input_html = $input->get_html_for_input();
-        // maybe add errors and help text ?
-        $input_html .= $input->get_html_for_errors() !== ''
-            ? EEH_HTML::nl() . $input->get_html_for_errors()
-            : '';
-        $input_html .= $input->get_html_for_help() !== ''
-            ? EEH_HTML::nl() . $input->get_html_for_help()
-            : '';
-        // overriding parent to add wp admin specific things.
-        $html = '';
-        if ($input instanceof EE_Hidden_Input) {
-            $html .= EEH_HTML::no_row($input->get_html_for_input());
-        } else {
-            $html .= EEH_HTML::tr(
-                EEH_HTML::th(
-                    $input->get_html_for_label(),
-                    '',
-                    '',
-                    '',
-                    'scope="row"'
-                ) . EEH_HTML::td($input_html)
-            );
-        }
-        return $html;
-    }
+	/**
+	 * Lays out the row for the input, including label and errors
+	 *
+	 * @param EE_Form_Input_Base $input
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function layout_input($input)
+	{
+		if (
+			$input->get_display_strategy() instanceof EE_Text_Area_Display_Strategy
+			|| $input->get_display_strategy() instanceof EE_Text_Input_Display_Strategy
+			|| $input->get_display_strategy() instanceof EE_Admin_File_Uploader_Display_Strategy
+		) {
+			$input->set_html_class($input->html_class() . ' large-text');
+		}
+		if ($input instanceof EE_Text_Area_Input) {
+			$input->set_rows(4);
+			$input->set_cols(60);
+		}
+		$input_html = $input->get_html_for_input();
+		// maybe add errors and help text ?
+		$input_html .= $input->get_html_for_errors() !== ''
+			? EEH_HTML::nl() . $input->get_html_for_errors()
+			: '';
+		$input_html .= $input->get_html_for_help() !== ''
+			? EEH_HTML::nl() . $input->get_html_for_help()
+			: '';
+		// overriding parent to add wp admin specific things.
+		$html = '';
+		if ($input instanceof EE_Hidden_Input) {
+			$html .= EEH_HTML::no_row($input->get_html_for_input());
+		} else {
+			$html .= EEH_HTML::tr(
+				EEH_HTML::th(
+					$input->get_html_for_label(),
+					'',
+					'',
+					'',
+					'scope="row"'
+				) . EEH_HTML::td($input_html)
+			);
+		}
+		return $html;
+	}
 }