Releasing templates plugin for testing.

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 26443eea739af439cada69b303b6a9e827fd42a1..b7c02c714f4934531c9fa37f0aa2f6de9a988d35 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.18.55.4847 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.18.56.4848 | 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/plugins.tpl b/WEB-INF/templates/plugins.tpl
index affbcc19265c0cd8b43d7cd5834172691faa0935..34c6fc22b69eaaa34e43162054d3e9ffe6a2ae68 100644 (file)
--- a/WEB-INF/templates/plugins.tpl
+++ b/WEB-INF/templates/plugins.tpl
@@ -152,12 +152,10 @@ function handlePluginCheckboxes() {
             <td align="right" nowrap>{$forms.pluginsForm.timesheets.control}</td>
             <td><label for="timesheets">{$i18n.title.timesheets}</label></td>
           </tr>
             <td align="right" nowrap>{$forms.pluginsForm.timesheets.control}</td>
             <td><label for="timesheets">{$i18n.title.timesheets}</label></td>
           </tr>

-{if isTrue('TEMPLATES_DEBUG')}

           <tr>
             <td align="right" nowrap>{$forms.pluginsForm.templates.control}</td>
             <td><label for="templates">{$i18n.title.templates}</label> <span id="templates_config"><a href="templates.php">{$i18n.label.configure}</a></span> <a href="https://www.anuko.com/lp/tt_29.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
           </tr>
           <tr>
             <td align="right" nowrap>{$forms.pluginsForm.templates.control}</td>
             <td><label for="templates">{$i18n.title.templates}</label> <span id="templates_config"><a href="templates.php">{$i18n.label.configure}</a></span> <a href="https://www.anuko.com/lp/tt_29.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
           </tr>

-{/if}

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

diff --git a/time.php b/time.php
index dd219e8e747178f61ede557e669fcbaf82004b5d..4f0d5918b0542016c738c029f860f045bce0f3e3 100644 (file)
--- a/time.php
+++ b/time.php
@@ -304,6 +304,10 @@ if ($request->isPost()) {
         $err->add($i18n->get('error.field'), $i18n->get('label.duration'));
     }
     if (!ttValidString($cl_note, true)) $err->add($i18n->get('error.field'), $i18n->get('label.note'));
         $err->add($i18n->get('error.field'), $i18n->get('label.duration'));
     }
     if (!ttValidString($cl_note, true)) $err->add($i18n->get('error.field'), $i18n->get('label.note'));

+    if ($user->isPluginEnabled('tp') && strpos($cl_note, '%req%') !== false) {
+      // A %req% element is found in note. They have to be replaced by user.
+      $err->add($i18n->get('error.field'), $i18n->get('label.note'));
+    }

     if (!ttTimeHelper::canAdd()) $err->add($i18n->get('error.expired'));
     // Finished validating user input.
 
     if (!ttTimeHelper::canAdd()) $err->add($i18n->get('error.expired'));
     // Finished validating user input.