From 63f247b62728856caaa9d005f6ec5907cbd5f6de Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Fri, 17 Mar 2006 17:27:43 +0000 Subject: [PATCH] MFC 10652 Make wizard work on described OPT interfaces --- .../www/wizards/traffic_shaper_wizard.xml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/usr/local/www/wizards/traffic_shaper_wizard.xml b/usr/local/www/wizards/traffic_shaper_wizard.xml index d3e8f5ae59..3dc592ed8f 100644 --- a/usr/local/www/wizards/traffic_shaper_wizard.xml +++ b/usr/local/www/wizards/traffic_shaper_wizard.xml @@ -111,8 +111,8 @@ header("Location: /wizard.php?xml=traffic_shaper_wizard.xml&stepid={$stepid}&message={$message}"); exit; } - $downq = "q" . strtoupper($config['ezshaper']['step2']['inside_int']); - $upq = "q" . strtoupper($config['ezshaper']['step2']['outside_int']); + $downq = "q" . convert_friendly_interface_to_friendly_descr($config['ezshaper']['step2']['inside_int']); + $upq = "q" . convert_friendly_interface_to_friendly_descr($config['ezshaper']['step2']['outside_int']); /* Magic shaper scheduler */ $config['shaper']['schedulertype'] = "hfsc"; @@ -384,8 +384,8 @@ } if ( $_POST['enable'] ) { - $downq = "q" . strtoupper($config['ezshaper']['step2']['inside_int']); - $upq = "q" . strtoupper($config['ezshaper']['step2']['outside_int']); + $downq = "q" . convert_friendly_interface_to_friendly_descr($config['ezshaper']['step2']['inside_int']); + $upq = "q" . convert_friendly_interface_to_friendly_descr($config['ezshaper']['step2']['outside_int']); $downint = strtolower($config['ezshaper']['step2']['inside_int']); $upint = strtolower($config['ezshaper']['step2']['outside_int']); @@ -690,8 +690,8 @@ /* XXX - billm - needs to actually honor what the user selects still */ if ( $_POST['enable'] ) { - $downq = "q" . strtoupper($config['ezshaper']['step2']['inside_int']); - $upq = "q" . strtoupper($config['ezshaper']['step2']['outside_int']); + $downq = "q" . convert_friendly_interface_to_friendly_descr($config['ezshaper']['step2']['inside_int']); + $upq = "q" . convert_friendly_interface_to_friendly_descr($config['ezshaper']['step2']['outside_int']); $downint = strtolower($config['ezshaper']['step2']['inside_int']); $upint = strtolower($config['ezshaper']['step2']['outside_int']); @@ -980,8 +980,8 @@ /* XXX - billm - needs to actually honor what the user selects still */ if ( $_POST['enable'] ) { - $downq = "q" . strtoupper($config['ezshaper']['step2']['inside_int']); - $upq = "q" . strtoupper($config['ezshaper']['step2']['outside_int']); + $downq = "q" . convert_friendly_interface_to_friendly_descr($config['ezshaper']['step2']['inside_int']); + $upq = "q" . convert_friendly_interface_to_friendly_descr($config['ezshaper']['step2']['outside_int']); $downint = strtolower($config['ezshaper']['step2']['inside_int']); $upint = strtolower($config['ezshaper']['step2']['outside_int']); @@ -1742,8 +1742,8 @@ if ( $_POST['enable'] ) { - $downq = "q" . strtoupper($config['ezshaper']['step2']['inside_int']); - $upq = "q" . strtoupper($config['ezshaper']['step2']['outside_int']); + $downq = "q" . convert_friendly_interface_to_friendly_descr($config['ezshaper']['step2']['inside_int']); + $upq = "q" . convert_friendly_interface_to_friendly_descr($config['ezshaper']['step2']['outside_int']); $downint = strtolower($config['ezshaper']['step2']['inside_int']); $upint = strtolower($config['ezshaper']['step2']['outside_int']); /* create qOthersUp queue */