diff options
author | Jim P <jim@pingle.org> | 2012-10-23 09:26:54 -0700 |
---|---|---|
committer | Jim P <jim@pingle.org> | 2012-10-23 09:26:54 -0700 |
commit | e5df3664f9760fb3841a5fb3d3aa7762eccb6011 (patch) | |
tree | 3cb75d76d7dfdb54a0d85321ab1ceffc19359d78 | |
parent | ac91bae5af34b6361b70dd2c28df81c67c24a0bb (diff) | |
parent | 184c7952900a64ea275b035238e532c33106298f (diff) | |
download | pfsense-e5df3664f9760fb3841a5fb3d3aa7762eccb6011.zip pfsense-e5df3664f9760fb3841a5fb3d3aa7762eccb6011.tar.gz |
Merge pull request #241 from bcyrill/patch-3
Fix limiter error
-rw-r--r-- | usr/local/www/firewall_shaper_vinterface.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/usr/local/www/firewall_shaper_vinterface.php b/usr/local/www/firewall_shaper_vinterface.php index baeafe4..84be907 100644 --- a/usr/local/www/firewall_shaper_vinterface.php +++ b/usr/local/www/firewall_shaper_vinterface.php @@ -98,7 +98,7 @@ if ($_GET) { if ($queue) { if (is_array($config['filter']['rule'])) { foreach ($config['filter']['rule'] as $rule) { - if ($rule['dnpipe'] == $queue->GetName() || $rule['pdnpipe'] == $queue->GetName()) + if ($rule['dnpipe'] == $queue->GetQname() || $rule['pdnpipe'] == $queue->GetQname()) $input_errors[] = gettext("This pipe/queue is referenced in filter rules, please remove references from there before deleteing."); } } @@ -161,6 +161,7 @@ if ($_GET) { if ($q) { $output_form .= $q->build_form(); + $newjavascript = $q->build_javascript(); unset($q); $newqueue = true; } @@ -222,6 +223,7 @@ if ($_GET) { read_dummynet_config(); $output_form .= $dnpipe->build_form(); + $newjavascript = $dnpipe->build_javascript(); } } else if ($parentqueue) { /* Add a new queue */ if (!empty($dummynet_pipe_list[$qname])) @@ -326,7 +328,7 @@ if ($can_add || $addnewaltq) { $output_form .= "</a>"; } $output_form .= "<a href=\"firewall_shaper_vinterface.php?pipe="; -$output_form .= $pipe . "&queue="; +$output_form .= $pipe; if ($queue) { $output_form .= "&queue=" . $queue->GetQname(); } |