webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 19:23:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
This commit is contained in:
Stefan Schantl
2020-06-12 18:44:29 +02:00
parent 43970d7cfc
commit 4f6d5b3ef3
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
html/cgi-bin/logs.cgi/showrequestfromcountry.dat
View File

@@ -15,12 +15,12 @@
#use strict; #use strict;
require '/var/ipfire/general-functions.pl'; 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}/lang.pl";
require "${General::swroot}/header.pl"; require "${General::swroot}/header.pl";
# Libloc database handle. # Libloc database handle.
my $libloc_db_handle = &GeoIP::init(); my $libloc_db_handle = &Location::Functions::init();
use POSIX(); use POSIX();
@@ -181,7 +181,7 @@ if (!$skip)
} }
elsif($srcaddr ne '') { elsif($srcaddr ne '') {
# or srcaddr matches country code # 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)){ if($ccode eq uc($country)){
$log[$lines] = $_; $log[$lines] = $_;
$lines++; $lines++;
@@ -352,7 +352,7 @@ foreach $_ (@slice)
if($iface eq $country || $srcaddr ne '') { if($iface eq $country || $srcaddr ne '') {
my $ccode=''; my $ccode='';
if($iface ne $country) { 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)) { if($iface eq $country || $ccode eq uc($country)) {
my $chain = ''; my $chain = '';