Skip to content

[stable27] unmark deleted users if their last login date is more recent than deleted date #45589

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
Jun 7, 2024
Merged

[stable27] unmark deleted users if their last login date is more recent than deleted date #45589

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a26d29
unmark deleted users if their last login date is more recent than del…
icewind1991 Mar 1, 2023
74dbc05
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 @backportbot
icewind1991 authored and backportbot[bot] committed May 30, 2024
commit 4a26d29777d82447e37c294bc93338ce7086efe4
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 @@ -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;

Expand Down