WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

allow ^/$ in filter expression

This commit is contained in:
Roland Gruber 2020-02-01 17:30:53 +01:00
parent 3dc40d1f99
commit e28efcfd21
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lam/lib/lists.inc
View File

@ -4,7 +4,7 @@ use LAM\TYPES\ConfiguredType;
/* /*
This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/) This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
Copyright (C) 2003 - 2019 Roland Gruber Copyright (C) 2003 - 2020 Roland Gruber
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
@ -233,7 +233,7 @@ class lamList {
$foundFilter = $_POST["filter" . strtolower($this->attrArray[$i])]; $foundFilter = $_POST["filter" . strtolower($this->attrArray[$i])];
} }
if (isset($foundFilter) && ($foundFilter != '')) { if (isset($foundFilter) && ($foundFilter != '')) {
if (preg_match('/^([\p{L}\p{N} _\\*\\$\\.:@-])+$/iu', $foundFilter)) { // \p{L} matches any Unicode letter if (preg_match('/^[\\^]?([\p{L}\p{N} _\\*\\$\\.:@-])+[\\$]?$/iu', $foundFilter)) { // \p{L} matches any Unicode letter
$this->filters[strtolower($this->attrArray[$i])] = $foundFilter; $this->filters[strtolower($this->attrArray[$i])] = $foundFilter;
} }
else { else {
@ -1084,10 +1084,16 @@ class lamList {
continue; continue;
} }
$filterExpression = $filter; $filterExpression = $filter;
if (strpos($filter, '*') !== 0) { if (strpos($filter, '^') === 0) {
$filterExpression = substr($filterExpression, 1);
}
elseif (strpos($filter, '*') !== 0) {
$filterExpression = '*' . $filterExpression; $filterExpression = '*' . $filterExpression;
} }
if (strrpos($filter, '*') !== (strlen($filter) - 1)) { if (strrpos($filter, '$') === (strlen($filter) - 1)) {
$filterExpression = substr($filterExpression, 0, -1);
}
elseif (strrpos($filter, '*') !== (strlen($filter) - 1)) {
$filterExpression = $filterExpression . '*'; $filterExpression = $filterExpression . '*';
} }
$text .= '(' . $attr . '=' . $filterExpression . ')'; $text .= '(' . $attr . '=' . $filterExpression . ')';