Sets downloaded attachment type to 'text/calendar' instead of the default 'application-octet-stream'

when attachment is of type 'text/calendar'.

Signed-off-by: Cyrille Bollu <cyr.debian@bollu.be>

1 files changed, 12 insertions, 4 deletions

diff --git a/lib/Attachment.php b/lib/Attachment.php
index 853139355..6ac195592 100644
--- a/lib/Attachment.php
+++ b/lib/Attachment.php
@@ -79,10 +79,6 @@ class Attachment {
 
 		$this->mimePart = new \Horde_Mime_Part();
 
-		// To prevent potential problems with the SOP we serve all files with the
-		// MIME type "application/octet-stream"
-		$this->mimePart->setType('application/octet-stream');
-
 		// Serve all files with a content-disposition of "attachment" to prevent Cross-Site Scripting
 		$this->mimePart->setDisposition('attachment');
 
@@ -102,6 +98,18 @@ class Attachment {
 			$this->mimePart->setTransferEncoding($tmp);
 		}
 
+		/* Content type */
+		if (strstr($mimeHeaders->getValue('content-type'), 'text/calendar')) {
+			$this->mimePart->setType('text/calendar');
+			if ($this->mimePart->getContentTypeParameter('name') === null) {
+				$this->mimePart->setContentTypeParameter('name', 'calendar.ics');
+			}
+		} else {
+			// To prevent potential problems with the SOP we serve all files but calendar entries with the
+			// MIME type "application/octet-stream"
+			$this->mimePart->setType('application/octet-stream');
+		}
+
 		$body = $fetch->getBodyPart($this->attachmentId);
 		$this->mimePart->setContents($body);
 	}