X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Ffilter%2Fverifier%2Fclass_UserUnconfirmedVerifierFilter.php;h=c87942bd997732c90328b635f6d0a9263de6e512;hb=bbf48d46cb9063a4d2b78c106747147712f5474e;hp=b4b37cf3287ebc875ad49b2d9ad5a671534ba8d5;hpb=b3e47fb693fb8d40868158b0192b3392b309d97a;p=shipsimu.git

diff --git a/inc/classes/main/filter/verifier/class_UserUnconfirmedVerifierFilter.php b/inc/classes/main/filter/verifier/class_UserUnconfirmedVerifierFilter.php
index b4b37cf..c87942b 100644
--- a/inc/classes/main/filter/verifier/class_UserUnconfirmedVerifierFilter.php
+++ b/inc/classes/main/filter/verifier/class_UserUnconfirmedVerifierFilter.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
  *
@@ -30,16 +30,6 @@ class UserUnconfirmedVerifierFilter extends BaseFrameworkSystem implements Filte
 	protected function __construct () {
 		// Call parent constructor
 		parent::__construct(__CLASS__);
-
-		// Set part description
-		$this->setObjectDescription("A filter for checking if the user account is unconfirmed");
-
-		// Create unique ID number
-		$this->generateUniqueId();
-
-		// Clean up a little
-		$this->removeNumberFormaters();
-		$this->removeSystemArray();
 	}
 
 	/**
@@ -63,16 +53,31 @@ class UserUnconfirmedVerifierFilter extends BaseFrameworkSystem implements Filte
 	 * @return	void
 	 */
 	public function execute (Requestable $requestInstance, Responseable $responseInstance) {
+		// Get member class
+		$userClass = $this->getConfigInstance()->readConfig('user_class');
+
 		// Get a user instance for comparison
-		$userInstance = User::createUserByRequest($requestInstance);
+		$userInstance = call_user_func_array(array($userClass, 'createMemberByRequest'), array($requestInstance));
+
+		// Is the email address valid?
+		if ($userInstance->ifEmailAddressExists() === false) {
+			// Request is invalid!
+			$requestInstance->requestIsValid(false);
+
+			// Redirect to configured URL
+			$responseInstance->redirectToConfiguredUrl('user_unconfirmed_email_missing_url');
+
+			// Stop processing here
+			exit();
+		} // END - if
 
 		// Is the user account confirmed?
-		if ($userInstance->getField('user_status') != $this->getConfigInstance()->readConfig('user_status_unconfirmed')) {
+		if ($userInstance->getField(UserDatabaseWrapper::DB_COLUMN_USER_STATUS) != $this->getConfigInstance()->readConfig('user_status_unconfirmed')) {
 			// Request is invalid!
 			$requestInstance->requestIsValid(false);
 
 			// Redirect to configured URL
-			$responseInstance->redirectToConfiguredUrl('login_user_unconfirmed_url');
+			$responseInstance->redirectToConfiguredUrl('user_not_unconfirmed_url');
 
 			// Stop processing here
 			exit();