From: kkalev <kkalev>
Date: Mon, 12 Aug 2002 13:38:05 +0000 (+0000)
Subject: Use a textarea for new members in group_admin.php3 and group_new.php3. Update lib... 
X-Git-Url: https://git.entuzijast.net/?a=commitdiff_plain;h=b31ebad8ebe809a3700f3ef6e1944ea402d2112a;p=freeradius-dialup-admin.git

Use a textarea for new members in group_admin.php3 and group_new.php3. Update lib/sql/create_group.php3 and
lib/sql/group_admin.php3
---

diff --git a/Changelog b/Changelog
index fe81ca3..dce9b53 100644
--- a/Changelog
+++ b/Changelog
@@ -13,6 +13,8 @@ Ver 1.50:
 * Add a page to change the user's personal information. Changed the user toolbar and added htdocs/user_info.php3
   along with lib/{sql,ldap}/change_info.php3
 * Print a message if we can't connect to the ldap server in lib/ldap/user_info.php3
+* Use a textarea for new members in group_admin.php3 and group_new.php3. Update lib/sql/create_group.php3 and
+  lib/sql/group_admin.php3
 Ver 1.30:
 * Add limit of results returned in accounting.php3
 * Fix a bug in time2strclock() in lib/functions.php3. Seconds ammount more than 9 would not show.
diff --git a/htdocs/group_admin.php3 b/htdocs/group_admin.php3
index 83b3b8c..6201b23 100644
--- a/htdocs/group_admin.php3
+++ b/htdocs/group_admin.php3
@@ -100,10 +100,10 @@ foreach ($group_members as $member){
 </tr>
 <tr>
 <td align=right bgcolor="#d0ddb0">
-New Group Member
+New Group Member(s)<br>Separate group members<br> by whitespace or newline
 </td>
 <td>
-<input type=text name=new_member value="" size=25>
+<textarea name=new_members cols="15" wrap="PHYSICAL" rows=5></textarea>
 </td>
 </tr>
 	</table>
diff --git a/htdocs/group_new.php3 b/htdocs/group_new.php3
index b9abcc5..d668b54 100644
--- a/htdocs/group_new.php3
+++ b/htdocs/group_new.php3
@@ -92,9 +92,9 @@ EOM;
 	</tr>
 	<tr>
 		<td align=right colspan=$colspan bgcolor="#d0ddb0">
-		First member
+		First member(s)<br>Separate group members<br> by whitespace or newline
 		</td><td>
-		<input type=text name="member" value="" size=35>
+		<textarea name=members cols="15" wrap="PHYSICAL" rows=5></textarea>
 		</td>
 	</tr>
 		
diff --git a/lib/sql/create_group.php3 b/lib/sql/create_group.php3
index 1f4e70c..4fdebe4 100644
--- a/lib/sql/create_group.php3
+++ b/lib/sql/create_group.php3
@@ -13,12 +13,17 @@ if ($config[sql_use_operators] == 'true'){
 $da_abort=0;
 $link = @da_sql_pconnect($config);
 if ($link){
-	$res = @da_sql_query($link,$config,
-	"INSERT INTO $config[sql_usergroup_table] (UserName,GroupName)
-	VALUES ('$member','$login');");
-	if (!$res || !@da_sql_affected_rows($link,$res,$config)){
-		echo "<b>Unable to add group $login. SQL error</b><br>\n";
-		$da_abort=1;
+	$Members = preg_split("/[\n\s]+/",$members,-1,PREG_SPLIT_NO_EMPTY);
+	if (!empty($Members)){
+		foreach ($Members as $member){
+			$res = @da_sql_query($link,$config,
+			"INSERT INTO $config[sql_usergroup_table] (UserName,GroupName)
+			VALUES ('$member','$login');");
+			if (!$res || !@da_sql_affected_rows($link,$res,$config)){
+				echo "<b>Unable to add user $member in group $login. SQL error</b><br>\n";
+				$da_abort=1;
+			}
+		}
 	}
 	if (!$da_abort){
 		foreach($show_attrs as $key => $attr){
diff --git a/lib/sql/group_admin.php3 b/lib/sql/group_admin.php3
index 90fc433..1e75eb9 100644
--- a/lib/sql/group_admin.php3
+++ b/lib/sql/group_admin.php3
@@ -15,21 +15,28 @@ if ($link){
 				echo "<b>Could not delete user $del from group. SQL Error</b><br>\n";
 		}
 	}
-	if ($new_member != ''){
-		$res = @da_sql_query($link,$config,
-	"SELECT UserName FROM $config[sql_usergroup_table] WHERE UserName = '$new_member' AND GroupName = '$login';");
-		if ($res){
-			if (@da_sql_num_rows($res,$config))
-				echo "<b>User $new_member already is a member of the group</b><br>\n";
-			else{	
+	if ($new_members != ''){
+		$Members = preg_split("/[\n\s]+/",$new_members,-1,PREG_SPLIT_NO_EMPTY);
+		if (!empty($Members)){
+			foreach ($Members as $new_member){
 				$res = @da_sql_query($link,$config,
-			"INSERT INTO $config[sql_usergroup_table] (GroupName,UserName) VALUES ('$login','$new_member');");
-				if (!$res)
-					echo "<b>Error while adding user $new_member to group</b><br>\n";
+				"SELECT UserName FROM $config[sql_usergroup_table] WHERE
+				UserName = '$new_member' AND GroupName = '$login';");
+				if ($res){
+					if (@da_sql_num_rows($res,$config))
+						echo "<b>User $new_member already is a member of the group</b><br>\n";
+					else{	
+						$res = @da_sql_query($link,$config,
+						"INSERT INTO $config[sql_usergroup_table] (GroupName,UserName)
+						VALUES ('$login','$new_member');");
+						if (!$res)
+							echo "<b>Error while adding user $new_member to group</b><br>\n";
+					}
+				}
+				else
+					echo "<b>Could not add new member $new_member. SQL Error</b><br>\n";
 			}
 		}
-		else
-			echo "<b>Could not add new member $new_member. SQL Error</b><br>\n";
 	}
 }
 else