X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=image.php;h=dcc7d806d406ec3f3c2beb07839c65e39b88ca2c;hb=da7e3e91bf6051d342819d596b76dd4e05740cd6;hp=3a2a0d1c583b6cc30facfd866317bb43ac9f3186;hpb=f03a795de75b99332c6315ea36ff452f7b32ca6a;p=tt-rss.git

diff --git a/image.php b/image.php
index 3a2a0d1c..dcc7d806 100644
--- a/image.php
+++ b/image.php
@@ -1,9 +1,52 @@
 <?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";
-	require_once "lib/simplepie/simplepie.inc";
 
-	SimplePie_Misc::display_cached_file($_GET['i'], SIMPLEPIE_CACHE_DIR, 'spi');
+	// backwards compatible wrapper for old-style image caching
+	/* if (isset($_GET['url'])) {
+		$url = base64_decode($_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);
+				readfile($filename);
+			}
+		} else {
+			header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found");
+			echo "File not found.";
+		}
+	}
+
 ?>