From: Chuck Hagenbuch Date: Tue, 14 Jul 2009 04:36:49 +0000 (-0400) Subject: rename Horde_Auth_Driver to Horde_Auth_Base to match the convention of other H4 libraries X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=50a77adcffa6a587b7565ee5c457ba24beffb33e;p=horde.git rename Horde_Auth_Driver to Horde_Auth_Base to match the convention of other H4 libraries --- diff --git a/framework/Auth/lib/Horde/Auth.php b/framework/Auth/lib/Horde/Auth.php index 91bb640b4..7402c0579 100644 --- a/framework/Auth/lib/Horde/Auth.php +++ b/framework/Auth/lib/Horde/Auth.php @@ -68,17 +68,17 @@ class Horde_Auth static protected $_instances = array(); /** - * Attempts to return a concrete Horde_Auth_Driver instance based on + * Attempts to return a concrete Horde_Auth_Base instance based on * $driver. * - * @param mixed $driver The type of concrete Horde_Auth_Driver subclass + * @param mixed $driver The type of concrete Horde_Auth_Base subclass * to return. If $driver is an array, then look * in $driver[0]/lib/Auth/ for the subclass * implementation named $driver[1].php. * @param array $params A hash containing any additional configuration or * parameters a subclass might need. * - * @return Horde_Auth_Driver The newly created concrete instance. + * @return Horde_Auth_Base The newly created concrete instance. * @throws Horde_Exception */ static public function factory($driver, $params = null) @@ -90,18 +90,11 @@ class Horde_Auth $driver = basename($driver); } - /* Return a base Horde_Auth_Driver object if no driver is - * specified. */ - if (empty($driver) || (strcasecmp($driver, 'none') == 0)) { - return new Horde_Auth_Driver(); - } - if (empty($params)) { $params = Horde::getDriverConfig('auth', $driver); } $class = (empty($app) ? 'Horde' : $app) . '_Auth_' . ucfirst($driver); - if (class_exists($class)) { return new $class($params); } @@ -116,14 +109,14 @@ class Horde_Auth * * This method must be invoked as: $var = Horde_Auth::singleton() * - * @param mixed $driver The type of concrete Horde_Auth_Driver subclass + * @param mixed $driver The type of concrete Horde_Auth_Base subclass * to return. If $driver is an array, then look * in $driver[0]/lib/Auth/ for the subclass * implementation named $driver[1].php. * @param array $params A hash containing any additional configuration or * connection parameters a subclass might need. * - * @return Horde_Auth_Driver The concrete reference. + * @return Horde_Auth_Base The concrete reference. * @throws Horde_Exception */ static public function singleton($driver, $params = array()) diff --git a/framework/Auth/lib/Horde/Auth/Application.php b/framework/Auth/lib/Horde/Auth/Application.php index c3d161871..fa486946f 100644 --- a/framework/Auth/lib/Horde/Auth/Application.php +++ b/framework/Auth/lib/Horde/Auth/Application.php @@ -17,7 +17,7 @@ * @author Chuck Hagenbuch * @package Horde_Auth */ -class Horde_Auth_Application extends Horde_Auth_Driver +class Horde_Auth_Application extends Horde_Auth_Base { /** * Cache for hasCapability(). diff --git a/framework/Auth/lib/Horde/Auth/Auto.php b/framework/Auth/lib/Horde/Auth/Auto.php index 3fac9b3fb..be5976090 100644 --- a/framework/Auth/lib/Horde/Auth/Auto.php +++ b/framework/Auth/lib/Horde/Auth/Auto.php @@ -24,7 +24,7 @@ * @author Chuck Hagenbuch * @package Horde_Auth */ -class Horde_Auth_Auto extends Horde_Auth_Driver +class Horde_Auth_Auto extends Horde_Auth_Base { /** * An array of capabilities, so that the driver can report which diff --git a/framework/Auth/lib/Horde/Auth/Base.php b/framework/Auth/lib/Horde/Auth/Base.php new file mode 100644 index 000000000..7a7999426 --- /dev/null +++ b/framework/Auth/lib/Horde/Auth/Base.php @@ -0,0 +1,303 @@ + + * @author Michael Slusarz + * @package Horde_Auth + */ +abstract class Horde_Auth_Base +{ + /** + * An array of capabilities, so that the driver can report which + * operations it supports and which it doesn't. + * + * @var array + */ + protected $_capabilities = array( + 'add' => false, + 'groups' => false, + 'list' => false, + 'resetpassword' => false, + 'remove' => false, + 'transparent' => false, + 'update' => false + ); + + /** + * Hash containing parameters needed for the drivers. + * + * @var array + */ + protected $_params = array(); + + /** + * The credentials currently being authenticated. + * + * @var array + */ + protected $_authCredentials = array(); + + /** + * Constructor. + * + * @param array $params A hash containing parameters. + */ + public function __construct($params = array()) + { + $this->_params = $params; + } + + /** + * Finds out if a set of login credentials are valid, and if requested, + * mark the user as logged in in the current session. + * + * @param string $userId The userId to check. + * @param array $credentials The credentials to check. + * @param boolean $login Whether to log the user in. If false, we'll + * only test the credentials and won't modify + * the current session. Defaults to true. + * @param string $realm The authentication realm to check. + * + * @return boolean Whether or not the credentials are valid. + */ + public function authenticate($userId, $credentials, $login = true, + $realm = null) + { + $auth = false; + $userId = trim($userId); + + if (!empty($GLOBALS['conf']['hooks']['preauthenticate'])) { + if (!Horde::callHook('_horde_hook_preauthenticate', array($userId, $credentials, $realm), 'horde')) { + if (Horde_Auth::getAuthError() != Horde_Auth::REASON_MESSAGE) { + Horde_Auth::setAuthError(Horde_Auth::REASON_FAILED); + } + return false; + } + } + + /* Store the credentials being checked so that subclasses can modify + * them if necessary (like transparent auth does). */ + $this->_authCredentials = array( + 'changeRequested' => false, + 'credentials' => $credentials, + 'realm' => $realm, + 'userId' => $userId + ); + + try { + $this->_authenticate($userId, $credentials); + + if ($login) { + $auth = Horde_Auth::setAuth( + $this->_authCredentials['userId'], + $this->_authCredentials['credentials'], + $this->_authCredentials['realm'], + $this->_authCredentials['changeRequested'] + ); + } else { + if (!Horde_Auth::checkSessionIP()) { + Horde_Auth::setAuthError(self::REASON_SESSIONIP); + } elseif (!Horde_Auth::checkBrowserString()) { + Horde_Auth::setAuthError(self::REASON_BROWSER); + } else { + $auth = true; + } + } + } catch (Horde_Exception $e) { + Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_DEBUG); + Horde_Auth::setAuthError($e->getCode() || Horde_Auth::REASON_MESSAGE, $e->getMessage()); + } + + return $auth; + } + + /** + * Authentication stub. + * + * Horde_Exception should pass a message string (if any) in the message + * field, and the REASON_* constant in the code field (defaults to + * REASON_MESSAGE). + * + * @throws Horde_Exception + */ + abstract protected function _authenticate(); + + /** + * Adds a set of authentication credentials. + * + * @param string $userId The userId to add. + * @param array $credentials The credentials to use. + * + * @throws Horde_Exception + */ + public function addUser($userId, $credentials) + { + throw new Horde_Exception('unsupported'); + } + + /** + * Updates a set of authentication credentials. + * + * @param string $oldID The old userId. + * @param string $newID The new userId. + * @param array $credentials The new credentials + * + * @throws Horde_Exception + */ + public function updateUser($oldID, $newID, $credentials) + { + throw new Horde_Exception('unsupported'); + } + + /** + * Deletes a set of authentication credentials. + * + * @param string $userId The userId to delete. + * + * @throws Horde_Exception + */ + public function removeUser($userId) + { + throw new Horde_Exception('unsupported'); + } + + /** + * Lists all users in the system. + * + * @return mixed The array of userIds. + * @throws Horde_Exception + */ + public function listUsers() + { + throw new Horde_Exception('unsupported'); + } + + /** + * Checks if $userId exists in the system. + * + * @param string $userId User ID for which to check + * + * @return boolean Whether or not $userId already exists. + */ + public function exists($userId) + { + try { + $users = $this->listUsers(); + return in_array($userId, $users); + } catch (Horde_Exception $e) { + return false; + } + } + + /** + * Automatic authentication: Finds out if the client matches an allowed IP + * block. + * + * @return boolean Whether or not the client is allowed. + */ + public function transparent() + { + try { + return $this->_transparent(); + } catch (Horde_Exception $e) { + Horde_Auth::setAuthError($e->getCode() || Horde_Auth::REASON_MESSAGE, $e->getMessage()); + return false; + } + } + + /** + * Transparent authentication stub. + * + * If the auth error message is desired to be set, Horde_Exception should + * thrown instead of returning false. + * The Horde_Exception object should have a message string (if any) in the + * message field, and the REASON_* constant in the code field (defaults to + * REASON_MESSAGE). + * + * @return boolean Whether transparent login is supported. + * @throws Horde_Exception + */ + protected function _transparent() + { + return false; + } + + /** + * Reset a user's password. Used for example when the user does not + * remember the existing password. + * + * @param string $userId The user id for which to reset the password. + * + * @return string The new password on success. + * @throws Horde_Exception + */ + public function resetPassword($userId) + { + throw new Horde_Exception('unsupported'); + } + + /** + * Queries the current driver to find out if it supports the given + * capability. + * + * @param string $capability The capability to test for. + * + * @return boolean Whether or not the capability is supported. + */ + public function hasCapability($capability) + { + return !empty($this->_capabilities[$capability]); + } + + /** + * Returns the URI of the login screen for the current authentication + * method. + * + * @param string $app The application to use. + * @param string $url The URL to redirect to after login. + * + * @return string The login screen URI. + */ + public function getLoginScreen($app = 'horde', $url = '') + { + $login = Horde::url($GLOBALS['registry']->get('webroot', $app) . '/login.php', true); + if (!empty($url)) { + $login = Horde_Util::addParameter($login, 'url', $url); + } + return $login; + } + + /** + * Returns the named parameter for the current auth driver. + * + * @param string $param The parameter to fetch. + * + * @return string The parameter's value, or null if it doesn't exist. + */ + public function getParam($param) + { + return isset($this->_params[$param]) + ? $this->_params[$param] + : null; + } + + /** + * Driver-level admin check stub. + * + * @todo + * + * @return boolean False. + */ + public function isAdmin($permission = null, $permlevel = null, $user = null) + { + return false; + } + +} diff --git a/framework/Auth/lib/Horde/Auth/Composite.php b/framework/Auth/lib/Horde/Auth/Composite.php index 5dd17ab65..5d6255639 100644 --- a/framework/Auth/lib/Horde/Auth/Composite.php +++ b/framework/Auth/lib/Horde/Auth/Composite.php @@ -12,7 +12,7 @@ * @author Chuck Hagenbuch * @package Horde_Auth */ -class Horde_Auth_Composite extends Horde_Auth_Driver +class Horde_Auth_Composite extends Horde_Auth_Base { /** * Hash containing any instantiated drivers. diff --git a/framework/Auth/lib/Horde/Auth/Cyrus.php b/framework/Auth/lib/Horde/Auth/Cyrus.php index ec34da4db..3ce2227ad 100644 --- a/framework/Auth/lib/Horde/Auth/Cyrus.php +++ b/framework/Auth/lib/Horde/Auth/Cyrus.php @@ -83,7 +83,7 @@ * @author Mike Cochrane * @package Horde_Auth */ -class Horde_Auth_Cyrus extends Horde_Auth_Driver +class Horde_Auth_Cyrus extends Horde_Auth_Base { /** * Horde_Imap_Client object. @@ -95,7 +95,7 @@ class Horde_Auth_Cyrus extends Horde_Auth_Driver /** * Pointer to another backend that Cyrus authenticates against. * - * @var Horde_Auth_Driver + * @var Horde_Auth_Base */ protected $_backend; diff --git a/framework/Auth/lib/Horde/Auth/Driver.php b/framework/Auth/lib/Horde/Auth/Driver.php deleted file mode 100644 index 7583bcb43..000000000 --- a/framework/Auth/lib/Horde/Auth/Driver.php +++ /dev/null @@ -1,305 +0,0 @@ - - * @author Michael Slusarz - * @package Horde_Auth - */ -class Horde_Auth_Driver -{ - /** - * An array of capabilities, so that the driver can report which - * operations it supports and which it doesn't. - * - * @var array - */ - protected $_capabilities = array( - 'add' => false, - 'groups' => false, - 'list' => false, - 'resetpassword' => false, - 'remove' => false, - 'transparent' => false, - 'update' => false - ); - - /** - * Hash containing parameters needed for the drivers. - * - * @var array - */ - protected $_params = array(); - - /** - * The credentials currently being authenticated. - * - * @var array - */ - protected $_authCredentials = array(); - - /** - * Constructor. - * - * @param array $params A hash containing parameters. - */ - public function __construct($params = array()) - { - $this->_params = $params; - } - - /** - * Finds out if a set of login credentials are valid, and if requested, - * mark the user as logged in in the current session. - * - * @param string $userId The userId to check. - * @param array $credentials The credentials to check. - * @param boolean $login Whether to log the user in. If false, we'll - * only test the credentials and won't modify - * the current session. Defaults to true. - * @param string $realm The authentication realm to check. - * - * @return boolean Whether or not the credentials are valid. - */ - public function authenticate($userId, $credentials, $login = true, - $realm = null) - { - $auth = false; - $userId = trim($userId); - - if (!empty($GLOBALS['conf']['hooks']['preauthenticate'])) { - if (!Horde::callHook('_horde_hook_preauthenticate', array($userId, $credentials, $realm), 'horde')) { - if (Horde_Auth::getAuthError() != Horde_Auth::REASON_MESSAGE) { - Horde_Auth::setAuthError(Horde_Auth::REASON_FAILED); - } - return false; - } - } - - /* Store the credentials being checked so that subclasses can modify - * them if necessary (like transparent auth does). */ - $this->_authCredentials = array( - 'changeRequested' => false, - 'credentials' => $credentials, - 'realm' => $realm, - 'userId' => $userId - ); - - try { - $this->_authenticate($userId, $credentials); - - if ($login) { - $auth = Horde_Auth::setAuth( - $this->_authCredentials['userId'], - $this->_authCredentials['credentials'], - $this->_authCredentials['realm'], - $this->_authCredentials['changeRequested'] - ); - } else { - if (!Horde_Auth::checkSessionIP()) { - Horde_Auth::setAuthError(self::REASON_SESSIONIP); - } elseif (!Horde_Auth::checkBrowserString()) { - Horde_Auth::setAuthError(self::REASON_BROWSER); - } else { - $auth = true; - } - } - } catch (Horde_Exception $e) { - Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_DEBUG); - Horde_Auth::setAuthError($e->getCode() || Horde_Auth::REASON_MESSAGE, $e->getMessage()); - } - - return $auth; - } - - /** - * Authentication stub. - * - * Horde_Exception should pass a message string (if any) in the message - * field, and the REASON_* constant in the code field (defaults to - * REASON_MESSAGE). - * - * @throws Horde_Exception - */ - protected function _authenticate() - { - } - - /** - * Adds a set of authentication credentials. - * - * @param string $userId The userId to add. - * @param array $credentials The credentials to use. - * - * @throws Horde_Exception - */ - public function addUser($userId, $credentials) - { - throw new Horde_Exception('unsupported'); - } - - /** - * Updates a set of authentication credentials. - * - * @param string $oldID The old userId. - * @param string $newID The new userId. - * @param array $credentials The new credentials - * - * @throws Horde_Exception - */ - public function updateUser($oldID, $newID, $credentials) - { - throw new Horde_Exception('unsupported'); - } - - /** - * Deletes a set of authentication credentials. - * - * @param string $userId The userId to delete. - * - * @throws Horde_Exception - */ - public function removeUser($userId) - { - throw new Horde_Exception('unsupported'); - } - - /** - * Lists all users in the system. - * - * @return mixed The array of userIds. - * @throws Horde_Exception - */ - public function listUsers() - { - throw new Horde_Exception('unsupported'); - } - - /** - * Checks if $userId exists in the system. - * - * @param string $userId User ID for which to check - * - * @return boolean Whether or not $userId already exists. - */ - public function exists($userId) - { - try { - $users = $this->listUsers(); - return in_array($userId, $users); - } catch (Horde_Exception $e) { - return false; - } - } - - /** - * Automatic authentication: Finds out if the client matches an allowed IP - * block. - * - * @return boolean Whether or not the client is allowed. - */ - public function transparent() - { - try { - return $this->_transparent(); - } catch (Horde_Exception $e) { - Horde_Auth::setAuthError($e->getCode() || Horde_Auth::REASON_MESSAGE, $e->getMessage()); - return false; - } - } - - /** - * Transparent authentication stub. - * - * If the auth error message is desired to be set, Horde_Exception should - * thrown instead of returning false. - * The Horde_Exception object should have a message string (if any) in the - * message field, and the REASON_* constant in the code field (defaults to - * REASON_MESSAGE). - * - * @return boolean Whether transparent login is supported. - * @throws Horde_Exception - */ - protected function _transparent() - { - return false; - } - - /** - * Reset a user's password. Used for example when the user does not - * remember the existing password. - * - * @param string $userId The user id for which to reset the password. - * - * @return string The new password on success. - * @throws Horde_Exception - */ - public function resetPassword($userId) - { - throw new Horde_Exception('unsupported'); - } - - /** - * Queries the current driver to find out if it supports the given - * capability. - * - * @param string $capability The capability to test for. - * - * @return boolean Whether or not the capability is supported. - */ - public function hasCapability($capability) - { - return !empty($this->_capabilities[$capability]); - } - - /** - * Returns the URI of the login screen for the current authentication - * method. - * - * @param string $app The application to use. - * @param string $url The URL to redirect to after login. - * - * @return string The login screen URI. - */ - public function getLoginScreen($app = 'horde', $url = '') - { - $login = Horde::url($GLOBALS['registry']->get('webroot', $app) . '/login.php', true); - if (!empty($url)) { - $login = Horde_Util::addParameter($login, 'url', $url); - } - return $login; - } - - /** - * Returns the named parameter for the current auth driver. - * - * @param string $param The parameter to fetch. - * - * @return string The parameter's value, or null if it doesn't exist. - */ - public function getParam($param) - { - return isset($this->_params[$param]) - ? $this->_params[$param] - : null; - } - - /** - * Driver-level admin check stub. - * - * @todo - * - * @return boolean False. - */ - public function isAdmin($permission = null, $permlevel = null, $user = null) - { - return false; - } - -} diff --git a/framework/Auth/lib/Horde/Auth/Ftp.php b/framework/Auth/lib/Horde/Auth/Ftp.php index 3003c0c47..531e77e7b 100644 --- a/framework/Auth/lib/Horde/Auth/Ftp.php +++ b/framework/Auth/lib/Horde/Auth/Ftp.php @@ -20,7 +20,7 @@ * @author Max Kalika * @package Horde_Auth */ -class Horde_Auth_Ftp extends Horde_Auth_Driver +class Horde_Auth_Ftp extends Horde_Auth_Base { /** * Constructor. diff --git a/framework/Auth/lib/Horde/Auth/Http.php b/framework/Auth/lib/Horde/Auth/Http.php index 99693c5bf..f5a8508b7 100644 --- a/framework/Auth/lib/Horde/Auth/Http.php +++ b/framework/Auth/lib/Horde/Auth/Http.php @@ -17,7 +17,7 @@ * @author Chuck Hagenbuch * @package Horde_Auth */ -class Horde_Auth_Http extends Horde_Auth_Driver +class Horde_Auth_Http extends Horde_Auth_Base { /** * An array of capabilities, so that the driver can report which diff --git a/framework/Auth/lib/Horde/Auth/HttpRemote.php b/framework/Auth/lib/Horde/Auth/HttpRemote.php index 7b8aa31ad..79bd206c7 100644 --- a/framework/Auth/lib/Horde/Auth/HttpRemote.php +++ b/framework/Auth/lib/Horde/Auth/HttpRemote.php @@ -11,7 +11,7 @@ * @author Duck * @package Horde_Auth */ -class Horde_Auth_HttpRemote extends Horde_Auth_Driver +class Horde_Auth_HttpRemote extends Horde_Auth_Base { /** * Find out if a set of login credentials are valid. diff --git a/framework/Auth/lib/Horde/Auth/Imap.php b/framework/Auth/lib/Horde/Auth/Imap.php index b20db106f..6571e1315 100644 --- a/framework/Auth/lib/Horde/Auth/Imap.php +++ b/framework/Auth/lib/Horde/Auth/Imap.php @@ -37,7 +37,7 @@ * @author Jan Schneider * @package Horde_Auth */ -class Horde_Auth_Imap extends Horde_Auth_Driver +class Horde_Auth_Imap extends Horde_Auth_Base { /** * Constructor. diff --git a/framework/Auth/lib/Horde/Auth/Imsp.php b/framework/Auth/lib/Horde/Auth/Imsp.php index 6004ac46d..ee0d058bf 100644 --- a/framework/Auth/lib/Horde/Auth/Imsp.php +++ b/framework/Auth/lib/Horde/Auth/Imsp.php @@ -13,7 +13,7 @@ * @author Michael Rubinsky * @package Horde_Auth */ -class Horde_Auth_imsp extends Horde_Auth_Driver +class Horde_Auth_imsp extends Horde_Auth_Base { /** * Private authentication function. diff --git a/framework/Auth/lib/Horde/Auth/Ipbasic.php b/framework/Auth/lib/Horde/Auth/Ipbasic.php index 066adfb96..1e89f22b8 100644 --- a/framework/Auth/lib/Horde/Auth/Ipbasic.php +++ b/framework/Auth/lib/Horde/Auth/Ipbasic.php @@ -18,7 +18,7 @@ * @author Chuck Hagenbuch * @package Horde_Auth */ -class Horde_Auth_Ipbasic extends Horde_Auth_Driver +class Horde_Auth_Ipbasic extends Horde_Auth_Base { /** * An array of capabilities, so that the driver can report which diff --git a/framework/Auth/lib/Horde/Auth/Kolab.php b/framework/Auth/lib/Horde/Auth/Kolab.php index d511467dd..f96c92539 100644 --- a/framework/Auth/lib/Horde/Auth/Kolab.php +++ b/framework/Auth/lib/Horde/Auth/Kolab.php @@ -14,7 +14,7 @@ * @author Gunnar Wrobel * @package Horde_Auth */ -class Horde_Auth_Kolab extends Horde_Auth_Driver +class Horde_Auth_Kolab extends Horde_Auth_Base { /** * An array of capabilities, so that the driver can report which @@ -138,7 +138,7 @@ class Horde_Auth_Kolab extends Horde_Auth_Driver */ function setAuth($userId, $credentials, $realm = null, $changeRequested = false) { - // TODO - setAuth doesn't exist in Horde_Auth_Driver + // TODO - setAuth doesn't exist in Horde_Auth_Base // This should probably use _username_hook_frombackend. if (class_exists('Horde_Kolab_Session')) { diff --git a/framework/Auth/lib/Horde/Auth/Krb5.php b/framework/Auth/lib/Horde/Auth/Krb5.php index 8a248448a..ebf7f72a4 100644 --- a/framework/Auth/lib/Horde/Auth/Krb5.php +++ b/framework/Auth/lib/Horde/Auth/Krb5.php @@ -18,7 +18,7 @@ * @author Michael Slusarz * @package Horde_Auth */ -class Horde_Auth_Krb5 extends Horde_Auth_Driver +class Horde_Auth_Krb5 extends Horde_Auth_Base { /** * Constructor. diff --git a/framework/Auth/lib/Horde/Auth/Ldap.php b/framework/Auth/lib/Horde/Auth/Ldap.php index 22b0e021c..c5dd4fb99 100644 --- a/framework/Auth/lib/Horde/Auth/Ldap.php +++ b/framework/Auth/lib/Horde/Auth/Ldap.php @@ -30,7 +30,7 @@ * @author Jon Parise * @package Horde_Auth */ -class Horde_Auth_Ldap extends Horde_Auth_Driver +class Horde_Auth_Ldap extends Horde_Auth_Base { /** * An array of capabilities, so that the driver can report which diff --git a/framework/Auth/lib/Horde/Auth/Login.php b/framework/Auth/lib/Horde/Auth/Login.php index 9f229be71..2549cc58e 100644 --- a/framework/Auth/lib/Horde/Auth/Login.php +++ b/framework/Auth/lib/Horde/Auth/Login.php @@ -19,7 +19,7 @@ * @author Jan Schneider * @package Horde_Auth */ -class Horde_Auth_Login extends Horde_Auth_Driver +class Horde_Auth_Login extends Horde_Auth_Base { /** * List of users that should be excluded from being listed/handled diff --git a/framework/Auth/lib/Horde/Auth/Pam.php b/framework/Auth/lib/Horde/Auth/Pam.php index 282a0755d..7dba7fd5b 100644 --- a/framework/Auth/lib/Horde/Auth/Pam.php +++ b/framework/Auth/lib/Horde/Auth/Pam.php @@ -26,7 +26,7 @@ * @author Jon Parise * @package Horde_Auth */ -class Horde_Auth_Pam extends Horde_Auth_Driver +class Horde_Auth_Pam extends Horde_Auth_Base { /** * Constructor. diff --git a/framework/Auth/lib/Horde/Auth/Passwd.php b/framework/Auth/lib/Horde/Auth/Passwd.php index e1a6040ec..34971a6de 100644 --- a/framework/Auth/lib/Horde/Auth/Passwd.php +++ b/framework/Auth/lib/Horde/Auth/Passwd.php @@ -33,7 +33,7 @@ * @author Chuck Hagenbuch * @package Horde_Auth */ -class Horde_Auth_Passwd extends Horde_Auth_Driver +class Horde_Auth_Passwd extends Horde_Auth_Base { /** * An array of capabilities, so that the driver can report which diff --git a/framework/Auth/lib/Horde/Auth/Peclsasl.php b/framework/Auth/lib/Horde/Auth/Peclsasl.php index 600756e7e..6b3dd9a9d 100644 --- a/framework/Auth/lib/Horde/Auth/Peclsasl.php +++ b/framework/Auth/lib/Horde/Auth/Peclsasl.php @@ -27,7 +27,7 @@ * @author Jon Parise * @package Horde_Auth */ -class Horde_Auth_Peclsasl extends Horde_Auth_Driver +class Horde_Auth_Peclsasl extends Horde_Auth_Base { /** * Constructor. diff --git a/framework/Auth/lib/Horde/Auth/Radius.php b/framework/Auth/lib/Horde/Auth/Radius.php index 804c391b5..05b42fe23 100644 --- a/framework/Auth/lib/Horde/Auth/Radius.php +++ b/framework/Auth/lib/Horde/Auth/Radius.php @@ -55,7 +55,7 @@ * @author Michael Slusarz * @package Horde_Auth */ -class Horde_Auth_Radius extends Horde_Auth_Driver +class Horde_Auth_Radius extends Horde_Auth_Base { /** * Constructor. diff --git a/framework/Auth/lib/Horde/Auth/Shibboleth.php b/framework/Auth/lib/Horde/Auth/Shibboleth.php index 810147e5a..cd7ee2197 100644 --- a/framework/Auth/lib/Horde/Auth/Shibboleth.php +++ b/framework/Auth/lib/Horde/Auth/Shibboleth.php @@ -28,7 +28,7 @@ * @author Cassio Nishiguchi * @package Horde_Auth */ -class Horde_Auth_Shibboleth extends Horde_Auth_Driver +class Horde_Auth_Shibboleth extends Horde_Auth_Base { /** * An array of capabilities, so that the driver can report which diff --git a/framework/Auth/lib/Horde/Auth/Smb.php b/framework/Auth/lib/Horde/Auth/Smb.php index 0a02c9a05..48fec9cd4 100644 --- a/framework/Auth/lib/Horde/Auth/Smb.php +++ b/framework/Auth/lib/Horde/Auth/Smb.php @@ -33,7 +33,7 @@ * @author Marcus I. Ryan * @package Horde_Auth */ -class Horde_Auth_Smb extends Horde_Auth_Driver +class Horde_Auth_Smb extends Horde_Auth_Base { /** * Constructor. diff --git a/framework/Auth/lib/Horde/Auth/Smbclient.php b/framework/Auth/lib/Horde/Auth/Smbclient.php index 121745e26..c2e7201c1 100644 --- a/framework/Auth/lib/Horde/Auth/Smbclient.php +++ b/framework/Auth/lib/Horde/Auth/Smbclient.php @@ -26,7 +26,7 @@ * @author Marcus I. Ryan * @package Horde_Auth */ -class Horde_Auth_Smbclient extends Horde_Auth_Driver +class Horde_Auth_Smbclient extends Horde_Auth_Base { /** * Constructor. diff --git a/framework/Auth/lib/Horde/Auth/Sql.php b/framework/Auth/lib/Horde/Auth/Sql.php index 8200d42d4..dda5f5599 100644 --- a/framework/Auth/lib/Horde/Auth/Sql.php +++ b/framework/Auth/lib/Horde/Auth/Sql.php @@ -67,7 +67,7 @@ * @author Chuck Hagenbuch * @package Horde_Auth */ -class Horde_Auth_Sql extends Horde_Auth_Driver +class Horde_Auth_Sql extends Horde_Auth_Base { /** * An array of capabilities, so that the driver can report which diff --git a/framework/Auth/package.xml b/framework/Auth/package.xml index 22a9bfa8c..78e56b64a 100644 --- a/framework/Auth/package.xml +++ b/framework/Auth/package.xml @@ -30,7 +30,7 @@ http://pear.php.net/dtd/package-2.0.xsd"> beta LGPL - * Split Horde_Auth:: into Horde_Auth:: and Horde_Auth_Driver:: components. + * Split Horde_Auth:: into Horde_Auth:: and Horde_Auth_Base:: components. * Initial Horde 4 package. @@ -43,11 +43,11 @@ http://pear.php.net/dtd/package-2.0.xsd"> + - @@ -143,11 +143,11 @@ http://pear.php.net/dtd/package-2.0.xsd"> + -