upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-04 22:35:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 31

fix(caldav): harden null handling of iMip scheduling method

Browse source 
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
This commit is contained in:
Richard Steinmetz 2023-03-01 12:24:28 +01:00 committed by Richard Steinmetz (Rebase PR Action)
parent 2f64d16afd
commit a35b960c7a
2 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
apps/dav/lib/CalDAV/Schedule/IMipPlugin.php
View file

@ -209,9 +209,11 @@ class IMipPlugin extends SabreIMipPlugin {
$senderName = $senderName->getValue() ?? null;
}
if ($senderName === null || empty(trim($senderName))) {
// Try to get the sender name from the current user id if available.
if ($this->userId !== null && ($senderName === null || empty(trim($senderName)))) {
$senderName = $this->userManager->getDisplayName($this->userId);
}
$sender = substr($iTipMessage->sender, 7);
switch (strtolower($iTipMessage->method)) {
@ -229,7 +231,6 @@ class IMipPlugin extends SabreIMipPlugin {
break;
}
$data['attendee_name'] = ($recipientName ?: $recipient);
$data['invitee_name'] = ($senderName ?: $sender);
@ -237,9 +238,19 @@ class IMipPlugin extends SabreIMipPlugin {
$fromName = $this->imipService->getFrom($senderName, $this->defaults->getName());
$message = $this->mailer->createMessage()
->setFrom([$fromEMail => $fromName])
->setTo([$recipient => $recipientName])
->setReplyTo([$sender => $senderName]);
->setFrom([$fromEMail => $fromName]);
if ($recipientName !== null) {
$message->setTo([$recipient => $recipientName]);
} else {
$message->setTo([$recipient]);
}
if ($senderName !== null) {
$message->setReplyTo([$sender => $senderName]);
} else {
$message->setReplyTo([$sender]);
}
$template = $this->mailer->createEMailTemplate('dav.calendarInvite.' . $method, $data);
$template->addHeader();

10
apps/dav/lib/CalDAV/Schedule/IMipService.php
View file

@ -70,11 +70,15 @@ class IMipService {
}
/**
* @param string $senderName
* @param $default
* @param string|null $senderName
* @param string $default
* @return string
*/
public function getFrom(string $senderName, $default): string {
public function getFrom(?string $senderName, string $default): string {
if ($senderName === null) {
return $default;
}
return $this->l10n->t('%1$s via %2$s', [$senderName, $default]);
}