Fixed base generation

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

diff --git a/include/class_plugin.inc b/include/class_plugin.inc
index b87216703eba5c8f9dda884ff5f1290ad266f139..2a34d2c55d6e8a378b26c547a600233d61cd378d 100644 (file)
--- a/include/class_plugin.inc
+++ b/include/class_plugin.inc
@@ -1018,7 +1018,7 @@ class plugin
       /* Collect some infos */
       $base           = $this->config->current['BASE'];
       $snap_base      = $tmp['SNAPSHOT_BASE'];
-      $base_of_object = dn2base($this->dn);
+      $base_of_object = preg_replace ('/^[^,]+,/i', '', $this->dn);
       $new_base       = preg_replace("/".normalizePreg($base)."$/","",$base_of_object).$snap_base;
 
       /* Create object */
@@ -1102,7 +1102,7 @@ class plugin
     /* Prepare bases and some other infos */
     $base           = $this->config->current['BASE'];
     $snap_base      = $tmp['SNAPSHOT_BASE'];
-    $base_of_object = dn2base($dn);
+    $base_of_object = preg_replace ('/^[^,]+,/i', '', $dn);
     $new_base       = preg_replace("/".normalizePreg($base)."$/","",$base_of_object).$snap_base;
     $tmp            = array(); 
 

diff --git a/plugins/admin/users/class_userManagement.inc b/plugins/admin/users/class_userManagement.inc
index 517ef7887bb729e22345a7cb14e9d8f35dc5cb70..ebe79b496b4ca10e9378dff1f64c78768fdb4cba 100644 (file)
--- a/plugins/admin/users/class_userManagement.inc
+++ b/plugins/admin/users/class_userManagement.inc
@@ -852,7 +852,6 @@ class userManagement extends plugin
         }
       }else{
         $this->dn =  $this->usertab->dn;
-        echo $this->dn;
         $this->create_snapshot("snapshot",$this->usertab->CurrentDescription);
         $this->usertab = NULL;
       }