Alex/freescout
1
0
Fork 0
mirror of https://github.com/freescout-helpdesk/freescout.git synced 2024-11-24 19:33:07 +01:00
Code Issues Releases Wiki Activity

Fix Message body is empty error - closes #320

Browse Source
This commit is contained in:
FreeScout 2019-10-31 03:12:05 -07:00
parent 8d2036636f
commit 802c5cf20d
1 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
overrides/Webklex/IMAP/Message.php
View File

@ -531,11 +531,14 @@ class Message
private function fetchStructure($structure, $partNumber = null)
{
if ($structure->type == self::TYPE_TEXT &&
($structure->ifdisposition == 0 ||
($structure->ifdisposition == 1 && !isset($structure->parts) && $partNumber == null)
)
# FreeScout #320
#($structure->ifdisposition == 0 ||
# ($structure->ifdisposition == 1 && !isset($structure->parts) && $partNumber == null)
#)
(empty($structure->disposition) || strtolower($structure->disposition) != 'attachment')
) {
if ($structure->subtype == 'PLAIN') {
// FreeScout improvement
/*if (strtolower($structure->subtype) == 'plain' || strtolower($structure->subtype) == 'csv') {
if (!$partNumber) {
$partNumber = 1;
}
@ -553,7 +556,7 @@ class Message
$this->bodies['text'] = $body;
$this->fetchAttachment($structure, $partNumber);
} elseif ($structure->subtype == 'HTML') {
} elseif (strtolower($structure->subtype) == 'html') {
if (!$partNumber) {
$partNumber = 1;
}
@ -569,6 +572,42 @@ class Message
$body->content = $content;
$this->bodies['html'] = $body;
}*/
if (strtolower($structure->subtype) == 'html') {
if (!$partNumber) {
$partNumber = 1;
}
$encoding = $this->getEncoding($structure);
$content = imap_fetchbody($this->client->getConnection(), $this->uid, $partNumber, $this->fetch_options | FT_UID);
$content = $this->decodeString($content, $structure->encoding);
$content = $this->convertEncoding($content, $encoding);
$body = new \stdClass();
$body->type = 'html';
$body->content = $content;
$this->bodies['html'] = $body;
} else {
// PLAIN.
if (!$partNumber) {
$partNumber = 1;
}
$encoding = $this->getEncoding($structure);
$content = imap_fetchbody($this->client->getConnection(), $this->uid, $partNumber, $this->fetch_options | FT_UID);
$content = $this->decodeString($content, $structure->encoding);
$content = $this->convertEncoding($content, $encoding);
$body = new \stdClass();
$body->type = 'text';
$body->content = $content;
$this->bodies['text'] = $body;
$this->fetchAttachment($structure, $partNumber);
}
} elseif ($structure->type == self::TYPE_MULTIPART) {
foreach ($structure->parts as $index => $subStruct) {