diff options
41 files changed, 124 insertions, 124 deletions
diff --git a/app/Controller/AvatarFile.php b/app/Controller/AvatarFileController.php index 1891a2fc..0e2ed1bb 100644 --- a/app/Controller/AvatarFile.php +++ b/app/Controller/AvatarFileController.php @@ -8,10 +8,10 @@ use Kanboard\Core\Thumbnail; /** * Avatar File Controller * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class AvatarFile extends BaseController +class AvatarFileController extends BaseController { /** * Display avatar page @@ -36,7 +36,7 @@ class AvatarFile extends BaseController $this->flash->failure(t('Unable to upload the file.')); } - $this->response->redirect($this->helper->url->to('AvatarFile', 'show', array('user_id' => $user['id']))); + $this->response->redirect($this->helper->url->to('AvatarFileController', 'show', array('user_id' => $user['id']))); } /** @@ -48,7 +48,7 @@ class AvatarFile extends BaseController $user = $this->getUser(); $this->avatarFile->remove($user['id']); $this->userSession->refresh($user['id']); - $this->response->redirect($this->helper->url->to('AvatarFile', 'show', array('user_id' => $user['id']))); + $this->response->redirect($this->helper->url->to('AvatarFileController', 'show', array('user_id' => $user['id']))); } /** diff --git a/app/Controller/Captcha.php b/app/Controller/CaptchaController.php index f6c717b3..43b2f823 100644 --- a/app/Controller/Captcha.php +++ b/app/Controller/CaptchaController.php @@ -7,10 +7,10 @@ use Gregwar\Captcha\CaptchaBuilder; /** * Captcha Controller * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class Captcha extends BaseController +class CaptchaController extends BaseController { /** * Display captcha image diff --git a/app/Controller/Config.php b/app/Controller/ConfigController.php index abf6565c..a5af0246 100644 --- a/app/Controller/Config.php +++ b/app/Controller/ConfigController.php @@ -3,12 +3,12 @@ namespace Kanboard\Controller; /** - * Config controller + * Config Controller * - * @package controller + * @package Kanboard/Controller * @author Frederic Guillot */ -class Config extends BaseController +class ConfigController extends BaseController { /** * Display the about page @@ -61,7 +61,7 @@ class Config extends BaseController $this->flash->failure(t('Unable to save your settings.')); } - $this->response->redirect($this->helper->url->to('config', $redirect)); + $this->response->redirect($this->helper->url->to('ConfigController', $redirect)); } /** @@ -177,7 +177,7 @@ class Config extends BaseController $this->checkCSRFParam(); $this->config->optimizeDatabase(); $this->flash->success(t('Database optimization done.')); - $this->response->redirect($this->helper->url->to('config', 'index')); + $this->response->redirect($this->helper->url->to('ConfigController', 'index')); } /** @@ -193,6 +193,6 @@ class Config extends BaseController $this->config->regenerateToken($type.'_token'); $this->flash->success(t('Token regenerated.')); - $this->response->redirect($this->helper->url->to('config', $type)); + $this->response->redirect($this->helper->url->to('ConfigController', $type)); } } diff --git a/app/Controller/Currency.php b/app/Controller/CurrencyController.php index 872d6929..5a0fac37 100644 --- a/app/Controller/Currency.php +++ b/app/Controller/CurrencyController.php @@ -3,12 +3,12 @@ namespace Kanboard\Controller; /** - * Currency controller + * Currency Controller * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class Currency extends BaseController +class CurrencyController extends BaseController { /** * Display all currency rates and form @@ -42,7 +42,7 @@ class Currency extends BaseController if ($valid) { if ($this->currency->create($values['currency'], $values['rate'])) { $this->flash->success(t('The currency rate have been added successfully.')); - return $this->response->redirect($this->helper->url->to('currency', 'index')); + return $this->response->redirect($this->helper->url->to('CurrencyController', 'index')); } else { $this->flash->failure(t('Unable to add this currency rate.')); } @@ -66,6 +66,6 @@ class Currency extends BaseController $this->flash->failure(t('Unable to save your settings.')); } - $this->response->redirect($this->helper->url->to('currency', 'index')); + $this->response->redirect($this->helper->url->to('CurrencyController', 'index')); } } diff --git a/app/Controller/Doc.php b/app/Controller/DocumentationController.php index 5caf5f5f..379e3dab 100644 --- a/app/Controller/Doc.php +++ b/app/Controller/DocumentationController.php @@ -7,10 +7,10 @@ use Parsedown; /** * Documentation Viewer * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class Doc extends BaseController +class DocumentationController extends BaseController { public function show() { @@ -71,7 +71,7 @@ class Doc extends BaseController */ public function replaceMarkdownUrl(array $matches) { - return '('.$this->helper->url->to('doc', 'show', array('file' => str_replace('.markdown', '', $matches[1]))).')'; + return '('.$this->helper->url->to('DocumentationController', 'show', array('file' => str_replace('.markdown', '', $matches[1]))).')'; } /** diff --git a/app/Controller/Feed.php b/app/Controller/FeedController.php index 7554a499..e453ecb9 100644 --- a/app/Controller/Feed.php +++ b/app/Controller/FeedController.php @@ -7,10 +7,10 @@ use Kanboard\Core\Controller\AccessForbiddenException; /** * Atom/RSS Feed controller * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class Feed extends BaseController +class FeedController extends BaseController { /** * RSS feed for a user diff --git a/app/Controller/Ical.php b/app/Controller/ICalendarController.php index 091ea5f4..78ea4d67 100644 --- a/app/Controller/Ical.php +++ b/app/Controller/ICalendarController.php @@ -12,12 +12,12 @@ use Kanboard\Model\Task as TaskModel; use Eluceo\iCal\Component\Calendar as iCalendar; /** - * iCalendar controller + * iCalendar Controller * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class Ical extends BaseController +class ICalendarController extends BaseController { /** * Get user iCalendar diff --git a/app/Controller/Search.php b/app/Controller/SearchController.php index a092cba6..88718cf7 100644 --- a/app/Controller/Search.php +++ b/app/Controller/SearchController.php @@ -5,12 +5,12 @@ namespace Kanboard\Controller; use Kanboard\Filter\TaskProjectsFilter; /** - * Search controller + * Search Controller * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class Search extends BaseController +class SearchController extends BaseController { public function index() { @@ -19,7 +19,7 @@ class Search extends BaseController $nb_tasks = 0; $paginator = $this->paginator - ->setUrl('search', 'index', array('search' => $search)) + ->setUrl('SearchController', 'index', array('search' => $search)) ->setMax(30) ->setOrder('tasks.id') ->setDirection('DESC'); @@ -39,7 +39,7 @@ class Search extends BaseController $this->response->html($this->helper->layout->app('search/index', array( 'values' => array( 'search' => $search, - 'controller' => 'search', + 'controller' => 'SearchController', 'action' => 'index', ), 'paginator' => $paginator, @@ -56,7 +56,7 @@ class Search extends BaseController $this->response->html($this->helper->layout->app('search/activity', array( 'values' => array( 'search' => $search, - 'controller' => 'search', + 'controller' => 'SearchController', 'action' => 'activity', ), 'title' => t('Search in activity stream').($nb_events > 0 ? ' ('.$nb_events.')' : ''), diff --git a/app/Helper/UrlHelper.php b/app/Helper/UrlHelper.php index 095c4af4..ab642c62 100644 --- a/app/Helper/UrlHelper.php +++ b/app/Helper/UrlHelper.php @@ -25,7 +25,7 @@ class UrlHelper extends Base */ public function doc($label, $file) { - return $this->link($label, 'doc', 'show', array('file' => $file), false, '', '', true); + return $this->link($label, 'DocumentationController', 'show', array('file' => $file), false, '', '', true); } /** diff --git a/app/ServiceProvider/AuthenticationProvider.php b/app/ServiceProvider/AuthenticationProvider.php index 759ec168..3d4c7f6b 100644 --- a/app/ServiceProvider/AuthenticationProvider.php +++ b/app/ServiceProvider/AuthenticationProvider.php @@ -121,18 +121,18 @@ class AuthenticationProvider implements ServiceProviderInterface $acl->setRoleHierarchy(Role::APP_USER, array(Role::APP_PUBLIC)); $acl->add('Auth', array('login', 'check'), Role::APP_PUBLIC); - $acl->add('Captcha', '*', Role::APP_PUBLIC); + $acl->add('CaptchaController', '*', Role::APP_PUBLIC); $acl->add('PasswordReset', '*', Role::APP_PUBLIC); $acl->add('Webhook', '*', Role::APP_PUBLIC); $acl->add('TaskViewController', 'readonly', Role::APP_PUBLIC); $acl->add('Board', 'readonly', Role::APP_PUBLIC); - $acl->add('Ical', '*', Role::APP_PUBLIC); - $acl->add('Feed', '*', Role::APP_PUBLIC); - $acl->add('AvatarFile', 'show', Role::APP_PUBLIC); + $acl->add('ICalendarController', '*', Role::APP_PUBLIC); + $acl->add('FeedController', '*', Role::APP_PUBLIC); + $acl->add('AvatarFileController', 'show', Role::APP_PUBLIC); - $acl->add('Config', '*', Role::APP_ADMIN); + $acl->add('ConfigController', '*', Role::APP_ADMIN); $acl->add('PluginController', '*', Role::APP_ADMIN); - $acl->add('Currency', '*', Role::APP_ADMIN); + $acl->add('CurrencyController', '*', Role::APP_ADMIN); $acl->add('Gantt', array('projects', 'saveProjectDate'), Role::APP_MANAGER); $acl->add('GroupListController', '*', Role::APP_ADMIN); $acl->add('GroupCreationController', '*', Role::APP_ADMIN); diff --git a/app/ServiceProvider/RouteProvider.php b/app/ServiceProvider/RouteProvider.php index 61f43ae6..c30c1574 100644 --- a/app/ServiceProvider/RouteProvider.php +++ b/app/ServiceProvider/RouteProvider.php @@ -41,8 +41,8 @@ class RouteProvider implements ServiceProviderInterface $container['route']->addRoute('dashboard/:user_id/notifications', 'DashboardController', 'notifications'); // Search routes - $container['route']->addRoute('search', 'search', 'index'); - $container['route']->addRoute('search/activity', 'search', 'activity'); + $container['route']->addRoute('search', 'SearchController', 'index'); + $container['route']->addRoute('search/activity', 'SearchController', 'activity'); // ProjectCreation routes $container['route']->addRoute('project/create', 'ProjectCreation', 'create'); @@ -132,12 +132,12 @@ class RouteProvider implements ServiceProviderInterface $container['route']->addRoute('gantt/:project_id/sort/:sorting', 'gantt', 'project'); // Feed routes - $container['route']->addRoute('feed/project/:token', 'feed', 'project'); - $container['route']->addRoute('feed/user/:token', 'feed', 'user'); + $container['route']->addRoute('feed/project/:token', 'FeedController', 'project'); + $container['route']->addRoute('feed/user/:token', 'FeedController', 'user'); // Ical routes - $container['route']->addRoute('ical/project/:token', 'ical', 'project'); - $container['route']->addRoute('ical/user/:token', 'ical', 'user'); + $container['route']->addRoute('ical/project/:token', 'ICalendarController', 'project'); + $container['route']->addRoute('ical/user/:token', 'ICalendarController', 'user'); // Users $container['route']->addRoute('users', 'UserListController', 'show'); @@ -154,32 +154,32 @@ class RouteProvider implements ServiceProviderInterface $container['route']->addRoute('user/:user_id/integrations', 'UserViewController', 'integrations'); $container['route']->addRoute('user/:user_id/authentication', 'UserCredentialController', 'changeAuthentication'); $container['route']->addRoute('user/:user_id/2fa', 'TwoFactorController', 'index'); - $container['route']->addRoute('user/:user_id/avatar', 'AvatarFile', 'show'); + $container['route']->addRoute('user/:user_id/avatar', 'AvatarFileController', 'show'); // Groups $container['route']->addRoute('groups', 'GroupListController', 'index'); $container['route']->addRoute('group/:group_id/members', 'GroupListController', 'users'); // Config - $container['route']->addRoute('settings', 'config', 'index'); - $container['route']->addRoute('settings/application', 'config', 'application'); - $container['route']->addRoute('settings/project', 'config', 'project'); - $container['route']->addRoute('settings/project', 'config', 'project'); - $container['route']->addRoute('settings/board', 'config', 'board'); - $container['route']->addRoute('settings/calendar', 'config', 'calendar'); - $container['route']->addRoute('settings/integrations', 'config', 'integrations'); - $container['route']->addRoute('settings/webhook', 'config', 'webhook'); - $container['route']->addRoute('settings/api', 'config', 'api'); + $container['route']->addRoute('settings', 'ConfigController', 'index'); + $container['route']->addRoute('settings/application', 'ConfigController', 'application'); + $container['route']->addRoute('settings/project', 'ConfigController', 'project'); + $container['route']->addRoute('settings/project', 'ConfigController', 'project'); + $container['route']->addRoute('settings/board', 'ConfigController', 'board'); + $container['route']->addRoute('settings/calendar', 'ConfigController', 'calendar'); + $container['route']->addRoute('settings/integrations', 'ConfigController', 'integrations'); + $container['route']->addRoute('settings/webhook', 'ConfigController', 'webhook'); + $container['route']->addRoute('settings/api', 'ConfigController', 'api'); $container['route']->addRoute('settings/links', 'link', 'index'); - $container['route']->addRoute('settings/currencies', 'currency', 'index'); + $container['route']->addRoute('settings/currencies', 'CurrencyController', 'index'); // Plugins $container['route']->addRoute('extensions', 'PluginController', 'show'); $container['route']->addRoute('extensions/directory', 'PluginController', 'directory'); // Doc - $container['route']->addRoute('documentation/:file', 'doc', 'show'); - $container['route']->addRoute('documentation', 'doc', 'show'); + $container['route']->addRoute('documentation/:file', 'DocumentationController', 'show'); + $container['route']->addRoute('documentation', 'DocumentationController', 'show'); // Auth routes $container['route']->addRoute('login', 'auth', 'login'); diff --git a/app/Template/activity/project.php b/app/Template/activity/project.php index 176d9b99..70235cfc 100644 --- a/app/Template/activity/project.php +++ b/app/Template/activity/project.php @@ -4,11 +4,11 @@ <?php if ($project['is_public']): ?> <div class="menu-inline pull-right"> <ul> - <li><i class="fa fa-rss-square fa-fw"></i><?= $this->url->link(t('RSS feed'), 'feed', 'project', array('token' => $project['token']), false, '', '', true) ?></li> - <li><i class="fa fa-calendar fa-fw"></i><?= $this->url->link(t('iCal feed'), 'ical', 'project', array('token' => $project['token'])) ?></li> + <li><i class="fa fa-rss-square fa-fw"></i><?= $this->url->link(t('RSS feed'), 'FeedController', 'project', array('token' => $project['token']), false, '', '', true) ?></li> + <li><i class="fa fa-calendar fa-fw"></i><?= $this->url->link(t('iCal feed'), 'ICalendarController', 'project', array('token' => $project['token'])) ?></li> </ul> </div> <?php endif ?> <?= $this->render('event/events', array('events' => $events)) ?> -</section>
\ No newline at end of file +</section> diff --git a/app/Template/auth/index.php b/app/Template/auth/index.php index cc562170..0f5129bd 100644 --- a/app/Template/auth/index.php +++ b/app/Template/auth/index.php @@ -19,7 +19,7 @@ <?php if (isset($captcha) && $captcha): ?> <?= $this->form->label(t('Enter the text below'), 'captcha') ?> - <img src="<?= $this->url->href('Captcha', 'image') ?>"/> + <img src="<?= $this->url->href('CaptchaController', 'image') ?>" alt="Captcha"> <?= $this->form->text('captcha', array(), $errors, array('required')) ?> <?php endif ?> @@ -39,4 +39,4 @@ <?php endif ?> <?= $this->hook->render('template:auth:login-form:after') ?> -</div>
\ No newline at end of file +</div> diff --git a/app/Template/avatar_file/show.php b/app/Template/avatar_file/show.php index 9f19a1ab..37c56cec 100644 --- a/app/Template/avatar_file/show.php +++ b/app/Template/avatar_file/show.php @@ -6,14 +6,14 @@ <div class="form-actions"> <?php if (! empty($user['avatar_path'])): ?> - <?= $this->url->link(t('Remove my image'), 'AvatarFile', 'remove', array('user_id' => $user['id']), true, 'btn btn-red') ?> + <?= $this->url->link(t('Remove my image'), 'AvatarFileController', 'remove', array('user_id' => $user['id']), true, 'btn btn-red') ?> <?php endif ?> </div> <hr> <h3><?= t('Upload my avatar image') ?></h3> -<form method="post" enctype="multipart/form-data" action="<?= $this->url->href('AvatarFile', 'upload', array('user_id' => $user['id'])) ?>"> +<form method="post" enctype="multipart/form-data" action="<?= $this->url->href('AvatarFileController', 'upload', array('user_id' => $user['id'])) ?>"> <?= $this->form->csrf() ?> <?= $this->form->file('avatar') ?> diff --git a/app/Template/config/about.php b/app/Template/config/about.php index 7c599ef7..8e2d1325 100644 --- a/app/Template/config/about.php +++ b/app/Template/config/about.php @@ -65,11 +65,11 @@ <strong><?= $this->text->bytes($db_size) ?></strong> </li> <li> - <?= $this->url->link(t('Download the database'), 'config', 'downloadDb', array(), true) ?> + <?= $this->url->link(t('Download the database'), 'ConfigController', 'downloadDb', array(), true) ?> <?= t('(Gzip compressed Sqlite file)') ?> </li> <li> - <?= $this->url->link(t('Optimize the database'), 'config', 'optimizeDb', array(), true) ?> + <?= $this->url->link(t('Optimize the database'), 'ConfigController', 'optimizeDb', array(), true) ?> <?= t('(VACUUM command)') ?> </li> </ul> diff --git a/app/Template/config/api.php b/app/Template/config/api.php index 3ebbb956..95f77355 100644 --- a/app/Template/config/api.php +++ b/app/Template/config/api.php @@ -12,7 +12,7 @@ <input type="text" class="auto-select" readonly="readonly" value="<?= $this->url->base().'jsonrpc.php' ?>"> </li> <li> - <?= $this->url->link(t('Reset token'), 'config', 'token', array('type' => 'api'), true) ?> + <?= $this->url->link(t('Reset token'), 'ConfigController', 'token', array('type' => 'api'), true) ?> </li> </ul> -</section>
\ No newline at end of file +</section> diff --git a/app/Template/config/application.php b/app/Template/config/application.php index ee0e147b..0f842f6e 100644 --- a/app/Template/config/application.php +++ b/app/Template/config/application.php @@ -1,7 +1,7 @@ <div class="page-header"> <h2><?= t('Application settings') ?></h2> </div> -<form method="post" action="<?= $this->url->href('config', 'save', array('redirect' => 'application')) ?>" autocomplete="off"> +<form method="post" action="<?= $this->url->href('ConfigController', 'save', array('redirect' => 'application')) ?>" autocomplete="off"> <?= $this->form->csrf() ?> diff --git a/app/Template/config/board.php b/app/Template/config/board.php index 75cd40ef..62a736e7 100644 --- a/app/Template/config/board.php +++ b/app/Template/config/board.php @@ -1,7 +1,7 @@ <div class="page-header"> <h2><?= t('Board settings') ?></h2> </div> -<form method="post" action="<?= $this->url->href('config', 'save', array('redirect' => 'board')) ?>" autocomplete="off"> +<form method="post" action="<?= $this->url->href('ConfigController', 'save', array('redirect' => 'board')) ?>" autocomplete="off"> <?= $this->form->csrf() ?> diff --git a/app/Template/config/calendar.php b/app/Template/config/calendar.php index 37084a8b..90e034e9 100644 --- a/app/Template/config/calendar.php +++ b/app/Template/config/calendar.php @@ -2,7 +2,7 @@ <h2><?= t('Calendar settings') ?></h2> </div> <section> -<form method="post" action="<?= $this->url->href('config', 'save', array('redirect' => 'calendar')) ?>" autocomplete="off"> +<form method="post" action="<?= $this->url->href('ConfigController', 'save', array('redirect' => 'calendar')) ?>" autocomplete="off"> <?= $this->form->csrf() ?> diff --git a/app/Template/config/integrations.php b/app/Template/config/integrations.php index 2a29b358..3ba4e865 100644 --- a/app/Template/config/integrations.php +++ b/app/Template/config/integrations.php @@ -2,7 +2,7 @@ <h2><?= t('Integration with third-party services') ?></h2> </div> -<form method="post" action="<?= $this->url->href('config', 'save', array('redirect' => 'integrations')) ?>" autocomplete="off"> +<form method="post" action="<?= $this->url->href('ConfigController', 'save', array('redirect' => 'integrations')) ?>" autocomplete="off"> <?= $this->form->csrf() ?> <?= $this->hook->render('template:config:integrations', array('values' => $values)) ?> diff --git a/app/Template/config/project.php b/app/Template/config/project.php index b0112773..6d8d131a 100644 --- a/app/Template/config/project.php +++ b/app/Template/config/project.php @@ -1,7 +1,7 @@ <div class="page-header"> <h2><?= t('Project settings') ?></h2> </div> -<form method="post" action="<?= $this->url->href('config', 'save', array('redirect' => 'project')) ?>" autocomplete="off"> +<form method="post" action="<?= $this->url->href('ConfigController', 'save', array('redirect' => 'project')) ?>" autocomplete="off"> <?= $this->form->csrf() ?> diff --git a/app/Template/config/sidebar.php b/app/Template/config/sidebar.php index a2a5a6cb..e6b4631d 100644 --- a/app/Template/config/sidebar.php +++ b/app/Template/config/sidebar.php @@ -1,35 +1,35 @@ <div class="sidebar"> <h2><?= t('Actions') ?></h2> <ul> - <li <?= $this->app->checkMenuSelection('config', 'index') ?>> - <?= $this->url->link(t('About'), 'config', 'index') ?> + <li <?= $this->app->checkMenuSelection('ConfigController', 'index') ?>> + <?= $this->url->link(t('About'), 'ConfigController', 'index') ?> </li> - <li <?= $this->app->checkMenuSelection('config', 'application') ?>> - <?= $this->url->link(t('Application settings'), 'config', 'application') ?> + <li <?= $this->app->checkMenuSelection('ConfigController', 'application') ?>> + <?= $this->url->link(t('Application settings'), 'ConfigController', 'application') ?> </li> - <li <?= $this->app->checkMenuSelection('config', 'project') ?>> - <?= $this->url->link(t('Project settings'), 'config', 'project') ?> + <li <?= $this->app->checkMenuSelection('ConfigController', 'project') ?>> + <?= $this->url->link(t('Project settings'), 'ConfigController', 'project') ?> </li> - <li <?= $this->app->checkMenuSelection('config', 'board') ?>> - <?= $this->url->link(t('Board settings'), 'config', 'board') ?> + <li <?= $this->app->checkMenuSelection('ConfigController', 'board') ?>> + <?= $this->url->link(t('Board settings'), 'ConfigController', 'board') ?> </li> - <li <?= $this->app->checkMenuSelection('config', 'calendar') ?>> - <?= $this->url->link(t('Calendar settings'), 'config', 'calendar') ?> + <li <?= $this->app->checkMenuSelection('ConfigController', 'calendar') ?>> + <?= $this->url->link(t('Calendar settings'), 'ConfigController', 'calendar') ?> </li> <li <?= $this->app->checkMenuSelection('link') ?>> <?= $this->url->link(t('Link settings'), 'link', 'index') ?> </li> - <li <?= $this->app->checkMenuSelection('currency', 'index') ?>> - <?= $this->url->link(t('Currency rates'), 'currency', 'index') ?> + <li <?= $this->app->checkMenuSelection('CurrencyController', 'index') ?>> + <?= $this->url->link(t('Currency rates'), 'CurrencyController', 'index') ?> </li> - <li <?= $this->app->checkMenuSelection('config', 'integrations') ?>> - <?= $this->url->link(t('Integrations'), 'config', 'integrations') ?> + <li <?= $this->app->checkMenuSelection('ConfigController', 'integrations') ?>> + <?= $this->url->link(t('Integrations'), 'ConfigController', 'integrations') ?> </li> - <li <?= $this->app->checkMenuSelection('config', 'webhook') ?>> - <?= $this->url->link(t('Webhooks'), 'config', 'webhook') ?> + <li <?= $this->app->checkMenuSelection('ConfigController', 'webhook') ?>> + <?= $this->url->link(t('Webhooks'), 'ConfigController', 'webhook') ?> </li> - <li <?= $this->app->checkMenuSelection('config', 'api') ?>> - <?= $this->url->link(t('API'), 'config', 'api') ?> + <li <?= $this->app->checkMenuSelection('ConfigController', 'api') ?>> + <?= $this->url->link(t('API'), 'ConfigController', 'api') ?> </li> <?= $this->hook->render('template:config:sidebar') ?> </ul> diff --git a/app/Template/config/webhook.php b/app/Template/config/webhook.php index 3bba907c..e3245873 100644 --- a/app/Template/config/webhook.php +++ b/app/Template/config/webhook.php @@ -2,7 +2,7 @@ <h2><?= t('Webhook settings') ?></h2> </div> <section> -<form method="post" action="<?= $this->url->href('config', 'save', array('redirect' => 'webhook')) ?>" autocomplete="off"> +<form method="post" action="<?= $this->url->href('ConfigController', 'save', array('redirect' => 'webhook')) ?>" autocomplete="off"> <?= $this->form->csrf() ?> @@ -25,7 +25,7 @@ <strong><?= $this->text->e($values['webhook_token']) ?></strong> </li> <li> - <?= $this->url->link(t('Reset token'), 'config', 'token', array('type' => 'webhook'), true) ?> + <?= $this->url->link(t('Reset token'), 'ConfigController', 'token', array('type' => 'webhook'), true) ?> </li> </ul> </section> diff --git a/app/Template/currency/index.php b/app/Template/currency/index.php index d35ac459..9881cee5 100644 --- a/app/Template/currency/index.php +++ b/app/Template/currency/index.php @@ -24,7 +24,7 @@ <hr/> <h3><?= t('Change reference currency') ?></h3> <?php endif ?> -<form method="post" action="<?= $this->url->href('currency', 'reference') ?>" autocomplete="off"> +<form method="post" action="<?= $this->url->href('CurrencyController', 'reference') ?>" autocomplete="off"> <?= $this->form->csrf() ?> @@ -38,7 +38,7 @@ <hr/> <h3><?= t('Add a new currency rate') ?></h3> -<form method="post" action="<?= $this->url->href('currency', 'create') ?>" autocomplete="off"> +<form method="post" action="<?= $this->url->href('CurrencyController', 'create') ?>" autocomplete="off"> <?= $this->form->csrf() ?> diff --git a/app/Template/dashboard/layout.php b/app/Template/dashboard/layout.php index 187f7f42..f73e02b5 100644 --- a/app/Template/dashboard/layout.php +++ b/app/Template/dashboard/layout.php @@ -15,7 +15,7 @@ <?php endif ?> <li> <i class="fa fa-search fa-fw"></i> - <?= $this->url->link(t('Search'), 'search', 'index') ?> + <?= $this->url->link(t('Search'), 'SearchController', 'index') ?> </li> <li> <i class="fa fa-folder fa-fw"></i> diff --git a/app/Template/dashboard/show.php b/app/Template/dashboard/show.php index bc4e2952..917a6651 100644 --- a/app/Template/dashboard/show.php +++ b/app/Template/dashboard/show.php @@ -2,7 +2,7 @@ <form method="get" action="<?= $this->url->dir() ?>" class="search"> <?= $this->form->hidden('controller', array('controller' => 'search')) ?> <?= $this->form->hidden('action', array('action' => 'index')) ?> - <?= $this->form->text('search', array(), array(), array('placeholder="'.t('Search').'"'), 'form-input-large') ?> + <?= $this->form->text('SearchController', array(), array(), array('placeholder="'.t('Search').'"'), 'form-input-large') ?> <?= $this->render('app/filters_helper') ?> </form> </div> diff --git a/app/Template/doc/show.php b/app/Template/doc/show.php index 8fbadc93..a8dbd762 100644 --- a/app/Template/doc/show.php +++ b/app/Template/doc/show.php @@ -3,11 +3,11 @@ <ul> <li> <i class="fa fa-life-ring fa-fw"></i> - <?= $this->url->link(t('Table of contents'), 'doc', 'show', array('file' => 'index')) ?> + <?= $this->url->link(t('Table of contents'), 'DocumentationController', 'show', array('file' => 'index')) ?> </li> </ul> </div> <div class="markdown documentation"> <?= $content ?> </div> -</section>
\ No newline at end of file +</section> diff --git a/app/Template/feed/project.php b/app/Template/feed/project.php index eae41c92..213a04d4 100644 --- a/app/Template/feed/project.php +++ b/app/Template/feed/project.php @@ -2,9 +2,9 @@ <feed xml:lang="en-US" xmlns="http://www.w3.org/2005/Atom"> <title><?= t('%s\'s activity', $project['name']) ?></title> <link rel="alternate" type="text/html" href="<?= $this->url->base() ?>"/> - <link rel="self" type="application/atom+xml" href="<?= $this->url->href('feed', 'project', array('token' => $project['token']), false, '', true) ?>"/> + <link rel="self" type="application/atom+xml" href="<?= $this->url->href('FeedController', 'project', array('token' => $project['token']), false, '', true) ?>"/> <updated><?= date(DATE_ATOM) ?></updated> - <id><?= $this->url->href('feed', 'project', array('token' => $project['token']), false, '', true) ?></id> + <id><?= $this->url->href('FeedController', 'project', array('token' => $project['token']), false, '', true) ?></id> <icon><?= $this->url->base() ?>assets/img/favicon.png</icon> <?php foreach ($events as $e): ?> diff --git a/app/Template/feed/user.php b/app/Template/feed/user.php index 483cf7cd..0c45f03c 100644 --- a/app/Template/feed/user.php +++ b/app/Template/feed/user.php @@ -2,9 +2,9 @@ <feed xml:lang="en-US" xmlns="http://www.w3.org/2005/Atom"> <title><?= t('Project activities for %s', $user['name'] ?: $user['username']) ?></title> <link rel="alternate" type="text/html" href="<?= $this->url->base() ?>"/> - <link rel="self" type="application/atom+xml" href="<?= $this->url->href('feed', 'user', array('token' => $user['token']), false, '', true) ?>"/> + <link rel="self" type="application/atom+xml" href="<?= $this->url->href('FeedController', 'user', array('token' => $user['token']), false, '', true) ?>"/> <updated><?= date(DATE_ATOM) ?></updated> - <id><?= $this->url->href('feed', 'user', array('token' => $user['token']), false, '', true) ?></id> + <id><?= $this->url->href('FeedController', 'user', array('token' => $user['token']), false, '', true) ?></id> <icon><?= $this->url->base() ?>assets/img/favicon.png</icon> <?php foreach ($events as $e): ?> diff --git a/app/Template/header.php b/app/Template/header.php index 1ff8bf33..300df76d 100644 --- a/app/Template/header.php +++ b/app/Template/header.php @@ -88,12 +88,12 @@ </li> <li> <i class="fa fa-cog fa-fw"></i> - <?= $this->url->link(t('Settings'), 'config', 'index') ?> + <?= $this->url->link(t('Settings'), 'ConfigController', 'index') ?> </li> <?php endif ?> <li> <i class="fa fa-life-ring fa-fw"></i> - <?= $this->url->link(t('Documentation'), 'doc', 'show') ?> + <?= $this->url->link(t('Documentation'), 'DocumentationController', 'show') ?> </li> <?php if (! DISABLE_LOGOUT): ?> <li> diff --git a/app/Template/layout.php b/app/Template/layout.php index ff29e18f..6c02de91 100644 --- a/app/Template/layout.php +++ b/app/Template/layout.php @@ -46,7 +46,7 @@ </head> <body data-status-url="<?= $this->url->href('UserAjaxController', 'status') ?>" data-login-url="<?= $this->url->href('auth', 'login') ?>" - data-keyboard-shortcut-url="<?= $this->url->href('Doc', 'shortcuts') ?>" + data-keyboard-shortcut-url="<?= $this->url->href('DocumentationController', 'shortcuts') ?>" data-timezone="<?= $this->app->getTimezone() ?>" data-js-lang="<?= $this->app->jsLang() ?>"> diff --git a/app/Template/password_reset/create.php b/app/Template/password_reset/create.php index 918a0eb4..f1877aa7 100644 --- a/app/Template/password_reset/create.php +++ b/app/Template/password_reset/create.php @@ -7,11 +7,11 @@ <?= $this->form->text('username', $values, $errors, array('autofocus', 'required')) ?> <?= $this->form->label(t('Enter the text below'), 'captcha') ?> - <img src="<?= $this->url->href('Captcha', 'image') ?>"/> + <img src="<?= $this->url->href('CaptchaController', 'image') ?>" alt="Captcha"> <?= $this->form->text('captcha', array(), $errors, array('required')) ?> <div class="form-actions"> <button type="submit" class="btn btn-blue"><?= t('Change Password') ?></button> </div> </form> -</div>
\ No newline at end of file +</div> diff --git a/app/Template/project_overview/information.php b/app/Template/project_overview/information.php index 2032ed28..f49133bd 100644 --- a/app/Template/project_overview/information.php +++ b/app/Template/project_overview/information.php @@ -30,8 +30,8 @@ <?php if ($project['is_public']): ?> <li><i class="fa fa-share-alt"></i> <?= $this->url->link(t('Public link'), 'board', 'readonly', array('token' => $project['token']), false, '', '', true) ?></li> - <li><i class="fa fa-rss-square"></i> <?= $this->url->link(t('RSS feed'), 'feed', 'project', array('token' => $project['token']), false, '', '', true) ?></li> - <li><i class="fa fa-calendar"></i> <?= $this->url->link(t('iCal feed'), 'ical', 'project', array('token' => $project['token'])) ?></li> + <li><i class="fa fa-rss-square"></i> <?= $this->url->link(t('RSS feed'), 'FeedController', 'project', array('token' => $project['token']), false, '', '', true) ?></li> + <li><i class="fa fa-calendar"></i> <?= $this->url->link(t('iCal feed'), 'ICalendarController', 'project', array('token' => $project['token'])) ?></li> <?php endif ?> </ul> </div> diff --git a/app/Template/project_view/share.php b/app/Template/project_view/share.php index 6161faa9..f8cfc0eb 100644 --- a/app/Template/project_view/share.php +++ b/app/Template/project_view/share.php @@ -7,8 +7,8 @@ <div class="listing"> <ul class="no-bullet"> <li><strong><i class="fa fa-share-alt"></i> <?= $this->url->link(t('Public link'), 'board', 'readonly', array('token' => $project['token']), false, '', '', true) ?></strong></li> - <li><strong><i class="fa fa-rss-square"></i> <?= $this->url->link(t('RSS feed'), 'feed', 'project', array('token' => $project['token']), false, '', '', true) ?></strong></li> - <li><strong><i class="fa fa-calendar"></i> <?= $this->url->link(t('iCal feed'), 'ical', 'project', array('token' => $project['token']), false, '', '', true) ?></strong></li> + <li><strong><i class="fa fa-rss-square"></i> <?= $this->url->link(t('RSS feed'), 'FeedController', 'project', array('token' => $project['token']), false, '', '', true) ?></strong></li> + <li><strong><i class="fa fa-calendar"></i> <?= $this->url->link(t('iCal feed'), 'ICalendarController', 'project', array('token' => $project['token']), false, '', '', true) ?></strong></li> </ul> </div> diff --git a/app/Template/project_view/show.php b/app/Template/project_view/show.php index 4aba4919..3a0d7f03 100644 --- a/app/Template/project_view/show.php +++ b/app/Template/project_view/show.php @@ -14,8 +14,8 @@ <?php if ($project['is_public']): ?> <li><i class="fa fa-share-alt"></i> <?= $this->url->link(t('Public link'), 'board', 'readonly', array('token' => $project['token']), false, '', '', true) ?></li> - <li><i class="fa fa-rss-square"></i> <?= $this->url->link(t('RSS feed'), 'feed', 'project', array('token' => $project['token']), false, '', '', true) ?></li> - <li><i class="fa fa-calendar"></i> <?= $this->url->link(t('iCal feed'), 'ical', 'project', array('token' => $project['token'])) ?></li> + <li><i class="fa fa-rss-square"></i> <?= $this->url->link(t('RSS feed'), 'FeedController', 'project', array('token' => $project['token']), false, '', '', true) ?></li> + <li><i class="fa fa-calendar"></i> <?= $this->url->link(t('iCal feed'), 'ICalendarController', 'project', array('token' => $project['token'])) ?></li> <?php else: ?> <li><?= t('Public access disabled') ?></li> <?php endif ?> diff --git a/app/Template/search/activity.php b/app/Template/search/activity.php index 60362215..9abc7d7e 100644 --- a/app/Template/search/activity.php +++ b/app/Template/search/activity.php @@ -3,7 +3,7 @@ <ul> <li> <i class="fa fa-search fa-fw"></i> - <?= $this->url->link(t('Search tasks'), 'search', 'index') ?> + <?= $this->url->link(t('Search tasks'), 'SearchController', 'index') ?> </li> </ul> </div> @@ -36,4 +36,4 @@ <?= $this->render('event/events', array('events' => $events)) ?> <?php endif ?> -</section>
\ No newline at end of file +</section> diff --git a/app/Template/search/index.php b/app/Template/search/index.php index d5d07ed6..bc528af7 100644 --- a/app/Template/search/index.php +++ b/app/Template/search/index.php @@ -3,7 +3,7 @@ <ul> <li> <i class="fa fa-search fa-fw"></i> - <?= $this->url->link(t('Activity stream search'), 'search', 'activity') ?> + <?= $this->url->link(t('Activity stream search'), 'SearchController', 'activity') ?> </li> </ul> </div> @@ -40,4 +40,4 @@ )) ?> <?php endif ?> -</section>
\ No newline at end of file +</section> diff --git a/app/Template/user_view/share.php b/app/Template/user_view/share.php index 9ef150e8..570b766e 100644 --- a/app/Template/user_view/share.php +++ b/app/Template/user_view/share.php @@ -5,8 +5,8 @@ <?php if (! empty($user['token'])): ?> <div class="listing"> <ul class="no-bullet"> - <li><strong><i class="fa fa-rss-square"></i> <?= $this->url->link(t('RSS feed'), 'feed', 'user', array('token' => $user['token']), false, '', '', true) ?></strong></li> - <li><strong><i class="fa fa-calendar"></i> <?= $this->url->link(t('iCal feed'), 'ical', 'user', array('token' => $user['token']), false, '', '', true) ?></strong></li> + <li><strong><i class="fa fa-rss-square"></i> <?= $this->url->link(t('RSS feed'), 'FeedController', 'user', array('token' => $user['token']), false, '', '', true) ?></strong></li> + <li><strong><i class="fa fa-calendar"></i> <?= $this->url->link(t('iCal feed'), 'ICalendarController', 'user', array('token' => $user['token']), false, '', '', true) ?></strong></li> </ul> </div> <?= $this->url->link(t('Disable public access'), 'UserViewController', 'share', array('user_id' => $user['id'], 'switch' => 'disable'), true, 'btn btn-red') ?> diff --git a/app/Template/user_view/show.php b/app/Template/user_view/show.php index 390a1e45..fc11f8a1 100644 --- a/app/Template/user_view/show.php +++ b/app/Template/user_view/show.php @@ -37,8 +37,8 @@ <div class="listing"> <ul class="no-bullet"> - <li><strong><i class="fa fa-rss-square"></i> <?= $this->url->link(t('RSS feed'), 'feed', 'user', array('token' => $user['token']), false, '', '', true) ?></strong></li> - <li><strong><i class="fa fa-calendar"></i> <?= $this->url->link(t('iCal feed'), 'ical', 'user', array('token' => $user['token']), false, '', '', true) ?></strong></li> + <li><strong><i class="fa fa-rss-square"></i> <?= $this->url->link(t('RSS feed'), 'FeedController', 'user', array('token' => $user['token']), false, '', '', true) ?></strong></li> + <li><strong><i class="fa fa-calendar"></i> <?= $this->url->link(t('iCal feed'), 'ICalendarController', 'user', array('token' => $user['token']), false, '', '', true) ?></strong></li> </ul> </div> <?php endif ?> diff --git a/app/Template/user_view/sidebar.php b/app/Template/user_view/sidebar.php index 0f2f3569..d200a7f5 100644 --- a/app/Template/user_view/sidebar.php +++ b/app/Template/user_view/sidebar.php @@ -38,7 +38,7 @@ <?= $this->url->link(t('Edit profile'), 'UserModificationController', 'show', array('user_id' => $user['id'])) ?> </li> <li <?= $this->app->checkMenuSelection('AvatarFile') ?>> - <?= $this->url->link(t('Avatar'), 'AvatarFile', 'show', array('user_id' => $user['id'])) ?> + <?= $this->url->link(t('Avatar'), 'AvatarFileController', 'show', array('user_id' => $user['id'])) ?> </li> <?php endif ?> diff --git a/app/User/Avatar/AvatarFileProvider.php b/app/User/Avatar/AvatarFileProvider.php index eea565f0..790245a4 100644 --- a/app/User/Avatar/AvatarFileProvider.php +++ b/app/User/Avatar/AvatarFileProvider.php @@ -23,7 +23,7 @@ class AvatarFileProvider extends Base implements AvatarProviderInterface */ public function render(array $user, $size) { - $url = $this->helper->url->href('AvatarFile', 'image', array('user_id' => $user['id'], 'size' => $size)); + $url = $this->helper->url->href('AvatarFileController', 'image', array('user_id' => $user['id'], 'size' => $size)); $title = $this->helper->text->e($user['name'] ?: $user['username']); return '<img src="' . $url . '" alt="' . $title . '" title="' . $title . '">'; } |