X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fcommands%2Fhtml%2Fclass_HtmlLoginCommand.php;h=ce67a7909c9e0124ba51c9882b70e47974bf0455;hb=2218902056efcf9a2c66fe7c24995e066bd7cd11;hp=d3df3f3e79d00361fb531b68e84e73cc98fb1598;hpb=4f9cf34b521892cb99fae9b21b92787f3d555b74;p=core.git

diff --git a/framework/main/classes/commands/html/class_HtmlLoginCommand.php b/framework/main/classes/commands/html/class_HtmlLoginCommand.php
index d3df3f3e..ce67a790 100644
--- a/framework/main/classes/commands/html/class_HtmlLoginCommand.php
+++ b/framework/main/classes/commands/html/class_HtmlLoginCommand.php
@@ -3,11 +3,13 @@
 namespace Org\Mxchange\CoreFramework\Command\Login;
 
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 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\Registry;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
+use Org\Mxchange\CoreFramework\Helper\Application\ApplicationHelper;
+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;
@@ -17,7 +19,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2020 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *
@@ -71,48 +73,45 @@ class HtmlLoginCommand extends BaseCommand implements Commandable {
 	 */
 	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 = Registry::getRegistry()->getInstance('app');
-
-		// Prepare a template instance
-		$templateInstance = $this->prepareTemplateInstance($applicationInstance);
+		$applicationInstance = ApplicationHelper::getSelfInstance();
 
 		// Assign application data with template engine
-		$templateInstance->assignApplicationData($applicationInstance);
+		$this->getTemplateInstance()->assignApplicationData();
 
 		// Assign base URL
-		$templateInstance->assignConfigVariable('base_url');
+		$this->getTemplateInstance()->assignConfigVariable('base_url');
 
 		// Load the master template
 		$masterTemplate = $applicationInstance->buildMasterTemplateName();
 
 		// Load header template
-		$templateInstance->loadCodeTemplate('header');
+		$this->getTemplateInstance()->loadCodeTemplate('header');
 
 		// Compile and assign it with a variable
-		$templateInstance->compileTemplate();
-		$templateInstance->assignTemplateWithVariable('header', 'header');
+		$this->getTemplateInstance()->compileTemplate();
+		$this->getTemplateInstance()->assignTemplateWithVariable('header', 'header');
 
 		// Load footer template
-		$templateInstance->loadCodeTemplate('footer');
+		$this->getTemplateInstance()->loadCodeTemplate('footer');
 
 		// Compile and assign it with a variable
-		$templateInstance->compileTemplate();
-		$templateInstance->assignTemplateWithVariable('footer', 'footer');
+		$this->getTemplateInstance()->compileTemplate();
+		$this->getTemplateInstance()->assignTemplateWithVariable('footer', 'footer');
 
 		// Load the home template
-		$templateInstance->loadCodeTemplate('login_form');
+		$this->getTemplateInstance()->loadCodeTemplate('login_form');
 
 		// Assign the home template with the master template as a content ... ;)
-		$templateInstance->assignTemplateWithVariable('login_form', 'main_content');
+		$this->getTemplateInstance()->assignTemplateWithVariable('login_form', 'main_content');
 
 		// Load the master template
-		$templateInstance->loadCodeTemplate($masterTemplate);
+		$this->getTemplateInstance()->loadCodeTemplate($masterTemplate);
 
 		// Set title
-		$templateInstance->assignVariable('title', $this->getLanguageInstance()->getMessage('page_login_title'));
+		$this->getTemplateInstance()->assignVariable('title', FrameworkBootstrap::getLanguageInstance()->getMessage('page_login_title'));
 
 		// Construct the menu in every command. We could do this in BaseCommand class. But this means
 		// *every* command has a navigation system and that is want we don't want.
@@ -122,17 +121,17 @@ class HtmlLoginCommand extends BaseCommand implements Commandable {
 		$menuInstance->renderMenu();
 
 		// Transfer it to the template engine instance
-		$menuInstance->transferContentToTemplateEngine($templateInstance);
+		$menuInstance->transferContentToTemplateEngine($this->getTemplateInstance());
 
 		/*
 		 * ... and all variables. This should be merged together in a pattern
 		 * to make things easier. A cache mechanism should be added between
 		 * these two calls to cache compiled templates.
 		 */
-		$templateInstance->compileVariables();
+		$this->getTemplateInstance()->compileVariables();
 
 		// Get the content back from the template engine and put it in response class
-		$templateInstance->transferToResponse($responseInstance);
+		$this->getTemplateInstance()->transferToResponse($responseInstance);
 	}
 
 	/**