From 1714871fc4a30e1a9f079b0e68290a6fad80a32c Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Mon, 31 May 2010 22:34:35 -0600
Subject: [PATCH] Move application auth driver to horde/Core

---
 framework/Auth/lib/Horde/Auth.php                  | 17 +++++++-----
 framework/Auth/package.xml                         |  6 +++--
 .../lib/Horde/Core}/Auth/Application.php           | 30 +++++++++-------------
 framework/Core/package.xml                         |  5 +++-
 4 files changed, 31 insertions(+), 27 deletions(-)
 rename framework/{Auth/lib/Horde => Core/lib/Horde/Core}/Auth/Application.php (93%)

diff --git a/framework/Auth/lib/Horde/Auth.php b/framework/Auth/lib/Horde/Auth.php
index 9d394d955..5e522d788 100644
--- a/framework/Auth/lib/Horde/Auth.php
+++ b/framework/Auth/lib/Horde/Auth.php
@@ -98,24 +98,29 @@ class Horde_Auth
      * Attempts to return a concrete Horde_Auth_Base instance based on
      * $driver.
      *
-     * @param mixed $driver  The type of concrete Horde_Auth_Base subclass
-     *                       to return.
-     * @param array $params  A hash containing any additional configuration or
-     *                       parameters a subclass might need.
+     * @param string $driver  Either a driver name, or the full class name to
+     *                        use (class must extend Horde_Auth_Base).
+     * @param array $params   A hash containing any additional configuration
+     *                        or parameters a subclass might need.
      *
      * @return Horde_Auth_Base  The newly created concrete instance.
      * @throws Horde_Auth_Exception
      */
     static public function factory($driver, $params = null)
     {
-        $driver = str_replace(' ', '_' , ucwords(str_replace('_', ' ', basename($driver))));
+        /* Base drivers (in Auth/ directory). */
         $class = __CLASS__ . '_' . $driver;
+        if (class_exists($class)) {
+            return new $class($params);
+        }
 
+        /* Explicit class name, */
+        $class = $driver;
         if (class_exists($class)) {
             return new $class($params);
         }
 
-        throw new Horde_Auth_Exception('Class definition of ' . $class . ' not found.');
+        throw new Horde_Auth_Exception(__CLASS__ . ': Class definition of ' . $driver . ' not found.');
     }
 
     /**
diff --git a/framework/Auth/package.xml b/framework/Auth/package.xml
index 5fc9525f6..6bd59ddb0 100644
--- a/framework/Auth/package.xml
+++ b/framework/Auth/package.xml
@@ -48,7 +48,6 @@ http://pear.php.net/dtd/package-2.0.xsd">
       <dir name="Http">
        <file name="Remote.php" role="php" />
       </dir> <!-- /lib/Horde/Auth/Http -->
-      <file name="Application.php" role="php" />
       <file name="Auto.php" role="php" />
       <file name="Base.php" role="php" />
       <file name="Composite.php" role="php" />
@@ -127,6 +126,10 @@ http://pear.php.net/dtd/package-2.0.xsd">
   </required>
   <optional>
    <package>
+    <name>Db</name>
+    <channel>pear.horde.org</channel>
+   </package>
+   <package>
     <name>Form</name>
     <channel>pear.horde.org</channel>
    </package>
@@ -164,7 +167,6 @@ http://pear.php.net/dtd/package-2.0.xsd">
  </dependencies>
  <phprelease>
   <filelist>
-   <install name="lib/Horde/Auth/Application.php" as="Horde/Auth/Application.php" />
    <install name="lib/Horde/Auth/Auto.php" as="Horde/Auth/Auto.php" />
    <install name="lib/Horde/Auth/Base.php" as="Horde/Auth/Base.php" />
    <install name="lib/Horde/Auth/Composite.php" as="Horde/Auth/Composite.php" />
diff --git a/framework/Auth/lib/Horde/Auth/Application.php b/framework/Core/lib/Horde/Core/Auth/Application.php
similarity index 93%
rename from framework/Auth/lib/Horde/Auth/Application.php
rename to framework/Core/lib/Horde/Core/Auth/Application.php
index 84eaa57d7..4074965ec 100644
--- a/framework/Auth/lib/Horde/Auth/Application.php
+++ b/framework/Core/lib/Horde/Core/Auth/Application.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The Horde_Auth_Application class provides a wrapper around
+ * The Horde_Core_Auth_Application class provides a wrapper around
  * application-provided Horde authentication which fits inside the
  * Horde_Auth:: API.
  *
@@ -12,9 +12,9 @@
  * @author   Chuck Hagenbuch <chuck@horde.org>
  * @category Horde
  * @license  http://opensource.org/licenses/lgpl-2.1.php LGPL
- * @package  Auth
+ * @package  Core
  */
