From: Michael M Slusarz Date: Fri, 21 Nov 2008 07:01:42 +0000 (-0700) Subject: Readd correct background display. X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=53d1b1af802d4dd86fc2089e88c4747a5d9f064b;p=horde.git Readd correct background display. --- diff --git a/framework/Mime/lib/Horde/Mime/Viewer/html.php b/framework/Mime/lib/Horde/Mime/Viewer/html.php index 9fe314081..4fcdc241c 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/html.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/html.php @@ -160,14 +160,22 @@ class Horde_Mime_Viewer_html extends Horde_Mime_Viewer_Driver /* Get phishing warning. */ $status = array(); 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")); + $warning = array( + 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."), _("Warning")), + _("The links that caused this warning have this background color:") . ' ' . _("EXAMPLE") . '.' + ); + if (!$inline) { - $phish_warning = String::convertCharset($phish_warning, NLS::getCharset(), $this->_mimepart->getCharset()); + $temp = array(); + foreach ($phish_warning as $val) { + $temp[] = String::convertCharset($val, NLS::getCharset(), $this->_mimepart->getCharset()); + } + $warning = $temp; } $status[] = array( 'class' => 'mimestatuswarning', - 'text' => array($phish_warning) + 'text' => $warning ); }