s.probst/OpenXE
1
0
Fork 0
mirror of https://github.com/OpenXE-org/OpenXE.git synced 2025-03-03 13:29:24 +01:00
Code Issues Projects Releases Wiki Activity

Fix ticket mails with application/pdf but no content disposition

Browse Source
This commit is contained in:
OpenXE 2025-02-25 17:49:52 +01:00
parent 94043a6609
commit 834588c347
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
classes/Components/MailClient/Data/MailAttachmentData.php
View File

@ -74,6 +74,11 @@ class MailAttachmentData implements MailAttachmentInterface
if ($content_type == 'application/octet-stream') { if ($content_type == 'application/octet-stream') {
return('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 // Check for Content-id
$contentIdHeader = $part->getHeader('content-id'); $contentIdHeader = $part->getHeader('content-id');
if ($contentIdHeader !== null) { if ($contentIdHeader !== null) {

8
classes/Modules/Ticket/Task/TicketImportHelper.php
View File

@ -558,13 +558,7 @@ class TicketImportHelper
} }
if ($plainTextBody == '' && $htmlBody == '') { if ($plainTextBody == '' && $htmlBody == '') {
$simple_content = $message->getContent(); $this->logger->debug('Empty mail',[]);
if (empty($simple_content)) {
$this->logger->debug('Empty mail',[]);
} else {
$plainTextBody = $simple_content;
$htmlBody = nl2br(htmlentities($simple_content));
}
} }
$this->logger->debug('Text',['plain' => $plainTextBody, 'html' => $htmlBody, 'simple_content' => $simple_content]); $this->logger->debug('Text',['plain' => $plainTextBody, 'html' => $htmlBody, 'simple_content' => $simple_content]);