*
* @author Roland Haeder <webmaster@ship-simu.org>
* @version 0.0.0
- * @copyright Copyright (c) 2007, 2008 Roland Haeder, this is free software
+ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 Ship-Simu Developer Team
* @license GNU GPL 3.0 or any newer version
* @link http://www.ship-simu.org
*
if (is_null($method)) {
// Then abort here
throw new UserAuthMethodException($this, self::EXCEPTION_MISSING_METHOD);
- } elseif (!method_exists($this->getConfigInstance()->readConfig('guest_class'), $method)) {
+ } elseif (!method_exists($this->getConfigInstance()->getConfigEntry('guest_class'), $method)) {
// The method is invalid!
throw new MissingMethodException(array($this, $method), self::EXCEPTION_MISSING_METHOD);
}
- // Get a instance of the registry
- $userInstance = Registry::getRegistry()->getInstance('user');
+ // Get a user instance
+ $userInstance = call_user_func_array(array($this->getConfigInstance()->getConfigEntry('guest_class'), $method), array($data));
- // Is there an instance?
- if (is_null($userInstance)) {
- // Get a user instance
- $userInstance = call_user_func_array(array($this->getConfigInstance()->readConfig('guest_class'), $method), array($data));
-
- // Remember this new instance in registry
- Registry::getRegistry()->addInstance($userInstance);
- } // END - if
+ // Remember this new instance in registry
+ Registry::getRegistry()->addInstance('user', $userInstance);
// Is the password correct?
if ($userInstance->ifPasswordHashMatches($requestInstance) === false) {
}
/**
- * Determines wether the login was fine. This is done by checking if the 'login' instance is in registry
+ * Determines wether the login was fine. This is done by checking if 'login' instance is in registry
*
* @return $loginDone Wether the login was fine or not
*/
}
/**
- * Encrypt the given request key or throw an exception if the key was not
- * found in the request
+ * Encrypt given request key or throw an exception if key was not found in
+ * request
*
* @param $requestKey Key in request class
* @return void
*/
public function encryptPassword ($requestKey) {
- // Check if the password is found in the request
+ // Check if password is found in request
if ($this->getRequestInstance()->isRequestElementSet($requestKey)) {
// So encrypt the password and store it for later usage in
// the request:
// Get a crypto helper and hash the password
$this->hashedPassword = ObjectFactory::createObjectByConfiguredName('crypto_class')->hashString($plainPassword, $userInstance->getPasswordHash());
- // Store the hash back in the request
+ // Store the hash back in request
$this->getRequestInstance()->setRequestElement('pass_hash', $this->hashedPassword);
} // END - if
}