strip absolute positioning css from html mails.

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

diff --git a/ChangeLog b/ChangeLog
index 7f7b0ec11b5e279a5460ac80b8c6f80d31052822..bbf56dde324b9229e8b90c145934115896220759 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -267,10 +267,11 @@ Version 1.5.1 -- CVS
     and $plugins array changes.
   - Included local configuration file in config.php generated by
     administrator's plugin.
     and $plugins array changes.
   - Included local configuration file in config.php generated by
     administrator's plugin.

-  - Updated the Filters plugin to comply with our Plugin Standards
+  - Updated the Filters plugin to comply with our Plugin Standards.

   - Fixed Filters plugin problems with duplicate rule processing and false
   - Fixed Filters plugin problems with duplicate rule processing and false

-    unread message counts (Bug# 676073 and patch #919045)
-
+    unread message counts (Bug# 676073 and patch #919045).
+  - Strip position:absolute style from HTML mails.
+  

 Version 1.5.0
 --------------------
   - Added new preference that determines cursor focus when replying
 Version 1.5.0
 --------------------
   - Added new preference that determines cursor focus when replying

diff --git a/functions/mime.php b/functions/mime.php
index 6541820e4f17e7a95388414692b2128663f45355..5b8e99d471004265d5b87fd8ec509737f3813f80 100644 (file)
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -1944,6 +1944,7 @@ function magicHTML($body, $id, $message, $mailbox = 'INBOX', $take_mailto_links
                                 "/binding/i",
                                 "/behaviou*r/i",
                                 "/include-source/i",
                                 "/binding/i",
                                 "/behaviou*r/i",
                                 "/include-source/i",

+                                "/position\s*:\s*absolute/i",

                                 "/url\s*\(\s*([\'\"])\s*\S+script\s*:.*([\'\"])\s*\)/si",
                                 "/url\s*\(\s*([\'\"])\s*mocha\s*:.*([\'\"])\s*\)/si",
                                 "/url\s*\(\s*([\'\"])\s*about\s*:.*([\'\"])\s*\)/si",
                                 "/url\s*\(\s*([\'\"])\s*\S+script\s*:.*([\'\"])\s*\)/si",
                                 "/url\s*\(\s*([\'\"])\s*mocha\s*:.*([\'\"])\s*\)/si",
                                 "/url\s*\(\s*([\'\"])\s*about\s*:.*([\'\"])\s*\)/si",


@@ -1954,6 +1955,7 @@ function magicHTML($body, $id, $message, $mailbox = 'INBOX', $take_mailto_links
                                 "idiocy",
                                 "idiocy",
                                 "idiocy",
                                 "idiocy",
                                 "idiocy",
                                 "idiocy",

+                                "",

                                 "url(\\1#\\1)",
                                 "url(\\1#\\1)",
                                 "url(\\1#\\1)",
                                 "url(\\1#\\1)",
                                 "url(\\1#\\1)",
                                 "url(\\1#\\1)",