1
0
mirror of https://github.com/mosbth/cimage.git synced 2025-08-29 02:19:47 +02:00

Compare commits

...

22 Commits

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
16 changed files with 293 additions and 90 deletions

View File

@@ -51,6 +51,15 @@ class CCache
return $path; 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)) { if ($create && is_writable($this->path)) {
$path = $this->path . "/" . $subdir; $path = $this->path . "/" . $subdir;

View File

@@ -215,7 +215,7 @@ class CHttpGet
{ {
$type = isset($this->response['header']['Content-Type']) $type = isset($this->response['header']['Content-Type'])
? $this->response['header']['Content-Type'] ? $this->response['header']['Content-Type']
: null; : '';
return preg_match('#[a-z]+/[a-z]+#', $type) return preg_match('#[a-z]+/[a-z]+#', $type)
? $type ? $type

View File

@@ -6,6 +6,7 @@
* @example http://dbwebb.se/opensource/cimage * @example http://dbwebb.se/opensource/cimage
* @link https://github.com/mosbth/cimage * @link https://github.com/mosbth/cimage
*/ */
#[AllowDynamicProperties]
class CImage class CImage
{ {
@@ -679,9 +680,9 @@ class CImage
* *
* @return string $extension as a normalized file extension. * @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') { if ($extension == 'jpeg') {
$extension = 'jpg'; $extension = 'jpg';
@@ -964,8 +965,11 @@ class CImage
{ {
$file = $file ? $file : $this->pathToImage; $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); $info = list($this->width, $this->height, $this->fileType) = getimagesize($file);
if (empty($info)) { if (empty($info)) {
@@ -2440,8 +2444,10 @@ class CImage
return; return;
} }
is_writable($this->saveFolder) if (!defined("WINDOWS2WSL")) {
is_writable($this->saveFolder)
or $this->raiseError('Target directory is not writable.'); or $this->raiseError('Target directory is not writable.');
}
$type = $this->getTargetImageExtension(); $type = $this->getTargetImageExtension();
$this->Log("Saving image as " . $type); $this->Log("Saving image as " . $type);
@@ -2793,18 +2799,18 @@ class CImage
$lastModified = filemtime($this->pathToImage); $lastModified = filemtime($this->pathToImage);
$details['srcGmdate'] = gmdate("D, d M Y H:i:s", $lastModified); $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); $details['cacheGmdate'] = gmdate("D, d M Y H:i:s", $lastModified);
$this->load($file); $this->load($file);
$details['filename'] = basename($file); $details['filename'] = basename($file ?? "");
$details['mimeType'] = $this->getMimeType($this->fileType); $details['mimeType'] = $this->getMimeType($this->fileType);
$details['width'] = $this->width; $details['width'] = $this->width;
$details['height'] = $this->height; $details['height'] = $this->height;
$details['aspectRatio'] = round($this->width / $this->height, 3); $details['aspectRatio'] = round($this->width / $this->height, 3);
$details['size'] = filesize($file); $details['size'] = filesize($file ?? "");
$details['colors'] = $this->colorsTotal($this->image); $details['colors'] = $this->colorsTotal($this->image);
$details['includedFiles'] = count(get_included_files()); $details['includedFiles'] = count(get_included_files());
$details['memoryPeek'] = round(memory_get_peak_usage()/1024/1024, 3) . " MB" ; $details['memoryPeek'] = round(memory_get_peak_usage()/1024/1024, 3) . " MB" ;

View File

@@ -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) [![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://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) [![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 About
------------------------------------- -------------------------------------

View File

@@ -1,8 +1,51 @@
Revision history Revision history
===================================== =====================================
<!--
[![Build Status](https://travis-ci.org/mosbth/cimage.svg?branch=master)](https://travis-ci.org/mosbth/cimage) [![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) [![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) v0.8.1 (2020-06-08)

6
SECURITY.md Normal file
View File

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

View File

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

97
docker-compose.yaml Normal file
View File

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

View File

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

View File

@@ -3,6 +3,12 @@
<head> <head>
<style> <style>
<?php
function e($str) {
return htmlspecialchars($str, ENT_QUOTES, 'UTF-8');
}
?>
body { body {
} }
@@ -128,15 +134,15 @@ if (isset($_GET['input1'])) {
// Use incoming from querystring as defaults // Use incoming from querystring as defaults
?> ?>
CImage.compare({ 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 <?php
} elseif (isset($script)) { } elseif (isset($script)) {

View File

@@ -186,7 +186,7 @@ $hotlinkingWhitelist = getConfig('hotlinking_whitelist', array());
$serverName = isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : null; $serverName = isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : null;
$referer = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : 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 (!$allowHotlinking) {
if ($passwordMatch) { if ($passwordMatch) {
@@ -319,11 +319,11 @@ if (isset($shortcut)
/** /**
* src - the source image file. * src - the source image file.
*/ */
$srcImage = urldecode(get('src')) $srcImage = urldecode(get('src', ""))
or errorPage('Must set src-attribute.', 404); or errorPage('Must set src-attribute.', 404);
// Get settings for src-alt as backup image // Get settings for src-alt as backup image
$srcAltImage = urldecode(get('src-alt', null)); $srcAltImage = urldecode(get('src-alt', ""));
$srcAltConfig = getConfig('src_alt', null); $srcAltConfig = getConfig('src_alt', null);
if (empty($srcAltImage)) { if (empty($srcAltImage)) {
$srcAltImage = $srcAltConfig; $srcAltImage = $srcAltConfig;
@@ -1149,7 +1149,8 @@ EOD;
/** /**
* Load, process and output the image * 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) ->setSaveFolder($cachePath)
->useCache($useCache) ->useCache($useCache)
->setSource($srcImage, $imagePath) ->setSource($srcImage, $imagePath)

View File

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

View File

@@ -38,7 +38,7 @@ $config = array(
// Version of cimage and img.php // Version of cimage and img.php
define("CIMAGE_VERSION", "v0.8.1 (2020-06-08)"); define("CIMAGE_VERSION", "v0.8.6 (2023-10-27)");
// For CRemoteImage // For CRemoteImage
define("CIMAGE_USER_AGENT", "CImage/" . CIMAGE_VERSION); define("CIMAGE_USER_AGENT", "CImage/" . CIMAGE_VERSION);
@@ -465,7 +465,7 @@ class CHttpGet
{ {
$type = isset($this->response['header']['Content-Type']) $type = isset($this->response['header']['Content-Type'])
? $this->response['header']['Content-Type'] ? $this->response['header']['Content-Type']
: null; : '';
return preg_match('#[a-z]+/[a-z]+#', $type) return preg_match('#[a-z]+/[a-z]+#', $type)
? $type ? $type
@@ -1143,6 +1143,7 @@ class CAsciiArt
* @example http://dbwebb.se/opensource/cimage * @example http://dbwebb.se/opensource/cimage
* @link https://github.com/mosbth/cimage * @link https://github.com/mosbth/cimage
*/ */
#[AllowDynamicProperties]
class CImage class CImage
{ {
@@ -1816,9 +1817,9 @@ class CImage
* *
* @return string $extension as a normalized file extension. * @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') { if ($extension == 'jpeg') {
$extension = 'jpg'; $extension = 'jpg';
@@ -2101,8 +2102,11 @@ class CImage
{ {
$file = $file ? $file : $this->pathToImage; $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); $info = list($this->width, $this->height, $this->fileType) = getimagesize($file);
if (empty($info)) { if (empty($info)) {
@@ -3577,8 +3581,10 @@ class CImage
return; return;
} }
is_writable($this->saveFolder) if (!defined("WINDOWS2WSL")) {
is_writable($this->saveFolder)
or $this->raiseError('Target directory is not writable.'); or $this->raiseError('Target directory is not writable.');
}
$type = $this->getTargetImageExtension(); $type = $this->getTargetImageExtension();
$this->Log("Saving image as " . $type); $this->Log("Saving image as " . $type);
@@ -3930,18 +3936,18 @@ class CImage
$lastModified = filemtime($this->pathToImage); $lastModified = filemtime($this->pathToImage);
$details['srcGmdate'] = gmdate("D, d M Y H:i:s", $lastModified); $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); $details['cacheGmdate'] = gmdate("D, d M Y H:i:s", $lastModified);
$this->load($file); $this->load($file);
$details['filename'] = basename($file); $details['filename'] = basename($file ?? "");
$details['mimeType'] = $this->getMimeType($this->fileType); $details['mimeType'] = $this->getMimeType($this->fileType);
$details['width'] = $this->width; $details['width'] = $this->width;
$details['height'] = $this->height; $details['height'] = $this->height;
$details['aspectRatio'] = round($this->width / $this->height, 3); $details['aspectRatio'] = round($this->width / $this->height, 3);
$details['size'] = filesize($file); $details['size'] = filesize($file ?? "");
$details['colors'] = $this->colorsTotal($this->image); $details['colors'] = $this->colorsTotal($this->image);
$details['includedFiles'] = count(get_included_files()); $details['includedFiles'] = count(get_included_files());
$details['memoryPeek'] = round(memory_get_peak_usage()/1024/1024, 3) . " MB" ; $details['memoryPeek'] = round(memory_get_peak_usage()/1024/1024, 3) . " MB" ;
@@ -4140,6 +4146,15 @@ class CCache
return $path; 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)) { if ($create && is_writable($this->path)) {
$path = $this->path . "/" . $subdir; $path = $this->path . "/" . $subdir;
@@ -4624,7 +4639,7 @@ $hotlinkingWhitelist = getConfig('hotlinking_whitelist', array());
$serverName = isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : null; $serverName = isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : null;
$referer = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : 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 (!$allowHotlinking) {
if ($passwordMatch) { if ($passwordMatch) {
@@ -4757,11 +4772,11 @@ if (isset($shortcut)
/** /**
* src - the source image file. * src - the source image file.
*/ */
$srcImage = urldecode(get('src')) $srcImage = urldecode(get('src', ""))
or errorPage('Must set src-attribute.', 404); or errorPage('Must set src-attribute.', 404);
// Get settings for src-alt as backup image // Get settings for src-alt as backup image
$srcAltImage = urldecode(get('src-alt', null)); $srcAltImage = urldecode(get('src-alt', ""));
$srcAltConfig = getConfig('src_alt', null); $srcAltConfig = getConfig('src_alt', null);
if (empty($srcAltImage)) { if (empty($srcAltImage)) {
$srcAltImage = $srcAltConfig; $srcAltImage = $srcAltConfig;
@@ -5587,7 +5602,8 @@ EOD;
/** /**
* Load, process and output the image * 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) ->setSaveFolder($cachePath)
->useCache($useCache) ->useCache($useCache)
->setSource($srcImage, $imagePath) ->setSource($srcImage, $imagePath)

View File

@@ -38,7 +38,7 @@ $config = array(
// Version of cimage and img.php // Version of cimage and img.php
define("CIMAGE_VERSION", "v0.8.1 (2020-06-08)"); define("CIMAGE_VERSION", "v0.8.6 (2023-10-27)");
// For CRemoteImage // For CRemoteImage
define("CIMAGE_USER_AGENT", "CImage/" . CIMAGE_VERSION); define("CIMAGE_USER_AGENT", "CImage/" . CIMAGE_VERSION);
@@ -465,7 +465,7 @@ class CHttpGet
{ {
$type = isset($this->response['header']['Content-Type']) $type = isset($this->response['header']['Content-Type'])
? $this->response['header']['Content-Type'] ? $this->response['header']['Content-Type']
: null; : '';
return preg_match('#[a-z]+/[a-z]+#', $type) return preg_match('#[a-z]+/[a-z]+#', $type)
? $type ? $type
@@ -1143,6 +1143,7 @@ class CAsciiArt
* @example http://dbwebb.se/opensource/cimage * @example http://dbwebb.se/opensource/cimage
* @link https://github.com/mosbth/cimage * @link https://github.com/mosbth/cimage
*/ */
#[AllowDynamicProperties]
class CImage class CImage
{ {
@@ -1816,9 +1817,9 @@ class CImage
* *
* @return string $extension as a normalized file extension. * @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') { if ($extension == 'jpeg') {
$extension = 'jpg'; $extension = 'jpg';
@@ -2101,8 +2102,11 @@ class CImage
{ {
$file = $file ? $file : $this->pathToImage; $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); $info = list($this->width, $this->height, $this->fileType) = getimagesize($file);
if (empty($info)) { if (empty($info)) {
@@ -3577,8 +3581,10 @@ class CImage
return; return;
} }
is_writable($this->saveFolder) if (!defined("WINDOWS2WSL")) {
is_writable($this->saveFolder)
or $this->raiseError('Target directory is not writable.'); or $this->raiseError('Target directory is not writable.');
}
$type = $this->getTargetImageExtension(); $type = $this->getTargetImageExtension();
$this->Log("Saving image as " . $type); $this->Log("Saving image as " . $type);
@@ -3930,18 +3936,18 @@ class CImage
$lastModified = filemtime($this->pathToImage); $lastModified = filemtime($this->pathToImage);
$details['srcGmdate'] = gmdate("D, d M Y H:i:s", $lastModified); $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); $details['cacheGmdate'] = gmdate("D, d M Y H:i:s", $lastModified);
$this->load($file); $this->load($file);
$details['filename'] = basename($file); $details['filename'] = basename($file ?? "");
$details['mimeType'] = $this->getMimeType($this->fileType); $details['mimeType'] = $this->getMimeType($this->fileType);
$details['width'] = $this->width; $details['width'] = $this->width;
$details['height'] = $this->height; $details['height'] = $this->height;
$details['aspectRatio'] = round($this->width / $this->height, 3); $details['aspectRatio'] = round($this->width / $this->height, 3);
$details['size'] = filesize($file); $details['size'] = filesize($file ?? "");
$details['colors'] = $this->colorsTotal($this->image); $details['colors'] = $this->colorsTotal($this->image);
$details['includedFiles'] = count(get_included_files()); $details['includedFiles'] = count(get_included_files());
$details['memoryPeek'] = round(memory_get_peak_usage()/1024/1024, 3) . " MB" ; $details['memoryPeek'] = round(memory_get_peak_usage()/1024/1024, 3) . " MB" ;
@@ -4140,6 +4146,15 @@ class CCache
return $path; 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)) { if ($create && is_writable($this->path)) {
$path = $this->path . "/" . $subdir; $path = $this->path . "/" . $subdir;
@@ -4624,7 +4639,7 @@ $hotlinkingWhitelist = getConfig('hotlinking_whitelist', array());
$serverName = isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : null; $serverName = isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : null;
$referer = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : 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 (!$allowHotlinking) {
if ($passwordMatch) { if ($passwordMatch) {
@@ -4757,11 +4772,11 @@ if (isset($shortcut)
/** /**
* src - the source image file. * src - the source image file.
*/ */
$srcImage = urldecode(get('src')) $srcImage = urldecode(get('src', ""))
or errorPage('Must set src-attribute.', 404); or errorPage('Must set src-attribute.', 404);
// Get settings for src-alt as backup image // Get settings for src-alt as backup image
$srcAltImage = urldecode(get('src-alt', null)); $srcAltImage = urldecode(get('src-alt', ""));
$srcAltConfig = getConfig('src_alt', null); $srcAltConfig = getConfig('src_alt', null);
if (empty($srcAltImage)) { if (empty($srcAltImage)) {
$srcAltImage = $srcAltConfig; $srcAltImage = $srcAltConfig;
@@ -5587,7 +5602,8 @@ EOD;
/** /**
* Load, process and output the image * 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) ->setSaveFolder($cachePath)
->useCache($useCache) ->useCache($useCache)
->setSource($srcImage, $imagePath) ->setSource($srcImage, $imagePath)

File diff suppressed because one or more lines are too long

22
webroot/tests.php Normal file
View File

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