From e879fc815effb1477ba13f2dfc2aed4b8f2d40be Mon Sep 17 00:00:00 2001
From: Ermal <eri@pfsense.org>
Date: Tue, 22 Jun 2010 14:29:45 +0000
Subject: Fixes #613. Add correctly users to all users group.

---
 etc/inc/auth.inc                     |  2 +-
 usr/local/www/system_usermanager.php | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/etc/inc/auth.inc b/etc/inc/auth.inc
index f9b9d21..3a72db9 100644
--- a/etc/inc/auth.inc
+++ b/etc/inc/auth.inc
@@ -409,7 +409,7 @@ function local_user_set_groups($user, $new_groups = NULL ) {
 	/* determine which memberships to remove */
 	foreach ($cur_groups as $groupname) {
 		if (in_array($groupname,$new_groups))
-		continue;
+			continue;
 		$group = & $config['system']['group'][$groupindex[$groupname]];
 		$index = array_search($user['uid'], $group['member']);
 		array_splice($group['member'], $index, 1);
diff --git a/usr/local/www/system_usermanager.php b/usr/local/www/system_usermanager.php
index c3da004..058046a 100644
--- a/usr/local/www/system_usermanager.php
+++ b/usr/local/www/system_usermanager.php
@@ -174,7 +174,6 @@ if (isAllowedPage("system_usermanager")) {
 	}
 
 	if ($_POST) {
-		conf_mount_rw();
 		unset($input_errors);
 		$pconfig = $_POST;
 
@@ -253,6 +252,7 @@ if (isAllowedPage("system_usermanager")) {
 		}
 
 		if (!$input_errors) {
+			conf_mount_rw();
 			$userent = array();
 			if (isset($id) && $a_user[$id])
 				$userent = $a_user[$id];
@@ -303,6 +303,16 @@ if (isAllowedPage("system_usermanager")) {
 					$userent['cert'][] = $cert;
 				}
 				$userent['uid'] = $config['system']['nextuid']++;
+				/* Add the user to All Users group. */
+				if (!is_array($config['system']['group']['member']))
+					$config['system']['group']['member'] = array();
+				foreach ($config['system']['group'] as $gidx => $group) {
+					if ($group['name'] == "all") {
+						$config['system']['group'][$gidx]['member'][] = $userent['uid'];
+						break;
+					}
+				}
+
 				$a_user[] = $userent;
 			}
 
-- 
cgit v1.1