--- rat/lonratsrv.pm	2006/11/02 21:26:54	1.38
+++ rat/lonratsrv.pm	2006/12/20 22:42:48	1.39
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Server for RAT Maps
 #
-# $Id: lonratsrv.pm,v 1.38 2006/11/02 21:26:54 albertel Exp $
+# $Id: lonratsrv.pm,v 1.39 2006/12/20 22:42:48 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -30,6 +30,7 @@ package Apache::lonratsrv;
 
 use strict;
 use Apache::Constants qw(:common);
+use LONCAPA();
 use LONCAPA::map();
 
 
@@ -43,18 +44,18 @@ sub handler {
   return OK if $r->header_only;
 
   my $url=$r->uri;
-  $url=~/\/(\w+)\/ratserver$/;
+  $url=~m{/(\w+)/ratserver$};
   my $mode=$1;
 
-  $url=~s/\/loadonly\/ratserver$/\/save\/ratserver/;
+  $url=~s{/loadonly/ratserver$}{/save/ratserver};
   
   my $fn=$r->filename;
   my $lonDocRoot=$r->dir_config('lonDocRoot');
   if ( $fn =~ /\Q$lonDocRoot\E/ ) {
       #internal authentication, needs fixup.
       $fn = $url;
-      $fn=~s|^/~(\w+)|/home/$1/public_html|;
-      $fn=~s|/[^/]*/ratserver$||;
+      $fn=~s{^/~($LONCAPA::username_re)}{/home/$1/public_html};
+      $fn=~s{/[^/]*/ratserver$}{};
   }
   my $errtext='';
   my $infotext='';