Missed some CategoryManager conversions

diff --git a/ansel/gallery.php b/ansel/gallery.php
index a9de34f..93cd0d0 100644 (file)
--- a/ansel/gallery.php
+++ b/ansel/gallery.php
@@ -9,7 +9,6 @@
  */
 
 require_once dirname(__FILE__) . '/lib/base.php';
-require_once 'Horde/Prefs/CategoryManager.php';
 
 // Redirect to the gallery list if no action has been requested.
 $actionID = Horde_Util::getFormData('actionID');
@@ -139,7 +138,7 @@ case 'save':
     $gallery_mode = Horde_Util::getFormData('view_mode', 'Normal');
     $gallery_passwd = Horde_Util::getFormData('gallery_passwd');
     if ($new_category = Horde_Util::getFormData('new_category')) {
-        $cManager = new Prefs_CategoryManager();
+        $cManager = new Horde_Prefs_CategoryManager();
         $new_category = $cManager->add($new_category);
         if ($new_category) {
             $gallery_category = $new_category;

diff --git a/ansel/templates/gallery/gallery.inc b/ansel/templates/gallery/gallery.inc
index aeb93c9..a881b31 100644 (file)
--- a/ansel/templates/gallery/gallery.inc
+++ b/ansel/templates/gallery/gallery.inc
@@ -26,8 +26,8 @@
   <td align="right" valign="top"><strong><?php echo _("Gallery Category") ?></strong>&nbsp;</td>
   <td>
     <input type="hidden" name="new_category" value="" />
-    <?php echo Prefs_CategoryManager::getJavaScript('gallery', 'gallery_category') .
-               Prefs_CategoryManager::getSelect("gallery_category", $gallery_category) ?>
+    <?php echo Horde_Prefs_CategoryManager::getJavaScript('gallery', 'gallery_category') .
+               Horde_Prefs_CategoryManager::getSelect("gallery_category", $gallery_category) ?>
   </td>
 </tr>
 

diff --git a/ansel/templates/prefs/default_category_select.inc b/ansel/templates/prefs/default_category_select.inc
index e6dbdc9..ca804a9 100644 (file)
--- a/ansel/templates/prefs/default_category_select.inc
+++ b/ansel/templates/prefs/default_category_select.inc
@@ -1,7 +1,6 @@
 <?php
 
-require_once 'Horde/Prefs/CategoryManager.php';
-$cManager = new Prefs_CategoryManager();
+$cManager = new Horde_Prefs_CategoryManager();
 $categories = $cManager->getSelect('default_category_select', $GLOBALS['prefs']->getValue('default_category'));
 
 echo _("Default category for galleries");

diff --git a/beatnik/listzones.php b/beatnik/listzones.php
index fe199fa..68451c7 100644 (file)
--- a/beatnik/listzones.php
+++ b/beatnik/listzones.php
@@ -7,13 +7,12 @@
  */
 
 require_once dirname(__FILE__) . '/lib/base.php';
-require_once 'Horde/Prefs/CategoryManager.php';
 
 // Unset the current domain since we are generating a zone list
 $_SESSION['beatnik']['curdomain'] = null;
 
 // Set up categories
-$cManager = new Prefs_CategoryManager();
+$cManager = new Horde_Prefs_CategoryManager();
 $categories = $cManager->get();
 $colors = $cManager->colors();
 $fgcolors = $cManager->fgColors();

diff --git a/nag/data.php b/nag/data.php
index 0670a82..c44e9d4 100644 (file)
--- a/nag/data.php
+++ b/nag/data.php
@@ -153,8 +153,7 @@ if (!$error) {
 /* We have a final result set. */
 if (is_array($next_step)) {
     /* Create a category manager. */
-    require_once 'Horde/Prefs/CategoryManager.php';
-    $cManager = new Prefs_CategoryManager();
+    $cManager = new Horde_Prefs_CategoryManager();
     $categories = $cManager->get();
 
     /* Create a Nag storage instance. */

diff --git a/nag/lib/Block/summary.php b/nag/lib/Block/summary.php
index 9b33503..74536ca 100644 (file)
--- a/nag/lib/Block/summary.php
+++ b/nag/lib/Block/summary.php
@@ -24,8 +24,7 @@ class Horde_Block_nag_summary extends Horde_Block {
     function _params()
     {
         require_once dirname(__FILE__) . '/../base.php';
-        require_once 'Horde/Prefs/CategoryManager.php';
-        $cManager = new Prefs_CategoryManager();
+        $cManager = new Horde_Prefs_CategoryManager();
         $categories = array();
         foreach ($cManager->get() as $c) {
             $categories[$c] = $c;

diff --git a/nag/lib/Forms/task.php b/nag/lib/Forms/task.php
index 6efc6a6..7bd94b5 100644 (file)
--- a/nag/lib/Forms/task.php
+++ b/nag/lib/Forms/task.php
@@ -85,9 +85,7 @@ class Nag_TaskForm extends Horde_Form {
         if (class_exists('Horde_Form_Type_category')) {
             $this->addVariable(_("Category"), 'category', 'category', false);
         } else {
-            require_once 'Horde/Prefs/CategoryManager.php';
-            require_once 'Horde/Array.php';
-            $values = Horde_Array::valuesToKeys(Prefs_CategoryManager::get());
+            $values = Horde_Array::valuesToKeys(Horde_Prefs_CategoryManager::get());
             $this->addVariable(_("Category"), 'category', 'enum', false, false, false, array($values, _("Unfiled")));
         }
 

diff --git a/nag/task.php b/nag/task.php
index aa097af..71d17d2 100644 (file)
--- a/nag/task.php
+++ b/nag/task.php
@@ -134,8 +134,7 @@ case 'save_task':
 
     /* Add new category. */
     if ($info['category']['new']) {
-        require_once 'Horde/Prefs/CategoryManager.php';
-        $cManager = new Prefs_CategoryManager();
+        $cManager = new Horde_Prefs_CategoryManager();
         $cManager->add($info['category']['value']);
     }
 

diff --git a/nag/themes/categoryCSS.php b/nag/themes/categoryCSS.php
index 878781f..7131326 100644 (file)
--- a/nag/themes/categoryCSS.php
+++ b/nag/themes/categoryCSS.php
@@ -11,12 +11,10 @@
 @define('AUTH_HANDLER', true);
 @define('NAG_BASE', dirname(__FILE__) . '/..');
 require_once NAG_BASE . '/lib/base.php';
-require_once 'Horde/Image.php';
-require_once 'Horde/Prefs/CategoryManager.php';
 
 header('Content-Type: text/css');
 
-$cManager = new Prefs_CategoryManager();
+$cManager = new Horde_Prefs_CategoryManager();
 
 $colors = $cManager->colors();
 $fgColors = $cManager->fgColors();

diff --git a/skoli/lib/Forms/CreateClass.php b/skoli/lib/Forms/CreateClass.php
index 30e3ee8..90f10b4 100644 (file)
--- a/skoli/lib/Forms/CreateClass.php
+++ b/skoli/lib/Forms/CreateClass.php
@@ -162,8 +162,7 @@ class Skoli_CreateClassForm extends Horde_Form {
 
         /* Add new category. */
         if (strpos($this->_vars->get('category'), '*new*') !== false || $this->_vars->get('category') == $this->_vars->get('new_category')) {
-            require_once 'Horde/Prefs/CategoryManager.php';
-            $cManager = new Prefs_CategoryManager();
+            $cManager = new Horde_Prefs_CategoryManager();
             $cManager->add($this->_vars->get('new_category'));
             $this->_vars->set('category', $this->_vars->get('new_category'));
         }

diff --git a/skoli/lib/Forms/EditClass.php b/skoli/lib/Forms/EditClass.php
index dc09c6a..7081275 100644 (file)
--- a/skoli/lib/Forms/EditClass.php
+++ b/skoli/lib/Forms/EditClass.php
@@ -131,8 +131,7 @@ class Skoli_EditClassForm extends Horde_Form {
 
         /* Add new category. */
         if (strpos($this->_vars->get('category'), '*new*') !== false || $this->_vars->get('category') == $this->_vars->get('new_category')) {
-            require_once 'Horde/Prefs/CategoryManager.php';
-            $cManager = new Prefs_CategoryManager();
+            $cManager = new Horde_Prefs_CategoryManager();
             $cManager->add($this->_vars->get('new_category'));
             $this->_vars->set('category', $this->_vars->get('new_category'));
         }

diff --git a/skoli/themes/categoryCSS.php b/skoli/themes/categoryCSS.php
index 4947e48..b3668af 100644 (file)
--- a/skoli/themes/categoryCSS.php
+++ b/skoli/themes/categoryCSS.php
@@ -10,11 +10,10 @@
 
 $skoli_authentication = 'none';
 require_once dirname(__FILE__) . '/../lib/base.php';
-require_once 'Horde/Prefs/CategoryManager.php';
 
 header('Content-Type: text/css');
 
-$cManager = new Prefs_CategoryManager();
+$cManager = new Horde_Prefs_CategoryManager();
 
 $colors = $cManager->colors();
 $fgColors = $cManager->fgColors();

diff --git a/turba/data.php b/turba/data.php
index 2fbe3fb..7d01149 100644 (file)
--- a/turba/data.php
+++ b/turba/data.php
@@ -410,8 +410,7 @@ if (!$error && !empty($import_format)) {
 /* We have a final result set. */
 if (is_array($next_step)) {
     /* Create a category manager. */
-    require_once 'Horde/Prefs/CategoryManager.php';
-    $cManager = new Prefs_CategoryManager();
+    $cManager = new Horde_Prefs_CategoryManager();
     $categories = $cManager->get();
 
     /* Create a Turba storage instance. */

diff --git a/turba/lib/Api.php b/turba/lib/Api.php
index 7c37bdf..a4121d7 100644 (file)
--- a/turba/lib/Api.php
+++ b/turba/lib/Api.php
@@ -627,7 +627,9 @@ class Turba_Api extends Horde_Registry_Api
 
         // Check existance of and permissions on the specified source.
         if (!isset($cfgSources[$import_source])) {
-            return PEAR::raiseError(sprintf(_("Invalid address book: %s"),
+            print_r($cfgSources);
+            exit;
+            return PEAR::raiseError(sprintf(_("aInvalid address book: %s"),
                 $import_source),
             'horde.warning');
         }
@@ -642,8 +644,7 @@ class Turba_Api extends Horde_Registry_Api
         }
 
         /* Create a category manager. */
-        require_once 'Horde/Prefs/CategoryManager.php';
-        $cManager = new Prefs_CategoryManager();
+        $cManager = new Horde_Prefs_CategoryManager();
         $categories = $cManager->get();
 
         if (!is_a($content, 'Horde_iCalendar_vcard')) {

diff --git a/turba/lib/Driver.php b/turba/lib/Driver.php
index e4e64ed..9891c85 100644 (file)
--- a/turba/lib/Driver.php
+++ b/turba/lib/Driver.php
@@ -172,8 +172,7 @@ class Turba_Driver
         /* Handle category. */
         if (!empty($hash['category'])) {
             if (!empty($hash['category']['new'])) {
-                require_once 'Horde/Prefs/CategoryManager.php';
-                $cManager = new Prefs_CategoryManager();
+                $cManager = new Horde_Prefs_CategoryManager();
                 $cManager->add($hash['category']['value']);
             }
             $hash['category'] = $hash['category']['value'];

diff --git a/vilma/users/index.php b/vilma/users/index.php
index 2832362..e080897 100644 (file)
--- a/vilma/users/index.php
+++ b/vilma/users/index.php
@@ -12,7 +12,6 @@
 
 @define('VILMA_BASE', dirname(__FILE__) . '/..');
 require_once VILMA_BASE . '/lib/base.php';
-require_once 'Horde/Prefs/CategoryManager.php';
 
 /* Only admin should be using this. */
 if (!Vilma::hasPermission($curdomain)) {