*
* @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, this is free software
* @license GNU GPL 3.0 or any newer version
* @link http://www.ship-simu.org
*
// Call parent constructor
parent::__construct(__CLASS__);
- // Set part description
- $this->setObjectDescription("Guest login for Ship-Simu");
-
- // Create unique ID number
- $this->generateUniqueId();
-
// Clean up a little
$this->removeNumberFormaters();
$this->removeSystemArray();
$data = "";
// Detect login method (username or email) and try to get a userinstance
- if (!is_null($requestInstance->getRequestElement('username'))) {
+ if (!is_null($requestInstance->getRequestElement('user'))) {
// Username found!
- $method = "createGuestByUsername";
- $data = $requestInstance->getRequestElement('username');
- } elseif (!is_null($requestInstance->getRequestElement('email'))) {
- // Email found!
- $method = "createGuestByEmail";
- $data = $requestInstance->getRequestElement('email');
- }
+ $method = 'createGuestByUsername';
+ $data = $requestInstance->getRequestElement('user');
+ } // END - if
// Is a method detected?
if (is_null($method)) {
} // END - if
// Is the password correct?
- if (!$userInstance->ifPasswordHashMatches($requestInstance)) {
+ if ($userInstance->ifPasswordHashMatches($requestInstance) === false) {
// Mismatching password
- throw new UserPasswordMismatchException(array($this, $userInstance), User::EXCEPTION_USER_PASS_MISMATCH);
+ throw new UserPasswordMismatchException(array($this, $userInstance), BaseUser::EXCEPTION_USER_PASS_MISMATCH);
} // END - if
// Now do the real login. This can be cookie- or session-based login
}
/**
- * 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:
$userInstance = Registry::getRegistry()->getInstance('user');
// Get a crypto helper and hash the password
- $this->hashedPassword = ObjectFactory::createObjectByConfiguredName('crypto_class')->hashPassword($plainPassword, $userInstance->getPasswordHash());
+ $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
}