Skip to content

O
OpnSense
Commit d3376f7f authored by Franco Fichtner's avatar Franco Fichtner
Browse files
Options

src: webConfigurator -> web GUI

parent dfb09411
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 35 deletions
src/etc/inc/authgui.inc
View file @ d3376f7f
......@@ -221,7 +221,7 @@ function session_auth(&$Login_Error)
} else {
/* give the user an error message */
$Login_Error = gettext('Wrong username or password.');
log_error("webConfigurator authentication error for '{$_POST['usernamefld']}' from {$_SERVER['REMOTE_ADDR']}");
log_error("Web GUI authentication error for '{$_POST['usernamefld']}' from {$_SERVER['REMOTE_ADDR']}");
}
}
......
src/etc/inc/system.inc
View file @ d3376f7f
......@@ -937,7 +937,6 @@ function system_webgui_configure($verbose = false)
}
if ($config['system']['webgui']['protocol'] == "https") {
// Ensure that we have a webConfigurator CERT
$cert =& lookup_cert($config['system']['webgui']['ssl-certref']);
if(!is_array($cert) && !$cert['crt'] && !$cert['prv']) {
if (!is_array($config['ca'])) {
......@@ -948,10 +947,10 @@ function system_webgui_configure($verbose = false)
$config['cert'] = array();
}
$a_cert =& $config['cert'];
log_error("Creating SSL Certificate for this host");
log_error("Creating SSL certificate for this host");
$cert = array();
$cert['refid'] = uniqid();
$cert['descr'] = 'webConfigurator default';
$cert['descr'] = 'Web GUI SSL certificate';
mwexec(
/* XXX ought to be replaced by PHP calls */
'/usr/local/bin/openssl req -new ' .
......@@ -966,7 +965,7 @@ function system_webgui_configure($verbose = false)
cert_import($cert, $crt, $key);
$a_cert[] = $cert;
$config['system']['webgui']['ssl-certref'] = $cert['refid'];
write_config('Importing HTTPS certificate');
write_config('Created web GUI SSL certificate');
} else {
$crt = base64_decode($cert['crt']);
$key = base64_decode($cert['prv']);
......
src/etc/inc/upgrade_config.inc
View file @ d3376f7f
......@@ -650,8 +650,8 @@ function upgrade_039_to_040() {
$config['system']['user'][0]['priv'] = array();
$config['system']['user'][0]['priv'][0]['id'] = "lockwc";
$config['system']['user'][0]['priv'][0]['name'] = "Lock webConfigurator";
$config['system']['user'][0]['priv'][0]['descr'] = gettext("Indicates whether this user will lock access to the webConfigurator for other users.");
$config['system']['user'][0]['priv'][0]['name'] = "Lock web GUI";
$config['system']['user'][0]['priv'][0]['descr'] = gettext("Indicates whether this user will lock access to the web GUI for other users.");
$config['system']['user'][0]['priv'][1]['id'] = "lock-ipages";
$config['system']['user'][0]['priv'][1]['name'] = "Lock individual pages";
$config['system']['user'][0]['priv'][1]['descr'] = gettext("Indicates whether this user will lock individual HTML pages after having accessed a particular page (the lock will be freed if the user leaves or saves the page form).");
......@@ -1931,7 +1931,7 @@ function upgrade_052_to_053() {
/* create cert entry */
$cert = array();
$cert['refid'] = uniqid();
$cert['descr'] = "webConfigurator SSL Certificate";
$cert['descr'] = "Web GUI SSL certificate";
$cert['crt'] = $config['system']['webgui']['certificate'];
$cert['prv'] = $config['system']['webgui']['private-key'];
$config['cert'][] = $cert;
......
src/etc/rc.initial.setlanip
View file @ d3376f7f
......@@ -449,7 +449,7 @@ console_configure_dhcpd(6);
//*****************************************************************************
if ($config['system']['webgui']['protocol'] == "https") {
if (console_prompt_for_yn(gettext("Do you want to revert to HTTP as the webConfigurator protocol?"))) {
if (console_prompt_for_yn(gettext("Do you want to revert to HTTP as the web GUI protocol?"))) {
$config['system']['webgui']['protocol'] = "http";
$restart_webgui = true;
}
......@@ -537,7 +537,7 @@ if ($intip6 != '') {
if ($intip != '' || $intip6 != '') {
if (count($ifdescrs) == "1" or $interface == "lan") {
echo gettext('You can now access the webConfigurator by opening the following URL in your web browser:') . "\n";
echo gettext('You can now access the web GUI by opening the following URL in your web browser:') . "\n";
if (!empty($config['system']['webgui']['port'])) {
$webuiport = $config['system']['webgui']['port'];
if ($intip != '') {
......
src/wizard/setup.xml
View file @ d3376f7f
......@@ -649,7 +649,7 @@
Congratulations! OPNsense is now configured.<p/>
Please consider donating to the project to help us with our overhead costs.<p/>
See <a target='_new' href='https://opnsense.org/'>OPNsense.org</a> to donate or purchase services offered by the OPNsense team.<p/>
Click <a href='$myurl'>here</a> to continue on to OPNsense webConfigurator.
Click <a href='$myurl'>here</a> to continue on to OPNsense web GUI.
]]>
</description>
</step>
......
src/www/diag_logs_settings.php
View file @ d3376f7f
......@@ -196,7 +196,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$savemsg = get_std_save_message();
if ($oldnologlighttpd !== isset($config['syslog']['nologlighttpd'])) {
log_error('webConfigurator configuration has changed. Restarting webConfigurator now.');
log_error('Web GUI configuration has changed. Restarting now.');
mwexec_bg('/usr/local/etc/rc.restart_webgui 2');
$savemsg .= "<br />" . gettext("WebGUI process is restarting.");
}
......
src/www/index.php
View file @ d3376f7f
......@@ -100,8 +100,6 @@ include("head.inc");
include("fbegin.inc");?>
<?php
## If it is the first time webConfigurator has been
## accessed since initial install show this stuff.
if (isset($config['trigger_initial_wizard'])) :?>
<script type="text/javascript">
$( document ).ready(function() {
......
src/www/system_advanced_admin.php
View file @ d3376f7f
......@@ -63,7 +63,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
/* input validation */
if (!empty($pconfig['webguiport'])) {
if (!is_port($pconfig['webguiport'])) {
$input_errors[] = gettext("You must specify a valid webConfigurator port number");
$input_errors[] = gettext('You must specify a valid web GUI port number');
}
}
......@@ -315,7 +315,7 @@ include("head.inc");
<form method="post" name="iform" id="iform">
<table class="table table-striped opnsense_standard_table_form">
<tr>
<td width="22%"><strong><?=gettext("webConfigurator");?></strong></td>
<td width="22%"><strong><?=gettext('Web GUI');?></strong></td>
<td width="78%" align="right">
<small><?=gettext("full help"); ?> </small>
<i class="fa fa-toggle-off text-danger" style="cursor: pointer;" id="show_all_help_page" type="button"></i>
......@@ -364,7 +364,7 @@ include("head.inc");
<td>
<input name="webguiport" type="text" value="<?=$pconfig['webguiport'];?>" />
<div class="hidden" for="help_for_webguiport">
<?=gettext("Enter a custom port number for the webConfigurator " .
<?=gettext("Enter a custom port number for the web GUI " .
"above if you want to override the default (80 for HTTP, 443 " .
"for HTTPS). Changes will take effect immediately after save."); ?>
</div>
......@@ -374,9 +374,9 @@ include("head.inc");
<td><a id="help_for_disablehttpredirect" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("WebGUI redirect"); ?></td>
<td width="78%">
<input name="disablehttpredirect" type="checkbox" value="yes" <?= empty($pconfig['disablehttpredirect']) ? '' : 'checked="checked"';?> />
<strong><?=gettext("Disable webConfigurator redirect rule"); ?></strong>
<strong><?= gettext('Disable web GUI redirect rule') ?></strong>
<div class="hidden" for="help_for_disablehttpredirect">
<?= gettext("When this is unchecked, access to the webConfigurator " .
<?= gettext("When this is unchecked, access to the web GUI " .
"is always permitted even on port 80, regardless of the listening port configured. " .
"Check this box to disable this automatically added redirect rule.");
?>
......@@ -387,9 +387,9 @@ include("head.inc");
<td><a id="help_for_loginautocomplete" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("WebGUI Login Autocomplete"); ?></td>
<td>
<input name="loginautocomplete" type="checkbox" value="yes" <?= empty($pconfig['loginautocomplete']) ? '' : 'checked="checked"' ?> />
<strong><?=gettext("Enable webConfigurator login autocomplete"); ?></strong>
<strong><?= gettext('Enable web GUI login autocomplete') ?></strong>
<div class="hidden" for="help_for_loginautocomplete">
<?= gettext("When this is checked, login credentials for the webConfigurator " .
<?= gettext("When this is checked, login credentials for the web GUI " .
"may be saved by the browser. While convenient, some security standards require this to be disabled. " .
"Check this box to enable autocomplete on the login form so that browsers will prompt to save credentials (NOTE: Some browsers do not respect this option).");?>
</div>
......@@ -399,9 +399,9 @@ include("head.inc");
<td><a id="help_for_quietlogin" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("WebGUI login messages") ?></td>
<td>
<input name="quietlogin" type="checkbox" value="yes" <?= empty($pconfig['quietlogin']) ? '' : 'checked="checked"' ?>/>
<strong><?=gettext("Disable logging of webConfigurator successful logins"); ?></strong>
<strong><?= gettext('Disable logging of web GUI successful logins') ?></strong>
<div class="hidden" for="help_for_quietlogin">
<?=gettext("When this is checked, successful logins to the webConfigurator " .
<?=gettext("When this is checked, successful logins to the web GUI " .
"will not be logged.");?>
</div>
</td>
......@@ -410,12 +410,12 @@ include("head.inc");
<td><a id="help_for_noantilockout" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Anti-lockout"); ?></td>
<td>
<input name="noantilockout" type="checkbox" value="yes" <?= empty($pconfig['noantilockout']) ? '' : 'checked="checked"' ?>/>
<strong><?=gettext("Disable webConfigurator anti-lockout rule"); ?></strong>
<strong><?= gettext('Disable web GUI anti-lockout rule') ?></strong>
<div class="hidden" for="help_for_noantilockout">
<?= sprintf(gettext("When this is unchecked, access to the webConfigurator " .
<?= sprintf(gettext("When this is unchecked, access to the web GUI " .
"on the %s interface is always permitted, regardless of the user-defined firewall " .
"rule set. Check this box to disable this automatically added rule, so access " .
"to the webConfigurator is controlled by the user-defined firewall rules " .
"to the web GUI is controlled by the user-defined firewall rules " .
"(ensure you have a firewall rule in place that allows you in, or you will " .
"lock yourself out!)"), (empty($config['interfaces']['lan']) ? gettext("WAN") : gettext("LAN"))); ?>
<em><?= gettext('Hint: the "Set interface(s) IP address" option in the console menu resets this setting as well.'); ?></em>
......@@ -430,7 +430,7 @@ include("head.inc");
<div class="hidden" for="help_for_nodnsrebindcheck">
<?= sprintf(gettext("When this is unchecked, your system is protected against %sDNS Rebinding attacks%s. " .
"This blocks private IP responses from your configured DNS servers. Check this box to disable this protection if it interferes with " .
"webConfigurator access or name resolution in your environment."),'<a href="http://en.wikipedia.org/wiki/DNS_rebinding">','</a>') ?>
"web GUI access or name resolution in your environment."),'<a href="http://en.wikipedia.org/wiki/DNS_rebinding">','</a>') ?>
</div>
</td>
</tr>
......@@ -451,10 +451,10 @@ include("head.inc");
<input name="nohttpreferercheck" type="checkbox" value="yes" <?= empty($pconfig['nohttpreferercheck']) ? '' : 'checked="checked"' ?> />
<strong><?=gettext("Disable HTTP_REFERER enforcement check"); ?></strong>
<div class="hidden" for="help_for_nohttpreferercheck">
<?=sprintf(gettext("When this is unchecked, access to the webConfigurator " .
<?=sprintf(gettext("When this is unchecked, access to the web GUI " .
"is protected against HTTP_REFERER redirection attempts. " .
"Check this box to disable this protection if you find that it interferes with " .
"webConfigurator access in certain corner cases such as using external scripts to interact with this system. More information on HTTP_REFERER is available from %sWikipedia%s."),
"web GUI access in certain corner cases such as using external scripts to interact with this system. More information on HTTP_REFERER is available from %sWikipedia%s."),
'<a target="_blank" href="http://en.wikipedia.org/wiki/HTTP_referrer">','</a>') ?>
</div>
</td>
......
src/www/system_certmanager.php
View file @ d3376f7f
......@@ -1273,7 +1273,7 @@ $( document ).ready(function() {
<?php
endif;
if (is_webgui_cert($cert['refid'])) :?>
<?=gettext('webConfigurator') ?><br />
<?=gettext('Web GUI') ?><br />
<?php
endif;
if (is_user_cert($cert['refid'])) :?>
......
src/www/system_general.php
View file @ d3376f7f
......@@ -319,7 +319,7 @@ include("head.inc");
</select>
<div class="hidden" for="help_for_language">
<strong>
<?=gettext("Choose a language for the webConfigurator"); ?>
<?= gettext('Choose a language for the web GUI.') ?>
</strong>
</div>
</td>
......
src/www/system_groupmanager.php
View file @ d3376f7f
......@@ -421,7 +421,7 @@ $( document ).ready(function() {
</tr>
<tr class="hidden-xs">
<td colspan="4">
<?=gettext('Additional webConfigurator groups can be added here. ' .
<?=gettext('Additional groups can be added here. ' .
'Group permissions can be assigned which are inherited by users who are members of the group. ' .
'An icon that appears grey indicates that it is a system defined object. ' .
'Some system object properties can be modified but they cannot be deleted.');?>
......
src/www/system_hasync.php
View file @ d3376f7f
......@@ -182,7 +182,7 @@ include("head.inc");
<td>
<input name="username" type="text" value="<?=$pconfig['username'];?>" />
<div class="hidden" for="help_for_username">
<?=gettext('Enter the webConfigurator username of the system entered above for synchronizing your configuration.') ?><br />
<?=gettext('Enter the web GUI username of the system entered above for synchronizing your configuration.') ?><br />
<div class="well well-sm">
<b><?=gettext('Do not use the Synchronize Config to IP and username option on backup cluster members!') ?></b>
</div>
......@@ -194,7 +194,7 @@ include("head.inc");
<td>
<input type="password" name="password" value="<?=$pconfig['password']; ?>" />
<div class="hidden" for="help_for_password">
<?=gettext('Enter the webConfigurator password of the system entered above for synchronizing your configuration.') ?><br />
<?=gettext('Enter the web GUI password of the system entered above for synchronizing your configuration.') ?><br />
<div class="well well-sm">
<b><?=gettext('Do not use the Synchronize Config to IP and password option on backup cluster members!') ?></b>
</div>
......
src/www/system_usermanager.php
View file @ d3376f7f
......@@ -964,7 +964,7 @@ $( document ).ready(function() {
<tr>
<td colspan="4">
<?=gettext("Additional users can be added here. User permissions for accessing " .
"the webConfigurator can be assigned directly or inherited from group memberships. " .
"the web GUI or other subsystems can be assigned directly or inherited from group memberships. " .
"An icon that appears grey indicates that it is a system defined object. " .
"Some system object properties can be modified but they cannot be deleted."); ?>
</td>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023