--- rat/map.pm 2006/08/17 22:35:51 1.1
+++ rat/map.pm 2007/01/26 23:37:51 1.6
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# routines for modyfing .sequence and .page files
#
-# $Id: map.pm,v 1.1 2006/08/17 22:35:51 albertel Exp $
+# $Id: map.pm,v 1.6 2007/01/26 23:37:51 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;
@@ -439,7 +440,7 @@ sub qtescape {
$str=~s/\&\#58\;/\:/g;
$str=~s/\&\#39\;/\'/g;
$str=~s/\&\#44\;/\,/g;
- $str=~s/\"/\&\#34\;/g;
+ $str=~s/\&\#34\;/\"/g;
return $str;
}
@@ -475,6 +476,8 @@ sub loadmap {
}
if ($instr eq -2) {
$errtext.='Map not loaded: An error occured while trying to load the map.';
+ } elsif ($instr eq '-1') {
+ # Map doesn't exist
} elsif ($instr) {
my $parser = HTML::TokeParser->new(\$instr);
my $token;
@@ -623,6 +626,8 @@ sub savemap {
# --------------------------------------------------------------- Logical input
if (($comp[$#comp] eq 'res') || ($comp[$#comp] eq 'zombie')) {
$comp[0]=qtescape($comp[0]);
+ $comp[0] = &HTML::Entities::encode($comp[0],'&<>"');
+
$comp[1]=qtescape($comp[1]);
if ($comp[2] eq 'true') {
if ($comp[1]!~/^http\:\/\//) {
@@ -688,7 +693,7 @@ sub savemap {
}
}
$outstr.="\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);
500 Internal Server Error
Internal Server Error
The server encountered an internal error or
misconfiguration and was unable to complete
your request.
Please contact the server administrator at
root@localhost to inform them of the time this error occurred,
and the actions you performed just before this error.
More information about this error may be available
in the server error log.