-class Horde_Auth_Application extends Horde_Auth_Base
+class Horde_Core_Auth_Application extends Horde_Auth_Base
 {
     /**
      * Cache for hasCapability().
@@ -134,11 +134,9 @@ class Horde_Auth_Application extends Horde_Auth_Base
      */
     public function listUsers()
     {
-        if ($this->hasCapability('list')) {
-            return $GLOBALS['registry']->callAppMethod($this->_app, $this->_apiMethods['list']);
-        } else {
-            return parent::listUsers();
-        }
+        return $this->hasCapability('list')
+            ? $GLOBALS['registry']->callAppMethod($this->_app, $this->_apiMethods['list'])
+            : parent::listUsers();
     }
 
     /**
@@ -150,11 +148,9 @@ class Horde_Auth_Application extends Horde_Auth_Base
      */
     public function exists($userId)
     {
-        if ($this->hasCapability('exists')) {
-            return $GLOBALS['registry']->callAppMethod($this->_app, $this->_apiMethods['exists'], array('args' => array($userId)));
-        } else {
-            return parent::exists($userId);
-        }
+        return $this->hasCapability('exists')
+            ? $GLOBALS['registry']->callAppMethod($this->_app, $this->_apiMethods['exists'], array('args' => array($userId)))
+            : parent::exists($userId);
     }
 
     /**
@@ -203,11 +199,9 @@ class Horde_Auth_Application extends Horde_Auth_Base
      */
     public function resetPassword($userId)
     {
-        if ($this->hasCapability('resetpassword')) {
-            return $GLOBALS['registry']->callAppMethod($this->_app, $this->_apiMethods['resetpassword'], array('args' => array($userId)));
-        }
-
-        return parent::resetPassword();
+        return $this->hasCapability('resetpassword')
+            ? $GLOBALS['registry']->callAppMethod($this->_app, $this->_apiMethods['resetpassword'], array('args' => array($userId)))
+            : parent::resetPassword();
     }
 
     /**
diff --git a/framework/Core/package.xml b/framework/Core/package.xml
index 292879e8d..de76dfa69 100644
--- a/framework/Core/package.xml
+++ b/framework/Core/package.xml
@@ -37,7 +37,8 @@ Application Framework.
   <api>beta</api>
  </stability>
  <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
- <notes>* Import signup code from horde/Auth.
+ <notes>* Import application auth driver from horde/Auth.
+ * Import signup code from horde/Auth.
  * Import Horde backend driver from horde/LoginTasks.
  * Import perms UI handling class from horde/Perms.
  * Import prefs UI handling class from horde/Prefs.
@@ -62,6 +63,7 @@ Application Framework.
      </dir> <!-- /lib/Horde/Config -->
      <dir name="Core">
       <dir name="Auth">
+       <file name="Application.php" role="php" />
        <dir name="Signup">
         <file name="Base.php" role="php" />
         <file name="Form.php" role="php" />
@@ -263,6 +265,7 @@ Application Framework.
   <filelist>
    <install name="lib/Horde/Config.php" as="Horde/Config.php" />
    <install name="lib/Horde/Config/Form.php" as="Horde/Config/Form.php" />
+   <install name="lib/Horde/Core/Auth/Application.php" as="Horde/Core/Auth/Application.php" />
    <install name="lib/Horde/Core/Auth/Signup.php" as="Horde/Core/Auth/Signup.php" />
    <install name="lib/Horde/Core/Auth/Signup/Base.php" as="Horde/Core/Auth/Signup/Base.php" />
    <install name="lib/Horde/Core/Auth/Signup/Form.php" as="Horde/Core/Auth/Signup/Form.php" />
-- 
2.11.0