summaryrefslogtreecommitdiff
path: root/lib/kolab_sync_data_email.php
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-04-06 17:38:23 (GMT)
committerAleksander Machniak <alec@alec.pl>2013-04-06 17:38:23 (GMT)
commitbdff03bd5a5e392122fded796036c81d17742068 (patch)
treee91461d2f6562ce49d9dd4f149986068d6480b74 /lib/kolab_sync_data_email.php
parent384fd222d1f88f2908f4b22bedea83770e4978f1 (diff)
downloadkolab-syncroton-bdff03bd5a5e392122fded796036c81d17742068.tar.gz
Update Roundcube Framework with small improvements to invalid characters in message headers cleanup
Diffstat (limited to 'lib/kolab_sync_data_email.php')
-rw-r--r--lib/kolab_sync_data_email.php11
1 files changed, 3 insertions, 8 deletions
diff --git a/lib/kolab_sync_data_email.php b/lib/kolab_sync_data_email.php
index d246af4..6ad2ed8 100644
--- a/lib/kolab_sync_data_email.php
+++ b/lib/kolab_sync_data_email.php
@@ -144,14 +144,9 @@ class kolab_sync_data_email extends kolab_sync_data implements Syncroton_Data_ID
$addresses = rcube_mime::decode_address_list($headers->$name, null, true, $headers->charset);
foreach ($addresses as $idx => $part) {
- $name = $part['name'];
- $mailto = $part['mailto'];
- $string = $part['string'];
-
- // @TODO: convert to utf8?
- // @FIXME: set name + address or address only?
- //rcube_utils::idn_to_utf8();
- $addresses[$idx] = format_email_recipient($mailto, $name);
+ // @FIXME: set name + address or address only?
+ $addresses[$idx] = format_email_recipient($part['mailto'], $part['name']);
+ $addresses[$idx] = rcube_charset::clean($addresses[$idx]);
}
$value = implode(',', $addresses);