Copyright updated

[core.git] / inc / classes / main / filter / verifier / class_ConfirmCodeVerifierFilter.php

diff --git a/inc/classes/main/filter/verifier/class_ConfirmCodeVerifierFilter.php b/inc/classes/main/filter/verifier/class_ConfirmCodeVerifierFilter.php
index 09a13d0134fe78ae68b0e776ca8e0f8704c49c2f..112e63bc069f33da13d261a7578f2aee055d0d41 100644 (file)
--- a/inc/classes/main/filter/verifier/class_ConfirmCodeVerifierFilter.php
+++ b/inc/classes/main/filter/verifier/class_ConfirmCodeVerifierFilter.php
@@ -4,7 +4,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 - 2012 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -35,16 +35,12 @@ class ConfirmCodeVerifierFilter 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 createConfirmCodeVerifierFilter (Controller $controllerInstance) {
+       public static final function createConfirmCodeVerifierFilter () {
                // Get a new instance
                $filterInstance = new ConfirmCodeVerifierFilter();
 
-               // Set the controller
-               $filterInstance->setControllerInstance($controllerInstance);
-
                // Return the instance
                return $filterInstance;
        }
@@ -55,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
@@ -70,7 +66,7 @@ class ConfirmCodeVerifierFilter extends BaseFilter implements Filterable {
                        $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);
@@ -79,18 +75,12 @@ class ConfirmCodeVerifierFilter extends BaseFilter implements Filterable {
                        $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);
 
@@ -100,7 +90,7 @@ class ConfirmCodeVerifierFilter extends BaseFilter implements Filterable {
                        $requestInstance->requestIsValid(false);
 
                        // Redirect to error page
-                       $responseInstance->redirectToConfiguredUrl('confirm_code_invalid_url');
+                       $responseInstance->redirectToConfiguredUrl('confirm_code_invalid');
 
                        // Stop processing here
                        exit();