Continued:

[core.git] / framework / main / classes / filter / verifier / class_AccountPasswordVerifierFilter.php

diff --git a/framework/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php b/framework/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php
index 8e4c0b807a82c02dd22d429183105226cc1ed33b..0d8dfbd518f2481a3e72a1d0b25e1bf33397443d 100644 (file)
--- a/framework/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php
+++ b/framework/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php
@@ -4,9 +4,11 @@ namespace Org\Mxchange\CoreFramework\Filter\Verifier\Password;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filter\BaseFilter;
+use Org\Mxchange\CoreFramework\Filter\Chain\FilterChainException;
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
+use Org\Mxchange\CoreFramework\Helper\Crypto\CryptoHelper;
+use Org\Mxchange\CoreFramework\Registry\Object\ObjectRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 use Org\Mxchange\CoreFramework\User\BaseUser;
@@ -17,7 +19,7 @@ use Org\Mxchange\CoreFramework\User\BaseUser;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2023 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -40,7 +42,7 @@ class AccountPasswordVerifierFilter extends BaseFilter implements Filterable {
         *
         * @return      void
         */
-       protected function __construct () {
+       private function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
        }
@@ -80,41 +82,41 @@ class AccountPasswordVerifierFilter extends BaseFilter implements Filterable {
                        // Is the password still not set?
                        if (is_null($password)) {
                                // Not found in form so stop the filtering process
-                               $requestInstance->requestIsValid(false);
+                               $requestInstance->setIsRequestValid(FALSE);
 
                                // Add a message to the response
                                $responseInstance->addFatalMessage('password_unset');
 
                                // Abort here
                                throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
-                       } // END - if
-               } // END - if
+                       }
+               }
 
                if (empty($password)) {
                        // Password is empty
-                       $requestInstance->requestIsValid(false);
+                       $requestInstance->setIsRequestValid(FALSE);
 
                        // Add a message to the response
                        $responseInstance->addFatalMessage('password_empty');
 
                        // Abort here
                        throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
-               } // END - if
+               }
 
                // Get a user instance
-               $userInstance = GenericRegistry::getRegistry()->getInstance('user');
+               $userInstance = ObjectRegistry::getRegistry('generic')->getInstance('user');
 
                // Get current hash
                $currentHash = $userInstance->getField('pass_hash');
 
                // Get an encryption helper and encrypt the password
-               $passHash = ObjectFactory::createObjectByConfiguredName('crypto_class')->hashString($password, $currentHash);
+               $passHash = CryptoHelper::getSelfInstance()->hashString($password, $currentHash);
 
                // Does it match?
                if ($currentHash != $passHash) {
                        // Throw an exception here to stop the proccessing
                        throw new AccountPasswordMismatchException($this, BaseUser::EXCEPTION_USER_PASS_MISMATCH);
-               } // END - if
+               }
        }
 
 }