From bebc39ec2652c074fe2f6d6230ee85bfadf9fd2a Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Fri, 11 Aug 2017 13:58:08 -0700
Subject: [PATCH] Handle user and group names with spaces in them
 https://sourceforge.net/p/webadmin/bugs/5011/

---
 group_chooser.cgi | 16 +---------------
 user_chooser.cgi  |  2 +-
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/group_chooser.cgi b/group_chooser.cgi
index 1215fc959..f0136321f 100755
--- a/group_chooser.cgi
+++ b/group_chooser.cgi
@@ -25,7 +25,7 @@ if ($in{'multi'}) {
 		# base frame
 		&PrintHeader();
 		print "<script type='text/javascript'>\n";
-		@ul = &split_quoted(&filter_javascript($in{'group'}));
+		@ul = &split_quoted_string(&filter_javascript($in{'group'}));
 		$len = @ul;
 		print "sel = new Array($len);\n";
 		print "selr = new Array($len);\n";
@@ -207,17 +207,3 @@ endgrent() if ($gconfig{'os_type'} ne 'hpux');
 return sort { $a->[0] cmp $b->[0] } @groups;
 }
 
-# split_quoted(string)
-sub split_quoted
-{
-local @rv;
-local $str = $_[0];
-while($str =~ /^\s*(\S*"[^"]+"\S*)(.*)$/ || $str =~ /^\s*(\S+)(.*)$/) {
-	$str = $2;
-	local $g = $1;
-	$g =~ s/"//g;
-	push(@rv, $g);
-	}
-return @rv;
-}
-
diff --git a/user_chooser.cgi b/user_chooser.cgi
index 57f304dd6..bd3c5d354 100755
--- a/user_chooser.cgi
+++ b/user_chooser.cgi
@@ -19,7 +19,7 @@ if ($in{'multi'}) {
 		# base frame
 		&PrintHeader();
 		print "<script type='text/javascript'>\n";
-		@ul = split(/\s+/, &filter_javascript($in{'user'}));
+		@ul = &split_quoted_string(/\s+/, &filter_javascript($in{'user'}));
 		$len = @ul;
 		print "sel = new Array($len);\n";
 		print "selr = new Array($len);\n";