Fix report exports to honor user decimal mark designation.

diff --git a/WEB-INF/config.php.dist b/WEB-INF/config.php.dist
index bca0da0edd63cb07806ab2c5521e68f0730f8cfa..b52e0d809ccb198e98d36079513cc75ebc5f98a7 100644 (file)
--- a/WEB-INF/config.php.dist
+++ b/WEB-INF/config.php.dist
@@ -174,7 +174,7 @@ define('LANG_DEFAULT', '');
 define('CURRENCY_DEFAULT', '$');
 
 
 define('CURRENCY_DEFAULT', '$');
 
 

-// EXPORT_DECIMAL_DURATION - defines whether time duration values are decimal in CSV and XML data exports (1.25 vs 1:15).
+// EXPORT_DECIMAL_DURATION - defines whether time duration values are decimal in CSV and XML data exports (1.25 or 1,25 vs 1:15).

 // 
 define('EXPORT_DECIMAL_DURATION', true);
 
 // 
 define('EXPORT_DECIMAL_DURATION', true);
 

diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index 124b78f5887823c3d13a61370f96008d4561e21d..d98e8889298ca10d37dbe70a86051a4ca3d045d4 100644 (file)
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -144,13 +144,14 @@
        }
 
 function time_to_decimal($a) {
        }
 
 function time_to_decimal($a) {

+  global $user;

   $tmp = explode(":", $a);
   if($tmp[1]{0}=="0") $tmp[1] = $tmp[1]{1};
 
   $m = round($tmp[1]*100/60);
 
   if($m<10) $m = "0".$m;
   $tmp = explode(":", $a);
   if($tmp[1]{0}=="0") $tmp[1] = $tmp[1]{1};
 
   $m = round($tmp[1]*100/60);
 
   if($m<10) $m = "0".$m;

-  $time = $tmp[0].".".$m;
+  $time = $tmp[0].$user->decimal_mark.$m;

   return $time;
 }
 
   return $time;
 }
 

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 40a17ec2659e022aab19ee49c29702be4997a976..f15d95d6eeae881e381437bbdbea9283f63c48d6 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.9.24.3495 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.9.25.3496 | 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>