eventespresso / event-espresso-core

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

Indentation +20 added lines, -20 removed lines

@@ -13,27 +13,27 @@
 class EE_Boolean_Normalization extends EE_Normalization_Strategy_Base
 {
 
-    /**
-     * @param string | int | bool $value_to_normalize
-     * @return boolean
-     */
-    public function normalize($value_to_normalize)
-    {
-        return filter_var($value_to_normalize, FILTER_VALIDATE_BOOLEAN);
-    }
+	/**
+	 * @param string | int | bool $value_to_normalize
+	 * @return boolean
+	 */
+	public function normalize($value_to_normalize)
+	{
+		return filter_var($value_to_normalize, FILTER_VALIDATE_BOOLEAN);
+	}
 
 
 
-    /**
-     * @param boolean $normalized_value
-     * @return string
-     */
-    public function unnormalize($normalized_value)
-    {
-        if ($normalized_value) {
-            return '1';
-        } else {
-            return '0';
-        }
-    }
+	/**
+	 * @param boolean $normalized_value
+	 * @return string
+	 */
+	public function unnormalize($normalized_value)
+	{
+		if ($normalized_value) {
+			return '1';
+		} else {
+			return '0';
+		}
+	}
 }

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

Indentation +86 added lines, -86 removed lines

@@ -10,90 +10,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);
+	}
 }

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

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

Indentation +18 added lines, -18 removed lines

@@ -10,25 +10,25 @@
 class EE_Slug_Normalization extends EE_Normalization_Strategy_Base
 {
 
-    /**
-     * @param string $value_to_normalize
-     * @return string
-     */
-    public function normalize($value_to_normalize)
-    {
-        return sanitize_title($value_to_normalize);
-    }
+	/**
+	 * @param string $value_to_normalize
+	 * @return string
+	 */
+	public function normalize($value_to_normalize)
+	{
+		return sanitize_title($value_to_normalize);
+	}
 
 
 
-    /**
-     * It's hard to unnormalize this- let's just take a guess
-     *
-     * @param string $normalized_value
-     * @return string
-     */
-    public function unnormalize($normalized_value)
-    {
-        return str_replace("-", " ", $normalized_value);
-    }
+	/**
+	 * It's hard to unnormalize this- let's just take a guess
+	 *
+	 * @param string $normalized_value
+	 * @return string
+	 */
+	public function unnormalize($normalized_value)
+	{
+		return str_replace("-", " ", $normalized_value);
+	}
 }

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

Indentation +10 added lines, -10 removed lines

@@ -9,14 +9,14 @@
 class EE_Credit_Card_Normalization extends EE_Text_Normalization
 {
 
-    /**
-     * @param string $value_to_normalize
-     * @return mixed
-     */
-    public function normalize($value_to_normalize)
-    {
-        $normalized_by_parent = parent::normalize($value_to_normalize);
-        // we want to make it consistent, so remove whitespace from cc number
-        return preg_replace('/\s+/', '', $normalized_by_parent);
-    }
+	/**
+	 * @param string $value_to_normalize
+	 * @return mixed
+	 */
+	public function normalize($value_to_normalize)
+	{
+		$normalized_by_parent = parent::normalize($value_to_normalize);
+		// we want to make it consistent, so remove whitespace from cc number
+		return preg_replace('/\s+/', '', $normalized_by_parent);
+	}
 }

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

Indentation +31 added lines, -31 removed lines

@@ -10,38 +10,38 @@
 class EE_Text_Normalization extends EE_Normalization_Strategy_Base
 {
 
-    /**
-     * @param string $value_to_normalize
-     * @return array|mixed|string
-     */
-    public function normalize($value_to_normalize)
-    {
-        if (is_array($value_to_normalize)) {
-            return (string) array_shift($value_to_normalize);
-        }
-        // consider `"null"` values to be equivalent to null.
-        if ($value_to_normalize === '' || $value_to_normalize === null) {
-            return null;
-        }
-        return (string) $value_to_normalize;
-    }
+	/**
+	 * @param string $value_to_normalize
+	 * @return array|mixed|string
+	 */
+	public function normalize($value_to_normalize)
+	{
+		if (is_array($value_to_normalize)) {
+			return (string) array_shift($value_to_normalize);
+		}
+		// consider `"null"` values to be equivalent to null.
+		if ($value_to_normalize === '' || $value_to_normalize === null) {
+			return null;
+		}
+		return (string) $value_to_normalize;
+	}
 
 
 
-    /**
-     * IF its a string in PHP, it will be a string in the HTML form. easy
-     *
-     * @param string $normalized_value
-     * @return string
-     */
-    public function unnormalize($normalized_value)
-    {
-        // account for default "select here" option values
-        if ($normalized_value === null) {
-            return '';
-        }
-        // double-check it's a string. It's possible this value was a question option that happened to be a numeric
-        // string, in which case PHP has automatically converted it to an integer!
-        return (string) $normalized_value;
-    }
+	/**
+	 * IF its a string in PHP, it will be a string in the HTML form. easy
+	 *
+	 * @param string $normalized_value
+	 * @return string
+	 */
+	public function unnormalize($normalized_value)
+	{
+		// account for default "select here" option values
+		if ($normalized_value === null) {
+			return '';
+		}
+		// double-check it's a string. It's possible this value was a question option that happened to be a numeric
+		// string, in which case PHP has automatically converted it to an integer!
+		return (string) $normalized_value;
+	}
 }

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

