Removed: create from existing user

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

diff --git a/setup/class_setupStep_Migrate.inc b/setup/class_setupStep_Migrate.inc
index 8354a765e2b494b031d67d096f5d1794c39a85ae..b75cb097f43c01d7c1877363e5a699a0452953bb 100644 (file)
--- a/setup/class_setupStep_Migrate.inc
+++ b/setup/class_setupStep_Migrate.inc
@@ -67,7 +67,6 @@ class Step_Migrate extends setup_step
 
   /* Create Acl attributes */
   var $acl_create_dialog  = FALSE;
-  var $acl_create_type    = "group";
   var $acl_create_selected= ""; // Currently selected element, that should receive admin rights 
   var $acl_create_changes = ""; // Contains ldif information about changes 
   var $acl_create_confirmed= FALSE;
@@ -1264,14 +1263,14 @@ class Step_Migrate extends setup_step
       $this->show_details = FALSE;
     }
 
-    if(isset($_POST['create_acls_create_confirmed'])){
-      if($this->create_admin()){
-        $this->acl_create_dialog = FALSE;
-        $this->dialog = FALSE;
-      $this->show_details = FALSE;
-        $this->initialize_checks();
-      }
-    }
+#    if(isset($_POST['create_acls_create_confirmed'])){
+#      if($this->create_admin()){
+#        $this->acl_create_dialog = FALSE;
+#        $this->dialog = FALSE;
+#      $this->show_details = FALSE;
+#        $this->initialize_checks();
+#      }
+#    }
 
     if(isset($_POST['create_acls_create'])){
       $this->create_admin(TRUE);
@@ -1288,11 +1287,6 @@ class Step_Migrate extends setup_step
       $smarty = get_smarty();
       $smarty->assign("new_user_password",@$_POST['new_user_password']);
       $smarty->assign("new_user_password2",@$_POST['new_user_password2']);
-      $smarty->assign("users" ,$this->get_user_list());
-      $smarty->assign("users_cnt" ,count($this->get_user_list()));
-      $smarty->assign("groups",$this->get_group_list());
-      $smarty->assign("groups_cnt",count($this->get_group_list()));
-      $smarty->assign("type"  ,$this->acl_create_type);
       $smarty->assign("method","create_acls");
       $smarty->assign("acl_create_selected",$this->acl_create_selected);
       $smarty->assign("what_will_be_done_now",$this->acl_create_changes);
@@ -1440,21 +1434,10 @@ class Step_Migrate extends setup_step
 
     /* Get "create acl" dialog posts */
     if($this->acl_create_dialog){
-      if(isset($_POST['create_acls_create'])){
-        if(isset($_POST['create_acls_selected'])){
-          $this->acl_create_selected = base64_decode($_POST['create_acls_selected']);
-        }else{
-          $this->acl_create_selected = ""; 
-        }
-      }
 
       if(isset($_POST['create_acls_create_abort'])){
         $this->acl_create_selected = "";
       }
-
-      if(isset($_POST['acl_create_type'])){
-        $this->acl_create_type = $_POST['acl_create_type'];
-      }
     }
 
     /* Get selected departments */

diff --git a/setup/setup_migrate.tpl b/setup/setup_migrate.tpl
index 8937ca4e73b298ffe4783a7f8df80ce85e18d203..5abb0b8a17f342a0ab000ad17e84e251f08f5f96 100644 (file)
--- a/setup/setup_migrate.tpl
+++ b/setup/setup_migrate.tpl
@@ -243,40 +243,13 @@
   document.mainform.new_user_password.focus();
   -->
 </script>
-                               <input type='submit' name='create_admin_user' value='{t}Apply{/t}'>     
-                       
-                       {if $users_cnt != 0 || $groups_cnt != 0 }
-                       
-                       <h2>{t}Assign super administrator permissions to an existing user or group{/t}</h2>
-                       <p>{t}To grant administrative permissions to a user or a group, select an object and choose 'Assign'.{/t}</p>
-                       <select name='acl_create_type' onChange='document.mainform.submit();' >
-                               {if $type == "user"}
-                               <option value='group'>{t}Group{/t}</option>
-                               <option selected value='user'>{t}User{/t}</option>
-                               {else}
-                               <option selected value='group'>{t}Group{/t}</option>
-                               <option value='user'>{t}User{/t}</option>
-                               {/if}
-                       </select>
-                       <select name='create_acls_selected' size="12" style='width:100%;'>
-                               {if $type == "user"}
-                                       {html_options options=$users selected=$acl_create_selected}
-                               {else}
-                                       {html_options options=$groups selected=$acl_create_selected}
-                               {/if}
-                       </select>
-                       <input type='submit' name='create_acls_create' value='{t}Apply{/t}'>
-                       {/if}
-                       <p class='seperator'>&nbsp;</p> 
 
+                       <p class='seperator'>&nbsp;</p> 
                        <div style='width:99%; text-align:right; padding:5px;'>
+                               <input type='submit' name='create_admin_user' value='{t}Apply{/t}'>     
                                <input type='submit' name='create_acls_cancel' value='{t}Cancel{/t}'>
                        </div>
-               
-               {/if}
-
-
-
+                       {/if}   
                {elseif $method == "migrate_deps"}
        
                        <h2>Department migration</h2>