Improve the way the auth server list is generated and account for a key being removed from the array when deleting. Fixes #7682

1 files changed, 2 insertions, 4 deletions

diff --git a/src/usr/local/www/system_authservers.php b/src/usr/local/www/system_authservers.php
index a651dfa..4133e47 100644
--- a/src/usr/local/www/system_authservers.php
+++ b/src/usr/local/www/system_authservers.php
@@ -103,11 +103,8 @@ if (!is_array($config['system']['authserver'])) {
 	$config['system']['authserver'] = array();
 }
 
-$a_servers = auth_get_authserver_list();
+$a_server = array_values(auth_get_authserver_list());
 
-foreach ($a_servers as $servers) {
-	$a_server[] = $servers;
-}
 
 if (!is_array($config['ca'])) {
 	$config['ca'] = array();
@@ -134,6 +131,7 @@ if ($_POST['act'] == "del") {
 
 	/* Remove server from temp list used later on this page. */
 	unset($a_server[$_POST['id']]);
+	$a_server = array_values($a_server);
 
 	$savemsg = sprintf(gettext("Authentication Server %s deleted."), htmlspecialchars($serverdeleted));
 	write_config($savemsg);