X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_servDNS.inc;h=f12ad0f8bcc77f0de704d79532a6409e11fbbd93;hb=868f556da0e7c0003fb3ae735559e6500e5bc3ed;hp=c63fd9b1c947872ad51b66c2d07da7cc8d663185;hpb=d9f1895952e9b02c1b0c398cc5dc09b88178e603;p=gosa.git

diff --git a/plugins/admin/systems/class_servDNS.inc b/plugins/admin/systems/class_servDNS.inc
index c63fd9b1c..f12ad0f8b 100644
--- a/plugins/admin/systems/class_servDNS.inc
+++ b/plugins/admin/systems/class_servDNS.inc
@@ -2,11 +2,6 @@
 
 class servdns extends plugin
 {
-  /* CLI vars */
-  var $cli_summary= "Manage server basic objects";
-  var $cli_description= "Some longer text\nfor help";
-  var $cli_parameters= array("eins" => "Eins ist toll", "zwei" => "Zwei ist noch besser");
-
   /* attribute list for save action */
   var $ignore_account   = FALSE;
   var $attributes       = array(); 
@@ -34,7 +29,7 @@ class servdns extends plugin
     /* Get all zone Informations
      */
     $this->Zones = getDNSZoneEntries($config,$dn);
-    
+  
     /* If there is at least one entry in this -> types, we have DNS enabled 
      */
     if(count($this->Zones) == 0){
@@ -83,7 +78,7 @@ class servdns extends plugin
 
     /* Edited or Added zone 
      */
-    if(isset($_POST['SaveZoneChanges'])){
+    if((isset($_POST['SaveZoneChanges'])) && is_object($this->dialog)){
       $this->dialog->save_object();
 
       /* Check for errors  
@@ -155,7 +150,7 @@ class servdns extends plugin
     /* Create Listbox with existing Zones 
      */
     $ZoneList = new divSelectBox("dNSZones");
-    $ZoneList -> SetHeight(254);
+    $ZoneList -> SetHeight(300);
 
     /* Add entries to divlist
      */
@@ -163,11 +158,11 @@ class servdns extends plugin
       <input type='image' src='images/edittrash.png' name='delZone_%s'>";
     foreach($this->Zones as $zone => $values ){
       $ZoneList->AddEntry(array(
-            array("string" => $zone),
-            array("string" => _("Reverse zone")." : ".$values['ReverseZone']),
+            array("string" => getNameFromMix($zone)),
+            array("string" => _("Reverse zone")." : ".getNameFromMix($values['ReverseZone'])),
             array("string" => _("TTL")." : ".$values['sOAttl']),
             array("string" => _("Class")." : ".$values['dNSClass']),
-            array("string" =>str_replace("%s",base64_encode($zone),$editImg))
+            array("string" => str_replace("%s",base64_encode($zone),$editImg))
             ));
     }    
   
@@ -186,16 +181,17 @@ class servdns extends plugin
   function RemoveZone($id)
   {
     $zones =  $this->getUsedZoneNames();
-
+    $rev  ="";
+  
     if(isset($this->Zones[$id]['InitialReverseZone'])){
-      $rev = FlipIp($this->Zones[$id]['InitialReverseZone']);
-    }else{
-      $rev = FlipIp($this->Zones[$id]['ReverseZone']);
+      $rev = FlipIp(getNameFromMix($this->Zones[$id]['InitialReverseZone']));
+    }elseif(isset($this->Zones[$id]['ReverseZone'])){
+      $rev = FlipIp(getNameFromMix($this->Zones[$id]['ReverseZone']));
     }
 
     $zonename = "";
     if(isset($this->Zones[$id]['InitialzoneName'])){
-      $zonename= $this->Zones[$id]['InitialzoneName'];
+      $zonename= getNameFromMix($this->Zones[$id]['InitialzoneName']);
     }
 
     $used = array();
@@ -283,7 +279,13 @@ class servdns extends plugin
   
     /* Get differences 
      */
-    $tmp = getDNSZoneEntriesDiff($this->config,$this->Zones,$this->orig_dn);
+
+    $old_dn =  $this->orig_dn;
+    if($old_dn == "new"){
+      $old_dn = $this->dn;
+    }
+  
+    $tmp = getDNSZoneEntriesDiff($this->config,$this->Zones,$old_dn);
 
     /* Updated zone entries if reverser or forward name has changed  
      * Must be done before moving entries, else the given dn is invalid