Continued:

- added missing namespaces to config *_class entries
- added missing imports
- filter class configuration entries shall always end with _filter_class
- updated core framework

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/application/city/classes/actions/html/class_HtmlCityLoginLogoutAction.php b/application/city/classes/actions/html/class_HtmlCityLoginLogoutAction.php
index c48aa8f8cc5f6473defea83591c41ce2eb58bbd6..c97464d794120cf05e37e180de31b814d97460c9 100644 (file)
--- a/application/city/classes/actions/html/class_HtmlCityLoginLogoutAction.php
+++ b/application/city/classes/actions/html/class_HtmlCityLoginLogoutAction.php
@@ -83,6 +83,6 @@ class HtmlCityLoginLogoutAction extends BaseCityAction implements Commandable, R
         */
        public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
                // Check for user status by default
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_filter'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_filter_class'));
        }
 }

diff --git a/application/city/classes/actions/html/class_HtmlCityLoginProfileAction.php b/application/city/classes/actions/html/class_HtmlCityLoginProfileAction.php
index e3ce288ffe9fe52ff928ca7780881cae9a92cf16..e16f88e1a34c9675b903b273eb3b30b08787a546 100644 (file)
--- a/application/city/classes/actions/html/class_HtmlCityLoginProfileAction.php
+++ b/application/city/classes/actions/html/class_HtmlCityLoginProfileAction.php
@@ -83,6 +83,6 @@ class HtmlCityLoginProfileAction extends BaseCityAction implements Commandable,
         */
        public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
                // Check for user status by default
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_filter'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_filter_class'));
        }
 }

diff --git a/application/city/classes/actions/html/class_HtmlCityLoginStatusProblemAction.php b/application/city/classes/actions/html/class_HtmlCityLoginStatusProblemAction.php
index a86daf49be59203879ad51786be1bc8a7fee4a21..914ceb0578a5f0d662d5ff7042703d3aa83d38b6 100644 (file)
--- a/application/city/classes/actions/html/class_HtmlCityLoginStatusProblemAction.php
+++ b/application/city/classes/actions/html/class_HtmlCityLoginStatusProblemAction.php
@@ -84,6 +84,6 @@ class HtmlCityLoginStatusProblemAction extends BaseCityAction implements Command
         */
        public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
                // Check for user status by default
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_filter'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_filter_class'));
        }
 }

diff --git a/application/city/classes/city_daemon/default/class_SimulationDefaultCityDaemon.php b/application/city/classes/city_daemon/default/class_SimulationDefaultCityDaemon.php
index a4747648715399b5615cb739ccabc81e7e6a9f6a..f58e327f5c85f354f75be0d8c097a5b6455be843 100644 (file)
--- a/application/city/classes/city_daemon/default/class_SimulationDefaultCityDaemon.php
+++ b/application/city/classes/city_daemon/default/class_SimulationDefaultCityDaemon.php
@@ -83,7 +83,7 @@ class SimulationDefaultCityDaemon extends BaseCityDaemon implements CityHelper,
                $controllerInstance = $applicationInstance->getControllerInstance();
 
                // Foo task
-               // @TODO $controllerInstance->addActivationFilter(ObjectFactory::createObjectByConfiguredName('city_foo_task_filter'));
+               // @TODO $controllerInstance->addActivationFilter(ObjectFactory::createObjectByConfiguredName('city_foo_task_filter_class'));
 
                // @TODO Add some filters here
                $this->partialStub('Add some filters here.');

