Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
fusiondirectory
fusiondirectory
Commits
4d83dfae
Commit
4d83dfae
authored
May 31, 2017
by
Côme Chilliet
Browse files
Fixes
#5562
ACLs were not applied correctly if management lists
Problem was in commit
b2c7c09a
parent
7cfd27ea
Changes
2
Hide whitespace changes
Inline
Side-by-side
include/class_filterLDAP.inc
View file @
4d83dfae
...
...
@@ -74,7 +74,7 @@ class filterLDAP
*
* \param boolean $checkAcl
*/
static
function
get_list
(
$parent
,
$base
,
$filter
,
$attributes
,
$category
,
$objectStorage
,
$scope
,
$sizelimit
=
TRUE
,
$
check
Acl
=
FALSE
)
static
function
get_list
(
$parent
,
$base
,
$filter
,
$attributes
,
$category
,
$objectStorage
,
$scope
,
$sizelimit
=
TRUE
,
$
skip
Acl
=
FALSE
)
{
global
$config
,
$ui
;
...
...
@@ -151,7 +151,7 @@ class filterLDAP
$dn
=
$attrs
[
'dn'
];
/* Skip ACL checks if we are forced to skip those checks */
if
(
!
$check
Acl
)
{
if
(
$skip
Acl
)
{
$result
[]
=
$attrs
;
}
else
{
// Check entry permission
...
...
plugins/admin/users/class_userManagement.inc
View file @
4d83dfae
...
...
@@ -150,7 +150,7 @@ class userManagement extends simpleManagement
}
}
if
(
count
(
$disallowed
))
{
msg_dialog
::
display
(
_
(
'Permission'
),
msgPool
::
perm
Delete
(
$disallowed
),
INFO_DIALOG
);
msg_dialog
::
display
(
_
(
'Permission'
),
msgPool
::
perm
Modify
(
$disallowed
),
INFO_DIALOG
);
}
// Try to lock/unlock the rest of the entries.
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment