mirror of https://github.com/friendica/friendica
Photo now uses Imagick instead of gd.
This commit is contained in:
Domovoy
parent
0ff93edeee
commit
fb2f4b6b35
|
|
@ -3,397 +3,351 @@
|
||||||
if(! class_exists("Photo")) {
|
if(! class_exists("Photo")) {
|
||||||
class Photo {
|
class Photo {
|
||||||
|
|
||||||
private $image;
|
private $image;
|
||||||
private $width;
|
private $ext;
|
||||||
private $height;
|
|
||||||
private $valid;
|
|
||||||
private $type;
|
|
||||||
private $types;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* supported mimetypes and corresponding file extensions
|
* supported mimetypes and corresponding file extensions
|
||||||
*/
|
*/
|
||||||
static function supportedTypes() {
|
static function supportedTypes() {
|
||||||
$t = array();
|
/**
|
||||||
$t['image/jpeg'] ='jpg';
|
* Imagick::queryFormats won't help us a lot there...
|
||||||
if (imagetypes() & IMG_PNG) $t['image/png'] = 'png';
|
* At least, not yet, other parts of friendica uses this array
|
||||||
return $t;
|
*/
|
||||||
}
|
$t = array(
|
||||||
|
'image/jpeg' => 'jpg',
|
||||||
|
'image/png' => 'png',
|
||||||
|
'image/gif' => 'gif'
|
||||||
|
);
|
||||||
|
return $t;
|
||||||
|
}
|
||||||
|
|
||||||
public function __construct($data, $type="image/jpeg") {
|
public function __construct($data, $type=null) {
|
||||||
|
$this->image = new Imagick();
|
||||||
|
$this->image->readImageBlob($data);
|
||||||
|
|
||||||
$this->types = $this->supportedTypes();
|
// If it is a gif, it may be animated, get it ready for any future operations
|
||||||
if (!array_key_exists($type,$this->types)){
|
if($this->image->getFormat() !== "GIF") $this->image = $this->image->coalesceImages();
|
||||||
$type='image/jpeg';
|
|
||||||
}
|
|
||||||
$this->valid = false;
|
|
||||||
$this->type = $type;
|
|
||||||
$this->image = @imagecreatefromstring($data);
|
|
||||||
if($this->image !== FALSE) {
|
|
||||||
$this->width = imagesx($this->image);
|
|
||||||
$this->height = imagesy($this->image);
|
|
||||||
$this->valid = true;
|
|
||||||
imagealphablending($this->image, false);
|
|
||||||
imagesavealpha($this->image, true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public function __destruct() {
|
$this->ext = strtolower($this->image->getImageFormat());
|
||||||
if($this->image)
|
}
|
||||||
imagedestroy($this->image);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function is_valid() {
|
public function __destruct() {
|
||||||
return $this->valid;
|
if($this->image) {
|
||||||
}
|
$this->image->clear();
|
||||||
|
$this->image->destroy();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public function getWidth() {
|
public function is_valid() {
|
||||||
return $this->width;
|
return ($this->image !== FALSE);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getHeight() {
|
public function getWidth() {
|
||||||
return $this->height;
|
if(!$this->is_valid())
|
||||||
}
|
return FALSE;
|
||||||
|
|
||||||
public function getImage() {
|
return $this->image->getImageWidth();
|
||||||
return $this->image;
|
}
|
||||||
}
|
|
||||||
|
|
||||||
public function getType() {
|
public function getHeight() {
|
||||||
return $this->type;
|
if(!$this->is_valid())
|
||||||
}
|
return FALSE;
|
||||||
public function getExt() {
|
|
||||||
return $this->types[$this->type];
|
|
||||||
}
|
|
||||||
|
|
||||||
public function scaleImage($max) {
|
return $this->image->getImageHeight();
|
||||||
|
}
|
||||||
|
|
||||||
$width = $this->width;
|
public function getImage() {
|
||||||
$height = $this->height;
|
if(!$this->is_valid())
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
$dest_width = $dest_height = 0;
|
/* Clean it */
|
||||||
|
$this->image = $this->image->deconstructImages();
|
||||||
|
return $this->image;
|
||||||
|
}
|
||||||
|
|
||||||
if((! $width)|| (! $height))
|
public function getType() {
|
||||||
return FALSE;
|
if(!$this->is_valid())
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
if($width > $max && $height > $max) {
|
// This should do the trick (see supportedTypes above)
|
||||||
if($width > $height) {
|
return 'image/'. $this->getExt();
|
||||||
$dest_width = $max;
|
}
|
||||||
$dest_height = intval(( $height * $max ) / $width);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
$dest_width = intval(( $width * $max ) / $height);
|
|
||||||
$dest_height = $max;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
if( $width > $max ) {
|
|
||||||
$dest_width = $max;
|
|
||||||
$dest_height = intval(( $height * $max ) / $width);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
if( $height > $max ) {
|
|
||||||
$dest_width = intval(( $width * $max ) / $height);
|
|
||||||
$dest_height = $max;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
$dest_width = $width;
|
|
||||||
$dest_height = $height;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
public function getExt() {
|
||||||
|
if(!$this->is_valid())
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
$dest = imagecreatetruecolor( $dest_width, $dest_height );
|
return $this->ext;
|
||||||
imagealphablending($dest, false);
|
}
|
||||||
imagesavealpha($dest, true);
|
|
||||||
if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha
|
|
||||||
imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dest_width, $dest_height, $width, $height);
|
|
||||||
if($this->image)
|
|
||||||
imagedestroy($this->image);
|
|
||||||
$this->image = $dest;
|
|
||||||
$this->width = imagesx($this->image);
|
|
||||||
$this->height = imagesy($this->image);
|
|
||||||
|
|
||||||
}
|
public function scaleImage($max) {
|
||||||
|
if(!$this->is_valid())
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
public function rotate($degrees) {
|
/**
|
||||||
$this->image = imagerotate($this->image,$degrees,0);
|
* If it is not animated, there will be only one iteration here,
|
||||||
$this->width = imagesx($this->image);
|
* so don't bother checking
|
||||||
$this->height = imagesy($this->image);
|
*/
|
||||||
}
|
// Don't forget to go back to the first frame for any further operation
|
||||||
|
$this->image->setFirstIterator();
|
||||||
|
do {
|
||||||
|
$this->image->resizeImage($max, $max, imagick::FILTER_LANCZOS, 1, true);
|
||||||
|
} while ($this->image->nextImage());
|
||||||
|
}
|
||||||
|
|
||||||
public function flip($horiz = true, $vert = false) {
|
public function rotate($degrees) {
|
||||||
$w = imagesx($this->image);
|
if(!$this->is_valid())
|
||||||
$h = imagesy($this->image);
|
return FALSE;
|
||||||
$flipped = imagecreate($w, $h);
|
|
||||||
if($horiz) {
|
|
||||||
for ($x = 0; $x < $w; $x++) {
|
|
||||||
imagecopy($flipped, $this->image, $x, 0, $w - $x - 1, 0, 1, $h);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if($vert) {
|
|
||||||
for ($y = 0; $y < $h; $y++) {
|
|
||||||
imagecopy($flipped, $this->image, 0, $y, 0, $h - $y - 1, $w, 1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
$this->image = $flipped;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function orient($filename) {
|
$this->image->setFirstIterator();
|
||||||
// based off comment on http://php.net/manual/en/function.imagerotate.php
|
do {
|
||||||
|
$this->image->rotateImage(new ImagickPixel(), $degrees);
|
||||||
|
} while ($this->image->nextImage());
|
||||||
|
}
|
||||||
|
|
||||||
if( (! function_exists('exif_read_data')) || ($this->getType() !== 'image/jpeg') )
|
public function flip($horiz = true, $vert = false) {
|
||||||
return;
|
if(!$this->is_valid())
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
$exif = exif_read_data($filename);
|
$this->image->setFirstIterator();
|
||||||
$ort = $exif['Orientation'];
|
do {
|
||||||
|
if($horiz) $this->image->flipImage();
|
||||||
|
if($vert) $this->image->flopImage();
|
||||||
|
} while ($this->image->nextImage());
|
||||||
|
}
|
||||||
|
|
||||||
switch($ort)
|
public function orient($filename) {
|
||||||
{
|
// based off comment on http://php.net/manual/en/function.imagerotate.php
|
||||||
case 1: // nothing
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 2: // horizontal flip
|
if(!$this->is_valid())
|
||||||
$this->flip();
|
return FALSE;
|
||||||
break;
|
|
||||||
|
|
||||||
case 3: // 180 rotate left
|
if( (! function_exists('exif_read_data')) || ($this->getType() !== 'image/jpeg') )
|
||||||
$this->rotate(180);
|
return;
|
||||||
break;
|
|
||||||
|
|
||||||
case 4: // vertical flip
|
$exif = exif_read_data($filename);
|
||||||
$this->flip(false, true);
|
$ort = $exif['Orientation'];
|
||||||
break;
|
|
||||||
|
|
||||||
case 5: // vertical flip + 90 rotate right
|
switch($ort)
|
||||||
$this->flip(false, true);
|
{
|
||||||
|
case 1: // nothing
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 2: // horizontal flip
|
||||||
|
$this->flip();
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 3: // 180 rotate left
|
||||||
|
$this->rotate(180);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 4: // vertical flip
|
||||||
|
$this->flip(false, true);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 5: // vertical flip + 90 rotate right
|
||||||
|
$this->flip(false, true);
|
||||||
$this->rotate(-90);
|
$this->rotate(-90);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 6: // 90 rotate right
|
case 6: // 90 rotate right
|
||||||
$this->rotate(-90);
|
$this->rotate(-90);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 7: // horizontal flip + 90 rotate right
|
case 7: // horizontal flip + 90 rotate right
|
||||||
$this->flip();
|
$this->flip();
|
||||||
$this->rotate(-90);
|
$this->rotate(-90);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 8: // 90 rotate left
|
case 8: // 90 rotate left
|
||||||
$this->rotate(90);
|
$this->rotate(90);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public function scaleImageUp($min) {
|
public function scaleImageUp($min) {
|
||||||
|
if(!$this->is_valid())
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
$width = $this->width;
|
$this->scaleImage($min);
|
||||||
$height = $this->height;
|
}
|
||||||
|
|
||||||
$dest_width = $dest_height = 0;
|
|
||||||
|
|
||||||
if((! $width)|| (! $height))
|
|
||||||
return FALSE;
|
|
||||||
|
|
||||||
if($width < $min && $height < $min) {
|
|
||||||
if($width > $height) {
|
|
||||||
$dest_width = $min;
|
|
||||||
$dest_height = intval(( $height * $min ) / $width);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
$dest_width = intval(( $width * $min ) / $height);
|
|
||||||
$dest_height = $min;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
if( $width < $min ) {
|
|
||||||
$dest_width = $min;
|
|
||||||
$dest_height = intval(( $height * $min ) / $width);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
if( $height < $min ) {
|
|
||||||
$dest_width = intval(( $width * $min ) / $height);
|
|
||||||
$dest_height = $min;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
$dest_width = $width;
|
|
||||||
$dest_height = $height;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
$dest = imagecreatetruecolor( $dest_width, $dest_height );
|
|
||||||
imagealphablending($dest, false);
|
|
||||||
imagesavealpha($dest, true);
|
|
||||||
if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha
|
|
||||||
imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dest_width, $dest_height, $width, $height);
|
|
||||||
if($this->image)
|
|
||||||
imagedestroy($this->image);
|
|
||||||
$this->image = $dest;
|
|
||||||
$this->width = imagesx($this->image);
|
|
||||||
$this->height = imagesy($this->image);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public function scaleImageSquare($dim) {
|
public function scaleImageSquare($dim) {
|
||||||
|
if(!$this->is_valid())
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
$dest = imagecreatetruecolor( $dim, $dim );
|
$this->image->setFirstIterator();
|
||||||
imagealphablending($dest, false);
|
do {
|
||||||
imagesavealpha($dest, true);
|
$this->image->resizeImage($max, $max, imagick::FILTER_LANCZOS, 1, false);
|
||||||
if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha
|
} while ($this->image->nextImage());
|
||||||
imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dim, $dim, $this->width, $this->height);
|
}
|
||||||
if($this->image)
|
|
||||||
imagedestroy($this->image);
|
|
||||||
$this->image = $dest;
|
|
||||||
$this->width = imagesx($this->image);
|
|
||||||
$this->height = imagesy($this->image);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public function cropImage($max,$x,$y,$w,$h) {
|
public function cropImage($max,$x,$y,$w,$h) {
|
||||||
$dest = imagecreatetruecolor( $max, $max );
|
if(!$this->is_valid())
|
||||||
imagealphablending($dest, false);
|
return FALSE;
|
||||||
imagesavealpha($dest, true);
|
|
||||||
if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha
|
|
||||||
imagecopyresampled($dest, $this->image, 0, 0, $x, $y, $max, $max, $w, $h);
|
|
||||||
if($this->image)
|
|
||||||
imagedestroy($this->image);
|
|
||||||
$this->image = $dest;
|
|
||||||
$this->width = imagesx($this->image);
|
|
||||||
$this->height = imagesy($this->image);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function saveImage($path) {
|
$this->image->setFirstIterator();
|
||||||
switch($this->type){
|
do {
|
||||||
case "image/png":
|
$this->image->cropImage($w, $h, $x, $y);
|
||||||
$quality = get_config('system','png_quality');
|
/**
|
||||||
if((! $quality) || ($quality > 9))
|
* We need to remove the canva,
|
||||||
$quality = PNG_QUALITY;
|
* or the image is not resized to the crop:
|
||||||
imagepng($this->image, $path, $quality);
|
* http://php.net/manual/en/imagick.cropimage.php#97232
|
||||||
break;
|
*/
|
||||||
default:
|
$this->image->setImagePage(0, 0, 0, 0);
|
||||||
$quality = get_config('system','jpeg_quality');
|
} while ($this->image->nextImage());
|
||||||
if((! $quality) || ($quality > 100))
|
$this->scaleImage($max);
|
||||||
$quality = JPEG_QUALITY;
|
}
|
||||||
imagejpeg($this->image,$path,$quality);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
public function saveImage($path) {
|
||||||
|
if(!$this->is_valid())
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
public function imageString() {
|
$string = $this->imageString();
|
||||||
ob_start();
|
file_put_contents($path, $string);
|
||||||
switch($this->type){
|
}
|
||||||
case "image/png":
|
|
||||||
$quality = get_config('system','png_quality');
|
|
||||||
if((! $quality) || ($quality > 9))
|
|
||||||
$quality = PNG_QUALITY;
|
|
||||||
imagepng($this->image,NULL, $quality);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
$quality = get_config('system','jpeg_quality');
|
|
||||||
if((! $quality) || ($quality > 100))
|
|
||||||
$quality = JPEG_QUALITY;
|
|
||||||
|
|
||||||
imagejpeg($this->image,NULL,$quality);
|
public function imageString() {
|
||||||
}
|
if(!$this->is_valid())
|
||||||
$s = ob_get_contents();
|
return FALSE;
|
||||||
ob_end_clean();
|
|
||||||
return $s;
|
$quality = FALSE;
|
||||||
}
|
|
||||||
|
/**
|
||||||
|
* Hmmm,
|
||||||
|
* we should do the conversion/compression at the initialisation i think
|
||||||
|
* This method may be called several times,
|
||||||
|
* and there is no need to do that more than once
|
||||||
|
*/
|
||||||
|
switch($this->image->getImageFormat()){
|
||||||
|
case "PNG":
|
||||||
|
$quality = get_config('system','png_quality');
|
||||||
|
if((! $quality) || ($quality > 9))
|
||||||
|
$quality = PNG_QUALITY;
|
||||||
|
/**
|
||||||
|
* From http://www.imagemagick.org/script/command-line-options.php#quality:
|
||||||
|
*
|
||||||
|
* 'For the MNG and PNG image formats, the quality value sets
|
||||||
|
* the zlib compression level (quality / 10) and filter-type (quality % 10).
|
||||||
|
* The default PNG "quality" is 75, which means compression level 7 with adaptive PNG filtering,
|
||||||
|
* unless the image has a color map, in which case it means compression level 7 with no PNG filtering'
|
||||||
|
*/
|
||||||
|
$quality = $quality * 10;
|
||||||
|
break;
|
||||||
|
case "GIF":
|
||||||
|
// We change nothing here, do we?
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
// Convert to jpeg by default
|
||||||
|
$quality = get_config('system','jpeg_quality');
|
||||||
|
if((! $quality) || ($quality > 100))
|
||||||
|
$quality = JPEG_QUALITY;
|
||||||
|
$this->image->setImageFormat('jpeg');
|
||||||
|
}
|
||||||
|
|
||||||
|
if($quality !== FALSE) {
|
||||||
|
// Do we need to iterate for animations?
|
||||||
|
$this->image->setImageCompressionQuality($quality);
|
||||||
|
$this->image->stripImage();
|
||||||
|
}
|
||||||
|
|
||||||
|
$string = $this->image->getImagesBlob();
|
||||||
|
return $string;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public function store($uid, $cid, $rid, $filename, $album, $scale, $profile = 0, $allow_cid = '', $allow_gid = '', $deny_cid = '', $deny_gid = '') {
|
public function store($uid, $cid, $rid, $filename, $album, $scale, $profile = 0, $allow_cid = '', $allow_gid = '', $deny_cid = '', $deny_gid = '') {
|
||||||
|
|
||||||
$r = q("select `guid` from photo where `resource-id` = '%s' and `guid` != '' limit 1",
|
$r = q("select `guid` from photo where `resource-id` = '%s' and `guid` != '' limit 1",
|
||||||
dbesc($rid)
|
dbesc($rid)
|
||||||
);
|
);
|
||||||
if(count($r))
|
if(count($r))
|
||||||
$guid = $r[0]['guid'];
|
$guid = $r[0]['guid'];
|
||||||
else
|
else
|
||||||
$guid = get_guid();
|
$guid = get_guid();
|
||||||
|
|
||||||
$x = q("select id from photo where `resource-id` = '%s' and uid = %d and `contact-id` = %d and `scale` = %d limit 1",
|
$x = q("select id from photo where `resource-id` = '%s' and uid = %d and `contact-id` = %d and `scale` = %d limit 1",
|
||||||
dbesc($rid),
|
dbesc($rid),
|
||||||
intval($uid),
|
intval($uid),
|
||||||
intval($cid),
|
intval($cid),
|
||||||
intval($scale)
|
intval($scale)
|
||||||
);
|
);
|
||||||
if(count($x)) {
|
if(count($x)) {
|
||||||
$r = q("UPDATE `photo`
|
$r = q("UPDATE `photo`
|
||||||
set `uid` = %d,
|
set `uid` = %d,
|
||||||
`contact-id` = %d,
|
`contact-id` = %d,
|
||||||
`guid` = '%s',
|
`guid` = '%s',
|
||||||
`resource-id` = '%s',
|
`resource-id` = '%s',
|
||||||
`created` = '%s',
|
`created` = '%s',
|
||||||
`edited` = '%s',
|
`edited` = '%s',
|
||||||
`filename` = '%s',
|
`filename` = '%s',
|
||||||
`type` = '%s',
|
`type` = '%s',
|
||||||
`album` = '%s',
|
`album` = '%s',
|
||||||
`height` = %d,
|
`height` = %d,
|
||||||
`width` = %d,
|
`width` = %d,
|
||||||
`data` = '%s',
|
`data` = '%s',
|
||||||
`scale` = %d,
|
`scale` = %d,
|
||||||
`profile` = %d,
|
`profile` = %d,
|
||||||
`allow_cid` = '%s',
|
`allow_cid` = '%s',
|
||||||
`allow_gid` = '%s',
|
`allow_gid` = '%s',
|
||||||
`deny_cid` = '%s',
|
`deny_cid` = '%s',
|
||||||
`deny_gid` = '%s'
|
`deny_gid` = '%s'
|
||||||
where id = %d limit 1",
|
where id = %d limit 1",
|
||||||
|
|
||||||
intval($uid),
|
intval($uid),
|
||||||
intval($cid),
|
intval($cid),
|
||||||
dbesc($guid),
|
dbesc($guid),
|
||||||
dbesc($rid),
|
dbesc($rid),
|
||||||
dbesc(datetime_convert()),
|
dbesc(datetime_convert()),
|
||||||
dbesc(datetime_convert()),
|
dbesc(datetime_convert()),
|
||||||
dbesc(basename($filename)),
|
dbesc(basename($filename)),
|
||||||
dbesc($this->type),
|
dbesc($this->getType()),
|
||||||
dbesc($album),
|
dbesc($album),
|
||||||
intval($this->height),
|
intval($this->getHeight()),
|
||||||
intval($this->width),
|
intval($this->getWidth()),
|
||||||
dbesc($this->imageString()),
|
dbesc($this->imageString()),
|
||||||
intval($scale),
|
intval($scale),
|
||||||
intval($profile),
|
intval($profile),
|
||||||
dbesc($allow_cid),
|
dbesc($allow_cid),
|
||||||
dbesc($allow_gid),
|
dbesc($allow_gid),
|
||||||
dbesc($deny_cid),
|
dbesc($deny_cid),
|
||||||
dbesc($deny_gid),
|
dbesc($deny_gid),
|
||||||
intval($x[0]['id'])
|
intval($x[0]['id'])
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$r = q("INSERT INTO `photo`
|
$r = q("INSERT INTO `photo`
|
||||||
( `uid`, `contact-id`, `guid`, `resource-id`, `created`, `edited`, `filename`, type, `album`, `height`, `width`, `data`, `scale`, `profile`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid` )
|
( `uid`, `contact-id`, `guid`, `resource-id`, `created`, `edited`, `filename`, type, `album`, `height`, `width`, `data`, `scale`, `profile`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid` )
|
||||||
VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, %d, '%s', '%s', '%s', '%s' )",
|
VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, %d, '%s', '%s', '%s', '%s' )",
|
||||||
intval($uid),
|
intval($uid),
|
||||||
intval($cid),
|
intval($cid),
|
||||||
dbesc($guid),
|
dbesc($guid),
|
||||||
dbesc($rid),
|
dbesc($rid),
|
||||||
dbesc(datetime_convert()),
|
dbesc(datetime_convert()),
|
||||||
dbesc(datetime_convert()),
|
dbesc(datetime_convert()),
|
||||||
dbesc(basename($filename)),
|
dbesc(basename($filename)),
|
||||||
dbesc($this->type),
|
dbesc($this->getType()),
|
||||||
dbesc($album),
|
dbesc($album),
|
||||||
intval($this->height),
|
intval($this->getHeight()),
|
||||||
intval($this->width),
|
intval($this->getWidth()),
|
||||||
dbesc($this->imageString()),
|
dbesc($this->imageString()),
|
||||||
intval($scale),
|
intval($scale),
|
||||||
intval($profile),
|
intval($profile),
|
||||||
dbesc($allow_cid),
|
dbesc($allow_cid),
|
||||||
dbesc($allow_gid),
|
dbesc($allow_gid),
|
||||||
dbesc($deny_cid),
|
dbesc($deny_cid),
|
||||||
dbesc($deny_gid)
|
dbesc($deny_gid)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
return $r;
|
return $r;
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -405,93 +359,96 @@ class Photo {
|
||||||
*/
|
*/
|
||||||
function guess_image_type($filename, $fromcurl=false) {
|
function guess_image_type($filename, $fromcurl=false) {
|
||||||
logger('Photo: guess_image_type: '.$filename . ($fromcurl?' from curl headers':''), LOGGER_DEBUG);
|
logger('Photo: guess_image_type: '.$filename . ($fromcurl?' from curl headers':''), LOGGER_DEBUG);
|
||||||
$type = null;
|
$type = null;
|
||||||
if ($fromcurl) {
|
if ($fromcurl) {
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
$headers=array();
|
$headers=array();
|
||||||
$h = explode("\n",$a->get_curl_headers());
|
$h = explode("\n",$a->get_curl_headers());
|
||||||
foreach ($h as $l) {
|
foreach ($h as $l) {
|
||||||
list($k,$v) = array_map("trim", explode(":", trim($l), 2));
|
list($k,$v) = array_map("trim", explode(":", trim($l), 2));
|
||||||
$headers[$k] = $v;
|
$headers[$k] = $v;
|
||||||
}
|
}
|
||||||
if (array_key_exists('Content-Type', $headers))
|
if (array_key_exists('Content-Type', $headers))
|
||||||
$type = $headers['Content-Type'];
|
$type = $headers['Content-Type'];
|
||||||
}
|
}
|
||||||
if (is_null($type)){
|
if (is_null($type)){
|
||||||
$ext = pathinfo($filename, PATHINFO_EXTENSION);
|
// Guessing from extension? Isn't that... dangerous?
|
||||||
$types = Photo::supportedTypes();
|
/*$ext = pathinfo($filename, PATHINFO_EXTENSION);
|
||||||
$type = "image/jpeg";
|
$types = Photo::supportedTypes();
|
||||||
foreach ($types as $m=>$e){
|
$type = "image/jpeg";
|
||||||
if ($ext==$e) $type = $m;
|
foreach ($types as $m=>$e){
|
||||||
}
|
if ($ext==$e) $type = $m;
|
||||||
|
}*/
|
||||||
}
|
/**
|
||||||
|
* Well, this not much better,
|
||||||
|
* but at least it comes from the data inside the image,
|
||||||
|
* we won't be tricked by a manipulated extension
|
||||||
|
*/
|
||||||
|
$image = new Imagick($filename);
|
||||||
|
$type = 'image/'. strtolower($image->getImageFormat());
|
||||||
|
}
|
||||||
logger('Photo: guess_image_type: type='.$type, LOGGER_DEBUG);
|
logger('Photo: guess_image_type: type='.$type, LOGGER_DEBUG);
|
||||||
return $type;
|
return $type;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function import_profile_photo($photo,$uid,$cid) {
|
function import_profile_photo($photo,$uid,$cid) {
|
||||||
|
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
|
|
||||||
$r = q("select `resource-id` from photo where `uid` = %d and `contact-id` = %d and `scale` = 4 and `album` = 'Contact Photos' limit 1",
|
$r = q("select `resource-id` from photo where `uid` = %d and `contact-id` = %d and `scale` = 4 and `album` = 'Contact Photos' limit 1",
|
||||||
intval($uid),
|
intval($uid),
|
||||||
intval($cid)
|
intval($cid)
|
||||||
);
|
);
|
||||||
if(count($r)) {
|
if(count($r)) {
|
||||||
$hash = $r[0]['resource-id'];
|
$hash = $r[0]['resource-id'];
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$hash = photo_new_resource();
|
$hash = photo_new_resource();
|
||||||
}
|
}
|
||||||
|
|
||||||
$photo_failure = false;
|
$photo_failure = false;
|
||||||
|
|
||||||
$filename = basename($photo);
|
$filename = basename($photo);
|
||||||
$img_str = fetch_url($photo,true);
|
$img_str = fetch_url($photo,true);
|
||||||
|
|
||||||
// guess mimetype from headers or filename
|
$img = new Photo($img_str);
|
||||||
$type = guess_image_type($photo,true);
|
if($img->is_valid()) {
|
||||||
|
|
||||||
|
$img->scaleImageSquare(175);
|
||||||
|
|
||||||
$img = new Photo($img_str, $type);
|
$r = $img->store($uid, $cid, $hash, $filename, 'Contact Photos', 4 );
|
||||||
if($img->is_valid()) {
|
|
||||||
|
|
||||||
$img->scaleImageSquare(175);
|
if($r === false)
|
||||||
|
$photo_failure = true;
|
||||||
|
|
||||||
$r = $img->store($uid, $cid, $hash, $filename, 'Contact Photos', 4 );
|
$img->scaleImage(80);
|
||||||
|
|
||||||
if($r === false)
|
$r = $img->store($uid, $cid, $hash, $filename, 'Contact Photos', 5 );
|
||||||
$photo_failure = true;
|
|
||||||
|
|
||||||
$img->scaleImage(80);
|
if($r === false)
|
||||||
|
$photo_failure = true;
|
||||||
|
|
||||||
$r = $img->store($uid, $cid, $hash, $filename, 'Contact Photos', 5 );
|
$img->scaleImage(48);
|
||||||
|
|
||||||
if($r === false)
|
$r = $img->store($uid, $cid, $hash, $filename, 'Contact Photos', 6 );
|
||||||
$photo_failure = true;
|
|
||||||
|
|
||||||
$img->scaleImage(48);
|
if($r === false)
|
||||||
|
$photo_failure = true;
|
||||||
|
|
||||||
$r = $img->store($uid, $cid, $hash, $filename, 'Contact Photos', 6 );
|
$photo = $a->get_baseurl() . '/photo/' . $hash . '-4.' . $img->getExt();
|
||||||
|
$thumb = $a->get_baseurl() . '/photo/' . $hash . '-5.' . $img->getExt();
|
||||||
|
$micro = $a->get_baseurl() . '/photo/' . $hash . '-6.' . $img->getExt();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
$photo_failure = true;
|
||||||
|
|
||||||
if($r === false)
|
if($photo_failure) {
|
||||||
$photo_failure = true;
|
$photo = $a->get_baseurl() . '/images/person-175.jpg';
|
||||||
|
$thumb = $a->get_baseurl() . '/images/person-80.jpg';
|
||||||
|
$micro = $a->get_baseurl() . '/images/person-48.jpg';
|
||||||
|
}
|
||||||
|
|
||||||
$photo = $a->get_baseurl() . '/photo/' . $hash . '-4.' . $img->getExt();
|
return(array($photo,$thumb,$micro));
|
||||||
$thumb = $a->get_baseurl() . '/photo/' . $hash . '-5.' . $img->getExt();
|
|
||||||
$micro = $a->get_baseurl() . '/photo/' . $hash . '-6.' . $img->getExt();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
$photo_failure = true;
|
|
||||||
|
|
||||||
if($photo_failure) {
|
|
||||||
$photo = $a->get_baseurl() . '/images/person-175.jpg';
|
|
||||||
$thumb = $a->get_baseurl() . '/images/person-80.jpg';
|
|
||||||
$micro = $a->get_baseurl() . '/images/person-48.jpg';
|
|
||||||
}
|
|
||||||
|
|
||||||
return(array($photo,$thumb,$micro));
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue