AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename all models

Browse Source
This commit is contained in:
Frederic Guillot
2016-05-28 19:48:22 -04:00
parent 936376ffe7
commit 14713b0ec7
411 changed files with 4145 additions and 4156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/Controller/ActionController.php
View File

@@ -18,7 +18,7 @@ class ActionController extends BaseController
public function index()
{
$project = $this->getProject();
$actions = $this->action->getAllByProject($project['id']);
$actions = $this->actionModel->getAllByProject($project['id']);
$this->response->html($this->helper->layout->project('action/index', array(
'values' => array('project_id' => $project['id']),
@@ -27,12 +27,12 @@ class ActionController extends BaseController
'available_actions' => $this->actionManager->getAvailableActions(),
'available_events' => $this->eventManager->getAll(),
'available_params' => $this->actionManager->getAvailableParameters($actions),
'columns_list' => $this->column->getList($project['id']),
'users_list' => $this->projectUserRole->getAssignableUsersList($project['id']),
'projects_list' => $this->projectUserRole->getProjectsByUser($this->userSession->getId()),
'colors_list' => $this->color->getList(),
'categories_list' => $this->category->getList($project['id']),
'links_list' => $this->link->getList(0, false),
'columns_list' => $this->columnModel->getList($project['id']),
'users_list' => $this->projectUserRoleModel->getAssignableUsersList($project['id']),
'projects_list' => $this->projectUserRoleModel->getProjectsByUser($this->userSession->getId()),
'colors_list' => $this->colorModel->getList(),
'categories_list' => $this->categoryModel->getList($project['id']),
'links_list' => $this->linkModel->getList(0, false),
'title' => t('Automatic actions')
)));
}
@@ -47,7 +47,7 @@ class ActionController extends BaseController
$project = $this->getProject();
$this->response->html($this->helper->layout->project('action/remove', array(
'action' => $this->action->getById($this->request->getIntegerParam('action_id')),
'action' => $this->actionModel->getById($this->request->getIntegerParam('action_id')),
'available_events' => $this->eventManager->getAll(),
'available_actions' => $this->actionManager->getAvailableActions(),
'project' => $project,
@@ -64,9 +64,9 @@ class ActionController extends BaseController
{
$this->checkCSRFParam();
$project = $this->getProject();
$action = $this->action->getById($this->request->getIntegerParam('action_id'));
$action = $this->actionModel->getById($this->request->getIntegerParam('action_id'));
if (! empty($action) && $this->action->remove($action['id'])) {
if (! empty($action) && $this->actionModel->remove($action['id'])) {
$this->flash->success(t('Action removed successfully.'));
} else {
$this->flash->failure(t('Unable to remove this action.'));

16
app/Controller/ActionCreationController.php
View File

@@ -69,19 +69,19 @@ class ActionCreationController extends BaseController
$this->doCreation($project, $values + array('params' => array()));
}
$projects_list = $this->projectUserRole->getActiveProjectsByUser($this->userSession->getId());
$projects_list = $this->projectUserRoleModel->getActiveProjectsByUser($this->userSession->getId());
unset($projects_list[$project['id']]);
$this->response->html($this->template->render('action_creation/params', array(
'values' => $values,
'action_params' => $action_params,
'columns_list' => $this->column->getList($project['id']),
'users_list' => $this->projectUserRole->getAssignableUsersList($project['id']),
'columns_list' => $this->columnModel->getList($project['id']),
'users_list' => $this->projectUserRoleModel->getAssignableUsersList($project['id']),
'projects_list' => $projects_list,
'colors_list' => $this->color->getList(),
'categories_list' => $this->category->getList($project['id']),
'links_list' => $this->link->getList(0, false),
'priorities_list' => $this->project->getPriorities($project),
'colors_list' => $this->colorModel->getList(),
'categories_list' => $this->categoryModel->getList($project['id']),
'links_list' => $this->linkModel->getList(0, false),
'priorities_list' => $this->projectModel->getPriorities($project),
'project' => $project,
'available_actions' => $this->actionManager->getAvailableActions(),
'events' => $this->actionManager->getCompatibleEvents($values['action_name']),
@@ -110,7 +110,7 @@ class ActionCreationController extends BaseController
list($valid, ) = $this->actionValidator->validateCreation($values);
if ($valid) {
if ($this->action->create($values) !== false) {
if ($this->actionModel->create($values) !== false) {
$this->flash->success(t('Your automatic action have been created successfully.'));
} else {
$this->flash->failure(t('Unable to create your automatic action.'));

2
app/Controller/ActivityController.php
View File

@@ -38,7 +38,7 @@ class ActivityController extends BaseController
$this->response->html($this->helper->layout->task('activity/task', array(
'title' => $task['title'],
'task' => $task,
'project' => $this->project->getById($task['project_id']),
'project' => $this->projectModel->getById($task['project_id']),
'events' => $this->helper->projectActivity->getTaskEvents($task['id']),
)));
}

12
app/Controller/AnalyticController.php
View File

@@ -3,7 +3,7 @@
namespace Kanboard\Controller;
use Kanboard\Filter\TaskProjectFilter;
use Kanboard\Model\Task as TaskModel;
use Kanboard\Model\TaskModel;
/**
* Project Analytic Controller
@@ -30,8 +30,8 @@ class AnalyticController extends BaseController
),
'project' => $project,
'average' => $this->averageLeadCycleTimeAnalytic->build($project['id']),
'metrics' => $this->projectDailyStats->getRawMetrics($project['id'], $from, $to),
'date_format' => $this->config->get('application_date_format'),
'metrics' => $this->projectDailyStatsModel->getRawMetrics($project['id'], $from, $to),
'date_format' => $this->configModel->get('application_date_format'),
'date_formats' => $this->dateParser->getAvailableFormats($this->dateParser->getDateFormats()),
'title' => t('Lead and Cycle time for "%s"', $project['name']),
)));
@@ -145,7 +145,7 @@ class AnalyticController extends BaseController
$project = $this->getProject();
list($from, $to) = $this->getDates();
$display_graph = $this->projectDailyColumnStats->countDays($project['id'], $from, $to) >= 2;
$display_graph = $this->projectDailyColumnStatsModel->countDays($project['id'], $from, $to) >= 2;
$this->response->html($this->helper->layout->analytic($template, array(
'values' => array(
@@ -153,9 +153,9 @@ class AnalyticController extends BaseController
'to' => $to,
),
'display_graph' => $display_graph,
'metrics' => $display_graph ? $this->projectDailyColumnStats->getAggregatedMetrics($project['id'], $from, $to, $column) : array(),
'metrics' => $display_graph ? $this->projectDailyColumnStatsModel->getAggregatedMetrics($project['id'], $from, $to, $column) : array(),
'project' => $project,
'date_format' => $this->config->get('application_date_format'),
'date_format' => $this->configModel->get('application_date_format'),
'date_formats' => $this->dateParser->getAvailableFormats($this->dateParser->getDateFormats()),
'title' => t($title, $project['name']),
)));

2
app/Controller/AuthController.php
View File

@@ -23,7 +23,7 @@ class AuthController extends BaseController
$this->response->redirect($this->helper->url->to('DashboardController', 'show'));
} else {
$this->response->html($this->helper->layout->app('auth/index', array(
'captcha' => ! empty($values['username']) && $this->userLocking->hasCaptcha($values['username']),
'captcha' => ! empty($values['username']) && $this->userLockingModel->hasCaptcha($values['username']),
'errors' => $errors,
'values' => $values,
'no_layout' => true,

6
app/Controller/AvatarFileController.php
View File

@@ -32,7 +32,7 @@ class AvatarFileController extends BaseController
{
$user = $this->getUser();
if (! $this->avatarFile->uploadImageFile($user['id'], $this->request->getFileInfo('avatar'))) {
if (! $this->avatarFileModel->uploadImageFile($user['id'], $this->request->getFileInfo('avatar'))) {
$this->flash->failure(t('Unable to upload the file.'));
}
@@ -46,7 +46,7 @@ class AvatarFileController extends BaseController
{
$this->checkCSRFParam();
$user = $this->getUser();
$this->avatarFile->remove($user['id']);
$this->avatarFileModel->remove($user['id']);
$this->userSession->refresh($user['id']);
$this->response->redirect($this->helper->url->to('AvatarFileController', 'show', array('user_id' => $user['id'])));
}
@@ -58,7 +58,7 @@ class AvatarFileController extends BaseController
{
$user_id = $this->request->getIntegerParam('user_id');
$size = $this->request->getStringParam('size', 48);
$filename = $this->avatarFile->getFilename($user_id);
$filename = $this->avatarFileModel->getFilename($user_id);
$etag = md5($filename.$size);
$this->response->withCache(365 * 86400, $etag);

12
app/Controller/BaseController.php
View File

@@ -33,7 +33,7 @@ abstract class BaseController extends Base
*/
protected function checkWebhookToken()
{
if ($this->config->get('webhook_token') !== $this->request->getStringParam('token')) {
if ($this->configModel->get('webhook_token') !== $this->request->getStringParam('token')) {
$this->response->text('Not Authorized', 401);
}
}
@@ -49,7 +49,7 @@ abstract class BaseController extends Base
protected function getTask()
{
$project_id = $this->request->getIntegerParam('project_id');
$task = $this->taskFinder->getDetails($this->request->getIntegerParam('task_id'));
$task = $this->taskFinderModel->getDetails($this->request->getIntegerParam('task_id'));
if (empty($task)) {
throw new PageNotFoundException();
@@ -78,7 +78,7 @@ abstract class BaseController extends Base
if ($task_id > 0) {
$model = 'taskFile';
$project_id = $this->taskFinder->getProjectId($task_id);
$project_id = $this->taskFinderModel->getProjectId($task_id);
if ($project_id !== $this->request->getIntegerParam('project_id')) {
throw new AccessForbiddenException();
@@ -106,7 +106,7 @@ abstract class BaseController extends Base
protected function getProject($project_id = 0)
{
$project_id = $this->request->getIntegerParam('project_id', $project_id);
$project = $this->project->getByIdWithOwner($project_id);
$project = $this->projectModel->getByIdWithOwner($project_id);
if (empty($project)) {
throw new PageNotFoundException();
@@ -125,7 +125,7 @@ abstract class BaseController extends Base
*/
protected function getUser()
{
$user = $this->user->getById($this->request->getIntegerParam('user_id', $this->userSession->getId()));
$user = $this->userModel->getById($this->request->getIntegerParam('user_id', $this->userSession->getId()));
if (empty($user)) {
throw new PageNotFoundException();
@@ -147,7 +147,7 @@ abstract class BaseController extends Base
*/
protected function getSubtask()
{
$subtask = $this->subtask->getById($this->request->getIntegerParam('subtask_id'));
$subtask = $this->subtaskModel->getById($this->request->getIntegerParam('subtask_id'));
if (empty($subtask)) {
throw new PageNotFoundException();

10
app/Controller/BoardAjaxController.php
View File

@@ -28,7 +28,7 @@ class BoardAjaxController extends BaseController
$values = $this->request->getJson();
$result =$this->taskPosition->movePosition(
$result =$this->taskPositionModel->movePosition(
$project_id,
$values['task_id'],
$values['column_id'],
@@ -55,7 +55,7 @@ class BoardAjaxController extends BaseController
if (! $project_id || ! $this->request->isAjax()) {
throw new AccessForbiddenException();
} elseif (! $this->project->isModifiedSince($project_id, $timestamp)) {
} elseif (! $this->projectModel->isModifiedSince($project_id, $timestamp)) {
$this->response->status(304);
} else {
$this->response->html($this->renderBoard($project_id));
@@ -129,9 +129,9 @@ class BoardAjaxController extends BaseController
protected function renderBoard($project_id)
{
return $this->template->render('board/table_container', array(
'project' => $this->project->getById($project_id),
'board_private_refresh_interval' => $this->config->get('board_private_refresh_interval'),
'board_highlight_period' => $this->config->get('board_highlight_period'),
'project' => $this->projectModel->getById($project_id),
'board_private_refresh_interval' => $this->configModel->get('board_private_refresh_interval'),
'board_highlight_period' => $this->configModel->get('board_highlight_period'),
'swimlanes' => $this->taskLexer
->build($this->userSession->getFilters($project_id))
->format(BoardFormatter::getInstance($this->container)->setProjectId($project_id))

10
app/Controller/BoardPopoverController.php
View File

@@ -23,9 +23,9 @@ class BoardPopoverController extends BaseController
$this->response->html($this->template->render('board_popover/close_all_tasks_column', array(
'project' => $project,
'nb_tasks' => $this->taskFinder->countByColumnAndSwimlaneId($project['id'], $column_id, $swimlane_id),
'column' => $this->column->getColumnTitleById($column_id),
'swimlane' => $this->swimlane->getNameById($swimlane_id) ?: t($project['default_swimlane']),
'nb_tasks' => $this->taskFinderModel->countByColumnAndSwimlaneId($project['id'], $column_id, $swimlane_id),
'column' => $this->columnModel->getColumnTitleById($column_id),
'swimlane' => $this->swimlaneModel->getNameById($swimlane_id) ?: t($project['default_swimlane']),
'values' => array('column_id' => $column_id, 'swimlane_id' => $swimlane_id),
)));
}
@@ -40,8 +40,8 @@ class BoardPopoverController extends BaseController
$project = $this->getProject();
$values = $this->request->getValues();
$this->taskStatus->closeTasksBySwimlaneAndColumn($values['swimlane_id'], $values['column_id']);
$this->flash->success(t('All tasks of the column "%s" and the swimlane "%s" have been closed successfully.', $this->column->getColumnTitleById($values['column_id']), $this->swimlane->getNameById($values['swimlane_id']) ?: t($project['default_swimlane'])));
$this->taskStatusModel->closeTasksBySwimlaneAndColumn($values['swimlane_id'], $values['column_id']);
$this->flash->success(t('All tasks of the column "%s" and the swimlane "%s" have been closed successfully.', $this->columnModel->getColumnTitleById($values['column_id']), $this->swimlaneModel->getNameById($values['swimlane_id']) ?: t($project['default_swimlane'])));
$this->response->redirect($this->helper->url->to('BoardViewController', 'show', array('project_id' => $project['id'])));
}
}

18
app/Controller/BoardTooltipController.php
View File

@@ -19,7 +19,7 @@ class BoardTooltipController extends BaseController
{
$task = $this->getTask();
$this->response->html($this->template->render('board/tooltip_tasklinks', array(
'links' => $this->taskLink->getAllGroupedByLabel($task['id']),
'links' => $this->taskLinkModel->getAllGroupedByLabel($task['id']),
'task' => $task,
)));
}
@@ -33,7 +33,7 @@ class BoardTooltipController extends BaseController
{
$task = $this->getTask();
$this->response->html($this->template->render('board/tooltip_external_links', array(
'links' => $this->taskExternalLink->getAll($task['id']),
'links' => $this->taskExternalLinkModel->getAll($task['id']),
'task' => $task,
)));
}
@@ -47,7 +47,7 @@ class BoardTooltipController extends BaseController
{
$task = $this->getTask();
$this->response->html($this->template->render('board/tooltip_subtasks', array(
'subtasks' => $this->subtask->getAll($task['id']),
'subtasks' => $this->subtaskModel->getAll($task['id']),
'task' => $task,
)));
}
@@ -62,7 +62,7 @@ class BoardTooltipController extends BaseController
$task = $this->getTask();
$this->response->html($this->template->render('board/tooltip_files', array(
'files' => $this->taskFile->getAll($task['id']),
'files' => $this->taskFileModel->getAll($task['id']),
'task' => $task,
)));
}
@@ -78,7 +78,7 @@ class BoardTooltipController extends BaseController
$this->response->html($this->template->render('board/tooltip_comments', array(
'task' => $task,
'comments' => $this->comment->getAll($task['id'], $this->userSession->getCommentSorting())
'comments' => $this->commentModel->getAll($task['id'], $this->userSession->getCommentSorting())
)));
}
@@ -107,9 +107,9 @@ class BoardTooltipController extends BaseController
$this->response->html($this->template->render('task_recurrence/info', array(
'task' => $task,
'recurrence_trigger_list' => $this->task->getRecurrenceTriggerList(),
'recurrence_timeframe_list' => $this->task->getRecurrenceTimeframeList(),
'recurrence_basedate_list' => $this->task->getRecurrenceBasedateList(),
'recurrence_trigger_list' => $this->taskModel->getRecurrenceTriggerList(),
'recurrence_timeframe_list' => $this->taskModel->getRecurrenceTimeframeList(),
'recurrence_basedate_list' => $this->taskModel->getRecurrenceBasedateList(),
)));
}
@@ -121,7 +121,7 @@ class BoardTooltipController extends BaseController
public function swimlane()
{
$this->getProject();
$swimlane = $this->swimlane->getById($this->request->getIntegerParam('swimlane_id'));
$swimlane = $this->swimlaneModel->getById($this->request->getIntegerParam('swimlane_id'));
$this->response->html($this->template->render('board/tooltip_description', array('task' => $swimlane)));
}
}

14
app/Controller/BoardViewController.php
View File

@@ -22,7 +22,7 @@ class BoardViewController extends BaseController
public function readonly()
{
$token = $this->request->getStringParam('token');
$project = $this->project->getByToken($token);
$project = $this->projectModel->getByToken($token);
if (empty($project)) {
throw AccessForbiddenException::getInstance()->withoutLayout();
@@ -30,14 +30,14 @@ class BoardViewController extends BaseController
$this->response->html($this->helper->layout->app('board/view_public', array(
'project' => $project,
'swimlanes' => $this->board->getBoard($project['id']),
'swimlanes' => $this->boardModel->getBoard($project['id']),
'title' => $project['name'],
'description' => $project['description'],
'no_layout' => true,
'not_editable' => true,
'board_public_refresh_interval' => $this->config->get('board_public_refresh_interval'),
'board_private_refresh_interval' => $this->config->get('board_private_refresh_interval'),
'board_highlight_period' => $this->config->get('board_highlight_period'),
'board_public_refresh_interval' => $this->configModel->get('board_public_refresh_interval'),
'board_private_refresh_interval' => $this->configModel->get('board_private_refresh_interval'),
'board_highlight_period' => $this->configModel->get('board_highlight_period'),
)));
}
@@ -55,8 +55,8 @@ class BoardViewController extends BaseController
'project' => $project,
'title' => $project['name'],
'description' => $this->helper->projectHeader->getDescription($project),
'board_private_refresh_interval' => $this->config->get('board_private_refresh_interval'),
'board_highlight_period' => $this->config->get('board_highlight_period'),
'board_private_refresh_interval' => $this->configModel->get('board_private_refresh_interval'),
'board_highlight_period' => $this->configModel->get('board_highlight_period'),
'swimlanes' => $this->taskLexer
->build($search)
->format(BoardFormatter::getInstance($this->container)->setProjectId($project['id']))

8
app/Controller/CalendarController.php
View File

@@ -5,7 +5,7 @@ namespace Kanboard\Controller;
use Kanboard\Filter\TaskAssigneeFilter;
use Kanboard\Filter\TaskProjectFilter;
use Kanboard\Filter\TaskStatusFilter;
use Kanboard\Model\Task as TaskModel;
use Kanboard\Model\TaskModel;
/**
* Calendar Controller
@@ -29,7 +29,7 @@ class CalendarController extends BaseController
'project' => $project,
'title' => $project['name'],
'description' => $this->helper->projectHeader->getDescription($project),
'check_interval' => $this->config->get('board_private_refresh_interval'),
'check_interval' => $this->configModel->get('board_private_refresh_interval'),
)));
}
@@ -75,7 +75,7 @@ class CalendarController extends BaseController
$events = $this->helper->calendar->getTaskDateDueEvents(clone($queryBuilder), $start, $end);
$events = array_merge($events, $this->helper->calendar->getTaskEvents(clone($queryBuilder), $start, $end));
if ($this->config->get('calendar_user_subtasks_time_tracking') == 1) {
if ($this->configModel->get('calendar_user_subtasks_time_tracking') == 1) {
$events = array_merge($events, $this->helper->calendar->getSubtaskTimeTrackingEvents($user_id, $start, $end));
}
@@ -98,7 +98,7 @@ class CalendarController extends BaseController
if ($this->request->isAjax() && $this->request->isPost()) {
$values = $this->request->getJson();
$this->taskModification->update(array(
$this->taskModificationModel->update(array(
'id' => $values['task_id'],
'date_due' => substr($values['date_due'], 0, 10),
));

10
app/Controller/CategoryController.php
View File

@@ -21,7 +21,7 @@ class CategoryController extends BaseController
*/
private function getCategory()
{
$category = $this->category->getById($this->request->getIntegerParam('category_id'));
$category = $this->categoryModel->getById($this->request->getIntegerParam('category_id'));
if (empty($category)) {
throw new PageNotFoundException();
@@ -43,7 +43,7 @@ class CategoryController extends BaseController
$project = $this->getProject();
$this->response->html($this->helper->layout->project('category/index', array(
'categories' => $this->category->getList($project['id'], false),
'categories' => $this->categoryModel->getList($project['id'], false),
'values' => $values + array('project_id' => $project['id']),
'errors' => $errors,
'project' => $project,
@@ -64,7 +64,7 @@ class CategoryController extends BaseController
list($valid, $errors) = $this->categoryValidator->validateCreation($values);
if ($valid) {
if ($this->category->create($values)) {
if ($this->categoryModel->create($values)) {
$this->flash->success(t('Your category have been created successfully.'));
return $this->response->redirect($this->helper->url->to('CategoryController', 'index', array('project_id' => $project['id'])));
} else {
@@ -109,7 +109,7 @@ class CategoryController extends BaseController
list($valid, $errors) = $this->categoryValidator->validateModification($values);
if ($valid) {
if ($this->category->update($values)) {
if ($this->categoryModel->update($values)) {
$this->flash->success(t('Your category have been updated successfully.'));
return $this->response->redirect($this->helper->url->to('CategoryController', 'index', array('project_id' => $project['id'])));
} else {
@@ -148,7 +148,7 @@ class CategoryController extends BaseController
$project = $this->getProject();
$category = $this->getCategory();
if ($this->category->remove($category['id'])) {
if ($this->categoryModel->remove($category['id'])) {
$this->flash->success(t('Category removed successfully.'));
} else {
$this->flash->failure(t('Unable to remove this category.'));

14
app/Controller/ColumnController.php
View File

@@ -20,7 +20,7 @@ class ColumnController extends BaseController
public function index()
{
$project = $this->getProject();
$columns = $this->column->getAll($project['id']);
$columns = $this->columnModel->getAll($project['id']);
$this->response->html($this->helper->layout->project('column/index', array(
'columns' => $columns,
@@ -66,7 +66,7 @@ class ColumnController extends BaseController
list($valid, $errors) = $this->columnValidator->validateCreation($values);
if ($valid) {
if ($this->column->create($project['id'], $values['title'], $values['task_limit'], $values['description'])) {
if ($this->columnModel->create($project['id'], $values['title'], $values['task_limit'], $values['description'])) {
$this->flash->success(t('Column created successfully.'));
return $this->response->redirect($this->helper->url->to('ColumnController', 'index', array('project_id' => $project['id'])), true);
} else {
@@ -87,7 +87,7 @@ class ColumnController extends BaseController
public function edit(array $values = array(), array $errors = array())
{
$project = $this->getProject();
$column = $this->column->getById($this->request->getIntegerParam('column_id'));
$column = $this->columnModel->getById($this->request->getIntegerParam('column_id'));
$this->response->html($this->helper->layout->project('column/edit', array(
'errors' => $errors,
@@ -111,7 +111,7 @@ class ColumnController extends BaseController
list($valid, $errors) = $this->columnValidator->validateModification($values);
if ($valid) {
if ($this->column->update($values['id'], $values['title'], $values['task_limit'], $values['description'])) {
if ($this->columnModel->update($values['id'], $values['title'], $values['task_limit'], $values['description'])) {
$this->flash->success(t('Board updated successfully.'));
return $this->response->redirect($this->helper->url->to('ColumnController', 'index', array('project_id' => $project['id'])));
} else {
@@ -133,7 +133,7 @@ class ColumnController extends BaseController
$values = $this->request->getJson();
if (! empty($values) && isset($values['column_id']) && isset($values['position'])) {
$result = $this->column->changePosition($project['id'], $values['column_id'], $values['position']);
$result = $this->columnModel->changePosition($project['id'], $values['column_id'], $values['position']);
$this->response->json(array('result' => $result));
} else {
throw new AccessForbiddenException();
@@ -150,7 +150,7 @@ class ColumnController extends BaseController
$project = $this->getProject();
$this->response->html($this->helper->layout->project('column/remove', array(
'column' => $this->column->getById($this->request->getIntegerParam('column_id')),
'column' => $this->columnModel->getById($this->request->getIntegerParam('column_id')),
'project' => $project,
'title' => t('Remove a column from a board')
)));
@@ -167,7 +167,7 @@ class ColumnController extends BaseController
$this->checkCSRFParam();
$column_id = $this->request->getIntegerParam('column_id');
if ($this->column->remove($column_id)) {
if ($this->columnModel->remove($column_id)) {
$this->flash->success(t('Column removed successfully.'));
} else {
$this->flash->failure(t('Unable to remove this column.'));

8
app/Controller/CommentController.php
View File

@@ -23,7 +23,7 @@ class CommentController extends BaseController
*/
private function getComment()
{
$comment = $this->comment->getById($this->request->getIntegerParam('comment_id'));
$comment = $this->commentModel->getById($this->request->getIntegerParam('comment_id'));
if (empty($comment)) {
throw new PageNotFoundException();
@@ -76,7 +76,7 @@ class CommentController extends BaseController
list($valid, $errors) = $this->commentValidator->validateCreation($values);
if ($valid) {
if ($this->comment->create($values)) {
if ($this->commentModel->create($values)) {
$this->flash->success(t('Comment added successfully.'));
} else {
$this->flash->failure(t('Unable to create your comment.'));
@@ -125,7 +125,7 @@ class CommentController extends BaseController
list($valid, $errors) = $this->commentValidator->validateModification($values);
if ($valid) {
if ($this->comment->update($values)) {
if ($this->commentModel->update($values)) {
$this->flash->success(t('Comment updated successfully.'));
} else {
$this->flash->failure(t('Unable to update your comment.'));
@@ -165,7 +165,7 @@ class CommentController extends BaseController
$task = $this->getTask();
$comment = $this->getComment();
if ($this->comment->remove($comment['id'])) {
if ($this->commentModel->remove($comment['id'])) {
$this->flash->success(t('Comment removed successfully.'));
} else {
$this->flash->failure(t('Unable to remove this comment.'));

20
app/Controller/ConfigController.php
View File

@@ -18,7 +18,7 @@ class ConfigController extends BaseController
public function index()
{
$this->response->html($this->helper->layout->config('config/about', array(
'db_size' => $this->config->getDatabaseSize(),
'db_size' => $this->configModel->getDatabaseSize(),
'db_version' => $this->db->getDriver()->getDatabaseVersion(),
'user_agent' => $this->request->getServerVariable('HTTP_USER_AGENT'),
'title' => t('Settings').' > '.t('About'),
@@ -54,8 +54,8 @@ class ConfigController extends BaseController
break;
}
if ($this->config->save($values)) {
$this->language->loadCurrentLanguage();
if ($this->configModel->save($values)) {
$this->languageModel->loadCurrentLanguage();
$this->flash->success(t('Settings saved successfully.'));
} else {
$this->flash->failure(t('Unable to save your settings.'));
@@ -72,8 +72,8 @@ class ConfigController extends BaseController
public function application()
{
$this->response->html($this->helper->layout->config('config/application', array(
'languages' => $this->language->getLanguages(),
'timezones' => $this->timezone->getTimezones(),
'languages' => $this->languageModel->getLanguages(),
'timezones' => $this->timezoneModel->getTimezones(),
'date_formats' => $this->dateParser->getAvailableFormats($this->dateParser->getDateFormats()),
'datetime_formats' => $this->dateParser->getAvailableFormats($this->dateParser->getDateTimeFormats()),
'time_formats' => $this->dateParser->getAvailableFormats($this->dateParser->getTimeFormats()),
@@ -89,8 +89,8 @@ class ConfigController extends BaseController
public function project()
{
$this->response->html($this->helper->layout->config('config/project', array(
'colors' => $this->color->getList(),
'default_columns' => implode(', ', $this->board->getDefaultColumns()),
'colors' => $this->colorModel->getList(),
'default_columns' => implode(', ', $this->boardModel->getDefaultColumns()),
'title' => t('Settings').' > '.t('Project settings'),
)));
}
@@ -164,7 +164,7 @@ class ConfigController extends BaseController
{
$this->checkCSRFParam();
$this->response->withFileDownload('db.sqlite.gz');
$this->response->binary($this->config->downloadDatabase());
$this->response->binary($this->configModel->downloadDatabase());
}
/**
@@ -175,7 +175,7 @@ class ConfigController extends BaseController
public function optimizeDb()
{
$this->checkCSRFParam();
$this->config->optimizeDatabase();
$this->configModel->optimizeDatabase();
$this->flash->success(t('Database optimization done.'));
$this->response->redirect($this->helper->url->to('ConfigController', 'index'));
}
@@ -190,7 +190,7 @@ class ConfigController extends BaseController
$type = $this->request->getStringParam('type');
$this->checkCSRFParam();
$this->config->regenerateToken($type.'_token');
$this->configModel->regenerateToken($type.'_token');
$this->flash->success(t('Token regenerated.'));
$this->response->redirect($this->helper->url->to('ConfigController', $type));

10
app/Controller/CurrencyController.php
View File

@@ -20,11 +20,11 @@ class CurrencyController extends BaseController
public function index(array $values = array(), array $errors = array())
{
$this->response->html($this->helper->layout->config('currency/index', array(
'config_values' => array('application_currency' => $this->config->get('application_currency')),
'config_values' => array('application_currency' => $this->configModel->get('application_currency')),
'values' => $values,
'errors' => $errors,
'rates' => $this->currency->getAll(),
'currencies' => $this->currency->getCurrencies(),
'rates' => $this->currencyModel->getAll(),
'currencies' => $this->currencyModel->getCurrencies(),
'title' => t('Settings').' > '.t('Currency rates'),
)));
}
@@ -40,7 +40,7 @@ class CurrencyController extends BaseController
list($valid, $errors) = $this->currencyValidator->validateCreation($values);
if ($valid) {
if ($this->currency->create($values['currency'], $values['rate'])) {
if ($this->currencyModel->create($values['currency'], $values['rate'])) {
$this->flash->success(t('The currency rate have been added successfully.'));
return $this->response->redirect($this->helper->url->to('CurrencyController', 'index'));
} else {
@@ -60,7 +60,7 @@ class CurrencyController extends BaseController
{
$values = $this->request->getValues();
if ($this->config->save($values)) {
if ($this->configModel->save($values)) {
$this->flash->success(t('Settings saved successfully.'));
} else {
$this->flash->failure(t('Unable to save your settings.'));

18
app/Controller/CustomFilterController.php
View File

@@ -27,7 +27,7 @@ class CustomFilterController extends BaseController
'values' => $values + array('project_id' => $project['id']),
'errors' => $errors,
'project' => $project,
'custom_filters' => $this->customFilter->getAll($project['id'], $this->userSession->getId()),
'custom_filters' => $this->customFilterModel->getAll($project['id'], $this->userSession->getId()),
'title' => t('Custom filters'),
)));
}
@@ -47,7 +47,7 @@ class CustomFilterController extends BaseController
list($valid, $errors) = $this->customFilterValidator->validateCreation($values);
if ($valid) {
if ($this->customFilter->create($values)) {
if ($this->customFilterModel->create($values)) {
$this->flash->success(t('Your custom filter have been created successfully.'));
return $this->response->redirect($this->helper->url->to('CustomFilterController', 'index', array('project_id' => $project['id'])));
} else {
@@ -66,7 +66,7 @@ class CustomFilterController extends BaseController
public function confirm()
{
$project = $this->getProject();
$filter = $this->customFilter->getById($this->request->getIntegerParam('filter_id'));
$filter = $this->customFilterModel->getById($this->request->getIntegerParam('filter_id'));
$this->response->html($this->helper->layout->project('custom_filter/remove', array(
'project' => $project,
@@ -84,11 +84,11 @@ class CustomFilterController extends BaseController
{
$this->checkCSRFParam();
$project = $this->getProject();
$filter = $this->customFilter->getById($this->request->getIntegerParam('filter_id'));
$filter = $this->customFilterModel->getById($this->request->getIntegerParam('filter_id'));
$this->checkPermission($project, $filter);
if ($this->customFilter->remove($filter['id'])) {
if ($this->customFilterModel->remove($filter['id'])) {
$this->flash->success(t('Custom filter removed successfully.'));
} else {
$this->flash->failure(t('Unable to remove this custom filter.'));
@@ -105,7 +105,7 @@ class CustomFilterController extends BaseController
public function edit(array $values = array(), array $errors = array())
{
$project = $this->getProject();
$filter = $this->customFilter->getById($this->request->getIntegerParam('filter_id'));
$filter = $this->customFilterModel->getById($this->request->getIntegerParam('filter_id'));
$this->checkPermission($project, $filter);
@@ -126,7 +126,7 @@ class CustomFilterController extends BaseController
public function update()
{
$project = $this->getProject();
$filter = $this->customFilter->getById($this->request->getIntegerParam('filter_id'));
$filter = $this->customFilterModel->getById($this->request->getIntegerParam('filter_id'));
$this->checkPermission($project, $filter);
@@ -143,7 +143,7 @@ class CustomFilterController extends BaseController
list($valid, $errors) = $this->customFilterValidator->validateModification($values);
if ($valid) {
if ($this->customFilter->update($values)) {
if ($this->customFilterModel->update($values)) {
$this->flash->success(t('Your custom filter have been updated successfully.'));
return $this->response->redirect($this->helper->url->to('CustomFilterController', 'index', array('project_id' => $project['id'])));
} else {
@@ -158,7 +158,7 @@ class CustomFilterController extends BaseController
{
$user_id = $this->userSession->getId();
if ($filter['user_id'] != $user_id && ($this->projectUserRole->getUserRole($project['id'], $user_id) === Role::PROJECT_MANAGER || ! $this->userSession->isAdmin())) {
if ($filter['user_id'] != $user_id && ($this->projectUserRoleModel->getUserRole($project['id'], $user_id) === Role::PROJECT_MANAGER || ! $this->userSession->isAdmin())) {
throw new AccessForbiddenException();
}
}

14
app/Controller/DashboardController.php
View File

@@ -2,8 +2,8 @@
namespace Kanboard\Controller;
use Kanboard\Model\Project as ProjectModel;
use Kanboard\Model\Subtask as SubtaskModel;
use Kanboard\Model\ProjectModel;
use Kanboard\Model\SubtaskModel;
/**
* Dashboard Controller
@@ -28,7 +28,7 @@ class DashboardController extends BaseController
->setUrl('DashboardController', $action, array('pagination' => 'projects', 'user_id' => $user_id))
->setMax($max)
->setOrder(ProjectModel::TABLE.'.name')
->setQuery($this->project->getQueryColumnStats($this->projectPermission->getActiveProjectIds($user_id)))
->setQuery($this->projectModel->getQueryColumnStats($this->projectPermissionModel->getActiveProjectIds($user_id)))
->calculateOnlyIf($this->request->getStringParam('pagination') === 'projects');
}
@@ -47,7 +47,7 @@ class DashboardController extends BaseController
->setUrl('DashboardController', $action, array('pagination' => 'tasks', 'user_id' => $user_id))
->setMax($max)
->setOrder('tasks.id')
->setQuery($this->taskFinder->getUserQuery($user_id))
->setQuery($this->taskFinderModel->getUserQuery($user_id))
->calculateOnlyIf($this->request->getStringParam('pagination') === 'tasks');
}
@@ -66,7 +66,7 @@ class DashboardController extends BaseController
->setUrl('DashboardController', $action, array('pagination' => 'subtasks', 'user_id' => $user_id))
->setMax($max)
->setOrder('tasks.id')
->setQuery($this->subtask->getUserQuery($user_id, array(SubTaskModel::STATUS_TODO, SubtaskModel::STATUS_INPROGRESS)))
->setQuery($this->subtaskModel->getUserQuery($user_id, array(SubTaskModel::STATUS_TODO, SubtaskModel::STATUS_INPROGRESS)))
->calculateOnlyIf($this->request->getStringParam('pagination') === 'subtasks');
}
@@ -147,7 +147,7 @@ class DashboardController extends BaseController
$this->response->html($this->helper->layout->dashboard('dashboard/activity', array(
'title' => t('My activity stream'),
'events' => $this->helper->projectActivity->getProjectsEvents($this->projectPermission->getActiveProjectIds($user['id']), 100),
'events' => $this->helper->projectActivity->getProjectsEvents($this->projectPermissionModel->getActiveProjectIds($user['id']), 100),
'user' => $user,
)));
}
@@ -176,7 +176,7 @@ class DashboardController extends BaseController
$this->response->html($this->helper->layout->dashboard('dashboard/notifications', array(
'title' => t('My notifications'),
'notifications' => $this->userUnreadNotification->getAll($user['id']),
'notifications' => $this->userUnreadNotificationModel->getAll($user['id']),
'user' => $user,
)));
}

4
app/Controller/DocumentationController.php
View File

@@ -20,7 +20,7 @@ class DocumentationController extends BaseController
$page = 'index';
}
if ($this->language->getCurrentLanguage() === 'fr_FR') {
if ($this->languageModel->getCurrentLanguage() === 'fr_FR') {
$filename = __DIR__.'/../../doc/fr/' . $page . '.markdown';
} else {
$filename = __DIR__ . '/../../doc/' . $page . '.markdown';
@@ -83,7 +83,7 @@ class DocumentationController extends BaseController
*/
public function replaceImageUrl(array $matches)
{
if ($this->language->getCurrentLanguage() === 'fr_FR') {
if ($this->languageModel->getCurrentLanguage() === 'fr_FR') {
return '('.$this->helper->url->base().'doc/fr/'.$matches[1].')';
}

2
app/Controller/ExportController.php
View File

@@ -42,7 +42,7 @@ class ExportController extends BaseController
'to' => $to,
),
'errors' => array(),
'date_format' => $this->config->get('application_date_format'),
'date_format' => $this->configModel->get('application_date_format'),
'date_formats' => $this->dateParser->getAvailableFormats($this->dateParser->getDateFormats()),
'project' => $project,
'title' => $page_title,

6
app/Controller/FeedController.php
View File

@@ -20,7 +20,7 @@ class FeedController extends BaseController
public function user()
{
$token = $this->request->getStringParam('token');
$user = $this->user->getByToken($token);
$user = $this->userModel->getByToken($token);
// Token verification
if (empty($user)) {
@@ -28,7 +28,7 @@ class FeedController extends BaseController
}
$this->response->xml($this->template->render('feed/user', array(
'events' => $this->helper->projectActivity->getProjectsEvents($this->projectPermission->getActiveProjectIds($user['id'])),
'events' => $this->helper->projectActivity->getProjectsEvents($this->projectPermissionModel->getActiveProjectIds($user['id'])),
'user' => $user,
)));
}
@@ -41,7 +41,7 @@ class FeedController extends BaseController
public function project()
{
$token = $this->request->getStringParam('token');
$project = $this->project->getByToken($token);
$project = $this->projectModel->getByToken($token);
if (empty($project)) {
throw AccessForbiddenException::getInstance()->withoutLayout();

2
app/Controller/GroupCreationController.php
View File

@@ -36,7 +36,7 @@ class GroupCreationController extends BaseController
list($valid, $errors) = $this->groupValidator->validateCreation($values);
if ($valid) {
if ($this->group->create($values['name']) !== false) {
if ($this->groupModel->create($values['name']) !== false) {
$this->flash->success(t('Group created successfully.'));
return $this->response->redirect($this->helper->url->to('GroupListController', 'index'), true);
} else {

22
app/Controller/GroupListController.php
View File

@@ -21,7 +21,7 @@ class GroupListController extends BaseController
->setUrl('GroupListController', 'index')
->setMax(30)
->setOrder('name')
->setQuery($this->group->getQuery())
->setQuery($this->groupModel->getQuery())
->calculate();
$this->response->html($this->helper->layout->app('group/index', array(
@@ -38,13 +38,13 @@ class GroupListController extends BaseController
public function users()
{
$group_id = $this->request->getIntegerParam('group_id');
$group = $this->group->getById($group_id);
$group = $this->groupModel->getById($group_id);
$paginator = $this->paginator
->setUrl('GroupListController', 'users', array('group_id' => $group_id))
->setMax(30)
->setOrder('username')
->setQuery($this->groupMember->getQuery($group_id))
->setQuery($this->groupMemberModel->getQuery($group_id))
->calculate();
$this->response->html($this->helper->layout->app('group/users', array(
@@ -64,14 +64,14 @@ class GroupListController extends BaseController
public function associate(array $values = array(), array $errors = array())
{
$group_id = $this->request->getIntegerParam('group_id');
$group = $this->group->getById($group_id);
$group = $this->groupModel->getById($group_id);
if (empty($values)) {
$values['group_id'] = $group_id;
}
$this->response->html($this->template->render('group/associate', array(
'users' => $this->user->prepareList($this->groupMember->getNotMembers($group_id)),
'users' => $this->userModel->prepareList($this->groupMemberModel->getNotMembers($group_id)),
'group' => $group,
'errors' => $errors,
'values' => $values,
@@ -88,7 +88,7 @@ class GroupListController extends BaseController
$values = $this->request->getValues();
if (isset($values['group_id']) && isset($values['user_id'])) {
if ($this->groupMember->addUser($values['group_id'], $values['user_id'])) {
if ($this->groupMemberModel->addUser($values['group_id'], $values['user_id'])) {
$this->flash->success(t('Group member added successfully.'));
return $this->response->redirect($this->helper->url->to('GroupListController', 'users', array('group_id' => $values['group_id'])), true);
} else {
@@ -108,8 +108,8 @@ class GroupListController extends BaseController
{
$group_id = $this->request->getIntegerParam('group_id');
$user_id = $this->request->getIntegerParam('user_id');
$group = $this->group->getById($group_id);
$user = $this->user->getById($user_id);
$group = $this->groupModel->getById($group_id);
$user = $this->userModel->getById($user_id);
$this->response->html($this->template->render('group/dissociate', array(
'group' => $group,
@@ -128,7 +128,7 @@ class GroupListController extends BaseController
$group_id = $this->request->getIntegerParam('group_id');
$user_id = $this->request->getIntegerParam('user_id');
if ($this->groupMember->removeUser($group_id, $user_id)) {
if ($this->groupMemberModel->removeUser($group_id, $user_id)) {
$this->flash->success(t('User removed successfully from this group.'));
} else {
$this->flash->failure(t('Unable to remove this user from the group.'));
@@ -145,7 +145,7 @@ class GroupListController extends BaseController
public function confirm()
{
$group_id = $this->request->getIntegerParam('group_id');
$group = $this->group->getById($group_id);
$group = $this->groupModel->getById($group_id);
$this->response->html($this->template->render('group/remove', array(
'group' => $group,
@@ -162,7 +162,7 @@ class GroupListController extends BaseController
$this->checkCSRFParam();
$group_id = $this->request->getIntegerParam('group_id');
if ($this->group->remove($group_id)) {
if ($this->groupModel->remove($group_id)) {
$this->flash->success(t('Group removed successfully.'));
} else {
$this->flash->failure(t('Unable to remove this group.'));

4
app/Controller/GroupModificationController.php
View File

@@ -20,7 +20,7 @@ class GroupModificationController extends BaseController
public function show(array $values = array(), array $errors = array())
{
if (empty($values)) {
$values = $this->group->getById($this->request->getIntegerParam('group_id'));
$values = $this->groupModel->getById($this->request->getIntegerParam('group_id'));
}
$this->response->html($this->template->render('group_modification/show', array(
@@ -40,7 +40,7 @@ class GroupModificationController extends BaseController
list($valid, $errors) = $this->groupValidator->validateModification($values);
if ($valid) {
if ($this->group->update($values) !== false) {
if ($this->groupModel->update($values) !== false) {
$this->flash->success(t('Group updated successfully.'));
return $this->response->redirect($this->helper->url->to('GroupListController', 'index'), true);
} else {

10
app/Controller/ICalendarController.php
View File

@@ -8,7 +8,7 @@ use Kanboard\Filter\TaskAssigneeFilter;
use Kanboard\Filter\TaskProjectFilter;
use Kanboard\Filter\TaskStatusFilter;
use Kanboard\Formatter\TaskICalFormatter;
use Kanboard\Model\Task as TaskModel;
use Kanboard\Model\TaskModel;
use Eluceo\iCal\Component\Calendar as iCalendar;
/**
@@ -27,7 +27,7 @@ class ICalendarController extends BaseController
public function user()
{
$token = $this->request->getStringParam('token');
$user = $this->user->getByToken($token);
$user = $this->userModel->getByToken($token);
// Token verification
if (empty($user)) {
@@ -37,7 +37,7 @@ class ICalendarController extends BaseController
// Common filter
$queryBuilder = new QueryBuilder();
$queryBuilder
->withQuery($this->taskFinder->getICalQuery())
->withQuery($this->taskFinderModel->getICalQuery())
->withFilter(new TaskStatusFilter(TaskModel::STATUS_OPEN))
->withFilter(new TaskAssigneeFilter($user['id']));
@@ -58,7 +58,7 @@ class ICalendarController extends BaseController
public function project()
{
$token = $this->request->getStringParam('token');
$project = $this->project->getByToken($token);
$project = $this->projectModel->getByToken($token);
// Token verification
if (empty($project)) {
@@ -68,7 +68,7 @@ class ICalendarController extends BaseController
// Common filter
$queryBuilder = new QueryBuilder();
$queryBuilder
->withQuery($this->taskFinder->getICalQuery())
->withQuery($this->taskFinderModel->getICalQuery())
->withFilter(new TaskStatusFilter(TaskModel::STATUS_OPEN))
->withFilter(new TaskProjectFilter($project['id']));

12
app/Controller/LinkController.php
View File

@@ -22,7 +22,7 @@ class LinkController extends BaseController
*/
private function getLink()
{
$link = $this->link->getById($this->request->getIntegerParam('link_id'));
$link = $this->linkModel->getById($this->request->getIntegerParam('link_id'));
if (empty($link)) {
throw new PageNotFoundException();
@@ -41,7 +41,7 @@ class LinkController extends BaseController
public function index(array $values = array(), array $errors = array())
{
$this->response->html($this->helper->layout->config('link/index', array(
'links' => $this->link->getMergedList(),
'links' => $this->linkModel->getMergedList(),
'values' => $values,
'errors' => $errors,
'title' => t('Settings').' > '.t('Task\'s links'),
@@ -59,7 +59,7 @@ class LinkController extends BaseController
list($valid, $errors) = $this->linkValidator->validateCreation($values);
if ($valid) {
if ($this->link->create($values['label'], $values['opposite_label']) !== false) {
if ($this->linkModel->create($values['label'], $values['opposite_label']) !== false) {
$this->flash->success(t('Link added successfully.'));
return $this->response->redirect($this->helper->url->to('LinkController', 'index'));
} else {
@@ -86,7 +86,7 @@ class LinkController extends BaseController
$this->response->html($this->helper->layout->config('link/edit', array(
'values' => $values ?: $link,
'errors' => $errors,
'labels' => $this->link->getList($link['id']),
'labels' => $this->linkModel->getList($link['id']),
'link' => $link,
'title' => t('Link modification')
)));
@@ -103,7 +103,7 @@ class LinkController extends BaseController
list($valid, $errors) = $this->linkValidator->validateModification($values);
if ($valid) {
if ($this->link->update($values)) {
if ($this->linkModel->update($values)) {
$this->flash->success(t('Link updated successfully.'));
return $this->response->redirect($this->helper->url->to('LinkController', 'index'));
} else {
@@ -139,7 +139,7 @@ class LinkController extends BaseController
$this->checkCSRFParam();
$link = $this->getLink();
if ($this->link->remove($link['id'])) {
if ($this->linkModel->remove($link['id'])) {
$this->flash->success(t('Link removed successfully.'));
} else {
$this->flash->failure(t('Unable to remove this link.'));

14
app/Controller/PasswordResetController.php
View File

@@ -52,7 +52,7 @@ class PasswordResetController extends BaseController
$this->checkActivation();
$token = $this->request->getStringParam('token');
$user_id = $this->passwordReset->getUserIdByToken($token);
$user_id = $this->passwordResetModel->getUserIdByToken($token);
if ($user_id !== false) {
$this->response->html($this->helper->layout->app('password_reset/change', array(
@@ -78,11 +78,11 @@ class PasswordResetController extends BaseController
list($valid, $errors) = $this->passwordResetValidator->validateModification($values);
if ($valid) {
$user_id = $this->passwordReset->getUserIdByToken($token);
$user_id = $this->passwordResetModel->getUserIdByToken($token);
if ($user_id !== false) {
$this->user->update(array('id' => $user_id, 'password' => $values['password']));
$this->passwordReset->disable($user_id);
$this->userModel->update(array('id' => $user_id, 'password' => $values['password']));
$this->passwordResetModel->disable($user_id);
}
return $this->response->redirect($this->helper->url->to('AuthController', 'login'));
@@ -96,10 +96,10 @@ class PasswordResetController extends BaseController
*/
private function sendEmail($username)
{
$token = $this->passwordReset->create($username);
$token = $this->passwordResetModel->create($username);
if ($token !== false) {
$user = $this->user->getByUsername($username);
$user = $this->userModel->getByUsername($username);
$this->emailClient->send(
$user['email'],
@@ -115,7 +115,7 @@ class PasswordResetController extends BaseController
*/
private function checkActivation()
{
if ($this->config->get('password_reset', 0) == 0) {
if ($this->configModel->get('password_reset', 0) == 0) {
throw AccessForbiddenException::getInstance()->withoutLayout();
}
}

4
app/Controller/ProjectActionDuplicationController.php
View File

@@ -13,7 +13,7 @@ class ProjectActionDuplicationController extends BaseController
public function show()
{
$project = $this->getProject();
$projects = $this->projectUserRole->getProjectsByUser($this->userSession->getId());
$projects = $this->projectUserRoleModel->getProjectsByUser($this->userSession->getId());
unset($projects[$project['id']]);
$this->response->html($this->template->render('project_action_duplication/show', array(
@@ -27,7 +27,7 @@ class ProjectActionDuplicationController extends BaseController
$project = $this->getProject();
$src_project_id = $this->request->getValue('src_project_id');
if ($this->action->duplicate($src_project_id, $project['id'])) {
if ($this->actionModel->duplicate($src_project_id, $project['id'])) {
$this->flash->success(t('Actions duplicated successfully.'));
} else {
$this->flash->failure(t('Unable to duplicate actions.'));

8
app/Controller/ProjectCreationController.php
View File

@@ -20,7 +20,7 @@ class ProjectCreationController extends BaseController
public function create(array $values = array(), array $errors = array())
{
$is_private = isset($values['is_private']) && $values['is_private'] == 1;
$projects_list = array(0 => t('Do not duplicate anything')) + $this->projectUserRole->getActiveProjectsByUser($this->userSession->getId());
$projects_list = array(0 => t('Do not duplicate anything')) + $this->projectUserRoleModel->getActiveProjectsByUser($this->userSession->getId());
$this->response->html($this->helper->layout->app('project_creation/create', array(
'values' => $values,
@@ -98,7 +98,7 @@ class ProjectCreationController extends BaseController
'is_private' => $values['is_private'],
);
return $this->project->create($project, $this->userSession->getId(), true);
return $this->projectModel->create($project, $this->userSession->getId(), true);
}
/**
@@ -112,13 +112,13 @@ class ProjectCreationController extends BaseController
{
$selection = array();
foreach ($this->projectDuplication->getOptionalSelection() as $item) {
foreach ($this->projectDuplicationModel->getOptionalSelection() as $item) {
if (isset($values[$item]) && $values[$item] == 1) {
$selection[] = $item;
}
}
return $this->projectDuplication->duplicate(
return $this->projectDuplicationModel->duplicate(
$values['src_project_id'],
$selection,
$this->userSession->getId(),

4
app/Controller/ProjectEditController.php
View File

@@ -73,7 +73,7 @@ class ProjectEditController extends BaseController
list($valid, $errors) = $this->projectValidator->validateModification($values);
if ($valid) {
if ($this->project->update($values)) {
if ($this->projectModel->update($values)) {
$this->flash->success(t('Project updated successfully.'));
return $this->response->redirect($this->helper->url->to('ProjectEditController', $redirect, array('project_id' => $project['id'])), true);
} else {
@@ -123,7 +123,7 @@ class ProjectEditController extends BaseController
$project = $this->getProject();
$this->response->html($this->helper->layout->project($template, array(
'owners' => $this->projectUserRole->getAssignableUsersList($project['id'], true),
'owners' => $this->projectUserRoleModel->getAssignableUsersList($project['id'], true),
'values' => empty($values) ? $project : $values,
'errors' => $errors,
'project' => $project,

8
app/Controller/ProjectFileController.php
View File

@@ -34,7 +34,7 @@ class ProjectFileController extends BaseController
{
$project = $this->getProject();
if (! $this->projectFile->uploadFiles($project['id'], $this->request->getFileInfo('files'))) {
if (! $this->projectFileModel->uploadFiles($project['id'], $this->request->getFileInfo('files'))) {
$this->flash->failure(t('Unable to upload the file.'));
}
@@ -50,9 +50,9 @@ class ProjectFileController extends BaseController
{
$this->checkCSRFParam();
$project = $this->getProject();
$file = $this->projectFile->getById($this->request->getIntegerParam('file_id'));
$file = $this->projectFileModel->getById($this->request->getIntegerParam('file_id'));
if ($this->projectFile->remove($file['id'])) {
if ($this->projectFileModel->remove($file['id'])) {
$this->flash->success(t('File removed successfully.'));
} else {
$this->flash->failure(t('Unable to remove this file.'));
@@ -69,7 +69,7 @@ class ProjectFileController extends BaseController
public function confirm()
{
$project = $this->getProject();
$file = $this->projectFile->getById($this->request->getIntegerParam('file_id'));
$file = $this->projectFileModel->getById($this->request->getIntegerParam('file_id'));
$this->response->html($this->template->render('project_file/remove', array(
'project' => $project,

12
app/Controller/ProjectGanttController.php
View File

@@ -6,7 +6,7 @@ use Kanboard\Filter\ProjectIdsFilter;
use Kanboard\Filter\ProjectStatusFilter;
use Kanboard\Filter\ProjectTypeFilter;
use Kanboard\Formatter\ProjectGanttFormatter;
use Kanboard\Model\Project;
use Kanboard\Model\ProjectModel;
/**
* Projects Gantt Controller
@@ -21,13 +21,13 @@ class ProjectGanttController extends BaseController
*/
public function show()
{
$project_ids = $this->projectPermission->getActiveProjectIds($this->userSession->getId());
$project_ids = $this->projectPermissionModel->getActiveProjectIds($this->userSession->getId());
$filter = $this->projectQuery
->withFilter(new ProjectTypeFilter(Project::TYPE_TEAM))
->withFilter(new ProjectStatusFilter(Project::ACTIVE))
->withFilter(new ProjectTypeFilter(ProjectModel::TYPE_TEAM))
->withFilter(new ProjectStatusFilter(ProjectModel::ACTIVE))
->withFilter(new ProjectIdsFilter($project_ids));
$filter->getQuery()->asc(Project::TABLE.'.start_date');
$filter->getQuery()->asc(ProjectModel::TABLE.'.start_date');
$this->response->html($this->helper->layout->app('project_gantt/show', array(
'projects' => $filter->format(new ProjectGanttFormatter($this->container)),
@@ -42,7 +42,7 @@ class ProjectGanttController extends BaseController
{
$values = $this->request->getJson();
$result = $this->project->update(array(
$result = $this->projectModel->update(array(
'id' => $values['id'],
'start_date' => $this->dateParser->getIsoDate(strtotime($values['start'])),
'end_date' => $this->dateParser->getIsoDate(strtotime($values['end'])),

6
app/Controller/ProjectListController.php
View File

@@ -18,9 +18,9 @@ class ProjectListController extends BaseController
public function show()
{
if ($this->userSession->isAdmin()) {
$project_ids = $this->project->getAllIds();
$project_ids = $this->projectModel->getAllIds();
} else {
$project_ids = $this->projectPermission->getActiveProjectIds($this->userSession->getId());
$project_ids = $this->projectPermissionModel->getActiveProjectIds($this->userSession->getId());
}
$nb_projects = count($project_ids);
@@ -29,7 +29,7 @@ class ProjectListController extends BaseController
->setUrl('ProjectListController', 'show')
->setMax(20)
->setOrder('name')
->setQuery($this->project->getQueryColumnStats($project_ids))
->setQuery($this->projectModel->getQueryColumnStats($project_ids))
->calculate();
$this->response->html($this->helper->layout->app('project_list/show', array(

8
app/Controller/ProjectOverviewController.php
View File

@@ -16,17 +16,17 @@ class ProjectOverviewController extends BaseController
public function show()
{
$project = $this->getProject();
$this->project->getColumnStats($project);
$this->projectModel->getColumnStats($project);
$this->response->html($this->helper->layout->app('project_overview/show', array(
'project' => $project,
'title' => $project['name'],
'description' => $this->helper->projectHeader->getDescription($project),
'users' => $this->projectUserRole->getAllUsersGroupedByRole($project['id']),
'users' => $this->projectUserRoleModel->getAllUsersGroupedByRole($project['id']),
'roles' => $this->role->getProjectRoles(),
'events' => $this->helper->projectActivity->getProjectEvents($project['id'], 10),
'images' => $this->projectFile->getAllImages($project['id']),
'files' => $this->projectFile->getAllDocuments($project['id']),
'images' => $this->projectFileModel->getAllImages($project['id']),
'files' => $this->projectFileModel->getAllDocuments($project['id']),
)));
}
}

20
app/Controller/ProjectPermissionController.php
View File

@@ -50,8 +50,8 @@ class ProjectPermissionController extends BaseController
$this->response->html($this->helper->layout->project('project_permission/index', array(
'project' => $project,
'users' => $this->projectUserRole->getUsers($project['id']),
'groups' => $this->projectGroupRole->getGroups($project['id']),
'users' => $this->projectUserRoleModel->getUsers($project['id']),
'groups' => $this->projectGroupRoleModel->getGroups($project['id']),
'roles' => $this->role->getProjectRoles(),
'values' => $values,
'errors' => $errors,
@@ -69,7 +69,7 @@ class ProjectPermissionController extends BaseController
$project = $this->getProject();
$values = $this->request->getValues() + array('is_everybody_allowed' => 0);
if ($this->project->update($values)) {
if ($this->projectModel->update($values)) {
$this->flash->success(t('Project updated successfully.'));
} else {
$this->flash->failure(t('Unable to update this project.'));
@@ -90,7 +90,7 @@ class ProjectPermissionController extends BaseController
if (empty($values['user_id'])) {
$this->flash->failure(t('User not found.'));
} elseif ($this->projectUserRole->addUser($values['project_id'], $values['user_id'], $values['role'])) {
} elseif ($this->projectUserRoleModel->addUser($values['project_id'], $values['user_id'], $values['role'])) {
$this->flash->success(t('Project updated successfully.'));
} else {
$this->flash->failure(t('Unable to update this project.'));
@@ -110,7 +110,7 @@ class ProjectPermissionController extends BaseController
$project = $this->getProject();
$user_id = $this->request->getIntegerParam('user_id');
if ($this->projectUserRole->removeUser($project['id'], $user_id)) {
if ($this->projectUserRoleModel->removeUser($project['id'], $user_id)) {
$this->flash->success(t('Project updated successfully.'));
} else {
$this->flash->failure(t('Unable to update this project.'));
@@ -129,7 +129,7 @@ class ProjectPermissionController extends BaseController
$project = $this->getProject();
$values = $this->request->getJson();
if (! empty($project) && ! empty($values) && $this->projectUserRole->changeUserRole($project['id'], $values['id'], $values['role'])) {
if (! empty($project) && ! empty($values) && $this->projectUserRoleModel->changeUserRole($project['id'], $values['id'], $values['role'])) {
$this->response->json(array('status' => 'ok'));
} else {
$this->response->json(array('status' => 'error'));
@@ -147,10 +147,10 @@ class ProjectPermissionController extends BaseController
$values = $this->request->getValues();
if (empty($values['group_id']) && ! empty($values['external_id'])) {
$values['group_id'] = $this->group->create($values['name'], $values['external_id']);
$values['group_id'] = $this->groupModel->create($values['name'], $values['external_id']);
}
if ($this->projectGroupRole->addGroup($project['id'], $values['group_id'], $values['role'])) {
if ($this->projectGroupRoleModel->addGroup($project['id'], $values['group_id'], $values['role'])) {
$this->flash->success(t('Project updated successfully.'));
} else {
$this->flash->failure(t('Unable to update this project.'));
@@ -170,7 +170,7 @@ class ProjectPermissionController extends BaseController
$project = $this->getProject();
$group_id = $this->request->getIntegerParam('group_id');
if ($this->projectGroupRole->removeGroup($project['id'], $group_id)) {
if ($this->projectGroupRoleModel->removeGroup($project['id'], $group_id)) {
$this->flash->success(t('Project updated successfully.'));
} else {
$this->flash->failure(t('Unable to update this project.'));
@@ -189,7 +189,7 @@ class ProjectPermissionController extends BaseController
$project = $this->getProject();
$values = $this->request->getJson();
if (! empty($project) && ! empty($values) && $this->projectGroupRole->changeGroupRole($project['id'], $values['id'], $values['role'])) {
if (! empty($project) && ! empty($values) && $this->projectGroupRoleModel->changeGroupRole($project['id'], $values['id'], $values['role'])) {
$this->response->json(array('status' => 'ok'));
} else {
$this->response->json(array('status' => 'error'));

6
app/Controller/ProjectStatusController.php
View File

@@ -31,7 +31,7 @@ class ProjectStatusController extends BaseController
$project = $this->getProject();
$this->checkCSRFParam();
if ($this->project->enable($project['id'])) {
if ($this->projectModel->enable($project['id'])) {
$this->flash->success(t('Project activated successfully.'));
} else {
$this->flash->failure(t('Unable to activate this project.'));
@@ -61,7 +61,7 @@ class ProjectStatusController extends BaseController
$project = $this->getProject();
$this->checkCSRFParam();
if ($this->project->disable($project['id'])) {
if ($this->projectModel->disable($project['id'])) {
$this->flash->success(t('Project disabled successfully.'));
} else {
$this->flash->failure(t('Unable to disable this project.'));
@@ -91,7 +91,7 @@ class ProjectStatusController extends BaseController
$project = $this->getProject();
$this->checkCSRFParam();
if ($this->project->remove($project['id'])) {
if ($this->projectModel->remove($project['id'])) {
$this->flash->success(t('Project removed successfully.'));
} else {
$this->flash->failure(t('Unable to remove this project.'));

16
app/Controller/ProjectUserOverviewController.php
View File

@@ -2,8 +2,8 @@
namespace Kanboard\Controller;
use Kanboard\Model\User as UserModel;
use Kanboard\Model\Task as TaskModel;
use Kanboard\Model\UserModel;
use Kanboard\Model\TaskModel;
use Kanboard\Core\Security\Role;
/**
@@ -19,19 +19,19 @@ class ProjectUserOverviewController extends BaseController
$user_id = $this->request->getIntegerParam('user_id', UserModel::EVERYBODY_ID);
if ($this->userSession->isAdmin()) {
$project_ids = $this->project->getAllIds();
$project_ids = $this->projectModel->getAllIds();
} else {
$project_ids = $this->projectPermission->getActiveProjectIds($this->userSession->getId());
$project_ids = $this->projectPermissionModel->getActiveProjectIds($this->userSession->getId());
}
return array($user_id, $project_ids, $this->user->getActiveUsersList(true));
return array($user_id, $project_ids, $this->userModel->getActiveUsersList(true));
}
private function role($role, $action, $title, $title_user)
{
list($user_id, $project_ids, $users) = $this->common();
$query = $this->projectPermission->getQueryByRole($project_ids, $role)->callback(array($this->project, 'applyColumnStats'));
$query = $this->projectPermissionModel->getQueryByRole($project_ids, $role)->callback(array($this->projectModel, 'applyColumnStats'));
if ($user_id !== UserModel::EVERYBODY_ID && isset($users[$user_id])) {
$query->eq(UserModel::TABLE.'.id', $user_id);
@@ -57,7 +57,7 @@ class ProjectUserOverviewController extends BaseController
{
list($user_id, $project_ids, $users) = $this->common();
$query = $this->taskFinder->getProjectUserOverviewQuery($project_ids, $is_active);
$query = $this->taskFinderModel->getProjectUserOverviewQuery($project_ids, $is_active);
if ($user_id !== UserModel::EVERYBODY_ID && isset($users[$user_id])) {
$query->eq(TaskModel::TABLE.'.owner_id', $user_id);
@@ -123,7 +123,7 @@ class ProjectUserOverviewController extends BaseController
$project = $this->getProject();
return $this->response->html($this->template->render('project_user_overview/tooltip_users', array(
'users' => $this->projectUserRole->getAllUsersGroupedByRole($project['id']),
'users' => $this->projectUserRoleModel->getAllUsersGroupedByRole($project['id']),
'roles' => $this->role->getProjectRoles(),
)));
}

18
app/Controller/ProjectViewController.php
View File

@@ -21,7 +21,7 @@ class ProjectViewController extends BaseController
$this->response->html($this->helper->layout->project('project_view/show', array(
'project' => $project,
'stats' => $this->project->getTaskStats($project['id']),
'stats' => $this->projectModel->getTaskStats($project['id']),
'title' => $project['name'],
)));
}
@@ -53,7 +53,7 @@ class ProjectViewController extends BaseController
$this->checkCSRFParam();
$switch = $this->request->getStringParam('switch');
if ($this->project->{$switch.'PublicAccess'}($project['id'])) {
if ($this->projectModel->{$switch.'PublicAccess'}($project['id'])) {
$this->flash->success(t('Project updated successfully.'));
} else {
$this->flash->failure(t('Unable to update this project.'));
@@ -74,8 +74,8 @@ class ProjectViewController extends BaseController
$this->response->html($this->helper->layout->project('project_view/integrations', array(
'project' => $project,
'title' => t('Integrations'),
'webhook_token' => $this->config->get('webhook_token'),
'values' => $this->projectMetadata->getAll($project['id']),
'webhook_token' => $this->configModel->get('webhook_token'),
'values' => $this->projectMetadataModel->getAll($project['id']),
'errors' => array(),
)));
}
@@ -89,7 +89,7 @@ class ProjectViewController extends BaseController
{
$project = $this->getProject();
$this->projectMetadata->save($project['id'], $this->request->getValues());
$this->projectMetadataModel->save($project['id'], $this->request->getValues());
$this->flash->success(t('Project updated successfully.'));
$this->response->redirect($this->helper->url->to('ProjectViewController', 'integrations', array('project_id' => $project['id'])));
}
@@ -104,8 +104,8 @@ class ProjectViewController extends BaseController
$project = $this->getProject();
$this->response->html($this->helper->layout->project('project_view/notifications', array(
'notifications' => $this->projectNotification->readSettings($project['id']),
'types' => $this->projectNotificationType->getTypes(),
'notifications' => $this->projectNotificationModel->readSettings($project['id']),
'types' => $this->projectNotificationTypeModel->getTypes(),
'project' => $project,
'title' => t('Notifications'),
)));
@@ -121,7 +121,7 @@ class ProjectViewController extends BaseController
$project = $this->getProject();
$values = $this->request->getValues();
$this->projectNotification->saveSettings($project['id'], $values);
$this->projectNotificationModel->saveSettings($project['id'], $values);
$this->flash->success(t('Project updated successfully.'));
$this->response->redirect($this->helper->url->to('ProjectViewController', 'notifications', array('project_id' => $project['id'])));
}
@@ -149,7 +149,7 @@ class ProjectViewController extends BaseController
public function doDuplication()
{
$project = $this->getProject();
$project_id = $this->projectDuplication->duplicate($project['id'], array_keys($this->request->getValues()), $this->userSession->getId());
$project_id = $this->projectDuplicationModel->duplicate($project['id'], array_keys($this->request->getValues()), $this->userSession->getId());
if ($project_id !== false) {
$this->flash->success(t('Project cloned successfully.'));

2
app/Controller/SearchController.php
View File

@@ -14,7 +14,7 @@ class SearchController extends BaseController
{
public function index()
{
$projects = $this->projectUserRole->getProjectsByUser($this->userSession->getId());
$projects = $this->projectUserRoleModel->getProjectsByUser($this->userSession->getId());
$search = urldecode($this->request->getStringParam('search'));
$nb_tasks = 0;

14
app/Controller/SubtaskController.php
View File

@@ -36,7 +36,7 @@ class SubtaskController extends BaseController
$this->response->html($this->template->render('subtask/create', array(
'values' => $values,
'errors' => $errors,
'users_list' => $this->projectUserRole->getAssignableUsersList($task['project_id']),
'users_list' => $this->projectUserRoleModel->getAssignableUsersList($task['project_id']),
'task' => $task,
)));
}
@@ -54,7 +54,7 @@ class SubtaskController extends BaseController
list($valid, $errors) = $this->subtaskValidator->validateCreation($values);
if ($valid) {
if ($this->subtask->create($values)) {
if ($this->subtaskModel->create($values)) {
$this->flash->success(t('Sub-task added successfully.'));
} else {
$this->flash->failure(t('Unable to create your sub-task.'));
@@ -87,8 +87,8 @@ class SubtaskController extends BaseController
$this->response->html($this->template->render('subtask/edit', array(
'values' => empty($values) ? $subtask : $values,
'errors' => $errors,
'users_list' => $this->projectUserRole->getAssignableUsersList($task['project_id']),
'status_list' => $this->subtask->getStatusList(),
'users_list' => $this->projectUserRoleModel->getAssignableUsersList($task['project_id']),
'status_list' => $this->subtaskModel->getStatusList(),
'subtask' => $subtask,
'task' => $task,
)));
@@ -108,7 +108,7 @@ class SubtaskController extends BaseController
list($valid, $errors) = $this->subtaskValidator->validateModification($values);
if ($valid) {
if ($this->subtask->update($values)) {
if ($this->subtaskModel->update($values)) {
$this->flash->success(t('Sub-task updated successfully.'));
} else {
$this->flash->failure(t('Unable to update your sub-task.'));
@@ -147,7 +147,7 @@ class SubtaskController extends BaseController
$task = $this->getTask();
$subtask = $this->getSubtask();
if ($this->subtask->remove($subtask['id'])) {
if ($this->subtaskModel->remove($subtask['id'])) {
$this->flash->success(t('Sub-task removed successfully.'));
} else {
$this->flash->failure(t('Unable to remove this sub-task.'));
@@ -168,7 +168,7 @@ class SubtaskController extends BaseController
$values = $this->request->getJson();
if (! empty($values) && $this->helper->user->hasProjectAccess('SubtaskController', 'movePosition', $project_id)) {
$result = $this->subtask->changePosition($task_id, $values['subtask_id'], $values['position']);
$result = $this->subtaskModel->changePosition($task_id, $values['subtask_id'], $values['position']);
$this->response->json(array('result' => $result));
} else {
throw new AccessForbiddenException();

2
app/Controller/SubtaskConverterController.php
View File

@@ -26,7 +26,7 @@ class SubtaskConverterController extends BaseController
$project = $this->getProject();
$subtask = $this->getSubtask();
$task_id = $this->subtask->convertToTask($project['id'], $subtask['id']);
$task_id = $this->subtaskModel->convertToTask($project['id'], $subtask['id']);
if ($task_id !== false) {
$this->flash->success(t('Subtask converted to task successfully.'));

8
app/Controller/SubtaskRestrictionController.php
View File

@@ -2,7 +2,7 @@
namespace Kanboard\Controller;
use Kanboard\Model\Subtask as SubtaskModel;
use Kanboard\Model\SubtaskModel;
/**
* Subtask Restriction
@@ -27,7 +27,7 @@ class SubtaskRestrictionController extends BaseController
SubtaskModel::STATUS_TODO => t('Todo'),
SubtaskModel::STATUS_DONE => t('Done'),
),
'subtask_inprogress' => $this->subtask->getSubtaskInProgress($this->userSession->getId()),
'subtask_inprogress' => $this->subtaskModel->getSubtaskInProgress($this->userSession->getId()),
'subtask' => $subtask,
'task' => $task,
)));
@@ -45,13 +45,13 @@ class SubtaskRestrictionController extends BaseController
$values = $this->request->getValues();
// Change status of the previous "in progress" subtask
$this->subtask->update(array(
$this->subtaskModel->update(array(
'id' => $values['id'],
'status' => $values['status'],
));
// Set the current subtask to "in progress"
$this->subtask->update(array(
$this->subtaskModel->update(array(
'id' => $subtask['id'],
'status' => SubtaskModel::STATUS_INPROGRESS,
));

10
app/Controller/SubtaskStatusController.php
View File

@@ -20,7 +20,7 @@ class SubtaskStatusController extends BaseController
$task = $this->getTask();
$subtask = $this->getSubtask();
$status = $this->subtask->toggleStatus($subtask['id']);
$status = $this->subtaskModel->toggleStatus($subtask['id']);
if ($this->request->getIntegerParam('refresh-table') === 0) {
$subtask['status'] = $status;
@@ -44,10 +44,10 @@ class SubtaskStatusController extends BaseController
$timer = $this->request->getStringParam('timer');
if ($timer === 'start') {
$this->subtaskTimeTracking->logStartTime($subtask_id, $this->userSession->getId());
$this->subtaskTimeTrackingModel->logStartTime($subtask_id, $this->userSession->getId());
} elseif ($timer === 'stop') {
$this->subtaskTimeTracking->logEndTime($subtask_id, $this->userSession->getId());
$this->subtaskTimeTracking->updateTaskTimeTracking($task['id']);
$this->subtaskTimeTrackingModel->logEndTime($subtask_id, $this->userSession->getId());
$this->subtaskTimeTrackingModel->updateTaskTimeTracking($task['id']);
}
$this->response->html($this->renderTable($task));
@@ -64,7 +64,7 @@ class SubtaskStatusController extends BaseController
{
return $this->template->render('subtask/table', array(
'task' => $task,
'subtasks' => $this->subtask->getAll($task['id']),
'subtasks' => $this->subtaskModel->getAll($task['id']),
'editable' => true,
));
}

30
app/Controller/SwimlaneController.php
View File

@@ -4,7 +4,7 @@ namespace Kanboard\Controller;
use Kanboard\Core\Controller\AccessForbiddenException;
use Kanboard\Core\Controller\PageNotFoundException;
use Kanboard\Model\Swimlane as SwimlaneModel;
use Kanboard\Model\SwimlaneModel;
/**
* Swimlanes Controller
@@ -23,7 +23,7 @@ class SwimlaneController extends BaseController
*/
private function getSwimlane()
{
$swimlane = $this->swimlane->getById($this->request->getIntegerParam('swimlane_id'));
$swimlane = $this->swimlaneModel->getById($this->request->getIntegerParam('swimlane_id'));
if (empty($swimlane)) {
throw new PageNotFoundException();
@@ -42,9 +42,9 @@ class SwimlaneController extends BaseController
$project = $this->getProject();
$this->response->html($this->helper->layout->project('swimlane/index', array(
'default_swimlane' => $this->swimlane->getDefault($project['id']),
'active_swimlanes' => $this->swimlane->getAllByStatus($project['id'], SwimlaneModel::ACTIVE),
'inactive_swimlanes' => $this->swimlane->getAllByStatus($project['id'], SwimlaneModel::INACTIVE),
'default_swimlane' => $this->swimlaneModel->getDefault($project['id']),
'active_swimlanes' => $this->swimlaneModel->getAllByStatus($project['id'], SwimlaneModel::ACTIVE),
'inactive_swimlanes' => $this->swimlaneModel->getAllByStatus($project['id'], SwimlaneModel::INACTIVE),
'project' => $project,
'title' => t('Swimlanes')
)));
@@ -81,7 +81,7 @@ class SwimlaneController extends BaseController
list($valid, $errors) = $this->swimlaneValidator->validateCreation($values);
if ($valid) {
if ($this->swimlane->create($values)) {
if ($this->swimlaneModel->create($values)) {
$this->flash->success(t('Your swimlane have been created successfully.'));
return $this->response->redirect($this->helper->url->to('SwimlaneController', 'index', array('project_id' => $project['id'])));
} else {
@@ -103,7 +103,7 @@ class SwimlaneController extends BaseController
public function editDefault(array $values = array(), array $errors = array())
{
$project = $this->getProject();
$swimlane = $this->swimlane->getDefault($project['id']);
$swimlane = $this->swimlaneModel->getDefault($project['id']);
$this->response->html($this->helper->layout->project('swimlane/edit_default', array(
'values' => empty($values) ? $swimlane : $values,
@@ -125,7 +125,7 @@ class SwimlaneController extends BaseController
list($valid, $errors) = $this->swimlaneValidator->validateDefaultModification($values);
if ($valid) {
if ($this->swimlane->updateDefault($values)) {
if ($this->swimlaneModel->updateDefault($values)) {
$this->flash->success(t('The default swimlane have been updated successfully.'));
return $this->response->redirect($this->helper->url->to('SwimlaneController', 'index', array('project_id' => $project['id'])), true);
} else {
@@ -169,7 +169,7 @@ class SwimlaneController extends BaseController
list($valid, $errors) = $this->swimlaneValidator->validateModification($values);
if ($valid) {
if ($this->swimlane->update($values)) {
if ($this->swimlaneModel->update($values)) {
$this->flash->success(t('Swimlane updated successfully.'));
return $this->response->redirect($this->helper->url->to('SwimlaneController', 'index', array('project_id' => $project['id'])));
} else {
@@ -207,7 +207,7 @@ class SwimlaneController extends BaseController
$project = $this->getProject();
$swimlane_id = $this->request->getIntegerParam('swimlane_id');
if ($this->swimlane->remove($project['id'], $swimlane_id)) {
if ($this->swimlaneModel->remove($project['id'], $swimlane_id)) {
$this->flash->success(t('Swimlane removed successfully.'));
} else {
$this->flash->failure(t('Unable to remove this swimlane.'));
@@ -227,7 +227,7 @@ class SwimlaneController extends BaseController
$project = $this->getProject();
$swimlane_id = $this->request->getIntegerParam('swimlane_id');
if ($this->swimlane->disable($project['id'], $swimlane_id)) {
if ($this->swimlaneModel->disable($project['id'], $swimlane_id)) {
$this->flash->success(t('Swimlane updated successfully.'));
} else {
$this->flash->failure(t('Unable to update this swimlane.'));
@@ -246,7 +246,7 @@ class SwimlaneController extends BaseController
$this->checkCSRFParam();
$project = $this->getProject();
if ($this->swimlane->disableDefault($project['id'])) {
if ($this->swimlaneModel->disableDefault($project['id'])) {
$this->flash->success(t('Swimlane updated successfully.'));
} else {
$this->flash->failure(t('Unable to update this swimlane.'));
@@ -266,7 +266,7 @@ class SwimlaneController extends BaseController
$project = $this->getProject();
$swimlane_id = $this->request->getIntegerParam('swimlane_id');
if ($this->swimlane->enable($project['id'], $swimlane_id)) {
if ($this->swimlaneModel->enable($project['id'], $swimlane_id)) {
$this->flash->success(t('Swimlane updated successfully.'));
} else {
$this->flash->failure(t('Unable to update this swimlane.'));
@@ -285,7 +285,7 @@ class SwimlaneController extends BaseController
$this->checkCSRFParam();
$project = $this->getProject();
if ($this->swimlane->enableDefault($project['id'])) {
if ($this->swimlaneModel->enableDefault($project['id'])) {
$this->flash->success(t('Swimlane updated successfully.'));
} else {
$this->flash->failure(t('Unable to update this swimlane.'));
@@ -305,7 +305,7 @@ class SwimlaneController extends BaseController
$values = $this->request->getJson();
if (! empty($values) && isset($values['swimlane_id']) && isset($values['position'])) {
$result = $this->swimlane->changePosition($project['id'], $values['swimlane_id'], $values['position']);
$result = $this->swimlaneModel->changePosition($project['id'], $values['swimlane_id'], $values['position']);
$this->response->json(array('result' => $result));
} else {
throw new AccessForbiddenException();

2
app/Controller/TaskAjaxController.php
View File

@@ -24,7 +24,7 @@ class TaskAjaxController extends BaseController
public function autocomplete()
{
$search = $this->request->getStringParam('term');
$project_ids = $this->projectPermission->getActiveProjectIds($this->userSession->getId());
$project_ids = $this->projectPermissionModel->getActiveProjectIds($this->userSession->getId());
$exclude_task_id = $this->request->getIntegerParam('exclude_task_id');
if (empty($project_ids)) {

8
app/Controller/TaskBulkController.php
View File

@@ -32,9 +32,9 @@ class TaskBulkController extends BaseController
'project' => $project,
'values' => $values,
'errors' => $errors,
'users_list' => $this->projectUserRole->getAssignableUsersList($project['id'], true, false, true),
'colors_list' => $this->color->getList(),
'categories_list' => $this->category->getList($project['id']),
'users_list' => $this->projectUserRoleModel->getAssignableUsersList($project['id'], true, false, true),
'colors_list' => $this->colorModel->getList(),
'categories_list' => $this->categoryModel->getList($project['id']),
)));
}
@@ -74,7 +74,7 @@ class TaskBulkController extends BaseController
$title = trim($title);
if (! empty($title)) {
$this->taskCreation->create(array(
$this->taskCreationModel->create(array(
'title' => $title,
'column_id' => $values['column_id'],
'swimlane_id' => $values['swimlane_id'],

14
app/Controller/TaskCreationController.php
View File

@@ -21,13 +21,13 @@ class TaskCreationController extends BaseController
public function show(array $values = array(), array $errors = array())
{
$project = $this->getProject();
$swimlanes_list = $this->swimlane->getList($project['id'], false, true);
$swimlanes_list = $this->swimlaneModel->getList($project['id'], false, true);
if (empty($values)) {
$values = array(
'swimlane_id' => $this->request->getIntegerParam('swimlane_id', key($swimlanes_list)),
'column_id' => $this->request->getIntegerParam('column_id'),
'color_id' => $this->color->getDefaultColor(),
'color_id' => $this->colorModel->getDefaultColor(),
'owner_id' => $this->userSession->getId(),
);
@@ -39,10 +39,10 @@ class TaskCreationController extends BaseController
'project' => $project,
'errors' => $errors,
'values' => $values + array('project_id' => $project['id']),
'columns_list' => $this->column->getList($project['id']),
'users_list' => $this->projectUserRole->getAssignableUsersList($project['id'], true, false, true),
'colors_list' => $this->color->getList(),
'categories_list' => $this->category->getList($project['id']),
'columns_list' => $this->columnModel->getList($project['id']),
'users_list' => $this->projectUserRoleModel->getAssignableUsersList($project['id'], true, false, true),
'colors_list' => $this->colorModel->getList(),
'categories_list' => $this->categoryModel->getList($project['id']),
'swimlanes_list' => $swimlanes_list,
'title' => $project['name'].' > '.t('New task')
)));
@@ -60,7 +60,7 @@ class TaskCreationController extends BaseController
list($valid, $errors) = $this->taskValidator->validateCreation($values);
if ($valid && $this->taskCreation->create($values)) {
if ($valid && $this->taskCreationModel->create($values)) {
$this->flash->success(t('Task created successfully.'));
return $this->afterSave($project, $values);
}

18
app/Controller/TaskDuplicationController.php
View File

@@ -21,7 +21,7 @@ class TaskDuplicationController extends BaseController
if ($this->request->getStringParam('confirmation') === 'yes') {
$this->checkCSRFParam();
$task_id = $this->taskDuplication->duplicate($task['id']);
$task_id = $this->taskDuplicationModel->duplicate($task['id']);
if ($task_id > 0) {
$this->flash->success(t('Task created successfully.'));
@@ -50,7 +50,7 @@ class TaskDuplicationController extends BaseController
$values = $this->request->getValues();
list($valid, ) = $this->taskValidator->validateProjectModification($values);
if ($valid && $this->taskDuplication->moveToProject($task['id'],
if ($valid && $this->taskDuplicationModel->moveToProject($task['id'],
$values['project_id'],
$values['swimlane_id'],
$values['column_id'],
@@ -80,7 +80,7 @@ class TaskDuplicationController extends BaseController
list($valid, ) = $this->taskValidator->validateProjectModification($values);
if ($valid) {
$task_id = $this->taskDuplication->duplicateToProject(
$task_id = $this->taskDuplicationModel->duplicateToProject(
$task['id'], $values['project_id'], $values['swimlane_id'],
$values['column_id'], $values['category_id'], $values['owner_id']
);
@@ -107,19 +107,19 @@ class TaskDuplicationController extends BaseController
private function chooseDestination(array $task, $template)
{
$values = array();
$projects_list = $this->projectUserRole->getActiveProjectsByUser($this->userSession->getId());
$projects_list = $this->projectUserRoleModel->getActiveProjectsByUser($this->userSession->getId());
unset($projects_list[$task['project_id']]);
if (! empty($projects_list)) {
$dst_project_id = $this->request->getIntegerParam('dst_project_id', key($projects_list));
$swimlanes_list = $this->swimlane->getList($dst_project_id, false, true);
$columns_list = $this->column->getList($dst_project_id);
$categories_list = $this->category->getList($dst_project_id);
$users_list = $this->projectUserRole->getAssignableUsersList($dst_project_id);
$swimlanes_list = $this->swimlaneModel->getList($dst_project_id, false, true);
$columns_list = $this->columnModel->getList($dst_project_id);
$categories_list = $this->categoryModel->getList($dst_project_id);
$users_list = $this->projectUserRoleModel->getAssignableUsersList($dst_project_id);
$values = $this->taskDuplication->checkDestinationProjectValues($task);
$values = $this->taskDuplicationModel->checkDestinationProjectValues($task);
$values['project_id'] = $dst_project_id;
} else {
$swimlanes_list = array();

10
app/Controller/TaskExternalLinkController.php
View File

@@ -76,7 +76,7 @@ class TaskExternalLinkController extends BaseController
$values = $this->request->getValues();
list($valid, $errors) = $this->externalLinkValidator->validateCreation($values);
if ($valid && $this->taskExternalLink->create($values)) {
if ($valid && $this->taskExternalLinkModel->create($values)) {
$this->flash->success(t('Link added successfully.'));
return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), true);
}
@@ -100,7 +100,7 @@ class TaskExternalLinkController extends BaseController
$link_id = $this->request->getIntegerParam('link_id');
if ($link_id > 0) {
$values = $this->taskExternalLink->getById($link_id);
$values = $this->taskExternalLinkModel->getById($link_id);
}
if (empty($values)) {
@@ -128,7 +128,7 @@ class TaskExternalLinkController extends BaseController
$values = $this->request->getValues();
list($valid, $errors) = $this->externalLinkValidator->validateModification($values);
if ($valid && $this->taskExternalLink->update($values)) {
if ($valid && $this->taskExternalLinkModel->update($values)) {
$this->flash->success(t('Link updated successfully.'));
return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), true);
}
@@ -145,7 +145,7 @@ class TaskExternalLinkController extends BaseController
{
$task = $this->getTask();
$link_id = $this->request->getIntegerParam('link_id');
$link = $this->taskExternalLink->getById($link_id);
$link = $this->taskExternalLinkModel->getById($link_id);
if (empty($link)) {
throw new PageNotFoundException();
@@ -167,7 +167,7 @@ class TaskExternalLinkController extends BaseController
$this->checkCSRFParam();
$task = $this->getTask();
if ($this->taskExternalLink->remove($this->request->getIntegerParam('link_id'))) {
if ($this->taskExternalLinkModel->remove($this->request->getIntegerParam('link_id'))) {
$this->flash->success(t('Link removed successfully.'));
} else {
$this->flash->failure(t('Unable to remove this link.'));

10
app/Controller/TaskFileController.php
View File

@@ -19,7 +19,7 @@ class TaskFileController extends BaseController
{
$task = $this->getTask();
if ($this->request->isPost() && $this->taskFile->uploadScreenshot($task['id'], $this->request->getValue('screenshot')) !== false) {
if ($this->request->isPost() && $this->taskFileModel->uploadScreenshot($task['id'], $this->request->getValue('screenshot')) !== false) {
$this->flash->success(t('Screenshot uploaded successfully.'));
return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), true);
}
@@ -53,7 +53,7 @@ class TaskFileController extends BaseController
{
$task = $this->getTask();
if (! $this->taskFile->uploadFiles($task['id'], $this->request->getFileInfo('files'))) {
if (! $this->taskFileModel->uploadFiles($task['id'], $this->request->getFileInfo('files'))) {
$this->flash->failure(t('Unable to upload the file.'));
}
@@ -69,9 +69,9 @@ class TaskFileController extends BaseController
{
$this->checkCSRFParam();
$task = $this->getTask();
$file = $this->taskFile->getById($this->request->getIntegerParam('file_id'));
$file = $this->taskFileModel->getById($this->request->getIntegerParam('file_id'));
if ($file['task_id'] == $task['id'] && $this->taskFile->remove($file['id'])) {
if ($file['task_id'] == $task['id'] && $this->taskFileModel->remove($file['id'])) {
$this->flash->success(t('File removed successfully.'));
} else {
$this->flash->failure(t('Unable to remove this file.'));
@@ -88,7 +88,7 @@ class TaskFileController extends BaseController
public function confirm()
{
$task = $this->getTask();
$file = $this->taskFile->getById($this->request->getIntegerParam('file_id'));
$file = $this->taskFileModel->getById($this->request->getIntegerParam('file_id'));
$this->response->html($this->template->render('task_file/remove', array(
'task' => $task,

4
app/Controller/TaskGanttController.php
View File

@@ -4,7 +4,7 @@ namespace Kanboard\Controller;
use Kanboard\Filter\TaskProjectFilter;
use Kanboard\Formatter\TaskGanttFormatter;
use Kanboard\Model\Task as TaskModel;
use Kanboard\Model\TaskModel;
/**
* Tasks Gantt Controller
@@ -47,7 +47,7 @@ class TaskGanttController extends BaseController
$this->getProject();
$values = $this->request->getJson();
$result = $this->taskModification->update(array(
$result = $this->taskModificationModel->update(array(
'id' => $values['id'],
'date_started' => strtotime($values['start']),
'date_due' => strtotime($values['end']),

12
app/Controller/TaskGanttCreationController.php
View File

@@ -24,7 +24,7 @@ class TaskGanttCreationController extends BaseController
$values = $values + array(
'project_id' => $project['id'],
'column_id' => $this->column->getFirstColumnId($project['id']),
'column_id' => $this->columnModel->getFirstColumnId($project['id']),
'position' => 1
);
@@ -35,10 +35,10 @@ class TaskGanttCreationController extends BaseController
'project' => $project,
'errors' => $errors,
'values' => $values,
'users_list' => $this->projectUserRole->getAssignableUsersList($project['id'], true, false, true),
'colors_list' => $this->color->getList(),
'categories_list' => $this->category->getList($project['id']),
'swimlanes_list' => $this->swimlane->getList($project['id'], false, true),
'users_list' => $this->projectUserRoleModel->getAssignableUsersList($project['id'], true, false, true),
'colors_list' => $this->colorModel->getList(),
'categories_list' => $this->categoryModel->getList($project['id']),
'swimlanes_list' => $this->swimlaneModel->getList($project['id'], false, true),
'title' => $project['name'].' > '.t('New task')
)));
}
@@ -56,7 +56,7 @@ class TaskGanttCreationController extends BaseController
list($valid, $errors) = $this->taskValidator->validateCreation($values);
if ($valid) {
$task_id = $this->taskCreation->create($values);
$task_id = $this->taskCreationModel->create($values);
if ($task_id !== false) {
$this->flash->success(t('Task created successfully.'));

14
app/Controller/TaskInternalLinkController.php
View File

@@ -22,7 +22,7 @@ class TaskInternalLinkController extends BaseController
*/
private function getTaskLink()
{
$link = $this->taskLink->getById($this->request->getIntegerParam('link_id'));
$link = $this->taskLinkModel->getById($this->request->getIntegerParam('link_id'));
if (empty($link)) {
throw new PageNotFoundException();
@@ -48,7 +48,7 @@ class TaskInternalLinkController extends BaseController
'values' => $values,
'errors' => $errors,
'task' => $task,
'labels' => $this->link->getList(0, false),
'labels' => $this->linkModel->getList(0, false),
)));
}
@@ -65,7 +65,7 @@ class TaskInternalLinkController extends BaseController
list($valid, $errors) = $this->taskLinkValidator->validateCreation($values);
if ($valid) {
if ($this->taskLink->create($values['task_id'], $values['opposite_task_id'], $values['link_id'])) {
if ($this->taskLinkModel->create($values['task_id'], $values['opposite_task_id'], $values['link_id'])) {
$this->flash->success(t('Link added successfully.'));
return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), true);
}
@@ -92,7 +92,7 @@ class TaskInternalLinkController extends BaseController
$task_link = $this->getTaskLink();
if (empty($values)) {
$opposite_task = $this->taskFinder->getById($task_link['opposite_task_id']);
$opposite_task = $this->taskFinderModel->getById($task_link['opposite_task_id']);
$values = $task_link;
$values['title'] = '#'.$opposite_task['id'].' - '.$opposite_task['title'];
}
@@ -102,7 +102,7 @@ class TaskInternalLinkController extends BaseController
'errors' => $errors,
'task_link' => $task_link,
'task' => $task,
'labels' => $this->link->getList(0, false)
'labels' => $this->linkModel->getList(0, false)
)));
}
@@ -119,7 +119,7 @@ class TaskInternalLinkController extends BaseController
list($valid, $errors) = $this->taskLinkValidator->validateModification($values);
if ($valid) {
if ($this->taskLink->update($values['id'], $values['task_id'], $values['opposite_task_id'], $values['link_id'])) {
if ($this->taskLinkModel->update($values['id'], $values['task_id'], $values['opposite_task_id'], $values['link_id'])) {
$this->flash->success(t('Link updated successfully.'));
return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])).'#links');
}
@@ -156,7 +156,7 @@ class TaskInternalLinkController extends BaseController
$this->checkCSRFParam();
$task = $this->getTask();
if ($this->taskLink->remove($this->request->getIntegerParam('link_id'))) {
if ($this->taskLinkModel->remove($this->request->getIntegerParam('link_id'))) {
$this->flash->success(t('Link removed successfully.'));
} else {
$this->flash->failure(t('Unable to remove this link.'));

2
app/Controller/TaskListController.php
View File

@@ -3,7 +3,7 @@
namespace Kanboard\Controller;
use Kanboard\Filter\TaskProjectFilter;
use Kanboard\Model\Task as TaskModel;
use Kanboard\Model\TaskModel;
/**
* Task List Controller

18
app/Controller/TaskModificationController.php
View File

@@ -20,7 +20,7 @@ class TaskModificationController extends BaseController
public function start()
{
$task = $this->getTask();
$this->taskModification->update(array('id' => $task['id'], 'date_started' => time()));
$this->taskModificationModel->update(array('id' => $task['id'], 'date_started' => time()));
$this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])));
}
@@ -61,7 +61,7 @@ class TaskModificationController extends BaseController
list($valid, $errors) = $this->taskValidator->validateDescriptionCreation($values);
if ($valid) {
if ($this->taskModification->update($values)) {
if ($this->taskModificationModel->update($values)) {
$this->flash->success(t('Task updated successfully.'));
} else {
$this->flash->failure(t('Unable to update your task.'));
@@ -85,7 +85,7 @@ class TaskModificationController extends BaseController
public function edit(array $values = array(), array $errors = array())
{
$task = $this->getTask();
$project = $this->project->getById($task['project_id']);
$project = $this->projectModel->getById($task['project_id']);
if (empty($values)) {
$values = $task;
@@ -93,17 +93,17 @@ class TaskModificationController extends BaseController
$values = $this->hook->merge('controller:task-modification:form:default', $values, array('default_values' => $values));
}
$values = $this->dateParser->format($values, array('date_due'), $this->config->get('application_date_format', DateParser::DATE_FORMAT));
$values = $this->dateParser->format($values, array('date_started'), $this->config->get('application_datetime_format', DateParser::DATE_TIME_FORMAT));
$values = $this->dateParser->format($values, array('date_due'), $this->configModel->get('application_date_format', DateParser::DATE_FORMAT));
$values = $this->dateParser->format($values, array('date_started'), $this->configModel->get('application_datetime_format', DateParser::DATE_TIME_FORMAT));
$this->response->html($this->template->render('task_modification/edit_task', array(
'project' => $project,
'values' => $values,
'errors' => $errors,
'task' => $task,
'users_list' => $this->projectUserRole->getAssignableUsersList($task['project_id']),
'colors_list' => $this->color->getList(),
'categories_list' => $this->category->getList($task['project_id']),
'users_list' => $this->projectUserRoleModel->getAssignableUsersList($task['project_id']),
'colors_list' => $this->colorModel->getList(),
'categories_list' => $this->categoryModel->getList($task['project_id']),
)));
}
@@ -119,7 +119,7 @@ class TaskModificationController extends BaseController
list($valid, $errors) = $this->taskValidator->validateModification($values);
if ($valid && $this->taskModification->update($values)) {
if ($valid && $this->taskModificationModel->update($values)) {
$this->flash->success(t('Task updated successfully.'));
$this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])), true);
} else {

12
app/Controller/TaskPopoverController.php
View File

@@ -18,11 +18,11 @@ class TaskPopoverController extends BaseController
public function changeAssignee()
{
$task = $this->getTask();
$project = $this->project->getById($task['project_id']);
$project = $this->projectModel->getById($task['project_id']);
$this->response->html($this->template->render('task_popover/change_assignee', array(
'values' => $task,
'users_list' => $this->projectUserRole->getAssignableUsersList($project['id']),
'users_list' => $this->projectUserRoleModel->getAssignableUsersList($project['id']),
'project' => $project,
)));
}
@@ -38,7 +38,7 @@ class TaskPopoverController extends BaseController
list($valid,) = $this->taskValidator->validateAssigneeModification($values);
if ($valid && $this->taskModification->update($values)) {
if ($valid && $this->taskModificationModel->update($values)) {
$this->flash->success(t('Task updated successfully.'));
} else {
$this->flash->failure(t('Unable to update your task.'));
@@ -55,11 +55,11 @@ class TaskPopoverController extends BaseController
public function changeCategory()
{
$task = $this->getTask();
$project = $this->project->getById($task['project_id']);
$project = $this->projectModel->getById($task['project_id']);
$this->response->html($this->template->render('task_popover/change_category', array(
'values' => $task,
'categories_list' => $this->category->getList($project['id']),
'categories_list' => $this->categoryModel->getList($project['id']),
'project' => $project,
)));
}
@@ -75,7 +75,7 @@ class TaskPopoverController extends BaseController
list($valid,) = $this->taskValidator->validateCategoryModification($values);
if ($valid && $this->taskModification->update($values)) {
if ($valid && $this->taskModificationModel->update($values)) {
$this->flash->success(t('Task updated successfully.'));
} else {
$this->flash->failure(t('Unable to update your task.'));

10
app/Controller/TaskRecurrenceController.php
View File

@@ -31,10 +31,10 @@ class TaskRecurrenceController extends BaseController
'values' => $values,
'errors' => $errors,
'task' => $task,
'recurrence_status_list' => $this->task->getRecurrenceStatusList(),
'recurrence_trigger_list' => $this->task->getRecurrenceTriggerList(),
'recurrence_timeframe_list' => $this->task->getRecurrenceTimeframeList(),
'recurrence_basedate_list' => $this->task->getRecurrenceBasedateList(),
'recurrence_status_list' => $this->taskModel->getRecurrenceStatusList(),
'recurrence_trigger_list' => $this->taskModel->getRecurrenceTriggerList(),
'recurrence_timeframe_list' => $this->taskModel->getRecurrenceTimeframeList(),
'recurrence_basedate_list' => $this->taskModel->getRecurrenceBasedateList(),
)));
}
@@ -51,7 +51,7 @@ class TaskRecurrenceController extends BaseController
list($valid, $errors) = $this->taskValidator->validateEditRecurrence($values);
if ($valid) {
if ($this->taskModification->update($values)) {
if ($this->taskModificationModel->update($values)) {
$this->flash->success(t('Task updated successfully.'));
} else {
$this->flash->failure(t('Unable to update your task.'));

2
app/Controller/TaskStatusController.php
View File

@@ -46,7 +46,7 @@ class TaskStatusController extends BaseController
if ($this->request->getStringParam('confirmation') === 'yes') {
$this->checkCSRFParam();
if ($this->taskStatus->$method($task['id'])) {
if ($this->taskStatusModel->$method($task['id'])) {
$this->flash->success($success_message);
} else {
$this->flash->failure($failure_message);

2
app/Controller/TaskSuppressionController.php
View File

@@ -41,7 +41,7 @@ class TaskSuppressionController extends BaseController
throw new AccessForbiddenException();
}
if ($this->task->remove($task['id'])) {
if ($this->taskModel->remove($task['id'])) {
$this->flash->success(t('Task removed successfully.'));
} else {
$this->flash->failure(t('Unable to remove this task.'));

48
app/Controller/TaskViewController.php
View File

@@ -21,14 +21,14 @@ class TaskViewController extends BaseController
*/
public function readonly()
{
$project = $this->project->getByToken($this->request->getStringParam('token'));
$project = $this->projectModel->getByToken($this->request->getStringParam('token'));
// Token verification
if (empty($project)) {
throw AccessForbiddenException::getInstance()->withoutLayout();
}
$task = $this->taskFinder->getDetails($this->request->getIntegerParam('task_id'));
$task = $this->taskFinderModel->getDetails($this->request->getIntegerParam('task_id'));
if (empty($task)) {
throw PageNotFoundException::getInstance()->withoutLayout();
@@ -40,12 +40,12 @@ class TaskViewController extends BaseController
$this->response->html($this->helper->layout->app('task/public', array(
'project' => $project,
'comments' => $this->comment->getAll($task['id']),
'subtasks' => $this->subtask->getAll($task['id']),
'links' => $this->taskLink->getAllGroupedByLabel($task['id']),
'comments' => $this->commentModel->getAll($task['id']),
'subtasks' => $this->subtaskModel->getAll($task['id']),
'links' => $this->taskLinkModel->getAllGroupedByLabel($task['id']),
'task' => $task,
'columns_list' => $this->column->getList($task['project_id']),
'colors_list' => $this->color->getList(),
'columns_list' => $this->columnModel->getList($task['project_id']),
'colors_list' => $this->colorModel->getList(),
'title' => $task['title'],
'no_layout' => true,
'auto_refresh' => true,
@@ -61,7 +61,7 @@ class TaskViewController extends BaseController
public function show()
{
$task = $this->getTask();
$subtasks = $this->subtask->getAll($task['id']);
$subtasks = $this->subtaskModel->getAll($task['id']);
$values = array(
'id' => $task['id'],
@@ -70,19 +70,19 @@ class TaskViewController extends BaseController
'time_spent' => $task['time_spent'] ?: '',
);
$values = $this->dateParser->format($values, array('date_started'), $this->config->get('application_datetime_format', DateParser::DATE_TIME_FORMAT));
$values = $this->dateParser->format($values, array('date_started'), $this->configModel->get('application_datetime_format', DateParser::DATE_TIME_FORMAT));
$this->response->html($this->helper->layout->task('task/show', array(
'task' => $task,
'project' => $this->project->getById($task['project_id']),
'project' => $this->projectModel->getById($task['project_id']),
'values' => $values,
'files' => $this->taskFile->getAllDocuments($task['id']),
'images' => $this->taskFile->getAllImages($task['id']),
'comments' => $this->comment->getAll($task['id'], $this->userSession->getCommentSorting()),
'files' => $this->taskFileModel->getAllDocuments($task['id']),
'images' => $this->taskFileModel->getAllImages($task['id']),
'comments' => $this->commentModel->getAll($task['id'], $this->userSession->getCommentSorting()),
'subtasks' => $subtasks,
'internal_links' => $this->taskLink->getAllGroupedByLabel($task['id']),
'external_links' => $this->taskExternalLink->getAll($task['id']),
'link_label_list' => $this->link->getList(0, false),
'internal_links' => $this->taskLinkModel->getAllGroupedByLabel($task['id']),
'external_links' => $this->taskExternalLinkModel->getAll($task['id']),
'link_label_list' => $this->linkModel->getList(0, false),
)));
}
@@ -97,10 +97,10 @@ class TaskViewController extends BaseController
$this->response->html($this->helper->layout->task('task/analytics', array(
'task' => $task,
'project' => $this->project->getById($task['project_id']),
'lead_time' => $this->taskAnalytic->getLeadTime($task),
'cycle_time' => $this->taskAnalytic->getCycleTime($task),
'time_spent_columns' => $this->taskAnalytic->getTimeSpentByColumn($task),
'project' => $this->projectModel->getById($task['project_id']),
'lead_time' => $this->taskAnalyticModel->getLeadTime($task),
'cycle_time' => $this->taskAnalyticModel->getCycleTime($task),
'time_spent_columns' => $this->taskAnalyticModel->getTimeSpentByColumn($task),
)));
}
@@ -118,12 +118,12 @@ class TaskViewController extends BaseController
->setMax(15)
->setOrder('start')
->setDirection('DESC')
->setQuery($this->subtaskTimeTracking->getTaskQuery($task['id']))
->setQuery($this->subtaskTimeTrackingModel->getTaskQuery($task['id']))
->calculateOnlyIf($this->request->getStringParam('pagination') === 'subtasks');
$this->response->html($this->helper->layout->task('task/time_tracking_details', array(
'task' => $task,
'project' => $this->project->getById($task['project_id']),
'project' => $this->projectModel->getById($task['project_id']),
'subtask_paginator' => $subtask_paginator,
)));
}
@@ -139,8 +139,8 @@ class TaskViewController extends BaseController
$this->response->html($this->helper->layout->task('task/transitions', array(
'task' => $task,
'project' => $this->project->getById($task['project_id']),
'transitions' => $this->transition->getAllByTask($task['id']),
'project' => $this->projectModel->getById($task['project_id']),
'transitions' => $this->transitionModel->getAllByTask($task['id']),
)));
}
}

6
app/Controller/TwoFactorController.php
View File

@@ -91,7 +91,7 @@ class TwoFactorController extends UserViewController
if ($provider->authenticate()) {
$this->flash->success(t('The two factor authentication code is valid.'));
$this->user->update(array(
$this->userModel->update(array(
'id' => $user['id'],
'twofactor_activated' => 1,
'twofactor_secret' => $this->authenticationManager->getPostAuthenticationProvider()->getSecret(),
@@ -117,7 +117,7 @@ class TwoFactorController extends UserViewController
$user = $this->getUser();
$this->checkCurrentUser($user);
$this->user->update(array(
$this->userModel->update(array(
'id' => $user['id'],
'twofactor_activated' => 0,
'twofactor_secret' => '',
@@ -186,7 +186,7 @@ class TwoFactorController extends UserViewController
if ($this->request->getStringParam('disable') === 'yes') {
$this->checkCSRFParam();
$this->user->update(array(
$this->userModel->update(array(
'id' => $user['id'],
'twofactor_activated' => 0,
'twofactor_secret' => '',

4
app/Controller/UserAjaxController.php
View File

@@ -4,7 +4,7 @@ namespace Kanboard\Controller;
use Kanboard\Filter\UserNameFilter;
use Kanboard\Formatter\UserAutoCompleteFormatter;
use Kanboard\Model\User as UserModel;
use Kanboard\Model\UserModel;
/**
* User Ajax Controller
@@ -36,7 +36,7 @@ class UserAjaxController extends BaseController
{
$project_id = $this->request->getStringParam('project_id');
$query = $this->request->getStringParam('q');
$users = $this->projectPermission->findUsernames($project_id, $query);
$users = $this->projectPermissionModel->findUsernames($project_id, $query);
$this->response->json($users);
}

12
app/Controller/UserCreationController.php
View File

@@ -26,10 +26,10 @@ class UserCreationController extends BaseController
$template = $isRemote ? 'user_creation/remote' : 'user_creation/local';
$this->response->html($this->template->render($template, array(
'timezones' => $this->timezone->getTimezones(true),
'languages' => $this->language->getLanguages(true),
'timezones' => $this->timezoneModel->getTimezones(true),
'languages' => $this->languageModel->getLanguages(true),
'roles' => $this->role->getApplicationRoles(),
'projects' => $this->project->getList(),
'projects' => $this->projectModel->getList(),
'errors' => $errors,
'values' => $values + array('role' => Role::APP_USER),
)));
@@ -62,15 +62,15 @@ class UserCreationController extends BaseController
$project_id = empty($values['project_id']) ? 0 : $values['project_id'];
unset($values['project_id']);
$user_id = $this->user->create($values);
$user_id = $this->userModel->create($values);
if ($user_id !== false) {
if ($project_id !== 0) {
$this->projectUserRole->addUser($project_id, $user_id, Role::PROJECT_MEMBER);
$this->projectUserRoleModel->addUser($project_id, $user_id, Role::PROJECT_MEMBER);
}
if (! empty($values['notifications_enabled'])) {
$this->userNotificationType->saveSelectedTypes($user_id, array(MailNotification::TYPE));
$this->userNotificationTypeModel->saveSelectedTypes($user_id, array(MailNotification::TYPE));
}
$this->flash->success(t('User created successfully.'));

6
app/Controller/UserCredentialController.php
View File

@@ -44,9 +44,9 @@ class UserCredentialController extends BaseController
list($valid, $errors) = $this->userValidator->validatePasswordModification($values);
if ($valid) {
if ($this->user->update($values)) {
if ($this->userModel->update($values)) {
$this->flash->success(t('Password modified successfully.'));
$this->userLocking->resetFailedLogin($user['username']);
$this->userLockingModel->resetFailedLogin($user['username']);
} else {
$this->flash->failure(t('Unable to change the password.'));
}
@@ -95,7 +95,7 @@ class UserCredentialController extends BaseController
list($valid, $errors) = $this->userValidator->validateModification($values);
if ($valid) {
if ($this->user->update($values)) {
if ($this->userModel->update($values)) {
$this->flash->success(t('User updated successfully.'));
} else {
$this->flash->failure(t('Unable to update your user.'));

2
app/Controller/UserListController.php
View File

@@ -21,7 +21,7 @@ class UserListController extends BaseController
->setUrl('UserListController', 'show')
->setMax(30)
->setOrder('username')
->setQuery($this->user->getQuery())
->setQuery($this->userModel->getQuery())
->calculate();
$this->response->html($this->helper->layout->app('user_list/show', array(

6
app/Controller/UserModificationController.php
View File

@@ -32,8 +32,8 @@ class UserModificationController extends BaseController
'values' => $values,
'errors' => $errors,
'user' => $user,
'timezones' => $this->timezone->getTimezones(true),
'languages' => $this->language->getLanguages(true),
'timezones' => $this->timezoneModel->getTimezones(true),
'languages' => $this->languageModel->getLanguages(true),
'roles' => $this->role->getApplicationRoles(),
)));
}
@@ -55,7 +55,7 @@ class UserModificationController extends BaseController
list($valid, $errors) = $this->userValidator->validateModification($values);
if ($valid) {
if ($this->user->update($values)) {
if ($this->userModel->update($values)) {
$this->flash->success(t('User updated successfully.'));
} else {
$this->flash->failure(t('Unable to update your user.'));

6
app/Controller/UserStatusController.php
View File

@@ -34,7 +34,7 @@ class UserStatusController extends BaseController
$user = $this->getUser();
$this->checkCSRFParam();
if ($this->user->remove($user['id'])) {
if ($this->userModel->remove($user['id'])) {
$this->flash->success(t('User removed successfully.'));
} else {
$this->flash->failure(t('Unable to remove this user.'));
@@ -67,7 +67,7 @@ class UserStatusController extends BaseController
$user = $this->getUser();
$this->checkCSRFParam();
if ($this->user->enable($user['id'])) {
if ($this->userModel->enable($user['id'])) {
$this->flash->success(t('User activated successfully.'));
} else {
$this->flash->failure(t('Unable to enable this user.'));
@@ -100,7 +100,7 @@ class UserStatusController extends BaseController
$user = $this->getUser();
$this->checkCSRFParam();
if ($this->user->disable($user['id'])) {
if ($this->userModel->disable($user['id'])) {
$this->flash->success(t('User disabled successfully.'));
} else {
$this->flash->failure(t('Unable to disable this user.'));

36
app/Controller/UserViewController.php
View File

@@ -3,7 +3,7 @@
namespace Kanboard\Controller;
use Kanboard\Core\Controller\PageNotFoundException;
use Kanboard\Model\Project as ProjectModel;
use Kanboard\Model\ProjectModel;
/**
* Class UserViewController
@@ -21,7 +21,7 @@ class UserViewController extends BaseController
*/
public function profile()
{
$user = $this->user->getById($this->request->getIntegerParam('user_id'));
$user = $this->userModel->getById($this->request->getIntegerParam('user_id'));
if (empty($user)) {
throw new PageNotFoundException();
@@ -43,8 +43,8 @@ class UserViewController extends BaseController
$user = $this->getUser();
$this->response->html($this->helper->layout->user('user_view/show', array(
'user' => $user,
'timezones' => $this->timezone->getTimezones(true),
'languages' => $this->language->getLanguages(true),
'timezones' => $this->timezoneModel->getTimezones(true),
'languages' => $this->languageModel->getLanguages(true),
)));
}
@@ -62,7 +62,7 @@ class UserViewController extends BaseController
->setMax(20)
->setOrder('start')
->setDirection('DESC')
->setQuery($this->subtaskTimeTracking->getUserQuery($user['id']))
->setQuery($this->subtaskTimeTrackingModel->getUserQuery($user['id']))
->calculateOnlyIf($this->request->getStringParam('pagination') === 'subtasks');
$this->response->html($this->helper->layout->user('user_view/timesheet', array(
@@ -80,7 +80,7 @@ class UserViewController extends BaseController
{
$user = $this->getUser();
$this->response->html($this->helper->layout->user('user_view/password_reset', array(
'tokens' => $this->passwordReset->getAll($user['id']),
'tokens' => $this->passwordResetModel->getAll($user['id']),
'user' => $user,
)));
}
@@ -94,7 +94,7 @@ class UserViewController extends BaseController
{
$user = $this->getUser();
$this->response->html($this->helper->layout->user('user_view/last', array(
'last_logins' => $this->lastLogin->getAll($user['id']),
'last_logins' => $this->lastLoginModel->getAll($user['id']),
'user' => $user,
)));
}
@@ -108,7 +108,7 @@ class UserViewController extends BaseController
{
$user = $this->getUser();
$this->response->html($this->helper->layout->user('user_view/sessions', array(
'sessions' => $this->rememberMeSession->getAll($user['id']),
'sessions' => $this->rememberMeSessionModel->getAll($user['id']),
'user' => $user,
)));
}
@@ -122,7 +122,7 @@ class UserViewController extends BaseController
{
$this->checkCSRFParam();
$user = $this->getUser();
$this->rememberMeSession->remove($this->request->getIntegerParam('id'));
$this->rememberMeSessionModel->remove($this->request->getIntegerParam('id'));
$this->response->redirect($this->helper->url->to('UserViewController', 'sessions', array('user_id' => $user['id'])));
}
@@ -137,16 +137,16 @@ class UserViewController extends BaseController
if ($this->request->isPost()) {
$values = $this->request->getValues();
$this->userNotification->saveSettings($user['id'], $values);
$this->userNotificationModel->saveSettings($user['id'], $values);
$this->flash->success(t('User updated successfully.'));
return $this->response->redirect($this->helper->url->to('UserViewController', 'notifications', array('user_id' => $user['id'])));
}
return $this->response->html($this->helper->layout->user('user_view/notifications', array(
'projects' => $this->projectUserRole->getProjectsByUser($user['id'], array(ProjectModel::ACTIVE)),
'notifications' => $this->userNotification->readSettings($user['id']),
'types' => $this->userNotificationType->getTypes(),
'filters' => $this->userNotificationFilter->getFilters(),
'projects' => $this->projectUserRoleModel->getProjectsByUser($user['id'], array(ProjectModel::ACTIVE)),
'notifications' => $this->userNotificationModel->readSettings($user['id']),
'types' => $this->userNotificationTypeModel->getTypes(),
'filters' => $this->userNotificationFilterModel->getFilters(),
'user' => $user,
)));
}
@@ -162,14 +162,14 @@ class UserViewController extends BaseController
if ($this->request->isPost()) {
$values = $this->request->getValues();
$this->userMetadata->save($user['id'], $values);
$this->userMetadataModel->save($user['id'], $values);
$this->flash->success(t('User updated successfully.'));
$this->response->redirect($this->helper->url->to('UserViewController', 'integrations', array('user_id' => $user['id'])));
}
$this->response->html($this->helper->layout->user('user_view/integrations', array(
'user' => $user,
'values' => $this->userMetadata->getAll($user['id']),
'values' => $this->userMetadataModel->getAll($user['id']),
)));
}
@@ -182,7 +182,7 @@ class UserViewController extends BaseController
{
$user = $this->getUser();
$this->response->html($this->helper->layout->user('user_view/external', array(
'last_logins' => $this->lastLogin->getAll($user['id']),
'last_logins' => $this->lastLoginModel->getAll($user['id']),
'user' => $user,
)));
}
@@ -200,7 +200,7 @@ class UserViewController extends BaseController
if ($switch === 'enable' || $switch === 'disable') {
$this->checkCSRFParam();
if ($this->user->{$switch . 'PublicAccess'}($user['id'])) {
if ($this->userModel->{$switch . 'PublicAccess'}($user['id'])) {
$this->flash->success(t('User updated successfully.'));
} else {
$this->flash->failure(t('Unable to update this user.'));

8
app/Controller/WebNotificationController.php
View File

@@ -19,7 +19,7 @@ class WebNotificationController extends BaseController
{
$user_id = $this->getUserId();
$this->userUnreadNotification->markAllAsRead($user_id);
$this->userUnreadNotificationModel->markAllAsRead($user_id);
$this->response->redirect($this->helper->url->to('DashboardController', 'notifications', array('user_id' => $user_id)));
}
@@ -33,7 +33,7 @@ class WebNotificationController extends BaseController
$user_id = $this->getUserId();
$notification_id = $this->request->getIntegerParam('notification_id');
$this->userUnreadNotification->markAsRead($user_id, $notification_id);
$this->userUnreadNotificationModel->markAsRead($user_id, $notification_id);
$this->response->redirect($this->helper->url->to('DashboardController', 'notifications', array('user_id' => $user_id)));
}
@@ -45,8 +45,8 @@ class WebNotificationController extends BaseController
$user_id = $this->getUserId();
$notification_id = $this->request->getIntegerParam('notification_id');
$notification = $this->userUnreadNotification->getById($notification_id);
$this->userUnreadNotification->markAsRead($user_id, $notification_id);
$notification = $this->userUnreadNotificationModel->getById($notification_id);
$this->userUnreadNotificationModel->markAsRead($user_id, $notification_id);
if (empty($notification)) {
$this->response->redirect($this->helper->url->to('DashboardController', 'notifications', array('user_id' => $user_id)));