diff options
| author | Ermal LUÇI <eri@pfsense.org> | 2015-04-03 17:16:15 +0200 |
|---|---|---|
| committer | Ermal LUÇI <eri@pfsense.org> | 2015-04-03 17:17:08 +0200 |
| commit | ebb9469d4e7ccb1986a4c17f1cdb44caf6bb6ad8 (patch) | |
| tree | a328472e3271eb9be8126e2f77be0185da437809 /usr/local/www/wizards | |
| parent | 8b760d4bb3fb03a3de7f34ea3dc52e304d7993ed (diff) | |
| download | pfsense-ebb9469d4e7ccb1986a4c17f1cdb44caf6bb6ad8.zip pfsense-ebb9469d4e7ccb1986a4c17f1cdb44caf6bb6ad8.tar.gz | |
Fixes #4259 Use proper variable to do calculations
Diffstat (limited to 'usr/local/www/wizards')
| -rw-r--r-- | usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc | 6 | ||||
| -rw-r--r-- | usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc b/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc index b2f5ed9..d984fed 100644 --- a/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc +++ b/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc @@ -1097,10 +1097,10 @@ function apply_all_chosen_items() { $voipbw = $config['ezshaper']['step3']["local{$i}download"]; $voipbwunit = $config['ezshaper']['step3']["local{$i}downloadspeed"]; if ($sched != HFSC) { - if ($penaltybwunit == "%") + if ($voipbwunit == "%") $factor = $downbw/100; else - $factor = wizard_get_bandwidthtype_scale($voipbwunit); + $factor = wizard_get_bandwidthtype_scale($voipbwunit); $remainbw += floatval($voipbw) * $factor; } else $remainbw += 32000; /* 32Kbit/s reserved for HFSC link sharing */ @@ -1151,7 +1151,7 @@ function apply_all_chosen_items() { } $remainbw = round($remainbw / $downbw * 100, 2); if (intval($remainbw) > 0 && intval($remainbw) > 40) { - $savemsg=gettext("Custom Bandwidths are greater than 30%. Please lower them for the wizard to continue."); + $savemsg=gettext("Custom Bandwidths are greater than 40%. Please lower them for the wizard to continue."); header("Location: wizard.php?xml=traffic_shaper_wizard_dedicated.xml&stepid=2&message={$savemsg}"); exit; } else { 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 b16d897..5bb3ca5 100644 --- a/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc +++ b/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc @@ -1159,7 +1159,7 @@ function apply_all_chosen_items() { $voipbw = $config['ezshaper']['step3']["local{$i}download"]; $voipbwunit = $config['ezshaper']['step3']["local{$i}downloadspeed"]; if ($sched != HFSC) { - if ($penaltybwunit == "%") + if ($voipbwunit == "%") $factor = $lanbw/100; else $factor = wizard_get_bandwidthtype_scale($voipbwunit); @@ -1214,7 +1214,7 @@ function apply_all_chosen_items() { $remainbw = round($remainbw / $lanbw * 100, 2); if (intval($remainbw) > 0 && intval($remainbw) > 40) { - $savemsg=gettext("Custom Bandwidths are greater than 30%. Please lower them for the wizard to continue."); + $savemsg=gettext("Custom Bandwidths are greater than 40%. Please lower them for the wizard to continue."); header("Location: wizard.php?xml=traffic_shaper_wizard_multi_all.xml&stepid=2&message={$savemsg}"); exit; } else { |
