Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
fusiondirectory
fusiondirectory
Commits
bbb70361
Commit
bbb70361
authored
7 years ago
by
Côme Chilliet
Browse files
Options
Download
Patches
Plain Diff
feat(management) Allow raw LDAP filters
parent
5316f1dd
dev
6342-update-the-locales-for-1-5
6344-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen
6365-core-locking-mechanism-is-not-changing-the-mail-ressource-it-does-lock-the-mail-account
6365-core-when-lock-mechanism-is-trigger-the-user-should-not-be-editable-if-not-unlock
6378-orcid-test-method-is-wrong-and-break-orcid-saving
core-php8
master
fusiondirectory-1.5
fusiondirectory-1.4
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
include/management/class_managementFilter.inc
+8
-7
include/management/class_managementFilter.inc
with
8 additions
and
7 deletions
+8
-7
include/management/class_managementFilter.inc
+
8
−
7
View file @
bbb70361
...
...
@@ -120,18 +120,19 @@ class managementFilter
function
query
(
array
$attrs
,
$base
)
{
$filter
=
''
;
if
(
!
empty
(
$this
->
search
))
{
$filter
=
'(|('
.
implode
(
'=*'
.
$this
->
search
.
'*)('
,
$this
->
searchAttributes
)
.
'=*'
.
$this
->
search
.
'*))'
;
}
$elementFilters
=
array
();
foreach
(
$this
->
filterElements
as
$element
)
{
$element
->
getFilters
(
$elementFilters
);
}
if
(
!
empty
(
$elementFilters
))
{
if
(
!
empty
(
$filter
))
{
$elementFilters
[]
=
$filter
;
if
(
!
empty
(
$this
->
search
))
{
if
(
preg_match
(
'/^\(.+\)$/'
,
$this
->
search
))
{
$elementFilters
[]
=
$this
->
search
;
}
else
{
$elementFilters
[]
=
'(|('
.
implode
(
'=*'
.
$this
->
search
.
'*)('
,
$this
->
searchAttributes
)
.
'=*'
.
$this
->
search
.
'*))'
;
}
}
$filter
=
''
;
if
(
!
empty
(
$elementFilters
))
{
$filter
=
'(&'
.
implode
(
''
,
$elementFilters
)
.
')'
;
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets