diff --git a/src/etc/inc/plugins.inc.d/ipsec.inc b/src/etc/inc/plugins.inc.d/ipsec.inc index 126136334..60c15add7 100644 --- a/src/etc/inc/plugins.inc.d/ipsec.inc +++ b/src/etc/inc/plugins.inc.d/ipsec.inc @@ -880,9 +880,7 @@ function ipsec_configure_do($verbose = false, $interface = '') $cnf_add_to_charon_section = ""; $cnf_add_to_charon_section .= $aggressive_psk ? "\ti_dont_care_about_security_and_use_aggressive_mode_psk=yes\n":""; - if(isset($config['ipsec']['auto_routes_disable'])) { - $cnf_add_to_charon_section .= "\tinstall_routes = no\n"; - } + $cnf_add_to_charon_section .= !empty($config['ipsec']['auto_routes_disable']) ? "\tinstall_routes = no\n" : ""; if (isset($a_client['enable']) && isset($a_client['net_list'])) { $cnf_add_to_charon_section .= "\tcisco_unity = yes\n"; } diff --git a/src/www/vpn_ipsec_settings.php b/src/www/vpn_ipsec_settings.php index e188b0bd0..eee6b9201 100644 --- a/src/www/vpn_ipsec_settings.php +++ b/src/www/vpn_ipsec_settings.php @@ -40,7 +40,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { $pconfig = array(); $pconfig['disablevpnrules'] = isset($config['system']['disablevpnrules']); $pconfig['preferoldsa_enable'] = isset($config['ipsec']['preferoldsa']); - $pconfig['auto_routes_disable'] = isset($config['ipsec']['auto_routes_disable']); + $pconfig['auto_routes_disable'] = isset($config['ipsec']['auto_routes_disable']); if (!empty($config['ipsec']['passthrough_networks'])) { $pconfig['passthrough_networks'] = explode(',', $config['ipsec']['passthrough_networks']); } else { @@ -96,7 +96,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { } elseif (isset($config['ipsec']['passthrough_networks'])) { unset($config['ipsec']['passthrough_networks']); } - if (isset($pconfig['auto_routes_disable']) && $pconfig['auto_routes_disable'] == "yes") { + if (!empty($pconfig['auto_routes_disable'])) { $config['ipsec']['auto_routes_disable'] = true; } elseif (isset($config['ipsec']['auto_routes_disable'])) { unset($config['ipsec']['auto_routes_disable']); @@ -190,7 +190,7 @@ if (isset($input_errors) && count($input_errors) > 0) { - /> + />