X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Ffilter%2Fauth%2Fclass_UserAuthFilter.php;h=bab1a5b1e4f7f8e6fee36fe9b3cfac5b97b78d81;hp=63bcc49c3f58572d27062ea8fbc38e0e5a85c3f9;hb=8d8cf621bd811811cecd83c65a4ab91f27258e79;hpb=d8a47744662a4850c136828b27341cce16745442;ds=sidebyside

diff --git a/framework/main/classes/filter/auth/class_UserAuthFilter.php b/framework/main/classes/filter/auth/class_UserAuthFilter.php
index 63bcc49c..bab1a5b1 100644
--- a/framework/main/classes/filter/auth/class_UserAuthFilter.php
+++ b/framework/main/classes/filter/auth/class_UserAuthFilter.php
@@ -1,16 +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 CoreFramework\User\BaseUser;
+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
@@ -92,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();
@@ -105,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');
@@ -141,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);
 	}
 
 }