Continued:

[city.git] / application / city / classes / commands / html / class_CityHtmlCityMapCommand.php

diff --git a/application/city/classes/commands/html/class_CityHtmlCityMapCommand.php b/application/city/classes/commands/html/class_CityHtmlCityMapCommand.php
index ce56651ecfb49fd3b4799bfbfd98bd4e28219e3d..841d916fb0f0bab7b588ef40e1de04e77aa67cb1 100644 (file)
--- a/application/city/classes/commands/html/class_CityHtmlCityMapCommand.php
+++ b/application/city/classes/commands/html/class_CityHtmlCityMapCommand.php
@@ -1,10 +1,26 @@
 <?php
+// Own namespace
+namespace Org\Mxchange\City\Command;
+
+// Import application-specific stuff
+use Org\Mxchange\City\Factory\Manager\ManagerFactory;
+use Org\Mxchange\City\Manager\City\ManageableCity;
+
+// Import framework stuff
+use Org\Mxchange\CoreFramework\Command\BaseCommand;
+use Org\Mxchange\CoreFramework\Command\Commandable;
+use Org\Mxchange\CoreFramework\Controller\Controller;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
+use Org\Mxchange\CoreFramework\Request\Requestable;
+use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
+use Org\Mxchange\CoreFramework\Response\Responseable;
+
 /**
  * A command for the city map
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2015, 2016 City Developer Team
+ * @copyright  Copyright (c) 2015 - 2023 City Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -63,10 +79,6 @@ class CityHtmlCityMapCommand extends BaseCommand implements Commandable {
                // Make sure the instance is valid
                assert($managerInstance instanceof ManageableCity);
 
-               // First set request and response instance
-               $managerInstance->setRequestInstance($requestInstance);
-               $managerInstance->setResponseInstance($responseInstance);
-
                // Is there already a city the user has founded?
                if ($managerInstance->isCityAlreadyFounded()) {
                        // Found 2nd,3rd,... city
@@ -90,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'));
        }
 }