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
e167a9dd
Commit
e167a9dd
authored
May 18, 2017
by
Côme Chilliet
Browse files
Fixes
#5528
Fixed ACL assignment display when ou field is empty
parent
2ed900a4
Changes
1
Hide whitespace changes
Inline
Side-by-side
plugins/admin/acl/class_aclManagement.inc
View file @
e167a9dd
...
...
@@ -200,15 +200,25 @@ class aclManagement extends simpleManagement
@
DEBUG
(
DEBUG_TRACE
,
__LINE__
,
__FUNCTION__
,
__FILE__
,
$this
->
dn
,
'Creating new ACL assignment'
);
}
static
function
filterLabel
(
$row
,
$dn
,
$pid
=
0
,
$base
=
""
,
$ou
=
array
()
)
static
function
filterLabel
(
$row
,
$dn
,
$pid
=
0
,
$base
=
''
)
{
$ou
=
$ou
[
0
];
if
(
$dn
==
$base
)
{
$ou
=
" . "
;
$ou
=
' . '
;
}
else
{
for
(
$i
=
4
;
$i
<
func_num_args
();
$i
++
)
{
$val
=
func_get_arg
(
$i
);
if
(
empty
(
$val
))
{
continue
;
}
if
(
!
is_array
(
$val
))
{
$val
=
array
(
$val
);
}
$ou
=
htmlentities
(
reset
(
$val
),
ENT_COMPAT
,
'UTF-8'
);
}
}
$ou
.
=
"
[
"
.
_
(
"
ACL Assignment
"
)
.
"]"
;
$ou
.
=
'
[
'
.
_
(
'
ACL Assignment
'
)
.
']'
;
return
"
<a href=
'
?plug=
"
.
$_GET
[
'plug'
]
.
"
&PID=
$pid
&act=listing_edit_
$row
'
title=
'
$dn
'>
$ou
</a>
"
;
return
'
<a href=
"
?plug=
'
.
$_GET
[
'plug'
]
.
'
&PID=
'
.
$pid
.
'
&act=listing_edit_
'
.
$row
.
'"
title=
"'
.
$dn
.
'">'
.
$ou
.
'
</a>
'
;
}
protected
function
removeEntryRequested
(
$action
,
array
$target
,
array
$all
)
...
...
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