From: Roland Häder Date: Thu, 20 Nov 2008 19:54:30 +0000 (+0000) Subject: Controller instance shall now be fetched from registry X-Git-Url: https://git.mxchange.org/?p=core.git;a=commitdiff_plain;h=320f6fb9f38e76152249af1657b624bc43a2a877 Controller instance shall now be fetched from registry --- diff --git a/inc/classes/main/filter/auth/class_UserAuthFilter.php b/inc/classes/main/filter/auth/class_UserAuthFilter.php index c2b0ac42..2557816a 100644 --- a/inc/classes/main/filter/auth/class_UserAuthFilter.php +++ b/inc/classes/main/filter/auth/class_UserAuthFilter.php @@ -43,16 +43,12 @@ class UserAuthFilter 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 createUserAuthFilter (Controller $controllerInstance) { + public final static function createUserAuthFilter () { // Get a new instance $filterInstance = new UserAuthFilter(); - // Set the controller - $filterInstance->setControllerInstance($controllerInstance); - // Set default auth method $filterInstance->setDefaultAuthMethod(); diff --git a/inc/classes/main/filter/change/class_EmailChangeFilter.php b/inc/classes/main/filter/change/class_EmailChangeFilter.php index bc481dd7..6a32d74d 100644 --- a/inc/classes/main/filter/change/class_EmailChangeFilter.php +++ b/inc/classes/main/filter/change/class_EmailChangeFilter.php @@ -35,16 +35,12 @@ class EmailChangeFilter 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 createEmailChangeFilter (Controller $controllerInstance) { + public final static function createEmailChangeFilter () { // Get a new instance $filterInstance = new EmailChangeFilter(); - // Set the controller - $filterInstance->setControllerInstance($controllerInstance); - // Return the instance return $filterInstance; } diff --git a/inc/classes/main/filter/change/class_PasswordChangeFilter.php b/inc/classes/main/filter/change/class_PasswordChangeFilter.php index e7b8b505..e5536731 100644 --- a/inc/classes/main/filter/change/class_PasswordChangeFilter.php +++ b/inc/classes/main/filter/change/class_PasswordChangeFilter.php @@ -38,13 +38,10 @@ class PasswordChangeFilter extends BaseFilter implements Filterable { * @param $controllerInstance An instance of a controller class * @return $filterInstance An instance of this filter class */ - public final static function createPasswordChangeFilter (Controller $controllerInstance) { + public final static function createPasswordChangeFilter () { // Get a new instance $filterInstance = new PasswordChangeFilter(); - // Set the controller - $filterInstance->setControllerInstance($controllerInstance); - // Return the instance return $filterInstance; } diff --git a/inc/classes/main/filter/checkboxes/class_RulesAcceptedFilter.php b/inc/classes/main/filter/checkboxes/class_RulesAcceptedFilter.php index 03b769a2..23664b64 100644 --- a/inc/classes/main/filter/checkboxes/class_RulesAcceptedFilter.php +++ b/inc/classes/main/filter/checkboxes/class_RulesAcceptedFilter.php @@ -37,16 +37,12 @@ class RulesAcceptedFilter 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 createRulesAcceptedFilter (Controller $controllerInstance) { + public final static function createRulesAcceptedFilter () { // Get a new instance $filterInstance = new RulesAcceptedFilter(); - // Set the controller - $filterInstance->setControllerInstance($controllerInstance); - // Return the instance return $filterInstance; } diff --git a/inc/classes/main/filter/class_ b/inc/classes/main/filter/class_ index bd14a20d..4fe41a14 100644 --- a/inc/classes/main/filter/class_ +++ b/inc/classes/main/filter/class_ @@ -35,16 +35,12 @@ class ???Filter extends BaseFrameworkSystem 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 create???Filter (Controller $controllerInstance) { + public final static function create???Filter () { // Get a new instance $filterInstance = new ???Filter(); - // Set the controller - $filterInstance->setControllerInstance($controllerInstance); - // Return the instance return $filterInstance; } diff --git a/inc/classes/main/filter/crypto/class_CaptchaEncryptFilter.php b/inc/classes/main/filter/crypto/class_CaptchaEncryptFilter.php index 3a20eb29..7208c60d 100644 --- a/inc/classes/main/filter/crypto/class_CaptchaEncryptFilter.php +++ b/inc/classes/main/filter/crypto/class_CaptchaEncryptFilter.php @@ -35,16 +35,12 @@ class CaptchaEncryptFilter 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 createCaptchaEncryptFilter (Controller $controllerInstance) { + public final static function createCaptchaEncryptFilter () { // Get a new instance $filterInstance = new CaptchaEncryptFilter(); - // Set the controller - $filterInstance->setControllerInstance($controllerInstance); - // Return the instance return $filterInstance; } diff --git a/inc/classes/main/filter/guest/class_UserNameIsGuestFilter.php b/inc/classes/main/filter/guest/class_UserNameIsGuestFilter.php index 20155ac3..e4a32e41 100644 --- a/inc/classes/main/filter/guest/class_UserNameIsGuestFilter.php +++ b/inc/classes/main/filter/guest/class_UserNameIsGuestFilter.php @@ -36,16 +36,12 @@ class UserNameIsGuestFilter 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 createUserNameIsGuestFilter (Controller $controllerInstance) { + public final static function createUserNameIsGuestFilter () { // Get a new instance $filterInstance = new UserNameIsGuestFilter(); - // Set the controller - $filterInstance->setControllerInstance($controllerInstance); - // Return the instance return $filterInstance; } diff --git a/inc/classes/main/filter/news/class_NewsDownloadFilter.php b/inc/classes/main/filter/news/class_NewsDownloadFilter.php index 8799398e..5034018f 100644 --- a/inc/classes/main/filter/news/class_NewsDownloadFilter.php +++ b/inc/classes/main/filter/news/class_NewsDownloadFilter.php @@ -37,16 +37,12 @@ class NewsDownloadFilter 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 createNewsDownloadFilter (Controller $controllerInstance) { + public final static function createNewsDownloadFilter () { // Get a new instance $filterInstance = new NewsDownloadFilter(); - // Set the controller - $filterInstance->setControllerInstance($controllerInstance); - // Return the instance return $filterInstance; } diff --git a/inc/classes/main/filter/news/class_NewsProcessFilter.php b/inc/classes/main/filter/news/class_NewsProcessFilter.php index 5ecb0960..611b73e5 100644 --- a/inc/classes/main/filter/news/class_NewsProcessFilter.php +++ b/inc/classes/main/filter/news/class_NewsProcessFilter.php @@ -36,16 +36,12 @@ class NewsProcessFilter 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 createNewsProcessFilter (Controller $controllerInstance) { + public final static function createNewsProcessFilter () { // Get a new instance $filterInstance = new NewsProcessFilter(); - // Set the controller - $filterInstance->setControllerInstance($controllerInstance); - // Return the instance return $filterInstance; } diff --git a/inc/classes/main/filter/null/class_NullFilter.php b/inc/classes/main/filter/null/class_NullFilter.php index 3dd83829..bcfa2b0b 100644 --- a/inc/classes/main/filter/null/class_NullFilter.php +++ b/inc/classes/main/filter/null/class_NullFilter.php @@ -36,16 +36,12 @@ class NullFilter 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 createNullFilter (Controller $controllerInstance) { + public final static function createNullFilter () { // Get a new instance $filterInstance = new NullFilter(); - // Set the controller - $filterInstance->setControllerInstance($controllerInstance); - // Return the instance return $filterInstance; } diff --git a/inc/classes/main/filter/update/class_UserStatusConfimedUpdateFilter.php b/inc/classes/main/filter/update/class_UserStatusConfimedUpdateFilter.php index a7e409b0..b158d765 100644 --- a/inc/classes/main/filter/update/class_UserStatusConfimedUpdateFilter.php +++ b/inc/classes/main/filter/update/class_UserStatusConfimedUpdateFilter.php @@ -35,16 +35,12 @@ class UserStatusConfimedUpdateFilter 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 createUserStatusConfimedUpdateFilter (Controller $controllerInstance) { + public final static function createUserStatusConfimedUpdateFilter () { // Get a new instance $filterInstance = new UserStatusConfimedUpdateFilter(); - // Set the controller - $filterInstance->setControllerInstance($controllerInstance); - // Return the instance return $filterInstance; } diff --git a/inc/classes/main/filter/update/class_UserUpdateFilter.php b/inc/classes/main/filter/update/class_UserUpdateFilter.php index 69c62d80..7f3790d2 100644 --- a/inc/classes/main/filter/update/class_UserUpdateFilter.php +++ b/inc/classes/main/filter/update/class_UserUpdateFilter.php @@ -36,16 +36,12 @@ class UserUpdateFilter 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 createUserUpdateFilter (Controller $controllerInstance) { + public final static function createUserUpdateFilter () { // Get a new instance $filterInstance = new UserUpdateFilter(); - // Set the controller - $filterInstance->setControllerInstance($controllerInstance); - // Return the instance return $filterInstance; } diff --git a/inc/classes/main/filter/validator/class_EmailValidatorFilter.php b/inc/classes/main/filter/validator/class_EmailValidatorFilter.php index 6183b33b..94fd2567 100644 --- a/inc/classes/main/filter/validator/class_EmailValidatorFilter.php +++ b/inc/classes/main/filter/validator/class_EmailValidatorFilter.php @@ -38,16 +38,12 @@ class EmailValidatorFilter 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 createEmailValidatorFilter (Controller $controllerInstance) { + public final static function createEmailValidatorFilter () { // Get a new instance $filterInstance = new EmailValidatorFilter(); - // Set the controller - $filterInstance->setControllerInstance($controllerInstance); - // Return the instance return $filterInstance; } diff --git a/inc/classes/main/filter/validator/class_PasswordValidatorFilter.php b/inc/classes/main/filter/validator/class_PasswordValidatorFilter.php index 2591f1ea..a666d262 100644 --- a/inc/classes/main/filter/validator/class_PasswordValidatorFilter.php +++ b/inc/classes/main/filter/validator/class_PasswordValidatorFilter.php @@ -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 final static function createPasswordValidatorFilter () { // Get a new instance $filterInstance = new PasswordValidatorFilter(); - // Set the controller - $filterInstance->setControllerInstance($controllerInstance); - // Return the instance return $filterInstance; } diff --git a/inc/classes/main/filter/validator/class_UserNameValidatorFilter.php b/inc/classes/main/filter/validator/class_UserNameValidatorFilter.php index 8d0445fe..2f9713c0 100644 --- a/inc/classes/main/filter/validator/class_UserNameValidatorFilter.php +++ b/inc/classes/main/filter/validator/class_UserNameValidatorFilter.php @@ -37,16 +37,12 @@ class UserNameValidatorFilter 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 createUserNameValidatorFilter (Controller $controllerInstance) { + public final static function createUserNameValidatorFilter () { // Get a new instance $filterInstance = new UserNameValidatorFilter(); - // Set the controller - $filterInstance->setControllerInstance($controllerInstance); - // Return the instance return $filterInstance; } diff --git a/inc/classes/main/filter/verifier/class_AccountPasswordVerifierFilter.php b/inc/classes/main/filter/verifier/class_AccountPasswordVerifierFilter.php index 44fdcfc9..a1ec524b 100644 --- a/inc/classes/main/filter/verifier/class_AccountPasswordVerifierFilter.php +++ b/inc/classes/main/filter/verifier/class_AccountPasswordVerifierFilter.php @@ -36,16 +36,12 @@ class AccountPasswordVerifierFilter 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 createAccountPasswordVerifierFilter (Controller $controllerInstance) { + public final static function createAccountPasswordVerifierFilter () { // Get a new instance $filterInstance = new AccountPasswordVerifierFilter(); - // Set the controller - $filterInstance->setControllerInstance($controllerInstance); - // Return the instance return $filterInstance; } diff --git a/inc/classes/main/filter/verifier/class_ConfirmCodeVerifierFilter.php b/inc/classes/main/filter/verifier/class_ConfirmCodeVerifierFilter.php index 09a13d01..e4620cb2 100644 --- a/inc/classes/main/filter/verifier/class_ConfirmCodeVerifierFilter.php +++ b/inc/classes/main/filter/verifier/class_ConfirmCodeVerifierFilter.php @@ -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 final static function createConfirmCodeVerifierFilter () { // Get a new instance $filterInstance = new ConfirmCodeVerifierFilter(); - // Set the controller - $filterInstance->setControllerInstance($controllerInstance); - // Return the instance return $filterInstance; } diff --git a/inc/classes/main/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php b/inc/classes/main/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php index 27fe8a35..29a84674 100644 --- a/inc/classes/main/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php +++ b/inc/classes/main/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php @@ -35,16 +35,12 @@ class GraphicalCodeCaptchaVerifierFilter extends BaseFilter implements Filterabl /** * 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 createGraphicalCodeCaptchaVerifierFilter (Controller $controllerInstance) { + public final static function createGraphicalCodeCaptchaVerifierFilter () { // Get a new instance $filterInstance = new GraphicalCodeCaptchaVerifierFilter(); - // Set the controller - $filterInstance->setControllerInstance($controllerInstance); - // Return the instance return $filterInstance; } diff --git a/inc/classes/main/filter/verifier/class_PasswordGuestVerifierFilter.php b/inc/classes/main/filter/verifier/class_PasswordGuestVerifierFilter.php index abe338d3..3095594c 100644 --- a/inc/classes/main/filter/verifier/class_PasswordGuestVerifierFilter.php +++ b/inc/classes/main/filter/verifier/class_PasswordGuestVerifierFilter.php @@ -36,16 +36,12 @@ class PasswordGuestVerifierFilter 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 createPasswordGuestVerifierFilter (Controller $controllerInstance) { + public final static function createPasswordGuestVerifierFilter () { // Get a new instance $filterInstance = new PasswordGuestVerifierFilter(); - // Set the controller - $filterInstance->setControllerInstance($controllerInstance); - // Return the instance return $filterInstance; } diff --git a/inc/classes/main/filter/verifier/class_PasswordVerifierFilter.php b/inc/classes/main/filter/verifier/class_PasswordVerifierFilter.php index cea7d210..d859aa72 100644 --- a/inc/classes/main/filter/verifier/class_PasswordVerifierFilter.php +++ b/inc/classes/main/filter/verifier/class_PasswordVerifierFilter.php @@ -36,16 +36,12 @@ class PasswordVerifierFilter 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 createPasswordVerifierFilter (Controller $controllerInstance) { + public final static function createPasswordVerifierFilter () { // Get a new instance $filterInstance = new PasswordVerifierFilter(); - // Set the controller - $filterInstance->setControllerInstance($controllerInstance); - // Return the instance return $filterInstance; } diff --git a/inc/classes/main/filter/verifier/class_UserGuestVerifierFilter.php b/inc/classes/main/filter/verifier/class_UserGuestVerifierFilter.php index 8e2b952f..4ede3845 100644 --- a/inc/classes/main/filter/verifier/class_UserGuestVerifierFilter.php +++ b/inc/classes/main/filter/verifier/class_UserGuestVerifierFilter.php @@ -37,16 +37,12 @@ class UserGuestVerifierFilter 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 createUserGuestVerifierFilter (Controller $controllerInstance) { + public final static function createUserGuestVerifierFilter () { // Get a new instance $filterInstance = new UserGuestVerifierFilter(); - // Set the controller - $filterInstance->setControllerInstance($controllerInstance); - // Return the instance return $filterInstance; } diff --git a/inc/classes/main/filter/verifier/class_UserNameVerifierFilter.php b/inc/classes/main/filter/verifier/class_UserNameVerifierFilter.php index a3b12a98..3022efee 100644 --- a/inc/classes/main/filter/verifier/class_UserNameVerifierFilter.php +++ b/inc/classes/main/filter/verifier/class_UserNameVerifierFilter.php @@ -37,16 +37,12 @@ class UserNameVerifierFilter 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 createUserNameVerifierFilter (Controller $controllerInstance) { + public final static function createUserNameVerifierFilter () { // Get a new instance $filterInstance = new UserNameVerifierFilter(); - // Set the controller - $filterInstance->setControllerInstance($controllerInstance); - // Return the instance return $filterInstance; } diff --git a/inc/classes/main/filter/verifier/class_UserStatusVerifierFilter.php b/inc/classes/main/filter/verifier/class_UserStatusVerifierFilter.php index a058aa04..e0c34990 100644 --- a/inc/classes/main/filter/verifier/class_UserStatusVerifierFilter.php +++ b/inc/classes/main/filter/verifier/class_UserStatusVerifierFilter.php @@ -35,16 +35,12 @@ class UserStatusVerifierFilter 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 createUserStatusVerifierFilter (Controller $controllerInstance) { + public final static function createUserStatusVerifierFilter () { // Get a new instance $filterInstance = new UserStatusVerifierFilter(); - // Set the controller - $filterInstance->setControllerInstance($controllerInstance); - // Return the instance return $filterInstance; } diff --git a/inc/classes/main/filter/verifier/class_UserUnconfirmedVerifierFilter.php b/inc/classes/main/filter/verifier/class_UserUnconfirmedVerifierFilter.php index 0845c85b..7df7795a 100644 --- a/inc/classes/main/filter/verifier/class_UserUnconfirmedVerifierFilter.php +++ b/inc/classes/main/filter/verifier/class_UserUnconfirmedVerifierFilter.php @@ -35,16 +35,12 @@ class UserUnconfirmedVerifierFilter 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 createUserUnconfirmedVerifierFilter (Controller $controllerInstance) { + public final static function createUserUnconfirmedVerifierFilter () { // Get a new instance $filterInstance = new UserUnconfirmedVerifierFilter(); - // Set the controller - $filterInstance->setControllerInstance($controllerInstance); - // Return the instance return $filterInstance; }