From 8f3e2b2e5c62a6130f6c8867ab335fb4c1a32c5c Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Fri, 4 Mar 2016 20:10:34 -0500 Subject: Helper refactoring --- app/Controller/Base.php | 2 +- app/Core/Helper.php | 74 +++-- app/Core/Template.php | 59 ++-- app/Helper/App.php | 128 -------- app/Helper/AppHelper.php | 128 ++++++++ app/Helper/Asset.php | 62 ---- app/Helper/AssetHelperHelper.php | 64 ++++ app/Helper/Board.php | 24 -- app/Helper/BoardHelper.php | 26 ++ app/Helper/DateHelper.php | 157 +++++++++ app/Helper/Dt.php | 156 --------- app/Helper/File.php | 107 ------ app/Helper/FileHelper.php | 109 +++++++ app/Helper/Form.php | 362 --------------------- app/Helper/FormHelper.php | 362 +++++++++++++++++++++ app/Helper/Hook.php | 64 ---- app/Helper/HookHelper.php | 66 ++++ app/Helper/Layout.php | 171 ---------- app/Helper/LayoutHelper.php | 171 ++++++++++ app/Helper/Model.php | 94 ------ app/Helper/ModelHelper.php | 94 ++++++ app/Helper/Subtask.php | 93 ------ app/Helper/SubtaskHelper.php | 95 ++++++ app/Helper/Task.php | 186 ----------- app/Helper/TaskHelper.php | 186 +++++++++++ app/Helper/Text.php | 96 ------ app/Helper/TextHelper.php | 107 ++++++ app/Helper/Url.php | 171 ---------- app/Helper/UrlHelper.php | 171 ++++++++++ app/Helper/User.php | 176 ---------- app/Helper/UserHelper.php | 178 ++++++++++ app/ServiceProvider/ClassProvider.php | 2 - app/ServiceProvider/HelperProvider.php | 34 ++ app/Template/action/index.php | 2 +- app/Template/analytic/avg_time_columns.php | 2 +- app/Template/analytic/compare_hours.php | 12 +- app/Template/analytic/tasks.php | 2 +- app/Template/analytic/users.php | 2 +- app/Template/app/projects.php | 6 +- app/Template/app/sidebar.php | 2 +- app/Template/app/subtasks.php | 8 +- app/Template/app/tasks.php | 8 +- app/Template/auth/index.php | 2 +- app/Template/board/table_column.php | 8 +- app/Template/board/table_swimlane.php | 2 +- app/Template/board/table_tasks.php | 2 +- app/Template/board/task_footer.php | 8 +- app/Template/board/task_private.php | 10 +- app/Template/board/task_public.php | 2 +- app/Template/board/tooltip_comments.php | 2 +- app/Template/board/tooltip_external_links.php | 4 +- app/Template/board/tooltip_files.php | 2 +- app/Template/board/tooltip_subtasks.php | 2 +- app/Template/board/tooltip_tasklinks.php | 4 +- app/Template/category/index.php | 2 +- app/Template/column/index.php | 6 +- app/Template/comment/show.php | 2 +- app/Template/config/about.php | 2 +- app/Template/config/api.php | 2 +- app/Template/config/plugins.php | 10 +- app/Template/config/webhook.php | 2 +- app/Template/currency/index.php | 2 +- app/Template/custom_filter/index.php | 6 +- app/Template/event/comment_create.php | 4 +- app/Template/event/comment_update.php | 4 +- app/Template/event/subtask_create.php | 6 +- app/Template/event/subtask_update.php | 6 +- app/Template/event/task_assignee_change.php | 8 +- app/Template/event/task_close.php | 4 +- app/Template/event/task_create.php | 4 +- app/Template/event/task_file_create.php | 4 +- app/Template/event/task_move_column.php | 6 +- app/Template/event/task_move_position.php | 6 +- app/Template/event/task_move_swimlane.php | 8 +- app/Template/event/task_open.php | 4 +- app/Template/event/task_update.php | 4 +- app/Template/feed/project.php | 2 +- app/Template/feed/user.php | 2 +- app/Template/file_viewer/show.php | 4 +- app/Template/group/index.php | 4 +- app/Template/group/users.php | 6 +- app/Template/header.php | 8 +- app/Template/layout.php | 2 +- app/Template/listing/show.php | 10 +- app/Template/notification/comment_create.php | 2 +- app/Template/notification/comment_update.php | 2 +- app/Template/notification/comment_user_mention.php | 2 +- app/Template/notification/subtask_create.php | 10 +- app/Template/notification/subtask_update.php | 12 +- app/Template/notification/task_assignee_change.php | 2 +- app/Template/notification/task_close.php | 2 +- app/Template/notification/task_create.php | 8 +- app/Template/notification/task_file_create.php | 2 +- app/Template/notification/task_move_column.php | 6 +- app/Template/notification/task_move_position.php | 6 +- app/Template/notification/task_move_swimlane.php | 8 +- app/Template/notification/task_open.php | 2 +- app/Template/notification/task_overdue.php | 4 +- app/Template/notification/task_update.php | 2 +- app/Template/notification/task_user_mention.php | 2 +- app/Template/project/index.php | 8 +- app/Template/project/show.php | 6 +- app/Template/project_file/remove.php | 2 +- app/Template/project_header/search.php | 6 +- app/Template/project_overview/columns.php | 2 +- app/Template/project_overview/description.php | 2 +- app/Template/project_overview/files.php | 8 +- app/Template/project_overview/information.php | 2 +- app/Template/project_permission/index.php | 4 +- app/Template/project_user/layout.php | 2 +- app/Template/project_user/roles.php | 6 +- app/Template/project_user/tasks.php | 10 +- app/Template/project_user/tooltip_users.php | 2 +- app/Template/search/results.php | 14 +- app/Template/subtask/remove.php | 2 +- app/Template/subtask/table.php | 6 +- app/Template/swimlane/table.php | 6 +- app/Template/task/analytics.php | 2 +- app/Template/task/color_picker.php | 2 +- app/Template/task/details.php | 16 +- app/Template/task/remove.php | 2 +- app/Template/task/time_tracking_details.php | 2 +- app/Template/task/time_tracking_summary.php | 6 +- app/Template/task/transitions.php | 6 +- app/Template/task_external_link/show.php | 6 +- app/Template/task_file/remove.php | 2 +- app/Template/task_file/show.php | 8 +- app/Template/task_recurrence/info.php | 8 +- app/Template/tasklink/show.php | 16 +- app/Template/twofactor/index.php | 2 +- app/Template/twofactor/show.php | 4 +- app/Template/user/index.php | 6 +- app/Template/user/last.php | 6 +- app/Template/user/password_reset.php | 4 +- app/Template/user/profile.php | 6 +- app/Template/user/sessions.php | 4 +- app/Template/user/show.php | 6 +- app/Template/user/timesheet.php | 4 +- app/common.php | 1 + composer.lock | 32 +- doc/plugin-helpers.markdown | 40 +++ doc/plugins.markdown | 1 + tests/units/Base.php | 1 + tests/units/Core/HelperTest.php | 17 + tests/units/Core/Http/RouterTest.php | 22 +- tests/units/Core/TemplateTest.php | 6 +- tests/units/Helper/AppHelperTest.php | 8 +- tests/units/Helper/AssetHelperTest.php | 4 +- tests/units/Helper/DatetimeHelperTest.php | 16 +- tests/units/Helper/FileHelperText.php | 8 +- tests/units/Helper/HookHelperTest.php | 10 +- tests/units/Helper/TaskHelperTest.php | 6 +- tests/units/Helper/TextHelperTest.php | 12 +- tests/units/Helper/UrlHelperTest.php | 24 +- tests/units/Helper/UserHelperTest.php | 26 +- 155 files changed, 2418 insertions(+), 2301 deletions(-) delete mode 100644 app/Helper/App.php create mode 100644 app/Helper/AppHelper.php delete mode 100644 app/Helper/Asset.php create mode 100644 app/Helper/AssetHelperHelper.php delete mode 100644 app/Helper/Board.php create mode 100644 app/Helper/BoardHelper.php create mode 100644 app/Helper/DateHelper.php delete mode 100644 app/Helper/Dt.php delete mode 100644 app/Helper/File.php create mode 100644 app/Helper/FileHelper.php delete mode 100644 app/Helper/Form.php create mode 100644 app/Helper/FormHelper.php delete mode 100644 app/Helper/Hook.php create mode 100644 app/Helper/HookHelper.php delete mode 100644 app/Helper/Layout.php create mode 100644 app/Helper/LayoutHelper.php delete mode 100644 app/Helper/Model.php create mode 100644 app/Helper/ModelHelper.php delete mode 100644 app/Helper/Subtask.php create mode 100644 app/Helper/SubtaskHelper.php delete mode 100644 app/Helper/Task.php create mode 100644 app/Helper/TaskHelper.php delete mode 100644 app/Helper/Text.php create mode 100644 app/Helper/TextHelper.php delete mode 100644 app/Helper/Url.php create mode 100644 app/Helper/UrlHelper.php delete mode 100644 app/Helper/User.php create mode 100644 app/Helper/UserHelper.php create mode 100644 app/ServiceProvider/HelperProvider.php create mode 100644 doc/plugin-helpers.markdown create mode 100644 tests/units/Core/HelperTest.php diff --git a/app/Controller/Base.php b/app/Controller/Base.php index 884c439c..2453be18 100644 --- a/app/Controller/Base.php +++ b/app/Controller/Base.php @@ -331,7 +331,7 @@ abstract class Base extends \Kanboard\Core\Base protected function getProjectDescription(array &$project) { if ($project['owner_id'] > 0) { - $description = t('Project owner: ').'**'.$this->template->e($project['owner_name'] ?: $project['owner_username']).'**'.PHP_EOL.PHP_EOL; + $description = t('Project owner: ').'**'.$this->helper->text->e($project['owner_name'] ?: $project['owner_username']).'**'.PHP_EOL.PHP_EOL; if (! empty($project['description'])) { $description .= '***'.PHP_EOL.PHP_EOL; diff --git a/app/Core/Helper.php b/app/Core/Helper.php index 759209f6..3764a67c 100644 --- a/app/Core/Helper.php +++ b/app/Core/Helper.php @@ -10,18 +10,18 @@ use Pimple\Container; * @package core * @author Frederic Guillot * - * @property \Kanboard\Helper\App $app - * @property \Kanboard\Helper\Asset $asset - * @property \Kanboard\Helper\Dt $dt - * @property \Kanboard\Helper\File $file - * @property \Kanboard\Helper\Form $form - * @property \Kanboard\Helper\Subtask $subtask - * @property \Kanboard\Helper\Task $task - * @property \Kanboard\Helper\Text $text - * @property \Kanboard\Helper\Url $url - * @property \Kanboard\Helper\User $user - * @property \Kanboard\Helper\Layout $layout - * @property \Kanboard\Helper\Model $model + * @property \Kanboard\Helper\AppHelper $app + * @property \Kanboard\Helper\AssetHelper $asset + * @property \Kanboard\Helper\DateHelper $dt + * @property \Kanboard\Helper\FileHelper $file + * @property \Kanboard\Helper\FormHelper $form + * @property \Kanboard\Helper\ModelHelper $model + * @property \Kanboard\Helper\SubtaskHelper $subtask + * @property \Kanboard\Helper\TaskHelper $task + * @property \Kanboard\Helper\TextHelper $text + * @property \Kanboard\Helper\UrlHelper $url + * @property \Kanboard\Helper\UserHelper $user + * @property \Kanboard\Helper\LayoutHelper $layout */ class Helper { @@ -29,17 +29,17 @@ class Helper * Helper instances * * @access private - * @var array + * @var \Pimple\Container */ - private $helpers = array(); + private $helpers; /** * Container instance * - * @access protected + * @access private * @var \Pimple\Container */ - protected $container; + private $container; /** * Constructor @@ -50,33 +50,49 @@ class Helper public function __construct(Container $container) { $this->container = $container; + $this->helpers = new Container; } /** - * Load automatically helpers + * Expose helpers with magic getter * * @access public - * @param string $name Helper name + * @param string $helper * @return mixed */ - public function __get($name) + public function __get($helper) { - if (! isset($this->helpers[$name])) { - $class = '\Kanboard\Helper\\'.ucfirst($name); - $this->helpers[$name] = new $class($this->container); - } + return $this->getHelper($helper); + } - return $this->helpers[$name]; + /** + * Expose helpers with method + * + * @access public + * @param string $helper + * @return mixed + */ + public function getHelper($helper) + { + return $this->helpers[$helper]; } /** - * HTML escaping + * Register a new Helper * - * @param string $value Value to escape - * @return string + * @access public + * @param string $property + * @param string $className + * @return Helper */ - public function e($value) + public function register($property, $className) { - return htmlspecialchars($value, ENT_QUOTES, 'UTF-8', false); + $container = $this->container; + + $this->helpers[$property] = function() use($className, $container) { + return new $className($container); + }; + + return $this; } } diff --git a/app/Core/Template.php b/app/Core/Template.php index 8ded6f7c..fa7b65ec 100644 --- a/app/Core/Template.php +++ b/app/Core/Template.php @@ -3,63 +3,50 @@ namespace Kanboard\Core; /** - * Template class + * Template * * @package core * @author Frederic Guillot */ -class Template extends Helper +class Template { /** - * List of template overrides + * Helper object * * @access private - * @var array + * @var Helper */ - private $overrides = array(); + private $helper; /** - * Rendering start time - * - * @access private - * @var float - */ - private $startTime = 0; - - /** - * Total rendering time + * List of template overrides * * @access private - * @var float + * @var array */ - private $renderingTime = 0; + private $overrides = array(); /** - * Method executed before the rendering + * Template constructor * - * @access protected - * @param string $template + * @access public + * @param Helper $helper */ - protected function beforeRender($template) + public function __construct(Helper $helper) { - if (DEBUG) { - $this->startTime = microtime(true); - } + $this->helper = $helper; } /** - * Method executed after the rendering + * Expose helpers with magic getter * - * @access protected - * @param string $template + * @access public + * @param string $helper + * @return mixed */ - protected function afterRender($template) + public function __get($helper) { - if (DEBUG) { - $duration = microtime(true) - $this->startTime; - $this->renderingTime += $duration; - $this->container['logger']->debug('Rendering '.$template.' in '.$duration.'s, total='.$this->renderingTime); - } + return $this->helper->getHelper($helper); } /** @@ -76,16 +63,10 @@ class Template extends Helper */ public function render($__template_name, array $__template_args = array()) { - $this->beforeRender($__template_name); - extract($__template_args); ob_start(); include $this->getTemplateFile($__template_name); - $html = ob_get_clean(); - - $this->afterRender($__template_name); - - return $html; + return ob_get_clean(); } /** diff --git a/app/Helper/App.php b/app/Helper/App.php deleted file mode 100644 index 79afa5b9..00000000 --- a/app/Helper/App.php +++ /dev/null @@ -1,128 +0,0 @@ -config->get($param, $default_value); - } - - /** - * Make sidebar menu active - * - * @access public - * @param string $controller - * @param string $action - * @param string $plugin - * @return string - */ - public function checkMenuSelection($controller, $action = '', $plugin = '') - { - $result = strtolower($this->getRouterController()) === strtolower($controller); - - if ($result && $action !== '') { - $result = strtolower($this->getRouterAction()) === strtolower($action); - } - - if ($result && $plugin !== '') { - $result = strtolower($this->getPluginName()) === strtolower($plugin); - } - - return $result ? 'class="active"' : ''; - } - - /** - * Get plugin name from route - * - * @access public - * @return string - */ - public function getPluginName() - { - return $this->router->getPlugin(); - } - - /** - * Get router controller - * - * @access public - * @return string - */ - public function getRouterController() - { - return $this->router->getController(); - } - - /** - * Get router action - * - * @access public - * @return string - */ - public function getRouterAction() - { - return $this->router->getAction(); - } - - /** - * Get javascript language code - * - * @access public - * @return string - */ - public function jsLang() - { - return $this->config->getJsLanguageCode(); - } - - /** - * Get current timezone - * - * @access public - * @return string - */ - public function getTimezone() - { - return $this->config->getCurrentTimezone(); - } - - /** - * Get session flash message - * - * @access public - * @return string - */ - public function flashMessage() - { - $success_message = $this->flash->getMessage('success'); - $failure_message = $this->flash->getMessage('failure'); - - if (! empty($success_message)) { - return '
'.$this->helper->e($success_message).'
'; - } - - if (! empty($failure_message)) { - return '
'.$this->helper->e($failure_message).'
'; - } - - return ''; - } -} diff --git a/app/Helper/AppHelper.php b/app/Helper/AppHelper.php new file mode 100644 index 00000000..e6f6412d --- /dev/null +++ b/app/Helper/AppHelper.php @@ -0,0 +1,128 @@ +config->get($param, $default_value); + } + + /** + * Make sidebar menu active + * + * @access public + * @param string $controller + * @param string $action + * @param string $plugin + * @return string + */ + public function checkMenuSelection($controller, $action = '', $plugin = '') + { + $result = strtolower($this->getRouterController()) === strtolower($controller); + + if ($result && $action !== '') { + $result = strtolower($this->getRouterAction()) === strtolower($action); + } + + if ($result && $plugin !== '') { + $result = strtolower($this->getPluginName()) === strtolower($plugin); + } + + return $result ? 'class="active"' : ''; + } + + /** + * Get plugin name from route + * + * @access public + * @return string + */ + public function getPluginName() + { + return $this->router->getPlugin(); + } + + /** + * Get router controller + * + * @access public + * @return string + */ + public function getRouterController() + { + return $this->router->getController(); + } + + /** + * Get router action + * + * @access public + * @return string + */ + public function getRouterAction() + { + return $this->router->getAction(); + } + + /** + * Get javascript language code + * + * @access public + * @return string + */ + public function jsLang() + { + return $this->config->getJsLanguageCode(); + } + + /** + * Get current timezone + * + * @access public + * @return string + */ + public function getTimezone() + { + return $this->config->getCurrentTimezone(); + } + + /** + * Get session flash message + * + * @access public + * @return string + */ + public function flashMessage() + { + $success_message = $this->flash->getMessage('success'); + $failure_message = $this->flash->getMessage('failure'); + + if (! empty($success_message)) { + return '
'.$this->helper->text->e($success_message).'
'; + } + + if (! empty($failure_message)) { + return '
'.$this->helper->text->e($failure_message).'
'; + } + + return ''; + } +} diff --git a/app/Helper/Asset.php b/app/Helper/Asset.php deleted file mode 100644 index c4178e8c..00000000 --- a/app/Helper/Asset.php +++ /dev/null @@ -1,62 +0,0 @@ -helper->url->dir().$filename.'?'.filemtime($filename).'">'; - } - - /** - * Add a stylesheet asset - * - * @param string $filename Filename - * @param boolean $is_file Add file timestamp - * @param string $media Media - * @return string - */ - public function css($filename, $is_file = true, $media = 'screen') - { - return ''; - } - - /** - * Get custom css - * - * @access public - * @return string - */ - public function customCss() - { - if ($this->config->get('application_stylesheet')) { - return ''; - } - - return ''; - } - - /** - * Get CSS for task colors - * - * @access public - * @return string - */ - public function colorCss() - { - return ''; - } -} diff --git a/app/Helper/AssetHelperHelper.php b/app/Helper/AssetHelperHelper.php new file mode 100644 index 00000000..7040a40a --- /dev/null +++ b/app/Helper/AssetHelperHelper.php @@ -0,0 +1,64 @@ +helper->url->dir().$filename.'?'.filemtime($filename).'">'; + } + + /** + * Add a stylesheet asset + * + * @param string $filename Filename + * @param boolean $is_file Add file timestamp + * @param string $media Media + * @return string + */ + public function css($filename, $is_file = true, $media = 'screen') + { + return ''; + } + + /** + * Get custom css + * + * @access public + * @return string + */ + public function customCss() + { + if ($this->config->get('application_stylesheet')) { + return ''; + } + + return ''; + } + + /** + * Get CSS for task colors + * + * @access public + * @return string + */ + public function colorCss() + { + return ''; + } +} diff --git a/app/Helper/Board.php b/app/Helper/Board.php deleted file mode 100644 index 430d1858..00000000 --- a/app/Helper/Board.php +++ /dev/null @@ -1,24 +0,0 @@ -userSession->isBoardCollapsed($project_id); - } -} diff --git a/app/Helper/BoardHelper.php b/app/Helper/BoardHelper.php new file mode 100644 index 00000000..a86a6c18 --- /dev/null +++ b/app/Helper/BoardHelper.php @@ -0,0 +1,26 @@ +userSession->isBoardCollapsed($project_id); + } +} diff --git a/app/Helper/DateHelper.php b/app/Helper/DateHelper.php new file mode 100644 index 00000000..3844ce64 --- /dev/null +++ b/app/Helper/DateHelper.php @@ -0,0 +1,157 @@ +config->get('application_time_format', 'H:i'), $value); + } + + /** + * Get formatted date + * + * @access public + * @param integer $value + * @return string + */ + public function date($value) + { + if (empty($value)) { + return ''; + } + + if (! ctype_digit($value)) { + $value = strtotime($value); + } + + return date($this->config->get('application_date_format', 'm/d/Y'), $value); + } + + /** + * Get formatted datetime + * + * @access public + * @param integer $value + * @return string + */ + public function datetime($value) + { + return date($this->config->get('application_datetime_format', 'm/d/Y H:i'), $value); + } + + /** + * Get duration in seconds into human format + * + * @access public + * @param integer $seconds + * @return string + */ + public function duration($seconds) + { + if ($seconds == 0) { + return 0; + } + + $dtF = new DateTime("@0"); + $dtT = new DateTime("@$seconds"); + return $dtF->diff($dtT)->format('%a days, %h hours, %i minutes and %s seconds'); + } + + /** + * Get the age of an item in quasi human readable format. + * It's in this format: <1h , NNh, NNd + * + * @access public + * @param integer $timestamp Unix timestamp of the artifact for which age will be calculated + * @param integer $now Compare with this timestamp (Default value is the current unix timestamp) + * @return string + */ + public function age($timestamp, $now = null) + { + if ($now === null) { + $now = time(); + } + + $diff = $now - $timestamp; + + if ($diff < 900) { + return t('<15m'); + } + if ($diff < 1200) { + return t('<30m'); + } elseif ($diff < 3600) { + return t('<1h'); + } elseif ($diff < 86400) { + return '~'.t('%dh', $diff / 3600); + } + + return t('%dd', ($now - $timestamp) / 86400); + } + + /** + * Get all hours for day + * + * @access public + * @return array + */ + public function getDayHours() + { + $values = array(); + + foreach (range(0, 23) as $hour) { + foreach (array(0, 30) as $minute) { + $time = sprintf('%02d:%02d', $hour, $minute); + $values[$time] = $time; + } + } + + return $values; + } + + /** + * Get all days of a week + * + * @access public + * @return array + */ + public function getWeekDays() + { + $values = array(); + + foreach (range(1, 7) as $day) { + $values[$day] = $this->getWeekDay($day); + } + + return $values; + } + + /** + * Get the localized day name from the day number + * + * @access public + * @param integer $day Day number + * @return string + */ + public function getWeekDay($day) + { + return date('l', strtotime('next Monday +'.($day - 1).' days')); + } +} diff --git a/app/Helper/Dt.php b/app/Helper/Dt.php deleted file mode 100644 index eb3f93b3..00000000 --- a/app/Helper/Dt.php +++ /dev/null @@ -1,156 +0,0 @@ -config->get('application_time_format', 'H:i'), $value); - } - - /** - * Get formatted date - * - * @access public - * @param integer $value - * @return string - */ - public function date($value) - { - if (empty($value)) { - return ''; - } - - if (! ctype_digit($value)) { - $value = strtotime($value); - } - - return date($this->config->get('application_date_format', 'm/d/Y'), $value); - } - - /** - * Get formatted datetime - * - * @access public - * @param integer $value - * @return string - */ - public function datetime($value) - { - return date($this->config->get('application_datetime_format', 'm/d/Y H:i'), $value); - } - - /** - * Get duration in seconds into human format - * - * @access public - * @param integer $seconds - * @return string - */ - public function duration($seconds) - { - if ($seconds == 0) { - return 0; - } - - $dtF = new DateTime("@0"); - $dtT = new DateTime("@$seconds"); - return $dtF->diff($dtT)->format('%a days, %h hours, %i minutes and %s seconds'); - } - - /** - * Get the age of an item in quasi human readable format. - * It's in this format: <1h , NNh, NNd - * - * @access public - * @param integer $timestamp Unix timestamp of the artifact for which age will be calculated - * @param integer $now Compare with this timestamp (Default value is the current unix timestamp) - * @return string - */ - public function age($timestamp, $now = null) - { - if ($now === null) { - $now = time(); - } - - $diff = $now - $timestamp; - - if ($diff < 900) { - return t('<15m'); - } - if ($diff < 1200) { - return t('<30m'); - } elseif ($diff < 3600) { - return t('<1h'); - } elseif ($diff < 86400) { - return '~'.t('%dh', $diff / 3600); - } - - return t('%dd', ($now - $timestamp) / 86400); - } - - /** - * Get all hours for day - * - * @access public - * @return array - */ - public function getDayHours() - { - $values = array(); - - foreach (range(0, 23) as $hour) { - foreach (array(0, 30) as $minute) { - $time = sprintf('%02d:%02d', $hour, $minute); - $values[$time] = $time; - } - } - - return $values; - } - - /** - * Get all days of a week - * - * @access public - * @return array - */ - public function getWeekDays() - { - $values = array(); - - foreach (range(1, 7) as $day) { - $values[$day] = $this->getWeekDay($day); - } - - return $values; - } - - /** - * Get the localized day name from the day number - * - * @access public - * @param integer $day Day number - * @return string - */ - public function getWeekDay($day) - { - return date('l', strtotime('next Monday +'.($day - 1).' days')); - } -} diff --git a/app/Helper/File.php b/app/Helper/File.php deleted file mode 100644 index b493e64f..00000000 --- a/app/Helper/File.php +++ /dev/null @@ -1,107 +0,0 @@ -token->getCSRFToken().'"/>'; - } - - /** - * Display a hidden form field - * - * @access public - * @param string $name Field name - * @param array $values Form values - * @return string - */ - public function hidden($name, array $values = array()) - { - return 'formValue($values, $name).'/>'; - } - - /** - * Display a select field - * - * @access public - * @param string $name Field name - * @param array $options Options - * @param array $values Form values - * @param array $errors Form errors - * @param string $class CSS class - * @return string - */ - public function select($name, array $options, array $values = array(), array $errors = array(), array $attributes = array(), $class = '') - { - $html = ''; - $html .= $this->errorList($errors, $name); - - return $html; - } - - /** - * Display a radio field group - * - * @access public - * @param string $name Field name - * @param array $options Options - * @param array $values Form values - * @return string - */ - public function radios($name, array $options, array $values = array()) - { - $html = ''; - - foreach ($options as $value => $label) { - $html .= $this->radio($name, $label, $value, isset($values[$name]) && $values[$name] == $value); - } - - return $html; - } - - /** - * Display a radio field - * - * @access public - * @param string $name Field name - * @param string $label Form label - * @param string $value Form value - * @param boolean $selected Field selected or not - * @param string $class CSS class - * @return string - */ - public function radio($name, $label, $value, $selected = false, $class = '') - { - return ''; - } - - /** - * Display a checkboxes group - * - * @access public - * @param string $name Field name - * @param array $options Options - * @param array $values Form values - * @return string - */ - public function checkboxes($name, array $options, array $values = array()) - { - $html = ''; - - foreach ($options as $value => $label) { - $html .= $this->checkbox($name.'['.$value.']', $label, $value, isset($values[$name]) && in_array($value, $values[$name])); - } - - return $html; - } - - /** - * Display a checkbox field - * - * @access public - * @param string $name Field name - * @param string $label Form label - * @param string $value Form value - * @param boolean $checked Field selected or not - * @param string $class CSS class - * @return string - */ - public function checkbox($name, $label, $value, $checked = false, $class = '') - { - return ''; - } - - /** - * Display a form label - * - * @access public - * @param string $name Field name - * @param string $label Form label - * @param array $attributes HTML attributes - * @return string - */ - public function label($label, $name, array $attributes = array()) - { - return ''; - } - - /** - * Display a textarea - * - * @access public - * @param string $name Field name - * @param array $values Form values - * @param array $errors Form errors - * @param array $attributes HTML attributes - * @param string $class CSS class - * @return string - */ - public function textarea($name, $values = array(), array $errors = array(), array $attributes = array(), $class = '') - { - $class .= $this->errorClass($errors, $name); - - $html = ''; - $html .= $this->errorList($errors, $name); - - return $html; - } - - /** - * Display file field - * - * @access public - * @param string $name - * @param array $errors - * @param boolean $multiple - * @return string - */ - public function file($name, array $errors = array(), $multiple = false) - { - $html = ''; - $html .= $this->errorList($errors, $name); - - return $html; - } - - /** - * Display a input field - * - * @access public - * @param string $type HMTL input tag type - * @param string $name Field name - * @param array $values Form values - * @param array $errors Form errors - * @param array $attributes HTML attributes - * @param string $class CSS class - * @return string - */ - public function input($type, $name, $values = array(), array $errors = array(), array $attributes = array(), $class = '') - { - $class .= $this->errorClass($errors, $name); - - $html = 'formValue($values, $name).' class="'.$class.'" '; - $html .= implode(' ', $attributes).'>'; - - if (in_array('required', $attributes)) { - $html .= '*'; - } - - $html .= $this->errorList($errors, $name); - - return $html; - } - - /** - * Display a text field - * - * @access public - * @param string $name Field name - * @param array $values Form values - * @param array $errors Form errors - * @param array $attributes HTML attributes - * @param string $class CSS class - * @return string - */ - public function text($name, $values = array(), array $errors = array(), array $attributes = array(), $class = '') - { - return $this->input('text', $name, $values, $errors, $attributes, $class); - } - - /** - * Display a password field - * - * @access public - * @param string $name Field name - * @param array $values Form values - * @param array $errors Form errors - * @param array $attributes HTML attributes - * @param string $class CSS class - * @return string - */ - public function password($name, $values = array(), array $errors = array(), array $attributes = array(), $class = '') - { - return $this->input('password', $name, $values, $errors, $attributes, $class); - } - - /** - * Display an email field - * - * @access public - * @param string $name Field name - * @param array $values Form values - * @param array $errors Form errors - * @param array $attributes HTML attributes - * @param string $class CSS class - * @return string - */ - public function email($name, $values = array(), array $errors = array(), array $attributes = array(), $class = '') - { - return $this->input('email', $name, $values, $errors, $attributes, $class); - } - - /** - * Display a number field - * - * @access public - * @param string $name Field name - * @param array $values Form values - * @param array $errors Form errors - * @param array $attributes HTML attributes - * @param string $class CSS class - * @return string - */ - public function number($name, $values = array(), array $errors = array(), array $attributes = array(), $class = '') - { - return $this->input('number', $name, $values, $errors, $attributes, $class); - } - - /** - * Display a numeric field (allow decimal number) - * - * @access public - * @param string $name Field name - * @param array $values Form values - * @param array $errors Form errors - * @param array $attributes HTML attributes - * @param string $class CSS class - * @return string - */ - public function numeric($name, $values = array(), array $errors = array(), array $attributes = array(), $class = '') - { - return $this->input('text', $name, $values, $errors, $attributes, $class.' form-numeric'); - } - - /** - * Display the form error class - * - * @access private - * @param array $errors Error list - * @param string $name Field name - * @return string - */ - private function errorClass(array $errors, $name) - { - return ! isset($errors[$name]) ? '' : ' form-error'; - } - - /** - * Display a list of form errors - * - * @access private - * @param array $errors List of errors - * @param string $name Field name - * @return string - */ - private function errorList(array $errors, $name) - { - $html = ''; - - if (isset($errors[$name])) { - $html .= ''; - } - - return $html; - } - - /** - * Get an escaped form value - * - * @access private - * @param mixed $values Values - * @param string $name Field name - * @return string - */ - private function formValue($values, $name) - { - if (isset($values->$name)) { - return 'value="'.$this->helper->e($values->$name).'"'; - } - - return isset($values[$name]) ? 'value="'.$this->helper->e($values[$name]).'"' : ''; - } -} diff --git a/app/Helper/FormHelper.php b/app/Helper/FormHelper.php new file mode 100644 index 00000000..161fd54c --- /dev/null +++ b/app/Helper/FormHelper.php @@ -0,0 +1,362 @@ +token->getCSRFToken().'"/>'; + } + + /** + * Display a hidden form field + * + * @access public + * @param string $name Field name + * @param array $values Form values + * @return string + */ + public function hidden($name, array $values = array()) + { + return 'formValue($values, $name).'/>'; + } + + /** + * Display a select field + * + * @access public + * @param string $name Field name + * @param array $options Options + * @param array $values Form values + * @param array $errors Form errors + * @param string $class CSS class + * @return string + */ + public function select($name, array $options, array $values = array(), array $errors = array(), array $attributes = array(), $class = '') + { + $html = ''; + $html .= $this->errorList($errors, $name); + + return $html; + } + + /** + * Display a radio field group + * + * @access public + * @param string $name Field name + * @param array $options Options + * @param array $values Form values + * @return string + */ + public function radios($name, array $options, array $values = array()) + { + $html = ''; + + foreach ($options as $value => $label) { + $html .= $this->radio($name, $label, $value, isset($values[$name]) && $values[$name] == $value); + } + + return $html; + } + + /** + * Display a radio field + * + * @access public + * @param string $name Field name + * @param string $label Form label + * @param string $value Form value + * @param boolean $selected Field selected or not + * @param string $class CSS class + * @return string + */ + public function radio($name, $label, $value, $selected = false, $class = '') + { + return ''; + } + + /** + * Display a checkboxes group + * + * @access public + * @param string $name Field name + * @param array $options Options + * @param array $values Form values + * @return string + */ + public function checkboxes($name, array $options, array $values = array()) + { + $html = ''; + + foreach ($options as $value => $label) { + $html .= $this->checkbox($name.'['.$value.']', $label, $value, isset($values[$name]) && in_array($value, $values[$name])); + } + + return $html; + } + + /** + * Display a checkbox field + * + * @access public + * @param string $name Field name + * @param string $label Form label + * @param string $value Form value + * @param boolean $checked Field selected or not + * @param string $class CSS class + * @return string + */ + public function checkbox($name, $label, $value, $checked = false, $class = '') + { + return ''; + } + + /** + * Display a form label + * + * @access public + * @param string $name Field name + * @param string $label Form label + * @param array $attributes HTML attributes + * @return string + */ + public function label($label, $name, array $attributes = array()) + { + return ''; + } + + /** + * Display a textarea + * + * @access public + * @param string $name Field name + * @param array $values Form values + * @param array $errors Form errors + * @param array $attributes HTML attributes + * @param string $class CSS class + * @return string + */ + public function textarea($name, $values = array(), array $errors = array(), array $attributes = array(), $class = '') + { + $class .= $this->errorClass($errors, $name); + + $html = ''; + $html .= $this->errorList($errors, $name); + + return $html; + } + + /** + * Display file field + * + * @access public + * @param string $name + * @param array $errors + * @param boolean $multiple + * @return string + */ + public function file($name, array $errors = array(), $multiple = false) + { + $html = ''; + $html .= $this->errorList($errors, $name); + + return $html; + } + + /** + * Display a input field + * + * @access public + * @param string $type HMTL input tag type + * @param string $name Field name + * @param array $values Form values + * @param array $errors Form errors + * @param array $attributes HTML attributes + * @param string $class CSS class + * @return string + */ + public function input($type, $name, $values = array(), array $errors = array(), array $attributes = array(), $class = '') + { + $class .= $this->errorClass($errors, $name); + + $html = 'formValue($values, $name).' class="'.$class.'" '; + $html .= implode(' ', $attributes).'>'; + + if (in_array('required', $attributes)) { + $html .= '*'; + } + + $html .= $this->errorList($errors, $name); + + return $html; + } + + /** + * Display a text field + * + * @access public + * @param string $name Field name + * @param array $values Form values + * @param array $errors Form errors + * @param array $attributes HTML attributes + * @param string $class CSS class + * @return string + */ + public function text($name, $values = array(), array $errors = array(), array $attributes = array(), $class = '') + { + return $this->input('text', $name, $values, $errors, $attributes, $class); + } + + /** + * Display a password field + * + * @access public + * @param string $name Field name + * @param array $values Form values + * @param array $errors Form errors + * @param array $attributes HTML attributes + * @param string $class CSS class + * @return string + */ + public function password($name, $values = array(), array $errors = array(), array $attributes = array(), $class = '') + { + return $this->input('password', $name, $values, $errors, $attributes, $class); + } + + /** + * Display an email field + * + * @access public + * @param string $name Field name + * @param array $values Form values + * @param array $errors Form errors + * @param array $attributes HTML attributes + * @param string $class CSS class + * @return string + */ + public function email($name, $values = array(), array $errors = array(), array $attributes = array(), $class = '') + { + return $this->input('email', $name, $values, $errors, $attributes, $class); + } + + /** + * Display a number field + * + * @access public + * @param string $name Field name + * @param array $values Form values + * @param array $errors Form errors + * @param array $attributes HTML attributes + * @param string $class CSS class + * @return string + */ + public function number($name, $values = array(), array $errors = array(), array $attributes = array(), $class = '') + { + return $this->input('number', $name, $values, $errors, $attributes, $class); + } + + /** + * Display a numeric field (allow decimal number) + * + * @access public + * @param string $name Field name + * @param array $values Form values + * @param array $errors Form errors + * @param array $attributes HTML attributes + * @param string $class CSS class + * @return string + */ + public function numeric($name, $values = array(), array $errors = array(), array $attributes = array(), $class = '') + { + return $this->input('text', $name, $values, $errors, $attributes, $class.' form-numeric'); + } + + /** + * Display the form error class + * + * @access private + * @param array $errors Error list + * @param string $name Field name + * @return string + */ + private function errorClass(array $errors, $name) + { + return ! isset($errors[$name]) ? '' : ' form-error'; + } + + /** + * Display a list of form errors + * + * @access private + * @param array $errors List of errors + * @param string $name Field name + * @return string + */ + private function errorList(array $errors, $name) + { + $html = ''; + + if (isset($errors[$name])) { + $html .= ''; + } + + return $html; + } + + /** + * Get an escaped form value + * + * @access private + * @param mixed $values Values + * @param string $name Field name + * @return string + */ + private function formValue($values, $name) + { + if (isset($values->$name)) { + return 'value="'.$this->helper->text->e($values->$name).'"'; + } + + return isset($values[$name]) ? 'value="'.$this->helper->text->e($values[$name]).'"' : ''; + } +} diff --git a/app/Helper/Hook.php b/app/Helper/Hook.php deleted file mode 100644 index 7b691949..00000000 --- a/app/Helper/Hook.php +++ /dev/null @@ -1,64 +0,0 @@ -hook->getListeners($hook) as $file) { - $buffer .= $this->helper->asset->$type($file); - } - - return $buffer; - } - - /** - * Render all attached hooks - * - * @access public - * @param string $hook - * @param array $variables - * @return string - */ - public function render($hook, array $variables = array()) - { - $buffer = ''; - - foreach ($this->hook->getListeners($hook) as $template) { - $buffer .= $this->template->render($template, $variables); - } - - return $buffer; - } - - /** - * Attach a template to a hook - * - * @access public - * @param string $hook - * @param string $template - * @return \Helper\Hook - */ - public function attach($hook, $template) - { - $this->hook->on($hook, $template); - return $this; - } -} diff --git a/app/Helper/HookHelper.php b/app/Helper/HookHelper.php new file mode 100644 index 00000000..e8abc875 --- /dev/null +++ b/app/Helper/HookHelper.php @@ -0,0 +1,66 @@ +hook->getListeners($hook) as $file) { + $buffer .= $this->helper->asset->$type($file); + } + + return $buffer; + } + + /** + * Render all attached hooks + * + * @access public + * @param string $hook + * @param array $variables + * @return string + */ + public function render($hook, array $variables = array()) + { + $buffer = ''; + + foreach ($this->hook->getListeners($hook) as $template) { + $buffer .= $this->template->render($template, $variables); + } + + return $buffer; + } + + /** + * Attach a template to a hook + * + * @access public + * @param string $hook + * @param string $template + * @return \Helper\Hook + */ + public function attach($hook, $template) + { + $this->hook->on($hook, $template); + return $this; + } +} diff --git a/app/Helper/Layout.php b/app/Helper/Layout.php deleted file mode 100644 index 3db23920..00000000 --- a/app/Helper/Layout.php +++ /dev/null @@ -1,171 +0,0 @@ -request->isAjax()) { - return $this->template->render($template, $params); - } - - if (! isset($params['no_layout']) && ! isset($params['board_selector'])) { - $params['board_selector'] = $this->projectUserRole->getActiveProjectsByUser($this->userSession->getId()); - } - - return $this->template->layout($template, $params); - } - - /** - * Common layout for user views - * - * @access public - * @param string $template Template name - * @param array $params Template parameters - * @return string - */ - public function user($template, array $params) - { - if (isset($params['user'])) { - $params['title'] = '#'.$params['user']['id'].' '.($params['user']['name'] ?: $params['user']['username']); - } - - return $this->subLayout('user/layout', 'user/sidebar', $template, $params); - } - - /** - * Common layout for task views - * - * @access public - * @param string $template Template name - * @param array $params Template parameters - * @return string - */ - public function task($template, array $params) - { - $params['title'] = $params['task']['title']; - return $this->subLayout('task/layout', 'task/sidebar', $template, $params); - } - - /** - * Common layout for project views - * - * @access public - * @param string $template - * @param array $params - * @param string $sidebar - * @return string - */ - public function project($template, array $params, $sidebar = 'project/sidebar') - { - if (empty($params['title'])) { - $params['title'] = $params['project']['name']; - } elseif ($params['project']['name'] !== $params['title']) { - $params['title'] = $params['project']['name'].' > '.$params['title']; - } - - return $this->subLayout('project/layout', $sidebar, $template, $params); - } - - /** - * Common layout for project user views - * - * @access public - * @param string $template - * @param array $params - * @return string - */ - public function projectUser($template, array $params) - { - $params['filter'] = array('user_id' => $params['user_id']); - return $this->subLayout('project_user/layout', 'project_user/sidebar', $template, $params); - } - - /** - * Common layout for config views - * - * @access public - * @param string $template - * @param array $params - * @return string - */ - public function config($template, array $params) - { - if (! isset($params['values'])) { - $params['values'] = $this->config->getAll(); - } - - if (! isset($params['errors'])) { - $params['errors'] = array(); - } - - return $this->subLayout('config/layout', 'config/sidebar', $template, $params); - } - - /** - * Common layout for dashboard views - * - * @access public - * @param string $template - * @param array $params - * @return string - */ - public function dashboard($template, array $params) - { - return $this->subLayout('app/layout', 'app/sidebar', $template, $params); - } - - /** - * Common layout for analytic views - * - * @access public - * @param string $template - * @param array $params - * @return string - */ - public function analytic($template, array $params) - { - return $this->subLayout('analytic/layout', 'analytic/sidebar', $template, $params); - } - - /** - * Common method to generate a sublayout - * - * @access public - * @param string $sublayout - * @param string $sidebar - * @param string $template - * @param array $params - * @return string - */ - public function subLayout($sublayout, $sidebar, $template, array $params = array()) - { - $content = $this->template->render($template, $params); - - if ($this->request->isAjax()) { - return $content; - } - - $params['content_for_sublayout'] = $content; - $params['sidebar_template'] = $sidebar; - - return $this->app($sublayout, $params); - } -} diff --git a/app/Helper/LayoutHelper.php b/app/Helper/LayoutHelper.php new file mode 100644 index 00000000..064c11ac --- /dev/null +++ b/app/Helper/LayoutHelper.php @@ -0,0 +1,171 @@ +request->isAjax()) { + return $this->template->render($template, $params); + } + + if (! isset($params['no_layout']) && ! isset($params['board_selector'])) { + $params['board_selector'] = $this->projectUserRole->getActiveProjectsByUser($this->userSession->getId()); + } + + return $this->template->layout($template, $params); + } + + /** + * Common layout for user views + * + * @access public + * @param string $template Template name + * @param array $params Template parameters + * @return string + */ + public function user($template, array $params) + { + if (isset($params['user'])) { + $params['title'] = '#'.$params['user']['id'].' '.($params['user']['name'] ?: $params['user']['username']); + } + + return $this->subLayout('user/layout', 'user/sidebar', $template, $params); + } + + /** + * Common layout for task views + * + * @access public + * @param string $template Template name + * @param array $params Template parameters + * @return string + */ + public function task($template, array $params) + { + $params['title'] = $params['task']['title']; + return $this->subLayout('task/layout', 'task/sidebar', $template, $params); + } + + /** + * Common layout for project views + * + * @access public + * @param string $template + * @param array $params + * @param string $sidebar + * @return string + */ + public function project($template, array $params, $sidebar = 'project/sidebar') + { + if (empty($params['title'])) { + $params['title'] = $params['project']['name']; + } elseif ($params['project']['name'] !== $params['title']) { + $params['title'] = $params['project']['name'].' > '.$params['title']; + } + + return $this->subLayout('project/layout', $sidebar, $template, $params); + } + + /** + * Common layout for project user views + * + * @access public + * @param string $template + * @param array $params + * @return string + */ + public function projectUser($template, array $params) + { + $params['filter'] = array('user_id' => $params['user_id']); + return $this->subLayout('project_user/layout', 'project_user/sidebar', $template, $params); + } + + /** + * Common layout for config views + * + * @access public + * @param string $template + * @param array $params + * @return string + */ + public function config($template, array $params) + { + if (! isset($params['values'])) { + $params['values'] = $this->config->getAll(); + } + + if (! isset($params['errors'])) { + $params['errors'] = array(); + } + + return $this->subLayout('config/layout', 'config/sidebar', $template, $params); + } + + /** + * Common layout for dashboard views + * + * @access public + * @param string $template + * @param array $params + * @return string + */ + public function dashboard($template, array $params) + { + return $this->subLayout('app/layout', 'app/sidebar', $template, $params); + } + + /** + * Common layout for analytic views + * + * @access public + * @param string $template + * @param array $params + * @return string + */ + public function analytic($template, array $params) + { + return $this->subLayout('analytic/layout', 'analytic/sidebar', $template, $params); + } + + /** + * Common method to generate a sublayout + * + * @access public + * @param string $sublayout + * @param string $sidebar + * @param string $template + * @param array $params + * @return string + */ + public function subLayout($sublayout, $sidebar, $template, array $params = array()) + { + $content = $this->template->render($template, $params); + + if ($this->request->isAjax()) { + return $content; + } + + $params['content_for_sublayout'] = $content; + $params['sidebar_template'] = $sidebar; + + return $this->app($sublayout, $params); + } +} diff --git a/app/Helper/Model.php b/app/Helper/Model.php deleted file mode 100644 index 68a52542..00000000 --- a/app/Helper/Model.php +++ /dev/null @@ -1,94 +0,0 @@ -'; - } elseif ($subtask['status'] == 1) { - $html = ''; - } else { - $html = ''; - } - - return $html.$this->helper->e($subtask['title']); - } - - /** - * Get the link to toggle subtask status - * - * @access public - * @param array $subtask - * @param integer $project_id - * @param boolean $refresh_table - * @return string - */ - public function toggleStatus(array $subtask, $project_id, $refresh_table = false) - { - if (! $this->helper->user->hasProjectAccess('subtask', 'edit', $project_id)) { - return $this->getTitle($subtask); - } - - $params = array('task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id'], 'refresh-table' => (int) $refresh_table); - - if ($subtask['status'] == 0 && isset($this->sessionStorage->hasSubtaskInProgress) && $this->sessionStorage->hasSubtaskInProgress) { - return $this->helper->url->link($this->getTitle($subtask), 'SubtaskRestriction', 'popover', $params, false, 'popover'); - } - - $class = 'subtask-toggle-status '.($refresh_table ? 'subtask-refresh-table' : ''); - return $this->helper->url->link($this->getTitle($subtask), 'SubtaskStatus', 'change', $params, false, $class); - } - - public function selectTitle(array $values, array $errors = array(), array $attributes = array()) - { - $attributes = array_merge(array('tabindex="1"', 'required', 'maxlength="255"'), $attributes); - - $html = $this->helper->form->label(t('Title'), 'title'); - $html .= $this->helper->form->text('title', $values, $errors, $attributes); - - return $html; - } - - public function selectAssignee(array $users, array $values, array $errors = array(), array $attributes = array()) - { - $attributes = array_merge(array('tabindex="2"'), $attributes); - - $html = $this->helper->form->label(t('Assignee'), 'user_id'); - $html .= $this->helper->form->select('user_id', $users, $values, $errors, $attributes); - $html .= ' '.t('Me').''; - - return $html; - } - - public function selectTimeEstimated(array $values, array $errors = array(), array $attributes = array()) - { - $attributes = array_merge(array('tabindex="3"'), $attributes); - - $html = $this->helper->form->label(t('Original estimate'), 'time_estimated'); - $html .= $this->helper->form->numeric('time_estimated', $values, $errors, $attributes); - $html .= ' '.t('hours'); - - return $html; - } - - public function selectTimeSpent(array $values, array $errors = array(), array $attributes = array()) - { - $attributes = array_merge(array('tabindex="4"'), $attributes); - - $html = $this->helper->form->label(t('Time spent'), 'time_spent'); - $html .= $this->helper->form->numeric('time_spent', $values, $errors, $attributes); - $html .= ' '.t('hours'); - - return $html; - } -} diff --git a/app/Helper/SubtaskHelper.php b/app/Helper/SubtaskHelper.php new file mode 100644 index 00000000..afa3c14e --- /dev/null +++ b/app/Helper/SubtaskHelper.php @@ -0,0 +1,95 @@ +'; + } elseif ($subtask['status'] == 1) { + $html = ''; + } else { + $html = ''; + } + + return $html.$this->helper->text->e($subtask['title']); + } + + /** + * Get the link to toggle subtask status + * + * @access public + * @param array $subtask + * @param integer $project_id + * @param boolean $refresh_table + * @return string + */ + public function toggleStatus(array $subtask, $project_id, $refresh_table = false) + { + if (! $this->helper->user->hasProjectAccess('subtask', 'edit', $project_id)) { + return $this->getTitle($subtask); + } + + $params = array('task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id'], 'refresh-table' => (int) $refresh_table); + + if ($subtask['status'] == 0 && isset($this->sessionStorage->hasSubtaskInProgress) && $this->sessionStorage->hasSubtaskInProgress) { + return $this->helper->url->link($this->getTitle($subtask), 'SubtaskRestriction', 'popover', $params, false, 'popover'); + } + + $class = 'subtask-toggle-status '.($refresh_table ? 'subtask-refresh-table' : ''); + return $this->helper->url->link($this->getTitle($subtask), 'SubtaskStatus', 'change', $params, false, $class); + } + + public function selectTitle(array $values, array $errors = array(), array $attributes = array()) + { + $attributes = array_merge(array('tabindex="1"', 'required', 'maxlength="255"'), $attributes); + + $html = $this->helper->form->label(t('Title'), 'title'); + $html .= $this->helper->form->text('title', $values, $errors, $attributes); + + return $html; + } + + public function selectAssignee(array $users, array $values, array $errors = array(), array $attributes = array()) + { + $attributes = array_merge(array('tabindex="2"'), $attributes); + + $html = $this->helper->form->label(t('Assignee'), 'user_id'); + $html .= $this->helper->form->select('user_id', $users, $values, $errors, $attributes); + $html .= ' '.t('Me').''; + + return $html; + } + + public function selectTimeEstimated(array $values, array $errors = array(), array $attributes = array()) + { + $attributes = array_merge(array('tabindex="3"'), $attributes); + + $html = $this->helper->form->label(t('Original estimate'), 'time_estimated'); + $html .= $this->helper->form->numeric('time_estimated', $values, $errors, $attributes); + $html .= ' '.t('hours'); + + return $html; + } + + public function selectTimeSpent(array $values, array $errors = array(), array $attributes = array()) + { + $attributes = array_merge(array('tabindex="4"'), $attributes); + + $html = $this->helper->form->label(t('Time spent'), 'time_spent'); + $html .= $this->helper->form->numeric('time_spent', $values, $errors, $attributes); + $html .= ' '.t('hours'); + + return $html; + } +} diff --git a/app/Helper/Task.php b/app/Helper/Task.php deleted file mode 100644 index 6058c099..00000000 --- a/app/Helper/Task.php +++ /dev/null @@ -1,186 +0,0 @@ -color->getList(); - } - - public function recurrenceTriggers() - { - return $this->task->getRecurrenceTriggerList(); - } - - public function recurrenceTimeframes() - { - return $this->task->getRecurrenceTimeframeList(); - } - - public function recurrenceBasedates() - { - return $this->task->getRecurrenceBasedateList(); - } - - public function canRemove(array $task) - { - return $this->taskPermission->canRemoveTask($task); - } - - public function selectAssignee(array $users, array $values, array $errors = array(), array $attributes = array()) - { - $attributes = array_merge(array('tabindex="3"'), $attributes); - - $html = $this->helper->form->label(t('Assignee'), 'owner_id'); - $html .= $this->helper->form->select('owner_id', $users, $values, $errors, $attributes); - $html .= ' '.t('Me').''; - - return $html; - } - - public function selectCategory(array $categories, array $values, array $errors = array(), array $attributes = array(), $allow_one_item = false) - { - $attributes = array_merge(array('tabindex="4"'), $attributes); - $html = ''; - - if (! (! $allow_one_item && count($categories) === 1 && key($categories) == 0)) { - $html .= $this->helper->form->label(t('Category'), 'category_id'); - $html .= $this->helper->form->select('category_id', $categories, $values, $errors, $attributes); - } - - return $html; - } - - public function selectSwimlane(array $swimlanes, array $values, array $errors = array(), array $attributes = array()) - { - $attributes = array_merge(array('tabindex="5"'), $attributes); - $html = ''; - - if (! (count($swimlanes) === 1 && key($swimlanes) == 0)) { - $html .= $this->helper->form->label(t('Swimlane'), 'swimlane_id'); - $html .= $this->helper->form->select('swimlane_id', $swimlanes, $values, $errors, $attributes); - } - - return $html; - } - - public function selectColumn(array $columns, array $values, array $errors = array(), array $attributes = array()) - { - $attributes = array_merge(array('tabindex="6"'), $attributes); - - $html = $this->helper->form->label(t('Column'), 'column_id'); - $html .= $this->helper->form->select('column_id', $columns, $values, $errors, $attributes); - - return $html; - } - - public function selectPriority(array $project, array $values) - { - $html = ''; - - if ($project['priority_end'] > $project['priority_start']) { - $range = range($project['priority_start'], $project['priority_end']); - $options = array_combine($range, $range); - $values += array('priority' => $project['priority_default']); - - $html .= $this->helper->form->label(t('Priority'), 'priority'); - $html .= $this->helper->form->select('priority', $options, $values, array(), array('tabindex="7"')); - } - - return $html; - } - - public function selectScore(array $values, array $errors = array(), array $attributes = array()) - { - $attributes = array_merge(array('tabindex="8"'), $attributes); - - $html = $this->helper->form->label(t('Complexity'), 'score'); - $html .= $this->helper->form->number('score', $values, $errors, $attributes); - - return $html; - } - - public function selectTimeEstimated(array $values, array $errors = array(), array $attributes = array()) - { - $attributes = array_merge(array('tabindex="9"'), $attributes); - - $html = $this->helper->form->label(t('Original estimate'), 'time_estimated'); - $html .= $this->helper->form->numeric('time_estimated', $values, $errors, $attributes); - $html .= ' '.t('hours'); - - return $html; - } - - public function selectTimeSpent(array $values, array $errors = array(), array $attributes = array()) - { - $attributes = array_merge(array('tabindex="10"'), $attributes); - - $html = $this->helper->form->label(t('Time spent'), 'time_spent'); - $html .= $this->helper->form->numeric('time_spent', $values, $errors, $attributes); - $html .= ' '.t('hours'); - - return $html; - } - - public function selectStartDate(array $values, array $errors = array(), array $attributes = array()) - { - $placeholder = date($this->config->get('application_date_format', 'm/d/Y H:i')); - $attributes = array_merge(array('tabindex="11"', 'placeholder="'.$placeholder.'"'), $attributes); - - $html = $this->helper->form->label(t('Start Date'), 'date_started'); - $html .= $this->helper->form->text('date_started', $values, $errors, $attributes, 'form-datetime'); - - return $html; - } - - public function selectDueDate(array $values, array $errors = array(), array $attributes = array()) - { - $placeholder = date($this->config->get('application_date_format', 'm/d/Y')); - $attributes = array_merge(array('tabindex="12"', 'placeholder="'.$placeholder.'"'), $attributes); - - $html = $this->helper->form->label(t('Due Date'), 'date_due'); - $html .= $this->helper->form->text('date_due', $values, $errors, $attributes, 'form-date'); - - return $html; - } - - public function formatPriority(array $project, array $task) - { - $html = ''; - - if ($project['priority_end'] > $project['priority_start']) { - $html .= ''; - $html .= $task['priority'] >= 0 ? 'P'.$task['priority'] : '-P'.abs($task['priority']); - $html .= ''; - } - - return $html; - } - - public function getProgress($task) - { - if (! isset($this->columns[$task['project_id']])) { - $this->columns[$task['project_id']] = $this->column->getList($task['project_id']); - } - - return $this->task->getProgress($task, $this->columns[$task['project_id']]); - } -} diff --git a/app/Helper/TaskHelper.php b/app/Helper/TaskHelper.php new file mode 100644 index 00000000..4857d0ee --- /dev/null +++ b/app/Helper/TaskHelper.php @@ -0,0 +1,186 @@ +color->getList(); + } + + public function recurrenceTriggers() + { + return $this->task->getRecurrenceTriggerList(); + } + + public function recurrenceTimeframes() + { + return $this->task->getRecurrenceTimeframeList(); + } + + public function recurrenceBasedates() + { + return $this->task->getRecurrenceBasedateList(); + } + + public function canRemove(array $task) + { + return $this->taskPermission->canRemoveTask($task); + } + + public function selectAssignee(array $users, array $values, array $errors = array(), array $attributes = array()) + { + $attributes = array_merge(array('tabindex="3"'), $attributes); + + $html = $this->helper->form->label(t('Assignee'), 'owner_id'); + $html .= $this->helper->form->select('owner_id', $users, $values, $errors, $attributes); + $html .= ' '.t('Me').''; + + return $html; + } + + public function selectCategory(array $categories, array $values, array $errors = array(), array $attributes = array(), $allow_one_item = false) + { + $attributes = array_merge(array('tabindex="4"'), $attributes); + $html = ''; + + if (! (! $allow_one_item && count($categories) === 1 && key($categories) == 0)) { + $html .= $this->helper->form->label(t('Category'), 'category_id'); + $html .= $this->helper->form->select('category_id', $categories, $values, $errors, $attributes); + } + + return $html; + } + + public function selectSwimlane(array $swimlanes, array $values, array $errors = array(), array $attributes = array()) + { + $attributes = array_merge(array('tabindex="5"'), $attributes); + $html = ''; + + if (! (count($swimlanes) === 1 && key($swimlanes) == 0)) { + $html .= $this->helper->form->label(t('Swimlane'), 'swimlane_id'); + $html .= $this->helper->form->select('swimlane_id', $swimlanes, $values, $errors, $attributes); + } + + return $html; + } + + public function selectColumn(array $columns, array $values, array $errors = array(), array $attributes = array()) + { + $attributes = array_merge(array('tabindex="6"'), $attributes); + + $html = $this->helper->form->label(t('Column'), 'column_id'); + $html .= $this->helper->form->select('column_id', $columns, $values, $errors, $attributes); + + return $html; + } + + public function selectPriority(array $project, array $values) + { + $html = ''; + + if ($project['priority_end'] > $project['priority_start']) { + $range = range($project['priority_start'], $project['priority_end']); + $options = array_combine($range, $range); + $values += array('priority' => $project['priority_default']); + + $html .= $this->helper->form->label(t('Priority'), 'priority'); + $html .= $this->helper->form->select('priority', $options, $values, array(), array('tabindex="7"')); + } + + return $html; + } + + public function selectScore(array $values, array $errors = array(), array $attributes = array()) + { + $attributes = array_merge(array('tabindex="8"'), $attributes); + + $html = $this->helper->form->label(t('Complexity'), 'score'); + $html .= $this->helper->form->number('score', $values, $errors, $attributes); + + return $html; + } + + public function selectTimeEstimated(array $values, array $errors = array(), array $attributes = array()) + { + $attributes = array_merge(array('tabindex="9"'), $attributes); + + $html = $this->helper->form->label(t('Original estimate'), 'time_estimated'); + $html .= $this->helper->form->numeric('time_estimated', $values, $errors, $attributes); + $html .= ' '.t('hours'); + + return $html; + } + + public function selectTimeSpent(array $values, array $errors = array(), array $attributes = array()) + { + $attributes = array_merge(array('tabindex="10"'), $attributes); + + $html = $this->helper->form->label(t('Time spent'), 'time_spent'); + $html .= $this->helper->form->numeric('time_spent', $values, $errors, $attributes); + $html .= ' '.t('hours'); + + return $html; + } + + public function selectStartDate(array $values, array $errors = array(), array $attributes = array()) + { + $placeholder = date($this->config->get('application_date_format', 'm/d/Y H:i')); + $attributes = array_merge(array('tabindex="11"', 'placeholder="'.$placeholder.'"'), $attributes); + + $html = $this->helper->form->label(t('Start Date'), 'date_started'); + $html .= $this->helper->form->text('date_started', $values, $errors, $attributes, 'form-datetime'); + + return $html; + } + + public function selectDueDate(array $values, array $errors = array(), array $attributes = array()) + { + $placeholder = date($this->config->get('application_date_format', 'm/d/Y')); + $attributes = array_merge(array('tabindex="12"', 'placeholder="'.$placeholder.'"'), $attributes); + + $html = $this->helper->form->label(t('Due Date'), 'date_due'); + $html .= $this->helper->form->text('date_due', $values, $errors, $attributes, 'form-date'); + + return $html; + } + + public function formatPriority(array $project, array $task) + { + $html = ''; + + if ($project['priority_end'] > $project['priority_start']) { + $html .= ''; + $html .= $task['priority'] >= 0 ? 'P'.$task['priority'] : '-P'.abs($task['priority']); + $html .= ''; + } + + return $html; + } + + public function getProgress($task) + { + if (! isset($this->columns[$task['project_id']])) { + $this->columns[$task['project_id']] = $this->column->getList($task['project_id']); + } + + return $this->task->getProgress($task, $this->columns[$task['project_id']]); + } +} diff --git a/app/Helper/Text.php b/app/Helper/Text.php deleted file mode 100644 index 83f1e3f9..00000000 --- a/app/Helper/Text.php +++ /dev/null @@ -1,96 +0,0 @@ -container, $link); - $parser->setMarkupEscaped(MARKDOWN_ESCAPE_HTML); - return $parser->text($text); - } - - /** - * Format a file size - * - * @param integer $size Size in bytes - * @param integer $precision Precision - * @return string - */ - public function bytes($size, $precision = 2) - { - $base = log($size) / log(1024); - $suffixes = array('', 'k', 'M', 'G', 'T'); - - return round(pow(1024, $base - floor($base)), $precision).$suffixes[(int)floor($base)]; - } - - /** - * Get the number of bytes from PHP size - * - * @param integer $val PHP size (example: 2M) - * @return integer - */ - public function phpToBytes($val) - { - $val = trim($val); - $last = strtolower($val[strlen($val)-1]); - - switch ($last) { - case 'g': - $val *= 1024; - case 'm': - $val *= 1024; - case 'k': - $val *= 1024; - } - - return $val; - } - - /** - * Return true if needle is contained in the haystack - * - * @param string $haystack Haystack - * @param string $needle Needle - * @return boolean - */ - public function contains($haystack, $needle) - { - return strpos($haystack, $needle) !== false; - } - - /** - * Return a value from a dictionary - * - * @param mixed $id Key - * @param array $listing Dictionary - * @param string $default_value Value displayed when the key doesn't exists - * @return string - */ - public function in($id, array $listing, $default_value = '?') - { - if (isset($listing[$id])) { - return $this->helper->e($listing[$id]); - } - - return $default_value; - } -} diff --git a/app/Helper/TextHelper.php b/app/Helper/TextHelper.php new file mode 100644 index 00000000..e5aefdcf --- /dev/null +++ b/app/Helper/TextHelper.php @@ -0,0 +1,107 @@ +container, $link); + $parser->setMarkupEscaped(MARKDOWN_ESCAPE_HTML); + return $parser->text($text); + } + + /** + * Format a file size + * + * @param integer $size Size in bytes + * @param integer $precision Precision + * @return string + */ + public function bytes($size, $precision = 2) + { + $base = log($size) / log(1024); + $suffixes = array('', 'k', 'M', 'G', 'T'); + + return round(pow(1024, $base - floor($base)), $precision).$suffixes[(int)floor($base)]; + } + + /** + * Get the number of bytes from PHP size + * + * @param integer $val PHP size (example: 2M) + * @return integer + */ + public function phpToBytes($val) + { + $val = trim($val); + $last = strtolower($val[strlen($val)-1]); + + switch ($last) { + case 'g': + $val *= 1024; + case 'm': + $val *= 1024; + case 'k': + $val *= 1024; + } + + return $val; + } + + /** + * Return true if needle is contained in the haystack + * + * @param string $haystack Haystack + * @param string $needle Needle + * @return boolean + */ + public function contains($haystack, $needle) + { + return strpos($haystack, $needle) !== false; + } + + /** + * Return a value from a dictionary + * + * @param mixed $id Key + * @param array $listing Dictionary + * @param string $default_value Value displayed when the key doesn't exists + * @return string + */ + public function in($id, array $listing, $default_value = '?') + { + if (isset($listing[$id])) { + return $this->helper->text->e($listing[$id]); + } + + return $default_value; + } +} diff --git a/app/Helper/Url.php b/app/Helper/Url.php deleted file mode 100644 index 7de8a571..00000000 --- a/app/Helper/Url.php +++ /dev/null @@ -1,171 +0,0 @@ -link($label, 'doc', 'show', array('file' => $file), false, '', '', true); - } - - /** - * HTML Link tag - * - * @access public - * @param string $label Link label - * @param string $controller Controller name - * @param string $action Action name - * @param array $params Url parameters - * @param boolean $csrf Add a CSRF token - * @param string $class CSS class attribute - * @param boolean $new_tab Open the link in a new tab - * @param string $anchor Link Anchor - * @return string - */ - public function link($label, $controller, $action, array $params = array(), $csrf = false, $class = '', $title = '', $new_tab = false, $anchor = '') - { - return ''.$label.''; - } - - /** - * HTML Hyperlink - * - * @access public - * @param string $controller Controller name - * @param string $action Action name - * @param array $params Url parameters - * @param boolean $csrf Add a CSRF token - * @param string $anchor Link Anchor - * @param boolean $absolute Absolute or relative link - * @return string - */ - public function href($controller, $action, array $params = array(), $csrf = false, $anchor = '', $absolute = false) - { - return $this->build('&', $controller, $action, $params, $csrf, $anchor, $absolute); - } - - /** - * Generate controller/action url - * - * @access public - * @param string $controller Controller name - * @param string $action Action name - * @param array $params Url parameters - * @param string $anchor Link Anchor - * @param boolean $absolute Absolute or relative link - * @return string - */ - public function to($controller, $action, array $params = array(), $anchor = '', $absolute = false) - { - return $this->build('&', $controller, $action, $params, false, $anchor, $absolute); - } - - /** - * Get application base url - * - * @access public - * @return string - */ - public function base() - { - if (empty($this->base)) { - $this->base = $this->config->get('application_url') ?: $this->server(); - } - - return $this->base; - } - - /** - * Get application base directory - * - * @access public - * @return string - */ - public function dir() - { - if ($this->directory === '' && $this->request->getMethod() !== '') { - $this->directory = str_replace('\\', '/', dirname($this->request->getServerVariable('PHP_SELF'))); - $this->directory = $this->directory !== '/' ? $this->directory.'/' : '/'; - $this->directory = str_replace('//', '/', $this->directory); - } - - return $this->directory; - } - - /** - * Get current server base url - * - * @access public - * @return string - */ - public function server() - { - if ($this->request->getServerVariable('SERVER_NAME') === '') { - return 'http://localhost/'; - } - - $url = $this->request->isHTTPS() ? 'https://' : 'http://'; - $url .= $this->request->getServerVariable('SERVER_NAME'); - $url .= $this->request->getServerVariable('SERVER_PORT') == 80 || $this->request->getServerVariable('SERVER_PORT') == 443 ? '' : ':'.$this->request->getServerVariable('SERVER_PORT'); - $url .= $this->dir() ?: '/'; - - return $url; - } - - /** - * Build relative url - * - * @access private - * @param string $separator Querystring argument separator - * @param string $controller Controller name - * @param string $action Action name - * @param array $params Url parameters - * @param boolean $csrf Add a CSRF token - * @param string $anchor Link Anchor - * @param boolean $absolute Absolute or relative link - * @return string - */ - private function build($separator, $controller, $action, array $params = array(), $csrf = false, $anchor = '', $absolute = false) - { - $path = $this->route->findUrl($controller, $action, $params); - $qs = array(); - - if (empty($path)) { - $qs['controller'] = $controller; - $qs['action'] = $action; - $qs += $params; - } else { - unset($params['plugin']); - } - - if ($csrf) { - $qs['csrf_token'] = $this->token->getCSRFToken(); - } - - if (! empty($qs)) { - $path .= '?'.http_build_query($qs, '', $separator); - } - - return ($absolute ? $this->base() : $this->dir()).$path.(empty($anchor) ? '' : '#'.$anchor); - } -} diff --git a/app/Helper/UrlHelper.php b/app/Helper/UrlHelper.php new file mode 100644 index 00000000..96c6735a --- /dev/null +++ b/app/Helper/UrlHelper.php @@ -0,0 +1,171 @@ +link($label, 'doc', 'show', array('file' => $file), false, '', '', true); + } + + /** + * HTML Link tag + * + * @access public + * @param string $label Link label + * @param string $controller Controller name + * @param string $action Action name + * @param array $params Url parameters + * @param boolean $csrf Add a CSRF token + * @param string $class CSS class attribute + * @param boolean $new_tab Open the link in a new tab + * @param string $anchor Link Anchor + * @return string + */ + public function link($label, $controller, $action, array $params = array(), $csrf = false, $class = '', $title = '', $new_tab = false, $anchor = '') + { + return ''.$label.''; + } + + /** + * HTML Hyperlink + * + * @access public + * @param string $controller Controller name + * @param string $action Action name + * @param array $params Url parameters + * @param boolean $csrf Add a CSRF token + * @param string $anchor Link Anchor + * @param boolean $absolute Absolute or relative link + * @return string + */ + public function href($controller, $action, array $params = array(), $csrf = false, $anchor = '', $absolute = false) + { + return $this->build('&', $controller, $action, $params, $csrf, $anchor, $absolute); + } + + /** + * Generate controller/action url + * + * @access public + * @param string $controller Controller name + * @param string $action Action name + * @param array $params Url parameters + * @param string $anchor Link Anchor + * @param boolean $absolute Absolute or relative link + * @return string + */ + public function to($controller, $action, array $params = array(), $anchor = '', $absolute = false) + { + return $this->build('&', $controller, $action, $params, false, $anchor, $absolute); + } + + /** + * Get application base url + * + * @access public + * @return string + */ + public function base() + { + if (empty($this->base)) { + $this->base = $this->config->get('application_url') ?: $this->server(); + } + + return $this->base; + } + + /** + * Get application base directory + * + * @access public + * @return string + */ + public function dir() + { + if ($this->directory === '' && $this->request->getMethod() !== '') { + $this->directory = str_replace('\\', '/', dirname($this->request->getServerVariable('PHP_SELF'))); + $this->directory = $this->directory !== '/' ? $this->directory.'/' : '/'; + $this->directory = str_replace('//', '/', $this->directory); + } + + return $this->directory; + } + + /** + * Get current server base url + * + * @access public + * @return string + */ + public function server() + { + if ($this->request->getServerVariable('SERVER_NAME') === '') { + return 'http://localhost/'; + } + + $url = $this->request->isHTTPS() ? 'https://' : 'http://'; + $url .= $this->request->getServerVariable('SERVER_NAME'); + $url .= $this->request->getServerVariable('SERVER_PORT') == 80 || $this->request->getServerVariable('SERVER_PORT') == 443 ? '' : ':'.$this->request->getServerVariable('SERVER_PORT'); + $url .= $this->dir() ?: '/'; + + return $url; + } + + /** + * Build relative url + * + * @access private + * @param string $separator Querystring argument separator + * @param string $controller Controller name + * @param string $action Action name + * @param array $params Url parameters + * @param boolean $csrf Add a CSRF token + * @param string $anchor Link Anchor + * @param boolean $absolute Absolute or relative link + * @return string + */ + private function build($separator, $controller, $action, array $params = array(), $csrf = false, $anchor = '', $absolute = false) + { + $path = $this->route->findUrl($controller, $action, $params); + $qs = array(); + + if (empty($path)) { + $qs['controller'] = $controller; + $qs['action'] = $action; + $qs += $params; + } else { + unset($params['plugin']); + } + + if ($csrf) { + $qs['csrf_token'] = $this->token->getCSRFToken(); + } + + if (! empty($qs)) { + $path .= '?'.http_build_query($qs, '', $separator); + } + + return ($absolute ? $this->base() : $this->dir()).$path.(empty($anchor) ? '' : '#'.$anchor); + } +} diff --git a/app/Helper/User.php b/app/Helper/User.php deleted file mode 100644 index 29844dfb..00000000 --- a/app/Helper/User.php +++ /dev/null @@ -1,176 +0,0 @@ -userUnreadNotification->hasNotifications($this->userSession->getId()); - } - - /** - * Get initials from a user - * - * @access public - * @param string $name - * @return string - */ - public function getInitials($name) - { - $initials = ''; - - foreach (explode(' ', $name) as $string) { - $initials .= mb_substr($string, 0, 1); - } - - return mb_strtoupper($initials); - } - - /** - * Get user id - * - * @access public - * @return integer - */ - public function getId() - { - return $this->userSession->getId(); - } - - /** - * Check if the given user_id is the connected user - * - * @param integer $user_id User id - * @return boolean - */ - public function isCurrentUser($user_id) - { - return $this->userSession->getId() == $user_id; - } - - /** - * Return if the logged user is admin - * - * @access public - * @return boolean - */ - public function isAdmin() - { - return $this->userSession->isAdmin(); - } - - /** - * Get role name - * - * @access public - * @param string $role - * @return string - */ - public function getRoleName($role = '') - { - return $this->role->getRoleName($role ?: $this->userSession->getRole()); - } - - /** - * Check application access - * - * @param string $controller - * @param string $action - * @return bool - */ - public function hasAccess($controller, $action) - { - $key = 'app_access:'.$controller.$action; - $result = $this->memoryCache->get($key); - - if ($result === null) { - $result = $this->applicationAuthorization->isAllowed($controller, $action, $this->userSession->getRole()); - $this->memoryCache->set($key, $result); - } - - return $result; - } - - /** - * Check project access - * - * @param string $controller - * @param string $action - * @param integer $project_id - * @return bool - */ - public function hasProjectAccess($controller, $action, $project_id) - { - if ($this->userSession->isAdmin()) { - return true; - } - - if (! $this->hasAccess($controller, $action)) { - return false; - } - - $key = 'project_access:'.$controller.$action.$project_id; - $result = $this->memoryCache->get($key); - - if ($result === null) { - $role = $this->getProjectUserRole($project_id); - $result = $this->projectAuthorization->isAllowed($controller, $action, $role); - $this->memoryCache->set($key, $result); - } - - return $result; - } - - /** - * Get project role for the current user - * - * @access public - * @param integer $project_id - * @return string - */ - public function getProjectUserRole($project_id) - { - return $this->memoryCache->proxy($this->projectUserRole, 'getUserRole', $project_id, $this->userSession->getId()); - } - - /** - * Return the user full name - * - * @param array $user User properties - * @return string - */ - public function getFullname(array $user = array()) - { - return $this->user->getFullname(empty($user) ? $this->sessionStorage->user : $user); - } - - /** - * Display gravatar image - * - * @access public - * @param string $email - * @param string $alt - * @return string - */ - public function avatar($email, $alt = '') - { - if (! empty($email) && $this->config->get('integration_gravatar') == 1) { - return ''.$this->helper->e($alt).''; - } - - return ''; - } -} diff --git a/app/Helper/UserHelper.php b/app/Helper/UserHelper.php new file mode 100644 index 00000000..cbdb4af8 --- /dev/null +++ b/app/Helper/UserHelper.php @@ -0,0 +1,178 @@ +userUnreadNotification->hasNotifications($this->userSession->getId()); + } + + /** + * Get initials from a user + * + * @access public + * @param string $name + * @return string + */ + public function getInitials($name) + { + $initials = ''; + + foreach (explode(' ', $name) as $string) { + $initials .= mb_substr($string, 0, 1); + } + + return mb_strtoupper($initials); + } + + /** + * Get user id + * + * @access public + * @return integer + */ + public function getId() + { + return $this->userSession->getId(); + } + + /** + * Check if the given user_id is the connected user + * + * @param integer $user_id User id + * @return boolean + */ + public function isCurrentUser($user_id) + { + return $this->userSession->getId() == $user_id; + } + + /** + * Return if the logged user is admin + * + * @access public + * @return boolean + */ + public function isAdmin() + { + return $this->userSession->isAdmin(); + } + + /** + * Get role name + * + * @access public + * @param string $role + * @return string + */ + public function getRoleName($role = '') + { + return $this->role->getRoleName($role ?: $this->userSession->getRole()); + } + + /** + * Check application access + * + * @param string $controller + * @param string $action + * @return bool + */ + public function hasAccess($controller, $action) + { + $key = 'app_access:'.$controller.$action; + $result = $this->memoryCache->get($key); + + if ($result === null) { + $result = $this->applicationAuthorization->isAllowed($controller, $action, $this->userSession->getRole()); + $this->memoryCache->set($key, $result); + } + + return $result; + } + + /** + * Check project access + * + * @param string $controller + * @param string $action + * @param integer $project_id + * @return bool + */ + public function hasProjectAccess($controller, $action, $project_id) + { + if ($this->userSession->isAdmin()) { + return true; + } + + if (! $this->hasAccess($controller, $action)) { + return false; + } + + $key = 'project_access:'.$controller.$action.$project_id; + $result = $this->memoryCache->get($key); + + if ($result === null) { + $role = $this->getProjectUserRole($project_id); + $result = $this->projectAuthorization->isAllowed($controller, $action, $role); + $this->memoryCache->set($key, $result); + } + + return $result; + } + + /** + * Get project role for the current user + * + * @access public + * @param integer $project_id + * @return string + */ + public function getProjectUserRole($project_id) + { + return $this->memoryCache->proxy($this->projectUserRole, 'getUserRole', $project_id, $this->userSession->getId()); + } + + /** + * Return the user full name + * + * @param array $user User properties + * @return string + */ + public function getFullname(array $user = array()) + { + return $this->user->getFullname(empty($user) ? $this->sessionStorage->user : $user); + } + + /** + * Display gravatar image + * + * @access public + * @param string $email + * @param string $alt + * @return string + */ + public function avatar($email, $alt = '') + { + if (! empty($email) && $this->config->get('integration_gravatar') == 1) { + return ''.$this->helper->text->e($alt).''; + } + + return ''; + } +} diff --git a/app/ServiceProvider/ClassProvider.php b/app/ServiceProvider/ClassProvider.php index f939a9b5..b883c905 100644 --- a/app/ServiceProvider/ClassProvider.php +++ b/app/ServiceProvider/ClassProvider.php @@ -117,9 +117,7 @@ class ClassProvider implements ServiceProviderInterface ), 'Core' => array( 'DateParser', - 'Helper', 'Lexer', - 'Template', ), 'Core\Event' => array( 'EventManager', diff --git a/app/ServiceProvider/HelperProvider.php b/app/ServiceProvider/HelperProvider.php new file mode 100644 index 00000000..42a0c85e --- /dev/null +++ b/app/ServiceProvider/HelperProvider.php @@ -0,0 +1,34 @@ +register('app', '\Kanboard\Helper\AppHelper'); + $container['helper']->register('asset', '\Kanboard\Helper\AssetHelper'); + $container['helper']->register('board', '\Kanboard\Helper\BoardHelper'); + $container['helper']->register('dt', '\Kanboard\Helper\DateHelper'); + $container['helper']->register('file', '\Kanboard\Helper\FileHelper'); + $container['helper']->register('form', '\Kanboard\Helper\FormHelper'); + $container['helper']->register('hook', '\Kanboard\Helper\HookHelper'); + $container['helper']->register('layout', '\Kanboard\Helper\LayoutHelper'); + $container['helper']->register('model', '\Kanboard\Helper\ModelHelper'); + $container['helper']->register('subtask', '\Kanboard\Helper\SubtaskHelper'); + $container['helper']->register('task', '\Kanboard\Helper\TaskHelper'); + $container['helper']->register('text', '\Kanboard\Helper\TextHelper'); + $container['helper']->register('url', '\Kanboard\Helper\UrlHelper'); + $container['helper']->register('user', '\Kanboard\Helper\UserHelper'); + + $container['template'] = new Template($container['helper']); + + return $container; + } +} diff --git a/app/Template/action/index.php b/app/Template/action/index.php index 66cfed77..f3165251 100644 --- a/app/Template/action/index.php +++ b/app/Template/action/index.php @@ -45,7 +45,7 @@ text->contains($param_name, 'link_id')): ?> text->in($param_value, $links_list) ?> - e($param_value) ?> + text->e($param_value) ?> diff --git a/app/Template/analytic/avg_time_columns.php b/app/Template/analytic/avg_time_columns.php index 7b9d7cf9..5f6c6b35 100644 --- a/app/Template/analytic/avg_time_columns.php +++ b/app/Template/analytic/avg_time_columns.php @@ -16,7 +16,7 @@ - e($column['title']) ?> + text->e($column['title']) ?> dt->duration($column['average']) ?> diff --git a/app/Template/analytic/compare_hours.php b/app/Template/analytic/compare_hours.php index bb145d61..8249e7ba 100644 --- a/app/Template/analytic/compare_hours.php +++ b/app/Template/analytic/compare_hours.php @@ -4,8 +4,8 @@
@@ -34,10 +34,10 @@ getCollection() as $task): ?> - url->link('#'.$this->e($task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> + url->link('#'.$this->text->e($task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> - url->link($this->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> + url->link($this->text->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> @@ -47,10 +47,10 @@ - e($task['time_estimated']) ?> + text->e($task['time_estimated']) ?> - e($task['time_spent']) ?> + text->e($task['time_spent']) ?> diff --git a/app/Template/analytic/tasks.php b/app/Template/analytic/tasks.php index 7392ee56..9e7b1fd7 100644 --- a/app/Template/analytic/tasks.php +++ b/app/Template/analytic/tasks.php @@ -18,7 +18,7 @@ - e($metric['column_title']) ?> + text->e($metric['column_title']) ?> diff --git a/app/Template/analytic/users.php b/app/Template/analytic/users.php index 514d7133..9d1d3a1e 100644 --- a/app/Template/analytic/users.php +++ b/app/Template/analytic/users.php @@ -18,7 +18,7 @@ - e($metric['user']) ?> + text->e($metric['user']) ?> diff --git a/app/Template/app/projects.php b/app/Template/app/projects.php index 61899c96..668b87c3 100644 --- a/app/Template/app/projects.php +++ b/app/Template/app/projects.php @@ -29,9 +29,9 @@ url->link('', 'listing', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('List')) ?>  url->link('', 'calendar', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Calendar')) ?>  - url->link($this->e($project['name']), 'board', 'show', array('project_id' => $project['id'])) ?> + url->link($this->text->e($project['name']), 'board', 'show', array('project_id' => $project['id'])) ?> - '> + '> @@ -39,7 +39,7 @@ - e($column['title']) ?> + text->e($column['title']) ?> diff --git a/app/Template/app/sidebar.php b/app/Template/app/sidebar.php index 3f0d988b..66d15b14 100644 --- a/app/Template/app/sidebar.php +++ b/app/Template/app/sidebar.php @@ -1,5 +1,5 @@
-

e($user['name'] ?: $user['username']) ?>

+

text->e($user['name'] ?: $user['username']) ?>

  • app->checkMenuSelection('app', 'index') ?>> url->link(t('Overview'), 'app', 'index', array('user_id' => $user['id'])) ?> diff --git a/app/Template/app/subtasks.php b/app/Template/app/subtasks.php index 6848112c..cca09481 100644 --- a/app/Template/app/subtasks.php +++ b/app/Template/app/subtasks.php @@ -18,21 +18,21 @@ render('task/dropdown', array('task' => array('id' => $subtask['task_id'], 'project_id' => $subtask['project_id']))) ?> - url->link($this->e($subtask['project_name']), 'board', 'show', array('project_id' => $subtask['project_id'])) ?> + url->link($this->text->e($subtask['project_name']), 'board', 'show', array('project_id' => $subtask['project_id'])) ?> - url->link($this->e($subtask['task_name']), 'task', 'show', array('task_id' => $subtask['task_id'], 'project_id' => $subtask['project_id'])) ?> + url->link($this->text->e($subtask['task_name']), 'task', 'show', array('task_id' => $subtask['task_id'], 'project_id' => $subtask['project_id'])) ?> subtask->toggleStatus($subtask, $subtask['project_id']) ?> - e($subtask['time_spent']).'h' ?> + text->e($subtask['time_spent']).'h' ?> - e($subtask['time_estimated']).'h' ?> + text->e($subtask['time_estimated']).'h' ?> diff --git a/app/Template/app/tasks.php b/app/Template/app/tasks.php index 786d7159..d7826fb7 100644 --- a/app/Template/app/tasks.php +++ b/app/Template/app/tasks.php @@ -18,18 +18,18 @@ render('task/dropdown', array('task' => $task)) ?> - url->link($this->e($task['project_name']), 'board', 'show', array('project_id' => $task['project_id'])) ?> + url->link($this->text->e($task['project_name']), 'board', 'show', array('project_id' => $task['project_id'])) ?> - url->link($this->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> + url->link($this->text->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> - e($task['time_spent']).'h' ?> + text->e($task['time_spent']).'h' ?> - e($task['time_estimated']).'h' ?> + text->e($task['time_estimated']).'h' ?> diff --git a/app/Template/auth/index.php b/app/Template/auth/index.php index 41441e69..3fcb6bbf 100644 --- a/app/Template/auth/index.php +++ b/app/Template/auth/index.php @@ -3,7 +3,7 @@ hook->render('template:auth:login-form:before') ?> -

    e($errors['login']) ?>

    +

    text->e($errors['login']) ?>

    diff --git a/app/Template/board/table_column.php b/app/Template/board/table_column.php index 58dcaf32..48538c88 100644 --- a/app/Template/board/table_column.php +++ b/app/Template/board/table_column.php @@ -26,10 +26,10 @@ - e($column['title']) ?> + text->e($column['title']) ?> - e($column['title']) ?> + text->e($column['title']) ?>
    • @@ -47,7 +47,7 @@ - '> + '>   @@ -60,7 +60,7 @@ - (/e($column['task_limit']) ?>) + (/text->e($column['task_limit']) ?>) diff --git a/app/Template/board/table_swimlane.php b/app/Template/board/table_swimlane.php index 44607859..349b9acb 100644 --- a/app/Template/board/table_swimlane.php +++ b/app/Template/board/table_swimlane.php @@ -8,7 +8,7 @@ - e($swimlane['name']) ?> + text->e($swimlane['name']) ?>
      - e($column['title']) ?> + text->e($column['title']) ?>
diff --git a/app/Template/board/task_footer.php b/app/Template/board/task_footer.php index 73e68602..d8b21a5b 100644 --- a/app/Template/board/task_footer.php +++ b/app/Template/board/task_footer.php @@ -2,10 +2,10 @@
- e($task['category_name']) ?> + text->e($task['category_name']) ?> url->link( - $this->e($task['category_name']), + $this->text->e($task['category_name']), 'boardPopover', 'changeCategory', array('task_id' => $task['id'], 'project_id' => $task['project_id']), @@ -61,11 +61,11 @@ - e($task['score']) ?> + text->e($task['score']) ?> - e($task['time_estimated']).'h' ?> + text->e($task['time_estimated']).'h' ?> diff --git a/app/Template/board/task_private.php b/app/Template/board/task_private.php index 4880af00..50efe2f6 100644 --- a/app/Template/board/task_private.php +++ b/app/Template/board/task_private.php @@ -23,11 +23,11 @@ - - e($this->user->getInitials($task['assignee_name'] ?: $task['assignee_username'])) ?> + + text->e($this->user->getInitials($task['assignee_name'] ?: $task['assignee_username'])) ?> - - url->link($this->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-collapsed-title tooltip', $this->e($task['title'])) ?> + url->link($this->text->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-collapsed-title tooltip', $this->text->e($task['title'])) ?>
@@ -57,7 +57,7 @@ t('Change assignee') ) ?> - e($task['assignee_name'] ?: $task['assignee_username']) ?> + text->e($task['assignee_name'] ?: $task['assignee_username']) ?> @@ -72,7 +72,7 @@
- url->link($this->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> + url->link($this->text->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
render('board/task_footer', array( diff --git a/app/Template/board/task_public.php b/app/Template/board/task_public.php index d02722bb..9058f897 100644 --- a/app/Template/board/task_public.php +++ b/app/Template/board/task_public.php @@ -19,7 +19,7 @@
- url->link($this->e($task['title']), 'task', 'readonly', array('task_id' => $task['id'], 'token' => $project['token'])) ?> + url->link($this->text->e($task['title']), 'task', 'readonly', array('task_id' => $task['id'], 'token' => $project['token'])) ?>
render('board/task_footer', array( diff --git a/app/Template/board/tooltip_comments.php b/app/Template/board/tooltip_comments.php index ca91e13f..6665bc7d 100644 --- a/app/Template/board/tooltip_comments.php +++ b/app/Template/board/tooltip_comments.php @@ -2,7 +2,7 @@

- e($comment['name'] ?: $comment['username']) ?> @ + text->e($comment['name'] ?: $comment['username']) ?> @ dt->datetime($comment['date_creation']) ?>

diff --git a/app/Template/board/tooltip_external_links.php b/app/Template/board/tooltip_external_links.php index 7681c06c..24cd1d88 100644 --- a/app/Template/board/tooltip_external_links.php +++ b/app/Template/board/tooltip_external_links.php @@ -10,10 +10,10 @@ - e($link['title']) ?> + text->e($link['title']) ?> - e($link['dependency_label']) ?> + text->e($link['dependency_label']) ?> diff --git a/app/Template/board/tooltip_files.php b/app/Template/board/tooltip_files.php index 4fa14b57..39823757 100644 --- a/app/Template/board/tooltip_files.php +++ b/app/Template/board/tooltip_files.php @@ -3,7 +3,7 @@ - e($file['name']) ?> + text->e($file['name']) ?> diff --git a/app/Template/board/tooltip_subtasks.php b/app/Template/board/tooltip_subtasks.php index dc076d26..126a319f 100644 --- a/app/Template/board/tooltip_subtasks.php +++ b/app/Template/board/tooltip_subtasks.php @@ -6,7 +6,7 @@ - e($subtask['name'] ?: $subtask['username']) ?> + text->e($subtask['name'] ?: $subtask['username']) ?> diff --git a/app/Template/board/tooltip_tasklinks.php b/app/Template/board/tooltip_tasklinks.php index b51f90ed..cabe43d8 100644 --- a/app/Template/board/tooltip_tasklinks.php +++ b/app/Template/board/tooltip_tasklinks.php @@ -6,13 +6,13 @@
task->getProgress($link).'%' ?> url->link( - $this->e('#'.$link['task_id'].' '.$link['title']), + $this->text->e('#'.$link['task_id'].' '.$link['title']), 'task', 'show', array('task_id' => $link['task_id'], 'project_id' => $link['project_id']), false, $link['is_active'] ? '' : 'task-link-closed' ) ?> - [e($link['task_assignee_name'] ?: $link['task_assignee_username']) ?>] + [text->e($link['task_assignee_name'] ?: $link['task_assignee_username']) ?>] () diff --git a/app/Template/category/index.php b/app/Template/category/index.php index e99b6d52..7b1adf78 100644 --- a/app/Template/category/index.php +++ b/app/Template/category/index.php @@ -9,7 +9,7 @@ $category_name): ?> - e($category_name) ?> + text->e($category_name) ?>
diff --git a/app/Template/column/index.php b/app/Template/column/index.php index 1aa44688..eef176f3 100644 --- a/app/Template/column/index.php +++ b/app/Template/column/index.php @@ -26,15 +26,15 @@ - e($column['title']) ?> + text->e($column['title']) ?> - '> + '> - e($column['task_limit']) ?> + text->e($column['task_limit']) ?>
diff --git a/app/Template/comment/show.php b/app/Template/comment/show.php index 2c9b426f..873e1470 100644 --- a/app/Template/comment/show.php +++ b/app/Template/comment/show.php @@ -6,7 +6,7 @@ - e($comment['name'] ?: $comment['username']) ?> @ + text->e($comment['name'] ?: $comment['username']) ?> @ dt->datetime($comment['date_creation']) ?> diff --git a/app/Template/config/about.php b/app/Template/config/about.php index f8534029..968b109a 100644 --- a/app/Template/config/about.php +++ b/app/Template/config/about.php @@ -29,7 +29,7 @@
  • - e(DB_DRIVER) ?> + text->e(DB_DRIVER) ?>
  • diff --git a/app/Template/config/api.php b/app/Template/config/api.php index 489f1968..3ebbb956 100644 --- a/app/Template/config/api.php +++ b/app/Template/config/api.php @@ -5,7 +5,7 @@
    • - e($values['api_token']) ?> + text->e($values['api_token']) ?>
    • diff --git a/app/Template/config/plugins.php b/app/Template/config/plugins.php index 4a263ce7..04b3f095 100644 --- a/app/Template/config/plugins.php +++ b/app/Template/config/plugins.php @@ -17,14 +17,14 @@ getPluginHomepage()): ?> - e($plugin->getPluginName()) ?> + text->e($plugin->getPluginName()) ?> - e($plugin->getPluginName()) ?> + text->e($plugin->getPluginName()) ?> - e($plugin->getPluginAuthor()) ?> - e($plugin->getPluginVersion()) ?> - e($plugin->getPluginDescription()) ?> + text->e($plugin->getPluginAuthor()) ?> + text->e($plugin->getPluginVersion()) ?> + text->e($plugin->getPluginDescription()) ?> \ No newline at end of file diff --git a/app/Template/config/webhook.php b/app/Template/config/webhook.php index f1a98f8b..bcf95787 100644 --- a/app/Template/config/webhook.php +++ b/app/Template/config/webhook.php @@ -22,7 +22,7 @@
      • - e($values['webhook_token']) ?> + text->e($values['webhook_token']) ?>
      • diff --git a/app/Template/currency/index.php b/app/Template/currency/index.php index 07b58a8b..f3e20026 100644 --- a/app/Template/currency/index.php +++ b/app/Template/currency/index.php @@ -12,7 +12,7 @@ - e($rate['currency']) ?> + text->e($rate['currency']) ?> diff --git a/app/Template/custom_filter/index.php b/app/Template/custom_filter/index.php index 28b6a878..12a4eece 100644 --- a/app/Template/custom_filter/index.php +++ b/app/Template/custom_filter/index.php @@ -14,8 +14,8 @@ - e($filter['name']) ?> - e($filter['filter']) ?> + text->e($filter['name']) ?> + text->e($filter['filter']) ?> @@ -30,7 +30,7 @@ - e($filter['owner_name'] ?: $filter['owner_username']) ?> + text->e($filter['owner_name'] ?: $filter['owner_username']) ?> user->getId() || $this->user->hasProjectAccess('customfilter', 'edit', $project['id'])): ?>
        diff --git a/app/Template/event/comment_create.php b/app/Template/event/comment_create.php index 462f15ca..063736b3 100644 --- a/app/Template/event/comment_create.php +++ b/app/Template/event/comment_create.php @@ -2,11 +2,11 @@

        e($author), + $this->text->e($author), $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ) ?>

        - e($task['title']) ?>
        + text->e($task['title']) ?>
        text->markdown($comment['comment']) ?>
        \ No newline at end of file diff --git a/app/Template/event/comment_update.php b/app/Template/event/comment_update.php index 0cb10bf6..93f24d8a 100644 --- a/app/Template/event/comment_update.php +++ b/app/Template/event/comment_update.php @@ -2,10 +2,10 @@

        e($author), + $this->text->e($author), $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ) ?>

        - e($task['title']) ?>
        + text->e($task['title']) ?>
        \ No newline at end of file diff --git a/app/Template/event/subtask_create.php b/app/Template/event/subtask_create.php index ca23aa9c..532783d5 100644 --- a/app/Template/event/subtask_create.php +++ b/app/Template/event/subtask_create.php @@ -2,16 +2,16 @@

        e($author), + $this->text->e($author), $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ) ?>

        -

        e($task['title']) ?>

        +

        text->e($task['title']) ?>

        • - e($subtask['title']) ?> (e($subtask['status_name']) ?>) + text->e($subtask['title']) ?> (text->e($subtask['status_name']) ?>)
        • diff --git a/app/Template/event/subtask_update.php b/app/Template/event/subtask_update.php index 11a778de..e9ff6ac6 100644 --- a/app/Template/event/subtask_update.php +++ b/app/Template/event/subtask_update.php @@ -2,16 +2,16 @@

          e($author), + $this->text->e($author), $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ) ?>

          -

          e($task['title']) ?>

          +

          text->e($task['title']) ?>

          • - e($subtask['title']) ?> (e($subtask['status_name']) ?>) + text->e($subtask['title']) ?> (text->e($subtask['status_name']) ?>)
          • diff --git a/app/Template/event/task_assignee_change.php b/app/Template/event/task_assignee_change.php index cdec8743..580176c7 100644 --- a/app/Template/event/task_assignee_change.php +++ b/app/Template/event/task_assignee_change.php @@ -5,14 +5,14 @@ e($author), + $this->text->e($author), $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), - $this->e($assignee) + $this->text->e($assignee) ) ?> - e($author), $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))) ?> + text->e($author), $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))) ?>

            - e($task['title']) ?> + text->e($task['title']) ?>

            \ No newline at end of file diff --git a/app/Template/event/task_close.php b/app/Template/event/task_close.php index 3d8670a6..361458d3 100644 --- a/app/Template/event/task_close.php +++ b/app/Template/event/task_close.php @@ -2,10 +2,10 @@

            e($author), + $this->text->e($author), $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ) ?>

            - e($task['title']) ?> + text->e($task['title']) ?>

            \ No newline at end of file diff --git a/app/Template/event/task_create.php b/app/Template/event/task_create.php index 773f401c..655bf8f3 100644 --- a/app/Template/event/task_create.php +++ b/app/Template/event/task_create.php @@ -2,10 +2,10 @@

            e($author), + $this->text->e($author), $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ) ?>

            - e($task['title']) ?> + text->e($task['title']) ?>

            \ No newline at end of file diff --git a/app/Template/event/task_file_create.php b/app/Template/event/task_file_create.php index 1a36bc8f..61bf3d61 100644 --- a/app/Template/event/task_file_create.php +++ b/app/Template/event/task_file_create.php @@ -2,10 +2,10 @@

            e($author), + $this->text->e($author), $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ) ?>

            - e($file['name']) ?> + text->e($file['name']) ?>

            \ No newline at end of file diff --git a/app/Template/event/task_move_column.php b/app/Template/event/task_move_column.php index ca482e46..904c956c 100644 --- a/app/Template/event/task_move_column.php +++ b/app/Template/event/task_move_column.php @@ -2,11 +2,11 @@

            e($author), + $this->text->e($author), $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), - $this->e($task['column_title']) + $this->text->e($task['column_title']) ) ?>

            - e($task['title']) ?> + text->e($task['title']) ?>

            \ No newline at end of file diff --git a/app/Template/event/task_move_position.php b/app/Template/event/task_move_position.php index dcdd3e1b..6580bb79 100644 --- a/app/Template/event/task_move_position.php +++ b/app/Template/event/task_move_position.php @@ -2,12 +2,12 @@

            e($author), + $this->text->e($author), $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), $task['position'], - $this->e($task['column_title']) + $this->text->e($task['column_title']) ) ?>

            - e($task['title']) ?> + text->e($task['title']) ?>

            \ No newline at end of file diff --git a/app/Template/event/task_move_swimlane.php b/app/Template/event/task_move_swimlane.php index ca440dbf..9ffa554c 100644 --- a/app/Template/event/task_move_swimlane.php +++ b/app/Template/event/task_move_swimlane.php @@ -3,17 +3,17 @@

            e($author), + $this->text->e($author), $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ) ?> e($author), + $this->text->e($author), $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), - $this->e($task['swimlane_name']) + $this->text->e($task['swimlane_name']) ) ?>

            - e($task['title']) ?> + text->e($task['title']) ?>

            \ No newline at end of file diff --git a/app/Template/event/task_open.php b/app/Template/event/task_open.php index 11fec64b..9db2e3c9 100644 --- a/app/Template/event/task_open.php +++ b/app/Template/event/task_open.php @@ -2,10 +2,10 @@

            e($author), + $this->text->e($author), $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ) ?>

            - e($task['title']) ?> + text->e($task['title']) ?>

            \ No newline at end of file diff --git a/app/Template/event/task_update.php b/app/Template/event/task_update.php index e8254bcb..72d70495 100644 --- a/app/Template/event/task_update.php +++ b/app/Template/event/task_update.php @@ -2,12 +2,12 @@

            e($author), + $this->text->e($author), $this->url->link(t('#%d', $task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ) ?>

            - e($task['title']) ?> + text->e($task['title']) ?>

            render('task/changes', array('changes' => $changes, 'task' => $task)) ?> diff --git a/app/Template/feed/project.php b/app/Template/feed/project.php index 76cf6cf0..1c6d1166 100644 --- a/app/Template/feed/project.php +++ b/app/Template/feed/project.php @@ -15,7 +15,7 @@ - e($e['author']) ?> + text->e($e['author']) ?> - e($e['author']) ?> + text->e($e['author']) ?> -

            e($file['name']) ?>

            +

            text->e($file['name']) ?>

            - <?= $this->e($file['name']) ?> + <?= $this->text->e($file['name']) ?>
            text->markdown($content) ?> diff --git a/app/Template/group/index.php b/app/Template/group/index.php index d111b5d9..8302e5a8 100644 --- a/app/Template/group/index.php +++ b/app/Template/group/index.php @@ -21,10 +21,10 @@ # - e($group['external_id']) ?> + text->e($group['external_id']) ?> - e($group['name']) ?> + text->e($group['name']) ?>
            diff --git a/app/Template/group/users.php b/app/Template/group/users.php index f79cb9ad..bbd41525 100644 --- a/app/Template/group/users.php +++ b/app/Template/group/users.php @@ -22,13 +22,13 @@ url->link('#'.$user['id'], 'user', 'show', array('user_id' => $user['id'])) ?> - url->link($this->e($user['username']), 'user', 'show', array('user_id' => $user['id'])) ?> + url->link($this->text->e($user['username']), 'user', 'show', array('user_id' => $user['id'])) ?> - e($user['name']) ?> + text->e($user['name']) ?> - e($user['email']) ?> + text->e($user['email']) ?> url->link(t('Remove this user'), 'group', 'dissociate', array('group_id' => $group['id'], 'user_id' => $user['id'])) ?> diff --git a/app/Template/header.php b/app/Template/header.php index e646012a..d891118c 100644 --- a/app/Template/header.php +++ b/app/Template/header.php @@ -5,10 +5,10 @@ url->link('KB', 'app', 'index', array(), false, '', t('Dashboard')) ?> - e($title) ?> + text->e($title) ?> - + @@ -26,7 +26,7 @@ data-redirect-url="url->href('board', 'show', array('project_id' => 'PROJECT_ID')) ?>"> $board_name): ?> - +
            • @@ -60,7 +60,7 @@
              -
            • e($this->user->getFullname()) ?>
              • +
            • text->e($this->user->getFullname()) ?>
            • url->link(t('My dashboard'), 'app', 'index', array('user_id' => $this->user->getId())) ?> diff --git a/app/Template/layout.php b/app/Template/layout.php index 0c81aac2..a694a96a 100644 --- a/app/Template/layout.php +++ b/app/Template/layout.php @@ -30,7 +30,7 @@ - <?= isset($title) ? $this->e($title) : 'Kanboard' ?> + <?= isset($title) ? $this->text->e($title) : 'Kanboard' ?> hook->render('template:layout:head') ?> diff --git a/app/Template/listing/show.php b/app/Template/listing/show.php index 9a5992e3..10dcedcc 100644 --- a/app/Template/listing/show.php +++ b/app/Template/listing/show.php @@ -27,20 +27,20 @@ render('task/dropdown', array('task' => $task)) ?> - e($task['swimlane_name'] ?: $task['default_swimlane']) ?> + text->e($task['swimlane_name'] ?: $task['default_swimlane']) ?> - e($task['column_name']) ?> + text->e($task['column_name']) ?> - e($task['category_name']) ?> + text->e($task['category_name']) ?> - url->link($this->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> + url->link($this->text->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> - e($task['assignee_name'] ?: $task['assignee_username']) ?> + text->e($task['assignee_name'] ?: $task['assignee_username']) ?> diff --git a/app/Template/notification/comment_create.php b/app/Template/notification/comment_create.php index 2f2c0fa6..fefc8ba1 100644 --- a/app/Template/notification/comment_create.php +++ b/app/Template/notification/comment_create.php @@ -1,4 +1,4 @@ -

              e($task['title']) ?> (#)

              +

              text->e($task['title']) ?> (#)

              diff --git a/app/Template/notification/comment_update.php b/app/Template/notification/comment_update.php index a15e5d6d..2477d8b3 100644 --- a/app/Template/notification/comment_update.php +++ b/app/Template/notification/comment_update.php @@ -1,4 +1,4 @@ -

              e($task['title']) ?> (#)

              +

              text->e($task['title']) ?> (#)

              diff --git a/app/Template/notification/comment_user_mention.php b/app/Template/notification/comment_user_mention.php index 59f5127e..372183df 100644 --- a/app/Template/notification/comment_user_mention.php +++ b/app/Template/notification/comment_user_mention.php @@ -1,6 +1,6 @@

              -

              e($task['title']) ?>

              +

              text->e($task['title']) ?>

              text->markdown($comment['comment']) ?> diff --git a/app/Template/notification/subtask_create.php b/app/Template/notification/subtask_create.php index e1c62b73..f6f8ba13 100644 --- a/app/Template/notification/subtask_create.php +++ b/app/Template/notification/subtask_create.php @@ -1,15 +1,15 @@ -

              e($task['title']) ?> (#)

              +

              text->e($task['title']) ?> (#)

                -
              • e($subtask['title']) ?>
                • -
              • e($subtask['status_name']) ?>
                • -
              • e($subtask['name'] ?: $subtask['username'] ?: '?') ?>
                • +
              • text->e($subtask['title']) ?>
                • +
              • text->e($subtask['status_name']) ?>
                • +
              • text->e($subtask['name'] ?: $subtask['username'] ?: '?') ?>
              • - e($subtask['time_estimated']).'h' ?> + text->e($subtask['time_estimated']).'h' ?>
              diff --git a/app/Template/notification/subtask_update.php b/app/Template/notification/subtask_update.php index cfde9db6..e6785f2c 100644 --- a/app/Template/notification/subtask_update.php +++ b/app/Template/notification/subtask_update.php @@ -1,19 +1,19 @@ -

              e($task['title']) ?> (#)

              +

              text->e($task['title']) ?> (#)

                -
              • e($subtask['title']) ?>
                • -
              • e($subtask['status_name']) ?>
                • -
              • e($subtask['name'] ?: $subtask['username'] ?: '?') ?>
                • +
              • text->e($subtask['title']) ?>
                • +
              • text->e($subtask['status_name']) ?>
                • +
              • text->e($subtask['name'] ?: $subtask['username'] ?: '?') ?>
              • - e($subtask['time_spent']).'h' ?> + text->e($subtask['time_spent']).'h' ?> - e($subtask['time_estimated']).'h' ?> + text->e($subtask['time_estimated']).'h' ?>
              diff --git a/app/Template/notification/task_assignee_change.php b/app/Template/notification/task_assignee_change.php index c9729ac9..53f7c5c1 100644 --- a/app/Template/notification/task_assignee_change.php +++ b/app/Template/notification/task_assignee_change.php @@ -1,4 +1,4 @@ -

              e($task['title']) ?> (#)

              +

              text->e($task['title']) ?> (#)

              • diff --git a/app/Template/notification/task_close.php b/app/Template/notification/task_close.php index 463223a0..4202e092 100644 --- a/app/Template/notification/task_close.php +++ b/app/Template/notification/task_close.php @@ -1,4 +1,4 @@ -

                e($task['title']) ?> (#)

                +

                text->e($task['title']) ?> (#)

                diff --git a/app/Template/notification/task_create.php b/app/Template/notification/task_create.php index fb7898fc..3cd68ac0 100644 --- a/app/Template/notification/task_create.php +++ b/app/Template/notification/task_create.php @@ -1,4 +1,4 @@ -

                e($task['title']) ?> (#)

                +

                text->e($task['title']) ?> (#)

                • @@ -25,12 +25,12 @@
                • - e($task['column_title']) ?> + text->e($task['column_title']) ?>
                  • -
                • e($task['position']) ?>
                  • +
                • text->e($task['position']) ?>
                • - e($task['category_name']) ?> + text->e($task['category_name']) ?>
                diff --git a/app/Template/notification/task_file_create.php b/app/Template/notification/task_file_create.php index 63f7d1b8..feab8dd2 100644 --- a/app/Template/notification/task_file_create.php +++ b/app/Template/notification/task_file_create.php @@ -1,4 +1,4 @@ -

                e($task['title']) ?> (#)

                +

                text->e($task['title']) ?> (#)

                diff --git a/app/Template/notification/task_move_column.php b/app/Template/notification/task_move_column.php index 88ab8ab5..263adebf 100644 --- a/app/Template/notification/task_move_column.php +++ b/app/Template/notification/task_move_column.php @@ -1,11 +1,11 @@ -

                e($task['title']) ?> (#)

                +

                text->e($task['title']) ?> (#)

                • - e($task['column_title']) ?> + text->e($task['column_title']) ?>
                  • -
                • e($task['position']) ?>
                  • +
                • text->e($task['position']) ?>
                render('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?> \ No newline at end of file diff --git a/app/Template/notification/task_move_position.php b/app/Template/notification/task_move_position.php index 88ab8ab5..263adebf 100644 --- a/app/Template/notification/task_move_position.php +++ b/app/Template/notification/task_move_position.php @@ -1,11 +1,11 @@ -

                e($task['title']) ?> (#)

                +

                text->e($task['title']) ?> (#)

                • - e($task['column_title']) ?> + text->e($task['column_title']) ?>
                  • -
                • e($task['position']) ?>
                  • +
                • text->e($task['position']) ?>
                render('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?> \ No newline at end of file diff --git a/app/Template/notification/task_move_swimlane.php b/app/Template/notification/task_move_swimlane.php index 04de7cc6..cbbd620d 100644 --- a/app/Template/notification/task_move_swimlane.php +++ b/app/Template/notification/task_move_swimlane.php @@ -1,4 +1,4 @@ -

                e($task['title']) ?> (#)

                +

                text->e($task['title']) ?> (#)

                • @@ -6,14 +6,14 @@ - e($task['swimlane_name']) ?> + text->e($task['swimlane_name']) ?>
                • - e($task['column_title']) ?> + text->e($task['column_title']) ?>
                  • -
                • e($task['position']) ?>
                  • +
                • text->e($task['position']) ?>
                render('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?> \ No newline at end of file diff --git a/app/Template/notification/task_open.php b/app/Template/notification/task_open.php index cb02a79c..6eb4ec08 100644 --- a/app/Template/notification/task_open.php +++ b/app/Template/notification/task_open.php @@ -1,4 +1,4 @@ -

                e($task['title']) ?> (#)

                +

                text->e($task['title']) ?> (#)

                diff --git a/app/Template/notification/task_overdue.php b/app/Template/notification/task_overdue.php index d7e6ff5a..ac0665a2 100644 --- a/app/Template/notification/task_overdue.php +++ b/app/Template/notification/task_overdue.php @@ -5,9 +5,9 @@
              • (#) - e($task['title']) ?> + text->e($task['title']) ?> - e($task['title']) ?> + text->e($task['title']) ?> (dt->date($task['date_due']) ?>) diff --git a/app/Template/notification/task_update.php b/app/Template/notification/task_update.php index 54f5c6d1..8adb2553 100644 --- a/app/Template/notification/task_update.php +++ b/app/Template/notification/task_update.php @@ -1,4 +1,4 @@ -

                e($task['title']) ?> (#)

                +

                text->e($task['title']) ?> (#)

                render('task/changes', array('changes' => $changes, 'task' => $task)) ?> render('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?> \ No newline at end of file diff --git a/app/Template/notification/task_user_mention.php b/app/Template/notification/task_user_mention.php index 40ddddca..3d8c8e95 100644 --- a/app/Template/notification/task_user_mention.php +++ b/app/Template/notification/task_user_mention.php @@ -1,5 +1,5 @@

                -

                e($task['title']) ?>

                +

                text->e($task['title']) ?>

                text->markdown($task['description']) ?> diff --git a/app/Template/project/index.php b/app/Template/project/index.php index 8d384e58..10d4aaa2 100644 --- a/app/Template/project/index.php +++ b/app/Template/project/index.php @@ -49,12 +49,12 @@ - '> + '> - url->link($this->e($project['name']), 'project', 'show', array('project_id' => $project['id'])) ?> + url->link($this->text->e($project['name']), 'project', 'show', array('project_id' => $project['id'])) ?> dt->date($project['start_date']) ?> @@ -64,7 +64,7 @@ 0): ?> - e($project['owner_name'] ?: $project['owner_username']) ?> + text->e($project['owner_name'] ?: $project['owner_username']) ?> user->hasAccess('projectuser', 'managers')): ?> @@ -76,7 +76,7 @@ - e($column['title']) ?> + text->e($column['title']) ?> diff --git a/app/Template/project/show.php b/app/Template/project/show.php index 166b8902..42eeec4d 100644 --- a/app/Template/project/show.php +++ b/app/Template/project/show.php @@ -5,7 +5,7 @@
                • 0): ?> -
              • e($project['owner_name'] ?: $project['owner_username']) ?>
                • +
              • text->e($project['owner_name'] ?: $project['owner_username']) ?>
                • @@ -61,9 +61,9 @@ - e($column['title']) ?> + text->e($column['title']) ?> - '> + '> diff --git a/app/Template/project_file/remove.php b/app/Template/project_file/remove.php index 4f0ba465..ba834288 100644 --- a/app/Template/project_file/remove.php +++ b/app/Template/project_file/remove.php @@ -4,7 +4,7 @@

                - e($file['name'])) ?> + text->e($file['name'])) ?>

                diff --git a/app/Template/project_header/search.php b/app/Template/project_header/search.php index 2b2a2c39..42216352 100644 --- a/app/Template/project_header/search.php +++ b/app/Template/project_header/search.php @@ -12,7 +12,7 @@
                @@ -24,7 +24,7 @@
                @@ -36,7 +36,7 @@
            diff --git a/app/Template/project_overview/columns.php b/app/Template/project_overview/columns.php index 870d753f..cc5782bd 100644 --- a/app/Template/project_overview/columns.php +++ b/app/Template/project_overview/columns.php @@ -2,7 +2,7 @@

            - e($column['title']) ?> + text->e($column['title']) ?>
          diff --git a/app/Template/project_overview/description.php b/app/Template/project_overview/description.php index 4137bf9f..cd6e2450 100644 --- a/app/Template/project_overview/description.php +++ b/app/Template/project_overview/description.php @@ -1,6 +1,6 @@
          -

          e($project['name']) ?>

          +

          text->e($project['name']) ?>

          text->markdown($project['description']) ?> diff --git a/app/Template/project_overview/files.php b/app/Template/project_overview/files.php index 7eb8c762..605431ed 100644 --- a/app/Template/project_overview/files.php +++ b/app/Template/project_overview/files.php @@ -18,11 +18,11 @@
          - <?= $this->e($file['name']) ?> + <?= $this->text->e($file['name']) ?>
          - e($file['name']) ?> + text->e($file['name']) ?>
          • @@ -62,7 +62,7 @@
            - e($file['name']) ?> + text->e($file['name']) ?>
              file->getPreviewType($file['name']) !== null): ?>
            • @@ -84,7 +84,7 @@
            - e($file['user_name'] ?: $file['username']) ?> + text->e($file['user_name'] ?: $file['username']) ?> dt->date($file['date']) ?> diff --git a/app/Template/project_overview/information.php b/app/Template/project_overview/information.php index 12a1317d..95508d98 100644 --- a/app/Template/project_overview/information.php +++ b/app/Template/project_overview/information.php @@ -4,7 +4,7 @@
              0): ?> -
            • e($project['owner_name'] ?: $project['owner_username']) ?>
              • +
            • text->e($project['owner_name'] ?: $project['owner_username']) ?>
              • diff --git a/app/Template/project_permission/index.php b/app/Template/project_permission/index.php index 5f0edc2b..6135ad9d 100644 --- a/app/Template/project_permission/index.php +++ b/app/Template/project_permission/index.php @@ -19,7 +19,7 @@ - e($user['name'] ?: $user['username']) ?> + text->e($user['name'] ?: $user['username']) ?> form->select( 'role-'.$user['id'], @@ -79,7 +79,7 @@ - e($group['name']) ?> + text->e($group['name']) ?> form->select( 'role-'.$group['id'], diff --git a/app/Template/project_user/layout.php b/app/Template/project_user/layout.php index 3ced5590..1103e9bc 100644 --- a/app/Template/project_user/layout.php +++ b/app/Template/project_user/layout.php @@ -19,7 +19,7 @@
              -

              e($title) ?>

              +

              text->e($title) ?>

              diff --git a/app/Template/project_user/roles.php b/app/Template/project_user/roles.php index 35d16241..17fb709b 100644 --- a/app/Template/project_user/roles.php +++ b/app/Template/project_user/roles.php @@ -10,19 +10,19 @@ getCollection() as $project): ?> - e($this->user->getFullname($project)) ?> + text->e($this->user->getFullname($project)) ?> url->link('', 'board', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Board')) ?> url->link('', 'gantt', 'project', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Gantt chart')) ?> url->link('', 'project', 'show', array('project_id' => $project['id']), false, 'dashboard-table-link', t('Project settings')) ?> - e($project['project_name']) ?> + text->e($project['project_name']) ?> - e($column['title']) ?> + text->e($column['title']) ?> diff --git a/app/Template/project_user/tasks.php b/app/Template/project_user/tasks.php index 8d1cbd96..108d3b33 100644 --- a/app/Template/project_user/tasks.php +++ b/app/Template/project_user/tasks.php @@ -14,20 +14,20 @@ getCollection() as $task): ?> - url->link('#'.$this->e($task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> + url->link('#'.$this->text->e($task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> - url->link($this->e($task['project_name']), 'board', 'show', array('project_id' => $task['project_id'])) ?> + url->link($this->text->e($task['project_name']), 'board', 'show', array('project_id' => $task['project_id'])) ?> - e($task['column_name']) ?> + text->e($task['column_name']) ?> - url->link($this->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> + url->link($this->text->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> - e($task['assignee_name'] ?: $task['assignee_username']) ?> + text->e($task['assignee_name'] ?: $task['assignee_username']) ?> diff --git a/app/Template/project_user/tooltip_users.php b/app/Template/project_user/tooltip_users.php index 7a07caad..f75d964b 100644 --- a/app/Template/project_user/tooltip_users.php +++ b/app/Template/project_user/tooltip_users.php @@ -6,7 +6,7 @@
                $user): ?> -
              • url->link($this->e($user), 'Projectuser', 'opens', array('user_id' => $user_id)) ?>
                • +
              • url->link($this->text->e($user), 'Projectuser', 'opens', array('user_id' => $user_id)) ?>
              diff --git a/app/Template/search/results.php b/app/Template/search/results.php index 3bb0e603..79df3544 100644 --- a/app/Template/search/results.php +++ b/app/Template/search/results.php @@ -13,26 +13,26 @@ getCollection() as $task): ?> - url->link($this->e($task['project_name']), 'board', 'show', array('project_id' => $task['project_id'])) ?> + url->link($this->text->e($task['project_name']), 'board', 'show', array('project_id' => $task['project_id'])) ?> - url->link('#'.$this->e($task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> + url->link('#'.$this->text->e($task['id']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> - e($task['swimlane_name'] ?: $task['default_swimlane']) ?> + text->e($task['swimlane_name'] ?: $task['default_swimlane']) ?> - e($task['column_name']) ?> + text->e($task['column_name']) ?> - e($task['category_name']) ?> + text->e($task['category_name']) ?> - url->link($this->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> + url->link($this->text->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?> - e($task['assignee_name'] ?: $task['assignee_username']) ?> + text->e($task['assignee_name'] ?: $task['assignee_username']) ?> diff --git a/app/Template/subtask/remove.php b/app/Template/subtask/remove.php index 9aef6842..374256fd 100644 --- a/app/Template/subtask/remove.php +++ b/app/Template/subtask/remove.php @@ -7,7 +7,7 @@

              -

              e($subtask['title']) ?>

              +

              text->e($subtask['title']) ?>

              url->link(t('Yes'), 'subtask', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id']), true, 'btn btn-red') ?> diff --git a/app/Template/subtask/table.php b/app/Template/subtask/table.php index 13d2c7cc..0af02dcf 100644 --- a/app/Template/subtask/table.php +++ b/app/Template/subtask/table.php @@ -26,18 +26,18 @@ - e($subtask['name'] ?: $subtask['username']) ?> + text->e($subtask['name'] ?: $subtask['username']) ?>
              • - e($subtask['time_spent']).'h' ?> + text->e($subtask['time_spent']).'h' ?> - e($subtask['time_estimated']).'h' ?> + text->e($subtask['time_estimated']).'h' ?>
                • user->getId()): ?> diff --git a/app/Template/swimlane/table.php b/app/Template/swimlane/table.php index 1e6a86bc..17be6924 100644 --- a/app/Template/swimlane/table.php +++ b/app/Template/swimlane/table.php @@ -10,7 +10,7 @@ - e($default_swimlane['default_swimlane']) ?> + text->e($default_swimlane['default_swimlane']) ?>  () @@ -42,10 +42,10 @@ - e($swimlane['name']) ?> + text->e($swimlane['name']) ?> - '> + '> diff --git a/app/Template/task/analytics.php b/app/Template/task/analytics.php index 306dd021..2f2c23a1 100644 --- a/app/Template/task/analytics.php +++ b/app/Template/task/analytics.php @@ -18,7 +18,7 @@ - e($column['title']) ?> + text->e($column['title']) ?> dt->duration($column['time_spent']) ?> diff --git a/app/Template/task/color_picker.php b/app/Template/task/color_picker.php index a849b9ce..0c62fa70 100644 --- a/app/Template/task/color_picker.php +++ b/app/Template/task/color_picker.php @@ -3,7 +3,7 @@
                + title="text->e($color_name) ?>">
              diff --git a/app/Template/task/details.php b/app/Template/task/details.php index 5c2e3cff..61f6c848 100644 --- a/app/Template/task/details.php +++ b/app/Template/task/details.php @@ -1,5 +1,5 @@
              -

              e($task['title']) ?>

              +

              text->e($task['title']) ?>

                @@ -18,12 +18,12 @@
              • - e($task['reference']) ?> + text->e($task['reference']) ?>
              • - e($task['score']) ?> + text->e($task['score']) ?>
                • @@ -39,18 +39,18 @@
              • - e($task['category_name']) ?> + text->e($task['category_name']) ?>
              • - e($task['swimlane_name']) ?> + text->e($task['swimlane_name']) ?>
              • - e($task['column_title']) ?> + text->e($task['column_title']) ?>
              • @@ -64,7 +64,7 @@ - e($task['assignee_name'] ?: $task['assignee_username']) ?> + text->e($task['assignee_name'] ?: $task['assignee_username']) ?> @@ -73,7 +73,7 @@
              • - e($task['creator_name'] ?: $task['creator_username']) ?> + text->e($task['creator_name'] ?: $task['creator_username']) ?>
                • diff --git a/app/Template/task/remove.php b/app/Template/task/remove.php index e0d655fe..eb0809b1 100644 --- a/app/Template/task/remove.php +++ b/app/Template/task/remove.php @@ -4,7 +4,7 @@

                - e($task['title'])) ?> + text->e($task['title'])) ?>

                diff --git a/app/Template/task/time_tracking_details.php b/app/Template/task/time_tracking_details.php index 147c5109..e2b599a5 100644 --- a/app/Template/task/time_tracking_details.php +++ b/app/Template/task/time_tracking_details.php @@ -14,7 +14,7 @@ getCollection() as $record): ?> - url->link($this->e($record['user_fullname'] ?: $record['username']), 'user', 'show', array('user_id' => $record['user_id'])) ?> + url->link($this->text->e($record['user_fullname'] ?: $record['username']), 'user', 'show', array('user_id' => $record['user_id'])) ?> dt->datetime($record['start']) ?> dt->datetime($record['end']) ?> diff --git a/app/Template/task/time_tracking_summary.php b/app/Template/task/time_tracking_summary.php index 0210be7e..9886ccfa 100644 --- a/app/Template/task/time_tracking_summary.php +++ b/app/Template/task/time_tracking_summary.php @@ -5,9 +5,9 @@
                  -
                • e($task['time_estimated']) ?>
                  • -
                • e($task['time_spent']) ?>
                  • -
                • e($task['time_estimated'] - $task['time_spent']) ?>
                  • +
                • text->e($task['time_estimated']) ?>
                  • +
                • text->e($task['time_spent']) ?>
                  • +
                • text->e($task['time_estimated'] - $task['time_spent']) ?>
                \ No newline at end of file diff --git a/app/Template/task/transitions.php b/app/Template/task/transitions.php index d79c2fd9..57f1e0ff 100644 --- a/app/Template/task/transitions.php +++ b/app/Template/task/transitions.php @@ -16,9 +16,9 @@ dt->datetime($transition['date']) ?> - e($transition['src_column']) ?> - e($transition['dst_column']) ?> - url->link($this->e($transition['name'] ?: $transition['username']), 'user', 'show', array('user_id' => $transition['user_id'])) ?> + 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'])) ?> dt->duration($transition['time_spent']) ?> diff --git a/app/Template/task_external_link/show.php b/app/Template/task_external_link/show.php index 12d8e4f6..7dce107e 100644 --- a/app/Template/task_external_link/show.php +++ b/app/Template/task_external_link/show.php @@ -22,13 +22,13 @@ - e($link['title']) ?> + text->e($link['title']) ?> - e($link['dependency_label']) ?> + text->e($link['dependency_label']) ?> - e($link['creator_name'] ?: $link['creator_username']) ?> + text->e($link['creator_name'] ?: $link['creator_username']) ?> dt->date($link['date_creation']) ?> diff --git a/app/Template/task_file/remove.php b/app/Template/task_file/remove.php index 5e6c83f2..fe601f6f 100644 --- a/app/Template/task_file/remove.php +++ b/app/Template/task_file/remove.php @@ -4,7 +4,7 @@

                - e($file['name'])) ?> + text->e($file['name'])) ?>

                diff --git a/app/Template/task_file/show.php b/app/Template/task_file/show.php index c3f2bb98..21bf79ef 100644 --- a/app/Template/task_file/show.php +++ b/app/Template/task_file/show.php @@ -8,11 +8,11 @@
                - <?= $this->e($file['name']) ?> + <?= $this->text->e($file['name']) ?>
                - e($file['name']) ?> + text->e($file['name']) ?>
                • @@ -52,7 +52,7 @@
                  - e($file['name']) ?> + text->e($file['name']) ?>
                    file->getPreviewType($file['name']) !== null): ?>
                  • @@ -74,7 +74,7 @@
                  - e($file['user_name'] ?: $file['username']) ?> + text->e($file['user_name'] ?: $file['username']) ?> dt->date($file['date']) ?> diff --git a/app/Template/task_recurrence/info.php b/app/Template/task_recurrence/info.php index 83ca0960..1a6574df 100644 --- a/app/Template/task_recurrence/info.php +++ b/app/Template/task_recurrence/info.php @@ -5,16 +5,16 @@
                  • - e($recurrence_trigger_list[$task['recurrence_trigger']]) ?> + text->e($recurrence_trigger_list[$task['recurrence_trigger']]) ?>
                  • - e($task['recurrence_factor']) ?> + text->e($task['recurrence_factor']) ?>
                  • - e($recurrence_timeframe_list[$task['recurrence_timeframe']]) ?> + text->e($recurrence_timeframe_list[$task['recurrence_timeframe']]) ?>
                  • - e($recurrence_basedate_list[$task['recurrence_basedate']]) ?> + text->e($recurrence_basedate_list[$task['recurrence_basedate']]) ?>
                  • diff --git a/app/Template/tasklink/show.php b/app/Template/tasklink/show.php index fd8b37a6..82c3d6c9 100644 --- a/app/Template/tasklink/show.php +++ b/app/Template/tasklink/show.php @@ -27,7 +27,7 @@ url->link( - $this->e('#'.$link['task_id'].' '.$link['title']), + $this->text->e('#'.$link['task_id'].' '.$link['title']), 'task', 'readonly', array('task_id' => $link['task_id'], 'token' => $project['token']), @@ -36,7 +36,7 @@ ) ?> url->link( - $this->e('#'.$link['task_id'].' '.$link['title']), + $this->text->e('#'.$link['task_id'].' '.$link['title']), 'task', 'show', array('task_id' => $link['task_id'], 'project_id' => $link['project_id']), @@ -48,21 +48,21 @@
                  - e($link['task_time_spent']).'h' ?> + text->e($link['task_time_spent']).'h' ?> - e($link['task_time_estimated']).'h' ?> + text->e($link['task_time_estimated']).'h' ?> - e($link['project_name']) ?> - e($link['column_title']) ?> + text->e($link['project_name']) ?> + text->e($link['column_title']) ?> - url->link($this->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']), 'user', 'show', array('user_id' => $link['task_assignee_id'])) ?> - e($link['task_assignee_name'] ?: $link['task_assignee_username']) ?> + text->e($link['task_assignee_name'] ?: $link['task_assignee_username']) ?> diff --git a/app/Template/twofactor/index.php b/app/Template/twofactor/index.php index b9ee4b49..6e701273 100644 --- a/app/Template/twofactor/index.php +++ b/app/Template/twofactor/index.php @@ -4,7 +4,7 @@
                  form->csrf() ?> -

                  e($provider) ?>

                  +

                  text->e($provider) ?>

                  diff --git a/app/Template/twofactor/show.php b/app/Template/twofactor/show.php index d6d8f405..df408035 100644 --- a/app/Template/twofactor/show.php +++ b/app/Template/twofactor/show.php @@ -5,7 +5,7 @@
                  -

                  e($secret) ?>

                  +

                  text->e($secret) ?>

                  @@ -13,7 +13,7 @@ -

                  e($key_url) ?>

                  +

                  text->e($key_url) ?>

                  diff --git a/app/Template/user/index.php b/app/Template/user/index.php index 494c1465..364fd965 100644 --- a/app/Template/user/index.php +++ b/app/Template/user/index.php @@ -27,13 +27,13 @@   - url->link($this->e($user['username']), 'user', 'show', array('user_id' => $user['id'])) ?> + url->link($this->text->e($user['username']), 'user', 'show', array('user_id' => $user['id'])) ?> - e($user['name']) ?> + text->e($user['name']) ?> - e($user['email']) ?> + text->e($user['email']) ?> user->getRoleName($user['role']) ?> diff --git a/app/Template/user/last.php b/app/Template/user/last.php index d6c86391..3de4d5e2 100644 --- a/app/Template/user/last.php +++ b/app/Template/user/last.php @@ -15,9 +15,9 @@ dt->datetime($login['date_creation']) ?> - e($login['auth_type']) ?> - e($login['ip']) ?> - e($login['user_agent']) ?> + text->e($login['auth_type']) ?> + text->e($login['ip']) ?> + text->e($login['user_agent']) ?> diff --git a/app/Template/user/password_reset.php b/app/Template/user/password_reset.php index 4e9063ef..1371ce11 100644 --- a/app/Template/user/password_reset.php +++ b/app/Template/user/password_reset.php @@ -18,8 +18,8 @@ dt->datetime($token['date_creation']) ?> dt->datetime($token['date_expiration']) ?> - e($token['ip']) ?> - e($token['user_agent']) ?> + text->e($token['ip']) ?> + text->e($token['user_agent']) ?> diff --git a/app/Template/user/profile.php b/app/Template/user/profile.php index 176a1491..80a633e3 100644 --- a/app/Template/user/profile.php +++ b/app/Template/user/profile.php @@ -1,8 +1,8 @@

                    -
                  • e($user['username']) ?>
                    • -
                  • e($user['name']) ?: t('None') ?>
                    • -
                  • e($user['email']) ?: t('None') ?>
                    • +
                  • text->e($user['username']) ?>
                    • +
                  • text->e($user['name']) ?: t('None') ?>
                    • +
                  • text->e($user['email']) ?: t('None') ?>
                  \ No newline at end of file diff --git a/app/Template/user/sessions.php b/app/Template/user/sessions.php index 8db02430..d7fe895d 100644 --- a/app/Template/user/sessions.php +++ b/app/Template/user/sessions.php @@ -17,8 +17,8 @@ dt->datetime($session['date_creation']) ?> dt->datetime($session['expiration']) ?> - e($session['ip']) ?> - e($session['user_agent']) ?> + text->e($session['ip']) ?> + text->e($session['user_agent']) ?> url->link(t('Remove'), 'User', 'removeSession', array('user_id' => $user['id'], 'id' => $session['id']), true) ?> diff --git a/app/Template/user/show.php b/app/Template/user/show.php index 9da56666..df0affb8 100644 --- a/app/Template/user/show.php +++ b/app/Template/user/show.php @@ -2,9 +2,9 @@

                    -
                  • e($user['username']) ?>
                    • -
                  • e($user['name']) ?: t('None') ?>
                    • -
                  • e($user['email']) ?: t('None') ?>
                    • +
                  • text->e($user['username']) ?>
                    • +
                  • text->e($user['name']) ?: t('None') ?>
                    • +
                  • text->e($user['email']) ?: t('None') ?>
                  diff --git a/app/Template/user/timesheet.php b/app/Template/user/timesheet.php index 4a6e42c5..92ebafb5 100644 --- a/app/Template/user/timesheet.php +++ b/app/Template/user/timesheet.php @@ -16,8 +16,8 @@ getCollection() as $record): ?> - url->link($this->e($record['task_title']), 'task', 'show', array('project_id' => $record['project_id'], 'task_id' => $record['task_id'])) ?> - url->link($this->e($record['subtask_title']), 'task', 'show', array('project_id' => $record['project_id'], 'task_id' => $record['task_id'])) ?> + url->link($this->text->e($record['task_title']), 'task', 'show', array('project_id' => $record['project_id'], 'task_id' => $record['task_id'])) ?> + url->link($this->text->e($record['subtask_title']), 'task', 'show', array('project_id' => $record['project_id'], 'task_id' => $record['task_id'])) ?> dt->datetime($record['start']) ?> dt->datetime($record['end']) ?> diff --git a/app/common.php b/app/common.php index e2fe6aff..71f80c75 100644 --- a/app/common.php +++ b/app/common.php @@ -26,6 +26,7 @@ require __DIR__.'/constants.php'; require __DIR__.'/check_setup.php'; $container = new Pimple\Container; +$container->register(new Kanboard\ServiceProvider\HelperProvider); $container->register(new Kanboard\ServiceProvider\SessionProvider); $container->register(new Kanboard\ServiceProvider\LoggingProvider); $container->register(new Kanboard\ServiceProvider\DatabaseProvider); diff --git a/composer.lock b/composer.lock index 238d6c7c..81375dd0 100644 --- a/composer.lock +++ b/composer.lock @@ -397,16 +397,16 @@ }, { "name": "paragonie/random_compat", - "version": "v1.2.0", + "version": "v1.2.1", "source": { "type": "git", "url": "https://github.com/paragonie/random_compat.git", - "reference": "b0e69d10852716b2ccbdff69c75c477637220790" + "reference": "f078eba3bcf140fd69b5fcc3ea5ac809abf729dc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/b0e69d10852716b2ccbdff69c75c477637220790", - "reference": "b0e69d10852716b2ccbdff69c75c477637220790", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/f078eba3bcf140fd69b5fcc3ea5ac809abf729dc", + "reference": "f078eba3bcf140fd69b5fcc3ea5ac809abf729dc", "shasum": "" }, "require": { @@ -441,7 +441,7 @@ "pseudorandom", "random" ], - "time": "2016-02-06 03:52:05" + "time": "2016-02-29 17:25:04" }, { "name": "pimple/pimple", @@ -627,16 +627,16 @@ }, { "name": "symfony/console", - "version": "v2.8.2", + "version": "v2.8.3", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "d0239fb42f98dd02e7d342f793c5d2cdee0c478d" + "reference": "56cc5caf051189720b8de974e4746090aaa10d44" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/d0239fb42f98dd02e7d342f793c5d2cdee0c478d", - "reference": "d0239fb42f98dd02e7d342f793c5d2cdee0c478d", + "url": "https://api.github.com/repos/symfony/console/zipball/56cc5caf051189720b8de974e4746090aaa10d44", + "reference": "56cc5caf051189720b8de974e4746090aaa10d44", "shasum": "" }, "require": { @@ -683,20 +683,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2016-01-14 08:33:16" + "time": "2016-02-28 16:20:50" }, { "name": "symfony/event-dispatcher", - "version": "v2.8.2", + "version": "v2.8.3", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "ee278f7c851533e58ca307f66305ccb9188aceda" + "reference": "78c468665c9568c3faaa9c416a7134308f2d85c3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/ee278f7c851533e58ca307f66305ccb9188aceda", - "reference": "ee278f7c851533e58ca307f66305ccb9188aceda", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/78c468665c9568c3faaa9c416a7134308f2d85c3", + "reference": "78c468665c9568c3faaa9c416a7134308f2d85c3", "shasum": "" }, "require": { @@ -743,7 +743,7 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2016-01-13 10:28:07" + "time": "2016-01-27 05:14:19" }, { "name": "symfony/polyfill-mbstring", @@ -808,7 +808,7 @@ "packages-dev": [ { "name": "symfony/stopwatch", - "version": "v2.8.2", + "version": "v2.8.3", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", diff --git a/doc/plugin-helpers.markdown b/doc/plugin-helpers.markdown new file mode 100644 index 00000000..8cc6b42a --- /dev/null +++ b/doc/plugin-helpers.markdown @@ -0,0 +1,40 @@ +Registering new helpers +======================= + +Helper skeleton: + +```php +helper->register('myHelper', '\Kanboard\Plugin\MyPlugin\Helper\MyHelper'); +``` + +Using your helper from a template: + +```php +

                  + myHelper->doSomething() ?> +

                  +``` + +Using your helper from another class: + +```php +$this->helper->myHelper->doSomething(); +``` diff --git a/doc/plugins.markdown b/doc/plugins.markdown index 55575612..e38c887f 100644 --- a/doc/plugins.markdown +++ b/doc/plugins.markdown @@ -13,6 +13,7 @@ Plugin creators should specify explicitly the compatible versions of Kanboard. I - [Override default application behaviors](plugin-overrides.markdown) - [Add schema migrations for plugins](plugin-schema-migrations.markdown) - [Custom routes](plugin-routes.markdown) +- [Add helpers](plugin-helpers.markdown) - [Add mail transports](plugin-mail-transports.markdown) - [Add notification types](plugin-notifications.markdown) - [Add automatic actions](plugin-automatic-actions.markdown) diff --git a/tests/units/Base.php b/tests/units/Base.php index eb9fc68b..6af14ba5 100644 --- a/tests/units/Base.php +++ b/tests/units/Base.php @@ -33,6 +33,7 @@ abstract class Base extends PHPUnit_Framework_TestCase } $this->container = new Pimple\Container; + $this->container->register(new Kanboard\ServiceProvider\HelperProvider); $this->container->register(new Kanboard\ServiceProvider\AuthenticationProvider); $this->container->register(new Kanboard\ServiceProvider\DatabaseProvider); $this->container->register(new Kanboard\ServiceProvider\ClassProvider); diff --git a/tests/units/Core/HelperTest.php b/tests/units/Core/HelperTest.php new file mode 100644 index 00000000..b766dd96 --- /dev/null +++ b/tests/units/Core/HelperTest.php @@ -0,0 +1,17 @@ +container); + $helper->register('foobar', '\Stdclass'); + + $this->assertInstanceOf('Stdclass', $helper->foobar); + $this->assertInstanceOf('Stdclass', $helper->getHelper('foobar')); + } +} diff --git a/tests/units/Core/Http/RouterTest.php b/tests/units/Core/Http/RouterTest.php index 0b200ab5..75a3ba4f 100644 --- a/tests/units/Core/Http/RouterTest.php +++ b/tests/units/Core/Http/RouterTest.php @@ -40,21 +40,25 @@ namespace { $this->assertEquals('userImport', $dispatcher->sanitize('userImport', 'default')); } - public function testGetPath() + public function testGetPathWithFolder() { - $dispatcher = new Router($this->container); - - $this->container['helper'] = new Helper($this->container); + $router = new Router($this->container); $this->container['request'] = new Request($this->container, array('PHP_SELF' => '/index.php', 'REQUEST_URI' => '/a/b/c', 'REQUEST_METHOD' => 'GET')); - $this->assertEquals('a/b/c', $dispatcher->getPath()); + $this->assertEquals('a/b/c', $router->getPath()); + } - $this->container['helper'] = new Helper($this->container); + public function testGetPathWithQueryString() + { + $router = new Router($this->container); $this->container['request'] = new Request($this->container, array('PHP_SELF' => '/index.php', 'REQUEST_URI' => '/a/b/something?test=a', 'QUERY_STRING' => 'test=a', 'REQUEST_METHOD' => 'GET')); - $this->assertEquals('a/b/something', $dispatcher->getPath()); + $this->assertEquals('a/b/something', $router->getPath()); + } - $this->container['helper'] = new Helper($this->container); + public function testGetPathWithSubFolderAndQueryString() + { + $router = new Router($this->container); $this->container['request'] = new Request($this->container, array('PHP_SELF' => '/a/index.php', 'REQUEST_URI' => '/a/b/something?test=a', 'QUERY_STRING' => 'test=a', 'REQUEST_METHOD' => 'GET')); - $this->assertEquals('b/something', $dispatcher->getPath()); + $this->assertEquals('b/something', $router->getPath()); } public function testDispatcherWithControllerNotFound() diff --git a/tests/units/Core/TemplateTest.php b/tests/units/Core/TemplateTest.php index 6e5ae00d..bd476c51 100644 --- a/tests/units/Core/TemplateTest.php +++ b/tests/units/Core/TemplateTest.php @@ -8,7 +8,7 @@ class TemplateTest extends Base { public function testGetTemplateFile() { - $t = new Template($this->container); + $t = new Template($this->container['helper']); $this->assertStringEndsWith( 'app'.DIRECTORY_SEPARATOR.'Core'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'Template'.DIRECTORY_SEPARATOR.'a'.DIRECTORY_SEPARATOR.'b.php', $t->getTemplateFile('a'.DIRECTORY_SEPARATOR.'b') @@ -17,7 +17,7 @@ class TemplateTest extends Base public function testGetPluginTemplateFile() { - $t = new Template($this->container); + $t = new Template($this->container['helper']); $this->assertStringEndsWith( 'app'.DIRECTORY_SEPARATOR.'Core'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'plugins'.DIRECTORY_SEPARATOR.'Myplugin'.DIRECTORY_SEPARATOR.'Template'.DIRECTORY_SEPARATOR.'a'.DIRECTORY_SEPARATOR.'b.php', $t->getTemplateFile('myplugin:a'.DIRECTORY_SEPARATOR.'b') @@ -26,7 +26,7 @@ class TemplateTest extends Base public function testGetOverridedTemplateFile() { - $t = new Template($this->container); + $t = new Template($this->container['helper']); $t->setTemplateOverride('a'.DIRECTORY_SEPARATOR.'b', 'myplugin:c'); $this->assertStringEndsWith( diff --git a/tests/units/Helper/AppHelperTest.php b/tests/units/Helper/AppHelperTest.php index 4fd486f0..dee0750e 100644 --- a/tests/units/Helper/AppHelperTest.php +++ b/tests/units/Helper/AppHelperTest.php @@ -3,25 +3,25 @@ require_once __DIR__.'/../Base.php'; use Kanboard\Core\Session\FlashMessage; -use Kanboard\Helper\App; +use Kanboard\Helper\AppHelper; class AppHelperTest extends Base { public function testJsLang() { - $h = new App($this->container); + $h = new AppHelper($this->container); $this->assertEquals('en', $h->jsLang()); } public function testTimezone() { - $h = new App($this->container); + $h = new AppHelper($this->container); $this->assertEquals('UTC', $h->getTimezone()); } public function testFlashMessage() { - $h = new App($this->container); + $h = new AppHelper($this->container); $f = new FlashMessage($this->container); $this->assertEmpty($h->flashMessage()); diff --git a/tests/units/Helper/AssetHelperTest.php b/tests/units/Helper/AssetHelperTest.php index 64fcd569..6ef5accd 100644 --- a/tests/units/Helper/AssetHelperTest.php +++ b/tests/units/Helper/AssetHelperTest.php @@ -2,14 +2,14 @@ require_once __DIR__.'/../Base.php'; -use Kanboard\Helper\Asset; +use Kanboard\Helper\AssetHelper; use Kanboard\Model\Config; class AssetHelperTest extends Base { public function testCustomCss() { - $h = new Asset($this->container); + $h = new AssetHelper($this->container); $c = new Config($this->container); $this->assertEmpty($h->customCss()); diff --git a/tests/units/Helper/DatetimeHelperTest.php b/tests/units/Helper/DatetimeHelperTest.php index f27a2eb9..19b1b704 100644 --- a/tests/units/Helper/DatetimeHelperTest.php +++ b/tests/units/Helper/DatetimeHelperTest.php @@ -2,19 +2,19 @@ require_once __DIR__.'/../Base.php'; -use Kanboard\Helper\Dt; +use Kanboard\Helper\DateHelper; class DatetimeHelperTest extends Base { public function testGetTime() { - $helper = new Dt($this->container); + $helper = new DateHelper($this->container); $this->assertEquals('17:25', $helper->time(1422206700)); } public function testGetDate() { - $helper = new Dt($this->container); + $helper = new DateHelper($this->container); $this->assertEquals('01/25/2015', $helper->date(1422206700)); $this->assertEquals('01/25/2015', $helper->date('2015-01-25')); $this->assertEquals('', $helper->date('0')); @@ -24,13 +24,13 @@ class DatetimeHelperTest extends Base public function testGetDatetime() { - $helper = new Dt($this->container); + $helper = new DateHelper($this->container); $this->assertEquals('01/25/2015 17:25', $helper->datetime(1422206700)); } public function testAge() { - $helper = new Dt($this->container); + $helper = new DateHelper($this->container); $this->assertEquals('<15m', $helper->age(0, 30)); $this->assertEquals('<30m', $helper->age(0, 1000)); @@ -42,7 +42,7 @@ class DatetimeHelperTest extends Base public function testGetDayHours() { - $helper = new Dt($this->container); + $helper = new DateHelper($this->container); $slots = $helper->getDayHours(); @@ -58,7 +58,7 @@ class DatetimeHelperTest extends Base public function testGetWeekDays() { - $helper = new Dt($this->container); + $helper = new DateHelper($this->container); $slots = $helper->getWeekDays(); @@ -70,7 +70,7 @@ class DatetimeHelperTest extends Base public function testGetWeekDay() { - $helper = new Dt($this->container); + $helper = new DateHelper($this->container); $this->assertEquals('Monday', $helper->getWeekDay(1)); $this->assertEquals('Sunday', $helper->getWeekDay(7)); diff --git a/tests/units/Helper/FileHelperText.php b/tests/units/Helper/FileHelperText.php index 6a1b78a4..215b024b 100644 --- a/tests/units/Helper/FileHelperText.php +++ b/tests/units/Helper/FileHelperText.php @@ -2,20 +2,20 @@ require_once __DIR__.'/../Base.php'; -use Kanboard\Helper\File; +use Kanboard\Helper\FileHelper; class FileHelperTest extends Base { public function testIcon() { - $helper = new File($this->container); + $helper = new FileHelper($this->container); $this->assertEquals('fa-file-image-o', $helper->icon('test.png')); $this->assertEquals('fa-file-o', $helper->icon('test')); } public function testGetMimeType() { - $helper = new File($this->container); + $helper = new FileHelper($this->container); $this->assertEquals('image/jpeg', $helper->getImageMimeType('My File.JPG')); $this->assertEquals('image/jpeg', $helper->getImageMimeType('My File.jpeg')); @@ -27,7 +27,7 @@ class FileHelperTest extends Base public function testGetPreviewType() { - $helper = new File($this->container); + $helper = new FileHelper($this->container); $this->assertEquals('text', $helper->getPreviewType('test.txt')); $this->assertEquals('markdown', $helper->getPreviewType('test.markdown')); $this->assertEquals('md', $helper->getPreviewType('test.md')); diff --git a/tests/units/Helper/HookHelperTest.php b/tests/units/Helper/HookHelperTest.php index aec4a771..6e03acd1 100644 --- a/tests/units/Helper/HookHelperTest.php +++ b/tests/units/Helper/HookHelperTest.php @@ -2,7 +2,7 @@ require_once __DIR__.'/../Base.php'; -use Kanboard\Helper\Hook; +use Kanboard\Helper\HookHelper; class HookHelperTest extends Base { @@ -10,7 +10,7 @@ class HookHelperTest extends Base { $this->container['template'] = $this ->getMockBuilder('\Kanboard\Core\Template') - ->setConstructorArgs(array($this->container)) + ->setConstructorArgs(array($this->container['helper'])) ->setMethods(array('render')) ->getMock(); @@ -32,7 +32,7 @@ class HookHelperTest extends Base ) ->will($this->returnValue('tpl2_content')); - $h = new Hook($this->container); + $h = new HookHelper($this->container); $h->attach('test', 'tpl1'); $h->attach('test', 'tpl2'); $this->assertEquals('tpl1_contenttpl2_content', $h->render('test')); @@ -41,7 +41,7 @@ class HookHelperTest extends Base public function testAssetHooks() { $this->container['helper']->asset = $this - ->getMockBuilder('\Kanboard\Helper\Asset') + ->getMockBuilder('\Kanboard\Helper\AssetHelper') ->setConstructorArgs(array($this->container)) ->setMethods(array('css', 'js')) ->getMock(); @@ -64,7 +64,7 @@ class HookHelperTest extends Base ) ->will($this->returnValue('')); - $h = new Hook($this->container); + $h = new HookHelper($this->container); $h->attach('test1', 'skin.css'); $h->attach('test2', 'skin.js'); diff --git a/tests/units/Helper/TaskHelperTest.php b/tests/units/Helper/TaskHelperTest.php index 726188e4..454da553 100644 --- a/tests/units/Helper/TaskHelperTest.php +++ b/tests/units/Helper/TaskHelperTest.php @@ -2,20 +2,20 @@ require_once __DIR__.'/../Base.php'; -use Kanboard\Helper\Task; +use Kanboard\Helper\TaskHelper; class TaskHelperTest extends Base { public function testSelectPriority() { - $helper = new Task($this->container); + $helper = new TaskHelper($this->container); $this->assertNotEmpty($helper->selectPriority(array('priority_end' => '3', 'priority_start' => '1', 'priority_default' => '2'), array())); $this->assertEmpty($helper->selectPriority(array('priority_end' => '3', 'priority_start' => '3', 'priority_default' => '2'), array())); } public function testFormatPriority() { - $helper = new Task($this->container); + $helper = new TaskHelper($this->container); $this->assertEquals( 'P2', diff --git a/tests/units/Helper/TextHelperTest.php b/tests/units/Helper/TextHelperTest.php index a4bdfa91..d7324dfd 100644 --- a/tests/units/Helper/TextHelperTest.php +++ b/tests/units/Helper/TextHelperTest.php @@ -2,13 +2,13 @@ require_once __DIR__.'/../Base.php'; -use Kanboard\Helper\Text; +use Kanboard\Helper\TextHelper; class TextHelperTest extends Base { public function testMarkdownTaskLink() { - $h = new Text($this->container); + $h = new TextHelper($this->container); $this->assertEquals('

                  Test

                  ', $h->markdown('Test')); @@ -33,13 +33,13 @@ class TextHelperTest extends Base public function testMarkdownUserLink() { - $h = new Text($this->container); + $h = new TextHelper($this->container); $this->assertEquals('

                  Text @admin @notfound

                  ', $h->markdown('Text @admin @notfound')); } public function testFormatBytes() { - $h = new Text($this->container); + $h = new TextHelper($this->container); $this->assertEquals('1k', $h->bytes(1024)); $this->assertEquals('33.71k', $h->bytes(34520)); @@ -47,7 +47,7 @@ class TextHelperTest extends Base public function testContains() { - $h = new Text($this->container); + $h = new TextHelper($this->container); $this->assertTrue($h->contains('abc', 'b')); $this->assertFalse($h->contains('abc', 'd')); @@ -55,7 +55,7 @@ class TextHelperTest extends Base public function testInList() { - $h = new Text($this->container); + $h = new TextHelper($this->container); $this->assertEquals('?', $h->in('a', array('b' => 'c'))); $this->assertEquals('c', $h->in('b', array('b' => 'c'))); } diff --git a/tests/units/Helper/UrlHelperTest.php b/tests/units/Helper/UrlHelperTest.php index 15e01237..34ab7604 100644 --- a/tests/units/Helper/UrlHelperTest.php +++ b/tests/units/Helper/UrlHelperTest.php @@ -2,7 +2,7 @@ require_once __DIR__.'/../Base.php'; -use Kanboard\Helper\Url; +use Kanboard\Helper\UrlHelper; use Kanboard\Model\Config; use Kanboard\Core\Http\Request; @@ -10,7 +10,7 @@ class UrlHelperTest extends Base { public function testPluginLink() { - $h = new Url($this->container); + $h = new UrlHelper($this->container); $this->assertEquals( 'label', $h->link('label', 'a', 'b', array('d' => 'e', 'plugin' => 'something'), false, 'f', 'g', true) @@ -22,7 +22,7 @@ class UrlHelperTest extends Base $this->container['route']->enable(); $this->container['route']->addRoute('/myplugin/something/:d', 'a', 'b', 'something'); - $h = new Url($this->container); + $h = new UrlHelper($this->container); $this->assertEquals( 'label', $h->link('label', 'a', 'b', array('d' => 'e', 'plugin' => 'something'), false, 'f', 'g', true) @@ -31,7 +31,7 @@ class UrlHelperTest extends Base public function testAppLink() { - $h = new Url($this->container); + $h = new UrlHelper($this->container); $this->assertEquals( 'label', $h->link('label', 'a', 'b', array('d' => 'e'), false, 'f', 'g', true) @@ -40,7 +40,7 @@ class UrlHelperTest extends Base public function testHref() { - $h = new Url($this->container); + $h = new UrlHelper($this->container); $this->assertEquals( '?controller=a&action=b&d=e', $h->href('a', 'b', array('d' => 'e')) @@ -49,7 +49,7 @@ class UrlHelperTest extends Base public function testTo() { - $h = new Url($this->container); + $h = new UrlHelper($this->container); $this->assertEquals( '?controller=a&action=b&d=e', $h->to('a', 'b', array('d' => 'e')) @@ -64,7 +64,7 @@ class UrlHelperTest extends Base ) ); - $h = new Url($this->container); + $h = new UrlHelper($this->container); $this->assertEquals('/kanboard/', $h->dir()); $this->container['request'] = new Request($this->container, array( @@ -73,7 +73,7 @@ class UrlHelperTest extends Base ) ); - $h = new Url($this->container); + $h = new UrlHelper($this->container); $this->assertEquals('/', $h->dir()); } @@ -87,7 +87,7 @@ class UrlHelperTest extends Base ) ); - $h = new Url($this->container); + $h = new UrlHelper($this->container); $this->assertEquals('http://localhost/', $h->server()); $this->container['request'] = new Request($this->container, array( @@ -98,7 +98,7 @@ class UrlHelperTest extends Base ) ); - $h = new Url($this->container); + $h = new UrlHelper($this->container); $this->assertEquals('http://kb:1234/', $h->server()); } @@ -112,14 +112,14 @@ class UrlHelperTest extends Base ) ); - $h = new Url($this->container); + $h = new UrlHelper($this->container); $this->assertEquals('http://kb:1234/', $h->base()); $c = new Config($this->container); $c->save(array('application_url' => 'https://mykanboard/')); $this->container['memoryCache']->flush(); - $h = new Url($this->container); + $h = new UrlHelper($this->container); $this->assertEquals('https://mykanboard/', $c->get('application_url')); $this->assertEquals('https://mykanboard/', $h->base()); } diff --git a/tests/units/Helper/UserHelperTest.php b/tests/units/Helper/UserHelperTest.php index f1099faa..7ee6e8bb 100644 --- a/tests/units/Helper/UserHelperTest.php +++ b/tests/units/Helper/UserHelperTest.php @@ -2,7 +2,7 @@ require_once __DIR__.'/../Base.php'; -use Kanboard\Helper\User; +use Kanboard\Helper\UserHelper; use Kanboard\Model\Project; use Kanboard\Model\ProjectUserRole; use Kanboard\Model\User as UserModel; @@ -12,7 +12,7 @@ class UserHelperTest extends Base { public function testInitials() { - $helper = new User($this->container); + $helper = new UserHelper($this->container); $this->assertEquals('CN', $helper->getInitials('chuck norris')); $this->assertEquals('A', $helper->getInitials('admin')); @@ -20,7 +20,7 @@ class UserHelperTest extends Base public function testGetRoleName() { - $helper = new User($this->container); + $helper = new UserHelper($this->container); $this->assertEquals('Administrator', $helper->getRoleName(Role::APP_ADMIN)); $this->assertEquals('Manager', $helper->getRoleName(Role::APP_MANAGER)); $this->assertEquals('Project Viewer', $helper->getRoleName(Role::PROJECT_VIEWER)); @@ -28,7 +28,7 @@ class UserHelperTest extends Base public function testHasAccessForAdmins() { - $helper = new User($this->container); + $helper = new UserHelper($this->container); $this->container['sessionStorage']->user = array( 'id' => 2, @@ -42,7 +42,7 @@ class UserHelperTest extends Base public function testHasAccessForManagers() { - $helper = new User($this->container); + $helper = new UserHelper($this->container); $this->container['sessionStorage']->user = array( 'id' => 2, @@ -56,7 +56,7 @@ class UserHelperTest extends Base public function testHasAccessForUsers() { - $helper = new User($this->container); + $helper = new UserHelper($this->container); $this->container['sessionStorage']->user = array( 'id' => 2, @@ -70,7 +70,7 @@ class UserHelperTest extends Base public function testHasProjectAccessForAdmins() { - $helper = new User($this->container); + $helper = new UserHelper($this->container); $project = new Project($this->container); $this->container['sessionStorage']->user = array( @@ -86,7 +86,7 @@ class UserHelperTest extends Base public function testHasProjectAccessForManagers() { - $helper = new User($this->container); + $helper = new UserHelper($this->container); $project = new Project($this->container); $this->container['sessionStorage']->user = array( @@ -102,7 +102,7 @@ class UserHelperTest extends Base public function testHasProjectAccessForUsers() { - $helper = new User($this->container); + $helper = new UserHelper($this->container); $project = new Project($this->container); $this->container['sessionStorage']->user = array( @@ -118,7 +118,7 @@ class UserHelperTest extends Base public function testHasProjectAccessForAppManagerAndProjectManagers() { - $helper = new User($this->container); + $helper = new UserHelper($this->container); $user = new UserModel($this->container); $project = new Project($this->container); $projectUserRole = new ProjectUserRole($this->container); @@ -146,7 +146,7 @@ class UserHelperTest extends Base public function testHasProjectAccessForProjectManagers() { - $helper = new User($this->container); + $helper = new UserHelper($this->container); $user = new UserModel($this->container); $project = new Project($this->container); $projectUserRole = new ProjectUserRole($this->container); @@ -174,7 +174,7 @@ class UserHelperTest extends Base public function testHasProjectAccessForProjectMembers() { - $helper = new User($this->container); + $helper = new UserHelper($this->container); $user = new UserModel($this->container); $project = new Project($this->container); $projectUserRole = new ProjectUserRole($this->container); @@ -202,7 +202,7 @@ class UserHelperTest extends Base public function testHasProjectAccessForProjectViewers() { - $helper = new User($this->container); + $helper = new UserHelper($this->container); $user = new UserModel($this->container); $project = new Project($this->container); $projectUserRole = new ProjectUserRole($this->container); -- cgit v1.2.3