diff --git a/application/city/classes/commands/console/class_CityConsoleDaemonCommand.php b/application/city/classes/commands/console/class_CityConsoleDaemonCommand.php
index 62d16d6bba5178dbed8ac305b1fa82c2a46b8416..f523e58447ebe4eba442bd109de5f8309dcad9d2 100644 (file)
--- a/application/city/classes/commands/console/class_CityConsoleDaemonCommand.php
+++ b/application/city/classes/commands/console/class_CityConsoleDaemonCommand.php
@@ -131,21 +131,21 @@ class CityConsoleDaemonCommand extends BaseCommand implements Commandable {
         */
        public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
                // Add pre filters
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('city_daemon_php_requirements_filter'));
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('city_daemon_initializer_filter'));
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('city_daemon_welcome_teaser_filter'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('city_daemon_php_requirements_filter_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('city_daemon_initializer_filter_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('city_daemon_welcome_teaser_filter_class'));
 
                // Add bootstrap filters
-               $controllerInstance->addBootstrapFilter(ObjectFactory::createObjectByConfiguredName('city_daemon_bootstrap_init_daemon_filter'));
-               $controllerInstance->addBootstrapFilter(ObjectFactory::createObjectByConfiguredName('city_daemon_bootstrap_extra_bootstrapping_filter'));
+               $controllerInstance->addBootstrapFilter(ObjectFactory::createObjectByConfiguredName('city_daemon_bootstrap_init_daemon_filter_class'));
+               $controllerInstance->addBootstrapFilter(ObjectFactory::createObjectByConfiguredName('city_daemon_bootstrap_extra_bootstrapping_filter_class'));
 
                // Add city activation filters
-               $controllerInstance->addActivationFilter(ObjectFactory::createObjectByConfiguredName('city_daemon_activation_task_handler_initializer_filter'));
+               $controllerInstance->addActivationFilter(ObjectFactory::createObjectByConfiguredName('city_daemon_activation_task_handler_initializer_filter_class'));
 
                // Add shutdown filters, you may want to shutdown the task handler as last one.
-               $controllerInstance->addShutdownFilter(ObjectFactory::createObjectByConfiguredName('city_daemon_shutdown_task_handler_filter'));
+               $controllerInstance->addShutdownFilter(ObjectFactory::createObjectByConfiguredName('city_daemon_shutdown_task_handler_filter_class'));
 
                // This is the last generic shutdown filter
-               $controllerInstance->addShutdownFilter(ObjectFactory::createObjectByConfiguredName('city_daemon_shutdown_city_filter'));
+               $controllerInstance->addShutdownFilter(ObjectFactory::createObjectByConfiguredName('city_daemon_shutdown_city_filter_class'));
        }
 }

diff --git a/application/city/classes/commands/html/class_CityHtmlCityGuestLoginCommand.php b/application/city/classes/commands/html/class_CityHtmlCityGuestLoginCommand.php
index 5f47cfdbbaf09e0f086e4a4ef03beb822bf41734..2734597e09603fc303bd7f63eaee60bff595fc21 100644 (file)
--- a/application/city/classes/commands/html/class_CityHtmlCityGuestLoginCommand.php
+++ b/application/city/classes/commands/html/class_CityHtmlCityGuestLoginCommand.php
@@ -107,12 +107,12 @@ class CityHtmlCityGuestLoginCommand extends BaseCommand implements Commandable {
         */
        public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
                // Add username verifier filter
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_guest_verifier_filter'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_guest_verifier_filter_class'));
 
                // Add password verifier filter
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('passwd_guest_verifier_filter'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('passwd_guest_verifier_filter_class'));
 
                // Add CAPTCHA verifier code
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_guest_verifier_filter'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_guest_verifier_filter_class'));
        }
 }

diff --git a/application/city/classes/commands/html/class_CityHtmlCityMapCommand.php b/application/city/classes/commands/html/class_CityHtmlCityMapCommand.php
index 3e5c34bf13e0394a2abb35af2b216aba4feb32c1..903ce08489c0549355bd0476626c0eb586f58fd2 100644 (file)
--- a/application/city/classes/commands/html/class_CityHtmlCityMapCommand.php
+++ b/application/city/classes/commands/html/class_CityHtmlCityMapCommand.php
@@ -102,15 +102,15 @@ class CityHtmlCityMapCommand extends BaseCommand implements Commandable {
         */
        public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
                // Add user auth filter (we don't need an update of the user here because it will be redirected)
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_auth_filter'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_auth_filter_class'));
 
                // Validate user status ('confirmed' no guest)
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_filter'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_filter_class'));
 
                // Check if city name is already used
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('city_name_verifier_filter'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('city_name_verifier_filter_class'));
 
                // Validate ...
-               //$controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('email_validator_filter'));
+               //$controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('email_validator_filter_class'));
        }
 }

diff --git a/application/city/classes/commands/html/class_CityHtmlCityRegisterCommand.php b/application/city/classes/commands/html/class_CityHtmlCityRegisterCommand.php
index b643c0e38530e32c36a59044cd9b4e150d8c6ef3..ddd6bbc02cd05519541514023289fd72c79c81ff 100644 (file)
--- a/application/city/classes/commands/html/class_CityHtmlCityRegisterCommand.php
+++ b/application/city/classes/commands/html/class_CityHtmlCityRegisterCommand.php
@@ -101,24 +101,24 @@ class CityHtmlCityRegisterCommand extends BaseCommand implements Commandable {
         */
        public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
                // Validate email address (if configured: check on double email addresses)
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('email_validator_filter'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('email_validator_filter_class'));
 
                // Validate username and check if it does not exist
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_validator_filter'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_validator_filter_class'));
 
                // Validate if username is "guest" and not taken
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_is_guest_filter'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_is_guest_filter_class'));
 
                // Validate if password is set
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('password_validator_filter'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('password_validator_filter_class'));
 
                // Check if rules where accepted
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('rules_accepted_filter'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('rules_accepted_filter_class'));
 
                // Validate CAPTCHA input
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_register_verifier_filter'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_register_verifier_filter_class'));
 
                // Validate birthday
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('birthday_register_verifier_filter'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('birthday_register_verifier_filter_class'));
        }
 }

