Merge branch 'switch-to-libloc' into next-switch-to-libloc

[people/mfischer/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 605873ac00ce7ca965750582b0264d118aa3cde9..2af0ec9dcc73eccf58ed77a587089f2c618dc874 100644 (file)
--- a/html/cgi-bin/logs.cgi/showrequestfromcountry.dat
+++ b/html/cgi-bin/logs.cgi/showrequestfromcountry.dat
@@ -19,6 +19,9 @@ require "${General::swroot}/geoip-functions.pl";
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
 
+# Libloc database handle.
+my $libloc_db_handle = &GeoIP::init();
+
 use POSIX();
 
 #workaround to suppress a warning when a variable is used only once
@@ -178,7 +181,7 @@ if (!$skip)
                        }
                        elsif($srcaddr ne '') {
                                # or srcaddr matches country code
-                               my $ccode = &GeoIP::lookup($srcaddr);
+                               my $ccode = &GeoIP::lookup_country_code($libloc_db_handle, $srcaddr);
                                if($ccode eq uc($country)){
                                        $log[$lines] = $_;
                                        $lines++;
@@ -349,7 +352,7 @@ foreach $_ (@slice)
        if($iface eq $country || $srcaddr ne '') {
                my $ccode='';
                if($iface ne $country) {
-                       $ccode = $gi->country_code_by_name($srcaddr);
+                       $ccode = &GeoIP::lookup_country_code($libloc_db_handle, $srcaddr);
                }
                if($iface eq $country || $ccode eq uc($country)) {
                        my $chain = '';