Code

fixed dn cut
authorhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Tue, 11 Apr 2006 12:11:41 +0000 (12:11 +0000)
committerhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Tue, 11 Apr 2006 12:11:41 +0000 (12:11 +0000)
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3034 594d385d-05f5-0310-b6e9-bd551577e9d8

include/functions.inc

index b98e65917d64800a71c87826874fe227a2de837d..ef7100de83677f38e65876a09d282fa970ac80bb 100644 (file)
@@ -798,8 +798,13 @@ function convert_department_dn2($dn)
   if(isset($deps[$dn])){
     $dn= $deps[$dn];
     $dep = preg_replace("/^.*=/","",$dn);
-  }else{
-    if(preg_match("/=/",$dn)){
+  }else{  
+    global $config;
+    $base = "ou=";
+    if(isset($config->current['BASE'])){
+      $base =  $config->current['BASE'];  
+    }
+    if(preg_match("%".$base."%",$dn)){
       $dep= preg_replace("%^.*\/([^\/]+)$%", "\\1", $dn);
     }else{
       $dep = $dn;