Continued:

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

diff --git a/application/city/classes/login/class_CityGuestLogin.php b/application/city/classes/login/class_CityGuestLogin.php
index 11a938ffb1eb8f55ff812568385e831d9aab6cd4..775b8abc65659ac2da75d50345f58be7ffa61483 100644 (file)
--- a/application/city/classes/login/class_CityGuestLogin.php
+++ b/application/city/classes/login/class_CityGuestLogin.php
@@ -1,4 +1,18 @@
 <?php
+// Own namespace
+namespace Org\Mxchange\City\Login\Guest;
+
+// Import framework stuff
+use Org\Mxchange\CoreFramework\Auth\LoginableUser;
+use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
+use Org\Mxchange\CoreFramework\Factory\User\UserFactory;
+use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
+use Org\Mxchange\CoreFramework\Registry\Registerable;
+use Org\Mxchange\CoreFramework\Request\Requestable;
+use Org\Mxchange\CoreFramework\Response\Responseable;
+
 /**
  * A special guest login class for City
  *
@@ -66,7 +80,7 @@ class CityGuestLogin extends BaseFrameworkSystem implements LoginableUser, Regis
                $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) {
@@ -102,7 +116,7 @@ class CityGuestLogin extends BaseFrameworkSystem implements LoginableUser, Regis
         */
        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;
@@ -117,21 +131,21 @@ class CityGuestLogin extends BaseFrameworkSystem implements LoginableUser, Regis
         */
        public function encryptPassword ($requestKey) {
                // Check if password is found in request
-               if ($this->getRequestInstance()->isRequestElementSet($requestKey)) {
+               if (FrameworkBootstrap::getRequestInstance()->isRequestElementSet($requestKey)) {
                        // So encrypt the password and store it for later usage in
                        // the request:
 
                        // Get the plain password
-                       $plainPassword = $this->getRequestInstance()->getRequestElement($requestKey);
+                       $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());
 
                        // Store the hash back in request
-                       $this->getRequestInstance()->setRequestElement('pass_hash', $this->hashedPassword);
+                       FrameworkBootstrap::getRequestInstance()->setRequestElement('pass_hash', $this->hashedPassword);
                } // END - if
        }
 }