X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fclasses%2Fmain%2Ffilter%2Fverifier%2Fclass_ConfirmCodeVerifierFilter.php;h=4e87d6c1f3cc7d75ef971a4f4d3164cd92e2a87f;hb=1ee35e6d96c456b8e3499bd683f1647aa28bd501;hp=8f4264041effdaca4a67caf40ae50b4f0053ac0c;hpb=361e6320e50a8bb1a3ccb675388b8042361669ae;p=core.git

diff --git a/inc/classes/main/filter/verifier/class_ConfirmCodeVerifierFilter.php b/inc/classes/main/filter/verifier/class_ConfirmCodeVerifierFilter.php
index 8f426404..4e87d6c1 100644
--- a/inc/classes/main/filter/verifier/class_ConfirmCodeVerifierFilter.php
+++ b/inc/classes/main/filter/verifier/class_ConfirmCodeVerifierFilter.php
@@ -2,11 +2,11 @@
 /**
  * A filter for checking if supplied confirmation code is valid.
  *
- * @author		Roland Haeder <webmaster@ship-simu.org>
+ * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007 - 2009 Roland Haeder, this is free software
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2014 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
@@ -35,9 +35,9 @@ class ConfirmCodeVerifierFilter 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 createConfirmCodeVerifierFilter () {
+	public static final function createConfirmCodeVerifierFilter () {
 		// Get a new instance
 		$filterInstance = new ConfirmCodeVerifierFilter();
 
@@ -51,7 +51,7 @@ class ConfirmCodeVerifierFilter 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	NullPointerException	If the user instance from registry is null
+	 * @throws	FilterChainException	If this filter fails to operate
 	 */
 	public function execute (Requestable $requestInstance, Responseable $responseInstance) {
 		// Get confirmation code from request
@@ -60,40 +60,34 @@ class ConfirmCodeVerifierFilter extends BaseFilter implements Filterable {
 		// Is this code set?
 		if (is_null($confirmCode)) {
 			// Is not in request
-			$requestInstance->requestIsValid(false);
+			$requestInstance->requestIsValid(FALSE);
 
 			// Add a message to the response
 			$responseInstance->addFatalMessage('confirm_code_unset');
 
 			// Abort here
-			return false;
+			throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
 		} elseif (empty($confirmCode)) {
 			// Email is empty
-			$requestInstance->requestIsValid(false);
+			$requestInstance->requestIsValid(FALSE);
 
 			// Add a message to the response
 			$responseInstance->addFatalMessage('confirm_code_empty');
 
 			// Abort here
-			return false;
+			throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
 		}
 
 		// Get a user instance from registry
 		$userInstance = Registry::getRegistry()->getInstance('user');
 
-		// Is the instance there?
-		if (is_null($userInstance)) {
-			// Throw an exception here
-			throw new NullPointerException ($this, self::EXCEPTION_IS_NULL_POINTER);
-		} // END - if
-
 		// Get the confirm code from user for comparison
 		$userCode = $userInstance->getField(UserDatabaseWrapper::DB_COLUMN_CONFIRM_HASH);
 
 		// Do we have the same code or different?
 		if ($userCode != $confirmCode) {
 			// Email is empty
-			$requestInstance->requestIsValid(false);
+			$requestInstance->requestIsValid(FALSE);
 
 			// Redirect to error page
 			$responseInstance->redirectToConfiguredUrl('confirm_code_invalid');