From 31ea31c827e623b39522cf28b15bb43fd2f93982 Mon Sep 17 00:00:00 2001 From: hickert Date: Thu, 16 Oct 2008 13:29:04 +0000 Subject: [PATCH] Updated Blocklists -Used acl object was wrong. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@12722 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../gofax/gofax/blocklists/class_blocklistManagement.inc | 2 +- .../gofax/gofax/blocklists/class_divListBlocklists.inc | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gosa-plugins/gofax/gofax/blocklists/class_blocklistManagement.inc b/gosa-plugins/gofax/gofax/blocklists/class_blocklistManagement.inc index 37a80a28f..962408b0b 100644 --- a/gosa-plugins/gofax/gofax/blocklists/class_blocklistManagement.inc +++ b/gosa-plugins/gofax/gofax/blocklists/class_blocklistManagement.inc @@ -408,7 +408,7 @@ class blocklist extends plugin $tmp=array(); foreach($this->blocklists as $tkey => $val ){ - $acl = $this->ui ->get_permissions($base,"gofaxlist/blocklist"); + $acl = $this->ui ->get_permissions($base,"gofaxlist/blocklistGeneric"); if(preg_match("/r/",$acl)){ $tmp[strtolower($val['cn'][0]).$val['cn'][0]]=$val; } diff --git a/gosa-plugins/gofax/gofax/blocklists/class_divListBlocklists.inc b/gosa-plugins/gofax/gofax/blocklists/class_divListBlocklists.inc index 35b8149de..76faf09da 100644 --- a/gosa-plugins/gofax/gofax/blocklists/class_divListBlocklists.inc +++ b/gosa-plugins/gofax/gofax/blocklists/class_divListBlocklists.inc @@ -76,7 +76,7 @@ class divListBlocklist extends MultiSelectWindow /* Get acls */ $ui = get_userinfo(); - $acl = $ui->get_permissions($this->selectedBase,"gofaxlist/blocklist"); + $acl = $ui->get_permissions($this->selectedBase,"gofaxlist/blocklistGeneric"); $acl_all = $ui->has_complete_category_acls($this->selectedBase,"gofaxlist"); /* Add default header */ @@ -135,7 +135,7 @@ class divListBlocklist extends MultiSelectWindow $ui = get_userinfo(); foreach($list as $key => $val){ - $acl = $ui->get_permissions($val['dn'],"gofaxlist/blocklist"); + $acl = $ui->get_permissions($val['dn'],"gofaxlist/blocklistGeneric"); $acl_all = $ui->has_complete_category_acls($val['dn'],"gofaxlist"); if(!preg_match("/r/",$acl)){ @@ -145,7 +145,7 @@ class divListBlocklist extends MultiSelectWindow $action =""; /* Add copy & cut functionality */ - $action.= $this->parent->get_copypaste_action($val['dn'],"gofaxlist","blocklist"); + $action.= $this->parent->get_copypaste_action($val['dn'],"gofaxlist","blocklistGeneric"); /* Edit link ; requires read access */ $action.= ""; -- 2.30.2