X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Ffilter%2Fverifier%2Fclass_AccountPasswordVerifierFilter.php;h=80f38d13e310232fd75bbf36e1b1475e14908c17;hb=4b88c118b615335d06bd74e444173d21aef4406c;hp=44fdcfc9f574399893f43ec11cc18f04f0cf71ed;hpb=c6d73b0e3246efc824cb98338d4be7ee5bc9f308;p=core.git

diff --git a/inc/classes/main/filter/verifier/class_AccountPasswordVerifierFilter.php b/inc/classes/main/filter/verifier/class_AccountPasswordVerifierFilter.php
index 44fdcfc9..80f38d13 100644
--- a/inc/classes/main/filter/verifier/class_AccountPasswordVerifierFilter.php
+++ b/inc/classes/main/filter/verifier/class_AccountPasswordVerifierFilter.php
@@ -5,7 +5,7 @@
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, this is free software
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -36,16 +36,12 @@ class AccountPasswordVerifierFilter extends BaseFilter implements Filterable {
 	/**
 	 * Creates an instance of this filter class
 	 *
-	 * @param	$controllerInstance		An instance of a Controller class
 	 * @return	$filterInstance			An instance of this filter class
 	 */
-	public final static function createAccountPasswordVerifierFilter (Controller $controllerInstance) {
+	public static final function createAccountPasswordVerifierFilter () {
 		// Get a new instance
 		$filterInstance = new AccountPasswordVerifierFilter();
 
-		// Set the controller
-		$filterInstance->setControllerInstance($controllerInstance);
-
 		// Return the instance
 		return $filterInstance;
 	}
@@ -57,6 +53,7 @@ class AccountPasswordVerifierFilter extends BaseFilter implements Filterable {
 	 * @param	$responseInstance	An instance of a class with an Responseable interface
 	 * @return	void
 	 * @throws	AccountPasswordMismatchException	If the account password does not match
+	 * @throws	FilterChainException				If this filter fails to operate
 	 * @todo	Rewrite handling of different password fields
 	 */
 	public function execute (Requestable $requestInstance, Responseable $responseInstance) {
@@ -77,7 +74,7 @@ class AccountPasswordVerifierFilter extends BaseFilter implements Filterable {
 				$responseInstance->addFatalMessage('password_unset');
 
 				// Abort here
-				return false;
+				throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
 			} // END - if
 		} // END - if
 
@@ -89,8 +86,8 @@ class AccountPasswordVerifierFilter extends BaseFilter implements Filterable {
 			$responseInstance->addFatalMessage('password_empty');
 
 			// Abort here
-			return false;
-		}
+			throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
+		} // END - if
 
 		// Get a user instance
 		$userInstance = Registry::getRegistry()->getInstance('user');