Fixes for image generation

[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 32bd7649120547a880d2563198ed87353a850153..9f06072f79428ee1132e0096adf704c0a3009467 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, this is free software
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -79,14 +79,9 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
                // Call parent constructor
                parent::__construct(__CLASS__);
 
-               // Set description
-               $this->setObjectDescription("Application-Helper");
-
-               // Create an unique ID
-               $this->generateUniqueId();
-
                // Tidy up a little
                $this->removeSystemArray();
+               $this->removeNumberFormaters();
        }
 
        /**
@@ -185,8 +180,19 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
                // Create a new request object
                $requestInstance = ObjectFactory::createObjectByName('HttpRequest');
 
+               // Default response is HTTP (HTML page) and type is "Web"
+               $response = "http";
+               $responseType = "web";
+
+               // Do we have another response?
+               if ($requestInstance->isRequestElementSet('response')) {
+                       // Then use it
+                       $response = strtolower($requestInstance->getRequestElement('response'));
+                       $responseType = $response;
+               } // END - if
+
                // ... and a new response object
-               $responseInstance = ObjectFactory::createObjectByName('HttpResponse', array($this));
+               $responseInstance = ObjectFactory::createObjectByName(ucfirst($response)."Response", array($this));
 
                // Remember both in this application
                $this->setRequestInstance($requestInstance);
@@ -197,11 +203,11 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 
                // If it is null then get default command
                if (is_null($commandName)) {
-                       $commandName = $this->getConfigInstance()->readConfig('default_command');
+                       $commandName = $responseInstance->getDefaultCommand();
                } // END - if
 
                // Get a resolver
-               $resolverInstance = WebControllerResolver::createWebControllerResolver($commandName, $this);
+               $resolverInstance = ObjectFactory::createObjectByName(ucfirst($responseType)."ControllerResolver", array($commandName, $this));
 
                // Get a controller instance as well
                $this->controllerInstance = $resolverInstance->resolveController();
@@ -221,7 +227,18 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
                // Walk through all messages
                foreach ($messageList as $message) {
                        print("MSG:".$message."<br />\n");
-               }
+               } // END - if
+       }
+
+       /**
+        * Assigns application-depending data
+        *
+        * @param       $templateInstance       An instance of a template engine
+        * @return      void
+        */
+       public function assignExtraTemplateData (CompileableTemplate $templateInstance) {
+               // Assign charset
+               $templateInstance->assignConfigVariable('header_charset');
        }
 }