Testing branches and merges.

[timetracker.git] / WEB-INF / lib / common.lib.php

diff --git a/WEB-INF/lib/common.lib.php b/WEB-INF/lib/common.lib.php
index 3644c0587471ac433005eb93b83010c60785490a..4fa43777a9d7dcc27deef87e91f7e8756e7270a6 100644 (file)
--- a/WEB-INF/lib/common.lib.php
+++ b/WEB-INF/lib/common.lib.php
@@ -26,13 +26,8 @@
 // | https://www.anuko.com/time_tracker/credits.htm
 // +----------------------------------------------------------------------+
 
 // | https://www.anuko.com/time_tracker/credits.htm
 // +----------------------------------------------------------------------+
 

-       /**
-        * @return unknown
-        * @param file unknown
-        * @param version = "" unknown
-        * @desc Loads a class
-        */
-       function import( $class_name ) {
+// import() function loads a class.
+function import($class_name) {

            $libs = array(
                        dirname($_SERVER["SCRIPT_FILENAME"]),
                        LIBRARY_DIR
            $libs = array(
                        dirname($_SERVER["SCRIPT_FILENAME"]),
                        LIBRARY_DIR


@@ -61,7 +56,7 @@
 
                print '<br><b>load_class: error loading file "'.$filename.'"</b>';
                die();
 
                print '<br><b>load_class: error loading file "'.$filename.'"</b>';
                die();

-       }
+}

 
        // The mu_sort function is used to sort a multi-dimensional array.
        // It looks like the code example is taken from the PHP manual http://ca2.php.net/manual/en/function.sort.php
 
        // The mu_sort function is used to sort a multi-dimensional array.
        // It looks like the code example is taken from the PHP manual http://ca2.php.net/manual/en/function.sort.php


@@ -143,15 +138,17 @@
                }
        }
 
                }
        }
 

-function time_to_decimal($a) {
-  $tmp = explode(":", $a);
-  if($tmp[1]{0}=="0") $tmp[1] = $tmp[1]{1};
+// time_to_decimal converts a time string such as 1:15 to its decimal representation such as 1.25 or 1,25.
+function time_to_decimal($val) {
+  global $user;
+  $parts = explode(':', $val); // parts[0] is hours, parts[1] is minutes.

 
 

-  $m = round($tmp[1]*100/60);
+  $minutePercent = round($parts[1]*100/60); // Integer value (0-98) of percent of minutes portion in the hour.
+  if($minutePercent < 10) $minutePercent = '0'.$minutePercent; // Pad small values with a 0 to always have 2 digits.

 
 

-  if($m<10) $m = "0".$m;
-  $time = $tmp[0].".".$m;
-  return $time;
+  $decimalTime = $parts[0].$user->decimal_mark.$minutePercent; // Construct decimal representation of time value.
+
+  return $decimalTime;

 }
 
 function sec_to_time_fmt_hm($sec)
 }
 
 function sec_to_time_fmt_hm($sec)


@@ -340,10 +337,3 @@ function ttAccessCheck($required_rights)
     
   return true;
 }
     
   return true;
 }

-
-// ttPluginEnabled is used to check whether a plugin is enabled for user.
-function ttPluginEnabled($plugin)
-{
-  global $user;
-  return in_array($plugin, explode(',', $user->plugins));
-}