From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 2 May 2007 12:07:41 +0000 (+0000)
Subject: fixed permission check
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6e3300d42265b1112ae317f574fc051d86699023;p=gosa.git

fixed permission check


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

diff --git a/setup/class_setupStep_Migrate.inc b/setup/class_setupStep_Migrate.inc
index 7d4565176..fb7861a1e 100644
--- a/setup/class_setupStep_Migrate.inc
+++ b/setup/class_setupStep_Migrate.inc
@@ -453,7 +453,8 @@ class Step_Migrate extends setup_step
     $ldap->cd ($dn);
     $ldap->create_missing_trees($dn);
     $res = $ldap->add($testEntry);
-    if(!$res){
+    $ldap->cat($dn);
+    if(!$ldap->count()){
       gosa_log($ldap->get_error());
       $this->checks['permissions']['STATUS']    = FALSE;
       $this->checks['permissions']['STATUS_MSG']= _("Failed");
@@ -465,7 +466,8 @@ class Step_Migrate extends setup_step
     /* Try to remove created entry 
      */
     $res = $ldap->rmDir($dn);
-    if(!$res){
+    $ldap->cat($dn);
+    if($ldap->count()){
       gosa_log($ldap->get_error());
       $this->checks['permissions']['STATUS']    = FALSE;
       $this->checks['permissions']['STATUS_MSG']= _("Failed");
diff --git a/setup/setup_migrate.tpl b/setup/setup_migrate.tpl
index cbf5a8ee0..51139288a 100644
--- a/setup/setup_migrate.tpl
+++ b/setup/setup_migrate.tpl
@@ -124,8 +124,6 @@
 				<input type='submit' name='outside_groups_dialog_cancel' value='{t}Close{/t}'>
 			</div>
 		
-
-		{elseif $method == "create_acls"}
 		{elseif $method == "outside_users"}
 
 			<h2>{t}Move users into valid user departments{/t}</h2>