Don't display message parts with unsupported text type, e.g. text/calendar

pull/53/head
Aleksander Machniak 12 years ago
parent 9ac96015f2
commit c23dc87f2b

@ -351,15 +351,22 @@ class rcube_message
// print body if message doesn't have multiple parts // print body if message doesn't have multiple parts
if ($message_ctype_primary == 'text' && !$recursive) { if ($message_ctype_primary == 'text' && !$recursive) {
// parts with unsupported type add to attachments list
if (!in_array($message_ctype_secondary, array('plain', 'html', 'enriched'))) {
$this->attachments[] = $structure;
return;
}
$structure->type = 'content'; $structure->type = 'content';
$this->parts[] = $structure; $this->parts[] = $structure;
// Parse simple (plain text) message body // Parse simple (plain text) message body
if ($message_ctype_secondary == 'plain') if ($message_ctype_secondary == 'plain') {
foreach ((array)$this->uu_decode($structure) as $uupart) { foreach ((array)$this->uu_decode($structure) as $uupart) {
$this->mime_parts[$uupart->mime_id] = $uupart; $this->mime_parts[$uupart->mime_id] = $uupart;
$this->attachments[] = $uupart; $this->attachments[] = $uupart;
} }
}
} }
// the same for pgp signed messages // the same for pgp signed messages
else if ($mimetype == 'application/pgp' && !$recursive) { else if ($mimetype == 'application/pgp' && !$recursive) {

Loading…
Cancel
Save