mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #25938 from nextcloud/backport/25927/stable20 

[stable20] Sharebymail: set expiration on creation
This commit is contained in:
Roeland Jago Douma 2021-03-09 20:20:49 +01:00 committed by GitHub
parent 791868fa25 3089c744d2
commit 0d021249f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/sharebymail/lib/ShareByMailProvider.php
View File

@ -321,7 +321,8 @@ class ShareByMailProvider implements IShareProvider {
$share->getToken(),
$share->getPassword(),
$share->getSendPasswordByTalk(),
$share->getHideDownload()
$share->getHideDownload(),
$share->getExpirationDate()
);
try {
@ -649,9 +650,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))
@ -668,6 +670,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

5
apps/sharebymail/tests/ShareByMailProviderTest.php
View File

@ -524,6 +524,7 @@ class ShareByMailProviderTest extends TestCase {
$password = 'password';
$sendPasswordByTalk = true;
$hideDownload = true;
$expiration = new \DateTime();
$instance = $this->getInstance();
@ -540,7 +541,8 @@ class ShareByMailProviderTest extends TestCase {
$token,
$password,
$sendPasswordByTalk,
$hideDownload
$hideDownload,
$expiration
]
);
@ -565,6 +567,7 @@ class ShareByMailProviderTest extends TestCase {
$this->assertSame($password, $result[0]['password']);
$this->assertSame($sendPasswordByTalk, (bool)$result[0]['password_by_talk']);
$this->assertSame($hideDownload, (bool)$result[0]['hide_download']);
$this->assertSame($expiration->getTimestamp(), \DateTime::createFromFormat('Y-m-d H:i:s', $result[0]['expiration'])->getTimestamp());
}
public function testUpdate() {