Commit a8e8c134 authored by Côme Chilliet's avatar Côme Chilliet
Browse files

Merge branch '5965-use-only-selectmanagement-for-selection-dialogs' into '1.4-dev'

Resolve "Use only selectManagement for selection dialogs"

See merge request fusiondirectory/fd!566
parents 3a241bec fed2d6b6
......@@ -931,7 +931,7 @@ class management
$infos['nameAttr'] = 'cn';
}
$objects[] = [
'name' => $entry[$infos['nameAttr']],
'name' => $entry[$infos['nameAttr']][0],
'dn' => $dn,
'icon' => $infos['icon'],
'type' => $infos['name']
......
<?php
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2003 Cajus Pollmeier
Copyright (C) 2011-2016 FusionDirectory
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
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
/*!
* \brief filterLDAP backend with blacklist/whitelist handling
*/
class filterLDAPBlacklist
{
static function query ($parent, $base, $scope, $filter, $attributes, $category, $objectStorage = "")
{
$result = filterLDAP::query($parent, $base, $scope, $filter, $attributes, $category, $objectStorage);
return filterLDAPBlacklist::filterByBlacklist($result);
}
static function filterByBlacklist ($entries)
{
if (session::is_set('filterWhitelist')) {
$wlist = session::get('filterWhitelist');
if (!empty($wlist)) {
foreach ($entries as $id => $entry) {
if (in_array($entry['dn'], $wlist['dn'])) {
continue;
}
foreach ($wlist['branches'] as $branch) {
if (preg_match('/'.preg_quote($branch, '/').'$/', $entry['dn'])) {
continue 2;
}
}
unset($entries[$id]);
}
}
}
if (session::is_set('filterBlacklist')) {
$blist = session::get('filterBlacklist');
foreach ($blist as $attr_name => $attr_values) {
foreach ($attr_values as $match) {
foreach ($entries as $id => $entry) {
if (isset($entry[$attr_name])) {
$test = $entry[$attr_name];
if (!is_array($test)) {
$test = [$test];
}
if (in_array($match, $test)) {
unset($entries[$id]);
}
}
}
}
}
}
return array_values($entries);
}
}
Markdown is supported
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