Changeset 606

Timestamp:

Dec 8, 2013, 5:08:37 PM (11 years ago)

Author:

chronos

Message:

• Přidáno: Ověřování vstupů pro MAC adresu a IPv4 a 6. V případě chyby se zobrazí chybné políčko červeně s popisem formátu.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Common/Form/Form.php (modified) (5 diffs)
• Common/Form/Types/Base.php (modified) (1 diff)
• Common/Form/Types/IPv4Address.php (modified) (1 diff)
• Common/Form/Types/IPv6Address.php (added)
• Common/Form/Types/MacAddress.php (added)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 605; // Subversion revision
+$Revision = 606; // Subversion revision
 $DatabaseRevision = 601; // SQL structure revision
 $ReleaseTime = '2013-12-08';

trunk/Common/Form/Form.php

@@ -9 +9 @@
   var $Definition;
   var $Values;
+  var $ValuesValidate;
   var $ValuesFilter;
   var $OnSubmit;
@@ -19 +20 @@
     $this->Definition = array();
     $this->Values = array();    
-    $this->ValuesFilter = array();    
+    $this->ValuesFilter = array();
+    $this->ValuesValidate = array();    
     $this->OnSubmit = '';
   }
@@ -108 +110 @@
         if(array_key_exists('Suffix', $Item)) $Edit .= $Item['Suffix'];
 
+      $Caption = $Item['Caption'].':';
+      if(array_key_exists($Index, $this->ValuesValidate) and 
+        $this->ValuesValidate[$Index]) {
+                $Format = $this->FormManager->Type->ExecuteTypeEvent($UseType, 'GetValidationFormat', array());
+                if($Format != '') $Caption .= '<br/><small>'.$Format.'</small>';
+                $Caption = '<span style="color:red;">'.$Caption.'</span>';
+        }
       if(!$this->FormManager->Type->IsHidden($UseType))
-          array_push($Table['Rows'], array($Item['Caption'].':', $Edit));
+          array_push($Table['Rows'], array($Caption, $Edit));
       else $Hidden .= $Edit;
     }
@@ -246 +255 @@
   function Validate()
   {
-    $Values = array();
+    $Valid = true;
     foreach($this->Definition['Items'] as $Index => $Item)
     if((!array_key_exists($Item['Type'], $this->FormManager->FormTypes) or 
@@ -272 +281 @@
           else $Parameters['Null'] = false;
         if(!$this->FormManager->Type->ExecuteTypeEvent($UseType, 'Validate', 
-          $Parameters)) throw new Exception('not validated');
-    }
-    return($Values);
+          $Parameters)) {
+                $this->ValuesValidate[$Index] = true;
+                $Valid = false;
+          }
+    }
+    if($Valid == false) throw new Exception('not validated');
+    return($Valid);
   } 
 }

trunk/Common/Form/Types/Base.php

@@ -65 +65 @@
         return(true);
   }
+
+  function GetValidationFormat()
+  {
+        return('');
+  }
 }

trunk/Common/Form/Types/IPv4Address.php

@@ -27 +27 @@
         return(filter_var($Item['Value'], FILTER_VALIDATE_IP, array('flags' => FILTER_FLAG_IPV4)));
   }
+  
+  function GetValidationFormat()
+  {
+        return('x.x.x.x kde x je hodnota 0..255');
+  } 
 }