Code

Removed hard coded ACL 'all'
authorhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Wed, 5 May 2010 07:49:37 +0000 (07:49 +0000)
committerhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Wed, 5 May 2010 07:49:37 +0000 (07:49 +0000)
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@18065 594d385d-05f5-0310-b6e9-bd551577e9d8

gosa-core/plugins/admin/acl/class_aclRole.inc
gosa-core/plugins/generic/references/class_aclResolver.inc

index b272377f142a218776ca4fa3ce689fc20fc9de16..6a86f3ba4f9805a09cfce9fb01994be1b3b45730 100644 (file)
@@ -127,8 +127,6 @@ class aclrole extends acl
         }
       }
     }
-    $this->aclObjects['all']= '*&nbsp;'._("All categories");
-    $this->ocMapping['all']= array('0' => 'all');
 
     /* Sort categories */
     asort($this->aclObjects);
@@ -447,9 +445,6 @@ class aclrole extends acl
         }
         $aclObjects[$this->aclObject.'/'.$class]= $plist[$class]['plDescription'];
       }
-      if ($this->aclObject == 'all'){
-        $aclObjects['all']= _("All objects in current subtree");
-      }
       $smarty->assign('aclSelector', $this->buildAclSelector($aclObjects));
     }
 
index a67cda04cd4409ce0f4441cdcbace912db2279e4..f33185614996f9d8e2d8e49e346876ef4967f76f 100644 (file)
@@ -33,7 +33,6 @@ class aclResolver
             $tmp= session::global_get('plist');
             $plist= $tmp->info;
             $map = array();
-            $map['all']= _("All categories");
             foreach($plist as $class => $plInfo){
                 if(isset($plInfo['plCategory']) && is_array($plInfo['plCategory'])){
                     foreach($plInfo['plCategory'] as $category => $desc){