X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=image.php;h=a134e658e88c4a6b28e1c4b5f05d39e55c899f13;hb=89018afa13887c46de4c8ef8189fc7b500cdac0f;hp=d240dbc68ff9330d32e79c96a9b70e7d9d7340d2;hpb=3c696512fcf85331158f26078616e5684f46a68e;p=tt-rss.git

diff --git a/image.php b/image.php
index d240dbc6..a134e658 100644
--- a/image.php
+++ b/image.php
@@ -1,15 +1,54 @@
 <?php
-	set_include_path(get_include_path() . PATH_SEPARATOR .
-		dirname(__FILE__) . "/include");
+	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+		get_include_path());
 
 	require_once "config.php";
 
-	$filename = CACHE_DIR . '/images/' . sha1($_GET['url']) . '.png';
+	// backwards compatible wrapper for old-style image caching
+	/* if (isset($_GET['url'])) {
+		$url = base64_decode($_GET['url']);
 
-	if (file_exists($filename)) {
-		header("Content-type: image/png");
-		echo file_get_contents($filename);
-	} else {
-		header("Location: " . $_GET['url']);
+		$filename = CACHE_DIR . '/images/' . sha1($url) . '.png';
+
+		if (file_exists($filename)) {
+			header("Content-type: image/png");
+			echo file_get_contents($filename);
+		} else {
+			header("Location: $url");
+		}
+
+		return;
+	} */
+
+	@$hash = basename($_GET['hash']);
+
+	if ($hash) {
+
+		$filename = CACHE_DIR . '/images/' . $hash . '.png';
+
+		if (file_exists($filename)) {
+			/* See if we can use X-Sendfile */
+			$xsendfile = false;
+			if (function_exists('apache_get_modules') &&
+			    array_search('mod_xsendfile', apache_get_modules()))
+				$xsendfile = true;
+
+			if ($xsendfile) {
+				header("X-Sendfile: $filename");
+				header("Content-type: application/octet-stream");
+				header('Content-Disposition: attachment; filename="' . basename($filename) . '"');
+			} else {
+				header("Content-type: image/png");
+				$stamp = gmdate("D, d M Y H:i:s", filemtime($filename)). " GMT";
+				header("Last-Modified: $stamp", true);
+				ob_clean();   // discard any data in the output buffer (if possible)
+				flush();      // flush headers (if possible)
+				readfile($filename);
+			}
+		} else {
+			header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found");
+			echo "File not found.";
+		}
 	}
+
 ?>