Updated copyright:

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

diff --git a/inc/classes/main/commands/web/class_WebRegisterCommand.php b/inc/classes/main/commands/web/class_WebRegisterCommand.php
index c23b6476ea84b27982ca5408ebdec5e8694d04bc..8486c9de1dbf541db2812705eb843b24ba898079 100644 (file)
--- a/inc/classes/main/commands/web/class_WebRegisterCommand.php
+++ b/inc/classes/main/commands/web/class_WebRegisterCommand.php
@@ -2,11 +2,11 @@
 /**
  * A command class for the registration form
  *
- * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
+ * @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 WebRegisterCommand extends BaseCommand implements Commandable, Registerabl
         * @param       $resolverInstance       An instance of a command resolver class
         * @return      $commandInstance        An instance a prepared command class
         */
-       public final static function createWebRegisterCommand (CommandResolver $resolverInstance) {
+       public static final function createWebRegisterCommand (CommandResolver $resolverInstance) {
                // Get new instance
                $commandInstance = new WebRegisterCommand();
 
@@ -61,19 +61,19 @@ class WebRegisterCommand extends BaseCommand implements Commandable, Registerabl
                Registry::getRegistry()->addInstance('extra', $this);
 
                // 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 all the application's data with template variables
-               $templateInstance->assignApplicationData($appInstance);
+               $templateInstance->assignApplicationData($applicationInstance);
 
                // Assign base URL
                $templateInstance->assignConfigVariable('base_url');
 
                // Load the master template
-               $masterTemplate = $appInstance->getMasterTemplate();
+               $masterTemplate = $applicationInstance->buildMasterTemplateName();
 
                // Load header template
                $templateInstance->loadCodeTemplate('header');
@@ -102,6 +102,16 @@ class WebRegisterCommand extends BaseCommand implements Commandable, Registerabl
                // Set title
                $templateInstance->assignVariable('title', $this->getLanguageInstance()->getMessage('page_register_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.
+               $menuInstance = ObjectFactory::createObjectByConfiguredName('register_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.
@@ -119,7 +129,7 @@ class WebRegisterCommand extends BaseCommand implements Commandable, Registerabl
         * @return      void
         */
        public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
-               // Empty class
+               // Empty method
        }
 }