mirror/php-cimage
1
0
Fork 0
mirror of https://github.com/mosbth/cimage.git synced 2025-08-02 14:17:44 +02:00
Code Issues Releases Wiki Activity

clear whitespace

Browse Source
This commit is contained in:
Mikael Roos
2015-12-07 15:35:19 +01:00
parent 179469334a
commit 6e0c775ede
6 changed files with 31 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CAsciiArt.php
View File

@@ -175,7 +175,7 @@ class CAsciiArt
*/ */
public function getLuminance($red, $green, $blue) public function getLuminance($red, $green, $blue)
{ {
switch($this->luminanceStrategy) { switch ($this->luminanceStrategy) {
case 1: case 1:
$luminance = ($red * 0.2126 + $green * 0.7152 + $blue * 0.0722) / 255; $luminance = ($red * 0.2126 + $green * 0.7152 + $blue * 0.0722) / 255;
break; break;

8
CImage.php
View File

@@ -400,7 +400,7 @@ class CImage
*/ */
const RESIZE = 1; const RESIZE = 1;
const RESAMPLE = 2; const RESAMPLE = 2;
private $copyStrategy = NULL; private $copyStrategy = null;
@@ -1634,7 +1634,7 @@ class CImage
*/ */
public function imageCopyResampled($dst_image, $src_image, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h) public function imageCopyResampled($dst_image, $src_image, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h)
{ {
if($this->copyStrategy == self::RESIZE) { if ($this->copyStrategy == self::RESIZE) {
$this->log("Copy by resize"); $this->log("Copy by resize");
imagecopyresized($dst_image, $src_image, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h); imagecopyresized($dst_image, $src_image, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);
} else { } else {
@@ -2312,7 +2312,7 @@ class CImage
$type = $this->getTargetImageExtension(); $type = $this->getTargetImageExtension();
$this->Log("Saving image as " . $type); $this->Log("Saving image as " . $type);
switch($type) { switch ($type) {
case 'jpeg': case 'jpeg':
case 'jpg': case 'jpg':
@@ -2549,7 +2549,7 @@ class CImage
header('Last-Modified: ' . $gmdate . " GMT"); header('Last-Modified: ' . $gmdate . " GMT");
} }
foreach($this->HTTPHeader as $key => $val) { foreach ($this->HTTPHeader as $key => $val) {
header("$key: $val"); header("$key: $val");
} }

4
test/CImageRemoteDownloadTest.php
View File

@@ -61,7 +61,7 @@ class CImageRemoteDownloadTest extends \PHPUnit_Framework_TestCase
public function testAllowRemoteDownloadDefaultPatternValid($source) public function testAllowRemoteDownloadDefaultPatternValid($source)
{ {
$img = new CImage(); $img = new CImage();
$img->setRemoteDownload(true); $img->setRemoteDownload(true, "");
$res = $img->isRemoteSource($source); $res = $img->isRemoteSource($source);
$this->assertTrue($res, "Should be a valid remote source: '$source'."); $this->assertTrue($res, "Should be a valid remote source: '$source'.");
@@ -79,7 +79,7 @@ class CImageRemoteDownloadTest extends \PHPUnit_Framework_TestCase
public function testAllowRemoteDownloadDefaultPatternInvalid($source) public function testAllowRemoteDownloadDefaultPatternInvalid($source)
{ {
$img = new CImage(); $img = new CImage();
$img->setRemoteDownload(true); $img->setRemoteDownload(true, "");
$res = $img->isRemoteSource($source); $res = $img->isRemoteSource($source);
$this->assertFalse($res, "Should not be a valid remote source: '$source'."); $this->assertFalse($res, "Should not be a valid remote source: '$source'.");

17
webroot/img.php
View File

@@ -63,8 +63,9 @@ set_exception_handler(function ($exception) {
. $exception->getMessage() . $exception->getMessage()
. "</p><pre>" . "</p><pre>"
. $exception->getTraceAsString() . $exception->getTraceAsString()
. "</pre>" . "</pre>",
, 500); 500
);
}); });
@@ -263,7 +264,7 @@ $pwd = get(array('password', 'pwd'), null);
// Check if passwords match, if configured to use passwords // Check if passwords match, if configured to use passwords
$passwordMatch = null; $passwordMatch = null;
if ($pwd) { if ($pwd) {
switch($pwdType) { switch ($pwdType) {
case 'md5': case 'md5':
$passwordMatch = ($pwdConfig === md5($pwd)); $passwordMatch = ($pwdConfig === md5($pwd));
break; break;
@@ -439,14 +440,16 @@ if ($dummyEnabled && $srcImage === $dummyFilename) {
is_file($pathToImage) is_file($pathToImage)
or errorPage( or errorPage(
'Source image is not a valid file, check the filename and that a 'Source image is not a valid file, check the filename and that a
matching file exists on the filesystem.' matching file exists on the filesystem.',
, 404); 404
);
substr_compare($imageDir, $pathToImage, 0, strlen($imageDir)) == 0 substr_compare($imageDir, $pathToImage, 0, strlen($imageDir)) == 0
or errorPage( or errorPage(
'Security constraint: Source image is not below the directory "image_path" 'Security constraint: Source image is not below the directory "image_path"
as specified in the config file img_config.php.' as specified in the config file img_config.php.',
, 404); 404
);
} }
verbose("src = $srcImage"); verbose("src = $srcImage");