diff --git a/usr/local/www/firewall_shaper_queues_edit.php b/usr/local/www/firewall_shaper_queues_edit.php
index e62ce5f201..e9237b5c10 100755
--- a/usr/local/www/firewall_shaper_queues_edit.php
+++ b/usr/local/www/firewall_shaper_queues_edit.php
@@ -43,7 +43,6 @@ if (isset($id) && $a_queues[$id]) {
$pconfig['mask'] = $a_queues[$id]['mask'];
$pconfig['name'] = $a_queues[$id]['name'];
$pconfig['options'] = $a_queues[$id]['options'];
-
$pconfig['options']['red'] = $a_queues[$id]['options']['red'];
$pconfig['options']['ecn'] = $a_queues[$id]['options']['ecn'];
$pconfig['options']['defaultqueue'] = $a_queues[$id]['options']['defaultqueue'];
@@ -57,6 +56,7 @@ if (isset($id) && $a_queues[$id]) {
$pconfig['options']['linkshare1'] = $a_queues[$id]['options']['linkshare1'];
$pconfig['options']['linkshare2'] = $a_queues[$id]['options']['linkshare2'];
$pconfig['options']['linkshare3'] = $a_queues[$id]['options']['linkshare3'];
+ $pconfig['options']['schedulertype'] = $a_queues[$id]['options']['schedulertype'];
$pconfig['bandwidth'] = $a_queues[$id]['bandwidth'];
$pconfig['bandwidthtype'] = $a_queues[$id]['bandwidthtype'];
}
@@ -67,8 +67,8 @@ if ($_POST) {
$pconfig = $_POST;
/* input validation */
- $reqdfields = explode(" ", "priority");
- $reqdfieldsn = explode(",", "Priority");
+ //$reqdfields = explode(" ", "priority");
+ //$reqdfieldsn = explode(",", "Priority");
do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
@@ -79,7 +79,7 @@ if ($_POST) {
if (!$input_errors) {
$queue = array();
- $queue['schedulertype'] = $_POST['scheduler'];
+ $queue['options']['schedulertype'] = $_POST['schedulertype'];
$queue['bandwidth'] = $_POST['bandwidth'];
$queue['priority'] = $_POST['priority'];
$queue['name'] = ereg_replace(" ", "", $_POST['name']);
@@ -97,9 +97,9 @@ if ($_POST) {
$queue['options']['upperlimit1'] = $_POST['upperlimit1'];
$queue['options']['parentqueue'] = $_POST['parentqueue'];
$scheduleroptions="";
- $queue['options']['red'] = "enabled";
- $queue['options']['ecn'] = "enabled";
- $queue['options']['defaultqueue'] = "eanbled";
+ $queue['options']['red'] = $_POST['red'];
+ $queue['options']['ecn'] = $_POST['ecn'];
+ $queue['options']['defaultqueue'] = $_POST['defaultqueue'];
if (isset($id) && $a_queues[$id])
$a_queues[$id] = $queue;
else
@@ -141,7 +141,7 @@ function sync_scheduler_options() {
document.forms[0].linkshare3.disabled = 1;
document.forms[0].childqueue.disabled = 1;
document.forms[0].priority.disabled = 0;
- } else if(document.forms[0].scheduler.value == 'cbq') {
+ } else if(document.forms[0].schedulertype.value == 'cbq') {
document.forms[0].defaultqueue.disabled = 0;
document.forms[0].parentqueue.disabled = 0;
document.forms[0].red.disabled = 0;
@@ -160,7 +160,7 @@ function sync_scheduler_options() {
document.forms[0].linkshare3.disabled = 1;
document.forms[0].childqueue.disabled = 0;
document.forms[0].priority.disabled = 0;
- } else if(document.forms[0].scheduler.value == 'hfsc') {
+ } else if(document.forms[0].schedulertype.value == 'hfsc') {
document.forms[0].red.disabled = 0;
document.forms[0].ecn.disabled = 0;
document.forms[0].defaultqueue.disabled = 0;
@@ -178,7 +178,7 @@ function sync_scheduler_options() {
document.forms[0].linkshare2.disabled = 0;
document.forms[0].linkshare3.disabled = 0;
document.forms[0].childqueue.disabled = 0;
- document.forms[0].priority.disabled = 1;
+ document.forms[0].priority.disabled = 0;
}
}
@@ -187,6 +187,26 @@ function sync_scheduler_options() {
+
Firewall: Traffic shaper: Edit queue