--- loncom/interface/lonpickstudent.pm	2006/12/06 20:54:13	1.20
+++ loncom/interface/lonpickstudent.pm	2007/07/21 00:48:55	1.21
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a student from the classlist
 #
-# $Id: lonpickstudent.pm,v 1.20 2006/12/06 20:54:13 albertel Exp $
+# $Id: lonpickstudent.pm,v 1.21 2007/07/21 00:48:55 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -70,11 +70,25 @@ sub handler {
 # See if filter present
     my $filter=$env{'form.filter'};
     my $filtermsg;
-    if ($filter ne '') {
-	$filtermsg = '<br />'.&mt('Name starting with').' "'.$filter.'"<br />';
-	$filter = quotemeta($filter);
-    } else {
+    if ($filter eq '') {
 	$filter = '.'
+    } else {
+	my $encoded_filter = &HTML::Entities::encode($filter,'<>&"');
+	$filter = quotemeta($filter);
+	my $change = &mt('Change');
+	my $filterbutton =<<FILTER;
+  <input type="text" name="filter" value="$encoded_filter" />
+  <input type="submit" name="Change" value="$change" />
+FILTER
+	foreach my $name ('form','unameelement','udomelement','roles') {
+	    my $value = &HTML::Entities::encode($env{"form.$name"},'<>&"');
+	    $filterbutton .= <<HIDDEN;
+   <input type="hidden" name="$name" value="$value" />
+HIDDEN
+	}
+        $filtermsg = '<br />'.
+	    &mt('Showing users with a name starting with [_1]',
+		$filterbutton).'<br />';
     }
 
     my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};