Backport usermanager code from HEAD so I can get it in the snaps and

start testing it properly
There's still some CSS/HTML fixes needed but the code seems to work

1 files changed, 21 insertions, 1 deletions

diff --git a/usr/local/www/guiconfig.inc b/usr/local/www/guiconfig.inc
index a6c1c00..b140bf4 100755
--- a/usr/local/www/guiconfig.inc
+++ b/usr/local/www/guiconfig.inc
@@ -41,7 +41,7 @@ if (!$omit_nocacheheaders) {
 
 /* Include authentication routines */
 /* THIS MUST BE ABOVE ALL OTHER CODE */
-require_once("auth.inc");
+require_once("authgui.inc");
 
 /* parse the configuration and include all configuration functions */
 require_once("config.inc");
@@ -305,6 +305,26 @@ function captiveportal_users_sort() {
 	usort($config['captiveportal']['user'], "cpusercmp");
 }
 
+function admin_groups_sort() {
+	global $g, $config;
+
+	function cpusercmp($a, $b) {
+		return strcasecmp($a['name'], $b['name']);
+	}
+
+	usort($config['system']['group'], "cpusercmp");
+}
+
+function admin_users_sort() {
+	global $g, $config;
+
+	function cpusercmp($a, $b) {
+		return strcasecmp($a['name'], $b['name']);
+	}
+
+	usort($config['system']['user'], "cpusercmp");
+}
+
 /* sort by interface only, retain the original order of rules that apply to
    the same interface */
 function filter_rules_sort() {