From 1881a8a15291c5777144fecfa691d7634eee9c0d Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 29 Dec 2014 08:26:18 -0500
Subject: [PATCH] Display "real" attachment size also on attachments list
---
program/steps/mail/show.inc | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc
index d9233a9..747cbc2 100644
--- a/program/steps/mail/show.inc
+++ b/program/steps/mail/show.inc
@@ -199,11 +199,10 @@
if (sizeof($MESSAGE->attachments)) {
foreach ($MESSAGE->attachments as $attach_prop) {
$filename = rcmail_attachment_name($attach_prop, true);
- $size = '';
+ $filesize = $RCMAIL->message_part_size($attach_prop);
if ($PRINT_MODE) {
- $size = $RCMAIL->message_part_size($attach_prop);
- $ol .= html::tag('li', null, rcube::Q(sprintf("%s (%s)", $filename, $size)));
+ $ol .= html::tag('li', null, rcube::Q(sprintf("%s (%s)", $filename, $filesize)));
}
else {
if ($attrib['maxlength'] && mb_strlen($filename) > $attrib['maxlength']) {
@@ -215,7 +214,7 @@
}
if ($attach_prop->size) {
- $size = ' ' . html::span('attachment-size', '(' . $RCMAIL->show_bytes($attach_prop->size) . ')');
+ $size = ' ' . html::span('attachment-size', '(' . rcube::Q($filesize) . ')');
}
$mimetype = rcmail_fix_mimetype($attach_prop->mimetype);
--
Gitblit v1.9.1