Standardize privilege page and sorting between users and groups. Fixes #7587

3 files changed, 17 insertions, 6 deletions

diff --git a/src/etc/inc/pfsense-utils.inc b/src/etc/inc/pfsense-utils.inc
index e86e83d..37e538e 100644
--- a/src/etc/inc/pfsense-utils.inc
+++ b/src/etc/inc/pfsense-utils.inc
@@ -3244,4 +3244,8 @@ function addrtolower($ip) {
 		return($ip);
 	}
 }
+
+function compare_by_name($a, $b) {
+	return strcasecmp($a['name'], $b['name']);
+}
 ?>
diff --git a/src/usr/local/www/system_groupmanager_addprivs.php b/src/usr/local/www/system_groupmanager_addprivs.php
index b2f706a..198e20b 100644
--- a/src/usr/local/www/system_groupmanager_addprivs.php
+++ b/src/usr/local/www/system_groupmanager_addprivs.php
@@ -53,6 +53,7 @@ if (!is_array($a_group['priv'])) {
 
 // Make a local copy and sort it
 $spriv_list = $priv_list;
+uasort($spriv_list, "compare_by_name");
 
 if ($_POST['save']) {
 
@@ -146,7 +147,17 @@ if (isset($groupid)) {
 	));
 }
 
-$section = new Form_Section('Add Privileges for '. $a_group['name']);
+$section = new Form_Section('Group Privileges');
+
+$name_string = $a_group['name'];
+if (!empty($a_group['descr'])) {
+	$name_string .= " ({$a_group['descr']})";
+}
+
+$section->addInput(new Form_StaticText(
+	'Group',
+	$name_string
+));
 
 $section->addInput(new Form_Select(
 	'sysprivs',
diff --git a/src/usr/local/www/system_usermanager_addprivs.php b/src/usr/local/www/system_usermanager_addprivs.php
index 8c7086f..880e049 100644
--- a/src/usr/local/www/system_usermanager_addprivs.php
+++ b/src/usr/local/www/system_usermanager_addprivs.php
@@ -28,10 +28,6 @@
 ##|*MATCH=system_usermanager_addprivs.php*
 ##|-PRIV
 
-function admusercmp($a, $b) {
-	return strcasecmp($a['name'], $b['name']);
-}
-
 require_once("guiconfig.inc");
 require_once("pfsense-utils.inc");
 
@@ -55,7 +51,7 @@ if (!is_array($a_user['priv'])) {
 
 // Make a local copy and sort it
 $spriv_list = $priv_list;
-uasort($spriv_list, "admusercmp");
+uasort($spriv_list, "compare_by_name");
 
 if ($_POST['save']) {
 	unset($input_errors);