'page' and 'command' were both the same (command), so better name it same way.

[hub.git] / application / hub / class_ApplicationHelper.php

diff --git a/application/hub/class_ApplicationHelper.php b/application/hub/class_ApplicationHelper.php
index 7352bc010aa33fe2f0ca77c453f08fc795270452..299754ec2c5b37bf9aee36fd6c7db32dc43cd7e2 100644 (file)
--- a/application/hub/class_ApplicationHelper.php
+++ b/application/hub/class_ApplicationHelper.php
@@ -22,7 +22,7 @@
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0
- * @copyright  Copyright (c) 2007 - 2008 Roland Haeder, 2009 - 2014 Hub Developer Team
+ * @copyright  Copyright (c) 2007 - 2008 Roland Haeder, 2009 - 2015 Hub Developer Team
  * @license            GNU GPL 3.0 or any newer version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -152,15 +152,15 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
                // Set this application in registry
                Registry::getRegistry()->addInstance('app', $this);
 
-               // Is no external IP set?
-               if ($this->getConfigInstance()->getConfigEntry('external_ip') == '') {
-                       // Determine external IP
-                       $this->getConfigInstance()->setConfigEntry('external_ip', ConsoleTools::determineExternalIp());
+               // Is no external address set?
+               if ($this->getConfigInstance()->getConfigEntry('external_address') == '') {
+                       // Determine external address
+                       $this->getConfigInstance()->setConfigEntry('external_address', HubTools::determineOwnExternalAddress());
                } // END - if
 
                // Default response is console
-               $response = $this->getResponseTypeFromSystem();
-               $responseType = $this->getResponseTypeFromSystem();
+               $response = self::getResponseTypeFromSystem();
+               $responseType = self::getResponseTypeFromSystem();
 
                // Create a new request object
                $requestInstance = ObjectFactory::createObjectByName($this->convertToClassName($response) . 'Request');
@@ -188,7 +188,7 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
                // If it is null then get default command
                if (is_null($commandName)) {
                        // Get default command
-                       $commandName = $responseInstance->getDefaultCommand();
+                       $commandName = $responseInstance->determineDefaultCommand();
 
                        // Set it in request
                        $requestInstance->setRequestElement('command', $commandName);
@@ -212,6 +212,16 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
                self::createDebugInstance(__CLASS__)->debugOutput('MAIN: Shutdown completed. (This is the last line.)');
        }
 
+       /**
+        * Assigns extra application-depending data
+        *
+        * @param       $templateInstance       An instance of a CompileableTemplate
+        * @return      void
+        * @todo        Nothing to add?
+        */
+       public function assignExtraTemplateData (CompileableTemplate $templateInstance) {
+       }
+
        /**
         * Handle the indexed array of fatal messages and puts them out in an
         * acceptable fasion