Updated zone editor

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@7210 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/plugins/admin/systems/class_servDNSeditZoneEntries.inc b/plugins/admin/systems/class_servDNSeditZoneEntries.inc
index bcfa78c872353925ebcf80721f125e41a491e19c..a485f8b11f906c4f7ee510a569d8cf05fa3f3832 100644 (file)
--- a/plugins/admin/systems/class_servDNSeditZoneEntries.inc
+++ b/plugins/admin/systems/class_servDNSeditZoneEntries.inc
@@ -64,6 +64,25 @@ class servDNSeditZoneEntries extends plugin
     plugin::execute();
 
 
+
+    /* Fill templating stuff */
+    $smarty= get_smarty();
+    $display= "";
+
+    $table = "";
+    foreach($this->Devices as $key => $dev){
+      $table .= $this->generateRecordConfigurationRow($key);
+    }
+
+    $smarty->assign("disableDialog",$this->disableDialog);
+    $smarty->assign("table",$table);;
+    $display.= $smarty->fetch(get_template_path('servDNSeditZoneEntries.tpl', TRUE));
+    return($display);
+  }
+
+
+  function save_object()
+  {
     /* Check posts for operations ...  
      */
     $once = true;
@@ -122,28 +141,8 @@ class servDNSeditZoneEntries extends plugin
           $this->Devices[$Name]['RECORDS'][] = $tmp;
         }
       }
-
-      
-    }
-
-    /* Fill templating stuff */
-    $smarty= get_smarty();
-    $display= "";
-
-    $table = "";
-    foreach($this->Devices as $key => $dev){
-      $table .= $this->generateRecordConfigurationRow($key);
     }
 
-    $smarty->assign("disableDialog",$this->disableDialog);
-    $smarty->assign("table",$table);;
-    $display.= $smarty->fetch(get_template_path('servDNSeditZoneEntries.tpl', TRUE));
-    return($display);
-  }
-
-
-  function save_object()
-  {
     /* Possible attributes posted 
      */
     foreach($_POST as $name => $value){
@@ -224,7 +223,7 @@ class servDNSeditZoneEntries extends plugin
 
       /* Checking entry name
        */
-      if((!is_uid($DevName)) | (empty($DevName))){
+      if(!preg_match("/^[a-z0-9_\.-]+$/i", $DevName) || (empty($DevName))){
         $message[] = sprintf(_("Entry name '%s' contains invalid characters."), $DevName);
       }