andy/friendica-addons
1
0
Fork 0
forked from friendica/friendica-addons
Code Pull requests Activity

privacy_image_cache: Clean up the code for caching.

Browse source
This commit is contained in:
Michael Vogel 2012-11-17 14:25:53 +01:00
parent 7598c4aa4f
commit 8516ea1e4a
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
privacy_image_cache/privacy_image_cache.php
View file

@ -94,14 +94,6 @@ function privacy_image_cache_init() {
$mime = $r[0]["desc"]; $mime = $r[0]["desc"];
if ($mime == "") $mime = "image/jpeg"; if ($mime == "") $mime = "image/jpeg";
// Test
//if ($mime == "image/jpeg") {
// $img = new Photo($img_str);
// if($img->is_valid()) {
// $img->scaleImage(1000);
// $img_str = $img->imageString();
// }
//}
} else { } else {
// It shouldn't happen but it does - spaces in URL // It shouldn't happen but it does - spaces in URL
$_REQUEST['url'] = str_replace(" ", "+", $_REQUEST['url']); $_REQUEST['url'] = str_replace(" ", "+", $_REQUEST['url']);
@ -117,6 +109,12 @@ function privacy_image_cache_init() {
if ((substr($a->get_curl_code(), 0, 1) == "4") or (!$img_str)) { if ((substr($a->get_curl_code(), 0, 1) == "4") or (!$img_str)) {
$img_str = file_get_contents("images/blank.png"); $img_str = file_get_contents("images/blank.png");
$mime = "image/png"; $mime = "image/png";
$cachefile = ""; // Clear the cachefile so that the dummy isn't stored
$img = new Photo($img_str);
if($img->is_valid()) {
$img->scaleImage(1);
$img_str = $img->imageString();
}
//} else if (substr($img_str, 0, 6) == "GIF89a") { //} else if (substr($img_str, 0, 6) == "GIF89a") {
} else if ($mime != "image/jpeg") { } else if ($mime != "image/jpeg") {
$image = @imagecreatefromstring($img_str); $image = @imagecreatefromstring($img_str);
@ -157,7 +155,6 @@ function privacy_image_cache_init() {
file_put_contents($cachefile, $img_str); file_put_contents($cachefile, $img_str);
header("Content-type: $mime"); header("Content-type: $mime");
//header("Last-Modified: Sat, 01 Apr 1999 12:23:42 GMT");
header("Last-Modified: " . gmdate("D, d M Y H:i:s", time()) . " GMT"); header("Last-Modified: " . gmdate("D, d M Y H:i:s", time()) . " GMT");
header('Etag: "'.md5($img_str).'"'); header('Etag: "'.md5($img_str).'"');
header("Expires: " . gmdate("D, d M Y H:i:s", time() + (31536000)) . " GMT"); header("Expires: " . gmdate("D, d M Y H:i:s", time() + (31536000)) . " GMT");