Standardize most injectors on the standard Horde_Db_Adapter connection

We should remove the separate SQL configs for these items as well

diff --git a/framework/Core/lib/Horde/Core/Binder/Alarm.php b/framework/Core/lib/Horde/Core/Binder/Alarm.php
index 200971b..279cfac 100644 (file)
--- a/framework/Core/lib/Horde/Core/Binder/Alarm.php
+++ b/framework/Core/lib/Horde/Core/Binder/Alarm.php
@@ -13,9 +13,8 @@ class Horde_Core_Binder_Alarm implements Horde_Injector_Binder
         $params = Horde::getDriverConfig('alarms', $driver);
 
         if (strcasecmp($driver, 'Sql') === 0) {
-            $params['db'] = $injector->getInstance('Horde_Db')->getDb('horde', 'alarm');
-            $config = $injector->getInstance('Horde_Db')->getConfig('alarm');
-            $params['charset'] = $config['charset'];
+            $params['db'] = $injector->getInstance('Horde_Db_Adapter');
+            $params['charset'] = 'UTF-8';
         }
 
         $params['logger'] = $injector->getInstance('Horde_Log_Logger');

diff --git a/framework/Core/lib/Horde/Core/Binder/SessionHandler.php b/framework/Core/lib/Horde/Core/Binder/SessionHandler.php
index f50c2e0..812f67d 100644 (file)
--- a/framework/Core/lib/Horde/Core/Binder/SessionHandler.php
+++ b/framework/Core/lib/Horde/Core/Binder/SessionHandler.php
@@ -20,7 +20,7 @@ class Horde_Core_Binder_SessionHandler implements Horde_Injector_Binder
         $params = Horde::getDriverConfig('sessionhandler', $driver);
 
         if (strcasecmp($driver, 'Sql') === 0) {
-            $params['db'] = $injector->getInstance('Horde_Db')->getDb('horde', 'sessionhandler');
+            $params['db'] = $injector->getInstance('Horde_Db_Adapter');
         } elseif (strcasecmp($driver, 'Memcache') === 0) {
             $params['memcache'] = $injector->getInstance('Horde_Memcache');
         } elseif (strcasecmp($driver, 'Ldap') === 0) {

diff --git a/framework/Core/lib/Horde/Core/Binder/Token.php b/framework/Core/lib/Horde/Core/Binder/Token.php
index 75ab882..9d84cce 100644 (file)
--- a/framework/Core/lib/Horde/Core/Binder/Token.php
+++ b/framework/Core/lib/Horde/Core/Binder/Token.php
@@ -15,7 +15,7 @@ class Horde_Core_Binder_Token implements Horde_Injector_Binder
             : array();
 
         if (strcasecmp($driver, 'Sql') === 0) {
-            $params['db'] = $injector->getInstance('Horde_Db')->getDb('horde', 'token');
+            $params['db'] = $injector->getInstance('Horde_Db_Adapter');
         } elseif (strcasecmp($driver, 'None') === 0) {
             $driver = 'Null';
         }

diff --git a/framework/Core/lib/Horde/Core/Factory/Alarm.php b/framework/Core/lib/Horde/Core/Factory/Alarm.php
index 2b448cd..8cc3ba8 100644 (file)
--- a/framework/Core/lib/Horde/Core/Factory/Alarm.php
+++ b/framework/Core/lib/Horde/Core/Factory/Alarm.php
@@ -29,7 +29,7 @@ class Horde_Core_Factory_Alarm
 {
     /**
      * Return a Horde_Alarm instance
-     * 
+     *
      */
     public function create(Horde_Injector $injector)
     {
@@ -40,9 +40,8 @@ class Horde_Core_Factory_Alarm
         $params = Horde::getDriverConfig('alarms', $driver);
 
         if (strcasecmp($driver, 'Sql') === 0) {
-            $params['db'] = $injector->getInstance('Horde_Db')->getDb('horde', 'alarm');
-            $config = $injector->getInstance('Horde_Db')->getConfig('alarm');
-            $params['charset'] = $config['charset'];
+            $params['db'] = $injector->getInstance('Horde_Db_Adapter');
+            $params['charset'] = 'UTF-8';
         }
 
         $params['logger'] = $injector->getInstance('Horde_Log_Logger');

diff --git a/framework/Core/lib/Horde/Core/Factory/Auth.php b/framework/Core/lib/Horde/Core/Factory/Auth.php
index 2d0d1b3..d417b4a 100644 (file)
--- a/framework/Core/lib/Horde/Core/Factory/Auth.php
+++ b/framework/Core/lib/Horde/Core/Factory/Auth.php
@@ -149,7 +149,7 @@ class Horde_Core_Factory_Auth
                 break;
 
             case 'sql':
-                $params['db'] = $this->_injector->getInstance('Horde_Db')->getDb();
+                $params['db'] = $this->_injector->getInstance('Horde_Db_Adapter');
                 break;
             }
 

diff --git a/framework/Core/lib/Horde/Core/Factory/Cache.php b/framework/Core/lib/Horde/Core/Factory/Cache.php
index 9e5836a..e89f73d 100644 (file)
--- a/framework/Core/lib/Horde/Core/Factory/Cache.php
+++ b/framework/Core/lib/Horde/Core/Factory/Cache.php
@@ -62,7 +62,7 @@ class Horde_Core_Factory_Cache
         if (strcasecmp($driver, 'Memcache') === 0) {
             $params['memcache'] = $injector->getInstance('Horde_Memcache');
         } elseif (strcasecmp($driver, 'Sql') === 0) {
-            $params['db'] = $injector->getInstance('Horde_Db')->getDb('horde', 'cache');
+            $params['db'] = $injector->getInstance('Horde_Db_Adapter');
         }
 
         if (!empty($GLOBALS['conf']['cache']['use_memorycache']) &&
@@ -95,6 +95,6 @@ class Horde_Core_Factory_Cache
             $classname = 'Horde_Cache_Null';
         }
 
-        return $classname;       
+        return $classname;
     }
 }

