X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Ffilter%2Fvalidator%2Fclass_EmailValidatorFilter.php;h=e9f8aa478d50b85c32077a2ff88448d1a6211e0c;hb=HEAD;hp=da354037262ef8411c8a261d9fe87bd842439a0e;hpb=5c7840de0bf7ae2fdfe90f283c91711e38368134;p=core.git

diff --git a/framework/main/classes/filter/validator/class_EmailValidatorFilter.php b/framework/main/classes/filter/validator/class_EmailValidatorFilter.php
index da354037..01b631d6 100644
--- a/framework/main/classes/filter/validator/class_EmailValidatorFilter.php
+++ b/framework/main/classes/filter/validator/class_EmailValidatorFilter.php
@@ -7,7 +7,7 @@ use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 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\Registry\Object\ObjectRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -19,7 +19,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 - 2022 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
  *
@@ -73,7 +73,7 @@ class EmailValidatorFilter extends BaseFilter implements Filterable {
 		$email = $requestInstance->getRequestElement('email');
 
 		// Is the Email set?
-		if ((is_null($email)) || (FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('register_email_unique') == 'Y')) {
+		if ((is_null($email)) || (FrameworkBootstrap::getConfigurationInstance()->isEnabled('register_email_unique'))) {
 			// Try it again
 			$email1 = $requestInstance->getRequestElement('email1');
 			$email2 = $requestInstance->getRequestElement('email2');
@@ -81,7 +81,7 @@ class EmailValidatorFilter extends BaseFilter implements Filterable {
 			// Is the email still not set?
 			if ((is_null($email1)) || (is_null($email2))) {
 				// Not found in form so stop the filtering process
-				$requestInstance->requestIsValid(false);
+				$requestInstance->setIsRequestValid(FALSE);
 
 				// Add a message to the response
 				$responseInstance->addFatalMessage('email_unset');
@@ -90,7 +90,7 @@ class EmailValidatorFilter extends BaseFilter implements Filterable {
 				throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
 			} elseif ((empty($email1)) || (empty($email2))) {
 				// Email is empty
-				$requestInstance->requestIsValid(false);
+				$requestInstance->setIsRequestValid(FALSE);
 
 				// Is the email empty?
 				if (empty($email1)) {
@@ -108,7 +108,7 @@ class EmailValidatorFilter extends BaseFilter implements Filterable {
 				throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
 			} elseif ($this->ifEmailIsTaken($email1)) {
 				// Email is already taken
-				$requestInstance->requestIsValid(false);
+				$requestInstance->setIsRequestValid(FALSE);
 
 				// Add a message to the response
 				$responseInstance->addFatalMessage('email_taken');
@@ -117,7 +117,7 @@ class EmailValidatorFilter extends BaseFilter implements Filterable {
 				throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
 			} elseif ($email1 != $email2) {
 				// Emails didn't match
-				$requestInstance->requestIsValid(false);
+				$requestInstance->setIsRequestValid(FALSE);
 
 				// Add a message to the response
 				$responseInstance->addFatalMessage('emails_mismatch');
@@ -127,7 +127,7 @@ class EmailValidatorFilter extends BaseFilter implements Filterable {
 			}
 		} elseif (empty($email)) {
 			// Empty field!
-			$requestInstance->requestIsValid(false);
+			$requestInstance->setIsRequestValid(FALSE);
 
 			// Add a message to the response
 			$responseInstance->addFatalMessage('email_empty');
@@ -143,7 +143,7 @@ class EmailValidatorFilter extends BaseFilter implements Filterable {
 	 * @param	$email			Email to check for existence
 	 * @return	$alreadyTaken	Whether the email has been taken
 	 */
-	private function ifEmailIsTaken ($email) {
+	private function ifEmailIsTaken (string $email) {
 		// Default is already taken
 		$alreadyTaken = true;
 
@@ -151,7 +151,7 @@ class EmailValidatorFilter extends BaseFilter implements Filterable {
 		$userInstance = NULL;
 
 		// Get a registry instance
-		$registryInstance = GenericRegistry::getRegistry();
+		$registryInstance = ObjectRegistry::getRegistry('generic');
 
 		// Is the user already there?
 		if ($registryInstance->instanceExists('user')) {