From 3c573ac1bf54f0840f108db8562f60433a3c4ddc Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Wed, 26 Aug 2009 11:13:30 -0600 Subject: [PATCH] Don't use TT tags --- framework/Mime/lib/Horde/Mime/Viewer/Plain.php | 2 +- framework/Mime/lib/Horde/Mime/Viewer/Rar.php | 4 ++-- framework/Mime/lib/Horde/Mime/Viewer/Tgz.php | 4 ++-- framework/Mime/lib/Horde/Mime/Viewer/Zip.php | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/framework/Mime/lib/Horde/Mime/Viewer/Plain.php b/framework/Mime/lib/Horde/Mime/Viewer/Plain.php index 5e2d8b6fe..3ede576ce 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/Plain.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/Plain.php @@ -44,7 +44,7 @@ class Horde_Mime_Viewer_Plain extends Horde_Mime_Viewer_Driver return array( $this->_mimepart->getMimeId() => array( - 'data' => '' . Horde_Text_Filter::filter($text, 'text2html', array('parselevel' => Horde_Text_Filter_Text2html::MICRO, 'charset' => $charset, 'class' => null)) . '', + 'data' => '' . Horde_Text_Filter::filter($text, 'text2html', array('parselevel' => Horde_Text_Filter_Text2html::MICRO, 'charset' => $charset, 'class' => null)) . '', 'status' => array(), 'type' => 'text/html; charset=' . $charset ) diff --git a/framework/Mime/lib/Horde/Mime/Viewer/Rar.php b/framework/Mime/lib/Horde/Mime/Viewer/Rar.php index e35be9f91..194e55bd2 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/Rar.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/Rar.php @@ -64,7 +64,7 @@ class Horde_Mime_Viewer_Rar extends Horde_Mime_Viewer_Driver } $text = '' . htmlspecialchars(sprintf(_("Contents of \"%s\""), $name)) . ":\n" . - '

' . + '' . Horde_Text_Filter::filter(_("Archive Name") . ': ' . $name, 'space2html', array('charset' => $charset, 'encode' => true, 'encode_all' => true)) . "\n" . Horde_Text_Filter::filter(_("Archive File Size") . ': ' . strlen($contents) . ' bytes', 'space2html', array('charset' => $charset, 'encode' => true, 'encode_all' => true)) . "\n" . Horde_Text_Filter::filter(sprintf(ngettext("File Count: %d file", "File Count: %d files", $fileCount), $fileCount), 'space2html', array('charset' => $charset, 'encode' => true, 'encode_all' => true)) . @@ -99,7 +99,7 @@ class Horde_Mime_Viewer_Rar extends Horde_Mime_Viewer_Driver return array( $this->_mimepart->getMimeId() => array( - 'data' => nl2br($text . str_repeat('-', 106) . "\n"), + 'data' => nl2br($text . str_repeat('-', 106) . "\n

"), 'status' => array(), 'type' => 'text/html; charset=' . $charset ) diff --git a/framework/Mime/lib/Horde/Mime/Viewer/Tgz.php b/framework/Mime/lib/Horde/Mime/Viewer/Tgz.php index e80035e64..b4eaf6911 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/Tgz.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/Tgz.php @@ -70,7 +70,7 @@ class Horde_Mime_Viewer_Tgz extends Horde_Mime_Viewer_Driver } $text = '' . htmlspecialchars(sprintf(_("Contents of \"%s\""), $name)) . ":\n" . - '

' . + '' . Horde_Text_Filter::filter(_("Archive Name") . ': ' . $name, 'space2html', array('charset' => $charset, 'encode' => true, 'encode_all' => true)) . "\n" . Horde_Text_Filter::filter(_("Archive File Size") . ': ' . strlen($contents) . ' bytes', 'space2html', array('charset' => $charset, 'encode' => true, 'encode_all' => true)) . "\n" . Horde_Text_Filter::filter(sprintf(ngettext("File Count: %d file", "File Count: %d files", $fileCount), $fileCount), 'space2html', array('charset' => $charset, 'encode' => true, 'encode_all' => true)) . @@ -98,7 +98,7 @@ class Horde_Mime_Viewer_Tgz extends Horde_Mime_Viewer_Driver return array( $this->_mimepart->getMimeId() => array( - 'data' => nl2br($text . str_repeat('-', 106) . "\n"), + 'data' => nl2br($text . str_repeat('-', 106) . "\n

"), 'status' => array(), 'type' => 'text/html; charset=' . $charset ) diff --git a/framework/Mime/lib/Horde/Mime/Viewer/Zip.php b/framework/Mime/lib/Horde/Mime/Viewer/Zip.php index 268a10c5b..f21e3fb6c 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/Zip.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/Zip.php @@ -89,7 +89,7 @@ class Horde_Mime_Viewer_Zip extends Horde_Mime_Viewer_Driver } $text = '' . htmlspecialchars(sprintf(_("Contents of \"%s\""), $name)) . ":\n" . - '

' . + '' . Horde_Text_Filter::filter( _("Archive Name") . ': ' . $name . "\n" . _("Archive File Size") . ': ' . strlen($contents) . @@ -133,7 +133,7 @@ class Horde_Mime_Viewer_Zip extends Horde_Mime_Viewer_Driver return array( $this->_mimepart->getMimeId() => array( - 'data' => nl2br($text . str_repeat('-', 69 + $maxlen) . "\n"), + 'data' => nl2br($text . str_repeat('-', 69 + $maxlen) . "\n

"), 'status' => array(), 'type' => 'text/html; charset=' . Horde_Nls::getCharset() ) -- 2.11.0