Merge remote branch 'mainline/master' into 4_load_balancer_and_services

Conflicts:
	usr/local/www/services_captiveportal_ip_edit.php
	usr/local/www/services_captiveportal_mac_edit.php
	usr/local/www/services_dhcp_edit.php
	usr/local/www/services_rfc2136.php
	usr/local/www/services_snmp.php

1 files changed, 11 insertions, 6 deletions

diff --git a/usr/local/www/system_groupmanager.php b/usr/local/www/system_groupmanager.php
index a167790..37c5ec3 100644
--- a/usr/local/www/system_groupmanager.php
+++ b/usr/local/www/system_groupmanager.php
@@ -152,10 +152,12 @@ if ($_POST) {
 		local_group_set($group);
 
 		/* Refresh users in this group since their privileges may have changed. */
-		$a_user = &$config['system']['user'];
-		foreach ($a_user as & $user) {
-			if (in_array($user['uid'], $group['member']))
-				local_user_set($user);
+		if (is_array($group['member'])) {
+			$a_user = &$config['system']['user'];
+			foreach ($a_user as & $user) {
+				if (in_array($user['uid'], $group['member']))
+					local_user_set($user);
+			}
 		}
 
 		write_config();
@@ -410,8 +412,11 @@ 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>
+					<tr ondblclick="document.location='system_groupmanager.php?act=edit&id=<?=$i;?>'">
 						<td class="listlr">
 							<table border="0" cellpadding="0" cellspacing="0">
 								<tr>
@@ -429,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;?>">