From mboxrd@z Thu Jan  1 00:00:00 1970
From: Peter =?utf-8?q?M=C3=BCller?= <peter.mueller@link38.eu>
To: development@lists.ipfire.org
Subject: [PATCH v2] display GeoIP information on ipinfo.cgi
Date: Wed, 15 Nov 2017 22:56:36 +0100
Message-ID: <20171115225636.63e93c18.peter.mueller@link38.eu>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7269099941533968911=="
List-Id: <development.lists.ipfire.org>

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

Display GeoIP information on ipinfo.cgi and use newly implemented
function in /var/ipfire/geoip-functions.pl .

Signed-off-by: Peter M=C3=BCller <peter.mueller(a)link38.eu>
---
 html/cgi-bin/ipinfo.cgi | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/html/cgi-bin/ipinfo.cgi b/html/cgi-bin/ipinfo.cgi
index 16541f126..b756a24d2 100644
--- a/html/cgi-bin/ipinfo.cgi
+++ b/html/cgi-bin/ipinfo.cgi
@@ -30,6 +30,7 @@ use strict;
 require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
+require "${General::swroot}/geoip-functions.pl";
=20
 my %cgiparams=3D();
=20
@@ -50,6 +51,10 @@ if (&General::validip($addr)) {
 	my $hostname =3D gethostbyaddr($iaddr, AF_INET);
 	if (!$hostname) { $hostname =3D $Lang::tr{'lookup failed'}; }
=20
+	# enumerate GeoIP information for IP address...
+	my $ccode =3D &GeoIP::lookup($addr);
+	my $flag_icon =3D &GeoIP::get_flag_icon($ccode);
+
 	my $sock =3D new IO::Socket::INET ( PeerAddr =3D> $whoisname, PeerPort =3D>=
 43, Proto =3D> 'tcp');
 	if ($sock)
 	{
@@ -81,7 +86,7 @@ if (&General::validip($addr)) {
 		@lines =3D ( "$Lang::tr{'unable to contact'} $whoisname" );
 	}
=20
-	&Header::openbox('100%', 'left', $addr . ' (' . $hostname . ') : '.$whoisna=
me);
+	&Header::openbox('100%', 'left', $addr . " <a href=3D'country.cgi#$ccode'><=
img src=3D'$flag_icon' border=3D'0' align=3D'absmiddle' alt=3D'$ccode' title=
=3D'$ccode' /></a> (" . $hostname . ') : '.$whoisname);
 	print "<pre>\n";
 	foreach my $line (@lines) {
 		print &Header::cleanhtml($line,"y");
--=20
2.13.6


--===============7269099941533968911==--