lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix #yogosha6411

Browse Source
This commit is contained in:
Laurent Destailleur 2021-06-15 20:22:36 +02:00
parent 3a5770f679
commit 1c87420895
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/core/class/ldap.class.php
View File

@ -958,7 +958,7 @@ class Ldap
} }
// Define filter // Define filter
if (!empty($activefilter)) { if (!empty($activefilter)) { // Use a predefined trusted filter (defined into setup by admin).
if (((string) $activefilter == '1' || (string) $activefilter == 'user') && $this->filter) { if (((string) $activefilter == '1' || (string) $activefilter == 'user') && $this->filter) {
$filter = '('.$this->filter.')'; $filter = '('.$this->filter.')';
} elseif (((string) $activefilter == 'group') && $this->filtergroup ) { } elseif (((string) $activefilter == 'group') && $this->filtergroup ) {
@ -966,11 +966,11 @@ class Ldap
} elseif (((string) $activefilter == 'member') && $this->filter) { } elseif (((string) $activefilter == 'member') && $this->filter) {
$filter = '('.$this->filtermember.')'; $filter = '('.$this->filtermember.')';
} else { } else {
// If this->filter is empty, make fiter on * (all) // If this->filter/this->filtergroup is empty, make fiter on * (all)
$filter = '('.$useridentifier.'=*)'; $filter = '('.ldap_escape($useridentifier, '', LDAP_ESCAPE_FILTER).'=*)';
} }
} else { } else { // Use a filter forged using the $search value
$filter = '('.$useridentifier.'='.$search.')'; $filter = '('.ldap_escape($useridentifier, '', LDAP_ESCAPE_FILTER).'='.ldap_escape($search, '', LDAP_ESCAPE_FILTER).')';
} }
if (is_array($attributeArray)) { if (is_array($attributeArray)) {