Generic menu XML added, XML nodes rewritten:

[shipsimu.git] / application / ship-simu / class_ApplicationHelper.php

diff --git a/application/ship-simu/class_ApplicationHelper.php b/application/ship-simu/class_ApplicationHelper.php
index e1af8620c08f25dd4b28a221c31183e4d66d18b4..d85438a054db7e6a7781398cdefee154cfa0254b 100644 (file)
--- a/application/ship-simu/class_ApplicationHelper.php
+++ b/application/ship-simu/class_ApplicationHelper.php
@@ -22,7 +22,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 Ship-Simu Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -160,7 +160,7 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
         */
        public function buildMasterTemplateName () {
                // Get short name and add suffix
-               $masterTemplateName = str_replace("-", "", $this->getAppShortName()) . "_main";
+               $masterTemplateName = str_replace('-', '', $this->getAppShortName()) . '_main';
 
                // Return it
                return $masterTemplateName;
@@ -175,9 +175,12 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
                // Create a new request object
                $requestInstance = ObjectFactory::createObjectByName('HttpRequest');
 
-               // Default response is HTTP (HTML page) and type is "Web"
-               $response = "http";
-               $responseType = "web";
+               // Remember request instance here
+               $this->setRequestInstance($requestInstance);
+
+               // Default response is HTTP (HTML page) and type is 'Web'
+               $response = 'http';
+               $responseType = 'web';
 
                // Do we have another response?
                if ($requestInstance->isRequestElementSet('request')) {
@@ -190,8 +193,7 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
                $responseClass = sprintf("%sResponse", $this->convertToClassName($response));
                $responseInstance = ObjectFactory::createObjectByName($responseClass, array($this));
 
-               // Remember both in this application
-               $this->setRequestInstance($requestInstance);
+               // Remember response instance here
                $this->setResponseInstance($responseInstance);
 
                // Get the parameter from the request
@@ -199,7 +201,11 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
 
                // If it is null then get default command
                if (is_null($commandName)) {
+                       // Get the default command
                        $commandName = $responseInstance->getDefaultCommand();
+
+                       // Set it in request
+                       $requestInstance->setRequestElement('page', $commandName);
                } // END - if
 
                // Get a resolver
@@ -209,6 +215,12 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
                // Get a controller instance as well
                $this->controllerInstance = $resolverInstance->resolveController();
 
+               // Get a web output class
+               $outputInstance = ObjectFactory::createObjectByConfiguredName('output_class', array($this));
+
+               // Set it in this application
+               $this->setWebOutputInstance($outputInstance);
+
                // Handle the request
                $this->controllerInstance->handleRequest($requestInstance, $responseInstance);
        }