Updated copyright:

[core.git] / inc / classes / main / commands / web / class_WebConfirmCommand.php

diff --git a/inc/classes/main/commands/web/class_WebConfirmCommand.php b/inc/classes/main/commands/web/class_WebConfirmCommand.php
index 220ae5ce60d3aaae0965fb85b137d678f0f5ca23..f64624d846ad11d194fbf36fd247ef28150c3ff9 100644 (file)
--- a/inc/classes/main/commands/web/class_WebConfirmCommand.php
+++ b/inc/classes/main/commands/web/class_WebConfirmCommand.php
@@ -2,11 +2,11 @@
 /**
  * A command for the confirmation link handling
  *
 /**
  * A command for the confirmation link handling
  *

- * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @author             Roland Haeder <webmaster@shipsimu.org>

  * @version            0.0.0
  * @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
  * @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
  *
  * 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 WebConfirmCommand extends BaseCommand implements Commandable {
         * @param       $resolverInstance       An instance of a command resolver class
         * @return      $commandInstance        An instance a prepared command class
         */
         * @param       $resolverInstance       An instance of a command resolver class
         * @return      $commandInstance        An instance a prepared command class
         */

-       public final static function createWebConfirmCommand (CommandResolver $resolverInstance) {
+       public static final function createWebConfirmCommand (CommandResolver $resolverInstance) {

                // Get new instance
                $commandInstance = new WebConfirmCommand();
 
                // Get new instance
                $commandInstance = new WebConfirmCommand();
 


@@ -58,19 +58,19 @@ class WebConfirmCommand extends BaseCommand implements Commandable {
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get the application instance
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get the application instance

-               $appInstance = $this->getResolverInstance()->getApplicationInstance();
+               $applicationInstance = $this->getResolverInstance()->getApplicationInstance();

 
                // Prepare a template instance
 
                // Prepare a template instance

-               $templateInstance = $this->prepareTemplateInstance($appInstance);
+               $templateInstance = $this->prepareTemplateInstance($applicationInstance);

 
                // Assign application data with template engine
 
                // Assign application data with template engine

-               $templateInstance->assignApplicationData($appInstance);
+               $templateInstance->assignApplicationData($applicationInstance);

 
                // Assign base URL
                $templateInstance->assignConfigVariable('base_url');
 
                // Load the master template
 
                // Assign base URL
                $templateInstance->assignConfigVariable('base_url');
 
                // Load the master template

-               $masterTemplate = $appInstance->buildMasterTemplateName();
+               $masterTemplate = $applicationInstance->buildMasterTemplateName();

 
                // Load header template
                $templateInstance->loadCodeTemplate('header');
 
                // Load header template
                $templateInstance->loadCodeTemplate('header');


@@ -111,7 +111,13 @@ class WebConfirmCommand extends BaseCommand implements Commandable {
 
                // 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.
 
                // 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('confirm_menu_class', array($appInstance));
+               $menuInstance = ObjectFactory::createObjectByConfiguredName('confirm_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
 
                // ... and all variables. This should be merged together in a pattern
                // to make things easier. A cache mechanism should be added between