Changed required template elements to 3 stop sign emojis for visibility.

diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index e09a943f029bd7e855676f130c3924daf13b073f..e2950753ec4e208475822050253aa0f122cf763b 100644 (file)
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -182,6 +182,15 @@ function ttValidString($val, $emptyValid = false)
   return true;    
 }
 
+// ttValidTemplateText is used to check template-based user input.
+// When templates are used, required input parts must be filled by user.
+// We identify these parts by 3 "stop sign" emojis (aka "octagonal sign" U+1F6D1).
+function ttValidTemplateText($val)
+{
+  $valid = strpos($val, '🛑🛑🛑') === false; // no 3 "stop sign" emojis in a row.
+  return $valid;
+}
+
 // ttValidEmail is used to check user input to validate an email string.
 function ttValidEmail($val, $emptyValid = false)
 {

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 3f192b301502c6e2cd2341a71d46db62c4e5175b..52aa91c5821acc1618ca53502499d9637076ccf8 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>
-          <td align="center">&nbsp;Anuko Time Tracker 1.18.61.4900 | 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.62.4901 | 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>

diff --git a/mobile/time.php b/mobile/time.php
index b9ee3bce3ada108d4a1fdf8aae216f364b5f9221..15069db2e0cb638eee8622567d859528f037eefa 100644 (file)
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -283,8 +283,7 @@ 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'));
-    if ($user->isPluginEnabled('tp') && strpos($cl_note, '%req%') !== false) {
-      // A %req% element is found in note. They have to be replaced by user.
+    if ($user->isPluginEnabled('tp') && !ttValidTemplateText($cl_note)) {
       $err->add($i18n->get('error.field'), $i18n->get('label.note'));
     }
     if (!ttTimeHelper::canAdd()) $err->add($i18n->get('error.expired'));

diff --git a/mobile/time_edit.php b/mobile/time_edit.php
index c3699d5395946d52851ca98f4d88158e10159e23..b33b099146735ae5de0009d8a70d0ac9a466b746 100644 (file)
--- a/mobile/time_edit.php
+++ b/mobile/time_edit.php
@@ -271,8 +271,7 @@ if ($request->isPost()) {
   }
   if (!ttValidDate($cl_date)) $err->add($i18n->get('error.field'), $i18n->get('label.date'));
   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.
+  if ($user->isPluginEnabled('tp') && !ttValidTemplateText($cl_note)) {
     $err->add($i18n->get('error.field'), $i18n->get('label.note'));
   }
   if (!ttTimeHelper::canAdd()) $err->add($i18n->get('error.expired'));

diff --git a/time.php b/time.php
index 4f0d5918b0542016c738c029f860f045bce0f3e3..9b76587bb609e7301e883c7a7b9978da0d08b311 100644 (file)
--- a/time.php
+++ b/time.php
@@ -304,8 +304,7 @@ 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'));
-    if ($user->isPluginEnabled('tp') && strpos($cl_note, '%req%') !== false) {
-      // A %req% element is found in note. They have to be replaced by user.
+    if ($user->isPluginEnabled('tp') && !ttValidTemplateText($cl_note)) {
       $err->add($i18n->get('error.field'), $i18n->get('label.note'));
     }
     if (!ttTimeHelper::canAdd()) $err->add($i18n->get('error.expired'));

diff --git a/time_edit.php b/time_edit.php
index e6ca12ad4f569c499273b2ca156b5a0cb376d9dc..bbc95eade1c22374d59af8eb255fb8b526f9d2b4 100644 (file)
--- a/time_edit.php
+++ b/time_edit.php
@@ -276,8 +276,7 @@ if ($request->isPost()) {
   }
   if (!ttValidDate($cl_date)) $err->add($i18n->get('error.field'), $i18n->get('label.date'));
   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.
+  if ($user->isPluginEnabled('tp') && !ttValidTemplateText($cl_note)) {
     $err->add($i18n->get('error.field'), $i18n->get('label.note'));
   }
   if (!ttTimeHelper::canAdd()) $err->add($i18n->get('error.expired'));