eventespresso / event-espresso-core

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

Indentation +132 added lines, -132 removed lines

@@ -14,136 +14,136 @@
 class EE_Div_Per_Section_Layout extends EE_Form_Section_Layout_Base
 {
 
-    /**
-     * opening div tag for a form
-     *
-     * @return string
-     */
-    public function layout_form_begin()
-    {
-        return EEH_HTML::div(
-            '',
-            $this->_form_section->html_id(),
-            $this->_form_section->html_class(),
-            $this->_form_section->html_style()
-        );
-    }
-
-
-
-    /**
-     * 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 = '';
-        // set something unique for the id
-        $html_id = (string) $input->html_id() !== ''
-            ? (string) $input->html_id()
-            : spl_object_hash($input);
-        // and add a generic input type class
-        $html_class = sanitize_key(str_replace('_', '-', get_class($input))) . '-dv';
-        if ($input instanceof EE_Hidden_Input) {
-            $html .= EEH_HTML::nl() . $input->get_html_for_input();
-        } elseif ($input instanceof EE_Submit_Input) {
-            $html .= EEH_HTML::div(
-                $input->get_html_for_input(),
-                $html_id . '-submit-dv',
-                "{$input->html_class()}-submit-dv {$html_class}"
-            );
-        } elseif ($input instanceof EE_Select_Input) {
-            $html .= EEH_HTML::div(
-                EEH_HTML::nl(1) . $input->get_html_for_label() .
-                EEH_HTML::nl() . $input->get_html_for_errors() .
-                EEH_HTML::nl() . $input->get_html_for_input() .
-                EEH_HTML::nl() . $input->get_html_for_help(),
-                $html_id . '-input-dv',
-                "{$input->html_class()}-input-dv {$html_class}"
-            );
-        } elseif ($input instanceof EE_Form_Input_With_Options_Base) {
-            $html .= EEH_HTML::div(
-                EEH_HTML::nl() . $this->_display_label_for_option_type_question($input) .
-                EEH_HTML::nl() . $input->get_html_for_errors() .
-                EEH_HTML::nl() . $input->get_html_for_input() .
-                EEH_HTML::nl() . $input->get_html_for_help(),
-                $html_id . '-input-dv',
-                "{$input->html_class()}-input-dv {$html_class}"
-            );
-        } else {
-            $html .= EEH_HTML::div(
-                EEH_HTML::nl(1) . $input->get_html_for_label() .
-                EEH_HTML::nl() . $input->get_html_for_errors() .
-                EEH_HTML::nl() . $input->get_html_for_input() .
-                EEH_HTML::nl() . $input->get_html_for_help(),
-                $html_id . '-input-dv',
-                "{$input->html_class()}-input-dv {$html_class}"
-            );
-        }
-        return $html;
-    }
-
-
-
-    /**
-     *
-     * _display_label_for_option_type_question
-     * Gets the HTML for the 'label', which is just text for this (because labels
-     * should be for each input)
-     *
-     * @param EE_Form_Input_With_Options_Base $input
-     * @return string
-     */
-    protected function _display_label_for_option_type_question(EE_Form_Input_With_Options_Base $input)
-    {
-        if ($input->display_html_label_text()) {
-            $html_label_text = $input->html_label_text();
-            $label_html = EEH_HTML::div(
-                $input->required()
-                    ? $html_label_text . EEH_HTML::span('*', '', 'ee-asterisk')
-                    : $html_label_text,
-                $input->html_label_id(),
-                $input->required()
-                    ? 'ee-required-label ' . $input->html_label_class()
-                    : $input->html_label_class(),
-                $input->html_label_style(),
-                $input->html_other_attributes()
-            );
-            // if no content was provided to EEH_HTML::div() above (ie: an empty label),
-            // then we need to close the div manually
-            if (empty($html_label_text)) {
-                $label_html .= EEH_HTML::divx($input->html_label_id(), $input->html_label_class());
-            }
-            return $label_html;
-        }
-        return '';
-    }
-
-
-
-    /**
-     * Lays out a row for the subsection
-     *
-     * @param EE_Form_Section_Proper $form_section
-     * @return string
-     */
-    public function layout_subsection($form_section)
-    {
-        return EEH_HTML::nl(1) . $form_section->get_html() . EEH_HTML::nl(-1);
-    }
-
-
-
-    /**
-     * closing div tag for a form
-     *
-     * @return string
-     */
-    public function layout_form_end()
-    {
-        return EEH_HTML::divx($this->_form_section->html_id(), $this->_form_section->html_class());
-    }
+	/**
+	 * opening div tag for a form
+	 *
+	 * @return string
+	 */
+	public function layout_form_begin()
+	{
+		return EEH_HTML::div(
+			'',
+			$this->_form_section->html_id(),
+			$this->_form_section->html_class(),
+			$this->_form_section->html_style()
+		);
+	}
+
+
+
+	/**
+	 * 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 = '';
+		// set something unique for the id
+		$html_id = (string) $input->html_id() !== ''
+			? (string) $input->html_id()
+			: spl_object_hash($input);
+		// and add a generic input type class
+		$html_class = sanitize_key(str_replace('_', '-', get_class($input))) . '-dv';
+		if ($input instanceof EE_Hidden_Input) {
+			$html .= EEH_HTML::nl() . $input->get_html_for_input();
+		} elseif ($input instanceof EE_Submit_Input) {
+			$html .= EEH_HTML::div(
+				$input->get_html_for_input(),
+				$html_id . '-submit-dv',
+				"{$input->html_class()}-submit-dv {$html_class}"
+			);
+		} elseif ($input instanceof EE_Select_Input) {
+			$html .= EEH_HTML::div(
+				EEH_HTML::nl(1) . $input->get_html_for_label() .
+				EEH_HTML::nl() . $input->get_html_for_errors() .
+				EEH_HTML::nl() . $input->get_html_for_input() .
+				EEH_HTML::nl() . $input->get_html_for_help(),
+				$html_id . '-input-dv',
+				"{$input->html_class()}-input-dv {$html_class}"
+			);
+		} elseif ($input instanceof EE_Form_Input_With_Options_Base) {
+			$html .= EEH_HTML::div(
+				EEH_HTML::nl() . $this->_display_label_for_option_type_question($input) .
+				EEH_HTML::nl() . $input->get_html_for_errors() .
+				EEH_HTML::nl() . $input->get_html_for_input() .
+				EEH_HTML::nl() . $input->get_html_for_help(),
+				$html_id . '-input-dv',
+				"{$input->html_class()}-input-dv {$html_class}"
+			);
+		} else {
+			$html .= EEH_HTML::div(
+				EEH_HTML::nl(1) . $input->get_html_for_label() .
+				EEH_HTML::nl() . $input->get_html_for_errors() .
+				EEH_HTML::nl() . $input->get_html_for_input() .
+				EEH_HTML::nl() . $input->get_html_for_help(),
+				$html_id . '-input-dv',
+				"{$input->html_class()}-input-dv {$html_class}"
+			);
+		}
+		return $html;
+	}
+
+
+
+	/**
+	 *
+	 * _display_label_for_option_type_question
+	 * Gets the HTML for the 'label', which is just text for this (because labels
+	 * should be for each input)
+	 *
+	 * @param EE_Form_Input_With_Options_Base $input
+	 * @return string
+	 */
+	protected function _display_label_for_option_type_question(EE_Form_Input_With_Options_Base $input)
+	{
+		if ($input->display_html_label_text()) {
+			$html_label_text = $input->html_label_text();
+			$label_html = EEH_HTML::div(
+				$input->required()
+					? $html_label_text . EEH_HTML::span('*', '', 'ee-asterisk')
+					: $html_label_text,
+				$input->html_label_id(),
+				$input->required()
+					? 'ee-required-label ' . $input->html_label_class()
+					: $input->html_label_class(),
+				$input->html_label_style(),
+				$input->html_other_attributes()
+			);
+			// if no content was provided to EEH_HTML::div() above (ie: an empty label),
+			// then we need to close the div manually
+			if (empty($html_label_text)) {
+				$label_html .= EEH_HTML::divx($input->html_label_id(), $input->html_label_class());
+			}
+			return $label_html;
+		}
+		return '';
+	}
+
+
+
+	/**
+	 * Lays out a row for the subsection
+	 *
+	 * @param EE_Form_Section_Proper $form_section
+	 * @return string
+	 */
+	public function layout_subsection($form_section)
+	{
+		return EEH_HTML::nl(1) . $form_section->get_html() . EEH_HTML::nl(-1);
+	}
+
+
+
+	/**
+	 * closing div tag for a form
+	 *
+	 * @return string
+	 */
+	public function layout_form_end()
+	{
+		return EEH_HTML::divx($this->_form_section->html_id(), $this->_form_section->html_class());
+	}
 }

