X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Ffilter%2Fchange%2Fclass_PasswordChangeFilter.php;h=f1c49da0ffdebdcab833401146c7d307faa66e61;hb=HEAD;hp=1a7ecdaab5648eb6bcc643647f8badddd8b7eef7;hpb=b002c5909aa0f781505dde5414964b0f014cde01;p=core.git diff --git a/framework/main/classes/filter/change/class_PasswordChangeFilter.php b/framework/main/classes/filter/change/class_PasswordChangeFilter.php index 1a7ecdaa..4d878637 100644 --- a/framework/main/classes/filter/change/class_PasswordChangeFilter.php +++ b/framework/main/classes/filter/change/class_PasswordChangeFilter.php @@ -4,8 +4,10 @@ namespace Org\Mxchange\CoreFramework\Filter\Change\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\Registry\GenericRegistry; +use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware; +use Org\Mxchange\CoreFramework\Registry\Object\ObjectRegistry; use Org\Mxchange\CoreFramework\Request\Requestable; use Org\Mxchange\CoreFramework\Response\Responseable; @@ -14,7 +16,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @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 * @@ -37,7 +39,7 @@ class PasswordChangeFilter extends BaseFilter implements Filterable { * * @return void */ - protected function __construct () { + private function __construct () { // Call parent constructor parent::__construct(__CLASS__); } @@ -73,50 +75,50 @@ class PasswordChangeFilter extends BaseFilter implements Filterable { // Is only first email set? if ((!empty($pass1)) && (empty($pass2))) { // Request is invalid! - $requestInstance->requestIsValid(false); + $requestInstance->setIsRequestValid(FALSE); // Email 2 is empty $responseInstance->addFatalMessage('pass2_empty'); // Stop processing here throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED); - } // END - if + } // Is only second pass set? if ((empty($pass1)) && (!empty($pass2))) { // Request is invalid! - $requestInstance->requestIsValid(false); + $requestInstance->setIsRequestValid(FALSE); // Email 1 is empty $responseInstance->addFatalMessage('pass1_empty'); // Stop processing here throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED); - } // END - if + } // Are password and confirmation empty? if ((empty($pass1)) && (empty($pass2))) { // Don't change password here return true; - } // END - if + } // Do both match? if ($pass1 != $pass2) { // Request is invalid! - $requestInstance->requestIsValid(false); + $requestInstance->setIsRequestValid(FALSE); // Emails are mismatching $responseInstance->addFatalMessage('pass_mismatch'); // Stop processing here throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED); - } // END - if + } // Now, get a user instance for comparison - $userInstance = GenericRegistry::getRegistry()->getInstance('user'); + $userInstance = ObjectRegistry::getRegistry('generic')->getInstance('user'); // Update the "password" field - $this->partialStub('Unfinished part.'); + DebugMiddleware::getSelfInstance()->partialStub('Unfinished part.'); } }