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

:ambulance: fix(mixedgroups) Correctly fill memberUid when there are subgroups 

issue #6081
parent 0a61144d
dev 6104-mail-methods-refactor 6231-give-the-ability-to-the-webservice-to-notice-if-an-attribute-is-monovalued-or-multivalued 6237-add-requiredattrs-array-to-the-webservice-informations 6245-adapt-the-ci-to-the-reorganisation-of-the-dev-tools-and-fixing-the-trigger-downstream-pipelines 6250-supann-configuration-backend-requires-account-life-cycle-section 6280-plugins-update-plugins-to-take-into-consideration-the-new-directory-of-core-structure 6310-tasks-reminder-error-in-the-schema-duplicate-attribute-id 6311-put-the-version-1-5-in-all-yaml-for-fusiondirectory-1-5 6322-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen-2 6332-zimbra-allows-update-of-data-for-unknown-domain-name-for-specific-individual-aliases 6337-webservice-issue-with-archiving-post-request-not-responding-but-successfully-archiving-user 6341-supann-extract-resources-states-sub-states-from-backend-configuration-to-their-own-objects master fusiondirectory-1.5 fusiondirectory-1.4
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 10 additions and 3 deletions
+10 -3
mixedgroups/admin/ogroups/mixedgroups/class_mixedGroup.inc
+ 10
− 3
View file @ 2446d543
<?php <?php
/* /*
This code is part of FusionDirectory (http://www.fusiondirectory.org/) This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2015-2016 FusionDirectory
Copyright (C) 2015-2020 FusionDirectory
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
...@@ -142,9 +143,15 @@ class mixedGroup extends simplePlugin ...@@ -142,9 +143,15 @@ class mixedGroup extends simplePlugin
$members = $this->parent->getBaseObject()->member; $members = $this->parent->getBaseObject()->member;
$memberUid = []; $memberUid = [];
foreach ($members as $dn) { foreach ($members as $dn) {
$ldap->cat($dn, ['uid']); $ldap->cat($dn, ['uid','memberUid']);
$attrs = $ldap->fetch(); $attrs = $ldap->fetch();
$memberUid[] = $attrs['uid'][0]; if (isset($attrs['uid'][0])) {
$memberUid[] = $attrs['uid'][0];
}
if (isset($attrs['memberUid'][0])) {
unset($attrs['memberUid']['count']);
$memberUid = array_merge_unique($memberUid, $attrs['memberUid']);
}
} }
$this->memberUid = $memberUid; $this->memberUid = $memberUid;
......
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