summaryrefslogtreecommitdiff
path: root/program/include/rcube_imap.inc
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2006-07-31 22:51:23 +0000
committerthomascube <thomas@roundcube.net>2006-07-31 22:51:23 +0000
commit41fa0b909ac1fe80dd103e8d986776ef46a5b50a (patch)
tree0a7e053b57951761e9e8662dd799cf46a2b7906a /program/include/rcube_imap.inc
parentabb32edbeb0e4c9be7b38c4162bd8c7cbd06dc74 (diff)
Compose, save and sendmail cleanup
Diffstat (limited to 'program/include/rcube_imap.inc')
-rw-r--r--program/include/rcube_imap.inc13
1 files changed, 6 insertions, 7 deletions
diff --git a/program/include/rcube_imap.inc b/program/include/rcube_imap.inc
index dad64261e..630d2fb8b 100644
--- a/program/include/rcube_imap.inc
+++ b/program/include/rcube_imap.inc
@@ -1678,7 +1678,7 @@ function gethdrids($hdr)
{
$a = $this->_parse_address_list($input);
$out = array();
-
+
if (!is_array($a))
return $out;
@@ -2018,12 +2018,13 @@ function gethdrids($hdr)
{
$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 @@ function gethdrids($hdr)
}
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;