diff options
author | jim-p <jimp@pfsense.org> | 2010-07-28 13:41:11 -0400 |
---|---|---|
committer | jim-p <jimp@pfsense.org> | 2010-07-28 13:53:09 -0400 |
commit | b0c231e4f391f57ca7c20e2bd823bb585f131a2f (patch) | |
tree | 61057c369a4766442092d9ee611fab8990f5e2fd /usr | |
parent | 1295e7691a5b50685e6baf176c3e677aba0fd17c (diff) | |
download | pfsense-b0c231e4f391f57ca7c20e2bd823bb585f131a2f.zip pfsense-b0c231e4f391f57ca7c20e2bd823bb585f131a2f.tar.gz |
Don't maintain a membership for the 'all' group when it includes everyone. Just return it for everyone if the 'all' group is requested. For the count of the 'all' group, just return a count of all the users on the system. Fixes #613
Diffstat (limited to 'usr')
-rw-r--r-- | usr/local/www/system_groupmanager.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/usr/local/www/system_groupmanager.php b/usr/local/www/system_groupmanager.php index 8b5c3c3..37c5ec3 100644 --- a/usr/local/www/system_groupmanager.php +++ b/usr/local/www/system_groupmanager.php @@ -412,6 +412,9 @@ function presubmit() { $grpimg = "/themes/{$g['theme']}/images/icons/icon_system-group-grey.png"; else $grpimg = "/themes/{$g['theme']}/images/icons/icon_system-group.png"; + $groupcount = count($group['member']); + if ($group["name"] == "all") + $groupcount = count($config['system']['user']); ?> <tr ondblclick="document.location='system_groupmanager.php?act=edit&id=<?=$i;?>'"> <td class="listlr"> @@ -431,7 +434,7 @@ function presubmit() { <?=htmlspecialchars($group['description']);?> </td> <td class="listbg"> - <?=count($group['member'])?> + <?=$groupcount;?> </td> <td valign="middle" nowrap class="list"> <a href="system_groupmanager.php?act=edit&id=<?=$i;?>"> |