X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Flogs.cgi%2Ffirewalllog.dat;h=5e7d7fce8d48ca17062f91f88d840ba5674a8252;hp=b48b009a535d1e8213fc51baefb34bf5db636759;hb=9fb25b1c17181bf7d73ac5daa9585d8fd8974604;hpb=78331e301975a38f952ad9311a7ff3201e5a5e2e

diff --git a/html/cgi-bin/logs.cgi/firewalllog.dat b/html/cgi-bin/logs.cgi/firewalllog.dat
index b48b009a53..5e7d7fce8d 100644
--- 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";
 
@@ -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
 	;