unmark deleted users if their last login date is more recent than deleted date

Signed-off-by: Robin Appelman <robin@icewind.nl>

diff --git a/apps/user_ldap/lib/User/DeletedUsersIndex.php b/apps/user_ldap/lib/User/DeletedUsersIndex.php
index d679ca86d93ac70c0af677ad2ad7a4fadeea338f..6ed14213d97d62e7dbb28852bd2ba271732b7959 100644 (file)
--- 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;