Text -> Horde_Text

diff --git a/chora/annotate.php b/chora/annotate.php
index 1643582..ab5a689 100644 (file)
--- a/chora/annotate.php
+++ b/chora/annotate.php
@@ -41,7 +41,7 @@ try {
     Chora::fatal($e);
 }
 
-$title = sprintf(_("Source Annotation of %s (revision %s)"), Text::htmlAllSpaces($where), $rev);
+$title = sprintf(_("Source Annotation of %s (revision %s)"), Horde_Text::htmlAllSpaces($where), $rev);
 $extraLink = sprintf('<a href="%s">%s</a> | <a href="%s">%s</a>',
                      Chora::url('co', $where, array('r' => $rev)), _("View"),
                      Chora::url('co', $where, array('r' => $rev, 'p' => 1)), _("Download"));
@@ -72,7 +72,7 @@ while (list(,$line) = each($lines)) {
     }
     $prev = $fl->queryPreviousRevision($rev);
 
-    $line = Text::htmlAllSpaces($line['line']);
+    $line = Horde_Text::htmlAllSpaces($line['line']);
     include CHORA_TEMPLATES . '/annotate/line.inc';
 }
 

diff --git a/chora/browsedir.php b/chora/browsedir.php
index 2cafa41..2160a2c 100644 (file)
--- a/chora/browsedir.php
+++ b/chora/browsedir.php
@@ -84,7 +84,7 @@ if ($dirList) {
             continue;
         }
         $url = Chora::url('browsedir', $where . '/' . $currentDir . '/');
-        $currDir = Text::htmlAllSpaces($currentDir);
+        $currDir = Horde_Text::htmlAllSpaces($currentDir);
         require CHORA_TEMPLATES . '/directory/dir.inc';
     }
     echo '</tbody>';
