From 4514bc1d4b4abff23902e46da76e70f13a3647eb Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Mon, 16 May 2016 20:55:21 -0400 Subject: [PATCH] Improve user controllers and views --- app/Controller/Oauth.php | 6 +- app/Controller/Twofactor.php | 4 +- ...{UserHelper.php => UserAjaxController.php} | 6 +- app/Controller/UserCreationController.php | 4 +- app/Controller/UserImportController.php | 2 +- app/Controller/UserListController.php | 32 +++++++ app/Controller/UserStatusController.php | 6 +- .../{User.php => UserViewController.php} | 72 ++++++---------- app/Core/Markdown.php | 2 +- app/Helper/LayoutHelper.php | 2 +- .../AuthenticationProvider.php | 5 +- app/ServiceProvider/RouteProvider.php | 26 +++--- app/Template/comment/create.php | 2 +- app/Template/comments/create.php | 2 +- app/Template/group/index.php | 2 +- app/Template/group/users.php | 4 +- app/Template/header.php | 6 +- app/Template/layout.php | 2 +- app/Template/project_permission/index.php | 2 +- app/Template/task/time_tracking_details.php | 4 +- app/Template/task/transitions.php | 4 +- app/Template/task_creation/show.php | 2 +- app/Template/task_internal_link/table.php | 4 +- .../task_modification/edit_description.php | 2 +- app/Template/twofactor/disable.php | 4 +- app/Template/user/sidebar.php | 83 ------------------- app/Template/user_creation/local.php | 2 +- app/Template/user_creation/remote.php | 2 +- app/Template/user_import/show.php | 2 +- app/Template/{user => user_list}/dropdown.php | 2 +- .../{user/index.php => user_list/show.php} | 4 +- app/Template/user_status/disable.php | 2 +- app/Template/user_status/enable.php | 2 +- app/Template/user_status/remove.php | 2 +- .../{user => user_view}/authentication.php | 7 +- app/Template/{user => user_view}/edit.php | 6 +- app/Template/{user => user_view}/external.php | 0 .../{user => user_view}/integrations.php | 2 +- app/Template/{user => user_view}/last.php | 0 app/Template/{user => user_view}/layout.php | 4 +- .../{user => user_view}/notifications.php | 6 +- app/Template/{user => user_view}/password.php | 4 +- .../{user => user_view}/password_reset.php | 0 app/Template/{user => user_view}/profile.php | 0 app/Template/{user => user_view}/sessions.php | 2 +- app/Template/{user => user_view}/share.php | 7 +- app/Template/{user => user_view}/show.php | 0 app/Template/user_view/sidebar.php | 83 +++++++++++++++++++ .../{user => user_view}/timesheet.php | 0 49 files changed, 219 insertions(+), 210 deletions(-) rename app/Controller/{UserHelper.php => UserAjaxController.php} (91%) create mode 100644 app/Controller/UserListController.php rename app/Controller/{User.php => UserViewController.php} (79%) delete mode 100644 app/Template/user/sidebar.php rename app/Template/{user => user_list}/dropdown.php (92%) rename app/Template/{user/index.php => user_list/show.php} (94%) rename app/Template/{user => user_view}/authentication.php (81%) rename app/Template/{user => user_view}/edit.php (82%) rename app/Template/{user => user_view}/external.php (100%) rename app/Template/{user => user_view}/integrations.php (72%) rename app/Template/{user => user_view}/last.php (100%) rename app/Template/{user => user_view}/layout.php (88%) rename app/Template/{user => user_view}/notifications.php (74%) rename app/Template/{user => user_view}/password.php (77%) rename app/Template/{user => user_view}/password_reset.php (100%) rename app/Template/{user => user_view}/profile.php (100%) rename app/Template/{user => user_view}/sessions.php (85%) rename app/Template/{user => user_view}/share.php (64%) rename app/Template/{user => user_view}/show.php (100%) create mode 100644 app/Template/user_view/sidebar.php rename app/Template/{user => user_view}/timesheet.php (100%) diff --git a/app/Controller/Oauth.php b/app/Controller/Oauth.php index c38654beb..04adf154c 100644 --- a/app/Controller/Oauth.php +++ b/app/Controller/Oauth.php @@ -49,7 +49,7 @@ class Oauth extends BaseController $this->link($provider); } else { $this->flash->failure(t('The OAuth2 state parameter is invalid')); - $this->response->redirect($this->helper->url->to('user', 'external', array('user_id' => $this->userSession->getId()))); + $this->response->redirect($this->helper->url->to('UserViewController', 'external', array('user_id' => $this->userSession->getId()))); } } else { if ($hasValidState) { @@ -75,7 +75,7 @@ class Oauth extends BaseController $this->flash->success(t('Your external account is linked to your profile successfully.')); } - $this->response->redirect($this->helper->url->to('user', 'external', array('user_id' => $this->userSession->getId()))); + $this->response->redirect($this->helper->url->to('UserViewController', 'external', array('user_id' => $this->userSession->getId()))); } /** @@ -94,7 +94,7 @@ class Oauth extends BaseController $this->flash->failure(t('Unable to unlink your external account.')); } - $this->response->redirect($this->helper->url->to('user', 'external', array('user_id' => $this->userSession->getId()))); + $this->response->redirect($this->helper->url->to('UserViewController', 'external', array('user_id' => $this->userSession->getId()))); } /** diff --git a/app/Controller/Twofactor.php b/app/Controller/Twofactor.php index 2eb615945..118613b24 100644 --- a/app/Controller/Twofactor.php +++ b/app/Controller/Twofactor.php @@ -10,7 +10,7 @@ use Kanboard\Core\Controller\AccessForbiddenException; * @package controller * @author Frederic Guillot */ -class Twofactor extends User +class Twofactor extends UserViewController { /** * Only the current user can access to 2FA settings @@ -192,7 +192,7 @@ class Twofactor extends User 'twofactor_secret' => '', )); - return $this->response->redirect($this->helper->url->to('user', 'show', array('user_id' => $user['id']))); + return $this->response->redirect($this->helper->url->to('UserViewController', 'show', array('user_id' => $user['id']))); } return $this->response->html($this->helper->layout->user('twofactor/disable', array( diff --git a/app/Controller/UserHelper.php b/app/Controller/UserAjaxController.php similarity index 91% rename from app/Controller/UserHelper.php rename to app/Controller/UserAjaxController.php index d5e0920d8..7b365667d 100644 --- a/app/Controller/UserHelper.php +++ b/app/Controller/UserAjaxController.php @@ -7,12 +7,12 @@ use Kanboard\Formatter\UserAutoCompleteFormatter; use Kanboard\Model\User as UserModel; /** - * User Helper + * User Ajax Controller * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class UserHelper extends BaseController +class UserAjaxController extends BaseController { /** * User auto-completion (Ajax) diff --git a/app/Controller/UserCreationController.php b/app/Controller/UserCreationController.php index d1c554ae2..49f9db54f 100644 --- a/app/Controller/UserCreationController.php +++ b/app/Controller/UserCreationController.php @@ -74,10 +74,10 @@ class UserCreationController extends BaseController } $this->flash->success(t('User created successfully.')); - $this->response->redirect($this->helper->url->to('user', 'show', array('user_id' => $user_id))); + $this->response->redirect($this->helper->url->to('UserViewController', 'show', array('user_id' => $user_id))); } else { $this->flash->failure(t('Unable to create your user.')); - $this->response->redirect($this->helper->url->to('user', 'index')); + $this->response->redirect($this->helper->url->to('UserListController', 'show')); } } } diff --git a/app/Controller/UserImportController.php b/app/Controller/UserImportController.php index b3cb52d1e..fec9a31d0 100644 --- a/app/Controller/UserImportController.php +++ b/app/Controller/UserImportController.php @@ -43,7 +43,7 @@ class UserImportController extends BaseController $this->importFile($values, $filename); } - $this->response->redirect($this->helper->url->to('user', 'index')); + $this->response->redirect($this->helper->url->to('UserListController', 'show')); } /** diff --git a/app/Controller/UserListController.php b/app/Controller/UserListController.php new file mode 100644 index 000000000..685746fbe --- /dev/null +++ b/app/Controller/UserListController.php @@ -0,0 +1,32 @@ +paginator + ->setUrl('UserListController', 'show') + ->setMax(30) + ->setOrder('username') + ->setQuery($this->user->getQuery()) + ->calculate(); + + $this->response->html($this->helper->layout->app('user_list/show', array( + 'title' => t('Users').' ('.$paginator->getTotal().')', + 'paginator' => $paginator, + ))); + } +} diff --git a/app/Controller/UserStatusController.php b/app/Controller/UserStatusController.php index 2b23505c1..bc40a7dd9 100644 --- a/app/Controller/UserStatusController.php +++ b/app/Controller/UserStatusController.php @@ -40,7 +40,7 @@ class UserStatusController extends BaseController $this->flash->failure(t('Unable to remove this user.')); } - $this->response->redirect($this->helper->url->to('user', 'index')); + $this->response->redirect($this->helper->url->to('UserListController', 'show')); } /** @@ -73,7 +73,7 @@ class UserStatusController extends BaseController $this->flash->failure(t('Unable to enable this user.')); } - $this->response->redirect($this->helper->url->to('user', 'index')); + $this->response->redirect($this->helper->url->to('UserListController', 'show')); } /** @@ -106,6 +106,6 @@ class UserStatusController extends BaseController $this->flash->failure(t('Unable to disable this user.')); } - $this->response->redirect($this->helper->url->to('user', 'index')); + $this->response->redirect($this->helper->url->to('UserListController', 'show')); } } diff --git a/app/Controller/User.php b/app/Controller/UserViewController.php similarity index 79% rename from app/Controller/User.php rename to app/Controller/UserViewController.php index 190acb61a..dc03f4190 100644 --- a/app/Controller/User.php +++ b/app/Controller/UserViewController.php @@ -6,33 +6,13 @@ use Kanboard\Core\Controller\PageNotFoundException; use Kanboard\Model\Project as ProjectModel; /** - * User controller + * Class UserViewController * - * @package controller - * @author Frederic Guillot + * @package Kanboard\Controller + * @author Frederic Guillot */ -class User extends BaseController +class UserViewController extends BaseController { - /** - * List all users - * - * @access public - */ - public function index() - { - $paginator = $this->paginator - ->setUrl('user', 'index') - ->setMax(30) - ->setOrder('username') - ->setQuery($this->user->getQuery()) - ->calculate(); - - $this->response->html($this->helper->layout->app('user/index', array( - 'title' => t('Users').' ('.$paginator->getTotal().')', - 'paginator' => $paginator, - ))); - } - /** * Public user profile * @@ -47,7 +27,7 @@ class User extends BaseController throw new PageNotFoundException(); } - $this->response->html($this->helper->layout->app('user/profile', array( + $this->response->html($this->helper->layout->app('user_view/profile', array( 'title' => $user['name'] ?: $user['username'], 'user' => $user, ))); @@ -61,7 +41,7 @@ class User extends BaseController public function show() { $user = $this->getUser(); - $this->response->html($this->helper->layout->user('user/show', array( + $this->response->html($this->helper->layout->user('user_view/show', array( 'user' => $user, 'timezones' => $this->timezone->getTimezones(true), 'languages' => $this->language->getLanguages(true), @@ -78,14 +58,14 @@ class User extends BaseController $user = $this->getUser(); $subtask_paginator = $this->paginator - ->setUrl('user', 'timesheet', array('user_id' => $user['id'], 'pagination' => 'subtasks')) + ->setUrl('UserViewController', 'timesheet', array('user_id' => $user['id'], 'pagination' => 'subtasks')) ->setMax(20) ->setOrder('start') ->setDirection('DESC') ->setQuery($this->subtaskTimeTracking->getUserQuery($user['id'])) ->calculateOnlyIf($this->request->getStringParam('pagination') === 'subtasks'); - $this->response->html($this->helper->layout->user('user/timesheet', array( + $this->response->html($this->helper->layout->user('user_view/timesheet', array( 'subtask_paginator' => $subtask_paginator, 'user' => $user, ))); @@ -99,7 +79,7 @@ class User extends BaseController public function passwordReset() { $user = $this->getUser(); - $this->response->html($this->helper->layout->user('user/password_reset', array( + $this->response->html($this->helper->layout->user('user_view/password_reset', array( 'tokens' => $this->passwordReset->getAll($user['id']), 'user' => $user, ))); @@ -110,10 +90,10 @@ class User extends BaseController * * @access public */ - public function last() + public function lastLogin() { $user = $this->getUser(); - $this->response->html($this->helper->layout->user('user/last', array( + $this->response->html($this->helper->layout->user('user_view/last', array( 'last_logins' => $this->lastLogin->getAll($user['id']), 'user' => $user, ))); @@ -127,7 +107,7 @@ class User extends BaseController public function sessions() { $user = $this->getUser(); - $this->response->html($this->helper->layout->user('user/sessions', array( + $this->response->html($this->helper->layout->user('user_view/sessions', array( 'sessions' => $this->rememberMeSession->getAll($user['id']), 'user' => $user, ))); @@ -143,7 +123,7 @@ class User extends BaseController $this->checkCSRFParam(); $user = $this->getUser(); $this->rememberMeSession->remove($this->request->getIntegerParam('id')); - $this->response->redirect($this->helper->url->to('user', 'sessions', array('user_id' => $user['id']))); + $this->response->redirect($this->helper->url->to('UserViewController', 'sessions', array('user_id' => $user['id']))); } /** @@ -159,10 +139,10 @@ class User extends BaseController $values = $this->request->getValues(); $this->userNotification->saveSettings($user['id'], $values); $this->flash->success(t('User updated successfully.')); - return $this->response->redirect($this->helper->url->to('user', 'notifications', array('user_id' => $user['id']))); + return $this->response->redirect($this->helper->url->to('UserViewController', 'notifications', array('user_id' => $user['id']))); } - return $this->response->html($this->helper->layout->user('user/notifications', array( + 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(), @@ -184,10 +164,10 @@ class User extends BaseController $values = $this->request->getValues(); $this->userMetadata->save($user['id'], $values); $this->flash->success(t('User updated successfully.')); - $this->response->redirect($this->helper->url->to('user', 'integrations', array('user_id' => $user['id']))); + $this->response->redirect($this->helper->url->to('UserViewController', 'integrations', array('user_id' => $user['id']))); } - $this->response->html($this->helper->layout->user('user/integrations', array( + $this->response->html($this->helper->layout->user('user_view/integrations', array( 'user' => $user, 'values' => $this->userMetadata->getAll($user['id']), ))); @@ -201,7 +181,7 @@ class User extends BaseController public function external() { $user = $this->getUser(); - $this->response->html($this->helper->layout->user('user/external', array( + $this->response->html($this->helper->layout->user('user_view/external', array( 'last_logins' => $this->lastLogin->getAll($user['id']), 'user' => $user, ))); @@ -226,10 +206,10 @@ class User extends BaseController $this->flash->failure(t('Unable to update this user.')); } - return $this->response->redirect($this->helper->url->to('user', 'share', array('user_id' => $user['id']))); + return $this->response->redirect($this->helper->url->to('UserViewController', 'share', array('user_id' => $user['id']))); } - return $this->response->html($this->helper->layout->user('user/share', array( + return $this->response->html($this->helper->layout->user('user_view/share', array( 'user' => $user, 'title' => t('Public access'), ))); @@ -257,11 +237,11 @@ class User extends BaseController $this->flash->failure(t('Unable to change the password.')); } - return $this->response->redirect($this->helper->url->to('user', 'show', array('user_id' => $user['id']))); + return $this->response->redirect($this->helper->url->to('UserViewController', 'show', array('user_id' => $user['id']))); } } - return $this->response->html($this->helper->layout->user('user/password', array( + return $this->response->html($this->helper->layout->user('user_view/password', array( 'values' => $values, 'errors' => $errors, 'user' => $user, @@ -299,11 +279,11 @@ class User extends BaseController $this->flash->failure(t('Unable to update your user.')); } - return $this->response->redirect($this->helper->url->to('user', 'show', array('user_id' => $user['id']))); + return $this->response->redirect($this->helper->url->to('UserViewController', 'show', array('user_id' => $user['id']))); } } - return $this->response->html($this->helper->layout->user('user/edit', array( + return $this->response->html($this->helper->layout->user('user_view/edit', array( 'values' => $values, 'errors' => $errors, 'user' => $user, @@ -337,11 +317,11 @@ class User extends BaseController $this->flash->failure(t('Unable to update your user.')); } - return $this->response->redirect($this->helper->url->to('user', 'authentication', array('user_id' => $user['id']))); + return $this->response->redirect($this->helper->url->to('UserViewController', 'authentication', array('user_id' => $user['id']))); } } - return $this->response->html($this->helper->layout->user('user/authentication', array( + return $this->response->html($this->helper->layout->user('user_view/authentication', array( 'values' => $values, 'errors' => $errors, 'user' => $user, diff --git a/app/Core/Markdown.php b/app/Core/Markdown.php index 8275c7529..0e7b6425b 100644 --- a/app/Core/Markdown.php +++ b/app/Core/Markdown.php @@ -90,7 +90,7 @@ class Markdown extends Parsedown $user_id = $this->container['user']->getIdByUsername($matches[1]); if (! empty($user_id)) { - $url = $this->container['helper']->url->href('user', 'profile', array('user_id' => $user_id)); + $url = $this->container['helper']->url->href('UserViewController', 'profile', array('user_id' => $user_id)); return array( 'extent' => strlen($matches[0]), diff --git a/app/Helper/LayoutHelper.php b/app/Helper/LayoutHelper.php index 39defc88a..75cd178a8 100644 --- a/app/Helper/LayoutHelper.php +++ b/app/Helper/LayoutHelper.php @@ -47,7 +47,7 @@ class LayoutHelper extends Base $params['title'] = '#'.$params['user']['id'].' '.($params['user']['name'] ?: $params['user']['username']); } - return $this->subLayout('user/layout', 'user/sidebar', $template, $params); + return $this->subLayout('user_view/layout', 'user_view/sidebar', $template, $params); } /** diff --git a/app/ServiceProvider/AuthenticationProvider.php b/app/ServiceProvider/AuthenticationProvider.php index 5540bf889..fbc10abf7 100644 --- a/app/ServiceProvider/AuthenticationProvider.php +++ b/app/ServiceProvider/AuthenticationProvider.php @@ -100,7 +100,7 @@ class AuthenticationProvider implements ServiceProviderInterface $acl->add('TaskExternalLink', '*', Role::PROJECT_MEMBER); $acl->add('Taskmodification', '*', Role::PROJECT_MEMBER); $acl->add('Taskstatus', '*', Role::PROJECT_MEMBER); - $acl->add('UserHelper', array('mention'), Role::PROJECT_MEMBER); + $acl->add('UserAjaxController', array('mention'), Role::PROJECT_MEMBER); return $acl; } @@ -141,8 +141,9 @@ class AuthenticationProvider implements ServiceProviderInterface $acl->add('Twofactor', 'disable', Role::APP_ADMIN); $acl->add('UserImportController', '*', Role::APP_ADMIN); $acl->add('UserCreationController', '*', Role::APP_ADMIN); - $acl->add('User', array('index', 'authentication'), Role::APP_ADMIN); + $acl->add('UserListController', '*', Role::APP_ADMIN); $acl->add('UserStatusController', '*', Role::APP_ADMIN); + $acl->add('UserViewController', array('authentication'), Role::APP_ADMIN); return $acl; } diff --git a/app/ServiceProvider/RouteProvider.php b/app/ServiceProvider/RouteProvider.php index a6d6abef8..359bd2203 100644 --- a/app/ServiceProvider/RouteProvider.php +++ b/app/ServiceProvider/RouteProvider.php @@ -144,19 +144,19 @@ class RouteProvider implements ServiceProviderInterface $container['route']->addRoute('ical/user/:token', 'ical', 'user'); // Users - $container['route']->addRoute('users', 'user', 'index'); - $container['route']->addRoute('user/profile/:user_id', 'user', 'profile'); - $container['route']->addRoute('user/show/:user_id', 'user', 'show'); - $container['route']->addRoute('user/show/:user_id/timesheet', 'user', 'timesheet'); - $container['route']->addRoute('user/show/:user_id/last-logins', 'user', 'last'); - $container['route']->addRoute('user/show/:user_id/sessions', 'user', 'sessions'); - $container['route']->addRoute('user/:user_id/edit', 'user', 'edit'); - $container['route']->addRoute('user/:user_id/password', 'user', 'password'); - $container['route']->addRoute('user/:user_id/share', 'user', 'share'); - $container['route']->addRoute('user/:user_id/notifications', 'user', 'notifications'); - $container['route']->addRoute('user/:user_id/accounts', 'user', 'external'); - $container['route']->addRoute('user/:user_id/integrations', 'user', 'integrations'); - $container['route']->addRoute('user/:user_id/authentication', 'user', 'authentication'); + $container['route']->addRoute('users', 'UserListController', 'show'); + $container['route']->addRoute('user/profile/:user_id', 'UserViewController', 'profile'); + $container['route']->addRoute('user/show/:user_id', 'UserViewController', 'show'); + $container['route']->addRoute('user/show/:user_id/timesheet', 'UserViewController', 'timesheet'); + $container['route']->addRoute('user/show/:user_id/last-logins', 'UserViewController', 'lastLogin'); + $container['route']->addRoute('user/show/:user_id/sessions', 'UserViewController', 'sessions'); + $container['route']->addRoute('user/:user_id/edit', 'UserViewController', 'edit'); + $container['route']->addRoute('user/:user_id/password', 'UserViewController', 'password'); + $container['route']->addRoute('user/:user_id/share', 'UserViewController', 'share'); + $container['route']->addRoute('user/:user_id/notifications', 'UserViewController', 'notifications'); + $container['route']->addRoute('user/:user_id/accounts', 'UserViewController', 'external'); + $container['route']->addRoute('user/:user_id/integrations', 'UserViewController', 'integrations'); + $container['route']->addRoute('user/:user_id/authentication', 'UserViewController', 'authentication'); $container['route']->addRoute('user/:user_id/2fa', 'twofactor', 'index'); $container['route']->addRoute('user/:user_id/avatar', 'AvatarFile', 'show'); diff --git a/app/Template/comment/create.php b/app/Template/comment/create.php index b6c27ae05..fa7c0ca60 100644 --- a/app/Template/comment/create.php +++ b/app/Template/comment/create.php @@ -15,7 +15,7 @@ 'autofocus', 'required', 'placeholder="'.t('Leave a comment').'"', - 'data-mention-search-url="'.$this->url->href('UserHelper', 'mention', array('project_id' => $task['project_id'])).'"', + 'data-mention-search-url="'.$this->url->href('UserAjaxController', 'mention', array('project_id' => $task['project_id'])).'"', ), 'markdown-editor' ) ?> diff --git a/app/Template/comments/create.php b/app/Template/comments/create.php index a638d3b88..633f4392b 100644 --- a/app/Template/comments/create.php +++ b/app/Template/comments/create.php @@ -12,7 +12,7 @@ 'data-markdown-editor-disable-toolbar="true"', 'required', 'placeholder="'.t('Leave a comment').'"', - 'data-mention-search-url="'.$this->url->href('UserHelper', 'mention', array('project_id' => $task['project_id'])).'"', + 'data-mention-search-url="'.$this->url->href('UserAjaxController', 'mention', array('project_id' => $task['project_id'])).'"', ), 'markdown-editor' ) ?> diff --git a/app/Template/group/index.php b/app/Template/group/index.php index 74e074c37..1062e18cb 100644 --- a/app/Template/group/index.php +++ b/app/Template/group/index.php @@ -1,7 +1,7 @@
    -
  • url->link(t('All users'), 'user', 'index') ?>
    • +
  • url->link(t('All users'), 'UserListController', 'show') ?>
  • url->link(t('New group'), 'GroupCreationController', 'show', array(), false, 'popover') ?>
diff --git a/app/Template/group/users.php b/app/Template/group/users.php index 0f8021469..a4895ab71 100644 --- a/app/Template/group/users.php +++ b/app/Template/group/users.php @@ -19,10 +19,10 @@ getCollection() as $user): ?> - url->link('#'.$user['id'], 'user', 'show', array('user_id' => $user['id'])) ?> + url->link('#'.$user['id'], 'UserViewController', 'show', array('user_id' => $user['id'])) ?> - url->link($this->text->e($user['username']), 'user', 'show', array('user_id' => $user['id'])) ?> + url->link($this->text->e($user['username']), 'UserViewController', 'show', array('user_id' => $user['id'])) ?> text->e($user['name']) ?> diff --git a/app/Template/header.php b/app/Template/header.php index bac026d34..23906a9eb 100644 --- a/app/Template/header.php +++ b/app/Template/header.php @@ -67,16 +67,16 @@
  • - url->link(t('My profile'), 'user', 'show', array('user_id' => $this->user->getId())) ?> + url->link(t('My profile'), 'UserViewController', 'show', array('user_id' => $this->user->getId())) ?>
  • url->link(t('Projects management'), 'project', 'index') ?>
    • - user->hasAccess('user', 'index')): ?> + user->hasAccess('UserListController', 'show')): ?>
  • - url->link(t('Users management'), 'user', 'index') ?> + url->link(t('Users management'), 'UserListController', 'show') ?>
  • diff --git a/app/Template/layout.php b/app/Template/layout.php index 701b297d0..ff29e18f2 100644 --- a/app/Template/layout.php +++ b/app/Template/layout.php @@ -44,7 +44,7 @@ hook->render('template:layout:head') ?> - diff --git a/app/Template/task/time_tracking_details.php b/app/Template/task/time_tracking_details.php index c51b8f5a9..d86273c58 100644 --- a/app/Template/task/time_tracking_details.php +++ b/app/Template/task/time_tracking_details.php @@ -18,7 +18,7 @@ getCollection() as $record): ?> - url->link($this->text->e($record['user_fullname'] ?: $record['username']), 'user', 'show', array('user_id' => $record['user_id'])) ?> + url->link($this->text->e($record['user_fullname'] ?: $record['username']), 'UserViewController', 'show', array('user_id' => $record['user_id'])) ?> dt->datetime($record['start']) ?> dt->datetime($record['end']) ?> @@ -28,4 +28,4 @@ - \ No newline at end of file + diff --git a/app/Template/task/transitions.php b/app/Template/task/transitions.php index 830401771..9e04c4e1d 100644 --- a/app/Template/task/transitions.php +++ b/app/Template/task/transitions.php @@ -22,9 +22,9 @@ dt->datetime($transition['date']) ?> text->e($transition['src_column']) ?> text->e($transition['dst_column']) ?> - url->link($this->text->e($transition['name'] ?: $transition['username']), 'user', 'show', array('user_id' => $transition['user_id'])) ?> + url->link($this->text->e($transition['name'] ?: $transition['username']), 'UserViewController', 'show', array('user_id' => $transition['user_id'])) ?> dt->duration($transition['time_spent']) ?> - \ No newline at end of file + diff --git a/app/Template/task_creation/show.php b/app/Template/task_creation/show.php index d39911773..cecf459dc 100644 --- a/app/Template/task_creation/show.php +++ b/app/Template/task_creation/show.php @@ -18,7 +18,7 @@ array( 'placeholder="'.t('Leave a description').'"', 'tabindex="2"', - 'data-mention-search-url="'.$this->url->href('UserHelper', 'mention', array('project_id' => $values['project_id'])).'"' + 'data-mention-search-url="'.$this->url->href('UserAjaxController', 'mention', array('project_id' => $values['project_id'])).'"' ), 'markdown-editor' ) ?> diff --git a/app/Template/task_internal_link/table.php b/app/Template/task_internal_link/table.php index 8f25b29b1..57a3536cd 100644 --- a/app/Template/task_internal_link/table.php +++ b/app/Template/task_internal_link/table.php @@ -52,7 +52,7 @@ - url->link($this->text->e($link['task_assignee_name'] ?: $link['task_assignee_username']), 'user', 'show', array('user_id' => $link['task_assignee_id'])) ?> + url->link($this->text->e($link['task_assignee_name'] ?: $link['task_assignee_username']), 'UserViewController', 'show', array('user_id' => $link['task_assignee_id'])) ?> text->e($link['task_assignee_name'] ?: $link['task_assignee_username']) ?> @@ -82,4 +82,4 @@ - \ No newline at end of file + diff --git a/app/Template/task_modification/edit_description.php b/app/Template/task_modification/edit_description.php index 8c149f4f6..801b40057 100644 --- a/app/Template/task_modification/edit_description.php +++ b/app/Template/task_modification/edit_description.php @@ -14,7 +14,7 @@ array( 'autofocus', 'placeholder="'.t('Leave a description').'"', - 'data-mention-search-url="'.$this->url->href('UserHelper', 'mention', array('project_id' => $task['project_id'])).'"' + 'data-mention-search-url="'.$this->url->href('UserAjaxController', 'mention', array('project_id' => $task['project_id'])).'"' ), 'markdown-editor' ) ?> diff --git a/app/Template/twofactor/disable.php b/app/Template/twofactor/disable.php index 36be4ef93..bdbe12339 100644 --- a/app/Template/twofactor/disable.php +++ b/app/Template/twofactor/disable.php @@ -9,6 +9,6 @@
    url->link(t('Yes'), 'twofactor', 'disable', array('user_id' => $user['id'], 'disable' => 'yes'), true, 'btn btn-red') ?> - url->link(t('cancel'), 'user', 'show', array('user_id' => $user['id'])) ?> + url->link(t('cancel'), 'UserViewController', 'show', array('user_id' => $user['id'])) ?>
    - \ No newline at end of file + diff --git a/app/Template/user/sidebar.php b/app/Template/user/sidebar.php deleted file mode 100644 index 9da43ced6..000000000 --- a/app/Template/user/sidebar.php +++ /dev/null @@ -1,83 +0,0 @@ -
    -

    -
      - user->hasAccess('user', 'show')): ?> -
    • app->checkMenuSelection('user', 'show') ?>> - url->link(t('Summary'), 'user', 'show', array('user_id' => $user['id'])) ?> -
      • - - user->isAdmin()): ?> -
    • - url->link(t('User dashboard'), 'DashboardController', 'show', array('user_id' => $user['id'])) ?> -
      • - - user->isAdmin() || $this->user->isCurrentUser($user['id'])): ?> -
    • app->checkMenuSelection('user', 'timesheet') ?>> - url->link(t('Time tracking'), 'user', 'timesheet', array('user_id' => $user['id'])) ?> -
      • -
    • app->checkMenuSelection('user', 'last') ?>> - url->link(t('Last logins'), 'user', 'last', array('user_id' => $user['id'])) ?> -
      • -
    • app->checkMenuSelection('user', 'sessions') ?>> - url->link(t('Persistent connections'), 'user', 'sessions', array('user_id' => $user['id'])) ?> -
      • -
    • app->checkMenuSelection('user', 'passwordReset') ?>> - url->link(t('Password reset history'), 'user', 'passwordReset', array('user_id' => $user['id'])) ?> -
      • - - - hook->render('template:user:sidebar:information', array('user' => $user)) ?> -
    - -

    -
      - user->isAdmin() || $this->user->isCurrentUser($user['id'])): ?> - - user->hasAccess('user', 'edit')): ?> -
    • app->checkMenuSelection('user', 'edit') ?>> - url->link(t('Edit profile'), 'user', 'edit', array('user_id' => $user['id'])) ?> -
      • -
    • app->checkMenuSelection('AvatarFile') ?>> - url->link(t('Avatar'), 'AvatarFile', 'show', array('user_id' => $user['id'])) ?> -
      • - - - -
    • app->checkMenuSelection('user', 'password') ?>> - url->link(t('Change password'), 'user', 'password', array('user_id' => $user['id'])) ?> -
      • - - - user->isCurrentUser($user['id'])): ?> -
    • app->checkMenuSelection('twofactor', 'index') ?>> - url->link(t('Two factor authentication'), 'twofactor', 'index', array('user_id' => $user['id'])) ?> -
      • - user->hasAccess('twofactor', 'disable') && $user['twofactor_activated'] == 1): ?> -
    • app->checkMenuSelection('twofactor', 'disable') ?>> - url->link(t('Two factor authentication'), 'twofactor', 'disable', array('user_id' => $user['id'])) ?> -
      • - - -
    • app->checkMenuSelection('user', 'share') ?>> - url->link(t('Public access'), 'user', 'share', array('user_id' => $user['id'])) ?> -
      • -
    • app->checkMenuSelection('user', 'notifications') ?>> - url->link(t('Notifications'), 'user', 'notifications', array('user_id' => $user['id'])) ?> -
      • -
    • app->checkMenuSelection('user', 'external') ?>> - url->link(t('External accounts'), 'user', 'external', array('user_id' => $user['id'])) ?> -
      • -
    • app->checkMenuSelection('user', 'integrations') ?>> - url->link(t('Integrations'), 'user', 'integrations', array('user_id' => $user['id'])) ?> -
      • - - - user->hasAccess('user', 'authentication')): ?> -
    • app->checkMenuSelection('user', 'authentication') ?>> - url->link(t('Edit Authentication'), 'user', 'authentication', array('user_id' => $user['id'])) ?> -
      • - - - hook->render('template:user:sidebar:actions', array('user' => $user)) ?> -
    -
    diff --git a/app/Template/user_creation/local.php b/app/Template/user_creation/local.php index a83074e8b..4c224cecb 100644 --- a/app/Template/user_creation/local.php +++ b/app/Template/user_creation/local.php @@ -40,6 +40,6 @@
    - url->link(t('cancel'), 'user', 'index', array(), false, 'close-popover') ?> + url->link(t('cancel'), 'UserListController', 'show', array(), false, 'close-popover') ?>
    diff --git a/app/Template/user_creation/remote.php b/app/Template/user_creation/remote.php index 5266fce8e..dc4981a4a 100644 --- a/app/Template/user_creation/remote.php +++ b/app/Template/user_creation/remote.php @@ -39,7 +39,7 @@
    - url->link(t('cancel'), 'user', 'index', array(), false, 'close-popover') ?> + url->link(t('cancel'), 'UserListController', 'show', array(), false, 'close-popover') ?>
    diff --git a/app/Template/user_import/show.php b/app/Template/user_import/show.php index 54a66237c..663f107ee 100644 --- a/app/Template/user_import/show.php +++ b/app/Template/user_import/show.php @@ -36,6 +36,6 @@
    - url->link(t('cancel'), 'user', 'index', array(), false, 'close-popover') ?> + url->link(t('cancel'), 'UserListController', 'show', array(), false, 'close-popover') ?>
    diff --git a/app/Template/user/dropdown.php b/app/Template/user_list/dropdown.php similarity index 92% rename from app/Template/user/dropdown.php rename to app/Template/user_list/dropdown.php index 086bf01b4..9e90c230f 100644 --- a/app/Template/user/dropdown.php +++ b/app/Template/user_list/dropdown.php @@ -3,7 +3,7 @@
    • - url->link(t('View profile'), 'user', 'show', array('user_id' => $user['id'])) ?> + url->link(t('View profile'), 'UserViewController', 'show', array('user_id' => $user['id'])) ?>
      • user->hasAccess('UserStatusController', 'disable') && ! $this->user->isCurrentUser($user['id'])): ?>
    • diff --git a/app/Template/user/index.php b/app/Template/user_list/show.php similarity index 94% rename from app/Template/user/index.php rename to app/Template/user_list/show.php index 15923e846..b2bd93778 100644 --- a/app/Template/user/index.php +++ b/app/Template/user_list/show.php @@ -30,7 +30,7 @@ - url->link($this->text->e($user['username']), 'user', 'show', array('user_id' => $user['id'])) ?> + url->link($this->text->e($user['username']), 'UserViewController', 'show', array('user_id' => $user['id'])) ?> text->e($user['name']) ?> @@ -55,7 +55,7 @@ - render('user/dropdown', array('user' => $user)) ?> + render('user_list/dropdown', array('user' => $user)) ?> diff --git a/app/Template/user_status/disable.php b/app/Template/user_status/disable.php index b551b3b8d..d30b0c207 100644 --- a/app/Template/user_status/disable.php +++ b/app/Template/user_status/disable.php @@ -8,6 +8,6 @@
      url->link(t('Yes'), 'UserStatusController', 'disable', array('user_id' => $user['id']), true, 'btn btn-red') ?> - url->link(t('cancel'), 'user', 'index', array(), false, 'close-popover') ?> + url->link(t('cancel'), 'UserListController', 'show', array(), false, 'close-popover') ?>
    diff --git a/app/Template/user_status/enable.php b/app/Template/user_status/enable.php index fe527047c..29d25eee8 100644 --- a/app/Template/user_status/enable.php +++ b/app/Template/user_status/enable.php @@ -8,6 +8,6 @@
    url->link(t('Yes'), 'UserStatusController', 'enable', array('user_id' => $user['id']), true, 'btn btn-red') ?> - url->link(t('cancel'), 'user', 'index', array(), false, 'close-popover') ?> + url->link(t('cancel'), 'UserListController', 'show', array(), false, 'close-popover') ?>
    diff --git a/app/Template/user_status/remove.php b/app/Template/user_status/remove.php index c84580927..2b8f2df5c 100644 --- a/app/Template/user_status/remove.php +++ b/app/Template/user_status/remove.php @@ -8,6 +8,6 @@
    url->link(t('Yes'), 'UserStatusController', 'remove', array('user_id' => $user['id']), true, 'btn btn-red') ?> - url->link(t('cancel'), 'user', 'index', array(), false, 'close-popover') ?> + url->link(t('cancel'), 'UserListController', 'show', array(), false, 'close-popover') ?>
    diff --git a/app/Template/user/authentication.php b/app/Template/user_view/authentication.php similarity index 81% rename from app/Template/user/authentication.php rename to app/Template/user_view/authentication.php index 6cfd4e577..44643388d 100644 --- a/app/Template/user/authentication.php +++ b/app/Template/user_view/authentication.php @@ -1,8 +1,7 @@

    -
    - + form->csrf() ?> form->hidden('id', $values) ?> @@ -16,7 +15,7 @@
    - url->link(t('cancel'), 'user', 'show', array('user_id' => $user['id'])) ?> + url->link(t('cancel'), 'UserViewController', 'show', array('user_id' => $user['id'])) ?>
    @@ -25,4 +24,4 @@
    • -
    \ No newline at end of file + diff --git a/app/Template/user/edit.php b/app/Template/user_view/edit.php similarity index 82% rename from app/Template/user/edit.php rename to app/Template/user_view/edit.php index 7b51eb731..189479053 100644 --- a/app/Template/user/edit.php +++ b/app/Template/user_view/edit.php @@ -1,7 +1,7 @@

    -
    + form->csrf() ?> @@ -30,6 +30,6 @@
    - url->link(t('cancel'), 'user', 'show', array('user_id' => $user['id'])) ?> + url->link(t('cancel'), 'UserViewController', 'show', array('user_id' => $user['id'])) ?>
    -
    \ No newline at end of file + diff --git a/app/Template/user/external.php b/app/Template/user_view/external.php similarity index 100% rename from app/Template/user/external.php rename to app/Template/user_view/external.php diff --git a/app/Template/user/integrations.php b/app/Template/user_view/integrations.php similarity index 72% rename from app/Template/user/integrations.php rename to app/Template/user_view/integrations.php index ef9d8e71e..4a2373466 100644 --- a/app/Template/user/integrations.php +++ b/app/Template/user_view/integrations.php @@ -2,7 +2,7 @@

    -
    + form->csrf() ?> hook->render('template:user:integrations', array('values' => $values)) ?> diff --git a/app/Template/user/last.php b/app/Template/user_view/last.php similarity index 100% rename from app/Template/user/last.php rename to app/Template/user_view/last.php diff --git a/app/Template/user/layout.php b/app/Template/user_view/layout.php similarity index 88% rename from app/Template/user/layout.php rename to app/Template/user_view/layout.php index 2c4bb7be4..c3604b99b 100644 --- a/app/Template/user/layout.php +++ b/app/Template/user_view/layout.php @@ -2,7 +2,7 @@
    user->hasAccess('UserCreationController', 'show')): ?>
      -
    • url->link(t('All users'), 'user', 'index') ?>
      • +
    • url->link(t('All users'), 'UserListController', 'show') ?>
    • url->link(t('New local user'), 'UserCreationController', 'show', array(), false, 'popover') ?>
    • url->link(t('New remote user'), 'UserCreationController', 'show', array('remote' => 1), false, 'popover') ?>
    • url->link(t('Import'), 'UserImportController', 'show', array(), false, 'popover') ?>
      • @@ -11,7 +11,7 @@