upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-15 22:11:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 27

fix(files_sharing): Add missing check for null & use bool instead of int for reminder_sent field

Browse source 
Signed-off-by: Stefan Cherniakov <luka-sama@pm.me>
This commit is contained in:
Stefan Cherniakov 2024-09-02 15:02:50 +02:00 committed by skjnldsv
parent d633b9bce6
commit 457eaee2b3
4 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/files_sharing/lib/SharesReminderJob.php
View file

@ -59,7 +59,9 @@ class SharesReminderJob extends TimedJob {
public function run(mixed $argument): void {
foreach ($this->getShares() as $share) {
$reminderInfo = $this->prepareReminder($share);
$this->sendReminder($reminderInfo);
if ($reminderInfo !== null) {
$this->sendReminder($reminderInfo);
}
}
}

2
apps/files_sharing/tests/SharesReminderJobTest.php
View file

@ -158,7 +158,7 @@ class SharesReminderJobTest extends \Test\TestCase {
$testFolder = $user1Folder->newFolder('test');
if (!$isEmpty) {
$testFolder->newFile("some_file.txt");
$testFolder->newFile('some_file.txt');
}
$share = $this->shareManager->newShare();

2
apps/sharebymail/lib/ShareByMailProvider.php
View file

@ -756,7 +756,7 @@ class ShareByMailProvider extends DefaultShareProvider implements IShareProvider
->set('hide_download', $qb->createNamedParameter((int)$share->getHideDownload(), IQueryBuilder::PARAM_INT))
->set('attributes', $qb->createNamedParameter($shareAttributes))
->set('mail_send', $qb->createNamedParameter((int)$share->getMailSend(), IQueryBuilder::PARAM_INT))
->set('reminder_sent', $qb->createNamedParameter((int)$share->getReminderSent(), IQueryBuilder::PARAM_INT))
->set('reminder_sent', $qb->createNamedParameter($share->getReminderSent(), IQueryBuilder::PARAM_BOOL))
->executeStatement();
if ($originalShare->getNote() !== $share->getNote() && $share->getNote() !== '') {

6
lib/private/Share20/DefaultShareProvider.php
View file

@ -98,7 +98,7 @@ class DefaultShareProvider implements IShareProviderWithNotification, IShareProv
$qb->setValue('expiration', $qb->createNamedParameter($expirationDate, 'datetime'));
}
$qb->setValue('reminder_sent', $qb->createNamedParameter($share->getReminderSent() ? 1 : 0, IQueryBuilder::PARAM_INT));
$qb->setValue('reminder_sent', $qb->createNamedParameter($share->getReminderSent(), IQueryBuilder::PARAM_BOOL));
} elseif ($share->getShareType() === IShare::TYPE_GROUP) {
//Set the GID of the group we share with
$qb->setValue('share_with', $qb->createNamedParameter($share->getSharedWith()));
@ -225,7 +225,7 @@ class DefaultShareProvider implements IShareProviderWithNotification, IShareProv
->set('expiration', $qb->createNamedParameter($expirationDate, IQueryBuilder::PARAM_DATE))
->set('note', $qb->createNamedParameter($share->getNote()))
->set('accepted', $qb->createNamedParameter($share->getStatus()))
->set('reminder_sent', $qb->createNamedParameter($share->getReminderSent()))
->set('reminder_sent', $qb->createNamedParameter($share->getReminderSent(), IQueryBuilder::PARAM_BOOL))
->execute();
} elseif ($share->getShareType() === IShare::TYPE_GROUP) {
$qb = $this->dbConn->getQueryBuilder();
@ -1071,7 +1071,7 @@ class DefaultShareProvider implements IShareProviderWithNotification, IShareProv
$share->setProviderId($this->identifier());
$share->setHideDownload((int)$data['hide_download'] === 1);
$share->setReminderSent((int)$data['reminder_sent'] === 1);
$share->setReminderSent((bool)$data['reminder_sent']);
return $share;
}