paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Web] Fall back to raw content when mail parsing fails, fixes #1892

master
André 2018-10-14 10:12:21 +02:00
parent 243c441ae1
commit b8fe3f5fd4
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
data/web/inc/ajax/qitem_details.php
View File

@ -40,6 +40,13 @@ if (!empty($_GET['id']) && ctype_alnum($_GET['id'])) {
$data['text_plain'] = $mail_parser->getMessageBody('text'); $data['text_plain'] = $mail_parser->getMessageBody('text');
// Get html content and convert to text // Get html content and convert to text
$data['text_html'] = $html2text->convert($mail_parser->getMessageBody('html')); $data['text_html'] = $html2text->convert($mail_parser->getMessageBody('html'));
if (empty($data['text_plain']) && empty($data['text_html'])) {
// Failed to parse content, try raw
$text = trim(substr($mailc['msg'], strpos($mailc['msg'], "\r\n\r\n") + 1));
// Only return html->text
$data['text_plain'] = 'Parser failed, assuming HTML';
$data['text_html'] = $html2text->convert($text);
}
(empty($data['text_plain'])) ? $data['text_plain'] = '-' : null; (empty($data['text_plain'])) ? $data['text_plain'] = '-' : null;
// Get subject // Get subject
$data['subject'] = $mail_parser->getHeader('subject'); $data['subject'] = $mail_parser->getHeader('subject');