E-Mail-Reminder to all attendees is sent only by organizer of the rem…

…inder/event
nextcloud · May 8, 2021 · 010114b · 010114b
1 parent 461a975
commit 010114b
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 11 deletions.
diff --git a/apps/dav/lib/CalDAV/Reminder/INotificationProvider.php b/apps/dav/lib/CalDAV/Reminder/INotificationProvider.php
@@ -44,9 +44,11 @@ interface INotificationProvider {
 	 * @param VEvent $vevent
 	 * @param string $calendarDisplayName
 	 * @param IUser[] $users
+	 * @param IUser $userOfReminder
 	 * @return void
 	 */
 	public function send(VEvent $vevent,
 						 string $calendarDisplayName,
-						 array $users = []): void;
+						 array $users = [],
+						 IUser $userOfReminder = null): void;
 }
diff --git a/apps/dav/lib/CalDAV/Reminder/NotificationProvider/AbstractProvider.php b/apps/dav/lib/CalDAV/Reminder/NotificationProvider/AbstractProvider.php
@@ -91,11 +91,13 @@ public function __construct(ILogger $logger,
 	 * @param VEvent $vevent
 	 * @param string $calendarDisplayName
 	 * @param IUser[] $users
+	 * @param IUser $userOfReminder
 	 * @return void
 	 */
 	abstract public function send(VEvent $vevent,
 						   string $calendarDisplayName,
-						   array $users = []): void;
+						   array $users = [],
+							IUser $userOfReminder = null): void;
 
 	/**
 	 * @return string

diff --git a/apps/dav/lib/CalDAV/Reminder/NotificationProvider/EmailProvider.php b/apps/dav/lib/CalDAV/Reminder/NotificationProvider/EmailProvider.php
@@ -37,6 +37,7 @@
 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 @@ public function __construct(IConfig $config,
 	 * @param VEvent $vevent
 	 * @param string $calendarDisplayName
 	 * @param array $users
+	 * @param IUser $userOfReminder
 	 * @throws \Exception
 	 */
 	public function send(VEvent $vevent,
 						 string $calendarDisplayName,
-						 array $users = []):void {
+						 array $users = [],
+						 IUser $userOfReminder = null):void {
 		$fallbackLanguage = $this->getFallbackLanguage();
 
 		$emailAddressesOfSharees = $this->getEMailAddressesOfAllUsersWithWriteAccessToCalendar($users);
-		$emailAddressesOfAttendees = $this->getAllEMailAddressesFromEvent($vevent);
+
+		$organizer = $this->getOrganizerEMailAndNameFromEvent($vevent);
+
+		$emailAddressesOfAttendees = [];
+
+		if ($userOfReminder && strcasecmp($userOfReminder->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 @@ public function send(VEvent $vevent,
 		);
 
 		$sortedByLanguage = $this->sortEMailAddressesByLanguage($emailAddresses, $fallbackLanguage);
-		$organizer = $this->getOrganizerEMailAndNameFromEvent($vevent);
 
 		foreach ($sortedByLanguage as $lang => $emailAddresses) {
 			if (!$this->hasL10NForLang($lang)) {
@@ -196,7 +205,7 @@ private function getOrganizerEMailAndNameFromEvent(VEvent $vevent):?array {
 		}
 
 		$organizer = $vevent->ORGANIZER;
-		if (strcasecmp($organizer->getValue(), 'mailto:') !== 0) {
+		if (!str_starts_with($organizer->getValue(), 'mailto:')) {
 			return null;
 		}
 

diff --git a/apps/dav/lib/CalDAV/Reminder/NotificationProvider/PushProvider.php b/apps/dav/lib/CalDAV/Reminder/NotificationProvider/PushProvider.php
@@ -83,11 +83,13 @@ public function __construct(IConfig $config,
 	 * @param VEvent $vevent
 	 * @param string $calendarDisplayName
 	 * @param IUser[] $users
+	 * @param IUser $userOfReminder
 	 * @throws \Exception
 	 */
 	public function send(VEvent $vevent,
 						 string $calendarDisplayName = null,
-						 array $users = []):void {
+						 array $users = [],
+						 IUser $userOfReminder = null):void {
 		if ($this->config->getAppValue('dav', 'sendEventRemindersPush', 'no') !== 'yes') {
 			return;
 		}

diff --git a/apps/dav/lib/CalDAV/Reminder/ReminderService.php b/apps/dav/lib/CalDAV/Reminder/ReminderService.php
@@ -142,13 +142,13 @@ public function processReminders():void {
 			}
 
 			$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);
 		}