Updated acl stuff

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

diff --git a/gosa-core/include/class_listing.inc b/gosa-core/include/class_listing.inc
index 85198923fd71f9656d65b5c8a7167e5ada512d93..9ffb82369e52ac10c2e49050dd1a041ca5eecb65 100644 (file)
--- a/gosa-core/include/class_listing.inc
+++ b/gosa-core/include/class_listing.inc
@@ -1207,14 +1207,6 @@ class listing {
   {
     $ui= get_userinfo();
 
-############# MARKER
-    if ($classes) {
-      $otype= $this->getObjectType($this->objectTypes, $classes);
-      echo "Type: $otype<br>";
-      #$category= $this->category[$otype];
-      #$params[]= $ui->get_category_permissions($dn, $category);
-    }
-
     if (isset($action['acl'])) {
       $acls= $action['acl'];
       if (!is_array($acls)) {
@@ -1226,6 +1218,13 @@ class listing {
         $module= $this->module;
         $aclList= array();
 
+        // Replace %acl if available
+        if ($classes) {
+          $otype= $this->getObjectType($this->objectTypes, $classes);
+          echo "ACL replace: $module/".$otype['category']."<br>";
+          $acl= str_replace('%acl', $module."/".$otype['category']);
+        }
+
         // Split for category and plugins if needed
         // match for "[rw]" style entries
         if (preg_match('/^\[([rwcdm]+)\]$/', $acl, $match)){