From a130cbba13785d328eeadf8acc85e54a982299d8 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Fri, 14 Nov 2008 00:33:29 -0700 Subject: [PATCH] Don't display status information in popup. --- framework/Mime/lib/Horde/Mime/Viewer/html.php | 4 ++-- imp/lib/Mime/Viewer/html.php | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/framework/Mime/lib/Horde/Mime/Viewer/html.php b/framework/Mime/lib/Horde/Mime/Viewer/html.php index cec01513c..9fe314081 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/html.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/html.php @@ -39,7 +39,7 @@ class Horde_Mime_Viewer_html extends Horde_Mime_Viewer_Driver return array( $this->_mimepart->getMimeId() => array( 'data' => $html['data'], - 'status' => $html['status'], + 'status' => array(), 'type' => $this->_mimepart->getType(true) ) ); @@ -159,7 +159,7 @@ class Horde_Mime_Viewer_html extends Horde_Mime_Viewer_Driver /* Get phishing warning. */ $status = array(); - if ($phish_warn) { + if ($inline && $phish_warn) { $phish_warning = sprintf(_("%s: This message may not be from whom it claims to be. Beware of following any links in it or of providing the sender with any personal information.") . ' ' . _("The links that caused this warning have the same background color as this message."), _("Warning")); if (!$inline) { $phish_warning = String::convertCharset($phish_warning, NLS::getCharset(), $this->_mimepart->getCharset()); diff --git a/imp/lib/Mime/Viewer/html.php b/imp/lib/Mime/Viewer/html.php index 82fccaae1..655a811ea 100644 --- a/imp/lib/Mime/Viewer/html.php +++ b/imp/lib/Mime/Viewer/html.php @@ -193,7 +193,8 @@ class IMP_Horde_Mime_Viewer_html extends Horde_Mime_Viewer_html } /* Only display images if specifically allowed by user. */ - if (!IMP::printMode() && + if ($inline && + !IMP::printMode() && $GLOBALS['prefs']->getValue('html_image_replacement') && preg_match($this->_img_regex, $data)) { /* Make sure the URL parameters are correct for the current -- 2.11.0