From fcbfdc9e6494d10c6290a76e5ce279663ce7f918 Mon Sep 17 00:00:00 2001
From: Chuck Hagenbuch <chuck@horde.org>
Date: Tue, 14 Jul 2009 01:14:53 -0400
Subject: [PATCH] rename IMP auth driver for class loading

---
 imp/lib/{Auth/Imp.php => Auth.php} | 4 ++--
 imp/lib/IMP.php                    | 2 +-
 imp/lib/Session.php                | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename imp/lib/{Auth/Imp.php => Auth.php} (95%)

diff --git a/imp/lib/Auth/Imp.php b/imp/lib/Auth.php
similarity index 95%
rename from imp/lib/Auth/Imp.php
rename to imp/lib/Auth.php
index cc0bdd39f..071f9dfcc 100644
--- a/imp/lib/Auth/Imp.php
+++ b/imp/lib/Auth.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The Horde_Auth_Imp:: class provides an IMP implementation of the Horde
+ * The Horde_Auth:: class provides an IMP implementation of the Horde
  * authentication system.
  *
  * Required parameters: NONE
@@ -14,7 +14,7 @@
  * @author  Michael Slusarz <slusarz@horde.org>
  * @package Horde_Auth
  */
-class IMP_Auth_Imp extends Horde_Auth_Driver
+class IMP_Auth extends Horde_Auth_Base
 {
     /**
      * Find out if a set of login credentials are valid, and if
diff --git a/imp/lib/IMP.php b/imp/lib/IMP.php
index f3b352b18..708738d75 100644
--- a/imp/lib/IMP.php
+++ b/imp/lib/IMP.php
@@ -74,7 +74,7 @@ class IMP
         if ($hordeauth) {
             $reason = Horde_Auth::isAuthenticated();
         } else {
-            $auth_imp = Horde_Auth::singleton(array('imp', 'imp'));
+            $auth_imp = new IMP_Auth();
             $reason = $auth_imp->authenticate(null, array(), false);
         }
 
diff --git a/imp/lib/Session.php b/imp/lib/Session.php
index 887ff262e..cbe16c1e4 100644
--- a/imp/lib/Session.php
+++ b/imp/lib/Session.php
@@ -108,7 +108,7 @@ class IMP_Session
 
         /* Do necessary authentication now (since Horde_Auth:: may need to set
          * values in Horde-land). */
-        $auth_imp = Horde_Auth::singleton(array('imp', 'imp'));
+        $auth_imp = new IMP_Auth();
         if ($auth_imp->authenticate($sess['uniquser'], array('password' => $password), true) !== true) {
             unset($_SESSION['imp']);
             return false;
-- 
2.11.0