diff --git a/application/city/classes/commands/html/class_CityHtmlCityUserLoginCommand.php b/application/city/classes/commands/html/class_CityHtmlCityUserLoginCommand.php
index 0a35eb59edef2c188a14aa68342efce8edf31e8e..c0949a666d0d95260759083e776ca2d7cf8a93a2 100644 (file)
--- a/application/city/classes/commands/html/class_CityHtmlCityUserLoginCommand.php
+++ b/application/city/classes/commands/html/class_CityHtmlCityUserLoginCommand.php
@@ -109,22 +109,22 @@ class CityHtmlCityUserLoginCommand extends BaseCommand implements Commandable {
                // Which login type do we have?
                switch ($this->getConfigInstance()->getConfigEntry('login_type')) {
                        case 'username': // Login via username
-                               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_verifier_filter'));
+                               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_verifier_filter_class'));
                                break;
 
                        case 'email': // Login via email
-                               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('email_verifier_filter'));
+                               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('email_verifier_filter_class'));
                                break;
 
                        default: // Wether username or email is set
-                               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_email_verifier_filter'));
+                               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_email_verifier_filter_class'));
                                break;
                }
 
                // Password verifier filter
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('password_verifier_filter'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('password_verifier_filter_class'));
 
                // Add filter for CAPTCHA
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_user_verifier_filter'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_user_verifier_filter_class'));
        }
 }

diff --git a/application/city/classes/commands/html/class_CityHtmlHomeCommand.php b/application/city/classes/commands/html/class_CityHtmlHomeCommand.php
index 2d1ac24d5edfc8d802169ca0e52bc13798a2e392..26bc2ab0230ca81b6d1852e7adcd11589ee6b256 100644 (file)
--- a/application/city/classes/commands/html/class_CityHtmlHomeCommand.php
+++ b/application/city/classes/commands/html/class_CityHtmlHomeCommand.php
@@ -95,6 +95,6 @@ class CityHtmlHomeCommand extends BaseCommand implements Commandable {
         */
        public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
                // Add pre filters
-               //$controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('node_php_requirements_filter'));
+               //$controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('node_php_requirements_filter_class'));
        }
 }

diff --git a/application/city/classes/commands/html/class_CityHtmlResendLinkCommand.php b/application/city/classes/commands/html/class_CityHtmlResendLinkCommand.php
index b217ff506fa2efb0590601cb21d1e7c96956cee4..77a2ba61653b7b2631dc75fae903eba41ae558d1 100644 (file)
--- a/application/city/classes/commands/html/class_CityHtmlResendLinkCommand.php
+++ b/application/city/classes/commands/html/class_CityHtmlResendLinkCommand.php
@@ -140,6 +140,6 @@ class CityHtmlResendLinkCommand extends BaseCommand implements Commandable {
         */
        public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
                // Filter for checking if account is unconfirmed
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_unconfirmed_filter'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_unconfirmed_filter_class'));
        }
 }

