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
996cfa3d
Unverified
Commit
996cfa3d
authored
3 years ago
by
Côme Chilliet
Browse files
Options
Download
Patches
Plain Diff
fix(core) Avoid PHP errors when an object type as an invalid ou
issue #6188
parent
44f16246
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/class_objects.inc
+12
-10
include/class_objects.inc
with
12 additions
and
10 deletions
+12
-10
include/class_objects.inc
+
12
−
10
View file @
996cfa3d
...
...
@@ -440,16 +440,18 @@ class objects
$infos
[
'filterRDN'
]
=
''
;
}
else
{
$parts
=
ldap_explode_dn
(
preg_replace
(
'/,$/'
,
''
,
$infos
[
'ou'
]),
0
);
unset
(
$parts
[
'count'
]);
$dnFilter
=
[];
foreach
(
$parts
as
$part
)
{
preg_match
(
'/([^=]+)=(.*)$/'
,
$part
,
$m
);
$dnFilter
[]
=
'('
.
$m
[
1
]
.
':dn:='
.
$m
[
2
]
.
')'
;
}
if
(
count
(
$dnFilter
)
>
1
)
{
$infos
[
'filterRDN'
]
=
'(&'
.
implode
(
''
,
$dnFilter
)
.
')'
;
}
else
{
$infos
[
'filterRDN'
]
=
$dnFilter
[
0
];
if
(
$parts
!==
FALSE
)
{
unset
(
$parts
[
'count'
]);
$dnFilter
=
[];
foreach
(
$parts
as
$part
)
{
preg_match
(
'/([^=]+)=(.*)$/'
,
$part
,
$m
);
$dnFilter
[]
=
'('
.
$m
[
1
]
.
':dn:='
.
$m
[
2
]
.
')'
;
}
if
(
count
(
$dnFilter
)
>
1
)
{
$infos
[
'filterRDN'
]
=
'(&'
.
implode
(
''
,
$dnFilter
)
.
')'
;
}
else
{
$infos
[
'filterRDN'
]
=
$dnFilter
[
0
];
}
}
}
}
...
...
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