Merge pull request #2063 from heper/patch-1

2 files changed, 12 insertions, 1 deletions

diff --git a/src/usr/local/www/diag_authentication.php b/src/usr/local/www/diag_authentication.php
index af1a621..85fd3bb 100644
--- a/src/usr/local/www/diag_authentication.php
+++ b/src/usr/local/www/diag_authentication.php
@@ -118,6 +118,12 @@ $section = new Form_Section('Authentication Test');
 foreach (auth_get_authserver_list() as $auth_server)
 	$serverlist[$auth_server['name']] = $auth_server['name'];
 
+if (isset($config['system']['webgui']['authmode'])) {
+	$pconfig['authmode'] = &$config['system']['webgui']['authmode'];
+}
+else {
+	$pconfig['authmode'] = "Local Database";
+}
 $section->addInput(new Form_Select(
 	'authmode',
 	'Authentication Server',
diff --git a/src/usr/local/www/system_usermanager_settings.php b/src/usr/local/www/system_usermanager_settings.php
index b432548..a3320e3 100644
--- a/src/usr/local/www/system_usermanager_settings.php
+++ b/src/usr/local/www/system_usermanager_settings.php
@@ -67,7 +67,12 @@
 require("guiconfig.inc");
 
 $pconfig['session_timeout'] = &$config['system']['webgui']['session_timeout'];
-$pconfig['authmode'] = &$config['system']['webgui']['authmode'];
+if (isset($config['system']['webgui']['authmode'])) {
+	$pconfig['authmode'] = &$config['system']['webgui']['authmode'];
+}
+else {
+	$pconfig['authmode'] = "Local Database";
+}
 $pconfig['backend'] = &$config['system']['webgui']['backend'];
 
 // Page title for main admin