[SM-CVS] CVS: squirrelmail/functions mime.php,1.265.2.34,1.265.2.35

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

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

Modified Files:
      Tag: SM-1_4-STABLE
	mime.php 
Log Message:
base64 decoding should follow $utfencode and $htmlsave


Index: mime.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/functions/mime.php,v
retrieving revision 1.265.2.34
retrieving revision 1.265.2.35
diff -u -w -r1.265.2.34 -r1.265.2.35
--- mime.php	23 Oct 2004 14:08:18 -0000	1.265.2.34
+++ mime.php	29 Oct 2004 06:40:04 -0000	1.265.2.35
@@ -622,7 +622,14 @@
             {
             case 'B':
                 $replace = base64_decode($res[4]);
+		if ($utfencode) {
                 $ret .= charset_decode($res[2],$replace);
+		} else {
+		    if ($htmlsave) {
+		        $replace = htmlspecialchars($replace);
+		    }
+		    $ret.= $replace;
+		}
                 break;
             case 'Q':
                 $replace = str_replace('_', ' ', $res[4]);