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 #2853 from NOYB/Miscellaneous_II_-_Remove_Personalizations

Browse Source
This commit is contained in:
Stephen Beaver 2016-04-11 08:15:06 -04:00
commit c76c5c252a
9 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/etc/inc/authgui.inc
View File

@ -262,7 +262,7 @@ if (isset($config['system']['webgui']['webguicss'])) {
<?php
if (is_ipaddr($http_host) && !$local_ip && !isset($config['system']['webgui']['nohttpreferercheck'])) {
$nifty_background = "#999";
print_info_box(gettext("You are accessing this router by an IP address not configured locally, which may be forwarded by NAT or other means. <br /><br />If you did not setup this forwarding, you may be the target of a man-in-the-middle attack."));
print_info_box(gettext("The IP address being used to access this router is not configured locally, which may be forwarded by NAT or other means. <br /><br />If this forwarding is unexpected, it should be verified that a man-in-the-middle attack is not taking place."));
}
$loginautocomplete = isset($config['system']['webgui']['loginautocomplete']) ? '' : 'autocomplete="off"';
@ -277,7 +277,7 @@ if (isset($config['system']['webgui']['webguicss'])) {
<?php if (!empty($_SESSION['Login_Error'])): ?>
<div class="alert alert-danger" role="alert"><?=$_SESSION['Login_Error'];?></div>
<?php endif ?>
<div class="alert alert-warning hidden" id="no_cookies"><?= gettext("Your browser must support cookies to login."); ?></div>
<div class="alert alert-warning hidden" id="no_cookies"><?= gettext("The browser must support cookies to login."); ?></div>
<form method="post" <?= $loginautocomplete ?> action="<?=$_SERVER['SCRIPT_NAME'];?>" class="form-horizontal">
<div class="form-group">

25
src/etc/inc/config.console.inc
View File

@ -125,7 +125,7 @@ EOD;
"If VLANs will not be used, or only for optional interfaces, it is typical to\n" .
"say no here and use the webConfigurator to configure VLANs later, if required.") .
"\n";
echo "\n" . gettext("Do you want to set up VLANs now [y|n]?") . " ";
echo "\n" . gettext("Should VLANs be set up now [y|n]?") . " ";
if ($auto_assign) {
$key = timeout();
@ -139,15 +139,14 @@ EOD;
!!! Auto Assigning Interfaces !!!
For installation purposes, you must plug in at least one NIC
for the LAN connection. If you plug in a second NIC it will be
assigned to WAN. Otherwise, WAN will be temporarily assigned to the
next available NIC found regardless of activity. You should
assign and configure the WAN interface according to your requirements
For setup purposes, there must be at least one NIC connected for
the LAN. If a second NIC is connected, it will be assigned to the
WAN. Otherwise, WAN will be temporarily assigned to the next
available NIC found regardless of activity. The WAN interface
should then be assigned and configured as required.
If you haven't plugged in any network cables yet,
now is the time to do so.
The system will keep trying until you do.
Please make the pfSense NIC connections now.
The system will continue checking until they have been made.
Searching for active interfaces...
@ -213,9 +212,9 @@ EOD;
echo <<<EOD
If you do not know the names of the interfaces, you may choose to use
auto-detection. In that case, disconnect all interfaces now before
hitting 'a' to initiate auto detection.
If the names of the interfaces are not known, auto-detection can
be used instead. To use auto-detection, please disconnect all
interfaces before pressing 'a' to begin the process.
EOD;
@ -477,7 +476,7 @@ EOD;
return;
}
echo gettext("One moment while we reload the settings...");
echo gettext("One moment while the settings are reloading...");
echo gettext(" done!") . "\n";
touch("{$g['tmp_path']}/assign_complete");

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

@ -292,7 +292,7 @@ if (is_array($confvers)):
<td><?= format_bytes($version['filesize']) ?></td>
<td><?= htmlspecialchars($version['description']) ?></td>
<td>
<a class="fa fa-undo" title="<?=gettext('Revert config')?>" href="diag_confbak.php?newver=<?=$version['time']?>" onclick="return confirm('<?=gettext("Are you sure you want to replace the current configuration with this backup?")?>')"></a>
<a class="fa fa-undo" title="<?=gettext('Revert config')?>" href="diag_confbak.php?newver=<?=$version['time']?>" onclick="return confirm('<?=gettext("Confirmation Required to replace the current configuration with this backup.")?>')"></a>
<a class="fa fa-download" title="<?=gettext('Download config')?>" href="diag_confbak.php?getcfg=<?=$version['time']?>"></a>
<a class="fa fa-trash" title="<?=gettext('Delete config')?>" href="diag_confbak.php?rmver=<?=$version['time']?>"></a>
</td>

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

@ -96,7 +96,7 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
<div class="panel panel-default">
<div class="panel-heading">
<h2 class="panel-title"><?=gettext('Are you sure you want to halt the system?')?></h2>
<h2 class="panel-title"><?=gettext('System Halt Confirmation')?></h2>
</div>
<div class="panel-body">
<div class="content">

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

@ -137,7 +137,7 @@ events.push(function() {
<div class="panel panel-default">
<div class="panel-heading">
<h2 class="panel-title"><?=gettext('Are you sure you want to reboot the system?')?></h2>
<h2 class="panel-title"><?=gettext('System Reboot Confirmation')?></h2>
</div>
<div class="panel-body">
<div class="content">

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

@ -292,7 +292,7 @@ events.push(function() {
function save_changes_to_xml(xml) {
var ids = $('#mainarea table tbody').sortable('serialize', {key:"ids[]"});
var strloading="<?=gettext('Saving changes...')?>";
if (confirm("<?=gettext("Do you really want to save changes?")?>")) {
if (confirm("<?=gettext("Confirmation Required to save changes.")?>")) {
$.ajax({
type: 'get',
cache: false,

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

@ -275,14 +275,14 @@ if ($input_errors) {
switch ($pkgmode) {
case 'reinstallpkg':
$pkgtxt = sprintf(gettext('Are you sure you want to reinstall package %s?'), $pkgname);
$pkgtxt = sprintf(gettext('Confirmation Required to reinstall package %s.'), $pkgname);
break;
case 'delete':
$pkgtxt = sprintf(gettext('Are you sure you want to remove package %s?'), $pkgname);
$pkgtxt = sprintf(gettext('Confirmation Required to remove package %s.'), $pkgname);
break;
case 'installed':
default:
$pkgtxt = sprintf(gettext('Are you sure you want to install package %s?'), $pkgname);
$pkgtxt = sprintf(gettext('Confirmation Required to install package %s.'), $pkgname);
break;
}
?>
@ -292,15 +292,15 @@ if ($input_errors) {
<?php
if ($pkgmode == 'reinstallall') {
?>
<?=gettext("Are you sure you want to reinstall all packages?");?>
<?=gettext("Confirmation Required to reinstall all packages.");?>
<?php
} else if ($_GET['from'] && $_GET['to']) {
?>
<?=sprintf(gettext('Are you sure you want to upgrade package %1$s from %2$s to %3$s?'), $pkgname, $_GET['from'], $_GET['to'])?>
<?=sprintf(gettext('Confirmation Required to upgrade package %1$s from %2$s to %3$s.'), $pkgname, $_GET['from'], $_GET['to'])?>
<?php
} else if ($firmwareupdate) {
?>
<?=sprintf(gettext('Are you sure you want to update %s system?'), $g['product_name'])?>
<?=sprintf(gettext('Confirmation Required to update %s system.'), $g['product_name'])?>
<?php
} else {
?>

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

@ -266,7 +266,7 @@ if (!$rawfilter) {
<i class="fa fa-info icon-pointer icon-primary" onclick="javascript:resolve_with_ajax('<?="{$filterent['srcip']}"; ?>');" title="<?=gettext("Click to resolve")?>">
</i>
<a class="fa fa-minus-square-o icon-pointer icon-primary" href="easyrule.php?<?="action=block&amp;int={$int}&amp;src={$filterent['srcip']}&amp;ipproto={$ipproto}"; ?>" title="<?=gettext("Easy Rule: Add to Block List")?>" onclick="return confirm('<?=gettext("Do you really want to add this BLOCK rule?")?>')">
<a class="fa fa-minus-square-o icon-pointer icon-primary" href="easyrule.php?<?="action=block&amp;int={$int}&amp;src={$filterent['srcip']}&amp;ipproto={$ipproto}"; ?>" title="<?=gettext("Easy Rule: Add to Block List")?>" onclick="return confirm('<?=gettext("Confirmation required to add this BLOCK rule.")?>')">
</a>
<?=$srcstr . '<span class="RESOLVE-' . $src_htmlclass . '"></span>'?>
@ -275,7 +275,7 @@ if (!$rawfilter) {
<i class="fa fa-info icon-pointer icon-primary; ICON-<?= $dst_htmlclass; ?>" onclick="javascript:resolve_with_ajax('<?="{$filterent['dstip']}"; ?>');" title="<?=gettext("Click to resolve")?>">
</i>
<a class="fa fa-plus-square-o icon-pointer icon-primary" href="easyrule.php?<?="action=pass&amp;int={$int}&amp;proto={$proto}&amp;src={$filterent['srcip']}&amp;dst={$filterent['dstip']}&amp;dstport={$filterent['dstport']}&amp;ipproto={$ipproto}"; ?>" title="<?=gettext("Easy Rule: Pass this traffic")?>" onclick="return confirm('<?=gettext("Do you really want to add this PASS rule?")?>')">
<a class="fa fa-plus-square-o icon-pointer icon-primary" href="easyrule.php?<?="action=pass&amp;int={$int}&amp;proto={$proto}&amp;src={$filterent['srcip']}&amp;dst={$filterent['dstip']}&amp;dstport={$filterent['dstport']}&amp;ipproto={$ipproto}"; ?>" title="<?=gettext("Easy Rule: Pass this traffic")?>" onclick="return confirm('<?=gettext("Confirmation required to add this PASS rule.")?>')">
</a>
<?=$dststr . '<span class="RESOLVE-' . $dst_htmlclass . '"></span>'?>
</td>

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

@ -577,13 +577,13 @@ events.push(function() {
});
$('[id^=Xdel_]').click(function (event) {
if (confirm("<?=gettext('Are you sure you wish to delete this P1 entry?')?>")) {
if (confirm("<?=gettext('Confirmation required to delete this P1 entry.')?>")) {
$('#' + event.target.id.slice(1)).click();
}
});
$('[id^=Xdelp2_]').click(function (event) {
if (confirm("<?=gettext('Are you sure you wish to delete this P2 entry?')?>")) {
if (confirm("<?=gettext('Confirmation required to delete this P2 entry.')?>")) {
$('#' + event.target.id.slice(1)).click();
}
});