summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorErmal LUÇI <eri@pfsense.org>2015-03-10 21:45:03 +0100
committerErmal LUÇI <eri@pfsense.org>2015-03-10 21:45:03 +0100
commit0a0978d78fffde2f9b020b6f687e4fdfee60acd2 (patch)
treeb3d7f4618edcc38ab7e8055fe82d90fbc6b9633f /usr
parent6127c541cc84fab64acc6a447905b11517725086 (diff)
downloadpfsense-0a0978d78fffde2f9b020b6f687e4fdfee60acd2.zip
pfsense-0a0978d78fffde2f9b020b6f687e4fdfee60acd2.tar.gz
Fixes #4427 Correct traffic shaper wizard to properly save and use Voip provided settings
Diffstat (limited to 'usr')
-rw-r--r--usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc8
1 files changed, 6 insertions, 2 deletions
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 9fc4f08..b16d897 100644
--- a/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc
+++ b/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc
@@ -532,8 +532,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--;
@@ -603,6 +603,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 < $localint; $i++) {
$config['ezshaper']['step3']["local{$i}download"] = $_POST["local{$i}download"];
$config['ezshaper']['step3']["local{$i}downloadspeed"] = $_POST["local{$i}downloadspeed"];
OpenPOWER on IntegriCloud