diff --git a/application/city/classes/controller/console/class_CityConsoleDefaultNewsController.php b/application/city/classes/controller/console/class_CityConsoleDefaultNewsController.php
index 761b658e0a806186c059f76be4ac124260997008..e430d3570a7a7575e17fb79389da09112df2c165 100644 (file)
--- a/application/city/classes/controller/console/class_CityConsoleDefaultNewsController.php
+++ b/application/city/classes/controller/console/class_CityConsoleDefaultNewsController.php
@@ -63,8 +63,8 @@ class CityConsoleDefaultNewsController extends BaseController implements Control
                $controllerInstance->setResolverInstance($resolverInstance);
 
                // Add news filters to this controller
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('news_download_filter'));
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('news_process_filter'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('news_download_filter_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('news_process_filter_class'));
 
                // Return the prepared instance
                return $controllerInstance;

diff --git a/application/city/classes/controller/html/class_CityHtmlConfirmController.php b/application/city/classes/controller/html/class_CityHtmlConfirmController.php
index 30add5eebb7c53f901f82e82241fc827260e33b3..82440fe4f905485ab26ce32e2cea213f4b3b257e 100644 (file)
--- a/application/city/classes/controller/html/class_CityHtmlConfirmController.php
+++ b/application/city/classes/controller/html/class_CityHtmlConfirmController.php
@@ -58,10 +58,10 @@ class CityHtmlConfirmController extends BaseController implements Controller {
                $controllerInstance->setResolverInstance($resolverInstance);
 
                // Add filters for handling confirmation code and username
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_verifier_filter'));
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_unconfirmed_filter'));
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('confirm_code_verifier_filter'));
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_confirmed_filter'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_verifier_filter_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_unconfirmed_filter_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('confirm_code_verifier_filter_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_confirmed_filter_class'));
 
                // Return the prepared instance
                return $controllerInstance;

diff --git a/application/city/classes/controller/html/class_CityHtmlDefaultNewsController.php b/application/city/classes/controller/html/class_CityHtmlDefaultNewsController.php
index ccffd4e11f23b6345f35016f2871a211b0cb7a1b..c0ef891eb08d7abab2b8d00b6db10ea1f7c5dc87 100644 (file)
--- a/application/city/classes/controller/html/class_CityHtmlDefaultNewsController.php
+++ b/application/city/classes/controller/html/class_CityHtmlDefaultNewsController.php
@@ -62,8 +62,8 @@ class CityHtmlDefaultNewsController extends BaseController implements Controller
                $controllerInstance->setResolverInstance($resolverInstance);
 
                // Add news filters to this controller
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('news_download_filter'));
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('news_process_filter'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('news_download_filter_class'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('news_process_filter_class'));
 
                // Return the prepared instance
                return $controllerInstance;

diff --git a/application/city/classes/controller/html/class_CityHtmlLogoutController.php b/application/city/classes/controller/html/class_CityHtmlLogoutController.php
index 1e7d226fbde34c813772ac419434a3f0766f4daf..990ff383cb7e58e943f7a2845ca8cb67d8e917fa 100644 (file)
--- a/application/city/classes/controller/html/class_CityHtmlLogoutController.php
+++ b/application/city/classes/controller/html/class_CityHtmlLogoutController.php
@@ -62,10 +62,10 @@ class CityHtmlLogoutController extends BaseController implements Controller {
                $controllerInstance->setResolverInstance($resolverInstance);
 
                // Add user auth filter (we don't need an update of the user here because it will be redirected)
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_auth_filter'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_auth_filter_class'));
 
                // User status filter
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_filter'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_filter_class'));
 
                // Return the prepared instance
                return $controllerInstance;

diff --git a/application/city/classes/controller/html/form/class_CityHtmlDoFormController.php b/application/city/classes/controller/html/form/class_CityHtmlDoFormController.php
index d9ffedd0b80f017bc59f5b70e2ee6dfbb8950612..5213548096535138aa9a04e8fe11f21cd4788fa1 100644 (file)
--- a/application/city/classes/controller/html/form/class_CityHtmlDoFormController.php
+++ b/application/city/classes/controller/html/form/class_CityHtmlDoFormController.php
@@ -79,7 +79,7 @@ class CityHtmlDoFormController extends BaseController implements Controller {
                $formAction = $requestInstance->getRequestElement('form');
 
                // Get command instance from resolver
-               $commandInstance = $this->getResolverInstance()->resolveCommand($formAction);
+               $commandInstance = $this->getResolverInstance()->resolveCommand('Org\Mxchange\City\Command', $formAction);
 
                // Add more filters by the command
                $commandInstance->addExtraFilters($this, $requestInstance);

diff --git a/application/city/classes/controller/html/login/class_CityHtmlLoginAreaController.php b/application/city/classes/controller/html/login/class_CityHtmlLoginAreaController.php
index d5522466e0264ed814500b793ec5825c13efccaa..af9c46915a509f6edb7d65107a06aa669086d2b5 100644 (file)
--- a/application/city/classes/controller/html/login/class_CityHtmlLoginAreaController.php
+++ b/application/city/classes/controller/html/login/class_CityHtmlLoginAreaController.php
@@ -63,16 +63,16 @@ class CityHtmlLoginAreaController extends BaseController implements Controller {
                $controllerInstance->setResolverInstance($resolverInstance);
 
                // User auth filter
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_auth_filter'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_auth_filter_class'));
 
                // User update filter
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_update_filter'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_update_filter_class'));
 
                // News fetcher filter
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('news_download_filter'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('news_download_filter_class'));
 
                // News proccess/display-preparation
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('news_process_filter'));
+               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('news_process_filter_class'));
 
                // Return the prepared instance
                return $controllerInstance;

