Updated Blocklists

-Used acl object was wrong.

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

diff --git a/gosa-plugins/gofax/gofax/blocklists/class_blocklistManagement.inc b/gosa-plugins/gofax/gofax/blocklists/class_blocklistManagement.inc
index 37a80a28f71c216139cb8d82ea23f704d2c53291..962408b0b3fed98e97c52d531fa7d1a622a2d27e 100644 (file)
--- 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 35b8149de50930438fc1c03ae34036f5615cd21c..76faf09da9449da5a67cbe5505c76eecd0b7750c 100644 (file)
--- 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.= "<input class='center' type='image' src='images/lists/edit.png' alt='"._("edit")."'     name='goFaxBlocklist_edit_%KEY%' title='"._("Edit user")."'>";