Ticket #241: iconv.patch

php/cache.php

@@ -514 +514 @@
                     }
                     $rows[$count]['recipient_email'] = $rectmp;
 
-           $subject = trim(htmlentities($magic_quotes ? stripslashes($row['subject']) : $row['subject']));
+           $subject = $magic_quotes ? stripslashes($row['subject']) : $row['subject'];
            if ($subject == "") {
               $subject = "(" . $lang['text_no_subject'] . ")";
            }else{
-                 $subject = decode_header($subject, $html_charset);
+                 $subject = htmlspecialchars(iconv_mime_decode($subject, 2, 'utf-8'), ENT_COMPAT, 'UTF-8');
            }
                   $rows[$count]['subject'] = $subject;
                   $count++;

php/mime.php

@@ -89 +89 @@
    {
       global $lang;
        
-      
       $ret = "<table border=\"0\" cellspacing=\"0\" cellpadding=\"2\" width=\"100%\">\n";
 
       if (isset($structure->headers["from"])) {
          $ret .= "<tr><td class=\"mailheader\" align=\"left\" valign=\"top\">\n";
          $ret .= "<font color=\"red\">FROM:</font></td>";
-         $ret .= "<td class=\"mailheader\" align=\"left\" valign=\"top\">" . trim(htmlentities($structure->headers["from"])) . "</td></tr>";
+         $ret .= "<td class=\"mailheader\" align=\"left\" valign=\"top\">" . htmlspecialchars(iconv_mime_decode($structure->headers["from"],2, 'utf-8'), ENT_QUOTES, 'utf-8') . "</td></tr>";
       }
       if (isset($structure->headers["to"])) {
          $ret .= "<tr><td class=\"mailheader\" align=\"left\" valign=\"top\">\n";
          $ret .= "<font color=\"red\">TO:</font></td>";
-         $ret .= "<td class=\"mailheader\" align=\"left\" valign=\"top\">" . trim(htmlentities($structure->headers["to"])) . "</td></tr>";
+         $ret .= "<td class=\"mailheader\" align=\"left\" valign=\"top\">" . htmlspecialchars(iconv_mime_decode($structure->headers["to"],2, 'utf-8'), ENT_QUOTES, 'utf-8') . "</td></tr>";
       }
       if (isset($structure->headers["subject"])) {
          $ret .= "<tr><td class=\"mailheader\" align=\"left\" valign=\"top\">\n";
          $ret .= "<font color=\"red\">SUBJECT:</font></td>";
-         $ret .= "<td class=\"mailheader\" align=\"left\" valign=\"top\">" . trim(htmlentities($structure->headers["subject"])) . "</td></tr>";
+         $ret .= "<td class=\"mailheader\" align=\"left\" valign=\"top\">" . htmlspecialchars(iconv_mime_decode($structure->headers["subject"],2, 'utf-8'), ENT_QUOTES, 'utf-8') . "</td></tr>";
       }
       $primary = strtolower(trim($structure->ctype_primary));
       $secondary = strtolower(trim($structure->ctype_secondary));
       $ctype = $primary . "/" . $secondary;
+      $message_charset = $structure->ctype_parameters['charset'];
+      
       $ret .= "<tr><td class=\"mailheader\" align=\"left\" valign=\"top\" width=\"150\">\n";
       $ret .= "<font color=\"red\">CONTENT-TYPE:</font></td>";
       $ret .= "<td class=\"mailheader\" align=\"left\" valign=\"top\">" . $ctype . "</td></tr>";
@@ -140 +141 @@
                // a sane width.
                case "plain":
 
-                  $ret .= "<pre>" . sanitize_html(wordwrap($structure->body, 70)) . "</pre>";
+                  $ret .= "<pre>" . sanitize_html(wordwrap(iconv($message_charset, 'utf-8',  $structure->body), 70)) . "</pre>";
                   break;
 
                // HTML content, clean it up a bit and display it.
                case "html":
 
-                  $ret .= sanitize_html($structure->body);
+                  $ret .= sanitize_html(iconv($message_charset, 'utf-8',  $structure->body));
                   break;
 
                // Some other odd text format we don't support, ignore it.

php/smarty.php

@@ -195 +195 @@
     $smarty->assign('MAIA_VERSION', MAIA_VERSION);
     $smarty->assign('display_language', $display_language);
     $smarty->assign('html_charset', $html_charset);
+    header("Content-Type: text/html; $html_charset");
     $smarty->assign("msid", $msid);
     $smarty->assign("sid", $sid);
     $smarty->assign('banner_title', $banner_title);

php/themes/desert_sand/templates/list-cache.tpl

@@ -81 +81 @@
 </b></td>
 <td align="left">
 <a id="link_{$row[hamloop].id}" class="thickbox HelpTipAnchor" href="view.php{$msid}mail_id={$row[hamloop].id}&amp;cache_type={$cache_type}&amp;address_id={$row[hamloop].address_id}">
-{$row[hamloop].subject|truncate:$truncate_subject:"...":true|escape:'htmlall'}
-</a><span id="cluetip_link_{$row[hamloop].id}"  class="HelpTip">{$row[hamloop].subject|escape:'htmlall'}</span></td>
+{$row[hamloop].subject|truncate:$truncate_subject:"...":true|escape}
+</a><span id="cluetip_link_{$row[hamloop].id}"  class="HelpTip">{$row[hamloop].subject}</span></td>
 <td align="center">
 <span class="HelpTipAnchor" id="received_date{$row[hamloop].id}">{$row[hamloop].received_date|truncate:$truncate_subject:"...":true|escape}</span>
 <span class="HelpTip" id="cluetip_received_date{$row[hamloop].id}">{$row[hamloop].received_date|escape:"javascript"|escape}</span>

php/view.php

@@ -214 +214 @@
           $mail = new Mail_mimeDecode((get_magic_quotes_gpc() ? stripslashes($contents) : $contents));
           $args['include_bodies'] = true;
           $args['decode_bodies'] = true;
-          $args['decode_headers'] = true;
+          $args['decode_headers'] = false;  // the inconv decoding will handle the headers
           $structure = $mail->decode($args);
           $smarty->assign("message", display_parts($structure));