only suppress known/supported INLINE image formats as JPG,JPEG,GIF,PNG for attachment list (on display of html message)

This commit is contained in:
Klaus Leithoff 2012-10-02 10:14:13 +00:00
parent 4d7db4e75d
commit e695f84f3a

View File

@ -3019,7 +3019,9 @@ class felamimail_bo
{
$attachments[] = $newAttachment;
} else {
if ( ($fetchEmbeddedImages && isset($newAttachment['cid']) && strlen($newAttachment['cid'])>0) ||
$fetchit = $fetchEmbeddedImages;
if ($fetchEmbeddedImages === false && (!in_array(strtoupper($structure->subtype),array('JPG','JPEG','GIF','PNG')))) $fetchit = true;
if ( ($fetchit && isset($newAttachment['cid']) && strlen($newAttachment['cid'])>0) ||
!isset($newAttachment['cid']) ||
empty($newAttachment['cid'])) $attachments[] = $newAttachment;
}
@ -3105,7 +3107,9 @@ class felamimail_bo
{
$attachments[] = $newAttachment;
} else {
if ( ($fetchEmbeddedImages && isset($newAttachment['cid']) && strlen($newAttachment['cid'])>0) ||
$fetchit = $fetchEmbeddedImages;
if ($fetchEmbeddedImages === false && (!in_array(strtoupper($structure->subtype),array('JPG','JPEG','GIF','PNG')))) $fetchit = true;
if ( ($fetchit && isset($newAttachment['cid']) && strlen($newAttachment['cid'])>0) ||
!isset($newAttachment['cid']) ||
empty($newAttachment['cid']) || $newAttachment['cid'] == 'NIL')
{