X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=application%2Fship-simu%2Fmain%2Flogin%2Fclass_ShipSimuUserLogin.php;h=e3540405507a7b177f90ac8765d7599648063e6e;hb=abb8bf6be9f5238f8a4552707bcb190f0dbf0b7a;hp=1f62ded44872b635a679bc03b8acde9156a65ce2;hpb=9327c11e14407cce78208de01b5cdd2de87e13a3;p=shipsimu.git

diff --git a/application/ship-simu/main/login/class_ShipSimuUserLogin.php b/application/ship-simu/main/login/class_ShipSimuUserLogin.php
index 1f62ded..e354040 100644
--- a/application/ship-simu/main/login/class_ShipSimuUserLogin.php
+++ b/application/ship-simu/main/login/class_ShipSimuUserLogin.php
@@ -4,7 +4,7 @@
  *
  * @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
  *
@@ -36,12 +36,6 @@ class ShipSimuUserLogin extends BaseFrameworkSystem implements LoginableUser {
 		// Call parent constructor
 		parent::__construct(__CLASS__);
 
-		// Set part description
-		$this->setObjectDescription("Login for Ship-Simu");
-
-		// Create unique ID number
-		$this->generateUniqueId();
-
 		// Clean up a little
 		$this->removeNumberFormaters();
 		$this->removeSystemArray();
@@ -68,45 +62,27 @@ class ShipSimuUserLogin extends BaseFrameworkSystem implements LoginableUser {
 	 * @param	$requestInstance	An instance of a Requestable class
 	 * @param	$responseInstance	An instance of a Responseable class
 	 * @return	void
-	 * @throws	UserAuthMethodException	If wether username nor email login
-	 *										was detected
-	 * @throws	MissingMethodException		If a method was not found in the
-	 *										User class
 	 * @throws	UserPasswordMismatchException	If the supplied password did not
 	 *										match with the stored password
+	 * @todo	We need to add something here which will make more than one
+	 * @todo	guest logins, users who are online but based on the same
+	 * @todo	user account.
 	 */
 	public function doLogin (Requestable $requestInstance, Responseable $responseInstance) {
 		// By default no method is selected
 		$method = null;
 		$data = "";
 
-		// Detect login method (username or email) and try to get a userinstance
-		if (!is_null($requestInstance->getRequestElement('username'))) {
-			// Username found!
-			$method = "createUserByUsername";
-			$data = $requestInstance->getRequestElement('username');
-		} elseif (!is_null($requestInstance->getRequestElement('email'))) {
-			// Email found!
-			$method = "createUserByEmail";
-			$data = $requestInstance->getRequestElement('email');
-		}
-
-		// Is a method detected?
-		if (is_null($method)) {
-			// Then abort here
-			throw new UserAuthMethodException($this, self::EXCEPTION_MISSING_METHOD);
-		} elseif (!method_exists($this->getConfigInstance()->readConfig('user_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');
 
 		// Is there an instance?
 		if (is_null($userInstance)) {
+			// Get member class
+			$userClass = $this->getConfigInstance()->readConfig('user_class');
+
 			// Get a user instance
-			$userInstance = call_user_func_array(array($this->getConfigInstance()->readConfig('user_class'), $method), array($data));
+			$userInstance = call_user_func_array(array($userClass, 'createMemberByRequest'), array($requestInstance));
 
 			// Remember this new instance in registry
 			Registry::getRegistry()->addInstance($userInstance);
@@ -115,9 +91,11 @@ class ShipSimuUserLogin extends BaseFrameworkSystem implements LoginableUser {
 		// Is the password correct?
 		if (!$userInstance->ifPasswordHashMatches($requestInstance)) {
 			// 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
 
+		// ToDo place
+
 		// Now do the real login. This can be cookie- or session-based login
 		// which depends on the admins setting then on the user's taste.
 		// 1) Get a login helper instance
@@ -160,7 +138,7 @@ class ShipSimuUserLogin extends BaseFrameworkSystem implements LoginableUser {
 			$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
 			$this->getRequestInstance()->setRequestElement('pass_hash', $this->hashedPassword);