diff options
author | Ermal Luçi <eri@pfsense.org> | 2008-02-21 19:37:45 +0000 |
---|---|---|
committer | Ermal Luçi <eri@pfsense.org> | 2008-02-21 19:37:45 +0000 |
commit | 7f31d1f6afde8cc1491efd4296c4d50740ee278c (patch) | |
tree | b94d4a6b39102022e1e7ae2ca10686845f8ffe34 | |
parent | fe93b17baff62f8a89bebe1b71ab2369f06d5442 (diff) | |
download | pfsense-7f31d1f6afde8cc1491efd4296c4d50740ee278c.zip pfsense-7f31d1f6afde8cc1491efd4296c4d50740ee278c.tar.gz |
Do not show duplicate queues names on rules edit page
-rw-r--r-- | etc/inc/shaper.inc | 4 | ||||
-rwxr-xr-x | usr/local/www/firewall_rules_edit.php | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/etc/inc/shaper.inc b/etc/inc/shaper.inc index 9c1f721..bc01ba8 100644 --- a/etc/inc/shaper.inc +++ b/etc/inc/shaper.inc @@ -394,6 +394,7 @@ class altq_root_queue { $this->SetAvailableBandwidth($this->GetAvailableBandwidth() - $myBw); $this->queues[$q->GetQname()] = &$q; $GLOBALS['allqueue_list'][] = $q->GetQname(); + $GLOBALS['unique_qlist'][$q->GetQname()] = $q->GetQname(); ref_on_altq_queue_list($this->GetQname(), $q->GetQname()); if (is_array($queue['queue'])) { foreach ($queue['queue'] as $key1 => $que) { @@ -1239,6 +1240,7 @@ class hfsc_queue extends priq_queue { $this->subqueues[$q->GetQname()] =& $q; //new hfsc_queue() $GLOBALS['allqueue_list'][] = $q->GetQname(); + $GLOBALS['unique_qlist'][$q->GetQname()] = $q->GetQname(); ref_on_altq_queue_list($this->GetQname(), $q->GetQname()); if (is_array($qname['queue'])) { foreach ($qname['queue'] as $key1 => $que) { @@ -1764,6 +1766,7 @@ class cbq_queue extends priq_queue { $q->SetLink($path); $this->subqueues[$q->GetQName()] = &$q; $GLOBALS['allqueue_list'][] = $q->GetQname(); + $GLOBALS['unique_qlist'][$q->GetQname()] = $q->GetQname(); ref_on_altq_queue_list($this->GetQname(), $q->GetQname()); if (is_array($qname['queue'])) { foreach ($qname['queue'] as $key1 => $que) { @@ -2075,6 +2078,7 @@ function read_altq_config() { $altq_list_queues = array(); $GLOBALS['allqueue_list'] = array(); + $GLOBALS['unique_qlist'] = array(); if (!is_array($config['shaper']['queue'])) return; diff --git a/usr/local/www/firewall_rules_edit.php b/usr/local/www/firewall_rules_edit.php index 322fc83..033d7ff 100755 --- a/usr/local/www/firewall_rules_edit.php +++ b/usr/local/www/firewall_rules_edit.php @@ -995,7 +995,7 @@ on another rule.")?> <?php if (!is_array($altq_list_queues)) read_altq_config(); /* XXX: */ - foreach ($GLOBALS['allqueue_list'] as $q) { + foreach ($GLOBALS['unique_qlist'] as $q) { echo "<option value=\"$q\""; if ($q == $pconfig['ackqueue']) { $qselected = 1; @@ -1011,7 +1011,7 @@ on another rule.")?> <select name="defaultqueue"> <?php $qselected = 0; - foreach ($GLOBALS['allqueue_list'] as $q) { + foreach ($GLOBALS['unique_qlist'] as $q) { echo "<option value=\"$q\""; if ($q == $pconfig['defaultqueue']) { $qselected = 1; |