Skip to content
GitLab
Commit c04a6115 authored by Côme Chilliet's avatar Côme Chilliet
Browse files

:ambulance: fix(management) Fix search base when multiple types are searched

parent 933bbc24
dev 6342-update-the-locales-for-1-5 6344-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen 6365-core-locking-mechanism-is-not-changing-the-mail-ressource-it-does-lock-the-mail-account 6365-core-when-lock-mechanism-is-trigger-the-user-should-not-be-editable-if-not-unlock 6378-orcid-test-method-is-wrong-and-break-orcid-saving core-php8 master fusiondirectory-1.5 fusiondirectory-1.4
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 5 additions and 3 deletions
+5 -3
include/management/class_managementFilter.inc
+ 5
− 3
View file @ c04a6115
...@@ -145,7 +145,9 @@ class managementFilter ...@@ -145,7 +145,9 @@ class managementFilter
} }
$infos = $this->types[$type]['infos']; $infos = $this->types[$type]['infos'];
if ($this->scope == 'one') { if ($this->scope == 'one') {
$base = (empty($infos['ou']) ? $base : $infos['ou'].$base); $searchBase = (empty($infos['ou']) ? $base : $infos['ou'].$base);
} else {
$searchBase = $base;
} }
$attrsAsked = $attrs; $attrsAsked = $attrs;
if (!empty($infos['mainAttr']) && !isset($attrsAsked[$infos['mainAttr']])) { if (!empty($infos['mainAttr']) && !isset($attrsAsked[$infos['mainAttr']])) {
...@@ -157,7 +159,7 @@ class managementFilter ...@@ -157,7 +159,7 @@ class managementFilter
$attrsAsked[$infos['nameAttr']] = '1'; $attrsAsked[$infos['nameAttr']] = '1';
} }
$ldapEntries = objects::ls($type, $attrsAsked, $base, $filter, TRUE, $this->scope); $ldapEntries = objects::ls($type, $attrsAsked, $searchBase, $filter, TRUE, $this->scope);
$objectTypeCount[$type] = count($ldapEntries); $objectTypeCount[$type] = count($ldapEntries);
foreach ($ldapEntries as $dn => $entry) { foreach ($ldapEntries as $dn => $entry) {
...@@ -167,7 +169,7 @@ class managementFilter ...@@ -167,7 +169,7 @@ class managementFilter
$parentClass = get_class($this->parent); $parentClass = get_class($this->parent);
if (!$parentClass::$skipTemplates && $this->showTemplates) { if (!$parentClass::$skipTemplates && $this->showTemplates) {
$ldapEntries = objects::ls($type, $attrsAsked, (($this->scope == 'one') ? 'ou=templates,'.$base : $base), $filter, TRUE, $this->scope, TRUE); $ldapEntries = objects::ls($type, $attrsAsked, (($this->scope == 'one') ? 'ou=templates,'.$searchBase : $searchBase), $filter, TRUE, $this->scope, TRUE);
$objectTypeCount['template_'.$type] = count($ldapEntries); $objectTypeCount['template_'.$type] = count($ldapEntries);
foreach ($ldapEntries as $dn => $entry) { foreach ($ldapEntries as $dn => $entry) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment