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.

diff --git a/html/cgi-bin/country.cgi b/html/cgi-bin/country.cgi
index db6c07496d6e6d8169c855d8be1d0d3dfa804358..76035fb46d76ad0c4775e300e8d4c975dcc2b36f 100644 (file)
--- a/html/cgi-bin/country.cgi
+++ b/html/cgi-bin/country.cgi
@@ -36,18 +36,18 @@ require "${General::swroot}/header.pl";
 
 &Header::showhttpheaders();
 
-&Header::openpage('Country Codes', 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::openpage($Lang::tr{'countries'}, 1, '');
+&Header::openbigbox('100%', 'left');
+
+&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
 ; 

diff --git a/html/cgi-bin/logs.cgi/firewalllogip.dat b/html/cgi-bin/logs.cgi/firewalllogip.dat
index e4e845198be965c6399e246d45aaa5124d5a1e81..07bcc77f813bdfd2ed17988103c717584dd37c23 100644 (file)
--- a/html/cgi-bin/logs.cgi/firewalllogip.dat
+++ b/html/cgi-bin/logs.cgi/firewalllogip.dat
@@ -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>";

diff --git a/html/cgi-bin/logs.cgi/firewalllogport.dat b/html/cgi-bin/logs.cgi/firewalllogport.dat
index 9f7ce3a11375e1fe1ab67e557e18789062503f27..5b0db62314df237f3db248040b7e14815e722caa 100644 (file)
--- a/html/cgi-bin/logs.cgi/firewalllogport.dat
+++ b/html/cgi-bin/logs.cgi/firewalllogport.dat
@@ -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>";

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index e951b68b5c1d6f1d620b3393ac1c052fbd276a0d..ea56e72759f36a75a56fe80f986e3ec33f2966be 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -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',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index d8cfdc771ccd19f42c7f4f402bddd0b5ad631b82..27b8b09cf398abe9de123491b77e60568fd76373 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -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',