Changeset 605 for trunk/Common/Form

Timestamp:

Dec 8, 2013, 4:38:25 PM (11 years ago)

Author:

chronos

Message:

• Přidáno: Podpora pro ověřování zadaných dat pro IPv4, IPv6 a MAC adresu.

Location:

trunk/Common/Form

Files:

• Form.php (modified) (1 diff)
• Types/Base.php (modified) (1 diff)
• Types/IPv4Address.php (modified) (1 diff)
• Types/Type.php (modified) (2 diffs)

trunk/Common/Form/Form.php

@@ -243 +243 @@
     return($Values);
   }
+
+  function Validate()
+  {
+    $Values = array();
+    foreach($this->Definition['Items'] as $Index => $Item)
+    if((!array_key_exists($Item['Type'], $this->FormManager->FormTypes) or 
+    (array_key_exists($Item['Type'], $this->FormManager->FormTypes) and
+    ($this->FormManager->FormTypes[$Item['Type']]['Type'] != 'ManyToOne'))) and
+    (!array_key_exists('ReadOnly', $Item) or 
+    (array_key_exists('ReadOnly', $Item) and
+    ($Item['ReadOnly'] != true))))
+    {     
+        //if(array_key_exists($Context.$Index, $_POST))
+        if(array_key_exists($Item['Type'], $this->FormManager->FormTypes))
+        {            
+          if(!array_key_exists($Item['Type'], $this->FormManager->Type->TypeDefinitionList)) 
+            $this->FormManager->Type->RegisterType($Item['Type'], '', 
+              $this->FormManager->FormTypes[$Item['Type']]);
+          $CustomType = $this->FormManager->FormTypes[$Item['Type']]['Type'];
+          if($CustomType == 'Reference') 
+            $UseType = 'OneToMany';
+          else if($CustomType == 'Enumeration') 
+            $UseType = 'Enumeration';
+        } else $UseType = $Item['Type'];
+        
+        $Parameters = array('Value' => $this->Values[$Index]);
+        if(array_key_exists('Null', $Item)) $Parameters['Null'] = $Item['Null'];
+          else $Parameters['Null'] = false;
+        if(!$this->FormManager->Type->ExecuteTypeEvent($UseType, 'Validate', 
+          $Parameters)) throw new Exception('not validated');
+    }
+    return($Values);
+  } 
 }
+
 
 function MakeLink($Target, $Title)

trunk/Common/Form/Types/Base.php

@@ -60 +60 @@
     return($Output);
   }
+  
+  function Validate($Item)
+  {
+        return(true);
+  }
 }

trunk/Common/Form/Types/IPv4Address.php

@@ -21 +21 @@
     return($_POST[$Item['Name']]);
   }
+  
+  function Validate($Item)
+  {
+        if($Item['Null'] and ($Item['Value'] == '')) return(true);
+        return(filter_var($Item['Value'], FILTER_VALIDATE_IP, array('flags' => FILTER_FLAG_IPV4)));
+  }
 }

trunk/Common/Form/Types/Type.php

@@ -19 +19 @@
 include(dirname(__FILE__).'/GPS.php');
 include(dirname(__FILE__).'/IPv4Address.php');
+include(dirname(__FILE__).'/IPv6Address.php');
 include(dirname(__FILE__).'/Color.php');
 include(dirname(__FILE__).'/RandomHash.php');
+include(dirname(__FILE__).'/MacAddress.php');
 
 class Type
@@ -52 +54 @@
       'Color' => array('Name' => 'Color', 'Class' => 'Color', 'ParentType' => '', 'Parameters' => array()),
       'RandomHash' => array('Name' => 'RandomHash', 'Class' => 'RandomHash', 'ParentType' => '', 'Parameters' => array()),
+      'MacAddress' => array('Name' => 'MacAddress', 'Class' => 'MacAddress', 'ParentType' => '', 'Parameters' => array()),
+      'IPv6Address' => array('Name' => 'IPv6Address', 'Class' => 'IPv6Address', 'ParentType' => '', 'Parameters' => array()),
     );
   }