From 1976b1189485f63ad5a3da269472293841fe0547 Mon Sep 17 00:00:00 2001
From: Ben Klang <ben@alkaloid.net>
Date: Sun, 3 Oct 2010 13:41:17 -0400
Subject: [PATCH] Replace LDAP Binder with Factory

---
 framework/Core/lib/Horde/Core/Binder/Group.php         |  2 +-
 framework/Core/lib/Horde/Core/Binder/Ldap.php          | 18 ------------------
 .../Core/lib/Horde/Core/Binder/SessionHandler.php      |  2 +-
 framework/Core/lib/Horde/Core/Factory/Auth.php         |  2 +-
 framework/Core/lib/Horde/Core/Factory/Prefs.php        |  2 +-
 framework/Core/package.xml                             |  4 +---
 6 files changed, 5 insertions(+), 25 deletions(-)
 delete mode 100644 framework/Core/lib/Horde/Core/Binder/Ldap.php

diff --git a/framework/Core/lib/Horde/Core/Binder/Group.php b/framework/Core/lib/Horde/Core/Binder/Group.php
index fc52277a9..fada734cd 100644
--- a/framework/Core/lib/Horde/Core/Binder/Group.php
+++ b/framework/Core/lib/Horde/Core/Binder/Group.php
@@ -17,7 +17,7 @@ class Horde_Core_Binder_Group implements Horde_Injector_Binder
             $driver = $GLOBALS['conf']['group']['driver'];
             $params = Horde::getDriverConfig('group', $driver);
             if ($driver == 'ldap') {
-                $params['ldap'] = $injector->getInstance('Horde_Ldap')->getLdap('horde', 'group');
+                $params['ldap'] = $injector->getInstance('Horde_Core_Factory_Ldap')->getLdap('horde', 'group');
             }
             $group = Horde_Group::factory($driver, $params);
         }
diff --git a/framework/Core/lib/Horde/Core/Binder/Ldap.php b/framework/Core/lib/Horde/Core/Binder/Ldap.php
deleted file mode 100644
index 354f98b13..000000000
--- a/framework/Core/lib/Horde/Core/Binder/Ldap.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * @category Horde
- * @package  Core
- */
-class Horde_Core_Binder_Ldap implements Horde_Injector_Binder
-{
-    public function create(Horde_Injector $injector)
-    {
-        return new Horde_Core_Factory_Ldap($injector);
-    }
-
-    public function equals(Horde_Injector_Binder $binder)
-    {
-        return false;
-    }
-
-}
diff --git a/framework/Core/lib/Horde/Core/Binder/SessionHandler.php b/framework/Core/lib/Horde/Core/Binder/SessionHandler.php
index 812f67df0..b4741d42a 100644
--- a/framework/Core/lib/Horde/Core/Binder/SessionHandler.php
+++ b/framework/Core/lib/Horde/Core/Binder/SessionHandler.php
@@ -24,7 +24,7 @@ class Horde_Core_Binder_SessionHandler implements Horde_Injector_Binder
         } elseif (strcasecmp($driver, 'Memcache') === 0) {
             $params['memcache'] = $injector->getInstance('Horde_Memcache');
         } elseif (strcasecmp($driver, 'Ldap') === 0) {
-            $params['ldap'] = $injector->getInstances('Horde_Ldap')->getLdap('horde', 'sessionhandler');
+            $params['ldap'] = $injector->getInstances('Horde_Core_Factory_Ldap')->getLdap('horde', 'sessionhandler');
         }
 
         $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 178d09061..95f034c7f 100644
--- a/framework/Core/lib/Horde/Core/Factory/Auth.php
+++ b/framework/Core/lib/Horde/Core/Factory/Auth.php
@@ -145,7 +145,7 @@ class Horde_Core_Factory_Auth
 
             case 'horde_core_auth_ldap':
             case 'horde_core_auth_msad':
-                $params['ldap'] = $this->_injector->getInstance('Horde_Ldap')->getLdap('horde', 'auth');
+                $params['ldap'] = $this->_injector->getInstance('Horde_Core_Factory_Ldap')->getLdap('horde', 'auth');
                 break;
 
             case 'sql':
diff --git a/framework/Core/lib/Horde/Core/Factory/Prefs.php b/framework/Core/lib/Horde/Core/Factory/Prefs.php
index f3cf750f3..677426fc7 100644
--- a/framework/Core/lib/Horde/Core/Factory/Prefs.php
+++ b/framework/Core/lib/Horde/Core/Factory/Prefs.php
@@ -100,7 +100,7 @@ class Horde_Core_Factory_Prefs
         } else {
             switch ($driver) {
             case 'Ldap':
-                //$params['ldap'] = $this->_injector->getInstance('Horde_Ldap')->getLdap('horde', 'ldap');
+                $params['ldap'] = $this->_injector->getInstance('Horde_Core_Factory_Ldap')->getLdap('horde', 'ldap');
                 break;
 
             case 'Sql':
diff --git a/framework/Core/package.xml b/framework/Core/package.xml
index 7836589b2..0962f58ea 100644
--- a/framework/Core/package.xml
+++ b/framework/Core/package.xml
@@ -24,7 +24,7 @@ Application Framework.</description>
   <active>yes</active>
  </developer>
  <date>2010-10-03</date>
- <time>13:34:55</time>
+ <time>13:41:03</time>
  <version>
   <release>0.1.0</release>
   <api>0.1.0</api>
@@ -122,7 +122,6 @@ Application Framework.</description>
        <file name="History.php" role="php" />
        <file name="HttpClient.php" role="php" />
        <file name="Identity.php" role="php" />
-       <file name="Ldap.php" role="php" />
        <file name="Logger.php" role="php" />
        <file name="LoginTasks.php" role="php" />
        <file name="Mail.php" role="php" />
@@ -442,7 +441,6 @@ Application Framework.</description>
    <install as="Horde/Core/Binder/History.php" name="lib/Horde/Core/Binder/History.php" />
    <install as="Horde/Core/Binder/HttpClient.php" name="lib/Horde/Core/Binder/HttpClient.php" />
    <install as="Horde/Core/Binder/Identity.php" name="lib/Horde/Core/Binder/Identity.php" />
-   <install as="Horde/Core/Binder/Ldap.php" name="lib/Horde/Core/Binder/Ldap.php" />
    <install as="Horde/Core/Binder/Logger.php" name="lib/Horde/Core/Binder/Logger.php" />
    <install as="Horde/Core/Binder/LoginTasks.php" name="lib/Horde/Core/Binder/LoginTasks.php" />
    <install as="Horde/Core/Binder/Mail.php" name="lib/Horde/Core/Binder/Mail.php" />
-- 
2.11.0