upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-06 15:23:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 34

Merge pull request #45588 from nextcloud/backport/36942/stable28

Browse source 
[stable28] unmark deleted users if their last login date is more recent than deleted date
This commit is contained in:
Git'Fellow 2024-06-03 10:03:52 +02:00 committed by GitHub
commit 1a701ed86c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/user_ldap/lib/User/DeletedUsersIndex.php
View file

@ -56,7 +56,12 @@ class DeletedUsersIndex {
$userObjects = [];
foreach ($deletedUsers as $user) {
$userObjects[] = new OfflineUser($user, $this->config, $this->mapping, $this->shareManager);
$userObject = new OfflineUser($user, $this->config, $this->mapping, $this->shareManager);
if ($userObject->getLastLogin() > $userObject->getDetectedOn()) {
$userObject->unmark();
} else {
$userObjects[] = $userObject;
}
}
$this->deletedUsers = $userObjects;