diff --git a/html/cgi-bin/logs.cgi/firewalllogip.dat b/html/cgi-bin/logs.cgi/firewalllogip.dat
index f671ab855..e4e845198 100644
--- a/html/cgi-bin/logs.cgi/firewalllogip.dat
+++ b/html/cgi-bin/logs.cgi/firewalllogip.dat
@@ -427,16 +427,12 @@ 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="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 $colorIndex = $color % 10;
+ if($colorIndex == 0) {
+ $colorIndex = 10;
+ }
+ $col="bgcolor='$color{\"color$colorIndex\"}'";
+ print "
";
my $gi = Geo::IP::PurePerl->new();
my $ccode = $gi->country_code_by_name($key[$s]);
@@ -456,16 +452,12 @@ for($s=0;$s<$lines;$s++)
if($cgiparams{'otherspie'} == 2 ){}
else{
-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 $colorIndex = $color % 10;
+ if($colorIndex == 0) {
+ $colorIndex = 10;
+ }
+ $col="bgcolor='$color{\"color$colorIndex\"}'";
+ print "
";
if ( $linesjc ne "0")
{
@@ -504,7 +496,10 @@ sub findkey {
last;
}
}
-}sub checkversion {
- #Automatic Updates is disabled
- return "0","0";
- }
+}
+
+sub checkversion {
+ #Automatic Updates is disabled
+ return "0","0";
+}
+
diff --git a/html/cgi-bin/logs.cgi/firewalllogport.dat b/html/cgi-bin/logs.cgi/firewalllogport.dat
index ba106016f..9f7ce3a11 100644
--- a/html/cgi-bin/logs.cgi/firewalllogport.dat
+++ b/html/cgi-bin/logs.cgi/firewalllogport.dat
@@ -429,16 +429,12 @@ 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'}'";}
+ my $colorIndex = $color % 10;
+ if($colorIndex == 0) {
+ $colorIndex = 10;
+ }
+ $col="bgcolor='$color{\"color$colorIndex\"}'";
+ print "
";
$color++;
print " | ";
@@ -450,16 +446,12 @@ for($s=0;$s<$lines;$s++)
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'}'";}
+ my $colorIndex = $color % 10;
+ if($colorIndex == 0) {
+ $colorIndex = 10;
+ }
+ $col="bgcolor='$color{\"color$colorIndex\"}'";
+ print "
";
if ( $linesjc ne "0")
{
@@ -487,6 +479,7 @@ END
&Header::closepage();
sub findkey {
+ my $v;
foreach $v (@keytabjc) {
if ($tabjc{$v} eq $_[0]) {
delete $tabjc{$v};
@@ -497,7 +490,9 @@ sub findkey {
}
}
}
+
sub checkversion {
- #Automatic Updates is disabled
- return "0","0";
- }
+ #Automatic Updates is disabled
+ return "0","0";
+}
+