webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-26 10:52:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

firewalllogcountry.dat: Use language strings and add to menu

Browse Source 
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.
This commit is contained in:
Alf Høgemark
2014-02-16 07:18:41 +01:00
parent e4aac47370
commit f424897557
4 changed files with 58 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
html/cgi-bin/logs.cgi/firewalllogcountry.dat
View File

@@ -221,7 +221,7 @@ if ($errormessage) {
&Header::closebox();
}
&Header::openbox('100%', 'left', "$Lang::tr{'settings'}:");
&Header::openbox('100%', 'left', "$Lang::tr{'settings'}");
print <<END
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
@@ -266,15 +266,15 @@ print <<END
</td>
<td width='5%' align='center'><input type='submit' name='ACTION' title='$Lang::tr{'day before'}' value='&lt;&lt;' /></td>
<td width='5%' align='center'><input type='submit' name='ACTION' title='$Lang::tr{'day after'}' value='&gt;&gt;' /></td>
<td width='20%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'update'}' /></td>
<td width='20%' align='right'><input type='submit' name='ACTION' value='$Lang::tr{'update'}' /></td>
</tr>
<tr>
<td colspan='3' align='left' valign="left">$Lang::tr{'Number of Countries for the pie chart'}:</td>
<td colspan='3' align='left' valign="center"><input type='text' name='pienumber' value='$pienumber' size='4'></td>
<td align='right'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td>
</tr>
</table>
<table width='100%'>
<tr><td width='20%' align='right' valign="center">$Lang::tr{'Number of IPs for the pie chart'}:</td>
<td width='10%' align='left' valign="center"><input type='text' name='pienumber' value='$pienumber' size='4'></td>
<td width='20%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td></tr>
</table>
</form>
</form>
END
;
@@ -285,7 +285,6 @@ print "<p><b>$Lang::tr{'firewall hits'} $longmonthstr $daystr: $lines</b></p>";
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 <<END
<TABLE WIDTH='100%'>
<TR>
<TD WIDTH='10%' ALIGN='CENTER' CLASS='boldbase'></TD>
<TD WIDTH='10%' ALIGN='CENTER' CLASS='boldbase'><B>Flag</B></TD>
<TD WIDTH='10%' ALIGN='CENTER' CLASS='boldbase'><B>Count</B></TD>
<TD WIDTH='30%' ALIGN='CENTER' CLASS='boldbase'><B>Percent</B></TD>
</TR>
<table width='100%' class='tbl'>
<tr>
<th width='10%' align='center' class='boldbase'></th>
<th width='30%' align='center' class='boldbase'><b>$Lang::tr{'country'}</b></th>
<th width='30%' align='center' class='boldbase'><b>Count</b></th>
<th width='30%' align='center' class='boldbase'><b>$Lang::tr{'percentage'}</b></th>
</tr>
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 "<TR BGCOLOR='$color{'color1'}'>\n";}
if ( ($color % 10) == 2 ){print "<TR BGCOLOR='$color{'color2'}'>\n";}
if ( ($color % 10) == 3 ){print "<TR BGCOLOR='$color{'color3'}'>\n";}
if ( ($color % 10) == 4 ){print "<TR BGCOLOR='$color{'color4'}'>\n";}
if ( ($color % 10) == 5 ){print "<TR BGCOLOR='$color{'color5'}'>\n";}
if ( ($color % 10) == 6 ){print "<TR BGCOLOR='$color{'color6'}'>\n";}
if ( ($color % 10) == 7 ){print "<TR BGCOLOR='$color{'color7'}'>\n";}
if ( ($color % 10) == 8 ){print "<TR BGCOLOR='$color{'color8'}'>\n";}
if ( ($color % 10) == 9 ){print "<TR BGCOLOR='$color{'color9'}'>\n";}
if ( ($color % 10) == 0 ){print "<TR BGCOLOR='$color{'color10'}'>\n";}
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'}'";}
$color++;
print "<TD ALIGN='CENTER'><form method='post' action='showrequestfromcountry.dat'><input type='hidden' name='MONTH' value='$cgiparams{'MONTH'}'> <input type='hidden' name='DAY' value='$cgiparams{'DAY'}'> <input type='hidden' name='country' value='$key[$s]'> <input type='submit' value='details'></form></TD>";
print "<td align='center' $col><form method='post' action='showrequestfromcountry.dat'><input type='hidden' name='MONTH' value='$cgiparams{'MONTH'}'> <input type='hidden' name='DAY' value='$cgiparams{'DAY'}'> <input type='hidden' name='country' value='$key[$s]'> <input type='submit' value='details'></form></td>";
if ( $key[$s] ne "unknown" ){
my $fcode = lc($key[$s]);
print "<TD ALIGN='CENTER'><a href='/cgi-bin/country.cgi#$fcode'><img src='/images/flags/$fcode.png' border='0' align='absmiddle' alt='$key[$s]' title='$key[$s]'></a></TD>";}
print "<td align='center' $col><a href='/cgi-bin/country.cgi#$fcode'><img src='/images/flags/$fcode.png' border='0' align='absmiddle' alt='$key[$s]' title='$key[$s]'></a></TD>";}
else {
print "<TD ALIGN='CENTER'></TD>";}
print "<TD ALIGN='CENTER'>$value[$s]</TD>";
print "<TD ALIGN='CENTER'>$percent</TD>";
print "</TR>";
print "<td align='center' $col></td>";
}
print "<td align='center' $col>$value[$s]</td>";
print "<td align='center' $col>$percent</td>";
print "</tr>";
}
if($cgiparams{'otherspie'} == 2 ){}
else{
if ( ($color % 10) == 1 ){print "<TR BGCOLOR='$color{'color1'}'>\n";}
if ( ($color % 10) == 2 ){print "<TR BGCOLOR='$color{'color2'}'>\n";}
if ( ($color % 10) == 3 ){print "<TR BGCOLOR='$color{'color3'}'>\n";}
if ( ($color % 10) == 4 ){print "<TR BGCOLOR='$color{'color4'}'>\n";}
if ( ($color % 10) == 5 ){print "<TR BGCOLOR='$color{'color5'}'>\n";}
if ( ($color % 10) == 6 ){print "<TR BGCOLOR='$color{'color6'}'>\n";}
if ( ($color % 10) == 7 ){print "<TR BGCOLOR='$color{'color7'}'>\n";}
if ( ($color % 10) == 8 ){print "<TR BGCOLOR='$color{'color8'}'>\n";}
if ( ($color % 10) == 9 ){print "<TR BGCOLOR='$color{'color9'}'>\n";}
if ( ($color % 10) == 0 ){print "<TR BGCOLOR='$color{'color10'}'>\n";}
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'}'";}
if ( $linesjc ne "0")
{
@@ -482,11 +482,11 @@ $dif = $linesjc - $total;
$percent = $dif * 100 / $linesjc;
$percent = sprintf("%.f", $percent);
print <<END
<TD ALIGN='CENTER'></TD>
<TD ALIGN='CENTER'>Other country</TD>
<TD ALIGN='CENTER'>$dif</TD>
<TD ALIGN='CENTER'>$percent</TD>
</TR>
<td align='center' $col></TD>
<td align='center' $col>$Lang::tr{'other countries'}</td>
<td align='center' $col>$dif</TD>
<td align='center' $col>$percent</TD>
</tr>
END
;
}