Add save link to full message display in DIMP.

diff --git a/imp/docs/CHANGES b/imp/docs/CHANGES
index f8cd7ec..70b5bba 100644 (file)
--- a/imp/docs/CHANGES
+++ b/imp/docs/CHANGES
@@ -2,6 +2,7 @@
 v5.0-git
 --------
 
+[mms] Add save link to full message display in DIMP.
 [mms] Allow on-demand filter application (if filter backend supports) in DIMP.
 [mms] Add full IMAP subscription support to DIMP.
 [mms] Add message information to preview screen (DIMP).

diff --git a/imp/lib/Views/ShowMessage.php b/imp/lib/Views/ShowMessage.php
index c7cef7e..11e7eb4 100644 (file)
--- a/imp/lib/Views/ShowMessage.php
+++ b/imp/lib/Views/ShowMessage.php
@@ -85,17 +85,18 @@ class IMP_Views_ShowMessage
      * 'list_info' - List information.
      * 'priority' - The X-Priority of the message ('low', 'high', 'normal')
      * 'replyTo' - The Reply-to addresses
+     * 'save_as' - The save link
      * </pre>
      */
     public function showMessage($args)
     {
         $preview = !empty($args['preview']);
-        $folder = $args['folder'];
+        $mailbox = $args['folder'];
         $index = $args['index'];
         $error_msg = _("Requested message not found.");
 
         $result = array(
-            'folder' => $folder,
+            'folder' => $mailbox,
             'index' => $index
         );
 
@@ -105,7 +106,7 @@ class IMP_Views_ShowMessage
         /* Get envelope/header information. We don't use flags in this
          * view. */
         try {
-            $fetch_ret = $GLOBALS['imp_imap']->ob->fetch($folder, array(
+            $fetch_ret = $GLOBALS['imp_imap']->ob->fetch($mailbox, array(
                 Horde_Imap_Client::FETCH_ENVELOPE => true,
                 Horde_Imap_Client::FETCH_HEADERTEXT => array(array('parse' => true, 'peek' => false))
             ), array('ids' => array($index)));
@@ -117,7 +118,7 @@ class IMP_Views_ShowMessage
 
         /* Parse MIME info and create the body of the message. */
         try {
-            $imp_contents = &IMP_Contents::singleton($index . IMP::IDX_SEP . $folder);
+            $imp_contents = &IMP_Contents::singleton($index . IMP::IDX_SEP . $mailbox);
         } catch (Horde_Exception $e) {
             $result['error'] = $error_msg;
             $result['errortype'] = 'horde.error';
@@ -246,8 +247,8 @@ class IMP_Views_ShowMessage
         }
 
         /* Do MDN processing now. */
-        if ($imp_ui->MDNCheck($folder, $index, $mime_headers)) {
-            $result['msgtext'] .= $imp_ui->formatStatusMsg(array('text' => array(_("The sender of this message is requesting a Message Disposition Notification from you when you have read this message."), sprintf(_("Click %s to send the notification message."), Horde::link('', '', '', '', 'DimpCore.doAction(\'SendMDN\',{folder:\'' . $folder . '\',index:' . $index . '}); return false;', '', '') . _("HERE") . '</a>'))));
+        if ($imp_ui->MDNCheck($mailbox, $index, $mime_headers)) {
+            $result['msgtext'] .= $imp_ui->formatStatusMsg(array('text' => array(_("The sender of this message is requesting a Message Disposition Notification from you when you have read this message."), sprintf(_("Click %s to send the notification message."), Horde::link('', '', '', '', 'DimpCore.doAction(\'SendMDN\',{folder:\'' . $mailbox . '\',index:' . $index . '}); return false;', '', '') . _("HERE") . '</a>'))));
         }
 
         /* Build body text. This needs to be done before we build the
@@ -342,6 +343,7 @@ class IMP_Views_ShowMessage
 
         if (!$preview) {
             $result['list_info'] = $imp_ui->getListInformation($mime_headers);
+            $result['save_as'] = Horde::downloadUrl(htmlspecialchars_decode($result['subject']), array_merge(array('actionID' => 'save_message'), IMP::getIMPMboxParameters($mailbox, $index, $mailbox)));
         }
 
         return $result;

diff --git a/imp/templates/chunks/message.php b/imp/templates/chunks/message.php
index de98463..ac57341 100644 (file)
--- a/imp/templates/chunks/message.php
+++ b/imp/templates/chunks/message.php
@@ -62,6 +62,7 @@ function _createDAfmsg($text, $image, $id, $class = '', $show_text = true)
 <?php if (!empty($conf['user']['allow_view_source'])): ?>
       <div id="msg_view_source"><span class="iconImg"></span><a><?php echo _("View Message Source") ?></a></div>
 <?php endif; ?>
+      <div><span class="iconImg saveAsImg"</span><a href="<?php echo $show_msg_result['save_as'] ?>"><?php echo _("Save") ?></a></div>
      </div>
      <div id="msgHeadersContent">
       <table cellspacing="0">

diff --git a/imp/themes/screen-dimp.css b/imp/themes/screen-dimp.css
index 034d7fe..f7209d1 100644 (file)
--- a/imp/themes/screen-dimp.css
+++ b/imp/themes/screen-dimp.css
@@ -391,7 +391,7 @@ div.vpRow.flagDeleted {
     text-decoration: none;
     color: #000;
 }
-.dimpOptions div:hover {
+.dimpOptions div a:hover {
     text-decoration: underline;
 }
 .dimpOptions div img {

diff --git a/imp/themes/screen.css b/imp/themes/screen.css
index 86391ae..f5384fc 100644 (file)
--- a/imp/themes/screen.css
+++ b/imp/themes/screen.css
@@ -596,7 +596,7 @@ td.addressTr span.loadingImg {
     padding: 0 1px;
     vertical-align: bottom;
 }
-.downloadAtc {
+.downloadAtc, .saveAsImg {
     background-image: url("graphics/download.png");
 }
 .downloadZipAtc {