diff --git a/application/city/classes/filter/city_daemon/class_CityDaemonPhpRequirementsFilter.php b/application/city/classes/filter/city_daemon/class_CityDaemonPhpRequirementsFilter.php
index 35b12f5264d3795a80888e95f67d6b59930b53d5..6358a46db3a7b9377322c8539084fbfeff19190c 100644 (file)
--- a/application/city/classes/filter/city_daemon/class_CityDaemonPhpRequirementsFilter.php
+++ b/application/city/classes/filter/city_daemon/class_CityDaemonPhpRequirementsFilter.php
@@ -6,6 +6,7 @@ namespace Org\Mxchange\City\Daemon\Filter;
 use Org\Mxchange\City\Filter\BaseCityFilter;
 
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Filter\Chain\FilterChainException;
 use Org\Mxchange\CoreFramework\Filter\Filterable;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;

diff --git a/application/city/classes/filter/city_daemon/class_CityDaemonWelcomeTeaserFilter.php b/application/city/classes/filter/city_daemon/class_CityDaemonWelcomeTeaserFilter.php
index de8531e277eb23421536b13234302fb9b2c51bbb..e0ef332accb3f8ec7442198bc61a0a269915bc0d 100644 (file)
--- a/application/city/classes/filter/city_daemon/class_CityDaemonWelcomeTeaserFilter.php
+++ b/application/city/classes/filter/city_daemon/class_CityDaemonWelcomeTeaserFilter.php
@@ -7,6 +7,7 @@ use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory;
 use Org\Mxchange\City\Filter\BaseCityFilter;
 
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Filter\Chain\FilterChainException;
 use Org\Mxchange\CoreFramework\Filter\Filterable;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;

diff --git a/application/city/classes/filter/verifier/class_CityNameVerifierFilter.php b/application/city/classes/filter/verifier/class_CityNameVerifierFilter.php
index b2ad8fbb110410227c3ce80731de4a3c312036b7..6e0263b5d81a1aff51fa05b1cb14f2faf671a4e9 100644 (file)
--- a/application/city/classes/filter/verifier/class_CityNameVerifierFilter.php
+++ b/application/city/classes/filter/verifier/class_CityNameVerifierFilter.php
@@ -8,6 +8,7 @@ use Org\Mxchange\City\Factory\Manager\ManagerFactory;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filter\BaseFilter;
+use Org\Mxchange\CoreFramework\Filter\Chain\FilterChainException;
 use Org\Mxchange\CoreFramework\Filter\Filterable;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;

diff --git a/application/city/config.php b/application/city/config.php
index 6a97865e2fc065294220d25304b08bf5d38c61ea..bbadaf1707b5dc4a64ebaa8d044095b184d40899 100644 (file)
--- a/application/city/config.php
+++ b/application/city/config.php
@@ -35,10 +35,10 @@ $cfg = FrameworkBootstrap::getConfigurationInstance();
 $cfg->setConfigEntry('city_default_mode', 'default');
 
 // CFG: NEWS-DOWNLOAD-FILTER
-$cfg->setConfigEntry('news_download_filter', 'Org\Mxchange\CoreFramework\Filter\News\NewsDownloadFilter');
+$cfg->setConfigEntry('news_download_filter_class', 'Org\Mxchange\CoreFramework\Filter\News\NewsDownloadFilter');
 
 // CFG: NEWS-PROCESS-FILTER
-$cfg->setConfigEntry('news_process_filter', 'Org\Mxchange\CoreFramework\Filter\News\NewsProcessFilter');
+$cfg->setConfigEntry('news_process_filter_class', 'Org\Mxchange\CoreFramework\Filter\News\NewsProcessFilter');
 
 // CFG: NEWS-READER-CLASS
 $cfg->setConfigEntry('news_reader_class', 'Org\Mxchange\CoreFramework\Reader\News\Console\ConsoleNewsReader');
@@ -282,43 +282,40 @@ $cfg->setConfigEntry('email_tpl_resend_link', 'text');
 $cfg->setConfigEntry('admin_email', 'you@some-hoster.invalid');
 
 // CFG: CAPTCHA-ENCRYPT-VALIDATOR-FILTER
-$cfg->setConfigEntry('captcha_encrypt_validator_filter', 'CaptchaEncryptFilter');
+$cfg->setConfigEntry('captcha_encrypt_validator_filter_class', 'Org\Mxchange\CoreFramework\Filter\Captcha\CaptchaEncryptFilter');
 
 // CFG: USER-STATUS-CONFIRMED-FILTER
