Changeset 141eb8a in github for program/steps/mail/sendmail.inc

Timestamp:

May 20, 2010 11:24:25 PM (3 years ago)

Author:

svncommit <devs@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

a2a3610

Parents:

dffcaa5

Message:

Fix double-addition of e-mail domain to content ID in HTML images

File:

• program/steps/mail/sendmail.inc (modified) (2 diffs)

program/steps/mail/sendmail.inc

@@ -96 +96 @@
 /**
  * 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;
@@ -438 +434 @@
   $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 {