--- loncom/imspackages/imsimport.pm	2006/04/10 22:30:20	1.20
+++ loncom/imspackages/imsimport.pm	2006/12/05 02:55:54	1.22
@@ -34,7 +34,8 @@ use HTML::Entities();
 use Apache::lonlocal;
 use Apache::lonupload;
 use File::Basename();
-                                                                                            
+use LONCAPA;
+
 # ----------------------------------------------------------------  Jscript One
 sub jscript_one {
     my ($fullpath,$jsref) = @_;
@@ -757,7 +758,7 @@ sub get_ccroles {
     my @crslist = ();
     my %descrip =();
     foreach my $key (keys %roles ) {
-        if ($key =~ m/^\/(\w+)\/(\w+)_cc$/) {
+        if ($key =~ m{^/($LONCAPA::domain_re)/($LONCAPA::username_re)_cc$}) {
             my $cdom = $1;
             my $crs = $2;
             my $role_end = 0;
@@ -855,7 +856,7 @@ sub handler {
         $fn=$env{'form.filename'};
         $fn=~s/^http\:\/\/[^\/]+\///;
         $fn=~s/^\///;
-        $fn=~s/(\~|priv\/)(\w+)//;
+        $fn=~s/(\~|priv\/)($LONCAPA::username_re)//;
         $fn=~s/\/+/\//g;
     } else {
         $r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}.