@@ -111,7 +111,7 @@ if ($fileList) {
         $log = $lg->queryLog();
         $attic = $currFile->isDeleted();
         $fileName = $where . ($attic ? '/' . 'Attic' : '') . '/' . $realname;
-        $name = Text::htmlAllSpaces($realname);
+        $name = Horde_Text::htmlAllSpaces($realname);
         $url = Chora::url('browsefile', $fileName);
         $readableDate = Chora::readableTime($date);
         if ($log) {

diff --git a/chora/cvsgraph.php b/chora/cvsgraph.php
index 6622515..bad9af3 100644 (file)
--- a/chora/cvsgraph.php
+++ b/chora/cvsgraph.php
@@ -48,7 +48,7 @@ if (Horde_Util::getFormData('show_image')) {
     passthru($conf['paths']['cvsgraph'] . ' ' . $argstr . ' ' . $file);
 } else {
     // Display the wrapper page for the image.
-    $title = sprintf(_("Graph for %s"), Text::htmlAllSpaces($where));
+    $title = sprintf(_("Graph for %s"), Horde_Text::htmlAllSpaces($where));
     $extraLink = Chora::getFileViews($where, 'cvsgraph');
 
     require CHORA_TEMPLATES . '/common-header.inc';

diff --git a/chora/diff.php b/chora/diff.php
index eb68109..71a7b28 100644 (file)
--- a/chora/diff.php
+++ b/chora/diff.php
@@ -54,7 +54,7 @@ if ($type != 'colored') {
 $abbrev_r1 = $VC->abbrev($r1);
 $abbrev_r2 = $VC->abbrev($r2);
 $title = sprintf(_("Diff for %s between version %s and %s"),
-                 Text::htmlallspaces($where), $abbrev_r1, $abbrev_r2);
+                 Horde_Text::htmlallspaces($where), $abbrev_r1, $abbrev_r2);
 
 /* Format log entries. */
 $log_messages = array();

diff --git a/chora/history.php b/chora/history.php
index 481ad57..deb529a 100644 (file)
--- a/chora/history.php
+++ b/chora/history.php
@@ -124,7 +124,7 @@ foreach ($grid as $cols) {
     $maxCol = max($val, $maxCol);
 }
 
-$title = sprintf(_("Source Branching View for %s"), Text::htmlallspaces($where));
+$title = sprintf(_("Source Branching View for %s"), Horde_Text::htmlallspaces($where));
 $extraLink = Chora::getFileViews($where, 'history');
 
 require CHORA_TEMPLATES . '/common-header.inc';

diff --git a/chora/lib/Chora.php b/chora/lib/Chora.php
index 31519c7..21ecfb8 100644 (file)
--- a/chora/lib/Chora.php
+++ b/chora/lib/Chora.php
@@ -200,7 +200,7 @@ class Chora
             }
             $path .= $dir;
             if (!empty($dir)) {
-                $bar .= '/ <a href="' . self::url('browsedir', $path . ($i == $dir_count && !$GLOBALS['atdir'] ? '' : '/')) . '">'. Text::htmlallspaces($dir) . '</a> ';
+                $bar .= '/ <a href="' . self::url('browsedir', $path . ($i == $dir_count && !$GLOBALS['atdir'] ? '' : '/')) . '">'. Horde_Text::htmlallspaces($dir) . '</a> ';
             }
         }
 

diff --git a/chora/lib/base.php b/chora/lib/base.php
index 206cbc4..3332728 100644 (file)
--- a/chora/lib/base.php
+++ b/chora/lib/base.php
@@ -45,7 +45,6 @@ $notification = &Notification::singleton();
 $notification->attach('status');
 
 // Horde base libraries.
-require_once 'Horde/Text.php';
 require_once 'Horde/Help.php';
 
 // Chora base library.

diff --git a/chora/stats.php b/chora/stats.php
index 486ebff..533744d 100644 (file)
--- a/chora/stats.php
+++ b/chora/stats.php
@@ -28,7 +28,7 @@ foreach ($fl->queryLogs() as $lg) {
 }
 arsort($stats);
 
-$title = sprintf(_("Statistics for %s"), Text::htmlallspaces($where));
+$title = sprintf(_("Statistics for %s"), Horde_Text::htmlallspaces($where));
 Horde::addScriptFile('prototype.js', 'horde', true);
 Horde::addScriptFile('tables.js', 'horde', true);
 require CHORA_TEMPLATES . '/common-header.inc';

diff --git a/imp/lib/IMP.php b/imp/lib/IMP.php
index 6835817..321f6fa 100644 (file)
--- a/imp/lib/IMP.php
+++ b/imp/lib/IMP.php
@@ -211,8 +211,6 @@ class IMP
      */
     static public function flistSelect($options = array())
     {
-        require_once 'Horde/Text.php';
-
         $imp_folder = IMP_Folder::singleton();
 
         /* Don't filter here - since we are going to parse through every
@@ -247,7 +245,7 @@ class IMP
             $val = isset($filter[$mbox['val']]) ? '' : htmlspecialchars($mbox['val']);
             $sel = ($mbox['val'] && !empty($options['selected']) && ($mbox['val'] === $options['selected'])) ? ' selected="selected"' : '';
             $label = empty($options['abbrev']) ? $mbox['label'] : $mbox['abbrev'];
-            $text .= sprintf('<option value="%s"%s>%s</option>%s', $val, $sel, Text::htmlSpaces($label), "\n");
+            $text .= sprintf('<option value="%s"%s>%s</option>%s', $val, $sel, Horde_Text::htmlSpaces($label), "\n");
         }
 
         /* Add the list of virtual folders to the list. */
@@ -257,7 +255,7 @@ class IMP
                 $vfolder_sel = $GLOBALS['imp_search']->searchMboxID();
                 $text .= '<option value="" disabled="disabled">- - - - - - - - -</option>' . "\n";
                 foreach ($vfolders as $id => $val) {
-                    $text .= sprintf('<option value="%s"%s>%s</option>%s', $GLOBALS['imp_search']->createSearchID($id), ($vfolder_sel == $id) ? ' selected="selected"' : '', Text::htmlSpaces($val), "\n");
+                    $text .= sprintf('<option value="%s"%s>%s</option>%s', $GLOBALS['imp_search']->createSearchID($id), ($vfolder_sel == $id) ? ' selected="selected"' : '', Horde_Text::htmlSpaces($val), "\n");
                 }
             }
         }
