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
fc583418
Commit
fc583418
authored
Mar 13, 2017
by
Côme Chilliet
Browse files
Fixes
#5397
Use a separate ACL for account locking
parent
e0dc4f50
Changes
2
Show whitespace changes
Inline
Side-by-side
plugins/admin/users/class_userManagement.inc
View file @
fc583418
...
...
@@ -143,7 +143,7 @@ class userManagement extends simpleManagement
$disallowed
=
array
();
$allowed
=
array
();
foreach
(
$entry
as
$dn
)
{
if
(
!
preg_match
(
'/w/'
,
$ui
->
get_permissions
(
$dn
,
'user/user'
,
'user
Password
'
)))
{
if
(
!
preg_match
(
'/w/'
,
$ui
->
get_permissions
(
$dn
,
'user/user'
,
'user
Lock
'
)))
{
$disallowed
[]
=
$dn
;
}
else
{
$allowed
[]
=
$dn
;
...
...
plugins/personal/generic/class_user.inc
View file @
fc583418
...
...
@@ -293,7 +293,10 @@ class user extends simplePlugin
'manager'
=>
array
(
'user'
,
'dn'
)
),
'plProvidedAcls'
=>
parent
::
generatePlProvidedAcls
(
static
::
getAttributesInfo
())
'plProvidedAcls'
=>
array_merge
(
parent
::
generatePlProvidedAcls
(
static
::
getAttributesInfo
()),
array
(
'userLock'
=>
_
(
'User lock status'
))
)
);
}
...
...
jplojohn
@jplojohn
mentioned in issue
#1724 (closed)
·
Sep 02, 2017
mentioned in issue
#1724 (closed)
mentioned in issue #1724
Toggle commit list
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