X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Ffilter%2Fverifier%2Fclass_UserUnconfirmedVerifierFilter.php;h=e4111834bf14ab4adac7f3fed6bea3bce021c6fb;hp=4db5a2948c06a6e8775b88fbf51309fb65791a7a;hb=HEAD;hpb=a60894f1d6ef33613d2d0351075aa07aa257f304

diff --git a/framework/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php b/framework/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php
index 4db5a294..46ea0c1f 100644
--- a/framework/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php
+++ b/framework/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php
@@ -3,10 +3,12 @@
 namespace Org\Mxchange\CoreFramework\Filter\Verifier\User;
 
 // Import framework stuff
-use Org\Mxchange\CoreFramework\Database\Frontend\User\UserDatabaseWrapper;
+use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
+use Org\Mxchange\CoreFramework\Database\Frontend\User\UserDatabaseFrontend;
+use Org\Mxchange\CoreFramework\Factory\User\UserFactory;
 use Org\Mxchange\CoreFramework\Filter\BaseFilter;
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
+use Org\Mxchange\CoreFramework\Registry\Object\ObjectRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -15,7 +17,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @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 +40,7 @@ class UserUnconfirmedVerifierFilter extends BaseFilter implements Filterable {
 	 *
 	 * @return	void
 	 */
-	protected function __construct () {
+	private function __construct () {
 		// Call parent constructor
 		parent::__construct(__CLASS__);
 	}
@@ -70,29 +72,29 @@ class UserUnconfirmedVerifierFilter extends BaseFilter implements Filterable {
 		// Is the email address valid?
 		if ($userInstance->ifEmailAddressExists() === false) {
 			// Request is invalid!
-			$requestInstance->requestIsValid(false);
+			$requestInstance->setIsRequestValid(FALSE);
 
 			// Redirect to configured URL
 			$responseInstance->redirectToConfiguredUrl('user_unconfirmed_email_missing');
 
 			// Stop processing here
 			exit();
-		} // END - if
+		}
 
 		// Is the user account confirmed?
-		if ($userInstance->getField(UserDatabaseWrapper::DB_COLUMN_USER_STATUS) != $this->getConfigInstance()->getConfigEntry('user_status_unconfirmed')) {
+		if ($userInstance->getField(UserDatabaseFrontend::DB_COLUMN_USER_STATUS) != FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('user_status_unconfirmed')) {
 			// Request is invalid!
-			$requestInstance->requestIsValid(false);
+			$requestInstance->setIsRequestValid(FALSE);
 
 			// Redirect to configured URL
 			$responseInstance->redirectToConfiguredUrl('user_not_unconfirmed');
 
 			// Stop processing here
 			exit();
-		} // END - if
+		}
 
 		// Add this instance to registry
-		GenericRegistry::getRegistry()->addInstance('user', $userInstance);
+		ObjectRegistry::getRegistry('generic')->addInstance('user', $userInstance);
 	}
 
 }