fixes from code-review

nextcloud · May 8, 2021 · 70c7173 · 70c7173
1 parent 010114b
commit 70c7173
Show file tree

Hide file tree

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

diff --git a/apps/dav/lib/CalDAV/Reminder/NotificationProvider/EmailProvider.php b/apps/dav/lib/CalDAV/Reminder/NotificationProvider/EmailProvider.php
@@ -81,13 +81,13 @@ public function __construct(IConfig $config,
 	 * @param VEvent $vevent
 	 * @param string $calendarDisplayName
 	 * @param array $users
-	 * @param IUser $userOfReminder
+	 * @param IUser $reminderOwner
 	 * @throws \Exception
 	 */
 	public function send(VEvent $vevent,
 						 string $calendarDisplayName,
 						 array $users = [],
-						 IUser $userOfReminder = null):void {
+						 IUser $reminderOwner = null):void {
 		$fallbackLanguage = $this->getFallbackLanguage();
 
 		$emailAddressesOfSharees = $this->getEMailAddressesOfAllUsersWithWriteAccessToCalendar($users);
@@ -96,7 +96,7 @@ public function send(VEvent $vevent,
 
 		$emailAddressesOfAttendees = [];
 
-		if ($userOfReminder && strcasecmp($userOfReminder->getEMailAddress(), key($organizer)) == 0) {
+		if ($organizer !== null && $reminderOwner instanceof IUser && strcasecmp($reminderOwner->getEMailAddress(), key($organizer)) === 0) {
 			$emailAddressesOfAttendees = $this->getAllEMailAddressesFromEvent($vevent);
 		}
 
@@ -205,7 +205,7 @@ private function getOrganizerEMailAndNameFromEvent(VEvent $vevent):?array {
 		}
 
 		$organizer = $vevent->ORGANIZER;
-		if (!str_starts_with($organizer->getValue(), 'mailto:')) {
+		if (strcasecmp($organizer->getValue(), 'mailto:') !== 0) {
 			return null;
 		}
 

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