From 8295dc93c1ee0c0d1442562c5e202dd7139af27d Mon Sep 17 00:00:00 2001 From: hickert Date: Mon, 26 May 2008 12:19:35 +0000 Subject: [PATCH] Fixed acl handling in user listing. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@11002 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../admin/users/class_divListUsers.inc | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/gosa-core/plugins/admin/users/class_divListUsers.inc b/gosa-core/plugins/admin/users/class_divListUsers.inc index a4b208b3a..5414d4254 100644 --- a/gosa-core/plugins/admin/users/class_divListUsers.inc +++ b/gosa-core/plugins/admin/users/class_divListUsers.inc @@ -153,7 +153,6 @@ class divListUsers extends MultiSelectWindow } /* Get copy & paste icon */ - $acl_all = $ui->has_complete_category_acls($this->selectedBase,"users") ; $acl = $ui->get_permissions($this->selectedBase,"users/user"); /* Add default header */ @@ -200,20 +199,25 @@ class divListUsers extends MultiSelectWindow } /* Add multiple copy & cut icons */ - if(is_object($this->parent->CopyPasteHandler) && preg_match("/(c.*w|w.*c)/",$acl_all)){ + $acl_all = $ui->has_complete_category_acls($this->selectedBase,"users"); + + if(is_object($this->parent->CopyPasteHandler) && preg_match("/r/",$acl_all)){ $s.= "..|---|\n"; $s.= "..|". " "._("Copy")."|"."multiple_copy_systems|\n"; + } + if(is_object($this->parent->CopyPasteHandler) && preg_match("/(r.*d|d.*r)/",$acl_all)){ $s.= "..|". " "._("Cut")."|"."multiple_cut_systems|\n"; - - if($this->parent->CopyPasteHandler->entries_queued()){ - $img = ""; - $s.="..|".$img." "._("Paste")."|editPaste|\n"; - }else{ - $img = ""; - $s.="..|".$img." "._("Paste")."\n"; - } + } + + /* Copy & paste icons */ + if(is_object($this->parent->CopyPasteHandler) && $this->parent->CopyPasteHandler->entries_queued()){ + $img = ""; + $s.="..|".$img." "._("Paste")."|editPaste|\n"; + }else{ + $img = ""; + $s.="..|".$img." "._("Paste")."\n"; } /* Add snapshot icons */ @@ -302,7 +306,6 @@ class divListUsers extends MultiSelectWindow $action= ""; /* Add copy & cut icons */ - $acl_all = $ui->has_complete_category_acls($this->selectedBase,"users") ; $acl = $ui->get_permissions($val['dn'],"users/user"); if(preg_match("/(r.*d|r.*d)/",$acl) && $this->parent->CopyPasteHandler){ $action .= "