diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/etc/inc/shaper.inc | 70 | ||||
-rw-r--r-- | src/usr/local/www/firewall_shaper_vinterface.php | 13 |
2 files changed, 10 insertions, 73 deletions
diff --git a/src/etc/inc/shaper.inc b/src/etc/inc/shaper.inc index 9b57170..bd53cde 100644 --- a/src/etc/inc/shaper.inc +++ b/src/etc/inc/shaper.inc @@ -4188,76 +4188,6 @@ class dnqueue_class extends dummynet_class { )); } - $bandwidth = $this->GetBandwidth(); - - // Delete a row - if (isset($_GET['delbwrow']) && (count($bandwidth) > 0)) { - unset($bandwidth[$_GET['delbwrow']]); - } - - // Add a row - if ($_GET['newbwrow']) { - array_push($bandwidth, array(count($bandwidth) => array('bw' => '', 'burst' => '', 'bwscale' => 'Kb', 'bwsched' => 'none') )); - - } - - if (is_array($bandwidth)) { - $row = 0; - $numrows = count($bandwidth) - 1; - - if ($numrows >= 0) { - foreach ($bandwidth as $bwidx => $bw) { - $group = new Form_Group($row == 0 ? 'Bandwidth':null); - - $group->add(new Form_Input( - 'bandwidth' . $bwidx, - null, - 'text', - $bw['bw'] - ))->setHelp($row == $numrows ? 'Bandwidth':null); - - $group->add(new Form_Select( - 'bwtype' . $bwidx, - null, - $bw['bwscale'], - array('Kb' => 'Kbit/s', 'Mb' => 'Mbit/s', 'Gb' => 'Gbit/s', 'b' => 'Bit/s') - ))->setHelp($row == $numrows ? 'Bw Type':null);; - - $group->add(new Form_Select( - 'bwsched' . $bwidx, - null, - $bw['bwsched'], - $schedules - ))->setHelp($row == $numrows ? 'Schedule':null);; - - $group->add(new Form_Button( - 'delete' + $bwidx, - 'Delete', - 'firewall_shaper_vinterface.php?pipe=' . $pipe . '&queue=' . $qname . '&action=' . $action . '&delbwrow=' . $bwidx - ))->removeClass('btn-primary')->addClass('btn-danger btn-sm'); - - if ($row == $numrows) { - $group->setHelp('Bandwidth is the rate (e.g. Mbit/s) to which traffic in this limiter will be restricted.'); - } - - $section->add($group); - $row++; - } - } - else { // The $bandwidth array exists, but is empty - $section->addInput(new Form_StaticText( - 'Bandwidth', - 'No schedules configured for this limiter.' - )); - } - - $section->addInput(new Form_Button( - 'addsched', - 'Add new schedule', - 'firewall_shaper_vinterface.php?pipe=' . $pipe . '&queue=' . $qname . '&action=' . $action . '&newbwrow=yes' - ))->removeClass('btn-primary')->addClass('btn-success btn-sm'); - } - $mask = $this->GetMask(); $section->addInput(new Form_Select( diff --git a/src/usr/local/www/firewall_shaper_vinterface.php b/src/usr/local/www/firewall_shaper_vinterface.php index 506a525..e888606 100644 --- a/src/usr/local/www/firewall_shaper_vinterface.php +++ b/src/usr/local/www/firewall_shaper_vinterface.php @@ -189,8 +189,6 @@ if ($_GET) { if ($dnpipe) { $q = new dnqueue_class(); $q->SetPipe($pipe); - $output_form .= "<input type=\"hidden\" name=\"parentqueue\" id=\"parentqueue\""; - $output_form .= " value=\"".$pipe."\" />"; } else if ($addnewpipe) { $q = new dnpipe_class(); $q->SetQname($pipe); @@ -200,10 +198,19 @@ if ($_GET) { if ($q) { $sform = $q->build_form(); + if ($dnpipe) { + $sform->addGlobal(new Form_Input( + 'parentqueue', + null, + 'hidden', + $pipe + )); + } $newjavascript = $q->build_javascript(); unset($q); $newqueue = true; } + break; case "show": if ($queue) { @@ -429,7 +436,7 @@ if ($dfltmsg) { if (!$dontshow || $newqueue) { if ($can_add || $addnewaltq) { if ($queue) { - $url = 'href="firewall_shaper_vinterface.php?pipe=' . $pipe . '&queue=' . $queue->GetQname() . '&action=add'; + $url = 'firewall_shaper_vinterface.php?pipe=' . $pipe . '&queue=' . $queue->GetQname() . '&action=add'; } else { $url = 'firewall_shaper.php?pipe='. $pipe . '&action=add'; } |