Changeset 1366 in subversion

Timestamp:

May 8, 2008 5:07:04 AM (5 years ago)

Author:

alec

Message:

• Corrected message headers decoding when charset isn't specified and improved support for native languages (#1485050, #1485048)

Location:

trunk/roundcubemail

Files:

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

trunk/roundcubemail/CHANGELOG

@@ -7 +7 @@
 - Optimized messages sorting on servers without sort capability (#1485049)
 - Option 'use_SQL_address_book' replaced by 'address_book_type'
+- Corrected message headers decoding when charset isn't specified and improved
+  support for native languages (#1485050, #1485048)
 
 2008/05/07 (davidke/richs)

trunk/roundcubemail/program/include/rcube_imap.php

@@ -2362 +2362 @@
       
     // no encoding information, use fallback
-    return rcube_charset_convert($input, !empty($fallback) ? $fallback : 'ISO-8859-1');
+    return rcube_charset_convert($input, !empty($fallback) ? $fallback : $this->default_charset);
     }
 

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

@@ -233 +233 @@
     $out .= sprintf("<td class=\"icon\">%s</td>\n", $message_icon ? sprintf($image_tag, $skin_path, $message_icon, '') : '');
 
+    if (!empty($header->charset))
+      $IMAP->set_charset($header->charset);
+  
     // format each col
     foreach ($a_show_cols as $col)
       {
       if ($col=='from' || $col=='to')
-        $cont = Q(rcmail_address_string(rcube_imap::decode_mime_string($header->$col, $header->charset), 3, $attrib['addicon']), 'show');
+        $cont = Q(rcmail_address_string($header->$col, 3, $attrib['addicon']), 'show');
       else if ($col=='subject')
         {
         $action = $mbox==$CONFIG['drafts_mbox'] ? 'compose' : 'show';
         $uid_param = $mbox==$CONFIG['drafts_mbox'] ? '_draf_uid' : '_uid';
-        $cont = Q(rcube_imap::decode_mime_string($header->$col, $header->charset));
+        $cont = Q($IMAP->decode_header($header->$col));
         if (empty($cont)) $cont = Q(rcube_label('nosubject'));
         $cont = sprintf('<a href="%s" onclick="return rcube_event.cancel(event)">%s</a>', Q(rcmail_url($action, array($uid_param=>$header->uid, '_mbox'=>$mbox))), $cont);
@@ -322 +325 @@
       continue;
 
+    if (!empty($header->charset))
+      $IMAP->set_charset($header->charset);
+
     // format each col; similar as in rcmail_message_list()
     foreach ($a_show_cols as $col)
       {
       if ($col=='from' || $col=='to')
-        $cont = Q(rcmail_address_string(rcube_imap::decode_mime_string($header->$col, $header->charset), 3), 'show');
+        $cont = Q(rcmail_address_string($header->$col, 3), 'show');
       else if ($col=='subject')
         {
         $action = $mbox==$CONFIG['drafts_mbox'] ? 'compose' : 'show';
         $uid_param = $mbox==$CONFIG['drafts_mbox'] ? '_draf_uid' : '_uid';
-        $cont = Q(rcube_imap::decode_mime_string($header->$col, $header->charset));
+        $cont = Q($IMAP->decode_header($header->$col));
         if (!$cont) $cont = Q(rcube_label('nosubject'));
         $cont = sprintf('<a href="%s" onclick="return rcube_event.cancel(event)">%s</a>', Q(rcmail_url($action, array($uid_param=>$header->uid, '_mbox'=>$mbox))), $cont);
@@ -975 +981 @@
       $header_value = Q(rcmail_address_string($headers[$hkey], NULL, $attrib['addicon']), 'show');
     else
-      $header_value = Q(rcube_imap::decode_mime_string($headers[$hkey], $headers['charset']));
+      $header_value = Q($IMAP->decode_header($headers[$hkey]));
 
     $out .= "\n<tr>\n";
@@ -1467 +1473 @@
   $message = array('UID' => $uid);
   $message['headers'] = $IMAP->get_headers($message['UID']);
-  $message['subject'] = rcube_imap::decode_mime_string($message['headers']->subject, $message['headers']->charset);
+  $message['subject'] = $IMAP->decode_header($message['headers']->subject);
   
   if ($message['headers']->mdn_to && !$message['headers']->mdn_sent)

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

@@ -62 +62 @@
     send_modified_header($_SESSION['login_time'], $etag, !$MESSAGE['headers']->seen);
 
-  $MESSAGE['subject'] = rcube_imap::decode_mime_string($MESSAGE['headers']->subject, $MESSAGE['headers']->charset);
+  $MESSAGE['subject'] = $IMAP->decode_header($MESSAGE['headers']->subject);
   $OUTPUT->set_pagetitle($MESSAGE['subject']);