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
0c1e5707
Unverified
Commit
0c1e5707
authored
4 years ago
by
Côme Chilliet
Browse files
Options
Download
Patches
Plain Diff
feat(locks) Ignore and delete locks older than session lifetime
issue
#6143
parent
55ef1657
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_Lock.inc
+16
-6
include/class_Lock.inc
with
16 additions
and
6 deletions
+16
-6
include/class_Lock.inc
+
16
−
6
View file @
0c1e5707
...
...
@@ -242,13 +242,23 @@ class Lock
}
$locks
=
[];
$sessionLifetime
=
$config
->
get_cfg_value
(
'sessionLifetime'
,
1800
);
if
(
$sessionLifetime
>
0
)
{
$expirationDate
=
(
new
DateTime
())
->
sub
(
new
DateInterval
(
'PT'
.
$sessionLifetime
.
'S'
));
}
while
(
$attrs
=
$ldap
->
fetch
())
{
$locks
[]
=
new
Lock
(
$attrs
[
'dn'
],
base64_decode
(
$attrs
[
'fdObjectDn'
][
0
]),
$attrs
[
'fdUserDn'
][
0
],
LdapGeneralizedTime
::
fromString
(
$attrs
[
'fdLockTimestamp'
][
0
])
);
$date
=
LdapGeneralizedTime
::
fromString
(
$attrs
[
'fdLockTimestamp'
][
0
]);
if
(
isset
(
$expirationDate
)
&&
(
$date
<
$expirationDate
))
{
/* Delete expired locks */
$ldap
->
rmdir
(
$attrs
[
'dn'
]);
}
else
{
$locks
[]
=
new
Lock
(
$attrs
[
'dn'
],
base64_decode
(
$attrs
[
'fdObjectDn'
][
0
]),
$attrs
[
'fdUserDn'
][
0
],
$date
);
}
}
if
(
!
is_array
(
$objects
)
&&
(
count
(
$locks
)
>
1
))
{
...
...
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