Merge branch 'master' of https://github.com/ukko/kanboard into 1245_bug_with_subtask_timer

1 files changed, 41 insertions, 21 deletions

diff --git a/app/Controller/File.php b/app/Controller/File.php
index 7b7c75ee..ef90c55a 100644
--- a/app/Controller/File.php
+++ b/app/Controller/File.php
@@ -2,6 +2,8 @@
 
 namespace Controller;
 
+use Core\ObjectStorage\ObjectStorageException;
+
 /**
  * File controller
  *
@@ -74,15 +76,21 @@ class File extends Base
      */
     public function download()
     {
-        $task = $this->getTask();
-        $file = $this->file->getById($this->request->getIntegerParam('file_id'));
+        try {
 
-        if ($file['task_id'] != $task['id']) {
-            $this->response->redirect($this->helper->url->to('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])));
-        }
+            $task = $this->getTask();
+            $file = $this->file->getById($this->request->getIntegerParam('file_id'));
+
+            if ($file['task_id'] != $task['id']) {
+                $this->response->redirect($this->helper->url->to('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])));
+            }
 
-        $this->response->forceDownload($file['name']);
-        $this->objectStorage->passthru($file['path']);
+            $this->response->forceDownload($file['name']);
+            $this->objectStorage->output($file['path']);
+        }
+        catch (ObjectStorageException $e) {
+            $this->logger->error($e->getMessage());
+        }
     }
 
     /**
@@ -110,15 +118,21 @@ class File extends Base
      */
     public function image()
     {
-        $task = $this->getTask();
-        $file = $this->file->getById($this->request->getIntegerParam('file_id'));
+        try {
 
-        if ($file['task_id'] != $task['id']) {
-            $this->response->redirect($this->helper->url->to('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])));
-        }
+            $task = $this->getTask();
+            $file = $this->file->getById($this->request->getIntegerParam('file_id'));
 
-        $this->response->contentType($this->file->getImageMimeType($file['name']));
-        $this->objectStorage->passthru($file['path']);
+            if ($file['task_id'] != $task['id']) {
+                $this->response->redirect($this->helper->url->to('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])));
+            }
+
+            $this->response->contentType($this->file->getImageMimeType($file['name']));
+            $this->objectStorage->output($file['path']);
+        }
+        catch (ObjectStorageException $e) {
+            $this->logger->error($e->getMessage());
+        }
     }
 
     /**
@@ -128,15 +142,21 @@ class File extends Base
      */
     public function thumbnail()
     {
-        $task = $this->getTask();
-        $file = $this->file->getById($this->request->getIntegerParam('file_id'));
+        try {
 
-        if ($file['task_id'] != $task['id']) {
-            $this->response->redirect($this->helper->url->to('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])));
-        }
+            $task = $this->getTask();
+            $file = $this->file->getById($this->request->getIntegerParam('file_id'));
+
+            if ($file['task_id'] != $task['id']) {
+                $this->response->redirect($this->helper->url->to('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])));
+            }
 
-        $this->response->contentType('image/jpeg');
-        $this->objectStorage->passthru($this->file->getThumbnailPath($file['path']));
+            $this->response->contentType('image/jpeg');
+            $this->objectStorage->output($this->file->getThumbnailPath($file['path']));
+        }
+        catch (ObjectStorageException $e) {
+            $this->logger->error($e->getMessage());
+        }
     }
 
     /**