dbxe/DBXE
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

Ticket system improvements for import encoding, ticket system limited display of html elements (strip_tags)

Browse Source
This commit is contained in:
OpenXE
2023-01-12 00:01:20 +01:00
parent 1fdd6dbf95
commit 613d45b1cc
4 changed files with 80 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Modules/Ticket/Task/TicketImportHelper.php
+17 -2
View File
@@ -491,7 +491,7 @@ class TicketImportHelper
}
try {
$this->logger->debug('Start import', ['message' => $message->getSubject()]);
$this->logger->debug('Start import', ['message' => $message]);
$result = $this->importMessage($message);
@@ -545,13 +545,28 @@ class TicketImportHelper
$htmlBody = $message->getHtmlBody();
if ($htmlBody === null) {
$htmlBody = '';
}
if ($plainTextBody == '' && $htmlBody == '') {
$simple_content = $message->getContent();
if (empty($simple_content)) {
$this->logger->debug('Empty mail',['message' => $message]);
} else {
$plainTextBody = $simple_content;
$htmlBody = nl2br(htmlentities($simple_content));
}
}
$this->logger->debug('Text',['plain' => $plainTextBody, 'html' => $htmlBody, 'simple_content' => $simple_content]);
$action = $this->formatter->encodeToUtf8($plainTextBody);
$action_html = $this->formatter->encodeToUtf8($htmlBody);
if (strlen($action_html) < strlen($action)) {
$action_html = nl2br($action);
}
$this->logger->debug('Text (converted)',['plain' => $action, 'html' => $action_html]);
// Import database emailbackup
$date = $message->getDate();
if (is_null($date)) { // This should not be happening -> Todo check getDate function
@@ -576,7 +591,7 @@ class TicketImportHelper
if ($result == 0) {
$this->logger->debug('Importing message',['']);
$this->logger->debug('Importing message',['message' => $message]);
$attachments = $message->getAttachments();
$anhang = count($attachments) > 0 ? 1 : 0;