[SM-CVS] CVS: squirrelmail/functions mime.php,1.265.2.66,1.265.2.67

[Tomas K. <to...@us...>]

Update of /cvsroot/squirrelmail/squirrelmail/functions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31623

Modified Files:
      Tag: SM-1_4-STABLE
	mime.php 
Log Message:
don't sanitize converted text, when htmlsave is set to false (#1460638)

see test plugin in 'cvs -z3 -d:ext:dev...@cv...:/cvsroot/squirrelmail co plugins'


Index: mime.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/functions/mime.php,v
retrieving revision 1.265.2.66
retrieving revision 1.265.2.67
diff -u -w -r1.265.2.66 -r1.265.2.67
--- mime.php	14 Apr 2006 22:27:07 -0000	1.265.2.66
+++ mime.php	24 Apr 2006 17:59:36 -0000	1.265.2.67
@@ -645,8 +645,8 @@
                 case 'B':
                     $replace = base64_decode($res[4]);
                     if ($can_be_encoded) {
-                        // string is converted from one charset to another and sanitized
-                        $replace =  charset_convert($res[2],$replace,$default_charset);
+                        // string is converted from one charset to another. sanitizing depends on $htmlsave
+                        $replace =  charset_convert($res[2],$replace,$default_charset,$htmlsave);
                     } elseif ($utfencode) {
                         // string is converted to htmlentities and sanitized
                         $replace = charset_decode($res[2],$replace);
@@ -661,8 +661,8 @@
                     $replace = preg_replace('/=([0-9a-f]{2})/ie', 'chr(hexdec("\1"))',
                             $replace);
                     if ($can_be_encoded) {
-                        // string is converted from one charset to another and sanitized
-                        $replace = charset_convert($res[2], $replace,$default_charset);
+                        // string is converted from one charset to another. sanitizing depends on $htmlsave
+                        $replace = charset_convert($res[2], $replace,$default_charset,$htmlsave);
                     } elseif ($utfencode) {
                         // string is converted to html entities and sanitized
                         $replace = charset_decode($res[2], $replace);