Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skjnldsv merged 2 commits into from
May 30, 2024
Merged

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

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36cb845
unmark deleted users if their last login date is more recent than del…
icewind1991 Mar 1, 2023
61a6013
fix: php lint
skjnldsv May 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
unmark deleted users if their last login date is more recent than del… 
…eted date

Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
@icewind1991 @joshtrichards
icewind1991 authored and joshtrichards committed May 27, 2024
commit 36cb845f0578d4a8db496cfd782c4567ad3924bf
7 changes: 6 additions & 1 deletion apps/user_ldap/lib/User/DeletedUsersIndex.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,12 @@ private function fetchDeletedUsers(): array {

$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;

Expand Down