X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Ffilter%2Fchange%2Fclass_PasswordChangeFilter.php;h=9693f6ced90ee65b65f6e30380e8a24c59115833;hp=25844175c591222755a17a08961fd0d98d22288f;hb=5203f9bd014ad46fbc7ee54e7223dcd46e14e3b4;hpb=0cd57c3885f00ad77fc599e53ed2f2d5e7ac267f

diff --git a/inc/classes/main/filter/change/class_PasswordChangeFilter.php b/inc/classes/main/filter/change/class_PasswordChangeFilter.php
index 25844175..9693f6ce 100644
--- a/inc/classes/main/filter/change/class_PasswordChangeFilter.php
+++ b/inc/classes/main/filter/change/class_PasswordChangeFilter.php
@@ -2,11 +2,11 @@
 /**
  * A filter for password change detection
  *
- * @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 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 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
@@ -38,7 +38,7 @@ class PasswordChangeFilter extends BaseFilter implements Filterable {
 	 * @param	$controllerInstance		An instance of a controller class
 	 * @return	$filterInstance			An instance of this filter class
 	 */
-	public final static function createPasswordChangeFilter () {
+	public static final function createPasswordChangeFilter () {
 		// Get a new instance
 		$filterInstance = new PasswordChangeFilter();
 
@@ -53,6 +53,7 @@ class PasswordChangeFilter extends BaseFilter implements Filterable {
 	 * @param	$responseInstance	An instance of a class with an Responseable interface
 	 * @return	void
 	 * @todo	Finished updating user password hash here. HINT: Use the User class again.
+	 * @throws	FilterChainException	If this filter fails to operate
 	 */
 	public function execute (Requestable $requestInstance, Responseable $responseInstance) {
 		// Get both passwords
@@ -62,50 +63,50 @@ class PasswordChangeFilter extends BaseFilter implements Filterable {
 		// Is only first email set?
 		if ((!empty($pass1)) && (empty($pass2))) {
 			// Request is invalid!
-			$requestInstance->requestIsValid(false);
+			$requestInstance->requestIsValid(FALSE);
 
 			// Email 2 is empty
 			$responseInstance->addFatalMessage('pass2_empty');
 
 			// Stop processing here
-			return false;
+			throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
 		} // END - if
 
 		// Is only second pass set?
 		if ((empty($pass1)) && (!empty($pass2))) {
 			// Request is invalid!
-			$requestInstance->requestIsValid(false);
+			$requestInstance->requestIsValid(FALSE);
 
 			// Email 1 is empty
 			$responseInstance->addFatalMessage('pass1_empty');
 
 			// Stop processing here
-			return false;
+			throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
 		} // END - if
 
 		// Are password and confirmation empty?
 		if ((empty($pass1)) && (empty($pass2))) {
 			// Don't change password here
-			return true;
+			return TRUE;
 		} // END - if
 
 		// Do both match?
 		if ($pass1 != $pass2) {
 			// Request is invalid!
-			$requestInstance->requestIsValid(false);
+			$requestInstance->requestIsValid(FALSE);
 
 			// Emails are mismatching
 			$responseInstance->addFatalMessage('pass_mismatch');
 
 			// Stop processing here
-			return false;
+			throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
 		} // END - if
 
 		// Now, get a user instance for comparison
 		$userInstance = Registry::getRegistry()->getInstance('user');
 
 		// Update the "password" field
-		$this->partialStub("Unfinished part.");
+		$this->partialStub('Unfinished part.');
 	}
 }