diff options
author | Stephen Beaver <sbeaver@netgate.com> | 2016-02-08 08:52:03 -0500 |
---|---|---|
committer | Stephen Beaver <sbeaver@netgate.com> | 2016-02-08 08:52:03 -0500 |
commit | b575e12fa49ca25660e0459962e54a54df7342a7 (patch) | |
tree | 195efba702b8f559e908c7d04bfb3dc3bb1b4495 /src/usr | |
parent | 5829ab3fc95118a18d18ed321dca20243a664f69 (diff) | |
parent | df82f650dd1be631c0181cea6ec5e885231db5fd (diff) | |
download | pfsense-b575e12fa49ca25660e0459962e54a54df7342a7.zip pfsense-b575e12fa49ca25660e0459962e54a54df7342a7.tar.gz |
Merge pull request #2595 from phil-davis/grppriv
Diffstat (limited to 'src/usr')
-rw-r--r-- | src/usr/local/www/system_groupmanager_addprivs.php | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/usr/local/www/system_groupmanager_addprivs.php b/src/usr/local/www/system_groupmanager_addprivs.php index e1ae561..cbc824e 100644 --- a/src/usr/local/www/system_groupmanager_addprivs.php +++ b/src/usr/local/www/system_groupmanager_addprivs.php @@ -100,6 +100,10 @@ if (!is_array($a_group['priv'])) { $a_group['priv'] = array(); } +// Make a local copy and sort it +$spriv_list = $priv_list; +uasort($spriv_list, admusercmp); + if ($_POST) { unset($input_errors); @@ -154,16 +158,16 @@ if (isAjax()) { } function build_priv_list() { - global $priv_list, $a_group; + global $spriv_list, $a_group; $list = array(); - foreach ($priv_list as $pname => $pdata) { + foreach ($spriv_list as $pname => $pdata) { if (in_array($pname, $a_group['priv'])) { continue; } - $list[$pname] = $pdata; + $list[$pname] = $pdata['name']; } return($list); @@ -198,9 +202,6 @@ if (isset($groupid)) { $section = new Form_Section('Add privileges for '. $a_group['name']); -$priv_list = array_map(function($p){ return $p['name']; }, $priv_list); -asort($priv_list, SORT_STRING|SORT_FLAG_CASE); - $section->addInput(new Form_Select( 'sysprivs', 'Assigned privileges', @@ -261,16 +262,16 @@ events.push(function() { <?php // Build a list of privilege descriptions - if (is_array($priv_list)) { + if (is_array($spriv_list)) { $id = 0; $jdescs = "var descs = new Array();\n"; - foreach ($priv_list as $pname => $pdata) { + foreach ($spriv_list as $pname => $pdata) { if (in_array($pname, $a_group['priv'])) { continue; } - $desc = addslashes(preg_replace("/pfSense/i", $g['product_name'], $pdata)); + $desc = addslashes(preg_replace("/pfSense/i", $g['product_name'], $pdata['descr'])); $jdescs .= "descs[{$id}] = '{$desc}';\n"; $id++; } |