prepare to tag v0.7.13

Add GD extension to the composer requiremets

.gitignore

@@ -11,3 +11,6 @@ vendor
 
 # Build and test
 build/
+
+# Mac OS
+.DS_Store

.travis.yml

@@ -76,6 +76,7 @@ script:
     
     # Run validation & publish
     #- make phpunit
+    - composer validate
     - phpunit
     #- make phpcs
 

CAsciiArt.php

@@ -175,7 +175,7 @@ class CAsciiArt
      */
     public function getLuminance($red, $green, $blue)
     {
-        switch($this->luminanceStrategy) {
+        switch ($this->luminanceStrategy) {
             case 1:
                 $luminance = ($red * 0.2126 + $green * 0.7152 + $blue * 0.0722) / 255;
                 break;

CCache.php

@@ -0,0 +1,107 @@
+<?php
+/**
+ * Deal with the cache directory and cached items.
+ *
+ */
+class CCache
+{
+    /**
+     * Path to the cache directory.
+     */
+    private $path;
+
+
+
+    /**
+     * Set the path to the cache dir which must exist.
+     *
+     * @param string path to the cache dir.
+     *
+     * @throws Exception when $path is not a directory.
+     *
+     * @return $this
+     */
+    public function setDir($path)
+    {
+        if (!is_dir($path)) {
+            throw new Exception("Cachedir is not a directory.");
+        }
+
+        $this->path = $path;
+
+        return $this;
+    }
+
+
+
+    /**
+     * Get the path to the cache subdir and try to create it if its not there.
+     *
+     * @param string $subdir name of subdir
+     * @param array  $create default is to try to create the subdir
+     *
+     * @return string | boolean as real path to the subdir or
+     *                          false if it does not exists
+     */
+    public function getPathToSubdir($subdir, $create = true)
+    {
+        $path = realpath($this->path . "/" . $subdir);
+
+        if (is_dir($path)) {
+            return $path;
+        }
+
+        if ($create && is_writable($this->path)) {
+            $path = $this->path . "/" . $subdir;
+
+            if (mkdir($path)) {
+                return realpath($path);
+            }
+        }
+
+        return false;
+    }
+
+
+
+    /**
+     * Get status of the cache subdir.
+     *
+     * @param string $subdir name of subdir
+     *
+     * @return string with status
+     */
+    public function getStatusOfSubdir($subdir)
+    {
+        $path = realpath($this->path . "/" . $subdir);
+
+        $exists = is_dir($path);
+        $res  = $exists ? "exists" : "does not exist";
+        
+        if ($exists) {
+            $res .= is_writable($path) ? ", writable" : ", not writable";
+        }
+
+        return $res;
+    }
+
+
+
+    /**
+     * Remove the cache subdir.
+     *
+     * @param string $subdir name of subdir
+     *
+     * @return null | boolean true if success else false, null if no operation
+     */
+    public function removeSubdir($subdir)
+    {
+        $path = realpath($this->path . "/" . $subdir);
+
+        if (is_dir($path)) {
+            return rmdir($path);
+        }
+
+        return null;
+    }
+}

CFastTrackCache.php

@@ -0,0 +1,238 @@
+<?php
+/**
+ * Enable a fast track cache with a json representation of the image delivery.
+ *
+ */
+class CFastTrackCache
+{
+    /**
+     * Cache is disabled to start with.
+     */
+    private $enabled = false;
+
+
+
+    /**
+     * Path to the cache directory.
+     */
+    private $path;
+
+
+
+    /**
+     * Filename of current cache item.
+     */
+    private $filename;
+
+
+
+    /**
+     * Container with items to store as cached item.
+     */
+    private $container;
+
+
+
+    /**
+     * Enable or disable cache.
+     *
+     * @param boolean $enable set to true to enable, false to disable
+     *
+     * @return $this
+     */
+    public function enable($enabled)
+    {
+        $this->enabled = $enabled;
+        return $this;
+    }
+
+
+
+    /**
+     * Set the path to the cache dir which must exist.
+     *
+     * @param string $path to the cache dir.
+     *
+     * @throws Exception when $path is not a directory.
+     *
+     * @return $this
+     */
+    public function setCacheDir($path)
+    {
+        if (!is_dir($path)) {
+            throw new Exception("Cachedir is not a directory.");
+        }
+
+        $this->path = rtrim($path, "/");
+
+        return $this;
+    }
+
+
+
+    /**
+     * Set the filename to store in cache, use the querystring to create that
+     * filename.
+     *
+     * @param array $clear items to clear in $_GET when creating the filename.
+     *
+     * @return string as filename created.
+     */
+    public function setFilename($clear)
+    {
+        $query = $_GET;
+
+        // Remove parts from querystring that should not be part of filename
+        foreach ($clear as $value) {
+            unset($query[$value]);
+        }
+
+        arsort($query);
+        $queryAsString = http_build_query($query);
+
+        $this->filename = md5($queryAsString);
+
+        if (CIMAGE_DEBUG) {
+            $this->container["query-string"] = $queryAsString;
+        }
+
+        return $this->filename;
+    }
+
+
+
+    /**
+     * Add header items.
+     *
+     * @param string $header add this as header.
+     *
+     * @return $this
+     */
+    public function addHeader($header)
+    {
+        $this->container["header"][] = $header;
+        return $this;
+    }
+
+
+
+    /**
+     * Add header items on output, these are not output when 304.
+     *
+     * @param string $header add this as header.
+     *
+     * @return $this
+     */
+    public function addHeaderOnOutput($header)
+    {
+        $this->container["header-output"][] = $header;
+        return $this;
+    }
+
+
+
+    /**
+     * Set path to source image to.
+     *
+     * @param string $source path to source image file.
+     *
+     * @return $this
+     */
+    public function setSource($source)
+    {
+        $this->container["source"] = $source;
+        return $this;
+    }
+
+
+
+    /**
+     * Set last modified of source image, use to check for 304.
+     *
+     * @param string $lastModified
+     *
+     * @return $this
+     */
+    public function setLastModified($lastModified)
+    {
+        $this->container["last-modified"] = $lastModified;
+        return $this;
+    }
+
+
+
+    /**
+     * Get filename of cached item.
+     *
+     * @return string as filename.
+     */
+    public function getFilename()
+    {
+        return $this->path . "/" . $this->filename;
+    }
+
+
+
+    /**
+     * Write current item to cache.
+     *
+     * @return boolean if cache file was written.
+     */
+    public function writeToCache()
+    {
+        if (!$this->enabled) {
+            return false;
+        }
+
+        if (is_dir($this->path) && is_writable($this->path)) {
+            $filename = $this->getFilename();
+            return file_put_contents($filename, json_encode($this->container)) !== false;
+        }
+
+        return false;
+    }
+
+
+
+    /**
+     * Output current item from cache, if available.
+     *
+     * @return void
+     */
+    public function output()
+    {
+        $filename = $this->getFilename();
+        if (!is_readable($filename)) {
+            return;
+        }
+
+        $item = json_decode(file_get_contents($filename), true);
+
+        if (!is_readable($item["source"])) {
+            return;
+        }
+
+        foreach ($item["header"] as $value) {
+            header($value);
+        }
+
+        if (isset($_SERVER["HTTP_IF_MODIFIED_SINCE"])
+            && strtotime($_SERVER["HTTP_IF_MODIFIED_SINCE"]) == $item["last-modified"]) {
+            header("HTTP/1.0 304 Not Modified");
+            if (CIMAGE_DEBUG) {
+                trace(__CLASS__ . " 304");
+            }
+            exit;
+        }
+
+        foreach ($item["header-output"] as $value) {
+            header($value);
+        }
+
+        if (CIMAGE_DEBUG) {
+            trace(__CLASS__ . " 200");
+        }
+        readfile($item["source"]);
+        exit;
+    }
+}

CImage.php

@@ -344,20 +344,27 @@ class CImage
 
 
     /**
-    * Calculate target dimension for image when using fill-to-fit resize strategy.
-    */
+     * Calculate target dimension for image when using fill-to-fit resize strategy.
+     */
     private $fillWidth;
     private $fillHeight;
 
 
 
     /**
-    * Allow remote file download, default is to disallow remote file download.
-    */
+     * Allow remote file download, default is to disallow remote file download.
+     */
     private $allowRemote = false;
 
 
 
+    /**
+     * Path to cache for remote download.
+     */
+    private $remoteCache;
+
+
+
     /**
      * Pattern to recognize a remote file.
      */
@@ -372,6 +379,12 @@ class CImage
     private $useCache = true;
 
 
+    /**
+    * Disable the fasttrackCacke to start with, inject an object to enable it.
+    */
+    private $fastTrackCache = null;
+
+
 
     /*
      * Set whitelist for valid hostnames from where remote source can be
@@ -439,6 +452,25 @@ class CImage
 
 
 
+    /**
+     * Inject object and use it, must be available as member.
+     *
+     * @param string $property to set as object.
+     * @param object $object   to set to property.
+     *
+     * @return $this
+     */
+    public function injectDependency($property, $object)
+    {
+        if (!property_exists($this, $property)) {
+            $this->raiseError("Injecting unknown property.");
+        }
+        $this->$property = $object;
+        return $this;
+    }
+
+
+
     /**
      * Set verbose mode.
      *
@@ -512,13 +544,15 @@ class CImage
      * Allow or disallow remote image download.
      *
      * @param boolean $allow   true or false to enable and disable.
+     * @param string  $cache   path to cache dir.
      * @param string  $pattern to use to detect if its a remote file.
      *
      * @return $this
      */
-    public function setRemoteDownload($allow, $pattern = null)
+    public function setRemoteDownload($allow, $cache, $pattern = null)
     {
         $this->allowRemote = $allow;
+        $this->remoteCache = $cache;
         $this->remotePattern = is_null($pattern) ? $this->remotePattern : $pattern;
 
         $this->log(
@@ -650,21 +684,12 @@ class CImage
         }
 
         $remote = new CRemoteImage();
-        $cache  = $this->saveFolder . "/remote/";
 
-        if (!is_dir($cache)) {
-            if (!is_writable($this->saveFolder)) {
-                throw new Exception("Can not create remote cache, cachefolder not writable.");
-            }
-            mkdir($cache);
-            $this->log("The remote cache does not exists, creating it.");
-        }
-
-        if (!is_writable($cache)) {
+        if (!is_writable($this->remoteCache)) {
             $this->log("The remote cache is not writable.");
         }
 
-        $remote->setCache($cache);
+        $remote->setCache($this->remoteCache);
         $remote->useCache($this->useCache);
         $src = $remote->download($src);
 
@@ -1098,8 +1123,14 @@ class CImage
                 $this->newWidth = round($factor * $width);
                 $this->log("New height was set.");
 
+            } else {
+
+                // Use existing width and height as new width and height.
+                $this->newWidth = $width;
+                $this->newHeight = $height;
             }
             
+
             // Get image dimensions for pre-resize image.
             if ($this->cropToFit || $this->fillToFit) {
 
@@ -1696,25 +1727,41 @@ class CImage
             // Resize by crop to fit
             $this->log("Resizing using strategy - Crop to fit");
 
-            if (!$this->upscale && ($this->width < $this->newWidth || $this->height < $this->newHeight)) {
+            if (!$this->upscale 
+                && ($this->width < $this->newWidth || $this->height < $this->newHeight)) {
                 $this->log("Resizing - smaller image, do not upscale.");
 
-                $cropX = round(($this->cropWidth/2) - ($this->newWidth/2));
-                $cropY = round(($this->cropHeight/2) - ($this->newHeight/2));
-
                 $posX = 0;
                 $posY = 0;
+                $cropX = 0;
+                $cropY = 0;
 
                 if ($this->newWidth > $this->width) {
                     $posX = round(($this->newWidth - $this->width) / 2);
                 }
+                if ($this->newWidth < $this->width) {
+                    $cropX = round(($this->width/2) - ($this->newWidth/2));
+                }
 
                 if ($this->newHeight > $this->height) {
                     $posY = round(($this->newHeight - $this->height) / 2);
                 }
+                if ($this->newHeight < $this->height) {
+                    $cropY = round(($this->height/2) - ($this->newHeight/2));
+                }
+                $this->log(" cwidth: $this->cropWidth");
+                $this->log(" cheight: $this->cropHeight");
+                $this->log(" nwidth: $this->newWidth");
+                $this->log(" nheight: $this->newHeight");
+                $this->log(" width: $this->width");
+                $this->log(" height: $this->height");
+                $this->log(" posX: $posX");
+                $this->log(" posY: $posY");
+                $this->log(" cropX: $cropX");
+                $this->log(" cropY: $cropY");
 
                 $imageResized = $this->CreateImageKeepTransparency($this->newWidth, $this->newHeight);
-                imagecopy($imageResized, $this->image, $posX, $posY, $cropX, $cropY, $this->newWidth, $this->newHeight);
+                imagecopy($imageResized, $this->image, $posX, $posY, $cropX, $cropY, $this->width, $this->height);
             } else {
                 $cropX = round(($this->cropWidth/2) - ($this->newWidth/2));
                 $cropY = round(($this->cropHeight/2) - ($this->newHeight/2));
@@ -1747,14 +1794,14 @@ class CImage
             }
 
             if (!$this->upscale
-                && ($this->width < $this->newWidth || $this->height < $this->newHeight)
+                && ($this->width < $this->newWidth && $this->height < $this->newHeight)
             ) {
 
                 $this->log("Resizing - smaller image, do not upscale.");
-                $posX = round(($this->fillWidth - $this->width) / 2);
-                $posY = round(($this->fillHeight - $this->height) / 2);
+                $posX = round(($this->newWidth - $this->width) / 2);
+                $posY = round(($this->newHeight - $this->height) / 2);
                 $imageResized = $this->CreateImageKeepTransparency($this->newWidth, $this->newHeight);
-                imagecopy($imageResized, $this->image, $posX, $posY, 0, 0, $this->fillWidth, $this->fillHeight);
+                imagecopy($imageResized, $this->image, $posX, $posY, 0, 0, $this->width, $this->height);
 
             } else {
                 $imgPreFill   = $this->CreateImageKeepTransparency($this->fillWidth, $this->fillHeight);
@@ -1796,9 +1843,8 @@ class CImage
                         $cropX = round(($this->width - $this->newWidth) / 2);
                     }
 
-                    //$this->log("posX=$posX, posY=$posY, cropX=$cropX, cropY=$cropY.");
                     $imageResized = $this->CreateImageKeepTransparency($this->newWidth, $this->newHeight);
-                    imagecopy($imageResized, $this->image, $posX, $posY, $cropX, $cropY, $this->newWidth, $this->newHeight);
+                    imagecopy($imageResized, $this->image, $posX, $posY, $cropX, $cropY, $this->width, $this->height);
                     $this->image = $imageResized;
                     $this->width = $this->newWidth;
                     $this->height = $this->newHeight;
@@ -2499,7 +2545,7 @@ class CImage
 
 
     /**
-     * Add HTTP header for putputting together with image.
+     * Add HTTP header for output together with image.
      *
      * @param string $type  the header type such as "Cache-Control"
      * @param string $value the value to use
@@ -2550,14 +2596,20 @@ class CImage
         // Get image modification time
         clearstatcache();
         $lastModified = filemtime($file);
-        $gmdate = gmdate("D, d M Y H:i:s", $lastModified);
+        $lastModifiedFormat = "D, d M Y H:i:s";
+        $gmdate = gmdate($lastModifiedFormat, $lastModified);
 
         if (!$this->verbose) {
-            header('Last-Modified: ' . $gmdate . " GMT");
+            $header = "Last-Modified: $gmdate GMT";
+            header($header);
+            $this->fastTrackCache->addHeader($header);
+            $this->fastTrackCache->setLastModified($lastModified);
         }
 
-        foreach($this->HTTPHeader as $key => $val) {
-            header("$key: $val");
+        foreach ($this->HTTPHeader as $key => $val) {
+            $header = "$key: $val";
+            header($header);
+            $this->fastTrackCache->addHeader($header);
         }
 
         if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) == $lastModified) {
@@ -2569,6 +2621,9 @@ class CImage
             }
 
             header("HTTP/1.0 304 Not Modified");
+            if (CIMAGE_DEBUG) {
+                trace(__CLASS__ . " 304");
+            }
 
         } else {
 
@@ -2589,8 +2644,19 @@ class CImage
                 }
             }
 
-            header("Content-type: $mime");
-            header("Content-length: $size");
+            $header = "Content-type: $mime";
+            header($header);
+            $this->fastTrackCache->addHeaderOnOutput($header);
+
+            $header = "Content-length: $size";
+            header($header);
+            $this->fastTrackCache->addHeaderOnOutput($header);
+
+            $this->fastTrackCache->setSource($file);
+            $this->fastTrackCache->writeToCache();
+            if (CIMAGE_DEBUG) {
+                trace(__CLASS__ . " 200");
+            }
             readfile($file);
         }
 

CRemoteImage.php

@@ -101,7 +101,7 @@ class CRemoteImage
      */
     public function setCache($path)
     {
-        $this->saveFolder = $path;
+        $this->saveFolder = rtrim($path, "/") . "/";
         return $this;
     }
 
@@ -147,7 +147,12 @@ class CRemoteImage
      */
     public function setHeaderFields()
     {
-        $this->http->setHeader("User-Agent", "CImage/0.7.2 (PHP/". phpversion() . " cURL)");
+        $cimageVersion = "CImage";
+        if (defined("CIMAGE_USER_AGENT")) {
+            $cimageVersion = CIMAGE_USER_AGENT;
+        }
+        
+        $this->http->setHeader("User-Agent", "$cimageVersion (PHP/". phpversion() . " cURL)");
         $this->http->setHeader("Accept", "image/jpeg,image/png,image/gif");
 
         if ($this->useCache) {

LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2012 - 2014 Mikael Roos, me@mikaelroos.se
+Copyright (c) 2012 - 2016 Mikael Roos, https://mikaelroos.se, mos@dbwebb.se
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -8,7 +8,7 @@ Image conversion on the fly using PHP
 About
 -------------------------------------
 
-<img src="http://dbwebb.se/kod-exempel/cimage/webroot/img.php?src=kodim07.png&w=200&c=140,140,520,340&sharpen"/>
+<img src="https://cimage.se/cimage/imgd.php?src=example/kodim07.png&w=200&c=140,140,520,340&sharpen"/>
 
 `CImage` is a PHP class enabling resizing of images through scaling, cropping and filtering effects -- using PHP GD. The script `img.php` uses `CImage` to enable server-side image processing utilizing caching and optimization of the processed images.
 
@@ -22,7 +22,10 @@ Documentation
 --------------------------------------
 
 Read full documentation at:
-http://dbwebb.se/opensource/cimage
+<strike>http://dbwebb.se/opensource/cimage</strike>
+
+New website is being setup at [cimage.se](https://cimage.se), to improve documentation (work is ongoing).
+
 
 
 
@@ -46,14 +49,14 @@ There are several ways of installing. You either install the whole project which
 
 The [sourcode is available on GitHub](https://github.com/mosbth/cimage). Clone, fork or [download as zip](https://github.com/mosbth/cimage/archive/master.zip). 
 
-**Latest stable version is v0.7.8 released 2015-12-06.**
+**Latest stable version is v0.7.13 released 2016-08-08.**
 
 I prefer cloning like this. Do switch to the latest stable version.
 
 ```bash
 git clone git://github.com/mosbth/cimage.git
 cd cimage
-git checkout v0.7.8
+git checkout v0.7.13
 ```
 
 Make the cache-directory writable by the webserver.
@@ -76,7 +79,7 @@ There are some all-included bundles of `img.php` that can be downloaded and used
 Dowload the version of your choice like this.
 
 ```bash
-wget https://raw.githubusercontent.com/mosbth/cimage/v0.7.8/webroot/imgp.php
+wget https://raw.githubusercontent.com/mosbth/cimage/v0.7.13/webroot/imgp.php
 ```
 
 Open up the file in your editor and edit the array `$config`. Ensure that the paths to the image directory and the cache directory matches your environment, or create an own config-file for the script.
@@ -98,7 +101,7 @@ Lets take some use cases to let you know when and how `img.php` might be useful.
 
 ### Make a thumbnail 
 
-<img src="http://dbwebb.se/kod-exempel/cimage/webroot/img.php?src=kodim04.png&w=80&h=80&cf">
+<img src="https://cimage.se/cimage/imgd.php?src=example/kodim04.png&w=80&h=80&cf">
 
 Lets say you have a larger image and you want to make a smaller thumbnail of it with a size of 80x80 pixels. You simply take the image and add constraints on `width`, `height` and you use the resize strategy `crop-to-fit` to crops out the parts of the image that does not fit.
 
@@ -112,7 +115,7 @@ To produce such a thumbnail, create a link like this:
 
 Perhaps you got an image from a friend. The image was taken with the iPhone and thus rotated. 
 
-<img src="http://dbwebb.se/kod-exempel/cimage/webroot/img.php?src=issue36/me-270.jpg&w=250">
+<img src="https://cimage.se/cimage/imgd.php?src=example/issue36/me-270.jpg&w=250">
 
 The original image is looking like this one, scaled down to a width of 250 pixels. 
 
@@ -125,7 +128,7 @@ Lets call this *the URL-Photoshopper*. This is how the magic looks like.
 > `img.php?src=issue36/me-270.jpg&w=100&h=100&cf&aro`
 > `&rb=-25&a=8,30,30,38&f=grayscale&convolve=sharpen-alt`
 
-<img src="http://dbwebb.se/kod-exempel/cimage/webroot/img.php?src=issue36/me-270.jpg&w=100&h=100&cf&aro&rb=-25&a=8,30,30,38&f=grayscale&convolve=sharpen-alt">
+<img src="https://cimage.se/cimage/imgd.php?src=example/issue36/me-270.jpg&w=100&h=100&cf&aro&rb=-25&a=8,30,30,38&f=grayscale&convolve=sharpen-alt">
 
 For myself, I use `img.php` to put up all images on my website, it gives me the power of affecting the resulting images - without opening up a photo-editing application.
 
@@ -144,7 +147,7 @@ Try it out by pointing your browser to the test file `webroot/test/test.php`. It
 
 ###Process your first image 
 
-<img src="http://dbwebb.se/kod-exempel/cimage/webroot/img.php?src=kodim04.png&amp;w=w2&amp;a=40,0,50,0" alt=''>
+<img src="https://cimage.se/cimage/imgd.php?src=example/kodim04.png&amp;w=w2&amp;a=40,0,50,0" alt=''>
 
 Try it yourself by opening up an image in your browser. Start with 
 
@@ -198,7 +201,7 @@ Open an image through `img.php` by using its `src` attribute.
 
 It looks like this.
 
-<img src="http://dbwebb.se/kod-exempel/cimage/webroot/img.php?src=kodim13.png&w=w1&save-as=jpg">
+<img src="https://cimage.se/cimage/imgd.php?src=example/kodim13.png&w=w1&save-as=jpg">
 
 All images are stored in a directory structure and you access them as:
 
@@ -212,7 +215,7 @@ Create a thumbnail of the image by applying constraints on width and height, or
 
 | `&width=150`        | `&height=150`       | `&w=150&h=150`      |
 |---------------------|---------------------|---------------------|
-| <img src=http://dbwebb.se/kod-exempel/cimage/webroot/img.php?src=kodim13.png&w=150 alt=''> | <img src=http://dbwebb.se/kod-exempel/cimage/webroot/img.php?src=kodim13.png&h=150 alt=''> | <img src=http://dbwebb.se/kod-exempel/cimage/webroot/img.php?src=kodim13.png&w=150&h=150 alt=''> |
+| <img src=https://cimage.se/cimage/imgd.php?src=example/kodim13.png&w=150 alt=''> | <img src=https://cimage.se/cimage/imgd.php?src=example/kodim13.png&h=150 alt=''> | <img src=https://cimage.se/cimage/imgd.php?src=example/kodim13.png&w=150&h=150 alt=''> |
 
 By setting `width`, `height` or both, the image gets resized to be *not larger* than the defined dimensions *and* keeping its original aspect ratio.
 
@@ -227,10 +230,10 @@ Creating a thumbnail with a certain dimension of width and height, usually invol
 
 | What                | The image           |
 |---------------------|---------------------|
-| **Original.** The original image resized with a max width and max height.<br>`?w=300&h=150` | <img src=http://dbwebb.se/kod-exempel/cimage/webroot/img.php?src=kodim13.png&w=300&h=150 alt=''> |
-| **Stretch.** Stretch the image so that the resulting image has the defined width and height.<br>`?w=300&h=150&stretch` | <img src=http://dbwebb.se/kod-exempel/cimage/webroot/img.php?src=kodim13.png&w=300&h=150&stretch alt=''> |
-| **Crop to fit.** Keep the aspect ratio and crop out the parts of the image that does not fit.<br>`?w=300&h=150&crop-to-fit` | <img src=http://dbwebb.se/kod-exempel/cimage/webroot/img.php?src=kodim13.png&w=300&h=150&crop-to-fit alt=''> |
-| **Fill to fit.** Keep the aspect ratio and fill then blank space with a background color.<br>`?w=300&h=150&fill-to-fit=006600` | <img src=http://dbwebb.se/kod-exempel/cimage/webroot/img.php?src=kodim13.png&w=300&h=150&fill-to-fit=006600 alt=''> |
+| **Original.** The original image resized with a max width and max height.<br>`?w=300&h=150` | <img src=https://cimage.se/cimage/imgd.php?src=example/kodim13.png&w=300&h=150 alt=''> |
+| **Stretch.** Stretch the image so that the resulting image has the defined width and height.<br>`?w=300&h=150&stretch` | <img src=https://cimage.se/cimage/imgd.php?src=example/kodim13.png&w=300&h=150&stretch alt=''> |
+| **Crop to fit.** Keep the aspect ratio and crop out the parts of the image that does not fit.<br>`?w=300&h=150&crop-to-fit` | <img src=https://cimage.se/cimage/imgd.php?src=example/kodim13.png&w=300&h=150&crop-to-fit alt=''> |
+| **Fill to fit.** Keep the aspect ratio and fill then blank space with a background color.<br>`?w=300&h=150&fill-to-fit=006600` | <img src=https://cimage.se/cimage/imgd.php?src=example/kodim13.png&w=300&h=150&fill-to-fit=006600 alt=''> |
 
 Learn to crop your images, creative cropping can make wonderful images from appearingly useless originals.
 
@@ -247,7 +250,7 @@ Fill to fit is useful when you have some image that must fit in a certain dimens
 > `img.php?src=kodim13.png&w=600&aspect-ratio=4`
 > `&crop-to-fit&sharpen&save-as=jpg&q=30`
 
-<img src=http://dbwebb.se/kod-exempel/cimage/webroot/img.php?src=kodim13.png&w=600&aspect-ratio=4&crop-to-fit&sharpen&save-as=jpg&q=30 alt=''>
+<img src=https://cimage.se/cimage/imgd.php?src=example/kodim13.png&w=600&aspect-ratio=4&crop-to-fit&sharpen&save-as=jpg&q=30 alt=''>
 
 Here is a list of all parameters that you can use together with `img.php`, grouped by its basic intent of usage. 
 
@@ -430,7 +433,7 @@ For example, the following image is created like this:
 
 > `&w=300&save-as=jpg`
 
-<img src="http://dbwebb.se/kod-exempel/cimage/webroot/img.php?src=kodim24.png&w=300&save-as=jpg" alt=''>
+<img src="https://cimage.se/cimage/imgd.php?src=example/kodim24.png&w=300&save-as=jpg" alt=''>
 
 Its JSON-representation is retrieved like this:
 

REVISION.md

@@ -5,6 +5,48 @@ Revision history
 [![Build Status](https://scrutinizer-ci.com/g/mosbth/cimage/badges/build.png?b=master)](https://scrutinizer-ci.com/g/mosbth/cimage/build-status/master)
 
 
+v0.7.13 (2016-08-08)
+-------------------------------------
+
+* Moved functions from img.php to `functions.php`.
+* Added function `trace()` to measure speed and memory consumption, only for development.
+* Added fast cache #149.
+* Added `imgf.php` as shortcut to check for fast cache, before loading `img.php` as usual, adding `imgf_config.php` as symlink to `img_config.php`.
+* Created `defines.php` and moved definition av version there.
+* Fixed images in README, #148.
+* Initiated dependency injection to `CImage`, class names can be set in config file and will be injected to `CImage` from `img.php`. Not implemented for all classes. #151.
+* Enabled debug mode to make it easier to trace what actually happens while processing the image, #150.
+
+
+v0.7.12 (2016-06-01)
+-------------------------------------
+
+* Fixed to correctly display image when using a resize strategy without height or width.
+* Fixed background color for option `no-upscale`, #144.
+
+
+v0.7.11 (2016-04-18)
+-------------------------------------
+
+* Add option for `skip_original` to config file to always skip original, #118.
+
+
+v0.7.10 (2016-04-01)
+-------------------------------------
+
+* Add backup option for images `src-alt`, #141.
+* Add require of ext-gd in composer.json, #133.
+* Fix strict mode only reporting 404 when failure, #127.
+
+
+v0.7.9 (2015-12-07)
+-------------------------------------
+
+* Strict mode only reporting 404 when failure, #127.
+* Added correct CImage version to remote agent string, #131.
+* Adding CCache to improve cache handling of caching for dummy, remote and srgb. #130.
+
+
 v0.7.8 (2015-12-06)
 -------------------------------------
 

autoload.php

@@ -3,9 +3,10 @@
  * Autoloader for CImage and related class files.
  *
  */
-//include __DIR__ . "/../CHttpGet.php";
-//include __DIR__ . "/../CRemoteImage.php";
-//include __DIR__ . "/../CImage.php";
+require_once __DIR__ . "/defines.php";
+require_once __DIR__ . "/functions.php";
+
+
 
 /**
  * Autoloader for classes.

bin/create-img-single.bash

@@ -34,11 +34,15 @@ fi
 $ECHO "Creating '$TARGET_D', '$TARGET_P' and '$TARGET_S' by combining the following files:"
 $ECHO "\n"
 $ECHO "\n webroot/img_header.php"
+$ECHO "\n defines.php"
+$ECHO "\n functions.php"
 $ECHO "\n CHttpGet.php"
 $ECHO "\n CRemoteImage.php"
 $ECHO "\n CWhitelist.php"
 $ECHO "\n CAsciiArt.php"
 $ECHO "\n CImage.php"
+$ECHO "\n CCache.php"
+$ECHO "\n CFastTrackCache.php"
 $ECHO "\n webroot/img.php"
 $ECHO "\n"
 $ECHO "\n'$TARGET_D' is for development mode."
@@ -59,6 +63,12 @@ cat webroot/img_header.php | sed "s|//'mode'         => 'production',|'mode'
 
 $ECHO "$NEWLINES" | tee -a $TARGET_D $TARGET_P $TARGET_S > /dev/null
 
+tail -n +2 defines.php | tee -a $TARGET_D $TARGET_P $TARGET_S > /dev/null
+$ECHO "$NEWLINES" | tee -a $TARGET_D $TARGET_P $TARGET_S > /dev/null
+
+tail -n +2 functions.php | tee -a $TARGET_D $TARGET_P $TARGET_S > /dev/null
+$ECHO "$NEWLINES" | tee -a $TARGET_D $TARGET_P $TARGET_S > /dev/null
+
 tail -n +2 CHttpGet.php | tee -a $TARGET_D $TARGET_P $TARGET_S > /dev/null
 $ECHO "$NEWLINES" | tee -a $TARGET_D $TARGET_P $TARGET_S > /dev/null
 
@@ -74,6 +84,12 @@ $ECHO "$NEWLINES" | tee -a $TARGET_D $TARGET_P $TARGET_S > /dev/null
 tail -n +2 CImage.php | tee -a $TARGET_D $TARGET_P $TARGET_S > /dev/null
 $ECHO "$NEWLINES" | tee -a $TARGET_D $TARGET_P $TARGET_S > /dev/null
 
+tail -n +2 CCache.php | tee -a $TARGET_D $TARGET_P $TARGET_S > /dev/null
+$ECHO "$NEWLINES" | tee -a $TARGET_D $TARGET_P $TARGET_S > /dev/null
+
+tail -n +2 CFastTrackCache.php | tee -a $TARGET_D $TARGET_P $TARGET_S > /dev/null
+$ECHO "$NEWLINES" | tee -a $TARGET_D $TARGET_P $TARGET_S > /dev/null
+
 tail -n +2 webroot/img.php | tee -a $TARGET_D $TARGET_P $TARGET_S > /dev/null
 $ECHO "$NEWLINES" | tee -a $TARGET_D $TARGET_P $TARGET_S > /dev/null
 

composer.json

@@ -18,15 +18,25 @@
         "docs": "http://dbwebb.se/opensource/cimage"
     },
     "require": {
-        "php": ">=5.3"
+        "php": ">=5.3",
+        "ext-gd": "*"
+    },
+    "suggest": {
+        "ext-exif": "*"
     },
     "autoload": {
-        "classmap": [
+       "files": [
+           "defines.php",
+           "functions.php"
+       ],
+       "classmap": [
             "CImage.php",
             "CHttpGet.php",
             "CRemoteImage.php",
             "CWhitelist.php",
-            "CAsciiArt.php"
+            "CAsciiArt.php",
+            "CCache.php",
+            "CFastTrackCache.php"
         ]
     }
 }

defines.php

@@ -0,0 +1,6 @@
+<?php
+// Version of cimage and img.php
+define("CIMAGE_VERSION", "v0.7.13 (2016-08-08)");
+
+// For CRemoteImage
+define("CIMAGE_USER_AGENT", "CImage/" . CIMAGE_VERSION);

functions.php

@@ -0,0 +1,165 @@
+<?php
+/**
+ * General functions to use in img.php.
+ */
+
+
+
+/**
+ * Trace and log execution to logfile, useful for debugging and development.
+ *
+ * @param string $msg message to log to file.
+ *
+ * @return void
+ */
+function trace($msg)
+{
+    $file = CIMAGE_DEBUG_FILE;
+    if (!is_writable($file)) {
+        return;
+    }
+
+    $timer = number_format((microtime(true) - $_SERVER["REQUEST_TIME_FLOAT"]), 6);
+    $details  = "{$timer}ms";
+    $details .= ":" . round(memory_get_peak_usage()/1024/1024, 3) . "MB";
+    $details .= ":" . count(get_included_files());
+    file_put_contents($file, "$details:$msg\n", FILE_APPEND);
+}
+
+
+
+/**
+ * Display error message.
+ *
+ * @param string $msg to display.
+ * @param int $type of HTTP error to display.
+ *
+ * @return void
+ */
+function errorPage($msg, $type = 500)
+{
+    global $mode;
+
+    switch ($type) {
+        case 403:
+            $header = "403 Forbidden";
+            break;
+        case 404:
+            $header = "404 Not Found";
+            break;
+        default:
+            $header = "500 Internal Server Error";
+    }
+
+    if ($mode == "strict") {
+        $header = "404 Not Found";
+    }
+
+    header("HTTP/1.0 $header");
+
+    if ($mode == "development") {
+        die("[img.php] $msg");
+    }
+
+    error_log("[img.php] $msg");
+    die("HTTP/1.0 $header");
+}
+
+
+
+/**
+ * Custom exception handler.
+ */
+set_exception_handler(function ($exception) {
+    errorPage(
+        "<p><b>img.php: Uncaught exception:</b> <p>"
+        . $exception->getMessage()
+        . "</p><pre>"
+        . $exception->getTraceAsString()
+        . "</pre>",
+        500
+    );
+});
+
+
+
+/**
+ * Get input from query string or return default value if not set.
+ *
+ * @param mixed $key     as string or array of string values to look for in $_GET.
+ * @param mixed $default value to return when $key is not set in $_GET.
+ *
+ * @return mixed value from $_GET or default value.
+ */
+function get($key, $default = null)
+{
+    if (is_array($key)) {
+        foreach ($key as $val) {
+            if (isset($_GET[$val])) {
+                return $_GET[$val];
+            }
+        }
+    } elseif (isset($_GET[$key])) {
+        return $_GET[$key];
+    }
+    return $default;
+}
+
+
+
+/**
+ * Get input from query string and set to $defined if defined or else $undefined.
+ *
+ * @param mixed $key       as string or array of string values to look for in $_GET.
+ * @param mixed $defined   value to return when $key is set in $_GET.
+ * @param mixed $undefined value to return when $key is not set in $_GET.
+ *
+ * @return mixed value as $defined or $undefined.
+ */
+function getDefined($key, $defined, $undefined)
+{
+    return get($key) === null ? $undefined : $defined;
+}
+
+
+
+/**
+ * Get value from config array or default if key is not set in config array.
+ *
+ * @param string $key    the key in the config array.
+ * @param mixed $default value to be default if $key is not set in config.
+ *
+ * @return mixed value as $config[$key] or $default.
+ */
+function getConfig($key, $default)
+{
+    global $config;
+    return isset($config[$key])
+        ? $config[$key]
+        : $default;
+}
+
+
+
+/**
+ * Log when verbose mode, when used without argument it returns the result.
+ *
+ * @param string $msg to log.
+ *
+ * @return void or array.
+ */
+function verbose($msg = null)
+{
+    global $verbose, $verboseFile;
+    static $log = array();
+
+    if (!($verbose || $verboseFile)) {
+        return;
+    }
+
+    if (is_null($msg)) {
+        return $log;
+    }
+
+    $log[] = $msg;
+}

test/CCacheTest.php

@@ -0,0 +1,68 @@
+<?php
+/**
+ * A testclass
+ *
+ */
+class CCacheTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * Test
+     *
+     * @return void
+     */
+    public function testSetCacheDir()
+    {
+        $cache = new CCache();
+        $cache->setDir(CACHE_PATH);
+
+        $exp = "exists, writable";
+        $res = $cache->getStatusOfSubdir("");
+        $this->assertEquals($exp, $res, "Status of cache dir missmatch.");
+    }
+
+
+
+    /**
+     * Test
+     *
+     * @expectedException Exception
+     *
+     * @return void
+     */
+    public function testSetWrongCacheDir()
+    {
+        $cache = new CCache();
+        $cache->setDir(CACHE_PATH . "/NO_EXISTS");
+    }
+
+
+
+    /**
+     * Test
+     *
+     * @return void
+     */
+    public function testCreateSubdir()
+    {
+        $cache = new CCache();
+        $cache->setDir(CACHE_PATH);
+        
+        $subdir = "__test__";
+        $cache->removeSubdir($subdir);
+        
+        $exp = "does not exist";
+        $res = $cache->getStatusOfSubdir($subdir, false);
+        $this->assertEquals($exp, $res, "Subdir should not be created.");
+        
+        $res = $cache->getPathToSubdir($subdir);
+        $exp = realpath(CACHE_PATH . "/$subdir");
+        $this->assertEquals($exp, $res, "Subdir path missmatch.");
+
+        $exp = "exists, writable";
+        $res = $cache->getStatusOfSubdir($subdir);
+        $this->assertEquals($exp, $res, "Subdir should exist.");
+
+        $res = $cache->removeSubdir($subdir);
+        $this->assertTrue($res, "Remove subdir.");
+    }
+}

test/CImageDummyTest.php

@@ -5,6 +5,57 @@
  */
 class CImageDummyTest extends \PHPUnit_Framework_TestCase
 {
+    const DUMMY = "__dummy__";
+    private $cachepath;
+
+
+
+    /**
+     * Setup environment
+     *
+     * @return void
+     */
+    protected function setUp()
+    {
+        $cache = new CCache();
+        $cache->setDir(CACHE_PATH);
+        $this->cachepath = $cache->getPathToSubdir(self::DUMMY);
+    }
+
+
+
+    /**
+     * Clean up cache dir content.
+     *
+     * @return void
+     */
+    protected function removeFilesInCacheDir()
+    {
+        $files = glob($this->cachepath . "/*");
+        foreach ($files as $file) {
+            if (is_file($file)) {
+                unlink($file);
+            }
+        }
+    }
+
+
+
+    /**
+     * Teardown environment
+     *
+     * @return void
+     */
+    protected function tearDown()
+    {
+        $cache = new CCache();
+        $cache->setDir(CACHE_PATH);
+        $this->removeFilesInCacheDir();
+        $cache->removeSubdir(self::DUMMY);
+    }
+
+
+
     /**
      * Test
      *
@@ -14,15 +65,15 @@ class CImageDummyTest extends \PHPUnit_Framework_TestCase
     {
         $img = new CImage();
 
-        $img->setSaveFolder(CACHE_PATH . "/dummy");
-        $img->setSource('dummy', CACHE_PATH . "/dummy");
+        $img->setSaveFolder($this->cachepath);
+        $img->setSource(self::DUMMY, $this->cachepath);
         $img->createDummyImage();
         $img->generateFilename(null, false);
         $img->save(null, null, false);
 
         $filename = $img->getTarget();
 
-        $this->assertEquals(basename($filename), "dummy_100_100", "Filename not as expected on dummy image.");
+        $this->assertEquals(basename($filename), self::DUMMY . "_100_100", "Filename not as expected on dummy image.");
     }
 
 
@@ -36,14 +87,14 @@ class CImageDummyTest extends \PHPUnit_Framework_TestCase
     {
         $img = new CImage();
 
-        $img->setSaveFolder(CACHE_PATH . "/dummy");
-        $img->setSource('dummy', CACHE_PATH . "/dummy");
+        $img->setSaveFolder($this->cachepath);
+        $img->setSource(self::DUMMY, $this->cachepath);
         $img->createDummyImage(200, 400);
         $img->generateFilename(null, false);
         $img->save(null, null, false);
 
         $filename = $img->getTarget();
 
-        $this->assertEquals(basename($filename), "dummy_200_400", "Filename not as expected on dummy image.");
+        $this->assertEquals(basename($filename), self::DUMMY . "_200_400", "Filename not as expected on dummy image.");
     }
 }

test/CImageRemoteDownloadTest.php

@@ -61,7 +61,7 @@ class CImageRemoteDownloadTest extends \PHPUnit_Framework_TestCase
     public function testAllowRemoteDownloadDefaultPatternValid($source)
     {
         $img = new CImage();
-        $img->setRemoteDownload(true);
+        $img->setRemoteDownload(true, "");
         
         $res = $img->isRemoteSource($source);
         $this->assertTrue($res, "Should be a valid remote source: '$source'.");
@@ -79,7 +79,7 @@ class CImageRemoteDownloadTest extends \PHPUnit_Framework_TestCase
     public function testAllowRemoteDownloadDefaultPatternInvalid($source)
     {
         $img = new CImage();
-        $img->setRemoteDownload(true);
+        $img->setRemoteDownload(true, "");
         
         $res = $img->isRemoteSource($source);
         $this->assertFalse($res, "Should not be a valid remote source: '$source'.");

webroot/img.php

@@ -8,143 +8,6 @@
  *
  */
 
-$version = "v0.7.8 (2015-12-06)";
-
-
-
-/**
- * Display error message.
- *
- * @param string $msg to display.
- * @param int $type of HTTP error to display.
- *
- * @return void
- */
-function errorPage($msg, $type = 500)
-{
-    global $mode;
-
-    switch ($type) {
-        case 403:
-            $header = "403 Forbidden";
-        break;
-        case 404:
-            $header = "404 Not Found";
-        break;
-        default:
-            $header = "500 Internal Server Error";
-    }
-
-    header("HTTP/1.0 $header");
-
-    if ($mode == 'development') {
-        die("[img.php] $msg");
-    }
-
-    error_log("[img.php] $msg");
-    die("HTTP/1.0 $header");
-}
-
-
-
-/**
- * Custom exception handler.
- */
-set_exception_handler(function ($exception) {
-    errorPage(
-        "<p><b>img.php: Uncaught exception:</b> <p>"
-        . $exception->getMessage()
-        . "</p><pre>"
-        . $exception->getTraceAsString()
-        . "</pre>"
-    , 500);
-});
-
-
-
-/**
- * Get input from query string or return default value if not set.
- *
- * @param mixed $key     as string or array of string values to look for in $_GET.
- * @param mixed $default value to return when $key is not set in $_GET.
- *
- * @return mixed value from $_GET or default value.
- */
-function get($key, $default = null)
-{
-    if (is_array($key)) {
-        foreach ($key as $val) {
-            if (isset($_GET[$val])) {
-                return $_GET[$val];
-            }
-        }
-    } elseif (isset($_GET[$key])) {
-        return $_GET[$key];
-    }
-    return $default;
-}
-
-
-
-/**
- * Get input from query string and set to $defined if defined or else $undefined.
- *
- * @param mixed $key       as string or array of string values to look for in $_GET.
- * @param mixed $defined   value to return when $key is set in $_GET.
- * @param mixed $undefined value to return when $key is not set in $_GET.
- *
- * @return mixed value as $defined or $undefined.
- */
-function getDefined($key, $defined, $undefined)
-{
-    return get($key) === null ? $undefined : $defined;
-}
-
-
-
-/**
- * Get value from config array or default if key is not set in config array.
- *
- * @param string $key    the key in the config array.
- * @param mixed $default value to be default if $key is not set in config.
- *
- * @return mixed value as $config[$key] or $default.
- */
-function getConfig($key, $default)
-{
-    global $config;
-    return isset($config[$key])
-        ? $config[$key]
-        : $default;
-}
-
-
-
-/**
- * Log when verbose mode, when used without argument it returns the result.
- *
- * @param string $msg to log.
- *
- * @return void or array.
- */
-function verbose($msg = null)
-{
-    global $verbose, $verboseFile;
-    static $log = array();
-
-    if (!($verbose || $verboseFile)) {
-        return;
-    }
-
-    if (is_null($msg)) {
-        return $log;
-    }
-
-    $log[] = $msg;
-}
-
-
-
 /**
  * Get configuration options from file, if the file exists, else use $config
  * if its defined or create an empty $config.
@@ -157,6 +20,24 @@ if (is_file($configFile)) {
     $config = array();
 }
 
+// Make CIMAGE_DEBUG false by default, if not already defined
+if (!defined("CIMAGE_DEBUG")) {
+    define("CIMAGE_DEBUG", false);
+}
+
+
+
+/**
+ * Setup the autoloader, but not when using a bundle.
+ */
+if (!defined("CIMAGE_BUNDLE")) {
+    if (!isset($config["autoloader"])) {
+        die("CImage: Missing autoloader.");
+    }
+
+    require $config["autoloader"];
+}
+
 
 
 /**
@@ -165,7 +46,7 @@ if (is_file($configFile)) {
 */
 $verbose = getDefined(array('verbose', 'v'), true, false);
 $verboseFile = getDefined('vf', true, false);
-verbose("img.php version = $version");
+verbose("img.php version = " . CIMAGE_VERSION);
 
 
 
@@ -256,7 +137,7 @@ $pwd         = get(array('password', 'pwd'), null);
 // Check if passwords match, if configured to use passwords
 $passwordMatch = null;
 if ($pwd) {
-    switch($pwdType) {
+    switch ($pwdType) {
         case 'md5':
             $passwordMatch = ($pwdConfig === md5($pwd));
             break;
@@ -324,24 +205,58 @@ verbose("referer host = $refererHost");
 
 
 /**
- * Get the source files.
+ * Create the class for the image.
  */
-$autoloader  = getConfig('autoloader', false);
-$cimageClass = getConfig('cimage_class', false);
-
-if ($autoloader) {
-    require $autoloader;
-} elseif ($cimageClass) {
-    require $cimageClass;
-}
+$CImage = getConfig('CImage', 'CImage');
+$img = new $CImage();
+$img->setVerbose($verbose || $verboseFile);
 
 
 
 /**
- * Create the class for the image.
+ * Get the cachepath from config.
  */
-$img = new CImage();
-$img->setVerbose($verbose || $verboseFile);
+$CCache = getConfig('CCache', 'CCache');
+$cachePath = getConfig('cache_path', __DIR__ . '/../cache/');
+$cache = new $CCache();
+$cache->setDir($cachePath);
+
+
+
+/**
+ * no-cache, nc - skip the cached version and process and create a new version in cache.
+ */
+$useCache = getDefined(array('no-cache', 'nc'), false, true);
+
+verbose("use cache = $useCache");
+
+
+
+/**
+ * Prepare fast track cache for swriting cache items.
+ */
+$fastTrackCache = "fasttrack";
+$allowFastTrackCache = getConfig('fast_track_allow', false);
+
+$CFastTrackCache = getConfig('CFastTrackCache', 'CFastTrackCache');
+$ftc = new $CFastTrackCache();
+$ftc->setCacheDir($cache->getPathToSubdir($fastTrackCache))
+    ->enable($allowFastTrackCache)
+    ->setFilename(array('no-cache', 'nc'));
+$img->injectDependency("fastTrackCache", $ftc);
+
+
+
+/**
+ *  Load and output images from fast track cache, if items are available
+ * in cache.
+ */
+if ($useCache && $allowFastTrackCache) {
+    if (CIMAGE_DEBUG) {
+        trace("img.php fast track cache enabled and used");
+    }
+    $ftc->output();
+}
 
 
 
@@ -353,8 +268,10 @@ $img->setVerbose($verbose || $verboseFile);
 $allowRemote = getConfig('remote_allow', false);
 
 if ($allowRemote && $passwordMatch !== false) {
+    $cacheRemote = $cache->getPathToSubdir("remote");
+    
     $pattern = getConfig('remote_pattern', null);
-    $img->setRemoteDownload($allowRemote, $pattern);
+    $img->setRemoteDownload($allowRemote, $cacheRemote, $pattern);
 
     $whitelist = getConfig('remote_whitelist', null);
     $img->setRemoteHostWhitelist($whitelist);
@@ -389,18 +306,28 @@ if (isset($shortcut)
 $srcImage = urldecode(get('src'))
     or errorPage('Must set src-attribute.', 404);
 
+// Get settings for src-alt as backup image
+$srcAltImage = urldecode(get('src-alt', null));
+$srcAltConfig = getConfig('src_alt', null);
+if (empty($srcAltImage)) {
+    $srcAltImage = $srcAltConfig;
+}
+
 // Check for valid/invalid characters
 $imagePath           = getConfig('image_path', __DIR__ . '/img/');
 $imagePathConstraint = getConfig('image_path_constraint', true);
 $validFilename       = getConfig('valid_filename', '#^[a-z0-9A-Z-/_ \.:]+$#');
 
+// Source is remote
+$remoteSource = false;
+
 // Dummy image feature
 $dummyEnabled  = getConfig('dummy_enabled', true);
 $dummyFilename = getConfig('dummy_filename', 'dummy');
 $dummyImage = false;
 
 preg_match($validFilename, $srcImage)
-    or errorPage('Filename contains invalid characters.', 404);
+    or errorPage('Source filename contains invalid characters.', 404);
 
 if ($dummyEnabled && $srcImage === $dummyFilename) {
 
@@ -410,24 +337,47 @@ if ($dummyEnabled && $srcImage === $dummyFilename) {
 } elseif ($allowRemote && $img->isRemoteSource($srcImage)) {
 
     // If source is a remote file, ignore local file checks.
+    $remoteSource = true;
 
-} elseif ($imagePathConstraint) {
+} else {
 
-    // Check that the image is a file below the directory 'image_path'.
+    // Check if file exists on disk or try using src-alt
     $pathToImage = realpath($imagePath . $srcImage);
-    $imageDir    = realpath($imagePath);
 
-    is_file($pathToImage)
-        or errorPage(
-            'Source image is not a valid file, check the filename and that a
-            matching file exists on the filesystem.'
-        , 404);
+    if (!is_file($pathToImage) && !empty($srcAltImage)) {
+        // Try using the src-alt instead
+        $srcImage = $srcAltImage;
+        $pathToImage = realpath($imagePath . $srcImage);
+
+        preg_match($validFilename, $srcImage)
+            or errorPage('Source (alt) filename contains invalid characters.', 404);
+
+        if ($dummyEnabled && $srcImage === $dummyFilename) {
+            // Check if src-alt is the dummy image
+            $dummyImage = true;
+        }
+    }
+
+    if (!$dummyImage) {
+        is_file($pathToImage)
+            or errorPage(
+                'Source image is not a valid file, check the filename and that a
+                matching file exists on the filesystem.',
+                404
+            );
+    } 
+}
+
+if ($imagePathConstraint && !$dummyImage && !$remoteSource) {
+    // Check that the image is a file below the directory 'image_path'.
+    $imageDir = realpath($imagePath);
 
     substr_compare($imageDir, $pathToImage, 0, strlen($imageDir)) == 0
         or errorPage(
             'Security constraint: Source image is not below the directory "image_path"
-            as specified in the config file img_config.php.'
-        , 404);
+            as specified in the config file img_config.php.',
+            404
+        );
 }
 
 verbose("src = $srcImage");
@@ -646,23 +596,14 @@ $useOriginal = getDefined(array('skip-original', 'so'), false, true);
 $useOriginalDefault = getConfig('skip_original', false);
 
 if ($useOriginalDefault === true) {
-    verbose("use original is default ON");
-    $useOriginal = true;
+    verbose("skip original is default ON");
+    $useOriginal = false;
 }
 
 verbose("use original = $useOriginal");
 
 
 
-/**
- * no-cache, nc - skip the cached version and process and create a new version in cache.
- */
-$useCache = getDefined(array('no-cache', 'nc'), false, true);
-
-verbose("use cache = $useCache");
-
-
-
 /**
  * quality, q - set level of quality for jpeg images
  */
@@ -940,14 +881,7 @@ verbose("alias = $alias");
 
 
 /**
- * Get the cachepath from config.
- */
-$cachePath = getConfig('cache_path', __DIR__ . '/../cache/');
-
-
-
-/**
- * Get the cachepath from config.
+ * Add cache control HTTP header.
  */
 $cacheControl = getConfig('cache_control', null);
 
@@ -961,11 +895,8 @@ if ($cacheControl) {
 /**
  * Prepare a dummy image and use it as source image.
  */
-$dummyDir = getConfig('dummy_dir', $cachePath. "/" . $dummyFilename);
-
 if ($dummyImage === true) {
-    is_writable($dummyDir)
-        or verbose("dummy dir not writable = $dummyDir");
+    $dummyDir = $cache->getPathToSubdir("dummy");
 
     $img->setSaveFolder($dummyDir)
         ->setSource($dummyFilename, $dummyDir)
@@ -993,24 +924,16 @@ if ($dummyImage === true) {
 /**
  * Prepare a sRGB version of the image and use it as source image.
  */
-$srgbDirName = "/srgb";
-$srgbDir     = realpath(getConfig('srgb_dir', $cachePath . $srgbDirName));
 $srgbDefault = getConfig('srgb_default', false);
 $srgbColorProfile = getConfig('srgb_colorprofile', __DIR__ . '/../icc/sRGB_IEC61966-2-1_black_scaled.icc');
 $srgb = getDefined('srgb', true, null);
 
 if ($srgb || $srgbDefault) {
 
-    if (!is_writable($srgbDir)) {
-        if (is_writable($cachePath)) {
-            mkdir($srgbDir);
-        }
-    }
-
     $filename = $img->convert2sRGBColorSpace(
         $srcImage,
         $imagePath,
-        $srgbDir,
+        $cache->getPathToSubdir("srgb"),
         $srgbColorProfile,
         $useCache
     );
@@ -1030,13 +953,26 @@ if ($srgb || $srgbDefault) {
  * Display status
  */
 if ($status) {
-    $text  = "img.php version = $version\n";
+    $text  = "img.php version = " . CIMAGE_VERSION . "\n";
     $text .= "PHP version = " . PHP_VERSION . "\n";
     $text .= "Running on: " . $_SERVER['SERVER_SOFTWARE'] . "\n";
     $text .= "Allow remote images = $allowRemote\n";
-    $text .= "Cache writable = " . is_writable($cachePath) . "\n";
-    $text .= "Cache dummy writable = " . is_writable($dummyDir) . "\n";
-    $text .= "Cache srgb writable = " . is_writable($srgbDir) . "\n";
+
+    $res = $cache->getStatusOfSubdir("");
+    $text .= "Cache $res\n";
+
+    $res = $cache->getStatusOfSubdir("remote");
+    $text .= "Cache remote $res\n";
+
+    $res = $cache->getStatusOfSubdir("dummy");
+    $text .= "Cache dummy $res\n";
+
+    $res = $cache->getStatusOfSubdir("srgb");
+    $text .= "Cache srgb $res\n";
+
+    $res = $cache->getStatusOfSubdir($fasttrackCache);
+    $text .= "Cache fasttrack $res\n";
+
     $text .= "Alias path writable = " . is_writable($aliasPath) . "\n";
 
     $no = extension_loaded('exif') ? null : 'NOT';

webroot/img_config.php

@@ -5,28 +5,54 @@
  * config-file imgtest_config.php.
  *
  */
+
+
+
+/**
+ * Change to true to enable debug mode which logs additional information
+ * to file. Only use for test and development. You must create the logfile
+ * and make it writable by the webserver or log entries will silently fail.
+ *
+ * CIMAGE_DEBUG will be false by default, if its not defined.
+ */
+if (!defined("CIMAGE_DEBUG")) {
+    define("CIMAGE_DEBUG", false);
+    //define("CIMAGE_DEBUG", true);
+    define("CIMAGE_DEBUG_FILE", "/tmp/cimage");
+}
+
+
+
 return array(
 
     /**
      * Set mode as 'strict', 'production' or 'development'.
      *
+     * development: Development mode with verbose error reporting. Option
+     *              &verbose and &status enabled.
+     * production:  Production mode logs all errors to file, giving server
+     *              error 500 for bad usage. Option &verbose and &status
+     *              disabled.
+     * strict:      Strict mode logs few errors to file, giving server error
+     *              500 for bad usage. Stripped from comments and spaces.
+     *              Option &verbose and &status disabled.
+     *
      * Default values:
      *  mode: 'production'
      */
-     //'mode' => 'production', // 'development', 'strict'
-     //'mode' => 'development', // 'development', 'strict'
+     //'mode' => 'production',
+     //'mode' => 'development',
+     //'mode' => 'strict',
 
 
 
     /**
-     * Where are the sources for the classfiles.
+     * Where to find the autoloader.
      *
      * Default values:
-     *  autoloader:  null     // used from v0.6.2
-     *  cimage_class: null    // used until v0.6.1
+     *  autoloader:  null
      */
     'autoloader'   =>  __DIR__ . '/../autoload.php',
-    //'cimage_class' =>  __DIR__ . '/../CImage.php',
 
 
 
@@ -35,16 +61,44 @@ return array(
      * End all paths with a slash.
      *
      * Default values:
-     *  image_path: __DIR__ . '/img/'
-     *  cache_path: __DIR__ . '/../cache/'
-     *  alias_path: null
+     *  image_path:     __DIR__ . '/img/'
+     *  cache_path:     __DIR__ . '/../cache/'
+     *  alias_path:     null
      */
-    'image_path'   =>  __DIR__ . '/img/',
-    'cache_path'   =>  __DIR__ . '/../cache/',
+    'image_path'        =>  __DIR__ . '/img/',
+    'cache_path'        =>  __DIR__ . '/../cache/',
     //'alias_path'   =>  __DIR__ . '/img/alias/',
 
 
 
+    /**
+     * Fast track cache. Save a json representation of the image as a
+     * fast track to the cached version of the image. This avoids some
+     * processing and allows for quicker load times of cached images.
+     *
+     * Default values:
+     *  fast_track_allow: false
+     */
+    'fast_track_allow' => true,
+
+
+
+    /**
+     * Class names to use, to ease dependency injection. You can change Class
+     * name if you want to use your own class instead. This is a way to extend
+     * the codebase.
+     *
+     * Default values:
+     *  CImage: CImage
+     *  CCache: CCache
+     *  CFastTrackCache: CFastTrackCache
+     */
+     //'CImage' => 'CImage',
+     //'CCache' => 'CCache',
+     //'CFastTrackCache' => 'CFastTrackCache',
+
+
+
     /**
      * Use password to protect from missusage, send &pwd=... or &password=..
      * with the request to match the password or set to false to disable.
@@ -97,6 +151,20 @@ return array(
 
 
 
+    /**
+     * Use backup image if src-image is not found on disk. The backup image
+     * is only available for local images and based on wether the original
+     * image is found on disk or not. The backup image must be a local image
+     * or the dummy image.
+     *
+     * Default value:
+     *  src_alt:  null //disabled by default
+     */
+     //'src_alt' => 'car.png',
+     //'src_alt' => 'dummy',
+
+
+
     /**
      * A regexp for validating characters in the image or alias filename.
      *
@@ -124,22 +192,32 @@ return array(
 
       /**
        * Convert the image to srgb before processing. Saves the converted
-       * image in the sub cache dir. This option is default false but can
+       * image in a cache subdir 'srgb'. This option is default false but can
        * be changed to default true to do this conversion for all images.
        * This option requires PHP extension imagick and will silently fail
        * if that is not installed.
        *
        * Default value:
-       *  srgb_dir:          $cachePath/srgb
        *  srgb_default:      false
        *  srgb_colorprofile: __DIR__ . '/../icc/sRGB_IEC61966-2-1_black_scaled.icc'
        */
-       //'srgb_dir'  => __DIR__ . '/../cache/srgb/',
        //'srgb_default' => false,
        //'srgb_colorprofile' => __DIR__ . '/../icc/sRGB_IEC61966-2-1_black_scaled.icc',
 
 
 
+       /**
+        * Set skip-original to true to always process the image and use
+        * the cached version. Default is false and to use the original
+        * image when its no processing needed.
+        *
+        * Default value:
+        *  skip_original: false
+        */
+        //'skip_original' => true,
+
+
+
       /**
        * A function (hook) can be called after img.php has processed all
        * configuration options and before processing the image using CImage.
@@ -170,30 +248,27 @@ return array(
 
      /**
       * The name representing a dummy image which is automatically created
-      * and stored at the defined path. The dummy image can then be used
-      * inplace of an original image as a placeholder.
-      * The dummy_dir must be writable and it defaults to a subdir of the
-      * cache directory.
-      * Write protect the dummy_dir to prevent creation of new dummy images,
-      * but continue to use the existing ones.
+      * and stored as a image in the dir CACHE_PATH/dummy. The dummy image
+      * can then be used as a placeholder image.
+      * The dir CACHE_PATH/dummy is automatically created when needed.
+      * Write protect the CACHE_PATH/dummy to prevent creation of new
+      * dummy images, but continue to use the existing ones.
       *
       * Default value:
       *  dummy_enabled:  true as default, disable dummy feature by setting
       *                  to false.
       *  dummy_filename: 'dummy' use this as ?src=dummy to create a dummy image.
-      *  dummy_dir:      Defaults to subdirectory of 'cache_path',
-      *                  named the same as 'dummy_filename'
       */
       //'dummy_enabled' => true,
       //'dummy_filename' => 'dummy',
-      //'dummy_dir' => 'some writable directory',
 
 
 
      /**
      * Check that the imagefile is a file below 'image_path' using realpath().
      * Security constraint to avoid reaching images outside image_path.
-     * This means that symbolic links to images outside the image_path will fail.
+     * This means that symbolic links to images outside the image_path will
+     * fail.
      *
      * Default value:
      *  image_path_constraint: true
@@ -384,7 +459,7 @@ return array(
 
 
     /**
-     * default options for ascii image.
+     * Default options for ascii image.
      *
      * Default values as specified below in the array.
      *  ascii-options:

webroot/img_header.php

@@ -10,6 +10,7 @@
  * @link    https://github.com/mosbth/cimage
  *
  */
+define("CIMAGE_BUNDLE", true);
 
 
 /**

webroot/imgf.php

@@ -0,0 +1,91 @@
+<?php
+/**
+ * Fast track cache, read entries from the cache before processing image
+ * the ordinary way.
+ */
+// Load the config file or use defaults
+$configFile = __DIR__
+    . "/"
+    . basename(__FILE__, ".php")
+    . "_config.php";
+
+if (is_file($configFile) && is_readable($configFile)) {
+    $config = require $configFile;
+} elseif (!isset($config)) {
+    $config = array(
+        "fast_track_allow" =>  true,
+        "autoloader" =>  __DIR__ . "/../autoload.php",
+        "cache_path" =>  __DIR__ . "/../cache/",
+    );
+}
+
+// Make CIMAGE_DEBUG false by default, if not already defined
+if (!defined("CIMAGE_DEBUG")) {
+    define("CIMAGE_DEBUG", false);
+}
+
+// Debug mode needs additional functions
+if (CIMAGE_DEBUG) {
+    require $config["autoloader"];
+}
+
+// Cache path must be valid
+$cacheIsReadable = is_dir($config["cache_path"]) && is_readable($config["cache_path"]);
+if (!$cacheIsReadable) {
+    die("imgf.php: Cache is not readable, check path in configfile.");
+}
+
+// Prepare to check if fast cache should be used
+$cachePath = $config["cache_path"] . "/fasttrack";
+$query = $_GET;
+
+// Do not use cache when no-cache is active
+$useCache = !(array_key_exists("no-cache", $query) || array_key_exists("nc", $query));
+
+// Only use cache if enabled by configuration
+$useCache = $useCache && isset($config["fast_track_allow"]) && $config["fast_track_allow"] === true;
+
+// Remove parts from querystring that should not be part of filename
+$clear = array("nc", "no-cache");
+foreach ($clear as $value) {
+    unset($query[$value]);
+}
+
+// Create the cache filename
+arsort($query);
+$queryAsString = http_build_query($query);
+$filename = md5($queryAsString);
+$filename = "$cachePath/$filename";
+
+// Check cached item, if any
+if ($useCache && is_readable($filename)) {
+    $item = json_decode(file_get_contents($filename), true);
+
+    if (is_readable($item["source"])) {
+        foreach ($item["header"] as $value) {
+            header($value);
+        }
+
+        if (isset($_SERVER["HTTP_IF_MODIFIED_SINCE"])
+            && strtotime($_SERVER["HTTP_IF_MODIFIED_SINCE"]) == $item["last-modified"]) {
+            header("HTTP/1.0 304 Not Modified");
+            if (CIMAGE_DEBUG) {
+                trace("imgf 304");
+            }
+            exit;
+        }
+
+        foreach ($item["header-output"] as $value) {
+            header($value);
+        }
+
+        if (CIMAGE_DEBUG) {
+            trace("imgf 200");
+        }
+        readfile($item["source"]);
+        exit;
+    }
+}
+
+// No fast track cache, proceed as usual
+include __DIR__ . "/img.php";

webroot/imgf_config.php

@@ -0,0 +1 @@
+img_config.php

webroot/test/test_option-no-upscale.php

@@ -17,12 +17,13 @@ $description = "Do not upscale image when original image (slice) is smaller than
 // Use these images in the test
 $images = array(
     'car.png',
+    'apple.jpg',
 );
 
 
 
 // For each image, apply these testcases
-$nc = null; //"&nc"; //null; //&nc'; 
+$nc = "&bgc=660000"; //null; //"&nc"; //null; //&nc'; 
 $testcase = array(
     $nc . '&w=600',
     $nc . '&w=600&no-upscale',
@@ -34,16 +35,20 @@ $testcase = array(
     $nc . '&w=700&h=400&no-upscale&stretch',
     $nc . '&w=700&h=200&stretch',
     $nc . '&w=700&h=200&no-upscale&stretch',
-    $nc . '&w=300&h=400&stretch',
-    $nc . '&w=300&h=400&no-upscale&stretch',
-    $nc . '&w=600&h=400&crop-to-fit',
-    $nc . '&w=600&h=400&no-upscale&crop-to-fit',
-    $nc . '&w=600&h=200&crop-to-fit',
-    $nc . '&w=600&h=200&no-upscale&crop-to-fit',
-    $nc . '&w=300&h=400&crop-to-fit',
-    $nc . '&w=300&h=400&no-upscale&crop-to-fit',
-    $nc . '&w=600&h=400&fill-to-fit',
-    $nc . '&w=600&h=400&no-upscale&fill-to-fit',
+    $nc . '&w=250&h=400&stretch',
+    $nc . '&w=250&h=400&no-upscale&stretch',
+    $nc . '&w=700&h=400&crop-to-fit',
+    $nc . '&w=700&h=400&no-upscale&crop-to-fit',
+    $nc . '&w=700&h=200&crop-to-fit',
+    $nc . '&w=700&h=200&no-upscale&crop-to-fit',
+    $nc . '&w=250&h=400&crop-to-fit',
+    $nc . '&w=250&h=400&no-upscale&crop-to-fit',
+    $nc . '&w=600&h=500&fill-to-fit',
+    $nc . '&w=600&h=500&no-upscale&fill-to-fit',
+    $nc . '&w=250&h=400&fill-to-fit',
+    $nc . '&w=250&h=400&no-upscale&fill-to-fit',
+    $nc . '&w=700&h=400&fill-to-fit',
+    $nc . '&w=700&h=400&no-upscale&fill-to-fit',
 /*
     $nc . '&w=600&ar=1.6',
     $nc . '&w=600&ar=1.6&no-upscale',