Spacing +21 added lines, -21 removed lines

@@ -46,40 +46,40 @@ 
             ? (string) $input->html_id()
             : spl_object_hash($input);
         // and add a generic input type class
-        $html_class = sanitize_key(str_replace('_', '-', get_class($input))) . '-dv';
+        $html_class = sanitize_key(str_replace('_', '-', get_class($input))).'-dv';
         if ($input instanceof EE_Hidden_Input) {
-            $html .= EEH_HTML::nl() . $input->get_html_for_input();
+            $html .= EEH_HTML::nl().$input->get_html_for_input();
         } elseif ($input instanceof EE_Submit_Input) {
             $html .= EEH_HTML::div(
                 $input->get_html_for_input(),
-                $html_id . '-submit-dv',
+                $html_id.'-submit-dv',
                 "{$input->html_class()}-submit-dv {$html_class}"
             );
         } elseif ($input instanceof EE_Select_Input) {
             $html .= EEH_HTML::div(
-                EEH_HTML::nl(1) . $input->get_html_for_label() .
-                EEH_HTML::nl() . $input->get_html_for_errors() .
-                EEH_HTML::nl() . $input->get_html_for_input() .
-                EEH_HTML::nl() . $input->get_html_for_help(),
-                $html_id . '-input-dv',
+                EEH_HTML::nl(1).$input->get_html_for_label().
+                EEH_HTML::nl().$input->get_html_for_errors().
+                EEH_HTML::nl().$input->get_html_for_input().
+                EEH_HTML::nl().$input->get_html_for_help(),
+                $html_id.'-input-dv',
                 "{$input->html_class()}-input-dv {$html_class}"
             );
         } elseif ($input instanceof EE_Form_Input_With_Options_Base) {
             $html .= EEH_HTML::div(
-                EEH_HTML::nl() . $this->_display_label_for_option_type_question($input) .
-                EEH_HTML::nl() . $input->get_html_for_errors() .
-                EEH_HTML::nl() . $input->get_html_for_input() .
-                EEH_HTML::nl() . $input->get_html_for_help(),
-                $html_id . '-input-dv',
+                EEH_HTML::nl().$this->_display_label_for_option_type_question($input).
+                EEH_HTML::nl().$input->get_html_for_errors().
+                EEH_HTML::nl().$input->get_html_for_input().
+                EEH_HTML::nl().$input->get_html_for_help(),
+                $html_id.'-input-dv',
                 "{$input->html_class()}-input-dv {$html_class}"
             );
         } else {
             $html .= EEH_HTML::div(
-                EEH_HTML::nl(1) . $input->get_html_for_label() .
-                EEH_HTML::nl() . $input->get_html_for_errors() .
-                EEH_HTML::nl() . $input->get_html_for_input() .
-                EEH_HTML::nl() . $input->get_html_for_help(),
-                $html_id . '-input-dv',
+                EEH_HTML::nl(1).$input->get_html_for_label().
+                EEH_HTML::nl().$input->get_html_for_errors().
+                EEH_HTML::nl().$input->get_html_for_input().
+                EEH_HTML::nl().$input->get_html_for_help(),
+                $html_id.'-input-dv',
                 "{$input->html_class()}-input-dv {$html_class}"
             );
         }
