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 14aab5807de2da780be24e083d0232e359b6da4c..de877222bcb7df5d2631261b7fdd74bc099ac374 100644 (file)
--- a/application/city/classes/login/class_CityGuestLogin.php
+++ b/application/city/classes/login/class_CityGuestLogin.php
@@ -3,7 +3,13 @@
 namespace Org\Mxchange\City\Login\Guest;
 
 // Import framework stuff
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+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;
 
@@ -12,7 +18,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2015, 2016 City Developer Team
+ * @copyright  Copyright (c) 2015 - 2023 City Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -74,13 +80,13 @@ 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) {
                        // Mismatching password
                        throw new UserPasswordMismatchException(array($this, $userInstance), BaseUser::EXCEPTION_USER_PASS_MISMATCH);
-               } // END - if
+               }
 
                // Now do the real login. This can be cookie- or session-based login
                // which depends on the admins setting then on the user's taste.
@@ -110,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;
@@ -125,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);
-               } // END - if
+                       FrameworkBootstrap::getRequestInstance()->setRequestElement('pass_hash', $this->hashedPassword);
+               }
        }
 }