Helper refactoring

16 files changed, 36 insertions, 36 deletions

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 @@
-<h2><?= $this->e($task['title']) ?> (#<?= $task['id'] ?>)</h2>
+<h2><?= $this->text->e($task['title']) ?> (#<?= $task['id'] ?>)</h2>
 
 <?php if (! empty($comment['username'])): ?>
     <h3><?= t('New comment posted by %s', $comment['name'] ?: $comment['username']) ?></h3>
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 @@
-<h2><?= $this->e($task['title']) ?> (#<?= $task['id'] ?>)</h2>
+<h2><?= $this->text->e($task['title']) ?> (#<?= $task['id'] ?>)</h2>
 
 <h3><?= t('Comment updated') ?></h3>
 
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 @@
 <h2><?= t('You were mentioned in a comment on the task #%d', $task['id']) ?></h2>
 
-<p><?= $this->e($task['title']) ?></p>
+<p><?= $this->text->e($task['title']) ?></p>
 
 <?= $this->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 @@
-<h2><?= $this->e($task['title']) ?> (#<?= $task['id'] ?>)</h2>
+<h2><?= $this->text->e($task['title']) ?> (#<?= $task['id'] ?>)</h2>
 
 <h3><?= t('New sub-task') ?></h3>
 
 <ul>
-    <li><?= t('Title:') ?> <?= $this->e($subtask['title']) ?></li>
-    <li><?= t('Status:') ?> <?= $this->e($subtask['status_name']) ?></li>
-    <li><?= t('Assignee:') ?> <?= $this->e($subtask['name'] ?: $subtask['username'] ?: '?') ?></li>
+    <li><?= t('Title:') ?> <?= $this->text->e($subtask['title']) ?></li>
+    <li><?= t('Status:') ?> <?= $this->text->e($subtask['status_name']) ?></li>
+    <li><?= t('Assignee:') ?> <?= $this->text->e($subtask['name'] ?: $subtask['username'] ?: '?') ?></li>
     <li>
         <?= t('Time tracking:') ?>
         <?php if (! empty($subtask['time_estimated'])): ?>
-            <strong><?= $this->e($subtask['time_estimated']).'h' ?></strong> <?= t('estimated') ?>
+            <strong><?= $this->text->e($subtask['time_estimated']).'h' ?></strong> <?= t('estimated') ?>
         <?php endif ?>
     </li>
 </ul>
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 @@
-<h2><?= $this->e($task['title']) ?> (#<?= $task['id'] ?>)</h2>
+<h2><?= $this->text->e($task['title']) ?> (#<?= $task['id'] ?>)</h2>
 
 <h3><?= t('Sub-task updated') ?></h3>
 
 <ul>
-    <li><?= t('Title:') ?> <?= $this->e($subtask['title']) ?></li>
-    <li><?= t('Status:') ?> <?= $this->e($subtask['status_name']) ?></li>
-    <li><?= t('Assignee:') ?> <?= $this->e($subtask['name'] ?: $subtask['username'] ?: '?') ?></li>
+    <li><?= t('Title:') ?> <?= $this->text->e($subtask['title']) ?></li>
+    <li><?= t('Status:') ?> <?= $this->text->e($subtask['status_name']) ?></li>
+    <li><?= t('Assignee:') ?> <?= $this->text->e($subtask['name'] ?: $subtask['username'] ?: '?') ?></li>
     <li>
         <?= t('Time tracking:') ?>
         <?php if (! empty($subtask['time_spent'])): ?>
-            <strong><?= $this->e($subtask['time_spent']).'h' ?></strong> <?= t('spent') ?>
+            <strong><?= $this->text->e($subtask['time_spent']).'h' ?></strong> <?= t('spent') ?>
         <?php endif ?>
 
         <?php if (! empty($subtask['time_estimated'])): ?>
-            <strong><?= $this->e($subtask['time_estimated']).'h' ?></strong> <?= t('estimated') ?>
+            <strong><?= $this->text->e($subtask['time_estimated']).'h' ?></strong> <?= t('estimated') ?>
         <?php endif ?>
     </li>
 </ul>
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 @@
-<h2><?= $this->e($task['title']) ?> (#<?= $task['id'] ?>)</h2>
+<h2><?= $this->text->e($task['title']) ?> (#<?= $task['id'] ?>)</h2>
 
 <ul>
     <li>
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 @@
-<h2><?= $this->e($task['title']) ?> (#<?= $task['id'] ?>)</h2>
+<h2><?= $this->text->e($task['title']) ?> (#<?= $task['id'] ?>)</h2>
 
 <p><?= t('The task #%d have been closed.', $task['id']) ?></p>
 
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 @@
-<h2><?= $this->e($task['title']) ?> (#<?= $task['id'] ?>)</h2>
+<h2><?= $this->text->e($task['title']) ?> (#<?= $task['id'] ?>)</h2>
 
 <ul>
     <li>
@@ -25,12 +25,12 @@
     </li>
     <li>
         <?= t('Column on the board:') ?>
-        <strong><?= $this->e($task['column_title']) ?></strong>
+        <strong><?= $this->text->e($task['column_title']) ?></strong>
     </li>
-    <li><?= t('Task position:').' '.$this->e($task['position']) ?></li>
+    <li><?= t('Task position:').' '.$this->text->e($task['position']) ?></li>
     <?php if (! empty($task['category_name'])): ?>
     <li>
-        <?= t('Category:') ?> <strong><?= $this->e($task['category_name']) ?></strong>
+        <?= t('Category:') ?> <strong><?= $this->text->e($task['category_name']) ?></strong>
     </li>
     <?php endif ?>
 </ul>
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 @@
-<h2><?= $this->e($task['title']) ?> (#<?= $task['id'] ?>)</h2>
+<h2><?= $this->text->e($task['title']) ?> (#<?= $task['id'] ?>)</h2>
 
 <p><?= t('New attachment added "%s"', $file['name']) ?></p>
 
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 @@
-<h2><?= $this->e($task['title']) ?> (#<?= $task['id'] ?>)</h2>
+<h2><?= $this->text->e($task['title']) ?> (#<?= $task['id'] ?>)</h2>
 
 <ul>
     <li>
         <?= t('Column on the board:') ?>
-        <strong><?= $this->e($task['column_title']) ?></strong>
+        <strong><?= $this->text->e($task['column_title']) ?></strong>
     </li>
-    <li><?= t('Task position:').' '.$this->e($task['position']) ?></li>
+    <li><?= t('Task position:').' '.$this->text->e($task['position']) ?></li>
 </ul>
 
 <?= $this->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 @@
-<h2><?= $this->e($task['title']) ?> (#<?= $task['id'] ?>)</h2>
+<h2><?= $this->text->e($task['title']) ?> (#<?= $task['id'] ?>)</h2>
 
 <ul>
     <li>
         <?= t('Column on the board:') ?>
-        <strong><?= $this->e($task['column_title']) ?></strong>
+        <strong><?= $this->text->e($task['column_title']) ?></strong>
     </li>
-    <li><?= t('Task position:').' '.$this->e($task['position']) ?></li>
+    <li><?= t('Task position:').' '.$this->text->e($task['position']) ?></li>
 </ul>
 
 <?= $this->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 @@
-<h2><?= $this->e($task['title']) ?> (#<?= $task['id'] ?>)</h2>
+<h2><?= $this->text->e($task['title']) ?> (#<?= $task['id'] ?>)</h2>
 
 <ul>
     <li>
@@ -6,14 +6,14 @@
             <?= t('The task have been moved to the first swimlane') ?>
         <?php else: ?>
             <?= t('The task have been moved to another swimlane:') ?>
-            <strong><?= $this->e($task['swimlane_name']) ?></strong>
+            <strong><?= $this->text->e($task['swimlane_name']) ?></strong>
         <?php endif ?>
     </li>
     <li>
         <?= t('Column on the board:') ?>
-        <strong><?= $this->e($task['column_title']) ?></strong>
+        <strong><?= $this->text->e($task['column_title']) ?></strong>
     </li>
-    <li><?= t('Task position:').' '.$this->e($task['position']) ?></li>
+    <li><?= t('Task position:').' '.$this->text->e($task['position']) ?></li>
 </ul>
 
 <?= $this->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 @@
-<h2><?= $this->e($task['title']) ?> (#<?= $task['id'] ?>)</h2>
+<h2><?= $this->text->e($task['title']) ?> (#<?= $task['id'] ?>)</h2>
 
 <p><?= t('The task #%d have been opened.', $task['id']) ?></p>
 
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 @@
         <li>
             (<strong>#<?= $task['id'] ?></strong>)
             <?php if ($application_url): ?>
-                <a href="<?= $this->url->href('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', true) ?>"><?= $this->e($task['title']) ?></a>
+                <a href="<?= $this->url->href('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', true) ?>"><?= $this->text->e($task['title']) ?></a>
             <?php else: ?>
-                <?= $this->e($task['title']) ?>
+                <?= $this->text->e($task['title']) ?>
             <?php endif ?>
             (<?= $this->dt->date($task['date_due']) ?>)
             <?php if ($task['assignee_username']): ?>
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 @@
-<h2><?= $this->e($task['title']) ?> (#<?= $task['id'] ?>)</h2>
+<h2><?= $this->text->e($task['title']) ?> (#<?= $task['id'] ?>)</h2>
 
 <?= $this->render('task/changes', array('changes' => $changes, 'task' => $task)) ?>
 <?= $this->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 @@
 <h2><?= t('You were mentioned in the task #%d', $task['id']) ?></h2>
-<p><?= $this->e($task['title']) ?></p>
+<p><?= $this->text->e($task['title']) ?></p>
 
 <h2><?= t('Description') ?></h2>
 <?= $this->text->markdown($task['description']) ?>