From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 30 Nov 2006 09:51:51 +0000 (+0000)
Subject: Minimized error msg for still in use dns-zone.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=269b6da4461630896e0af284cca9742b9f819f2b;p=gosa.git

Minimized error msg for still in use dns-zone.
It makes my browser to show the scroll bars


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

diff --git a/plugins/admin/systems/class_servDNS.inc b/plugins/admin/systems/class_servDNS.inc
index 8bd6f6d14..c74c27fd3 100644
--- a/plugins/admin/systems/class_servDNS.inc
+++ b/plugins/admin/systems/class_servDNS.inc
@@ -212,14 +212,16 @@ class servdns extends goService
 
     /* There are still entries using this configuration
      *  Abort deletion
-     */ 
+     */
     if(count($used)){
       $i = 2;
       $str ="";
       foreach($used as $dn){
-        if($i > 0 ){
+        if($i > 0 && !preg_match("/,relativeDomainName=/",$dn)){
           $i --;
-          $str.=$dn." ";
+          $name = preg_replace("/^[^=]+=([^,]*),.*$/","\\1",$dn);
+          $zone = preg_replace("/^.*zoneName=([^,]*),.*$/","\\1",$dn);
+          $str.= $name.".".$zone." ";
         }
       }