From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 10 Jul 2007 06:55:51 +0000 (+0000)
Subject: Fixed setup group user detection
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8fe69058d3718f3e69653f79de564dc01be4ad7f;p=gosa.git

Fixed setup group user detection


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

diff --git a/setup/class_setupStep_Migrate.inc b/setup/class_setupStep_Migrate.inc
index ad0c0fe01..15df31edd 100644
--- a/setup/class_setupStep_Migrate.inc
+++ b/setup/class_setupStep_Migrate.inc
@@ -364,8 +364,9 @@ class Step_Migrate extends setup_step
       return(false);
     }
 
+    $this->outside_groups = array();
     while($attrs = $ldap->fetch()){
-      $group_db_base = preg_replace("/^[^,]+,".normalizePreg($group_ou)."/","",$attrs['dn']);
+      $group_db_base = preg_replace("/^[^,]+,".normalizePreg($group_ou)."+,/i","",$attrs['dn']);
 
       /* Check if entry is not an addressbook only user
        *  and verify that he is in a valid department
@@ -441,7 +442,7 @@ class Step_Migrate extends setup_step
     } 
 
     while($attrs = $ldap->fetch()){
-      $people_db_base = preg_replace("/^[^,]+,".normalizePreg($people_ou)."/","",$attrs['dn']);
+      $people_db_base = preg_replace("/^[^,]+,".normalizePreg($people_ou)."/i","",$attrs['dn']);
  
       /* Check if entry is not an addressbook only user 
        *  and verify that he is in a valid department