--- loncom/interface/groupsort.pm 2006/07/31 18:39:15 1.48
+++ loncom/interface/groupsort.pm 2006/12/05 02:55:51 1.50
@@ -2,7 +2,7 @@
# The LON-CAPA group sort handler
# Allows for sorting prior to import into RAT.
#
-# $Id: groupsort.pm,v 1.48 2006/07/31 18:39:15 albertel Exp $
+# $Id: groupsort.pm,v 1.50 2006/12/05 02:55:51 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -37,6 +37,7 @@ use GDBM_File;
use Apache::loncommon;
use Apache::lonlocal;
use Apache::lonnet;
+use LONCAPA();
my $iconpath; # variable to be accessible to multiple subroutines
my %hash; # variable to tie to user specific database
@@ -174,7 +175,7 @@ sub readfromfile {
my $url=$token->[2]->{'src'};
my $name=$token->[2]->{'title'};
- $name=~s/ \[\((\d+)\,(\w+)\,(\w+)\)\]$//;
+ $name=~s/ \[\((\d+)\,($LONCAPA::username_re)\,($LONCAPA::domain_re)\)\]$//;
if ($1) {
$$nhash{$url}='
'.&mt('Removed by ').
&Apache::loncommon::plainname($2,$3).', '.
@@ -349,7 +350,8 @@ END
END
# --- Continue Buttons
- my $resurl = &Apache::loncommon::lastresurl();
+ my $resurl =
+ &Apache::loncommon::escape_single(&Apache::loncommon::lastresurl());
$r->print(<