X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fresponse%2Fimage%2Fclass_ImageResponse.php;h=ac46e101187cd817d247cbe2d6ba65cdc41541e0;hp=870ce11f4b1b764848d85f1190d93fdc498d904c;hb=9ef64d096119317c2a9a36d47c2925c1c764d683;hpb=361e6320e50a8bb1a3ccb675388b8042361669ae

diff --git a/inc/classes/main/response/image/class_ImageResponse.php b/inc/classes/main/response/image/class_ImageResponse.php
index 870ce11f..ac46e101 100644
--- 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 - 2009 Roland Haeder, this is free software
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -71,11 +71,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('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));
@@ -111,18 +111,18 @@ 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']))
 		return;
 
 		// Now construct the full header
-		$cookieString = $cookieName . "=" . $cookieValue . "; ";
+		$cookieString = $cookieName . '=' . $cookieValue . '; ';
 		$cookieString .= "expires=" . date("D, d-F-Y H:i:s", $expires) . " GMT";
 		// $cookieString .= "; path=".$path."; domain=".$domain;
 
@@ -149,28 +149,28 @@ 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);
 
-		// Do we have a "http" in front of the URL?
-		if (substr(strtolower($url), 0, 4) != "http") {
+		// Do we have a 'http' in front of the URL?
+		if (substr(strtolower($url), 0, 4) != 'http') {
 			// Is there a / in front of the relative URL?
-			if (substr($url, 0, 1) == "/") $url = substr($url, 1);
+			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', $url);
 
 		// Set correct response status
-		$this->setResponseStatus("301 Moved Permanently");
+		$this->setResponseStatus('301 Moved Permanently');
 
 		// Clear the body
-		$this->setResponseBody("");
+		$this->setResponseBody('');
 
 		// Flush the result
 		$this->flushBuffer();
@@ -197,7 +197,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);
@@ -213,7 +213,7 @@ class ImageResponse extends BaseResponse implements Responseable {
 		// Is the cookie there?
 		if (isset($_COOKIE[$cookieName])) {
 			// Then expire it with 20 minutes past
-			$this->addCookie($cookieName, "", false, (time() - 1200));
+			$this->addCookie($cookieName, '', false, (time() - 1200));
 
 			// Remove it from array
 			unset($_COOKIE[$cookieName]);
@@ -259,7 +259,7 @@ class ImageResponse extends BaseResponse implements Responseable {
 	 * @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;
 	}
 }