From 3d5371f3d5ca1a1588eb8b5b56d0899544df4138 Mon Sep 17 00:00:00 2001 From: cajus Date: Thu, 10 Aug 2006 09:56:19 +0000 Subject: [PATCH] Avoid initial reset of ocMapping. It is array() anyway. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@4465 594d385d-05f5-0310-b6e9-bd551577e9d8 --- include/class_userinfo.inc | 2 +- plugins/admin/fai/class_divListFai.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/class_userinfo.inc b/include/class_userinfo.inc index 2c5fb932c..29d6dc817 100644 --- a/include/class_userinfo.inc +++ b/include/class_userinfo.inc @@ -94,7 +94,6 @@ class userinfo #echo "NEW ACL LOADING --------------------------------------------------------------------------------------------
"; $this->ACL= array(); - $this->ocMapping= array(); $this->groups= array(); $ldap= $this->config->get_ldap_link(); $ldap->cd($this->config->current['BASE']); @@ -226,6 +225,7 @@ class userinfo /* If attribute is "", we want to know, if we've *any* permissions here... */ if ($attribute == "" && isset($subacl['acl'][$object])){ +echo "Global $object
"; foreach($subacl['acl'][$object] as $attr => $dummy){ $acl= $this->mergeACL($acl, $subacl['type'], $subacl['acl'][$object][$attr]); } diff --git a/plugins/admin/fai/class_divListFai.inc b/plugins/admin/fai/class_divListFai.inc index 56a0d2bb4..58cd27a8e 100644 --- a/plugins/admin/fai/class_divListFai.inc +++ b/plugins/admin/fai/class_divListFai.inc @@ -41,7 +41,7 @@ class divListFai extends MultiSelectWindow /* Set list strings */ $this->SetTitle(_("List of FAI classes")); - $this->SetSummary(_("This table displays all FAI classes, in the selected tree.")); + $this->SetSummary(_("This table displays all FAI classes in the selected tree.")); /* Result page will look like a headpage */ $this->SetHeadpageMode(); -- 2.30.2