diff options
| author | Phil Davis <phil.davis@inf.org> | 2015-09-23 13:04:29 +0545 |
|---|---|---|
| committer | Stephen Beaver <sbeaver@netgate.com> | 2015-09-24 10:05:29 -0400 |
| commit | f1e89d805a361a784e6a315073cf1bf6c43c643d (patch) | |
| tree | 5ef52879c71135eaa65752c5d01133ccc64b8154 | |
| parent | 83b48b440146be346e0b05ab6e42d82dc31b34c8 (diff) | |
| download | pfsense-f1e89d805a361a784e6a315073cf1bf6c43c643d.zip pfsense-f1e89d805a361a784e6a315073cf1bf6c43c643d.tar.gz | |
Clarify the use of noshuntlaninterfaces and autoexcludelanaddress
The existing code here looks like it should be working correctly. Maybe it would help future maintainers if the field name used for gathering the data value in the UI and $POSTing it is changed to autoexcludelanaddress. Then the code reads a bit more easily where the logic value of noshuntlaninterfaces and autoexcludelanaddress is swapped back and forth.
| -rw-r--r-- | src/usr/local/www/vpn_ipsec_settings.php | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/usr/local/www/vpn_ipsec_settings.php b/src/usr/local/www/vpn_ipsec_settings.php index 28440cb..ecacb20 100644 --- a/src/usr/local/www/vpn_ipsec_settings.php +++ b/src/usr/local/www/vpn_ipsec_settings.php @@ -202,7 +202,9 @@ if ($_POST) { unset($config['ipsec']['makebeforebreak']); } - if ($_POST['noshuntlaninterfaces'] == "yes") { + // The UI deals with "Auto-exclude LAN address" but in the back-end we work with + // noshuntlaninterfaces which is the reverse true/false logic setting - #4655 + if ($_POST['autoexcludelanaddress'] == "yes") { if (isset($config['ipsec']['noshuntlaninterfaces'])) { unset($config['ipsec']['noshuntlaninterfaces']); } @@ -255,9 +257,11 @@ if ($_POST) { return; } - // The logic value sent by $POST is opposite to the way it is stored in the config. + // The logic value sent by $POST for autoexcludelanaddress is opposite to + // the way it is stored in the config as noshuntlaninterfaces. // Reset the $pconfig value so it reflects the opposite of what was $POSTed. - if ($_POST['noshuntlaninterfaces'] == "yes") { + // This helps a redrawn UI page after Save to correctly display the most recently entered setting. + if ($_POST['autoexcludelanaddress'] == "yes") { $pconfig['noshuntlaninterfaces'] = false; } else { $pconfig['noshuntlaninterfaces'] = true; @@ -411,7 +415,7 @@ $section->addInput(new Form_Checkbox( 'during reauthentication, but requires support for overlapping SAs by the peer'); $section->addInput(new Form_Checkbox( - 'noshuntlaninterfaces', + 'autoexcludelanaddress', 'Auto-exclude LAN address', 'Enable bypass for LAN interface IP', !$pconfig['noshuntlaninterfaces'] @@ -423,4 +427,4 @@ print $form; ?> -<?php include("foot.inc"); ?>
\ No newline at end of file +<?php include("foot.inc"); ?> |
