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

firewalllog*.cgi and country.cgi: Use language strings, and align graphs

Browse Source 
Put the piechart for firewalllog* in the center of the page horisontally,
this looks visually better. Add language string for count and details
submit button.

Add language strings for country.cgi.
Make html validate for country.cgi.
This commit is contained in:
Alf Høgemark
2014-03-01 14:32:52 +01:00
parent c6f96750ba
commit 326a764de6
5 changed files with 49 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
html/cgi-bin/country.cgi
View File

@@ -36,18 +36,18 @@ require "${General::swroot}/header.pl";
&Header::showhttpheaders();
&Header::openpage('Country Codes', 1, '');
&Header::openbigbox('100%', 'LEFT');
&Header::openpage($Lang::tr{'countries'}, 1, '');
&Header::openbigbox('100%', 'left');
&Header::openbox('100%', 'LEFT', 'Flags & Country Codes:');
print "<TABLE WIDTH='100%' border='0' class='tbl'>";
print "<tr><th width='5%'><b>Flag</b></th>";
print "<th width='5%'><b>Code</b></th>";
print "<th width='40%'><b>$Lang::tr{'country'}</b></th>";
print "<th><b>&nbsp;</b></th>";
print "<th width='5%'><b>Flag</b></th>";
print "<th width='5%'><b>Code</b></th>";
print "<th width='40%'><b>$Lang::tr{'country'}</b></th></tr>";
&Header::openbox('100%', 'left', $Lang::tr{'country codes and flags'});
print "<table class='tbl'>";
print "<tr><th style='width=5%;'><b>$Lang::tr{'flag'}</b></th>";
print "<th style='width=5%;'><b>$Lang::tr{'countrycode'}</b></th>";
print "<th style='width=40%; text-align:left;'><b>$Lang::tr{'country'}</b></th>";
print "<th>&nbsp;</th>";
print "<th style='width=5%;'><b>$Lang::tr{'flag'}</b></th>";
print "<th style='width=5%;'><b>$Lang::tr{'countrycode'}</b></th>";
print "<th style='width=40%; text-align:left;'><b>$Lang::tr{'country'}</b></th></tr>";
@flaglist = <$flagdir/*>;
@@ -69,39 +69,34 @@ foreach $flag (@flaglistfiles)
if($fcode eq 'tp') { $country = 'East Timor'; }
if($fcode eq 'yu') { $country = 'Yugoslavia'; }
if ($lines % 2) {
print "<td $col><a name='$fcode'/><img src='/images/flags/$fcode.png' border='0' align='absmiddle' alt='$flagcode'</td>";
print "<td $col><a id='$fcode'><img src='/images/flags/$fcode.png' alt='$flagcode' title='$flagcode'/></a></td>";
print "<td $col>$flagcode</td>";
print "<td $col>$country</td></tr>\n";
}
else {
$lines2++;
if($lines2 % 2) {
print "<tr>";
$col="bgcolor='${Header::table2colour}'";
} else {
print "<tr>";
$col="bgcolor='${Header::table1colour}'";
}
print "<td $col><a name='$fcode'/><img src='/images/flags/$fcode.png' border='0' align='absmiddle' alt='$flagcode'</td>";
print "<td $col>$flagcode</td>";
print "<td $col>$country</td>";
print "<td $col>&nbsp;</td>";
else {
$lines2++;
if($lines2 % 2) {
$col="style='background-color:${Header::table2colour};'";
} else {
$col="style='background-color:${Header::table1colour};'";
}
print "<tr>";
print "<td $col><a id='$fcode'><img src='/images/flags/$fcode.png' alt='$flagcode' title='$flagcode'/></a></td>";
print "<td $col>$flagcode</td>";
print "<td $col>$country</td>";
print "<td $col>&nbsp;</td>";
}
}
print "</TABLE>";
print "</table>";
&Header::closebox();
&Header::closebigbox();
print <<END
<div align='center'>
<table width='80%'>
<tr>
<td align='center'><a href='$ENV{'HTTP_REFERER'}'>$Lang::tr{'back'}</a></td>
</tr>
</table>
<div style='text-align:center'>
<a href='$ENV{'HTTP_REFERER'}'>$Lang::tr{'back'}</a>
</div>
END
;

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

@@ -397,9 +397,9 @@ if ($showpie != 2 && $pienumber <= 50 && $pienumber != 0) {
print FILE $myimage->png;
close(FILE);
#####################################################
print "<table align='center'><tr><td>";
print "<div style='text-align:center'>";
print "<img src='/graphs/fwlog-ip$imagerandom.png'>";
print "</td></tr></table>";
print "</div>";
}
print <<END
@@ -408,7 +408,7 @@ print <<END
<th width='10%' align='center' class='boldbase'></th>
<th width='30%' align='center' class='boldbase'><b>$Lang::tr{'ip address'}</b></th>
<th width='10%' align='center' class='boldbase'><b>$Lang::tr{'country'}</b></th>
<th width='10%' align='center' class='boldbase'><b>Count</b></th>
<th width='10%' align='center' class='boldbase'><b>$Lang::tr{'count'}</b></th>
<th width='30%' align='center' class='boldbase'><b>$Lang::tr{'percentage'}</b></th>
</tr>
END
@@ -439,10 +439,10 @@ for($s=0;$s<$lines;$s++)
my $fcode = lc($ccode);
$color++;
print "<td align='center' $col><form method='post' action='showrequestfromip.dat'><input type='hidden' name='MONTH' value='$cgiparams{'MONTH'}'> <input type='hidden' name='DAY' value='$cgiparams{'DAY'}'> <input type='hidden' name='ip' value='$key[$s]'> <input type='submit' value='details'></form></td>";
print "<td align='center' $col><form method='post' action='showrequestfromip.dat'><input type='hidden' name='MONTH' value='$cgiparams{'MONTH'}'> <input type='hidden' name='DAY' value='$cgiparams{'DAY'}'> <input type='hidden' name='ip' value='$key[$s]'> <input type='submit' value='$Lang::tr{'details'}'></form></td>";
print "<td align='center' $col><a href='/cgi-bin/ipinfo.cgi?ip=$key[$s]'>$key[$s]</a></td>";
if ( $fcode ne "" ){
print "<td align='center' $col><a href='/cgi-bin/country.cgi#$fcode'><img src='/images/flags/$fcode.png' border='0' align='absmiddle' alt='$ccode'></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='$ccode' title='$ccode'></a></td>";}
else {
print "<td align='center' $col></td>";}
print "<td align='center' $col>$value[$s]</td>";

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

@@ -400,17 +400,17 @@ if ($showpie != 2 && $pienumber <= 50 && $pienumber != 0) {
print FILE $myimage->png;
close(FILE);
#####################################################
print "<table align='center'><tr><td>";
print "<div style='text-align:center'>";
print "<img src='/graphs/fwlog-port$imagerandom.png'>";
print "</td></tr></table>";
print "</div>";
}
print <<END
<table width='100%' CLASS='tbl'>
<table width='100%' class='tbl'>
<tr>
<th width='10%' align='center' class='boldbase'></th>
<th width='33%' align='center' class='boldbase'><b>$Lang::tr{'port'}</b></th>
<th width='33%' align='center' class='boldbase'><b>count</b></th>
<th width='33%' align='center' class='boldbase'><b>$Lang::tr{'count'}</b></th>
<th width='33%' align='center' class='boldbase'><b>$Lang::tr{'percentage'}</b></th>
</tr>
END
@@ -437,7 +437,7 @@ for($s=0;$s<$lines;$s++)
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>";
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='$Lang::tr{'details'}'></form></td>";
print "<td align='center' $col>$key[$s]</td>";
print "<td align='center' $col>$value[$s]</td>";
print "<td align='center' $col>$percent</td>";