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

Merge pull request #2830 from NOYB/Diagnostics_-_Remove_Personalizations

Browse Source 
(cherry picked from commit 235d9db9da)
This commit is contained in:
Stephen Beaver 2016-04-04 09:54:08 -04:00
parent 09cacd561f
commit ce87161946
8 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/usr/local/www/diag_backup.php
View File

@ -226,7 +226,7 @@ if ($_POST) {
if ($mode == "download") {
if ($_POST['encrypt']) {
if (!$_POST['encrypt_password']) {
$input_errors[] = gettext("You must supply and confirm the password for encryption.");
$input_errors[] = gettext("A password for decryption must be supplied and confirmed.");
}
}
@ -301,7 +301,7 @@ if ($_POST) {
if ($mode == "restore") {
if ($_POST['decrypt']) {
if (!$_POST['decrypt_password']) {
$input_errors[] = gettext("You must supply and confirm the password for decryption.");
$input_errors[] = gettext("A password for encryption must be supplied and confirmed.");
}
}
@ -332,10 +332,10 @@ if ($_POST) {
if ($_POST['restorearea']) {
/* restore a specific area of the configuration */
if (!stristr($data, "<" . $_POST['restorearea'] . ">")) {
$input_errors[] = gettext("You have selected to restore an area but we could not locate the correct xml tag.");
$input_errors[] = gettext("An area to restore was selected but the correct xml tag could not be located.");
} else {
if (!restore_config_section($_POST['restorearea'], $data)) {
$input_errors[] = gettext("You have selected to restore an area but we could not locate the correct xml tag.");
$input_errors[] = gettext("An area to restore was selected but the correct xml tag could not be located.");
} else {
if ($config['rrddata']) {
restore_rrddata();
@ -347,12 +347,12 @@ if ($_POST) {
conf_mount_ro();
}
filter_configure();
$savemsg = gettext("The configuration area has been restored. You may need to reboot the firewall.");
$savemsg = gettext("The configuration area has been restored. The firewall may need to be rebooted.");
}
}
} else {
if (!stristr($data, "<" . $g['xml_rootobj'] . ">")) {
$input_errors[] = sprintf(gettext("You have selected to restore the full configuration but we could not locate a %s tag."), $g['xml_rootobj']);
$input_errors[] = sprintf(gettext("A full configuration restore was selected but a %s tag could not be located."), $g['xml_rootobj']);
} else {
/* restore the entire configuration */
file_put_contents($_FILES['conffile']['tmp_name'], $data);
@ -529,7 +529,7 @@ if ($_POST) {
clear_subsystem_dirty('packagelock');
$savemsg = "Package lock cleared.";
} else if ($mode == "restore_ver") {
$input_errors[] = gettext("XXX - this feature may hose your config (do NOT backrev configs!) - billm");
$input_errors[] = gettext("XXX - this feature may hose the config (do NOT backrev configs!) - billm");
if ($ver2restore <> "") {
$conf_file = "{$g['cf_conf_path']}/bak/config-" . strtotime($ver2restore) . ".xml";
if (config_install($conf_file) == 0) {

6
src/usr/local/www/diag_defaults.php
View File

@ -75,7 +75,7 @@ include("head.inc");
?>
<?php if ($_POST['Submit'] == " " . gettext("Yes") . " "):
print_info_box(gettext("The system has been reset to factory defaults and is now rebooting. This may take a few minutes, depending on your hardware."))?>
print_info_box(gettext("The system has been reset to factory defaults and is now rebooting. This may take a few minutes, depending on the hardware."))?>
<pre>
<?php
reset_factory_defaults();
@ -85,12 +85,12 @@ include("head.inc");
<?php else:?>
<div class="panel panel-default">
<div class="panel-heading">
<h2 class="panel-title"><?=gettext("Are you sure you want to reset the system to the factory defaults?")?></h2>
<h2 class="panel-title"><?=gettext("Factory Defaults Reset")?></h2>
</div>
<div class="panel-body">
<div class="content">
<form action="diag_defaults.php" method="post">
<p><strong><?=sprintf(gettext('If you click %1$sYes%1$s the firewall will:'), "&quot;")?></strong></p>
<p><strong><?=sprintf(gettext('Resetting the system to factory defaults will remove all user configuration and apply the following settings:'), "&quot;")?></strong></p>
<ul>
<li><?=gettext("Reset to factory defaults")?></li>
<li><?=gettext("LAN IP address will be reset to 192.168.1.1")?></li>

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

@ -93,11 +93,11 @@ if ($_POST) {
$input_errors = "";
if (($_POST['action'] != "clear") && !is_valid_mirror($_POST['mirror'])) {
$input_errors[] = gettext("You must supply a valid mirror name.");
$input_errors[] = gettext("A valid mirror name must be supplied.");
}
if (!empty($_POST['consumer']) && !is_valid_consumer($_POST['consumer'])) {
$input_errors[] = gettext("You must supply a valid consumer name");
$input_errors[] = gettext("A valid consumer name must be supplied");
}
/* Additional action-specific validation that hasn't already been tested */

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

@ -100,7 +100,7 @@ if ($_POST['destslice'] && $_POST['duplicateslice']) {
$statusmsg = gettext("Duplicating slice. Please wait, this will take a moment...");
if (!DEBUG && nanobsd_clone_slice($_POST['destslice'])) {
$savemsg = gettext("The slice has been duplicated.") . "<p/>" . gettext("If you would like to boot from this newly duplicated slice please set it using the bootup information area.");
$savemsg = gettext("The slice has been duplicated.") . "<p/>" . gettext("To boot from this newly duplicated slice set it using the bootup information area.");
$class = 'alert-success';
} else {
$savemsg = gettext("There was an error while duplicating the slice. Operation aborted.");
@ -242,7 +242,7 @@ $dupbtn->addClass('btn-success btn-sm');
$section->addInput(new Form_StaticText(
'Duplicate boot slice',
$dupbtn
))->setHelp('This will duplicate the bootup slice to the alternate slice. Use this if you would like to duplicate the known good working boot partition to the alternate.');
))->setHelp('This will duplicate the bootup slice to the alternate slice. Use this to duplicate the known good working boot partition to the alternate.');
$section->addInput(new Form_StaticText(
'RRD/DHCP Backup',

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

@ -337,7 +337,7 @@ $section->addInput(new Form_Input(
))->setHelp('This value is either the Source or Destination IP address or subnet in CIDR notation. The packet capture will look for this address in either field.' . '<br />' .
'Matching can be negated by preceding the value with "!". Multiple IP addresses or CIDR subnets may be specified. Comma (",") separated values perform a boolean "AND". ' .
'Separating with a pipe ("|") performs a boolean "OR".' . '<br />' .
'If you leave this field blank, all packets on the specified interface will be captured.');
'If this field is left blank, all packets on the specified interface will be captured.');
$section->addInput(new Form_Input(
'port',
@ -345,7 +345,7 @@ $section->addInput(new Form_Input(
'text',
$port
))->setHelp('The port can be either the source or destination port. The packet capture will look for this port in either field. ' .
'Leave blank if you do not want to filter by port.');
'Leave blank if not filtering by port.');
$section->addInput(new Form_Input(
'snaplen',

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

@ -101,7 +101,7 @@ $statetablehelp = sprintf(gettext('Resetting the state tables will remove all en
'will be broken and will have to be re-established. This may be necessary after making substantial changes to the ' .
'firewall and/or NAT rules, especially if there are IP protocol mappings (e.g. for PPTP or IPv6) with open connections.%s' .
'The firewall will normally leave the state tables intact when changing rules.%s' .
'%sNOTE:%s If you reset the firewall state table, the browser session may appear to be hung after clicking &quot;Reset&quot;. ' .
'%sNOTE:%s Resetting the firewall state table, may cause the browser session to appear hung after clicking &quot;Reset&quot;. ' .
'Simply refresh the page to continue.'), "<br /><br />", "<br /><br />", "<strong>", "</strong>");
$sourcetablehelp = sprintf(gettext('Resetting the source tracking table will remove all source/destination associations. ' .

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

@ -114,7 +114,7 @@ $section->addInput(new Form_Checkbox(
'Enable',
$resolve
))->setHelp('Enabling name resolution may cause the query to take longer.'.
' You can stop it at any time by clicking the Stop button in your browser.');
' It can be stopped at any time by clicking the Stop button in the browser.');
$validLimits = array('10', '50', '100', '200', '500', '1000', 'all');
$section->addInput(new Form_Select(

10
src/usr/local/www/diag_testport.php
View File

@ -98,10 +98,10 @@ if ($_POST || $_REQUEST['host']) {
}
if (is_ipaddrv4($_REQUEST['host']) && ($_REQUEST['ipprotocol'] == "ipv6")) {
$input_errors[] = gettext("You cannot connect to an IPv4 address using IPv6.");
$input_errors[] = gettext("Cannot connect to an IPv4 address using IPv6.");
}
if (is_ipaddrv6($_REQUEST['host']) && ($_REQUEST['ipprotocol'] == "ipv4")) {
$input_errors[] = gettext("You cannot connect to an IPv6 address using IPv4.");
$input_errors[] = gettext("Cannot connect to an IPv6 address using IPv4.");
}
if (!$input_errors) {
@ -241,7 +241,7 @@ if ($input_errors) {
}
} else {
// First time, new page
print_info_box(gettext('This page allows you to perform a simple TCP connection test to determine if a host is up and accepting connections on a given port.') . " " .
print_info_box(gettext('This page performs a simple TCP connection test to determine if a host is up and accepting connections on a given port.') . " " .
gettext('This test does not function for UDP since there is no way to reliably determine if a UDP port accepts connections in this manner.'), 'warning', false);
}
@ -292,8 +292,8 @@ $section->addInput(new Form_Select(
'IP Protocol',
$ipprotocol,
array('ipv4' => 'IPv4', 'ipv6' => 'IPv6')
))->setHelp("If you force IPv4 or IPv6 and use a hostname that does not contain a result using that protocol, it will result in an error." .
" For example if you force IPv4 and use a hostname that only returns an AAAA IPv6 IP address, it will not work.");
))->setHelp("If IPv4 or IPv6 is forced and a hostname is used that does not contain a result using that protocol, it will result in an error." .
" For example if IPv4 is forced and a hostname is used that only returns an AAAA IPv6 IP address, it will not work.");
$form->add($section);