From: Michael M Slusarz <slusarz@curecanti.org>
Date: Thu, 4 Feb 2010 04:58:50 +0000 (-0700)
Subject: Don't display print links in attachment list
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=c82bf71957d427b9fa37820de9b6190df326652b;p=horde.git

Don't display print links in attachment list
---

diff --git a/imp/lib/Views/ShowMessage.php b/imp/lib/Views/ShowMessage.php
index 88f09ca4c..a07c913dd 100644
--- a/imp/lib/Views/ShowMessage.php
+++ b/imp/lib/Views/ShowMessage.php
@@ -254,7 +254,8 @@ class IMP_Views_ShowMessage
             IMP_Contents::SUMMARY_DOWNLOAD_ZIP |
             IMP_Contents::SUMMARY_PRINT;
 
-        $part_info = $part_info_display = array('icon', 'description', 'size', 'download', 'download_zip', 'print');
+        $part_info = $part_info_display = array('icon', 'description', 'size', 'download', 'download_zip');
+        $part_info_display[] = 'print';
 
         /* Do MDN processing now. */
         if ($imp_ui->MDNCheck($mailbox, $uid, $mime_headers)) {
diff --git a/imp/message.php b/imp/message.php
index a801bce12..3bb26cebf 100644
--- a/imp/message.php
+++ b/imp/message.php
@@ -574,12 +574,13 @@ foreach ($all_list_headers as $head => $val) {
 
 /* Determine the fields that will appear in the MIME info entries. */
 $part_info = $part_info_display = array('icon', 'description', 'size');
-$part_info_action = array('download', 'download_zip', 'img_save', 'strip', 'print');
+$part_info_action = array('download', 'download_zip', 'img_save', 'strip');
+$part_info_bodyonly = array('print');
 
 $show_parts = Horde_Util::getFormData('show_parts', $prefs->getValue('parts_display'));
 $strip_atc = $prefs->getValue('strip_attachments');
 
-$part_info_display = array_merge($part_info_display, $part_info_action);
+$part_info_display = array_merge($part_info_display, $part_info_action, $part_info_bodyonly);
 $contents_mask = IMP_Contents::SUMMARY_BYTES |
     IMP_Contents::SUMMARY_SIZE |
     IMP_Contents::SUMMARY_ICON |