From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stefan Schantl <stefan.schantl@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 07/19] ovpnclients.dat: Add table header.
Date: Mon, 13 Apr 2020 09:45:38 +0200
Message-ID: <20200413074550.2735-7-stefan.schantl@ipfire.org>
In-Reply-To: <20200413074550.2735-1-stefan.schantl@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2310401358449321521=="
List-Id: <development.lists.ipfire.org>

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

The header will be dynamically generated, according the items which will
be displayed.

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 html/cgi-bin/logs.cgi/ovpnclients.dat | 46 +++++++++++++++++++--------
 1 file changed, 33 insertions(+), 13 deletions(-)

diff --git a/html/cgi-bin/logs.cgi/ovpnclients.dat b/html/cgi-bin/logs.cgi/ov=
pnclients.dat
index b601fd292..33d6d8717 100755
--- a/html/cgi-bin/logs.cgi/ovpnclients.dat
+++ b/html/cgi-bin/logs.cgi/ovpnclients.dat
@@ -243,7 +243,21 @@ my $lines =3D 0;
=20
 print "<table width=3D'100%' class=3D'tbl'>";
=20
-my $col=3D"";
+my $col =3D "bgcolor=3D'$color{'color20'}'";
+
+	print "<tr>\n";
+		print "<td width=3D'40%' $col><b>$Lang::tr{'ovpn connection name'}</b></td=
>\n";
+
+	if ($cgiparams{'CONNECTION_NAME'}) {
+		print "<td width=3D'20%' $col><b>$Lang::tr{'connected'}</b></td>\n";
+		print "<td width=3D'20%' $col><b>$Lang::tr{'disconnected'}</b></td>\n";
+		print "<td width=3D'10%' $col><b>$Lang::tr{'recieved'}</b></td>\n";
+		print "<td width=3D'10%' $col><b>$Lang::tr{'sent'}</b></td>\n";
+	} else {
+		print "<td $col><b>$Lang::tr{'total connection time'}</b>\n";
+	}
+
+	print "</tr>\n";
=20
 while(my @row =3D $statement_handle->fetchrow_array()) {
 	# Assign some nice to read variable names for the DB fields.
@@ -253,23 +267,29 @@ while(my @row =3D $statement_handle->fetchrow_array()) {
 	my $connection_bytes_recieved =3D &General::formatBytes($row[3]);
 	my $connection_bytes_sent =3D &General::formatBytes($row[4]);
=20
-	# Colorize columns.=20
+	# Colorize columns.
 	if ($lines % 2) {
+		$col=3D"bgcolor=3D'$color{'color20'}'";
+	} else {
 		$col=3D"bgcolor=3D'$color{'color22'}'";
+	}
+
+	print "<tr>\n";
+		print "<td width=3D'40%' $col>$connection_name</td>\n";
+
+	if ($cgiparams{'CONNECTION_NAME'}) {
+		print "<td width=3D'20%' $col>$connection_open_time</td>\n";
+		print "<td width=3D'20%' $col>$connection_close_time</td>\n";
+		print "<td width=3D'10%' $col>$connection_bytes_recieved</td>\n";
+		print "<td width=3D'10%' $col>$connection_bytes_sent</td>\n";
 	} else {
-		$col=3D"bgcolor=3D'$color{'color20'}'";
+		# Convert total connection time into human-readable format.
+		my $total_time =3D &General::format_time($row[1]);
+
+		print "<td $col>$total_time</td>\n";
 	}
=20
-print <<END
-	<tr>
-		<td width=3D"40%" align=3D"left" $col>$connection_name</td>
-		<td width=3D"20%" align=3D"center" $col>$connection_open_time</td>
-		<td width=3D"20%" align=3D"center" $col>$connection_close_time</td>
-		<td width=3D"10%" align=3D"center" $col>$connection_bytes_recieved</td>
-		<td width=3D"10%" align=3D"center" $col>$connection_bytes_sent</td>
-	</tr>
-END
-;
+	print "</tr>\n";
=20
 	# Increase lines count.
 	$lines++;
--=20
2.26.0


--===============2310401358449321521==--