Updated remove from parent.

Removed unused code from template

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

diff --git a/plugins/admin/systems/class_servDNS.inc b/plugins/admin/systems/class_servDNS.inc
index 2a27325ddfbe8db08f79cd97a098851fa0d94549..b433a734c8ab8e212ffb23f086cc27ebcc66b2d6 100644 (file)
--- a/plugins/admin/systems/class_servDNS.inc
+++ b/plugins/admin/systems/class_servDNS.inc
@@ -253,25 +253,26 @@ class servdns extends plugin
   }
 
 
-  /* Remove dns service 
+
+    /* Remove dns service
    */
   function remove_from_parent()
   {
-    if(!$this->DNSinitially_was_account){
-      return;
-    }
-    print_red("Can't remove dns yet. returning without remove.");
-    return;
-    $ldap = $this->config->get_ldap_link();
-    $ldap->ls("(&(objectClass=dNSZone)(zoneName=*)(relativeDomainName=@))",$this->orig_dn,array("relativeDomainName","zoneName"));
-    while($attr = $ldap->fetch()){
-      $ldap->cd($attr['dn']);
-      $ldap->rmDir($attr['dn']);
+    if($this->initially_was_account){
+      $bool = true;
+      foreach($this->Zones as $key => $zone){
+        $bool= $bool & $this->RemoveZone($key);
+      }
+
+      if($bool){
+        $this->save();
+      }
+      return($bool);
     }
-    show_ldap_error($ldap->get_error(), _("Removing DNS service failed"));
   }
 
 
+
   /* Save to LDAP */
   function save()
   {

diff --git a/plugins/admin/systems/class_servDNSeditZoneEntries.inc b/plugins/admin/systems/class_servDNSeditZoneEntries.inc
index 21c334d697fb49e5072afb9160e96da168d3bbc7..89b4538e7a9632141cba2e766718db499231966a 100644 (file)
--- a/plugins/admin/systems/class_servDNSeditZoneEntries.inc
+++ b/plugins/admin/systems/class_servDNSeditZoneEntries.inc
@@ -284,7 +284,6 @@ class servDNSeditZoneEntries extends plugin
 
     $todo = array(); 
 
-    print_a($this->Devices);
 
     /* Create todolist
      */

diff --git a/plugins/admin/systems/servdns.tpl b/plugins/admin/systems/servdns.tpl
index 7cd08b7d945285fcd47264cd33c4aaa50d54a4fb..1a0eaf280724243d1a3ef8104c1f18b594b72548 100644 (file)
--- a/plugins/admin/systems/servdns.tpl
+++ b/plugins/admin/systems/servdns.tpl
@@ -4,8 +4,8 @@
        <td style="width:100%;vertical-align:top;">
                {$ZoneList}
                <input type="submit" name="AddZone" value="{t}Add{/t}" {$servdnsACL}>
-               <input type="submit" name="EditZone" value="{t}Edit{/t}" {$servdnsACL}>
-               <input type="submit" name="RemoveZone" value="{t}Remove{/t}" {$servdnsACL}>
+<!--           <input type="submit" name="EditZone" value="{t}Edit{/t}" {$servdnsACL}>-->
+<!--           <input type="submit" name="RemoveZone" value="{t}Remove{/t}" {$servdnsACL}>-->
        </td>
 </tr>
 </table>