Code

Minimized error msg for still in use dns-zone.
authorhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Thu, 30 Nov 2006 09:51:51 +0000 (09:51 +0000)
committerhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Thu, 30 Nov 2006 09:51:51 +0000 (09:51 +0000)
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

plugins/admin/systems/class_servDNS.inc

index 8bd6f6d147693b557e36745a554eca42d1a16caf..c74c27fd379fdbbfb0ba2364b557c533b4e46d9f 100644 (file)
@@ -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." ";
         }
       }