From 4a26d29777d82447e37c294bc93338ce7086efe4 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 1 Mar 2023 17:22:21 +0100 Subject: [PATCH 1/2] unmark deleted users if their last login date is more recent than deleted date Signed-off-by: Robin Appelman --- apps/user_ldap/lib/User/DeletedUsersIndex.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/apps/user_ldap/lib/User/DeletedUsersIndex.php b/apps/user_ldap/lib/User/DeletedUsersIndex.php index 1e057987eef01..406addaa310dc 100644 --- a/apps/user_ldap/lib/User/DeletedUsersIndex.php +++ b/apps/user_ldap/lib/User/DeletedUsersIndex.php @@ -64,7 +64,12 @@ private function fetchDeletedUsers() { $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; From 74dbc058e8507b9e666537723e83e52bcfa72a17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6?= Date: Thu, 2 May 2024 17:28:29 +0200 Subject: [PATCH 2/2] fix: php lint MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Côme Chilliet <91878298+come-nc@users.noreply.github.com> Signed-off-by: John Molakvoæ --- apps/user_ldap/lib/User/DeletedUsersIndex.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/user_ldap/lib/User/DeletedUsersIndex.php b/apps/user_ldap/lib/User/DeletedUsersIndex.php index 406addaa310dc..b83442669c287 100644 --- a/apps/user_ldap/lib/User/DeletedUsersIndex.php +++ b/apps/user_ldap/lib/User/DeletedUsersIndex.php @@ -64,7 +64,7 @@ private function fetchDeletedUsers() { $userObjects = []; foreach ($deletedUsers as $user) { - $userObject = 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 {