From 4f6d5b3ef3d6cfb9c4117cf2805a9c37cbdc01ac Mon Sep 17 00:00:00 2001 From: Stefan Schantl Date: Fri, 12 Jun 2020 18:44:29 +0200 Subject: [PATCH] logs.cgi/showrequestfromcountry.dat: Use location-functions.pl Signed-off-by: Stefan Schantl --- html/cgi-bin/logs.cgi/showrequestfromcountry.dat | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/html/cgi-bin/logs.cgi/showrequestfromcountry.dat b/html/cgi-bin/logs.cgi/showrequestfromcountry.dat index 2af0ec9dcc..4d80e77a4d 100644 --- a/html/cgi-bin/logs.cgi/showrequestfromcountry.dat +++ b/html/cgi-bin/logs.cgi/showrequestfromcountry.dat @@ -15,12 +15,12 @@ #use strict; 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"; # Libloc database handle. -my $libloc_db_handle = &GeoIP::init(); +my $libloc_db_handle = &Location::Functions::init(); use POSIX(); @@ -181,7 +181,7 @@ if (!$skip) } elsif($srcaddr ne '') { # or srcaddr matches country code - my $ccode = &GeoIP::lookup_country_code($libloc_db_handle, $srcaddr); + my $ccode = &Location::Functions::lookup_country_code($libloc_db_handle, $srcaddr); if($ccode eq uc($country)){ $log[$lines] = $_; $lines++; @@ -352,7 +352,7 @@ foreach $_ (@slice) if($iface eq $country || $srcaddr ne '') { my $ccode=''; if($iface ne $country) { - $ccode = &GeoIP::lookup_country_code($libloc_db_handle, $srcaddr); + $ccode = &Location::Functions::lookup_country_code($libloc_db_handle, $srcaddr); } if($iface eq $country || $ccode eq uc($country)) { my $chain = ''; -- 2.39.5