From 3f686005e3c5ff6993c044f6ce699c7c980bd317 Mon Sep 17 00:00:00 2001
From: coderkun <coderkun@users.noreply.github.com>
Date: Fri, 14 Feb 2014 19:25:29 +0100
Subject: [PATCH] make media directory configurable and check media file for
 existence

---
 configs/AppConfig.inc           |  3 ++-
 controllers/MediaController.inc | 13 +++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/configs/AppConfig.inc b/configs/AppConfig.inc
index 5f0e0485..3e8d92da 100644
--- a/configs/AppConfig.inc
+++ b/configs/AppConfig.inc
@@ -59,7 +59,8 @@
 		 * @var array
 		 */
 		public static $dirs = array(
-			'locale'	=>	'locale'
+			'locale'	=>	'locale',
+			'media'		=>	'media'
 		);
 		
 		
diff --git a/controllers/MediaController.inc b/controllers/MediaController.inc
index 60ad460d..7d80a897 100644
--- a/controllers/MediaController.inc
+++ b/controllers/MediaController.inc
@@ -46,7 +46,13 @@
 		
 		
 		/**
-		 * TODO Action: index.
+		 * Action: index.
+		 * 
+		 * Display a medium without processing.
+		 * 
+		 * @throws	IdNotFoundException
+		 * @param	string	$seminaryUrl	URL-title of the Seminary
+		 * @param	string	$mediaUrl	URL-name of the medium
 		 */
 		public function index($seminaryUrl, $mediaUrl)
 		{
@@ -60,7 +66,10 @@
 			$this->response->addHeader("Content-type: ".$media['mimetype']."");
 			
 			// Set filename
-			$media['filename'] = ROOT.DS.'media'.DS.$media['id'];
+			$media['filename'] = ROOT.DS.\nre\configs\AppConfig::$dirs['media'].DS.$media['id'];
+			if(!file_exists($media['filename'])) {
+				throw new \nre\exceptions\IdNotFoundException($mediaUrl);
+			}
 			
 			
 			// Pass data to view