From f77e9dbdc7477b3d878d342af4ae6138ca16d447 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Tue, 9 Jun 2009 22:41:54 -0600 Subject: [PATCH] Text -> Horde_Text --- framework/Mime/lib/Horde/Mime/Mdn.php | 1 - framework/Mime/lib/Horde/Mime/Viewer/Rar.php | 12 +++++------- framework/Mime/lib/Horde/Mime/Viewer/Tgz.php | 12 +++++------- framework/Mime/lib/Horde/Mime/Viewer/Zip.php | 4 +--- 4 files changed, 11 insertions(+), 18 deletions(-) diff --git a/framework/Mime/lib/Horde/Mime/Mdn.php b/framework/Mime/lib/Horde/Mime/Mdn.php index 77f898980..985a9d33e 100644 --- a/framework/Mime/lib/Horde/Mime/Mdn.php +++ b/framework/Mime/lib/Horde/Mime/Mdn.php @@ -144,7 +144,6 @@ class Horde_Mime_Mdn $err = array()) { require_once 'Horde/Identity.php'; - require_once 'Horde/Text.php'; /* Set up some variables we use later. */ $identity = &Identity::singleton(); diff --git a/framework/Mime/lib/Horde/Mime/Viewer/Rar.php b/framework/Mime/lib/Horde/Mime/Viewer/Rar.php index 7408d6a81..3379b4d03 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/Rar.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/Rar.php @@ -59,8 +59,6 @@ class Horde_Mime_Viewer_Rar extends Horde_Mime_Viewer_Driver } $fileCount = count($rarData); - require_once 'Horde/Text.php'; - $name = $this->_mimepart->getName(true); if (empty($name)) { $name = _("unnamed"); @@ -68,11 +66,11 @@ class Horde_Mime_Viewer_Rar extends Horde_Mime_Viewer_Driver $text = '' . htmlspecialchars(sprintf(_("Contents of \"%s\""), $name)) . ':' . "\n" . '
' . - Text::htmlAllSpaces(_("Archive Name") . ': ' . $name) . "\n" . - Text::htmlAllSpaces(_("Archive File Size") . ': ' . strlen($contents) . ' bytes') . "\n" . - Text::htmlAllSpaces(sprintf(ngettext("File Count: %d file", "File Count: %d files", $fileCount), $fileCount)) . + Horde_Text::htmlAllSpaces(_("Archive Name") . ': ' . $name) . "\n" . + Horde_Text::htmlAllSpaces(_("Archive File Size") . ': ' . strlen($contents) . ' bytes') . "\n" . + Horde_Text::htmlAllSpaces(sprintf(ngettext("File Count: %d file", "File Count: %d files", $fileCount), $fileCount)) . "\n\n" . - Text::htmlAllSpaces( + Horde_Text::htmlAllSpaces( Horde_String::pad(_("File Name"), 50, ' ', STR_PAD_RIGHT) . Horde_String::pad(_("Attributes"), 10, ' ', STR_PAD_LEFT) . Horde_String::pad(_("Size"), 10, ' ', STR_PAD_LEFT) . @@ -87,7 +85,7 @@ class Horde_Mime_Viewer_Rar extends Horde_Mime_Viewer_Driver ? 0 : 100 * ($val['csize'] / $val['size']); - $text .= Text::htmlAllSpaces( + $text .= Horde_Text::htmlAllSpaces( Horde_String::pad($val['name'], 50, ' ', STR_PAD_RIGHT) . Horde_String::pad($val['attr'], 10, ' ', STR_PAD_LEFT) . Horde_String::pad($val['size'], 10, ' ', STR_PAD_LEFT) . diff --git a/framework/Mime/lib/Horde/Mime/Viewer/Tgz.php b/framework/Mime/lib/Horde/Mime/Viewer/Tgz.php index cbfd711e0..e9d380d96 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/Tgz.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/Tgz.php @@ -67,8 +67,6 @@ class Horde_Mime_Viewer_Tgz extends Horde_Mime_Viewer_Driver } $fileCount = count($tarData); - require_once 'Horde/Text.php'; - $name = $this->_mimepart->getName(true); if (empty($name)) { $name = _("unnamed"); @@ -76,11 +74,11 @@ class Horde_Mime_Viewer_Tgz extends Horde_Mime_Viewer_Driver $text = '' . htmlspecialchars(sprintf(_("Contents of \"%s\""), $name)) . ':' . "\n" . '
' . - Text::htmlAllSpaces(_("Archive Name") . ': ' . $name) . "\n" . - Text::htmlAllSpaces(_("Archive File Size") . ': ' . strlen($contents) . ' bytes') . "\n" . - Text::htmlAllSpaces(sprintf(ngettext("File Count: %d file", "File Count: %d files", $fileCount), $fileCount)) . + Horde_Text::htmlAllSpaces(_("Archive Name") . ': ' . $name) . "\n" . + Horde_Text::htmlAllSpaces(_("Archive File Size") . ': ' . strlen($contents) . ' bytes') . "\n" . + Horde_Text::htmlAllSpaces(sprintf(ngettext("File Count: %d file", "File Count: %d files", $fileCount), $fileCount)) . "\n\n" . - Text::htmlAllSpaces( + Horde_Text::htmlAllSpaces( str_pad(_("File Name"), 62, ' ', STR_PAD_RIGHT) . str_pad(_("Attributes"), 15, ' ', STR_PAD_LEFT) . str_pad(_("Size"), 10, ' ', STR_PAD_LEFT) . @@ -89,7 +87,7 @@ class Horde_Mime_Viewer_Tgz extends Horde_Mime_Viewer_Driver str_repeat('-', 106) . "\n"; foreach ($tarData as $val) { - $text .= Text::htmlAllSpaces( + $text .= Horde_Text::htmlAllSpaces( str_pad($val['name'], 62, ' ', STR_PAD_RIGHT) . str_pad($val['attr'], 15, ' ', STR_PAD_LEFT) . str_pad($val['size'], 10, ' ', STR_PAD_LEFT) . diff --git a/framework/Mime/lib/Horde/Mime/Viewer/Zip.php b/framework/Mime/lib/Horde/Mime/Viewer/Zip.php index 2ddfef582..0a854a7db 100644 --- a/framework/Mime/lib/Horde/Mime/Viewer/Zip.php +++ b/framework/Mime/lib/Horde/Mime/Viewer/Zip.php @@ -88,8 +88,6 @@ class Horde_Mime_Viewer_Zip extends Horde_Mime_Viewer_Driver } $maxlen = empty($max_array) ? 0 : max($max_array); - require_once 'Horde/Text.php'; - $name = $this->_mimepart->getName(true); if (empty($name)) { $name = _("unnamed"); @@ -97,7 +95,7 @@ class Horde_Mime_Viewer_Zip extends Horde_Mime_Viewer_Driver $text = '' . htmlspecialchars(sprintf(_("Contents of \"%s\""), $name)) . ':' . "\n" . '
' . - Text::htmlAllSpaces( + Horde_Text::htmlAllSpaces( _("Archive Name") . ': ' . $name . "\n" . _("Archive File Size") . ': ' . strlen($contents) . ' bytes' . "\n" . -- 2.11.0