Indentation +196 added lines, -196 removed lines

@@ -23,200 +23,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);
+	}
 }

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

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

Indentation +103 added lines, -103 removed lines

@@ -12,107 +12,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;
+	}
 }

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

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

@@ -7,63 +7,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;
+	}
 }

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

Spacing +6 added lines, -6 removed lines

@@ -14,9 +14,9 @@ 
         return EEH_HTML::table(
             '',
             $this->_form_section->html_id(),
-            $this->_form_section->html_class() . ' form-table',
+            $this->_form_section->html_class().' form-table',
             $this->_form_section->html_style()
-        ) . EEH_HTML::tbody();
+        ).EEH_HTML::tbody();
     }
 
 
@@ -28,7 +28,7 @@ 
      */
     public function layout_form_end($additional_args = array())
     {
-        return EEH_HTML::tbodyx() . EEH_HTML::tablex($this->_form_section->html_id());
+        return EEH_HTML::tbodyx().EEH_HTML::tablex($this->_form_section->html_id());
     }
 
 
@@ -45,15 +45,15 @@ 
             || $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');
         }
         $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 = '';

Indentation +80 added lines, -80 removed lines

@@ -3,90 +3,90 @@
 class EE_Admin_One_Column_Layout extends EE_Form_Section_Layout_Base
 {
 
-    /**
-     * Starts the form section
-     *
-     * @param array $additional_args
-     * @return string
-     */
-    public function layout_form_begin($additional_args = array())
-    {
-        return EEH_HTML::table(
-            '',
-            $this->_form_section->html_id(),
-            $this->_form_section->html_class() . ' form-table',
-            $this->_form_section->html_style()
-        ) . EEH_HTML::tbody();
-    }
+	/**
+	 * Starts the form section
+	 *
+	 * @param array $additional_args
+	 * @return string
+	 */
+	public function layout_form_begin($additional_args = array())
+	{
+		return EEH_HTML::table(
+			'',
+			$this->_form_section->html_id(),
+			$this->_form_section->html_class() . ' form-table',
+			$this->_form_section->html_style()
+		) . EEH_HTML::tbody();
+	}
 
 
-    /**
-     * Ends the form section
-     *
-     * @param array $additional_args
-     * @return string
-     */
-    public function layout_form_end($additional_args = array())
-    {
-        return EEH_HTML::tbodyx() . EEH_HTML::tablex($this->_form_section->html_id());
-    }
+	/**
+	 * Ends the form section
+	 *
+	 * @param array $additional_args
+	 * @return string
+	 */
+	public function layout_form_end($additional_args = array())
+	{
+		return EEH_HTML::tbodyx() . EEH_HTML::tablex($this->_form_section->html_id());
+	}
 
 
-    /**
-     * 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');
-        }
-        $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::td(
-                    $input->get_html_for_label()
-                    . EEH_HTML::nl()
-                    . $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');
+		}
+		$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::td(
+					$input->get_html_for_label()
+					. EEH_HTML::nl()
+					. $input_html
+				)
+			);
+		}
+		return $html;
+	}
 
 
-    /**
-     * Lays out a row for the subsection
-     *
-     * @param EE_Form_Section_Proper $form_section
-     * @return string
-     */
-    public function layout_subsection($form_section)
-    {
-        if (
-            $form_section instanceof EE_Form_Section_Proper
-            || $form_section instanceof EE_Form_Section_HTML
-        ) {
-            return EEH_HTML::no_row($form_section->get_html());
-        }
-        return '';
-    }
+	/**
+	 * Lays out a row for the subsection
+	 *
+	 * @param EE_Form_Section_Proper $form_section
+	 * @return string
+	 */
+	public function layout_subsection($form_section)
+	{
+		if (
+			$form_section instanceof EE_Form_Section_Proper
+			|| $form_section instanceof EE_Form_Section_HTML
+		) {
+			return EEH_HTML::no_row($form_section->get_html());
+		}
+		return '';
+	}
 }