Updated in

[gosa.git] / gosa-core / setup / class_setupStep_Migrate.inc

diff --git a/gosa-core/setup/class_setupStep_Migrate.inc b/gosa-core/setup/class_setupStep_Migrate.inc
index 2b7630a11bd96b23f61edc70f8060ebccb5e28c3..c52b14cf4f2c650945e7356197da89fe3564d784 100644 (file)
--- a/gosa-core/setup/class_setupStep_Migrate.inc
+++ b/gosa-core/setup/class_setupStep_Migrate.inc
@@ -432,7 +432,7 @@ class Step_Migrate extends setup_step
        *  and verify that he is in a valid department
        */
       if( !preg_match("/".preg_quote("dc=addressbook,", '/')."/",$group_db_base) &&
-          !in_array($group_db_base,$valid_deps)
+          !in_array_strict($group_db_base,$valid_deps)
         ){
         $attrs['selected'] = FALSE;
         $attrs['ldif']     = "";
@@ -510,7 +510,7 @@ class Step_Migrate extends setup_step
        *  and verify that he is in a valid department
        */
       if( !preg_match("/dc=addressbook,/",$people_db_base) &&
-          !in_array($people_db_base,$valid_deps)
+          !in_array_strict($people_db_base,$valid_deps)
          ){
         $attrs['selected'] = FALSE;
         $attrs['ldif']     = "";
@@ -574,7 +574,6 @@ class Step_Migrate extends setup_step
     /* Try to create dummy object 
      */ 
     $ldap->cd ($dn);
-    $ldap->create_missing_trees($dn);
     $res = $ldap->add($testEntry);
     $ldap->cat($dn);
     if(!$ldap->count()){
@@ -743,7 +742,9 @@ class Step_Migrate extends setup_step
         "/(,|)ou=configs,/","/(,|)ou=systems,/",
         "/(,|)ou=apps,/","/(,|)ou=mime,/","/(,|)ou=devices/","/^ou=aclroles,/","/^ou=incoming,/",
         "/ou=snapshots,/","/(,|)dc=addressbook,/","/^(,|)ou=machineaccounts,/",
-        "/(,|)ou=winstations,/");
+        "/(,|)ou=winstations,/","/(,|)ou=roles,/");
+
+    
 
     /* Get all invisible departments */
     $ldap->cd($cv['base']); 
@@ -772,7 +773,7 @@ class Step_Migrate extends setup_step
        */
       if(preg_match("/^.*,[ ]*cn=/",$dn)){
         $cn_dn = preg_replace("/^.*,[ ]*cn=/","cn=",$dn);
-        if(in_array($cn_dn,$this->group_list)){
+        if(in_array_strict($cn_dn,$this->group_list)){
           $skip = true;
         }
       }
@@ -921,10 +922,10 @@ class Step_Migrate extends setup_step
         $acls = $attrs['gosaAclEntry'];
         for($i = 0 ; $i < $acls['count'] ; $i++){
           $acl = $acls[$i];
-          $tmp = split(":",$acl);
+          $tmp = explode(":",$acl);
 
           if($tmp[1] == "psub"){
-            $members = split(",",$tmp[2]);
+            $members = explode(",",$tmp[2]);
             foreach($members as $member){
               $member = base64_decode($member);
               if(isset($users[$member])){
@@ -965,7 +966,7 @@ class Step_Migrate extends setup_step
                 $a_str = $ret['gosaAclTemplate'][$e];
                 if(preg_match("/^[0-9]*:psub:/",$a_str) && preg_match("/:all;cmdrw$/",$a_str)){
 
-                  $members = split(",",$tmp[3]);
+                  $members = explode(",",$tmp[3]);
                   foreach($members as $member){
                     $member = base64_decode($member);
 
@@ -2043,7 +2044,7 @@ class Step_Migrate extends setup_step
 
     /* Root object doesn't exists 
      */
-    if(!in_array("gosaDepartment",$attrs['objectClass'])){
+    if(!in_array_strict("gosaDepartment",$attrs['objectClass'])){
       if($just_check){
 
         $this->rootOC_details = array();       
@@ -2065,7 +2066,7 @@ class Step_Migrate extends setup_step
         $dep_types = departmentManagement::get_support_departments();
         $dep_type ="";
         foreach($dep_types as $dep_name => $dep_class){
-          if(in_array($dep_class['CLASS'], $attrs['objectClass'])){
+          if(in_array_strict($dep_class['CLASS'], $attrs['objectClass'])){
             $dep_type = $dep_name;
             break;
           }
@@ -2456,7 +2457,7 @@ class Step_Migrate extends setup_step
   function cleanup_array($attrs)
   {
     foreach($attrs as $key => $value) {
-      if(is_numeric($key) || in_array($key,array("count","dn"))){
+      if(is_numeric($key) || in_array_strict($key,array("count","dn"))){
         unset($attrs[$key]);
       }
       if(is_array($value) && isset($value['count'])){
@@ -2609,7 +2610,7 @@ class Step_Migrate extends setup_step
         $ldap->cd($cv['base']);
         $ldap->cat($device['DN']);
         $attrs = $ldap->fetch();
-        if(in_array($device['OLD_DEVICE'],$attrs['gotoHotplugDevice'])){
+        if(in_array_strict($device['OLD_DEVICE'],$attrs['gotoHotplugDevice'])){
 
           /* Create new hotplug device object 'gotoDevice'
            */ 
@@ -2847,7 +2848,7 @@ class Step_Migrate extends setup_step
         for ($j= 0; $j < $info['gosaApplicationParameter']['count']; $j++){
           $p= preg_replace("/^([^:]+):.*$/", "$1", $info['gosaApplicationParameter'][$j]);
 
-          if(!isset($amap[$info['cn'][0]]) || !in_array($p, $amap[$info['cn'][0]])){
+          if(!isset($amap[$info['cn'][0]]) || !in_array_strict($p, $amap[$info['cn'][0]])){
             $amap[$info['cn'][0]][]= $p;
           }
         }
@@ -2902,7 +2903,7 @@ class Step_Migrate extends setup_step
        */ 
       $release = "";
       $r = $info['FAIrelease'][0];
-      $z = split("/",$r);
+      $z = explode("/",$r);
       foreach($z as $part){
 
         if(!empty($part)){
@@ -3195,7 +3196,7 @@ class Step_Migrate extends setup_step
     for($i=0;$i< $base_attrs['objectClass']['count']; $i++){
       $ocs[] = $base_attrs['objectClass'][$i];
     }
-    if(!in_array("gosaACL",$ocs)){
+    if(!in_array_strict("gosaACL",$ocs)){
       $ocs[] = "gosaACL";
     }
 
@@ -3260,7 +3261,7 @@ class Step_Migrate extends setup_step
       for($i=0;$i<$base_data['objectClass']['count'];$i++){
         $base_entry .= "objectClass: ".$base_data['objectClass'][$i]."\n";
       }
-      if(!in_array("gosaACL",$base_data['objectClass'])){
+      if(!in_array_strict("gosaACL",$base_data['objectClass'])){
         $base_entry .= "<b>objectClass: gosaACL</b>\n";
       }
       if(isset($base_data['gosaAclEntry'])){