mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-09 18:45:54 +02:00
firewalllog*.cgi and country.cgi: Use language strings, and align graphs
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
@@ -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> </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> </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> </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> </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
|
||||
;
|
||||
|
||||
@@ -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>";
|
||||
|
||||
@@ -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>";
|
||||
|
||||
@@ -564,7 +564,11 @@
|
||||
'could not open installed updates file' => 'Datei mit Update-Liste konnte nicht geöffnet werden',
|
||||
'could not open update information file' => 'Datei mit den Update-Information konnte nicht geöffnet werden. Die Update-Datei ist beschädigt.',
|
||||
'could not retrieve common name from certificate' => 'Der Gemeinsame Name (CN) konnte nicht aus dem Zertifikat gelesen werden.',
|
||||
'count' => 'Anzahl',
|
||||
'countries' => 'Länder',
|
||||
'country' => 'Land',
|
||||
'countrycode' => 'Kennung',
|
||||
'country codes and flags' => 'Länder und Länderkennungen',
|
||||
'cpu frequency per' => 'CPU-Frequenz pro',
|
||||
'cpu idle usage' => 'Leerlauf CPU-Nutzung',
|
||||
'cpu interrupt usage' => 'Interrupt CPU-Nutzung',
|
||||
@@ -644,6 +648,7 @@
|
||||
'destination port numbers' => 'Zielport muß ein(e) gültige(r) Portnummer oder Portbereich sein.',
|
||||
'destination port overlaps' => 'Der Zielportbereich überlappt einen bereits bestehenden Portbereich.',
|
||||
'detail level' => 'Detaillierungsgrad',
|
||||
'details' => 'Mehr',
|
||||
'device' => 'Gerät',
|
||||
'devices on blue' => 'Geräte auf Blau',
|
||||
'dhcp advopt add' => 'DHCP Option hinzufügen',
|
||||
@@ -898,6 +903,7 @@
|
||||
'fixed ip lease added' => 'Feste IP-Zuordnung hinzugefügt',
|
||||
'fixed ip lease modified' => 'Feste IP-Zuordnung geändert',
|
||||
'fixed ip lease removed' => 'Feste IP-Zuordnung gelöscht',
|
||||
'flag' => 'Flagge',
|
||||
'force update' => 'Aktualisierung erzwingen',
|
||||
'force user' => 'Standardbenutzer für das UNIX Dateisystem',
|
||||
'forward firewall' => 'Firewall',
|
||||
|
||||
@@ -585,7 +585,11 @@
|
||||
'could not open installed updates file' => 'Could not open installed updates file',
|
||||
'could not open update information file' => 'Could not open update information file. The update file is corrupt.',
|
||||
'could not retrieve common name from certificate' => 'Could not retrieve common name from certificate.',
|
||||
'count' => 'Count',
|
||||
'countries' => 'Countries',
|
||||
'country' => 'Country',
|
||||
'countrycode' => 'Code',
|
||||
'country codes and flags' => 'Country Codes and Flags:',
|
||||
'cpu frequency per' => 'CPU frequency per',
|
||||
'cpu idle usage' => 'Idle CPU Usage',
|
||||
'cpu interrupt usage' => 'Interrupt CPU Usage',
|
||||
@@ -666,6 +670,7 @@
|
||||
'destination port numbers' => 'Destination port must be a valid port number or port range.',
|
||||
'destination port overlaps' => 'Destination port range overlaps an existing port range.',
|
||||
'detail level' => 'Detail level',
|
||||
'details' => 'Details',
|
||||
'device' => 'Device',
|
||||
'devices on blue' => 'Devices on BLUE',
|
||||
'dhcp advopt add' => 'Add a DHCP option',
|
||||
@@ -924,6 +929,7 @@
|
||||
'fixed ip lease added' => 'Fixed IP lease added',
|
||||
'fixed ip lease modified' => 'Fixed IP lease modified',
|
||||
'fixed ip lease removed' => 'Fixed IP lease removed',
|
||||
'flag' => 'Flag',
|
||||
'force update' => 'Force update',
|
||||
'force user' => 'force all new file to user',
|
||||
'forward firewall' => 'Firewall',
|
||||
|
||||
Reference in New Issue
Block a user