From 834588c347699163b889c5323e4ac2f39e436eae Mon Sep 17 00:00:00 2001
From: OpenXE <>
Date: Tue, 25 Feb 2025 17:49:52 +0100
Subject: [PATCH] Fix ticket mails with application/pdf but no content
 disposition

---
 classes/Components/MailClient/Data/MailAttachmentData.php | 5 +++++
 classes/Modules/Ticket/Task/TicketImportHelper.php        | 8 +-------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/classes/Components/MailClient/Data/MailAttachmentData.php b/classes/Components/MailClient/Data/MailAttachmentData.php
index 2d40fdd7..f4d8c430 100644
--- a/classes/Components/MailClient/Data/MailAttachmentData.php
+++ b/classes/Components/MailClient/Data/MailAttachmentData.php
@@ -74,6 +74,11 @@ class MailAttachmentData implements MailAttachmentInterface
                 if ($content_type == 'application/octet-stream') {
                     return('application/octet-stream');
                 }                
+                // Check for application/pdf
+                $content_type = $part->getContentType();
+                if ($content_type == 'application/pdf') {
+                    return('application/pdf');
+                }
                 // Check for Content-id
                 $contentIdHeader = $part->getHeader('content-id');                                              
                 if ($contentIdHeader !== null) {
diff --git a/classes/Modules/Ticket/Task/TicketImportHelper.php b/classes/Modules/Ticket/Task/TicketImportHelper.php
index 1ebbf7f8..07528cb9 100644
--- a/classes/Modules/Ticket/Task/TicketImportHelper.php
+++ b/classes/Modules/Ticket/Task/TicketImportHelper.php
@@ -558,13 +558,7 @@ class TicketImportHelper
         }        
 
         if ($plainTextBody == '' && $htmlBody == '') {
-            $simple_content = $message->getContent();
-            if (empty($simple_content)) {
-                $this->logger->debug('Empty mail',[]);    
-            } else {
-                $plainTextBody = $simple_content;
-                $htmlBody = nl2br(htmlentities($simple_content));
-            }
+            $this->logger->debug('Empty mail',[]);
         }
 
         $this->logger->debug('Text',['plain' => $plainTextBody, 'html' => $htmlBody, 'simple_content' => $simple_content]);