Build to prepare to tag

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

@@ -679,9 +679,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';
@@ -964,8 +964,11 @@ 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.');
+        }
 
         $info = list($this->width, $this->height, $this->fileType) = getimagesize($file);
         if (empty($info)) {
@@ -2440,8 +2443,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);
@@ -2793,18 +2798,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['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,44 @@
 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.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)

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.

defines.php

@@ -1,6 +1,6 @@
 <?php
 // Version of cimage and img.php
-define("CIMAGE_VERSION", "v0.8.1 (2020-06-08)");
+define("CIMAGE_VERSION", "v0.8.5 (2022-11-17)");
 
 // For CRemoteImage
 define("CIMAGE_USER_AGENT", "CImage/" . CIMAGE_VERSION);

docker-compose.yaml

@@ -0,0 +1,88 @@
+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" ]
+
+    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

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)) {

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) {
@@ -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;
@@ -1149,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)

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',
 
 

webroot/imgd.php

@@ -38,7 +38,7 @@ $config = array(
 
 
 // Version of cimage and img.php
-define("CIMAGE_VERSION", "v0.8.1 (2020-06-08)");
+define("CIMAGE_VERSION", "v0.8.5 (2022-11-17)");
 
 // For CRemoteImage
 define("CIMAGE_USER_AGENT", "CImage/" . CIMAGE_VERSION);
@@ -465,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
@@ -1816,9 +1816,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';
@@ -2101,8 +2101,11 @@ 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.');
+        }
 
         $info = list($this->width, $this->height, $this->fileType) = getimagesize($file);
         if (empty($info)) {
@@ -3577,8 +3580,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);
@@ -3930,18 +3935,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['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" ;
@@ -4140,6 +4145,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;
 
@@ -4624,7 +4638,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) {
@@ -4757,11 +4771,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;
@@ -5587,7 +5601,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)

webroot/imgp.php

@@ -38,7 +38,7 @@ $config = array(
 
 
 // Version of cimage and img.php
-define("CIMAGE_VERSION", "v0.8.1 (2020-06-08)");
+define("CIMAGE_VERSION", "v0.8.5 (2022-11-17)");
 
 // For CRemoteImage
 define("CIMAGE_USER_AGENT", "CImage/" . CIMAGE_VERSION);
@@ -465,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
@@ -1816,9 +1816,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';
@@ -2101,8 +2101,11 @@ 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.');
+        }
 
         $info = list($this->width, $this->height, $this->fileType) = getimagesize($file);
         if (empty($info)) {
@@ -3577,8 +3580,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);
@@ -3930,18 +3935,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['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" ;
@@ -4140,6 +4145,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;
 
@@ -4624,7 +4638,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) {
@@ -4757,11 +4771,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;
@@ -5587,7 +5601,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)

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>