--- loncom/interface/lonpickstudent.pm	2006/03/16 21:34:04	1.13
+++ 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.13 2006/03/16 21:34:04 albertel Exp $
+# $Id: lonpickstudent.pm,v 1.21 2007/07/21 00:48:55 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -34,6 +34,8 @@ use Apache::loncommon;
 use Apache::loncoursedata;
 use Apache::lonnet;
 use Apache::lonlocal;
+use Apache::longroup;
+use LONCAPA;
 
 sub handler {
     my $r = shift;
@@ -66,26 +68,40 @@ sub handler {
     }
 
 # See if filter present
-
     my $filter=$env{'form.filter'};
-    $filter=~s/\W//g;
-    unless ($filter) { $filter='.'; }
+    my $filtermsg;
+    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'};
     my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
     my $classlist=&Apache::loncoursedata::get_classlist();
     my %grouplist=&Apache::lonnet::get_group_membership($cdom,$cnum);
     my $now = time;
-    my %allgroups;
-    my @coursegroups = ();
-    if (&Apache::loncommon::coursegroups(\%allgroups,$cdom,$cnum)) {
-        @coursegroups = keys(%allgroups);
-    }
+    my %allgroups = &Apache::longroup::coursegroups($cdom,$cnum);
 
 # --------------------------------------- There is such a user, get environment
 
     $r->print(<<ENDSCRIPT);
-<script>
+<script type="text/javascript">
 function gochoose(uname,udom) {
     opener.document.$env{'form.form'}.$env{'form.unameelement'}.value=uname;
     var slct=opener.document.$env{'form.form'}.$env{'form.udomelement'};
@@ -97,99 +113,116 @@ function gochoose(uname,udom) {
 }
 </script>
 ENDSCRIPT
-    
-  $r->print('<form>');
-  if ($allowed && (!$env{'form.roles'})) {
+
+    $r->print('<form>');
+    if ($allowed && (!$env{'form.roles'})) {
 # -------------------------------------------------------- Get course personnel
-    $r->print('<h3>'.$env{'course.'.$env{'request.course.id'}.'.description'}.
-              '</h3>');
-    my %coursepersonnel=
-       &Apache::lonnet::get_course_adv_roles();
-    $r->print('<table border="2">');
-    foreach my $role (sort keys %coursepersonnel) {
-       foreach (split(/\,/,$coursepersonnel{$role})) {
-	   my ($puname,$pudom)=split(/\:/,$_);
-	   $r->print('<tr><td>'.
-             '<input type="button" value="Select" onClick="gochoose('.
-             "'".$puname."','".$pudom."')".'" /></td><td>'.$role.'</td><td>'.
-		     &Apache::loncommon::aboutmewrapper(
-                          &Apache::loncommon::plainname($puname,
-                          $pudom),$puname,$pudom).'</td></tr>');
+	$r->print('<h3>'.$env{'course.'.$env{'request.course.id'}.'.description'}.
+		  '</h3>');
+	my %coursepersonnel=
+	    &Apache::lonnet::get_course_adv_roles();
+	$r->print(&Apache::loncommon::start_data_table());
+	foreach my $role (sort(keys(%coursepersonnel))) {
+	    foreach (split(/\,/,$coursepersonnel{$role})) {
+		my ($puname,$pudom)=split(/\:/,$_);
+		$role = &Apache::lonnet::plaintext($role,
+						   &Apache::loncommon::course_type());
+		$r->print(&Apache::loncommon::start_data_table_row().
+			  '<td>'.
+			  '<input type="button" value="Select" onClick="gochoose('.
+			  "'".$puname."','".$pudom."')".'" /></td><td>'.$role.'</td><td>'.
+			  &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($puname,$pudom),$puname,$pudom).'</td>'.
+			  &Apache::loncommon::end_data_table_row());
+	    }
 	}
-    }
-    $r->print('</table><p>&nbsp;');
-    if ($filter ne '.') {
-       $r->print('<br/ >'.&mt('Name starting with').' "'.$filter.'"<br />');
-    }
-    $r->print('</p><p><table><tr><th>&nbsp;</th><th>username</th><th>domain</th><th>Name</th><th>ID</th><th>section</th><th>active group(s)</th>');
-  # ------------------------------------------------------------------ Students
-    foreach (sort keys %$classlist) {
-        # the following undefs are for 'domain', and 'username' respectively.
-	my (undef,undef,$end,$start,$id,$section,$fullname,$status)=
-            @{$classlist->{$_}};
-	if ($allowed eq 'section' && $section ne $env{'request.course.sec'}) {
-	    next;
-	}
-        if ($_=~/^(\w+)\:(\w+)$/) {
-	    my ($uname,$udom)=($1,$2);
-	    if (($uname=~/^$filter/) || 
-                ($fullname=~/^$filter/i)) {
-               my $grouplist = '';
-               foreach my $group (@coursegroups) {
-                   if (exists($grouplist{$group.':'.$uname.':'.$udom})) {
-                       my ($end,$start) = split(/:/,$grouplist{$group.':'.$uname.':'.$udom});
-                       if (($end!=0) && ($end<$now)) { next; }
-                       if (($start!=0) && ($start>$now)) {next; }
-                       $grouplist .= " $group,"; 
-                   }
-               }
-               $grouplist =~ s/,$//;
-	       $r->print('<tr><td>'.
-                      '<input type="button" value="'.&mt('Select').'" onClick="gochoose('.
-                      "'".$uname."','".$udom."')".'" /></td>'.
-                         '<td><tt>'.$uname.'</tt></td><td> <tt>'.$udom.
-                         '</tt></td><td>'.
-                         &Apache::loncommon::aboutmewrapper(
-                         $fullname,
-                         $uname,$udom).'</td><td>'.$id.'</td><td>'.$section.
-                                       '</td><td>'.$grouplist.'</td></tr>');
-	   }
-        }
-    }
+	$r->print(&Apache::loncommon::end_data_table().'<p>&nbsp;');
 
-    $r->print('</table></p>');
-  } else {
-    $r->print('<h3>'.&mt('Users with Roles Assigned by').' '.
-	      &Apache::loncommon::plainname($env{'user.name'},
-					    $env{'user.domain'}).'</h3>');
-    if ($filter ne '.') {
-       $r->print('<br/ >'.&mt('Name starting with').' "'.$filter.'"<br />');
-    }
-    $r->print('<p><table>');
-    my %users=&Apache::lonnet::get_my_roles();
-    foreach (sort keys %users) {
-        if ($_=~/^(\w+)\:(\w+)\:(\w+)$/) {
-	    my ($uname,$udom,$urole)=($1,$2,$3);
-	    my $fullname=&Apache::loncommon::plainname($uname,$udom);
-	    if (($uname=~/^$filter/) || 
-                ($fullname=~/^$filter/i)) {
-	       $r->print('<tr><td>'.
-                      '<input type="button" value="Select" onClick="gochoose('.
-                      "'".$uname."','".$udom."')".'" /></td>'.
-                         '<td><tt>'.$uname.'</tt></td><td><tt>'.$udom.
-                         '</tt></td><td>'.
-                         &Apache::loncommon::aboutmewrapper(
-                         $fullname,
-                         $uname,$udom).'</td><td><td>'.
-			 &Apache::lonnet::plaintext($urole).
-                                       '</td></tr>');
-	   }
-        }
+	$r->print($filtermsg);
+
+	$r->print('</p><p>'.
+		  &Apache::loncommon::start_data_table().
+		  &Apache::loncommon::start_data_table_header_row().
+		  &Apache::loncommon::end_data_table_header_row().
+		  '<th>&nbsp;</th>'.
+		  '<th>'.&mt('username').'</th>'.
+		  '<th>'.&mt('domain').'</th>'.
+		  '<th>'.&mt('Name').'</th>'.
+		  '<th>'.&mt('ID').'</th>'.
+		  '<th>'.&mt('section').'</th>'.
+		  '<th>'.&mt('active group(s)').'</th>'.
+		  &Apache::loncommon::end_data_table_header_row());
+# ------------------------------------------------------------------ Students
+	foreach my $user (sort(keys(%$classlist))) {
+	    # the following undefs are for 'domain', and 'username' respectively.
+	    my (undef,undef,$end,$start,$id,$section,$fullname,$status)=
+		@{$classlist->{$user}};
+	    if ($allowed eq 'section' && $section ne $env{'request.course.sec'}) {
+		next;
+	    }
+	    if ($user=~/^($LONCAPA::username_re)\:($LONCAPA::domain_re)$/) {
+		my ($uname,$udom)=($1,$2);
+		if (($uname=~/^$filter/) || 
+		    ($fullname=~/^$filter/i)) {
+		    my $grouplist = '';
+		    foreach my $group (sort(keys(%allgroups))) {
+			if (exists($grouplist{$group.':'.$uname.':'.$udom})) {
+			    my ($end,$start) = split(/:/,$grouplist{$group.':'.$uname.':'.$udom});
+			    if (($end!=0) && ($end<$now)) { next; }
+			    if (($start!=0) && ($start>$now)) {next; }
+			    $grouplist .= " $group,"; 
+			}
+		    }
+		    $grouplist =~ s/,$//;
+		    $r->print(&Apache::loncommon::start_data_table_row().
+			      '<td>'.
+			      '<input type="button" value="'.&mt('Select').'" onClick="gochoose('.
+			      "'".$uname."','".$udom."')".'" /></td>'.
+			      '<td><tt>'.$uname.'</tt></td><td> <tt>'.$udom.
+			      '</tt></td><td>'.
+			      &Apache::loncommon::aboutmewrapper($fullname,
+								 $uname,$udom).
+			      '</td><td>'.$id.'</td><td>'.$section.
+			      '</td><td>'.$grouplist.'</td>'.
+			      &Apache::loncommon::end_data_table_row());
+		}
+	    }
+	}
+	
+	$r->print(&Apache::loncommon::end_data_table().'</p>');
+    } else {
+	$r->print('<h3>'.&mt('Users with Roles Assigned by').' '.
+		  &Apache::loncommon::plainname($env{'user.name'},
+						$env{'user.domain'}).'</h3>');
+	$r->print($filtermsg);
+
+	$r->print('<p>'.&Apache::loncommon::start_data_table());
+	my %users=&Apache::lonnet::get_my_roles();
+	foreach my $user (sort(keys(%users))) {
+	    if ($user =~
+		/^($LONCAPA::username_re)\:($LONCAPA::domain_re)\:(\w+)$/) {
+		my ($uname,$udom,$urole)=($1,$2,$3);
+		my $fullname=&Apache::loncommon::plainname($uname,$udom);
+		if (($uname=~/^$filter/) || 
+		    ($fullname=~/^$filter/i)) {
+		    $r->print(&Apache::loncommon::start_data_table_row().
+			      '<td>'.
+			      '<input type="button" value="Select" onClick="gochoose('.
+			      "'".$uname."','".$udom."')".'" /></td>'.
+			      '<td><tt>'.$uname.'</tt></td><td><tt>'.$udom.
+			      '</tt></td><td>'.
+			      &Apache::loncommon::aboutmewrapper(
+								 $fullname,
+								 $uname,$udom).'</td><td><td>'.
+			      &Apache::lonnet::plaintext($urole).
+			      '</td>'.
+			      &Apache::loncommon::end_data_table_row());
+		}
+	    }
+	}
+	$r->print(&Apache::loncommon::end_data_table().'</p>');
     }
-    $r->print('</table></p>');
-  }
-  $r->print('</form>'.&Apache::loncommon::end_page());
-  return OK;
+    $r->print('</form>'.&Apache::loncommon::end_page());
+    return OK;
 } 
 
 1;