From 5af2bbc5650af5ad3b18fd049b970c29334af8f5 Mon Sep 17 00:00:00 2001 From: hickert Date: Wed, 5 May 2010 07:49:37 +0000 Subject: [PATCH] Removed hard coded ACL 'all' git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@18065 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/plugins/admin/acl/class_aclRole.inc | 5 ----- gosa-core/plugins/generic/references/class_aclResolver.inc | 1 - 2 files changed, 6 deletions(-) diff --git a/gosa-core/plugins/admin/acl/class_aclRole.inc b/gosa-core/plugins/admin/acl/class_aclRole.inc index b272377f1..6a86f3ba4 100644 --- a/gosa-core/plugins/admin/acl/class_aclRole.inc +++ b/gosa-core/plugins/admin/acl/class_aclRole.inc @@ -127,8 +127,6 @@ class aclrole extends acl } } } - $this->aclObjects['all']= '* '._("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)); } diff --git a/gosa-core/plugins/generic/references/class_aclResolver.inc b/gosa-core/plugins/generic/references/class_aclResolver.inc index a67cda04c..f33185614 100644 --- a/gosa-core/plugins/generic/references/class_aclResolver.inc +++ b/gosa-core/plugins/generic/references/class_aclResolver.inc @@ -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){ -- 2.30.2