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/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 ++-- 105 files changed, 255 insertions(+), 255 deletions(-) (limited to 'app/Template') 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']) ?> -- cgit v1.2.3