From 93472f16bca36138fb4f227b262fe0a96a246776 Mon Sep 17 00:00:00 2001
From: Nik Okuntseff <support@anuko.com>
Date: Thu, 25 Oct 2018 17:00:09 +0000
Subject: [PATCH] Extended conditions to include >=, <, <=, and = situations.

---
 WEB-INF/lib/common.lib.php           |  9 ++++++++-
 WEB-INF/lib/ttReportHelper.class.php | 27 +++++++++++++++++++++++----
 WEB-INF/templates/footer.tpl         |  2 +-
 3 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index 325ae73b..d1ad384f 100644
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -319,7 +319,7 @@ function ttValidCondition($val, $emptyValid = true)
   if (stristr($val, '<script>') || stristr($val, '<script '))
     return false;
 
-  if (!preg_match("/^count\s?>\s?\d+$/", $val))
+  if (!preg_match("/^count\s?(=|[<>]=?)\s?\d+$/", $val))
     return false;
 
   return true;
@@ -383,3 +383,10 @@ function ttAccessAllowed($required_right)
 
   return false;
 }
+
+// ttStartsWith functions checks if a string starts with a given substring.
+function ttStartsWith($string, $startString)
+{
+    $len = strlen($startString);
+    return (substr($string, 0, $len) === $startString);
+}
diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 01929320..14683e0b 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -962,11 +962,30 @@ class ttReportHelper {
   {
     $items = ttReportHelper::getItems($options);
 
-    $condition = str_replace('count', '', $condition);
-    $count_required = (int) trim(str_replace('>', '', $condition));
+    $condition = trim(str_replace('count', '', $condition));
 
-    if (count($items) > $count_required)
-      return true; // Condition ok.
+    $greater_or_equal = ttStartsWith($condition, '>=');
+    if ($greater_or_equal) $condition = trim(str_replace('>=', '', $condition));
+
+    $greater = ttStartsWith($condition, '>');
+    if ($greater) $condition = trim(str_replace('>', '', $condition));
+
+    $less_or_equal = ttStartsWith($condition, '<=');
+    if ($less_or_equal) $condition = trim(str_replace('<=', '', $condition));
+
+    $less = ttStartsWith($condition, '<');
+    if ($less) $condition = trim(str_replace('<', '', $condition));
+
+    $equal = ttStartsWith($condition, '=');
+    if ($equal) $condition = trim(str_replace('=', '', $condition));
+
+    $count_required = (int) $condition;
+
+    if ($greater && count($items) > $count_required) return true;
+    if ($greater_or_equal && count($items) >= $count_required) return true;
+    if ($less && count($items) < $count_required) return true;
+    if ($less_or_equal && count($items) <= $count_required) return true;
+    if ($equal && count($items) == $count_required) return true;
 
     return false;
   }
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index bfb6356c..3ba0f22a 100644
--- 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.17.99.4322 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.100.4323 | 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>
-- 
2.20.1