From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 9 May 2008 13:07:54 +0000 (+0000)
Subject: Enable Remove of dns zones without displaying messages.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=94a7d549a628034e40e5bba8f028971ed7194bcc;p=gosa.git

Enable Remove of dns zones without displaying messages.


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

diff --git a/gosa-plugins/dns/admin/systems/services/dns/class_servDNS.inc b/gosa-plugins/dns/admin/systems/services/dns/class_servDNS.inc
index d2779828b..08b15e808 100644
--- a/gosa-plugins/dns/admin/systems/services/dns/class_servDNS.inc
+++ b/gosa-plugins/dns/admin/systems/services/dns/class_servDNS.inc
@@ -290,7 +290,7 @@ class servdns extends goService
 
   /* Delete specified zone
    */
-  function RemoveZone($id)
+  function RemoveZone($id,$force = FALSE)
   {
     $zones =  $this->getUsedZoneNames();
 
@@ -322,7 +322,7 @@ class servdns extends goService
     /* There are still entries using this configuration
      *  Abort deletion
      */
-    if(count($used)){
+    if(count($used) && !$force){
       $i = 2;
       $str ="";
       foreach($used as $dn){
@@ -371,9 +371,8 @@ class servdns extends goService
       $bool = true;
       $this->is_account = FALSE;
       foreach($this->Zones as $key => $zone){
-        $bool= $bool & $this->RemoveZone($key);
+        $bool= $bool & $this->RemoveZone($key,TRUE);
       }
-
       if($bool){
         $this->save();
       }