mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Better handling for GIF even, if not supported by the graphics library

Browse source
This commit is contained in:
Michael 2017-10-21 15:09:47 +00:00
parent 6367439e8a
commit 09727024ba
1 changed files with 28 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
mod/photo.php
View file

@ -31,7 +31,6 @@ function photo_init(App $a) {
// NOTREACHED
}
// strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) >= filemtime($localFileName)) {
if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
header('HTTP/1.1 304 Not Modified');
header("Last-Modified: " . gmdate("D, d M Y H:i:s", time()) . " GMT");
@ -50,7 +49,6 @@ function photo_init(App $a) {
if (isset($type)) {
/**
* Profile photos
*/
@ -72,7 +70,11 @@ function photo_init(App $a) {
break;
}
$uid = str_replace(array('.jpg','.png'),array('',''), $person);
$uid = str_replace(array('.jpg', '.png', '.gif'), array('', '', ''), $person);
foreach (Photo::supportedTypes() AS $m => $e) {
$uid = str_replace('.'.$e, '', $uid);
}
$r = q("SELECT * FROM `photo` WHERE `scale` = %d AND `uid` = %d AND `profile` = 1 LIMIT 1",
intval($resolution),
@ -82,20 +84,21 @@ function photo_init(App $a) {
$data = $r[0]['data'];
$mimetype = $r[0]['type'];
}
if(! isset($data)) {
if (empty($data)) {
$data = file_get_contents($default);
$mimetype = 'image/jpeg';
}
}
else {
} else {
/**
* Other photos
*/
$resolution = 0;
foreach( Photo::supportedTypes() as $m=>$e){
$photo = str_replace(".$e",'',$photo);
$photo = str_replace(array('.jpg', '.png', '.gif'), array('', '', ''), $photo);
foreach (Photo::supportedTypes() AS $m => $e) {
$photo = str_replace('.'.$e, '', $photo);
}
if (substr($photo, -2, 1) == '-') {
@ -136,7 +139,7 @@ function photo_init(App $a) {
}
}
if(! isset($data)) {
if (empty($data)) {
if (isset($resolution)) {
switch ($resolution) {
@ -161,7 +164,7 @@ function photo_init(App $a) {
}
// Resize only if its not a GIF
if ($mime != "image/gif") {
if ($mimetype != "image/gif") {
$ph = new Photo($data, $mimetype);
if ($ph->is_valid()) {
if (isset($customres) && $customres > 0 && $customres < 500) {
@ -187,8 +190,7 @@ function photo_init(App $a) {
header("Cache-Control: no-store, no-cache, must-revalidate");
}
else {
} else {
header("Last-Modified: " . gmdate("D, d M Y H:i:s", time()) . " GMT");
header('Etag: "'.md5($data).'"');
header("Expires: " . gmdate("D, d M Y H:i:s", time() + (31536000)) . " GMT");