Roundcubemail devel
parent: a7a778c1 | patch | commit | ignore whitespace
Aleksander Machniak
2014-11-09 a16cf3bb7cdae47b4729365593bb0b3a43c5c466 
Replace all attachment-image URIs with CID URIs, not only src and poster attributes (#1490132)
1 files modified
5 ■■■■■ changed files
program/steps/mail/sendmail.inc 5 ●●●●● patch | view | raw | blame | history 
 program/steps/mail/sendmail.inc


@@ -428,8 +428,7 @@


        $attachment = $RCMAIL->plugins->exec_hook('attachment_get', $attachment);




        if ($isHtml) {


            $dispurl      = '/\s(poster|src)\s*=\s*[\'"]*\S+display-attachment\S+file=rcmfile'


                . preg_quote($attachment['id']) . '[\s\'"]*/';


            $dispurl      = '/[\'"]\S+display-attachment\S+file=rcmfile' . preg_quote($attachment['id']) . '[\'"]/';


            $message_body = $MAIL_MIME->getHTMLBody();


            $is_inline    = preg_match($dispurl, $message_body);


        }


@@ -449,7 +448,7 @@


                $cid .= '@localhost';


            }




            $message_body = preg_replace($dispurl, ' \\1="cid:' . $cid . '" ', $message_body);


            $message_body = preg_replace($dispurl, '"cid:' . $cid . '"', $message_body);




            $MAIL_MIME->setHTMLBody($message_body);