X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=privacy_image_cache%2Fprivacy_image_cache.php;h=4729900711d7aeed1ba161574d9bcdd2c4c722b7;hb=57232bcaa4f01053a1c31c44fdb30b9b31710537;hp=8c68ef9a4bf555a3b7f2d92151c8cdfa363c7594;hpb=a30ee1587f4662e8d21235d0e7f1ea2e2eea24cd;p=friendica-addons.git

diff --git a/privacy_image_cache/privacy_image_cache.php b/privacy_image_cache/privacy_image_cache.php
index 8c68ef9a..47299007 100644
--- a/privacy_image_cache/privacy_image_cache.php
+++ b/privacy_image_cache/privacy_image_cache.php
@@ -32,7 +32,21 @@ function privacy_image_cache_module() {}
 
 
 function privacy_image_cache_init() {
-	global $a;
+	global $a, $_SERVER;
+
+	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");
+		header('Etag: '.$_SERVER['HTTP_IF_NONE_MATCH']);
+		header("Expires: " . gmdate("D, d M Y H:i:s", time() + (31536000)) . " GMT");
+		header("Cache-Control: max-age=31536000");
+		if(function_exists('header_remove')) {
+			header_remove('Last-Modified');
+			header_remove('Expires');
+			header_remove('Cache-Control');
+		}
+		exit;
+	}
 
 	if ($a->config["system"]["db_log"] != "")
 		$stamp1 = microtime(true);
@@ -46,17 +60,18 @@ function privacy_image_cache_init() {
 	// Double encoded url - happens with Diaspora
 	$urlhash2 = 'pic:' . sha1(urldecode($_REQUEST['url']));
 
-	$cache = get_config('system','itemcache');
-	if (($cache != '') and is_dir($cache)) {
-		$cachefile = $cache."/".hash("md5", $_REQUEST['url']);
+	$cachefile = get_cachefile(hash("md5", $_REQUEST['url']));
+	if ($cachefile != '') {
 		if (file_exists($cachefile)) {
 			$img_str = file_get_contents($cachefile);
 
 			$mime = image_type_to_mime_type(exif_imagetype($cachefile));
 
 			header("Content-type: $mime");
-			header("Expires: " . gmdate("D, d M Y H:i:s", time() + (3600*24)) . " GMT");
-			header("Cache-Control: max-age=" . (3600*24));
+			header("Last-Modified: " . gmdate("D, d M Y H:i:s", time()) . " GMT");
+			header('Etag: "'.md5($img_str).'"');
+			header("Expires: " . gmdate("D, d M Y H:i:s", time() + (31536000)) . " GMT");
+			header("Cache-Control: max-age=31536000");
 
 			echo $img_str;
 
@@ -79,21 +94,13 @@ function privacy_image_cache_init() {
 		$mime = $r[0]["desc"];
 		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 {
 		// It shouldn't happen but it does - spaces in URL
 		$_REQUEST['url'] = str_replace(" ", "+", $_REQUEST['url']);
 
 		$img_str = fetch_url($_REQUEST['url'],true);
 
-		$tempfile = tempnam("", "cache");
+		$tempfile = tempnam(get_config("system","temppath"), "cache");
 		file_put_contents($tempfile, $img_str);
 		$mime = image_type_to_mime_type(exif_imagetype($tempfile));
 		unlink($tempfile);
@@ -102,6 +109,12 @@ function privacy_image_cache_init() {
 		if ((substr($a->get_curl_code(), 0, 1) == "4") or (!$img_str)) {
 			$img_str = file_get_contents("images/blank.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 ($mime != "image/jpeg") {
 			$image = @imagecreatefromstring($img_str);
@@ -137,12 +150,15 @@ function privacy_image_cache_init() {
 	}
 
 	// Writing in cachefile
-	if (isset($cachefile) && ($cachefile != '') and (exif_imagetype($cachefile) > 0))
+	// and (file_exists($cachefile)) and (exif_imagetype($cachefile) > 0))
+	if ($cachefile != '')
 		file_put_contents($cachefile, $img_str);
 
 	header("Content-type: $mime");
-	header("Expires: " . gmdate("D, d M Y H:i:s", time() + (3600*24)) . " GMT");
-	header("Cache-Control: max-age=" . (3600*24));
+	header("Last-Modified: " . gmdate("D, d M Y H:i:s", time()) . " GMT");
+	header('Etag: "'.md5($img_str).'"');
+	header("Expires: " . gmdate("D, d M Y H:i:s", time() + (31536000)) . " GMT");
+	header("Cache-Control: max-age=31536000");
 
 	echo $img_str;
 
@@ -210,6 +226,8 @@ function privacy_image_cache_display_item_hook(&$a, &$o) {
             $o["output"]["thumb"] = $a->get_baseurl() . "/privacy_image_cache/?url=" . escape_tags(addslashes(rawurlencode($o["output"]["thumb"])));
         if (isset($o["output"]["author-avatar"]) && !privacy_image_cache_is_local_image($o["output"]["author-avatar"]))
             $o["output"]["author-avatar"] = $a->get_baseurl() . "/privacy_image_cache/?url=" . escape_tags(addslashes(rawurlencode($o["output"]["author-avatar"])));
+        if (isset($o["output"]["owner-avatar"]) && !privacy_image_cache_is_local_image($o["output"]["owner-avatar"]))
+            $o["output"]["owner-avatar"] = $a->get_baseurl() . "/privacy_image_cache/?url=" . escape_tags(addslashes(rawurlencode($o["output"]["owner-avatar"])));
     }
 }