Index: branches/2.4/prototype/services/ImapServiceAdapter.php
===================================================================
--- branches/2.4/prototype/services/ImapServiceAdapter.php (revision 6754)
+++ branches/2.4/prototype/services/ImapServiceAdapter.php (revision 7018)
@@ -650,7 +650,7 @@
case 'imapPart':
$att = $this->getForwardingAttachment($value['folder'],$value['uid'], $value['part']);
- if(strstr($body,'') !== false)//Embeded IMG
+ if(strstr($body,'src="./inc/get_archive.php?msgFolder='.$value['folder'].'&msgNumber='.$value['uid'].'&indexPart='.$value['part'].'"') !== false)//Embeded IMG
{
- $body = str_ireplace('' , '', $body);
+ $body = str_ireplace('src="./inc/get_archive.php?msgFolder='.$value['folder'].'&msgNumber='.$value['uid'].'&indexPart='.$value['part'].'"' , 'src="'.$att['name'].'"', $body);
$mailService->addStringImage($att['source'], $att['type'], mb_convert_encoding($att['name'], 'ISO-8859-1' , 'UTF-8,ISO-8859-1'));
}
Index: branches/2.4/expressoMail1_2/inc/class.imap_functions.inc.php
===================================================================
--- branches/2.4/expressoMail1_2/inc/class.imap_functions.inc.php (revision 6970)
+++ branches/2.4/expressoMail1_2/inc/class.imap_functions.inc.php (revision 7018)
@@ -2928,7 +2928,7 @@
case 'imapPart':
$att = $this->getForwardingAttachment($value['folder'],$value['uid'], $value['part']);
- if(strstr($body,'') !== false)//Embeded IMG
+ if(strstr($body,'src="./inc/get_archive.php?msgFolder='.$value['folder'].'&msgNumber='.$value['uid'].'&indexPart='.$value['part'].'"') !== false)//Embeded IMG
{
- $body = str_ireplace('' , '', $body);
+ $body = str_ireplace('src="./inc/get_archive.php?msgFolder='.$value['folder'].'&msgNumber='.$value['uid'].'&indexPart='.$value['part'].'"' , 'src="'.$att['name'].'"', $body);
$mailService->addStringImage($att['source'], $att['type'],mb_convert_encoding($att['name'], 'ISO-8859-1' , 'UTF-8,ISO-8859-1') );
}