From: Nik Okuntseff <support@anuko.com>
Date: Tue, 30 Jan 2018 23:44:30 +0000 (+0000)
Subject: Wrote validateDuration function.
X-Git-Tag: timetracker_1.19-1~1278
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=c50a47de724212e47c2ed8badecaff4c50aaeb40;p=timetracker.git

Wrote validateDuration function.
---

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index 748dc726..6b1efe0d 100644
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -102,6 +102,65 @@ class ttTimeHelper {
     return false;
   }
 
+  // validateDuration - a future replacement of the isValidDuration above.
+  // Validates a passed in $value as a time duration string in hours and / or minutes.
+  // Returns either a normalized duration (hh:mm) or false if $value is invalid.
+  //
+  // This is a convenience function that allows users to pass in data in a variety of formats.
+  //
+  // 3 or 3h  - means 3 hours - normalized 3:00. Note: h and m letters are not localized.
+  // 0.25 or 0.25h or .25 or .25h - means a quarter of hour - normalized 0:15.
+  // 0,25 0r 0,25h or ,25 or ,25h - means the same as above for users with comma ad decimal mark.
+  // 1:30 - means 1 hour 30 mminutes - normalized 1:30.
+  // 25m - means 25 minutes - normalized 0:25.
+  static function validateDuration($value) {
+    // Handle empty value.
+    if (!isset($value) || strlen($value) == 0)
+      return false;
+
+    // Handle whole hours.
+    if (preg_match('/^([0-1]{0,1}[0-9]|2[0-4])h?$/', $value )) { // 0, 1 ... 24
+      $normalized = trim($value, 'h');
+      $normalized .= ':00';
+      return $normalized;
+    }
+    // Handle already normalized value.
+    if (preg_match('/^([0-1]{0,1}[0-9]|2[0-3]):?[0-5][0-9]$/', $value )) { // 0:00 - 23:59, 000 - 2359
+      return $value;
+    }
+    // Handle a special case of 24:00.
+    if ($value == '24:00') {
+      return $value;
+    }
+    // Handle localized fractional hours.
+    global $user;
+    $localizedPattern = '/^([0-1]{0,1}[0-9]|2[0-3])?['.$user->decimal_mark.'][0-9]{1,4}h?$/';
+    if (preg_match($localizedPattern, $value )) { // decimal values like 0.5, 1.25h, ... .. 23.9999h (or with comma)
+        if ($user->decimal_mark == ',')
+          $value = str_replace (',', '.', $value);
+
+        $val = floatval($value);
+        $mins = round($val * 60);
+        $hours = (string)((int)($mins / 60));
+        $mins = (string)($mins % 60);
+        if (strlen($mins) == 1)
+          $mins = '0' . $mins;
+        return $hours.':'.$mins;
+    }
+    // Handle minutes.
+    if (preg_match('/^\d{1,4}m$/', $value )) { // ddddm
+      $mins = (int) trim($value, 'm');
+      if ($mins > 1440) // More minutes than an entire day could hold.
+        return false;
+      $hours = (string)((int)($mins / 60));
+      $mins = (string)($mins % 60);
+      if (strlen($mins) == 1)
+        $mins = '0' . $mins;
+      return $hours.':'.$mins;
+    }
+    return false;
+  }
+
   // normalizeDuration - converts a valid time duration string to format 00:00.
   static function normalizeDuration($value, $leadingZero = true) {
     $time_value = $value;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 98a3f839..155be1eb 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.10.3839 | 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.10.3840 | 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>