Continued:

[city.git] / application / city / classes / login / class_CityUserLogin.php

diff --git a/application/city/classes/login/class_CityUserLogin.php b/application/city/classes/login/class_CityUserLogin.php
index 7a68588f2ba0635ae5c0f3fd8dc7e3db9e93b14a..ac9f9b1e588e8f46d695159ad4aad68b69f79028 100644 (file)
--- a/application/city/classes/login/class_CityUserLogin.php
+++ b/application/city/classes/login/class_CityUserLogin.php
@@ -6,8 +6,8 @@ namespace Org\Mxchange\City\Login\User;
 use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -81,7 +81,7 @@ class CityUserLogin extends BaseFrameworkSystem implements LoginableUser, Regist
                $userInstance = UserFactory::createUserByRequest($requestInstance);
 
                // Remember this new instance in registry
-               Registry::getRegistry()->addInstance('user', $userInstance);
+               GenericRegistry::getRegistry()->addInstance('user', $userInstance);
 
                // Is the password correct?
                if ($userInstance->ifPasswordHashMatches($requestInstance) === FALSE) {
@@ -122,7 +122,7 @@ class CityUserLogin extends BaseFrameworkSystem implements LoginableUser, Regist
         */
        public function ifLoginWasSuccessfull () {
                // Is the registry key there?
-               $loginDone = (Registry::getRegistry()->getInstance('login') instanceof Registerable);
+               $loginDone = (GenericRegistry::getRegistry()->getInstance('login') instanceof Registerable);
 
                // Return the result
                return $loginDone;
@@ -145,7 +145,7 @@ class CityUserLogin extends BaseFrameworkSystem implements LoginableUser, Regist
                        $plainPassword = FrameworkBootstrap::getRequestInstance()->getRequestElement($requestKey);
 
                        // Get user instance
-                       $userInstance = Registry::getRegistry()->getInstance('user');
+                       $userInstance = GenericRegistry::getRegistry()->getInstance('user');
 
                        // Get a crypto helper and hash the password
                        $this->hashedPassword = ObjectFactory::createObjectByConfiguredName('crypto_class')->hashString($plainPassword, $userInstance->getPasswordHash());