X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Ffilter%2Fchange%2Fclass_EmailChangeFilter.php;h=a2de4bbd222af18e79147aa3a90833aecae914a7;hb=027c5659e968546a21be37e70d700c7e14cba993;hp=632607d8ee528145b94bb38fee30e4fe37bdc866;hpb=146c8b3c929a1b0ab17d6605e5ae949ac44899c1;p=core.git

diff --git a/framework/main/classes/filter/change/class_EmailChangeFilter.php b/framework/main/classes/filter/change/class_EmailChangeFilter.php
index 632607d8..a2de4bbd 100644
--- a/framework/main/classes/filter/change/class_EmailChangeFilter.php
+++ b/framework/main/classes/filter/change/class_EmailChangeFilter.php
@@ -1,20 +1,21 @@
 <?php
 // Own namespace
-namespace CoreFramework\Filter\Change\Email;
+namespace Org\Mxchange\CoreFramework\Filter\Change\Email;
 
 // Import framework stuff
-use CoreFramework\Filter\BaseFilter;
-use CoreFramework\Filter\Filterable;
-use CoreFramework\Registry\Registry;
-use CoreFramework\Request\Requestable;
-use CoreFramework\Response\Responseable;
+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\Request\Requestable;
+use Org\Mxchange\CoreFramework\Response\Responseable;
 
 /**
  * A filter for detecting email changes
  *
  * @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
  *
@@ -37,7 +38,7 @@ class EmailChangeFilter extends BaseFilter implements Filterable {
 	 *
 	 * @return	void
 	 */
-	protected function __construct () {
+	private function __construct () {
 		// Call parent constructor
 		parent::__construct(__CLASS__);
 	}
@@ -72,47 +73,47 @@ class EmailChangeFilter extends BaseFilter implements Filterable {
 		// Is only first email set?
 		if ((!empty($email1)) && (empty($email2))) {
 			// Request is invalid!
-			$requestInstance->requestIsValid(false);
+			$requestInstance->setIsRequestValid(FALSE);
 
 			// Email 2 is empty
 			$responseInstance->addFatalMessage('email2_empty');
 
 			// Stop processing here
 			throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
-		} // END - if
+		}
 
 		// Is only second email set?
 		if ((empty($email1)) && (!empty($email2))) {
 			// Request is invalid!
-			$requestInstance->requestIsValid(false);
+			$requestInstance->setIsRequestValid(FALSE);
 
 			// Email 1 is empty
 			$responseInstance->addFatalMessage('email1_empty');
 
 			// Stop processing here
 			throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
-		} // END - if
+		}
 
 		// Do both match?
 		if ($email1 != $email2) {
 			// Request is invalid!
-			$requestInstance->requestIsValid(false);
+			$requestInstance->setIsRequestValid(FALSE);
 
 			// Emails are mismatching
 			$responseInstance->addFatalMessage('emails_mismatch');
 
 			// Stop processing here
 			throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
-		} // END - if
+		}
 
 		// Are email and confirmation empty?
 		if ((empty($email1)) && (empty($email2))) {
 			// No email change required!
 			return true;
-		} // END - if
+		}
 
 		// Now, get a user instance for comparison
-		$userInstance = Registry::getRegistry()->getInstance('user');
+		$userInstance = GenericRegistry::getRegistry()->getInstance('user');
 
 		// Get the email field
 		$userEmail = $userInstance->getField('email');
@@ -121,7 +122,7 @@ class EmailChangeFilter extends BaseFilter implements Filterable {
 		if ($userEmail == $email1) {
 			// Nothing has been changed is fine...
 			return true;
-		} // END - if
+		}
 
 		// Update the "new_email" field
 		$this->partialStub('Unfinished part.');