mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

VPN / IPsec - Remove Personalizations

Browse Source 
Remove "you" personalizations.
This commit is contained in:
NOYB 2016-04-01 00:05:47 -07:00 committed by Stephen Beaver
parent 1b2527f293
commit dbe87243ff
6 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/usr/local/www/vpn_ipsec.php
View File

@ -266,7 +266,7 @@ display_top_tabs($tab_array);
}
if (is_subsystem_dirty('ipsec')) {
print_apply_box(gettext("The IPsec tunnel configuration has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect."));
print_apply_box(gettext("The IPsec tunnel configuration has been changed.") . "<br />" . gettext("The changes must be applied for them to take effect."));
}
?>
@ -557,7 +557,7 @@ display_top_tabs($tab_array);
</form>
<div class="infoblock">
<?php print_info_box(sprintf(gettext("You can check your IPsec status at %s%s%s."), '<a href="status_ipsec.php">', gettext("Status:IPsec"), '</a>') . '<br />' .
<?php print_info_box(sprintf(gettext("The IPsec status can be checked at %s%s%s."), '<a href="status_ipsec.php">', gettext("Status:IPsec"), '</a>') . '<br />' .
sprintf(gettext("IPsec debug mode can be enabled at %s%s%s."), '<a href="vpn_ipsec_settings.php">', gettext("VPN:IPsec:Advanced Settings"), '</a>') . '<br />' .
sprintf(gettext("IPsec can be set to prefer older SAs at %s%s%s."), '<a href="vpn_ipsec_settings.php">', gettext("VPN:IPsec:Advanced Settings"), '</a>'), 'info', false); ?>
</div>

2
src/usr/local/www/vpn_ipsec_keys.php
View File

@ -112,7 +112,7 @@ if ($savemsg) {
}
if (is_subsystem_dirty('ipsec')) {
print_apply_box(gettext("The IPsec tunnel configuration has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect."));
print_apply_box(gettext("The IPsec tunnel configuration has been changed.") . "<br />" . gettext("The changes must be applied for them to take effect."));
}
$tab_array = array();

2
src/usr/local/www/vpn_ipsec_mobile.php
View File

@ -437,7 +437,7 @@ if ($savemsg) {
print_info_box($savemsg, 'success');
}
if (is_subsystem_dirty('ipsec')) {
print_apply_box(gettext("The IPsec tunnel configuration has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect."));
print_apply_box(gettext("The IPsec tunnel configuration has been changed.") . "<br />" . gettext("The changes must be applied for them to take effect."));
}
foreach ($a_phase1 as $ph1ent) {
if (isset($ph1ent['mobile'])) {

12
src/usr/local/www/vpn_ipsec_phase1.php
View File

@ -273,9 +273,9 @@ if ($_POST) {
if (!is_ipaddr($pconfig['remotegw']) && !is_domain($pconfig['remotegw'])) {
$input_errors[] = gettext("A valid remote gateway address or host name must be specified.");
} elseif (is_ipaddrv4($pconfig['remotegw']) && ($pconfig['protocol'] != "inet")) {
$input_errors[] = gettext("A valid remote gateway IPv4 address must be specified or you need to change protocol to IPv6");
$input_errors[] = gettext("A valid remote gateway IPv4 address must be specified or protocol needs to be changed to IPv6");
} elseif (is_ipaddrv6($pconfig['remotegw']) && ($pconfig['protocol'] != "inet6")) {
$input_errors[] = gettext("A valid remote gateway IPv6 address must be specified or you need to change protocol to IPv4");
$input_errors[] = gettext("A valid remote gateway IPv6 address must be specified or protocol needs to be changed to IPv4");
}
}
@ -296,11 +296,11 @@ if ($_POST) {
foreach ($a_phase2 as $phase2) {
if ($phase2['ikeid'] == $pconfig['ikeid']) {
if (($pconfig['protocol'] == "inet") && ($phase2['mode'] == "tunnel6")) {
$input_errors[] = gettext("There is a Phase 2 using IPv6, you cannot use IPv4.");
$input_errors[] = gettext("There is a Phase 2 using IPv6, cannot use IPv4.");
break;
}
if (($pconfig['protocol'] == "inet6") && ($phase2['mode'] == "tunnel")) {
$input_errors[] = gettext("There is a Phase 2 using IPv4, you cannot use IPv6.");
$input_errors[] = gettext("There is a Phase 2 using IPv4, cannot use IPv6.");
break;
}
}
@ -729,7 +729,7 @@ $section->addInput(new Form_Input(
'Description',
'text',
$pconfig['descr']
))->setHelp('You may enter a description here for your reference (not parsed).');
))->setHelp('A description may be entered here for administrative reference (not parsed).');
$form->add($section);
@ -795,7 +795,7 @@ $section->addInput(new Form_Input(
'Pre-Shared Key',
'text',
$pconfig['pskey']
))->setHelp('Enter your Pre-Shared Key string.');
))->setHelp('Enter the Pre-Shared Key string.');
$section->addInput(new Form_Select(
'certref',

18
src/usr/local/www/vpn_ipsec_phase2.php
View File

@ -187,9 +187,9 @@ if ($_POST) {
if (!$pconfig['localid_address'] || !is_ipaddr($pconfig['localid_address'])) {
$input_errors[] = gettext("A valid local network IP address must be specified.");
} elseif (is_ipaddrv4($pconfig['localid_address']) && ($pconfig['mode'] != "tunnel")) {
$input_errors[] = gettext("A valid local network IPv4 address must be specified or you need to change Mode to IPv6");
$input_errors[] = gettext("A valid local network IPv4 address must be specified or Mode needs to be changed to IPv6");
} elseif (is_ipaddrv6($pconfig['localid_address']) && ($pconfig['mode'] != "tunnel6")) {
$input_errors[] = gettext("A valid local network IPv6 address must be specified or you need to change Mode to IPv4");
$input_errors[] = gettext("A valid local network IPv6 address must be specified or Mode needs to be changed to IPv4");
}
break;
}
@ -211,15 +211,15 @@ if ($_POST) {
$input_errors[] = gettext("A valid NAT local network bit count must be specified.");
}
if ($pconfig['localid_type'] == "address") {
$input_errors[] = gettext("You cannot configure a network type address for NAT while only an address type is selected for local source.");
$input_errors[] = gettext("A network type address cannot be configured for NAT while only an address type is selected for local source.");
}
case "address":
if (!empty($pconfig['natlocalid_address']) && !is_ipaddr($pconfig['natlocalid_address'])) {
$input_errors[] = gettext("A valid NAT local network IP address must be specified.");
} elseif (is_ipaddrv4($pconfig['natlocalid_address']) && ($pconfig['mode'] != "tunnel")) {
$input_errors[] = gettext("A valid NAT local network IPv4 address must be specified or you need to change Mode to IPv6");
$input_errors[] = gettext("A valid NAT local network IPv4 address must be specified or Mode needs to be changed to IPv6");
} elseif (is_ipaddrv6($pconfig['natlocalid_address']) && ($pconfig['mode'] != "tunnel6")) {
$input_errors[] = gettext("A valid NAT local network IPv6 address must be specified or you need to change Mode to IPv4");
$input_errors[] = gettext("A valid NAT local network IPv6 address must be specified or Mode needs to be changed to IPv4");
}
break;
}
@ -244,9 +244,9 @@ if ($_POST) {
if (!$pconfig['remoteid_address'] || !is_ipaddr($pconfig['remoteid_address'])) {
$input_errors[] = gettext("A valid remote network IP address must be specified.");
} elseif (is_ipaddrv4($pconfig['remoteid_address']) && ($pconfig['mode'] != "tunnel")) {
$input_errors[] = gettext("A valid remote network IPv4 address must be specified or you need to change Mode to IPv6");
$input_errors[] = gettext("A valid remote network IPv4 address must be specified or Mode needs to be changed to IPv6");
} elseif (is_ipaddrv6($pconfig['remoteid_address']) && ($pconfig['mode'] != "tunnel6")) {
$input_errors[] = gettext("A valid remote network IPv6 address must be specified or you need to change Mode to IPv4");
$input_errors[] = gettext("A valid remote network IPv6 address must be specified or Mode needs to be changed to IPv4");
}
break;
}
@ -619,7 +619,7 @@ $section->addInput(new Form_Input(
'Description',
'text',
$pconfig['descr']
))->setHelp('You may enter a description here for your reference (not parsed).');
))->setHelp('A description may be entered here for administrative reference (not parsed).');
$form->add($section);
@ -667,7 +667,7 @@ foreach ($p2_ealgos as $algo => $algodata) {
if ($i == $rows) {
$group->setHelp('Use 3DES for best compatibility or if you have a hardware crypto accelerator card. Blowfish is usually the fastest in software encryption.');
$group->setHelp('Use 3DES for best compatibility or for a hardware crypto accelerator card. Blowfish is usually the fastest in software encryption.');
}
$i++;

2
src/usr/local/www/vpn_ipsec_settings.php
View File

@ -328,7 +328,7 @@ $section->addInput(new Form_Checkbox(
'Some implementations send the third Main Mode message unencrypted, probably to find the PSKs for the specified ID for authentication.' .
'This is very similar to Aggressive Mode, and has the same security implications: ' .
'A passive attacker can sniff the negotiated Identity, and start brute forcing the PSK using the HASH payload.' .
'It is recommended to keep this option to no, unless you know exactly what the implications are and require compatibility to such devices (for example, some SonicWall boxes).'
'It is recommended to keep this option to no, unless the exact implications are known and compatibility is required for such devices (for example, some SonicWall boxes).'
);
$section->addInput(new Form_Checkbox(