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 --- html/cgi-bin/logs.cgi/showrequestfromcountry.dat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/html/cgi-bin/logs.cgi/showrequestfromcountry.dat b/html/cgi-bin/logs.cgi/showrequestfromcountry.dat index 2a246ec60..f81994f87 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] = $_;
Reviewed-by: Peter Müller peter.mueller@ipfire.org
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
html/cgi-bin/logs.cgi/showrequestfromcountry.dat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/html/cgi-bin/logs.cgi/showrequestfromcountry.dat b/html/cgi-bin/logs.cgi/showrequestfromcountry.dat index 2a246ec60..f81994f87 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] = $_;