preparing to release v0.7.0-rc-1

* Three different modes: strict, production, development #44.
* Three files for all-in-one `imgs.php`, `imgp.php`, `imgd.php` #73.

CHttpGet.php

@@ -0,0 +1,240 @@
+<?php
+/**
+ * Get a image from a remote server using HTTP GET and If-Modified-Since.
+ *
+ */
+class CHttpGet
+{
+    private $request  = array();
+    private $response = array();
+
+
+
+    /**
+    * Constructor
+    *
+    */
+    public function __construct()
+    {
+        $this->request['header'] = array();
+    }
+
+
+
+    /**
+     * Set the url for the request.
+     *
+     * @param string $url
+     *
+     * @return $this
+     */
+    public function setUrl($url)
+    {
+        $this->request['url'] = $url;
+        return $this;
+    }
+
+
+
+    /**
+     * Set custom header field for the request.
+     *
+     * @param string $field
+     * @param string $value
+     *
+     * @return $this
+     */
+    public function setHeader($field, $value)
+    {
+        $this->request['header'][] = "$field: $value";
+        return $this;
+    }
+
+
+
+    /**
+     * Set header fields for the request.
+     *
+     * @param string $field
+     * @param string $value
+     *
+     * @return $this
+     */
+    public function parseHeader()
+    {
+        $header = explode("\r\n", rtrim($this->response['headerRaw'], "\r\n"));
+        $output = array();
+
+        if ('HTTP' === substr($header[0], 0, 4)) {
+            list($output['version'], $output['status']) = explode(' ', $header[0]);
+            unset($header[0]);
+        }
+
+        foreach ($header as $entry) {
+            $pos = strpos($entry, ':');
+            $output[trim(substr($entry, 0, $pos))] = trim(substr($entry, $pos + 1));
+        }
+
+        $this->response['header'] = $output;
+        return $this;
+    }
+
+
+
+    /**
+     * Perform the request.
+     *
+     * @param boolean $debug set to true to dump headers.
+     *
+     * @return boolean
+     */
+    public function doGet($debug = false)
+    {
+        $options = array(
+            CURLOPT_URL             => $this->request['url'],
+            CURLOPT_HEADER          => 1,
+            CURLOPT_HTTPHEADER      => $this->request['header'],
+            CURLOPT_AUTOREFERER     => true,
+            CURLOPT_RETURNTRANSFER  => true,
+            CURLINFO_HEADER_OUT     => $debug,
+            CURLOPT_CONNECTTIMEOUT  => 5,
+            CURLOPT_TIMEOUT         => 5,
+        );
+
+        $ch = curl_init();
+        curl_setopt_array($ch, $options);
+        $response = curl_exec($ch);
+
+        if (!$response) {
+            return false;
+        }
+
+        $headerSize = curl_getinfo($ch, CURLINFO_HEADER_SIZE);
+        $this->response['headerRaw'] = substr($response, 0, $headerSize);
+        $this->response['body']      = substr($response, $headerSize);
+
+        $this->parseHeader();
+
+        if ($debug) {
+            $info = curl_getinfo($ch);
+            echo "Request header<br><pre>", var_dump($info['request_header']), "</pre>";
+            echo "Response header (raw)<br><pre>", var_dump($this->response['headerRaw']), "</pre>";
+            echo "Response header (parsed)<br><pre>", var_dump($this->response['header']), "</pre>";
+        }
+
+        curl_close($ch);
+        return true;
+    }
+
+
+
+    /**
+     * Get HTTP code of response.
+     *
+     * @return integer as HTTP status code or null if not available.
+     */
+    public function getStatus()
+    {
+        return isset($this->response['header']['status'])
+            ? (int) $this->response['header']['status']
+            : null;
+    }
+
+
+
+    /**
+     * Get file modification time of response.
+     *
+     * @return int as timestamp.
+     */
+    public function getLastModified()
+    {
+        return isset($this->response['header']['Last-Modified'])
+            ? strtotime($this->response['header']['Last-Modified'])
+            : null;
+    }
+
+
+
+    /**
+     * Get content type.
+     *
+     * @return string as the content type or null if not existing or invalid.
+     */
+    public function getContentType()
+    {
+        $type = isset($this->response['header']['Content-Type'])
+            ? $this->response['header']['Content-Type']
+            : null;
+
+        return preg_match('#[a-z]+/[a-z]+#', $type)
+            ? $type
+            : null;
+    }
+
+
+
+    /**
+     * Get file modification time of response.
+     *
+     * @param mixed $default as default value (int seconds) if date is
+     *                       missing in response header.
+     *
+     * @return int as timestamp or $default if Date is missing in
+     *             response header.
+     */
+    public function getDate($default = false)
+    {
+        return isset($this->response['header']['Date'])
+            ? strtotime($this->response['header']['Date'])
+            : $default;
+    }
+
+
+
+    /**
+     * Get max age of cachable item.
+     *
+     * @param mixed $default as default value if date is missing in response
+     *                       header.
+     *
+     * @return int as timestamp or false if not available.
+     */
+    public function getMaxAge($default = false)
+    {
+        $cacheControl = isset($this->response['header']['Cache-Control'])
+            ? $this->response['header']['Cache-Control']
+            : null;
+
+        $maxAge = null;
+        if ($cacheControl) {
+            // max-age=2592000
+            $part = explode('=', $cacheControl);
+            $maxAge = ($part[0] == "max-age")
+                ? (int) $part[1]
+                : null;
+        }
+
+        if ($maxAge) {
+            return $maxAge;
+        }
+
+        $expire = isset($this->response['header']['Expires'])
+            ? strtotime($this->response['header']['Expires'])
+            : null;
+
+        return $expire ? $expire : $default;
+    }
+
+
+
+    /**
+     * Get body of response.
+     *
+     * @return string as body.
+     */
+    public function getBody()
+    {
+        return $this->response['body'];
+    }
+}

CImage.php

@@ -297,6 +297,27 @@ class CImage
 
 
 
+    /**
+    * Allow remote file download, default is to disallow remote file download.
+    */
+    private $allowRemote = false;
+
+
+
+    /**
+     * Pattern to recognize a remote file.
+     */
+    //private $remotePattern = '#^[http|https]://#';
+    private $remotePattern = '#^https?://#';
+
+
+
+    /**
+     * Use the cache if true, set to false to ignore the cached file.
+     */
+    private $useCache = true;
+
+
     /**
      * Properties, the class is mutable and the method setOptions()
      * decides (partly) what properties are created.
@@ -313,7 +334,6 @@ class CImage
     public $filters;
     private $type; // Calculated from source image
     private $attr; // Calculated from source image
-    private $useCache; // Use the cache if true, set to false to ignore the cached file.
     private $useOriginal; // Use original image if possible
 
 
@@ -338,7 +358,8 @@ class CImage
     /**
      * Set verbose mode.
      *
-     * @param boolean $mode true or false to enable and disable versbose mode, default is true.
+     * @param boolean $mode true or false to enable and disable verbose mode,
+     *                      default is true.
      *
      * @return $this
      */
@@ -350,6 +371,79 @@ class CImage
 
 
 
