Fix deprecation notice on "Creation of dynamic property" for PHP 8.2.

Spelling in README
Build to prepare to tag
2025-08-24 16:42:48 +02:00 · 2023-10-27 10:20:16 +02:00 · 2022-11-17 16:13:56 +01:00 · 2022-11-17 16:08:48 +01:00 · 2022-11-17 16:06:25 +01:00 · 2022-11-17 16:05:25 +01:00
39 changed files with 3163 additions and 778 deletions
--- a/CCache.php
+++ b/CCache.php
@@ -51,6 +51,15 @@ class CCache
            return $path;
        }

+        if ($create && defined('WINDOWS2WSL')) {
+            // Special case to solve Windows 2 WSL integration
+            $path = $this->path . "/" . $subdir;
+
+            if (mkdir($path)) {
+                return realpath($path);
+            }
+        }
+
        if ($create && is_writable($this->path)) {
            $path = $this->path . "/" . $subdir;

--- a/CFastTrackCache.php
+++ b/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;
+    }
+}
--- a/CHttpGet.php
+++ b/CHttpGet.php
@@ -215,7 +215,7 @@ class CHttpGet
    {
        $type = isset($this->response['header']['Content-Type'])
            ? $this->response['header']['Content-Type']
-            : null;
+            : '';

        return preg_match('#[a-z]+/[a-z]+#', $type)
            ? $type
--- a/CImage.php
+++ b/CImage.php
@@ -6,6 +6,7 @@
 * @example http://dbwebb.se/opensource/cimage
 * @link    https://github.com/mosbth/cimage
 */
+#[AllowDynamicProperties]
 class CImage
 {

@@ -155,6 +156,13 @@ class CImage



+    /**
+     * Do lossy output using external postprocessing tools.
+     */
+    private $lossy = null;
+
+
+
    /**
     * Verbose mode to print out a trace and display the created image
     */
@@ -190,7 +198,15 @@ class CImage


    /**
-     * Path to command for filter optimize, for example optipng or null.
+     * Path to command for lossy optimize, for example pngquant.
+     */
+    private $pngLossy;
+    private $pngLossyCmd;
+
+
+
+    /**
+     * Path to command for filter optimize, for example optipng.
     */
    private $pngFilter;
    private $pngFilterCmd;
@@ -198,7 +214,7 @@ class CImage


    /**
-     * Path to command for deflate optimize, for example pngout or null.
+     * Path to command for deflate optimize, for example pngout.
     */
    private $pngDeflate;
    private $pngDeflateCmd;
@@ -379,6 +395,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
@@ -402,6 +424,13 @@ class CImage



+    /*
+     * Use interlaced progressive mode for JPEG images.
+     */
+    private $interlace = false;
+
+
+
    /*
     * Image copy strategy, defaults to RESAMPLE.
     */
@@ -446,6 +475,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.
     *
@@ -615,7 +663,7 @@ class CImage
     */
    private function checkFileExtension($extension)
    {
-        $valid = array('jpg', 'jpeg', 'png', 'gif');
+        $valid = array('jpg', 'jpeg', 'png', 'gif', 'webp');

        in_array(strtolower($extension), $valid)
            or $this->raiseError('Not a valid file extension.');
@@ -632,13 +680,13 @@ class CImage
     *
     * @return string $extension as a normalized file extension.
     */
-    private function normalizeFileExtension($extension = null)
+    private function normalizeFileExtension($extension = "")
    {
-        $extension = strtolower($extension ? $extension : $this->extension);
+        $extension = strtolower($extension ? $extension : $this->extension ?? "");

        if ($extension == 'jpeg') {
                $extension = 'jpg';
-            }
+        }

        return $extension;
    }
@@ -798,10 +846,14 @@ class CImage
            'blur'        => null,
            'convolve'       => null,
            'rotateAfter' => null,
+            'interlace' => null,

            // Output format
            'outputFormat' => null,
            'dpr'          => 1,
+
+            // Postprocessing using external tools
+            'lossy' => null,
        );

        // Convert crop settings from string to array
@@ -913,20 +965,40 @@ class CImage
    {
        $file = $file ? $file : $this->pathToImage;

-        is_readable($file)
-            or $this->raiseError('Image file does not exist.');
+        // Special case to solve Windows 2 WSL integration
+        if (!defined('WINDOWS2WSL')) {
+            is_readable($file)
+                or $this->raiseError('Image file does not exist.');
+        }

-        // Get details on image
-        $info = list($this->width, $this->height, $this->fileType, $this->attr) = getimagesize($file);
+        $info = list($this->width, $this->height, $this->fileType) = getimagesize($file);
        if (empty($info)) {
-            throw new Exception("The file doesn't seem to be a valid image.");
+            // To support webp
+            $this->fileType = false;
+            if (function_exists("exif_imagetype")) {
+                $this->fileType = exif_imagetype($file);
+                if ($this->fileType === false) {
+                    if (function_exists("imagecreatefromwebp")) {
+                        $webp = imagecreatefromwebp($file);
+                        if ($webp !== false) {
+                            $this->width  = imagesx($webp);
+                            $this->height = imagesy($webp);
+                            $this->fileType = IMG_WEBP;
+                        }
+                    }
+                }
+            }
+        }
+
+        if (!$this->fileType) {
+            throw new Exception("Loading image details, the file doesn't seem to be a valid image.");
        }

        if ($this->verbose) {
            $this->log("Loading image details for: {$file}");
            $this->log(" Image width x height (type): {$this->width} x {$this->height} ({$this->fileType}).");
            $this->log(" Image filesize: " . filesize($file) . " bytes.");
-            $this->log(" Image mimetype: " . image_type_to_mime_type($this->fileType));
+            $this->log(" Image mimetype: " . $this->getMimeType());
        }

        return $this;
@@ -934,6 +1006,23 @@ class CImage



+    /**
+     * Get mime type for image type.
+     *
+     * @return $this
+     * @throws Exception
+     */
+    protected function getMimeType()
+    {
+        if ($this->fileType === IMG_WEBP) {
+            return "image/webp";
+        }
+
+        return image_type_to_mime_type($this->fileType);
+    }
+
+
+
    /**
     * Init new width and height and do some sanity checks on constraints, before any
     * processing can be done.
@@ -946,13 +1035,15 @@ class CImage
        $this->log("Init dimension (before) newWidth x newHeight is {$this->newWidth} x {$this->newHeight}.");

        // width as %
-        if ($this->newWidth[strlen($this->newWidth)-1] == '%') {
+        if ($this->newWidth
+            && $this->newWidth[strlen($this->newWidth)-1] == '%') {
            $this->newWidth = $this->width * substr($this->newWidth, 0, -1) / 100;
            $this->log("Setting new width based on % to {$this->newWidth}");
        }

        // height as %
-        if ($this->newHeight[strlen($this->newHeight)-1] == '%') {
+        if ($this->newHeight
+            && $this->newHeight[strlen($this->newHeight)-1] == '%') {
            $this->newHeight = $this->height * substr($this->newHeight, 0, -1) / 100;
            $this->log("Setting new height based on % to {$this->newHeight}");
        }
@@ -1098,8 +1189,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) {

@@ -1282,6 +1379,7 @@ class CImage
            && !$this->autoRotate
            && !$this->bgColor
            && ($this->upscale === self::UPSCALE_DEFAULT)
+            && !$this->lossy
        ) {
            $this->log("Using original image.");
            $this->output($this->pathToImage);
@@ -1315,6 +1413,8 @@ class CImage
        $compress     = $this->compress     ? "_co{$this->compress}"     : null;
        $rotateBefore = $this->rotateBefore ? "_rb{$this->rotateBefore}" : null;
        $rotateAfter  = $this->rotateAfter  ? "_ra{$this->rotateAfter}"  : null;
+        $lossy        = $this->lossy        ? "_l"                       : null;
+        $interlace    = $this->interlace    ? "_i"                       : null;

        $saveAs = $this->normalizeFileExtension();
        $saveAs = $saveAs ? "_$saveAs" : null;
@@ -1381,7 +1481,7 @@ class CImage
            . $quality . $filters . $sharpen . $emboss . $blur . $palette
            . $optimize . $compress
            . $scale . $rotateBefore . $rotateAfter . $autoRotate . $bgColor
-            . $convolve . $copyStrat . $saveAs;
+            . $convolve . $copyStrat . $lossy . $interlace . $saveAs;

        return $this->setTarget($file, $base);
    }
@@ -1439,9 +1539,14 @@ class CImage
            $this->setSource($src, $dir);
        }

-        $this->loadImageDetails($this->pathToImage);
+        $this->loadImageDetails();

-        $this->image = imagecreatefromstring(file_get_contents($this->pathToImage));
+        if ($this->fileType === IMG_WEBP) {
+            $this->image = imagecreatefromwebp($this->pathToImage);
+        } else {
+            $imageAsString = file_get_contents($this->pathToImage);
+            $this->image = imagecreatefromstring($imageAsString);
+        }
        if ($this->image === false) {
            throw new Exception("Could not load image.");
        }
@@ -1696,25 +1801,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 +1868,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 +1917,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;
@@ -2260,6 +2380,14 @@ class CImage
            $this->jpegOptimizeCmd = null;
        }

+        if (array_key_exists("png_lossy", $options)
+            && $options['png_lossy'] !== false) {
+            $this->pngLossy = $options['png_lossy'];
+            $this->pngLossyCmd = $options['png_lossy_cmd'];
+        } else {
+            $this->pngLossyCmd = null;
+        }
+
        if (isset($options['png_filter']) && $options['png_filter']) {
            $this->pngFilterCmd = $options['png_filter_cmd'];
        } else {
@@ -2287,9 +2415,11 @@ class CImage
        // switch on mimetype
        if (isset($this->extension)) {
            return strtolower($this->extension);
-        } else {
-            return substr(image_type_to_extension($this->fileType), 1);
+        } elseif ($this->fileType === IMG_WEBP) {
+            return "webp";
        }
+
+        return substr(image_type_to_extension($this->fileType), 1);
    }


@@ -2314,8 +2444,10 @@ class CImage
            return;
        }

-        is_writable($this->saveFolder)
+        if (!defined("WINDOWS2WSL")) {
+            is_writable($this->saveFolder)
            or $this->raiseError('Target directory is not writable.');
+        }

        $type = $this->getTargetImageExtension();
        $this->Log("Saving image as " . $type);
@@ -2323,6 +2455,12 @@ class CImage

            case 'jpeg':
            case 'jpg':
+                // Set as interlaced progressive JPEG
+                if ($this->interlace) {
+                    $this->Log("Set JPEG image to be interlaced.");
+                    $res = imageinterlace($this->image, true);
+                }
+
                $this->Log("Saving image as JPEG to cache using quality = {$this->quality}.");
                imagejpeg($this->image, $this->cacheFileName, $this->quality);

@@ -2345,6 +2483,11 @@ class CImage
                imagegif($this->image, $this->cacheFileName);
                break;

+            case 'webp':
+                $this->Log("Saving image as WEBP to cache using quality = {$this->quality}.");
+                imagewebp($this->image, $this->cacheFileName, $this->quality);
+                break;
+
            case 'png':
            default:
                $this->Log("Saving image as PNG to cache using compression = {$this->compress}.");
@@ -2354,6 +2497,24 @@ class CImage
                imagesavealpha($this->image, true);
                imagepng($this->image, $this->cacheFileName, $this->compress);

+                // Use external program to process lossy PNG, if defined
+                $lossyEnabled = $this->pngLossy === true;
+                $lossySoftEnabled = $this->pngLossy === null;
+                $lossyActiveEnabled = $this->lossy === true;
+                if ($lossyEnabled || ($lossySoftEnabled && $lossyActiveEnabled)) {
+                    if ($this->verbose) {
+                        clearstatcache();
+                        $this->log("Lossy enabled: $lossyEnabled");
+                        $this->log("Lossy soft enabled: $lossySoftEnabled");
+                        $this->Log("Filesize before lossy optimize: " . filesize($this->cacheFileName) . " bytes.");
+                    }
+                    $res = array();
+                    $cmd = $this->pngLossyCmd . " $this->cacheFileName $this->cacheFileName";
+                    exec($cmd, $res);
+                    $this->Log($cmd);
+                    $this->Log($res);
+                }
+
                // Use external program to filter PNG, if defined
                if ($this->pngFilterCmd) {
                    if ($this->verbose) {
@@ -2499,7 +2660,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
@@ -2533,6 +2694,7 @@ class CImage
            $format = $this->outputFormat;
        }

+        $this->log("### Output");
        $this->log("Output format is: $format");

        if (!$this->verbose && $format == 'json') {
@@ -2550,17 +2712,24 @@ 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) {
+        if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])
+            && strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) == $lastModified) {

            if ($this->verbose) {
                $this->log("304 not modified");
@@ -2569,13 +2738,14 @@ class CImage
            }

            header("HTTP/1.0 304 Not Modified");
+            if (CIMAGE_DEBUG) {
+                trace(__CLASS__ . " 304");
+            }

        } else {

-            // Get details on image
-            $info = getimagesize($file);
-            !empty($info) or $this->raiseError("The file doesn't seem to be an image.");
-            $mime = $info['mime'];
+            $this->loadImageDetails($file);
+            $mime = $this->getMimeType();
            $size = filesize($file);

            if ($this->verbose) {
@@ -2589,8 +2759,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);
        }

@@ -2618,18 +2799,18 @@ class CImage
        $lastModified         = filemtime($this->pathToImage);
        $details['srcGmdate'] = gmdate("D, d M Y H:i:s", $lastModified);

-        $details['cache']       = basename($this->cacheFileName);
-        $lastModified           = filemtime($this->cacheFileName);
+        $details['cache']       = basename($this->cacheFileName ?? "");
+        $lastModified           = filemtime($this->cacheFileName ?? "");
        $details['cacheGmdate'] = gmdate("D, d M Y H:i:s", $lastModified);

        $this->load($file);

-        $details['filename']    = basename($file);
-        $details['mimeType']    = image_type_to_mime_type($this->fileType);
+        $details['filename']    = basename($file ?? "");
+        $details['mimeType']    = $this->getMimeType($this->fileType);
        $details['width']       = $this->width;
        $details['height']      = $this->height;
        $details['aspectRatio'] = round($this->width / $this->height, 3);
-        $details['size']        = filesize($file);
+        $details['size']        = filesize($file ?? "");
        $details['colors'] = $this->colorsTotal($this->image);
        $details['includedFiles'] = count(get_included_files());
        $details['memoryPeek'] = round(memory_get_peak_usage()/1024/1024, 3) . " MB" ;
@@ -2727,6 +2908,7 @@ class CImage
    private function verboseOutput()
    {
        $log = null;
+        $this->log("### Summary of verbose log");
        $this->log("As JSON: \n" . $this->json());
        $this->log("Memory peak: " . round(memory_get_peak_usage() /1024/1024) . "M");
        $this->log("Memory limit: " . ini_get('memory_limit'));
--- a/LICENSE.txt
+++ b/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
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.
--- a/README.md
+++ b/README.md
@@ -2,13 +2,15 @@ Image conversion on the fly using PHP
 =====================================

 [![Join the chat at https://gitter.im/mosbth/cimage](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mosbth/cimage?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+<!--
 [![Build Status](https://travis-ci.org/mosbth/cimage.svg?branch=master)](https://travis-ci.org/mosbth/cimage)
 [![Build Status](https://scrutinizer-ci.com/g/mosbth/cimage/badges/build.png?b=master)](https://scrutinizer-ci.com/g/mosbth/cimage/build-status/master)
+-->

 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 +24,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).
+



@@ -42,18 +47,18 @@ There are several ways of installing. You either install the whole project which



-###Install source from GitHub 
+### Install source from GitHub 

 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.9 released 2015-12-07.**
+**Latest stable version is v0.7.18 released 2016-08-09.**

 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.9
+git checkout v0.7.18
 ```

 Make the cache-directory writable by the webserver.
@@ -63,7 +68,7 @@ chmod 777 cache
 ```


-###Install all-included bundle 
+### Install all-included bundle 

 There are some all-included bundles of `img.php` that can be downloaded and used without dependency to the rest of the sourcecode.

@@ -76,14 +81,14 @@ 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.9/webroot/imgp.php
+wget https://raw.githubusercontent.com/mosbth/cimage/v0.7.18/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.



-###Install from Packagist
+### Install from Packagist

 You can install the package [`mos/cimage` from Packagist](https://packagist.org/packages/mos/cimage) using composer.

@@ -98,7 +103,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 +117,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 +130,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.

@@ -136,15 +141,15 @@ Get going quickly



-###Check out the test page 
+### Check out the test page 

 Try it out by pointing your browser to the test file `webroot/test/test.php`. It will show some example images and you can review how they are created.



-###Process your first image 
+### 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 

@@ -156,20 +161,20 @@ and try to resize it to a thumbnail by adding the options



-###What does "processing the image" involves? 
+### What does "processing the image" involves? 

 Add `&verbose` to the link to get a verbose output of what is happens during image processing. This is useful for developers and those who seek a deeper understanding on how it works behind the scene. 



-###Check your system 
+### Check your system 

 Open up `webroot/check_system.php` if you are uncertain that your system has the right extensions loaded. 




-###How does it work? 
+### How does it work? 

 Review the settings in `webroot/img_config.php` and check out `webroot/img.php` on how it uses `CImage`.

@@ -190,7 +195,7 @@ Basic usage



-###Select the source 
+### Select the source 

 Open an image through `img.php` by using its `src` attribute.

@@ -198,7 +203,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:

@@ -206,13 +211,13 @@ All images are stored in a directory structure and you access them as:



-###Resize using constraints on width and height 
+### Resize using constraints on width and height 

 Create a thumbnail of the image by applying constraints on width and height, or one of them.

 | `&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.

@@ -220,17 +225,17 @@ Think of the constraints as a imaginary box where the image should fit. With `wi



-###Resize to fit a certain dimension 
+### Resize to fit a certain dimension 

 Creating a thumbnail with a certain dimension of width and height, usually involves stretching or cropping the image to fit in the selected dimensions. Here is how you create a image that has the exact dimensions of 300x150 pixels, by either *stretching*, *cropping* or *fill to fit*.


 | 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.

@@ -240,19 +245,19 @@ Fill to fit is useful when you have some image that must fit in a certain dimens



-###List of parameters
+### List of parameters

 `img.php` supports a lot of parameters. Combine the parameters to get the desired behavior and resulting image. For example, take the original image, resize it using width, aspect-ratio and crop-to-fit, apply a sharpen effect, save the image as JPEG using quality 30.

 > `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. 


-####Mandatory options and debugging 
+#### Mandatory options and debugging 

 Option `src` is the only mandatory option. The options in this section is useful for debugging or deciding what version of the target image is used.

@@ -267,7 +272,7 @@ Option `src` is the only mandatory option. The options in this section is useful



-####Options for deciding width and height of target image
+#### Options for deciding width and height of target image

 These options are all affecting the final dimensions, width and height, of the resulting image.

@@ -280,7 +285,7 @@ These options are all affecting the final dimensions, width and height, of the r



-####Options for resize strategy
+#### Options for resize strategy

 These options affect strategy to use when resizing an image into a target image that has both width and height set.

@@ -293,7 +298,7 @@ These options affect strategy to use when resizing an image into a target image



-####Options for cropping part of image
+#### Options for cropping part of image

 These options enable to decide what part of image to crop out.

@@ -304,7 +309,7 @@ These options enable to decide what part of image to crop out.



-####General processing options
+#### General processing options

 These options are general options affecting processing.

@@ -314,7 +319,7 @@ These options are general options affecting processing.



-####Processing of image before resizing 
+#### Processing of image before resizing 

 This option are executed *before* the image is resized.

@@ -326,7 +331,7 @@ This option are executed *before* the image is resized.



-####Processing of image after resizing 
+#### Processing of image after resizing 

 These options are executed *after* the image is resized.

@@ -344,7 +349,7 @@ These options are executed *after* the image is resized.



-####Saving image, affecting quality and file size 
+#### Saving image, affecting quality and file size 

 Options for saving the target image.

@@ -400,7 +405,7 @@ Consult the file `webroot/img-config.php` for a complete list together with the



-###Create and name the config file 
+### Create and name the config file 

 The file `img.php` looks for the config-file `img_config.php`, and uses it if its found. The three files where everything is included -- `imgd.php`, `imgp.php` and `imgs.php` -- includes an empty `$config`-array which can be overridden by saving a config-file in the same directory. If the script is `imgp.php` then name the config-file `imgp_config.php` and it will find it and use those settings. 

@@ -430,7 +435,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:

@@ -465,19 +470,19 @@ Here are some thoughts when applying `img.php` on a live system.



-###Select the proper mode 
+### Select the proper mode 

 Select the proper mode for `img.php`. Set it to "strict" or "production" to prevent outsiders to get information about your system. Use only "development" for internal use since its quite verbose in its nature of error reporting. 



-###Put the installation directory outside web root 
+### Put the installation directory outside web root 

 Edit the config file to put the installation directory -- and the cache directory -- outside of the web root. Best practice would be to store the installation directory and cache, outside of the web root. The only thing needed in the web root is `img.php` and `img_config.php` (if used) which can be placed, for example, in `/img/img.php` or just as `/img.php`.



-###Friendly urls through `.htaccess` 
+### Friendly urls through `.htaccess` 

 Use `.htaccess`and rewrite rules (Apache) to get friendly image urls. Put `img.php` in the `/img` directory. Put the file `.htaccess` in the web root.

@@ -515,7 +520,7 @@ The result is good readable urls to your images. Its easy for the search engine



-###Monitor cache size
+### Monitor cache size

 There is a utility `cache.bash` included for monitoring the size of the cache-directory. It generates an output like this.

@@ -553,13 +558,13 @@ Use it as a base if you feel the need to monitor the size och the cache-director



-###Read-only cache
+### Read-only cache

 The cache directory need to be writable for `img.php` to create new files. But its possible to first create all cache-files and then set the directory to be read-only. This will give you a way of shutting of `img.php` from creating new cache files. `img.php` will then continue to work for all images having a cached version but will fail if someone tries to create a new, not previously cached, version of the image.



-###Post-processing with external tools
+### Post-processing with external tools

 You can use external tools to post-process the images to optimize the file size. This option is available for JPEG and for PNG images. Post-processing is disabled by default, edit `img_config.php` to enable it.

@@ -569,7 +574,7 @@ These tools for post processing is not a part of `CImage` and `img.php`, you nee



-###Allowing remote download of images
+### Allowing remote download of images

 You can allow `img.php` to download remote images. That can be enabled in the config-file. However, before doing so, consider the implications on allowing anyone to download a file, hopefully an image, to your server and then the possibility to access it through the webserver.

--- a/REVISION.md
+++ b/REVISION.md
@@ -1,8 +1,170 @@
 Revision history
 =====================================

+<!--
 [![Build Status](https://travis-ci.org/mosbth/cimage.svg?branch=master)](https://travis-ci.org/mosbth/cimage)
 [![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.8.6 (2023-10-27)
+-------------------------------------
+
+* Fix deprecation notice on "Creation of dynamic property" for PHP 8.2.
+
+
+
+v0.8.5 (2022-11-17)
+-------------------------------------
+
+* Enable configuration fix for solving Windows 2 WSL2 issue with is_readable/is_writable #189.
+* Update CHttpGet.php for php 8.1 deprecated notice #188.
+* Remove build status from README (since it is not up to date).
+
+
+
+v0.8.4 (2022-05-30)
+-------------------------------------
+
+* Support PHP 8.1 and remove (more) deprecated messages when run in in development mode.
+
+
+
+v0.8.3 (2022-05-24)
+-------------------------------------
+
+* Support PHP 8.1 and remove deprecated messages when run in in development mode.
+* Generate prebuilt all include files for various settings
+* Fix deprecated for PHP 8.1
+* Fix deprecated for PHP 8.1
+* Add php version as output in verbose mode
+* Add PHP 81 as test environment
+
+
+
+v0.8.2 (2021-10-27)
+-------------------------------------
+
+* Remove bad configuration.
+
+
+
+v0.8.1 (2020-06-08)
+-------------------------------------
+
+* Updated version number in define.php.
+
+
+
+v0.8.0 (2020-06-08)
+-------------------------------------
+
+* Enable to set JPEG image as interlaced, implement feature #177.
+* Add function getValue() to read from querystring.
+* Set PHP 7.0 as precondition (to prepare to update the codebase).
+
+
+
+v0.7.23 (2020-05-06)
+-------------------------------------
+
+* Fix error in composer.json
+
+
+
+v0.7.22 (2020-05-06)
+-------------------------------------
+
+* Update composer.json and move ext-gd from required to suggested to ease installation where cli does not have all extensions installed.
+
+
+
+v0.7.21 (2020-01-15)
+-------------------------------------
+
+* Support PHP 7.4, some minor fixes with notices.
+
+
+v0.7.20 (2017-11-06)
+-------------------------------------
+
+* Remove webroot/img/{round8.PNG,wider.JPEG,wider.JPG} to avoid unzip warning message when installing with composer.
+* Adding docker-compose.yml #169.
+
+
+v0.7.19 (2017-03-31)
+-------------------------------------
+
+* Move exception handler from functions.php to img.php #166.
+* Correct XSS injection in `check_system.php`.
+* Composer suggests ext-imagick and ext-curl.
+
+
+v0.7.18 (2016-08-09)
+-------------------------------------
+
+* Made `&lossless` a requirement to not use the original image.
+
+
+v0.7.17 (2016-08-09)
+-------------------------------------
+
+* Made `&lossless` part of the generated cache filename.
+
+
+v0.7.16 (2016-08-09)
+-------------------------------------
+
+* Fix default mode to be production.
+* Added pngquant as extra postprocessing utility for PNG-images, #154.
+* Bug `&status` wrong variable name for fast track cache.
+
+
+v0.7.15 (2016-08-09)
+-------------------------------------
+
+* Added the [Lenna/Lena sample image](http://www.cs.cmu.edu/~chuck/lennapg/) as tif and created a png, jpeg and webp version using Imagick convert `convert lena.tif lena.{png,jpg,webp}`, #152.
+* Limited and basic support for WEBP format, se #132.
+
+
+v0.7.14 (2016-08-08)
+-------------------------------------
+
+* Re-add removed cache directory.
+* Make fast track cache disabled by default in the config file.
+
+
+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)
@@ -18,7 +180,7 @@ v0.7.8 (2015-12-06)

 * HTTP error messages now 403, 404 and 500 as in #128 and #127.
 * More examples on dealing with cache through bash `bin/cache.bash`, #129.
-* Added conversion to sRGB using option `?srgb`. #120. 
+* Added conversion to sRGB using option `?srgb`. #120.
 * Added Gitter badge to README, #126.
 * Fix proper download url in README, #125.
 * Change path in `webroot/htaccess` to make it work in current environment.
@@ -29,11 +191,11 @@ v0.7.7 (2015-10-21)

 * One can now add a HTTP header for Cache-Control in the config file, #109.
 * Added hook in img,php before CImage is called, #123.
-* Added configuration for default jpeg quality and png compression in the config file, #107. 
+* Added configuration for default jpeg quality and png compression in the config file, #107.
 * Strip comments and whitespace in imgs.php, #115.
 * Bundle imgs.php did not have the correct mode.
 * Adding option &status to get an overview of the installed on configured utilities, #116.
-* Bug, all files saved as png-files, when not saving as specific file. 
+* Bug, all files saved as png-files, when not saving as specific file.
 * Removed saving filename extension for alias images.
 * Added option to decide if resample or resize when copying images internally. `&no-resample` makes resize, instead of resample as is default.
 * Verbose now correctly states if transparent color is detected.
@@ -88,14 +250,14 @@ v0.7.1 (2015-07-25)
 * Using `CWhitelist` for checking hotlinking to images, fix #88.
 * Added mode for `test` which enables logging verbose mode to file, fix #97.
 * Improved codestyle and added `phpcs.xml` to start using phpcs to check code style, fix #95.
-* Adding `composer.json` for publishing on packagist. 
+* Adding `composer.json` for publishing on packagist.
 * Add permalink to setup for comparing images with `webroot/compare/compare.php`, fix #92.
 * Allow space in filename by using `urlencode()` and allow space as valid filenam character. fix #91.
-* Support redirections for remote images, fix #87, fix #90. 
+* Support redirections for remote images, fix #87, fix #90.
 * Improving usage of Travis and Scrutinizer.
 * Naming cache-file using md5 for remote images, fix #86.
 * Loading images without depending on filename extension, fix #85.
-* Adding unittest with phpunit #84, fix #13 
+* Adding unittest with phpunit #84, fix #13
 * Adding support for whitelist of remote hostnames, #84
 * Adding phpdoc, fix #48.
 * Adding travis, fix #15.
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -0,0 +1,6 @@
+Security policy
+======================
+
+To report security vulnerabilities in the project, send en email to mikael.t.h.roos@gmail.com.
+
+For other security related issues, please open an issue on the project.
--- a/autoload.php
+++ b/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.
--- a/bin/create-img-single.bash
+++ b/bin/create-img-single.bash
@@ -34,12 +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."
@@ -60,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

@@ -78,6 +87,9 @@ $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

--- a/cache/.gitignore
+++ b/cache/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
--- a/cache/README.md
+++ b/cache/README.md
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "mos/cimage",    
+    "name": "mos/cimage",
    "type": "library",
    "description": "Process, scale, resize, crop and filter images.",
    "keywords": ["image", "imageprocessing", "gd"],
@@ -18,16 +18,27 @@
        "docs": "http://dbwebb.se/opensource/cimage"
    },
    "require": {
-        "php": ">=5.3"
+        "php": ">=7.0"
+    },
+    "suggest": {
+        "ext-curl": "*",
+        "ext-exif": "*",
+        "ext-gd": "*",
+        "ext-imagick": "*"
    },
    "autoload": {
-        "classmap": [
+       "files": [
+           "defines.php",
+           "functions.php"
+       ],
+       "classmap": [
            "CImage.php",
            "CHttpGet.php",
            "CRemoteImage.php",
            "CWhitelist.php",
            "CAsciiArt.php",
-            "CCache.php"
+            "CCache.php",
+            "CFastTrackCache.php"
        ]
    }
 }
--- a/defines.php
+++ b/defines.php
@@ -0,0 +1,11 @@
+<?php
+// Version of cimage and img.php
+define("CIMAGE_VERSION", "v0.8.6 (2023-10-27)");
+
+// For CRemoteImage
+define("CIMAGE_USER_AGENT", "CImage/" . CIMAGE_VERSION);
+
+// Image type IMG_WEBP is only defined from 5.6.25
+if (!defined("IMG_WEBP")) {
+    define("IMG_WEBP", -1);
+}
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -0,0 +1,97 @@
+version: "3"
+services:
+    cli:
+        image: anax/dev
+        volumes: [ ".:/home/anax/repo" ]
+
+    apache:
+        image: anax/dev:apache
+        volumes: [ ".:/home/anax/repo" ]
+        ports: [ "11000:80" ]
+
+    remserver:
+        image: anax/dev:apache
+        ports:
+            - "8090:80"
+        volumes: [ ".:/home/anax/repo" ]
+
+    php82:
+        image: anax/dev:php82
+        volumes: [ ".:/home/anax/repo" ]
+
+    php82-apache:
+        image: anax/dev:php82-apache
+        ports: [ "11082:80" ]
+        volumes: [ ".:/home/anax/repo" ]
+
+    php81:
+        image: anax/dev:php81
+        volumes: [ ".:/home/anax/repo" ]
+
+    php81-apache:
+        image: anax/dev:php81-apache
+        ports: [ "11081:80" ]
+        volumes: [ ".:/home/anax/repo" ]
+
+    php80:
+        image: anax/dev:php80
+        volumes: [ ".:/home/anax/repo" ]
+
+    php80-apache:
+        image: anax/dev:php80-apache
+        ports: [ "11080:80" ]
+        volumes: [ ".:/home/anax/repo" ]
+
+    php74:
+        image: anax/dev:php74
+        volumes: [ ".:/home/anax/repo" ]
+
+    php74-apache:
+        image: anax/dev:php74-apache
+        ports: [ "11074:80" ]
+        volumes: [ ".:/home/anax/repo" ]
+
+    php73:
+        image: anax/dev:php73
+        volumes: [ ".:/home/anax/repo" ]
+
+    php73-apache:
+        image: anax/dev:php73-apache
+        ports: [ "11073:80" ]
+        volumes: [ ".:/home/anax/repo" ]
+
+    php72:
+        image: anax/dev:php72
+        volumes: [ ".:/home/anax/repo" ]
+
+    php72-apache:
+        image: anax/dev:php72-apache
+        ports: [ "11072:80" ]
+        volumes: [ ".:/home/anax/repo" ]
+
+    php71:
+        image: anax/dev:php71
+        volumes: [ ".:/home/anax/repo" ]
+
+    php71-apache:
+        image: anax/dev:php71-apache
+        ports: [ "11071:80" ]
+        volumes: [ ".:/home/anax/repo" ]
+
+    php70:
+        image: anax/dev:php70
+        volumes: [ ".:/home/anax/repo" ]
+
+    php70:
+        image: anax/dev:php70-apache
+        ports: [ "11070:80" ]
+        volumes: [ ".:/home/anax/repo" ]
+
+    php56:
+        image: anax/dev:php56
+        volumes: [ ".:/home/anax/repo" ]
+
+    php56:
+        image: anax/dev:php56-apache
+        ports: [ "11056:80" ]
+        volumes: [ ".:/home/anax/repo" ]
--- a/functions.php
+++ b/functions.php
@@ -0,0 +1,197 @@
+<?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");
+}
+
+
+
+/**
+ * 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 of input from query string or else $undefined.
+ *
+ * @param mixed $key       as string or array of string values to look for in $_GET.
+ * @param mixed $undefined value to return when $key has no, or empty value in $_GET.
+ *
+ * @return mixed value as or $undefined.
+ */
+function getValue($key, $undefined)
+{
+    $val = get($key);
+    if (is_null($val) || $val === "") {
+        return $undefined;
+    }
+    return $val;
+}
+
+
+
+/**
+ * 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, $arg = "")
+{
+    global $verbose, $verboseFile;
+    static $log = array();
+
+    if (!($verbose || $verboseFile)) {
+        return;
+    }
+
+    if (is_null($msg)) {
+        return $log;
+    }
+
+    if (is_null($arg)) {
+        $arg = "null";
+    } elseif ($arg === false) {
+        $arg = "false";
+    } elseif ($arg === true) {
+        $arg = "true";
+    }
+
+    $log[] = $msg . $arg;
+}
+
+
+
+/**
+ * Log when verbose mode, when used without argument it returns the result.
+ *
+ * @param string $msg to log.
+ *
+ * @return void or array.
+ */
+function checkExternalCommand($what, $enabled, $commandString)
+{
+    $no = $enabled ? null : 'NOT';
+    $text = "Post processing $what is $no enabled.<br>";
+
+    list($command) = explode(" ", $commandString);
+    $no = is_executable($command) ? null : 'NOT';
+    $text .= "The command for $what is $no an executable.<br>";
+
+    return $text;
+}
--- a/webroot/check_system.php
+++ b/webroot/check_system.php
@@ -2,7 +2,7 @@

 echo 'Current PHP version: ' . phpversion() . '<br><br>';

-echo 'Running on: ' . $_SERVER['SERVER_SOFTWARE'] . '<br><br>';
+echo 'Running on: ' . htmlentities($_SERVER['SERVER_SOFTWARE']) . '<br><br>';

 $no = extension_loaded('exif') ? null : 'NOT';
 echo "Extension exif is $no loaded.<br>";
@@ -15,13 +15,15 @@ echo "Extension imagick is $no loaded.<br>";

 $no = extension_loaded('gd') ? null : 'NOT';
 echo "Extension gd is $no loaded.<br>";
-
 if (!$no) {
    echo "<pre>", var_dump(gd_info()), "</pre>";
 }

 echo "<strong>Checking path for postprocessing tools</strong>";

+echo "<br>pngquant: ";
+system("which pngquant");
+
 echo "<br>optipng: ";
 system("which optipng");

--- a/webroot/compare/compare.php
+++ b/webroot/compare/compare.php
@@ -3,6 +3,12 @@
 <head>
 <style>

+<?php
+function e($str) {
+    return htmlspecialchars($str, ENT_QUOTES, 'UTF-8');
+}
+?>
+
 body {
 }

@@ -128,15 +134,15 @@ if (isset($_GET['input1'])) {
    // Use incoming from querystring as defaults
 ?>
    CImage.compare({
-        "input1": "<?=$_GET['input1']?>",
-        "input2": "<?=$_GET['input2']?>",
-        "input3": "<?=$_GET['input3']?>",
-        "input4": "<?=$_GET['input4']?>",
-        "input5": "<?=$_GET['input5']?>",
-        "input6": "<?=$_GET['input6']?>",
-        "json": <?=$_GET['json']?>,
-        "stack": <?=$_GET['stack']?>,
-        "bg": <?=$_GET['bg']?>
+        "input1": "<?=e($_GET['input1'])?>",
+        "input2": "<?=e($_GET['input2'])?>",
+        "input3": "<?=e($_GET['input3'])?>",
+        "input4": "<?=e($_GET['input4'])?>",
+        "input5": "<?=e($_GET['input5'])?>",
+        "input6": "<?=e($_GET['input6'])?>",
+        "json": <?=e($_GET['json'])?>,
+        "stack": <?=e($_GET['stack'])?>,
+        "bg": <?=e($_GET['bg'])?>
    });
 <?php
 } elseif (isset($script)) {
--- a/webroot/img.php
+++ b/webroot/img.php
@@ -8,52 +8,6 @@
 *
 */

-$version = "v0.7.9 (2015-12-07)";
-
-// For CRemoteImage
-define("CIMAGE_USER_AGENT", "CImage/$version");
-
-
-
-/**
- * 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");
-    }
-
-    if ($mode == "strict") {
-        $header = "404 Not Found";
-    }
-
-    error_log("[img.php] $msg");
-    die("HTTP/1.0 $header");
-}
-
-
-
 /**
 * Custom exception handler.
 */
@@ -70,89 +24,6 @@ set_exception_handler(function ($exception) {



-/**
- * 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.
@@ -165,6 +36,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"];
+}
+


 /**
@@ -173,7 +62,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);



@@ -297,7 +186,7 @@ $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);
+$refererHost = parse_url($referer ?? "", PHP_URL_HOST);

 if (!$allowHotlinking) {
    if ($passwordMatch) {
@@ -331,24 +220,11 @@ verbose("referer host = $refererHost");



-/**
- * Get the source files.
- */
-$autoloader  = getConfig('autoloader', false);
-$cimageClass = getConfig('cimage_class', false);
-
-if ($autoloader) {
-    require $autoloader;
-} elseif ($cimageClass) {
-    require $cimageClass;
-}
-
-
-
 /**
 * Create the class for the image.
 */
-$img = new CImage();
+$CImage = getConfig('CImage', 'CImage');
+$img = new $CImage();
 $img->setVerbose($verbose || $verboseFile);


@@ -356,12 +232,49 @@ $img->setVerbose($verbose || $verboseFile);
 /**
 * Get the cachepath from config.
 */
+$CCache = getConfig('CCache', 'CCache');
 $cachePath = getConfig('cache_path', __DIR__ . '/../cache/');
-$cache = new CCache();
+$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();
+}
+
+

 /**
 * Allow or disallow remote download of images from other servers.
@@ -372,7 +285,7 @@ $allowRemote = getConfig('remote_allow', false);

 if ($allowRemote && $passwordMatch !== false) {
    $cacheRemote = $cache->getPathToSubdir("remote");
-    
+
    $pattern = getConfig('remote_pattern', null);
    $img->setRemoteDownload($allowRemote, $cacheRemote, $pattern);

@@ -406,21 +319,31 @@ if (isset($shortcut)
 /**
 * src - the source image file.
 */
-$srcImage = urldecode(get('src'))
+$srcImage = urldecode(get('src', ""))
    or errorPage('Must set src-attribute.', 404);

+// Get settings for src-alt as backup image
+$srcAltImage = urldecode(get('src-alt', ""));
+$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) {

@@ -430,19 +353,40 @@ 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(
@@ -496,7 +440,7 @@ if (isset($sizes[$newWidth])) {
 }

 // Support width as % of original width
-if ($newWidth[strlen($newWidth)-1] == '%') {
+if ($newWidth && $newWidth[strlen($newWidth)-1] == '%') {
    is_numeric(substr($newWidth, 0, -1))
        or errorPage('Width % not numeric.', 404);
 } else {
@@ -521,7 +465,7 @@ if (isset($sizes[$newHeight])) {
 }

 // height
-if ($newHeight[strlen($newHeight)-1] == '%') {
+if ($newHeight && $newHeight[strlen($newHeight)-1] == '%') {
    is_numeric(substr($newHeight, 0, -1))
        or errorPage('Height % out of range.', 404);
 } else {
@@ -552,7 +496,7 @@ $aspectRatioConstant = getConfig('aspect_ratio_constant', function () {

 // Check to replace predefined aspect ratio
 $aspectRatios = call_user_func($aspectRatioConstant);
-$negateAspectRatio = ($aspectRatio[0] == '!') ? true : false;
+$negateAspectRatio = ($aspectRatio && $aspectRatio[0] == '!') ? true : false;
 $aspectRatio = $negateAspectRatio ? substr($aspectRatio, 1) : $aspectRatio;

 if (isset($aspectRatios[$aspectRatio])) {
@@ -668,23 +612,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
 */
@@ -921,6 +856,9 @@ verbose("upscale = $upscale");
 * Get details for post processing
 */
 $postProcessing = getConfig('postprocessing', array(
+    'png_lossy'        => false,
+    'png_lossy_cmd'    => '/usr/local/bin/pngquant --force --output',
+
    'png_filter'        => false,
    'png_filter_cmd'    => '/usr/local/bin/optipng -q',

@@ -933,6 +871,15 @@ $postProcessing = getConfig('postprocessing', array(



+/**
+ * lossy - Do lossy postprocessing, if available.
+ */
+$lossy = getDefined(array('lossy'), true, null);
+
+verbose("lossy = $lossy");
+
+
+
 /**
 * alias - Save resulting image to another alias name.
 * Password always apply, must be defined.
@@ -973,6 +920,18 @@ if ($cacheControl) {



+/**
+ * interlace - Enable configuration for interlaced progressive JPEG images.
+ */
+$interlaceConfig  = getConfig('interlace', null);
+$interlaceValue   = getValue('interlace', null);
+$interlaceDefined = getDefined('interlace', true, null);
+$interlace = $interlaceValue ?? $interlaceDefined ?? $interlaceConfig;
+verbose("interlace (configfile) = ", $interlaceConfig);
+verbose("interlace = ", $interlace);
+
+
+
 /**
 * Prepare a dummy image and use it as source image.
 */
@@ -1034,7 +993,7 @@ 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";
@@ -1051,6 +1010,9 @@ if ($status) {
    $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';
@@ -1065,6 +1027,11 @@ if ($status) {
    $no = extension_loaded('gd') ? null : 'NOT';
    $text .= "Extension gd is $no loaded.<br>";

+    $text .= checkExternalCommand("PNG LOSSY", $postProcessing["png_lossy"], $postProcessing["png_lossy_cmd"]);
+    $text .= checkExternalCommand("PNG FILTER", $postProcessing["png_filter"], $postProcessing["png_filter_cmd"]);
+    $text .= checkExternalCommand("PNG DEFLATE", $postProcessing["png_deflate"], $postProcessing["png_deflate_cmd"]);
+    $text .= checkExternalCommand("JPEG OPTIMIZE", $postProcessing["jpeg_optimize"], $postProcessing["jpeg_optimize_cmd"]);
+
    if (!$no) {
        $text .= print_r(gd_info(), 1);
    }
@@ -1126,6 +1093,7 @@ if (is_callable($hookBeforeCImage)) {
            'blur'      => $blur,
            'convolve'  => $convolve,
            'rotateAfter' => $rotateAfter,
+            'interlace' => $interlace,

            // Output format
            'outputFormat' => $outputFormat,
@@ -1133,6 +1101,7 @@ if (is_callable($hookBeforeCImage)) {

            // Other
            'postProcessing' => $postProcessing,
+            'lossy' => $lossy,
    ));
    verbose(print_r($allConfig, 1));
    extract($allConfig);
@@ -1180,7 +1149,8 @@ EOD;
 /**
 * Load, process and output the image
 */
-$img->log("Incoming arguments: " . print_r(verbose(), 1))
+$img->log("PHP version: " . phpversion())
+    ->log("Incoming arguments: " . print_r(verbose(), 1))
    ->setSaveFolder($cachePath)
    ->useCache($useCache)
    ->setSource($srcImage, $imagePath)
@@ -1213,10 +1183,14 @@ $img->log("Incoming arguments: " . print_r(verbose(), 1))
            'blur'      => $blur,
            'convolve'  => $convolve,
            'rotateAfter' => $rotateAfter,
+            'interlace' => $interlace,

            // Output format
            'outputFormat' => $outputFormat,
            'dpr'          => $dpr,
+
+            // Postprocessing using external tools
+            'lossy' => $lossy,
        )
    )
    ->loadImageDetails()
--- a/webroot/img/apple.jpg
+++ b/webroot/img/apple.jpg
--- a/webroot/img/duke.png
+++ b/webroot/img/duke.png
--- a/webroot/img/lena.jpg
+++ b/webroot/img/lena.jpg
--- a/webroot/img/lena.png
+++ b/webroot/img/lena.png
--- a/webroot/img/lena.tif
+++ b/webroot/img/lena.tif
--- a/webroot/img/lena.webp
+++ b/webroot/img/lena.webp
--- a/webroot/img/planet.gif
+++ b/webroot/img/planet.gif
--- a/webroot/img/round8.PNG
+++ b/webroot/img/round8.PNG
--- a/webroot/img/webp/1.webp
+++ b/webroot/img/webp/1.webp
--- a/webroot/img/wider.JPEG
+++ b/webroot/img/wider.JPEG
--- a/webroot/img/wider.JPG
+++ b/webroot/img/wider.JPG
--- a/webroot/img_config.php
+++ b/webroot/img_config.php
@@ -5,29 +5,63 @@
 * 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");
+}
+
+/**
+ * Set this if you work with a webserver in Windows and try to access files
+ * within WSL2.
+ * The issue seems to be with functions like `is_writable()` and
+ * `is_readable()`.
+ * When WINDOWS2WSL is defined (to any value) it ignores these functions.
+ */
+#define('WINDOWS2WSL', 1);
+
+
+
 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',
-     //'mode' => 'development',
+     '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',



@@ -36,13 +70,41 @@ 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/',
-    //'alias_path'   =>  __DIR__ . '/img/alias/',
+    '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',



@@ -63,7 +125,7 @@ return array(
     *  password_type:   'text' // use plain password, not encoded,
     */
    //'password_always' => false, // always require password,
-    //'password'        => false, // "secret-password",
+    //'password'        => "moped", // "secret-password",
    //'password_type'   => 'text', // supports 'text', 'md5', 'hash',


@@ -98,6 +160,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.
     *
@@ -139,6 +215,18 @@ return array(



+       /**
+        * 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.
@@ -188,7 +276,8 @@ 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.
+     * This means that symbolic links to images outside the image_path will
+     * fail.
     *
     * Default value:
     *  image_path_constraint: true
@@ -241,8 +330,16 @@ return array(
     * Post processing of images using external tools, set to true or false
     * and set command to be executed.
     *
+     * The png_lossy can alos have a value of null which means that its
+     * enabled but not used as default. Each image having the option
+     * &lossy will be processed. This means one can individually choose
+     * when to use the lossy processing.
+     *
     * Default values.
     *
+     *  png_lossy:        false
+     *  png_lossy_cmd:    '/usr/local/bin/pngquant --force --output'
+     *
     *  png_filter:        false
     *  png_filter_cmd:    '/usr/local/bin/optipng -q'
     *
@@ -254,6 +351,9 @@ return array(
     */
    /*
    'postprocessing' => array(
+        'png_lossy'       => null,
+        'png_lossy_cmd'   => '/usr/local/bin/pngquant --force --output',
+
        'png_filter'        => false,
        'png_filter_cmd'    => '/usr/local/bin/optipng -q',

@@ -379,7 +479,7 @@ return array(


    /**
-     * default options for ascii image.
+     * Default options for ascii image.
     *
     * Default values as specified below in the array.
     *  ascii-options:
@@ -394,6 +494,18 @@ return array(
            "scale" => 14,
            "luminanceStrategy" => 3,
            "customCharacterSet" => null,
-        );
-    },*/
+        ), */
+
+
+
+    /**
+     * Default options  for creating interlaced progressive JPEG images. Set
+     * to true to always render jpeg images as interlaced. This setting can
+     * be overridden by using `?interlace`, `?interlace=true` or
+     * `?interlace=false`.
+     *
+     * Default values are:
+     *  interlace:  false
+     */
+     /*'interlace' => false,*/
 );
--- a/webroot/img_header.php
+++ b/webroot/img_header.php
@@ -10,6 +10,7 @@
 * @link    https://github.com/mosbth/cimage
 *
 */
+define("CIMAGE_BUNDLE", true);


 /**
--- a/webroot/imgd.php
+++ b/webroot/imgd.php
--- a/webroot/imgf.php
+++ b/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";
--- a/webroot/imgf_config.php
+++ b/webroot/imgf_config.php
@@ -0,0 +1 @@
+img_config.php
--- a/webroot/imgp.php
+++ b/webroot/imgp.php
--- a/webroot/imgs.php
+++ b/webroot/imgs.php
--- a/webroot/test/test_option-no-upscale.php
+++ b/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',
--- a/webroot/tests.php
+++ b/webroot/tests.php
@@ -0,0 +1,22 @@
+<?php
+
+$links = [
+    "img.php?src=car.png&v",
+    "img.php?src=car.png&w=700&v",
+];
+
+?><!doctype html>
+<html>
+    <head>
+        <title>Links to use for testing</title>
+    </head>
+    <body>
+        <h1>Links useful for testing</h1>
+        <p>A collection of linkt to use to test various aspects of the cimage process.</p>
+        <ul>
+        <?php foreach ($links as $link) : ?>
+            <li><a href="<?= $link ?>"><?= $link ?></a></li>
+        <?php endforeach; ?>
+        </ul>
+    </body>
+</html>
Author	SHA1	Message	Date
Mikael Roos	b44be78f06	Fix deprecation notice on "Creation of dynamic property" for PHP 8.2.	2023-10-27 10:20:16 +02:00
Mikael Roos	1056f0a5ee	Spelling in README	2022-11-17 16:13:56 +01:00
Mikael Roos	1666ea1412	Build to prepare to tag	2022-11-17 16:08:48 +01:00
Mikael Roos	bb57af697b	Remove build status from README (since it is not up to date)	2022-11-17 16:06:25 +01:00
Mikael Roos	55ce23ae5e	Add fix for WINDOWS2WSL	2022-11-17 16:05:25 +01:00
Mikael Roos	4589b3b3cd	Enable configuration fix for solving Windows 2 WSL2 issue with is_readable/is_writable #189	2022-11-17 15:40:43 +01:00
Mikael Roos	d5ca10cebc	Add a webpage with links useful to test various aspects of img.php	2022-11-17 15:31:40 +01:00
Mikael Roos	9d7343a2df	Merge pull request #188 from niciz/patch-1 Update CHttpGet.php for php 8.1 deprecated notice	2022-11-08 13:50:12 +01:00
niciz	3d7adcdbde	Update CHttpGet.php for php 8.1 deprecated notice	2022-11-08 12:23:07 +01:00
Mikael Roos	80cd4e092f	v0.8.4 (2022-05-30)	2022-05-30 15:32:20 +02:00
Mikael Roos	4c0ac8ed23	Support PHP 8.1 and remove deprecated messages when run in in development mode	2022-05-24 16:41:01 +02:00
Mikael Roos	39b86628db	Generate prebuilt all include files for various settings	2022-05-24 16:38:48 +02:00
Mikael Roos	5f4280d387	Fix deprecated for PHP 8.1	2022-05-24 16:37:50 +02:00
Mikael Roos	dd315dbd21	Fix deprecated for PHP 8.1	2022-05-24 16:33:08 +02:00
Mikael Roos	493118e1c5	Add php version as output in verbose mode	2022-05-24 12:57:27 +02:00
Mikael Roos	e41b3d9877	Add PHP 81 as test environment	2022-05-24 12:57:08 +02:00
Mikael Roos	bb60001c36	Prepare to tag	2021-10-27 11:40:40 +02:00
Mikael Roos	adeca3f9f9	Prepare to tag	2021-10-27 11:40:18 +02:00
Mikael Roos	a5662690fe	Remove bad configuration	2021-10-27 11:21:29 +02:00
Mikael Roos	3cfa9a6a98	Add htmlentities to escape input, fix #183	2021-09-13 08:17:47 +02:00
Mikael Roos	4ecebcd5b4	Add a security policy #183	2021-09-09 13:51:13 +02:00
Mikael Roos	9196d1ee41	Update the docker-compose.yaml to include PHP 8.0, #181	2021-05-10 16:01:23 +02:00
Mikael Roos	0249056761	Updated version number in define.php.	2020-06-08 12:38:44 +02:00
Mikael Roos	4ea72be49a	Enable to set JPEG image as interlaced, implement feature #177 .	2020-06-08 12:26:40 +02:00
Mikael Roos	2ce1f18fe5	Set PHP 7.0 as precondition (to prepare to update the codebase).	2020-06-08 12:26:01 +02:00
Mikael Roos	0f1f537b62	Add function getValue() to read from querystring.	2020-06-08 12:25:47 +02:00
Mikael Roos	1411adc828	Fix error in composer.json	2020-05-06 09:51:12 +02:00
Mikael Roos	86737af69e	Update composer.json and move ext-gd from required to suggested to ease installation where cli does not have all extensions installed.	2020-05-06 09:06:46 +02:00
Mikael Roos	c563275ed5	Support PHP 7.4, some minor fixes with notices.	2020-01-15 16:51:39 +01:00
Mikael Roos	8fec09b195	Merge pull request #176 from SpaceLenore/patch-1 fixed markdown syntax	2018-10-28 19:08:45 +01:00
Lenore	ac16343cd7	fixed markdown syntax added spaces so the markdown gets parsed correctly	2018-10-28 17:49:35 +01:00
Mikael Roos	cd142c5880	prepare to tag	2017-11-06 10:24:47 +01:00
Mikael Roos	91dd92d483	Remove webroot/img/{round8.PNG,wider.JPEG,wider.JPG} to avoid unzip warning message when installing with composer.	2017-11-06 10:24:16 +01:00
Mikael Roos	4b64d921d1	Adding docker-compose.yml #169 .	2017-06-26 10:30:21 +02:00
Mikael Roos	4211d7e0e6	Adding docker-compose.yml #169 .	2017-06-26 10:30:08 +02:00
Mikael Roos	dd8878c8bd	add issue number	2017-03-31 00:55:38 +02:00
Mikael Roos	f9604518e4	prepare to tag v0.7.19	2017-03-31 00:47:55 +02:00
Mikael Roos	61aa52854e	Move exception handler from functions.php to img.php.	2017-03-31 00:46:43 +02:00
Mikael Roos	401478c839	Correct XSS injection in check_system.php.	2016-08-31 15:26:14 +02:00
Mikael Roos	f0ab9479d6	read lena.tif, will need it in the future	2016-08-13 18:33:09 +02:00
Mikael Roos	9ff7a61ca9	remove tif version of lena	2016-08-13 17:49:36 +02:00
Mikael Roos	3170beb832	Composer suggests ext-imagick and ext-curl.	2016-08-11 17:39:45 +02:00
Mikael Roos	8001f72a1a	prepare to tag v0.7.18	2016-08-09 13:27:46 +02:00
Mikael Roos	0f9e0220f1	Made &lossless a requirement to not use the original image.	2016-08-09 13:27:30 +02:00
Mikael Roos	e59ef91991	prepare to tag v0.7.17	2016-08-09 13:23:04 +02:00
Mikael Roos	2337dbe94c	Made &lossless part of the generated cache filename.	2016-08-09 13:22:33 +02:00
Mikael Roos	c5de59a754	prepare to tag v0.7.16	2016-08-09 13:02:25 +02:00
Mikael Roos	7ab19d39d6	adding support for pngquant	2016-08-09 13:01:38 +02:00
Mikael Roos	9f6cba9292	changed date of release	2016-08-09 10:21:41 +02:00
Mikael Roos	21e53887b8	prepare to tag v0.7.15	2016-08-09 10:19:49 +02:00
Mikael Roos	66c5a07767	webp partly working	2016-08-09 09:32:02 +02:00
Mikael Roos	bbfd895c4c	webp implemented but fail to verify	2016-08-08 16:49:29 +02:00
Mikael Roos	b5de49d601	add debug for test	2016-08-08 16:48:23 +02:00
Mikael Roos	7677fc772f	remove debugging	2016-08-08 16:21:36 +02:00
Mikael Roos	3d0b25abe0	test support for webp images	2016-08-08 16:13:51 +02:00
Mikael Roos	1e5de9d225	Added the [Lenna/Lena sample image](http://www.cs.cmu.edu/~chuck/lennapg/) as tif and created a png, jpeg and webp version using Imagick convert `convert lena.tif lena.{png,jpg,webp}`.	2016-08-08 14:42:12 +02:00
Mikael Roos	43cb5b79b2	prepare to tag v0.7.14	2016-08-08 12:20:01 +02:00
Mikael Roos	8e10e9ba5c	Re-add removed cache directory.	2016-08-08 12:19:31 +02:00
Mikael Roos	1738680301	Make fast track cache disabled by default in the config file.	2016-08-08 12:19:04 +02:00
Mikael Roos	9b110037b4	prepare to tag v0.7.13	2016-08-08 11:35:12 +02:00
Mikael Roos	9a912e7f01	prepare to merge	2016-08-08 11:33:04 +02:00
Mikael Roos	689865a8b2	even more testing	2016-08-08 11:19:53 +02:00
Mikael Roos	493ed45311	more test	2016-08-08 10:44:27 +02:00
Mikael Roos	72c04632b8	more test	2016-08-08 10:39:11 +02:00
Mikael Roos	b1d0cb1506	prepare to test	2016-08-08 09:29:26 +02:00
Mikael Roos	c637fa23ef	test with imgf	2016-07-18 16:38:57 +02:00
Mikael Roos	6cccf5497d	added and fixed fast track cache script version	2016-07-18 01:00:55 +02:00
Mikael Roos	0dd562aa61	add really fast track cache script	2016-07-18 00:44:46 +02:00
Mikael Roos	9a0a9429db	make debug depend on file exists	2016-07-10 22:57:58 +02:00
Mikael Roos	6118f298ff	prepare to test fast track cache	2016-07-10 22:54:11 +02:00
Mikael Roos	32a23894d1	cleanup, removed code comments, codestyle	2016-06-01 10:11:44 +02:00
Mikael Roos	cde8bab6e7	tagging v0.7.12	2016-06-01 09:37:28 +02:00
Mikael Roos	5edbfc9b54	prepare to tag v0.7.12	2016-06-01 09:34:30 +02:00
Mikael Roos	9e9c44c935	Fixed to correctly display image when using a resize strategy without height or width.	2016-06-01 09:31:28 +02:00
Mikael Roos	9088647d3a	Fixed background color for option , #144 .	2016-06-01 09:30:18 +02:00
Mikael Roos	8ad324b4f5	update readme with latest version number	2016-04-18 16:09:49 +02:00
Mikael Roos	3b16b4b79d	prepare to tag v0.7.11	2016-04-18 15:58:39 +02:00
Mikael Roos	4e940164f9	Add option for skip_original to config file to always skip original, #118 .	2016-04-18 15:53:55 +02:00
Mikael Roos	1943d6606b	update years in license	2016-04-01 11:25:36 +02:00
Mikael Roos	5eebaa66ce	update to latest version	2016-04-01 10:32:44 +02:00
Mikael Roos	c5cc0314c2	prepare to tag v0.7.10	2016-04-01 10:30:25 +02:00
Mikael Roos	71816261f2	prepare to merge master	2016-04-01 10:27:33 +02:00
Mikael Roos	a62d7cb6c2	Add backup option for images src-alt, #141 .	2016-04-01 10:24:24 +02:00
Mikael Roos	ccbd08949f	add for testcase #134	2016-01-26 17:40:10 +01:00
Mikael Roos	6467fcc748	Add require of ext-gd in composer.json, #133 .	2016-01-14 16:19:00 +01:00
Mikael Roos	14d22a18e5	Merge pull request #133 from abcdmitry/patch-1 Add GD extension to the composer requiremets	2016-01-14 16:17:43 +01:00
Dmitry Lukashin	6d3687d838	Add PHP extensions to the composer requirements	2016-01-14 16:03:13 +03:00
Mikael Roos	ad8f6c12ee	creating bundles	2015-12-07 17:40:00 +01:00
Mikael Roos	ad4930c3ae	Fix strict mode only reporting 404 when failure, #127 .	2015-12-07 17:39:34 +01:00