diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2021-03-04 13:49:21 +0100 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2021-03-04 13:49:21 +0100 |
| commit | d247a5fb47a6416dbbd2744938aadfb0045abef8 (patch) | |
| tree | 68645c7bc3226be2dfbc0376d846779e7d8c9c47 /apps/sharebymail/lib | |
| parent | 3bbacb2f541a513f47e0744ab8a629b936a091d8 (diff) | |
| download | nextcloud-server-d247a5fb47a6416dbbd2744938aadfb0045abef8.tar.gz nextcloud-server-d247a5fb47a6416dbbd2744938aadfb0045abef8.zip | |
Sharebymail: set expiration on creation
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'apps/sharebymail/lib')
| -rw-r--r-- | apps/sharebymail/lib/ShareByMailProvider.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/apps/sharebymail/lib/ShareByMailProvider.php b/apps/sharebymail/lib/ShareByMailProvider.php index 6f2b5de437f..03e46c8e021 100644 --- a/apps/sharebymail/lib/ShareByMailProvider.php +++ b/apps/sharebymail/lib/ShareByMailProvider.php @@ -321,7 +321,8 @@ class ShareByMailProvider implements IShareProvider { $share->getToken(), $share->getPassword(), $share->getSendPasswordByTalk(), - $share->getHideDownload() + $share->getHideDownload(), + $share->getExpirationDate() ); try { @@ -658,9 +659,10 @@ class ShareByMailProvider implements IShareProvider { * @param string $password * @param bool $sendPasswordByTalk * @param bool $hideDownload + * @param \DateTime|null $expirationTime * @return int */ - protected function addShareToDB($itemSource, $itemType, $shareWith, $sharedBy, $uidOwner, $permissions, $token, $password, $sendPasswordByTalk, $hideDownload) { + protected function addShareToDB($itemSource, $itemType, $shareWith, $sharedBy, $uidOwner, $permissions, $token, $password, $sendPasswordByTalk, $hideDownload, $expirationTime) { $qb = $this->dbConnection->getQueryBuilder(); $qb->insert('share') ->setValue('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL)) @@ -677,6 +679,10 @@ class ShareByMailProvider implements IShareProvider { ->setValue('stime', $qb->createNamedParameter(time())) ->setValue('hide_download', $qb->createNamedParameter((int)$hideDownload, IQueryBuilder::PARAM_INT)); + if ($expirationTime !== null) { + $qb->setValue('expiration', $qb->createNamedParameter($expirationTime, IQueryBuilder::PARAM_DATE)); + } + /* * Added to fix https://github.com/owncloud/core/issues/22215 * Can be removed once we get rid of ajax/share.php |