From mboxrd@z Thu Jan  1 00:00:00 1970
From: Alexander Marx <alexander.marx@ipfire.org>
To: development@lists.ipfire.org
Subject:
 [PATCH] BUG12245: captive portal - clients are not automatically removed
Date: Wed, 20 Nov 2019 11:45:18 +0100
Message-ID: <20191120104518.13156-1-alexander.marx@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5764751118873315517=="
List-Id: <development.lists.ipfire.org>

--===============5764751118873315517==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

With this patch the clients are updated and those who are expired get deleted=
 from the hash.
In addition the table of active clients is now sorted.
---
 html/cgi-bin/captive.cgi | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/html/cgi-bin/captive.cgi b/html/cgi-bin/captive.cgi
index b33287dd4..8204eb7b3 100755
--- a/html/cgi-bin/captive.cgi
+++ b/html/cgi-bin/captive.cgi
@@ -514,6 +514,25 @@ END
 	}
 }
=20
+sub cleanup_expired_coupons
+{
+	my $acttime=3Dtime();
+	&General::readhasharray($clients, \%clientshash) if (-e $clients);
+	foreach my $key (keys %clientshash) {
+
+		#calculate endtime from clientshash
+		my $endtime;
+		if ($clientshash{$key}[3] > '0'){
+			$endtime =3D $clientshash{$key}[2]+$clientshash{$key}[3];
+			if ($acttime > $endtime) {
+				delete $clientshash{$key};
+			}
+		}
+	}
+	#write back hash
+	&General::writehasharray("$clients", \%clientshash);
+}
+
 sub show_coupons() {
 	&General::readhasharray($coupons, \%couponhash) if (-e $coupons);
=20
@@ -601,9 +620,9 @@ sub show_clients() {
 				<th align=3D'center' width=3D'5%'>$Lang::tr{'delete'}</th>
 			</tr>
 END
-
+	&cleanup_expired_coupons();
 	&General::readhasharray($clients, \%clientshash) if (-e $clients);
-	foreach my $key (keys %clientshash) {
+	foreach my $key (sort {$clientshash{$a}[2] <=3D> $clientshash{$b}[2]} keys =
%clientshash) {
 		#calculate time from clientshash (starttime)
 		my $starttime =3D sub{sprintf '%02d.%02d.%04d %02d:%02d', $_[3], $_[4]+1, =
$_[5]+1900, $_[2], $_[1]  }->(localtime($clientshash{$key}[2]));
=20
--=20
2.17.1


--===============5764751118873315517==--