mirror/php-cimage
1
0
Fork 0
mirror of https://github.com/mosbth/cimage.git synced 2025-01-16 18:48:14 +01: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
Show Stats 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)
{
switch($this->luminanceStrategy) {
switch ($this->luminanceStrategy) {
case 1:
$luminance = ($red * 0.2126 + $green * 0.7152 + $blue * 0.0722) / 255;
break;

2
CCache.php
View File

@ -75,7 +75,7 @@ class CCache
{
$path = realpath($this->path . "/" . $subdir);
$exists = is_dir($path);
$exists = is_dir($path);
$res = $exists ? "exists" : "does not exist";
if ($exists) {

24
CImage.php
View File

@ -208,8 +208,8 @@ class CImage
/**
* Path to command to optimize jpeg images, for example jpegtran or null.
*/
private $jpegOptimize;
private $jpegOptimizeCmd;
private $jpegOptimize;
private $jpegOptimizeCmd;
@ -400,7 +400,7 @@ class CImage
*/
const RESIZE = 1;
const RESAMPLE = 2;
private $copyStrategy = NULL;
private $copyStrategy = null;
@ -631,7 +631,7 @@ class CImage
if ($extension == 'jpeg') {
$extension = 'jpg';
}
}
return $extension;
}
@ -1619,11 +1619,11 @@ class CImage
*
* @return $this
*/
public function setCopyResizeStrategy($strategy)
{
$this->copyStrategy = $strategy;
return $this;
}
public function setCopyResizeStrategy($strategy)
{
$this->copyStrategy = $strategy;
return $this;
}
@ -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)
{
if($this->copyStrategy == self::RESIZE) {
if ($this->copyStrategy == self::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);
} else {
@ -2312,7 +2312,7 @@ class CImage
$type = $this->getTargetImageExtension();
$this->Log("Saving image as " . $type);
switch($type) {
switch ($type) {
case 'jpeg':
case 'jpg':
@ -2549,7 +2549,7 @@ class CImage
header('Last-Modified: ' . $gmdate . " GMT");
}
foreach($this->HTTPHeader as $key => $val) {
foreach ($this->HTTPHeader as $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)
{
$img = new CImage();
$img->setRemoteDownload(true);
$img->setRemoteDownload(true, "");
$res = $img->isRemoteSource($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)
{
$img = new CImage();
$img->setRemoteDownload(true);
$img->setRemoteDownload(true, "");
$res = $img->isRemoteSource($source);
$this->assertFalse($res, "Should not be a valid remote source: '$source'.");

6
test/CImageSRGBTest.php
View File

@ -38,7 +38,7 @@ class CImageSRGBTest extends \PHPUnit_Framework_TestCase
$img = new CImage();
$filename = $img->convert2sRGBColorSpace(
'car.png',
'car.png',
IMAGE_PATH,
$this->cache,
$this->srgbColorProfile
@ -63,8 +63,8 @@ class CImageSRGBTest extends \PHPUnit_Framework_TestCase
$img = new CImage();
$filename = $img->convert2sRGBColorSpace(
'car.jpg',
IMAGE_PATH,
'car.jpg',
IMAGE_PATH,
$this->cache,
$this->srgbColorProfile
);

21
webroot/img.php
View File

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