lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-14 00:24:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix typo and style fixes for https://github.com/opnsense/core/pull/2222

Browse Source
This commit is contained in:
Ad Schellevis 2018-02-24 15:21:34 +01:00
parent 82c07d89ac
commit 1a415b9ea2
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/etc/inc/plugins.inc.d/ipsec.inc
View File

@ -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";
}

6
src/www/vpn_ipsec_settings.php
View File

@ -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) {
<tr>
<td><a id="help_for_auto_routes_disable" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Do not install routes"); ?></td>
<td style="width:78%" class="vtable">
<input name="auto_routes_disable" type="checkbox" id="auto_routes_disable" value="yes" <?= !empty($pconfig['auto_routes_disable']) ? "checked=\"checked\" : """;?> />
<input name="auto_routes_disable" type="checkbox" id="auto_routes_disable" value="yes" <?= !empty($pconfig['auto_routes_disable']) ? "checked=\"checked\"" : "";?> />
<strong><?=gettext("Do not automatically install routes"); ?></strong>
<output class="hidden" for="help_for_auto_routes_disable">
<?=gettext("By default, IPsec installs routes when a tunnel becomes active. " .