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
b78e3e56
Commit
b78e3e56
authored
8 years ago
by
Côme Chilliet
Browse files
Options
Download
Patches
Plain Diff
Fixed ACL assignment check for empty member list
parent
25938f0a
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
fusiondirectory-1.3.1
fusiondirectory-1.3
fusiondirectory-1.2.3
fusiondirectory-1.2.2
fusiondirectory-1.2.1
fusiondirectory-1.2
fusiondirectory-1.1.1
fusiondirectory-1.1
fusiondirectory-1.0.20
fusiondirectory-1.0.19
fusiondirectory-1.0.18
fusiondirectory-1.0.17
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
include/class_acl.inc
+6
-1
include/class_acl.inc
plugins/admin/acl/class_aclAssignment.inc
+5
-0
plugins/admin/acl/class_aclAssignment.inc
with
11 additions
and
1 deletion
+11
-1
include/class_acl.inc
+
6
−
1
View file @
b78e3e56
...
@@ -141,7 +141,12 @@ class acl
...
@@ -141,7 +141,12 @@ class acl
foreach
(
$ma
as
$memberdn
)
{
foreach
(
$ma
as
$memberdn
)
{
// Check for wildcard here
// Check for wildcard here
$dn
=
base64_decode
(
$memberdn
);
$dn
=
base64_decode
(
$memberdn
);
if
(
$dn
!=
"*"
)
{
if
(
$dn
!=
'*'
)
{
if
(
empty
(
$dn
))
{
trigger_error
(
'Empty dn found in members of ACL'
);
continue
;
}
$ldap
->
cat
(
$dn
,
array
(
'cn'
,
'objectClass'
,
'description'
,
'uid'
));
$ldap
->
cat
(
$dn
,
array
(
'cn'
,
'objectClass'
,
'description'
,
'uid'
));
/* Found entry... */
/* Found entry... */
...
...
This diff is collapsed.
Click to expand it.
plugins/admin/acl/class_aclAssignment.inc
+
5
−
0
View file @
b78e3e56
...
@@ -156,6 +156,11 @@ class ACLsAssignmentDialog extends GenericDialog
...
@@ -156,6 +156,11 @@ class ACLsAssignmentDialog extends GenericDialog
function
handle_finish
()
function
handle_finish
()
{
{
$this
->
dialog
->
save_object
();
$this
->
dialog
->
save_object
();
$messages
=
$this
->
dialog
->
check
();
if
(
!
empty
(
$messages
))
{
msg_dialog
::
displayChecks
(
$messages
);
return
$this
->
dialog
->
execute
();
}
$this
->
attribute
->
addValue
(
$this
->
dialog
->
getAclEntry
());
$this
->
attribute
->
addValue
(
$this
->
dialog
->
getAclEntry
());
return
FALSE
;
return
FALSE
;
}
}
...
...
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