+    /**
+     * Set save folder, base folder for saving cache files.
+     *
+     * @todo clean up how $this->saveFolder is used in other methods.
+     *
+     * @param string $path where to store cached files.
+     *
+     * @return $this
+     */
+    public function setSaveFolder($path)
+    {
+        $this->saveFolder = $path;
+        return $this;
+    }
+
+
+
+    /**
+     * Use cache or not.
+     *
+     * @todo clean up how $this->noCache is used in other methods.
+     *
+     * @param string $use true or false to use cache.
+     *
+     * @return $this
+     */
+    public function useCache($use = true)
+    {
+        $this->useCache = $use;
+        return $this;
+    }
+
+
+
+    /**
+     * Allow or disallow remote image download.
+     *
+     * @param boolean $allow   true or false to enable and disable.
+     * @param string  $pattern to use to detect if its a remote file.
+     *
+     * @return $this
+     */
+    public function setRemoteDownload($allow, $pattern = null)
+    {
+        $this->allowRemote = $allow;
+        $this->remotePattern = $pattern ? $pattern : $this->remotePattern;
+
+        $this->log("Set remote download to: "
+            . ($this->allowRemote ? "true" : "false")
+            . " using pattern "
+            . $this->remotePattern);
+
+        return $this;
+    }
+
+
+
+    /**
+     * Check if the image resource is a remote file or not.
+     *
+     * @param string $src check if src is remote.
+     *
+     * @return boolean true if $src is a remote file, else false.
+     */
+    public function isRemoteSource($src)
+    {
+        $remote = preg_match($this->remotePattern, $src);
+        $this->log("Detected remote image: " . ($remote ? "true" : "false"));
+        return $remote;
+    }
+
+
+
     /**
      * Check if file extension is valid as a file extension.
      *
@@ -369,6 +463,43 @@ class CImage
 
 
 
+    /**
+     * Download a remote image and return path to its local copy.
+     *
+     * @param string $src remote path to image.
+     *
+     * @return string as path to downloaded remote source.
+     */
+    public function downloadRemoteSource($src)
+    {
+        $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)) {
+            $this->log("The remote cache is not writable.");
+        }
+
+        $remote->setCache($cache);
+        $remote->useCache($this->useCache);
+        $src = $remote->download($src);
+
+        $this->log("Remote HTTP status: " . $remote->getStatus());
+        $this->log("Remote item has local cached file: $src");
+        $this->log("Remote details on cache:" . print_r($remote->getDetails(), true));
+
+        return $src;
+    }
+
+
+
     /**
      * Set src file.
      *
@@ -381,7 +512,14 @@ class CImage
     {
         if (!isset($src)) {
             return $this;
-        } else if (!isset($dir)) {
+        }
+
+        if ($this->allowRemote && $this->isRemoteSource($src)) {
+            $src = $this->downloadRemoteSource($src);
+            $dir = null;
+        }
+
+        if (!isset($dir)) {
             $dir = dirname($src);
             $src = basename($src);
         }
@@ -1175,6 +1313,8 @@ class CImage
             $this->log("imageistruecolor() : " . (imageistruecolor($this->image) ? 'true' : 'false'));
             $this->log("imagecolorstotal() : " . imagecolorstotal($this->image));
             $this->log("Number of colors in image = " . $this->colorsTotal($this->image));
+            $index = imagecolortransparent($this->image);
+            $this->log("Detected transparent color = " . ($index > 0 ? implode(", ", imagecolorsforindex($this->image, $index)) : "NONE") . " at index = $index");
         }
 
         return $this;
@@ -1859,7 +1999,17 @@ class CImage
         imagealphablending($img, false);
         imagesavealpha($img, true);
 
-        if ($this->bgColorDefault) {
+        $index = imagecolortransparent($this->image);
+        if ($index != -1) {
+
+            imagealphablending($img, true);
+            $transparent = imagecolorsforindex($this->image, $index);
+            $color = imagecolorallocatealpha($img, $transparent['red'], $transparent['green'], $transparent['blue'], $transparent['alpha']);
+            imagefill($img, 0, 0, $color);
+            $index = imagecolortransparent($img, $color);
+            $this->Log("Detected transparent color = " . implode(", ", $transparent) . " at index = $index");
+
+        } elseif ($this->bgColorDefault) {
 
             $color = $this->getBackgroundColor($img);
             imagefill($img, 0, 0, $color);
@@ -1942,10 +2092,8 @@ class CImage
                 break;
 
             case 'gif':
-                if ($this->saveFolder) {
                 $this->Log("Saving image as GIF to cache.");
                 imagegif($this->image, $this->cacheFileName);
-                }
                 break;
 
             case 'png':
@@ -1994,6 +2142,42 @@ class CImage
             $this->log("imageistruecolor() : " . (imageistruecolor($this->image) ? 'true' : 'false'));
             $this->log("imagecolorstotal() : " . imagecolorstotal($this->image));
             $this->log("Number of colors in image = " . $this->ColorsTotal($this->image));
+            $index = imagecolortransparent($this->image);
+            $this->log("Detected transparent color = " . ($index > 0 ? implode(", ", imagecolorsforindex($this->image, $index)) : "NONE") . " at index = $index");
+        }
+
+        return $this;
+    }
+
+
+
+    /**
+     * Create a hard link, as an alias, to the cached file.
+     *
+     * @param string $alias where to store the link,
+     *                      filename without extension.
+     *
+     * @return $this
+     */
+    public function linkToCacheFile($alias)
+    {
+        if ($alias === null) {
+            $this->log("Ignore creating alias.");
+            return $this;
+        }
+
+        $alias = $alias . "." . $this->extension;
+
+        if (is_readable($alias)) {
+            unlink($alias);
+        }
+
+        $res = link($this->cacheFileName, $alias);
+
+        if ($res) {
+            $this->log("Created an alias as: $alias");
+        } else {
+            $this->log("Failed to create the alias: $alias");
         }
 
         return $this;

CRemoteImage.php

@@ -0,0 +1,351 @@
+<?php
+/**
+ * Get a image from a remote server using HTTP GET and If-Modified-Since.
+ *
+ */
+class CRemoteImage
+{
+    /**
+     * Path to cache files.
+     */
+    private $saveFolder = null;
+
+
+
+    /**
+     * Use cache or not.
+     */
+    private $useCache = true;
+
+
+
+    /**
+     * HTTP object to aid in download file.
+     */
+    private $http;
+
+
+
+    /**
+     * Status of the HTTP request.
+     */
+    private $status;
+
+
+
+    /**
+     * Defalt age for cached items 60*60*24*7.
+     */
+    private $defaultMaxAge = 604800;
+
+
+
+    /**
+     * Url of downloaded item.
+     */
+    private $url;
+
+
+
+    /**
+     * Base name of cache file for downloaded item.
+     */
+    private $fileName;
+
+
+
+    /**
+     * Filename for json-file with details of cached item.
+     */
+    private $fileJson;
+
+
+
+    /**
+     * Filename for image-file.
+     */
+    private $fileImage;
+
+
+
+    /**
+     * Cache details loaded from file.
+     */
+    private $cache;
+
+
+
+    /**
+     * Constructor
+     *
+     */
+    public function __construct()
+    {
+        ;
+    }
+
+
+    /**
+     * Get status of last HTTP request.
+     *
+     * @return int as status
+     */
+    public function getStatus()
+    {
+        return $this->status;
+    }
+
+
+
+    /**
+     * Get JSON details for cache item.
+     *
+     * @return array with json details on cache.
+     */
+    public function getDetails()
+    {
+        return $this->cache;
+    }
+
+
+
+    /**
+     * Set the path to the cache directory.
+     *
+     * @param boolean $use true to use the cache and false to ignore cache.
+     *
+     * @return $this
+     */
+    public function setCache($path)
+    {
+        $this->saveFolder = $path;
+        return $this;
+    }
+
+
+
+    /**
+     * Check if cache is writable or throw exception.
+     *
+     * @return $this
+     *
+     * @throws Exception if cahce folder is not writable.
+     */
+    public function isCacheWritable()
+    {
+        if (!is_writable($this->saveFolder)) {
+            throw new Exception("Cache folder is not writable for downloaded files.");
+        }
+        return $this;
+    }
+
+
+
+    /**
+     * Decide if the cache should be used or not before trying to download
+     * a remote file.
+     *
+     * @param boolean $use true to use the cache and false to ignore cache.
+     *
+     * @return $this
+     */
+    public function useCache($use = true)
+    {
+        $this->useCache = $use;
+        return $this;
+    }
+
+
+
+    /**
+     * Translate a content type to a file extension.
+     *
+     * @param string $type a valid content type.
+     *
+     * @return string as file extension or false if no match.
+     */
+    function contentTypeToFileExtension($type) {
+        $extension = array(
+            'image/jpeg' => 'jpg',
+            'image/png'  => 'png',
+            'image/gif'  => 'gif',
+        );
+
+        return isset($extension[$type])
+        ? $extension[$type]
+        : false;
+    }
+
+
+
+    /**
+     * Set header fields.
+     *
+     * @return $this
+     */
+    function setHeaderFields() {
+        $this->http->setHeader("User-Agent", "CImage/0.6 (PHP/". phpversion() . " cURL)");
+        $this->http->setHeader("Accept", "image/jpeg,image/png,image/gif");
+
+        if ($this->useCache) {
+            $this->http->setHeader("Cache-Control", "max-age=0");
+        } else {
+            $this->http->setHeader("Cache-Control", "no-cache");
+            $this->http->setHeader("Pragma", "no-cache");
+        }
+    }
+
+
+
+    /**
+     * Save downloaded resource to cache.
+     *
+     * @return string as path to saved file or false if not saved.
+     */
+    function save() {
+
+        $this->cache = array();
+        $date         = $this->http->getDate(time());
+        $maxAge       = $this->http->getMaxAge($this->defaultMaxAge);
+        $lastModified = $this->http->getLastModified();
+        $type         = $this->http->getContentType();
+        $extension    = $this->contentTypeToFileExtension($type);
+
+        $this->cache['Date']           = gmdate("D, d M Y H:i:s T", $date);
+        $this->cache['Max-Age']        = $maxAge;
+        $this->cache['Content-Type']   = $type;
+        $this->cache['File-Extension'] = $extension;
+
+        if ($lastModified) {
+            $this->cache['Last-Modified'] = gmdate("D, d M Y H:i:s T", $lastModified);
+        }
+
+        if ($extension) {
+
+            $this->fileImage = $this->fileName . "." . $extension;
+
+            // Save only if body is a valid image
+            $body = $this->http->getBody();
+            $img = imagecreatefromstring($body);
+
+            if ($img !== false) {
+                file_put_contents($this->fileImage, $body);
+                file_put_contents($this->fileJson, json_encode($this->cache));
+                return $this->fileImage;
+            }
+        }
+
+        return false;
+    }
+
+
+
+    /**
+     * Got a 304 and updates cache with new age.
+     *
+     * @return string as path to cached file.
+     */
+    function updateCacheDetails() {
+
+        $date         = $this->http->getDate(time());
+        $maxAge       = $this->http->getMaxAge($this->defaultMaxAge);
+        $lastModified = $this->http->getLastModified();
+
+        $this->cache['Date']     = gmdate("D, d M Y H:i:s T", $date);
+        $this->cache['Max-Age']  = $maxAge;
+
+        if ($lastModified) {
+            $this->cache['Last-Modified'] = gmdate("D, d M Y H:i:s T", $lastModified);
+        }
+
+        file_put_contents($this->fileJson, json_encode($this->cache));
+        return $this->fileImage;
+    }
+
+
+
+    /**
+     * Download a remote file and keep a cache of downloaded files.
+     *
+     * @param string $url a remote url.
+     *
+     * @return string as path to downloaded file or false if failed.
+     */
+    function download($url) {
+
+        $this->http = new CHttpGet();
+        $this->url = $url;
+
+        // First check if the cache is valid and can be used
+        $this->loadCacheDetails();
+
+        if ($this->useCache) {
+            $src = $this->getCachedSource();
+            if ($src) {
+                $this->status = 1;
+                return $src;
+            }
+        }
+
+        // Do a HTTP request to download item
+        $this->setHeaderFields();
+        $this->http->setUrl($this->url);
+        $this->http->doGet();
+
+        $this->status = $this->http->getStatus();
+        if ($this->status === 200) {
+            $this->isCacheWritable();
+            return $this->save();
+        } else if ($this->status === 304) {
+            $this->isCacheWritable();
+            return $this->updateCacheDetails();
+        }
+
+        return false;
+    }
+
+
+
+    /**
+     * Get the path to the cached image file if the cache is valid.
+     *
+     * @return $this
+     */
+    public function loadCacheDetails()
+    {
+        $cacheFile = str_replace(array("/", ":", "#", ".", "?"), "-", $this->url);
+        $this->fileName = $this->saveFolder . $cacheFile;
+        $this->fileJson = $this->fileName . ".json";
+        if (is_readable($this->fileJson)) {
+            $this->cache = json_decode(file_get_contents($this->fileJson), true);
+        }
+    }
+
+
+
+    /**
+     * Get the path to the cached image file if the cache is valid.
+     *
+     * @return string as the path ot the image file or false if no cache.
+     */
+    public function getCachedSource()
+    {
+        $this->fileImage = $this->fileName . "." . $this->cache['File-Extension'];
+        $imageExists = is_readable($this->fileImage);
+
+        // Is cache valid?
+        $date   = strtotime($this->cache['Date']);
+        $maxAge = $this->cache['Max-Age'];
+        $now = time();
+        if ($imageExists && $date + $maxAge > $now) {
+            return $this->fileImage;
+        }
+
+        // Prepare for a 304 if available
+        if ($imageExists && isset($this->cache['Last-Modified'])) {
+            $this->http->setHeader("If-Modified-Since", $this->cache['Last-Modified']);
+        }
+
+        return false;
+    }
+}

README.md

@@ -275,155 +275,7 @@ http://dbwebb.se/opensource/cimage
 
 
 
-Revision history
--------------------------------------
-
-
-v0.6.1 (2015-01-08)
-
-* Adding compare-page for comparing images. Issue #20.
-* Added option `no-upscale, nu` as resizing strategy to decline upscaling of smaller images. Fix #61.
-* Minor change in `CImage::resize()`, crop now does imagecopy without resamling.
-* Correcting internal details for save-as and response json which indicated wrong colors. Fix #62.
-* Fixed fill-to-fit that failed when using aspect-ratio. Fix #52.
-* JSON returns correct values for resulting image. Fix #58.
-* Corrected behaviour for skip-original. Fix #60.
-
-
-v0.6 (2014-12-06)
-
-* Rewrote and added documentation.
-* Moved conolution expressesion from `img_config.php` to `CImage`.
-* Minor cleaning of properties in `CImage`. Fix #23.
-* Adding `webroot/htaccess` to show off how friendly urls can be created for `img.php`. Fix #45.
-* Added option `fill-to-fit, ff`. Fix #38.
-* Added option `shortcut, sc` to enable configuration of complex expressions. Fix #2.
-* Added support for custom convolutions. Fix #49.
-* Restructured testprograms. Fix #41.
-* Corrected json on PHP 5.3. Fix #42.
-* Improving template for tests in `webroot/tests` when testing out #40.
-* Adding testcase for #40.
-* Adding option `convolve` taking comma-separated list of 11 float-values, wraps and exposes `imageconvoluttion()`. #4 
-* Adding option `dpr, device-pixel-ratio` which defaults to 1. Set to 2 to get a twice as large image. Useful for Retina displays. Basically a shortcut to enlarge the image.
-* Adding utility `cache.bash` to ease gathering stats on cache usage. #21
-* Cache-directory can now be readonly and serve all cached files, still failing when need to save files. #5
-* Cache now uses same file extension as original image #37. 
-* Can output image as json format using `json` #11.
-
-
-v0.5.3 (2014-11-21)
-
-* Support filenames of uppercase JPEG, JPG, PNG and GIF, as proposed in #37.
-* Changing `CImage::output()` as proposed in #37.
-* Adding security check that image filename is always below the path `image_path` as specified in `img_config.php` #37.
-* Adding configuration item in `img_config.php` for setting valid characters in image filename.
-* Moving `webroot/test*` into directory `webroot/test`.
-* `webroot/check_system.php` now outputs if extension for exif is loaded.
-* Broke API when `initDimensions()` split into two methods, new `initDimensions()` and `loadImageDetails()`.
-* Added `autoRotate, aro` to auto rotate image based on EXIF information.
-* Added `bgColor, bgc` to use as backgroundcolor when needing a filler color, for example rotate 45.
-* Added `rotateBefore, rb` to rotate image a certain angle before processing.
-* Added `rotateAfter, ra` to rotate image a certain angle after processing.
-* Cleaned up code formatting, removed trailing spaces.
-* Removed @ from opening images, better to display correct warning when failing #34, but put it back again.
-* Setting gd.jpeg_ignore_warning to true as default #34.
-* `webroot/check_system.php` now outputs version of PHP and GD.
-* #32 correctly send 404 header when serving an error message.
-* Trying to verify issue #29, but can not.
-* Adding structure for testprograms together with, use `webroot/test_issue29.php` as sample.
-* Improving code formatting.
-* Moving parts of verbose output from img.php to CImage.php.
-
-
-v0.5.2 (2014-04-01)
-
-* Correcting issue #26 providing error message when not using postprocessing.
-* Correcting issue #27 warning of default timezone.
-* Removed default $config options in `img.php`, was not used, all configuration should be in `img_config.php`.
-* Verified known bug - sharpen acts as blur in PHP 5.5.9 and 5.5.10 #28
-
-
-v0.5.1 (2014-02-12)
-
-* Display image in README-file.
-* Create an empty `cache` directory as part of repo.
-
-
-v0.5 (2014-02-12)
-
-* Change constant name `CImage::PNG_QUALITY_DEFAULT` to `CImage::PNG_COMPRESSION_DEFAULT`.
-* Split JPEG quality and PNG compression, `CImage->quality` and `CImage->compression`
-* Changed `img.php` parameter name `d, deflate` to `co, compress`.
-* Separating configuration issues from `img.php` to `img_config.php`.
-* Format code according to PSR-2.
-* Disabled post-processing JPEG and PNG as default.
-* This version is supporting PHP 5.3, later versions will require 5.5 or later.
-* Using GitHub issue tracking for feature requests and planning.
-* Rewrote [the manual](http://dbwebb.se/opensource/cimage).
-* Created directory `webroot` and moved some files there.
-
-
-v0.4.1 (2014-01-27)
-
-* Changed => to == on Modified-Since.
-* Always send Last-Modified-Header.
-* Added `htmlentities()` to verbose output.
-* Fixed support for jpeg, not only jpg.
-* Fixed crop whole image by setting crop=0,0,0,0
-* Use negative values for crop width & height to base calulation on original width/height and withdraw selected amount.
-* Correcting jpeg when setting quality.
-* Removed obsolete reference to `$newName` in `CImage::__construct()` (issue 1). 
-
-
-v0.4 (2013-10-08)
-
-* Improved support for pre-defined sizes.
-* Adding grid column size as predefined size, c1-c24 for a 24 column grid. Configure in `img.php`.
-* Corrected error on naming cache-files using subdir.
-* Corrected calculation error on width & height for crop-to-fit.
-* Adding effects for sharpen, emboss and blur through imageconvolution using matrixes.
-* crop-to-fit, add parameter for offset x and y to enable to define which area is the, implemented as area.
-* Support for resizing opaque images.
-* Center of the image from which the crop is done. Improved usage of area to crop.
-* Added support for % in width & height.
-* Added aspect-ratio.
-* Added scale.
-* Quality for PNG images is now knows as deflate.
-* Added palette to create images with max 256 colors.
-* Added usage of all parameters to README.md
-* Added documentation here http://dbwebb.se/opensource/cimage
-* Adding `.gitignore`
-* Re-adding `cache` directory
-
-
-v0.3 (2012-10-02)
-
-* Added crop. Can crop a area (`width`, `height`, `start_x`, `start_y`) from the original
-image.
-* Corrected to make the 304 Not Modified header work.
-* Predefined sizes can be configured for width in `img.php`.
-* Corrected to make crop work with width or height in combination with crop-to-fit.
-
- 
-v0.2 (2012-05-09) 
-
-* Implemented filters as in http://php.net/manual/en/function.imagefilter.php
-* Changed `crop` to `crop_to_fit`, works the same way.
-* Changed arguments and sends them in array.
-* Added quality-setting.
-* Added testcases for above.
-
-
-v0.1.1 (2012-04-27) 
-
-* Corrected calculation where both width and height were set.
-
-
-v0.1 (2012-04-25) 
-
-* Initial release after rewriting some older code doing the same, but not that good and flexible.
-
-<pre>
+```
  .
-..:  Copyright 2012-2014 by Mikael Roos (me@mikaelroos.se)
-</pre>
+..:  Copyright 2012-2015 by Mikael Roos (me@mikaelroos.se)
+```

REVISION.md

@@ -0,0 +1,185 @@
+Revision history
+=====================================
+
+
+v0.7.0-rc.1 (2015-02-10)
+-------------------------------------
+
+* Always use password, setting in img_config.php, fix #78.
+* Resize gif keeping transparency #81.
+* Now returns statuscode 500 when something fails #55.
+* Three different modes: strict, production, development #44.
+* Three files for all-in-one `imgs.php`, `imgp.php`, `imgd.php` #73.
+* Change name of script all-in-one to `webroot/imgs.php` #73.
+* Combine all code into one singel script, `webroot/img_single.php` #73.
+* Disallow hotlinking/leeching by configuration #46.
+* Alias-name is without extension #47.
+* Option `alias` now requires `password` to work #47.
+* Support for option `password, pwd` to protect usage of `alias` and remote download.
+* Added support for option `alias` that creates a link to a cached version  of the image #47.
+* Create cache directory for remote download if it does not exists.
+* Cleaned up `img_config.php` and introduced default values for almost all options #72.
+
+
+v0.6.2 (2015-01-14)
+-------------------------------------
+
+* Added support for download of remote images #43.
+* Added autoloader.
+
+
+v0.6.1 (2015-01-08)
+-------------------------------------
+
+* Adding compare-page for comparing images. Issue #20.
+* Added option `no-upscale, nu` as resizing strategy to decline upscaling of smaller images. Fix #61.
+* Minor change in `CImage::resize()`, crop now does imagecopy without resamling.
+* Correcting internal details for save-as and response json which indicated wrong colors. Fix #62.
+* Fixed fill-to-fit that failed when using aspect-ratio. Fix #52.
+* JSON returns correct values for resulting image. Fix #58.
+* Corrected behaviour for skip-original. Fix #60.
+
+
+v0.6 (2014-12-06)
+-------------------------------------
+
+* Rewrote and added documentation.
+* Moved conolution expressesion from `img_config.php` to `CImage`.
+* Minor cleaning of properties in `CImage`. Fix #23.
+* Adding `webroot/htaccess` to show off how friendly urls can be created for `img.php`. Fix #45.
+* Added option `fill-to-fit, ff`. Fix #38.
+* Added option `shortcut, sc` to enable configuration of complex expressions. Fix #2.
+* Added support for custom convolutions. Fix #49.
+* Restructured testprograms. Fix #41.
+* Corrected json on PHP 5.3. Fix #42.
+* Improving template for tests in `webroot/tests` when testing out #40.
+* Adding testcase for #40.
+* Adding option `convolve` taking comma-separated list of 11 float-values, wraps and exposes `imageconvoluttion()`. #4
+* Adding option `dpr, device-pixel-ratio` which defaults to 1. Set to 2 to get a twice as large image. Useful for Retina displays. Basically a shortcut to enlarge the image.
+* Adding utility `cache.bash` to ease gathering stats on cache usage. #21
+* Cache-directory can now be readonly and serve all cached files, still failing when need to save files. #5
+* Cache now uses same file extension as original image #37.
+* Can output image as json format using `json` #11.
+
+
+v0.5.3 (2014-11-21)
+-------------------------------------
+
+* Support filenames of uppercase JPEG, JPG, PNG and GIF, as proposed in #37.
+* Changing `CImage::output()` as proposed in #37.
+* Adding security check that image filename is always below the path `image_path` as specified in `img_config.php` #37.
+* Adding configuration item in `img_config.php` for setting valid characters in image filename.
+* Moving `webroot/test*` into directory `webroot/test`.
+* `webroot/check_system.php` now outputs if extension for exif is loaded.
+* Broke API when `initDimensions()` split into two methods, new `initDimensions()` and `loadImageDetails()`.
+* Added `autoRotate, aro` to auto rotate image based on EXIF information.
+* Added `bgColor, bgc` to use as backgroundcolor when needing a filler color, for example rotate 45.
+* Added `rotateBefore, rb` to rotate image a certain angle before processing.
+* Added `rotateAfter, ra` to rotate image a certain angle after processing.
+* Cleaned up code formatting, removed trailing spaces.
+* Removed @ from opening images, better to display correct warning when failing #34, but put it back again.
+* Setting gd.jpeg_ignore_warning to true as default #34.
+* `webroot/check_system.php` now outputs version of PHP and GD.
+* #32 correctly send 404 header when serving an error message.
+* Trying to verify issue #29, but can not.
+* Adding structure for testprograms together with, use `webroot/test_issue29.php` as sample.
+* Improving code formatting.
+* Moving parts of verbose output from img.php to CImage.php.
+
+
+v0.5.2 (2014-04-01)
+-------------------------------------
+
+* Correcting issue #26 providing error message when not using postprocessing.
+* Correcting issue #27 warning of default timezone.
+* Removed default $config options in `img.php`, was not used, all configuration should be in `img_config.php`.
+* Verified known bug - sharpen acts as blur in PHP 5.5.9 and 5.5.10 #28
+
+
+v0.5.1 (2014-02-12)
+-------------------------------------
+
+* Display image in README-file.
+* Create an empty `cache` directory as part of repo.
+
+
+v0.5 (2014-02-12)
+-------------------------------------
+
+* Change constant name `CImage::PNG_QUALITY_DEFAULT` to `CImage::PNG_COMPRESSION_DEFAULT`.
+* Split JPEG quality and PNG compression, `CImage->quality` and `CImage->compression`
+* Changed `img.php` parameter name `d, deflate` to `co, compress`.
+* Separating configuration issues from `img.php` to `img_config.php`.
+* Format code according to PSR-2.
+* Disabled post-processing JPEG and PNG as default.
+* This version is supporting PHP 5.3, later versions will require 5.5 or later.
+* Using GitHub issue tracking for feature requests and planning.
+* Rewrote [the manual](http://dbwebb.se/opensource/cimage).
+* Created directory `webroot` and moved some files there.
+
+
+v0.4.1 (2014-01-27)
+-------------------------------------
+
+* Changed => to == on Modified-Since.
+* Always send Last-Modified-Header.
+* Added `htmlentities()` to verbose output.
+* Fixed support for jpeg, not only jpg.
+* Fixed crop whole image by setting crop=0,0,0,0
+* Use negative values for crop width & height to base calulation on original width/height and withdraw selected amount.
+* Correcting jpeg when setting quality.
+* Removed obsolete reference to `$newName` in `CImage::__construct()` (issue 1).
+
+
+v0.4 (2013-10-08)
+-------------------------------------
+
+* Improved support for pre-defined sizes.
+* Adding grid column size as predefined size, c1-c24 for a 24 column grid. Configure in `img.php`.
+* Corrected error on naming cache-files using subdir.
+* Corrected calculation error on width & height for crop-to-fit.
+* Adding effects for sharpen, emboss and blur through imageconvolution using matrixes.
+* crop-to-fit, add parameter for offset x and y to enable to define which area is the, implemented as area.
+* Support for resizing opaque images.
+* Center of the image from which the crop is done. Improved usage of area to crop.
+* Added support for % in width & height.
+* Added aspect-ratio.
+* Added scale.
+* Quality for PNG images is now knows as deflate.
+* Added palette to create images with max 256 colors.
+* Added usage of all parameters to README.md
+* Added documentation here http://dbwebb.se/opensource/cimage
+* Adding `.gitignore`
+* Re-adding `cache` directory
+
+
+v0.3 (2012-10-02)
+-------------------------------------
+
+* Added crop. Can crop a area (`width`, `height`, `start_x`, `start_y`) from the original
+image.
+* Corrected to make the 304 Not Modified header work.
+* Predefined sizes can be configured for width in `img.php`.
+* Corrected to make crop work with width or height in combination with crop-to-fit.
+
+
+v0.2 (2012-05-09)
+-------------------------------------
+
+* Implemented filters as in http://php.net/manual/en/function.imagefilter.php
+* Changed `crop` to `crop_to_fit`, works the same way.
+* Changed arguments and sends them in array.
+* Added quality-setting.
+* Added testcases for above.
+
+
+v0.1.1 (2012-04-27)
+-------------------------------------
+
+* Corrected calculation where both width and height were set.
+
+
+v0.1 (2012-04-25)
+-------------------------------------
+
+* Initial release after rewriting some older code doing the same, but not that good and flexible.

autoload.php

@@ -0,0 +1,23 @@
+<?php
+/**
+ * Autoloader for CImage and related class files.
+ *
+ */
+//include __DIR__ . "/../CHttpGet.php";
+//include __DIR__ . "/../CRemoteImage.php";
+//include __DIR__ . "/../CImage.php";
+
+/**
+ * Autoloader for classes.
+ *
+ * @param string $class the fully-qualified class name.
+ *
+ * @return void
+ */
+spl_autoload_register(function ($class) {
+    //$path = CIMAGE_SOURCE_PATH . "/{$class}.php";
+    $path = __DIR__ . "/{$class}.php";
+    if(is_file($path)) {
+        require($path);
+    }
+});

create-img-single.bash

@@ -0,0 +1,74 @@
+#!/bin/bash
+
+#
+# Paths and settings
+#
+TARGET_D="webroot/imgd.php"
+TARGET_P="webroot/imgp.php"
+TARGET_S="webroot/imgs.php"
+NEWLINES="\n\n\n"
+
+
+
+#
+# Specify the utilities used
+#
+ECHO="printf"
+
+
+
+#
+# Main, start by checking basic usage
+#
+if [ $# -gt 0 ]
+then
+    $ECHO "Usage: $0\n"
+    exit 1
+fi
+
+
+
+#
+# Print out details on cache-directory
+#
+$ECHO "Creating '$TARGET_D', '$TARGET_P' and '$TARGET_S' by combining the following files:"
+$ECHO "\n"
+$ECHO "\n webroot/img_header.php"
+$ECHO "\n CHttpGet.php"
+$ECHO "\n CRemoteImage.php"
+$ECHO "\n CImage.php"
+$ECHO "\n webroot/img.php"
+$ECHO "\n"
+$ECHO "\n'$TARGET_D' is for development mode."
+$ECHO "\n'$TARGET_P' is for production mode (default mode)."
+$ECHO "\n'$TARGET_S' is for strict mode."
+$ECHO "\n"
+
+$ECHO "\nPress enter to continue. "
+read answer
+
+
+#
+# Create the $TARGET_? files
+#
+cat webroot/img_header.php > $TARGET_P
+cat webroot/img_header.php | sed "s|//'mode'         => 'production',|'mode'         => 'development',|" > $TARGET_D
+cat webroot/img_header.php | sed "s|//'mode'         => 'production',|'mode'         => 'development',|" > $TARGET_S
+
+$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
+
+tail -n +2 CRemoteImage.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 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 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
+
+$ECHO "\nDone."
+$ECHO "\n"
+$ECHO "\n"

webroot/img.php

@@ -1,9 +1,15 @@
 <?php
 /**
- * Resize images on the fly using CImage, configuration is made in file named.
+ * Resize and crop images on the fly, store generated images in a cache.
+ *
+ * @author  Mikael Roos mos@dbwebb.se
+ * @example http://dbwebb.se/opensource/cimage
+ * @link    https://github.com/mosbth/cimage
  *
  */
 
+$version = "v0.7.0-rc.1 (2015-02-10)";
+
 
 
 /**
@@ -15,8 +21,16 @@
  */
 function errorPage($msg)
 {
-    header("HTTP/1.0 404 Not Found");
-    die('img.php say 404: ' . $msg);
+    global $mode;
+
+    header("HTTP/1.0 500 Internal Server Error");
+
+    if ($mode == 'development') {
+        die("[img.php] $msg");
+    } else {
+        error_log("[img.php] $msg");
+        die("HTTP/1.0 500 Internal Server Error");
+    }
 }
 
 
@@ -70,6 +84,24 @@ function getDefined($key, $defined, $undefined)
 
 
 
+/**
+ * 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.
  *
@@ -96,20 +128,78 @@ function verbose($msg = null)
 
 
 /**
- * Get configuration options from file.
+ * Get configuration options from file, if the file exists, else use $config
+ * if its defined or create an empty $config.
  */
 $configFile = __DIR__.'/'.basename(__FILE__, '.php').'_config.php';
-$config = require $configFile;
 
-call_user_func($config['error_reporting']);
+if (is_file($configFile)) {
+    $config = require $configFile;
+} else if (!isset($config)) {
+    $config = array();
+}
+
+
+
+/**
+* verbose, v - do a verbose dump of what happens
+*/
+$verbose = getDefined(array('verbose', 'v'), true, false);
+verbose("img.php version = $version");
+
+
+
+/**
+ * Set mode as strict, production or development.
+ * Default is production environment.
+ */
+$mode = getConfig('mode', 'production');
+
+// Settings for any mode
+set_time_limit(20);
+ini_set('gd.jpeg_ignore_warning', 1);
+
+if (!extension_loaded('gd')) {
+    errorPage("Extension gd is nod loaded.");
+}
+
+// Specific settings for each mode
+if ($mode == 'strict') {
+
+    error_reporting(0);
+    ini_set('display_errors', 0);
+    ini_set('log_errors', 1);
+    $verbose = false;
+
+} else if ($mode == 'production') {
+
+    error_reporting(-1);
+    ini_set('display_errors', 0);
+    ini_set('log_errors', 1);
+    $verbose = false;
+
+} else if ($mode == 'development') {
+
+    error_reporting(-1);
+    ini_set('display_errors', 1);
+    ini_set('log_errors', 0);
+
+} else {
+    errorPage("Unknown mode: $mode");
+}
+
+verbose("mode = $mode");
+verbose("error log = " . ini_get('error_log'));
 
 
 
 /**
  * Set default timezone if not set or if its set in the config-file.
  */
-if (isset($config['default_timezone'])) {
-    date_default_timezone_set($config['default_timezone']);
+$defaultTimezone = getConfig('default_timezone', null);
+
+if ($defaultTimezone) {
+    date_default_timezone_set($defaultTimezone);
 } else if (!ini_get('default_timezone')) {
     date_default_timezone_set('UTC');
 }
@@ -117,36 +207,128 @@ if (isset($config['default_timezone'])) {
 
 
 /**
- * verbose, v - do a verbose dump of what happens
+ * Check if passwords are configured, used and match.
+ * Options decide themself if they require passwords to be used.
  */
-$verbose = getDefined(array('verbose', 'v'), true, false);
+$pwdConfig   = getConfig('password', false);
+$pwdAlways   = getConfig('password_always', false);
+$pwd         = get(array('password', 'pwd'), null);
+
+// Check if passwords match, if configured to use passwords
+$passwordMatch = null;
+if ($pwdAlways) {
+
+    $passwordMatch = ($pwdConfig === $pwd);
+    if (!$passwordMatch) {
+        errorPage("Password required and does not match or exists.");
+    }
+
+} elseif ($pwdConfig && $pwd) {
+
+    $passwordMatch = ($pwdConfig === $pwd);
+}
+
+verbose("password match = $passwordMatch");
+
+
+
+/**
+ * Prevent hotlinking, leeching, of images by controlling who access them
+ * from where.
+ *
+ */
+$allowHotlinking = getConfig('allow_hotlinking', true);
+$hotlinkingWhitelist = getConfig('hotlinking_whitelist', array());
+
+$serverName  = isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : null;
+$referer     = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : null;
+$refererHost = parse_url($referer, PHP_URL_HOST);
+
+if (!$allowHotlinking) {
+    if ($passwordMatch) {
+        ; // Always allow when password match
+    } else if ($passwordMatch === false) {
+        errorPage("Hotlinking/leeching not allowed when password missmatch.");
+    } else if (!$referer) {
+        errorPage("Hotlinking/leeching not allowed and referer is missing.");
+    } else if (strcmp($serverName, $refererHost) == 0) {
+        ; // Allow when serverName matches refererHost
+    } else if (!empty($hotlinkingWhitelist)) {
+
+        $allowedByWhitelist = false;
+        foreach ($hotlinkingWhitelist as $val) {
+            if (preg_match($val, $refererHost)) {
+                $allowedByWhitelist = true;
+            }
+        }
+
+        if (!$allowedByWhitelist) {
+            errorPage("Hotlinking/leeching not allowed by whitelist.");
+        }
+
+    } else {
+        errorPage("Hotlinking/leeching not allowed.");
+    }
+}
+
+verbose("allow_hotlinking = $allowHotlinking");
+verbose("referer = $referer");
+verbose("referer host = $refererHost");
+
+
+
+/**
+ * Get the source files.
+ */
+$autoloader  = getConfig('autoloader', false);
+$cimageClass = getConfig('cimage_class', false);
+
+if ($autoloader) {
+    require $autoloader;
+} else if ($cimageClass) {
+    require $cimageClass;
+}
 
 
 
 /**
  * Create the class for the image.
  */
-require $config['cimage_class'];
-
 $img = new CImage();
 $img->setVerbose($verbose);
 
 
 
+/**
+ * Allow or disallow remote download of images from other servers.
+ * Passwords apply if used.
+ *
+ */
+$allowRemote = getConfig('remote_allow', false);
+
+if ($allowRemote && $passwordMatch !== false) {
+    $pattern = getConfig('remote_pattern', null);
+    $img->setRemoteDownload($allowRemote, $pattern);
+}
+
+
+
 /**
  * shortcut, sc - extend arguments with a constant value, defined
  * in config-file.
  */
 $shortcut       = get(array('shortcut', 'sc'), null);
+$shortcutConfig = getConfig('shortcut', array(
+    'sepia' => "&f=grayscale&f0=brightness,-10&f1=contrast,-20&f2=colorize,120,60,0,0&sharpen",
+));
 
 verbose("shortcut = $shortcut");
 
 if (isset($shortcut)
-    && isset($config['shortcut'])
-    && isset($config['shortcut'][$shortcut])) {
+    && isset($shortcutConfig[$shortcut])) {
 
-    parse_str($config['shortcut'][$shortcut], $get);
-    verbose("shortcut-constant = {$config['shortcut'][$shortcut]}");
+    parse_str($shortcutConfig[$shortcut], $get);
+    verbose("shortcut-constant = {$shortcutConfig[$shortcut]}");
     $_GET = array_merge($_GET, $get);
 }
 
@@ -158,17 +340,23 @@ if (isset($shortcut)
 $srcImage = get('src')
     or errorPage('Must set src-attribute.');
 
-
 // Check for valid/invalid characters
-preg_match($config['valid_filename'], $srcImage)
+$imagePath           = getConfig('image_path', __DIR__ . '/img/');
+$imagePathConstraint = getConfig('image_path_constraint', true);
+$validFilename       = getConfig('valid_filename', '#^[a-z0-9A-Z-/_\.:]+$#');
+
+preg_match($validFilename, $srcImage)
     or errorPage('Filename contains invalid characters.');
 
+if ($allowRemote && $img->isRemoteSource($srcImage)) {
 
-// Check that the image is a file below the directory 'image_path'.
-if ($config['image_path_constraint']) {
+    // If source is a remote file, ignore local file checks.
 
-    $pathToImage = realpath($config['image_path'] . $srcImage);
-    $imageDir    = realpath($config['image_path']);
+} else if ($imagePathConstraint) {
+
+    // Check that the image is a file below the directory 'image_path'.
+    $pathToImage = realpath($imagePath . $srcImage);
+    $imageDir    = realpath($imagePath);
 
     is_file($pathToImage)
         or errorPage(
@@ -183,18 +371,45 @@ if ($config['image_path_constraint']) {
         );
 }
 
-
 verbose("src = $srcImage");
 
 
 
+/**
+ * Manage size constants from config file, use constants to replace values
+ * for width and height.
+ */
+$sizeConstant = getConfig('size_constant', function () {
+
+    // Set sizes to map constant to value, easier to use with width or height
+    $sizes = array(
+        'w1' => 613,
+        'w2' => 630,
+    );
+
+    // Add grid column width, useful for use as predefined size for width (or height).
+    $gridColumnWidth = 30;
+    $gridGutterWidth = 10;
+    $gridColumns     = 24;
+
+    for ($i = 1; $i <= $gridColumns; $i++) {
+        $sizes['c' . $i] = ($gridColumnWidth + $gridGutterWidth) * $i - $gridGutterWidth;
+    }
+
+    return $sizes;
+});
+
+$sizes = call_user_func($sizeConstant);
+
+
+
 /**
  * width, w - set target width, affecting the resulting image width, height and resize options
  */
 $newWidth     = get(array('width', 'w'));
+$maxWidth     = getConfig('max_width', 2000);
 
 // Check to replace predefined size
-$sizes = call_user_func($config['size_constant']);
 if (isset($sizes[$newWidth])) {
     $newWidth = $sizes[$newWidth];
 }
@@ -205,7 +420,7 @@ if ($newWidth[strlen($newWidth)-1] == '%') {
         or errorPage('Width % not numeric.');
 } else {
     is_null($newWidth)
-        or ($newWidth > 10 && $newWidth <= $config['max_width'])
+        or ($newWidth > 10 && $newWidth <= $maxWidth)
         or errorPage('Width out of range.');
 }
 
@@ -217,6 +432,7 @@ verbose("new width = $newWidth");
  * height, h - set target height, affecting the resulting image width, height and resize options
  */
 $newHeight = get(array('height', 'h'));
+$maxHeight = getConfig('max_height', 2000);
 
 // Check to replace predefined size
 if (isset($sizes[$newHeight])) {
@@ -229,7 +445,7 @@ if ($newHeight[strlen($newHeight)-1] == '%') {
         or errorPage('Height % out of range.');
 } else {
     is_null($newHeight)
-        or ($newHeight > 10 && $newHeight <= $config['max_height'])
+        or ($newHeight > 10 && $newHeight <= $maxHeight)
         or errorPage('Hight out of range.');
 }
 
@@ -241,9 +457,20 @@ verbose("new height = $newHeight");
  * aspect-ratio, ar - affecting the resulting image width, height and resize options
  */
 $aspectRatio         = get(array('aspect-ratio', 'ar'));
+$aspectRatioConstant = getConfig('aspect_ratio_constant', function () {
+    return array(
+        '3:1'    => 3/1,
+        '3:2'    => 3/2,
+        '4:3'    => 4/3,
+        '8:5'    => 8/5,
+        '16:10'  => 16/10,
+        '16:9'   => 16/9,
+        'golden' => 1.618,
+    );
+});
 
 // Check to replace predefined aspect ratio
-$aspectRatios = call_user_func($config['aspect_ratio_constant']);
+$aspectRatios = call_user_func($aspectRatioConstant);
 $negateAspectRatio = ($aspectRatio[0] == '!') ? true : false;
 $aspectRatio = $negateAspectRatio ? substr($aspectRatio, 1) : $aspectRatio;
 
@@ -275,9 +502,11 @@ verbose("crop to fit = $cropToFit");
 /**
  * Set default background color from config file.
  */
-if (isset($config['background_color'])) {
-    $img->setDefaultBackgroundColor($config['background_color']);
-    verbose("Using default background_color = {$config['background_color']}");
+$backgroundColor = getConfig('background_color', null);
+
+if ($backgroundColor) {
+    $img->setDefaultBackgroundColor($backgroundColor);
+    verbose("Using default background_color = $backgroundColor");
 }
 
 
@@ -518,11 +747,12 @@ verbose("dpr = $dpr");
  * convolve - image convolution as in http://php.net/manual/en/function.imageconvolution.php
  */
 $convolve = get('convolve', null);
+$convolutionConstant = getConfig('convolution_constant', array());
 
 // Check if the convolve is matching an existing constant
-if ($convolve && isset($config['convolution_constant'])) {
-    $img->addConvolveExpressions($config['convolution_constant']);
-    verbose("convolve constant = " . print_r($config['convolution_constant'], 1));
+if ($convolve && isset($convolutionConstant)) {
+    $img->addConvolveExpressions($convolutionConstant);
+    verbose("convolve constant = " . print_r($convolutionConstant, 1));
 }
 
 verbose("convolve = " . print_r($convolve, 1));
@@ -538,6 +768,50 @@ verbose("upscale = $upscale");
 
 
 
+/**
+ * Get details for post processing
+ */
+$postProcessing = getConfig('postprocessing', array(
+    'png_filter'        => false,
+    'png_filter_cmd'    => '/usr/local/bin/optipng -q',
+
+    'png_deflate'       => false,
+    'png_deflate_cmd'   => '/usr/local/bin/pngout -q',
+
+    'jpeg_optimize'     => false,
+    'jpeg_optimize_cmd' => '/usr/local/bin/jpegtran -copy none -optimize',
+));
+
+
+
+/**
+ * alias - Save resulting image to another alias name.
+ * Password always apply, must be defined.
+ */
+$alias          = get('alias', null);
+$aliasPath      = getConfig('alias_path', null);
+$validAliasname = getConfig('valid_aliasname', '#^[a-z0-9A-Z-_]+$#');
+$aliasTarget    = null;
+
+if ($alias && $aliasPath && $passwordMatch) {
+
+    $aliasTarget = $aliasPath . $alias;
+    $useCache    = false;
+
+    is_writable($aliasPath)
+        or errorPage("Directory for alias is not writable.");
+
+    preg_match($validAliasname, $alias)
+        or errorPage('Filename for alias contains invalid characters. Do not add extension.');
+
+} else if ($alias) {
+    errorPage('Alias is not enabled in the config file or password not matching.');
+}
+
+verbose("alias = $alias");
+
+
+
 /**
  * Display image if verbose mode
  */
@@ -570,11 +844,20 @@ EOD;
 
 
 
+/**
+ * Get the cachepath from config.
+ */
+$cachePath = getConfig('cache_path', __DIR__ . '/../cache/');
+
+
+
 /**
  * Load, process and output the image
  */
 $img->log("Incoming arguments: " . print_r(verbose(), 1))
-    ->setSource($srcImage, $config['image_path'])
+    ->setSaveFolder($cachePath)
+    ->useCache($useCache)
+    ->setSource($srcImage, $imagePath)
     ->setOptions(
         array(
             // Options for calculate dimensions
@@ -617,12 +900,13 @@ $img->log("Incoming arguments: " . print_r(verbose(), 1))
     ->setJpegQuality($quality)
     ->setPngCompression($compress)
     ->useOriginalIfPossible($useOriginal)
-    ->generateFilename($config['cache_path'])
+    ->generateFilename($cachePath)
     ->useCacheIfPossible($useCache)
     ->load()
     ->preResize()
     ->resize()
     ->postResize()
-    ->setPostProcessingOptions($config['postprocessing'])
+    ->setPostProcessingOptions($postProcessing)
     ->save()
+    ->linkToCacheFile($aliasTarget)
     ->output();

webroot/img_config.php

@@ -8,12 +8,80 @@
 return array(
 
     /**
-     * Paths, where are all the stuff I should use? 
-     * Append ending slash on directories.
+     * Set mode as 'strict', 'production' or 'development'.
+     *
+     * Default values:
+     *  mode: 'production'
+     */
+    'mode' => 'development',
+    //'mode' => 'production', // 'development', 'strict'
+
+
+
+    /**
+     * Where are the sources for the classfiles.
+     *
+     * Default values:
+     *  autoloader:  null     // used from v0.6.2
+     *  cimage_class: null    // used until v0.6.1
+     */
+    'autoloader'   =>  __DIR__ . '/../autoload.php',
+    //'cimage_class' =>  __DIR__ . '/../CImage.php',
+
+
+
+    /**
+     * Paths, where are the images stored and where is the cache.
+     * End all paths with a slash.
+     *
+     * Default values:
+     *  image_path: __DIR__ . '/img/'
+     *  cache_path: __DIR__ . '/../cache/'
+     *  alias_path: null
      */
-    'cimage_class' =>  __DIR__ . '/../CImage.php',
     'image_path'   =>  __DIR__ . '/img/',
     'cache_path'   =>  __DIR__ . '/../cache/',
+    //'alias_path'   =>  __DIR__ . '/img/alias/',
+
+
+
+    /**
+    * Use password to protect from missusage, send &pwd=... or &password=..
+    * with the request to match the password or set to false to disable.
+    * Passwords are only used together with the options for remote download
+    * and aliasing.
+    *
+    * Default values.
+    *  password:        false // as in do not use password
+    *  password_always: false // do not always require password,
+    */
+    //'password'        => false, // "secret-password",
+    //'password_always' => false, // always require password,
+
+
+
+    /**
+     * Allow or disallow downloading of remote files, images available on
+     * some remote server. Default is to disallow.
+     *
+     * Default values.
+     *  remote_allow:    false
+     *  remote_pattern:  null  // use default values from CImage
+     */
+    //'remote_allow'    => true,
+    //'remote_pattern'  => '#^https?://#',
+
+
+
+    /**
+     * A regexp for validating characters in the image or alias filename.
+     *
+     * Default value:
+     *  valid_filename:  '#^[a-z0-9A-Z-/_\.:]+$#'
+     *  valid_aliasname: '#^[a-z0-9A-Z-_]+$#'
+     */
+     //'valid_filename'  => '#^[a-z0-9A-Z-/_\.:]+$#',
+     //'valid_aliasname' => '#^[a-z0-9A-Z-_]+$#',
 
 
 
@@ -21,21 +89,19 @@ return array(
      * 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.
-     */
-    'image_path_constraint' => true,
-
-
-
-    /**
-     * A regexp for validating characters in the image filename.
-     */
-    'valid_filename' => '#^[a-z0-9A-Z-/_\.]+$#',
-
-
-
-    /**
-     * Set default timezone, it defaults to UTC if not specified.
      *
+     * Default value:
+     *  image_path_constraint: true
+     */
+     //'image_path_constraint' => false,
+
+
+
+     /**
+     * Set default timezone.
+     *
+     * Default values.
+     *  default_timezone: ini_get('default_timezone') or 'UTC'
      */
     //'default_timezone' => 'UTC',
 
@@ -46,9 +112,12 @@ return array(
      * This is basically a security constraint to avoid using resources on creating
      * large (unwanted) images.
      *
+     * Default values.
+     *  max_width:  2000
+     *  max_height: 2000
      */
-    'max_width'     => 2000,
-    'max_height'    => 2000,
+    //'max_width'     => 2000,
+    //'max_height'    => 2000,
 
 
 
@@ -60,6 +129,8 @@ return array(
      * the alpha value is between 00 (opaqe) and 7F (transparent),
      * that is between 00000000-FFFFFF7F.
      *
+     * Default values.
+     *  background_color: As specified by CImage
      */
     //'background_color' => "FFFFFF",
     //'background_color' => "FFFFFF7F",
@@ -69,7 +140,19 @@ return array(
     /**
      * Post processing of images using external tools, set to true or false
      * and set command to be executed.
+     *
+     * Default values.
+     *
+     *  png_filter:        false
+     *  png_filter_cmd:    '/usr/local/bin/optipng -q'
+     *
+     *  png_deflate:       false
+     *  png_deflate_cmd:   '/usr/local/bin/pngout -q'
+     *
+     *  jpeg_optimize:     false
+     *  jpeg_optimize_cmd: '/usr/local/bin/jpegtran -copy none -optimize'
      */
+    /*
     'postprocessing' => array(
         'png_filter'        => false,
         'png_filter_cmd'    => '/usr/local/bin/optipng -q',
@@ -80,26 +163,59 @@ return array(
         'jpeg_optimize'     => false,
         'jpeg_optimize_cmd' => '/usr/local/bin/jpegtran -copy none -optimize',
     ),
+    */
 
 
 
     /**
      * Create custom convolution expressions, matrix 3x3, divisor and
      * offset.
+     *
+     * Default values.
+     *  convolution_constant: array()
      */
+    /*
     'convolution_constant' => array(
         //'sharpen'       => '-1,-1,-1, -1,16,-1, -1,-1,-1, 8, 0',
         //'sharpen-alt'   => '0,-1,0, -1,5,-1, 0,-1,0, 1, 0',
     ),
+    */
+
+
+
+    /**
+     * Prevent leeching of images by controlling who can access them from where.
+     * Default it to allow hotlinking.
+     * Password apply when hotlinking is disallowed, use password to allow.
+     * The whitelist is an array of regexpes for allowed hostnames that can
+     * hotlink images.
+     *
+     * Default values.
+     *  allow_hotlinking:     true
+     *  hotlinking_whitelist: array()
+     */
+     /*
+    'allow_hotlinking' => false,
+    'hotlinking_whitelist' => array(
+        '#^localhost$#',
+        '#^dbwebb\.se$#',
+    ),
+    */
 
 
 
     /**
      * Create custom shortcuts for more advanced expressions.
+     *
+     * Default values.
+     *  shortcut: array(
+     *      'sepia' => "&f=grayscale&f0=brightness,-10&f1=contrast,-20&f2=colorize,120,60,0,0&sharpen",
+     *  )
      */
+     /*
     'shortcut' => array(
         'sepia' => "&f=grayscale&f0=brightness,-10&f1=contrast,-20&f2=colorize,120,60,0,0&sharpen",
-    ),
+    ),*/
 
 
 
@@ -114,7 +230,11 @@ return array(
      *  &width=w1  // results in width=613
      *  &width=c2  // results in spanning two columns with a gutter, 30*2+10=70
      *  &width=c24 // results in spanning whole grid 24*30+((24-1)*10)=950
+     *
+     * Default values.
+     *  size_constant: As specified by the function below.
      */
+    /*
     'size_constant' => function () {
 
         // Set sizes to map constant to value, easier to use with width or height
@@ -133,15 +253,17 @@ return array(
         }
 
         return $sizes;
-    },
+    },*/
 
 
 
     /**
      * Predefined aspect ratios.
      *
+     * Default values.
+     *  aspect_ratio_constant: As the function below.
      */
-    'aspect_ratio_constant' => function () {
+    /*'aspect_ratio_constant' => function () {
         return array(
             '3:1'   => 3/1,
             '3:2'   => 3/2,
@@ -151,20 +273,5 @@ return array(
             '16:9'  => 16/9,
             'golden' => 1.618,
         );
-    },
-
-
-
-    /**
-     * Set error reporting to match development or production environment 
-     */
-    'error_reporting' => function () {
-        error_reporting(-1);              // Report all type of errors
-        ini_set('display_errors', 1);     // Display all errors
-        set_time_limit(20);
-        ini_set('gd.jpeg_ignore_warning', 1); // Ignore warning of corrupt jpegs
-        if (!extension_loaded('gd')) {
-            throw new Exception("Extension gd is nod loaded.");
-        }
-    },
+    },*/
 );

webroot/img_header.php

@@ -0,0 +1,35 @@
+<?php
+/**
+ * Resize and crop images on the fly, store generated images in a cache.
+ *
+ * This version is a all-in-one version of img.php, it is not dependant an any other file
+ * so you can simply copy it to any place you want it. 
+ *
+ * @author  Mikael Roos mos@dbwebb.se
+ * @example http://dbwebb.se/opensource/cimage
+ * @link    https://github.com/mosbth/cimage
+ *
+ */
+
+
+/**
+ * Change configuration details in the array below or create a separate file
+ * where you store the configuration details. 
+ *
+ * The configuration file should be named the same name as this file and then 
+ * add '_config.php'. If this file is named 'img.php' then name the
+ * config file should be named 'img_config.php'.
+ *
+ * The settings below are only a few of the available ones. Check the file in
+ * webroot/img_config.php for a complete list of configuration options.
+ */
+$config = array(
+
+    //'mode'         => 'production',               // 'production', 'development', 'strict'
+    //'image_path'   =>  __DIR__ . '/img/',
+    //'cache_path'   =>  __DIR__ . '/../cache/',
+    //'alias_path'   =>  __DIR__ . '/img/alias/',
+    //'remote_allow' => true,
+    //'password'     => false,                      // "secret-password",
+
+);

webroot/test/test_issue38.php

@@ -17,6 +17,8 @@ $description = "The issue was to implement fill-to-fit, but it needs some flexib
 // Use these images in the test
 $images = array(
     'kodim04.png',
+    'apple_trans.gif',
+    'circle_trans.png',
 );