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 4bda7caf7476cdb85fdc585030ccb14c3f0b59f9..0400ef9e5d575c611f7cb449efa734f298503a0e 100644 (file)
--- a/application/city/classes/registration/class_CityRegistration.php
+++ b/application/city/classes/registration/class_CityRegistration.php
@@ -3,7 +3,13 @@
 namespace Org\Mxchange\City\Registration;
 
 // Import framework stuff
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
+use Org\Mxchange\CoreFramework\Criteria\Storing\StoreableCriteria;
+use Org\Mxchange\CoreFramework\Database\Frontend\User\UserDatabaseFrontend;
+use Org\Mxchange\CoreFramework\Factory\Database\Frontend\DatabaseFrontendFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
+use Org\Mxchange\CoreFramework\Registration\BaseRegistration;
+use Org\Mxchange\CoreFramework\Registration\User\UserRegister;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 
 /**
@@ -11,7 +17,7 @@ use Org\Mxchange\CoreFramework\Request\Requestable;
  *
  * @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
  *
@@ -91,18 +97,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);
                }
        }
 
@@ -126,11 +132,11 @@ class CityRegistration extends BaseRegistration implements UserRegister {
         * @todo        Maybe add more things to perform
         */
        public function registerNewUser () {
-               // Get a user database wrapper
-               $wrapperInstance = DatabaseWrapperFactory::createWrapperByConfiguredName('user_db_wrapper_class');
+               // Get a user database frontend
+               $frontendInstance = DatabaseFrontendFactory::createFrontendByConfiguredName('user_db_frontend_class');
 
                // Use this instance to insert the whole registration instance
-               $wrapperInstance->insertRegistrationObject($this);
+               $frontendInstance->insertRegistrationObject($this);
        }
 
        /**
@@ -156,7 +162,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(), FrameworkBootstrap::getResponseInstance());
        }
 
        /**
@@ -171,45 +177,42 @@ class CityRegistration extends BaseRegistration implements UserRegister {
                $configEntry = 'user_status_unconfirmed';
 
                // Is the confirmation process entirely disabled?
-               if ($this->getConfigInstance()->getConfigEntry('confirm_email_enabled') === 'N') {
+               if (FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('confirm_email_enabled') === 'N') {
                        // No confirmation of email needed
                        $configEntry = 'user_status_confirmed';
-               } // END - if
+               }
 
                // Add a lot elements to the dataset criteria
                foreach ($this->criteriaElements as $alias => $element) {
                        // 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) == FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('guest_login_user'))) {
                                // Yes, then set the config entry to guest status
                                $configEntry = 'user_status_guest';
-                       } // END - if
-               } // END - foreach
+                       }
+               }
 
                // Mark the username as unique key
-               $criteriaInstance->setUniqueKey(UserDatabaseWrapper::DB_COLUMN_USERNAME);
+               $criteriaInstance->setUniqueKey(UserDatabaseFrontend::DB_COLUMN_USERNAME);
 
                // Add account status as configured
-               $criteriaInstance->addConfiguredCriteria(UserDatabaseWrapper::DB_COLUMN_USER_STATUS, $configEntry);
+               $criteriaInstance->addConfiguredCriteria(UserDatabaseFrontend::DB_COLUMN_USER_STATUS, $configEntry);
 
                // Include registration timestamp
                $criteriaInstance->addCriteria('registered', date('Y-m-d H:i:s', time()));
        }
 }
-
-//
-?>