throw 404 when model could not be found

Author: Matthias Lill

Controller/BlobFileController.php

@@ -35,6 +35,10 @@ public function serve($model = null, $id = null, $field = null, $size = null) {
 			'fields' => array($field),
 		));
 
+		if (empty($dataset)) {
+			throw new NotFoundException('File does not exist');
+		}
+
 		$fileHandler = new BlobFileHandler;
 		$fileHandler->loadFromString($dataset[$model][$field]);
 
@@ -77,7 +81,9 @@ public function serve($model = null, $id = null, $field = null, $size = null) {
 		}
 
 		// copy file to webroot for better caching
-		if ( ! is_dir(WWW_ROOT.pathinfo($this->request->url,PATHINFO_DIRNAME))) {
+		if ( ! is_dir(WWW_ROOT.pathinfo($this->request->url,PATHINFO_DIRNAME))
+			and ! file_exists(WWW_ROOT.pathinfo($this->request->url,PATHINFO_DIRNAME))
+			) {
 			mkdir(WWW_ROOT.pathinfo($this->request->url,PATHINFO_DIRNAME),0777,true);
 		}
 		file_put_contents(WWW_ROOT.$this->request->url, $file);