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

Update CHttpGet.php for php 8.1 deprecated notice

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;
 

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

CImage.php

@@ -6,6 +6,7 @@
  * @example http://dbwebb.se/opensource/cimage
  * @link    https://github.com/mosbth/cimage
  */
+#[AllowDynamicProperties]
 class CImage
 {
 
@@ -423,6 +424,13 @@ class CImage
 
 
 
+    /*
+     * Use interlaced progressive mode for JPEG images.
+     */
+    private $interlace = false;
+
+
+
     /*
      * Image copy strategy, defaults to RESAMPLE.
      */
@@ -672,9 +680,9 @@ 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';
@@ -838,6 +846,7 @@ class CImage
             'blur'        => null,
             'convolve'       => null,
             'rotateAfter' => null,
+            'interlace' => null,
 
             // Output format
             'outputFormat' => null,
@@ -956,8 +965,11 @@ class CImage
     {
         $file = $file ? $file : $this->pathToImage;
 
-        is_readable($file)
+        // Special case to solve Windows 2 WSL integration
-            or $this->raiseError('Image file does not exist.');
+        if (!defined('WINDOWS2WSL')) {
+            is_readable($file)
+                or $this->raiseError('Image file does not exist.');
+        }
 
         $info = list($this->width, $this->height, $this->fileType) = getimagesize($file);
         if (empty($info)) {
@@ -1183,7 +1195,7 @@ class CImage
                 $this->newWidth = $width;
                 $this->newHeight = $height;
             }
-            
+
 
             // Get image dimensions for pre-resize image.
             if ($this->cropToFit || $this->fillToFit) {
@@ -1402,6 +1414,7 @@ class CImage
         $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;
@@ -1468,7 +1481,7 @@ class CImage
             . $quality . $filters . $sharpen . $emboss . $blur . $palette
             . $optimize . $compress
             . $scale . $rotateBefore . $rotateAfter . $autoRotate . $bgColor
-            . $convolve . $copyStrat . $lossy . $saveAs;
+            . $convolve . $copyStrat . $lossy . $interlace . $saveAs;
 
         return $this->setTarget($file, $base);
     }
@@ -1788,7 +1801,7 @@ class CImage
             // Resize by crop to fit
             $this->log("Resizing using strategy - Crop to fit");
 
-            if (!$this->upscale 
+            if (!$this->upscale
                 && ($this->width < $this->newWidth || $this->height < $this->newHeight)) {
                 $this->log("Resizing - smaller image, do not upscale.");
 
@@ -2367,7 +2380,7 @@ class CImage
             $this->jpegOptimizeCmd = null;
         }
 
-        if (array_key_exists("png_lossy", $options) 
+        if (array_key_exists("png_lossy", $options)
             && $options['png_lossy'] !== false) {
             $this->pngLossy = $options['png_lossy'];
             $this->pngLossyCmd = $options['png_lossy_cmd'];
@@ -2431,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);
@@ -2440,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);
 
@@ -2778,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);
+        $details['cache']       = basename($this->cacheFileName ?? "");
-        $lastModified           = filemtime($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['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" ;

README.md

@@ -2,8 +2,10 @@ 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
 -------------------------------------

REVISION.md

@@ -1,8 +1,81 @@
 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)
@@ -14,7 +87,7 @@ v0.7.21 (2020-01-15)
 v0.7.20 (2017-11-06)
 -------------------------------------
 
-* Remove webroot/img/{round8.PNG,wider.JPEG,wider.JPG} to avoid unzip warning message when installing with composer. 
+* Remove webroot/img/{round8.PNG,wider.JPEG,wider.JPG} to avoid unzip warning message when installing with composer.
 * Adding docker-compose.yml #169.
 
 
@@ -107,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.
@@ -118,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.
@@ -177,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.

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.

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,12 +18,12 @@
         "docs": "http://dbwebb.se/opensource/cimage"
     },
     "require": {
-        "php": ">=5.3",
+        "php": ">=7.0"
-        "ext-gd": "*"
     },
     "suggest": {
-        "ext-exif": "*",
         "ext-curl": "*",
+        "ext-exif": "*",
+        "ext-gd": "*",
         "ext-imagick": "*"
     },
     "autoload": {

defines.php

@@ -1,6 +1,6 @@
 <?php
 // Version of cimage and img.php
-define("CIMAGE_VERSION", "v0.7.20 (2017-11-06)");
+define("CIMAGE_VERSION", "v0.8.6 (2023-10-27)");
 
 // For CRemoteImage
 define("CIMAGE_USER_AGENT", "CImage/" . CIMAGE_VERSION);

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" ]

docker-compose.yml

@@ -1,30 +0,0 @@
-version: "3"
-services:
-    php74:
-        image: anax/dev:php74-apache
-        ports:
-            - "8074:80"
-        volumes:
-            - .:/home/anax/repo
-
-    php71:
-        image: cimage/php71-apache:latest
-        #build: .
-        ports:
-            - "8071:80"
-        volumes:
-            - ./:/var/www/html/
-    php70:
-        image: cimage/php70-apache:latest
-        #build: .
-        ports:
-            - "8070:80"
-        volumes:
-            - .:/var/www/html
-    php56:
-        image: cimage/php56-apache:latest
-        #build: .
-        ports:
-            - "8056:80"
-        volumes:
-            - .:/var/www/html

functions.php

@@ -107,6 +107,25 @@ function getDefined($key, $defined, $undefined)
 
 
 
+/**
+ * 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.
  *
@@ -132,7 +151,7 @@ function getConfig($key, $default)
  *
  * @return void or array.
  */
-function verbose($msg = null)
+function verbose($msg = null, $arg = "")
 {
     global $verbose, $verboseFile;
     static $log = array();
@@ -145,7 +164,15 @@ function verbose($msg = null)
         return $log;
     }
 
-    $log[] = $msg;
+    if (is_null($arg)) {
+        $arg = "null";
+    } elseif ($arg === false) {
+        $arg = "false";
+    } elseif ($arg === true) {
+        $arg = "true";
+    }
+
+    $log[] = $msg . $arg;
 }
 
 

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']?>",
+        "input1": "<?=e($_GET['input1'])?>",
-        "input2": "<?=$_GET['input2']?>",
+        "input2": "<?=e($_GET['input2'])?>",
-        "input3": "<?=$_GET['input3']?>",
+        "input3": "<?=e($_GET['input3'])?>",
-        "input4": "<?=$_GET['input4']?>",
+        "input4": "<?=e($_GET['input4'])?>",
-        "input5": "<?=$_GET['input5']?>",
+        "input5": "<?=e($_GET['input5'])?>",
-        "input6": "<?=$_GET['input6']?>",
+        "input6": "<?=e($_GET['input6'])?>",
-        "json": <?=$_GET['json']?>,
+        "json": <?=e($_GET['json'])?>,
-        "stack": <?=$_GET['stack']?>,
+        "stack": <?=e($_GET['stack'])?>,
-        "bg": <?=$_GET['bg']?>
+        "bg": <?=e($_GET['bg'])?>
     });
 <?php
 } elseif (isset($script)) {

webroot/img.php

@@ -186,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) {
@@ -285,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);
 
