From 620be7dc221ad3eac5f93216a92275c3f978e883 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?=
<skjnldsv@protonmail.com>
Date: Tue, 20 Oct 2020 10:20:26 +0200
Subject: [PATCH] Also expire share type email
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
---
apps/files_sharing/lib/ExpireSharesJob.php | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/apps/files_sharing/lib/ExpireSharesJob.php b/apps/files_sharing/lib/ExpireSharesJob.php
index d56e1f02425..5e48dd9ffd7 100644
--- a/apps/files_sharing/lib/ExpireSharesJob.php
+++ b/apps/files_sharing/lib/ExpireSharesJob.php
@@ -60,7 +60,10 @@ class ExpireSharesJob extends TimedJob {
->from('share')
->where(
$qb->expr()->andX(
- $qb->expr()->eq('share_type', $qb->expr()->literal(IShare::TYPE_LINK)),
+ $qb->expr()->orX(
+ $qb->expr()->eq('share_type', $qb->expr()->literal(IShare::TYPE_LINK)),
+ $qb->expr()->eq('share_type', $qb->expr()->literal(IShare::TYPE_EMAIL))
+ ),
$qb->expr()->lte('expiration', $qb->expr()->literal($now)),
$qb->expr()->orX(
$qb->expr()->eq('item_type', $qb->expr()->literal('file')),
--
GitLab