Another MS fix...

  - Strip <outbind://> tags out. This is a Microsoft only protocol and
    references files local to the sending machine.  This causes issues
    with Internet Explorer.
  - Replace <img src="outbind://"> links with clean images to stop
    issues with Internet Explorer not being able to track down the image.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@8823 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/ChangeLog b/ChangeLog
index 0202e43a769cb31217032ba6c68e31a36e7689d3..3059d5def2211511aff5e23c46b9a8caa72df74d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -214,6 +214,11 @@ Version 1.5.1 -- CVS
   - Fix for #855320 where Outlook Express was creating CID: based URLs,
     but not assigning a content-id to the attachment.  This is a bug in
        Outlook Express and is non-RFC compliant behaviour.
+  - Strip <outbind://> tags out. This is a Microsoft only protocol and
+    references files local to the sending machine.  This causes issues
+       with Internet Explorer.
+  - Replace <img src="outbind://"> links with clean images to stop
+    issues with Internet Explorer not being able to track down the image.
 
 
 Version 1.5.0

diff --git a/functions/mime.php b/functions/mime.php
index 93c95a04325de7383804af12a5ef69f35be79f30..6262a417430af7e70c6a37479efec6dea053af59 100644 (file)
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -1457,6 +1457,16 @@ function sq_fixatts($tagname,
         if (preg_match("/^[\'\"]\s*cid:/si", $attvalue)){
             $attary{$attname} = sq_cid2http($message, $id, $attvalue, $mailbox);
         }
+
+        /**
+         * "Hack" fix for Outlook using propriatary outbind:// protocol in img tags.
+         * One day MS might actually make it match something useful, for now, falling
+         * back to using cid2http, so we can grab the blank.png.
+         */
+        if (preg_match("/^[\'\"]\s*outbind:\/\//si", $attvalue)) {
+            $attary{$attname} = sq_cid2http($message, $id, $attvalue, $mailbox);
+        }
+
     }
     /**
     * See if we need to append any attributes to this tag.
@@ -1857,7 +1867,8 @@ function magicHTML($body, $id, $message, $mailbox = 'INBOX') {
                                 "img",
                                 "br",
                                 "hr",
-                                "input"
+                                "input",
+                                "outbind"
                                 );
 
     $force_tag_closing = true;