diff --git a/framework/Core/lib/Horde/Core/Factory/Lock.php b/framework/Core/lib/Horde/Core/Factory/Lock.php
index 8f665f1..c98e771 100644 (file)
--- a/framework/Core/lib/Horde/Core/Factory/Lock.php
+++ b/framework/Core/lib/Horde/Core/Factory/Lock.php
@@ -3,7 +3,7 @@
  * Factory for creating Horde_Lock objects
  *
  * Copyright 2010 Horde LLC <http://horde.org>
- * 
+ *
  * @category Horde
  * @package  Core
  */
@@ -30,7 +30,7 @@ class Horde_Core_Factory_Lock
         $params['logger'] = $injector->getInstance('Horde_Log_Logger');
 
         if (strcasecmp($driver, 'Sql') === 0) {
-            $params['db'] = $injector->getInstance('Horde_Db')->getDb('horde', 'lock');
+            $params['db'] = $injector->getInstance('Horde_Db_Adapter');
         }
 
         $driver = Horde_String::ucfirst(basename($driver));

diff --git a/framework/Core/lib/Horde/Core/Factory/Perms.php b/framework/Core/lib/Horde/Core/Factory/Perms.php
index 69c7317..c90a7b2 100644 (file)
--- a/framework/Core/lib/Horde/Core/Factory/Perms.php
+++ b/framework/Core/lib/Horde/Core/Factory/Perms.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Factory for creating Horde_Perms objects
- * 
+ *
  * Copyright 2010 Horde LLC <http://horde.org>
  *
  * @category Horde
@@ -23,7 +23,7 @@ class Horde_Core_Factory_Perms
             : array();
 
         if (strcasecmp($driver, 'Sql') === 0) {
-            $params['db'] = $injector->getInstance('Horde_Db')->getDb('horde', 'perms');
+            $params['db'] = $injector->getInstance('Horde_Db_Adapter');
         }
 
         $params['cache'] = $injector->getInstance('Horde_Cache');

diff --git a/framework/Core/lib/Horde/Core/Factory/Prefs.php b/framework/Core/lib/Horde/Core/Factory/Prefs.php
index 164e19e..c8a58c4 100644 (file)
--- a/framework/Core/lib/Horde/Core/Factory/Prefs.php
+++ b/framework/Core/lib/Horde/Core/Factory/Prefs.php
@@ -104,7 +104,7 @@ class Horde_Core_Factory_Prefs
                 break;
 
             case 'Sql':
-                $params['db'] = $this->_injector->getInstance('Horde_Db')->getDb();
+                $params['db'] = $this->_injector->getInstance('Horde_Db_Adapter');
                 // @todo All DB's use UTF-8(?) Does not seem to be a way to
                 // get this information from Horde_Db_Adapter.
                 $opts['charset'] = 'UTF-8';