projects
/
core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
All filters rewritten to throw FilterChainException
[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..ba39cdacab44333387c405b93dc5dffa5b74caca 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
*
* @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
- 2009
Roland Haeder, this is free software
* @license GNU GPL 3.0 or any newer version
* @link http://www.ship-simu.org
*
* @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
*
/**
* Creates an instance of this filter class
*
- * @param $controllerInstance An instance of a Controller class
* @return $filterInstance An instance of this filter class
*/
* @return $filterInstance An instance of this filter class
*/
- public final static function createPasswordValidatorFilter (
Controller $controllerInstance
) {
+ public final static function createPasswordValidatorFilter () {
// Get a new instance
$filterInstance = new PasswordValidatorFilter();
// Get a new instance
$filterInstance = new PasswordValidatorFilter();
- // Set the controller
- $filterInstance->setControllerInstance($controllerInstance);
-
// Return the instance
return $filterInstance;
}
// 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
* @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
*/
public function execute (Requestable $requestInstance, Responseable $responseInstance) {
// Get passwords
@@
-71,7
+68,7
@@
class PasswordValidatorFilter extends BaseFilter implements Filterable {
$responseInstance->addFatalMessage('password_unset');
// Abort here
$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);
} elseif ((empty($password1)) || (empty($password2))) {
// Password is empty
$requestInstance->requestIsValid(false);
@@
-89,7
+86,7
@@
class PasswordValidatorFilter extends BaseFilter implements Filterable {
} // END - if
// Abort here
} // 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);
} elseif ($password1 != $password2) {
// Passwords didn't match
$requestInstance->requestIsValid(false);
@@
-98,7
+95,7
@@
class PasswordValidatorFilter extends BaseFilter implements Filterable {
$responseInstance->addFatalMessage('pass_mismatch');
// Abort here
$responseInstance->addFatalMessage('pass_mismatch');
// Abort here
-
return false
;
+
throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED)
;
} // END - elseif
}
}
} // END - elseif
}
}