eventespresso / event-espresso-core

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

Spacing +6 added lines, -6 removed lines

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

Indentation +80 added lines, -80 removed lines

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

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

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

Indentation +37 added lines, -37 removed lines

@@ -10,41 +10,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 $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()
-            )
-        );
-    }
+	/**
+	 * @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
+	}
+
+
+
+	/**
+	 * @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()
+			)
+		);
+	}
 }

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

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

Indentation +222 added lines, -222 removed lines

@@ -12,246 +12,246 @@
 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;
+	/**
+	 * 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);
-    }
+	/**
+	 * @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;
-        }
-    }
+	/**
+	 * 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()
-            )
-        );
-    }
+	/**
+	 * @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;
-    }
+	/**
+	 * 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 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;
-    }
+	/**
+	 * 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;
-    }
+	/**
+	 * 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 );
-    }
+	/**
+	 * 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 );
+	}
 }

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

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

Indentation +44 added lines, -44 removed lines

@@ -14,54 +14,54 @@
 
 
 
-    /**
-     * @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()
+			)
+		);
+	}
 }

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

Indentation +44 added lines, -44 removed lines

@@ -13,57 +13,57 @@
 class EE_Simple_HTML_Validation_Strategy extends EE_Validation_Strategy_Base
 {
 
-    /**
-     * @param null $validation_error_message
-     */
-    public function __construct($validation_error_message = null)
-    {
-        if (! $validation_error_message) {
-            $allowedtags = $this->_get_allowed_tags();
-            $validation_error_message = sprintf(__("Only simple HTML tags are allowed. Eg, %s", "event_espresso"), implode(",", array_keys($allowedtags)));
-        }
-        parent::__construct($validation_error_message);
-    }
+	/**
+	 * @param null $validation_error_message
+	 */
+	public function __construct($validation_error_message = null)
+	{
+		if (! $validation_error_message) {
+			$allowedtags = $this->_get_allowed_tags();
+			$validation_error_message = sprintf(__("Only simple HTML tags are allowed. Eg, %s", "event_espresso"), implode(",", array_keys($allowedtags)));
+		}
+		parent::__construct($validation_error_message);
+	}
 
 
 
-    /**
-     * get tags allowed
-     */
-    protected function _get_allowed_tags()
-    {
-        return EEH_HTML::get_simple_tags();
-    }
+	/**
+	 * get tags allowed
+	 */
+	protected function _get_allowed_tags()
+	{
+		return EEH_HTML::get_simple_tags();
+	}
 
 
 
-    /**
-     * add_more_tags
-     *
-     * generates and returns a string that lists the top-level HTML tags that are allowable for this input
-     *
-     * @return string
-     */
-    public function get_list_of_allowed_tags()
-    {
-        $allowed_tags = $this->_get_allowed_tags();
-        ksort($allowed_tags);
-        return implode(', ', array_keys($allowed_tags));
-    }
+	/**
+	 * add_more_tags
+	 *
+	 * generates and returns a string that lists the top-level HTML tags that are allowable for this input
+	 *
+	 * @return string
+	 */
+	public function get_list_of_allowed_tags()
+	{
+		$allowed_tags = $this->_get_allowed_tags();
+		ksort($allowed_tags);
+		return implode(', ', array_keys($allowed_tags));
+	}
 
 
 
