diff options
author | Michele Di Maria <michele@nt2.it> | 2011-12-06 22:51:11 +0100 |
---|---|---|
committer | Scott Ullrich <sullrich@gmail.com> | 2011-12-06 17:03:30 -0500 |
commit | 8a1ec636b5060073f2a3b6b98046dc1b047bcdf9 (patch) | |
tree | a8b98aabf4dd9890c53f5121312ce1f8929eb940 | |
parent | b09ec44b2126cdfedc51dcafbf966bbd69145b1c (diff) | |
download | pfsense-8a1ec636b5060073f2a3b6b98046dc1b047bcdf9.zip pfsense-8a1ec636b5060073f2a3b6b98046dc1b047bcdf9.tar.gz |
Fixes this: http://redmine.pfsense.org/issues/2015
I was checking, but if someone of the stuff give it a check it would be much better, since this is a core feature!
-rw-r--r-- | etc/inc/shaper.inc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/etc/inc/shaper.inc b/etc/inc/shaper.inc index 861fa4a..c53230b 100644 --- a/etc/inc/shaper.inc +++ b/etc/inc/shaper.inc @@ -1191,12 +1191,13 @@ class priq_queue { function build_shortform() { /* XXX: Hacks in site. Mostly layer violations! */ global $g, $altq_list_queues; - + global $shaperIFlist; + $altq =& $altq_list_queues[$this->GetInterface()]; if ($altq) $scheduler = ": " . $altq->GetScheduler(); $form = "<tr><td width=\"20%\" class=\"vtable\">"; - $form .= "<a href=\"firewall_shaper.php?interface=" . $this->GetInterface() . "&queue=" . $this->GetInterface()."&action=show\">". $shaperIFlist[$this->GetInterface()] .": ".$scheduler."</a>"; + $form .= "<a href=\"firewall_shaper.php?interface=" . $this->GetInterface() . "&queue=" . $this->GetQname()."&action=show\">". $shaperIFlist[$this->GetInterface()] .$scheduler."</a>"; $form .= "</td></tr>"; /* * XXX: Hack in sight maybe fix with a class that wraps all @@ -4039,12 +4040,13 @@ function filter_generate_dummynet_rules() { function build_iface_without_this_queue($iface, $qname) { global $g, $altq_list_queues; + global $shaperIFlist; $altq =& $altq_list_queues[$iface]; if ($altq) $scheduler = ": " . $altq->GetScheduler(); $form = "<tr><td width=\"20%\" >"; - $form .= "<a href=\"firewall_shaper.php?interface=" . $iface . "&queue=" . $iface."&action=show\">".$iface.": ".$scheduler."</a>"; + $form .= "<a href=\"firewall_shaper.php?interface=" . $iface . "&queue=" . $iface."&action=show\">". $shaperIFlist[$iface] . $scheduler."</a>"; $form .= "</td></tr>"; $form .= "<tr><td width=\"100%\" class=\"vncellreq\">"; $form .= "<a href=\"firewall_shaper_queues.php?interface="; |