Fix for method in FrameworkConfiguration, removal of unneccessary code

[core.git] / inc / classes / main / filter / verifier / class_UserStatusVerifierFilter.php

diff --git a/inc/classes/main/filter/verifier/class_UserStatusVerifierFilter.php b/inc/classes/main/filter/verifier/class_UserStatusVerifierFilter.php
index a058aa04ab555bad87274d2ff119ef3a20da1568..43d7116105564a7cffd4bf0589512642c5301f6e 100644 (file)
--- a/inc/classes/main/filter/verifier/class_UserStatusVerifierFilter.php
+++ b/inc/classes/main/filter/verifier/class_UserStatusVerifierFilter.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, 2009 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -35,16 +35,12 @@ class UserStatusVerifierFilter extends BaseFilter implements Filterable {
        /**
         * Creates an instance of this filter class
         *
-        * @param       $controllerInstance             An instance of a Controller class
-        * @return      $filterInstance                 An instance of this filter class
+        * @return      $filterInstance         An instance of this filter class
         */
-       public final static function createUserStatusVerifierFilter (Controller $controllerInstance) {
+       public final static function createUserStatusVerifierFilter () {
                // Get a new instance
                $filterInstance = new UserStatusVerifierFilter();
 
-               // Set the controller
-               $filterInstance->setControllerInstance($controllerInstance);
-
                // Return the instance
                return $filterInstance;
        }
@@ -61,12 +57,12 @@ 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()->readConfig('user_status_confirmed')) && ($userInstance->getField(UserDatabaseWrapper::DB_COLUMN_USER_STATUS) != $this->getConfigInstance()->readConfig('user_status_guest'))) {
+               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'))) {
                        // Request is invalid!
                        $requestInstance->requestIsValid(false);
 
                        // Redirect to configured URL
-                       $responseInstance->redirectToConfiguredUrl('login_user_status_url');
+                       $responseInstance->redirectToConfiguredUrl('login_user_status');
 
                        // Stop processing here
                        exit();