-    /**
-     * @param $normalized_value
-     * @throws \EE_Validation_Error
-     */
-    public function validate($normalized_value)
-    {
-        $allowedtags = $this->_get_allowed_tags();
-        parent::validate($normalized_value);
-        $normalized_value_sans_tags =  wp_kses("$normalized_value", $allowedtags);
-        if (strlen($normalized_value) > strlen($normalized_value_sans_tags)) {
-            throw new EE_Validation_Error($this->get_validation_error_message(), 'complex_html_tags');
-        }
-    }
+	/**
+	 * @param $normalized_value
+	 * @throws \EE_Validation_Error
+	 */
+	public function validate($normalized_value)
+	{
+		$allowedtags = $this->_get_allowed_tags();
+		parent::validate($normalized_value);
+		$normalized_value_sans_tags =  wp_kses("$normalized_value", $allowedtags);
+		if (strlen($normalized_value) > strlen($normalized_value_sans_tags)) {
+			throw new EE_Validation_Error($this->get_validation_error_message(), 'complex_html_tags');
+		}
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
      */
     public function __construct($validation_error_message = null)
     {
-        if (! $validation_error_message) {
+        if ( ! $validation_error_message) {
             $allowedtags = $this->_get_allowed_tags();
             $validation_error_message = sprintf(__("Only simple HTML tags are allowed. Eg, %s", "event_espresso"), implode(",", array_keys($allowedtags)));
         }
@@ -61,7 +61,7 @@ 
     {
         $allowedtags = $this->_get_allowed_tags();
         parent::validate($normalized_value);
-        $normalized_value_sans_tags =  wp_kses("$normalized_value", $allowedtags);
+        $normalized_value_sans_tags = wp_kses("$normalized_value", $allowedtags);
         if (strlen($normalized_value) > strlen($normalized_value_sans_tags)) {
             throw new EE_Validation_Error($this->get_validation_error_message(), 'complex_html_tags');
         }

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

Indentation +22 added lines, -22 removed lines

@@ -13,27 +13,27 @@
 class EE_Plaintext_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 = __("HTML tags are not permitted in this field", "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 = __("HTML tags are not permitted in this field", "event_espresso");
+		}
+		parent::__construct($validation_error_message);
+	}
 
-    /**
-     * @param $normalized_value
-     * @throws \EE_Validation_Error
-     */
-    public function validate($normalized_value)
-    {
-        $no_tags = wp_strip_all_tags($normalized_value);
-        if (strlen($no_tags) < strlen(trim($normalized_value))) {
-            throw new EE_Validation_Error($this->get_validation_error_message(), 'no_html_tags');
-        }
-        parent::validate($normalized_value);
-    }
+	/**
+	 * @param $normalized_value
+	 * @throws \EE_Validation_Error
+	 */
+	public function validate($normalized_value)
+	{
+		$no_tags = wp_strip_all_tags($normalized_value);
+		if (strlen($no_tags) < strlen(trim($normalized_value))) {
+			throw new EE_Validation_Error($this->get_validation_error_message(), 'no_html_tags');
+		}
+		parent::validate($normalized_value);
+	}
 }

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 = __("HTML tags are not permitted in this field", "event_espresso");
         }
         parent::__construct($validation_error_message);

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

Spacing +3 added lines, -3 removed lines

@@ -32,7 +32,7 @@ 
      */
     public function __construct($validation_error_message = null, $model_name = '', $query_params = array(), $input_field_name = '')
     {
-        if (! EE_Registry::instance()->is_model_name($model_name)) {
+        if ( ! EE_Registry::instance()->is_model_name($model_name)) {
             throw new EE_Error(sprintf(__('You must provide a valid model object ', 'event_espresso'), $model_name));
         }
         $this->_model = EE_Registry::instance()->load_model($model_name);
@@ -58,8 +58,8 @@ 
             return true;
         }
         $combined_query_params = $this->get_query_params();
-        $combined_query_params[0][ $this->treat_input_as_field() ] = $normalized_value;
-        if (! $this->get_model()->exists($combined_query_params)) {
+        $combined_query_params[0][$this->treat_input_as_field()] = $normalized_value;
+        if ( ! $this->get_model()->exists($combined_query_params)) {
             throw new EE_Validation_Error($this->get_validation_error_message(), 'no_matching_model_object');
         }
     }

Indentation +71 added lines, -71 removed lines

@@ -13,86 +13,86 @@
 class EE_Model_Matching_Query_Validation_Strategy extends EE_Validation_Strategy_Base
 {
 
-    /**
-     *
-     * @var EEM_Base
-     */
-    protected $_model;
-    protected $_query_params;
-    protected $_input_field_name;
+	/**
+	 *
+	 * @var EEM_Base
+	 */
+	protected $_model;
+	protected $_query_params;
+	protected $_input_field_name;
 
 
 
-    /**
-     * @param string $validation_error_message
-     * @param string $model_name  name of an EEM_Base model
-     * @param array  $query_params     @see https://github.com/eventespresso/event-espresso-core/tree/master/docs/G--Model-System/model-query-params.md
-     * @param string $input_field_name the input will be treated as this field's value
-     * @throws \EE_Error
-     */
-    public function __construct($validation_error_message = null, $model_name = '', $query_params = array(), $input_field_name = '')
-    {
-        if (! EE_Registry::instance()->is_model_name($model_name)) {
-            throw new EE_Error(sprintf(__('You must provide a valid model object ', 'event_espresso'), $model_name));
-        }
-        $this->_model = EE_Registry::instance()->load_model($model_name);
-        $this->_query_params = $query_params;
-        if (empty($input_field_name)) {
-            $input_field_name = $this->_model->primary_key_name();
-        }
-        $this->_input_field_name = $input_field_name;
-        parent::__construct($validation_error_message);
-    }
+	/**
+	 * @param string $validation_error_message
+	 * @param string $model_name  name of an EEM_Base model
+	 * @param array  $query_params     @see https://github.com/eventespresso/event-espresso-core/tree/master/docs/G--Model-System/model-query-params.md
+	 * @param string $input_field_name the input will be treated as this field's value
+	 * @throws \EE_Error
+	 */
+	public function __construct($validation_error_message = null, $model_name = '', $query_params = array(), $input_field_name = '')
+	{
+		if (! EE_Registry::instance()->is_model_name($model_name)) {
+			throw new EE_Error(sprintf(__('You must provide a valid model object ', 'event_espresso'), $model_name));
+		}
+		$this->_model = EE_Registry::instance()->load_model($model_name);
+		$this->_query_params = $query_params;
+		if (empty($input_field_name)) {
+			$input_field_name = $this->_model->primary_key_name();
+		}
+		$this->_input_field_name = $input_field_name;
+		parent::__construct($validation_error_message);
+	}
 
 
 
-    /**
-     * @param $normalized_value
-     * @return bool|void
-     * @throws \EE_Error
-     * @throws \EE_Validation_Error
-     */
-    public function validate($normalized_value)
-    {
-        if (empty($normalized_value)) {
-            return true;
-        }
-        $combined_query_params = $this->get_query_params();
-        $combined_query_params[0][ $this->treat_input_as_field() ] = $normalized_value;
-        if (! $this->get_model()->exists($combined_query_params)) {
-            throw new EE_Validation_Error($this->get_validation_error_message(), 'no_matching_model_object');
-        }
-    }
+	/**
+	 * @param $normalized_value
+	 * @return bool|void
+	 * @throws \EE_Error
+	 * @throws \EE_Validation_Error
+	 */
+	public function validate($normalized_value)
+	{
+		if (empty($normalized_value)) {
+			return true;
+		}
+		$combined_query_params = $this->get_query_params();
+		$combined_query_params[0][ $this->treat_input_as_field() ] = $normalized_value;
+		if (! $this->get_model()->exists($combined_query_params)) {
+			throw new EE_Validation_Error($this->get_validation_error_message(), 'no_matching_model_object');
+		}
+	}
 
-    /**
-     * Gets the model used for querying
-     * @return EEM_Base
-     */
-    public function get_model()
-    {
-        return $this->_model;
-    }
+	/**
+	 * Gets the model used for querying
+	 * @return EEM_Base
+	 */
+	public function get_model()
+	{
+		return $this->_model;
+	}
 
-    /**
-     * Returns query params used for model query
-     * @return array
-     */
-    public function get_query_params()
-    {
-        return (array) $this->_query_params;
-    }
+	/**
+	 * Returns query params used for model query
+	 * @return array
+	 */
+	public function get_query_params()
+	{
+		return (array) $this->_query_params;
+	}
 
-    /**
-     * Gets the name of the field that will be used for lookup.
-     * eg it could be "EVT_name", meaning that if there is a model object in
-     * the database that has that event name, and matching the other query parameters
-     * on this strategy, the input will pass validation server-side
-     * @return string
-     */
-    public function treat_input_as_field()
-    {
-        return $this->_input_field_name;
-    }
+	/**
+	 * Gets the name of the field that will be used for lookup.
+	 * eg it could be "EVT_name", meaning that if there is a model object in
+	 * the database that has that event name, and matching the other query parameters
+	 * on this strategy, the input will pass validation server-side
+	 * @return string
+	 */
+	public function treat_input_as_field()
+	{
+		return $this->_input_field_name;
+	}
 }
 
 // End of file EE_FUll_HTML_Validation_Strategy.strategy.php

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

Indentation +48 added lines, -48 removed lines

@@ -13,58 +13,58 @@
  */
 class EE_Many_Valued_Validation_Strategy extends EE_Validation_Strategy_Base
 {
-    protected $_individual_item_validation_strategies = array();
-    /**
-     *
-     * @param EE_Validation_Strategy_Base[] $individual_item_validation_strategies (or a single EE_Validation_Strategy_Base)
-     */
-    public function __construct($individual_item_validation_strategies)
-    {
-        if (! is_array($individual_item_validation_strategies)) {
-            $individual_item_validation_strategies = array($individual_item_validation_strategies);
-        }
-        $this->_individual_item_validation_strategies = $individual_item_validation_strategies;
-        parent::__construct();
-    }
+	protected $_individual_item_validation_strategies = array();
+	/**
+	 *
+	 * @param EE_Validation_Strategy_Base[] $individual_item_validation_strategies (or a single EE_Validation_Strategy_Base)
+	 */
+	public function __construct($individual_item_validation_strategies)
+	{
+		if (! is_array($individual_item_validation_strategies)) {
+			$individual_item_validation_strategies = array($individual_item_validation_strategies);
+		}
+		$this->_individual_item_validation_strategies = $individual_item_validation_strategies;
+		parent::__construct();
+	}
 
 
 
-    /**
-     * Applies all teh individual item validation strategies on each item in the array
-     * @param array $normalized_value
-     * @return boolean
-     */
-    public function validate($normalized_value)
-    {
-        if (is_array($normalized_value)) {
-            $items_to_validate = $normalized_value;
-        } else {
-            $items_to_validate = array($normalized_value);
-        }
-        foreach ($items_to_validate as $individual_item) {
-            foreach ($this->_individual_item_validation_strategies as $validation_strategy) {
-                if ($validation_strategy instanceof EE_Validation_Strategy_Base) {
-                    $validation_strategy->validate($individual_item);
-                }
-            }
-        }
-        return true;
-    }
+	/**
+	 * Applies all teh individual item validation strategies on each item in the array
+	 * @param array $normalized_value
+	 * @return boolean
+	 */
+	public function validate($normalized_value)
+	{
+		if (is_array($normalized_value)) {
+			$items_to_validate = $normalized_value;
+		} else {
+			$items_to_validate = array($normalized_value);
+		}
+		foreach ($items_to_validate as $individual_item) {
+			foreach ($this->_individual_item_validation_strategies as $validation_strategy) {
+				if ($validation_strategy instanceof EE_Validation_Strategy_Base) {
+					$validation_strategy->validate($individual_item);
+				}
+			}
+		}
+		return true;
+	}
 
 
 
-    /**
-     * Extends parent's _construct_finalize so we ALSO set the input
-     * on each sub-validation-strategy
-     * @param \EE_Form_Input_Base $form_input
-     */
-    public function _construct_finalize(\EE_Form_Input_Base $form_input)
-    {
-        parent::_construct_finalize($form_input);
-        foreach ($this->_individual_item_validation_strategies as $item_validation_strategy) {
-            if ($item_validation_strategy instanceof EE_Validation_Strategy_Base) {
-                $item_validation_strategy->_construct_finalize($form_input);
-            }
-        }
-    }
+	/**
+	 * Extends parent's _construct_finalize so we ALSO set the input
+	 * on each sub-validation-strategy
+	 * @param \EE_Form_Input_Base $form_input
+	 */
+	public function _construct_finalize(\EE_Form_Input_Base $form_input)
+	{
+		parent::_construct_finalize($form_input);
+		foreach ($this->_individual_item_validation_strategies as $item_validation_strategy) {
+			if ($item_validation_strategy instanceof EE_Validation_Strategy_Base) {
+				$item_validation_strategy->_construct_finalize($form_input);
+			}
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
      */
     public function __construct($individual_item_validation_strategies)
     {
-        if (! is_array($individual_item_validation_strategies)) {
+        if ( ! is_array($individual_item_validation_strategies)) {
             $individual_item_validation_strategies = array($individual_item_validation_strategies);
         }
         $this->_individual_item_validation_strategies = $individual_item_validation_strategies;