From 7779e6ce2069e706f484280048a9c979ed93e272 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Thu, 6 Oct 2016 14:02:44 -0400
Subject: Select PRIQ by default in the shaper wizards, rather than HFSC.

---
 .../www/wizards/traffic_shaper_wizard_dedicated.inc      | 16 ++++++++--------
 .../www/wizards/traffic_shaper_wizard_multi_all.inc      | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'src/usr/local/www/wizards')

diff --git a/src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc b/src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc
index b9d398c..7ac38ec 100644
--- a/src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc
+++ b/src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc
@@ -132,6 +132,10 @@ function step2_stepbeforeformdisplay() {
 		$field['typehint'] = "Queueing discipline to apply on the download of this connection.";
 		$field['options']['option'] = array();
 		$opts = array();
+		$opts['name'] = "PRIQ";
+		$opts['value'] = "PRIQ";
+		$field['options']['option'][] = $opts;
+		$opts = array();
 		$opts['name'] = "HFSC";
 		$opts['value'] = "HFSC";
 		$field['options']['option'][] = $opts;
@@ -139,10 +143,6 @@ function step2_stepbeforeformdisplay() {
 		$opts['name'] = "CBQ";
 		$opts['value'] = "CBQ";
 		$field['options']['option'][] = $opts;
-		$opts = array();
-		$opts['name'] = "PRIQ";
-		$opts['value'] = "PRIQ";
-		$field['options']['option'][] = $opts;
 		$field['bindstofield'] = "ezshaper->step2->local{$i}downloadscheduler";
 		$fields[] = $field;
 
@@ -178,6 +178,10 @@ function step2_stepbeforeformdisplay() {
 		$field['typehint'] = "Queueing discipline to apply on the upload of this connection.";
 		$field['options']['option'] = array();
 		$opts = array();
+		$opts['name'] = "PRIQ";
+		$opts['value'] = "PRIQ";
+		$field['options']['option'][] = $opts;
+		$opts = array();
 		$opts['name'] = "HFSC";
 		$opts['value'] = "HFSC";
 		$field['options']['option'][] = $opts;
@@ -185,10 +189,6 @@ function step2_stepbeforeformdisplay() {
 		$opts['name'] = "CBQ";
 		$opts['value'] = "CBQ";
 		$field['options']['option'][] = $opts;
-		$opts = array();
-		$opts['name'] = "PRIQ";
-		$opts['value'] = "PRIQ";
-		$field['options']['option'][] = $opts;
 		$field['bindstofield'] = "ezshaper->step2->conn{$i}uploadscheduler";
 		$fields[] = $field;
 
diff --git a/src/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc b/src/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc
index 1b8be4e..5cfba52 100644
--- a/src/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc
+++ b/src/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc
@@ -155,6 +155,10 @@ function step2_stepbeforeformdisplay() {
 		$field['typehint'] = "Queueing discipline to apply on this local interface.";
 		$field['options']['option'] = array();
 		$opts = array();
+		$opts['name'] = "PRIQ";
+		$opts['value'] = "PRIQ";
+		$field['options']['option'][] = $opts;
+		$opts = array();
 		$opts['name'] = "HFSC";
 		$opts['value'] = "HFSC";
 		$field['options']['option'][] = $opts;
@@ -162,10 +166,6 @@ function step2_stepbeforeformdisplay() {
 		$opts['name'] = "CBQ";
 		$opts['value'] = "CBQ";
 		$field['options']['option'][] = $opts;
-		$opts = array();
-		$opts['name'] = "PRIQ";
-		$opts['value'] = "PRIQ";
-		$field['options']['option'][] = $opts;
 		$field['bindstofield'] = "ezshaper->step2->local{$i}downloadscheduler";
 		$fields[] = $field;
 	}
@@ -209,6 +209,10 @@ function step2_stepbeforeformdisplay() {
 		$field['typehint'] = "Queueing discipline to apply on the upload of this connection.";
 		$field['options']['option'] = array();
 		$opts = array();
+		$opts['name'] = "PRIQ";
+		$opts['value'] = "PRIQ";
+		$field['options']['option'][] = $opts;
+		$opts = array();
 		$opts['name'] = "HFSC";
 		$opts['value'] = "HFSC";
 		$field['options']['option'][] = $opts;
@@ -216,10 +220,6 @@ function step2_stepbeforeformdisplay() {
 		$opts['name'] = "CBQ";
 		$opts['value'] = "CBQ";
 		$field['options']['option'][] = $opts;
-		$opts = array();
-		$opts['name'] = "PRIQ";
-		$opts['value'] = "PRIQ";
-		$field['options']['option'][] = $opts;
 		$field['bindstofield'] = "ezshaper->step2->conn{$i}uploadscheduler";
 		$fields[] = $field;
 
-- 
cgit v1.1