diff --git a/include/class_config.inc b/include/class_config.inc index c28ecded64c571c813d6e1f160ad240411374729..c07ae223b1f6fb1e42aa4a46542c1a25a71441ee 100644 --- a/include/class_config.inc +++ b/include/class_config.inc @@ -803,7 +803,7 @@ class config if (isset($plInfo['plObjectType'])) { $entry = array('CLASS' => $class,'NAME' => $plInfo['plShortName']); if (isset($plInfo['plSubTabs'])) { - $entry['SUBTABS'] = strtoupper($plInfo['plSubTabs']).'TABS'; + $entry['SUBTABS'] = strtoupper($plInfo['plSubTabs']); } foreach ($plInfo['plObjectType'] as $key => $value) { if (is_numeric($key)) { diff --git a/include/class_userinfo.inc b/include/class_userinfo.inc index da2a32c0df61a017d1113c378defe5a247a627a4..38c1d7615d5ab5d23682b3960efd3580f22a1fb5 100644 --- a/include/class_userinfo.inc +++ b/include/class_userinfo.inc @@ -1029,21 +1029,23 @@ class userinfo if (is_array($type)) { /* Used for recursion through subtabs */ - $tabs = $type; + $prefix = ''; + $tabs = $type; } else { /* Usual workflow */ $infos = objects::infos($type); + $prefix = $infos['aclCategory'].'/'; $tabs = $config->data['TABS'][$infos['tabGroup']]; } foreach ($tabs as $tab) { $acls = pluglist::pluginInfos($tab['CLASS'])['plProvidedAcls']; if (isset($acls[$attribute])) { - return $infos['aclCategory'].'/'.$tab['CLASS']; + return $prefix.$tab['CLASS']; } if (isset($tab['SUBTABS'])) { $acl = $this->getAttributeCategory($config->data['TABS'][$tab['SUBTABS']], $attribute); if ($acl !== FALSE) { - return $acl; + return $prefix.$acl; } } } diff --git a/plugins/config/class_pluginsConfigInLdap.inc b/plugins/config/class_pluginsConfigInLdap.inc index c797cf0b745d69c21a3b182806d8a63bef6088af..676fa318db3676756b138dbc2df149b44d201cce 100644 --- a/plugins/config/class_pluginsConfigInLdap.inc +++ b/plugins/config/class_pluginsConfigInLdap.inc @@ -29,7 +29,7 @@ class pluginsConfigInLdap extends multiPlugin 'plDescription' => _('Configuration for plugins'), 'plPriority' => 20, 'plObjectType' => array('configuration'), - 'plSubTabs' => 'smallConfig', + 'plSubTabs' => 'SMALLCONFIGTABS', 'plProvidedAcls' => array() );