diff options
| author | Stephen Beaver <sbeaver@netgate.com> | 2015-09-01 16:10:09 -0400 |
|---|---|---|
| committer | Stephen Beaver <sbeaver@netgate.com> | 2015-09-01 16:10:09 -0400 |
| commit | b4333696779e52885d282f650aad27395ba942c5 (patch) | |
| tree | e0e1cf7f709d97fdd6802d7fee0bcb8d52d1c834 /src/usr/local/www/system_usermanager.php | |
| parent | c84db5bbdef21f43ab383c30ef773204e346d585 (diff) | |
| download | pfsense-b4333696779e52885d282f650aad27395ba942c5.zip pfsense-b4333696779e52885d282f650aad27395ba942c5.tar.gz | |
Fixed #5055
"All" no longer appears in group lists
Diffstat (limited to 'src/usr/local/www/system_usermanager.php')
| -rw-r--r-- | src/usr/local/www/system_usermanager.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/usr/local/www/system_usermanager.php b/src/usr/local/www/system_usermanager.php index 04fe289..f6e8596 100644 --- a/src/usr/local/www/system_usermanager.php +++ b/src/usr/local/www/system_usermanager.php @@ -646,10 +646,12 @@ if ($act == "new" || $act == "edit" || $input_errors): $usergid = [$pconfig['usernamefld']]; foreach ($config['system']['group'] as $Ggroup) { - if(($act == 'edit') && $Ggroup['member'] && in_array($pconfig['uid'], $Ggroup['member'])) - $usersGroups[ $Ggroup['name'] ] = $Ggroup['name']; // Add it to the user's list - else - $systemGroups[ $Ggroup['name'] ] = $Ggroup['name']; // Add it to the 'not a member of' list + if($Ggroup['name'] != "all") { + if(($act == 'edit') && $Ggroup['member'] && in_array($pconfig['uid'], $Ggroup['member'])) + $usersGroups[ $Ggroup['name'] ] = $Ggroup['name']; // Add it to the user's list + else + $systemGroups[ $Ggroup['name'] ] = $Ggroup['name']; // Add it to the 'not a member of' list + } } $group->add(new Form_Select( |
