1 files changed, 69 insertions, 7 deletions

diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc
index 372757720..a27e788a3 100644
--- a/program/steps/mail/get.inc
+++ b/program/steps/mail/get.inc
@@ -38,19 +38,34 @@ ob_end_clean();
 
 // similar code as in program/steps/mail/show.inc
 if (!empty($_GET['_uid'])) {
+  $uid = get_input_value('_uid', RCUBE_INPUT_GET);
   $RCMAIL->config->set('prefer_html', true);
-  $MESSAGE = new rcube_message(get_input_value('_uid', RCUBE_INPUT_GET));
+  $MESSAGE = new rcube_message($uid);
 }
 
 // check connection status
 check_storage_status();
 
+$part_id = get_input_value('_part', RCUBE_INPUT_GPC);
+
 // show part page
 if (!empty($_GET['_frame'])) {
-  if (($part_id = get_input_value('_part', RCUBE_INPUT_GPC)) && ($part = $MESSAGE->mime_parts[$part_id])) {
-    $OUTPUT->set_pagetitle(rcmail_attachment_name($part));
+  if ($part_id && ($part = $MESSAGE->mime_parts[$part_id])) {
+    $filename = rcmail_attachment_name($part);
+    $OUTPUT->set_pagetitle($filename);
   }
 
+  // register UI objects
+  $OUTPUT->add_handlers(array(
+    'messagepartframe'    => 'rcmail_message_part_frame',
+    'messagepartcontrols' => 'rcmail_message_part_controls',
+  ));
+
+  $OUTPUT->set_env('mailbox', $RCMAIL->storage->get_folder());
+  $OUTPUT->set_env('uid', $uid);
+  $OUTPUT->set_env('part', $part_id);
+  $OUTPUT->set_env('filename', $filename);
+
   $OUTPUT->send('messagepart');
   exit;
 }
@@ -92,9 +107,8 @@ else if ($_GET['_thumb']) {
   exit;
 }
 
-else if (strlen($pid = get_input_value('_part', RCUBE_INPUT_GET))) {
-
-  if ($part = $MESSAGE->mime_parts[$pid]) {
+else if (strlen($part_id)) {
+  if ($part = $MESSAGE->mime_parts[$part_id]) {
     $mimetype = rcmail_fix_mimetype($part->mimetype);
 
     // allow post-processing of the message body
@@ -378,7 +392,9 @@ else {
 header('HTTP/1.1 404 Not Found');
 exit;
 
-
+/**
+ * Handles nicely storage connection errors
+ */
 function check_storage_status()
 {
     $error = rcmail::get_instance()->storage->get_error_code();
@@ -410,3 +426,49 @@ function check_storage_status()
         exit;
     }
 }
+
+/**
+ * Attachment properties table
+ */
+function rcmail_message_part_controls($attrib)
+{
+    global $MESSAGE, $RCMAIL;
+
+    $part = asciiwords(get_input_value('_part', RCUBE_INPUT_GPC));
+    if (!is_object($MESSAGE) || !is_array($MESSAGE->parts)
+        || !($_GET['_uid'] && $_GET['_part']) || !$MESSAGE->mime_parts[$part]
+    ) {
+        return '';
+    }
+
+    $part  = $MESSAGE->mime_parts[$part];
+    $table = new html_table(array('cols' => 2));
+
+    $table->add('title', Q(rcube_label('namex')).':');
+    $table->add('header', Q(rcmail_attachment_name($part)));
+
+    $table->add('title', Q(rcube_label('type')).':');
+    $table->add('header', Q($part->mimetype));
+
+    $table->add('title', Q(rcube_label('size')).':');
+    $table->add('header', Q($RCMAIL->message_part_size($part)));
+
+    return $table->show($attrib);
+}
+
+/**
+ * Attachment preview frame
+ */
+function rcmail_message_part_frame($attrib)
+{
+    global $MESSAGE, $RCMAIL;
+
+    $part = $MESSAGE->mime_parts[asciiwords(get_input_value('_part', RCUBE_INPUT_GPC))];
+    $ctype_primary = strtolower($part->ctype_primary);
+
+    $attrib['src'] = './?' . str_replace('_frame=', ($ctype_primary=='text' ? '_embed=' : '_preload='), $_SERVER['QUERY_STRING']);
+
+    $RCMAIL->output->add_gui_object('messagepartframe', $attrib['id']);
+
+    return html::iframe($attrib);
+}