From: kkalev <kkalev>
Date: Mon, 6 Oct 2003 09:30:17 +0000 (+0000)
Subject: Show correct calculation of the montlhy usage time.
X-Git-Url: https://git.entuzijast.net/?a=commitdiff_plain;h=790fc27ccad5a33c603461b31d73fe08205e2f7c;p=freeradius-dialup-admin.git

Show correct calculation of the montlhy usage time.
---

diff --git a/Changelog b/Changelog
index beacd14..55b58a8 100644
--- 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 e2eb392..1217aa2 100644
--- 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>";