aboutsummaryrefslogtreecommitdiffstats
path: root/mod/photo.php
diff options
context:
space:
mode:
authorFabio Comuni <fabrix.xm@gmail.com>2012-06-07 17:42:13 +0200
committerFabio Comuni <fabrix.xm@gmail.com>2012-06-07 17:42:13 +0200
commit7cc8c369cb6a01cffb58215966844b53794f32f4 (patch)
tree758fc647c3e5d6dc36ec62e8e34c4471b388f97d /mod/photo.php
parent1d832618a4340526092fce9e49f4580f767e1526 (diff)
downloadvolse-hubzilla-7cc8c369cb6a01cffb58215966844b53794f32f4.tar.gz
volse-hubzilla-7cc8c369cb6a01cffb58215966844b53794f32f4.tar.bz2
volse-hubzilla-7cc8c369cb6a01cffb58215966844b53794f32f4.zip
Add support for PNG images with alpha
Diffstat (limited to 'mod/photo.php')
-rw-r--r--mod/photo.php18
1 files changed, 14 insertions, 4 deletions
diff --git a/mod/photo.php b/mod/photo.php
index 3cd8250a9..e8e74cfde 100644
--- a/mod/photo.php
+++ b/mod/photo.php
@@ -1,6 +1,7 @@
<?php
require_once('include/security.php');
+require_once('include/Photo.php');
function photo_init(&$a) {
@@ -83,9 +84,11 @@ function photo_init(&$a) {
);
if(count($r)) {
$data = $r[0]['data'];
+ $mimetype = $r[0]['type'];
}
if(! isset($data)) {
$data = file_get_contents($default);
+ $mimetype = 'image/jpeg';
}
}
else {
@@ -95,7 +98,9 @@ function photo_init(&$a) {
*/
$resolution = 0;
- $photo = str_replace('.jpg','',$photo);
+ foreach( Photo::supportedTypes() as $m=>$e){
+ $photo = str_replace(".$e",'',$photo);
+ }
if(substr($photo,-2,1) == '-') {
$resolution = intval(substr($photo,-1,1));
@@ -119,6 +124,7 @@ function photo_init(&$a) {
if(count($r)) {
$data = $r[0]['data'];
+ $mimetype = $r[0]['type'];
}
else {
@@ -136,6 +142,7 @@ function photo_init(&$a) {
);
if(count($r)) {
$data = file_get_contents('images/nosign.jpg');
+ $mimetype = 'image/jpeg';
$prvcachecontrol = true;
}
}
@@ -148,12 +155,15 @@ function photo_init(&$a) {
case 4:
$data = file_get_contents('images/person-175.jpg');
+ $mimetype = 'image/jpeg';
break;
case 5:
$data = file_get_contents('images/person-80.jpg');
+ $mimetype = 'image/jpeg';
break;
case 6:
$data = file_get_contents('images/person-48.jpg');
+ $mimetype = 'image/jpeg';
break;
default:
killme();
@@ -164,11 +174,11 @@ function photo_init(&$a) {
}
if(isset($customres) && $customres > 0 && $customres < 500) {
- require_once('include/Photo.php');
- $ph = new Photo($data);
+ $ph = new Photo($data, $mimetype);
if($ph->is_valid()) {
$ph->scaleImageSquare($customres);
$data = $ph->imageString();
+ $mimetype = $ph->getType();
}
}
@@ -181,7 +191,7 @@ function photo_init(&$a) {
header_remove('pragma');
}
- header("Content-type: image/jpeg");
+ header("Content-type: ".$mimetype);
if($prvcachecontrol) {