summaryrefslogtreecommitdiffstats
path: root/usr/local
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2010-07-28 13:41:11 -0400
committerjim-p <jimp@pfsense.org>2010-07-28 13:53:09 -0400
commitb0c231e4f391f57ca7c20e2bd823bb585f131a2f (patch)
tree61057c369a4766442092d9ee611fab8990f5e2fd /usr/local
parent1295e7691a5b50685e6baf176c3e677aba0fd17c (diff)
downloadpfsense-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/local')
-rw-r--r--usr/local/www/system_groupmanager.php5
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']);?>&nbsp;
</td>
<td class="listbg">
- <?=count($group['member'])?>
+ <?=$groupcount;?>
</td>
<td valign="middle" nowrap class="list">
<a href="system_groupmanager.php?act=edit&id=<?=$i;?>">
OpenPOWER on IntegriCloud