From 8477da26437cd927b47fbac8874e2a7e02b580ca Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sun, 14 Feb 2016 15:49:59 -0500
Subject: Rename File controller to TaskFile

---
 app/Controller/BoardPopover.php |   2 +-
 app/Controller/File.php         | 186 ----------------------------------------
 app/Controller/TaskFile.php     | 186 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 187 insertions(+), 187 deletions(-)
 delete mode 100644 app/Controller/File.php
 create mode 100644 app/Controller/TaskFile.php

(limited to 'app/Controller')

diff --git a/app/Controller/BoardPopover.php b/app/Controller/BoardPopover.php
index f2b39d8d..965669ff 100644
--- a/app/Controller/BoardPopover.php
+++ b/app/Controller/BoardPopover.php
@@ -93,7 +93,7 @@ class BoardPopover extends Base
     {
         $task = $this->getTask();
 
-        $this->response->html($this->template->render('file/screenshot', array(
+        $this->response->html($this->template->render('task_file/screenshot', array(
             'task' => $task,
         )));
     }
diff --git a/app/Controller/File.php b/app/Controller/File.php
deleted file mode 100644
index c5517df8..00000000
--- a/app/Controller/File.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php
-
-namespace Kanboard\Controller;
-
-use Kanboard\Core\ObjectStorage\ObjectStorageException;
-
-/**
- * File controller
- *
- * @package  controller
- * @author   Frederic Guillot
- */
-class File extends Base
-{
-    /**
-     * Screenshot
-     *
-     * @access public
-     */
-    public function screenshot()
-    {
-        $task = $this->getTask();
-
-        if ($this->request->isPost() && $this->taskFile->uploadScreenshot($task['id'], $this->request->getValue('screenshot')) !== false) {
-            $this->flash->success(t('Screenshot uploaded successfully.'));
-            return $this->response->redirect($this->helper->url->to('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), true);
-        }
-
-        $this->response->html($this->helper->layout->task('file/screenshot', array(
-            'task' => $task,
-        )));
-    }
-
-    /**
-     * File upload form
-     *
-     * @access public
-     */
-    public function create()
-    {
-        $task = $this->getTask();
-
-        $this->response->html($this->helper->layout->task('file/new', array(
-            'task' => $task,
-            'max_size' => $this->helper->text->phpToBytes(ini_get('upload_max_filesize')),
-        )));
-    }
-
-    /**
-     * File upload (save files)
-     *
-     * @access public
-     */
-    public function save()
-    {
-        $task = $this->getTask();
-
-        if (! $this->taskFile->uploadFiles($task['id'], $this->request->getFileInfo('files'))) {
-            $this->flash->failure(t('Unable to upload the file.'));
-        }
-
-        $this->response->redirect($this->helper->url->to('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), true);
-    }
-
-    /**
-     * File download
-     *
-     * @access public
-     */
-    public function download()
-    {
-        try {
-            $task = $this->getTask();
-            $file = $this->taskFile->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->output($file['path']);
-        } catch (ObjectStorageException $e) {
-            $this->logger->error($e->getMessage());
-        }
-    }
-
-    /**
-     * Open a file (show the content in a popover)
-     *
-     * @access public
-     */
-    public function open()
-    {
-        $task = $this->getTask();
-        $file = $this->taskFile->getById($this->request->getIntegerParam('file_id'));
-
-        if ($file['task_id'] == $task['id']) {
-            $this->response->html($this->template->render('file/open', array(
-                'file' => $file,
-                'task' => $task,
-            )));
-        }
-    }
-
-    /**
-     * Display image
-     *
-     * @access public
-     */
-    public function image()
-    {
-        try {
-            $task = $this->getTask();
-            $file = $this->taskFile->getById($this->request->getIntegerParam('file_id'));
-
-            if ($file['task_id'] == $task['id']) {
-                $this->response->contentType($this->taskFile->getImageMimeType($file['name']));
-                $this->objectStorage->output($file['path']);
-            }
-        } catch (ObjectStorageException $e) {
-            $this->logger->error($e->getMessage());
-        }
-    }
-
-    /**
-     * Display image thumbnails
-     *
-     * @access public
-     */
-    public function thumbnail()
-    {
-        $this->response->contentType('image/jpeg');
-
-        try {
-            $task = $this->getTask();
-            $file = $this->taskFile->getById($this->request->getIntegerParam('file_id'));
-
-            if ($file['task_id'] == $task['id']) {
-                $this->objectStorage->output($this->taskFile->getThumbnailPath($file['path']));
-            }
-        } catch (ObjectStorageException $e) {
-            $this->logger->error($e->getMessage());
-
-            // Try to generate thumbnail on the fly for images uploaded before Kanboard < 1.0.19
-            $data = $this->objectStorage->get($file['path']);
-            $this->taskFile->generateThumbnailFromData($file['path'], $data);
-            $this->objectStorage->output($this->taskFile->getThumbnailPath($file['path']));
-        }
-    }
-
-    /**
-     * Remove a file
-     *
-     * @access public
-     */
-    public function remove()
-    {
-        $this->checkCSRFParam();
-        $task = $this->getTask();
-        $file = $this->taskFile->getById($this->request->getIntegerParam('file_id'));
-
-        if ($file['task_id'] == $task['id'] && $this->taskFile->remove($file['id'])) {
-            $this->flash->success(t('File removed successfully.'));
-        } else {
-            $this->flash->failure(t('Unable to remove this file.'));
-        }
-
-        $this->response->redirect($this->helper->url->to('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])));
-    }
-
-    /**
-     * Confirmation dialog before removing a file
-     *
-     * @access public
-     */
-    public function confirm()
-    {
-        $task = $this->getTask();
-        $file = $this->taskFile->getById($this->request->getIntegerParam('file_id'));
-
-        $this->response->html($this->helper->layout->task('file/remove', array(
-            'task' => $task,
-            'file' => $file,
-        )));
-    }
-}
diff --git a/app/Controller/TaskFile.php b/app/Controller/TaskFile.php
new file mode 100644
index 00000000..102fdc5c
--- /dev/null
+++ b/app/Controller/TaskFile.php
@@ -0,0 +1,186 @@
+<?php
+
+namespace Kanboard\Controller;
+
+use Kanboard\Core\ObjectStorage\ObjectStorageException;
+
+/**
+ * File File Controller
+ *
+ * @package  controller
+ * @author   Frederic Guillot
+ */
+class TaskFile extends Base
+{
+    /**
+     * Screenshot
+     *
+     * @access public
+     */
+    public function screenshot()
+    {
+        $task = $this->getTask();
+
+        if ($this->request->isPost() && $this->taskFile->uploadScreenshot($task['id'], $this->request->getValue('screenshot')) !== false) {
+            $this->flash->success(t('Screenshot uploaded successfully.'));
+            return $this->response->redirect($this->helper->url->to('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), true);
+        }
+
+        $this->response->html($this->helper->layout->task('task_file/screenshot', array(
+            'task' => $task,
+        )));
+    }
+
+    /**
+     * File upload form
+     *
+     * @access public
+     */
+    public function create()
+    {
+        $task = $this->getTask();
+
+        $this->response->html($this->helper->layout->task('task_file/new', array(
+            'task' => $task,
+            'max_size' => $this->helper->text->phpToBytes(ini_get('upload_max_filesize')),
+        )));
+    }
+
+    /**
+     * File upload (save files)
+     *
+     * @access public
+     */
+    public function save()
+    {
+        $task = $this->getTask();
+
+        if (! $this->taskFile->uploadFiles($task['id'], $this->request->getFileInfo('files'))) {
+            $this->flash->failure(t('Unable to upload the file.'));
+        }
+
+        $this->response->redirect($this->helper->url->to('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), true);
+    }
+
+    /**
+     * File download
+     *
+     * @access public
+     */
+    public function download()
+    {
+        try {
+            $task = $this->getTask();
+            $file = $this->taskFile->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->output($file['path']);
+        } catch (ObjectStorageException $e) {
+            $this->logger->error($e->getMessage());
+        }
+    }
+
+    /**
+     * Open a file (show the content in a popover)
+     *
+     * @access public
+     */
+    public function open()
+    {
+        $task = $this->getTask();
+        $file = $this->taskFile->getById($this->request->getIntegerParam('file_id'));
+
+        if ($file['task_id'] == $task['id']) {
+            $this->response->html($this->template->render('task_file/open', array(
+                'file' => $file,
+                'task' => $task,
+            )));
+        }
+    }
+
+    /**
+     * Display image
+     *
+     * @access public
+     */
+    public function image()
+    {
+        try {
+            $task = $this->getTask();
+            $file = $this->taskFile->getById($this->request->getIntegerParam('file_id'));
+
+            if ($file['task_id'] == $task['id']) {
+                $this->response->contentType($this->taskFile->getImageMimeType($file['name']));
+                $this->objectStorage->output($file['path']);
+            }
+        } catch (ObjectStorageException $e) {
+            $this->logger->error($e->getMessage());
+        }
+    }
+
+    /**
+     * Display image thumbnails
+     *
+     * @access public
+     */
+    public function thumbnail()
+    {
+        $this->response->contentType('image/jpeg');
+
+        try {
+            $task = $this->getTask();
+            $file = $this->taskFile->getById($this->request->getIntegerParam('file_id'));
+
+            if ($file['task_id'] == $task['id']) {
+                $this->objectStorage->output($this->taskFile->getThumbnailPath($file['path']));
+            }
+        } catch (ObjectStorageException $e) {
+            $this->logger->error($e->getMessage());
+
+            // Try to generate thumbnail on the fly for images uploaded before Kanboard < 1.0.19
+            $data = $this->objectStorage->get($file['path']);
+            $this->taskFile->generateThumbnailFromData($file['path'], $data);
+            $this->objectStorage->output($this->taskFile->getThumbnailPath($file['path']));
+        }
+    }
+
+    /**
+     * Remove a file
+     *
+     * @access public
+     */
+    public function remove()
+    {
+        $this->checkCSRFParam();
+        $task = $this->getTask();
+        $file = $this->taskFile->getById($this->request->getIntegerParam('file_id'));
+
+        if ($file['task_id'] == $task['id'] && $this->taskFile->remove($file['id'])) {
+            $this->flash->success(t('File removed successfully.'));
+        } else {
+            $this->flash->failure(t('Unable to remove this file.'));
+        }
+
+        $this->response->redirect($this->helper->url->to('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])));
+    }
+
+    /**
+     * Confirmation dialog before removing a file
+     *
+     * @access public
+     */
+    public function confirm()
+    {
+        $task = $this->getTask();
+        $file = $this->taskFile->getById($this->request->getIntegerParam('file_id'));
+
+        $this->response->html($this->helper->layout->task('task_file/remove', array(
+            'task' => $task,
+            'file' => $file,
+        )));
+    }
+}
-- 
cgit v1.2.3