From 7cb56c30e2a5e6c7ec4b171b13f7f9ba8f7953f4 Mon Sep 17 00:00:00 2001 From: hickert Date: Thu, 23 Nov 2006 10:08:56 +0000 Subject: [PATCH] Some acl fixes git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@5208 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/admin/mimetypes/class_mimetypeManagement.inc | 4 ++-- plugins/admin/ogroups/class_divListOGroup.inc | 4 ++-- plugins/admin/users/class_divListUsers.inc | 3 --- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/plugins/admin/mimetypes/class_mimetypeManagement.inc b/plugins/admin/mimetypes/class_mimetypeManagement.inc index 3f04ac0aa..bca44d979 100755 --- a/plugins/admin/mimetypes/class_mimetypeManagement.inc +++ b/plugins/admin/mimetypes/class_mimetypeManagement.inc @@ -448,7 +448,7 @@ class mimetypeManagement extends plugin $dn = $this->mimetypes[$s_entry]['dn']; /* Check acls */ - $acl_all= $this->ui->has_complete_category_acls($dn,"ogroups"); + $acl_all= $this->ui->has_complete_category_acls($dn,"mimitypes"); if(preg_match("/(c.*w|w.*c)/",$acl_all)){ $obj = new mimetabs($this->config, $this->config->data['TABS']['MIMETABS'], $dn,"mimetypes"); $obj->set_acl_base($this->dn); @@ -465,7 +465,7 @@ class mimetypeManagement extends plugin $dn = $this->mimetypes[$s_entry]['dn']; /* Check acls */ - $acl_all= $this->ui->has_complete_category_acls($dn,"ogroups"); + $acl_all= $this->ui->has_complete_category_acls($dn,"mimetypes"); if(preg_match("/(c.*w|w.*c)/",$acl_all)){ $obj = new mimetabs($this->config, $this->config->data['TABS']['MIMETABS'], $dn); $this->CopyPasteHandler->Cut($obj); diff --git a/plugins/admin/ogroups/class_divListOGroup.inc b/plugins/admin/ogroups/class_divListOGroup.inc index 3c6ed8e66..2609fda97 100755 --- a/plugins/admin/ogroups/class_divListOGroup.inc +++ b/plugins/admin/ogroups/class_divListOGroup.inc @@ -111,7 +111,7 @@ class divListOGroup extends MultiSelectWindow /* Get copy & paste icon */ $acls = $ui->get_permissions($this->selectedBase,"ogroups/ogroup"); - $acl_all= $ui->has_complete_category_acls($this->selectedBase,"groups"); + $acl_all= $ui->has_complete_category_acls($this->selectedBase,"ogroups"); if(preg_match("/(c.*w|w.*c)/",$acl_all) && $this->parent->CopyPasteHandler){ $Copy_Paste = $this->parent->CopyPasteHandler->generatePasteIcon(); }else{ @@ -182,7 +182,7 @@ class divListOGroup extends MultiSelectWindow /* Create action icons */ $actions= ""; - $acl_all= $ui->has_complete_category_acls($val['dn'],"groups"); + $acl_all= $ui->has_complete_category_acls($val['dn'],"ogroups"); if(($this->parent->CopyPasteHandler) && preg_match("/(c.*w|w.*c)/",$acl_all)){ $actions.= " "; diff --git a/plugins/admin/users/class_divListUsers.inc b/plugins/admin/users/class_divListUsers.inc index 3edbf604d..499eb1762 100644 --- a/plugins/admin/users/class_divListUsers.inc +++ b/plugins/admin/users/class_divListUsers.inc @@ -88,12 +88,9 @@ class divListUsers extends MultiSelectWindow /* Load possible departments */ $ui= get_userinfo(); $tdeps= $ui->get_module_departments("users"); - $ids = $this->config->idepartments; - foreach($deps as $dep){ if(isset($ids[$dep['dn']]) && in_array_ics($dep['dn'], $tdeps)){ - $value = $ids[$dep['dn']]; if ($this->selectedBase == $dep['dn']){ $options.= ""; -- 2.30.2