1 files changed, 53 insertions, 43 deletions

diff --git a/app/Controller/Base.php b/app/Controller/Base.php
index efeab31e..2453be18 100644
--- a/app/Controller/Base.php
+++ b/app/Controller/Base.php
@@ -131,7 +131,7 @@ abstract class Base extends \Kanboard\Core\Base
      */
     protected function notfound($no_layout = false)
     {
-        $this->response->html($this->template->layout('app/notfound', array(
+        $this->response->html($this->helper->layout->app('app/notfound', array(
             'title' => t('Page not found'),
             'no_layout' => $no_layout,
         )));
@@ -149,7 +149,7 @@ abstract class Base extends \Kanboard\Core\Base
             $this->response->text('Access Forbidden', 403);
         }
 
-        $this->response->html($this->template->layout('app/forbidden', array(
+        $this->response->html($this->helper->layout->app('app/forbidden', array(
             'title' => t('Access Forbidden'),
             'no_layout' => $no_layout,
         )));
@@ -180,43 +180,6 @@ abstract class Base extends \Kanboard\Core\Base
     }
 
     /**
-     * Common layout for task views
-     *
-     * @access protected
-     * @param  string $template Template name
-     * @param  array $params Template parameters
-     * @return string
-     */
-    protected function taskLayout($template, array $params)
-    {
-        $content = $this->template->render($template, $params);
-        $params['task_content_for_layout'] = $content;
-        $params['title'] = $params['task']['project_name'].' > '.$params['task']['title'];
-        $params['board_selector'] = $this->projectUserRole->getActiveProjectsByUser($this->userSession->getId());
-
-        return $this->template->layout('task/layout', $params);
-    }
-
-    /**
-     * Common layout for project views
-     *
-     * @access protected
-     * @param  string    $template   Template name
-     * @param  array     $params     Template parameters
-     * @return string
-     */
-    protected function projectLayout($template, array $params, $sidebar_template = 'project/sidebar')
-    {
-        $content = $this->template->render($template, $params);
-        $params['project_content_for_layout'] = $content;
-        $params['title'] = $params['project']['name'] === $params['title'] ? $params['title'] : $params['project']['name'].' > '.$params['title'];
-        $params['board_selector'] = $this->projectUserRole->getActiveProjectsByUser($this->userSession->getId());
-        $params['sidebar_template'] = $sidebar_template;
-
-        return $this->template->layout('project/layout', $params);
-    }
-
-    /**
      * Common method to get a task for task views
      *
      * @access protected
@@ -239,6 +202,36 @@ abstract class Base extends \Kanboard\Core\Base
     }
 
     /**
+     * Get Task or Project file
+     *
+     * @access protected
+     */
+    protected function getFile()
+    {
+        $task_id = $this->request->getIntegerParam('task_id');
+        $file_id = $this->request->getIntegerParam('file_id');
+        $model = 'projectFile';
+
+        if ($task_id > 0) {
+            $model = 'taskFile';
+            $project_id = $this->taskFinder->getProjectId($task_id);
+
+            if ($project_id !== $this->request->getIntegerParam('project_id')) {
+                $this->forbidden();
+            }
+        }
+
+        $file = $this->$model->getById($file_id);
+
+        if (empty($file)) {
+            $this->notfound();
+        }
+
+        $file['model'] = $model;
+        return $file;
+    }
+
+    /**
      * Common method to get a project
      *
      * @access protected
@@ -251,8 +244,7 @@ abstract class Base extends \Kanboard\Core\Base
         $project = $this->project->getByIdWithOwner($project_id);
 
         if (empty($project)) {
-            $this->flash->failure(t('Project not found.'));
-            $this->response->redirect($this->helper->url->to('project', 'index'));
+            $this->notfound();
         }
 
         return $project;
@@ -280,6 +272,23 @@ abstract class Base extends \Kanboard\Core\Base
     }
 
     /**
+     * Get the current subtask
+     *
+     * @access protected
+     * @return array
+     */
+    protected function getSubtask()
+    {
+        $subtask = $this->subtask->getById($this->request->getIntegerParam('subtask_id'));
+
+        if (empty($subtask)) {
+            $this->notfound();
+        }
+
+        return $subtask;
+    }
+
+    /**
      * Common method to get project filters
      *
      * @access protected
@@ -319,9 +328,10 @@ abstract class Base extends \Kanboard\Core\Base
      * @param  array  &$project
      * @return string
      */
-    protected function getProjectDescription(array &$project) {
+    protected function getProjectDescription(array &$project)
+    {
         if ($project['owner_id'] > 0) {
-            $description = t('Project owner: ').'**'.$this->template->e($project['owner_name'] ?: $project['owner_username']).'**'.PHP_EOL.PHP_EOL;
+            $description = t('Project owner: ').'**'.$this->helper->text->e($project['owner_name'] ?: $project['owner_username']).'**'.PHP_EOL.PHP_EOL;
 
             if (! empty($project['description'])) {
                 $description .= '***'.PHP_EOL.PHP_EOL;