Text -> Horde_Text

diff --git a/framework/Mime/lib/Horde/Mime/Mdn.php b/framework/Mime/lib/Horde/Mime/Mdn.php
index 77f8989..985a9d3 100644 (file)
--- 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 7408d6a..3379b4d 100644 (file)
--- 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 = '<strong>' . htmlspecialchars(sprintf(_("Contents of \"%s\""), $name)) . ':</strong>' . "\n" .
             '<table><tr><td align="left"><tt><span class="fixed">' .
-            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 cbfd711..e9d380d 100644 (file)
--- 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 = '<strong>' . htmlspecialchars(sprintf(_("Contents of \"%s\""), $name)) . ':</strong>' . "\n" .
             '<table><tr><td align="left"><tt><span class="fixed">' .
-            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 2ddfef5..0a854a7 100644 (file)
--- 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 = '<strong>' . htmlspecialchars(sprintf(_("Contents of \"%s\""), $name)) . ':</strong>' . "\n" .
             '<table><tr><td align="left"><tt><span class="fixed">' .
-            Text::htmlAllSpaces(
+            Horde_Text::htmlAllSpaces(
                 _("Archive Name") . ': ' . $name . "\n" .
                 _("Archive File Size") . ': ' . strlen($contents) .
                 ' bytes' . "\n" .