From 41fa0b909ac1fe80dd103e8d986776ef46a5b50a Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Mon, 31 Jul 2006 18:51:23 -0400
Subject: [PATCH] Compose, save and sendmail cleanup
---
program/include/rcube_imap.inc | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/program/include/rcube_imap.inc b/program/include/rcube_imap.inc
index dad6426..630d2fb 100644
--- a/program/include/rcube_imap.inc
+++ b/program/include/rcube_imap.inc
@@ -1678,7 +1678,7 @@
{
$a = $this->_parse_address_list($input);
$out = array();
-
+
if (!is_array($a))
return $out;
@@ -2018,12 +2018,13 @@
{
$a = $this->_explode_quoted_string(',', $str);
$result = array();
-
+
foreach ($a as $key => $val)
{
$val = str_replace("\"<", "\" <", $val);
- $sub_a = $this->_explode_quoted_string(' ', $val);
-
+ $sub_a = $this->_explode_quoted_string(' ', $this->decode_header($val));
+ $result[$key]['name'] = '';
+
foreach ($sub_a as $k => $v)
{
if ((strpos($v, '@') > 0) && (strpos($v, '.') > 0))
@@ -2033,9 +2034,7 @@
}
if (empty($result[$key]['name']))
- $result[$key]['name'] = $result[$key]['address'];
-
- $result[$key]['name'] = $this->decode_header($result[$key]['name']);
+ $result[$key]['name'] = $result[$key]['address'];
}
return $result;
--
Gitblit v1.9.1