pakfire cgi not refreshes after upgrades

[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 dc75afeb1b70b477c55c198b2c6fe8d706b77b90..5979a76791b4618bf4c33425d680445cbd4fd65e 100644 (file)
--- a/html/cgi-bin/logs.cgi/firewalllog.dat
+++ b/html/cgi-bin/logs.cgi/firewalllog.dat
@@ -24,6 +24,11 @@ require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
 
+my %color = ();
+my %mainsettings = ();
+&General::readhash("${General::swroot}/main/settings", \%mainsettings);
+&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
+
 use POSIX();
 
 #workaround to suppress a warning when a variable is used only once
@@ -328,7 +333,7 @@ foreach $_ (@log)
         my $comment = $3; 
         my $packet = $4;
 
-        $packet =~ /IN=(\w+)/;       my $iface=$1;
+        $packet =~ /IN=(\w+)/;       my $iface=$1; if ( $1 eq "27" ){ $iface="";}
         $packet =~ /SRC=([\d\.]+)/;  my $srcaddr=$1;
         $packet =~ /DST=([\d\.]+)/;  my $dstaddr=$1;
         $packet =~ /MAC=([\w+\:]+)/; my $macaddr=$1;
@@ -349,9 +354,9 @@ foreach $_ (@log)
         my @mactemp = split(/:/,$macaddr);
         $macaddr = "$mactemp[6]:$mactemp[7]:$mactemp[8]:$mactemp[9]:$mactemp[10]:$mactemp[11]";
         if ($lines % 2) {
-                print "<tr bgcolor='${Header::table1colour}'>\n"; }
+                print "<tr bgcolor='$color{'color20'}'>\n"; }
         else {
-                print "<tr bgcolor='${Header::table2colour}'>\n"; }
+                print "<tr bgcolor='$color{'color22'}'>\n"; }
         print <<END
 
         <td align='center'>$time</td>
@@ -360,7 +365,13 @@ foreach $_ (@log)
         <td align='center'>$proto</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>
+END
+;
+        if ( $fcode ne "" ){
+        print "<td align='center'><a href='../country.cgi#$fcode'><img src='/images/flags/$fcode.png' border='0' align='absmiddle' alt='$ccode'></a></td>";} 
+        else {
+        print "<td align='center'></td>";}
+        print <<END
         <td align='center'>$macaddr</td>
 </tr>
 END