X-Git-Url: https://git.mxchange.org/?p=shipsimu.git;a=blobdiff_plain;f=application%2Fship-simu%2Fmain%2Fregistration%2Fclass_ShipSimuRegistration.php;h=1ad97313716eb84008af5695ac96c2f0939e7c10;hp=aae55e7f86a83325d82f1f4795d6421f95680f32;hb=abb8bf6be9f5238f8a4552707bcb190f0dbf0b7a;hpb=b848cab53db89342f0a854a00be91cadbcff2967

diff --git a/application/ship-simu/main/registration/class_ShipSimuRegistration.php b/application/ship-simu/main/registration/class_ShipSimuRegistration.php
index aae55e7..1ad9731 100644
--- a/application/ship-simu/main/registration/class_ShipSimuRegistration.php
+++ b/application/ship-simu/main/registration/class_ShipSimuRegistration.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
  *
@@ -54,12 +54,6 @@ class ShipSimuRegistration extends BaseRegistration {
 	protected function __construct () {
 		// Call parent constructor
 		parent::__construct(__CLASS__);
-
-		// Set part description
-		$this->setObjectDescription("Ship-Simu registration class");
-
-		// Create unique ID number
-		$this->generateUniqueId();
 	}
 
 	/**
@@ -90,10 +84,13 @@ class ShipSimuRegistration extends BaseRegistration {
 		if ($this->getRequestInstance()->isRequestElementSet($requestKey)) {
 			// So encrypt the password and store it for later usage in
 			// the request:
+
 			// 1.: Get the plain password
 			$plainPassword = $this->getRequestInstance()->getRequestElement($requestKey);
+
 			// 2. Get a crypto helper and hash the password
-			$this->hashedPassword = ObjectFactory::createObjectByConfiguredName('crypto_class')->hashPassword($plainPassword);
+			$this->hashedPassword = ObjectFactory::createObjectByConfiguredName('crypto_class')->hashString($plainPassword);
+
 			// 3. Store the hash back in the request
 			$this->getRequestInstance()->setRequestElement('pass_hash', $this->hashedPassword);
 		}
@@ -156,8 +153,17 @@ class ShipSimuRegistration extends BaseRegistration {
 	 * @return	void
 	 */
 	public function addElementsToDataSet (StoreableCriteria $criteriaInstance) {
+		// Default is unconfirmed!
+		$configEntry = 'user_status_unconfirmed';
+
+		// Is the confirmation process entirely disabled?
+		if ($this->getConfigInstance()->readConfig('confirm_email_enabled') === "N") {
+			// No confirmation of email needed
+			$configEntry = 'user_status_confirmed';
+		} // END - if
+
 		// Add a lot elements to the dataset criteria
-		foreach ($this->criteriaElements as $alias=>$element) {
+		foreach ($this->criteriaElements as $alias => $element) {
 			// Do we have an alias?
 			if (is_string($alias)) {
 				// Yes, so use it
@@ -166,13 +172,22 @@ class ShipSimuRegistration extends BaseRegistration {
 				// No, default entry
 				$criteriaInstance->addCriteria($element, $this->getRequestInstance()->getRequestElement($element));
 			}
+
+			// Is this a guest account?
+			if ((($element == "username") || ($alias == "username")) && ($this->getRequestInstance()->getRequestElement($element) == $this->getConfigInstance()->readConfig('guest_login_user'))) {
+				// Yes, then set the config entry to guest status
+				$configEntry = 'user_status_guest';
+			} // END - if
 		} // END - foreach
 
 		// Mark the username as unique key
-		$criteriaInstance->setUniqueKey('username');
+		$criteriaInstance->setUniqueKey(UserDatabaseWrapper::DB_COLUMN_USERNAME);
 
 		// Add account status as configured
-		$criteriaInstance->addConfiguredCriteria('user_status', 'user_status_register');
+		$criteriaInstance->addConfiguredCriteria(UserDatabaseWrapper::DB_COLUMN_USER_STATUS, $configEntry);
+
+		// Include registration timestamp
+		$criteriaInstance->addCriteria("registered", date("Y-m-d H:i:s", time()));
 	}
 }