-$cfg->setConfigEntry('user_status_confirmed_filter', 'UserStatusConfimedUpdateFilter');
+$cfg->setConfigEntry('user_status_confirmed_filter_class', 'Org\Mxchange\CoreFramework\Filter\User\Statu\UserStatusConfimedUpdateFilter');
 
 // CFG: CAPTCHA-GUEST-VERIFIER-FILTER
-$cfg->setConfigEntry('captcha_guest_verifier_filter', 'GraphicalCodeCaptchaVerifierFilter');
+$cfg->setConfigEntry('captcha_guest_verifier_filter_class', 'Org\Mxchange\CoreFramework\Filter\Verifier\Captcha\GraphicalCodeCaptchaVerifierFilter');
 
 // CFG: CAPTCHA-USER-VERIFIER-FILTER
-$cfg->setConfigEntry('captcha_user_verifier_filter', 'GraphicalCodeCaptchaVerifierFilter');
+$cfg->setConfigEntry('captcha_user_verifier_filter_class', 'Org\Mxchange\CoreFramework\Filter\Verifier\Captcha\GraphicalCodeCaptchaVerifierFilter');
 
 // CFG: CAPTCHA-REGISTER-VERIFIER-FILTER
-$cfg->setConfigEntry('captcha_register_verifier_filter', 'GraphicalCodeCaptchaVerifierFilter');
+$cfg->setConfigEntry('captcha_register_verifier_filter_class', 'Org\Mxchange\CoreFramework\Filter\Verifier\Captcha\GraphicalCodeCaptchaVerifierFilter');
 
 // CFG: CAPTCHA-REFILL-VERFIER-FILTER
-$cfg->setConfigEntry('captcha_refill_verifier_filter', 'GraphicalCodeCaptchaVerifierFilter');
+$cfg->setConfigEntry('captcha_refill_verifier_filter_class', 'Org\Mxchange\CoreFramework\Filter\Verifier\Captcha\GraphicalCodeCaptchaVerifierFilter');
 
 // CFG: CAPTCHA-GOVERNMENT-VERFIER-FILTER
-$cfg->setConfigEntry('captcha_government_verifier_filter', 'GraphicalCodeCaptchaVerifierFilter');
+$cfg->setConfigEntry('captcha_government_verifier_filter_class', 'Org\Mxchange\CoreFramework\Filter\Verifier\Captcha\GraphicalCodeCaptchaVerifierFilter');
 
 // CFG: CAPTCHA-PROFILE-VERFIER-FILTER
-$cfg->setConfigEntry('captcha_profile_verifier_filter', 'GraphicalCodeCaptchaVerifierFilter');
+$cfg->setConfigEntry('captcha_profile_verifier_filter_class', 'Org\Mxchange\CoreFramework\Filter\Verifier\Captcha\GraphicalCodeCaptchaVerifierFilter');
 
 // CFG: CONFIRM-CODE-VERIFIER-FILTER
-$cfg->setConfigEntry('confirm_code_verifier_filter', 'ConfirmCodeVerifierFilter');
+$cfg->setConfigEntry('confirm_code_verifier_filter_class', 'Org\Mxchange\CoreFramework\Filter\Verifier\Confirmation\ConfirmCodeVerifierFilter');
 
 // CFG: BIRTHDAY-REGISTER-VERIFIER-FILTER
-$cfg->setConfigEntry('birthday_register_verifier_filter', 'BirthdayVerifierFilter');
+$cfg->setConfigEntry('birthday_register_verifier_filter_class', 'Org\Mxchange\CoreFramework\Filter\Verifier\User\BirthdayVerifierFilter');
 
 // CFG: BIRTHDAY-PROFILE-VERIFIER-FILTER
-$cfg->setConfigEntry('birthday_profile_verifier_filter', 'BirthdayVerifierFilter');
+$cfg->setConfigEntry('birthday_profile_verifier_filter_class', 'Org\Mxchange\CoreFramework\Filter\Verifier\User\BirthdayVerifierFilter');
 
 // CFG: CITY-NAME-VERIFIER-FILTER
-$cfg->setConfigEntry('city_name_verifier_filter', 'CityNameVerifierFilter');
-
-// CFG: USER-STATUS-FILTER
-$cfg->setConfigEntry('user_status_filter', 'UserStatusVerifierFilter');
+$cfg->setConfigEntry('city_name_verifier_filter_class', 'Org\Mxchange\City\Filter\Verifier\CityNameVerifierFilter');
 
 // CFG: CITY-HTML-CMD-DO-FORM-RESOLVER-CLASS
 $cfg->setConfigEntry('city_html_cmd_do_form_resolver_class', 'Org\Mxchange\City\Resolver\Command\CityHtmlCommandResolver');
