eventespresso / event-espresso-core

core/libraries/form_sections/base/EE_Form_Section_Base.form.php

Indentation +446 added lines, -446 removed lines

@@ -2,7 +2,7 @@ 
 use EventEspresso\core\libraries\form_sections\strategies\filter\FormHtmlFilter;
 
 if (! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 
@@ -19,462 +19,462 @@ 
 abstract class EE_Form_Section_Base
 {
 
-    /**
-     * the URL the form is submitted to
-     *
-     * @var string
-     */
-    protected $_action;
-
-    /**
-     * POST (default) or GET
-     *
-     * @var string
-     */
-    protected $_method;
-
-    /**
-     * html_id and html_name are derived from this by default
-     *
-     * @var string
-     */
-    protected $_name;
-
-    /**
-     * $_html_id
-     * @var string
-     */
-    protected $_html_id;
-
-    /**
-     * $_html_class
-     * @var string
-     */
-    protected $_html_class;
-
-    /**
-     * $_html_style
-     * @var string
-     */
-    protected $_html_style;
-
-    /**
-     * $_other_html_attributes
-     * @var string
-     */
-    protected $_other_html_attributes;
-
-    /**
-     * The form section of which this form section is a part
-     *
-     * @var EE_Form_Section_Proper
-     */
-    protected $_parent_section;
-
-    /**
-     * flag indicating that _construct_finalize has been called.
-     * If it hasn't been called and we try to use functions which require it, we call it
-     * with no parameters. But normally, _construct_finalize should be called by the instantiating class
-     *
-     * @var boolean
-     */
-    protected $_construction_finalized;
-
-    /**
-     * Strategy for parsing the form HTML upon display
-     *
-     * @var FormHtmlFilter
-     */
-    protected $_form_html_filter;
-
-
-
-    /**
-     * @param array $options_array {
-     * @type        $name          string the name for this form section, if you want to explicitly define it
-     *                             }
-     */
-    public function __construct($options_array = array())
-    {
-        // used by display strategies
-        // assign incoming values to properties
-        foreach ($options_array as $key => $value) {
-            $key = '_' . $key;
-            if (property_exists($this, $key) && empty($this->{$key})) {
-                $this->{$key} = $value;
-            }
-        }
-        // set parser which allows the form section's rendered HTML to be filtered
-        if (isset($options_array['form_html_filter']) && $options_array['form_html_filter'] instanceof FormHtmlFilter) {
-            $this->_form_html_filter = $options_array['form_html_filter'];
-        }
-    }
-
-
-
-    /**
-     * @param $parent_form_section
-     * @param $name
-     * @throws \EE_Error
-     */
-    protected function _construct_finalize($parent_form_section, $name)
-    {
-        $this->_construction_finalized = true;
-        $this->_parent_section = $parent_form_section;
-        if ($name !== null) {
-            $this->_name = $name;
-        }
-    }
-
-
-
-    /**
-     * make sure construction finalized was called, otherwise children might not be ready
-     *
-     * @return void
-     * @throws \EE_Error
-     */
-    public function ensure_construct_finalized_called()
-    {
-        if (! $this->_construction_finalized) {
-            $this->_construct_finalize($this->_parent_section, $this->_name);
-        }
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function action()
-    {
-        return $this->_action;
-    }
-
-
-
-    /**
-     * @param string $action
-     */
-    public function set_action($action)
-    {
-        $this->_action = $action;
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function method()
-    {
-        return ! empty($this->_method) ? $this->_method : 'POST';
-    }
-
-
-
-    /**
-     * @param string $method
-     */
-    public function set_method($method)
-    {
-        switch ($method) {
-            case 'get' :
-            case 'GET' :
-                $this->_method = 'GET';
-                break;
-            default :
-                $this->_method = 'POST';
-        }
-    }
-
-
-
-    /**
-     * Sets the html_id to its default value, if none was specified in the constructor.
-     * Calculation involves using the name and the parent's html id
-     * return void
-     *
-     * @throws \EE_Error
-     */
-    protected function _set_default_html_id_if_empty()
-    {
-        if (! $this->_html_id) {
-            if ($this->_parent_section && $this->_parent_section instanceof EE_Form_Section_Proper) {
-                $this->_html_id = $this->_parent_section->html_id()
-                                  . '-'
-                                  . $this->_prep_name_for_html_id($this->name());
-            } else {
-                $this->_html_id = $this->_prep_name_for_html_id($this->name());
-            }
-        }
-    }
-
-
-
-    /**
-     * _prep_name_for_html_id
-     *
-     * @param $name
-     * @return string
-     */
-    private function _prep_name_for_html_id($name)
-    {
-        return sanitize_key(str_replace(array(' ', ' ', '_'), '-', $name));
-    }
+	/**
+	 * the URL the form is submitted to
+	 *
+	 * @var string
+	 */
+	protected $_action;
+
+	/**
+	 * POST (default) or GET
+	 *
+	 * @var string
+	 */
+	protected $_method;
+
+	/**
+	 * html_id and html_name are derived from this by default
+	 *
+	 * @var string
+	 */
+	protected $_name;
+
+	/**
+	 * $_html_id
+	 * @var string
+	 */
+	protected $_html_id;
+
+	/**
+	 * $_html_class
+	 * @var string
+	 */
+	protected $_html_class;
+
+	/**
+	 * $_html_style
+	 * @var string
+	 */
+	protected $_html_style;
+
+	/**
+	 * $_other_html_attributes
+	 * @var string
+	 */
+	protected $_other_html_attributes;
+
+	/**
+	 * The form section of which this form section is a part
+	 *
+	 * @var EE_Form_Section_Proper
+	 */
+	protected $_parent_section;
+
+	/**
+	 * flag indicating that _construct_finalize has been called.
+	 * If it hasn't been called and we try to use functions which require it, we call it
+	 * with no parameters. But normally, _construct_finalize should be called by the instantiating class
+	 *
+	 * @var boolean
+	 */
+	protected $_construction_finalized;
+
+	/**
+	 * Strategy for parsing the form HTML upon display
+	 *
+	 * @var FormHtmlFilter
+	 */
+	protected $_form_html_filter;
+
+
+
+	/**
+	 * @param array $options_array {
+	 * @type        $name          string the name for this form section, if you want to explicitly define it
+	 *                             }
+	 */
+	public function __construct($options_array = array())
+	{
+		// used by display strategies
+		// assign incoming values to properties
+		foreach ($options_array as $key => $value) {
+			$key = '_' . $key;
+			if (property_exists($this, $key) && empty($this->{$key})) {
+				$this->{$key} = $value;
+			}
+		}
+		// set parser which allows the form section's rendered HTML to be filtered
+		if (isset($options_array['form_html_filter']) && $options_array['form_html_filter'] instanceof FormHtmlFilter) {
+			$this->_form_html_filter = $options_array['form_html_filter'];
+		}
+	}
+
+
+
+	/**
+	 * @param $parent_form_section
+	 * @param $name
+	 * @throws \EE_Error
+	 */
+	protected function _construct_finalize($parent_form_section, $name)
+	{
+		$this->_construction_finalized = true;
+		$this->_parent_section = $parent_form_section;
+		if ($name !== null) {
+			$this->_name = $name;
+		}
+	}
+
+
+
+	/**
+	 * make sure construction finalized was called, otherwise children might not be ready
+	 *
+	 * @return void
+	 * @throws \EE_Error
+	 */
+	public function ensure_construct_finalized_called()
+	{
+		if (! $this->_construction_finalized) {
+			$this->_construct_finalize($this->_parent_section, $this->_name);
+		}
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function action()
+	{
+		return $this->_action;
+	}
+
+
+
+	/**
+	 * @param string $action
+	 */
+	public function set_action($action)
+	{
+		$this->_action = $action;
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function method()
+	{
+		return ! empty($this->_method) ? $this->_method : 'POST';
+	}
+
+
+
+	/**
+	 * @param string $method
+	 */
+	public function set_method($method)
+	{
+		switch ($method) {
+			case 'get' :
+			case 'GET' :
+				$this->_method = 'GET';
+				break;
+			default :
+				$this->_method = 'POST';
+		}
+	}
+
+
+
+	/**
+	 * Sets the html_id to its default value, if none was specified in the constructor.
+	 * Calculation involves using the name and the parent's html id
+	 * return void
+	 *
+	 * @throws \EE_Error
+	 */
+	protected function _set_default_html_id_if_empty()
+	{
+		if (! $this->_html_id) {
+			if ($this->_parent_section && $this->_parent_section instanceof EE_Form_Section_Proper) {
+				$this->_html_id = $this->_parent_section->html_id()
+								  . '-'
+								  . $this->_prep_name_for_html_id($this->name());
+			} else {
+				$this->_html_id = $this->_prep_name_for_html_id($this->name());
+			}
+		}
+	}
+
+
+
+	/**
+	 * _prep_name_for_html_id
+	 *
+	 * @param $name
+	 * @return string
+	 */
+	private function _prep_name_for_html_id($name)
+	{
+		return sanitize_key(str_replace(array(' ', ' ', '_'), '-', $name));
+	}
 
 
 
-    /**
-     * Returns the HTML, JS, and CSS necessary to display this form section on a page.
-     * Note however, it's recommended that you instead call enqueue_js on the "wp_enqueue_scripts" action,
-     * and call get_html when you want to output the html. Calling get_html_and_js after
-     * "wp_enqueue_scripts" has already fired seems to work for now, but is contrary
-     * to the instructions on https://developer.wordpress.org/reference/functions/wp_enqueue_script/
-     * and so might stop working anytime.
-     *
-     * @return string
-     */
-    public function get_html_and_js()
-    {
-        return $this->get_html();
-    }
+	/**
+	 * Returns the HTML, JS, and CSS necessary to display this form section on a page.
+	 * Note however, it's recommended that you instead call enqueue_js on the "wp_enqueue_scripts" action,
+	 * and call get_html when you want to output the html. Calling get_html_and_js after
+	 * "wp_enqueue_scripts" has already fired seems to work for now, but is contrary
+	 * to the instructions on https://developer.wordpress.org/reference/functions/wp_enqueue_script/
+	 * and so might stop working anytime.
+	 *
+	 * @return string
+	 */
+	public function get_html_and_js()
+	{
+		return $this->get_html();
+	}
 
 
 
-    /**
-     * Gets the HTML for displaying this form section
-     *
-     * @return string
-     */
-    public abstract function get_html();
+	/**
+	 * Gets the HTML for displaying this form section
+	 *
+	 * @return string
+	 */
+	public abstract function get_html();
 
 
 
-    /**
-     * @param bool $add_pound_sign
-     * @return string
-     */
-    public function html_id($add_pound_sign = false)
-    {
-        $this->_set_default_html_id_if_empty();
-        return $add_pound_sign ? '#' . $this->_html_id : $this->_html_id;
-    }
+	/**
+	 * @param bool $add_pound_sign
+	 * @return string
+	 */
+	public function html_id($add_pound_sign = false)
+	{
+		$this->_set_default_html_id_if_empty();
+		return $add_pound_sign ? '#' . $this->_html_id : $this->_html_id;
+	}
 
 
-
-    /**
-     * @return string
-     */
-    public function html_class()
-    {
-        return $this->_html_class;
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function html_style()
-    {
-        return $this->_html_style;
-    }
-
-
-
-    /**
-     * @param mixed $html_class
-     */
-    public function set_html_class($html_class)
-    {
-        $this->_html_class = $html_class;
-    }
-
-
-
-    /**
-     * @param mixed $html_id
-     */
-    public function set_html_id($html_id)
-    {
-        $this->_html_id = $html_id;
-    }
-
-
-
-    /**
-     * @param mixed $html_style
-     */
-    public function set_html_style($html_style)
-    {
-        $this->_html_style = $html_style;
-    }
-
-
-
-    /**
-     * @param string $other_html_attributes
-     */
-    public function set_other_html_attributes($other_html_attributes)
-    {
-        $this->_other_html_attributes = $other_html_attributes;
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function other_html_attributes()
-    {
-        return $this->_other_html_attributes;
-    }
-
-
-
-    /**
-     * Gets the name of the form section. This is not the same as the HTML name.
-     *
-     * @throws EE_Error
-     * @return string
-     */
-    public function name()
-    {
-        if (! $this->_construction_finalized) {
-            throw new EE_Error(sprintf(__('You cannot use the form section\s name until _construct_finalize has been called on it (when we set the name). It was called on a form section of type \'s\'',
-                'event_espresso'), get_class($this)));
-        }
-        return $this->_name;
-    }
-
-
-
-    /**
-     * Gets the parent section
-     *
-     * @return EE_Form_Section_Proper
-     */
-    public function parent_section()
-    {
-        return $this->_parent_section;
-    }
-
-
-
-    /**
-     * returns HTML for generating the opening form HTML tag (<form>)
-     *
-     * @param string $action           the URL the form is submitted to
-     * @param string $method           POST (default) or GET
-     * @param string $other_attributes anything else added to the form open tag, MUST BE VALID HTML
-     * @return string
-     */
-    public function form_open($action = '', $method = '', $other_attributes = '')
-    {
-        if (! empty($action)) {
-            $this->set_action($action);
-        }
-        if (! empty($method)) {
-            $this->set_method($method);
-        }
-        $html = EEH_HTML::nl(1, 'form') . '<form';
-        $html .= $this->html_id() !== '' ? ' id="' . $this->html_id() . '"' : '';
-        $html .= ' action="' . $this->action() . '"';
-        $html .= ' method="' . $this->method() . '"';
-        $html .= $other_attributes . '>';
-        return $html;
-    }
-
-
-
-    /**
-     * returns HTML for generating the closing form HTML tag (</form>)
-     *
-     * @return string
-     */
-    public function form_close()
-    {
-        return EEH_HTML::nl(-1, 'form')
-               . '</form>'
-               . EEH_HTML::nl()
-               . '<!-- end of ee-'
-               . $this->html_id()
-               . '-form -->'
-               . EEH_HTML::nl();
-    }
-
-
-
-    /**
-     * enqueues JS (and CSS) for the form (ie immediately call wp_enqueue_script and
-     * wp_enqueue_style; the scripts could have optionally been registered earlier)
-     * Default does nothing, but child classes can override
-     *
-     * @return void
-     */
-    public function enqueue_js()
-    {
-        //defaults to enqueue NO js or css
-    }
-
-
-
-    /**
-     * Adds any extra data needed by js. Eventually we'll call wp_localize_script
-     * with it, and it will be on each form section's 'other_data' property.
-     * By default nothing is added, but child classes can extend this method to add something.
-     * Eg, if you have an input that will cause a modal dialog to appear,
-     * here you could add an entry like 'modal_dialog_inputs' to this array
-     * to map between the input's html ID and the modal dialogue's ID, so that
-     * your JS code will know where to find the modal dialog when the input is pressed.
-     * Eg $form_other_js_data['modal_dialog_inputs']['some-input-id']='modal-dialog-id';
-     *
-     * @param array $form_other_js_data
-     * @return array
-     */
-    public function get_other_js_data($form_other_js_data = array())
-    {
-        return $form_other_js_data;
-    }
-
-
-
-    /**
-     * This isn't just the name of an input, it's a path pointing to an input. The
-     * path is similar to a folder path: slash (/) means to descend into a subsection,
-     * dot-dot-slash (../) means to ascend into the parent section.
-     * After a series of slashes and dot-dot-slashes, there should be the name of an input,
-     * which will be returned.
-     * Eg, if you want the related input to be conditional on a sibling input name 'foobar'
-     * just use 'foobar'. If you want it to be conditional on an aunt/uncle input name
-     * 'baz', use '../baz'. If you want it to be conditional on a cousin input,
-     * the child of 'baz_section' named 'baz_child', use '../baz_section/baz_child'.
-     * Etc
-     *
-     * @param string|false $form_section_path we accept false also because substr( '../', '../' ) = false
-     * @return EE_Form_Section_Base
-     */
-    public function find_section_from_path($form_section_path)
-    {
-        if (strpos($form_section_path, '/') === 0) {
-            $form_section_path = substr($form_section_path, strlen('/'));
-        }
-        if (empty($form_section_path)) {
-            return $this;
-        }
-        if (strpos($form_section_path, '../') === 0) {
-            $parent = $this->parent_section();
-            $form_section_path = substr($form_section_path, strlen('../'));
-            if ($parent instanceof EE_Form_Section_Base) {
-                return $parent->find_section_from_path($form_section_path);
-            } elseif (empty($form_section_path)) {
-                return $this;
-            }
-        }
-        //couldn't find it using simple parent following
-        return null;
-    }
+
+	/**
+	 * @return string
+	 */
+	public function html_class()
+	{
+		return $this->_html_class;
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function html_style()
+	{
+		return $this->_html_style;
+	}
+
+
+
+	/**
+	 * @param mixed $html_class
+	 */
+	public function set_html_class($html_class)
+	{
+		$this->_html_class = $html_class;
+	}
+
+
+
+	/**
+	 * @param mixed $html_id
+	 */
+	public function set_html_id($html_id)
+	{
+		$this->_html_id = $html_id;
+	}
+
+
+
+	/**
+	 * @param mixed $html_style
+	 */
+	public function set_html_style($html_style)
+	{
+		$this->_html_style = $html_style;
+	}
+
+
+
+	/**
+	 * @param string $other_html_attributes
+	 */
+	public function set_other_html_attributes($other_html_attributes)
+	{
+		$this->_other_html_attributes = $other_html_attributes;
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function other_html_attributes()
+	{
+		return $this->_other_html_attributes;
+	}
+
+
+
+	/**
+	 * Gets the name of the form section. This is not the same as the HTML name.
+	 *
+	 * @throws EE_Error
+	 * @return string
+	 */
+	public function name()
+	{
+		if (! $this->_construction_finalized) {
+			throw new EE_Error(sprintf(__('You cannot use the form section\s name until _construct_finalize has been called on it (when we set the name). It was called on a form section of type \'s\'',
+				'event_espresso'), get_class($this)));
+		}
+		return $this->_name;
+	}
+
+
+
+	/**
+	 * Gets the parent section
+	 *
+	 * @return EE_Form_Section_Proper
+	 */
+	public function parent_section()
+	{
+		return $this->_parent_section;
+	}
+
+
+
+	/**
+	 * returns HTML for generating the opening form HTML tag (<form>)
+	 *
+	 * @param string $action           the URL the form is submitted to
+	 * @param string $method           POST (default) or GET
+	 * @param string $other_attributes anything else added to the form open tag, MUST BE VALID HTML
+	 * @return string
+	 */
+	public function form_open($action = '', $method = '', $other_attributes = '')
+	{
+		if (! empty($action)) {
+			$this->set_action($action);
+		}
+		if (! empty($method)) {
+			$this->set_method($method);
+		}
+		$html = EEH_HTML::nl(1, 'form') . '<form';
+		$html .= $this->html_id() !== '' ? ' id="' . $this->html_id() . '"' : '';
+		$html .= ' action="' . $this->action() . '"';
+		$html .= ' method="' . $this->method() . '"';
+		$html .= $other_attributes . '>';
+		return $html;
+	}
+
+
+
+	/**
+	 * returns HTML for generating the closing form HTML tag (</form>)
+	 *
+	 * @return string
+	 */
+	public function form_close()
+	{
+		return EEH_HTML::nl(-1, 'form')
+			   . '</form>'
+			   . EEH_HTML::nl()
+			   . '<!-- end of ee-'
+			   . $this->html_id()
+			   . '-form -->'
+			   . EEH_HTML::nl();
+	}
+
+
+
+	/**
+	 * enqueues JS (and CSS) for the form (ie immediately call wp_enqueue_script and
+	 * wp_enqueue_style; the scripts could have optionally been registered earlier)
+	 * Default does nothing, but child classes can override
+	 *
+	 * @return void
+	 */
+	public function enqueue_js()
+	{
+		//defaults to enqueue NO js or css
+	}
+
+
+
+	/**
+	 * Adds any extra data needed by js. Eventually we'll call wp_localize_script
+	 * with it, and it will be on each form section's 'other_data' property.
+	 * By default nothing is added, but child classes can extend this method to add something.
+	 * Eg, if you have an input that will cause a modal dialog to appear,
+	 * here you could add an entry like 'modal_dialog_inputs' to this array
+	 * to map between the input's html ID and the modal dialogue's ID, so that
+	 * your JS code will know where to find the modal dialog when the input is pressed.
+	 * Eg $form_other_js_data['modal_dialog_inputs']['some-input-id']='modal-dialog-id';
+	 *
+	 * @param array $form_other_js_data
+	 * @return array
+	 */
+	public function get_other_js_data($form_other_js_data = array())
+	{
+		return $form_other_js_data;
+	}
+
+
+
+	/**
+	 * This isn't just the name of an input, it's a path pointing to an input. The
+	 * path is similar to a folder path: slash (/) means to descend into a subsection,
+	 * dot-dot-slash (../) means to ascend into the parent section.
+	 * After a series of slashes and dot-dot-slashes, there should be the name of an input,
+	 * which will be returned.
+	 * Eg, if you want the related input to be conditional on a sibling input name 'foobar'
+	 * just use 'foobar'. If you want it to be conditional on an aunt/uncle input name
+	 * 'baz', use '../baz'. If you want it to be conditional on a cousin input,
+	 * the child of 'baz_section' named 'baz_child', use '../baz_section/baz_child'.
+	 * Etc
+	 *
+	 * @param string|false $form_section_path we accept false also because substr( '../', '../' ) = false
+	 * @return EE_Form_Section_Base
+	 */
+	public function find_section_from_path($form_section_path)
+	{
+		if (strpos($form_section_path, '/') === 0) {
+			$form_section_path = substr($form_section_path, strlen('/'));
+		}
+		if (empty($form_section_path)) {
+			return $this;
+		}
+		if (strpos($form_section_path, '../') === 0) {
+			$parent = $this->parent_section();
+			$form_section_path = substr($form_section_path, strlen('../'));
+			if ($parent instanceof EE_Form_Section_Base) {
+				return $parent->find_section_from_path($form_section_path);
+			} elseif (empty($form_section_path)) {
+				return $this;
+			}
+		}
+		//couldn't find it using simple parent following
+		return null;
+	}
 
 
 }

Spacing +13 added lines, -13 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 use EventEspresso\core\libraries\form_sections\strategies\filter\FormHtmlFilter;
 
-if (! defined('EVENT_ESPRESSO_VERSION')) {
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
     exit('No direct script access allowed');
 }
 
@@ -99,7 +99,7 @@ 
         // used by display strategies
         // assign incoming values to properties
         foreach ($options_array as $key => $value) {
-            $key = '_' . $key;
+            $key = '_'.$key;
             if (property_exists($this, $key) && empty($this->{$key})) {
                 $this->{$key} = $value;
             }
@@ -136,7 +136,7 @@ 
      */
     public function ensure_construct_finalized_called()
     {
-        if (! $this->_construction_finalized) {
+        if ( ! $this->_construction_finalized) {
             $this->_construct_finalize($this->_parent_section, $this->_name);
         }
     }
@@ -199,7 +199,7 @@ 
      */
     protected function _set_default_html_id_if_empty()
     {
-        if (! $this->_html_id) {
+        if ( ! $this->_html_id) {
             if ($this->_parent_section && $this->_parent_section instanceof EE_Form_Section_Proper) {
                 $this->_html_id = $this->_parent_section->html_id()
                                   . '-'
@@ -258,7 +258,7 @@ 
     public function html_id($add_pound_sign = false)
     {
         $this->_set_default_html_id_if_empty();
-        return $add_pound_sign ? '#' . $this->_html_id : $this->_html_id;
+        return $add_pound_sign ? '#'.$this->_html_id : $this->_html_id;
     }
 
 
@@ -341,7 +341,7 @@ 
      */
     public function name()
     {
-        if (! $this->_construction_finalized) {
+        if ( ! $this->_construction_finalized) {
             throw new EE_Error(sprintf(__('You cannot use the form section\s name until _construct_finalize has been called on it (when we set the name). It was called on a form section of type \'s\'',
                 'event_espresso'), get_class($this)));
         }
@@ -372,17 +372,17 @@ 
      */
     public function form_open($action = '', $method = '', $other_attributes = '')
     {
-        if (! empty($action)) {
+        if ( ! empty($action)) {
             $this->set_action($action);
         }
-        if (! empty($method)) {
+        if ( ! empty($method)) {
             $this->set_method($method);
         }
-        $html = EEH_HTML::nl(1, 'form') . '<form';
-        $html .= $this->html_id() !== '' ? ' id="' . $this->html_id() . '"' : '';
-        $html .= ' action="' . $this->action() . '"';
-        $html .= ' method="' . $this->method() . '"';
-        $html .= $other_attributes . '>';
+        $html = EEH_HTML::nl(1, 'form').'<form';
+        $html .= $this->html_id() !== '' ? ' id="'.$this->html_id().'"' : '';
+        $html .= ' action="'.$this->action().'"';
+        $html .= ' method="'.$this->method().'"';
+        $html .= $other_attributes.'>';
         return $html;
     }
 

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

Indentation +94 added lines, -94 removed lines

@@ -13,110 +13,110 @@
 {
 
 
-    /**
-     * This is a flag indicating whether to use '<br>' tags after each input in the layout
-     * strategy.
-     *
-     * @var bool
-     */
-    protected $_use_break_tags = true;
+	/**
+	 * This is a flag indicating whether to use '<br>' tags after each input in the layout
+	 * strategy.
+	 *
+	 * @var bool
+	 */
+	protected $_use_break_tags = true;
 
 
-    /**
-     * EE_No_Layout constructor.
-     *
-     * @param array $options  Currently if this has a 'use_break_tags' key that is used to set the _use_break_tags
-     *                        property on the class.
-     */
-    public function __construct($options = array())
-    {
-        $this->_use_break_tags = is_array($options) && isset($options['use_break_tags'])
-            ? filter_var($options['use_break_tags'], FILTER_VALIDATE_BOOLEAN)
-            : $this->_use_break_tags;
-        parent::__construct();
-    }
+	/**
+	 * EE_No_Layout constructor.
+	 *
+	 * @param array $options  Currently if this has a 'use_break_tags' key that is used to set the _use_break_tags
+	 *                        property on the class.
+	 */
+	public function __construct($options = array())
+	{
+		$this->_use_break_tags = is_array($options) && isset($options['use_break_tags'])
+			? filter_var($options['use_break_tags'], FILTER_VALIDATE_BOOLEAN)
+			: $this->_use_break_tags;
+		parent::__construct();
+	}
 
-    /**
-     * Add line break at beginning of form
-     *
-     * @return string
-     */
-    public function layout_form_begin()
-    {
-        return EEH_HTML::nl(1);
-    }
+	/**
+	 * Add line break at beginning of form
+	 *
+	 * @return string
+	 */
+	public function layout_form_begin()
+	{
+		return EEH_HTML::nl(1);
+	}
 
 
-    /**
-     * 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)
-    {
-        $html = '';
-        if ($input instanceof EE_Hidden_Input) {
-            $html .= EEH_HTML::nl() . $input->get_html_for_input();
-        } else if ($input instanceof EE_Submit_Input) {
-            $html .= $this->br();
-            $html .= $input->get_html_for_input();
-        } else if ($input instanceof EE_Select_Input) {
-            $html .= $this->br();
-            $html .= EEH_HTML::nl(1) . $input->get_html_for_label();
-            $html .= EEH_HTML::nl() . $input->get_html_for_errors();
-            $html .= EEH_HTML::nl() . $input->get_html_for_input();
-            $html .= EEH_HTML::nl() . $input->get_html_for_help();
-            $html .= $this->br();
-        } else if ($input instanceof EE_Form_Input_With_Options_Base) {
-            $html .= $this->br();
-            $html .= EEH_HTML::nl() . $input->get_html_for_errors();
-            $html .= EEH_HTML::nl() . $input->get_html_for_input();
-            $html .= EEH_HTML::nl() . $input->get_html_for_help();
-        } else {
-            $html .= $this->br();
-            $html .= EEH_HTML::nl(1) . $input->get_html_for_label();
-            $html .= EEH_HTML::nl() . $input->get_html_for_errors();
-            $html .= EEH_HTML::nl() . $input->get_html_for_input();
-            $html .= EEH_HTML::nl() . $input->get_html_for_help();
-        }
-        $html .= EEH_HTML::nl(-1);
-        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)
+	{
+		$html = '';
+		if ($input instanceof EE_Hidden_Input) {
+			$html .= EEH_HTML::nl() . $input->get_html_for_input();
+		} else if ($input instanceof EE_Submit_Input) {
+			$html .= $this->br();
+			$html .= $input->get_html_for_input();
+		} else if ($input instanceof EE_Select_Input) {
+			$html .= $this->br();
+			$html .= EEH_HTML::nl(1) . $input->get_html_for_label();
+			$html .= EEH_HTML::nl() . $input->get_html_for_errors();
+			$html .= EEH_HTML::nl() . $input->get_html_for_input();
+			$html .= EEH_HTML::nl() . $input->get_html_for_help();
+			$html .= $this->br();
+		} else if ($input instanceof EE_Form_Input_With_Options_Base) {
+			$html .= $this->br();
+			$html .= EEH_HTML::nl() . $input->get_html_for_errors();
+			$html .= EEH_HTML::nl() . $input->get_html_for_input();
+			$html .= EEH_HTML::nl() . $input->get_html_for_help();
+		} else {
+			$html .= $this->br();
+			$html .= EEH_HTML::nl(1) . $input->get_html_for_label();
+			$html .= EEH_HTML::nl() . $input->get_html_for_errors();
+			$html .= EEH_HTML::nl() . $input->get_html_for_input();
+			$html .= EEH_HTML::nl() . $input->get_html_for_help();
+		}
+		$html .= EEH_HTML::nl(-1);
+		return $html;
+	}
 
 
-    /**
-     * Lays out a row for the subsection
-     *
-     * @param EE_Form_Section_Proper $form_section
-     * @return string
-     */
-    public function layout_subsection($form_section)
-    {
+	/**
+	 * Lays out a row for the subsection
+	 *
+	 * @param EE_Form_Section_Proper $form_section
+	 * @return string
+	 */
+	public function layout_subsection($form_section)
+	{
 //		d( $form_section );
-        return EEH_HTML::nl(1) . $form_section->get_html() . EEH_HTML::nl(-1);
-    }
+		return EEH_HTML::nl(1) . $form_section->get_html() . EEH_HTML::nl(-1);
+	}
 
 
-    /**
-     * Add line break at end of form.
-     *
-     * @return string
-     */
-    public function layout_form_end()
-    {
-        return EEH_HTML::nl(-1);
-    }
+	/**
+	 * Add line break at end of form.
+	 *
+	 * @return string
+	 */
+	public function layout_form_end()
+	{
+		return EEH_HTML::nl(-1);
+	}
 
 
-    /**
-     * This returns a break tag or an empty string depending on the value of the `_use_break_tags` property.
-     *
-     * @return string
-     */
-    protected function br()
-    {
-        return $this->_use_break_tags ? EEH_HTML::br() : '';
-    }
+	/**
+	 * This returns a break tag or an empty string depending on the value of the `_use_break_tags` property.
+	 *
+	 * @return string
+	 */
+	protected function br()
+	{
+		return $this->_use_break_tags ? EEH_HTML::br() : '';
+	}
 }
\ No newline at end of file

Spacing +13 added lines, -13 removed lines

@@ -58,28 +58,28 @@ 
     {
         $html = '';
         if ($input instanceof EE_Hidden_Input) {
-            $html .= EEH_HTML::nl() . $input->get_html_for_input();
+            $html .= EEH_HTML::nl().$input->get_html_for_input();
         } else if ($input instanceof EE_Submit_Input) {
             $html .= $this->br();
             $html .= $input->get_html_for_input();
         } else if ($input instanceof EE_Select_Input) {
             $html .= $this->br();
-            $html .= EEH_HTML::nl(1) . $input->get_html_for_label();
-            $html .= EEH_HTML::nl() . $input->get_html_for_errors();
-            $html .= EEH_HTML::nl() . $input->get_html_for_input();
-            $html .= EEH_HTML::nl() . $input->get_html_for_help();
+            $html .= EEH_HTML::nl(1).$input->get_html_for_label();
+            $html .= EEH_HTML::nl().$input->get_html_for_errors();
+            $html .= EEH_HTML::nl().$input->get_html_for_input();
+            $html .= EEH_HTML::nl().$input->get_html_for_help();
             $html .= $this->br();
         } else if ($input instanceof EE_Form_Input_With_Options_Base) {
             $html .= $this->br();
-            $html .= EEH_HTML::nl() . $input->get_html_for_errors();
-            $html .= EEH_HTML::nl() . $input->get_html_for_input();
-            $html .= EEH_HTML::nl() . $input->get_html_for_help();
+            $html .= EEH_HTML::nl().$input->get_html_for_errors();
+            $html .= EEH_HTML::nl().$input->get_html_for_input();
+            $html .= EEH_HTML::nl().$input->get_html_for_help();
         } else {
             $html .= $this->br();
-            $html .= EEH_HTML::nl(1) . $input->get_html_for_label();
-            $html .= EEH_HTML::nl() . $input->get_html_for_errors();
-            $html .= EEH_HTML::nl() . $input->get_html_for_input();
-            $html .= EEH_HTML::nl() . $input->get_html_for_help();
+            $html .= EEH_HTML::nl(1).$input->get_html_for_label();
+            $html .= EEH_HTML::nl().$input->get_html_for_errors();
+            $html .= EEH_HTML::nl().$input->get_html_for_input();
+            $html .= EEH_HTML::nl().$input->get_html_for_help();
         }
         $html .= EEH_HTML::nl(-1);
         return $html;
@@ -95,7 +95,7 @@ 
     public function layout_subsection($form_section)
     {
 //		d( $form_section );
-        return EEH_HTML::nl(1) . $form_section->get_html() . EEH_HTML::nl(-1);
+        return EEH_HTML::nl(1).$form_section->get_html().EEH_HTML::nl(-1);
     }
 
 

core/libraries/form_sections/strategies/filter/FormHtmlFilter.php

Indentation +6 added lines, -6 removed lines

@@ -18,12 +18,12 @@
 abstract class FormHtmlFilter
 {
 
-    /**
-     * @param                        $html
-     * @param EE_Form_Section_Validatable $form_section
-     * @return string
-     */
-    abstract public function filterHtml($html, EE_Form_Section_Validatable $form_section);
+	/**
+	 * @param                        $html
+	 * @param EE_Form_Section_Validatable $form_section
+	 * @return string
+	 */
+	abstract public function filterHtml($html, EE_Form_Section_Validatable $form_section);
 
 }
 // End of file FormHtmlFilter.php

core/libraries/form_sections/inputs/EE_Integer_Input.php

Indentation +31 added lines, -31 removed lines

@@ -15,37 +15,37 @@
 {
 
 
-    /**
-     * @param array $input_settings
-     */
-    public function __construct($input_settings = array())
-    {
-        $this->_set_display_strategy(
-            new EE_Number_Input_Display_Strategy(
-                isset($input_settings['min_value'])
-                    ? $input_settings['min_value']
-                    : null,
-                isset($input_settings['max_value'])
-                    ? $input_settings['max_value']
-                    : null
-            )
-        );
-        $this->_set_normalization_strategy(
-            new EE_Int_Normalization(
-                isset($input_settings['validation_error_message'])
-                    ? $input_settings['validation_error_message']
-                    : null
-            )
-        );
-        $this->_add_validation_strategy(
-            new EE_Int_Validation_Strategy(
-                isset($input_settings['validation_error_message'])
-                    ? $input_settings['validation_error_message']
-                    : null
-            )
-        );
-        parent::__construct($input_settings);
-    }
+	/**
+	 * @param array $input_settings
+	 */
+	public function __construct($input_settings = array())
+	{
+		$this->_set_display_strategy(
+			new EE_Number_Input_Display_Strategy(
+				isset($input_settings['min_value'])
+					? $input_settings['min_value']
+					: null,
+				isset($input_settings['max_value'])
+					? $input_settings['max_value']
+					: null
+			)
+		);
+		$this->_set_normalization_strategy(
+			new EE_Int_Normalization(
+				isset($input_settings['validation_error_message'])
+					? $input_settings['validation_error_message']
+					: null
+			)
+		);
+		$this->_add_validation_strategy(
+			new EE_Int_Validation_Strategy(
+				isset($input_settings['validation_error_message'])
+					? $input_settings['validation_error_message']
+					: null
+			)
+		);
+		parent::__construct($input_settings);
+	}
 
 }
 // End of file EE_Integer_Input.php

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

Indentation +1 added lines, -1 removed lines

@@ -16,6 +16,6 @@
 		$this->_set_normalization_strategy(new EE_Float_Normalization( isset( $input_settings[ 'validation_error_message' ] ) ? $input_settings[ 'validation_error_message' ] : NULL ) );
 		$this->_add_validation_strategy( new EE_Float_Validation_Strategy( isset( $input_settings[ 'validation_error_message' ] ) ? $input_settings[ 'validation_error_message' ] : NULL ) );
 		parent::__construct($input_settings);
-        $this->_other_html_attributes .= ' step="any"';
+		$this->_other_html_attributes .= ' step="any"';
 	}
 }
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -6,15 +6,15 @@
  * @subpackage
  * @author				Mike Nelson
  */
-class EE_Float_Input extends EE_Form_Input_Base{
+class EE_Float_Input extends EE_Form_Input_Base {
 
 	/**
 	 * @param array $input_settings
 	 */
-	function __construct($input_settings = array()){
+	function __construct($input_settings = array()) {
 		$this->_set_display_strategy(new EE_Number_Input_Display_Strategy());
-		$this->_set_normalization_strategy(new EE_Float_Normalization( isset( $input_settings[ 'validation_error_message' ] ) ? $input_settings[ 'validation_error_message' ] : NULL ) );
-		$this->_add_validation_strategy( new EE_Float_Validation_Strategy( isset( $input_settings[ 'validation_error_message' ] ) ? $input_settings[ 'validation_error_message' ] : NULL ) );
+		$this->_set_normalization_strategy(new EE_Float_Normalization(isset($input_settings['validation_error_message']) ? $input_settings['validation_error_message'] : NULL));
+		$this->_add_validation_strategy(new EE_Float_Validation_Strategy(isset($input_settings['validation_error_message']) ? $input_settings['validation_error_message'] : NULL));
 		parent::__construct($input_settings);
         $this->_other_html_attributes .= ' step="any"';
 	}

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

Spacing +2 added lines, -2 removed lines

@@ -1,4 +1,4 @@ 
-<?php if (! defined('EVENT_ESPRESSO_VERSION')) {
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
     exit('No direct script access allowed');
 }
 
@@ -61,7 +61,7 @@ 
      */
     protected function _append_chars($string = '', $chars = '-')
     {
-        return $this->_remove_chars($string, $chars) . $chars;
+        return $this->_remove_chars($string, $chars).$chars;
     }
 
 

Indentation +212 added lines, -212 removed lines

@@ -1,5 +1,5 @@ 
 <?php if (! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 
@@ -16,229 +16,229 @@ 
 {
 
 
-    /**
-     * @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;
-    }
+	/**
+	 * _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;
-    }
+	/**
+	 * _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 = '')
-    {
-        return $value !== null ? " {$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 = '')
-    {
-        return $value !== null ? " 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}" : '';
-    }
+
+	/**
+	 * 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 = '')
+	{
+		return $value !== null ? " {$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 = '')
+	{
+		return $value !== null ? " 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}" : '';
+	}
 
 }
\ No newline at end of file

core/libraries/form_sections/strategies/EE_Form_Input_Strategy_Base.strategy.php

Indentation +27 added lines, -27 removed lines

@@ -9,40 +9,40 @@
 abstract class EE_Form_Input_Strategy_Base
 {
 
-    /**
-     * Form Input to display
-     *
-     * @var EE_Form_Input_Base
-     */
-    protected $_input;
+	/**
+	 * Form Input to display
+	 *
+	 * @var EE_Form_Input_Base
+	 */
+	protected $_input;
 
 
 
-    public function __construct()
-    {
-    }
+	public function __construct()
+	{
+	}
 
 
 
-    /**
-     * The form input on which this strategy is to perform
-     *
-     * @param EE_Form_Input_Base $form_input
-     */
-    public function _construct_finalize(EE_Form_Input_Base $form_input)
-    {
-        $this->_input = $form_input;
-    }
+	/**
+	 * The form input on which this strategy is to perform
+	 *
+	 * @param EE_Form_Input_Base $form_input
+	 */
+	public function _construct_finalize(EE_Form_Input_Base $form_input)
+	{
+		$this->_input = $form_input;
+	}
 
 
 
-    /**
-     * Gets this strategy's input
-     *
-     * @return EE_Form_Input_Base
-     */
-    public function get_input()
-    {
-        return $this->_input;
-    }
+	/**
+	 * Gets this strategy's input
+	 *
+	 * @return EE_Form_Input_Base
+	 */
+	public function get_input()
+	{
+		return $this->_input;
+	}
 }
\ No newline at end of file

core/db_classes/EE_Question.class.php

Spacing +110 added lines, -110 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -37,9 +37,9 @@ 
 	 *                             		    date_format and the second value is the time format
 	 * @return EE_Question
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone, $date_formats );
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
 	}
 
 
@@ -50,8 +50,8 @@ 
 	 *                          		the website will be used.
 	 * @return EE_Question
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 
 
@@ -62,8 +62,8 @@ 
 	 * @access        public
 	 * @param string $QST_display_text
 	 */
-	public function set_display_text( $QST_display_text = '' ) {
-		$this->set( 'QST_display_text', $QST_display_text );
+	public function set_display_text($QST_display_text = '') {
+		$this->set('QST_display_text', $QST_display_text);
 	}
 
 
@@ -74,8 +74,8 @@ 
 	 * @access        public
 	 * @param        string $QST_admin_label
 	 */
-	public function set_admin_label( $QST_admin_label = '' ) {
-		$this->set( 'QST_admin_label', $QST_admin_label );
+	public function set_admin_label($QST_admin_label = '') {
+		$this->set('QST_admin_label', $QST_admin_label);
 	}
 
 
@@ -86,8 +86,8 @@ 
 	 * @access        public
 	 * @param        mixed $QST_system
 	 */
-	public function set_system_ID( $QST_system = '' ) {
-		$this->set( 'QST_system', $QST_system );
+	public function set_system_ID($QST_system = '') {
+		$this->set('QST_system', $QST_system);
 	}
 
 
@@ -98,8 +98,8 @@ 
 	 * @access        public
 	 * @param        string $QST_type
 	 */
-	public function set_question_type( $QST_type = '' ) {
-		$this->set( 'QST_type', $QST_type );
+	public function set_question_type($QST_type = '') {
+		$this->set('QST_type', $QST_type);
 	}
 
 
@@ -110,8 +110,8 @@ 
 	 * @access        public
 	 * @param        bool $QST_required
 	 */
-	public function set_required( $QST_required = FALSE ) {
-		$this->set( 'QST_required', $QST_required );
+	public function set_required($QST_required = FALSE) {
+		$this->set('QST_required', $QST_required);
 	}
 
 
@@ -122,8 +122,8 @@ 
 	 * @access        public
 	 * @param        string $QST_required_text
 	 */
-	public function set_required_text( $QST_required_text = '' ) {
-		$this->set( 'QST_required_text', $QST_required_text );
+	public function set_required_text($QST_required_text = '') {
+		$this->set('QST_required_text', $QST_required_text);
 	}
 
 
@@ -134,8 +134,8 @@ 
 	 * @access        public
 	 * @param        int $QST_order
 	 */
-	public function set_order( $QST_order = 0 ) {
-		$this->set( 'QST_order', $QST_order );
+	public function set_order($QST_order = 0) {
+		$this->set('QST_order', $QST_order);
 	}
 
 
@@ -146,8 +146,8 @@ 
 	 * @access        public
 	 * @param        bool $QST_admin_only
 	 */
-	public function set_admin_only( $QST_admin_only = FALSE ) {
-		$this->set( 'QST_admin_only', $QST_admin_only );
+	public function set_admin_only($QST_admin_only = FALSE) {
+		$this->set('QST_admin_only', $QST_admin_only);
 	}
 
 
@@ -158,8 +158,8 @@ 
 	 * @access        public
 	 * @param        int $QST_wp_user
 	 */
-	public function set_wp_user( $QST_wp_user = 1 ) {
-		$this->set( 'QST_wp_user', $QST_wp_user );
+	public function set_wp_user($QST_wp_user = 1) {
+		$this->set('QST_wp_user', $QST_wp_user);
 	}
 
 
@@ -175,8 +175,8 @@ 
 	 * @access        public
 	 * @param 	bool $QST_deleted
 	 */
-	public function set_deleted( $QST_deleted = FALSE ) {
-		$this->set( 'QST_deleted', $QST_deleted );
+	public function set_deleted($QST_deleted = FALSE) {
+		$this->set('QST_deleted', $QST_deleted);
 	}
 
 
@@ -187,7 +187,7 @@ 
 	 * @return string
 	 */
 	public function display_text() {
-		return $this->get( 'QST_display_text' );
+		return $this->get('QST_display_text');
 	}
 
 
@@ -198,7 +198,7 @@ 
 	 * @return string
 	 */
 	public function admin_label() {
-		return $this->get( 'QST_admin_label' );
+		return $this->get('QST_admin_label');
 	}
 
 
@@ -209,7 +209,7 @@ 
 	 * @return string
 	 */
 	public function system_ID() {
-		return $this->get( 'QST_system' );
+		return $this->get('QST_system');
 	}
 
 
@@ -220,7 +220,7 @@ 
 	 * @return boolean
 	 */
 	public function required() {
-		return $this->get( 'QST_required' );
+		return $this->get('QST_required');
 	}
 
 
@@ -232,7 +232,7 @@ 
 	 * @return string
 	 */
 	public function required_text() {
-		return $this->get( 'QST_required_text' );
+		return $this->get('QST_required_text');
 	}
 
 
@@ -243,7 +243,7 @@ 
 	 * @return string
 	 */
 	public function type() {
-		return $this->get( 'QST_type' );
+		return $this->get('QST_type');
 	}
 
 
@@ -255,7 +255,7 @@ 
 	 * @return int
 	 */
 	public function order() {
-		return $this->get( 'QST_order' );
+		return $this->get('QST_order');
 	}
 
 
@@ -267,7 +267,7 @@ 
 	 * @return boolean
 	 */
 	public function admin_only() {
-		return $this->get( 'QST_admin_only' );
+		return $this->get('QST_admin_only');
 	}
 
 
@@ -278,7 +278,7 @@ 
 	 * @return int
 	 */
 	public function wp_user() {
-		return $this->get( 'QST_wp_user' );
+		return $this->get('QST_wp_user');
 	}
 
 
@@ -289,7 +289,7 @@ 
 	 * @return boolean
 	 */
 	public function deleted() {
-		return $this->get( 'QST_deleted' );
+		return $this->get('QST_deleted');
 	}
 
 
@@ -299,7 +299,7 @@ 
 	 * @return EE_Answer[]
 	 */
 	public function answers() {
-		return $this->get_many_related( 'Answer' );
+		return $this->get_many_related('Answer');
 	}
 
 
@@ -309,7 +309,7 @@ 
 	 * @return boolean true = has answers, false = no answers.
 	 */
 	public function has_answers() {
-		return $this->count_related( 'Answer' ) > 0 ? TRUE : FALSE;
+		return $this->count_related('Answer') > 0 ? TRUE : FALSE;
 	}
 
 
@@ -319,7 +319,7 @@ 
 	 * @return EE_Question_Group[]
 	 */
 	public function question_groups() {
-		return $this->get_many_related( 'Question_Group' );
+		return $this->get_many_related('Question_Group');
 	}
 
 
@@ -333,24 +333,24 @@ 
 	 *                                                       whether it was trashed or not.
 	 * @return EE_Question_Option[]
 	 */
-	public function options( $notDeletedOptionsOnly = TRUE, $selected_value_to_always_include = NULL ) {
-		if ( ! $this->ID() ) {
+	public function options($notDeletedOptionsOnly = TRUE, $selected_value_to_always_include = NULL) {
+		if ( ! $this->ID()) {
 			return array();
 		}
 		$query_params = array();
-		if ( $selected_value_to_always_include ) {
-			if ( is_array( $selected_value_to_always_include ) ) {
-				$query_params[ 0 ][ 'OR*options-query' ][ 'QSO_value' ] = array( 'IN', $selected_value_to_always_include );
+		if ($selected_value_to_always_include) {
+			if (is_array($selected_value_to_always_include)) {
+				$query_params[0]['OR*options-query']['QSO_value'] = array('IN', $selected_value_to_always_include);
 			} else {
-				$query_params[ 0 ][ 'OR*options-query' ][ 'QSO_value' ] = $selected_value_to_always_include;
+				$query_params[0]['OR*options-query']['QSO_value'] = $selected_value_to_always_include;
 			}
 		}
-		if ( $notDeletedOptionsOnly ) {
-			$query_params[ 0 ][ 'OR*options-query' ][ 'QSO_deleted' ] = FALSE;
+		if ($notDeletedOptionsOnly) {
+			$query_params[0]['OR*options-query']['QSO_deleted'] = FALSE;
 		}
 		//order by QSO_order
-		$query_params[ 'order_by' ] = array( 'QSO_order' => 'ASC' );
-		return $this->get_many_related( 'Question_Option', $query_params );
+		$query_params['order_by'] = array('QSO_order' => 'ASC');
+		return $this->get_many_related('Question_Option', $query_params);
 	}
 
 
@@ -360,7 +360,7 @@ 
 	 * @return \EE_Question_Option[]
 	 */
 	public function temp_options() {
-		return $this->_model_relations[ 'Question_Option' ];
+		return $this->_model_relations['Question_Option'];
 	}
 
 
@@ -371,8 +371,8 @@ 
 	 * @param EE_Question_Option $option
 	 * @return boolean success
 	 */
-	public function add_option( EE_Question_Option $option ) {
-		return $this->_add_relation_to( $option, 'Question_Option' );
+	public function add_option(EE_Question_Option $option) {
+		return $this->_add_relation_to($option, 'Question_Option');
 	}
 
 
@@ -382,8 +382,8 @@ 
 	 * @param EE_Question_Option $option
 	 * @return boolean success
 	 */
-	public function add_temp_option( EE_Question_Option $option ) {
-		$this->_model_relations[ 'Question_Option' ][ ] = $option;
+	public function add_temp_option(EE_Question_Option $option) {
+		$this->_model_relations['Question_Option'][] = $option;
 		return TRUE;
 	}
 
@@ -394,8 +394,8 @@ 
 	 * @param EE_Question_Option $option
 	 * @return boolean success
 	 */
-	public function remove_option( EE_Question_Option $option ) {
-		return $this->_remove_relation_to( $option, 'Question_Option' );
+	public function remove_option(EE_Question_Option $option) {
+		return $this->_remove_relation_to($option, 'Question_Option');
 	}
 
 
@@ -404,8 +404,8 @@ 
 	 * @return bool
 	 */
 	public function is_system_question() {
-		$system_ID = $this->get( 'QST_system' );
-		return ! empty( $system_ID ) ? TRUE : FALSE;
+		$system_ID = $this->get('QST_system');
+		return ! empty($system_ID) ? TRUE : FALSE;
 	}
 
 
@@ -418,8 +418,8 @@ 
 	 */
 	public function set_order_to_latest() {
 		$latest_order = $this->get_model()->get_latest_question_order();
-		$latest_order ++;
-		$this->set( 'QST_order', $latest_order );
+		$latest_order++;
+		$this->set('QST_order', $latest_order);
 	}
 
 
@@ -438,20 +438,20 @@ 
 	 * Duplicates this question and its question options
 	 * @return \EE_Question
 	 */
-	public function duplicate( $options = array() ) {
+	public function duplicate($options = array()) {
 		$new_question = clone $this;
-		$new_question->set( 'QST_ID', null );
-		$new_question->set_display_text( sprintf( __( '%s **Duplicate**', 'event_espresso' ), $this->display_text() ) );
-		$new_question->set_admin_label( sprintf( __( '%s **Duplicate**', 'event_espresso' ), $this->admin_label() ) );
-		$new_question->set_system_ID( null );
-		$new_question->set_wp_user( get_current_user_id() );
+		$new_question->set('QST_ID', null);
+		$new_question->set_display_text(sprintf(__('%s **Duplicate**', 'event_espresso'), $this->display_text()));
+		$new_question->set_admin_label(sprintf(__('%s **Duplicate**', 'event_espresso'), $this->admin_label()));
+		$new_question->set_system_ID(null);
+		$new_question->set_wp_user(get_current_user_id());
                 //if we're duplicating a trashed question, assume we don't want the new one to be trashed
-                $new_question->set_deleted( false );
+                $new_question->set_deleted(false);
 		$success = $new_question->save();
-		if( $success ) {
+		if ($success) {
 			//we don't totally want to duplicate the question options, because we want them to be for the NEW question
-			foreach( $this->options() as $question_option ) {
-				$question_option->duplicate( array( 'QST_ID' => $new_question->ID() ) );
+			foreach ($this->options() as $question_option) {
+				$question_option->duplicate(array('QST_ID' => $new_question->ID()));
 			}
 			return $new_question;
 		} else {
@@ -464,7 +464,7 @@ 
 	 * @return int|float
 	 */
 	public function max() {
-		return $this->get( 'QST_max' );
+		return $this->get('QST_max');
 	}
 
 	/**
@@ -472,8 +472,8 @@ 
 	 * @param int|float $new_max
 	 * @return void
 	 */
-	public function set_max( $new_max ) {
-		$this->set( 'QST_max', $new_max );
+	public function set_max($new_max) {
+		$this->set('QST_max', $new_max);
 	}
 
 
@@ -485,7 +485,7 @@ 
 	 * @param array $input_constructor_args
 	 * @return EE_Form_Input_Base
 	 */
-	public function generate_form_input( $registration = null, $answer = null, $input_constructor_args = array() ) {
+	public function generate_form_input($registration = null, $answer = null, $input_constructor_args = array()) {
 		$identifier = $this->is_system_question() ? $this->system_ID() : $this->ID();
 
 		$input_constructor_args = array_merge(
@@ -496,29 +496,29 @@ 
 				),
 				$input_constructor_args
 			);
-		if( ! $answer instanceof EE_Answer && $registration instanceof EE_Registration ) {
-			$answer = EEM_Answer::instance()->get_registration_question_answer_object( $registration, $this->ID() );
+		if ( ! $answer instanceof EE_Answer && $registration instanceof EE_Registration) {
+			$answer = EEM_Answer::instance()->get_registration_question_answer_object($registration, $this->ID());
 		}
 		// has this question been answered ?
-		if ( $answer instanceof EE_Answer
+		if ($answer instanceof EE_Answer
              && $answer->value() !== ''
         ) {
 			//answer gets htmlspecialchars called on it, undo that please
 			//because the form input's display strategy may call esc_attr too
 			//which also does html special characters
 			$values_with_html_special_chars = $answer->value();
-			if( is_array( $values_with_html_special_chars ) ) {
-				$default_value = array_map( 'htmlspecialchars_decode', $values_with_html_special_chars );
+			if (is_array($values_with_html_special_chars)) {
+				$default_value = array_map('htmlspecialchars_decode', $values_with_html_special_chars);
 			} else {
-				$default_value = htmlspecialchars_decode( $values_with_html_special_chars );
+				$default_value = htmlspecialchars_decode($values_with_html_special_chars);
 			}
 			$input_constructor_args['default'] = $default_value;
 		}
-		$max_max_for_question = EEM_Question::instance()->absolute_max_for_system_question( $this->system_ID() );
-		if( EEM_Question::instance()->question_type_is_in_category(  $this->type(), 'text' ) ) {
-			$input_constructor_args[ 'validation_strategies' ][] = new EE_Max_Length_Validation_Strategy(
+		$max_max_for_question = EEM_Question::instance()->absolute_max_for_system_question($this->system_ID());
+		if (EEM_Question::instance()->question_type_is_in_category($this->type(), 'text')) {
+			$input_constructor_args['validation_strategies'][] = new EE_Max_Length_Validation_Strategy(
 				null,
-				min( $max_max_for_question, $this->max() )
+				min($max_max_for_question, $this->max())
 			);
 		}
 		$input_constructor_args = apply_filters(
@@ -530,22 +530,22 @@ 
 		);
 
 		$result = null;
-		switch ( $this->type() ) {
+		switch ($this->type()) {
 			// Text
 			case EEM_Question::QST_type_text :
-				$result = new EE_Text_Input( $input_constructor_args );
+				$result = new EE_Text_Input($input_constructor_args);
 				break;
 			// Textarea
 			case EEM_Question::QST_type_textarea :
-				$result = new EE_Text_Area_Input( $input_constructor_args );
+				$result = new EE_Text_Area_Input($input_constructor_args);
 				break;
 			// Radio Buttons
 			case EEM_Question::QST_type_radio :
-				$result = new EE_Radio_Button_Input( $this->options(), $input_constructor_args );
+				$result = new EE_Radio_Button_Input($this->options(), $input_constructor_args);
 				break;
 			// Dropdown
 			case EEM_Question::QST_type_dropdown :
-				$result = new EE_Select_Input( $this->options(), $input_constructor_args );
+				$result = new EE_Select_Input($this->options(), $input_constructor_args);
 				break;
 			// State Dropdown
 			case EEM_Question::QST_type_state :
@@ -556,7 +556,7 @@ 
 					$registration,
 					$answer
 				);				
-				$result = new EE_State_Select_Input( $state_options, $input_constructor_args );
+				$result = new EE_State_Select_Input($state_options, $input_constructor_args);
 				break;
 			// Country Dropdown
 			case EEM_Question::QST_type_country :
@@ -567,47 +567,47 @@ 
 					$registration,
 					$answer
 				);
-				$result = new EE_Country_Select_Input( $country_options, $input_constructor_args );
+				$result = new EE_Country_Select_Input($country_options, $input_constructor_args);
 				break;
 			// Checkboxes
 			case EEM_Question::QST_type_checkbox :
-				$result = new EE_Checkbox_Multi_Input( $this->options(), $input_constructor_args );
+				$result = new EE_Checkbox_Multi_Input($this->options(), $input_constructor_args);
 				break;
 			// Date
 			case EEM_Question::QST_type_date :
-				$result = new EE_Datepicker_Input( $input_constructor_args );
+				$result = new EE_Datepicker_Input($input_constructor_args);
 				break;
 			case EEM_Question::QST_type_html_textarea :
-				$input_constructor_args[ 'validation_strategies' ][] = new EE_Simple_HTML_Validation_Strategy();
-				$result =  new EE_Text_Area_Input( $input_constructor_args );
-				$result->remove_validation_strategy( 'EE_Plaintext_Validation_Strategy' );
+				$input_constructor_args['validation_strategies'][] = new EE_Simple_HTML_Validation_Strategy();
+				$result = new EE_Text_Area_Input($input_constructor_args);
+				$result->remove_validation_strategy('EE_Plaintext_Validation_Strategy');
 				break;
 			case EEM_Question::QST_type_email :
-				$result = new EE_Email_Input( $input_constructor_args );
+				$result = new EE_Email_Input($input_constructor_args);
 				break;
 			case EEM_Question::QST_type_us_phone :
-				$result = new EE_Phone_Input( $input_constructor_args );
+				$result = new EE_Phone_Input($input_constructor_args);
 				break;
 			case EEM_Question::QST_type_int :
-				$result = new EE_Integer_Input( $input_constructor_args );
+				$result = new EE_Integer_Input($input_constructor_args);
 				break;
 			case EEM_Question::QST_type_decimal :
-				$result = new EE_Float_Input( $input_constructor_args );
+				$result = new EE_Float_Input($input_constructor_args);
 				break;
 			case EEM_Question::QST_type_url :
-				$input_constructor_args[ 'validation_strategies' ][] = new EE_URL_Validation_Strategy();
-				$result = new EE_Text_Input( $input_constructor_args );
+				$input_constructor_args['validation_strategies'][] = new EE_URL_Validation_Strategy();
+				$result = new EE_Text_Input($input_constructor_args);
 				break;
 			case EEM_Question::QST_type_year :
 				$result = new EE_Year_Input(
 						$input_constructor_args,
-						apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__four_digit', true, $this ),
-						apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__early_range', 100, $this ),
-						apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__end_range', 100, $this )
+						apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__four_digit', true, $this),
+						apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__early_range', 100, $this),
+						apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__end_range', 100, $this)
 						);
 				break;
 			case EEM_Question::QST_type_multi_select :
-				$result = new EE_Select_Multiple_Input( $this->options(), $input_constructor_args );
+				$result = new EE_Select_Multiple_Input($this->options(), $input_constructor_args);
 				break;
 			// fallback
 			default :
@@ -618,12 +618,12 @@ 
 					$this,
 					$input_constructor_args
 				);
-				if( ! $default_input ){
-					$default_input = new EE_Text_Input( $input_constructor_args );
+				if ( ! $default_input) {
+					$default_input = new EE_Text_Input($input_constructor_args);
 				}
 				$result = $default_input;
 		}
-		return apply_filters( 'FHEE__EE_Question__generate_form_input__return', $result, $registration, $this, $answer );
+		return apply_filters('FHEE__EE_Question__generate_form_input__return', $result, $registration, $this, $answer);
 	}
 
 

core/libraries/messages/EE_Message_Repository.lib.php

Indentation +251 added lines, -251 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 if (! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 
@@ -16,256 +16,256 @@ 
 {
 
 
-    /**
-     *    EE_Message_Repository constructor
-     */
-    public function __construct()
-    {
-        $this->interface = 'EE_Message';
-        parent::__construct();
-    }
-
-
-    /**
-     * Add the EE_Message to the repository.
-     * This also ensures that the MSG_token is saves as a part of the info for retrieval.
-     *
-     * @param EE_Message $message
-     * @param mixed      $info Any included data is saved in the attached object info array indexed by 'data'
-     * @return bool
-     */
-    public function add($message, $info = null)
-    {
-        $attached = parent::add($message);
-        //ensure $info is an array if not already
-        $info = $info === null ? $info = array() : (array)$info;
-        $data = $this->_init_data($info, $attached, $message);
-        if ($attached) {
-            $this->set_info($message, $data);
-        }
-        return $attached;
-    }
-
-
-    /**
-     * Initializes the data from the incoming info.
-     *
-     * @param array      $info     incoming data.
-     * @param bool       $attached Indicates whether the object was attached successfully.
-     * @param EE_Message $message
-     * @return array
-     */
-    protected function _init_data($info, $attached, $message)
-    {
-        $data = array(
-            'test_send'               => false,
-            'preview'                 => false,
-            'data_handler_class_name' => '',
-            'data'                    => array(
-                'MSG_generation_data' => array(),
-            ),
-        );
-        if (isset($info['preview'])) {
-            $data['preview'] = $info['preview'];
-            unset($info['preview']);
-        }
-        if (isset($info['test_send'])) {
-            $data['test_send'] = $info['test_send'];
-            unset($info['test_send']);
-        }
-        if (isset($info['data_handler_class_name'])) {
-            $data['data_handler_class_name'] = $info['data_handler_class_name'];
-            unset($info['data_handler_class_name']);
-        }
-        if ($attached && $message->STS_ID() === EEM_Message::status_incomplete) {
-            $generation_data = isset($info['MSG_generation_data']) ? $info['MSG_generation_data'] : array();
-            //if data isn't in $info...let's see if its available via the message object
-            $generation_data = ! $generation_data ? $message->get_generation_data() : $generation_data;
-            //still empty then let's just use info
-            $generation_data                     = ! $generation_data ? $info : $generation_data;
-            $data['data']['MSG_generation_data'] = $generation_data;
-        }
-        return $data;
-    }
-
-
-    /**
-     * Save all EE_Message objects to the db.
-     *
-     * @param bool $do_hooks_only  When true, only the hooks related to saving are fired.
-     * @return array array(
-     *                  'updated' => 0, //count of how many messages updated
-     *                  'notupdated' => 0, //count of how many messages not updated.
-     *                  'errors' => array( $token ), //array of message object tokens that had errors in saving
-     *                  )
-     */
-    public function saveAll($do_hooks_only = false)
-    {
-        $save_tracking = array('updated' => 0, 'notupdated' => 0, 'errors' => array());
-
-        if (! $do_hooks_only) {
-            $this->rewind();
-            //exit early if there is nothing to save.
-            if ($this->count() < 1) {
-                return $save_tracking;
-            }
-
-            while ($this->valid()) {
-                $saved = $this->current()->save();
-                if ($saved === false) {
-                    $save_tracking['errors'][] = $this->current()->MSG_token();
-                } elseif ($saved) {
-                    $save_tracking['updated']++;
-                } else {
-                    $save_tracking['notupdated']++;
-                }
-                //maybe persist generation data if this is an incomplete EE_Message.
-                $this->_maybe_persist_attached_data();
-
-                $this->next();
-            }
-        }
-        do_action('AHEE__EE_Message_Repository__saveAll__after', $save_tracking, $this, $do_hooks_only);
-        return $save_tracking;
-    }
-
-
-    /**
-     * Retrieves a EE_Message from the repository that matches the given token.
-     *
-     * @param string $token Token.
-     * @return EE_Message | null
-     */
-    public function getMessageByToken($token)
-    {
-        $this->rewind();
-        while ($this->valid()) {
-            if ($this->current()->MSG_token() === $token) {
-                $message = $this->current();
-                $this->rewind();
-                return $message;
-            }
-            $this->next();
-        }
-        return null;
-    }
-
-
-    /**
-     * This retrieves any data required for generation that may be saved with the current EE_Message in storage.
-     *
-     * @return array();
-     */
-    public function get_generation_data()
-    {
-        //first verify we're at a valid iterator point.
-        if ( ! $this->valid()) {
-            return array();
-        }
-        $info = $this->getInfo();
-        return isset($info['data']) && isset($info['data']['MSG_generation_data']) ? $info['data']['MSG_generation_data'] : array();
-    }
-
-
-    /**
-     * Retrieves the data_handler_class_name or reference associated with the current EE_Message object in the iterator.
-     *
-     * @return string
-     */
-    public function get_data_handler()
-    {
-        if ( ! $this->valid()) {
-            return '';
-        }
-        $info = $this->getInfo();
-        return isset($info['data_handler_class_name']) ? $info['data_handler_class_name'] : '';
-    }
-
-
-    /**
-     * Returns whether this EE_Message is for a preview or not.
-     *
-     * @return bool
-     */
-    public function is_preview()
-    {
-        if ( ! $this->valid()) {
-            return false;
-        }
-        $info = $this->getInfo();
-        return $info['preview'];
-    }
-
-
-    /**
-     * Returns whether the current message pointed to is for a test send.
-     *
-     * @return bool
-     */
-    public function is_test_send()
-    {
-        if ( ! $this->valid()) {
-            return false;
-        }
-        $info = $this->getInfo();
-        return $info['test_send'];
-    }
-
-
-    /**
-     *  This checks if the current EE_Message in the iterator is incomplete. If it is, then
-     *  data is attached for later retrieval (batch generation).
-     */
-    protected function _maybe_persist_attached_data()
-    {
-        if ( ! $this->valid()) {
-            return;
-        }
-
-        $info                    = $this->getInfo();
-        $data_handler_class_name = isset($info['data_handler_class_name']) ? $info['data_handler_class_name'] : '';
-        $data                    = isset($info['data']) && isset($info['data']['MSG_generation_data']) ? $info['data']['MSG_generation_data'] : array();
-        if ($data && $this->current()->STS_ID() === EEM_Message::status_incomplete) {
-            $this->current()->set_generation_data($data);
-            $this->current()->set_field_or_extra_meta('data_handler_class_name', $data_handler_class_name);
-        }
-    }
-
-
-    /**
-     * This method returns a count of messages in the repository that have a given priority.
-     *
-     * @param int   $priority the priority that is being filtered for the count.
-     * @param array $status   the optional status(es) that will also be filtered by when priority matches.
-     * @return int  count of messages in the queue matching the conditions.
-     */
-    public function count_by_priority_and_status($priority, $status = array())
-    {
-        if ( ! empty($status)) {
-            $status = is_array($status) ? $status : array($status);
-        }
-
-        $count = 0;
-        $this->rewind();
-        while ($this->valid()) {
-            if ($this->current()->priority() === $priority && (($status && in_array($this->current()->STS_ID(),
-                            $status)) || ! $status)
-            ) {
-                $count++;
-            }
-            $this->next();
-        }
-        return $count;
-    }
-
-
-    /**
-     * @return EE_Message
-     */
-    public function current()
-    {
-        return parent::current();
-    }
+	/**
+	 *    EE_Message_Repository constructor
+	 */
+	public function __construct()
+	{
+		$this->interface = 'EE_Message';
+		parent::__construct();
+	}
+
+
+	/**
+	 * Add the EE_Message to the repository.
+	 * This also ensures that the MSG_token is saves as a part of the info for retrieval.
+	 *
+	 * @param EE_Message $message
+	 * @param mixed      $info Any included data is saved in the attached object info array indexed by 'data'
+	 * @return bool
+	 */
+	public function add($message, $info = null)
+	{
+		$attached = parent::add($message);
+		//ensure $info is an array if not already
+		$info = $info === null ? $info = array() : (array)$info;
+		$data = $this->_init_data($info, $attached, $message);
+		if ($attached) {
+			$this->set_info($message, $data);
+		}
+		return $attached;
+	}
+
+
+	/**
+	 * Initializes the data from the incoming info.
+	 *
+	 * @param array      $info     incoming data.
+	 * @param bool       $attached Indicates whether the object was attached successfully.
+	 * @param EE_Message $message
+	 * @return array
+	 */
+	protected function _init_data($info, $attached, $message)
+	{
+		$data = array(
+			'test_send'               => false,
+			'preview'                 => false,
+			'data_handler_class_name' => '',
+			'data'                    => array(
+				'MSG_generation_data' => array(),
+			),
+		);
+		if (isset($info['preview'])) {
+			$data['preview'] = $info['preview'];
+			unset($info['preview']);
+		}
+		if (isset($info['test_send'])) {
+			$data['test_send'] = $info['test_send'];
+			unset($info['test_send']);
+		}
+		if (isset($info['data_handler_class_name'])) {
+			$data['data_handler_class_name'] = $info['data_handler_class_name'];
+			unset($info['data_handler_class_name']);
+		}
+		if ($attached && $message->STS_ID() === EEM_Message::status_incomplete) {
+			$generation_data = isset($info['MSG_generation_data']) ? $info['MSG_generation_data'] : array();
+			//if data isn't in $info...let's see if its available via the message object
+			$generation_data = ! $generation_data ? $message->get_generation_data() : $generation_data;
+			//still empty then let's just use info
+			$generation_data                     = ! $generation_data ? $info : $generation_data;
+			$data['data']['MSG_generation_data'] = $generation_data;
+		}
+		return $data;
+	}
+
+
+	/**
+	 * Save all EE_Message objects to the db.
+	 *
+	 * @param bool $do_hooks_only  When true, only the hooks related to saving are fired.
+	 * @return array array(
+	 *                  'updated' => 0, //count of how many messages updated
+	 *                  'notupdated' => 0, //count of how many messages not updated.
+	 *                  'errors' => array( $token ), //array of message object tokens that had errors in saving
+	 *                  )
+	 */
+	public function saveAll($do_hooks_only = false)
+	{
+		$save_tracking = array('updated' => 0, 'notupdated' => 0, 'errors' => array());
+
+		if (! $do_hooks_only) {
+			$this->rewind();
+			//exit early if there is nothing to save.
+			if ($this->count() < 1) {
+				return $save_tracking;
+			}
+
+			while ($this->valid()) {
+				$saved = $this->current()->save();
+				if ($saved === false) {
+					$save_tracking['errors'][] = $this->current()->MSG_token();
+				} elseif ($saved) {
+					$save_tracking['updated']++;
+				} else {
+					$save_tracking['notupdated']++;
+				}
+				//maybe persist generation data if this is an incomplete EE_Message.
+				$this->_maybe_persist_attached_data();
+
+				$this->next();
+			}
+		}
+		do_action('AHEE__EE_Message_Repository__saveAll__after', $save_tracking, $this, $do_hooks_only);
+		return $save_tracking;
+	}
+
+
+	/**
+	 * Retrieves a EE_Message from the repository that matches the given token.
+	 *
+	 * @param string $token Token.
+	 * @return EE_Message | null
+	 */
+	public function getMessageByToken($token)
+	{
+		$this->rewind();
+		while ($this->valid()) {
+			if ($this->current()->MSG_token() === $token) {
+				$message = $this->current();
+				$this->rewind();
+				return $message;
+			}
+			$this->next();
+		}
+		return null;
+	}
+
+
+	/**
+	 * This retrieves any data required for generation that may be saved with the current EE_Message in storage.
+	 *
+	 * @return array();
+	 */
+	public function get_generation_data()
+	{
+		//first verify we're at a valid iterator point.
+		if ( ! $this->valid()) {
+			return array();
+		}
+		$info = $this->getInfo();
+		return isset($info['data']) && isset($info['data']['MSG_generation_data']) ? $info['data']['MSG_generation_data'] : array();
+	}
+
+
+	/**
+	 * Retrieves the data_handler_class_name or reference associated with the current EE_Message object in the iterator.
+	 *
+	 * @return string
+	 */
+	public function get_data_handler()
+	{
+		if ( ! $this->valid()) {
+			return '';
+		}
+		$info = $this->getInfo();
+		return isset($info['data_handler_class_name']) ? $info['data_handler_class_name'] : '';
+	}
+
+
+	/**
+	 * Returns whether this EE_Message is for a preview or not.
+	 *
+	 * @return bool
+	 */
+	public function is_preview()
+	{
+		if ( ! $this->valid()) {
+			return false;
+		}
+		$info = $this->getInfo();
+		return $info['preview'];
+	}
+
+
+	/**
+	 * Returns whether the current message pointed to is for a test send.
+	 *
+	 * @return bool
+	 */
+	public function is_test_send()
+	{
+		if ( ! $this->valid()) {
+			return false;
+		}
+		$info = $this->getInfo();
+		return $info['test_send'];
+	}
+
+
+	/**
+	 *  This checks if the current EE_Message in the iterator is incomplete. If it is, then
+	 *  data is attached for later retrieval (batch generation).
+	 */
+	protected function _maybe_persist_attached_data()
+	{
+		if ( ! $this->valid()) {
+			return;
+		}
+
+		$info                    = $this->getInfo();
+		$data_handler_class_name = isset($info['data_handler_class_name']) ? $info['data_handler_class_name'] : '';
+		$data                    = isset($info['data']) && isset($info['data']['MSG_generation_data']) ? $info['data']['MSG_generation_data'] : array();
+		if ($data && $this->current()->STS_ID() === EEM_Message::status_incomplete) {
+			$this->current()->set_generation_data($data);
+			$this->current()->set_field_or_extra_meta('data_handler_class_name', $data_handler_class_name);
+		}
+	}
+
+
+	/**
+	 * This method returns a count of messages in the repository that have a given priority.
+	 *
+	 * @param int   $priority the priority that is being filtered for the count.
+	 * @param array $status   the optional status(es) that will also be filtered by when priority matches.
+	 * @return int  count of messages in the queue matching the conditions.
+	 */
+	public function count_by_priority_and_status($priority, $status = array())
+	{
+		if ( ! empty($status)) {
+			$status = is_array($status) ? $status : array($status);
+		}
+
+		$count = 0;
+		$this->rewind();
+		while ($this->valid()) {
+			if ($this->current()->priority() === $priority && (($status && in_array($this->current()->STS_ID(),
+							$status)) || ! $status)
+			) {
+				$count++;
+			}
+			$this->next();
+		}
+		return $count;
+	}
+
+
+	/**
+	 * @return EE_Message
+	 */
+	public function current()
+	{
+		return parent::current();
+	}
 
 
 }
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (! defined('EVENT_ESPRESSO_VERSION')) {
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
     exit('No direct script access allowed');
 }
 
@@ -38,7 +38,7 @@ 
     {
         $attached = parent::add($message);
         //ensure $info is an array if not already
-        $info = $info === null ? $info = array() : (array)$info;
+        $info = $info === null ? $info = array() : (array) $info;
         $data = $this->_init_data($info, $attached, $message);
         if ($attached) {
             $this->set_info($message, $data);
@@ -103,7 +103,7 @@ 
     {
         $save_tracking = array('updated' => 0, 'notupdated' => 0, 'errors' => array());
 
-        if (! $do_hooks_only) {
+        if ( ! $do_hooks_only) {
             $this->rewind();
             //exit early if there is nothing to save.
             if ($this->count() < 1) {