Registry rewritten, exception added #2

[core.git] / inc / classes / main / response / class_BaseResponse.php

diff --git a/inc/classes/main/response/class_BaseResponse.php b/inc/classes/main/response/class_BaseResponse.php
index 48aa79f9610b71146376bb31ccdcdfcc1b7312a6..ade23c8d29ddb10c962260c402eccfcb74da0454 100644 (file)
--- a/inc/classes/main/response/class_BaseResponse.php
+++ b/inc/classes/main/response/class_BaseResponse.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0

- * @copyright  Copyright (c) 2007 - 2009 Roland Haeder, this is free software
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009, 2010 Core Developer Team

  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *


@@ -43,7 +43,7 @@ class BaseResponse extends BaseFrameworkSystem {
        /**
         * Body of the response
         */
        /**
         * Body of the response
         */

-       private $responseBody = "";
+       private $responseBody = '';

 
        /**
         * Instance of the template engine
 
        /**
         * Instance of the template engine


@@ -64,10 +64,6 @@ class BaseResponse extends BaseFrameworkSystem {
        protected function __construct ($className) {
                // Call parent constructor
                parent::__construct($className);
        protected function __construct ($className) {
                // Call parent constructor
                parent::__construct($className);

-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();

        }
 
        /**
        }
 
        /**


@@ -170,7 +166,7 @@ class BaseResponse extends BaseFrameworkSystem {
                        $this->addHeader('Pragma', 'no-cache'); // HTTP/1.0
 
                        // Define the charset to be used
                        $this->addHeader('Pragma', 'no-cache'); // HTTP/1.0
 
                        // Define the charset to be used

-                       //$this->addHeader('Content-type:', sprintf("text/html; charset=%s", $this->getConfigInstance()->readConfig('header_charset')));
+                       //$this->addHeader('Content-type:', sprintf("text/html; charset=%s", $this->getConfigInstance()->getConfigEntry('header_charset')));

 
                        // Send all headers
                        foreach ($this->responseHeaders as $name => $value) {
 
                        // Send all headers
                        foreach ($this->responseHeaders as $name => $value) {


@@ -181,7 +177,7 @@ class BaseResponse extends BaseFrameworkSystem {
                        // Send cookies out?
                        if (count($this->cookies) > 0) {
                                // Send all cookies
                        // Send cookies out?
                        if (count($this->cookies) > 0) {
                                // Send all cookies

-                               $cookieString = implode(" ", $this->cookies);
+                               $cookieString = implode(' ', $this->cookies);

                                header("Set-Cookie: {$cookieString}");
 
                                // Remove them all
                                header("Set-Cookie: {$cookieString}");
 
                                // Remove them all


@@ -202,7 +198,7 @@ class BaseResponse extends BaseFrameworkSystem {
                }
 
                // Clear response header and body
                }
 
                // Clear response header and body

-               $this->setResponseBody("");
+               $this->setResponseBody('');

                $this->resetResponseHeaders();
        }
 }
                $this->resetResponseHeaders();
        }
 }