summaryrefslogtreecommitdiffstats
path: root/src/usr/local/www
diff options
context:
space:
mode:
authorStephen Beaver <sbeaver@netgate.com>2015-11-19 19:49:49 -0500
committerStephen Beaver <sbeaver@netgate.com>2015-11-19 19:50:19 -0500
commite6d97c6e14f21fc1160dc47a53a97328583c87ae (patch)
tree07505b4f16502bba2963a34c7311d4077c4abc62 /src/usr/local/www
parentbcc5aeedf9a3c11392a75eaa917dffd28ce71a55 (diff)
downloadpfsense-e6d97c6e14f21fc1160dc47a53a97328583c87ae.zip
pfsense-e6d97c6e14f21fc1160dc47a53a97328583c87ae.tar.gz
Fixed #5490
Diffstat (limited to 'src/usr/local/www')
-rw-r--r--src/usr/local/www/system_usermanager_settings.php14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/usr/local/www/system_usermanager_settings.php b/src/usr/local/www/system_usermanager_settings.php
index 811cb1d..ac6e034 100644
--- a/src/usr/local/www/system_usermanager_settings.php
+++ b/src/usr/local/www/system_usermanager_settings.php
@@ -79,6 +79,7 @@ $pconfig['backend'] = &$config['system']['webgui']['backend'];
$pgtitle = array(gettext("System"), gettext("User manager settings"));
$save_and_test = false;
+
if ($_POST) {
unset($input_errors);
$pconfig = $_POST;
@@ -90,6 +91,10 @@ if ($_POST) {
}
}
+ if(($_POST['authmode'] == "Local Database") && $_POST['savetest']) {
+ $savemsg = gettext("Settings have been saved, but the test was not performed because it is not supported for local databases.");
+ }
+
if (!$input_errors) {
if ($_POST['authmode'] != "Local Database") {
$authsrv = auth_get_authserver($_POST['authmode']);
@@ -97,12 +102,11 @@ if ($_POST) {
if ($authsrv['type'] == "ldap") {
$save_and_test = true;
} else {
- $savemsg = gettext("The test was not performed because it is supported only for ldap based backends.");
+ $savemsg = gettext("Settings have been saved, but the test was not performed because it is supported only for ldap based backends.");
}
}
}
-
if (isset($_POST['session_timeout']) && $_POST['session_timeout'] != "") {
$config['system']['webgui']['session_timeout'] = intval($_POST['session_timeout']);
} else {
@@ -124,8 +128,9 @@ include("head.inc");
if ($input_errors)
print_input_errors($input_errors);
+
if ($savemsg)
- print_info_box($savemsg);
+ print_info_box($savemsg, success);
if($save_and_test) {
echo "<script>\n";
@@ -154,7 +159,8 @@ $section->addInput(new Form_Input(
'session_timeout',
'Session timeout',
'number',
- $pconfig['session_timeout']
+ $pconfig['session_timeout'],
+ [min => 0]
))->setHelp('Time in minutes to expire idle management sessions. The default is 4 '.
'hours (240 minutes).Enter 0 to never expire sessions. NOTE: This is a security '.
'risk!');
OpenPOWER on IntegriCloud