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

Merge 70c7173020 into 46dbc8fa98

This commit is contained in:
cl 2021-06-04 15:31:31 +12:00 committed by GitHub
parent 46dbc8fa98 70c7173020
commit caec9a2bbb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/dav/lib/CalDAV/Reminder/INotificationProvider.php
View File

@ -44,9 +44,11 @@ interface INotificationProvider {
* @param VEvent $vevent
* @param string $calendarDisplayName
* @param IUser[] $users
* @param IUser $reminderOwner
* @return void
*/
public function send(VEvent $vevent,
string $calendarDisplayName,
array $users = []): void;
array $users = [],
IUser $reminderOwner = null): void;
}

4
apps/dav/lib/CalDAV/Reminder/NotificationProvider/AbstractProvider.php
View File

@ -91,11 +91,13 @@ abstract class AbstractProvider implements INotificationProvider {
* @param VEvent $vevent
* @param string $calendarDisplayName
* @param IUser[] $users
* @param IUser $reminderOwner
* @return void
*/
abstract public function send(VEvent $vevent,
string $calendarDisplayName,
array $users = []): void;
array $users = [],
IUser $reminderOwner = null): void;
/**
* @return string

15
apps/dav/lib/CalDAV/Reminder/NotificationProvider/EmailProvider.php
View File

@ -37,6 +37,7 @@ use OCP\IConfig;
use OCP\IL10N;
use OCP\ILogger;
use OCP\IURLGenerator;
use OCP\IUser;
use OCP\L10N\IFactory as L10NFactory;
use OCP\Mail\IEMailTemplate;
use OCP\Mail\IMailer;
@ -80,15 +81,24 @@ class EmailProvider extends AbstractProvider {
* @param VEvent $vevent
* @param string $calendarDisplayName
* @param array $users
* @param IUser $reminderOwner
* @throws \Exception
*/
public function send(VEvent $vevent,
string $calendarDisplayName,
array $users = []):void {
array $users = [],
IUser $reminderOwner = null):void {
$fallbackLanguage = $this->getFallbackLanguage();
$emailAddressesOfSharees = $this->getEMailAddressesOfAllUsersWithWriteAccessToCalendar($users);
$emailAddressesOfAttendees = $this->getAllEMailAddressesFromEvent($vevent);
$organizer = $this->getOrganizerEMailAndNameFromEvent($vevent);
$emailAddressesOfAttendees = [];
if ($organizer !== null && $reminderOwner instanceof IUser && strcasecmp($reminderOwner->getEMailAddress(), key($organizer)) === 0) {
$emailAddressesOfAttendees = $this->getAllEMailAddressesFromEvent($vevent);
}
// Quote from php.net:
// If the input arrays have the same string keys, then the later value for that key will overwrite the previous one.
@ -99,7 +109,6 @@ class EmailProvider extends AbstractProvider {
);
$sortedByLanguage = $this->sortEMailAddressesByLanguage($emailAddresses, $fallbackLanguage);
$organizer = $this->getOrganizerEMailAndNameFromEvent($vevent);
foreach ($sortedByLanguage as $lang => $emailAddresses) {
if (!$this->hasL10NForLang($lang)) {

4
apps/dav/lib/CalDAV/Reminder/NotificationProvider/PushProvider.php
View File

@ -83,11 +83,13 @@ class PushProvider extends AbstractProvider {
* @param VEvent $vevent
* @param string $calendarDisplayName
* @param IUser[] $users
* @param IUser $reminderOwner
* @throws \Exception
*/
public function send(VEvent $vevent,
string $calendarDisplayName = null,
array $users = []):void {
array $users = [],
IUser $reminderOwner = null):void {
if ($this->config->getAppValue('dav', 'sendEventRemindersPush', 'no') !== 'yes') {
return;
}

8
apps/dav/lib/CalDAV/Reminder/ReminderService.php
View File

@ -142,13 +142,13 @@ class ReminderService {
}
$users = $this->getAllUsersWithWriteAccessToCalendar($reminder['calendar_id']);
$user = $this->getUserFromPrincipalURI($reminder['principaluri']);
if ($user) {
$users[] = $user;
$userOfReminder = $this->getUserFromPrincipalURI($reminder['principaluri']);
if ($userOfReminder) {
$users[] = $userOfReminder;
}
$notificationProvider = $this->notificationProviderManager->getProvider($reminder['type']);
$notificationProvider->send($vevent, $reminder['displayname'], $users);
$notificationProvider->send($vevent, $reminder['displayname'], $users, $userOfReminder);
$this->deleteOrProcessNext($reminder, $vevent);
}