X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fcommands%2Fweb%2Fclass_WebLogoutDoneCommand.php;h=269f19a89082b571f71e7e22ac707c2df896ceea;hp=fa11b02c9202f75782bd845e346c0137b2508e5a;hb=a99af80d10397a588bda35a4d7631d0563022072;hpb=0cd57c3885f00ad77fc599e53ed2f2d5e7ac267f diff --git a/inc/classes/main/commands/web/class_WebLogoutDoneCommand.php b/inc/classes/main/commands/web/class_WebLogoutDoneCommand.php index fa11b02c..269f19a8 100644 --- a/inc/classes/main/commands/web/class_WebLogoutDoneCommand.php +++ b/inc/classes/main/commands/web/class_WebLogoutDoneCommand.php @@ -2,11 +2,11 @@ /** * A command for the login failed page * - * @author Roland Haeder + * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Core Developer Team * @license GNU GPL 3.0 or any newer version - * @link http://www.ship-simu.org + * @link http://www.shipsimu.org * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -38,7 +38,7 @@ class WebLogoutDoneCommand extends BaseCommand implements Commandable { * @param $resolverInstance An instance of a command resolver class * @return $commandInstance An instance a prepared command class */ - public final static function createWebLogoutDoneCommand (CommandResolver $resolverInstance) { + public static final function createWebLogoutDoneCommand (CommandResolver $resolverInstance) { // Get new instance $commandInstance = new WebLogoutDoneCommand(); @@ -58,16 +58,16 @@ class WebLogoutDoneCommand extends BaseCommand implements Commandable { */ public function execute (Requestable $requestInstance, Responseable $responseInstance) { // Get the application instance - $appInstance = $this->getResolverInstance()->getApplicationInstance(); + $applicationInstance = $this->getResolverInstance()->getApplicationInstance(); // Prepare a template instance - $templateInstance = $this->prepareTemplateInstance($appInstance); + $templateInstance = $this->prepareTemplateInstance($applicationInstance); // Assign application data - $templateInstance->assignApplicationData($appInstance); + $templateInstance->assignApplicationData($applicationInstance); // Load the master template - $masterTemplate = $appInstance->buildMasterTemplateName(); + $masterTemplate = $applicationInstance->buildMasterTemplateName(); // Load header template $templateInstance->loadCodeTemplate('header'); @@ -98,9 +98,21 @@ class WebLogoutDoneCommand extends BaseCommand implements Commandable { // Assign base URL $templateInstance->assignConfigVariable('base_url'); - // ... 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. + // 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. + $menuInstance = ObjectFactory::createObjectByConfiguredName('logout_menu_class', array($applicationInstance)); + + // Render the menu + $menuInstance->renderMenu(); + + // Transfer it to the template engine instance + $menuInstance->transferContentToTemplateEngine($templateInstance); + + /* + * ... 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(); // Get the content back from the template engine and put it in response class