X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Ffilter%2Fverifier%2Fclass_UserStatusVerifierFilter.php;h=94b62a23cd400b6ccf8764e27a9ae3747fd5159e;hp=752cd8db33a0a9cfdab8cd2e177d7b55c38b4a0a;hb=cbd2f71aee1c3daca3d11acc346c79757852316f;hpb=37cf2fb39a315b82795c070754883db41a90c160

diff --git a/inc/classes/main/filter/verifier/class_UserStatusVerifierFilter.php b/inc/classes/main/filter/verifier/class_UserStatusVerifierFilter.php
index 752cd8db..94b62a23 100644
--- a/inc/classes/main/filter/verifier/class_UserStatusVerifierFilter.php
+++ b/inc/classes/main/filter/verifier/class_UserStatusVerifierFilter.php
@@ -2,11 +2,11 @@
 /**
  * A filter for checking if user status is GUEST or CONFIRMED.
  *
- * @author		Roland Haeder <webmaster@ship-simu.org>
+ * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
+ * @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
@@ -37,7 +37,7 @@ class UserStatusVerifierFilter extends BaseFilter implements Filterable {
 	 *
 	 * @return	$filterInstance		An instance of this filter class
 	 */
-	public final static function createUserStatusVerifierFilter () {
+	public static final function createUserStatusVerifierFilter () {
 		// Get a new instance
 		$filterInstance = new UserStatusVerifierFilter();
 
@@ -57,9 +57,9 @@ class UserStatusVerifierFilter extends BaseFilter implements Filterable {
 		$userInstance = Registry::getRegistry()->getInstance('user');
 
 		// Is the user account confirmed?
-		if (($userInstance->getField(UserDatabaseWrapper::DB_COLUMN_USER_STATUS) != $this->getConfigInstance()->getConfigEntry('user_status_confirmed')) && ($userInstance->getField(UserDatabaseWrapper::DB_COLUMN_USER_STATUS) != $this->getConfigInstance()->getConfigEntry('user_status_guest')) && ($requestInstance->getRequestElement('action') != $this->getConfigInstance()->getConfigEntry('action_status_problem'))) {
+		if ((!$userInstance->isConfirmed()) && (!$userInstance->isGuest()) && ($requestInstance->getRequestElement('action') != $this->getConfigInstance()->getConfigEntry('action_status_problem'))) {
 			// Request is invalid!
-			$requestInstance->requestIsValid(false);
+			$requestInstance->requestIsValid(FALSE);
 
 			// Redirect to configured URL
 			$responseInstance->redirectToConfiguredUrl('login_user_status');