Simplified templates by using the default Smarty escape calls.

diff --git a/WEB-INF/templates/admin_team_delete.tpl b/WEB-INF/templates/admin_team_delete.tpl
index a320bd994e8b8ac9b71785d96f060b041f1745df..a8b0712f70b76137d9915aedc06ee741992b4f64 100644 (file)
--- a/WEB-INF/templates/admin_team_delete.tpl
+++ b/WEB-INF/templates/admin_team_delete.tpl
@@ -4,7 +4,7 @@
     <td>
       <table cellspacing="0" cellpadding="0" border="0">
         <tr>
     <td>
       <table cellspacing="0" cellpadding="0" border="0">
         <tr>

-          <td colspan="2" align="center"><b>{$team_to_delete|escape:'html'}</b></td>
+          <td colspan="2" align="center"><b>{$team_to_delete|escape}</b></td>

         </tr>
         <tr>
           <td colspan="2" align="center">&nbsp;</td>
         </tr>
         <tr>
           <td colspan="2" align="center">&nbsp;</td>

diff --git a/WEB-INF/templates/admin_teams.tpl b/WEB-INF/templates/admin_teams.tpl
index f68cea9d9c3f0ccd0bf6cd3130807bfcbae9b795..bb4c16ae60552d4912f993edbe63674b7874478d 100644 (file)
--- a/WEB-INF/templates/admin_teams.tpl
+++ b/WEB-INF/templates/admin_teams.tpl
@@ -19,7 +19,7 @@
   {foreach $teams as $team}
   <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
     <td>{$team.id}</td>
   {foreach $teams as $team}
   <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
     <td>{$team.id}</td>

-    <td>{$team.name|escape:'html'}</td>
+    <td>{$team.name|escape}</td>

     <td nowrap>{$team.date}</td>
     <td align="center">{$team.lang}</td>
     <td><a href="admin_team_edit.php?id={$team.id}">{$i18n.label.edit}</a></td>
     <td nowrap>{$team.date}</td>
     <td align="center">{$team.lang}</td>
     <td><a href="admin_team_edit.php?id={$team.id}">{$i18n.label.edit}</a></td>

diff --git a/WEB-INF/templates/cf_custom_field_delete.tpl b/WEB-INF/templates/cf_custom_field_delete.tpl
index d6746b07a4399fb97ce21fc1f658871f94602450..00ad37ffa81849e495fbc7f0d26beb492f5e80d5 100644 (file)
--- a/WEB-INF/templates/cf_custom_field_delete.tpl
+++ b/WEB-INF/templates/cf_custom_field_delete.tpl
@@ -5,7 +5,7 @@
 {if $user->canManageTeam()}
       <table cellspacing="0" cellpadding="0" border="0">
         <tr>
 {if $user->canManageTeam()}
       <table cellspacing="0" cellpadding="0" border="0">
         <tr>

-          <td colspan="2" align="center"><b>{$field|escape:'html'}</b></td>
+          <td colspan="2" align="center"><b>{$field|escape}</b></td>

         </tr>
         <tr>
           <td colspan="2" align="center">&nbsp;</td>
         </tr>
         <tr>
           <td colspan="2" align="center">&nbsp;</td>

diff --git a/WEB-INF/templates/cf_custom_fields.tpl b/WEB-INF/templates/cf_custom_fields.tpl
index 4a21d5b337dbf4ff06c08ca201348b79584f3569..54be19d2834eaa7e9485b3739912d1875b844b76 100644 (file)
--- a/WEB-INF/templates/cf_custom_fields.tpl
+++ b/WEB-INF/templates/cf_custom_fields.tpl
@@ -14,7 +14,7 @@
   {if $custom_fields}
     {foreach $custom_fields as $field}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
   {if $custom_fields}
     {foreach $custom_fields as $field}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">

-          <td>{$field['label']|escape:'html'}</td>
+          <td>{$field['label']|escape}</td>

       {if CustomFields::TYPE_TEXT == $field['type']}
           <td>{$i18n.label.type_text}</td>
           <td></td>
       {if CustomFields::TYPE_TEXT == $field['type']}
           <td>{$i18n.label.type_text}</td>
           <td></td>

diff --git a/WEB-INF/templates/cf_dropdown_option_delete.tpl b/WEB-INF/templates/cf_dropdown_option_delete.tpl
index 96b9db8a35b1a69e30a8744e52ead27c7b7e21e5..6a273db0e1423a6c97ba36088bcc5fedb102921f 100644 (file)
--- a/WEB-INF/templates/cf_dropdown_option_delete.tpl
+++ b/WEB-INF/templates/cf_dropdown_option_delete.tpl
@@ -5,7 +5,7 @@
 {if $user->canManageTeam()}
       <table cellspacing="0" cellpadding="0" border="0">
         <tr>
 {if $user->canManageTeam()}
       <table cellspacing="0" cellpadding="0" border="0">
         <tr>

-          <td colspan="2" align="center"><b>{$option|escape:'html'}</b></td>
+          <td colspan="2" align="center"><b>{$option|escape}</b></td>

         </tr>
         <tr>
           <td colspan="2" align="center">&nbsp;</td>
         </tr>
         <tr>
           <td colspan="2" align="center">&nbsp;</td>

diff --git a/WEB-INF/templates/cf_dropdown_options.tpl b/WEB-INF/templates/cf_dropdown_options.tpl
index 4446353ff26b28bc4e8bac80810bb3ca42cd048f..61a40435e0e111921ed62f57af7c734356460e35 100644 (file)
--- a/WEB-INF/templates/cf_dropdown_options.tpl
+++ b/WEB-INF/templates/cf_dropdown_options.tpl
@@ -16,7 +16,7 @@
   {if $options}
     {foreach $options as $key=>$val}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
   {if $options}
     {foreach $options as $key=>$val}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">

-          <td>{$val|escape:'html'}</td>
+          <td>{$val|escape}</td>

           <td><a href="cf_dropdown_option_edit.php?id={$key}">{$i18n.label.edit}</a></td>
           <td><a href="cf_dropdown_option_delete.php?id={$key}">{$i18n.label.delete}</a></td>
         </tr>
           <td><a href="cf_dropdown_option_edit.php?id={$key}">{$i18n.label.edit}</a></td>
           <td><a href="cf_dropdown_option_delete.php?id={$key}">{$i18n.label.delete}</a></td>
         </tr>

diff --git a/WEB-INF/templates/charts.tpl b/WEB-INF/templates/charts.tpl
index 4c676147fecd772c69e45fc079d2a1166b1ba31d..5e173e109a06383e6151e29ba9e9a99f1df54f89 100644 (file)
--- a/WEB-INF/templates/charts.tpl
+++ b/WEB-INF/templates/charts.tpl
@@ -22,7 +22,7 @@
       <table border="0" cellspacing="3">
       {section name=i loop=$totals}
       {if $smarty.section.i.index <= 12}
       <table border="0" cellspacing="3">
       {section name=i loop=$totals}
       {if $smarty.section.i.index <= 12}

-        <tr><td style="width:7px;height:1em;background-color:{$totals[i].color_html};"></td><td>{$totals[i].name|escape:'html'}</td></tr>
+        <tr><td style="width:7px;height:1em;background-color:{$totals[i].color_html};"></td><td>{$totals[i].name|escape}</td></tr>

       {/if}
       {/section}
       </table>
       {/if}
       {/section}
       </table>

diff --git a/WEB-INF/templates/client_delete.tpl b/WEB-INF/templates/client_delete.tpl
index 551b42e234a557ce9bb264aace00ba708d9211f1..f40b94c1209cc03983906d5ae42f7e710e53621b 100644 (file)
--- a/WEB-INF/templates/client_delete.tpl
+++ b/WEB-INF/templates/client_delete.tpl
@@ -5,7 +5,7 @@
       <table cellspacing="0" cellpadding="2" border="0">
         <tr>
           <td>{$i18n.form.client.client_to_delete}:</td>
       <table cellspacing="0" cellpadding="2" border="0">
         <tr>
           <td>{$i18n.form.client.client_to_delete}:</td>

-          <th>{$client_to_delete|escape:'html'}</th>
+          <th>{$client_to_delete|escape}</th>

         </tr>
         <tr>
           <td>{$i18n.form.client.client_entries}:</td>
         </tr>
         <tr>
           <td>{$i18n.form.client.client_entries}:</td>

diff --git a/WEB-INF/templates/clients.tpl b/WEB-INF/templates/clients.tpl
index eb46259f1a99d1de2db1271d0b55dc309613ef2d..2d19b001edba9deee07a313575b014b4563c271c 100644 (file)
--- a/WEB-INF/templates/clients.tpl
+++ b/WEB-INF/templates/clients.tpl
@@ -18,8 +18,8 @@
         </tr>
   {foreach $active_clients as $client}
         <tr valign="top" bgcolor="{cycle values="#f5f5f5,#dedee5"}">
         </tr>
   {foreach $active_clients as $client}
         <tr valign="top" bgcolor="{cycle values="#f5f5f5,#dedee5"}">

-          <td>{$client.name|escape:'html'}</td>
-          <td>{$client.address|escape:'html'}</td>
+          <td>{$client.name|escape}</td>
+          <td>{$client.address|escape}</td>

           <td><a href="client_edit.php?id={$client.id}">{$i18n.label.edit}</a></td>
           <td><a href="client_delete.php?id={$client.id}">{$i18n.label.delete}</a></td>
         </tr>
           <td><a href="client_edit.php?id={$client.id}">{$i18n.label.edit}</a></td>
           <td><a href="client_delete.php?id={$client.id}">{$i18n.label.delete}</a></td>
         </tr>


@@ -41,8 +41,8 @@
         </tr>
     {foreach $inactive_clients as $client}
         <tr valign="top" bgcolor="{cycle values="#f5f5f5,#dedee5"}">
         </tr>
     {foreach $inactive_clients as $client}
         <tr valign="top" bgcolor="{cycle values="#f5f5f5,#dedee5"}">

-          <td>{$client.name|escape:'html'}</td>
-          <td>{$client.address|escape:'html'}</td>
+          <td>{$client.name|escape}</td>
+          <td>{$client.address|escape}</td>

           <td><a href="client_edit.php?id={$client.id}">{$i18n.label.edit}</a></td>
           <td><a href="client_delete.php?id={$client.id}">{$i18n.label.delete}</a></td>
         </tr>
           <td><a href="client_edit.php?id={$client.id}">{$i18n.label.edit}</a></td>
           <td><a href="client_delete.php?id={$client.id}">{$i18n.label.delete}</a></td>
         </tr>

diff --git a/WEB-INF/templates/expense_delete.tpl b/WEB-INF/templates/expense_delete.tpl
index 1b2d6d62e6f377a0a027798725e7280712c6d879..2e6b97c5b9f0a3d04ae7691a690b49c2a1f576dd 100644 (file)
--- a/WEB-INF/templates/expense_delete.tpl
+++ b/WEB-INF/templates/expense_delete.tpl
@@ -16,12 +16,12 @@
   </tr>
   <tr bgcolor="{cycle values="#f5f5f5,#ccccce"}">
 {if $user->isPluginEnabled('cl')}
   </tr>
   <tr bgcolor="{cycle values="#f5f5f5,#ccccce"}">
 {if $user->isPluginEnabled('cl')}

