X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fclasses%2Fmain%2Fresponse%2Fimage%2Fclass_ImageResponse.php;h=8e018d7ceb623d2024dc04baf9dbcbcc55d4d93b;hb=ec6bb7da038135934f0d5abfcb82a7a7780945a4;hp=dc6e5ad03e0f2a5debf4c3f7bf319d75983866f2;hpb=3107989f93cfb5808ce9d75f1c7d2b7ee3d83d18;p=core.git diff --git a/inc/classes/main/response/image/class_ImageResponse.php b/inc/classes/main/response/image/class_ImageResponse.php index dc6e5ad0..8e018d7c 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 * @version 0.0.0 - * @copyright Copyright (c) 2007 - 2009 Roland Haeder, this is free software + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 Core Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * @@ -25,11 +25,6 @@ * Michal Cihar , licensed under GNU GPL 2.0. */ class ImageResponse extends BaseResponse implements Responseable { - /** - * Instance of the image - */ - private $imageInstance = null; - /** * Protected constructor * @@ -43,18 +38,18 @@ class ImageResponse extends BaseResponse implements Responseable { /** * Creates an object of this class * - * @param $appInstance An instance of a manageable application - * @return $responseInstance A prepared instance of this class + * @param $applicationInstance An instance of a manageable application + * @return $responseInstance A prepared instance of this class */ - public final static function createImageResponse (ManageableApplication $appInstance) { + public static final function createImageResponse (ManageableApplication $applicationInstance) { // Get a new instance $responseInstance = new ImageResponse(); // Set the application instance - $responseInstance->setApplicationInstance($appInstance); + $responseInstance->setApplicationInstance($applicationInstance); // Initialize the template engine here - $responseInstance->initTemplateEngine($appInstance); + $responseInstance->initTemplateEngine($applicationInstance); // Return the prepared instance return $responseInstance; @@ -63,22 +58,22 @@ class ImageResponse extends BaseResponse implements Responseable { /** * Initializes the template engine instance * - * @param $appInstance An instance of a manageable application + * @param $applicationInstance An instance of a manageable application * @return void */ - public final function initTemplateEngine (ManageableApplication $appInstance) { + public final function initTemplateEngine (ManageableApplication $applicationInstance) { // Get config instance $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)); + $this->setTemplateInstance($this->prepareTemplateInstance($applicationInstance)); } /** @@ -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,18 +108,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,25 +146,25 @@ 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', str_replace('&', '&', $url)); // Set correct response status - $this->setResponseStatus("301 Moved Permanently"); + $this->setResponseStatus('301 Moved Permanently'); // Clear the body $this->setResponseBody(''); @@ -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; } }