From 8749e94b4bed36500e4f45c65cc16cfd5633ef34 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Fri, 8 Jun 2012 11:14:53 +0200 Subject: Fix attachment sizes in message print page and attachment preview page (#1488515) - Use size parameter from Content-Disposition header if specified, - Calculate size of base64 encoded message parts --- program/steps/mail/show.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'program/steps/mail/show.inc') diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc index 158ba31c8..5fa72d77f 100644 --- a/program/steps/mail/show.inc +++ b/program/steps/mail/show.inc @@ -144,7 +144,7 @@ if ($uid = get_input_value('_uid', RCUBE_INPUT_GET)) { function rcmail_message_attachments($attrib) { - global $PRINT_MODE, $MESSAGE; + global $PRINT_MODE, $MESSAGE, $RCMAIL; $out = $ol = ''; @@ -156,7 +156,8 @@ function rcmail_message_attachments($attrib) } if ($PRINT_MODE) { - $ol .= html::tag('li', null, sprintf("%s (%s)", Q($filename), Q(show_bytes($attach_prop->size)))); + $size = $RCMAIL->message_part_size($attach_prop); + $ol .= html::tag('li', null, Q(sprintf("%s (%s)", $filename, $size))); } else { if (mb_strlen($filename) > 50) { -- cgit v1.2.3