diff options
| author | Ermal <eri@pfsense.org> | 2010-10-18 15:16:33 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2010-10-18 15:16:33 +0000 |
| commit | 5d763c0e195a68e25467b7ccc0949453214e8d14 (patch) | |
| tree | 5a7859efb5a5d07da778ab32428f82b5e2c7d428 /usr/local/www/wizards | |
| parent | 2e408f5995c6a163365b353af70522f0546997b6 (diff) | |
| download | pfsense-5d763c0e195a68e25467b7ccc0949453214e8d14.zip pfsense-5d763c0e195a68e25467b7ccc0949453214e8d14.tar.gz | |
Fix the dedicated and multi_all wizards. They had typos in variable names and some remaining unused code which caused problems!
Diffstat (limited to 'usr/local/www/wizards')
| -rwxr-xr-x | usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc | 10 | ||||
| -rwxr-xr-x | usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc b/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc index b640c05..9909db7 100755 --- a/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc +++ b/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc @@ -736,12 +736,11 @@ function apply_all_choosen_items() { $tmpcf['bandwidthtype'] = $config['ezshaper']['step2']["conn{$i}uploadspeed"]; } else if ($sched == "HFSC") { - $tmpcf['linkshare3'] = floatval($config['ezshaper']['step2']["conn{$i}upload"]) . $config['ezshaper']['step2']["conn{$i}uploadspeed"]; $tmpcf['upperlimit'] = "on"; $tmpcf['upperlimit3'] = floatval($config['ezshaper']['step2']["conn{$i}upload"]) . $config['ezshaper']['step2']["conn{$i}uploadspeed"]; - $tmpcf['linkshare2'] = 100; $tmpcf['linkshare'] = "on"; + $tmpcf['linkshare3'] = floatval($config['ezshaper']['step2']["conn{$i}upload"]) . $config['ezshaper']['step2']["conn{$i}uploadspeed"]; $tmpcf['bandwidth'] = floatval($config['ezshaper']['step2']["conn{$i}upload"]); $tmpcf['bandwidthtype'] = $config['ezshaper']['step2']["conn{$i}uploadspeed"]; } @@ -1010,7 +1009,7 @@ function apply_all_choosen_items() { array_pop($tmppath); $downfactor = wizard_get_bandwidthtype_scale($config['ezshaper']['step2']["conn{$i}downloadspeed"]); - $downbw = floatval($config['ezshaper']['step2']["conn{$i}download"]) * $upfactor; + $downbw = floatval($config['ezshaper']['step2']["conn{$i}download"]) * $downfactor; $tmppath = array(); $altq =& new altq_root_queue(); @@ -1045,7 +1044,7 @@ function apply_all_choosen_items() { $voip = true; $voipbw = $config['ezshaper']['step3']["local{$i}download"]; $voipbwunit = $config['ezshaper']['step3']["local{$i}downloadspeed"]; - if ($scehd != HFSC) { + if ($sched != HFSC) { if ($penaltybwunit == "%") $factor = $downbw/100; else @@ -1122,11 +1121,10 @@ function apply_all_choosen_items() { $tmpcf['bandwidthtype'] = $config['ezshaper']['step2']["conn{$i}downloadspeed"]; } else if ($sched == "HFSC") { - $tmpcf['linkshare3'] = floatval($config['ezshaper']['step2']["conn{$i}download"]) . $config['ezshaper']['step2']["conn{$i}downloadspeed"]; $tmpcf['upperlimit'] = "on"; $tmpcf['upperlimit3'] = floatval($config['ezshaper']['step2']["conn{$i}download"]) . $config['ezshaper']['step2']["conn{$i}downloadspeed"]; - $tmpcf['linkshare2'] = 100; $tmpcf['linkshare'] = "on"; + $tmpcf['linkshare3'] = floatval($config['ezshaper']['step2']["conn{$i}download"]) . $config['ezshaper']['step2']["conn{$i}downloadspeed"]; $tmpcf['bandwidth'] = floatval($config['ezshaper']['step2']["conn{$i}download"]); $tmpcf['bandwidthtype'] = $config['ezshaper']['step2']["conn{$i}downloadspeed"]; } diff --git a/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc b/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc index 7e88216..b44a0b8 100755 --- a/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc +++ b/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc @@ -1088,7 +1088,7 @@ function apply_all_choosen_items() { $voip = true; $voipbw = $config['ezshaper']['step3']["local{$i}download"]; $voipbwunit = $config['ezshaper']['step3']["local{$i}downloadspeed"]; - if ($scehd != HFSC) { + if ($sched != HFSC) { if ($penaltybwunit == "%") $factor = $lanbw/100; else |
