"Update Booster" fertiggestellt und getestet.

[people/pmueller/ipfire-2.x.git] / html / cgi-bin / logs.cgi / firewalllog.dat

diff --git a/html/cgi-bin/logs.cgi/firewalllog.dat b/html/cgi-bin/logs.cgi/firewalllog.dat
index 78cfdda897ab3640e055d44437f537c20a0f687c..5e7d7fce8d48ca17062f91f88d840ba5674a8252 100644 (file)
--- a/html/cgi-bin/logs.cgi/firewalllog.dat
+++ b/html/cgi-bin/logs.cgi/firewalllog.dat
@@ -20,7 +20,7 @@ use Getopt::Std;
 #use warnings;
 #use CGI::Carp 'fatalsToBrowser';
 
-require 'CONFIG_ROOT/general-functions.pl';
+require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
 
@@ -199,7 +199,7 @@ while ($gzindex >=0 && $loop) {
 if ($cgiparams{'ACTION'} eq $Lang::tr{'export'})
 {
        print "Content-type: text/plain\n\n";
-       print "IPCop firewall log\r\n";
+       print "IPFire firewall log\r\n";
        print "$Lang::{'date'}: $date\r\n\r\n";
 
        if ($logsettings{'LOGVIEW_REVERSE'} eq 'on') { @log = reverse @log; }
@@ -305,16 +305,14 @@ if ($lines != 0) { &oldernewer(); }
 print <<END
 <table width='100%'>
 <tr>
-       <td width='10%' align='center' class='boldbase'><b>$Lang::tr{'time'}</b></td>
-       <td width='13%' align='center' class='boldbase'><b>$Lang::tr{'chain'}</b></td>
-       <td width='5%' align='center' class='boldbase'><b>$Lang::tr{'iface'}</b></td>
-       <td width='5%' align='center' class='boldbase'><b>$Lang::tr{'proto'}</b></td>
-       <td width='16%' align='center' class='boldbase'><b>$Lang::tr{'source'}</b></td>
+       <td align='center' class='boldbase'><b>$Lang::tr{'time'}</b></td>
+       <td align='center' class='boldbase'><b>$Lang::tr{'chain'}</b></td>
+       <td align='center' class='boldbase'><b>$Lang::tr{'iface'}</b></td>
+       <td align='center' class='boldbase'><b>$Lang::tr{'proto'}</b></td>
+       <td align='center' class='boldbase'><b>$Lang::tr{'source'}<br/>$Lang::tr{'destination'}</b></td>
+       <td align='center' class='boldbase'><b>$Lang::tr{'src port'}<br />$Lang::tr{'dst port'}</b></td>
        <td align='center' class='boldbase'><b>Flag</b></td>
-       <td width='10%' align='center' class='boldbase'><b>$Lang::tr{'src port'}</b></td>
-       <td width='5%' align='center' class='boldbase'><b>$Lang::tr{'mac address'}</b></td>
-       <td width='16%' align='center' class='boldbase'><b>$Lang::tr{'destination'}</b></td>
-       <td width='20%' align='center' class='boldbase'><b>$Lang::tr{'dst port'}</b></td>
+       <td align='center' class='boldbase'><b>$Lang::tr{'mac address'}</b></td>
 </tr>
 END
 ;
@@ -360,16 +358,10 @@ foreach $_ (@log)
        <td align='center'>$comment</td>
        <td align='center'>$iface</td>
        <td align='center'>$proto</td>
-       <td align='center'><a href='/cgi-bin/ipinfo.cgi?ip=$srcaddr'>$srcaddr</a></td>
+       <td align='center'><a href='/cgi-bin/ipinfo.cgi?ip=$srcaddr'>$srcaddr</a><br /><a href='/cgi-bin/ipinfo.cgi?ip=$dstaddr'>$dstaddr</a></td>
+       <td align='center'>$srcport<br/>$dstport</td>
        <td align='center'><a href='../country.cgi#$fcode'><img src='/images/flags/$fcode.png' border='0' align='absmiddle' alt='$ccode'></a></td>
-       <td align='center'>$srcport</td>
        <td align='center'>$macaddr</td>
-       <td align='center'>
-       <table width='100%' cellpadding='0' cellspacing='0'><tr>
-       <td align='center'><a href='/cgi-bin/ipinfo.cgi?ip=$dstaddr'>$dstaddr</a></td>
-       </tr></table>
-       </td>
-       <td align='center'>$dstport</td>
 </tr>
 END
        ;