Registry rewritten, exception added #2

[core.git] / inc / classes / main / response / image / class_ImageResponse.php

diff --git a/inc/classes/main/response/image/class_ImageResponse.php b/inc/classes/main/response/image/class_ImageResponse.php
index 7a1cdce27deb8c94b8063001055a5a2d11dc4ad3..649bddd82a70d6d663806866c44cb8667db233e6 100644 (file)
--- a/inc/classes/main/response/image/class_ImageResponse.php
+++ b/inc/classes/main/response/image/class_ImageResponse.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
+ * @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
  *
@@ -25,11 +25,6 @@
  * Michal Cihar <michal@cihar.com>, licensed under GNU GPL 2.0.
  */
 class ImageResponse extends BaseResponse implements Responseable {
-       /**
-        * Instance of the image
-        */
-       private $imageInstance = null;
-
        /**
         * Protected constructor
         *
@@ -71,11 +66,11 @@ class ImageResponse extends BaseResponse implements Responseable {
                $cfg = $this->getConfigInstance();
 
                // Set new template engine
-               $cfg->setConfigEntry('template_class'         , $cfg->readConfig('image_template_class'));
-               $cfg->setConfigEntry('raw_template_extension' , ".img");
-               $cfg->setConfigEntry('code_template_extension', ".itp");
-               $cfg->setConfigEntry('tpl_base_path'          , "templates/images/");
-               $cfg->setConfigEntry('code_template_type'     , "image");
+               $cfg->setConfigEntry('web_template_class'         , $cfg->getConfigEntry('image_template_class'));
+               $cfg->setConfigEntry('raw_template_extension' , '.img');
+               $cfg->setConfigEntry('code_template_extension', '.xml');
+               $cfg->setConfigEntry('tpl_base_path'          , 'templates/images/');
+               $cfg->setConfigEntry('code_template_type'     , 'image');
 
                // Get a prepared instance
                $this->setTemplateInstance($this->prepareTemplateInstance($appInstance));
@@ -104,6 +99,8 @@ class ImageResponse extends BaseResponse implements Responseable {
 
                // Shall we encrypt the cookie?
                if ($encrypted === true) {
+                       // Unsupported at the moment
+                       $this->partialStub('Encryption is unsupported at the moment.');
                } // END - if
 
                // For slow browsers set the cookie array element first
@@ -111,11 +108,11 @@ class ImageResponse extends BaseResponse implements Responseable {
 
                // Get all config entries
                if (is_null($expires)) {
-                       $expires = (time() + $this->getConfigInstance()->readConfig('cookie_expire'));
+                       $expires = (time() + $this->getConfigInstance()->getConfigEntry('cookie_expire'));
                } // END - if
 
-               $path = $this->getConfigInstance()->readConfig('cookie_path');
-               $domain = $this->getConfigInstance()->readConfig('cookie_domain');
+               $path = $this->getConfigInstance()->getConfigEntry('cookie_path');
+               $domain = $this->getConfigInstance()->getConfigEntry('cookie_domain');
 
                setcookie($cookieName, $cookieValue, $expires);
                //, $path, $domain, (isset($_SERVER['HTTPS']))
@@ -149,7 +146,7 @@ class ImageResponse extends BaseResponse implements Responseable {
                $this->getTemplateInstance()->assignApplicationData($this->getApplicationInstance());
 
                // Get the url from config
-               $url = $this->getConfigInstance()->readConfig($configEntry . "_url");
+               $url = $this->getConfigInstance()->getConfigEntry($configEntry . "_url");
 
                // Compile the URL
                $url = $this->getTemplateInstance()->compileRawCode($url);
@@ -160,11 +157,11 @@ class ImageResponse extends BaseResponse implements Responseable {
                        if (substr($url, 0, 1) == '/') $url = substr($url, 1);
 
                        // No, then extend it with our base URL
-                       $url = $this->getConfigInstance()->readConfig('base_url') . '/' . $url;
+                       $url = $this->getConfigInstance()->getConfigEntry('base_url') . '/' . $url;
                } // END - if
 
                // Add redirect header
-               $this->addHeader('Location', $url);
+               $this->addHeader('Location', str_replace('&amp;', '&', $url));
 
                // Set correct response status
                $this->setResponseStatus('301 Moved Permanently');
@@ -197,7 +194,7 @@ class ImageResponse extends BaseResponse implements Responseable {
                $this->setResponseBody($content);
 
                // Set content type
-               $this->addHeader('Content-type', "image/".$this->getImageInstance()->getImageType());
+               $this->addHeader('Content-type', 'image/' . $this->getImageInstance()->getImageType());
 
                // Call parent method
                parent::flushBuffer($force);
@@ -234,32 +231,13 @@ class ImageResponse extends BaseResponse implements Responseable {
                } // END - if
        }
 
-       /**
-        * Setter for image instanxe
-        *
-        * @param       $imageInstance  An instance of an image
-        * @return      void
-        */
-       public final function setImageInstance (BaseImage $imageInstance) {
-               $this->imageInstance = $imageInstance;
-       }
-
-       /**
-        * Getter for image instanxe
-        *
-        * @return      $imageInstance  An instance of an image
-        */
-       public final function getImageInstance () {
-               return $this->imageInstance;
-       }
-
        /**
         * Getter for default command
         *
         * @return      $defaultCommand         Default command for this response
         */
        public function getDefaultCommand () {
-               $defaultCommand = $this->getConfigInstance()->readConfig('default_image_command');
+               $defaultCommand = $this->getConfigInstance()->getConfigEntry('default_image_command');
                return $defaultCommand;
        }
 }