Opps, forgot this.

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

diff --git a/inc/classes/main/filter/verifier/class_AccountPasswordVerifierFilter.php b/inc/classes/main/filter/verifier/class_AccountPasswordVerifierFilter.php
index 35f38cee37dbb0c1e1e80a11d72df1857ef7a3cb..80ca36fd5c3cde9e7f5ff525267fd53452d71e7d 100644 (file)
--- 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 - 2009 Roland Haeder, this is free software
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 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');