Changeset 5984

Timestamp:

02/01/12 18:47:37 (4 months ago)

Author:

vain

Message:

• added formvalidators for ip, email, url
• modified range to not use the min/maxlength validators internally, but filter_validate_int

Location:

trunk/core/viewhelper/form/validators

Files:

• ip.php (added)
• mail.php (added)
• range.php (modified) (3 diffs)
• url.php (added)

trunk/core/viewhelper/form/validators/range.php

@@ -40 +40 @@
 {
     /**
-     * @var Clansuite_Formelement_Validator_Minlength
+     * @var filter var options
      */
-    private $validator_minlength;
-
-    /**
-     * @var Clansuite_Formelement_Validator_Maxlength
-     */
-    private $validator_maxlength;
-
-    public function __construct()
-    {
-        $this->validator_minlength = Clansuite_Formelement_Validator_Minlength();
-        $this->validator_maxlength = Clansuite_Formelement_Validator_Maxlength();
-    }
+    private $options = array();
 
     /**
@@ -63 +52 @@
     public function setRange($minimum_length, $maximum_length)
     {
-        $this->validator_minlength->setMinlength($minimum_length);
-        $this->validator_maxlength->setMaxlength($maximum_length);
+        $this->options['options']['min_range'] = $minimum_length;
+        $this->options['options']['max_range'] = $maximum_length;
     }
 
     public function getErrorMessage()
     {
-        $min = $this->validator_minlength->getMinlength();
-        $max = $this->validator_maxlength->setMaxlength();
+        $min = $this->options['options']['min_range']
+        $max = $this->options['options']['max_range']
 
         return _('The value is outside the range of ' . $min .' <> '. $max .' chars.');
@@ -77 +66 @@
     protected function processValidationLogic($value)
     {
-        if($this->validator_maxlength->validate($value) === true and $this->validator_minlength->validate($value) === true)
+        if(filter_var($value, FILTER_VALIDATE_INT, $this->options) !== FALSE))
         {
             return true;