diff --git a/html/cgi-bin/logs.cgi/firewalllogip.dat b/html/cgi-bin/logs.cgi/firewalllogip.dat index b58f09e75..d24dd983f 100644 --- a/html/cgi-bin/logs.cgi/firewalllogip.dat +++ b/html/cgi-bin/logs.cgi/firewalllogip.dat @@ -403,14 +403,14 @@ if ($showpie != 2 && $pienumber <= 50 && $pienumber != 0) { } print < - - -IP -Flag -Count -Percent - + + + + + + + + END ; @@ -427,45 +427,45 @@ for($s=0;$s<$lines;$s++) $percent = $value[$s] * 100 / $linesjc; $percent = sprintf("%.f", $percent); $total = $total + $value[$s]; - 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 ( ($color % 10) == 1 ){print ""; $col="bcolor='$color{'color1'}'";} + if ( ($color % 10) == 2 ){print ""; $col="bcolor='$color{'color2'}'";} + if ( ($color % 10) == 3 ){print ""; $col="bcolor='$color{'color3'}'";} + if ( ($color % 10) == 4 ){print ""; $col="bcolor='$color{'color4'}'";} + if ( ($color % 10) == 5 ){print ""; $col="bcolor='$color{'color5'}'";} + if ( ($color % 10) == 6 ){print ""; $col="bcolor='$color{'color6'}'";} + if ( ($color % 10) == 7 ){print ""; $col="bcolor='$color{'color7'}'";} + if ( ($color % 10) == 8 ){print ""; $col="bcolor='$color{'color8'}'";} + if ( ($color % 10) == 9 ){print ""; $col="bcolor='$color{'color9'}'";} + if ( ($color % 10) == 0 ){print ""; $col="bcolor='$color{'color10'}'";} my $gi = Geo::IP::PurePerl->new(); my $ccode = $gi->country_code_by_name($key[$s]); my $fcode = lc($ccode); $color++; - print ""; - print ""; + print ""; + print ""; if ( $fcode ne "" ){ - print "";} + print "";} else { - print "";} - print ""; - print ""; - print ""; -} + print "";} + print ""; + print ""; + print ""; + } if($cgiparams{'otherspie'} == 2 ){} else{ -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 ( ($color % 10) == 1 ){print ""; $col="bcolor='$color{'color1'}'";} +if ( ($color % 10) == 2 ){print ""; $col="bcolor='$color{'color2'}'";} +if ( ($color % 10) == 3 ){print ""; $col="bcolor='$color{'color3'}'";} +if ( ($color % 10) == 4 ){print ""; $col="bcolor='$color{'color4'}'";} +if ( ($color % 10) == 5 ){print ""; $col="bcolor='$color{'color5'}'";} +if ( ($color % 10) == 6 ){print ""; $col="bcolor='$color{'color6'}'";} +if ( ($color % 10) == 7 ){print ""; $col="bcolor='$color{'color7'}'";} +if ( ($color % 10) == 8 ){print ""; $col="bcolor='$color{'color8'}'";} +if ( ($color % 10) == 9 ){print ""; $col="bcolor='$color{'color9'}'";} +if ( ($color % 10) == 0 ){print ""; $col="bcolor='$color{'color10'}'";} if ( $linesjc ne "0") { @@ -474,18 +474,18 @@ $dif = $linesjc - $total; $percent = $dif * 100 / $linesjc; $percent = sprintf("%.f", $percent); print < - - - - - + + + + + + END ; } } print < +
IPFlagCountPercent
$key[$s]
$key[$s]$ccode$ccode$value[$s]$percent
$value[$s]$percent
$Lang::tr{'otherip'}$dif$percent
$Lang::tr{'otherip'}$dif$percent
END ; diff --git a/html/cgi-bin/logs.cgi/firewalllogport.dat b/html/cgi-bin/logs.cgi/firewalllogport.dat index 7a32a906f..a13414654 100644 --- a/html/cgi-bin/logs.cgi/firewalllogport.dat +++ b/html/cgi-bin/logs.cgi/firewalllogport.dat @@ -406,13 +406,13 @@ if ($showpie != 2 && $pienumber <= 50 && $pienumber != 0) { } print < - - -Port -Count -Percent - + + + + + + + END ; @@ -429,37 +429,37 @@ for($s=0;$s<$lines;$s++) $percent = $value[$s] * 100 / $linesjc; $percent = sprintf("%.f", $percent); $total = $total + $value[$s]; - 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 ( ($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 ""; - print ""; - print ""; - print ""; + print ""; + print ""; + print ""; + print ""; + print ""; } if($cgiparams{'otherspie'} == 2 ){} else{ -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 ( ($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") { @@ -468,17 +468,17 @@ $dif = $linesjc - $total; $percent = $dif * 100 / $linesjc; $percent = sprintf("%.f", $percent); print < - - - - + + + + + END ; } } print < +
PortCountPercent
$key[$s]$value[$s]$percent
$key[$s]$value[$s]$percent
$Lang::tr{'otherport'}$dif$percent
$Lang::tr{'otherport'}$dif$percent
END ; diff --git a/html/cgi-bin/logs.cgi/proxylog.dat b/html/cgi-bin/logs.cgi/proxylog.dat index a1a05b289..1d1844e7c 100644 --- a/html/cgi-bin/logs.cgi/proxylog.dat +++ b/html/cgi-bin/logs.cgi/proxylog.dat @@ -182,7 +182,7 @@ my $thiscode = '$temp =~ /$filter/;'; eval($thiscode); if ($@ ne '') { - $errormessage = "$Lang::tr{'bad ignore filter'}.$@

"; + $errormessage = "$Lang::tr{'bad ignore filter'}.$@

"; $filter = ''; } else { my $loop = 1; diff --git a/html/cgi-bin/logs.cgi/showrequestfromip.dat b/html/cgi-bin/logs.cgi/showrequestfromip.dat index 7aa5c0552..09a60b519 100644 --- a/html/cgi-bin/logs.cgi/showrequestfromip.dat +++ b/html/cgi-bin/logs.cgi/showrequestfromip.dat @@ -271,17 +271,17 @@ if ($start == 0) { $prev = -1; } if ($lines != 0) { &oldernewer(); } print < - -$Lang::tr{'time'} -$Lang::tr{'chain'} -$Lang::tr{'iface'} -$Lang::tr{'proto'} -$Lang::tr{'source'} -$Lang::tr{'src port'} -$Lang::tr{'destination'} -$Lang::tr{'dst port'} - + + + + + + + + + + + END ; @@ -320,23 +320,23 @@ foreach $_ (@slice) else { print "\n"; } print <$time - - - + + + + - + - - + + END ; $lines++; @@ -345,7 +345,7 @@ END } print < +
$Lang::tr{'time'}$Lang::tr{'chain'}$Lang::tr{'iface'}$Lang::tr{'proto'}$Lang::tr{'source'}$Lang::tr{'src port'}$Lang::tr{'destination'}$Lang::tr{'dst port'}
$chain$iface$protostr$time$chain$iface$protostr
$srcaddr
$srcport$srcport
$dstaddr
$dstport
$dstport
END ; diff --git a/html/cgi-bin/logs.cgi/showrequestfromport.dat b/html/cgi-bin/logs.cgi/showrequestfromport.dat index ee1d2eb01..ad9823cde 100644 --- a/html/cgi-bin/logs.cgi/showrequestfromport.dat +++ b/html/cgi-bin/logs.cgi/showrequestfromport.dat @@ -278,17 +278,17 @@ if ($start == 0) { $prev = -1; } if ($lines != 0) { &oldernewer(); } print < - -$Lang::tr{'time'} -$Lang::tr{'chain'} -$Lang::tr{'iface'} -$Lang::tr{'proto'} -$Lang::tr{'source'} -$Lang::tr{'src port'} -$Lang::tr{'destination'} -$Lang::tr{'dst port'} - + + + + + + + + + + + END ; my @slice = splice(@log, $start, ${Header::viewsize}); @@ -326,23 +326,23 @@ foreach $_ (@slice) else { print "\n"; } print <$time - - - + + + + - + - - + + END ; $lines++; @@ -351,7 +351,7 @@ END } print < +
$Lang::tr{'time'}$Lang::tr{'chain'}$Lang::tr{'iface'}$Lang::tr{'proto'}$Lang::tr{'source'}$Lang::tr{'src port'}$Lang::tr{'destination'}$Lang::tr{'dst port'}
$chain$iface$protostr$time$chain$iface$protostr
$srcaddr
$srcport$srcport
$dstaddr
$dstport
$dstport
END ;