GeoIP: Add lookup function for convenience

[ipfire-2.x.git] / html / cgi-bin / logs.cgi / firewalllogcountry.dat

diff --git a/html/cgi-bin/logs.cgi/firewalllogcountry.dat b/html/cgi-bin/logs.cgi/firewalllogcountry.dat
index 26920b5da0dd97b2831da177cd70c418018f5e27..949f2599daade08aa40d9285a3c754bccf419c95 100644 (file)
--- a/html/cgi-bin/logs.cgi/firewalllogcountry.dat
+++ b/html/cgi-bin/logs.cgi/firewalllogcountry.dat
@@ -11,7 +11,6 @@
 #                          and Michael Tremer (www.ipfire.org)
 
 use strict;
-use Geo::IP::PurePerl;
 use Getopt::Std;
 
 # enable only the following on debugging purpose
@@ -213,7 +212,7 @@ if ($multifile) {
 my $MODNAME="fwlogs";
 
 &Header::showhttpheaders();
-&Header::openpage($Lang::tr{'firewall log'}, 1, '');
+&Header::openpage($Lang::tr{'firewall log country'}, 1, '');
 &Header::openbigbox('100%', 'left', '', $errormessage);
 
 
@@ -281,13 +280,12 @@ END
 
 &Header::closebox();
 
-&Header::openbox('100%', 'left', 'Firewall Logs');
+&Header::openbox('100%', 'left', $Lang::tr{'firewall graph country'});
 print "<p><b>$Lang::tr{'firewall hits'} $longmonthstr $daystr: $lines</b></p>";
 
 my $red_interface = &General::get_red_interface();
 my $linesjc = 0;
 my %tabjc;
-my $gi = Geo::IP::PurePerl->new();
 
 if ($pienumber == -1 || $pienumber > $lines || $sortcolumn == 2) { $pienumber = $lines; };
 $lines = 0;
@@ -310,7 +308,7 @@ foreach $_ (@log)
                # Traffic from red
                if($srcaddr ne '') {
                        # srcaddr is set
-                       my $ccode = $gi->country_code_by_name($srcaddr);
+                       my $ccode = &GeoIP::lookup($srcaddr);
                        if ($ccode eq '') {
                                $ccode = 'unknown';
                        }
@@ -471,7 +469,7 @@ for($s=0;$s<$lines;$s++)
                print"<input type='hidden' name='MONTH' value='$cgiparams{'MONTH'}'>";
                print"<input type='hidden' name='DAY' value='$cgiparams{'DAY'}'>";
                print"<input type='hidden' name='country' value='$key[$s]'>";
-               print"<input type='submit' value='details'></form>";
+               print"<input type='submit' value='$Lang::tr{'details'}'></form>";
        }
        elsif ($key[$s] eq 'unknown') {
                print "unknown";