Continued:

[core.git] / framework / main / classes / filter / auth / class_UserAuthFilter.php

diff --git a/framework/main/classes/filter/auth/class_UserAuthFilter.php b/framework/main/classes/filter/auth/class_UserAuthFilter.php
index 163fd3b157de2246ef3c022df28c5f8cfe21e7ba..bab1a5b1e4f7f8e6fee36fe9b3cfac5b97b78d81 100644 (file)
--- a/framework/main/classes/filter/auth/class_UserAuthFilter.php
+++ b/framework/main/classes/filter/auth/class_UserAuthFilter.php
@@ -1,15 +1,16 @@
 <?php
 // Own namespace
-namespace CoreFramework\Filter\User\Auth;
+namespace Org\Mxchange\CoreFramework\Filter\User\Auth;
 
 // Import framework stuff
-use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Filter\BaseFilter;
-use CoreFramework\Filter\Filterable;
-use CoreFramework\Loader\NoClassException;
-use CoreFramework\Registry\Registry;
-use CoreFramework\Request\Requestable;
-use CoreFramework\Response\Responseable;
+use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Filter\BaseFilter;
+use Org\Mxchange\CoreFramework\Filter\Filterable;
+use Org\Mxchange\CoreFramework\Loader\NoClassException;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
+use Org\Mxchange\CoreFramework\Request\Requestable;
+use Org\Mxchange\CoreFramework\Response\Responseable;
+use Org\Mxchange\CoreFramework\User\BaseUser;
 
 /**
  * A filter for checking user permissions
@@ -91,9 +92,6 @@ class UserAuthFilter extends BaseFilter implements Filterable {
                // Then get an auth instance for checking and updating the auth cookies
                $authInstance = ObjectFactory::createObjectByName($this->authMethod, array($responseInstance));
 
-               // Set request instance
-               $authInstance->setRequestInstance($requestInstance);
-
                // Now, get the auth data for comparison
                $authLogin = $authInstance->getUserAuth();
                $authHash  = $authInstance->getPasswordAuth();
@@ -104,7 +102,7 @@ class UserAuthFilter extends BaseFilter implements Filterable {
                        $authInstance->destroyAuthData();
 
                        // Mark the request as invalid
-                       $requestInstance->requestIsValid(FALSE);
+                       $requestInstance->requestIsValid(false);
 
                        // Add fatal message
                        $responseInstance->addFatalMessage('auth_data_incomplete');
@@ -140,8 +138,8 @@ class UserAuthFilter extends BaseFilter implements Filterable {
                } // END - if
 
                // Remember auth and user instances in registry
-               Registry::getRegistry()->addInstance('auth', $authInstance);
-               Registry::getRegistry()->addInstance('user', $userInstance);
+               GenericRegistry::getRegistry()->addInstance('auth', $authInstance);
+               GenericRegistry::getRegistry()->addInstance('user', $userInstance);
        }
 
 }