QoS.cgi speichert jetzt die TOS-Bits nach dem editieren wieder richtig.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@803 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/backup/include b/config/backup/include
index a8ae9335d5aa89201491d35a502ca6a24284d7b9..8679a5fb69aaec98622bc806bed131d3585088f3 100644 (file)
--- a/config/backup/include
+++ b/config/backup/include
@@ -2,6 +2,8 @@
 /var/ipfire/*/*.conf
 /var/ipfire/*/*.pem
 /var/ipfire/*/config
+/var/ipfire/*/enable
+/var/ipifre/*/*enable*
 /etc/passwd
 /etc/shadow
 /etc/group
@@ -10,11 +12,11 @@
 /etc/httpd/*
 /etc/ssh/ssh_host*
 /var/ipfire/auth/users
-/var/ipifre/*/*enable*
 /var/ipfire/dhcp/*
 /var/ipfire/main/*
 /var/ipfire/outgoing/rules
 /var/ipfire/ovpn
+/var/ipfire/ppp
 /var/ipfire/proxy
 /var/ipfire/qos/*
 /var/ipfire/urlfilter

diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi
index 6c8067040ed5444130ec5eb0fcda2d9ef2e8ebe7..bacf77f233d028b9cf1c42384256ea976a9bb04e 100644 (file)
--- a/html/cgi-bin/qos.cgi
+++ b/html/cgi-bin/qos.cgi
@@ -846,13 +846,17 @@ END
                <tr><td width='33%' align='right'>Ceilburst:
                    <td width='33%' align='left'><input type='text' size='20' name='CBURST' maxlength='8' value="$qossettings{'CBURST'}" />
                    <td width='33%' align='center'>&nbsp;
+END
+;
+                       $selected{'TOS'}{$qossettings{'TOS'}} = "selected='selected'";
+print <<END
                <tr><td width='33%' align='right'>TOS-Bit:
                    <td width='33%' align='left'><select name='TOS'>
-                               <option value='0'>$Lang::tr{'disabled'} (0)</option>
-                               <option value='8'>$Lang::tr{'min delay'} (8)</option>
-                               <option value='4'>$Lang::tr{'max throughput'} (4)</option>
-                               <option value='2'>$Lang::tr{'max reliability'} (2)</option>
-                               <option value='1'>$Lang::tr{'min costs'} (1)</option></select>
+                               <option value='0' $selected{'TOS'}{'0'}>$Lang::tr{'disabled'} (0)</option>
+                               <option value='8' $selected{'TOS'}{'8'}>$Lang::tr{'min delay'} (8)</option>
+                               <option value='4' $selected{'TOS'}{'4'}>$Lang::tr{'max throughput'} (4)</option>
+                               <option value='2' $selected{'TOS'}{'2'}>$Lang::tr{'max reliability'} (2)</option>
+                               <option value='1' $selected{'TOS'}{'1'}>$Lang::tr{'min costs'} (1)</option></select>
                    <td width='33%' align='center'>&nbsp;
                <tr><td width='33%' align='right'>$Lang::tr{'remark'}:
                    <td width='66%' colspan='2' align='left'><input type='text' name='REMARK' size='40' maxlength='40' value="$qossettings{'REMARK'}" /> <img alt="" alt='blob' src='/blob.gif' />