Use iTIP email when no sender name is present

tchapi · Aug 30, 2024 · 231b7ff · 231b7ff
1 parent c4faa17
commit 231b7ff
Showing 1 changed file with 19 additions and 5 deletions.
diff --git a/src/Plugins/DavisIMipPlugin.php b/src/Plugins/DavisIMipPlugin.php
@@ -68,13 +68,14 @@ public function schedule(ITip\Message $itip)
 
         $deliveredLocally = '1.2' === $itip->getScheduleStatus();
 
-        $senderName = $itip->senderName;
-        $recipientName = $itip->recipientName;
-
         // 7 is the length of `mailto:`.
         $senderEmail = substr($itip->sender, 7);
         $recipientEmail = substr($itip->recipient, 7);
 
+        // We fallback the senderName to the email if the iTIP originator does not send a name along.
+        $senderName = $itip->senderName ?? $senderEmail;
+        $recipientName = $itip->recipientName;
+
         $subject = 'CalDAV message';
         switch (strtoupper($itip->method)) {
             case 'REPLY':
@@ -197,10 +198,23 @@ public function schedule(ITip\Message $itip)
             }
         }
 
+        // For the mail headers, we don't automatically default to the email
+        if ($itip->senderName) {
+            // If we have a proper name, we use it with the optional message origin indicator
+            $mailSenderName = $itip->senderName;
+            if (static::MESSAGE_ORIGIN_INDICATOR) {
+                $mailSenderName = $mailSenderName.' '.static::MESSAGE_ORIGIN_INDICATOR;
+            }
+        } elseif (static::MESSAGE_ORIGIN_INDICATOR) {
+            // Otherwise, we don't use the email except if we explicitly have a message origin
+            // indicator (it would be redundant if there wasn't)
+            $mailSenderName = $senderEmail.' '.static::MESSAGE_ORIGIN_INDICATOR;
+        }
+
         $message = (new TemplatedEmail())
-            ->from(new Address($this->senderEmail, $senderName.' '.static::MESSAGE_ORIGIN_INDICATOR))
+            ->from(new Address($this->senderEmail, $mailSenderName))
             ->to(new Address($recipientEmail, $recipientName ?? ''))
-            ->replyTo(new Address($senderEmail, $senderName ?? ''))
+            ->replyTo(new Address($senderEmail, $mailSenderName))
             ->subject($subject);
 
         if (DAV\Server::$exposeVersion) {