diff options
author | Scott Ullrich <sullrich@pfsense.org> | 2005-03-21 17:31:22 +0000 |
---|---|---|
committer | Scott Ullrich <sullrich@pfsense.org> | 2005-03-21 17:31:22 +0000 |
commit | 9f8a09ace12f9aa3b271a157c84eaac88adb56b5 (patch) | |
tree | 60543de6059c7c4cf2d7b3fa34c059251a8349c3 /usr/local/www/firewall_shaper_queues_edit.php | |
parent | a11c626c5183164f5f6aa81e33931b3a5a55f046 (diff) | |
download | pfsense-9f8a09ace12f9aa3b271a157c84eaac88adb56b5.zip pfsense-9f8a09ace12f9aa3b271a157c84eaac88adb56b5.tar.gz |
Correctly save and restore parent queue association.
Diffstat (limited to 'usr/local/www/firewall_shaper_queues_edit.php')
-rwxr-xr-x | usr/local/www/firewall_shaper_queues_edit.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/usr/local/www/firewall_shaper_queues_edit.php b/usr/local/www/firewall_shaper_queues_edit.php index ebadde8..48c07d0 100755 --- a/usr/local/www/firewall_shaper_queues_edit.php +++ b/usr/local/www/firewall_shaper_queues_edit.php @@ -74,6 +74,7 @@ if (isset($id)) { $pconfig['bandwidth'] = $a_queues[$id]['bandwidth']; $pconfig['bandwidthtype'] = $a_queues[$id]['bandwidthtype']; $pconfig['associatedrule'] = $a_queues[$id]['associatedrule']; + $pconfig['attachtoqueue'] = $a_queues[$id]['attachtoqueue']; } } @@ -115,6 +116,7 @@ if ($_POST) { $queue['upperlimit2'] = $_POST['upperlimit2']; $queue['upperlimit1'] = $_POST['upperlimit1']; $queue['parentqueue'] = $_POST['parentqueue']; + $queue['attachtoqueue'] = $_POST['attachtoqueue']; $queue['associatedrule'] = $_POST['associatedrule']; $scheduleroptions=""; $queue['rio'] = $_POST['rio']; @@ -173,6 +175,7 @@ if ($_POST) { $linkshare3 = $pconfig["linkshare3"]; $parentqueue = $pconfig["parentqueue"]; $defaultqueue = $pconfig["defaultqueue"]; + $attachtoqueue = $pconfig['attachtoqueue']; $parent = $pconfig["parent"]; ?> <p class="pgtitle">Firewall: Traffic shaper: Edit queue</p> @@ -251,10 +254,10 @@ if ($_POST) { <tr> <td width="22%" valign="top" class="vncell">Parent queue (CBQ or HFSC only):</td> <td width="78%" class="vtable"> - <select id="childqueue" name="childqueue"> + <select id="attachtoqueue" name="attachtoqueue"> <?php - if(is_subqueue($config['shaper']['queue'])) - echo "<option value=\"" . $pconfig['shaper']['childqueue'] . "\">" . $pconfig['shaper']['childqueue'] . "</option>"; + if($pconfig['attachtoqueue'] <> "") + echo "<option value=\"" . $pconfig['attachtoqueue'] . "\">" . $pconfig['attachtoqueue'] . "</option>"; else echo "<option value=\"\"></option>"; if (is_array($config['shaper']['queue'])) { |