X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Ffilter%2Fverifier%2Fclass_ConfirmCodeVerifierFilter.php;h=13957c024e727240319201d9b7ff110bd381739a;hp=bbc2f17d50d917a5bb9fcc6d2bb5e04c6f71e077;hb=HEAD;hpb=146c8b3c929a1b0ab17d6605e5ae949ac44899c1

diff --git a/framework/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php b/framework/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php
index bbc2f17d..4490f10b 100644
--- a/framework/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php
+++ b/framework/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php
@@ -1,21 +1,22 @@
 <?php
 // Own namespace
-namespace CoreFramework\Filter\Verifier\Confirmation;
+namespace Org\Mxchange\CoreFramework\Filter\Verifier\Confirmation;
 
 // Import framework stuff
-use CoreFramework\Filter\BaseFilter;
-use CoreFramework\Filter\Filterable;
-use CoreFramework\Registry\Registry;
-use CoreFramework\Request\Requestable;
-use CoreFramework\Response\Responseable;
-use CoreFramework\Wrapper\Database\User\UserDatabaseWrapper;
+use Org\Mxchange\CoreFramework\Database\Frontend\User\UserDatabaseFrontend;
+use Org\Mxchange\CoreFramework\Filter\BaseFilter;
+use Org\Mxchange\CoreFramework\Filter\Chain\FilterChainException;
+use Org\Mxchange\CoreFramework\Filter\Filterable;
+use Org\Mxchange\CoreFramework\Registry\Object\ObjectRegistry;
+use Org\Mxchange\CoreFramework\Request\Requestable;
+use Org\Mxchange\CoreFramework\Response\Responseable;
 
 /**
  * A filter for checking if supplied confirmation code is valid.
  *
  * @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
  *
@@ -38,7 +39,7 @@ class ConfirmCodeVerifierFilter extends BaseFilter implements Filterable {
 	 *
 	 * @return	void
 	 */
-	protected function __construct () {
+	private function __construct () {
 		// Call parent constructor
 		parent::__construct(__CLASS__);
 	}
@@ -48,7 +49,7 @@ class ConfirmCodeVerifierFilter extends BaseFilter implements Filterable {
 	 *
 	 * @return	$filterInstance		An instance of this filter class
 	 */
-	public static final function createConfirmCodeVerifierFilter () {
+	public static final function createConfirmCodeVerifierFilter (): Filterable {
 		// Get a new instance
 		$filterInstance = new ConfirmCodeVerifierFilter();
 
@@ -64,14 +65,14 @@ class ConfirmCodeVerifierFilter extends BaseFilter implements Filterable {
 	 * @return	void
 	 * @throws	FilterChainException	If this filter fails to operate
 	 */
-	public function execute (Requestable $requestInstance, Responseable $responseInstance) {
+	public function execute (Requestable $requestInstance, Responseable $responseInstance): void {
 		// Get confirmation code from request
 		$confirmCode = $requestInstance->getRequestElement('confirm');
 
 		// Is this code set?
 		if (is_null($confirmCode)) {
 			// Is not in request
-			$requestInstance->requestIsValid(false);
+			$requestInstance->setIsRequestValid(FALSE);
 
 			// Add a message to the response
 			$responseInstance->addFatalMessage('confirm_code_unset');
@@ -80,7 +81,7 @@ class ConfirmCodeVerifierFilter extends BaseFilter implements Filterable {
 			throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
 		} elseif (empty($confirmCode)) {
 			// Email is empty
-			$requestInstance->requestIsValid(false);
+			$requestInstance->setIsRequestValid(FALSE);
 
 			// Add a message to the response
 			$responseInstance->addFatalMessage('confirm_code_empty');
@@ -90,22 +91,22 @@ class ConfirmCodeVerifierFilter extends BaseFilter implements Filterable {
 		}
 
 		// Get a user instance from registry
-		$userInstance = Registry::getRegistry()->getInstance('user');
+		$userInstance = ObjectRegistry::getRegistry('generic')->getInstance('user');
 
 		// Get the confirm code from user for comparison
-		$userCode = $userInstance->getField(UserDatabaseWrapper::DB_COLUMN_CONFIRM_HASH);
+		$userCode = $userInstance->getField(UserDatabaseFrontend::DB_COLUMN_CONFIRM_HASH);
 
 		// Do we have the same code or different?
 		if ($userCode != $confirmCode) {
 			// Email is empty
-			$requestInstance->requestIsValid(false);
+			$requestInstance->setIsRequestValid(FALSE);
 
 			// Redirect to error page
 			$responseInstance->redirectToConfiguredUrl('confirm_code_invalid');
 
 			// Stop processing here
 			exit();
-		} // END - if
+		}
 	}
 
 }