@@ -319,11 +319,11 @@ 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', null));
+$srcAltImage = urldecode(get('src-alt', ""));
 $srcAltConfig = getConfig('src_alt', null);
 if (empty($srcAltImage)) {
     $srcAltImage = $srcAltConfig;
@@ -381,7 +381,7 @@ if ($dummyEnabled && $srcImage === $dummyFilename) {
                 matching file exists on the filesystem.',
                 404
             );
-    } 
+    }
 }
 
 if ($imagePathConstraint && !$dummyImage && !$remoteSource) {
@@ -920,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.
  */
@@ -1081,6 +1093,7 @@ if (is_callable($hookBeforeCImage)) {
             'blur'      => $blur,
             'convolve'  => $convolve,
             'rotateAfter' => $rotateAfter,
+            'interlace' => $interlace,
 
             // Output format
             'outputFormat' => $outputFormat,
@@ -1136,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)
@@ -1169,6 +1183,7 @@ $img->log("Incoming arguments: " . print_r(verbose(), 1))
             'blur'      => $blur,
             'convolve'  => $convolve,
             'rotateAfter' => $rotateAfter,
+            'interlace' => $interlace,
 
             // Output format
             'outputFormat' => $outputFormat,

webroot/img_config.php

@@ -21,6 +21,15 @@ if (!defined("CIMAGE_DEBUG")) {
     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(
@@ -116,7 +125,7 @@ return array(
      *  password_type:   'text' // use plain password, not encoded,
      */
     //'password_always' => false, // always require password,
-    'password'        => "moped", // "secret-password",
+    //'password'        => "moped", // "secret-password",
     //'password_type'   => 'text', // supports 'text', 'md5', 'hash',
 
 
@@ -485,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,*/
 );

webroot/imgd.php

@@ -38,7 +38,7 @@ $config = array(
 
 
 // Version of cimage and img.php
-define("CIMAGE_VERSION", "v0.7.20 (2017-11-06)");
+define("CIMAGE_VERSION", "v0.8.6 (2023-10-27)");
 
 // For CRemoteImage
 define("CIMAGE_USER_AGENT", "CImage/" . CIMAGE_VERSION);
@@ -158,6 +158,25 @@ function getDefined($key, $defined, $undefined)
 
 
 
+/**
+ * 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.
  *
@@ -183,7 +202,7 @@ function getConfig($key, $default)
  *
  * @return void or array.
  */
-function verbose($msg = null)
+function verbose($msg = null, $arg = "")
 {
     global $verbose, $verboseFile;
     static $log = array();
@@ -196,7 +215,15 @@ function verbose($msg = null)
         return $log;
     }
 
-    $log[] = $msg;
+    if (is_null($arg)) {
+        $arg = "null";
+    } elseif ($arg === false) {
+        $arg = "false";
+    } elseif ($arg === true) {
+        $arg = "true";
+    }
+
+    $log[] = $msg . $arg;
 }
 
 
@@ -438,7 +465,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
@@ -1116,6 +1143,7 @@ class CAsciiArt
  * @example http://dbwebb.se/opensource/cimage
  * @link    https://github.com/mosbth/cimage
  */
+#[AllowDynamicProperties]
 class CImage
 {
 
@@ -1533,6 +1561,13 @@ class CImage
 
 
 
+    /*
+     * Use interlaced progressive mode for JPEG images.
+     */
+    private $interlace = false;
+
+
+
     /*
      * Image copy strategy, defaults to RESAMPLE.
      */
@@ -1782,9 +1817,9 @@ 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';
@@ -1948,6 +1983,7 @@ class CImage
             'blur'        => null,
             'convolve'       => null,
             'rotateAfter' => null,
+            'interlace' => null,
 
             // Output format
             'outputFormat' => null,
@@ -2066,8 +2102,11 @@ class CImage
     {
         $file = $file ? $file : $this->pathToImage;
 
-        is_readable($file)
+        // Special case to solve Windows 2 WSL integration
-            or $this->raiseError('Image file does not exist.');
+        if (!defined('WINDOWS2WSL')) {
+            is_readable($file)
+                or $this->raiseError('Image file does not exist.');
+        }
 
         $info = list($this->width, $this->height, $this->fileType) = getimagesize($file);
         if (empty($info)) {
@@ -2293,7 +2332,7 @@ class CImage
                 $this->newWidth = $width;
                 $this->newHeight = $height;
             }
-            
+
 
             // Get image dimensions for pre-resize image.
             if ($this->cropToFit || $this->fillToFit) {
@@ -2512,6 +2551,7 @@ class CImage
         $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;
@@ -2578,7 +2618,7 @@ class CImage
             . $quality . $filters . $sharpen . $emboss . $blur . $palette
             . $optimize . $compress
             . $scale . $rotateBefore . $rotateAfter . $autoRotate . $bgColor
-            . $convolve . $copyStrat . $lossy . $saveAs;
+            . $convolve . $copyStrat . $lossy . $interlace . $saveAs;
 
         return $this->setTarget($file, $base);
     }
@@ -2898,7 +2938,7 @@ class CImage
             // Resize by crop to fit
             $this->log("Resizing using strategy - Crop to fit");
 
-            if (!$this->upscale 
+            if (!$this->upscale
                 && ($this->width < $this->newWidth || $this->height < $this->newHeight)) {
                 $this->log("Resizing - smaller image, do not upscale.");
 
@@ -3477,7 +3517,7 @@ class CImage
             $this->jpegOptimizeCmd = null;
         }
 
-        if (array_key_exists("png_lossy", $options) 
+        if (array_key_exists("png_lossy", $options)
             && $options['png_lossy'] !== false) {
             $this->pngLossy = $options['png_lossy'];
             $this->pngLossyCmd = $options['png_lossy_cmd'];
@@ -3541,8 +3581,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);
@@ -3550,6 +3592,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);
 
@@ -3888,18 +3936,18 @@ class CImage
         $lastModified         = filemtime($this->pathToImage);
         $details['srcGmdate'] = gmdate("D, d M Y H:i:s", $lastModified);
 
-        $details['cache']       = basename($this->cacheFileName);
+        $details['cache']       = basename($this->cacheFileName ?? "");
-        $lastModified           = filemtime($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['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" ;
@@ -4098,6 +4146,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;
 
@@ -4582,7 +4639,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) {
@@ -4681,7 +4738,7 @@ $allowRemote = getConfig('remote_allow', false);
 
 if ($allowRemote && $passwordMatch !== false) {
     $cacheRemote = $cache->getPathToSubdir("remote");
-    
+
     $pattern = getConfig('remote_pattern', null);
     $img->setRemoteDownload($allowRemote, $cacheRemote, $pattern);
 
@@ -4715,11 +4772,11 @@ 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', null));
+$srcAltImage = urldecode(get('src-alt', ""));
 $srcAltConfig = getConfig('src_alt', null);
 if (empty($srcAltImage)) {
     $srcAltImage = $srcAltConfig;
@@ -4777,7 +4834,7 @@ if ($dummyEnabled && $srcImage === $dummyFilename) {
                 matching file exists on the filesystem.',
                 404
             );
-    } 
+    }
 }
 
 if ($imagePathConstraint && !$dummyImage && !$remoteSource) {
@@ -5316,6 +5373,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.
  */
@@ -5477,6 +5546,7 @@ if (is_callable($hookBeforeCImage)) {
             'blur'      => $blur,
             'convolve'  => $convolve,
             'rotateAfter' => $rotateAfter,
+            'interlace' => $interlace,
 
             // Output format
             'outputFormat' => $outputFormat,
@@ -5532,7 +5602,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)
@@ -5565,6 +5636,7 @@ $img->log("Incoming arguments: " . print_r(verbose(), 1))
             'blur'      => $blur,
             'convolve'  => $convolve,
             'rotateAfter' => $rotateAfter,
+            'interlace' => $interlace,
 
             // Output format
             'outputFormat' => $outputFormat,

webroot/imgp.php

@@ -38,7 +38,7 @@ $config = array(
 
 
 // Version of cimage and img.php
-define("CIMAGE_VERSION", "v0.7.20 (2017-11-06)");
+define("CIMAGE_VERSION", "v0.8.6 (2023-10-27)");
 
 // For CRemoteImage
 define("CIMAGE_USER_AGENT", "CImage/" . CIMAGE_VERSION);
@@ -158,6 +158,25 @@ function getDefined($key, $defined, $undefined)
 
 
 
+/**
+ * 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.
  *
@@ -183,7 +202,7 @@ function getConfig($key, $default)
  *
  * @return void or array.
  */
-function verbose($msg = null)
+function verbose($msg = null, $arg = "")
 {
     global $verbose, $verboseFile;
     static $log = array();
@@ -196,7 +215,15 @@ function verbose($msg = null)
         return $log;
     }
 
-    $log[] = $msg;
+    if (is_null($arg)) {
+        $arg = "null";
+    } elseif ($arg === false) {
+        $arg = "false";
+    } elseif ($arg === true) {
+        $arg = "true";
+    }
+
+    $log[] = $msg . $arg;
 }
 
 
@@ -438,7 +465,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
@@ -1116,6 +1143,7 @@ class CAsciiArt
  * @example http://dbwebb.se/opensource/cimage
  * @link    https://github.com/mosbth/cimage
  */
+#[AllowDynamicProperties]
 class CImage
 {
 
@@ -1533,6 +1561,13 @@ class CImage
 
 
 
+    /*
+     * Use interlaced progressive mode for JPEG images.
+     */
+    private $interlace = false;
+
+
+
     /*
      * Image copy strategy, defaults to RESAMPLE.
      */
@@ -1782,9 +1817,9 @@ 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';
@@ -1948,6 +1983,7 @@ class CImage
             'blur'        => null,
             'convolve'       => null,
             'rotateAfter' => null,
+            'interlace' => null,
 
             // Output format
             'outputFormat' => null,
@@ -2066,8 +2102,11 @@ class CImage
     {
         $file = $file ? $file : $this->pathToImage;
 
-        is_readable($file)
+        // Special case to solve Windows 2 WSL integration
-            or $this->raiseError('Image file does not exist.');
+        if (!defined('WINDOWS2WSL')) {
+            is_readable($file)
+                or $this->raiseError('Image file does not exist.');
+        }
 
         $info = list($this->width, $this->height, $this->fileType) = getimagesize($file);
         if (empty($info)) {
@@ -2293,7 +2332,7 @@ class CImage
                 $this->newWidth = $width;
                 $this->newHeight = $height;
             }
-            
+
 
             // Get image dimensions for pre-resize image.
             if ($this->cropToFit || $this->fillToFit) {
@@ -2512,6 +2551,7 @@ class CImage
         $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;
@@ -2578,7 +2618,7 @@ class CImage
             . $quality . $filters . $sharpen . $emboss . $blur . $palette
             . $optimize . $compress
             . $scale . $rotateBefore . $rotateAfter . $autoRotate . $bgColor
-            . $convolve . $copyStrat . $lossy . $saveAs;
+            . $convolve . $copyStrat . $lossy . $interlace . $saveAs;
 
         return $this->setTarget($file, $base);
     }
@@ -2898,7 +2938,7 @@ class CImage
             // Resize by crop to fit
             $this->log("Resizing using strategy - Crop to fit");
 
-            if (!$this->upscale 
+            if (!$this->upscale
                 && ($this->width < $this->newWidth || $this->height < $this->newHeight)) {
                 $this->log("Resizing - smaller image, do not upscale.");
 
@@ -3477,7 +3517,7 @@ class CImage
             $this->jpegOptimizeCmd = null;
         }
 
-        if (array_key_exists("png_lossy", $options) 
+        if (array_key_exists("png_lossy", $options)
             && $options['png_lossy'] !== false) {
             $this->pngLossy = $options['png_lossy'];
             $this->pngLossyCmd = $options['png_lossy_cmd'];
@@ -3541,8 +3581,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);
@@ -3550,6 +3592,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);
 
@@ -3888,18 +3936,18 @@ class CImage
         $lastModified         = filemtime($this->pathToImage);
         $details['srcGmdate'] = gmdate("D, d M Y H:i:s", $lastModified);
 
-        $details['cache']       = basename($this->cacheFileName);
+        $details['cache']       = basename($this->cacheFileName ?? "");
-        $lastModified           = filemtime($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['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" ;
@@ -4098,6 +4146,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;
 
@@ -4582,7 +4639,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) {
@@ -4681,7 +4738,7 @@ $allowRemote = getConfig('remote_allow', false);
 
 if ($allowRemote && $passwordMatch !== false) {
     $cacheRemote = $cache->getPathToSubdir("remote");
-    
+
     $pattern = getConfig('remote_pattern', null);
     $img->setRemoteDownload($allowRemote, $cacheRemote, $pattern);
 
@@ -4715,11 +4772,11 @@ 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', null));
+$srcAltImage = urldecode(get('src-alt', ""));
 $srcAltConfig = getConfig('src_alt', null);
 if (empty($srcAltImage)) {
     $srcAltImage = $srcAltConfig;
@@ -4777,7 +4834,7 @@ if ($dummyEnabled && $srcImage === $dummyFilename) {
                 matching file exists on the filesystem.',
                 404
             );
-    } 
+    }
 }
 
 if ($imagePathConstraint && !$dummyImage && !$remoteSource) {
@@ -5316,6 +5373,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.
  */
@@ -5477,6 +5546,7 @@ if (is_callable($hookBeforeCImage)) {
             'blur'      => $blur,
             'convolve'  => $convolve,
             'rotateAfter' => $rotateAfter,
+            'interlace' => $interlace,
 
             // Output format
             'outputFormat' => $outputFormat,
@@ -5532,7 +5602,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)
@@ -5565,6 +5636,7 @@ $img->log("Incoming arguments: " . print_r(verbose(), 1))
             'blur'      => $blur,
             'convolve'  => $convolve,
             'rotateAfter' => $rotateAfter,
+            'interlace' => $interlace,
 
             // Output format
             'outputFormat' => $outputFormat,

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>