From f424897557ee41cd235ae293820a558c98e9caf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alf=20H=C3=B8gemark?= Date: Sun, 16 Feb 2014 07:18:41 +0100 Subject: [PATCH] firewalllogcountry.dat: Use language strings and add to menu Add some language strings for the new firewalllogport.dat, and include html fixes done in firewalllogip.dat, which this file is based on. Also try to add the menu item to the sub menu, but that is currently not working. --- config/menu/70-log.menu | 5 + html/cgi-bin/logs.cgi/firewalllogcountry.dat | 96 ++++++++++---------- langs/de/cgi-bin/de.pl | 2 + langs/en/cgi-bin/en.pl | 4 +- 4 files changed, 58 insertions(+), 49 deletions(-) diff --git a/config/menu/70-log.menu b/config/menu/70-log.menu index 25ba090fc..08973de5a 100644 --- a/config/menu/70-log.menu +++ b/config/menu/70-log.menu @@ -33,6 +33,11 @@ 'title' => "$Lang::tr{'firewall logs port'}", 'enabled' => 1 }; + $sublogs->{'43.firewallcountry'} = {'caption' => $Lang::tr{'firewall logs country'}, + 'uri' => '/cgi-bin/logs.cgi/firewalllogcountry.dat', + 'title' => "$Lang::tr{'firewall logs country'}", + 'enabled' => 1 + }; $sublogs->{'50.ids'} = {'caption' => $Lang::tr{'ids logs'}, 'uri' => '/cgi-bin/logs.cgi/ids.dat', 'title' => "$Lang::tr{'ids logs'}", diff --git a/html/cgi-bin/logs.cgi/firewalllogcountry.dat b/html/cgi-bin/logs.cgi/firewalllogcountry.dat index ffd8cea83..6676f9cb7 100644 --- a/html/cgi-bin/logs.cgi/firewalllogcountry.dat +++ b/html/cgi-bin/logs.cgi/firewalllogcountry.dat @@ -221,7 +221,7 @@ if ($errormessage) { &Header::closebox(); } -&Header::openbox('100%', 'left', "$Lang::tr{'settings'}:"); +&Header::openbox('100%', 'left', "$Lang::tr{'settings'}"); print < @@ -266,15 +266,15 @@ print < - + + + + $Lang::tr{'Number of Countries for the pie chart'}: + + - - - - -
$Lang::tr{'Number of IPs for the pie chart'}:
- + END ; @@ -285,7 +285,6 @@ print "

$Lang::tr{'firewall hits'} $longmonthstr $daystr: $lines

"; my $linesjc = 0; my %tabjc; - my $gi = Geo::IP::PurePerl->new(); if ($pienumber == -1 || $pienumber > $lines || $sortcolumn == 2) { $pienumber = $lines; }; @@ -416,13 +415,13 @@ if ($showpie != 2 && $pienumber <= 50 && $pienumber != 0) { } print < - - -Flag -Count -Percent - + + + + + + + END ; @@ -431,6 +430,7 @@ my $show=0; my $s; my $percent; +my $col=""; for($s=0;$s<$lines;$s++) { @@ -438,42 +438,42 @@ for($s=0;$s<$lines;$s++) $percent = $value[$s] * 100 / $linesjc; $percent = sprintf("%.f", $percent); $total = $total + $value[$s]; - if ( ($color % 10) == 1 ){print "\n";} - if ( ($color % 10) == 2 ){print "\n";} - if ( ($color % 10) == 3 ){print "\n";} - if ( ($color % 10) == 4 ){print "\n";} - if ( ($color % 10) == 5 ){print "\n";} - if ( ($color % 10) == 6 ){print "\n";} - if ( ($color % 10) == 7 ){print "\n";} - if ( ($color % 10) == 8 ){print "\n";} - if ( ($color % 10) == 9 ){print "\n";} - if ( ($color % 10) == 0 ){print "\n";} - + if ( ($color % 10) == 1 ){print ""; $col="bgcolor='$color{'color1'}'";} + if ( ($color % 10) == 2 ){print ""; $col="bgcolor='$color{'color2'}'";} + if ( ($color % 10) == 3 ){print ""; $col="bgcolor='$color{'color3'}'";} + if ( ($color % 10) == 4 ){print ""; $col="bgcolor='$color{'color4'}'";} + if ( ($color % 10) == 5 ){print ""; $col="bgcolor='$color{'color5'}'";} + if ( ($color % 10) == 6 ){print ""; $col="bgcolor='$color{'color6'}'";} + if ( ($color % 10) == 7 ){print ""; $col="bgcolor='$color{'color7'}'";} + if ( ($color % 10) == 8 ){print ""; $col="bgcolor='$color{'color8'}'";} + if ( ($color % 10) == 9 ){print ""; $col="bgcolor='$color{'color9'}'";} + if ( ($color % 10) == 0 ){print ""; $col="bgcolor='$color{'color10'}'";} $color++; - print ""; + print ""; if ( $key[$s] ne "unknown" ){ my $fcode = lc($key[$s]); - print "";} + print "";} else { - print "";} - print ""; - print ""; - print ""; + print ""; } + print ""; + print ""; + print ""; +} if($cgiparams{'otherspie'} == 2 ){} else{ -if ( ($color % 10) == 1 ){print "\n";} -if ( ($color % 10) == 2 ){print "\n";} -if ( ($color % 10) == 3 ){print "\n";} -if ( ($color % 10) == 4 ){print "\n";} -if ( ($color % 10) == 5 ){print "\n";} -if ( ($color % 10) == 6 ){print "\n";} -if ( ($color % 10) == 7 ){print "\n";} -if ( ($color % 10) == 8 ){print "\n";} -if ( ($color % 10) == 9 ){print "\n";} -if ( ($color % 10) == 0 ){print "\n";} +if ( ($color % 10) == 1 ){print ""; $col="bgcolor='$color{'color1'}'";} +if ( ($color % 10) == 2 ){print ""; $col="bgcolor='$color{'color2'}'";} +if ( ($color % 10) == 3 ){print ""; $col="bgcolor='$color{'color3'}'";} +if ( ($color % 10) == 4 ){print ""; $col="bgcolor='$color{'color4'}'";} +if ( ($color % 10) == 5 ){print ""; $col="bgcolor='$color{'color5'}'";} +if ( ($color % 10) == 6 ){print ""; $col="bgcolor='$color{'color6'}'";} +if ( ($color % 10) == 7 ){print ""; $col="bgcolor='$color{'color7'}'";} +if ( ($color % 10) == 8 ){print ""; $col="bgcolor='$color{'color8'}'";} +if ( ($color % 10) == 9 ){print ""; $col="bgcolor='$color{'color9'}'";} +if ( ($color % 10) == 0 ){print ""; $col="bgcolor='$color{'color10'}'";} if ( $linesjc ne "0") { @@ -482,11 +482,11 @@ $dif = $linesjc - $total; $percent = $dif * 100 / $linesjc; $percent = sprintf("%.f", $percent); print < - - - - + + + + + END ; } diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index e951b68b5..700f41b3b 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -34,6 +34,7 @@ 'Level7 rule' => 'Level7-Regel', 'Local VPN IP' => 'Internes Netzwerk (GREEN)', 'MTU' => 'MTU Size', +'Number of Countries for the pie chart' => 'Anzahl der angezeigten Länder im Diagramm', 'Number of IPs for the pie chart' => 'Anzahl der angezeigten IPs im Diagramm', 'Number of Ports for the pie chart' => 'Anzahl der angezeigten Ports im Diagramm', 'OVPN' => 'OpenVPN', @@ -888,6 +889,7 @@ 'firewall log' => 'Firewall-Protokoll', 'firewall log viewer' => 'Betrachter der Firewall-Logdateien', 'firewall logs' => 'Firewall-Logdateien', +'firewall logs country' => 'Fw-Logdiagramme (Land)', 'firewall logs ip' => 'Fw-Logdiagramme (IP)', 'firewall logs port' => 'Fw-Logdiagramme (Port)', 'firewall rules' => 'Firewallregeln', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index d8cfdc771..6a7835275 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -34,6 +34,7 @@ 'Level7 rule' => 'Level7 rule', 'Local VPN IP' => 'Internal Network (GREEN):', 'MTU' => 'MTU size:', +'Number of Countries for the pie chart' => 'Number of Countries for the pie chart', 'Number of IPs for the pie chart' => 'Number of IPs for the pie chart', 'Number of Ports for the pie chart' => 'Number of ports for the pie chart', 'OVPN' => 'OpenVPN', @@ -911,11 +912,12 @@ 'firewall graphs' => 'Firewall Graphs', 'firewall hits' => 'Total number of firewall hits for', 'firewall hits per' => 'firewallhits per', +'firewall logs' => 'Firewall Logs', 'firewall log' => 'Firewall log', 'firewall log viewer' => 'Firewall Log Viewer', -'firewall logs' => 'Firewall Logs', 'firewall logs ip' => 'Fw-Loggraphs (IP)', 'firewall logs port' => 'Fw-Loggraphs (Port)', +'firewall logs country' => 'Fw-Loggraphs (Country)', 'firewall rules' => 'Firewall Rules', 'firewallhits' => 'firewallhits', 'firmware' => 'Firmware',
$Lang::tr{'country'}Count$Lang::tr{'percentage'}
$key[$s]$key[$s]$value[$s]$percent
$value[$s]$percent
Other country$dif$percent
$Lang::tr{'other countries'}$dif$percent