X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Ffilter%2Fverifier%2Fclass_UserUnconfirmedVerifierFilter.php;h=897951d432d90803c0eaef0f47ad73c6a15c2653;hp=7df7795a85b39b6de008151a66a817549579de0d;hb=27e0403074124968ff6588735afb0e1d7577ab76;hpb=320f6fb9f38e76152249af1657b624bc43a2a877

diff --git a/inc/classes/main/filter/verifier/class_UserUnconfirmedVerifierFilter.php b/inc/classes/main/filter/verifier/class_UserUnconfirmedVerifierFilter.php
index 7df7795a..897951d4 100644
--- a/inc/classes/main/filter/verifier/class_UserUnconfirmedVerifierFilter.php
+++ b/inc/classes/main/filter/verifier/class_UserUnconfirmedVerifierFilter.php
@@ -2,11 +2,11 @@
 /**
  * A filter for checking if user status is UNCONFIRMED.
  *
- * @author		Roland Haeder <webmaster@ship-simu.org>
+ * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, this is free software
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
- * @link		http://www.ship-simu.org
+ * @link		http://www.shipsimu.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,9 +35,9 @@ class UserUnconfirmedVerifierFilter extends BaseFilter implements Filterable {
 	/**
 	 * Creates an instance of this filter class
 	 *
-	 * @return	$filterInstance			An instance of this filter class
+	 * @return	$filterInstance		An instance of this filter class
 	 */
-	public final static function createUserUnconfirmedVerifierFilter () {
+	public static final function createUserUnconfirmedVerifierFilter () {
 		// Get a new instance
 		$filterInstance = new UserUnconfirmedVerifierFilter();
 
@@ -53,31 +53,28 @@ class UserUnconfirmedVerifierFilter extends BaseFilter implements Filterable {
 	 * @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 = call_user_func_array(array($userClass, 'createMemberByRequest'), array($requestInstance));
+		$userInstance = UserFactory::createUserByRequest($requestInstance);
 
 		// Is the email address valid?
-		if ($userInstance->ifEmailAddressExists() === false) {
+		if ($userInstance->ifEmailAddressExists() === FALSE) {
 			// Request is invalid!
-			$requestInstance->requestIsValid(false);
+			$requestInstance->requestIsValid(FALSE);
 
 			// Redirect to configured URL
-			$responseInstance->redirectToConfiguredUrl('user_unconfirmed_email_missing_url');
+			$responseInstance->redirectToConfiguredUrl('user_unconfirmed_email_missing');
 
 			// Stop processing here
 			exit();
 		} // END - if
 
 		// Is the user account confirmed?
-		if ($userInstance->getField(UserDatabaseWrapper::DB_COLUMN_USER_STATUS) != $this->getConfigInstance()->readConfig('user_status_unconfirmed')) {
+		if ($userInstance->getField(UserDatabaseWrapper::DB_COLUMN_USER_STATUS) != $this->getConfigInstance()->getConfigEntry('user_status_unconfirmed')) {
 			// Request is invalid!
-			$requestInstance->requestIsValid(false);
+			$requestInstance->requestIsValid(FALSE);
 
 			// Redirect to configured URL
-			$responseInstance->redirectToConfiguredUrl('user_not_unconfirmed_url');
+			$responseInstance->redirectToConfiguredUrl('user_not_unconfirmed');
 
 			// Stop processing here
 			exit();