Show correct calculation of the montlhy usage time.

diff --git a/Changelog b/Changelog
index beacd143f185dac2fac2490f19e90b29fdc0bcb9..55b58a8a89292950f40f1e8b64d55c3e97febfcb 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -48,6 +48,7 @@ Ver 1.63:
   it in user_admin if monthly_limit != 'none' or if this directive is set.
   Based on a report by "apellido jr., wilfredo p"
 * Add more comments in the admin.conf file
+* Show correct calculation of the montlhy usage time.
 Ver 1.62:
 * Remove one sql query from user_admin which was not needed.
 * Instead of a query like "LIKE 'YYYY-MM-DD%'" use "AcctStopTime >= 'YYYY-MM-DD 00:00:00 AND AcctStopTime

diff --git a/htdocs/user_admin.php3 b/htdocs/user_admin.php3
index e2eb392d748593aa21b4221d8d5311927f846282..1217aa2f79cb355267d56f32606aa5bd07eee9f9 100644 (file)
--- a/htdocs/user_admin.php3
+++ b/htdocs/user_admin.php3
@@ -196,7 +196,7 @@ if ($link){
                        $remaining = $tmp;
                $log_color = ($remaining) ? 'green' : 'red';
        }
-       if ($config[counter_monthly_calculate_usage] == 'true'){
+       if ($monthly_limit != 'none' || $config[counter_monthly_calculate_usage] == 'true'){
                $monthly_used = time2str($monthly_used);
                if ($monthly_limit != 'none' && !$tmp)
                        $monthly_used = "<font color=red>$monthly_used</font>";