X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Ffilter%2Fverifier%2Fclass_AccountPasswordVerifierFilter.php;h=4aac8994ca7e81a1b6ee6223edc4a5907ee429b9;hb=f2e5c734f1b1397a95d517094152da14b136b5a1;hp=a1ec524b68b080d90773f47e2313e7bc833eacd9;hpb=320f6fb9f38e76152249af1657b624bc43a2a877;p=core.git

diff --git a/inc/classes/main/filter/verifier/class_AccountPasswordVerifierFilter.php b/inc/classes/main/filter/verifier/class_AccountPasswordVerifierFilter.php
index a1ec524b..4aac8994 100644
--- a/inc/classes/main/filter/verifier/class_AccountPasswordVerifierFilter.php
+++ b/inc/classes/main/filter/verifier/class_AccountPasswordVerifierFilter.php
@@ -3,11 +3,11 @@
  * A concrete filter for validating the password. This filter may intercept
  * the filter chain if no password is given or the password is invalid
  *
- * @author		Roland Haeder <webmaster@ship-simu.org>
+ * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, this is free software
+ * @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
@@ -36,9 +36,9 @@ class AccountPasswordVerifierFilter extends BaseFilter implements Filterable {
 	/**
 	 * Creates an instance of this filter class
 	 *
-	 * @return	$filterInstance			An instance of this filter class
+	 * @return	$filterInstance		An instance of this filter class
 	 */
-	public final static function createAccountPasswordVerifierFilter () {
+	public static final function createAccountPasswordVerifierFilter () {
 		// Get a new instance
 		$filterInstance = new AccountPasswordVerifierFilter();
 
@@ -53,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) {
@@ -67,26 +68,26 @@ class AccountPasswordVerifierFilter extends BaseFilter implements Filterable {
 			// Is the password still not set?
 			if (is_null($password)) {
 				// Not found in form so stop the filtering process
-				$requestInstance->requestIsValid(false);
+				$requestInstance->requestIsValid(FALSE);
 
 				// Add a message to the response
 				$responseInstance->addFatalMessage('password_unset');
 
 				// Abort here
-				return false;
+				throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
 			} // END - if
 		} // END - if
 
 		if (empty($password)) {
 			// Password is empty
-			$requestInstance->requestIsValid(false);
+			$requestInstance->requestIsValid(FALSE);
 
 			// Add a message to the response
 			$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');