Continued:

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

diff --git a/application/city/classes/commands/html/class_CityHtmlLoginCommand.php b/application/city/classes/commands/html/class_CityHtmlLoginCommand.php
index bd1327d1f42b734634d99ea0c91dfe9672f9c85c..69507599b433f2558557c2e8edef81e2435f4759 100644 (file)
--- a/application/city/classes/commands/html/class_CityHtmlLoginCommand.php
+++ b/application/city/classes/commands/html/class_CityHtmlLoginCommand.php
@@ -1,4 +1,16 @@
 <?php
+// Own namespace
+namespace Org\Mxchange\City\Command;
+
+// 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\Registry\Registerable;
+use Org\Mxchange\CoreFramework\Request\Requestable;
+use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
+use Org\Mxchange\CoreFramework\Response\Responseable;
+
 /**
  * A command for the login form
  *
@@ -58,16 +70,16 @@ class CityHtmlLoginCommand extends BaseCommand implements Commandable, Registera
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Set request instance as extra instance
-               Registry::getRegistry()->addInstance('extra', $this);
+               GenericRegistry::getRegistry()->addInstance('extra', $this);
 
                // Get the application instance
-               $applicationInstance = $this->getResolverInstance()->getApplicationInstance();
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
 
                // Prepare a template instance
                $templateInstance = $this->prepareTemplateInstance($applicationInstance);
 
                // Assign application data with template engine
-               $templateInstance->assignApplicationData($applicationInstance);
+               $templateInstance->assignApplicationData();
 
                // Assign base URL
                $templateInstance->assignConfigVariable('base_url');