summaryrefslogtreecommitdiff
path: root/program/steps/mail/sendmail.inc
diff options
context:
space:
mode:
authorsvncommit <devs@roundcube.net>2010-05-21 03:24:25 +0000
committersvncommit <devs@roundcube.net>2010-05-21 03:24:25 +0000
commit141eb8a497d847069cf87ce0d204614596338352 (patch)
treedcf5edc282f2ab52b593a0081b280a8cf817790a /program/steps/mail/sendmail.inc
parentdffcaa59db930408b9f07a300ba67a7933d2eab0 (diff)
Fix double-addition of e-mail domain to content ID in HTML images
Diffstat (limited to 'program/steps/mail/sendmail.inc')
-rw-r--r--program/steps/mail/sendmail.inc15
1 files changed, 6 insertions, 9 deletions
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index 2576a66b5..dedab99fa 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -95,18 +95,14 @@ function rcmail_get_identity($id)
/**
* go from this:
- * <img src=".../tiny_mce/plugins/emotions/images/smiley-cool.gif" border="0" alt="Cool" title="Cool" />
+ * <img src="http[s]://.../tiny_mce/plugins/emotions/images/smiley-cool.gif" border="0" alt="Cool" title="Cool" />
*
* to this:
*
- * <IMG src="cid:smiley-cool.gif"/>
+ * <img src="/path/on/server/.../tiny_mce/plugins/emotions/images/smiley-cool.gif" border="0" alt="Cool" title="Cool" />
* ...
- * ------part...
- * Content-Type: image/gif
- * Content-Transfer-Encoding: base64
- * Content-ID: <smiley-cool.gif>
*/
-function rcmail_attach_emoticons(&$mime_message)
+function rcmail_fix_emoticon_paths(&$mime_message)
{
global $CONFIG;
@@ -437,8 +433,9 @@ if ($isHtml) {
$plugin = $RCMAIL->plugins->exec_hook('outgoing_message_body', array('body' => $plainTextPart, 'type' => 'alternative', 'message' => $MAIL_MIME));
$MAIL_MIME->setTXTBody($plugin['body']);
- // look for "emoticon" images from TinyMCE and copy into message as attachments
- $message_body = rcmail_attach_emoticons($MAIL_MIME);
+ // look for "emoticon" images from TinyMCE and change their src paths to
+ // be file paths on the server instead of URL paths.
+ $message_body = rcmail_fix_emoticon_paths($MAIL_MIME);
}
else {
if ($footer)