mirror of
https://github.com/mosbth/cimage.git
synced 2025-08-30 19:09:51 +02:00
Compare commits
9 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
b44be78f06 | ||
|
1056f0a5ee | ||
|
1666ea1412 | ||
|
bb57af697b | ||
|
55ce23ae5e | ||
|
4589b3b3cd | ||
|
d5ca10cebc | ||
|
9d7343a2df | ||
|
3d7adcdbde |
@@ -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;
|
||||||
|
|
||||||
|
@@ -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
|
||||||
|
12
CImage.php
12
CImage.php
@@ -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
|
||||||
{
|
{
|
||||||
|
|
||||||
@@ -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);
|
||||||
|
@@ -2,8 +2,10 @@ Image conversion on the fly using PHP
|
|||||||
=====================================
|
=====================================
|
||||||
|
|
||||||
[](https://gitter.im/mosbth/cimage?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
|
[](https://gitter.im/mosbth/cimage?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
|
||||||
|
<!--
|
||||||
[](https://travis-ci.org/mosbth/cimage)
|
[](https://travis-ci.org/mosbth/cimage)
|
||||||
[](https://scrutinizer-ci.com/g/mosbth/cimage/build-status/master)
|
[](https://scrutinizer-ci.com/g/mosbth/cimage/build-status/master)
|
||||||
|
-->
|
||||||
|
|
||||||
About
|
About
|
||||||
-------------------------------------
|
-------------------------------------
|
||||||
|
17
REVISION.md
17
REVISION.md
@@ -1,8 +1,25 @@
|
|||||||
Revision history
|
Revision history
|
||||||
=====================================
|
=====================================
|
||||||
|
|
||||||
|
<!--
|
||||||
[](https://travis-ci.org/mosbth/cimage)
|
[](https://travis-ci.org/mosbth/cimage)
|
||||||
[](https://scrutinizer-ci.com/g/mosbth/cimage/build-status/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)
|
v0.8.4 (2022-05-30)
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
// Version of cimage and img.php
|
// Version of cimage and img.php
|
||||||
define("CIMAGE_VERSION", "v0.8.4 (2022-05-30)");
|
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);
|
||||||
|
@@ -15,6 +15,15 @@ services:
|
|||||||
- "8090:80"
|
- "8090:80"
|
||||||
volumes: [ ".:/home/anax/repo" ]
|
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:
|
php81:
|
||||||
image: anax/dev:php81
|
image: anax/dev:php81
|
||||||
volumes: [ ".:/home/anax/repo" ]
|
volumes: [ ".:/home/anax/repo" ]
|
||||||
|
@@ -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(
|
||||||
|
@@ -38,7 +38,7 @@ $config = array(
|
|||||||
|
|
||||||
|
|
||||||
// Version of cimage and img.php
|
// Version of cimage and img.php
|
||||||
define("CIMAGE_VERSION", "v0.8.4 (2022-05-30)");
|
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
|
||||||
{
|
{
|
||||||
|
|
||||||
@@ -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);
|
||||||
@@ -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;
|
||||||
|
|
||||||
|
@@ -38,7 +38,7 @@ $config = array(
|
|||||||
|
|
||||||
|
|
||||||
// Version of cimage and img.php
|
// Version of cimage and img.php
|
||||||
define("CIMAGE_VERSION", "v0.8.4 (2022-05-30)");
|
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
|
||||||
{
|
{
|
||||||
|
|
||||||
@@ -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);
|
||||||
@@ -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;
|
||||||
|
|
||||||
|
File diff suppressed because one or more lines are too long
22
webroot/tests.php
Normal file
22
webroot/tests.php
Normal 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>
|
Reference in New Issue
Block a user