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

refixing new cache management for remote images

Browse Source
This commit is contained in:
Mikael Roos
2015-12-07 16:01:47 +01:00
parent b069e322e9
commit 05c11ca9fc
2 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
CImage.php
View File

@@ -208,8 +208,8 @@ class CImage
/** /**
* Path to command to optimize jpeg images, for example jpegtran or null. * Path to command to optimize jpeg images, for example jpegtran or null.
*/ */
private $jpegOptimize; private $jpegOptimize;
private $jpegOptimizeCmd; private $jpegOptimizeCmd;
@@ -344,20 +344,27 @@ class CImage
/** /**
* Calculate target dimension for image when using fill-to-fit resize strategy. * Calculate target dimension for image when using fill-to-fit resize strategy.
*/ */
private $fillWidth; private $fillWidth;
private $fillHeight; private $fillHeight;
/** /**
* Allow remote file download, default is to disallow remote file download. * Allow remote file download, default is to disallow remote file download.
*/ */
private $allowRemote = false; private $allowRemote = false;
/**
* Path to cache for remote download.
*/
private $remoteCache;
/** /**
* Pattern to recognize a remote file. * Pattern to recognize a remote file.
*/ */
@@ -400,7 +407,7 @@ class CImage
*/ */
const RESIZE = 1; const RESIZE = 1;
const RESAMPLE = 2; const RESAMPLE = 2;
private $copyStrategy = null; private $copyStrategy = NULL;
@@ -631,7 +638,7 @@ class CImage
if ($extension == 'jpeg') { if ($extension == 'jpeg') {
$extension = 'jpg'; $extension = 'jpg';
} }
return $extension; return $extension;
} }
@@ -1619,11 +1626,11 @@ class CImage
* *
* @return $this * @return $this
*/ */
public function setCopyResizeStrategy($strategy) public function setCopyResizeStrategy($strategy)
{ {
$this->copyStrategy = $strategy; $this->copyStrategy = $strategy;
return $this; return $this;
} }
@@ -1634,7 +1641,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 +2319,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 +2556,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");
} }

2
CRemoteImage.php
View File

@@ -101,7 +101,7 @@ class CRemoteImage
*/ */
public function setCache($path) public function setCache($path)
{ {
$this->saveFolder = $path; $this->saveFolder = rtrim($path, "/") . "/";
return $this; return $this;
} }