perdedora/leftypol
1
0
Fork 0
forked from leftypol/leftypol
Code Pull requests Activity

Better upload handling (don't move file before handling it)

Browse source
This commit is contained in:
Michael Save 2012-03-18 19:53:56 +11:00
parent fb5fc04599
commit c136d44894
2 changed files with 32 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

20
inc/image.php
View file

@ -216,8 +216,7 @@
public function init() {
global $config;
$this->temp = tempnam($config['tmp'], 'imagick');
$this->temp = false;
}
public function from() {
$size = trim(shell_exec('identify -format "%w %h" ' . escapeshellarg($this->src . '[0]')));
@ -232,8 +231,13 @@
}
}
public function to($src) {
rename($this->temp, $src);
chmod($src, 0664);
if(!$this->temp) {
// $config['redraw_image']
shell_exec('convert ' . escapeshellarg($this->src) . ' ' . escapeshellarg($src));
} else {
rename($this->temp, $src);
chmod($src, 0664);
}
}
public function width() {
return $this->width;
@ -243,10 +247,18 @@
}
public function destroy() {
@unlink($this->temp);
$this->temp = false;
}
public function resize() {
global $config;
if($this->temp) {
// remove old
$this->destroy();
}
$this->temp = tempnam($config['tmp'], 'imagick');
$quality = $config['thumb_quality'] * 10;
if(shell_exec("convert -flatten -filter Point -scale {$this->width}x{$this->height} +antialias -quality {$quality} " . escapeshellarg($this->src . '[0]') . " " . escapeshellarg($this->temp)) || !file_exists($this->temp))