logs.cgi/showrequestfromcountry.dat: Use location-functions.pl

[people/pmueller/ipfire-2.x.git] / html / cgi-bin / logs.cgi / showrequestfromcountry.dat

diff --git a/html/cgi-bin/logs.cgi/showrequestfromcountry.dat b/html/cgi-bin/logs.cgi/showrequestfromcountry.dat
index 2af0ec9dcc73eccf58ed77a587089f2c618dc874..4d80e77a4d68fa2bacba9f275c1df842bd2d9c4c 100644 (file)
--- 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 = '';