bn8/ldapsaisie
1
0
Fork 0
mirror of https://gitlab.easter-eggs.com/ee/ldapsaisie.git synced 2024-12-18 14:33:49 +01:00
Code Issues Projects Releases Wiki Activity

LSsearch : fix possibility to specify a filter and a pattern (in the same time)

Browse source
This commit is contained in:
Benjamin Renard 2020-04-29 15:31:30 +02:00
parent c63040203d
commit 6ea6b78fd4
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
public_html/includes/class/class.LSsearch.php
View file

@ -275,22 +275,18 @@ class LSsearch {
$OK=false; $OK=false;
} }
} }
// Patterm // Patterm
if (isset($params['pattern'])) { if (isset($params['pattern'])) {
if ($params['pattern']=="") { if ($params['pattern']=="") {
$this -> params['pattern'] = NULL; $this -> params['pattern'] = NULL;
$this -> params['filter'] = NULL;
} }
elseif ($this -> isValidPattern($params['pattern'])) { elseif ($this -> isValidPattern($params['pattern'])) {
$this -> params['pattern'] = $params['pattern']; $this -> params['pattern'] = $params['pattern'];
if (!is_string($params['filter'])) {
$this -> params['filter']=NULL;
}
} }
} }
// BaseDN // BaseDN
if (isset($params['basedn']) && is_string($params['basedn'])) { if (isset($params['basedn']) && is_string($params['basedn'])) {
if (isCompatibleDNs(LSsession :: getRootDn(),$params['basedn'])) { if (isCompatibleDNs(LSsession :: getRootDn(),$params['basedn'])) {