Changed all true/false to TRUE/FALSE respectively as PHP constants are better than...

[core.git] / inc / classes / main / filter / validator / class_PasswordValidatorFilter.php

diff --git a/inc/classes/main/filter/validator/class_PasswordValidatorFilter.php b/inc/classes/main/filter/validator/class_PasswordValidatorFilter.php
index 2591f1ea78efc2a4af1a0e65c452dcbeb9b11118..b421fe5e040b53ed216ea39e5713d15bd843f3c2 100644 (file)
--- a/inc/classes/main/filter/validator/class_PasswordValidatorFilter.php
+++ b/inc/classes/main/filter/validator/class_PasswordValidatorFilter.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 - 2012 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -36,16 +36,12 @@ class PasswordValidatorFilter 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 createPasswordValidatorFilter (Controller $controllerInstance) {
+       public static final function createPasswordValidatorFilter () {
                // Get a new instance
                $filterInstance = new PasswordValidatorFilter();
 
-               // Set the controller
-               $filterInstance->setControllerInstance($controllerInstance);
-
                // Return the instance
                return $filterInstance;
        }
@@ -56,6 +52,7 @@ class PasswordValidatorFilter 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      FilterChainException    If this filter fails to operate
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get passwords
@@ -65,16 +62,16 @@ class PasswordValidatorFilter extends BaseFilter implements Filterable {
                // Is the password still not set?
                if ((is_null($password1)) || (is_null($password2))) {
                        // 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);
                } elseif ((empty($password1)) || (empty($password2))) {
                        // Password is empty
-                       $requestInstance->requestIsValid(false);
+                       $requestInstance->requestIsValid(FALSE);
 
                        // Is the password empty?
                        if (empty($password1)) {
@@ -89,16 +86,16 @@ class PasswordValidatorFilter extends BaseFilter implements Filterable {
                        } // END - if
 
                        // Abort here
-                       return false;
+                       throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
                } elseif ($password1 != $password2) {
                        // Passwords didn't match
-                       $requestInstance->requestIsValid(false);
+                       $requestInstance->requestIsValid(FALSE);
 
                        // Add a message to the response
                        $responseInstance->addFatalMessage('pass_mismatch');
 
                        // Abort here
-                       return false;
+                       throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
                } // END - elseif
        }
 }