Refactoring - renamed a function for clarity of purpose.

diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php
index f98d67572febece955e7a115f46f86a93e4587b1..a6117eefad1d927d883f655503efbef452a0a4aa 100644 (file)
--- a/WEB-INF/lib/ttTimeHelper.class.php
+++ b/WEB-INF/lib/ttTimeHelper.class.php
@@ -146,8 +146,9 @@ class ttTimeHelper {
     return (int)@$time_a[1] + ((int)@$time_a[0]) * 60;
   }
   
     return (int)@$time_a[1] + ((int)@$time_a[0]) * 60;
   }
   

-  // fromMinutes - converts a number of minutes to format 00:00
-  static function fromMinutes($minutes){
+  // toAbsDuration - converts a number of minutes to format 00:00
+  // even if $minutes is negative.
+  static function toAbsDuration($minutes){

     $hours = (string)((int)abs($minutes / 60));
     $mins = (string)(abs($minutes % 60));
     if (strlen($hours) == 1)
     $hours = (string)((int)abs($minutes / 60));
     $mins = (string)(abs($minutes % 60));
     if (strlen($hours) == 1)


@@ -162,7 +163,7 @@ class ttTimeHelper {
     $duration_minutes = ttTimeHelper::toMinutes($finish) - ttTimeHelper::toMinutes($start);
     if ($duration_minutes <= 0) return false;
     
     $duration_minutes = ttTimeHelper::toMinutes($finish) - ttTimeHelper::toMinutes($start);
     if ($duration_minutes <= 0) return false;
     

-    return ttTimeHelper::fromMinutes($duration_minutes);
+    return ttTimeHelper::toAbsDuration($duration_minutes);

   }
   
   // The to12HourFormat function converts a 24-hour time value (such as 15:23) to 12 hour format (03:23 PM).
   }
   
   // The to12HourFormat function converts a 24-hour time value (such as 15:23) to 12 hour format (03:23 PM).

diff --git a/time.php b/time.php
index 33b57639a2eb6127801ecfcd03302e70d3cd0466..63290a69523b65adda5f694930a2842b199afe82 100644 (file)
--- a/time.php
+++ b/time.php
@@ -72,7 +72,7 @@ if ($user->isPluginEnabled('mq')){
   
   $smarty->assign('month_total', $month_total);
   $smarty->assign('over_quota', $minutesLeft < 0);
   
   $smarty->assign('month_total', $month_total);
   $smarty->assign('over_quota', $minutesLeft < 0);

-  $smarty->assign('month_left', ttTimeHelper::fromMinutes($minutesLeft));
+  $smarty->assign('month_left', ttTimeHelper::toAbsDuration($minutesLeft));

 }
 
 // Initialize variables.
 }
 
 // Initialize variables.