Merge pull request #2794 from NOYB/System_/_Advanced_/_Admin_Access_-_Remove_Personalizations

This commit is contained in:
Stephen Beaver 2016-03-28 14:11:55 -04:00
commit a59cc5ef1d

View File

@ -110,7 +110,7 @@ if ($_POST) {
/* input validation */
if ($_POST['webguiport']) {
if (!is_port($_POST['webguiport'])) {
$input_errors[] = gettext("You must specify a valid webConfigurator port number");
$input_errors[] = gettext("A valid webConfigurator port number must be specified");
}
}
@ -131,7 +131,7 @@ if ($_POST) {
if ($_POST['sshport']) {
if (!is_port($_POST['sshport'])) {
$input_errors[] = gettext("You must specify a valid port number");
$input_errors[] = gettext("A valid port number must be specified");
}
}
@ -357,9 +357,8 @@ $group->add(new Form_Checkbox(
'https'
))->displayAsRadio();
$group->setHelp($certs_available ? '':'No Certificates have been defined. You must '.
'<a href="system_certmanager.php">'. gettext("Create or Import").'</a> '.
'a Certificate before SSL can be enabled.');
$group->setHelp($certs_available ? '':'No Certificates have been defined. A certificate is required before SSL can be enabled. '.
'<a href="system_certmanager.php">'. gettext("Create or Import").'</a> '.' a Certificate.');
$section->add($group);
@ -382,16 +381,16 @@ $section->addInput(new Form_Input(
$config['system']['webgui']['port'],
['min' => 1, 'max' => 65535]
))->setHelp('Enter a custom port number for the webConfigurator '.
'above if you want to override the default (80 for HTTP, 443 '.
'for HTTPS). Changes will take effect immediately after save.');
'above to override the default (80 for HTTP, 443 for HTTPS). '.
'Changes will take effect immediately after save.');
$section->addInput(new Form_Input(
'max_procs',
'Max Processes',
'number',
$pconfig['max_procs']
))->setHelp('Enter the number of webConfigurator processes you '.
'want to run. This defaults to 2. Increasing this will allow more '.
))->setHelp('Enter the number of webConfigurator processes to run. '.
'This defaults to 2. Increasing this will allow more '.
'users/browsers to access the GUI concurrently.');
$section->addInput(new Form_Checkbox(
@ -437,8 +436,8 @@ $section->addInput(new Form_Checkbox(
'unchecked, access to the webConfigurator 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 (ensure you have a firewall rule '.
'in place that allows you in, or you will lock yourself out!)<em>Hint: the &quot;Set interface(s) IP address&quot; '.
'controlled by the user-defined firewall rules (ensure a firewall rule is '.
'in place that allows access, to avoid being locked out!)<em>Hint: the &quot;Set interface(s) IP address&quot; '.
'option in the console menu resets this setting as well.</em>', [$lockout_interface]);
$section->addInput(new Form_Checkbox(
@ -446,19 +445,19 @@ $section->addInput(new Form_Checkbox(
'DNS Rebind Check',
'Disable DNS Rebinding Checks',
$pconfig['nodnsrebindcheck']
))->setHelp('When this is unchecked, your system is protected against <a '.
))->setHelp('When this is unchecked, the system is protected against <a '.
'href="http://en.wikipedia.org/wiki/DNS_rebinding">DNS Rebinding attacks</a>. '.
'This blocks private IP responses from your configured DNS servers. Check this '.
'This blocks private IP responses from the configured DNS servers. Check this '.
'box to disable this protection if it interferes with webConfigurator access or '.
'name resolution in your environment.');
'name resolution in the environment.');
$section->addInput(new Form_Input(
'althostnames',
'Alternate Hostnames',
'text',
htmlspecialchars($pconfig['althostnames'])
))->setHelp('Alternate Hostnames for DNS Rebinding and HTTP_REFERER Checks. Here '.
'you can specify alternate hostnames by which the router may be queried, to '.
))->setHelp('Alternate Hostnames for DNS Rebinding and HTTP_REFERER Checks. '.
'Specify alternate hostnames by which the router may be queried, to '.
'bypass the DNS Rebinding Attack checks. Separate hostnames with spaces.');
$section->addInput(new Form_Checkbox(
@ -468,7 +467,7 @@ $section->addInput(new Form_Checkbox(
$pconfig['nohttpreferercheck']
))->setHelp('When this is unchecked, access to the webConfigurator 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 '.
'protection if 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 <a target="_blank" '.
'href="http://en.wikipedia.org/wiki/HTTP_referrer">Wikipedia</a>.');
@ -520,7 +519,7 @@ if (!$g['enableserial_force'] && ($g['platform'] == $g['product_name'] || $g['pl
'Enables the first serial port with 115200/8/N/1 by default, or another speed selectable below.',
isset($pconfig['enableserial'])
))->setHelp('Note: This will redirect the console output and messages to '.
'the serial port. You can still access the console menu from the internal video '.
'the serial port. The console menu can still be accessed from the internal video '.
'card/keyboard. A <b>null modem</b> serial cable or adapter is required to use the '.
'serial console.');
}