Added <> handler to conditions.

diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index d1ad384f5b5741ed9886fb9cc0be4bbd9ac57d0b..43377103a294f0e7738dd01380b475c1721f2915 100644 (file)
--- 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 (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;
     return false;
 
   return true;

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 14683e0ba9e02d991857e1597a864fae341aea9d..e2bb8ddbaa4b44f94177c06f79557f62105d9922 100644 (file)
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -967,12 +967,15 @@ class ttReportHelper {
     $greater_or_equal = ttStartsWith($condition, '>=');
     if ($greater_or_equal) $condition = trim(str_replace('>=', '', $condition));
 
     $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_or_equal = ttStartsWith($condition, '<=');
     if ($less_or_equal) $condition = trim(str_replace('<=', '', $condition));
 

+    $not_equal = ttStartsWith($condition, '<>');
+    if ($not_equal) $condition = trim(str_replace('<>', '', $condition));
+
+    $greater = ttStartsWith($condition, '>');
+    if ($greater) $condition = trim(str_replace('>', '', $condition));
+

     $less = ttStartsWith($condition, '<');
     if ($less) $condition = trim(str_replace('<', '', $condition));
 
     $less = ttStartsWith($condition, '<');
     if ($less) $condition = trim(str_replace('<', '', $condition));
 


@@ -986,6 +989,7 @@ class ttReportHelper {
     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;
     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;

+    if ($not_equal && count($items) <> $count_required) return true;

 
     return false;
   }
 
     return false;
   }

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 3ba0f22a18d1b82a6e5f449495c9fb5a763e9be2..7167ac7f4f548612d03027b189c900478d7ea3a9 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.17.100.4323 | 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.4324 | 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>