diff options
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | program/include/rcube_imap.php | 10 |
2 files changed, 6 insertions, 5 deletions
@@ -1,6 +1,7 @@ CHANGELOG RoundCube Webmail =========================== +- Fix %00 character in winmail.dat attachments names (#1486738) - Fix handling errors of folder deletion (#1486705) - Parse untagged CAPABILITY response for LOGIN command (#1486742) - Renamed all php-cli scripts to use .sh extension diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php index 768e8337a..cc1f9c56a 100644 --- a/program/include/rcube_imap.php +++ b/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; |