mirror/php-cimage
1
0
Fork 0
mirror of https://github.com/mosbth/cimage.git synced 2025-07-24 18:21:48 +02:00
Code Issues Releases Wiki Activity

Support filenames of uppercase JPEG, JPG, PNG and GIF, as proposed in #37.

Browse Source
This commit is contained in:
Mikael Roos
2014-11-21 21:01:22 +01:00
parent c83eac8c3c
commit 3b7485b3b9
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CImage.php
View File

@@ -91,7 +91,7 @@ class CImage
/**
* File extension to use when saving image
* File extension to use when saving image.
*/
private $extension;
@@ -237,7 +237,7 @@ class CImage
{
$valid = array('jpg', 'jpeg', 'png', 'gif');
in_array($extension, $valid)
in_array(strtolower($extension), $valid)
or $this->raiseError('Not a valid file extension.');
return $this;
@@ -262,7 +262,7 @@ class CImage
$this->imageSrc = ltrim($src, '/');
$this->imageFolder = rtrim($dir, '/');
$this->pathToImage = $this->imageFolder . '/' . $this->imageSrc;
$this->fileExtension = pathinfo($this->pathToImage, PATHINFO_EXTENSION);
$this->fileExtension = strtolower(pathinfo($this->pathToImage, PATHINFO_EXTENSION));
$this->extension = $this->fileExtension;
$this->checkFileExtension($this->fileExtension);
@@ -670,6 +670,7 @@ class CImage
public function setSaveAsExtension($saveAs = null)
{
if (isset($saveAs)) {
$saveAs = strtolower($saveAs);
$this->checkFileExtension($saveAs);
$this->saveAs = $saveAs;
$this->extension = $saveAs;
@@ -810,9 +811,11 @@ class CImage
$autoRotate = $this->autoRotate ? 'ar' : null;
/*
$this->extension = isset($this->extension)
? $this->extension
: $parts['extension'];
*/
// Check optimizing options
$optimize = null;

1
README.md
View File

@@ -133,6 +133,7 @@ Revision history
v0.5.x (latest)
* Support filenames of uppercase JPEG, JPG, PNG and GIF, as proposed in #37.
* Changing `CImage::output()` as proposed in #37.
* Adding security check that image filename is always below the path `image_path` as specified in `img_config.php` #37.
* Adding configuration item in `img_config.php` for setting valid characters in image filename.