Continued:

[city.git] / application / city / classes / registration / class_CityRegistration.php

diff --git a/application/city/classes/registration/class_CityRegistration.php b/application/city/classes/registration/class_CityRegistration.php
index f20f9ebed3df77514f4b62f7d3ddff272861df83..b9fc81518048c3f78c8cbbee7a47f64217b0d13b 100644 (file)
--- a/application/city/classes/registration/class_CityRegistration.php
+++ b/application/city/classes/registration/class_CityRegistration.php
@@ -3,7 +3,9 @@
 namespace Org\Mxchange\City\Registration;
 
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 use Org\Mxchange\CoreFramework\Criteria\Storing\StoreableCriteria;
+use Org\Mxchange\CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 
@@ -92,18 +94,18 @@ class CityRegistration extends BaseRegistration implements UserRegister {
         */
        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:
 
                        // 1.: Get the plain password
-                       $plainPassword = $this->getRequestInstance()->getRequestElement($requestKey);
+                       $plainPassword = FrameworkBootstrap::getRequestInstance()->getRequestElement($requestKey);
 
                        // 2. Get a crypto helper and hash the password
                        $this->hashedPassword = ObjectFactory::createObjectByConfiguredName('crypto_class')->hashString($plainPassword);
 
                        // 3. Store the hash back in request
-                       $this->getRequestInstance()->setRequestElement('pass_hash', $this->hashedPassword);
+                       FrameworkBootstrap::getRequestInstance()->setRequestElement('pass_hash', $this->hashedPassword);
                }
        }
 
@@ -157,7 +159,7 @@ class CityRegistration extends BaseRegistration implements UserRegister {
                $actionInstance = ObjectFactory::createObjectByConfiguredName('post_registration_class');
 
                // Execute the action
-               $actionInstance->execute($this->getRequestInstance(), $this->getResponseInstance());
+               $actionInstance->execute(FrameworkBootstrap::getRequestInstance(), $this->getResponseInstance());
        }
 
        /**
@@ -182,20 +184,20 @@ class CityRegistration extends BaseRegistration implements UserRegister {
                        // Do we have an alias?
                        if (is_string($alias)) {
                                // Yes, so use it
-                               $criteriaInstance->addCriteria($alias, $this->getRequestInstance()->getRequestElement($element));
+                               $criteriaInstance->addCriteria($alias, FrameworkBootstrap::getRequestInstance()->getRequestElement($element));
 
                                // Debug message
-                               //* DEBUG: */ $this->debugOutput('ALIAS: alias='.$alias.',element='.$element.'='.$this->getRequestInstance()->getRequestElement($element));
+                               //* DEBUG: */ $this->debugOutput('ALIAS: alias='.$alias.',element='.$element.'='.FrameworkBootstrap::getRequestInstance()->getRequestElement($element));
                        } else {
                                // No, default entry
-                               $criteriaInstance->addCriteria($element, $this->getRequestInstance()->getRequestElement($element));
+                               $criteriaInstance->addCriteria($element, FrameworkBootstrap::getRequestInstance()->getRequestElement($element));
 
                                // Debug message
-                               //* DEBUG: */ $this->debugOutput('DEFAULT: element='.$element.'='.$this->getRequestInstance()->getRequestElement($element));
+                               //* DEBUG: */ $this->debugOutput('DEFAULT: element='.$element.'='.FrameworkBootstrap::getRequestInstance()->getRequestElement($element));
                        }
 
                        // Is this a guest account?
-                       if ((($element == 'username') || ($alias == 'username')) && ($this->getRequestInstance()->getRequestElement($element) == $this->getConfigInstance()->getConfigEntry('guest_login_user'))) {
+                       if ((($element == 'username') || ($alias == 'username')) && (FrameworkBootstrap::getRequestInstance()->getRequestElement($element) == $this->getConfigInstance()->getConfigEntry('guest_login_user'))) {
                                // Yes, then set the config entry to guest status
                                $configEntry = 'user_status_guest';
                        } // END - if