eventespresso / event-espresso-core

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

Indentation +45 added lines, -45 removed lines

@@ -13,58 +13,58 @@
  */
 class EE_Text_Input_Display_Strategy extends EE_Display_Strategy_Base
 {
-    /**
-     * The html "type" attribute value. default is "text"
-     * @var string
-     */
-    protected $_type;
+	/**
+	 * The html "type" attribute value. default is "text"
+	 * @var string
+	 */
+	protected $_type;
 
 
 
-    /**
-     * @param string $type
-     */
-    public function __construct($type = 'text')
-    {
-        $this->_type = $type;
-        parent::__construct();
-    }
+	/**
+	 * @param string $type
+	 */
+	public function __construct($type = 'text')
+	{
+		$this->_type = $type;
+		parent::__construct();
+	}
 
 
 
-    /**
-     * Gets the html "type" attribute's value
-     * @return string
-     */
-    public function get_type()
-    {
-        if ($this->_type === 'email'
-            && ! apply_filters('FHEE__EE_Text_Input_Display_Strategy__use_html5_email', false)
-        ) {
-            return 'text';
-        }
-        return $this->_type;
-    }
+	/**
+	 * Gets the html "type" attribute's value
+	 * @return string
+	 */
+	public function get_type()
+	{
+		if ($this->_type === 'email'
+			&& ! apply_filters('FHEE__EE_Text_Input_Display_Strategy__use_html5_email', false)
+		) {
+			return 'text';
+		}
+		return $this->_type;
+	}
 
 
 
-    /**
-     *
-     * @return string of html to display the field
-     */
-    public function display()
-    {
-        $input = '<input type="'. $this->get_type() .'"';
-        $input .= ' name="' . $this->_input->html_name() . '"';
-        $input .= ' id="' . $this->_input->html_id() . '"';
-        $class = $this->_input->required() ? $this->_input->required_css_class() . ' ' . $this->_input->html_class() : $this->_input->html_class();
-        $input .= ' class="' . $class . '"';
-        // add html5 required
-        $input .= $this->_input->required() ? ' required' : '';
-        $input .= ' value="' . $this->_input->raw_value_in_form() . '"';
-        $input .= ' style="' . $this->_input->html_style() . '"';
-        $input .= $this->_input->other_html_attributes();
-        $input .= '/>';
-        return $input;
-    }
+	/**
+	 *
+	 * @return string of html to display the field
+	 */
+	public function display()
+	{
+		$input = '<input type="'. $this->get_type() .'"';
+		$input .= ' name="' . $this->_input->html_name() . '"';
+		$input .= ' id="' . $this->_input->html_id() . '"';
+		$class = $this->_input->required() ? $this->_input->required_css_class() . ' ' . $this->_input->html_class() : $this->_input->html_class();
+		$input .= ' class="' . $class . '"';
+		// add html5 required
+		$input .= $this->_input->required() ? ' required' : '';
+		$input .= ' value="' . $this->_input->raw_value_in_form() . '"';
+		$input .= ' style="' . $this->_input->html_style() . '"';
+		$input .= $this->_input->other_html_attributes();
+		$input .= '/>';
+		return $input;
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -54,15 +54,15 @@
      */
     public function display()
     {
-        $input = '<input type="'. $this->get_type() .'"';
-        $input .= ' name="' . $this->_input->html_name() . '"';
-        $input .= ' id="' . $this->_input->html_id() . '"';
-        $class = $this->_input->required() ? $this->_input->required_css_class() . ' ' . $this->_input->html_class() : $this->_input->html_class();
-        $input .= ' class="' . $class . '"';
+        $input = '<input type="'.$this->get_type().'"';
+        $input .= ' name="'.$this->_input->html_name().'"';
+        $input .= ' id="'.$this->_input->html_id().'"';
+        $class = $this->_input->required() ? $this->_input->required_css_class().' '.$this->_input->html_class() : $this->_input->html_class();
+        $input .= ' class="'.$class.'"';
         // add html5 required
         $input .= $this->_input->required() ? ' required' : '';
-        $input .= ' value="' . $this->_input->raw_value_in_form() . '"';
-        $input .= ' style="' . $this->_input->html_style() . '"';
+        $input .= ' value="'.$this->_input->raw_value_in_form().'"';
+        $input .= ' style="'.$this->_input->html_style().'"';
         $input .= $this->_input->other_html_attributes();
         $input .= '/>';
         return $input;

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

Indentation +61 added lines, -61 removed lines

@@ -11,73 +11,73 @@
 class EE_Admin_File_Uploader_Display_Strategy extends EE_Display_Strategy_Base
 {
 
-    /**
-     * Its important this media only get enqueued AFTER init, but before the footer... where the
-     * rest of our forms JS gets enqueued. Otherwise the JS gets enqueued fine, and loaded on the page fine,
-     * but when you upload an image it gets uploaded fine to the server, but it doesn't display and reports an error
-     * (also it doesn't show any of the currently existing media in the modal window that pops up when you click the button
-     * to select media).
-     * Besides that, no special consideration should be required to make the media uploader appear, besides having
-     * this input displayed.
-     * @deprecated. enqueue_js should be called automatically now
-     */
-    public static function enqueue_scripts()
-    {
-        EE_Error::doing_it_wrong(__FUNCTION__, __('EE_Admin_File_Uploader_Display_Strategy::enqueue_scripts() no longer needs to be called in order to display the admin uploader input correctly. This is handled now by EE_Admin_File_Uploader_Display_Strategy::enqueue_js() which is called automatically when enqueueing JS and CSS for the form', 'event_espresso'), '4.9.8.rc.015');
-        wp_enqueue_media();
-        wp_enqueue_script('media-upload');
-        wp_enqueue_script('ee-payments', EE_GLOBAL_ASSETS_URL.'scripts/ee-media-uploader.js');
-    }
+	/**
+	 * Its important this media only get enqueued AFTER init, but before the footer... where the
+	 * rest of our forms JS gets enqueued. Otherwise the JS gets enqueued fine, and loaded on the page fine,
+	 * but when you upload an image it gets uploaded fine to the server, but it doesn't display and reports an error
+	 * (also it doesn't show any of the currently existing media in the modal window that pops up when you click the button
+	 * to select media).
+	 * Besides that, no special consideration should be required to make the media uploader appear, besides having
+	 * this input displayed.
+	 * @deprecated. enqueue_js should be called automatically now
+	 */
+	public static function enqueue_scripts()
+	{
+		EE_Error::doing_it_wrong(__FUNCTION__, __('EE_Admin_File_Uploader_Display_Strategy::enqueue_scripts() no longer needs to be called in order to display the admin uploader input correctly. This is handled now by EE_Admin_File_Uploader_Display_Strategy::enqueue_js() which is called automatically when enqueueing JS and CSS for the form', 'event_espresso'), '4.9.8.rc.015');
+		wp_enqueue_media();
+		wp_enqueue_script('media-upload');
+		wp_enqueue_script('ee-payments', EE_GLOBAL_ASSETS_URL.'scripts/ee-media-uploader.js');
+	}
     
-    /**
-     * Enqueues the JS and CSS needed to display this input
-     */
-    public function enqueue_js()
-    {
-        wp_enqueue_media();
-        wp_enqueue_script('media-upload');
-        wp_enqueue_script('ee-payments', EE_GLOBAL_ASSETS_URL.'scripts/ee-media-uploader.js');
-        parent::enqueue_js();
-    }
+	/**
+	 * Enqueues the JS and CSS needed to display this input
+	 */
+	public function enqueue_js()
+	{
+		wp_enqueue_media();
+		wp_enqueue_script('media-upload');
+		wp_enqueue_script('ee-payments', EE_GLOBAL_ASSETS_URL.'scripts/ee-media-uploader.js');
+		parent::enqueue_js();
+	}
 
 
 
-    /**
-     *
-     * @return string of html to display the field
-     */
+	/**
+	 *
+	 * @return string of html to display the field
+	 */
 
-    public function display()
-    {
-        // the actual input
-        $input = '<input type="text" size="34" ';
-        $input .= 'name="' . $this->_input->html_name() . '" ';
-        $input .= $this->_input->html_class() != '' ? 'class="large-text ee_media_url ' . $this->_input->html_class() . '" ' : 'class="large-text ee_media_url" ';
-        $input .= 'value="' . $this->_input->raw_value_in_form() . '" ';
-        $input .= $this->_input->other_html_attributes() . '>';
-        // image uploader
-        $uploader = EEH_HTML::link('#', '<img src="' . admin_url('images/media-button-image.gif') . '" >', __('click to add an image', 'event_espresso'), '', 'ee_media_upload');
-        // only attempt to show the image if it at least exists
-        $image = $this->src_exists($this->_input->raw_value()) ? EEH_HTML::br(2) . EEH_HTML::img($this->_input->raw_value(), __('logo', 'event_espresso'), '', 'ee_media_image') : '';
-        // html string
-        return EEH_HTML::div($input . EEH_HTML::nbsp() . $uploader . $image, '', 'ee_media_uploader_area');
-    }
+	public function display()
+	{
+		// the actual input
+		$input = '<input type="text" size="34" ';
+		$input .= 'name="' . $this->_input->html_name() . '" ';
+		$input .= $this->_input->html_class() != '' ? 'class="large-text ee_media_url ' . $this->_input->html_class() . '" ' : 'class="large-text ee_media_url" ';
+		$input .= 'value="' . $this->_input->raw_value_in_form() . '" ';
+		$input .= $this->_input->other_html_attributes() . '>';
+		// image uploader
+		$uploader = EEH_HTML::link('#', '<img src="' . admin_url('images/media-button-image.gif') . '" >', __('click to add an image', 'event_espresso'), '', 'ee_media_upload');
+		// only attempt to show the image if it at least exists
+		$image = $this->src_exists($this->_input->raw_value()) ? EEH_HTML::br(2) . EEH_HTML::img($this->_input->raw_value(), __('logo', 'event_espresso'), '', 'ee_media_image') : '';
+		// html string
+		return EEH_HTML::div($input . EEH_HTML::nbsp() . $uploader . $image, '', 'ee_media_uploader_area');
+	}
 
 
 
-    /**
-     * Asserts an image actually exists as quickly as possible by sending a HEAD
-     * request
-     * @param string $src
-     * @return boolean
-     */
-    protected function src_exists($src)
-    {
-        $results = wp_remote_head($src);
-        if (is_array($results) && ! $results instanceof WP_Error) {
-            return strpos($results['headers']['content-type'], "image") !== false;
-        } else {
-            return false;
-        }
-    }
+	/**
+	 * Asserts an image actually exists as quickly as possible by sending a HEAD
+	 * request
+	 * @param string $src
+	 * @return boolean
+	 */
+	protected function src_exists($src)
+	{
+		$results = wp_remote_head($src);
+		if (is_array($results) && ! $results instanceof WP_Error) {
+			return strpos($results['headers']['content-type'], "image") !== false;
+		} else {
+			return false;
+		}
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -51,16 +51,16 @@
     {
         // the actual input
         $input = '<input type="text" size="34" ';
-        $input .= 'name="' . $this->_input->html_name() . '" ';
-        $input .= $this->_input->html_class() != '' ? 'class="large-text ee_media_url ' . $this->_input->html_class() . '" ' : 'class="large-text ee_media_url" ';
-        $input .= 'value="' . $this->_input->raw_value_in_form() . '" ';
-        $input .= $this->_input->other_html_attributes() . '>';
+        $input .= 'name="'.$this->_input->html_name().'" ';
+        $input .= $this->_input->html_class() != '' ? 'class="large-text ee_media_url '.$this->_input->html_class().'" ' : 'class="large-text ee_media_url" ';
+        $input .= 'value="'.$this->_input->raw_value_in_form().'" ';
+        $input .= $this->_input->other_html_attributes().'>';
         // image uploader
-        $uploader = EEH_HTML::link('#', '<img src="' . admin_url('images/media-button-image.gif') . '" >', __('click to add an image', 'event_espresso'), '', 'ee_media_upload');
+        $uploader = EEH_HTML::link('#', '<img src="'.admin_url('images/media-button-image.gif').'" >', __('click to add an image', 'event_espresso'), '', 'ee_media_upload');
         // only attempt to show the image if it at least exists
-        $image = $this->src_exists($this->_input->raw_value()) ? EEH_HTML::br(2) . EEH_HTML::img($this->_input->raw_value(), __('logo', 'event_espresso'), '', 'ee_media_image') : '';
+        $image = $this->src_exists($this->_input->raw_value()) ? EEH_HTML::br(2).EEH_HTML::img($this->_input->raw_value(), __('logo', 'event_espresso'), '', 'ee_media_image') : '';
         // html string
-        return EEH_HTML::div($input . EEH_HTML::nbsp() . $uploader . $image, '', 'ee_media_uploader_area');
+        return EEH_HTML::div($input.EEH_HTML::nbsp().$uploader.$image, '', 'ee_media_uploader_area');
     }
 
 

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

Indentation +226 added lines, -226 removed lines

@@ -11,236 +11,236 @@
 {
 
 
-    /**
-     * @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}" : '';
+	}
 }

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

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

Indentation +38 added lines, -38 removed lines

@@ -4,42 +4,42 @@
 
 
 
-    /**
-    *
-    * @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(
-                    __('%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(
+					__('%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;
+	}
 }

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) {

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

Indentation +20 added lines, -20 removed lines

@@ -14,27 +14,27 @@ 
 class EE_Invisible_Recaptcha_Display_Strategy extends EE_Display_Strategy_Base
 {
 
-    /**
-     * @return EE_Form_Input_Base|EE_Invisible_Recaptcha_Input
-     */
-    public function input()
-    {
-        return $this->_input;
-    }
+	/**
+	 * @return EE_Form_Input_Base|EE_Invisible_Recaptcha_Input
+	 */
+	public function input()
+	{
+		return $this->_input;
+	}
 
 
-    /**
-     * returns HTML and javascript related to the displaying of this input
-     *
-     * @return string
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     * @throws InvalidArgumentException
-     */
-    public function display()
-    {
-        wp_enqueue_script(EE_Invisible_Recaptcha_Input::SCRIPT_HANDLE_GOOGLE_INVISIBLE_RECAPTCHA);
-        return <<<EOD
+	/**
+	 * returns HTML and javascript related to the displaying of this input
+	 *
+	 * @return string
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidArgumentException
+	 */
+	public function display()
+	{
+		wp_enqueue_script(EE_Invisible_Recaptcha_Input::SCRIPT_HANDLE_GOOGLE_INVISIBLE_RECAPTCHA);
+		return <<<EOD
     <div id="g-recaptcha-{$this->input()->recaptchaId()}"
         class="g-recaptcha"
         data-sitekey="{$this->input()->siteKey()}"
@@ -45,5 +45,5 @@ 
         >
     </div>
 EOD;
-    }
+	}
 }

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

Indentation +47 added lines, -47 removed lines

@@ -16,57 +16,57 @@
 abstract class EE_Compound_Input_Display_Strategy extends EE_Display_Strategy_Base
 {
 
-    /**
-     * Gets the html ID for the sub-input for the specified option html value (not display text)
-     *
-     * @param string $option_value
-     * @param bool   $add_pound_sign
-     * @return string
-     */
-    public function get_sub_input_id($option_value, $add_pound_sign = false)
-    {
-        return $this->_append_chars($this->_input->html_id($add_pound_sign), '-') . sanitize_key($option_value);
-    }
+	/**
+	 * Gets the html ID for the sub-input for the specified option html value (not display text)
+	 *
+	 * @param string $option_value
+	 * @param bool   $add_pound_sign
+	 * @return string
+	 */
+	public function get_sub_input_id($option_value, $add_pound_sign = false)
+	{
+		return $this->_append_chars($this->_input->html_id($add_pound_sign), '-') . sanitize_key($option_value);
+	}
 
 
 
-    /**
-     * Gets the HTML IDs of all the inputs
-     *
-     * @param boolean $add_pound_sign
-     * @return array
-     * @throws \EE_Error
-     */
-    public function get_html_input_ids($add_pound_sign = false)
-    {
-        $html_input_ids = array();
-        foreach ($this->get_input()->options() as $value => $display) {
-            $html_input_ids[] = $this->get_sub_input_id($value, $add_pound_sign);
-        }
-        return $html_input_ids;
-    }
+	/**
+	 * Gets the HTML IDs of all the inputs
+	 *
+	 * @param boolean $add_pound_sign
+	 * @return array
+	 * @throws \EE_Error
+	 */
+	public function get_html_input_ids($add_pound_sign = false)
+	{
+		$html_input_ids = array();
+		foreach ($this->get_input()->options() as $value => $display) {
+			$html_input_ids[] = $this->get_sub_input_id($value, $add_pound_sign);
+		}
+		return $html_input_ids;
+	}
 
 
 
-    /**
-     * Overrides parent to make sure this display strategy is only used with the
-     * appropriate input type
-     *
-     * @return \EE_Form_Input_With_Options_Base
-     * @throws \EE_Error
-     */
-    public function get_input()
-    {
-        if (! $this->_input instanceof EE_Form_Input_With_Options_Base) {
-            throw new EE_Error(
-                sprintf(
-                    __(
-                        'Can not use a Compound Input Display Strategy (eg checkbox or radio) with an input that doesn\'t have options',
-                        'event_espresso'
-                    )
-                )
-            );
-        }
-        return parent::get_input();
-    }
+	/**
+	 * Overrides parent to make sure this display strategy is only used with the
+	 * appropriate input type
+	 *
+	 * @return \EE_Form_Input_With_Options_Base
+	 * @throws \EE_Error
+	 */
+	public function get_input()
+	{
+		if (! $this->_input instanceof EE_Form_Input_With_Options_Base) {
+			throw new EE_Error(
+				sprintf(
+					__(
+						'Can not use a Compound Input Display Strategy (eg checkbox or radio) with an input that doesn\'t have options',
+						'event_espresso'
+					)
+				)
+			);
+		}
+		return parent::get_input();
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
      */
     public function get_sub_input_id($option_value, $add_pound_sign = false)
     {
-        return $this->_append_chars($this->_input->html_id($add_pound_sign), '-') . sanitize_key($option_value);
+        return $this->_append_chars($this->_input->html_id($add_pound_sign), '-').sanitize_key($option_value);
     }
 
 
@@ -57,7 +57,7 @@ 
      */
     public function get_input()
     {
-        if (! $this->_input instanceof EE_Form_Input_With_Options_Base) {
+        if ( ! $this->_input instanceof EE_Form_Input_With_Options_Base) {
             throw new EE_Error(
                 sprintf(
                     __(

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

Indentation +70 added lines, -70 removed lines

@@ -10,84 +10,84 @@
 class EE_Float_Normalization extends EE_Normalization_Strategy_Base
 {
 
-    /*
+	/*
      * regex pattern that matches for the following:
      *      * optional negative sign
      *      * one or more digits or decimals
      */
-    const REGEX = '/^(-?)([\d.]+)$/';
+	const REGEX = '/^(-?)([\d.]+)$/';
 
 
 
-    /**
-     * @param string $value_to_normalize
-     * @return float
-     * @throws \EE_Validation_Error
-     */
-    public function normalize($value_to_normalize)
-    {
-        if ($value_to_normalize === null) {
-            return null;
-        }
-        if (is_float($value_to_normalize) || is_int($value_to_normalize)) {
-            return (float) $value_to_normalize;
-        }
-        if (! is_string($value_to_normalize)) {
-            throw new EE_Validation_Error(
-                sprintf(
-                    __('The value "%s" must be a string submitted for normalization, it was %s', 'event_espresso'),
-                    print_r($value_to_normalize, true),
-                    gettype($value_to_normalize)
-                )
-            );
-        }
-        $normalized_value = filter_var(
-            $value_to_normalize,
-            FILTER_SANITIZE_NUMBER_FLOAT,
-            FILTER_FLAG_ALLOW_FRACTION
-        );
-        if ($normalized_value === '') {
-            return null;
-        }
-        if (preg_match(EE_Float_Normalization::REGEX, $normalized_value, $matches)) {
-            if (count($matches) === 3) {
-                // if first match is the negative sign,
-                // then the number needs to be multiplied by -1 to remain negative
-                return $matches[1] === '-'
-                    ? (float) $matches[2] * -1
-                    : (float) $matches[2];
-            }
-        }
-        // find if this input has a float validation strategy
-        // in which case, use its message
-        $validation_error_message = null;
-        foreach ($this->_input->get_validation_strategies() as $validation_strategy) {
-            if ($validation_strategy instanceof EE_Float_Validation_Strategy) {
-                $validation_error_message = $validation_strategy->get_validation_error_message();
-            }
-        }
-        // this really shouldn't ever happen because fields with a float normalization strategy
-        // should also have a float validation strategy, but in case it doesn't use the default
-        if (! $validation_error_message) {
-            $default_validation_strategy = new EE_Float_Validation_Strategy();
-            $validation_error_message = $default_validation_strategy->get_validation_error_message();
-        }
-        throw new EE_Validation_Error($validation_error_message, 'float_only');
-    }
+	/**
+	 * @param string $value_to_normalize
+	 * @return float
+	 * @throws \EE_Validation_Error
+	 */
+	public function normalize($value_to_normalize)
+	{
+		if ($value_to_normalize === null) {
+			return null;
+		}
+		if (is_float($value_to_normalize) || is_int($value_to_normalize)) {
+			return (float) $value_to_normalize;
+		}
+		if (! is_string($value_to_normalize)) {
+			throw new EE_Validation_Error(
+				sprintf(
+					__('The value "%s" must be a string submitted for normalization, it was %s', 'event_espresso'),
+					print_r($value_to_normalize, true),
+					gettype($value_to_normalize)
+				)
+			);
+		}
+		$normalized_value = filter_var(
+			$value_to_normalize,
+			FILTER_SANITIZE_NUMBER_FLOAT,
+			FILTER_FLAG_ALLOW_FRACTION
+		);
+		if ($normalized_value === '') {
+			return null;
+		}
+		if (preg_match(EE_Float_Normalization::REGEX, $normalized_value, $matches)) {
+			if (count($matches) === 3) {
+				// if first match is the negative sign,
+				// then the number needs to be multiplied by -1 to remain negative
+				return $matches[1] === '-'
+					? (float) $matches[2] * -1
+					: (float) $matches[2];
+			}
+		}
+		// find if this input has a float validation strategy
+		// in which case, use its message
+		$validation_error_message = null;
+		foreach ($this->_input->get_validation_strategies() as $validation_strategy) {
+			if ($validation_strategy instanceof EE_Float_Validation_Strategy) {
+				$validation_error_message = $validation_strategy->get_validation_error_message();
+			}
+		}
+		// this really shouldn't ever happen because fields with a float normalization strategy
+		// should also have a float validation strategy, but in case it doesn't use the default
+		if (! $validation_error_message) {
+			$default_validation_strategy = new EE_Float_Validation_Strategy();
+			$validation_error_message = $default_validation_strategy->get_validation_error_message();
+		}
+		throw new EE_Validation_Error($validation_error_message, 'float_only');
+	}
 
 
 
-    /**
-     * Converts a float into a string
-     *
-     * @param float $normalized_value
-     * @return string
-     */
-    public function unnormalize($normalized_value)
-    {
-        if (empty($normalized_value)) {
-            return '0.00';
-        }
-        return "{$normalized_value}";
-    }
+	/**
+	 * Converts a float into a string
+	 *
+	 * @param float $normalized_value
+	 * @return string
+	 */
+	public function unnormalize($normalized_value)
+	{
+		if (empty($normalized_value)) {
+			return '0.00';
+		}
+		return "{$normalized_value}";
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -32,7 +32,7 @@ 
         if (is_float($value_to_normalize) || is_int($value_to_normalize)) {
             return (float) $value_to_normalize;
         }
-        if (! is_string($value_to_normalize)) {
+        if ( ! is_string($value_to_normalize)) {
             throw new EE_Validation_Error(
                 sprintf(
                     __('The value "%s" must be a string submitted for normalization, it was %s', 'event_espresso'),
@@ -68,7 +68,7 @@ 
         }
         // this really shouldn't ever happen because fields with a float normalization strategy
         // should also have a float validation strategy, but in case it doesn't use the default
-        if (! $validation_error_message) {
+        if ( ! $validation_error_message) {
             $default_validation_strategy = new EE_Float_Validation_Strategy();
             $validation_error_message = $default_validation_strategy->get_validation_error_message();
         }

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

Indentation +74 added lines, -74 removed lines

@@ -10,88 +10,88 @@
 class EE_Int_Normalization extends EE_Normalization_Strategy_Base
 {
 
-    /*
+	/*
      * regex pattern that matches for the following:
      *      * optional negative sign
      *      * one or more digits
      */
-    const REGEX = '/^(-?)(\d+)(?:\.0+)?$/';
+	const REGEX = '/^(-?)(\d+)(?:\.0+)?$/';
 
 
 
-    /**
-     * @param string $value_to_normalize
-     * @return int|mixed|string
-     * @throws \EE_Validation_Error
-     */
-    public function normalize($value_to_normalize)
-    {
-        if ($value_to_normalize === null) {
-            return null;
-        }
-        if (is_int($value_to_normalize) || is_float($value_to_normalize)) {
-            return (int) $value_to_normalize;
-        }
-        if (! is_string($value_to_normalize)) {
-            throw new EE_Validation_Error(
-                sprintf(
-                    __('The value "%s" must be a string submitted for normalization, it was %s', 'event_espresso'),
-                    print_r($value_to_normalize, true),
-                    gettype($value_to_normalize)
-                )
-            );
-        }
-        $value_to_normalize = filter_var(
-            $value_to_normalize,
-            FILTER_SANITIZE_NUMBER_FLOAT,
-            FILTER_FLAG_ALLOW_FRACTION
-        );
-        if ($value_to_normalize === '') {
-            return null;
-        }
-        $matches = array();
-        if (preg_match(EE_Int_Normalization::REGEX, $value_to_normalize, $matches)) {
-            if (count($matches) === 3) {
-                // if first match is the negative sign,
-                // then the number needs to be multiplied by -1 to remain negative
-                return $matches[1] === '-'
-                    ? (int) $matches[2] * -1
-                    : (int) $matches[2];
-            }
-        }
-        // find if this input has a int validation strategy
-        // in which case, use its message
-        $validation_error_message = null;
-        foreach ($this->_input->get_validation_strategies() as $validation_strategy) {
-            if ($validation_strategy instanceof EE_Int_Validation_Strategy) {
-                $validation_error_message = $validation_strategy->get_validation_error_message();
-            }
-        }
-        // this really shouldn't ever happen because fields with a int normalization strategy
-        // should also have a int validation strategy, but in case it doesn't use the default
-        if (! $validation_error_message) {
-            $default_validation_strategy = new EE_Int_Validation_Strategy();
-            $validation_error_message = $default_validation_strategy->get_validation_error_message();
-        }
-        throw new EE_Validation_Error($validation_error_message, 'numeric_only');
-    }
+	/**
+	 * @param string $value_to_normalize
+	 * @return int|mixed|string
+	 * @throws \EE_Validation_Error
+	 */
+	public function normalize($value_to_normalize)
+	{
+		if ($value_to_normalize === null) {
+			return null;
+		}
+		if (is_int($value_to_normalize) || is_float($value_to_normalize)) {
+			return (int) $value_to_normalize;
+		}
+		if (! is_string($value_to_normalize)) {
+			throw new EE_Validation_Error(
+				sprintf(
+					__('The value "%s" must be a string submitted for normalization, it was %s', 'event_espresso'),
+					print_r($value_to_normalize, true),
+					gettype($value_to_normalize)
+				)
+			);
+		}
+		$value_to_normalize = filter_var(
+			$value_to_normalize,
+			FILTER_SANITIZE_NUMBER_FLOAT,
+			FILTER_FLAG_ALLOW_FRACTION
+		);
+		if ($value_to_normalize === '') {
+			return null;
+		}
+		$matches = array();
+		if (preg_match(EE_Int_Normalization::REGEX, $value_to_normalize, $matches)) {
+			if (count($matches) === 3) {
+				// if first match is the negative sign,
+				// then the number needs to be multiplied by -1 to remain negative
+				return $matches[1] === '-'
+					? (int) $matches[2] * -1
+					: (int) $matches[2];
+			}
+		}
+		// find if this input has a int validation strategy
+		// in which case, use its message
+		$validation_error_message = null;
+		foreach ($this->_input->get_validation_strategies() as $validation_strategy) {
+			if ($validation_strategy instanceof EE_Int_Validation_Strategy) {
+				$validation_error_message = $validation_strategy->get_validation_error_message();
+			}
+		}
+		// this really shouldn't ever happen because fields with a int normalization strategy
+		// should also have a int validation strategy, but in case it doesn't use the default
+		if (! $validation_error_message) {
+			$default_validation_strategy = new EE_Int_Validation_Strategy();
+			$validation_error_message = $default_validation_strategy->get_validation_error_message();
+		}
+		throw new EE_Validation_Error($validation_error_message, 'numeric_only');
+	}
 
 
 
-    /**
-     * Converts the int into a string for use in teh html form
-     *
-     * @param int $normalized_value
-     * @return string
-     */
-    public function unnormalize($normalized_value)
-    {
-        if ($normalized_value === null || $normalized_value === '') {
-            return '';
-        }
-        if (empty($normalized_value)) {
-            return '0';
-        }
-        return "$normalized_value";
-    }
+	/**
+	 * Converts the int into a string for use in teh html form
+	 *
+	 * @param int $normalized_value
+	 * @return string
+	 */
+	public function unnormalize($normalized_value)
+	{
+		if ($normalized_value === null || $normalized_value === '') {
+			return '';
+		}
+		if (empty($normalized_value)) {
+			return '0';
+		}
+		return "$normalized_value";
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -32,7 +32,7 @@ 
         if (is_int($value_to_normalize) || is_float($value_to_normalize)) {
             return (int) $value_to_normalize;
         }
-        if (! is_string($value_to_normalize)) {
+        if ( ! is_string($value_to_normalize)) {
             throw new EE_Validation_Error(
                 sprintf(
                     __('The value "%s" must be a string submitted for normalization, it was %s', 'event_espresso'),
@@ -69,7 +69,7 @@ 
         }
         // this really shouldn't ever happen because fields with a int normalization strategy
         // should also have a int validation strategy, but in case it doesn't use the default
-        if (! $validation_error_message) {
+        if ( ! $validation_error_message) {
             $default_validation_strategy = new EE_Int_Validation_Strategy();
             $validation_error_message = $default_validation_strategy->get_validation_error_message();
         }

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

Indentation +18 added lines, -18 removed lines

@@ -10,25 +10,25 @@
 class EE_Null_Normalization extends EE_Normalization_Strategy_Base
 {
 
-    /**
-     * @param string $value_to_normalize
-     * @return null
-     */
-    public function normalize($value_to_normalize)
-    {
-        return null;
-    }
+	/**
+	 * @param string $value_to_normalize
+	 * @return null
+	 */
+	public function normalize($value_to_normalize)
+	{
+		return null;
+	}
 
 
 
-    /**
-     * In the form input we need some string, so use a blank one.
-     *
-     * @param string $normalized_value
-     * @return string
-     */
-    public function unnormalize($normalized_value)
-    {
-        return '';
-    }
+	/**
+	 * In the form input we need some string, so use a blank one.
+	 *
+	 * @param string $normalized_value
+	 * @return string
+	 */
+	public function unnormalize($normalized_value)
+	{
+		return '';
+	}
 }