From 0cae558fa9703558b4ecc525dc4cc21ee31bbf81 Mon Sep 17 00:00:00 2001
From: Robin Appelman <robin@icewind.nl>
Date: Wed, 1 Mar 2023 17:22:21 +0100
Subject: [PATCH] unmark deleted users if their last login date is more recent
 than deleted date

Signed-off-by: Robin Appelman <robin@icewind.nl>
---
 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 d679ca86d93..6ed14213d97 100644
--- a/apps/user_ldap/lib/User/DeletedUsersIndex.php
+++ b/apps/user_ldap/lib/User/DeletedUsersIndex.php
@@ -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;