summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErmal LUÇI <eri@pfsense.org>2015-03-10 21:46:53 +0100
committerErmal LUÇI <eri@pfsense.org>2015-03-10 21:46:53 +0100
commitea7ad4c25fcc2cf341b7ffbf478588b54d0248f6 (patch)
tree693e119084586061f111828442793fb1d6f4df5f
parentd3fa306d0a0e58d953957f577e5f8974c5fa05d9 (diff)
downloadpfsense-ea7ad4c25fcc2cf341b7ffbf478588b54d0248f6.zip
pfsense-ea7ad4c25fcc2cf341b7ffbf478588b54d0248f6.tar.gz
Fixes #4427 Correct traffic shaper wizard to properly save and use Voip provided settings
-rw-r--r--usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc8
1 files changed, 6 insertions, 2 deletions
diff --git a/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc b/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc
index 7a4104e..de6ec5d 100644
--- a/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc
+++ b/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc
@@ -489,8 +489,8 @@ function step3_stepsubmitphpaction() {
if (!$_POST['enable'])
return;
- if($_POST['address']) {
- if(!is_ipaddroralias($_POST['address'])) {
+ if($_POST['upstream_sip_server']) {
+ if(!is_ipaddroralias($_POST['upstream_sip_server'])) {
/* item is not an ip or alias. error out */
$savemsg=gettext("Address must be a valid IP address or Firewall Alias. Please correct this value to continue.");
$stepid--;
@@ -555,6 +555,10 @@ function step3_stepsubmitphpaction() {
unset($config['ezshaper']['step3']);
$config['ezshaper']['step3'] = array();
+ if (!empty($_POST['upstream_sip_server']))
+ $config['ezshaper']['step3']['address'] = $_POST['upstream_sip_server'];
+ if ($_POST['enable'] == 'on')
+ $config['ezshaper']['step3']['enable'] = 'on';
for ($i = 0; $i < $steps; $i++) {
$config['ezshaper']['step3']["local{$i}download"] = $_POST["local{$i}download"];
$config['ezshaper']['step3']["local{$i}downloadspeed"] = $_POST["local{$i}downloadspeed"];
OpenPOWER on IntegriCloud