Template helpers refactoring

11 files changed, 26 insertions, 26 deletions

diff --git a/app/Template/event/comment_create.php b/app/Template/event/comment_create.php
index d2f6f97b..ee985ed1 100644
--- a/app/Template/event/comment_create.php
+++ b/app/Template/event/comment_create.php
@@ -1,7 +1,7 @@
 <p class="activity-title">
-    <?= e('%s commented the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a>', Helper\escape($author), $task_id, $task_id) ?>
+    <?= e('%s commented the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a>', $this->e($author), $task_id, $task_id) ?>
 </p>
 <div class="activity-description">
-    <em><?= Helper\escape($task['title']) ?></em><br/>
-    <div class="markdown"><?= Helper\markdown($comment['comment']) ?></div>
+    <em><?= $this->e($task['title']) ?></em><br/>
+    <div class="markdown"><?= $this->markdown($comment['comment']) ?></div>
 </div>
\ No newline at end of file
diff --git a/app/Template/event/comment_update.php b/app/Template/event/comment_update.php
index c0b43622..93418159 100644
--- a/app/Template/event/comment_update.php
+++ b/app/Template/event/comment_update.php
@@ -1,6 +1,6 @@
 <p class="activity-title">
-    <?= e('%s updated a comment on the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a>', Helper\escape($author), $task_id, $task_id) ?>
+    <?= e('%s updated a comment on the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a>', $this->e($author), $task_id, $task_id) ?>
 </p>
 <div class="activity-description">
-    <em><?= Helper\escape($task['title']) ?></em><br/>
+    <em><?= $this->e($task['title']) ?></em><br/>
 </div>
\ No newline at end of file
diff --git a/app/Template/event/subtask_create.php b/app/Template/event/subtask_create.php
index 664e9da2..3572031f 100644
--- a/app/Template/event/subtask_create.php
+++ b/app/Template/event/subtask_create.php
@@ -1,12 +1,12 @@
 <p class="activity-title">
-    <?= e('%s created a subtask for the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a>', Helper\escape($author), $task_id, $task_id) ?>
+    <?= e('%s created a subtask for the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a>', $this->e($author), $task_id, $task_id) ?>
 </p>
 <div class="activity-description">
-    <p><em><?= Helper\escape($task['title']) ?></em></p>
+    <p><em><?= $this->e($task['title']) ?></em></p>
 
     <ul>
         <li>
-            <?= Helper\escape($subtask['title']) ?> (<strong><?= Helper\escape($subtask['status_name']) ?></strong>)
+            <?= $this->e($subtask['title']) ?> (<strong><?= $this->e($subtask['status_name']) ?></strong>)
         </li>
         <li>
             <?php if ($subtask['username']): ?>
diff --git a/app/Template/event/subtask_update.php b/app/Template/event/subtask_update.php
index 96a589dd..0adc8ff5 100644
--- a/app/Template/event/subtask_update.php
+++ b/app/Template/event/subtask_update.php
@@ -1,12 +1,12 @@
 <p class="activity-title">
-    <?= e('%s updated a subtask for the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a>', Helper\escape($author), $task_id, $task_id) ?>
+    <?= e('%s updated a subtask for the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a>', $this->e($author), $task_id, $task_id) ?>
 </p>
 <div class="activity-description">
-    <p><em><?= Helper\escape($task['title']) ?></em></p>
+    <p><em><?= $this->e($task['title']) ?></em></p>
 
     <ul>
         <li>
-            <?= Helper\escape($subtask['title']) ?> (<strong><?= Helper\escape($subtask['status_name']) ?></strong>)
+            <?= $this->e($subtask['title']) ?> (<strong><?= $this->e($subtask['status_name']) ?></strong>)
         </li>
         <li>
             <?php if ($subtask['username']): ?>
diff --git a/app/Template/event/task_assignee_change.php b/app/Template/event/task_assignee_change.php
index b346325e..e9815853 100644
--- a/app/Template/event/task_assignee_change.php
+++ b/app/Template/event/task_assignee_change.php
@@ -1,12 +1,12 @@
 <p class="activity-title">
     <?= e(
             '%s change the assignee of the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a> to %s',
-            Helper\escape($author),
+            $this->e($author),
             $task_id,
             $task_id,
-            Helper\escape($task['assignee_name'] ?: $task['assignee_username'])
+            $this->e($task['assignee_name'] ?: $task['assignee_username'])
     ) ?>
 </p>
 <p class="activity-description">
