From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Fri, 12 Jun 2020 16:52:19 +0000 (+0200)
Subject: remote.cgi: Use location-functions.pl
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=69d431e41aae4a887bd69c6af8325edeb32f8a91;p=people%2Fstevee%2Fipfire-2.x.git

remote.cgi: Use location-functions.pl

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
---

diff --git a/html/cgi-bin/remote.cgi b/html/cgi-bin/remote.cgi
index d94d27d425..9c742669bc 100644
--- a/html/cgi-bin/remote.cgi
+++ b/html/cgi-bin/remote.cgi
@@ -28,7 +28,7 @@ use strict;
 use IO::Socket;
 
 require '/var/ipfire/general-functions.pl';
-require "${General::swroot}/geoip-functions.pl";
+require "${General::swroot}/location-functions.pl";
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
 
@@ -279,7 +279,7 @@ sub printactivelogins()
 		# list active logins...
 
 		# Libloc database handle.
-		my $libloc_db_handle = &GeoIP::init();
+		my $libloc_db_handle = &Location::Functions::init();
 
 		foreach my $line (@output)
 		{
@@ -291,8 +291,8 @@ sub printactivelogins()
 			$remoteip =~ s/[()]//g;
 
 			# display more information about that IP adress...
-			my $ccode = &GeoIP::lookup_country_code($libloc_db_handle, $remoteip);
-			my $flag_icon = &GeoIP::get_flag_icon($ccode);
+			my $ccode = &Location::Functions::lookup_country_code($libloc_db_handle, $remoteip);
+			my $flag_icon = &Location::Functions::get_flag_icon($ccode);
 
 			# get rDNS...
 			my $iaddr = inet_aton($remoteip);