Continued:

[core.git] / framework / main / classes / commands / html / class_HtmlLoginAreaCommand.php

diff --git a/framework/main/classes/commands/html/class_HtmlLoginAreaCommand.php b/framework/main/classes/commands/html/class_HtmlLoginAreaCommand.php
index 105883015a6d223a090cc8f2a5527cadf4fa2343..a7aad82e316d7a0256f3ecbf468650f82792c38d 100644 (file)
--- a/framework/main/classes/commands/html/class_HtmlLoginAreaCommand.php
+++ b/framework/main/classes/commands/html/class_HtmlLoginAreaCommand.php
@@ -1,17 +1,17 @@
 <?php
 // Own namespace
-namespace CoreFramework\Command\Login;
+namespace Org\Mxchange\CoreFramework\Command\Login;
 
 // Import framework stuff
-use CoreFramework\Action\PerformableAction;
-use CoreFramework\Command\BaseCommand;
-use CoreFramework\Command\Commandable;
-use CoreFramework\Controller\Controller;
-use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Registry\Registry;
-use CoreFramework\Request\Requestable;
-use CoreFramework\Resolver\Command\CommandResolver;
-use CoreFramework\Response\Responseable;
+use Org\Mxchange\CoreFramework\Action\PerformableAction;
+use Org\Mxchange\CoreFramework\Command\BaseCommand;
+use Org\Mxchange\CoreFramework\Command\Commandable;
+use Org\Mxchange\CoreFramework\Controller\Controller;
+use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
+use Org\Mxchange\CoreFramework\Request\Requestable;
+use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
+use Org\Mxchange\CoreFramework\Response\Responseable;
 
 /**
  * A command for the login area (member/gamer area)
@@ -89,7 +89,7 @@ class HtmlLoginAreaCommand extends BaseCommand implements Commandable {
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get the action instance from registry
-               $actionInstance = Registry::getRegistry()->getInstance('action');
+               $actionInstance = GenericRegistry::getRegistry()->getInstance('action');
 
                // Do we have an action here?
                if ($actionInstance instanceof PerformableAction) {
@@ -98,7 +98,7 @@ class HtmlLoginAreaCommand extends BaseCommand implements Commandable {
                } // END - if
 
                // Get the application instance
-               $applicationInstance = $this->getResolverInstance()->getApplicationInstance();
+               $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
 
                // Prepare a template instance
                $templateInstance = $this->prepareTemplateInstance($applicationInstance);
@@ -107,7 +107,7 @@ class HtmlLoginAreaCommand extends BaseCommand implements Commandable {
                $templateInstance->assignConfigVariable('base_url');
 
                // Assign all the application's data with template variables
-               $templateInstance->assignApplicationData($applicationInstance);
+               $templateInstance->assignApplicationData();
 
                // Load the master template
                $masterTemplate = $applicationInstance->buildMasterTemplateName();
@@ -179,7 +179,7 @@ class HtmlLoginAreaCommand extends BaseCommand implements Commandable {
                $actionInstance = NULL;
 
                // Get registry
-               $registryInstance = Registry::getRegistry();
+               $registryInstance = GenericRegistry::getRegistry();
 
                // Get our application instance from the registry
                $applicationInstance = $registryInstance->getInstance('application');
@@ -196,11 +196,8 @@ class HtmlLoginAreaCommand extends BaseCommand implements Commandable {
                        $this->actionName = self::convertDashesToUnderscores($applicationInstance->getAppShortName()) . '_login_' . $actReq;
                } // END - if
 
-               // Get application instance
-               $applicationInstance = $this->getResolverInstance()->getApplicationInstance();
-
                // Get a resolver
-               $actionResolver = HtmlActionResolver::createHtmlActionResolver($this->actionName, $applicationInstance);
+               $actionResolver = HtmlActionResolver::createHtmlActionResolver($this->actionName);
 
                // Resolve the action
                $actionInstance = $actionResolver->resolveAction();
@@ -209,7 +206,7 @@ class HtmlLoginAreaCommand extends BaseCommand implements Commandable {
                $actionInstance->addExtraFilters($controllerInstance, $requestInstance);
 
                // Remember this action in registry
-               Registry::getRegistry()->addInstance('action', $actionInstance);
+               GenericRegistry::getRegistry()->addInstance('action', $actionInstance);
        }
 
 }