Côme Chilliet
3 days ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with
6 additions and
3 deletions
-
lib/private/Share20/Manager.php
|
|
|
@ -1265,16 +1265,16 @@ class Manager implements IManager { |
|
|
|
while (true) { |
|
|
|
$added = 0; |
|
|
|
foreach ($shares as $share) { |
|
|
|
$added++; |
|
|
|
if ($onlyValid) { |
|
|
|
try { |
|
|
|
$this->checkShare($share); |
|
|
|
$this->checkShare($share, $added); |
|
|
|
} catch (ShareNotFound $e) { |
|
|
|
// Ignore since this basically means the share is deleted
|
|
|
|
continue; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
$added++; |
|
|
|
$shares2[] = $share; |
|
|
|
|
|
|
|
if (count($shares2) === $limit) { |
|
|
|
@ -1480,11 +1480,14 @@ class Manager implements IManager { |
|
|
|
/** |
|
|
|
* Check expire date and disabled owner |
|
|
|
* |
|
|
|
* @param int &$added If given, will be decremented if the share is deleted |
|
|
|
* @throws ShareNotFound |
|
|
|
*/ |
|
|
|
protected function checkShare(IShare $share): void { |
|
|
|
private function checkShare(IShare $share, int &$added = 1): void { |
|
|
|
if ($share->isExpired()) { |
|
|
|
$this->deleteShare($share); |
|
|
|
// Remove 1 to added, because this share was deleted
|
|
|
|
$added--; |
|
|
|
throw new ShareNotFound($this->l->t('The requested share does not exist anymore')); |
|
|
|
} |
|
|
|
if ($this->config->getAppValue('files_sharing', 'hide_disabled_user_shares', 'no') === 'yes') { |
|
|
|
|
