--- rat/map.pm	2006/12/04 14:59:55	1.2
+++ rat/map.pm	2007/01/16 21:18:08	1.5
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # routines for modyfing .sequence and .page files
 #
-# $Id: map.pm,v 1.2 2006/12/04 14:59:55 raeburn Exp $
+# $Id: map.pm,v 1.5 2007/01/16 21:18:08 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -29,6 +29,7 @@
 package LONCAPA::map;
 
 use HTML::TokeParser;
+use HTML::Entities();
 use Apache::lonnet;
 use Apache::lonlocal;
 use File::Copy;
@@ -476,7 +477,7 @@ sub loadmap {
     if ($instr eq -2) {
         $errtext.='Map not loaded: An error occured while trying to load the map.';
     } elsif ($instr eq '-1') {
-        $errtext.=&mt('Map not loaded: The file [_1] does not exist.',$fn);
+	# Map doesn't exist 
     } elsif ($instr) {
         my $parser = HTML::TokeParser->new(\$instr);
         my $token;
@@ -643,7 +644,7 @@ sub savemap {
 			$outstr.=' type="'.$comp[3].'"';
 		    }
 		    if ($comp[0] ne '') {
-			$outstr.=' title="'.$comp[0].'"';
+			$outstr.=' title="'.&HTML::Entities::encode($comp[0]).'"';
 		    }
 		    $outstr.=" />\n";
 		} elsif ($comp[$#comp] eq 'cond') {
@@ -690,7 +691,7 @@ sub savemap {
 	    }
         }
         $outstr.="</map>\n";
-	if ($fn=~/^\/*uploaded\/(\w+)\/(\w+)\/(.*)$/) {
+	if ($fn=~m{^/*uploaded/($LONCAPA::domain_re)/($LONCAPA::courseid_re)/(.*)$}) {
 	    $env{'form.output'}=$outstr;
             my $result=&Apache::lonnet::finishuserfileupload($2,$1,
 							     'output',$3);