From 3e4c67dda9b92c54474415a1c7762396e742c295 Mon Sep 17 00:00:00 2001 From: alec Date: Wed, 19 May 2010 07:57:06 +0000 Subject: - Fix %00 character in winmail.dat attachments names (#1486738) git-svn-id: https://svn.roundcube.net/trunk@3634 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/include/rcube_imap.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'roundcubemail/program/include') diff --git a/roundcubemail/program/include/rcube_imap.php b/roundcubemail/program/include/rcube_imap.php index 768e8337a..cc1f9c56a 100644 --- a/roundcubemail/program/include/rcube_imap.php +++ b/roundcubemail/program/include/rcube_imap.php @@ -3393,13 +3393,13 @@ class rcube_imap foreach ($tnef_arr as $winatt) { $tpart = new rcube_message_part; - $tpart->filename = $winatt["name"]; + $tpart->filename = trim($winatt['name']); $tpart->encoding = 'stream'; - $tpart->ctype_primary = $winatt["type0"]; - $tpart->ctype_secondary = $winatt["type1"]; - $tpart->mimetype = strtolower($winatt["type0"] . "/" . $winatt["type1"]); + $tpart->ctype_primary = trim(strtolower($winatt['type0'])); + $tpart->ctype_secondary = trim(strtolower($winatt['type1'])); + $tpart->mimetype = $tpart->ctype_primary . '/' . $tpart->ctype_secondary; $tpart->mime_id = "winmail." . $part->mime_id . ".$pid"; - $tpart->size = $winatt["size"]; + $tpart->size = $winatt['size']; $tpart->body = $winatt['stream']; $tnef_parts[] = $tpart; -- cgit v1.2.3