@@ -351,13 +348,13 @@ $cfg->setConfigEntry('guest_login_user', 'guest');
 $cfg->setConfigEntry('guest_login_passwd', 'guest');
 
 // CFG: USER-REGISTRATION
-$cfg->setConfigEntry('user_registration_class', 'CityRegistration');
+$cfg->setConfigEntry('user_registration_class', 'Org\Mxchange\City\Registration\CityRegistration');
 
 // CFG: USER-LOGIN-CLASS
-$cfg->setConfigEntry('user_login_class', 'CityUserLogin');
+$cfg->setConfigEntry('user_login_class', 'Org\Mxchange\City\Login\User\CityUserLogin');
 
 // CFG: GUEST-LOGIN-CLASS
-$cfg->setConfigEntry('guest_login_class', 'CityGuestLogin');
+$cfg->setConfigEntry('guest_login_class', 'Org\Mxchange\City\Login\Guest\CityGuestLogin');
 
 // CFG: CONFIRM-EMAIL-ENABLED
 $cfg->setConfigEntry('confirm_email_enabled', 'Y');
@@ -375,10 +372,10 @@ $cfg->setConfigEntry('user_status_confirmed', 'CONFIRMED');
 $cfg->setConfigEntry('user_status_locked', 'LOCKED');
 
 // CFG: LOGIN-HELPER-CLASS
-$cfg->setConfigEntry('login_helper_class', 'CityLoginHelper');
+$cfg->setConfigEntry('login_helper_class', 'Org\Mxchange\City\Helper\Login\CityLoginHelper');
 
 // CFG: AUTH-METHOD-CLASS
-$cfg->setConfigEntry('auth_method_class', 'CookieAuth');
+$cfg->setConfigEntry('auth_method_class', 'Org\Mxchange\CoreFramework\Auth\CookieAuth');
 
 // CFG: APP-LOGIN-URL
 $cfg->setConfigEntry('app_login_url', 'index.php?app={?app_short_name?}&command=login_area');
