2 files changed, 0 insertions, 135 deletions
diff --git a/app/Controller/CalendarController.php b/app/Controller/CalendarController.php
deleted file mode 100644
index e764549d..00000000
--- a/app/Controller/CalendarController.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-
-namespace Kanboard\Controller;
-
-use Kanboard\Filter\TaskAssigneeFilter;
-use Kanboard\Filter\TaskProjectFilter;
-use Kanboard\Filter\TaskStatusFilter;
-use Kanboard\Model\TaskModel;
-
-/**
- * Calendar Controller
- *
- * @package  Kanboard\Controller
- * @author   Frederic Guillot
- * @author   Timo Litzbarski
- */
-class CalendarController extends BaseController
-{
-    /**
-     * Show calendar view for a user
-     *
-     * @access public
-     */
-    public function user()
-    {
-        $user = $this->getUser();
-
-        $this->response->html($this->helper->layout->app('calendar/user', array(
-            'user' => $user,
-        )));
-    }
-
-    /**
-     * Show calendar view for a project
-     *
-     * @access public
-     */
-    public function project()
-    {
-        $project = $this->getProject();
-
-        $this->response->html($this->helper->layout->app('calendar/project', array(
-            'project'     => $project,
-            'title'       => $project['name'],
-            'description' => $this->helper->projectHeader->getDescription($project),
-        )));
-    }
-
-    /**
-     * Get tasks to display on the calendar (project view)
-     *
-     * @access public
-     */
-    public function projectEvents()
-    {
-        $project_id = $this->request->getIntegerParam('project_id');
-        $start = $this->request->getStringParam('start');
-        $end = $this->request->getStringParam('end');
-        $search = $this->userSession->getFilters($project_id);
-        $queryBuilder = $this->taskLexer->build($search)->withFilter(new TaskProjectFilter($project_id));
-
-        $events = $this->helper->calendar->getTaskDateDueEvents(clone($queryBuilder), $start, $end);
-        $events = array_merge($events, $this->helper->calendar->getTaskEvents(clone($queryBuilder), $start, $end));
-
-        $events = $this->hook->merge('controller:calendar:project:events', $events, array(
-            'project_id' => $project_id,
-            'start' => $start,
-            'end' => $end,
-        ));
-
-        $this->response->json($events);
-    }
-
-    /**
-     * Get tasks to display on the calendar (user view)
-     *
-     * @access public
-     */
-    public function userEvents()
-    {
-        $user_id = $this->request->getIntegerParam('user_id');
-        $start = $this->request->getStringParam('start');
-        $end = $this->request->getStringParam('end');
-        $queryBuilder = $this->taskQuery
-            ->withFilter(new TaskAssigneeFilter($user_id))
-            ->withFilter(new TaskStatusFilter(TaskModel::STATUS_OPEN));
-
-        $events = $this->helper->calendar->getTaskDateDueEvents(clone($queryBuilder), $start, $end);
-        $events = array_merge($events, $this->helper->calendar->getTaskEvents(clone($queryBuilder), $start, $end));
-
-        if ($this->configModel->get('calendar_user_subtasks_time_tracking') == 1) {
-            $events = array_merge($events, $this->helper->calendar->getSubtaskTimeTrackingEvents($user_id, $start, $end));
-        }
-
-        $events = $this->hook->merge('controller:calendar:user:events', $events, array(
-            'user_id' => $user_id,
-            'start' => $start,
-            'end' => $end,
-        ));
-
-        $this->response->json($events);
-    }
-
-    /**
-     * Update task due date
-     *
-     * @access public
-     */
-    public function save()
-    {
-        if ($this->request->isAjax() && $this->request->isPost()) {
-            $values = $this->request->getJson();
-
-            $this->taskModificationModel->update(array(
-                'id' => $values['task_id'],
-                'date_due' => substr($values['date_due'], 0, 10),
-            ));
-        }
-    }
-}
diff --git a/app/Controller/ConfigController.php b/app/Controller/ConfigController.php
index 6b85d1f9..6c2bc44b 100644
--- a/app/Controller/ConfigController.php
+++ b/app/Controller/ConfigController.php
@@ -49,9 +49,6 @@ class ConfigController extends BaseController
             case 'integrations':
                 $values += array('integration_gravatar' => 0);
                 break;
-            case 'calendar':
-                $values += array('calendar_user_subtasks_time_tracking' => 0);
-                break;
         }
 
         if ($this->configModel->save($values)) {
@@ -128,18 +125,6 @@ class ConfigController extends BaseController
     }
 
     /**
-     * Display the calendar settings page
-     *
-     * @access public
-     */
-    public function calendar()
-    {
-        $this->response->html($this->helper->layout->config('config/calendar', array(
-            'title' => t('Settings').' &gt; '.t('Calendar settings'),
-        )));
-    }
-
-    /**
      * Display the integration settings page
      *
      * @access public