Updated admin create dialog

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

diff --git a/setup/class_setupStep_Migrate.inc b/setup/class_setupStep_Migrate.inc
index c2379c23012d27cb5776678c28af40a6d155e770..1fb44610217cd64f0bcd597054c73c8bc56acafe 100644 (file)
--- a/setup/class_setupStep_Migrate.inc
+++ b/setup/class_setupStep_Migrate.inc
@@ -772,7 +772,7 @@ class Step_Migrate extends setup_step
             $ldap->cat(base64_decode($tmp[2]),array("objectClass"));
             $ret = $ldap->fetch();
 
-            if(in_array("gosaAccount",$ret['objectClass']) && 
+            if(isset($ret['objectClass']) && in_array("gosaAccount",$ret['objectClass']) && 
                in_array("organizationalPerson",$ret['objectClass']) &&
                in_array("inetOrgPerson",$ret['objectClass'])){
               $found = TRUE;
@@ -852,6 +852,9 @@ class Step_Migrate extends setup_step
       $ldap->cd($cv['base']);
       if(!$ldap->modify($attrs_new)){
         print_red(sprintf(_("Adding acls for user '%s' failed, ldap says '%s'."),$dn,$ldap->get_error()));
+        return(FALSE);
+      }else{
+        return(TRUE);
       }
     }
   }
@@ -1208,7 +1211,11 @@ class Step_Migrate extends setup_step
     }
 
     if(isset($_POST['create_acls_create_confirmed'])){
-      $this->create_admin();
+      if($this->create_admin()){
+        $this->acl_create_dialog = FALSE;
+        $this->dialog = FALSE;
+        $this->initialize_checks();
+      }
     }
 
     if(isset($_POST['create_acls_create'])){

diff --git a/setup/setup_migrate.tpl b/setup/setup_migrate.tpl
index e5c6dfcb5e9bb7fa18902f4398dd664d4ceb5e91..e3873f8b237e46dced553e2767e1c60c3dc336d9 100644 (file)
--- a/setup/setup_migrate.tpl
+++ b/setup/setup_migrate.tpl
@@ -261,15 +261,15 @@
                        </select>
                        <input type='submit' name='create_acls_create' value='{t}Apply{/t}'>
                        {/if}
-               {/if}
-
-
                        <p class='seperator'>&nbsp;</p> 
 
                        <div style='width:99%; text-align:right; padding:5px;'>
                                <input type='submit' name='create_acls_cancel' value='{t}Cancel{/t}'>
                        </div>
                
+               {/if}
+
+
 
                {elseif $method == "migrate_deps"}