samba: update to 3.6.20.

[people/pmueller/ipfire-2.x.git] / html / cgi-bin / outgoingfw.cgi

diff --git a/html/cgi-bin/outgoingfw.cgi b/html/cgi-bin/outgoingfw.cgi
index a15b243c0591770c171ef7881367b4d93b36eca9..b417817a257cb524c46e257a23a0a6f9dbde76cf 100644 (file)
--- a/html/cgi-bin/outgoingfw.cgi
+++ b/html/cgi-bin/outgoingfw.cgi
@@ -631,7 +631,7 @@ END
 sub addrule
 {
        &Header::openbox('100%', 'center', $Lang::tr{'Add Rule'});
-       if ($outfwsettings{'EDIT'} eq 'no') { $selected{'ENABLED'} = 'checked'; }
+       if ($outfwsettings{'ENABLED'} eq 'on') { $selected{'ENABLED'} = 'checked'; }
        $selected{'TIME_FROM'}{$outfwsettings{'TIME_FROM'}} = "selected='selected'";
        $selected{'TIME_TO'}{$outfwsettings{'TIME_TO'}} = "selected='selected'";
 print <<END
@@ -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();