Constants PATH and _DB_TYPE replaced

[shipsimu.git] / inc / classes / main / response / class_HttpResponse.php

diff --git a/inc/classes/main/response/class_HttpResponse.php b/inc/classes/main/response/class_HttpResponse.php
index 7e78b4378e05d22e1aa1185020845248ff0a0e5e..869d358a49acbb44537dbaf09325b7afbdfd3471 100644 (file)
--- a/inc/classes/main/response/class_HttpResponse.php
+++ b/inc/classes/main/response/class_HttpResponse.php
@@ -4,7 +4,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
  *
@@ -48,7 +48,7 @@ class HttpResponse extends BaseFrameworkSystem implements Responseable {
        /**
         * Instance of the template engine
         */
-       private $templateEngine = null;
+       private $templateInstance = null;
 
        /**
         * Fatal resolved messages from filters and so on
@@ -64,12 +64,6 @@ class HttpResponse extends BaseFrameworkSystem implements Responseable {
                // Call parent constructor
                parent::__construct(__CLASS__);
 
-               // Set part description
-               $this->setObjectDescription("HTTP response");
-
-               // Create unique ID number
-               $this->generateUniqueId();
-
                // Clean up a little
                $this->removeNumberFormaters();
                $this->removeSystemArray();
@@ -213,16 +207,7 @@ class HttpResponse extends BaseFrameworkSystem implements Responseable {
         * @return      void
         */
        public final function initTemplateEngine (ManageableApplication $appInstance) {
-               $this->templateEngine = $this->prepareTemplateEngine($appInstance);
-       }
-
-       /**
-        * Getter for the template engine instance
-        *
-        * @return      $templateEngine         An instance of the used template engine
-        */
-       public final function getTemplateEngine () {
-               return $this->templateEngine;
+               $this->setTemplateInstance($this->prepareTemplateInstance($appInstance));
        }
 
        /**
@@ -246,17 +231,22 @@ class HttpResponse extends BaseFrameworkSystem implements Responseable {
         * @param       $expires                Timestamp of expiration (default: configured)
         * @return      void
         * @throws      ResponseHeadersAlreadySentException             If headers are already sent
+        * @todo        Encryption of cookie data not yet supported.
+        * @todo        Why are these parameters conflicting?
+        * @todo        If the return statement is removed and setcookie() commented out,
+        * @todo        this will send only one cookie out, the first one.
         */
        public function addCookie ($cookieName, $cookieValue, $encrypted = false, $expires = null) {
+               //* DEBUG: */ echo $cookieName."=".$cookieValue."<br />\n";
                // Are headers already sent?
                if (headers_sent()) {
                        // Throw an exception here
+                       //* DEBUG: */ return;
                        throw new ResponseHeadersAlreadySentException($this, self::EXCEPTION_HEADERS_ALREADY_SENT);
                } // END - if
 
                // Shall we encrypt the cookie?
                if ($encrypted === true) {
-                       /* @TODO Encryption of cookie data not yet supported */
                } // END - if
 
                // For slow browsers set the cookie array element first
@@ -271,15 +261,12 @@ class HttpResponse extends BaseFrameworkSystem implements Responseable {
                $domain = $this->getConfigInstance()->readConfig('cookie_domain');
 
                setcookie($cookieName, $cookieValue, $expires);
-               /* @TODO Why are these parameters conflicting? */
                //, $path, $domain, (isset($_SERVER['HTTPS']))
                return;
-               /* @TODO This will send only one cookie out, the first one. */
 
                // Now construct the full header
                $cookieString = $cookieName . "=" . $cookieValue . "; ";
                $cookieString .= "expires=" . date("D, d-F-Y H:i:s", $expires) . " GMT";
-               /* @TODO Why are these parameters conflicting? */
                // $cookieString .= "; path=".$path."; domain=".$domain;
 
                // Set the cookie as a header
@@ -359,6 +346,16 @@ class HttpResponse extends BaseFrameworkSystem implements Responseable {
                        $this->addCookie($cookieName, $_COOKIE[$cookieName], false);
                } // END - if
        }
+
+       /**
+        * Getter for default command
+        *
+        * @return      $defaultCommand         Default command for this response
+        */
+       public function getDefaultCommand () {
+               $defaultCommand = $this->getConfigInstance()->readConfig('default_web_command');
+               return $defaultCommand;
+       }
 }
 
 // [EOF]