* HOOK_ENCLOSURE_ENTRY: pass article_id to handler

* DiskCache: multiple fixes; support isWritable() for cache entries, set content-disposition for send()
* public/cached_url: allow selecting files from sub-caches other than images
* plugins/Cache_Starred_Images: rework to use DiskCache, can be enabled per-user, properly handles article enclosures, etc

1 files changed, 19 insertions, 4 deletions

diff --git a/classes/diskcache.php b/classes/diskcache.php
index 07643b9be..41609d6b5 100644
--- a/classes/diskcache.php
+++ b/classes/diskcache.php
@@ -3,15 +3,28 @@ class DiskCache {
 	private $dir;
 
 	public function __construct($dir) {
-		$this->dir = basename($dir);
+		$this->dir = CACHE_DIR . "/" . basename($dir);
 	}
 
 	public function getDir() {
 		return $this->dir;
 	}
 
-	public function isWritable() {
-		return is_dir($this->dir) && is_writable($this->dir);
+	public function makeDir() {
+		if (!is_dir($this->dir)) {
+			return mkdir($this->dir);
+		}
+	}
+
+	public function isWritable($filename = "") {
+		if ($filename) {
+			if (file_exists($this->getFullPath($filename)))
+				return is_writable($this->getFullPath($filename));
+			else
+				return is_writable($this->dir);
+		} else {
+			return is_writable($this->dir);
+		}
 	}
 
 	public function exists($filename) {
@@ -28,7 +41,7 @@ class DiskCache {
 	public function getFullPath($filename) {
 		$filename = basename($filename);
 
-		return CACHE_DIR . "/" . $this->dir . "/" . $filename;
+		return $this->dir . "/" . $filename;
 	}
 
 	public function put($filename, $data) {
@@ -54,6 +67,8 @@ class DiskCache {
 	}
 
 	public function send($filename) {
+		header("Content-Disposition: inline; filename=\"$filename\"");
+
 		return send_local_file($this->getFullPath($filename));
 	}