Changeset 1355 in subversion

Timestamp:

May 5, 2008 5:59:56 AM (5 years ago)

Author:

alec

Message:

• Do charset conversion also for from/to column on messages list

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/steps/mail/func.inc (modified) (4 diffs)

trunk/roundcubemail/CHANGELOG

@@ -5 +5 @@
 ----------
 - Installer: encode special characters in DB username/password (#1485042)
+- Do charset conversion also for from/to column on messages list
 
 2008/05/02 (alec)

trunk/roundcubemail/program/steps/mail/func.inc

@@ -232 +232 @@
     
     $out .= sprintf("<td class=\"icon\">%s</td>\n", $message_icon ? sprintf($image_tag, $skin_path, $message_icon, '') : '');
-    
+
     // format each col
     foreach ($a_show_cols as $col)
       {
       if ($col=='from' || $col=='to')
-        $cont = Q(rcmail_address_string($header->$col, 3, $attrib['addicon']), 'show');
+        $cont = Q(rcmail_address_string(rcube_imap::decode_mime_string($header->$col, $header->charset), 3, $attrib['addicon']), 'show');
       else if ($col=='subject')
         {
@@ -326 +326 @@
       {
       if ($col=='from' || $col=='to')
-        $cont = Q(rcmail_address_string($header->$col, 3), 'show');
+        $cont = Q(rcmail_address_string(rcube_imap::decode_mime_string($header->$col, $header->charset), 3), 'show');
       else if ($col=='subject')
         {
@@ -1278 +1278 @@
   {
   global $IMAP, $PRINT_MODE, $CONFIG, $OUTPUT, $EMAIL_ADDRESS_PATTERN;
-  
+
   $a_parts = $IMAP->decode_address_list($input);
 
@@ -1292 +1292 @@
     $j++;
     if ($PRINT_MODE)
-      $out .= sprintf('%s &lt;%s&gt;', Q($part['name']), $part['mailto']);
+      $out .= sprintf('%s &lt;%s&gt;', Q(rcube_charset_convert($part['name'])), $part['mailto']);
     else if (preg_match($EMAIL_ADDRESS_PATTERN, $part['mailto']))
       {