From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Mon, 5 Apr 2021 13:36:12 +0000 (+0200)
Subject: logs.cgi/showrequestfromcountry.dat: Proper lookup country code.
X-Git-Tag: v2.25-core156~8^2~56
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=5ae118858924b3ca909f907e9448350cc7089cc0

logs.cgi/showrequestfromcountry.dat: Proper lookup country code.

Seems to be a code fragment has been left while switching to
libloc. Now call the right function from location-functions.pl.

Fixes #12599.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/html/cgi-bin/logs.cgi/showrequestfromcountry.dat b/html/cgi-bin/logs.cgi/showrequestfromcountry.dat
index 2a246ec60e..f81994f870 100644
--- a/html/cgi-bin/logs.cgi/showrequestfromcountry.dat
+++ b/html/cgi-bin/logs.cgi/showrequestfromcountry.dat
@@ -218,7 +218,7 @@ if ($multifile) {
 				# extract ipv4 and ipv6 address
 				elsif (($_ =~ /SRC\=(([\d]{1,3})(\.([\d]{1,3})){3})/) or ($_ =~ /SRC\=(([0-9a-fA-F]{0,4})(\:([0-9a-fA-F]{0,4})){2,7})/)) {
 					my $srcaddr=$1;
-					my $ccode = $gi->country_code_by_name($srcaddr);
+					my $ccode = &Location::Functions::lookup_country_code($srcaddr);
 					if($ccode eq uc($country)){
 						# or srcaddr matches country code
 						$log[$lines] = $_;