From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 14 Oct 2010 06:33:27 +0000 (+0200)
Subject: Merge commit 'origin/master' into next
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=799cc0f3a9524abbbd6cca803795206e2112a00e;hp=d4c6ba21eb1aed558c60f5a30a4de028f06584c0

Merge commit 'origin/master' into next

Conflicts:
	config/rootfiles/core/41/filelists/files
---

diff --git a/config/outgoingfw/outgoingfw.pl b/config/outgoingfw/outgoingfw.pl
index 8d4d27d31..6709ee603 100644
--- a/config/outgoingfw/outgoingfw.pl
+++ b/config/outgoingfw/outgoingfw.pl
@@ -187,7 +187,7 @@ foreach $configentry (sort @configs)
 			foreach $SOURCE (@SOURCE) {
 				$SOURCE =~ s/\s//gi;
 
-				if ( $SOURCE eq "" ){next;}
+				if ( $SOURCE eq "" || $configline[1] eq "" ){next;}
 
 				if ( ( $configline[6] ne "" || $configline[2] eq 'mac' ) && $configline[2] ne 'all'){
 					$SOURCE =~ s/[^a-zA-Z0-9]/:/gi;
diff --git a/html/cgi-bin/outgoingfw.cgi b/html/cgi-bin/outgoingfw.cgi
index 27a8927e6..a15b243c0 100644
--- a/html/cgi-bin/outgoingfw.cgi
+++ b/html/cgi-bin/outgoingfw.cgi
@@ -408,8 +408,12 @@ END
 				if ($outfwsettings{'STATE'} eq 'DENY'){ $outfwsettings{'DISPLAY_STATE'} = "<img src='/images/stock_stop.png' alt='DENY' />"; }
 				if ($outfwsettings{'STATE'} eq 'ALLOW'){ $outfwsettings{'DISPLAY_STATE'} = "<img src='/images/stock_ok.png' alt='ALLOW' />"; }
 				if ((($outfwsettings{'POLICY'} eq 'MODE1') && ($outfwsettings{'STATE'} eq 'ALLOW')) || (($outfwsettings{'POLICY'} eq 'MODE2') && ($outfwsettings{'STATE'} eq 'DENY'))){
-			  		print <<END
-					<tr bgcolor='$color{'color20'}'>
+				if ( $outfwsettings{'ENABLED'} eq "on" ){
+					print "<tr bgcolor='$color{'color20'}'>";
+				} else {
+					print "<tr bgcolor='$color{'color18'}'>";
+				}
+					print <<END
 					    <td align='center'>$outfwsettings{'PROT'}
 					    <td align='center'>$outfwsettings{'SNET'}
 					    <td align='center'>$outfwsettings{'DISPLAY_DIP'}:$outfwsettings{'DISPLAY_DPORT'}