--- loncom/interface/lonevaluate.pm	2006/03/19 22:22:49	1.19
+++ loncom/interface/lonevaluate.pm	2007/05/02 01:33:49	1.21
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Evaluate
 #
-# $Id: lonevaluate.pm,v 1.19 2006/03/19 22:22:49 albertel Exp $
+# $Id: lonevaluate.pm,v 1.21 2007/05/02 01:33:49 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,6 +33,7 @@ use Apache::lonnet;
 use Apache::Constants qw(:common);
 use Apache::loncommon();
 use Apache::lonenc();
+use LONCAPA();
 
 sub handler {
     my $r = shift;
@@ -53,7 +54,7 @@ sub handler {
     my $title=&Apache::lonnet::gettitle($feedurl);
     my $showurl=&Apache::lonenc::check_encrypt($feedurl);
 
-    my ($rdomain,$rauth)=($feedurl=~/^(\w+)\/(\w+)\//);
+    my ($rdomain,$rauth)=($feedurl=~/^($LONCAPA::domain_re)\/($LONCAPA::username_re)\//);
 
     my $prefix=$env{'user.name'}.'@'.$env{'user.domain'}.'___'.
 	$feedurl.'___';
@@ -102,7 +103,7 @@ ENDJS
 $start_page
 <h1>Thank you for your input!</h1>
 ENDHEADER
-       $r->print('Storing feedback: '.
+       $r->print('Saving feedback: '.
            &Apache::lonnet::put('nohist_resevaldata',\%currenteval,$rdomain,$rauth));
            unless ($already) {
 	       $r->print('<br />Logging first evaluation');