Helper refactoring

7 files changed, 18 insertions, 18 deletions

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 @@
             <tr>
                 <td>
                     <?= '#'.$user['id'] ?>&nbsp;
-                    <?= $this->url->link($this->e($user['username']), 'user', 'show', array('user_id' => $user['id'])) ?>
+                    <?= $this->url->link($this->text->e($user['username']), 'user', 'show', array('user_id' => $user['id'])) ?>
                 </td>
                 <td>
-                    <?= $this->e($user['name']) ?>
+                    <?= $this->text->e($user['name']) ?>
                 </td>
                 <td>
-                    <a href="mailto:<?= $this->e($user['email']) ?>"><?= $this->e($user['email']) ?></a>
+                    <a href="mailto:<?= $this->text->e($user['email']) ?>"><?= $this->text->e($user['email']) ?></a>
                 </td>
                 <td>
                     <?= $this->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 @@
     <?php foreach ($last_logins as $login): ?>
     <tr>
         <td><?= $this->dt->datetime($login['date_creation']) ?></td>
-        <td><?= $this->e($login['auth_type']) ?></td>
-        <td><?= $this->e($login['ip']) ?></td>
-        <td><?= $this->e($login['user_agent']) ?></td>
+        <td><?= $this->text->e($login['auth_type']) ?></td>
+        <td><?= $this->text->e($login['ip']) ?></td>
+        <td><?= $this->text->e($login['user_agent']) ?></td>
     </tr>
     <?php endforeach ?>
     </table>
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 @@
         <td><?= $this->dt->datetime($token['date_creation']) ?></td>
         <td><?= $this->dt->datetime($token['date_expiration']) ?></td>
         <td><?= $token['is_active'] == 0 ? t('No') : t('Yes') ?></td>
-        <td><?= $this->e($token['ip']) ?></td>
-        <td><?= $this->e($token['user_agent']) ?></td>
+        <td><?= $this->text->e($token['ip']) ?></td>
+        <td><?= $this->text->e($token['user_agent']) ?></td>
     </tr>
     <?php endforeach ?>
     </table>
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 @@
 <section id="main">
     <br>
     <ul class="listing">
-        <li><?= t('Username:') ?> <strong><?= $this->e($user['username']) ?></strong></li>
-        <li><?= t('Name:') ?> <strong><?= $this->e($user['name']) ?: t('None') ?></strong></li>
-        <li><?= t('Email:') ?> <strong><?= $this->e($user['email']) ?: t('None') ?></strong></li>
+        <li><?= t('Username:') ?> <strong><?= $this->text->e($user['username']) ?></strong></li>
+        <li><?= t('Name:') ?> <strong><?= $this->text->e($user['name']) ?: t('None') ?></strong></li>
+        <li><?= t('Email:') ?> <strong><?= $this->text->e($user['email']) ?: t('None') ?></strong></li>
     </ul>
 </section>
\ 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 @@
     <tr>
         <td><?= $this->dt->datetime($session['date_creation']) ?></td>
         <td><?= $this->dt->datetime($session['expiration']) ?></td>
-        <td><?= $this->e($session['ip']) ?></td>
-        <td><?= $this->e($session['user_agent']) ?></td>
+        <td><?= $this->text->e($session['ip']) ?></td>
+        <td><?= $this->text->e($session['user_agent']) ?></td>
         <td><?= $this->url->link(t('Remove'), 'User', 'removeSession', array('user_id' => $user['id'], 'id' => $session['id']), true) ?></td>
     </tr>
     <?php endforeach ?>
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 @@
     <h2><?= t('Summary') ?></h2>
 </div>
 <ul class="listing">
-    <li><?= t('Username:') ?> <strong><?= $this->e($user['username']) ?></strong></li>
-    <li><?= t('Name:') ?> <strong><?= $this->e($user['name']) ?: t('None') ?></strong></li>
-    <li><?= t('Email:') ?> <strong><?= $this->e($user['email']) ?: t('None') ?></strong></li>
+    <li><?= t('Username:') ?> <strong><?= $this->text->e($user['username']) ?></strong></li>
+    <li><?= t('Name:') ?> <strong><?= $this->text->e($user['name']) ?: t('None') ?></strong></li>
+    <li><?= t('Email:') ?> <strong><?= $this->text->e($user['email']) ?: t('None') ?></strong></li>
     <li><?= t('Status:') ?> <strong><?= $user['is_active'] ? t('Active') : t('Inactive') ?></strong></li>
 </ul>
 
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 @@
         </tr>
         <?php foreach ($subtask_paginator->getCollection() as $record): ?>
         <tr>
-            <td><?= $this->url->link($this->e($record['task_title']), 'task', 'show', array('project_id' => $record['project_id'], 'task_id' => $record['task_id'])) ?></td>
-            <td><?= $this->url->link($this->e($record['subtask_title']), 'task', 'show', array('project_id' => $record['project_id'], 'task_id' => $record['task_id'])) ?></td>
+            <td><?= $this->url->link($this->text->e($record['task_title']), 'task', 'show', array('project_id' => $record['project_id'], 'task_id' => $record['task_id'])) ?></td>
+            <td><?= $this->url->link($this->text->e($record['subtask_title']), 'task', 'show', array('project_id' => $record['project_id'], 'task_id' => $record['task_id'])) ?></td>
             <td><?= $this->dt->datetime($record['start']) ?></td>
             <td><?= $this->dt->datetime($record['end']) ?></td>
             <td><?= n($record['time_spent']).' '.t('hours') ?></td>