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

firewalllogs*.dat: Reduce amount of code to set row bgcolor

Browse Source 
Replace 10 if statements with duplicated code for print
and setting background color by using a variable and
one if statement.
This commit is contained in:
Alf Høgemark
2014-02-22 17:47:12 +01:00
committed by Michael Tremer
parent 25bd6edaaf
commit c101827318
2 changed files with 37 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
html/cgi-bin/logs.cgi/firewalllogip.dat
View File

@@ -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 "<tr>"; $col="bcolor='$color{'color1'}'";}
if ( ($color % 10) == 2 ){print "<tr>"; $col="bcolor='$color{'color2'}'";}
if ( ($color % 10) == 3 ){print "<tr>"; $col="bcolor='$color{'color3'}'";}
if ( ($color % 10) == 4 ){print "<tr>"; $col="bcolor='$color{'color4'}'";}
if ( ($color % 10) == 5 ){print "<tr>"; $col="bcolor='$color{'color5'}'";}
if ( ($color % 10) == 6 ){print "<tr>"; $col="bcolor='$color{'color6'}'";}
if ( ($color % 10) == 7 ){print "<tr>"; $col="bcolor='$color{'color7'}'";}
if ( ($color % 10) == 8 ){print "<tr>"; $col="bcolor='$color{'color8'}'";}
if ( ($color % 10) == 9 ){print "<tr>"; $col="bcolor='$color{'color9'}'";}
if ( ($color % 10) == 0 ){print "<tr>"; $col="bcolor='$color{'color10'}'";}
my $colorIndex = $color % 10;
if($colorIndex == 0) {
$colorIndex = 10;
}
$col="bgcolor='$color{\"color$colorIndex\"}'";
print "<tr>";
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 "<tr>"; $col="bcolor='$color{'color1'}'";}
if ( ($color % 10) == 2 ){print "<tr>"; $col="bcolor='$color{'color2'}'";}
if ( ($color % 10) == 3 ){print "<tr>"; $col="bcolor='$color{'color3'}'";}
if ( ($color % 10) == 4 ){print "<tr>"; $col="bcolor='$color{'color4'}'";}
if ( ($color % 10) == 5 ){print "<tr>"; $col="bcolor='$color{'color5'}'";}
if ( ($color % 10) == 6 ){print "<tr>"; $col="bcolor='$color{'color6'}'";}
if ( ($color % 10) == 7 ){print "<tr>"; $col="bcolor='$color{'color7'}'";}
if ( ($color % 10) == 8 ){print "<tr>"; $col="bcolor='$color{'color8'}'";}
if ( ($color % 10) == 9 ){print "<tr>"; $col="bcolor='$color{'color9'}'";}
if ( ($color % 10) == 0 ){print "<tr>"; $col="bcolor='$color{'color10'}'";}
my $colorIndex = $color % 10;
if($colorIndex == 0) {
$colorIndex = 10;
}
$col="bgcolor='$color{\"color$colorIndex\"}'";
print "<tr>";
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";
}

41
html/cgi-bin/logs.cgi/firewalllogport.dat
View File

@@ -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 "<tr>"; $col="bgcolor='$color{'color1'}'";}
if ( ($color % 10) == 2 ){print "<tr>"; $col="bgcolor='$color{'color2'}'";}
if ( ($color % 10) == 3 ){print "<tr>"; $col="bgcolor='$color{'color3'}'";}
if ( ($color % 10) == 4 ){print "<tr>"; $col="bgcolor='$color{'color4'}'";}
if ( ($color % 10) == 5 ){print "<tr>"; $col="bgcolor='$color{'color5'}'";}
if ( ($color % 10) == 6 ){print "<tr>"; $col="bgcolor='$color{'color6'}'";}
if ( ($color % 10) == 7 ){print "<tr>"; $col="bgcolor='$color{'color7'}'";}
if ( ($color % 10) == 8 ){print "<tr>"; $col="bgcolor='$color{'color8'}'";}
if ( ($color % 10) == 9 ){print "<tr>"; $col="bgcolor='$color{'color9'}'";}
if ( ($color % 10) == 0 ){print "<tr>"; $col="bgcolor='$color{'color10'}'";}
my $colorIndex = $color % 10;
if($colorIndex == 0) {
$colorIndex = 10;
}
$col="bgcolor='$color{\"color$colorIndex\"}'";
print "<tr>";
$color++;
print "<td align='center' $col><form method='post' action='showrequestfromport.dat'><input type='hidden' name='MONTH' value='$cgiparams{'MONTH'}'> <input type='hidden' name='DAY' value='$cgiparams{'DAY'}'> <input type='hidden' name='port' value='$key[$s]'> <input type='submit' value='details'></form></td>";
@@ -450,16 +446,12 @@ for($s=0;$s<$lines;$s++)
if($cgiparams{'otherspie'} == 2 ){}
else{
if ( ($color % 10) == 1 ){print "<tr>"; $col="bgcolor='$color{'color1'}'";}
if ( ($color % 10) == 2 ){print "<tr>"; $col="bgcolor='$color{'color2'}'";}
if ( ($color % 10) == 3 ){print "<tr>"; $col="bgcolor='$color{'color3'}'";}
if ( ($color % 10) == 4 ){print "<tr>"; $col="bgcolor='$color{'color4'}'";}
if ( ($color % 10) == 5 ){print "<tr>"; $col="bgcolor='$color{'color5'}'";}
if ( ($color % 10) == 6 ){print "<tr>"; $col="bgcolor='$color{'color6'}'";}
if ( ($color % 10) == 7 ){print "<tr>"; $col="bgcolor='$color{'color7'}'";}
if ( ($color % 10) == 8 ){print "<tr>"; $col="bgcolor='$color{'color8'}'";}
if ( ($color % 10) == 9 ){print "<tr>"; $col="bgcolor='$color{'color9'}'";}
if ( ($color % 10) == 0 ){print "<tr>"; $col="bgcolor='$color{'color10'}'";}
my $colorIndex = $color % 10;
if($colorIndex == 0) {
$colorIndex = 10;
}
$col="bgcolor='$color{\"color$colorIndex\"}'";
print "<tr>";
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";
}