@@ -444,10 +441,10 @@ $cfg->setConfigEntry('confirm_code_invalid_url', 'index.php?app={?app_short_name
 $cfg->setConfigEntry('user_not_found_url', 'index.php?app={?app_short_name?}&command=login_area&action=status_problem&status=user_not_found');
 
 // CFG: USER-AUTH-FILTER
-$cfg->setConfigEntry('user_auth_filter', 'UserAuthFilter');
+$cfg->setConfigEntry('user_auth_filter_class', 'Org\Mxchange\CoreFramework\Filter\User\Auth\UserAuthFilter');
 
 // CFG: USER-UPDATE-FILTER
-$cfg->setConfigEntry('user_update_filter', 'UserUpdateFilter');
+$cfg->setConfigEntry('user_update_filter_class', 'Org\Mxchange\CoreFramework\Filter\User\UserUpdateFilter');
 
 // CFG: LOGIN-DEFAULT-ACTION
 $cfg->setConfigEntry('login_default_action', 'welcome');
@@ -459,7 +456,7 @@ $cfg->setConfigEntry('moneybank_activated', 'Y');
 $cfg->setConfigEntry('moneybank_opening_class', 'MoneyBankRealtimeOpening');
 
 // CFG: USER-POINTS-CLASS
-$cfg->setConfigEntry('user_points_class', 'UserPoints');
+$cfg->setConfigEntry('user_points_class', 'Org\Mxchange\CoreFramework\User\Points\UserPoints');
 
 // CFG: BLOCK-SHOWS-REGISTRATION
 $cfg->setConfigEntry('block_shows_registration', 'Y');
@@ -471,7 +468,7 @@ $cfg->setConfigEntry('government_class', 'SimplifiedGovernment');
 $cfg->setConfigEntry('bank_class', 'MoneyBank');
 
 // CFG: USER-POINTS-DB-WRAPPER-CLASS
-$cfg->setConfigEntry('user_points_db_wrapper_class', 'UserPointsDatabaseWrapper');
+$cfg->setConfigEntry('user_points_db_wrapper_class', 'Org\Mxchange\CoreFramework\Database\Frontend\Points\UserPointsDatabaseWrapper');
 
 // CFG: USER-GOVERNMENT-WRAPPER-CLASS
 $cfg->setConfigEntry('user_government_wrapper_class', 'UserGovernmentDatabaseWrapper');
@@ -520,28 +517,28 @@ $cfg->setConfigEntry('default_city_console_controller', 'daemon');
 $cfg->setConfigEntry('city_console_cmd_daemon_resolver_class', 'Org\Mxchange\City\Resolver\Command\CityConsoleCommandResolver');
 
 // CFG: CITY-DAEMON-PHP-REQUIREMENTS-FILTER
-$cfg->setConfigEntry('city_daemon_php_requirements_filter', 'Org\Mxchange\City\Daemon\Filter\CityDaemonPhpRequirementsFilter');
+$cfg->setConfigEntry('city_daemon_php_requirements_filter_class', 'Org\Mxchange\City\Daemon\Filter\CityDaemonPhpRequirementsFilter');
 
 // CFG: CITY-DAEMON-INITIALIZER-FILTER
-$cfg->setConfigEntry('city_daemon_initializer_filter', 'Org\Mxchange\City\Daemon\Filter\Initialization\CityDaemonInitializationFilter');
+$cfg->setConfigEntry('city_daemon_initializer_filter_class', 'Org\Mxchange\City\Daemon\Filter\Initialization\CityDaemonInitializationFilter');
 
 // CFG: CITY-DAEMON-ACTIVATION-TASK-HANDLER-INITIALIZER-FILTER
-$cfg->setConfigEntry('city_daemon_activation_task_handler_initializer_filter', 'Org\Mxchange\City\Daemon\Filter\Initialization\Tasks\CityDaemonTaskHandlerInitializerFilter');
+$cfg->setConfigEntry('city_daemon_activation_task_handler_initializer_filter_class', 'Org\Mxchange\City\Daemon\Filter\Initialization\Tasks\CityDaemonTaskHandlerInitializerFilter');
 
 // CFG: CITY-DAEMON-WELCOME-TEASER-FILTER
-$cfg->setConfigEntry('city_daemon_welcome_teaser_filter', 'Org\Mxchange\City\Daemon\Filter\CityDaemonWelcomeTeaserFilter');
+$cfg->setConfigEntry('city_daemon_welcome_teaser_filter_class', 'Org\Mxchange\City\Daemon\Filter\CityDaemonWelcomeTeaserFilter');
 
 // CFG: CITY-DAEMON-BOOTSTRAP-INIT-DAEMON-FILTER
-$cfg->setConfigEntry('city_daemon_bootstrap_init_daemon_filter', 'Org\Mxchange\City\Daemon\Filter\Bootstrap\CityDaemonBootstrapInitDaemonFilter');
+$cfg->setConfigEntry('city_daemon_bootstrap_init_daemon_filter_class', 'Org\Mxchange\City\Daemon\Filter\Bootstrap\CityDaemonBootstrapInitDaemonFilter');
 
 // CFG: CITY-DAEMON-BOOTSTRAP-EXTRA-BOOTSTRAPPING-FILTER
-$cfg->setConfigEntry('city_daemon_bootstrap_extra_bootstrapping_filter', 'Org\Mxchange\City\Daemon\Filter\Bootstrap\CityDaemonBootstrapExtraBootstrappingFilter');
+$cfg->setConfigEntry('city_daemon_bootstrap_extra_bootstrapping_filter_class', 'Org\Mxchange\City\Daemon\Filter\Bootstrap\CityDaemonBootstrapExtraBootstrappingFilter');
 
 // CFG: CITY-DAEMON-SHUTDOWN-TASK-HANDLER-FILTER
-$cfg->setConfigEntry('city_daemon_shutdown_task_handler_filter', 'Org\Mxchange\City\Daemon\Filter\Shutdown\CityDaemonShutdownTaskHandlerFilter');
+$cfg->setConfigEntry('city_daemon_shutdown_task_handler_filter_class', 'Org\Mxchange\City\Daemon\Filter\Shutdown\CityDaemonShutdownTaskHandlerFilter');
 
 // CFG: CITY-DAEMON-SHUTDOWN-CITY-FILTER
-$cfg->setConfigEntry('city_daemon_shutdown_city_filter', 'Org\Mxchange\City\Daemon\Filter\Shutdown\CityDaemonShutdownCityFilter');
+$cfg->setConfigEntry('city_daemon_shutdown_city_filter_class', 'Org\Mxchange\City\Daemon\Filter\Shutdown\CityDaemonShutdownCityFilter');
 
 // CFG: NEWS-READER-DAEMON-CLASS
 $cfg->setConfigEntry('news_reader_daemon_class', 'Org\Mxchange\CoreFramework\Reader\News\Console\ConsoleNewsReader');

diff --git a/core b/core
index c53e9c7252290aa3e4107717419429c0418a6945..f2ab4d6de08ce3a56636bf76ba5ef0ebf3a187c7 160000 (submodule)
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit c53e9c7252290aa3e4107717419429c0418a6945
+Subproject commit f2ab4d6de08ce3a56636bf76ba5ef0ebf3a187c7