From afccf115e98185da89456354762695bfd214294f Mon Sep 17 00:00:00 2001
From: kkalev <kkalev>
Date: Tue, 28 Jan 2003 14:14:53 +0000
Subject: [PATCH] In user_new show a select box with all the available groups.
 Based on an idea by Karel Stadler (kstadler)

---
 Changelog             |  1 +
 htdocs/user_new.php3  | 10 ++++++++--
 lib/sql/defaults.php3 | 22 ++++++++++++++++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/Changelog b/Changelog
index 1e4dd0c..1eec2b9 100644
--- a/Changelog
+++ b/Changelog
@@ -33,6 +33,7 @@ Ver 1.62:
 * Fix a small bug in lib/ldap/create_user.php3. Unset the mod array before adding any values to it.
 * Fix a small problem with debugging
 * Do a write lock in radacct before truncating it in truncate_radacct
+* In user_new show a select box with all the available groups. Based on an idea by Karel Stadler (kstadler)
 Ver 1.61:
 * Add a string encoder for greek
 * If general_decode_normal_attributes is set then encode attributes in lib/ldap/change_info. In the near future
diff --git a/htdocs/user_new.php3 b/htdocs/user_new.php3
index 145b983..c2eb993 100644
--- a/htdocs/user_new.php3
+++ b/htdocs/user_new.php3
@@ -91,13 +91,19 @@ EOM;
 EOM;
 	if ($config[general_lib_type] == 'sql'){
 		if (isset($member_groups))
-			$group = $member_groups[0];
+			$selected[$member_groups[0]] = 'selected';
 		echo <<<EOM
 	<tr>
 		<td align=right colspan=$colspan bgcolor="#d0ddb0">
 		Group
 		</td><td>
-		<input type=text name="Fgroup" value="$group" size=35>
+		<select name="Fgroup">
+EOM;
+		foreach ($member_groups as $group)
+			echo "<option value=\"$group\" $selected[$group]>$group\n";
+
+		echo <<<EOM
+		</select>
 		</td>
 	</tr>
 EOM;
diff --git a/lib/sql/defaults.php3 b/lib/sql/defaults.php3
index bd2a701..d144bc3 100644
--- a/lib/sql/defaults.php3
+++ b/lib/sql/defaults.php3
@@ -110,4 +110,26 @@ if ($login != ''){
 			echo "<b>Could not connect to SQL database</b><br>\n";
 	}while($stop == 0);
 }
+else{
+	if (is_file("../lib/sql/drivers/$config[sql_type]/functions.php3"))
+		include_once("../lib/sql/drivers/$config[sql_type]/functions.php3");
+	else{
+		echo "<b>Could not include SQL library</b><br>\n";
+		exit();
+	}
+	unset($member_groups);
+	$link = @da_sql_pconnect($config);
+	if ($link){
+		$res = @da_sql_query($link,$config,
+		"SELECT DISTINCT GroupName FROM $config[sql_usergroup_table];");
+		if ($res){
+			while(($row = @da_sql_fetch_array($res,$config)))
+				$member_groups[] = $row[GroupName];
+		}
+		else
+			echo "<b>Database query failed: " . da_sql_error($link,$config) . "</b><br>\n";
+	}
+	else
+		echo "<b>Could not connect to SQL database</b><br>\n";
+}
 ?>
-- 
2.39.5