Fixed handling of cache keys as empty results caused cache keys to exist. :(

[core.git] / inc / classes / main / images / class_BaseImage.php

diff --git a/inc/classes/main/images/class_BaseImage.php b/inc/classes/main/images/class_BaseImage.php
index 27d768cc5ac5b5cf86c8aa3f440d330102895194..7a556111e88e49f4c37e737b578871c90345f358 100644 (file)
--- a/inc/classes/main/images/class_BaseImage.php
+++ b/inc/classes/main/images/class_BaseImage.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 - 2012 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -63,7 +63,7 @@ class BaseImage extends BaseFrameworkSystem implements Registerable {
        /**
         * Image resource
         */
-       private $imageResource = null;
+       private $imageResource = NULL;
 
        /**
         * Image name
@@ -78,7 +78,7 @@ class BaseImage extends BaseFrameworkSystem implements Registerable {
        /**
         * Groupable image strings?
         */
-       private $groupable = "single";
+       private $groupable = 'single';
 
        /**
         * Protected constructor
@@ -94,7 +94,7 @@ class BaseImage extends BaseFrameworkSystem implements Registerable {
        /**
         * Private setter for all colors
         *
-        * @param       $colorMode              Wether background or foreground color
+        * @param       $colorMode              Whether background or foreground color
         * @param       $colorChannel   Red, green or blue channel?
         * @param       $colorValue             Value to set
         */
@@ -205,7 +205,7 @@ class BaseImage extends BaseFrameworkSystem implements Registerable {
         * @return      void
         */
        public function initBackgroundColor () {
-               $this->colorMode = "backgroundColor";
+               $this->colorMode = 'backgroundColor';
        }
 
        /**
@@ -224,7 +224,7 @@ class BaseImage extends BaseFrameworkSystem implements Registerable {
         * @return      void
         */
        public function initForegroundColor () {
-               $this->colorMode = "foregroundColor";
+               $this->colorMode = 'foregroundColor';
        }
 
        /**
@@ -240,11 +240,11 @@ class BaseImage extends BaseFrameworkSystem implements Registerable {
        /**
         * Prepares the class for string (unused at the moment)
         *
-        * @param       $groupable      Wether this image string is groupable or single
+        * @param       $groupable      Whether this image string is groupable or single
         * @return      void
         * @todo        Find something usefull for this method.
         */
-       public function initImageString ($groupable = "single") {
+       public function initImageString ($groupable = 'single') {
                $this->groupable = $groupable;
        }
 
@@ -485,7 +485,7 @@ class BaseImage extends BaseFrameworkSystem implements Registerable {
                $foreColor = imagecolorallocate($this->getImageResource(), $red, $green, $blue);
 
                switch ($this->groupable) {
-                       case "single": // Single image string
+                       case 'single': // Single image string
                                // Compile image string
                                $imageString = $templateInstance->compileRawCode($this->getString());
 
@@ -501,7 +501,7 @@ class BaseImage extends BaseFrameworkSystem implements Registerable {
                                imagestring($this->getImageResource(), $size, $x, $y, $imageString, $foreColor);
                                break;
 
-                       case "groupable": // More than one string allowed
+                       case 'groupable': // More than one string allowed
                                // Walk through all groups
                                foreach ($templateInstance->getVariableGroups() as $group => $set) {
                                        // Set the group
@@ -516,7 +516,7 @@ class BaseImage extends BaseFrameworkSystem implements Registerable {
                                        $size = $templateInstance->compileRawCode($this->getFontSize());
 
                                        // Set the image string
-                                       //* DEBUG: */ echo __METHOD__.": size={$size}, x={$x}, y={$y}, string={$imageString}<br />\n";
+                                       //* DEBUG: */ print __METHOD__.": size={$size}, x={$x}, y={$y}, string={$imageString}<br />\n";
                                        imagestring($this->getImageResource(), $size, $x, $y, $imageString, $foreColor);
                                } // END - foreach
                                break;