X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fusers%2Fclass_userManagement.inc;h=c0042797a60a184c1b8ec58f9e99d9cff82d85f2;hb=4b45577aa0d449c2d36417afa256441f9dcb503f;hp=5d56063f93f97678ea368f29b25f36599a3da63d;hpb=f0eeb6e86bed66ccaf53275d8b3f2137b25d8a23;p=gosa.git

diff --git a/plugins/admin/users/class_userManagement.inc b/plugins/admin/users/class_userManagement.inc
index 5d56063f9..c0042797a 100644
--- a/plugins/admin/users/class_userManagement.inc
+++ b/plugins/admin/users/class_userManagement.inc
@@ -210,7 +210,6 @@ class userManagement extends plugin
       $acl = $this->ui->get_permissions($dn, "users/password");
       $cacl= $this->ui->get_permissions($dn, "users/user");
 
-
       if (preg_match('/w/', $acl) || preg_match('/c/', $cacl)){
 
         /* Check input and feed errors into 'message' */
@@ -402,6 +401,7 @@ class userManagement extends plugin
 
           /* In case of new users, ask for a password, skip this for templates */
           if (($set_pass || $this->usertab->password_change_needed()) && !$this->is_template){
+            $this->dn = $this->usertab->dn;
             return($smarty->fetch(get_template_path('password.tpl', TRUE)));
           }
 
@@ -827,8 +827,8 @@ class userManagement extends plugin
         $dn= $this->list[trim($s_entry)]['dn'];
 
         /* Check acl */
-        $acl = $this->ui->get_permissions($dn,"users/user");
-        if(preg_match("/(c.*w|w.*c)/",$acl)){
+        $acl_all  = $ui->has_complete_category_acls($this->selectedBase,"users") ;
+        if(preg_match("/(c.*w|w.*c)/",$acl_all)){
           $obj    = new usertabs($this->config, $this->config->data['TABS']['USERTABS'], $dn);
           $obj->set_acl_base($dn);
           $objNew = new usertabs($this->config, $this->config->data['TABS']['USERTABS'], "new");
@@ -847,8 +847,8 @@ class userManagement extends plugin
         $dn= $this->list[trim($s_entry)]['dn'];
 
         /* Check acl */
-        $acl = $this->ui->get_permissions($dn,"users/user");
-        if(preg_match("/(c.*w|w.*c)/",$acl)){
+        $acl_all  = $ui->has_complete_category_acls($this->selectedBase,"users") ;
+        if(preg_match("/(c.*w|w.*c)/",$acl_all)){
           $obj= new usertabs($this->config, $this->config->data['TABS']['USERTABS'], $dn);
           $obj->set_acl_base($dn);
           $this->CopyPasteHandler->Cut($obj);