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 2f0b5539f44ae924d2bfe5926b2793ab447cb810..8d84f0f49639e1c6338cc1f523a29d519aa97fa0 100644 (file)
--- a/framework/main/classes/filter/auth/class_UserAuthFilter.php
+++ b/framework/main/classes/filter/auth/class_UserAuthFilter.php
@@ -1,23 +1,24 @@
 <?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\Bootstrap\FrameworkBootstrap;
+use Org\Mxchange\CoreFramework\Factory\Object\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
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2020 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -75,7 +76,7 @@ class UserAuthFilter extends BaseFilter implements Filterable {
         * @return      void
         */
        protected function setDefaultAuthMethod () {
-               $this->authMethod = $this->getConfigInstance()->getConfigEntry('auth_method_class');
+               $this->authMethod = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('auth_method_class');
        }
 
        /**
@@ -112,13 +113,13 @@ class UserAuthFilter extends BaseFilter implements Filterable {
                } // END - if
 
                // Regular user account
-               $className = $this->getConfigInstance()->getConfigEntry('user_class');
+               $className = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('user_class');
                $methodName = 'createMemberByUserName';
 
                // Now, try to get a user or guest instance
-               if ($authLogin == $this->getConfigInstance()->getConfigEntry('guest_login_user')) {
+               if ($authLogin == FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('guest_login_user')) {
                        // Set class
-                       $className = $this->getConfigInstance()->getConfigEntry('guest_class');
+                       $className = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('guest_class');
                        $methodName = 'createGuestByUserName';
                } // END - if
 
@@ -138,8 +139,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);
        }
 
 }