-  <td>{$expense_item.client_name|escape:'html'}</td>
+  <td>{$expense_item.client_name|escape}</td>

 {/if}
 {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
 {/if}
 {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}

-    <td>{$expense_item.project_name|escape:'html'}</td>
+    <td>{$expense_item.project_name|escape}</td>

 {/if}
 {/if}

-    <td>{$expense_item.name|escape:'html'}</td>
+    <td>{$expense_item.name|escape}</td>

     <td align="right">{$expense_item.cost}</td>
   </tr>
   </table>
     <td align="right">{$expense_item.cost}</td>
   </tr>
   </table>

diff --git a/WEB-INF/templates/expense_edit.tpl b/WEB-INF/templates/expense_edit.tpl
index 7881d7929befa470ad57163e3f74ae71a04fe726..a9c095807cd6d48d7989e2b3394fb704794a2acf 100644 (file)
--- a/WEB-INF/templates/expense_edit.tpl
+++ b/WEB-INF/templates/expense_edit.tpl
@@ -94,7 +94,7 @@ function get_date() {
     </tr>
     <tr>
       <td align="right">{$i18n.label.cost}:</td>
     </tr>
     <tr>
       <td align="right">{$i18n.label.cost}:</td>

-      <td>{$forms.expenseItemForm.cost.control} {$user->currency|escape:'html'}</td>
+      <td>{$forms.expenseItemForm.cost.control} {$user->currency|escape}</td>

     </tr>
     <tr>
       <td align="right">{$i18n.label.date}:</td>
     </tr>
     <tr>
       <td align="right">{$i18n.label.date}:</td>

diff --git a/WEB-INF/templates/expenses.tpl b/WEB-INF/templates/expenses.tpl
index 12d9534d1ef1dfb2886a99f2dd62da6ddfadbb33..550e3efac85721439cb724400c89af2751be2249 100644 (file)
--- a/WEB-INF/templates/expenses.tpl
+++ b/WEB-INF/templates/expenses.tpl
@@ -97,7 +97,7 @@ function get_date() {
         </tr>
         <tr>
           <td align="right">{$i18n.label.cost} (*):</td>
         </tr>
         <tr>
           <td align="right">{$i18n.label.cost} (*):</td>

-          <td>{$forms.expensesForm.cost.control} {$user->currency|escape:'html'}</td>
+          <td>{$forms.expensesForm.cost.control} {$user->currency|escape}</td>

         </tr>
       </table>
     </td>
         </tr>
       </table>
     </td>


@@ -134,12 +134,12 @@ function get_date() {
   {foreach $expense_items as $item}
       <tr bgcolor="{cycle values="#f5f5f5,#ccccce"}">
     {if $user->isPluginEnabled('cl')}
   {foreach $expense_items as $item}
       <tr bgcolor="{cycle values="#f5f5f5,#ccccce"}">
     {if $user->isPluginEnabled('cl')}

-        <td valign='top'>{$item.client|escape:'html'}</td>
+        <td valign='top'>{$item.client|escape}</td>

     {/if}
     {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
     {/if}
     {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}

-        <td valign='top'>{$item.project|escape:'html'}</td>
+        <td valign='top'>{$item.project|escape}</td>

     {/if}
     {/if}

-        <td valign='top'>{$item.item|escape:'html'}</td>
+        <td valign='top'>{$item.item|escape}</td>

         <td valign='top' align='right'>{$item.cost}</td>
         <td valign='top' align='center'>{if $item.invoice_id}&nbsp;{else}<a href='expense_edit.php?id={$item.id}'>{$i18n.label.edit}</a>{/if}</td>
       </tr>
         <td valign='top' align='right'>{$item.cost}</td>
         <td valign='top' align='center'>{if $item.invoice_id}&nbsp;{else}<a href='expense_edit.php?id={$item.id}'>{$i18n.label.edit}</a>{/if}</td>
       </tr>


@@ -147,7 +147,7 @@ function get_date() {
     </table>
     <table border="0" cellpadding="3" cellspacing="1" width="100%">
       <tr>
     </table>
     <table border="0" cellpadding="3" cellspacing="1" width="100%">
       <tr>

-        <td nowrap align="right">{$i18n.label.day_total}: {$user->currency|escape:'html'} {$day_total}</td>
+        <td nowrap align="right">{$i18n.label.day_total}: {$user->currency|escape} {$day_total}</td>

       </tr>
     </table>
 {/if}
       </tr>
     </table>
 {/if}

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 5c1d5366489977b874deb7189dcd5dcc9466e414..072978852d564b02abe96c0aab6ea24da0410f15 100644 (file)
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@ -12,7 +12,7 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>

-          <td align="center">&nbsp;Anuko Time Tracker 1.9.35.3553 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.9.35.3554 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |

             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>
             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>

diff --git a/WEB-INF/templates/header.tpl b/WEB-INF/templates/header.tpl
index 3bedfb1eb35b0e783cec48acf8f42a723181a419..4e4a4146495e88e7e1e95b694cfa0ec0c967ee74 100644 (file)
--- a/WEB-INF/templates/header.tpl
+++ b/WEB-INF/templates/header.tpl
@@ -150,7 +150,7 @@
 {if $title}
       <table cellspacing="0" cellpadding="5" width="{$tab_width+20}" border="0">
         <tr><td class="sectionHeader"><div class="pageTitle">{$title}{if $timestring}: {$timestring}{/if}</div></td></tr>
 {if $title}
       <table cellspacing="0" cellpadding="5" width="{$tab_width+20}" border="0">
         <tr><td class="sectionHeader"><div class="pageTitle">{$title}{if $timestring}: {$timestring}{/if}</div></td></tr>

-        <tr><td>{$user->name|escape:'html'}{if $user->isAdmin()} {$i18n.label.role_admin}{elseif $user->isManager()} {$i18n.label.role_manager}{elseif $user->canManageTeam()} {$i18n.label.role_comanager}{/if}{if $user->behalf_id > 0} <b>{$i18n.label.on_behalf} {$user->behalf_name|escape:'html'}</b>{/if}{if $user->team}, {$user->team|escape:'html'}{/if}</td></tr>
+        <tr><td>{$user->name|escape}{if $user->isAdmin()} {$i18n.label.role_admin}{elseif $user->isManager()} {$i18n.label.role_manager}{elseif $user->canManageTeam()} {$i18n.label.role_comanager}{/if}{if $user->behalf_id > 0} <b>{$i18n.label.on_behalf} {$user->behalf_name|escape}</b>{/if}{if $user->team}, {$user->team|escape}{/if}</td></tr>

       </table>
 {/if}
       <!-- end of page title and user details -->
       </table>
 {/if}
       <!-- end of page title and user details -->

diff --git a/WEB-INF/templates/invoice_delete.tpl b/WEB-INF/templates/invoice_delete.tpl
index c89a72cdb56cff09a9e29d81d98d92badb8682e4..0f539377a704578ce3697ae64307b1bced534fbb 100644 (file)
--- a/WEB-INF/templates/invoice_delete.tpl
+++ b/WEB-INF/templates/invoice_delete.tpl
@@ -5,7 +5,7 @@
       <table cellspacing="0" cellpadding="2" border="0">
         <tr>
           <td>{$i18n.form.invoice.invoice_to_delete}:</td>
       <table cellspacing="0" cellpadding="2" border="0">
         <tr>
           <td>{$i18n.form.invoice.invoice_to_delete}:</td>

-          <th>{$invoice_to_delete|escape:'html'}</th>
+          <th>{$invoice_to_delete|escape}</th>

         </tr>
         <tr>
           <td>{$i18n.form.invoice.invoice_entries}:</td>
         </tr>
         <tr>
           <td>{$i18n.form.invoice.invoice_entries}:</td>

diff --git a/WEB-INF/templates/invoice_view.tpl b/WEB-INF/templates/invoice_view.tpl
index 57b917e7a62cb18a7bb4accdaf85cb8ed9e382d5..90c7ad7e09ef613a2c320ae9e9312ed3f97b7636 100644 (file)
--- a/WEB-INF/templates/invoice_view.tpl
+++ b/WEB-INF/templates/invoice_view.tpl
@@ -6,10 +6,10 @@
   <tr>
     <td>
       <table border=0 width=100%>
   <tr>
     <td>
       <table border=0 width=100%>

-        <tr><td align="center"><b style="font-size: 15pt; font-family: Arial, Helvetica, sans-serif;">{$i18n.title.invoice} {$invoice_name|escape:'html'} </b></td></tr>
+        <tr><td align="center"><b style="font-size: 15pt; font-family: Arial, Helvetica, sans-serif;">{$i18n.title.invoice} {$invoice_name|escape} </b></td></tr>

         <tr><td align='left'><b>{$i18n.label.date}:</b> {$invoice_date}</td></tr>
         <tr><td align='left'><b>{$i18n.label.date}:</b> {$invoice_date}</td></tr>

-        <tr><td align='left'><b>{$i18n.label.client}:</b> {$client_name|escape:'html'}</td></tr>
-        <tr><td align='left'><b>{$i18n.label.client_address}:</b> {$client_address|escape:'html'}</td></tr>
+        <tr><td align='left'><b>{$i18n.label.client}:</b> {$client_name|escape}</td></tr>
+        <tr><td align='left'><b>{$i18n.label.client_address}:</b> {$client_address|escape}</td></tr>

       </table>
     </td>
   </tr>
       </table>
     </td>
   </tr>


@@ -33,14 +33,14 @@
   {foreach $invoice_items as $invoice_item}
         <tr bgcolor="{cycle values="#f5f5f5,#ccccce"}">
           <td valign='top'>{$invoice_item.date}</td>
   {foreach $invoice_items as $invoice_item}
         <tr bgcolor="{cycle values="#f5f5f5,#ccccce"}">
           <td valign='top'>{$invoice_item.date}</td>

-          <td valign='top'>{$invoice_item.user_name|escape:'html'}</td>
+          <td valign='top'>{$invoice_item.user_name|escape}</td>

     {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
     {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}

-          <td valign='top'>{$invoice_item.project_name|escape:'html'}</td>
+          <td valign='top'>{$invoice_item.project_name|escape}</td>

     {/if}
     {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
     {/if}
     {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}

-          <td valign='top'>{$invoice_item.task_name|escape:'html'}</td>
+          <td valign='top'>{$invoice_item.task_name|escape}</td>

     {/if}
     {/if}

-          <td valign='top'>{$invoice_item.note|escape:'html'}</td>
+          <td valign='top'>{$invoice_item.note|escape}</td>

           <td align='right' valign='top'>{$invoice_item.duration}</td>
           <td align='right' valign='top'>{$invoice_item.cost}</td>
         </tr>
           <td align='right' valign='top'>{$invoice_item.duration}</td>
           <td align='right' valign='top'>{$invoice_item.cost}</td>
         </tr>


@@ -49,16 +49,16 @@
   {if $tax}
         <tr>
           <td align="right" colspan="{$colspan}"><b>{$i18n.label.subtotal}:</b></td>
   {if $tax}
         <tr>
           <td align="right" colspan="{$colspan}"><b>{$i18n.label.subtotal}:</b></td>

-          <td align="right"><nobr>{$subtotal|escape:'html'}</nobr></td>
+          <td align="right"><nobr>{$subtotal|escape}</nobr></td>

         </tr>
         <tr>
           <td align="right" colspan="{$colspan}"><b>{$i18n.label.tax}:</b></td>
         </tr>
         <tr>
           <td align="right" colspan="{$colspan}"><b>{$i18n.label.tax}:</b></td>

-          <td align="right"><nobr>{$tax|escape:'html'}</nobr></td>
+          <td align="right"><nobr>{$tax|escape}</nobr></td>

         </tr>
    {/if}
         <tr>
           <td align="right" colspan="{$colspan}"><b>{$i18n.label.total}:</b></td>
         </tr>
    {/if}
         <tr>
           <td align="right" colspan="{$colspan}"><b>{$i18n.label.total}:</b></td>

-          <td align="right"><nobr>{$total|escape:'html'}</nobr></td>
+          <td align="right"><nobr>{$total|escape}</nobr></td>

         </tr>
       </table>
 {/if}
         </tr>
       </table>
 {/if}

diff --git a/WEB-INF/templates/invoices.tpl b/WEB-INF/templates/invoices.tpl
index 56046f451cf8236f7ce5b8cbbc89eb14f1878d0f..4d6f50a90a82f0797a0656f32883df9420f617cf 100644 (file)
--- a/WEB-INF/templates/invoices.tpl
+++ b/WEB-INF/templates/invoices.tpl
@@ -18,8 +18,8 @@
         </tr>
         {foreach $invoices as $invoice}
         <tr valign="top" bgcolor="{cycle values="#f5f5f5,#dedee5"}">
         </tr>
         {foreach $invoices as $invoice}
         <tr valign="top" bgcolor="{cycle values="#f5f5f5,#dedee5"}">

-          <td>{$invoice.name|escape:'html'}</td>
-          <td>{$invoice.client_name|escape:'html'}</td>
+          <td>{$invoice.name|escape}</td>
+          <td>{$invoice.client_name|escape}</td>

           <td>{$invoice.date}</td>
           <td><a href="invoice_view.php?id={$invoice.id}">{$i18n.label.view}</a></td>
   {if !$user->isClient()}
           <td>{$invoice.date}</td>
           <td><a href="invoice_view.php?id={$invoice.id}">{$i18n.label.view}</a></td>
   {if !$user->isClient()}

diff --git a/WEB-INF/templates/mobile/client_delete.tpl b/WEB-INF/templates/mobile/client_delete.tpl
index 551b42e234a557ce9bb264aace00ba708d9211f1..f40b94c1209cc03983906d5ae42f7e710e53621b 100644 (file)
--- a/WEB-INF/templates/mobile/client_delete.tpl
+++ b/WEB-INF/templates/mobile/client_delete.tpl
@@ -5,7 +5,7 @@
       <table cellspacing="0" cellpadding="2" border="0">
         <tr>
           <td>{$i18n.form.client.client_to_delete}:</td>
       <table cellspacing="0" cellpadding="2" border="0">
         <tr>
           <td>{$i18n.form.client.client_to_delete}:</td>

-          <th>{$client_to_delete|escape:'html'}</th>
+          <th>{$client_to_delete|escape}</th>

         </tr>
         <tr>
           <td>{$i18n.form.client.client_entries}:</td>
         </tr>
         <tr>
           <td>{$i18n.form.client.client_entries}:</td>

diff --git a/WEB-INF/templates/mobile/clients.tpl b/WEB-INF/templates/mobile/clients.tpl
index a61320115643322e84d17ffe5fb146cde291254e..00a19eee7d50c9cf2a4ebf2ab188c5a519ea2572 100644 (file)
--- a/WEB-INF/templates/mobile/clients.tpl
+++ b/WEB-INF/templates/mobile/clients.tpl
@@ -16,8 +16,8 @@
         </tr>
   {foreach $active_clients as $client}
         <tr valign="top" bgcolor="{cycle values="#f5f5f5,#dedee5"}">
         </tr>
   {foreach $active_clients as $client}
         <tr valign="top" bgcolor="{cycle values="#f5f5f5,#dedee5"}">

-          <td><a href="client_edit.php?id={$client.id}">{$client.name|escape:'html'}</a></td>
-          <td>{$client.address|escape:'html'}</td>
+          <td><a href="client_edit.php?id={$client.id}">{$client.name|escape}</a></td>
+          <td>{$client.address|escape}</td>

         </tr>
   {/foreach}
       </table>
         </tr>
   {/foreach}
       </table>


@@ -35,8 +35,8 @@
         </tr>
     {foreach $inactive_clients as $client}
         <tr valign="top" bgcolor="{cycle values="#f5f5f5,#dedee5"}">
         </tr>
     {foreach $inactive_clients as $client}
         <tr valign="top" bgcolor="{cycle values="#f5f5f5,#dedee5"}">

-          <td><a href="client_edit.php?id={$client.id}">{$client.name|escape:'html'}</a></td>
-          <td>{$client.address|escape:'html'}</td>
+          <td><a href="client_edit.php?id={$client.id}">{$client.name|escape}</a></td>
+          <td>{$client.address|escape}</td>

         </tr>
     {/foreach}
       </table>
         </tr>
     {/foreach}
       </table>

diff --git a/WEB-INF/templates/mobile/expense_delete.tpl b/WEB-INF/templates/mobile/expense_delete.tpl
index 8fc771c40e0eea615952e9a1dadc3ea49e730818..5685bd66308bf6e978915c2a694fe044b9ba706a 100644 (file)
--- a/WEB-INF/templates/mobile/expense_delete.tpl
+++ b/WEB-INF/templates/mobile/expense_delete.tpl
@@ -16,12 +16,12 @@
   </tr>
   <tr bgcolor="{cycle values="#f5f5f5,#ccccce"}">
 {if $user->isPluginEnabled('cl')}
   </tr>
   <tr bgcolor="{cycle values="#f5f5f5,#ccccce"}">
 {if $user->isPluginEnabled('cl')}

-  <td>{$expense_item.client_name|escape:'html'}</td>
+  <td>{$expense_item.client_name|escape}</td>

 {/if}
 {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
 {/if}
 {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}

-    <td>{$expense_item.project_name|escape:'html'}</td>
+    <td>{$expense_item.project_name|escape}</td>

 {/if}
 {/if}

-    <td>{$expense_item.name|escape:'html'}</td>
+    <td>{$expense_item.name|escape}</td>

     <td align="right">{$expense_item.cost}</td>
   </tr>
   </table>
     <td align="right">{$expense_item.cost}</td>
   </tr>
   </table>

diff --git a/WEB-INF/templates/mobile/expense_edit.tpl b/WEB-INF/templates/mobile/expense_edit.tpl
index 7881d7929befa470ad57163e3f74ae71a04fe726..a9c095807cd6d48d7989e2b3394fb704794a2acf 100644 (file)
--- a/WEB-INF/templates/mobile/expense_edit.tpl
+++ b/WEB-INF/templates/mobile/expense_edit.tpl
@@ -94,7 +94,7 @@ function get_date() {
     </tr>
     <tr>
       <td align="right">{$i18n.label.cost}:</td>
     </tr>
     <tr>
       <td align="right">{$i18n.label.cost}:</td>

-      <td>{$forms.expenseItemForm.cost.control} {$user->currency|escape:'html'}</td>
+      <td>{$forms.expenseItemForm.cost.control} {$user->currency|escape}</td>

     </tr>
     <tr>
       <td align="right">{$i18n.label.date}:</td>
     </tr>
     <tr>
       <td align="right">{$i18n.label.date}:</td>

diff --git a/WEB-INF/templates/mobile/expenses.tpl b/WEB-INF/templates/mobile/expenses.tpl
index a0fe73f9657a54c8d8c879f51dcb2e0105acf6f6..276f82658c475ad15e9f894e11efa68a53128167 100644 (file)
--- a/WEB-INF/templates/mobile/expenses.tpl
+++ b/WEB-INF/templates/mobile/expenses.tpl
@@ -106,7 +106,7 @@ function get_date() {
         </tr>
         <tr>
           <td align="right">{$i18n.label.cost} (*):</td>
         </tr>
         <tr>
           <td align="right">{$i18n.label.cost} (*):</td>

-          <td>{$forms.expensesForm.cost.control} {$user->currency|escape:'html'}</td>
+          <td>{$forms.expensesForm.cost.control} {$user->currency|escape}</td>

         </tr>
       </table>
     </td>
         </tr>
       </table>
     </td>


@@ -144,19 +144,19 @@ function get_date() {
   {foreach $expense_items as $item}
       <tr bgcolor="{cycle values="#f5f5f5,#ccccce"}">
     {if $user->isPluginEnabled('cl')}
   {foreach $expense_items as $item}
       <tr bgcolor="{cycle values="#f5f5f5,#ccccce"}">
     {if $user->isPluginEnabled('cl')}

-        <td valign='top'>{$item.client|escape:'html'}</td>
+        <td valign='top'>{$item.client|escape}</td>

     {/if}
     {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
     {/if}
     {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}

-        <td valign='top'>{$item.project|escape:'html'}</td>
+        <td valign='top'>{$item.project|escape}</td>

     {/if}
     {/if}

-        <td valign='top'>{if $item.invoice_id} {$item.item|escape:'html'} {else}<a href='expense_edit.php?id={$item.id}'>{$item.item|escape:'html'}</a>{/if}</td>
+        <td valign='top'>{if $item.invoice_id} {$item.item|escape} {else}<a href='expense_edit.php?id={$item.id}'>{$item.item|escape}</a>{/if}</td>

         <td valign='top' align='right'>{$item.cost}</td>
       </tr>
   {/foreach}
     </table>
     <table border="0" cellpadding="3" cellspacing="1" width="100%">
       <tr>
         <td valign='top' align='right'>{$item.cost}</td>
       </tr>
   {/foreach}
     </table>
     <table border="0" cellpadding="3" cellspacing="1" width="100%">
       <tr>

-        <td nowrap align="right">{$i18n.label.day_total}: {$user->currency|escape:'html'} {$day_total}</td>
+        <td nowrap align="right">{$i18n.label.day_total}: {$user->currency|escape} {$day_total}</td>

       </tr>
     </table>
 {/if}
       </tr>
     </table>
 {/if}

diff --git a/WEB-INF/templates/mobile/project_delete.tpl b/WEB-INF/templates/mobile/project_delete.tpl
index 620414345efa55fdc3772d26282a13770d3aba12..98d3e836d603d3199669badc5f6f07afefc3405f 100644 (file)
--- a/WEB-INF/templates/mobile/project_delete.tpl
+++ b/WEB-INF/templates/mobile/project_delete.tpl
@@ -4,7 +4,7 @@
     <td>
       <table cellspacing="0" cellpadding="0" border="0">
         <tr>
     <td>
       <table cellspacing="0" cellpadding="0" border="0">
         <tr>

-          <td colspan="2" align="center"><b>{$project_to_delete|escape:'html'}</b></td>
+          <td colspan="2" align="center"><b>{$project_to_delete|escape}</b></td>

         </tr>
         <tr><td colspan="2" align="center">&nbsp;</td></tr>
         <tr>
         </tr>
         <tr><td colspan="2" align="center">&nbsp;</td></tr>
         <tr>

diff --git a/WEB-INF/templates/mobile/projects.tpl b/WEB-INF/templates/mobile/projects.tpl
index b371c80309abd7ad003ec11fe283be09b72fa301..d40e792a887bae3bb83dcbaf3f19cd0076f5a475 100644 (file)
--- a/WEB-INF/templates/mobile/projects.tpl
+++ b/WEB-INF/templates/mobile/projects.tpl
@@ -17,8 +17,8 @@
   {if $active_projects}
     {foreach $active_projects as $project}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
   {if $active_projects}
     {foreach $active_projects as $project}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">

-          <td><a href="project_edit.php?id={$project.id}">{$project.name|escape:'html'}</a></td>
-          <td>{$project.description|escape:'html'}</td>
+          <td><a href="project_edit.php?id={$project.id}">{$project.name|escape}</a></td>
+          <td>{$project.description|escape}</td>

         </tr>
     {/foreach}
   {/if}
         </tr>
     {/foreach}
   {/if}


@@ -41,8 +41,8 @@
         </tr>
     {foreach $inactive_projects as $project}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
         </tr>
     {foreach $inactive_projects as $project}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">

-          <td><a href="project_edit.php?id={$project.id}">{$project.name|escape:'html'}</a></td>
-          <td>{$project.description|escape:'html'}</td>
+          <td><a href="project_edit.php?id={$project.id}">{$project.name|escape}</a></td>
+          <td>{$project.description|escape}</td>

         </tr>
     {/foreach}
       </table>
         </tr>
     {/foreach}
       </table>


@@ -64,8 +64,8 @@
   {if $active_projects}
     {foreach $active_projects as $project}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
   {if $active_projects}
     {foreach $active_projects as $project}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">

-          <td>{$project.name|escape:'html'}</td>
-          <td>{$project.description|escape:'html'}</td>
+          <td>{$project.name|escape}</td>
+          <td>{$project.description|escape}</td>

         </tr>
     {/foreach}
   {/if}
         </tr>
     {/foreach}
   {/if}

diff --git a/WEB-INF/templates/mobile/task_delete.tpl b/WEB-INF/templates/mobile/task_delete.tpl
index f25cc951fbf5e5582a73fc1ce21954985efecc70..9f16d7c3a2f39ef1c5034845e4145f785bc3f309 100644 (file)
--- a/WEB-INF/templates/mobile/task_delete.tpl
+++ b/WEB-INF/templates/mobile/task_delete.tpl
@@ -4,7 +4,7 @@
     <td>
       <table cellspacing="0" cellpadding="0" border="0">
         <tr>
     <td>
       <table cellspacing="0" cellpadding="0" border="0">
         <tr>

-          <td colspan="2" align="center"><b>{$task_to_delete|escape:'html'}</b></td>
+          <td colspan="2" align="center"><b>{$task_to_delete|escape}</b></td>

         </tr>
         <tr>
           <td colspan="2" align="center">&nbsp;</td>
         </tr>
         <tr>
           <td colspan="2" align="center">&nbsp;</td>

diff --git a/WEB-INF/templates/mobile/tasks.tpl b/WEB-INF/templates/mobile/tasks.tpl
index c877e98947a88964febc6cf1e0d193d9a1a842c7..8ed15fb8aa7ac6e7d4a6b077b4ca392c793f3920 100644 (file)
--- a/WEB-INF/templates/mobile/tasks.tpl
+++ b/WEB-INF/templates/mobile/tasks.tpl
@@ -17,8 +17,8 @@
   {if $active_tasks}
     {foreach $active_tasks as $task}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
   {if $active_tasks}
     {foreach $active_tasks as $task}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">

-          <td><a href="task_edit.php?id={$task.id}">{$task.name|escape:'html'}</a></td>
-          <td>{$task.description|escape:'html'}</td>
+          <td><a href="task_edit.php?id={$task.id}">{$task.name|escape}</a></td>
+          <td>{$task.description|escape}</td>

         </tr>
     {/foreach}
   {/if}
         </tr>
     {/foreach}
   {/if}


@@ -41,8 +41,8 @@
         </tr>
     {foreach $inactive_tasks as $task}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
         </tr>
     {foreach $inactive_tasks as $task}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">

-          <td><a href="task_edit.php?id={$task.id}">{$task.name|escape:'html'}</a></td>
-          <td>{$task.description|escape:'html'}</td>
+          <td><a href="task_edit.php?id={$task.id}">{$task.name|escape}</a></td>
+          <td>{$task.description|escape}</td>

         </tr>
     {/foreach}
       </table>
         </tr>
     {/foreach}
       </table>


@@ -64,8 +64,8 @@
   {if $active_tasks}
     {foreach $active_tasks as $task}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
   {if $active_tasks}
     {foreach $active_tasks as $task}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">

-          <td>{$task.name|escape:'html'}</td>
-          <td>{$task.description|escape:'html'}</td>
+          <td>{$task.name|escape}</td>
+          <td>{$task.description|escape}</td>

         </tr>
     {/foreach}
   {/if}
         </tr>
     {/foreach}
   {/if}

diff --git a/WEB-INF/templates/mobile/time.tpl b/WEB-INF/templates/mobile/time.tpl
index c3e9b59b56bbfa23fad31b6b591f8236146a789c..83bb19f7bd38197c836156e9eca7eab3f6ef0c5d 100644 (file)
--- a/WEB-INF/templates/mobile/time.tpl
+++ b/WEB-INF/templates/mobile/time.tpl
@@ -224,7 +224,7 @@ function get_date() {
       {foreach $time_records as $record}
       <tr bgcolor="{cycle values="#ccccce,#f5f5f5"}" {if !$record.billable} class="not_billable" {/if}>
 {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
       {foreach $time_records as $record}
       <tr bgcolor="{cycle values="#ccccce,#f5f5f5"}" {if !$record.billable} class="not_billable" {/if}>
 {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}

-        <td valign='top'>{$record.project|escape:'html'}</td>
+        <td valign='top'>{$record.project|escape}</td>

 {/if}
         <td align='right' valign='top'>{if ($record.duration == '0:00' && $record.start <> '')}<font color="#ff0000">{/if}{$record.duration}{if ($record.duration == '0:00' && $record.start <> '')}</font>{/if}</td>
         <td align='center'>{if $record.invoice_id}&nbsp;{else}<a href='time_edit.php?id={$record.id}'>{$i18n.label.edit}</a>{/if}</td>
 {/if}
         <td align='right' valign='top'>{if ($record.duration == '0:00' && $record.start <> '')}<font color="#ff0000">{/if}{$record.duration}{if ($record.duration == '0:00' && $record.start <> '')}</font>{/if}</td>
         <td align='center'>{if $record.invoice_id}&nbsp;{else}<a href='time_edit.php?id={$record.id}'>{$i18n.label.edit}</a>{/if}</td>


@@ -258,7 +258,7 @@ function get_date() {
     <tr><td><label>{$forms.timeRecordForm.billable.control}{$i18n.form.time.billable}</label></td></tr>
 {/if}
 {if ($custom_fields && $custom_fields->fields[0])}
     <tr><td><label>{$forms.timeRecordForm.billable.control}{$i18n.form.time.billable}</label></td></tr>
 {/if}
 {if ($custom_fields && $custom_fields->fields[0])}

-      <tr><td>{$custom_fields->fields[0]['label']|escape:'html'}:</td></tr>
+      <tr><td>{$custom_fields->fields[0]['label']|escape}:</td></tr>

       <tr><td>{$forms.timeRecordForm.cf_1.control}</td></tr>
 {/if}
 {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
       <tr><td>{$forms.timeRecordForm.cf_1.control}</td></tr>
 {/if}
 {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}

diff --git a/WEB-INF/templates/mobile/time_delete.tpl b/WEB-INF/templates/mobile/time_delete.tpl
index 380e95bcf091d3ff82e67c7e5ac04c75f5c9611f..bda0e93ee83adec174c7fd8d21a506a371b3be0b 100644 (file)
--- a/WEB-INF/templates/mobile/time_delete.tpl
+++ b/WEB-INF/templates/mobile/time_delete.tpl
@@ -12,10 +12,10 @@
   </tr>
   <tr bgcolor="#f5f5f5">
 {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
   </tr>
   <tr bgcolor="#f5f5f5">
 {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}

-    <td>{$time_rec.project_name|escape:'html'}</td>
+    <td>{$time_rec.project_name|escape}</td>

 {/if}
     <td align="right">{if ($time_rec.duration == '0:00' && $time_rec.start <> '')}<font color="#ff0000">{$i18n.form.time.uncompleted}</font>{else}{$time_rec.duration}{/if}</td>
 {/if}
     <td align="right">{if ($time_rec.duration == '0:00' && $time_rec.start <> '')}<font color="#ff0000">{$i18n.form.time.uncompleted}</font>{else}{$time_rec.duration}{/if}</td>

-    <td>{if $time_rec.comment}{$time_rec.comment|escape:'html'}{else}&nbsp;{/if}</td>
+    <td>{if $time_rec.comment}{$time_rec.comment|escape}{else}&nbsp;{/if}</td>

   </tr>
   </table>
   <table width="100%">
   </tr>
   </table>
   <table width="100%">

diff --git a/WEB-INF/templates/mobile/time_edit.tpl b/WEB-INF/templates/mobile/time_edit.tpl
index f6381d6a9c8161e486668324c36142d07dd1fc1c..17c970d6e831af68b1fc243e2c1aa161618fdc67 100644 (file)
--- a/WEB-INF/templates/mobile/time_edit.tpl
+++ b/WEB-INF/templates/mobile/time_edit.tpl
@@ -218,7 +218,7 @@ function get_date() {
     <tr><td><label>{$forms.timeRecordForm.billable.control}{$i18n.form.time.billable}</label></td></tr>
 {/if}
 {if ($custom_fields && $custom_fields->fields[0])} 
     <tr><td><label>{$forms.timeRecordForm.billable.control}{$i18n.form.time.billable}</label></td></tr>
 {/if}
 {if ($custom_fields && $custom_fields->fields[0])} 

-    <tr><td>{$custom_fields->fields[0]['label']|escape:'html'}:</td></tr>
+    <tr><td>{$custom_fields->fields[0]['label']|escape}:</td></tr>

     <tr><td>{$forms.timeRecordForm.cf_1.control}</td></tr>
 {/if}
 {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
     <tr><td>{$forms.timeRecordForm.cf_1.control}</td></tr>
 {/if}
 {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}

diff --git a/WEB-INF/templates/mobile/timer.tpl b/WEB-INF/templates/mobile/timer.tpl
index c8df7988eef5b7cba68fb6059681a1bb09015b41..e1c7d76e440e2f7eee895f987e2c156424f6a63b 100644 (file)
--- a/WEB-INF/templates/mobile/timer.tpl
+++ b/WEB-INF/templates/mobile/timer.tpl
@@ -225,7 +225,7 @@ startTimer();
     <tr><td><label>{$forms.timerRecordForm.billable.control}{$i18n.form.time.billable}</label></td></tr>
 {/if}
 {if ($custom_fields && $custom_fields->fields[0])}
     <tr><td><label>{$forms.timerRecordForm.billable.control}{$i18n.form.time.billable}</label></td></tr>
 {/if}
 {if ($custom_fields && $custom_fields->fields[0])}

-      <tr><td>{$custom_fields->fields[0]['label']|escape:'html'}:</td></tr>
+      <tr><td>{$custom_fields->fields[0]['label']|escape}:</td></tr>

       <tr><td>{$forms.timerRecordForm.cf_1.control}</td></tr>
 {/if}
 {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
       <tr><td>{$forms.timerRecordForm.cf_1.control}</td></tr>
 {/if}
 {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}

diff --git a/WEB-INF/templates/mobile/user_delete.tpl b/WEB-INF/templates/mobile/user_delete.tpl
index 1f5b442e40ed60b2f3e201c4334a3d1371ea004d..e85d97f1f9a2848c6f5364d9a8dccb0218615e1b 100644 (file)
--- a/WEB-INF/templates/mobile/user_delete.tpl
+++ b/WEB-INF/templates/mobile/user_delete.tpl
@@ -4,7 +4,7 @@
     <td>
       <table cellspacing="0" cellpadding="0" border="0">
         <tr>
     <td>
       <table cellspacing="0" cellpadding="0" border="0">
         <tr>

-          <td colspan="2" align="center"><b>{$user_to_delete|escape:'html'}</b></td>
+          <td colspan="2" align="center"><b>{$user_to_delete|escape}</b></td>

         </tr>
         <tr>
           <td colspan="2" align="center">&nbsp;</td>
         </tr>
         <tr>
           <td colspan="2" align="center">&nbsp;</td>

diff --git a/WEB-INF/templates/mobile/users.tpl b/WEB-INF/templates/mobile/users.tpl
index 202e018e3739ea4636f375f81e584a3c6f54d83b..6ff3269a9dab366ae86f93896ff9b28ce4a3f899 100644 (file)
--- a/WEB-INF/templates/mobile/users.tpl
+++ b/WEB-INF/templates/mobile/users.tpl
@@ -23,16 +23,16 @@
               <span class="uncompleted-entry{if $u.has_uncompleted_entry} active{/if}"{if $u.has_uncompleted_entry} title="{$i18n.form.users.uncompleted_entry}"{/if}></span>
             {/if}
             {if $user->isManager()}
               <span class="uncompleted-entry{if $u.has_uncompleted_entry} active{/if}"{if $u.has_uncompleted_entry} title="{$i18n.form.users.uncompleted_entry}"{/if}></span>
             {/if}
             {if $user->isManager()}

-              <a href="user_edit.php?id={$u.id}">{$u.name|escape:'html'}</a>
+              <a href="user_edit.php?id={$u.id}">{$u.name|escape}</a>

             {else}
               {if ($user->id == $u.id) || ($smarty.const.ROLE_CLIENT == $u.role) || ($smarty.const.ROLE_USER == $u.role)}
             {else}
               {if ($user->id == $u.id) || ($smarty.const.ROLE_CLIENT == $u.role) || ($smarty.const.ROLE_USER == $u.role)}

-                <a href="user_edit.php?id={$u.id}">{$u.name|escape:'html'}</a>
+                <a href="user_edit.php?id={$u.id}">{$u.name|escape}</a>

               {else}
               {else}

-                {$u.name|escape:'html'}
+                {$u.name|escape}

               {/if}
             {/if}
           </td>
               {/if}
             {/if}
           </td>

-          <td>{$u.login|escape:'html'}</td>
+          <td>{$u.login|escape}</td>

       {if $smarty.const.ROLE_MANAGER == $u.role}
             <td>{$i18n.form.users.manager}</td>
       {elseif $smarty.const.ROLE_COMANAGER == $u.role}
       {if $smarty.const.ROLE_MANAGER == $u.role}
             <td>{$i18n.form.users.manager}</td>
       {elseif $smarty.const.ROLE_COMANAGER == $u.role}


@@ -68,12 +68,12 @@
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
           <td>
             {if $user->isManager()}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
           <td>
             {if $user->isManager()}

-              <a href="user_edit.php?id={$u.id}">{$u.name|escape:'html'}</a>
+              <a href="user_edit.php?id={$u.id}">{$u.name|escape}</a>

             {else}
             {else}

-              {if ($user->id == $u.id) || ($smarty.const.ROLE_CLIENT == $u.role) || ($smarty.const.ROLE_USER == $u.role)}<a href="user_edit.php?id={$u.id}">{$u.name|escape:'html'}</a>{/if}
+              {if ($user->id == $u.id) || ($smarty.const.ROLE_CLIENT == $u.role) || ($smarty.const.ROLE_USER == $u.role)}<a href="user_edit.php?id={$u.id}">{$u.name|escape}</a>{/if}

             {/if}
           </td>
             {/if}
           </td>

-          <td>{$u.login|escape:'html'}</td>
+          <td>{$u.login|escape}</td>

       {if $smarty.const.ROLE_MANAGER == $u.role}
             <td>{$i18n.form.users.manager}</td>
       {elseif $smarty.const.ROLE_COMANAGER == $u.role}
       {if $smarty.const.ROLE_MANAGER == $u.role}
             <td>{$i18n.form.users.manager}</td>
       {elseif $smarty.const.ROLE_COMANAGER == $u.role}


@@ -112,8 +112,8 @@
         </tr>
   {foreach $active_users as $u}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
         </tr>
   {foreach $active_users as $u}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">

-          <td>{$u.name|escape:'html'}</td>
-          <td>{$u.login|escape:'html'}</td>
+          <td>{$u.name|escape}</td>
+          <td>{$u.login|escape}</td>

     {if $smarty.const.ROLE_MANAGER == $u.role}
             <td>{$i18n.form.users.manager}</td>
     {elseif $smarty.const.ROLE_COMANAGER == $u.role}
     {if $smarty.const.ROLE_MANAGER == $u.role}
             <td>{$i18n.form.users.manager}</td>
     {elseif $smarty.const.ROLE_COMANAGER == $u.role}

diff --git a/WEB-INF/templates/notification_delete.tpl b/WEB-INF/templates/notification_delete.tpl
index 919453d731c01ea18956e7f43f5c335876e1d7a6..fac015c3adbfcfe509268f86e649cf8348e9a992 100644 (file)
--- a/WEB-INF/templates/notification_delete.tpl
+++ b/WEB-INF/templates/notification_delete.tpl
@@ -4,7 +4,7 @@
     <td>
       <table cellspacing="0" cellpadding="0" border="0">
         <tr>
     <td>
       <table cellspacing="0" cellpadding="0" border="0">
         <tr>

-          <td colspan="2" align="center"><b>{$notification_to_delete|escape:'html'}</b></td>
+          <td colspan="2" align="center"><b>{$notification_to_delete|escape}</b></td>

         </tr>
         <tr><td colspan="2" align="center">&nbsp;</td></tr>
         <tr>
         </tr>
         <tr><td colspan="2" align="center">&nbsp;</td></tr>
         <tr>

diff --git a/WEB-INF/templates/notifications.tpl b/WEB-INF/templates/notifications.tpl
index 7daf3dc9215cce5f561e8b2679fae927b55625b1..7d51f52ad7b57ae66f4090f853a0c7efe0aebb7d 100644 (file)
--- a/WEB-INF/templates/notifications.tpl
+++ b/WEB-INF/templates/notifications.tpl
@@ -14,9 +14,9 @@
   {if $notifications}
     {foreach $notifications as $notification}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
   {if $notifications}
     {foreach $notifications as $notification}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">

-          <td>{$notification['name']|escape:'html'}</td>
-          <td>{$notification['cron_spec']|escape:'html'}</td>
-          <td>{$notification['email']|escape:'html'}</td>
+          <td>{$notification['name']|escape}</td>
+          <td>{$notification['cron_spec']|escape}</td>
+          <td>{$notification['email']|escape}</td>

           <td><a href="notification_edit.php?id={$notification['id']}">{$i18n.label.edit}</a></td>
           <td><a href="notification_delete.php?id={$notification['id']}">{$i18n.label.delete}</a></td>
         </tr>
           <td><a href="notification_edit.php?id={$notification['id']}">{$i18n.label.edit}</a></td>
           <td><a href="notification_delete.php?id={$notification['id']}">{$i18n.label.delete}</a></td>
         </tr>

diff --git a/WEB-INF/templates/project_delete.tpl b/WEB-INF/templates/project_delete.tpl
index 620414345efa55fdc3772d26282a13770d3aba12..98d3e836d603d3199669badc5f6f07afefc3405f 100644 (file)
--- a/WEB-INF/templates/project_delete.tpl
+++ b/WEB-INF/templates/project_delete.tpl
@@ -4,7 +4,7 @@
     <td>
       <table cellspacing="0" cellpadding="0" border="0">
         <tr>
     <td>
       <table cellspacing="0" cellpadding="0" border="0">
         <tr>

-          <td colspan="2" align="center"><b>{$project_to_delete|escape:'html'}</b></td>
+          <td colspan="2" align="center"><b>{$project_to_delete|escape}</b></td>

         </tr>
         <tr><td colspan="2" align="center">&nbsp;</td></tr>
         <tr>
         </tr>
         <tr><td colspan="2" align="center">&nbsp;</td></tr>
         <tr>

diff --git a/WEB-INF/templates/projects.tpl b/WEB-INF/templates/projects.tpl
index 59d356edae466a1604a34ec66d7a0e4060ef6f6e..1c97753e66af5c96bba6c0081cd74917efb7bbf5 100644 (file)
--- a/WEB-INF/templates/projects.tpl
+++ b/WEB-INF/templates/projects.tpl
@@ -19,8 +19,8 @@
   {if $active_projects}
     {foreach $active_projects as $project}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
   {if $active_projects}
     {foreach $active_projects as $project}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">

-          <td>{$project.name|escape:'html'}</td>
-          <td>{$project.description|escape:'html'}</td>
+          <td>{$project.name|escape}</td>
+          <td>{$project.description|escape}</td>

           <td><a href="project_edit.php?id={$project.id}">{$i18n.label.edit}</a></td>
           <td><a href="project_delete.php?id={$project.id}">{$i18n.label.delete}</a></td>
         </tr>
           <td><a href="project_edit.php?id={$project.id}">{$i18n.label.edit}</a></td>
           <td><a href="project_delete.php?id={$project.id}">{$i18n.label.delete}</a></td>
         </tr>


@@ -47,8 +47,8 @@
         </tr>
     {foreach $inactive_projects as $project}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
         </tr>
     {foreach $inactive_projects as $project}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">

-          <td>{$project.name|escape:'html'}</td>
-          <td>{$project.description|escape:'html'}</td>
+          <td>{$project.name|escape}</td>
+          <td>{$project.description|escape}</td>

           <td><a href="project_edit.php?id={$project.id}">{$i18n.label.edit}</a></td>
           <td><a href="project_delete.php?id={$project.id}">{$i18n.label.delete}</a></td>
         </tr>
           <td><a href="project_edit.php?id={$project.id}">{$i18n.label.edit}</a></td>
           <td><a href="project_delete.php?id={$project.id}">{$i18n.label.delete}</a></td>
         </tr>


@@ -72,8 +72,8 @@
   {if $active_projects}
     {foreach $active_projects as $project}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
   {if $active_projects}
     {foreach $active_projects as $project}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">

-          <td>{$project.name|escape:'html'}</td>
-          <td>{$project.description|escape:'html'}</td>
+          <td>{$project.name|escape}</td>
+          <td>{$project.description|escape}</td>

         </tr>
     {/foreach}
   {/if}
         </tr>
     {/foreach}
   {/if}

diff --git a/WEB-INF/templates/report.tpl b/WEB-INF/templates/report.tpl
index 4ed3baa138d2c432d24ae7048adc5cac5f53bf0b..a05618db94dbc373124240cf5afca2fccba73e44 100644 (file)
--- a/WEB-INF/templates/report.tpl
+++ b/WEB-INF/templates/report.tpl
@@ -14,13 +14,13 @@
 <!-- totals only report -->
 {if $bean->getAttribute('chtotalsonly')}
       <tr>
 <!-- totals only report -->
 {if $bean->getAttribute('chtotalsonly')}
       <tr>

-        <td class="tableHeader">{$group_by_header|escape:'html'}</td>
+        <td class="tableHeader">{$group_by_header|escape}</td>

         {if $bean->getAttribute('chduration')}<td class="tableHeaderCentered" width="5%">{$i18n.label.duration}</td>{/if}
         {if $bean->getAttribute('chcost')}<td class="tableHeaderCentered" width="5%">{$i18n.label.cost}</td>{/if}
       </tr>
   {foreach $subtotals as $subtotal}
       <tr class="rowReportSubtotal">
         {if $bean->getAttribute('chduration')}<td class="tableHeaderCentered" width="5%">{$i18n.label.duration}</td>{/if}
         {if $bean->getAttribute('chcost')}<td class="tableHeaderCentered" width="5%">{$i18n.label.cost}</td>{/if}
       </tr>
   {foreach $subtotals as $subtotal}
       <tr class="rowReportSubtotal">

-        <td class="cellLeftAlignedSubtotal">{if $subtotal['name']}{$subtotal['name']|escape:'html'}{else}&nbsp;{/if}</td>
+        <td class="cellLeftAlignedSubtotal">{if $subtotal['name']}{$subtotal['name']|escape}{else}&nbsp;{/if}</td>

         {if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$subtotal['time']}</td>{/if}
         {if $bean->getAttribute('chcost')}<td class="cellRightAlignedSubtotal">{if $user->canManageTeam() || $user->isClient()}{$subtotal['cost']}{else}{$subtotal['expenses']}{/if}</td>{/if}
       </tr>
         {if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$subtotal['time']}</td>{/if}
         {if $bean->getAttribute('chcost')}<td class="cellRightAlignedSubtotal">{if $user->canManageTeam() || $user->isClient()}{$subtotal['cost']}{else}{$subtotal['expenses']}{/if}</td>{/if}
       </tr>


@@ -30,7 +30,7 @@
       <tr class="rowReportSubtotal">
         <td class="cellLeftAlignedSubtotal">{$i18n.label.total}</td>
         {if $bean->getAttribute('chduration')}<td nowrap class="cellRightAlignedSubtotal">{$totals['time']}</td>{/if}
       <tr class="rowReportSubtotal">
         <td class="cellLeftAlignedSubtotal">{$i18n.label.total}</td>
         {if $bean->getAttribute('chduration')}<td nowrap class="cellRightAlignedSubtotal">{$totals['time']}</td>{/if}

-        {if $bean->getAttribute('chcost')}<td nowrap class="cellRightAlignedSubtotal">{$user->currency|escape:'html'} {if $user->canManageTeam() || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if}</td>{/if}
+        {if $bean->getAttribute('chcost')}<td nowrap class="cellRightAlignedSubtotal">{$user->currency|escape} {if $user->canManageTeam() || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if}</td>{/if}

       </tr>
 {else}
 <!-- normal report -->
       </tr>
 {else}
 <!-- normal report -->


@@ -40,7 +40,7 @@
   {if $bean->getAttribute('chclient')}<td class="tableHeader">{$i18n.label.client}</td>{/if}
   {if $bean->getAttribute('chproject')}<td class="tableHeader">{$i18n.label.project}</td>{/if}
   {if $bean->getAttribute('chtask')}<td class="tableHeader">{$i18n.label.task}</td>{/if}
   {if $bean->getAttribute('chclient')}<td class="tableHeader">{$i18n.label.client}</td>{/if}
   {if $bean->getAttribute('chproject')}<td class="tableHeader">{$i18n.label.project}</td>{/if}
   {if $bean->getAttribute('chtask')}<td class="tableHeader">{$i18n.label.task}</td>{/if}

-  {if $bean->getAttribute('chcf_1')}<td class="tableHeader">{$custom_fields->fields[0]['label']|escape:'html'}</td>{/if}
+  {if $bean->getAttribute('chcf_1')}<td class="tableHeader">{$custom_fields->fields[0]['label']|escape}</td>{/if}

   {if $bean->getAttribute('chstart')}<td class="tableHeaderCentered" width="5%">{$i18n.label.start}</td>{/if}
   {if $bean->getAttribute('chfinish')}<td class="tableHeaderCentered" width="5%">{$i18n.label.finish}</td>{/if}
   {if $bean->getAttribute('chduration')}<td class="tableHeaderCentered" width="5%">{$i18n.label.duration}</td>{/if}
   {if $bean->getAttribute('chstart')}<td class="tableHeaderCentered" width="5%">{$i18n.label.start}</td>{/if}
   {if $bean->getAttribute('chfinish')}<td class="tableHeaderCentered" width="5%">{$i18n.label.finish}</td>{/if}
   {if $bean->getAttribute('chduration')}<td class="tableHeaderCentered" width="5%">{$i18n.label.duration}</td>{/if}


@@ -56,11 +56,11 @@
       {if $cur_grouped_by != $prev_grouped_by && !$first_pass}
       <tr class="rowReportSubtotal">
         <td class="cellLeftAlignedSubtotal">{$i18n.label.subtotal}
       {if $cur_grouped_by != $prev_grouped_by && !$first_pass}
       <tr class="rowReportSubtotal">
         <td class="cellLeftAlignedSubtotal">{$i18n.label.subtotal}

-        {if $user->canManageTeam() || $user->isClient()}<td class="cellLeftAlignedSubtotal">{if $group_by == 'user'}{$subtotals[$prev_grouped_by]['name']|escape:'html'}</td>{/if}{/if}
-        {if $bean->getAttribute('chclient')}<td class="cellLeftAlignedSubtotal">{if $group_by == 'client'}{$subtotals[$prev_grouped_by]['name']|escape:'html'}</td>{/if}{/if}
-        {if $bean->getAttribute('chproject')}<td class="cellLeftAlignedSubtotal">{if $group_by == 'project'}{$subtotals[$prev_grouped_by]['name']|escape:'html'}</td>{/if}{/if}
-        {if $bean->getAttribute('chtask')}<td class="cellLeftAlignedSubtotal">{if $group_by == 'task'}{$subtotals[$prev_grouped_by]['name']|escape:'html'}</td>{/if}{/if}
-        {if $bean->getAttribute('chcf_1')}<td class="cellLeftAlignedSubtotal">{if $group_by == 'cf_1'}{$subtotals[$prev_grouped_by]['name']|escape:'html'}</td>{/if}{/if}
+        {if $user->canManageTeam() || $user->isClient()}<td class="cellLeftAlignedSubtotal">{if $group_by == 'user'}{$subtotals[$prev_grouped_by]['name']|escape}</td>{/if}{/if}
+        {if $bean->getAttribute('chclient')}<td class="cellLeftAlignedSubtotal">{if $group_by == 'client'}{$subtotals[$prev_grouped_by]['name']|escape}</td>{/if}{/if}
+        {if $bean->getAttribute('chproject')}<td class="cellLeftAlignedSubtotal">{if $group_by == 'project'}{$subtotals[$prev_grouped_by]['name']|escape}</td>{/if}{/if}
+        {if $bean->getAttribute('chtask')}<td class="cellLeftAlignedSubtotal">{if $group_by == 'task'}{$subtotals[$prev_grouped_by]['name']|escape}</td>{/if}{/if}
+        {if $bean->getAttribute('chcf_1')}<td class="cellLeftAlignedSubtotal">{if $group_by == 'cf_1'}{$subtotals[$prev_grouped_by]['name']|escape}</td>{/if}{/if}

         {if $bean->getAttribute('chstart')}<td></td>{/if}
         {if $bean->getAttribute('chfinish')}<td></td>{/if}
         {if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$subtotals[$prev_grouped_by]['time']}</td>{/if}
         {if $bean->getAttribute('chstart')}<td></td>{/if}
         {if $bean->getAttribute('chfinish')}<td></td>{/if}
         {if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$subtotals[$prev_grouped_by]['time']}</td>{/if}


@@ -78,18 +78,18 @@
       {/if}
       <tr class="{$report_row_class}">
         <td class="cellLeftAligned">{$item.date}</td>
       {/if}
       <tr class="{$report_row_class}">
         <td class="cellLeftAligned">{$item.date}</td>

-    {if $user->canManageTeam() || $user->isClient()}<td class="cellLeftAligned">{$item.user|escape:'html'}</td>{/if}
-    {if $bean->getAttribute('chclient')}<td class="cellLeftAligned">{$item.client|escape:'html'}</td>{/if}
-    {if $bean->getAttribute('chproject')}<td class="cellLeftAligned">{$item.project|escape:'html'}</td>{/if}
-    {if $bean->getAttribute('chtask')}<td class="cellLeftAligned">{$item.task|escape:'html'}</td>{/if}
-    {if $bean->getAttribute('chcf_1')}<td class="cellLeftAligned">{$item.cf_1|escape:'html'}</td>{/if}
+    {if $user->canManageTeam() || $user->isClient()}<td class="cellLeftAligned">{$item.user|escape}</td>{/if}
+    {if $bean->getAttribute('chclient')}<td class="cellLeftAligned">{$item.client|escape}</td>{/if}
+    {if $bean->getAttribute('chproject')}<td class="cellLeftAligned">{$item.project|escape}</td>{/if}
+    {if $bean->getAttribute('chtask')}<td class="cellLeftAligned">{$item.task|escape}</td>{/if}
+    {if $bean->getAttribute('chcf_1')}<td class="cellLeftAligned">{$item.cf_1|escape}</td>{/if}

     {if $bean->getAttribute('chstart')}<td nowrap class="cellRightAligned">{$item.start}</td>{/if}
     {if $bean->getAttribute('chfinish')}<td nowrap class="cellRightAligned">{$item.finish}</td>{/if}
     {if $bean->getAttribute('chduration')}<td class="cellRightAligned">{$item.duration}</td>{/if}
     {if $bean->getAttribute('chstart')}<td nowrap class="cellRightAligned">{$item.start}</td>{/if}
     {if $bean->getAttribute('chfinish')}<td nowrap class="cellRightAligned">{$item.finish}</td>{/if}
     {if $bean->getAttribute('chduration')}<td class="cellRightAligned">{$item.duration}</td>{/if}

-    {if $bean->getAttribute('chnote')}<td class="cellLeftAligned">{$item.note|escape:'html'}</td>{/if}
+    {if $bean->getAttribute('chnote')}<td class="cellLeftAligned">{$item.note|escape}</td>{/if}

     {if $bean->getAttribute('chcost')}<td class="cellRightAligned">{if $user->canManageTeam() || $user->isClient()}{$item.cost}{else}{$item.expense}{/if}</td>{/if}
     {if $bean->getAttribute('chinvoice')}
     {if $bean->getAttribute('chcost')}<td class="cellRightAligned">{if $user->canManageTeam() || $user->isClient()}{$item.cost}{else}{$item.expense}{/if}</td>{/if}
     {if $bean->getAttribute('chinvoice')}

-        <td class="cellRightAligned">{$item.invoice|escape:'html'}</td>
+        <td class="cellRightAligned">{$item.invoice|escape}</td>

       {if $use_checkboxes}
         {if 1 == $item.type}<td bgcolor="white"><input type="checkbox" name="log_id_{$item.id}"></td>{/if}
         {if 2 == $item.type}<td bgcolor="white"><input type="checkbox" name="item_id_{$item.id}"></td>{/if}
       {if $use_checkboxes}
         {if 1 == $item.type}<td bgcolor="white"><input type="checkbox" name="log_id_{$item.id}"></td>{/if}
         {if 2 == $item.type}<td bgcolor="white"><input type="checkbox" name="item_id_{$item.id}"></td>{/if}


@@ -103,11 +103,11 @@
   {if $print_subtotals}
       <tr class="rowReportSubtotal">
         <td class="cellLeftAlignedSubtotal">{$i18n.label.subtotal}
   {if $print_subtotals}
       <tr class="rowReportSubtotal">
         <td class="cellLeftAlignedSubtotal">{$i18n.label.subtotal}

-    {if $user->canManageTeam() || $user->isClient()}<td class="cellLeftAlignedSubtotal">{if $group_by == 'user'}{$subtotals[$cur_grouped_by]['name']|escape:'html'}</td>{/if}{/if}
-    {if $bean->getAttribute('chclient')}<td class="cellLeftAlignedSubtotal">{if $group_by == 'client'}{$subtotals[$cur_grouped_by]['name']|escape:'html'}</td>{/if}{/if}
-    {if $bean->getAttribute('chproject')}<td class="cellLeftAlignedSubtotal">{if $group_by == 'project'}{$subtotals[$cur_grouped_by]['name']|escape:'html'}</td>{/if}{/if}
-    {if $bean->getAttribute('chtask')}<td class="cellLeftAlignedSubtotal">{if $group_by == 'task'}{$subtotals[$cur_grouped_by]['name']|escape:'html'}</td>{/if}{/if}
-    {if $bean->getAttribute('chcf_1')}<td class="cellLeftAlignedSubtotal">{if $group_by == 'cf_1'}{$subtotals[$cur_grouped_by]['name']|escape:'html'}</td>{/if}{/if}
+    {if $user->canManageTeam() || $user->isClient()}<td class="cellLeftAlignedSubtotal">{if $group_by == 'user'}{$subtotals[$cur_grouped_by]['name']|escape}</td>{/if}{/if}
+    {if $bean->getAttribute('chclient')}<td class="cellLeftAlignedSubtotal">{if $group_by == 'client'}{$subtotals[$cur_grouped_by]['name']|escape}</td>{/if}{/if}
+    {if $bean->getAttribute('chproject')}<td class="cellLeftAlignedSubtotal">{if $group_by == 'project'}{$subtotals[$cur_grouped_by]['name']|escape}</td>{/if}{/if}
+    {if $bean->getAttribute('chtask')}<td class="cellLeftAlignedSubtotal">{if $group_by == 'task'}{$subtotals[$cur_grouped_by]['name']|escape}</td>{/if}{/if}
+    {if $bean->getAttribute('chcf_1')}<td class="cellLeftAlignedSubtotal">{if $group_by == 'cf_1'}{$subtotals[$cur_grouped_by]['name']|escape}</td>{/if}{/if}

     {if $bean->getAttribute('chstart')}<td></td>{/if}
     {if $bean->getAttribute('chfinish')}<td></td>{/if}
     {if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$subtotals[$cur_grouped_by]['time']}</td>{/if}
     {if $bean->getAttribute('chstart')}<td></td>{/if}
     {if $bean->getAttribute('chfinish')}<td></td>{/if}
     {if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$subtotals[$cur_grouped_by]['time']}</td>{/if}


@@ -129,7 +129,7 @@
     {if $bean->getAttribute('chfinish')}<td></td>{/if}
     {if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$totals['time']}</td>{/if}
     {if $bean->getAttribute('chnote')}<td></td>{/if}
     {if $bean->getAttribute('chfinish')}<td></td>{/if}
     {if $bean->getAttribute('chduration')}<td class="cellRightAlignedSubtotal">{$totals['time']}</td>{/if}
     {if $bean->getAttribute('chnote')}<td></td>{/if}

-    {if $bean->getAttribute('chcost')}<td nowrap class="cellRightAlignedSubtotal">{$user->currency|escape:'html'} {if $user->canManageTeam() || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if}</td>{/if}
+    {if $bean->getAttribute('chcost')}<td nowrap class="cellRightAlignedSubtotal">{$user->currency|escape} {if $user->canManageTeam() || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if}</td>{/if}

     {if $bean->getAttribute('chinvoice')}<td></td>{/if}
       </tr>
 {/if}
     {if $bean->getAttribute('chinvoice')}<td></td>{/if}
       </tr>
 {/if}

diff --git a/WEB-INF/templates/reports.tpl b/WEB-INF/templates/reports.tpl
index ce804dc575fcdb601ce10cba3b7e6902a8f15257..5ca7a171f5b79f1ddf5d5eab7aaa14d721663732 100644 (file)
--- a/WEB-INF/templates/reports.tpl
+++ b/WEB-INF/templates/reports.tpl
@@ -261,7 +261,7 @@ function handleCheckboxes() {
                 <td>{if (($smarty.const.TYPE_START_FINISH == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))}<label>{$forms.reportForm.chfinish.control}&nbsp;{$i18n.label.finish}</label>{/if}</td>
                 <td><label>{$forms.reportForm.chnote.control}&nbsp;{$i18n.label.note}</label></td>
 {if ($custom_fields && $custom_fields->fields[0])}
                 <td>{if (($smarty.const.TYPE_START_FINISH == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))}<label>{$forms.reportForm.chfinish.control}&nbsp;{$i18n.label.finish}</label>{/if}</td>
                 <td><label>{$forms.reportForm.chnote.control}&nbsp;{$i18n.label.note}</label></td>
 {if ($custom_fields && $custom_fields->fields[0])}

-                <td><label>{$forms.reportForm.chcf_1.control}&nbsp;{$custom_fields->fields[0]['label']|escape:'html'}</label></td>
+                <td><label>{$forms.reportForm.chcf_1.control}&nbsp;{$custom_fields->fields[0]['label']|escape}</label></td>

 {else}
                 <td></td>
 {/if}
 {else}
                 <td></td>
 {/if}

diff --git a/WEB-INF/templates/task_delete.tpl b/WEB-INF/templates/task_delete.tpl
index f25cc951fbf5e5582a73fc1ce21954985efecc70..9f16d7c3a2f39ef1c5034845e4145f785bc3f309 100644 (file)
--- a/WEB-INF/templates/task_delete.tpl
+++ b/WEB-INF/templates/task_delete.tpl
@@ -4,7 +4,7 @@
     <td>
       <table cellspacing="0" cellpadding="0" border="0">
         <tr>
     <td>
       <table cellspacing="0" cellpadding="0" border="0">
         <tr>

-          <td colspan="2" align="center"><b>{$task_to_delete|escape:'html'}</b></td>
+          <td colspan="2" align="center"><b>{$task_to_delete|escape}</b></td>

         </tr>
         <tr>
           <td colspan="2" align="center">&nbsp;</td>
         </tr>
         <tr>
           <td colspan="2" align="center">&nbsp;</td>

diff --git a/WEB-INF/templates/tasks.tpl b/WEB-INF/templates/tasks.tpl
index 2c996a1f8d035bfb4755601d022cab35a9b17c0f..23d5ec4c52178a38d382eaf7757b972abd76b0be 100644 (file)
--- a/WEB-INF/templates/tasks.tpl
+++ b/WEB-INF/templates/tasks.tpl
@@ -19,8 +19,8 @@
   {if $active_tasks}
     {foreach $active_tasks as $task}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
   {if $active_tasks}
     {foreach $active_tasks as $task}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">

-          <td>{$task.name|escape:'html'}</td>
-          <td>{$task.description|escape:'html'}</td>
+          <td>{$task.name|escape}</td>
+          <td>{$task.description|escape}</td>

           <td><a href="task_edit.php?id={$task.id}">{$i18n.label.edit}</a></td>
           <td><a href="task_delete.php?id={$task.id}">{$i18n.label.delete}</a></td>
         </tr>
           <td><a href="task_edit.php?id={$task.id}">{$i18n.label.edit}</a></td>
           <td><a href="task_delete.php?id={$task.id}">{$i18n.label.delete}</a></td>
         </tr>


@@ -47,8 +47,8 @@
         </tr>
     {foreach $inactive_tasks as $task}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
         </tr>
     {foreach $inactive_tasks as $task}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">

-          <td>{$task.name|escape:'html'}</td>
-          <td>{$task.description|escape:'html'}</td>
+          <td>{$task.name|escape}</td>
+          <td>{$task.description|escape}</td>

           <td><a href="task_edit.php?id={$task.id}">{$i18n.label.edit}</a></td>
           <td><a href="task_delete.php?id={$task.id}">{$i18n.label.delete}</a></td>
         </tr>
           <td><a href="task_edit.php?id={$task.id}">{$i18n.label.edit}</a></td>
           <td><a href="task_delete.php?id={$task.id}">{$i18n.label.delete}</a></td>
         </tr>


@@ -72,8 +72,8 @@
   {if $active_tasks}
     {foreach $active_tasks as $task}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
   {if $active_tasks}
     {foreach $active_tasks as $task}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">

-          <td>{$task.name|escape:'html'}</td>
-          <td>{$task.description|escape:'html'}</td>
+          <td>{$task.name|escape}</td>
+          <td>{$task.description|escape}</td>

         </tr>
     {/foreach}
   {/if}
         </tr>
     {/foreach}
   {/if}

diff --git a/WEB-INF/templates/time.tpl b/WEB-INF/templates/time.tpl
index 0afaa15bb1d03732f08ac2740627d2332ada0966..ff414e1000f45fbed1a4a40e9a57010ec959a53c 100644 (file)
--- a/WEB-INF/templates/time.tpl
+++ b/WEB-INF/templates/time.tpl
@@ -237,7 +237,7 @@ function get_time() {
 {/if}
 {if ($custom_fields && $custom_fields->fields[0])}
         <tr>
 {/if}
 {if ($custom_fields && $custom_fields->fields[0])}
         <tr>

-          <td align="right">{$custom_fields->fields[0]['label']|escape:'html'}{if $custom_fields->fields[0]['required']} (*){/if}:</td><td>{$forms.timeRecordForm.cf_1.control}</td>
+          <td align="right">{$custom_fields->fields[0]['label']|escape}{if $custom_fields->fields[0]['required']} (*){/if}:</td><td>{$forms.timeRecordForm.cf_1.control}</td>

         </tr>
 {/if}
 {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
         </tr>
 {/if}
 {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}


@@ -314,20 +314,20 @@ function get_time() {
   {foreach $time_records as $record}
       <tr bgcolor="{cycle values="#f5f5f5,#ccccce"}" {if !$record.billable} class="not_billable" {/if}>
     {if $user->isPluginEnabled('cl')}
   {foreach $time_records as $record}
       <tr bgcolor="{cycle values="#f5f5f5,#ccccce"}" {if !$record.billable} class="not_billable" {/if}>
     {if $user->isPluginEnabled('cl')}

-        <td valign='top'>{$record.client|escape:'html'}</td>
+        <td valign='top'>{$record.client|escape}</td>

     {/if}
     {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
     {/if}
     {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}

-        <td valign='top'>{$record.project|escape:'html'}</td>
+        <td valign='top'>{$record.project|escape}</td>

     {/if}
     {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
     {/if}
     {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}

-        <td valign='top'>{$record.task|escape:'html'}</td>
+        <td valign='top'>{$record.task|escape}</td>

     {/if}
     {if (($smarty.const.TYPE_START_FINISH == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))}
         <td nowrap align='right' valign='top'>{if $record.start}{$record.start}{else}&nbsp;{/if}</td>
         <td nowrap align='right' valign='top'>{if $record.finish}{$record.finish}{else}&nbsp;{/if}</td>
     {/if}
         <td align='right' valign='top'>{if ($record.duration == '0:00' && $record.start <> '')}<font color="#ff0000">{$i18n.form.time.uncompleted}</font>{else}{$record.duration}{/if}</td>
     {/if}
     {if (($smarty.const.TYPE_START_FINISH == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))}
         <td nowrap align='right' valign='top'>{if $record.start}{$record.start}{else}&nbsp;{/if}</td>
         <td nowrap align='right' valign='top'>{if $record.finish}{$record.finish}{else}&nbsp;{/if}</td>
     {/if}
         <td align='right' valign='top'>{if ($record.duration == '0:00' && $record.start <> '')}<font color="#ff0000">{$i18n.form.time.uncompleted}</font>{else}{$record.duration}{/if}</td>

-        <td valign='top'>{if $record.comment}{$record.comment|escape:'html'}{else}&nbsp;{/if}</td>
+        <td valign='top'>{if $record.comment}{$record.comment|escape}{else}&nbsp;{/if}</td>

         <td valign='top' align='center'>
     {if $record.invoice_id}
           &nbsp;
         <td valign='top' align='center'>
     {if $record.invoice_id}
           &nbsp;

diff --git a/WEB-INF/templates/time_delete.tpl b/WEB-INF/templates/time_delete.tpl
index 4ebbe5589e91688cd2be8ac7cbedb468d89a0855..b3d8a3972bb0ffe065fb2d6b107eb20efcfff489 100644 (file)
--- a/WEB-INF/templates/time_delete.tpl
+++ b/WEB-INF/templates/time_delete.tpl
@@ -21,10 +21,10 @@
   </tr>
   <tr bgcolor="#f5f5f5">
 {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
   </tr>
   <tr bgcolor="#f5f5f5">
 {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}

-    <td>{$time_rec.project_name|escape:'html'}</td>
+    <td>{$time_rec.project_name|escape}</td>

 {/if}
 {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
 {/if}
 {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}

-    <td>{$time_rec.task_name|escape:'html'}</td>
+    <td>{$time_rec.task_name|escape}</td>

 {/if}
 {if (($smarty.const.TYPE_START_FINISH == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))}
     <td align="right">{if $time_rec.start}{$time_rec.start}{else}&nbsp;{/if}</td>
 {/if}
 {if (($smarty.const.TYPE_START_FINISH == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))}
     <td align="right">{if $time_rec.start}{$time_rec.start}{else}&nbsp;{/if}</td>


@@ -33,7 +33,7 @@
 {if (($smarty.const.TYPE_DURATION == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))}
     <td align="right">{if ($time_rec.duration == '0:00' && $time_rec.start <> '')}<font color="#ff0000">{$i18n.form.time.uncompleted}</font>{else}{$time_rec.duration}{/if}</td>
 {/if}
 {if (($smarty.const.TYPE_DURATION == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))}
     <td align="right">{if ($time_rec.duration == '0:00' && $time_rec.start <> '')}<font color="#ff0000">{$i18n.form.time.uncompleted}</font>{else}{$time_rec.duration}{/if}</td>
 {/if}

-    <td>{if $time_rec.comment}{$time_rec.comment|escape:'html'}{else}&nbsp;{/if}</td>
+    <td>{if $time_rec.comment}{$time_rec.comment|escape}{else}&nbsp;{/if}</td>

   </tr>
   </table>
   <table width="100%">
   </tr>
   </table>
   <table width="100%">

diff --git a/WEB-INF/templates/time_edit.tpl b/WEB-INF/templates/time_edit.tpl
index fd3c1730e150f87be6eaa887ee4722bbd17e041e..a4e26a6f40b811fba2849f008adad6ea29ae83aa 100644 (file)
--- a/WEB-INF/templates/time_edit.tpl
+++ b/WEB-INF/templates/time_edit.tpl
@@ -219,7 +219,7 @@ function setNow(formField) {
 {/if}
 {if ($custom_fields && $custom_fields->fields[0])} 
     <tr>
 {/if}
 {if ($custom_fields && $custom_fields->fields[0])} 
     <tr>

-      <td align="right">{$custom_fields->fields[0]['label']|escape:'html'}{if $custom_fields->fields[0]['required']} (*){/if}:</td><td>{$forms.timeRecordForm.cf_1.control}</td>
+      <td align="right">{$custom_fields->fields[0]['label']|escape}{if $custom_fields->fields[0]['required']} (*){/if}:</td><td>{$forms.timeRecordForm.cf_1.control}</td>

     </tr>
 {/if}
 {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
     </tr>
 {/if}
 {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}

diff --git a/WEB-INF/templates/user_delete.tpl b/WEB-INF/templates/user_delete.tpl
index 1f5b442e40ed60b2f3e201c4334a3d1371ea004d..e85d97f1f9a2848c6f5364d9a8dccb0218615e1b 100644 (file)
--- a/WEB-INF/templates/user_delete.tpl
+++ b/WEB-INF/templates/user_delete.tpl
@@ -4,7 +4,7 @@
     <td>
       <table cellspacing="0" cellpadding="0" border="0">
         <tr>
     <td>
       <table cellspacing="0" cellpadding="0" border="0">
         <tr>

-          <td colspan="2" align="center"><b>{$user_to_delete|escape:'html'}</b></td>
+          <td colspan="2" align="center"><b>{$user_to_delete|escape}</b></td>

         </tr>
         <tr>
           <td colspan="2" align="center">&nbsp;</td>
         </tr>
         <tr>
           <td colspan="2" align="center">&nbsp;</td>

diff --git a/WEB-INF/templates/users.tpl b/WEB-INF/templates/users.tpl
index 99d617bdd2e6759e4d2e871e1091423fc64f849c..3ea9ceb3d486a804b215532c46fc54ce4f2740b5 100644 (file)
--- a/WEB-INF/templates/users.tpl
+++ b/WEB-INF/templates/users.tpl
@@ -24,9 +24,9 @@
           {if $smarty.const.UNCOMPLETED_INDICATORS == $user->uncompleted_indicators}
             <span class="uncompleted-entry{if $u.has_uncompleted_entry} active{/if}"{if $u.has_uncompleted_entry} title="{$i18n.form.users.uncompleted_entry}"{/if}></span>
           {/if}
           {if $smarty.const.UNCOMPLETED_INDICATORS == $user->uncompleted_indicators}
             <span class="uncompleted-entry{if $u.has_uncompleted_entry} active{/if}"{if $u.has_uncompleted_entry} title="{$i18n.form.users.uncompleted_entry}"{/if}></span>
           {/if}

-            {$u.name|escape:'html'}
+            {$u.name|escape}

           </td>
           </td>

-          <td>{$u.login|escape:'html'}</td>
+          <td>{$u.login|escape}</td>

       {if $smarty.const.ROLE_MANAGER == $u.role}
             <td>{$i18n.form.users.manager}</td>
       {elseif $smarty.const.ROLE_COMANAGER == $u.role}
       {if $smarty.const.ROLE_MANAGER == $u.role}
             <td>{$i18n.form.users.manager}</td>
       {elseif $smarty.const.ROLE_COMANAGER == $u.role}


@@ -70,8 +70,8 @@
         </tr>
     {foreach $inactive_users as $u}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
         </tr>
     {foreach $inactive_users as $u}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">

-          <td>{$u.name|escape:'html'}</td>
-          <td>{$u.login|escape:'html'}</td>
+          <td>{$u.name|escape}</td>
+          <td>{$u.login|escape}</td>

       {if $smarty.const.ROLE_MANAGER == $u.role}
             <td>{$i18n.form.users.manager}</td>
       {elseif $smarty.const.ROLE_COMANAGER == $u.role}
       {if $smarty.const.ROLE_MANAGER == $u.role}
             <td>{$i18n.form.users.manager}</td>
       {elseif $smarty.const.ROLE_COMANAGER == $u.role}


@@ -112,8 +112,8 @@
         </tr>
   {foreach $active_users as $u}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
         </tr>
   {foreach $active_users as $u}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">

-          <td>{$u.name|escape:'html'}</td>
-          <td>{$u.login|escape:'html'}</td>
+          <td>{$u.name|escape}</td>
+          <td>{$u.login|escape}</td>

     {if $smarty.const.ROLE_MANAGER == $u.role}
             <td>{$i18n.form.users.manager}</td>
     {elseif $smarty.const.ROLE_COMANAGER == $u.role}
     {if $smarty.const.ROLE_MANAGER == $u.role}
             <td>{$i18n.form.users.manager}</td>
     {elseif $smarty.const.ROLE_COMANAGER == $u.role}