-    <em><?= Helper\escape($task['title']) ?></em>
+    <em><?= $this->e($task['title']) ?></em>
 </p>
\ No newline at end of file
diff --git a/app/Template/event/task_close.php b/app/Template/event/task_close.php
index 48d25678..6ab476bd 100644
--- a/app/Template/event/task_close.php
+++ b/app/Template/event/task_close.php
@@ -1,6 +1,6 @@
 <p class="activity-title">
-    <?= e('%s closed the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a>', Helper\escape($author), $task_id, $task_id) ?>
+    <?= e('%s closed the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a>', $this->e($author), $task_id, $task_id) ?>
 </p>
 <p class="activity-description">
-    <em><?= Helper\escape($task['title']) ?></em>
+    <em><?= $this->e($task['title']) ?></em>
 </p>
\ No newline at end of file
diff --git a/app/Template/event/task_create.php b/app/Template/event/task_create.php
index 2515af05..36bd4713 100644
--- a/app/Template/event/task_create.php
+++ b/app/Template/event/task_create.php
@@ -1,6 +1,6 @@
 <p class="activity-title">
-    <?= e('%s created the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a>', Helper\escape($author), $task_id, $task_id) ?>
+    <?= e('%s created the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a>', $this->e($author), $task_id, $task_id) ?>
 </p>
 <p class="activity-description">
-    <em><?= Helper\escape($task['title']) ?></em>
+    <em><?= $this->e($task['title']) ?></em>
 </p>
\ 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 f2aac8f7..9c5f54dd 100644
--- a/app/Template/event/task_move_column.php
+++ b/app/Template/event/task_move_column.php
@@ -1,6 +1,6 @@
 <p class="activity-title">
-    <?= e('%s moved the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a> to the column "%s"', Helper\escape($author), $task_id, $task_id, Helper\escape($task['column_title'])) ?>
+    <?= e('%s moved the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a> to the column "%s"', $this->e($author), $task_id, $task_id, $this->e($task['column_title'])) ?>
 </p>
 <p class="activity-description">
-    <em><?= Helper\escape($task['title']) ?></em>
+    <em><?= $this->e($task['title']) ?></em>
 </p>
\ 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 26cdeb13..86e09953 100644
--- a/app/Template/event/task_move_position.php
+++ b/app/Template/event/task_move_position.php
@@ -1,6 +1,6 @@
 <p class="activity-title">
-    <?= e('%s moved the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a> to the position #%d in the column "%s"', Helper\escape($author), $task_id, $task_id, $task['position'], Helper\escape($task['column_title'])) ?>
+    <?= e('%s moved the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a> to the position #%d in the column "%s"', $this->e($author), $task_id, $task_id, $task['position'], $this->e($task['column_title'])) ?>
 </p>
 <p class="activity-description">
-    <em><?= Helper\escape($task['title']) ?></em>
+    <em><?= $this->e($task['title']) ?></em>
 </p>
\ No newline at end of file
diff --git a/app/Template/event/task_open.php b/app/Template/event/task_open.php
index 9623be74..cdcb907c 100644
--- a/app/Template/event/task_open.php
+++ b/app/Template/event/task_open.php
@@ -1,6 +1,6 @@
 <p class="activity-title">
-    <?= e('%s open the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a>', Helper\escape($author), $task_id, $task_id) ?>
+    <?= e('%s open the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a>', $this->e($author), $task_id, $task_id) ?>
 </p>
 <p class="activity-description">
-    <em><?= Helper\escape($task['title']) ?></em>
+    <em><?= $this->e($task['title']) ?></em>
 </p>
\ No newline at end of file
diff --git a/app/Template/event/task_update.php b/app/Template/event/task_update.php
index a270b936..34b96257 100644
--- a/app/Template/event/task_update.php
+++ b/app/Template/event/task_update.php
@@ -1,6 +1,6 @@
 <p class="activity-title">
-    <?= e('%s updated the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a>', Helper\escape($author), $task_id, $task_id) ?>
+    <?= e('%s updated the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a>', $this->e($author), $task_id, $task_id) ?>
 </p>
 <p class="activity-description">
-    <em><?= Helper\escape($task['title']) ?></em>
+    <em><?= $this->e($task['title']) ?></em>
 </p>
\ No newline at end of file