From 98c474a4aa6802cc07088eafb60eb47a8b315d10 Mon Sep 17 00:00:00 2001
From: Christian Schmidt <maniacikarus@ipfire.org>
Date: Fri, 10 Dec 2010 12:10:47 +0100
Subject: [PATCH] Fixed a bug in the outgoingfw where preselected groups where
 not set if you edit a rule.

---
 config/rootfiles/core/44/filelists/files | 1 +
 html/cgi-bin/outgoingfw.cgi              | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/config/rootfiles/core/44/filelists/files b/config/rootfiles/core/44/filelists/files
index de75056e4..866acf0bc 100644
--- a/config/rootfiles/core/44/filelists/files
+++ b/config/rootfiles/core/44/filelists/files
@@ -12,6 +12,7 @@ srv/web/ipfire/cgi-bin/proxy.cgi
 srv/web/ipfire/cgi-bin/speed.cgi
 srv/web/ipfire/cgi-bin/vpnmain.cgi
 srv/web/ipfire/cgi-bin/ids.cgi
+srv/web/ipfire/cgi-bin/outgoingfw.cgi
 srv/web/ipfire/cgi-bin/pppsetup.cgi
 srv/web/ipfire/html/images/urlfilter/copy.gif
 var/ipfire/general-functions.pl
diff --git a/html/cgi-bin/outgoingfw.cgi b/html/cgi-bin/outgoingfw.cgi
index a15b243c0..295bde477 100644
--- a/html/cgi-bin/outgoingfw.cgi
+++ b/html/cgi-bin/outgoingfw.cgi
@@ -699,7 +699,8 @@ END
 ;
 	my @ipgroups = qx(ls $configpath/ipgroups/);
 	foreach (sort @ipgroups){
-		print "\t\t\t\t\t<option value='$_' $selected{'SNET'}{'$_'}>$_</option>\n";
+		chomp($_);
+		print "\t\t\t\t\t<option value='$_' $selected{'SNET'}{$_}>$_</option>\n";
 	}
 	print <<END
 					</optgroup>
@@ -708,7 +709,8 @@ END
 ;
 	my @macgroups = qx(ls $configpath/macgroups/);
 	foreach (sort @macgroups){
-		print "\t\t\t\t\t<option value='$_' $selected{'SNET'}{'$_'}>$_</option>\n";
+		chomp($_);
+		print "\t\t\t\t\t<option value='$_' $selected{'SNET'}{$_}>$_</option>\n";
 	}
 	print <<END
 					</optgroup>
@@ -844,4 +846,4 @@ END
 }
 
 &Header::closebigbox();
-&Header::closepage();
\ No newline at end of file
+&Header::closepage();