@@ -274,7 +272,7 @@ class IMP
                 foreach ($tasklists as $id => $tasklist) {
                     $text .= sprintf('<option value="%s">%s</option>%s',
                                      '_tasklist_' . $id,
-                                     Text::htmlSpaces($tasklist->get('name')),
+                                     Horde_Text::htmlSpaces($tasklist->get('name')),
                                      "\n");
                 }
             }
@@ -292,7 +290,7 @@ class IMP
                 foreach ($notepads as $id => $notepad) {
                     $text .= sprintf('<option value="%s">%s</option>%s',
                                      '_notepad_' . $id,
-                                     Text::htmlSpaces($notepad->get('name')),
+                                     Horde_Text::htmlSpaces($notepad->get('name')),
                                      "\n");
                 }
             }

diff --git a/imp/lib/UI/Mailbox.php b/imp/lib/UI/Mailbox.php
index 5532765..ae9b866 100644 (file)
--- a/imp/lib/UI/Mailbox.php
+++ b/imp/lib/UI/Mailbox.php
@@ -233,7 +233,7 @@ class IMP_UI_Mailbox
      * Formats the subject header.
      *
      * @param string $subject     The MIME encoded subject header.
-     * @param string $htmlspaces  Run through Text::htmlSpaces()?
+     * @param string $htmlspaces  Run through Horde_Text::htmlSpaces()?
      *
      * @return string  The formatted subject header.
      */
@@ -247,8 +247,7 @@ class IMP_UI_Mailbox
         $new_subject = $subject = IMP::filterText(preg_replace("/\s+/", ' ', $subject));
 
         if ($htmlspaces) {
-            require_once 'Horde/Text.php';
-            $new_subject = Text::htmlSpaces($subject);
+            $new_subject = Horde_Text::htmlSpaces($subject);
             if (empty($new_subject)) {
                 $new_subject = htmlspecialchars($subject);
             }

diff --git a/imp/lib/UI/Message.php b/imp/lib/UI/Message.php
index 4b25361..b73b609 100644 (file)
--- a/imp/lib/UI/Message.php
+++ b/imp/lib/UI/Message.php
@@ -202,8 +202,6 @@ class IMP_UI_Message
     {
         $output = '';
 
-        require_once 'Horde/Text.php';
-
         /* Split the incoming data by the ',' character. */
         foreach (preg_split("/,/", $data) as $entry) {
             /* Get the data inside of the brackets. If there is no brackets,

diff --git a/ingo/lib/Ingo.php b/ingo/lib/Ingo.php
index dca1594..30582fe 100644 (file)
--- a/ingo/lib/Ingo.php
+++ b/ingo/lib/Ingo.php
@@ -66,8 +66,6 @@ class Ingo
                     $text .= '<option value="">' . _("Create new folder") . "</option>\n";
                 }
 
-                require_once 'Horde/Text.php';
-
                 foreach ($mailboxes as $mbox) {
                     $sel = ($mbox['val'] && ($mbox['val'] === $value)) ? ' selected="selected"' : '';
                     $disabled = empty($mbox['val']) ? ' disabled="disabled"' : '';
@@ -75,7 +73,7 @@ class Ingo
                     $label = $mbox['abbrev'];
                     $text .= sprintf('<option%s value="%s"%s>%s</option>%s',
                                      $disabled, $val, $sel,
-                                     Text::htmlSpaces($label), "\n");
+                                     Horde_Text::htmlSpaces($label), "\n");
                 }
 
                 $text .= '</select>';

diff --git a/kronolith/lib/Views/Event.php b/kronolith/lib/Views/Event.php
index 0931423..d493ea7 100644 (file)
--- a/kronolith/lib/Views/Event.php
+++ b/kronolith/lib/Views/Event.php
@@ -39,7 +39,6 @@ class Kronolith_View_Event {
             return;
         }
 
-        require_once 'Horde/Text.php';
         require_once 'Horde/Text/Filter.php';
 
         $createdby = '';