diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2016-10-19 10:03:29 +0200 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2016-10-28 08:44:05 +0200 |
| commit | f8352fcb8dfb5284520396bdc624b6bf62d18219 (patch) | |
| tree | 34cc43159586b971e325efd30f6f16b328f607d7 /apps/files_trashbin/lib | |
| parent | ad597d498d9298643338df2df0170159b736c12c (diff) | |
| download | nextcloud-server-f8352fcb8dfb5284520396bdc624b6bf62d18219.tar.gz nextcloud-server-f8352fcb8dfb5284520396bdc624b6bf62d18219.zip | |
introduce callForSeenUsers and countSeenUsers (#26361)
* introduce callForSeenUsers and countSeenUsers
* add tests
* oracle should support not null on clob
* since 9.2.0
Diffstat (limited to 'apps/files_trashbin/lib')
| -rw-r--r-- | apps/files_trashbin/lib/BackgroundJob/ExpireTrash.php | 4 | ||||
| -rw-r--r-- | apps/files_trashbin/lib/Command/ExpireTrash.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/files_trashbin/lib/BackgroundJob/ExpireTrash.php b/apps/files_trashbin/lib/BackgroundJob/ExpireTrash.php index 7d481afeb59..d366a401e2f 100644 --- a/apps/files_trashbin/lib/BackgroundJob/ExpireTrash.php +++ b/apps/files_trashbin/lib/BackgroundJob/ExpireTrash.php @@ -77,9 +77,9 @@ class ExpireTrash extends \OC\BackgroundJob\TimedJob { return; } - $this->userManager->callForAllUsers(function(IUser $user) { + $this->userManager->callForSeenUsers(function(IUser $user) { $uid = $user->getUID(); - if ($user->getLastLogin() === 0 || !$this->setupFS($uid)) { + if (!$this->setupFS($uid)) { return; } $dirContent = Helper::getTrashFiles('/', $uid, 'mtime'); diff --git a/apps/files_trashbin/lib/Command/ExpireTrash.php b/apps/files_trashbin/lib/Command/ExpireTrash.php index ff827718885..b016fdd6aeb 100644 --- a/apps/files_trashbin/lib/Command/ExpireTrash.php +++ b/apps/files_trashbin/lib/Command/ExpireTrash.php @@ -89,7 +89,7 @@ class ExpireTrash extends Command { } else { $p = new ProgressBar($output); $p->start(); - $this->userManager->callForAllUsers(function(IUser $user) use ($p) { + $this->userManager->callForSeenUsers(function(IUser $user) use ($p) { $p->advance(); $this->expireTrashForUser($user); }); @@ -100,7 +100,7 @@ class ExpireTrash extends Command { function expireTrashForUser(IUser $user) { $uid = $user->getUID(); - if ($user->getLastLogin() === 0 || !$this->setupFS($uid)) { + if (!$this->setupFS($uid)) { return; } $dirContent = Helper::getTrashFiles('/', $uid, 'mtime'); |