From 1088d667458ae03a54fcb4b8d290f6218e84d304 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 05 May 2008 05:59:56 -0400
Subject: [PATCH] - Do charset conversion also for from/to column on messages list
---
CHANGELOG | 1 +
program/steps/mail/func.inc | 10 +++++-----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 0384783..c586bce 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@
2008/05/05 (alec)
----------
- Installer: encode special characters in DB username/password (#1485042)
+- Do charset conversion also for from/to column on messages list
2008/05/02 (alec)
----------
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 1c1a4c6..34586dd 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -231,12 +231,12 @@
$zebra_class);
$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')
{
$action = $mbox==$CONFIG['drafts_mbox'] ? 'compose' : 'show';
@@ -325,7 +325,7 @@
foreach ($a_show_cols as $col)
{
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')
{
$action = $mbox==$CONFIG['drafts_mbox'] ? 'compose' : 'show';
@@ -1277,7 +1277,7 @@
function rcmail_address_string($input, $max=NULL, $addicon=NULL)
{
global $IMAP, $PRINT_MODE, $CONFIG, $OUTPUT, $EMAIL_ADDRESS_PATTERN;
-
+
$a_parts = $IMAP->decode_address_list($input);
if (!sizeof($a_parts))
@@ -1291,7 +1291,7 @@
{
$j++;
if ($PRINT_MODE)
- $out .= sprintf('%s <%s>', Q($part['name']), $part['mailto']);
+ $out .= sprintf('%s <%s>', Q(rcube_charset_convert($part['name'])), $part['mailto']);
else if (preg_match($EMAIL_ADDRESS_PATTERN, $part['mailto']))
{
$out .= sprintf('<a href="mailto:%s" onclick="return %s.command(\'compose\',\'%s\',this)" class="rcmContactAddress" title="%s">%s</a>',
--
Gitblit v1.9.1