summaryrefslogtreecommitdiff
path: root/roundcubemail/program/steps/mail/get.inc
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2010-05-28 09:38:41 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2010-05-28 09:38:41 +0000
commit18767e67edcc30982d41298a12cd70f9048c0f81 (patch)
treedec375fd5d240f43506798e26b08c18f947e2572 /roundcubemail/program/steps/mail/get.inc
parent2f4ff8ded256ee0e4f73f365c774c2b01857b057 (diff)
- Fix forwarding of messages with winmail attachments
- Remove some redundant code for winmail handling in get.inc, move tnef_decode() to rcube_message - Fix handling of uuencoded attachments in message body (#1485839) - Extend rc_mime_content_type() to work with string buffer git-svn-id: https://svn.roundcube.net/trunk@3680 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/steps/mail/get.inc')
-rw-r--r--roundcubemail/program/steps/mail/get.inc11
1 files changed, 1 insertions, 10 deletions
diff --git a/roundcubemail/program/steps/mail/get.inc b/roundcubemail/program/steps/mail/get.inc
index fdf90135c..89180dd3a 100644
--- a/roundcubemail/program/steps/mail/get.inc
+++ b/roundcubemail/program/steps/mail/get.inc
@@ -50,16 +50,7 @@ if (!empty($_GET['_frame'])) {
}
else if ($pid = get_input_value('_part', RCUBE_INPUT_GET)) {
- // TNEF encoded attachment part
- if (preg_match('/^winmail\.([0-9.]+)\.([0-9]+)$/', $pid, $nt)) {
- $pid = $nt[1]; $i = $nt[2];
- if ($part = $MESSAGE->mime_parts[$pid]) {
- $tnef_arr = $IMAP->tnef_decode($part, $MESSAGE->uid);
- if (is_a($tnef_arr[$i], 'rcube_message_part'))
- $MESSAGE->mime_parts[$pid] = $tnef_arr[$i];
- }
- }
-
+
if ($part = $MESSAGE->mime_parts[$pid]) {
$ctype_primary = strtolower($part->ctype_primary);
$ctype_secondary = strtolower($part->ctype_secondary);