@@ -103,11 +103,11 @@ 
             $html_label_text = $input->html_label_text();
             $label_html = EEH_HTML::div(
                 $input->required()
-                    ? $html_label_text . EEH_HTML::span('*', '', 'ee-asterisk')
+                    ? $html_label_text.EEH_HTML::span('*', '', 'ee-asterisk')
                     : $html_label_text,
                 $input->html_label_id(),
                 $input->required()
-                    ? 'ee-required-label ' . $input->html_label_class()
+                    ? 'ee-required-label '.$input->html_label_class()
                     : $input->html_label_class(),
                 $input->html_label_style(),
                 $input->html_other_attributes()
@@ -132,7 +132,7 @@ 
      */
     public function layout_subsection($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/layout/EE_Fieldset_Section_Layout.strategy.php

Indentation +103 added lines, -103 removed lines

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

Spacing +3 added lines, -3 removed lines

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

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

Indentation +70 added lines, -70 removed lines

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

Spacing +5 added lines, -5 removed lines

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

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

Indentation +78 added lines, -78 removed lines

@@ -3,88 +3,88 @@
 class EE_Admin_One_Column_Layout extends EE_Form_Section_Layout_Base
 {
 
-    /**
-     * Starts the form section
-     *
-     * @param array $additional_args
-     * @return string
-     */
-    public function layout_form_begin($additional_args = array())
-    {
-        return EEH_HTML::table(
-            '',
-            $this->_form_section->html_id(),
-            $this->_form_section->html_class() . ' form-table',
-            $this->_form_section->html_style()
-        ) . EEH_HTML::tbody();
-    }
+	/**
+	 * Starts the form section
+	 *
+	 * @param array $additional_args
+	 * @return string
+	 */
+	public function layout_form_begin($additional_args = array())
+	{
+		return EEH_HTML::table(
+			'',
+			$this->_form_section->html_id(),
+			$this->_form_section->html_class() . ' form-table',
+			$this->_form_section->html_style()
+		) . EEH_HTML::tbody();
+	}
 
 
-    /**
-     * Ends the form section
-     *
-     * @param array $additional_args
-     * @return string
-     */
-    public function layout_form_end($additional_args = array())
-    {
-        return EEH_HTML::tbodyx() . EEH_HTML::tablex($this->_form_section->html_id());
-    }
+	/**
+	 * Ends the form section
+	 *
+	 * @param array $additional_args
+	 * @return string
+	 */
+	public function layout_form_end($additional_args = array())
+	{
+		return EEH_HTML::tbodyx() . EEH_HTML::tablex($this->_form_section->html_id());
+	}
 
 
-    /**
-     * Lays out the row for the input, including label and errors
-     *
-     * @param EE_Form_Input_Base $input
-     * @return string
-     * @throws EE_Error
-     */
-    public function layout_input($input)
-    {
-        if ($input->get_display_strategy() instanceof EE_Text_Area_Display_Strategy
-            || $input->get_display_strategy() instanceof EE_Text_Input_Display_Strategy
-            || $input->get_display_strategy() instanceof EE_Admin_File_Uploader_Display_Strategy
-        ) {
-            $input->set_html_class($input->html_class() . ' large-text');
-        }
-        $input_html = $input->get_html_for_input();
-        // maybe add errors and help text ?
-        $input_html .= $input->get_html_for_errors() !== ''
-            ? EEH_HTML::nl() . $input->get_html_for_errors()
-            : '';
-        $input_html .= $input->get_html_for_help() !== ''
-            ? EEH_HTML::nl() . $input->get_html_for_help()
-            : '';
-        // overriding parent to add wp admin specific things.
-        $html = '';
-        if ($input instanceof EE_Hidden_Input) {
-            $html .= EEH_HTML::no_row($input->get_html_for_input());
-        } else {
-            $html .= EEH_HTML::tr(
-                EEH_HTML::td(
-                    $input->get_html_for_label()
-                    . EEH_HTML::nl()
-                    . $input_html
-                )
-            );
-        }
-        return $html;
-    }
+	/**
+	 * Lays out the row for the input, including label and errors
+	 *
+	 * @param EE_Form_Input_Base $input
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function layout_input($input)
+	{
+		if ($input->get_display_strategy() instanceof EE_Text_Area_Display_Strategy
+			|| $input->get_display_strategy() instanceof EE_Text_Input_Display_Strategy
+			|| $input->get_display_strategy() instanceof EE_Admin_File_Uploader_Display_Strategy
+		) {
+			$input->set_html_class($input->html_class() . ' large-text');
+		}
+		$input_html = $input->get_html_for_input();
+		// maybe add errors and help text ?
+		$input_html .= $input->get_html_for_errors() !== ''
+			? EEH_HTML::nl() . $input->get_html_for_errors()
+			: '';
+		$input_html .= $input->get_html_for_help() !== ''
+			? EEH_HTML::nl() . $input->get_html_for_help()
+			: '';
+		// overriding parent to add wp admin specific things.
+		$html = '';
+		if ($input instanceof EE_Hidden_Input) {
+			$html .= EEH_HTML::no_row($input->get_html_for_input());
+		} else {
+			$html .= EEH_HTML::tr(
+				EEH_HTML::td(
+					$input->get_html_for_label()
+					. EEH_HTML::nl()
+					. $input_html
+				)
+			);
+		}
+		return $html;
+	}
 
 
-    /**
-     * Lays out a row for the subsection
-     *
-     * @param EE_Form_Section_Proper $form_section
-     * @return string
-     */
-    public function layout_subsection($form_section)
-    {
-        if ($form_section instanceof EE_Form_Section_Proper
-            || $form_section instanceof EE_Form_Section_HTML
-        ) {
-            return EEH_HTML::no_row($form_section->get_html());
-        }
-        return '';
-    }
+	/**
+	 * Lays out a row for the subsection
+	 *
+	 * @param EE_Form_Section_Proper $form_section
+	 * @return string
+	 */
+	public function layout_subsection($form_section)
+	{
+		if ($form_section instanceof EE_Form_Section_Proper
+			|| $form_section instanceof EE_Form_Section_HTML
+		) {
+			return EEH_HTML::no_row($form_section->get_html());
+		}
+		return '';
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -14,9 +14,9 @@ 
         return EEH_HTML::table(
             '',
             $this->_form_section->html_id(),
-            $this->_form_section->html_class() . ' form-table',
+            $this->_form_section->html_class().' form-table',
             $this->_form_section->html_style()
-        ) . EEH_HTML::tbody();
+        ).EEH_HTML::tbody();
     }
 
 
@@ -28,7 +28,7 @@ 
      */
     public function layout_form_end($additional_args = array())
     {
-        return EEH_HTML::tbodyx() . EEH_HTML::tablex($this->_form_section->html_id());
+        return EEH_HTML::tbodyx().EEH_HTML::tablex($this->_form_section->html_id());
     }
 
 
@@ -45,15 +45,15 @@ 
             || $input->get_display_strategy() instanceof EE_Text_Input_Display_Strategy
             || $input->get_display_strategy() instanceof EE_Admin_File_Uploader_Display_Strategy
         ) {
-            $input->set_html_class($input->html_class() . ' large-text');
+            $input->set_html_class($input->html_class().' large-text');
         }
         $input_html = $input->get_html_for_input();
         // maybe add errors and help text ?
         $input_html .= $input->get_html_for_errors() !== ''
-            ? EEH_HTML::nl() . $input->get_html_for_errors()
+            ? EEH_HTML::nl().$input->get_html_for_errors()
             : '';
         $input_html .= $input->get_html_for_help() !== ''
-            ? EEH_HTML::nl() . $input->get_html_for_help()
+            ? EEH_HTML::nl().$input->get_html_for_help()
             : '';
         // overriding parent to add wp admin specific things.
         $html = '';

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

Indentation +113 added lines, -113 removed lines

@@ -12,117 +12,117 @@
 {
 
 
-    /**
-     * 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();
-    }
-
-
-
-    /**
-     * 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();
-        } elseif ($input instanceof EE_Submit_Input) {
-            $html .= $this->br();
-            $html .= $input->get_html_for_input();
-        } elseif ($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();
-        } elseif ($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)
-    {
-        //      d( $form_section );
-        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);
-    }
-
-
-
-    /**
-     * 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 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();
+	}
+
+
+
+	/**
+	 * 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();
+		} elseif ($input instanceof EE_Submit_Input) {
+			$html .= $this->br();
+			$html .= $input->get_html_for_input();
+		} elseif ($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();
+		} elseif ($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)
+	{
+		//      d( $form_section );
+		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);
+	}
+
+
+
+	/**
+	 * 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() : '';
+	}
 }

Spacing +13 added lines, -13 removed lines

@@ -61,28 +61,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();
         } elseif ($input instanceof EE_Submit_Input) {
             $html .= $this->br();
             $html .= $input->get_html_for_input();
         } elseif ($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();
         } elseif ($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;
@@ -99,7 +99,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/validation/EE_Int_Validation_Strategy.strategy.php

Indentation +31 added lines, -31 removed lines

@@ -9,41 +9,41 @@
 class EE_Int_Validation_Strategy extends EE_Validation_Strategy_Base
 {
 
-    /**
-     * @param null $validation_error_message
-     */
-    public function __construct($validation_error_message = null)
-    {
-        if (! $validation_error_message) {
-            $validation_error_message = __("Only digits are allowed.", "event_espresso");
-        }
-        parent::__construct($validation_error_message);
-    }
+	/**
+	 * @param null $validation_error_message
+	 */
+	public function __construct($validation_error_message = null)
+	{
+		if (! $validation_error_message) {
+			$validation_error_message = __("Only digits are allowed.", "event_espresso");
+		}
+		parent::__construct($validation_error_message);
+	}
 
 
 
-    /**
-     * @param $normalized_value
-     */
-    public function validate($normalized_value)
-    {
-        // this should have already been detected by the normalization strategy
-    }
+	/**
+	 * @param $normalized_value
+	 */
+	public function validate($normalized_value)
+	{
+		// this should have already been detected by the normalization strategy
+	}
 
 
 
-    /**
-     * @return array
-     */
-    public function get_jquery_validation_rule_array()
-    {
-        return array(
-            'number'=>true,
-            'step' => 1,
-            'messages' => array(
-                'number' => $this->get_validation_error_message(),
-                'step' => $this->get_validation_error_message()
-            )
-        );
-    }
+	/**
+	 * @return array
+	 */
+	public function get_jquery_validation_rule_array()
+	{
+		return array(
+			'number'=>true,
+			'step' => 1,
+			'messages' => array(
+				'number' => $this->get_validation_error_message(),
+				'step' => $this->get_validation_error_message()
+			)
+		);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
      */
     public function __construct($validation_error_message = null)
     {
-        if (! $validation_error_message) {
+        if ( ! $validation_error_message) {
             $validation_error_message = __("Only digits are allowed.", "event_espresso");
         }
         parent::__construct($validation_error_message);

core/libraries/form_sections/strategies/validation/EE_Conditionally_Required_Validation_Strategy.strategy.php

Indentation +241 added lines, -241 removed lines

@@ -11,245 +11,245 @@
 class EE_Conditionally_Required_Validation_Strategy extends EE_Validation_Strategy_Base
 {
 
-    /**
-     * Array describing conditions necessary to make the input required.
-     * This is used to derive a jquery dependency expression (see http://jqueryvalidation.org/required-method)
-     * or jquery callback; and server-side logic to determine if the field is necessary.
-     * @var array
-     */
-    protected $requirement_conditions;
-
-
-
-    /**
-     * @param string $validation_error_message
-     * @param array $requirement_conditions
-     */
-    public function __construct($validation_error_message = null, $requirement_conditions = array())
-    {
-        if (! $validation_error_message) {
-            $validation_error_message = __("This field is required.", "event_espresso");
-        }
-        $this->set_requirement_conditions($requirement_conditions);
-        parent::__construct($validation_error_message);
-    }
-
-
-
-    /**
-     * just checks the field isn't blank, provided the requirement conditions
-     * indicate this input is still required
-     *
-     * @param $normalized_value
-     * @return bool
-     * @throws \EE_Error
-     * @throws \EE_Validation_Error
-     */
-    public function validate($normalized_value)
-    {
-        if ((
-                $normalized_value === ''
-                || $normalized_value === null
-                || $normalized_value === array()
-            )
-            && $this->_input_is_required_server_side()
-        ) {
-            throw new EE_Validation_Error($this->get_validation_error_message(), 'required');
-        } else {
-            return true;
-        }
-    }
-
-
-
-    /**
-     * @return array
-     * @throws \EE_Error
-     */
-    public function get_jquery_validation_rule_array()
-    {
-        return array(
-            'required'=> $this->_get_jquery_requirement_value(),
-            'messages' => array(
-                'required' => $this->get_validation_error_message()
-            )
-        );
-    }
-
-    /**
-     * Sets the "required conditions". This should be an array, its top-level key
-     * is the name of a field, its value is an array. This 2nd level array has two items:
-     * the first is the operator (for now only '=' is accepted), and teh 2nd argument is the
-     * the value the field should be in order to make the field required.
-     * Eg array( 'payment_type' => array( '=', 'credit_card' ).
-     *
-     * @param array $requirement_conditions
-     */
-    public function set_requirement_conditions($requirement_conditions)
-    {
-        $this->requirement_conditions = (array) $requirement_conditions;
-    }
-
-    /**
-     * Gets the array that describes when the related input should be required.
-     * see set_requirement_conditions for a description of how it should be formatted
-     * @return array
-     */
-    public function get_requirement_conditions()
-    {
-        return $this->requirement_conditions;
-    }
-
-
-
-    /**
-     * gets jQuery dependency expression used for client-side validation
-     * Its possible this could also return a javascript callback used for determining
-     * if the input is required or not. That is not yet implemented, however.
-     *
-     * @return string see http://jqueryvalidation.org/required-method for format
-     * @throws \EE_Error
-     */
-    protected function _get_jquery_requirement_value()
-    {
-        $requirement_value = '';
-        $conditions = $this->get_requirement_conditions();
-        if (! is_array($conditions)) {
-            EE_Error::throw_exception_if_debugging(
-                sprintf(
-                    __('Input requirement conditions must be an array. You provided %1$s', 'event_espresso'),
-                    $this->_input->name()
-                ),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-            return true;
-        }
-        if (count($conditions) > 1) {
-            EE_Error::throw_exception_if_debugging(
-                sprintf(
-                    __('Required Validation Strategy does not yet support multiple conditions. You should add it! The related input is %1$s', 'event_espresso'),
-                    $this->_input->name()
-                ),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-        }
-        foreach ($conditions as $input_path => $op_and_value) {
-            $input = $this->_input->find_section_from_path($input_path);
-            if (! $input instanceof EE_Form_Input_Base) {
-                EE_Error::throw_exception_if_debugging(
-                    sprintf(
-                        __('Error encountered while setting requirement condition for input %1$s. The path %2$s does not correspond to a valid input', 'event_espresso'),
-                        $this->_input->name(),
-                        $input_path
-                    ),
-                    __FILE__,
-                    __FUNCTION__,
-                    __LINE__
-                );
-                return false;
-            }
-            list( $op, $value ) = $this->_validate_op_and_value($op_and_value);
-            // ok now the jquery dependency expression depends on the input's display strategy.
-            if (! $input->get_display_strategy() instanceof EE_Select_Display_Strategy) {
-                EE_Error::throw_exception_if_debugging(
-                    sprintf(
-                        __('Required Validation Strategy can only depend on another input which uses the EE_Select_Display_Strategy, but you specified a field "%1$s" that uses display strategy "%2$s". If you need others, please add support for it! The related input is %3$s', 'event_espresso'),
-                        $input->name(),
-                        get_class($input->get_display_strategy()),
-                        $this->_input->name()
-                    ),
-                    __FILE__,
-                    __FUNCTION__,
-                    __LINE__
-                );
-            }
-            $requirement_value = $input->html_id(true) . ' option[value="' . $value . '"]:selected';
-        }
-        return $requirement_value;
-    }
-
-
-
-    /**
-     * Returns whether or not this input is required based on the _requirement_conditions
-     * (not whether or not the input passes validation. That's for the validate method
-     * to decide)
-     *
-     * @return boolean
-     * @throws \EE_Error
-     */
-    protected function _input_is_required_server_side()
-    {
-        $meets_all_requirements = true;
-        $conditions = $this->get_requirement_conditions();
-        foreach ($conditions as $input_path => $op_and_value) {
-            $input = $this->_input->find_section_from_path($input_path);
-            if (! $input instanceof EE_Form_Input_Base) {
-                EE_Error::throw_exception_if_debugging(
-                    sprintf(
-                        __('Error encountered while setting requirement condition for input %1$s. The path %2$s does not correspond to a valid input', 'event_espresso'),
-                        $this->_input->name(),
-                        $input_path
-                    ),
-                    __FILE__,
-                    __FUNCTION__,
-                    __LINE__
-                );
-                return false;
-            }
-            list( $op, $value ) = $this->_validate_op_and_value($op_and_value);
-            switch ($op) {
-                case '=':
-                default:
-                    $meets_all_requirements = $input->normalized_value() === $value;
-            }
-            if (! $meets_all_requirements) {
-                break;
-            }
-        }
-        return $meets_all_requirements;
-    }
-
-
-
-    /**
-     * Verifies this is an array with keys 0 and 1, where key 0 is a usable
-     * operator (initially just '=') and key 1 is something that can be cast to a string
-     *
-     * @param array $op_and_value
-     * @return array
-     * @throws \EE_Error
-     */
-    protected function _validate_op_and_value($op_and_value)
-    {
-        if (! isset($op_and_value[0], $op_and_value[1])) {
-                EE_Error::throw_exception_if_debugging(
-                    sprintf(
-                        __('Required Validation Strategy conditions array\'s value must be an array with two elements: an operator, and a value. It didn\'t. The related input is %1$s', 'event_espresso'),
-                        $this->_input->name()
-                    ),
-                    __FILE__,
-                    __FUNCTION__,
-                    __LINE__
-                );
-        }
-            $operator = $op_and_value[0];
-            $value = (string) $op_and_value[1];
-        if ($operator !== '=') {
-            EE_Error::throw_exception_if_debugging(
-                sprintf(
-                    __('Required Validation Strategy conditions can currently only use the equals operator. If you need others, please add support for it! The related input is %1$s', 'event_espresso'),
-                    $this->_input->name()
-                ),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-        }
-            return array( $operator, $value );
-    }
+	/**
+	 * Array describing conditions necessary to make the input required.
+	 * This is used to derive a jquery dependency expression (see http://jqueryvalidation.org/required-method)
+	 * or jquery callback; and server-side logic to determine if the field is necessary.
+	 * @var array
+	 */
+	protected $requirement_conditions;
+
+
+
+	/**
+	 * @param string $validation_error_message
+	 * @param array $requirement_conditions
+	 */
+	public function __construct($validation_error_message = null, $requirement_conditions = array())
+	{
+		if (! $validation_error_message) {
+			$validation_error_message = __("This field is required.", "event_espresso");
+		}
+		$this->set_requirement_conditions($requirement_conditions);
+		parent::__construct($validation_error_message);
+	}
+
+
+
+	/**
+	 * just checks the field isn't blank, provided the requirement conditions
+	 * indicate this input is still required
+	 *
+	 * @param $normalized_value
+	 * @return bool
+	 * @throws \EE_Error
+	 * @throws \EE_Validation_Error
+	 */
+	public function validate($normalized_value)
+	{
+		if ((
+				$normalized_value === ''
+				|| $normalized_value === null
+				|| $normalized_value === array()
+			)
+			&& $this->_input_is_required_server_side()
+		) {
+			throw new EE_Validation_Error($this->get_validation_error_message(), 'required');
+		} else {
+			return true;
+		}
+	}
+
+
+
+	/**
+	 * @return array
+	 * @throws \EE_Error
+	 */
+	public function get_jquery_validation_rule_array()
+	{
+		return array(
+			'required'=> $this->_get_jquery_requirement_value(),
+			'messages' => array(
+				'required' => $this->get_validation_error_message()
+			)
+		);
+	}
+
+	/**
+	 * Sets the "required conditions". This should be an array, its top-level key
+	 * is the name of a field, its value is an array. This 2nd level array has two items:
+	 * the first is the operator (for now only '=' is accepted), and teh 2nd argument is the
+	 * the value the field should be in order to make the field required.
+	 * Eg array( 'payment_type' => array( '=', 'credit_card' ).
+	 *
+	 * @param array $requirement_conditions
+	 */
+	public function set_requirement_conditions($requirement_conditions)
+	{
+		$this->requirement_conditions = (array) $requirement_conditions;
+	}
+
+	/**
+	 * Gets the array that describes when the related input should be required.
+	 * see set_requirement_conditions for a description of how it should be formatted
+	 * @return array
+	 */
+	public function get_requirement_conditions()
+	{
+		return $this->requirement_conditions;
+	}
+
+
+
+	/**
+	 * gets jQuery dependency expression used for client-side validation
+	 * Its possible this could also return a javascript callback used for determining
+	 * if the input is required or not. That is not yet implemented, however.
+	 *
+	 * @return string see http://jqueryvalidation.org/required-method for format
+	 * @throws \EE_Error
+	 */
+	protected function _get_jquery_requirement_value()
+	{
+		$requirement_value = '';
+		$conditions = $this->get_requirement_conditions();
+		if (! is_array($conditions)) {
+			EE_Error::throw_exception_if_debugging(
+				sprintf(
+					__('Input requirement conditions must be an array. You provided %1$s', 'event_espresso'),
+					$this->_input->name()
+				),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+			return true;
+		}
+		if (count($conditions) > 1) {
+			EE_Error::throw_exception_if_debugging(
+				sprintf(
+					__('Required Validation Strategy does not yet support multiple conditions. You should add it! The related input is %1$s', 'event_espresso'),
+					$this->_input->name()
+				),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+		}
+		foreach ($conditions as $input_path => $op_and_value) {
+			$input = $this->_input->find_section_from_path($input_path);
+			if (! $input instanceof EE_Form_Input_Base) {
+				EE_Error::throw_exception_if_debugging(
+					sprintf(
+						__('Error encountered while setting requirement condition for input %1$s. The path %2$s does not correspond to a valid input', 'event_espresso'),
+						$this->_input->name(),
+						$input_path
+					),
+					__FILE__,
+					__FUNCTION__,
+					__LINE__
+				);
+				return false;
+			}
+			list( $op, $value ) = $this->_validate_op_and_value($op_and_value);
+			// ok now the jquery dependency expression depends on the input's display strategy.
+			if (! $input->get_display_strategy() instanceof EE_Select_Display_Strategy) {
+				EE_Error::throw_exception_if_debugging(
+					sprintf(
+						__('Required Validation Strategy can only depend on another input which uses the EE_Select_Display_Strategy, but you specified a field "%1$s" that uses display strategy "%2$s". If you need others, please add support for it! The related input is %3$s', 'event_espresso'),
+						$input->name(),
+						get_class($input->get_display_strategy()),
+						$this->_input->name()
+					),
+					__FILE__,
+					__FUNCTION__,
+					__LINE__
+				);
+			}
+			$requirement_value = $input->html_id(true) . ' option[value="' . $value . '"]:selected';
+		}
+		return $requirement_value;
+	}
+
+
+
+	/**
+	 * Returns whether or not this input is required based on the _requirement_conditions
+	 * (not whether or not the input passes validation. That's for the validate method
+	 * to decide)
+	 *
+	 * @return boolean
+	 * @throws \EE_Error
+	 */
+	protected function _input_is_required_server_side()
+	{
+		$meets_all_requirements = true;
+		$conditions = $this->get_requirement_conditions();
+		foreach ($conditions as $input_path => $op_and_value) {
+			$input = $this->_input->find_section_from_path($input_path);
+			if (! $input instanceof EE_Form_Input_Base) {
+				EE_Error::throw_exception_if_debugging(
+					sprintf(
+						__('Error encountered while setting requirement condition for input %1$s. The path %2$s does not correspond to a valid input', 'event_espresso'),
+						$this->_input->name(),
+						$input_path
+					),
+					__FILE__,
+					__FUNCTION__,
+					__LINE__
+				);
+				return false;
+			}
+			list( $op, $value ) = $this->_validate_op_and_value($op_and_value);
+			switch ($op) {
+				case '=':
+				default:
+					$meets_all_requirements = $input->normalized_value() === $value;
+			}
+			if (! $meets_all_requirements) {
+				break;
+			}
+		}
+		return $meets_all_requirements;
+	}
+
+
+
+	/**
+	 * Verifies this is an array with keys 0 and 1, where key 0 is a usable
+	 * operator (initially just '=') and key 1 is something that can be cast to a string
+	 *
+	 * @param array $op_and_value
+	 * @return array
+	 * @throws \EE_Error
+	 */
+	protected function _validate_op_and_value($op_and_value)
+	{
+		if (! isset($op_and_value[0], $op_and_value[1])) {
+				EE_Error::throw_exception_if_debugging(
+					sprintf(
+						__('Required Validation Strategy conditions array\'s value must be an array with two elements: an operator, and a value. It didn\'t. The related input is %1$s', 'event_espresso'),
+						$this->_input->name()
+					),
+					__FILE__,
+					__FUNCTION__,
+					__LINE__
+				);
+		}
+			$operator = $op_and_value[0];
+			$value = (string) $op_and_value[1];
+		if ($operator !== '=') {
+			EE_Error::throw_exception_if_debugging(
+				sprintf(
+					__('Required Validation Strategy conditions can currently only use the equals operator. If you need others, please add support for it! The related input is %1$s', 'event_espresso'),
+					$this->_input->name()
+				),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+		}
+			return array( $operator, $value );
+	}
 }

Spacing +11 added lines, -11 removed lines

@@ -27,7 +27,7 @@ 
      */
     public function __construct($validation_error_message = null, $requirement_conditions = array())
     {
-        if (! $validation_error_message) {
+        if ( ! $validation_error_message) {
             $validation_error_message = __("This field is required.", "event_espresso");
         }
         $this->set_requirement_conditions($requirement_conditions);
@@ -114,7 +114,7 @@ 
     {
         $requirement_value = '';
         $conditions = $this->get_requirement_conditions();
-        if (! is_array($conditions)) {
+        if ( ! is_array($conditions)) {
             EE_Error::throw_exception_if_debugging(
                 sprintf(
                     __('Input requirement conditions must be an array. You provided %1$s', 'event_espresso'),
@@ -139,7 +139,7 @@ 
         }
         foreach ($conditions as $input_path => $op_and_value) {
             $input = $this->_input->find_section_from_path($input_path);
-            if (! $input instanceof EE_Form_Input_Base) {
+            if ( ! $input instanceof EE_Form_Input_Base) {
                 EE_Error::throw_exception_if_debugging(
                     sprintf(
                         __('Error encountered while setting requirement condition for input %1$s. The path %2$s does not correspond to a valid input', 'event_espresso'),
@@ -152,9 +152,9 @@ 
                 );
                 return false;
             }
-            list( $op, $value ) = $this->_validate_op_and_value($op_and_value);
+            list($op, $value) = $this->_validate_op_and_value($op_and_value);
             // ok now the jquery dependency expression depends on the input's display strategy.
-            if (! $input->get_display_strategy() instanceof EE_Select_Display_Strategy) {
+            if ( ! $input->get_display_strategy() instanceof EE_Select_Display_Strategy) {
                 EE_Error::throw_exception_if_debugging(
                     sprintf(
                         __('Required Validation Strategy can only depend on another input which uses the EE_Select_Display_Strategy, but you specified a field "%1$s" that uses display strategy "%2$s". If you need others, please add support for it! The related input is %3$s', 'event_espresso'),
@@ -167,7 +167,7 @@ 
                     __LINE__
                 );
             }
-            $requirement_value = $input->html_id(true) . ' option[value="' . $value . '"]:selected';
+            $requirement_value = $input->html_id(true).' option[value="'.$value.'"]:selected';
         }
         return $requirement_value;
     }
@@ -188,7 +188,7 @@ 
         $conditions = $this->get_requirement_conditions();
         foreach ($conditions as $input_path => $op_and_value) {
             $input = $this->_input->find_section_from_path($input_path);
-            if (! $input instanceof EE_Form_Input_Base) {
+            if ( ! $input instanceof EE_Form_Input_Base) {
                 EE_Error::throw_exception_if_debugging(
                     sprintf(
                         __('Error encountered while setting requirement condition for input %1$s. The path %2$s does not correspond to a valid input', 'event_espresso'),
@@ -201,13 +201,13 @@ 
                 );
                 return false;
             }
-            list( $op, $value ) = $this->_validate_op_and_value($op_and_value);
+            list($op, $value) = $this->_validate_op_and_value($op_and_value);
             switch ($op) {
                 case '=':
                 default:
                     $meets_all_requirements = $input->normalized_value() === $value;
             }
-            if (! $meets_all_requirements) {
+            if ( ! $meets_all_requirements) {
                 break;
             }
         }
@@ -226,7 +226,7 @@ 
      */
     protected function _validate_op_and_value($op_and_value)
     {
-        if (! isset($op_and_value[0], $op_and_value[1])) {
+        if ( ! isset($op_and_value[0], $op_and_value[1])) {
                 EE_Error::throw_exception_if_debugging(
                     sprintf(
                         __('Required Validation Strategy conditions array\'s value must be an array with two elements: an operator, and a value. It didn\'t. The related input is %1$s', 'event_espresso'),
@@ -250,6 +250,6 @@ 
                 __LINE__
             );
         }
-            return array( $operator, $value );
+            return array($operator, $value);
     }
 }

core/libraries/form_sections/strategies/validation/EE_Required_Validation_Strategy.strategy.php

Indentation +43 added lines, -43 removed lines

@@ -13,53 +13,53 @@
 
 
 
-    /**
-     * @param string $validation_error_message
-     */
-    public function __construct($validation_error_message = null)
-    {
-        if (! $validation_error_message) {
-            $validation_error_message = __("This field is required.", "event_espresso");
-        }
-        parent::__construct($validation_error_message);
-    }
+	/**
+	 * @param string $validation_error_message
+	 */
+	public function __construct($validation_error_message = null)
+	{
+		if (! $validation_error_message) {
+			$validation_error_message = __("This field is required.", "event_espresso");
+		}
+		parent::__construct($validation_error_message);
+	}
 
 
 
-    /**
-     * just checks the field isn't blank, provided the requirement conditions
-     * indicate this input is still required
-     *
-     * @param $normalized_value
-     * @return bool
-     * @throws \EE_Error
-     * @throws \EE_Validation_Error
-     */
-    public function validate($normalized_value)
-    {
-        if ($normalized_value === ''
-            || $normalized_value === null
-            || $normalized_value === array()
-        ) {
-            throw new EE_Validation_Error($this->get_validation_error_message(), 'required');
-        } else {
-            return true;
-        }
-    }
+	/**
+	 * just checks the field isn't blank, provided the requirement conditions
+	 * indicate this input is still required
+	 *
+	 * @param $normalized_value
+	 * @return bool
+	 * @throws \EE_Error
+	 * @throws \EE_Validation_Error
+	 */
+	public function validate($normalized_value)
+	{
+		if ($normalized_value === ''
+			|| $normalized_value === null
+			|| $normalized_value === array()
+		) {
+			throw new EE_Validation_Error($this->get_validation_error_message(), 'required');
+		} else {
+			return true;
+		}
+	}
 
 
 
-    /**
-     * @return array
-     * @throws \EE_Error
-     */
-    public function get_jquery_validation_rule_array()
-    {
-        return array(
-            'required'=> true,
-            'messages' => array(
-                'required' => $this->get_validation_error_message()
-            )
-        );
-    }
+	/**
+	 * @return array
+	 * @throws \EE_Error
+	 */
+	public function get_jquery_validation_rule_array()
+	{
+		return array(
+			'required'=> true,
+			'messages' => array(
+				'required' => $this->get_validation_error_message()
+			)
+		);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
      */
     public function __construct($validation_error_message = null)
     {
-        if (! $validation_error_message) {
+        if ( ! $validation_error_message) {
             $validation_error_message = __("This field is required.", "event_espresso");
         }
         parent::__construct($validation_error_message);

core/libraries/form_sections/strategies/validation/EE_Text_Validation_Strategy.strategy.php

Indentation +40 added lines, -40 removed lines

@@ -10,52 +10,52 @@
 class EE_Text_Validation_Strategy extends EE_Validation_Strategy_Base
 {
 
-    protected $_regex = null;
-    /**
-     *
-     * @param string $validation_error_message
-     * @param string $regex a PHP regex; the javascript regex will be derived from this
-     */
-    public function __construct($validation_error_message = null, $regex = null)
-    {
-        $this->_regex = $regex;
-        parent::__construct($validation_error_message);
-    }
+	protected $_regex = null;
+	/**
+	 *
+	 * @param string $validation_error_message
+	 * @param string $regex a PHP regex; the javascript regex will be derived from this
+	 */
+	public function __construct($validation_error_message = null, $regex = null)
+	{
+		$this->_regex = $regex;
+		parent::__construct($validation_error_message);
+	}
 
-    /**
-     * @param $normalized_value
-     */
-    public function validate($normalized_value)
-    {
-        if ($this->_regex && $normalized_value) {
-            if (! preg_match($this->_regex, $normalized_value)) {
-                throw new EE_Validation_Error($this->get_validation_error_message(), 'regex');
-            }
-        }
-    }
+	/**
+	 * @param $normalized_value
+	 */
+	public function validate($normalized_value)
+	{
+		if ($this->_regex && $normalized_value) {
+			if (! preg_match($this->_regex, $normalized_value)) {
+				throw new EE_Validation_Error($this->get_validation_error_message(), 'regex');
+			}
+		}
+	}
 
-    /**
-     * @return array
-     */
-    public function get_jquery_validation_rule_array()
-    {
-        if ($this->_regex !== null) {
-            return array( 'regex'=> $this->regex_js(), 'messages' => array( 'regex' => $this->get_validation_error_message() ) );
-        } else {
-            return array();
-        }
-    }
+	/**
+	 * @return array
+	 */
+	public function get_jquery_validation_rule_array()
+	{
+		if ($this->_regex !== null) {
+			return array( 'regex'=> $this->regex_js(), 'messages' => array( 'regex' => $this->get_validation_error_message() ) );
+		} else {
+			return array();
+		}
+	}
 
 /**
  * Translates a PHP regex into a javscript regex (eg, PHP needs separate delimieters, whereas
  * javscript does not
  * @return string
  */
-    public function regex_js()
-    {
-        // first character must be the delimiter
-        $delimeter = $this->_regex[0];
-        $last_occurence_of_delimieter = strrpos($this->_regex, $delimeter);
-        return substr($this->_regex, 1, $last_occurence_of_delimieter - 1);
-    }
+	public function regex_js()
+	{
+		// first character must be the delimiter
+		$delimeter = $this->_regex[0];
+		$last_occurence_of_delimieter = strrpos($this->_regex, $delimeter);
+		return substr($this->_regex, 1, $last_occurence_of_delimieter - 1);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -28,7 +28,7 @@ 
     public function validate($normalized_value)
     {
         if ($this->_regex && $normalized_value) {
-            if (! preg_match($this->_regex, $normalized_value)) {
+            if ( ! preg_match($this->_regex, $normalized_value)) {
                 throw new EE_Validation_Error($this->get_validation_error_message(), 'regex');
             }
         }
@@ -40,7 +40,7 @@ 
     public function get_jquery_validation_rule_array()
     {
         if ($this->_regex !== null) {
-            return array( 'regex'=> $this->regex_js(), 'messages' => array( 'regex' => $this->get_validation_error_message() ) );
+            return array('regex'=> $this->regex_js(), 'messages' => array('regex' => $this->get_validation_error_message()));
         } else {
             return array();
         }