diff options
author | Ermal <eri@pfsense.org> | 2012-10-23 20:56:19 +0000 |
---|---|---|
committer | Ermal <eri@pfsense.org> | 2012-10-23 20:56:19 +0000 |
commit | fbfed5baccbe768594f60ef4bceb98a9a882ae45 (patch) | |
tree | 9de96af2292e898081530473a436237dc88a49bd | |
parent | e5df3664f9760fb3841a5fb3d3aa7762eccb6011 (diff) | |
download | pfsense-fbfed5baccbe768594f60ef4bceb98a9a882ae45.zip pfsense-fbfed5baccbe768594f60ef4bceb98a9a882ae45.tar.gz |
Correct issues with limiters. 1. correct spelling of config option 2. avoid duplicating javascript
-rw-r--r-- | etc/inc/shaper.inc | 4 | ||||
-rw-r--r-- | usr/local/www/firewall_shaper_vinterface.php | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/etc/inc/shaper.inc b/etc/inc/shaper.inc index efd2eed..a13ec30 100644 --- a/etc/inc/shaper.inc +++ b/etc/inc/shaper.inc @@ -3002,7 +3002,7 @@ class dnpipe_class extends dummynet_class { $bandwidth = $this->GetBandwidth(); if (is_array($bandwidth)) { foreach ($bandwidth as $bw) { - if ($bw['sched'] != "none") { + if ($bw['bwsched'] != "none") { $time_based_rules = true; if (is_array($config['schedules']) && is_array($config['schedules']['schedule'])) { foreach ($config['schedules']['schedule'] as $schedule) { @@ -3072,7 +3072,7 @@ class dnpipe_class extends dummynet_class { foreach (array("Kb" => "Kbit/s", "Mb" => "Mbit/s", "Gb" => "Gbit/s", "b" => "Bit/s") as $bwidx => $bw) $bwopt .= "<option value='{$bwidx}'>{$bw}</option>"; - $javasr = <<<EOD + $javasr = <<<EOD <script text='type/javascript'> var addBwRowTo = (function() { return (function (tableId) { diff --git a/usr/local/www/firewall_shaper_vinterface.php b/usr/local/www/firewall_shaper_vinterface.php index 84be907..9893de1 100644 --- a/usr/local/www/firewall_shaper_vinterface.php +++ b/usr/local/www/firewall_shaper_vinterface.php @@ -368,7 +368,8 @@ function show_source_port_range() { <?php if ($queue) echo $queue->build_javascript(); -echo $newjavascript; +else + echo $newjavascript; include("fbegin.inc"); ?> |