summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/inc/shaper.inc4
-rw-r--r--usr/local/www/firewall_shaper_vinterface.php3
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");
?>
OpenPOWER on IntegriCloud