X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Ffilter%2Fchange%2Fclass_EmailChangeFilter.php;h=a46d3d6e913e9c3a8704a62f3c1c922bb7a1f5ee;hp=f4bb048ccba50179a7edd5767685e2fb02168d32;hb=fdc6a02b5e6c2155cda61fcc345c7583b734ab85;hpb=607a11e2c22949ea0647568c17d62a605595e83b

diff --git a/inc/classes/main/filter/change/class_EmailChangeFilter.php b/inc/classes/main/filter/change/class_EmailChangeFilter.php
index f4bb048c..a46d3d6e 100644
--- a/inc/classes/main/filter/change/class_EmailChangeFilter.php
+++ b/inc/classes/main/filter/change/class_EmailChangeFilter.php
@@ -2,11 +2,11 @@
 /**
  * A filter for detecting email changes
  *
- * @author		Roland Haeder <webmaster@ship-simu.org>
+ * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2013 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
- * @link		http://www.ship-simu.org
+ * @link		http://www.shipsimu.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -51,6 +51,7 @@ class EmailChangeFilter extends BaseFilter implements Filterable {
 	 * @param	$requestInstance	An instance of a class with an Requestable interface
 	 * @param	$responseInstance	An instance of a class with an Responseable interface
 	 * @return	void
+	 * @throws	FilterChainException	If this filter fails to operate
 	 * @todo	Implement email change of the user here. HINT: Use the User class!
 	 */
 	public function execute (Requestable $requestInstance, Responseable $responseInstance) {
@@ -61,43 +62,43 @@ class EmailChangeFilter extends BaseFilter implements Filterable {
 		// Is only first email set?
 		if ((!empty($email1)) && (empty($email2))) {
 			// Request is invalid!
-			$requestInstance->requestIsValid(false);
+			$requestInstance->requestIsValid(FALSE);
 
 			// Email 2 is empty
 			$responseInstance->addFatalMessage('email2_empty');
 
 			// Stop processing here
-			return false;
+			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->requestIsValid(FALSE);
 
 			// Email 1 is empty
 			$responseInstance->addFatalMessage('email1_empty');
 
 			// Stop processing here
-			return false;
+			throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
 		} // END - if
 
 		// Do both match?
 		if ($email1 != $email2) {
 			// Request is invalid!
-			$requestInstance->requestIsValid(false);
+			$requestInstance->requestIsValid(FALSE);
 
 			// Emails are mismatching
 			$responseInstance->addFatalMessage('emails_mismatch');
 
 			// Stop processing here
-			return false;
+			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;
+			return TRUE;
 		} // END - if
 
 		// Now, get a user instance for comparison
@@ -109,11 +110,11 @@ class EmailChangeFilter extends BaseFilter implements Filterable {
 		// Are they different?
 		if ($userEmail == $email1) {
 			// Nothing has been changed is fine...
-			return true;
+			return TRUE;
 		} // END - if
 
 		// Update the "new_email" field
-		$this->partialStub("Unfinished part.");
+		$this->partialStub('Unfinished part.');
 	}
 }