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

Rename controllers

This commit is contained in:
Frederic Guillot 2016-05-28 11:31:54 -04:00
parent 82b5b491be
commit ab48a09f0d
41 changed files with 124 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Controller/AvatarFile.php → app/Controller/AvatarFileController.php
View File

@ -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'])));
}
/**

4
app/Controller/Captcha.php → app/Controller/CaptchaController.php
View File

@ -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

12
app/Controller/Config.php → app/Controller/ConfigController.php
View File

@ -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));
}
}

10
app/Controller/Currency.php → app/Controller/CurrencyController.php
View File

@ -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'));
}
}

6
app/Controller/Doc.php → app/Controller/DocumentationController.php
View File

@ -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]))).')';
}
/**

4
app/Controller/Feed.php → app/Controller/FeedController.php
View File

@ -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

6
app/Controller/Ical.php → app/Controller/ICalendarController.php
View File

@ -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

12
app/Controller/Search.php → app/Controller/SearchController.php
View File

@ -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.')' : ''),

2
app/Helper/UrlHelper.php
View File

@ -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);
}
/**

12
app/ServiceProvider/AuthenticationProvider.php
View File

@ -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);

38
app/ServiceProvider/RouteProvider.php
View File

@ -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');

6
app/Template/activity/project.php
View File

@ -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>
</section>

4
app/Template/auth/index.php
View File

@ -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>
</div>

4
app/Template/avatar_file/show.php
View File

@ -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') ?>

4
app/Template/config/about.php
View File

@ -65,11 +65,11 @@
<strong><?= $this->text->bytes($db_size) ?></strong>
</li>
<li>
<?= $this->url->link(t('Download the database'), 'config', 'downloadDb', array(), true) ?>&nbsp;
<?= $this->url->link(t('Download the database'), 'ConfigController', 'downloadDb', array(), true) ?>&nbsp;
<?= t('(Gzip compressed Sqlite file)') ?>
</li>
<li>
<?= $this->url->link(t('Optimize the database'), 'config', 'optimizeDb', array(), true) ?>&nbsp;
<?= $this->url->link(t('Optimize the database'), 'ConfigController', 'optimizeDb', array(), true) ?>&nbsp;
<?= t('(VACUUM command)') ?>
</li>
</ul>

4
app/Template/config/api.php
View File

@ -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>
</section>

2
app/Template/config/application.php
View File

@ -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() ?>

2
app/Template/config/board.php
View File

@ -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() ?>

2
app/Template/config/calendar.php
View File

@ -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() ?>

2
app/Template/config/integrations.php
View File

@ -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)) ?>

2
app/Template/config/project.php
View File

@ -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() ?>

36
app/Template/config/sidebar.php
View File

@ -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>

4
app/Template/config/webhook.php
View File

@ -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>

4
app/Template/currency/index.php
View File

@ -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() ?>

2
app/Template/dashboard/layout.php
View File

@ -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>

2
app/Template/dashboard/show.php
View File

@ -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>

4
app/Template/doc/show.php
View File

@ -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>
</section>

4
app/Template/feed/project.php
View File

@ -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): ?>

4
app/Template/feed/user.php
View File

@ -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): ?>

4
app/Template/header.php
View File

@ -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>

2
app/Template/layout.php
View File

@ -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() ?>">

4
app/Template/password_reset/create.php
View File

@ -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>
</div>

4
app/Template/project_overview/information.php
View File

@ -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>

4
app/Template/project_view/share.php
View File

@ -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>

4
app/Template/project_view/show.php
View File

@ -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 ?>

4
app/Template/search/activity.php
View File

@ -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>
</section>

4
app/Template/search/index.php
View File

@ -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>
</section>

4
app/Template/user_view/share.php
View File

@ -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') ?>

4
app/Template/user_view/show.php
View File

@ -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 ?>

2
app/Template/user_view/sidebar.php
View File

@ -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 ?>

2
app/User/Avatar/AvatarFileProvider.php
View File

@ -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 . '">';
}