From 0a9e6c85f05b1027156618a9ccf1e1b12f31683e Mon Sep 17 00:00:00 2001 From: Chris Buechler Date: Sat, 4 Apr 2015 19:50:04 -0500 Subject: Fix up Ticket #4504 implementation. Match config style with other areas. Use a config setting to disable, rather than enable, this functionality since it's enabled by default so the tag isn't necessary in the default config. Remove now unnecessary config upgrade code. --- usr/local/www/vpn_ipsec_settings.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'usr') diff --git a/usr/local/www/vpn_ipsec_settings.php b/usr/local/www/vpn_ipsec_settings.php index 6c63722..7c21817 100644 --- a/usr/local/www/vpn_ipsec_settings.php +++ b/usr/local/www/vpn_ipsec_settings.php @@ -46,7 +46,7 @@ foreach ($ipsec_loglevels as $lkey => $ldescr) { $pconfig["ipsec_{$lkey}"] = $config['ipsec']["ipsec_{$lkey}"]; } $pconfig['unityplugin'] = isset($config['ipsec']['unityplugin']); -$pconfig['shuntlaninterfaces'] = isset($config['ipsec']['shuntlaninterfaces']); +$pconfig['noshuntlaninterfaces'] = isset($config['ipsec']['noshuntlaninterfaces']); $pconfig['compression'] = isset($config['ipsec']['compression']); $pconfig['enableinterfacesuse'] = isset($config['ipsec']['enableinterfacesuse']); $pconfig['acceptunencryptedmainmode'] = isset($config['ipsec']['acceptunencryptedmainmode']); @@ -156,10 +156,10 @@ if ($_POST) { unset($config['ipsec']['unityplugin']); } - if($_POST['shuntlaninterfaces'] == "yes") { - $config['ipsec']['shuntlaninterfaces'] = true; - } elseif (isset($config['ipsec']['shuntlaninterfaces'])) { - unset($config['ipsec']['shuntlaninterfaces']); + if($_POST['noshuntlaninterfaces'] == "yes") { + $config['ipsec']['noshuntlaninterfaces'] = true; + } elseif (isset($config['ipsec']['noshuntlaninterfaces'])) { + unset($config['ipsec']['noshuntlaninterfaces']); } if($_POST['acceptunencryptedmainmode'] == "yes") { @@ -356,12 +356,12 @@ function maxmss_checked(obj) { - + - /> - + /> +
- + -- cgit v1.1