[LON-CAPA-cvs] cvs: loncom /enrollment Enrollment.pm /homework chemresponse.pm essayresponse.pm grades.pm inputtags.pm radiobuttonresponse.pm response.pm /interface londocs.pm lonhelper.pm lonindexer.pm lonmeta.pm lonmsg.pm lonpickcourse.pm /interface/spreadsheet Spreadsheet.pm /interface/statistics lonproblemanalysis.pm lonstathelpers.pm /publisher lonconstruct.pm lonpublisher.pm lonupload.pm /xml londefdef.pm lonxml.pm run.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Wed, 31 Mar 2004 05:24:01 -0000
This is a MIME encoded message
--albertel1080710641
Content-Type: text/plain
albertel Wed Mar 31 00:24:01 2004 EDT
Modified files:
/loncom/enrollment Enrollment.pm
/loncom/homework chemresponse.pm essayresponse.pm grades.pm
inputtags.pm radiobuttonresponse.pm response.pm
/loncom/interface londocs.pm lonhelper.pm lonindexer.pm lonmeta.pm
lonmsg.pm lonpickcourse.pm
/loncom/interface/spreadsheet Spreadsheet.pm
/loncom/interface/statistics lonproblemanalysis.pm
lonstathelpers.pm
/loncom/publisher lonconstruct.pm lonpublisher.pm lonupload.pm
/loncom/xml londefdef.pm lonxml.pm run.pm
Log:
- trying to be UTF8 transparent
--albertel1080710641
Content-Type: text/plain
Content-Disposition: attachment; filename="albertel-20040331002401.txt"
Index: loncom/enrollment/Enrollment.pm
diff -u loncom/enrollment/Enrollment.pm:1.12 loncom/enrollment/Enrollment.pm:1.13
--- loncom/enrollment/Enrollment.pm:1.12 Thu Mar 18 11:46:28 2004
+++ loncom/enrollment/Enrollment.pm Wed Mar 31 00:23:59 2004
@@ -1,5 +1,5 @@
# Automated Enrollment manager
-# $Id: Enrollment.pm,v 1.12 2004/03/18 16:46:28 raeburn Exp $
+# $Id: Enrollment.pm,v 1.13 2004/03/31 05:23:59 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -233,7 +233,7 @@
$usec =~ s/\W//g;
unless ($emailaddr =~/^[^\@]+\@[^\@]+$/) { $emailaddr =''; }
- my $emailenc = &HTML::Entities::encode($emailaddr);
+ my $emailenc = &HTML::Entities::encode($emailaddr,'<>&"');
# Use course defaults where entry is absent
if ( ($auth eq '') || (!defined($auth)) ) {
Index: loncom/homework/chemresponse.pm
diff -u loncom/homework/chemresponse.pm:1.31 loncom/homework/chemresponse.pm:1.32
--- loncom/homework/chemresponse.pm:1.31 Fri Mar 12 13:41:43 2004
+++ loncom/homework/chemresponse.pm Wed Mar 31 00:23:59 2004
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# chemical equation style response
#
-# $Id: chemresponse.pm,v 1.31 2004/03/12 18:41:43 albertel Exp $
+# $Id: chemresponse.pm,v 1.32 2004/03/31 05:23:59 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -92,7 +92,7 @@
</body>
</html>
CHEMPAGE
- $body=&HTML::Entities::encode($body);
+ $body=&HTML::Entities::encode($body,'<>&"');
$body=~s/\n/ /g;
my $result=<<CHEMINPUT;
<input type="button" value="Draw Molecule" onClick="javascript:editor=window.open('','','width=500,height=500,scrollbars=no,resizable=yes');editor.document.open('text/html','replace');editor.document.writeln('$body')" />
Index: loncom/homework/essayresponse.pm
diff -u loncom/homework/essayresponse.pm:1.33 loncom/homework/essayresponse.pm:1.34
--- loncom/homework/essayresponse.pm:1.33 Fri Mar 5 15:18:26 2004
+++ loncom/homework/essayresponse.pm Wed Mar 31 00:23:59 2004
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# essay (ungraded) style responses
#
-# $Id: essayresponse.pm,v 1.33 2004/03/05 20:18:26 albertel Exp $
+# $Id: essayresponse.pm,v 1.34 2004/03/31 05:23:59 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -46,10 +46,10 @@
my $part= $Apache::inputtags::part;
my $ncol= &Apache::lonnet::EXT("resource.$part".'_'."$id.maxcollaborators");
- my $coll= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"});
+ my $coll= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"');
my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");
$uploadedfiletypes=~s/[^\w\,]//g;
- my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"});
+ my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"},'<>&"');
$result='<br /><table border="1">';
$result.='<tr><td>'.
'<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked> '.
@@ -96,7 +96,7 @@
if ( $target eq 'grade' ) {
my $collaborators = $ENV{'form.HWCOL'.$part.'_'.$id};
if ($collaborators =~ /[^\s]/) {
- my $previous_list= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"});
+ my $previous_list= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"');
$Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators
if ($collaborators ne $previous_list);
}
Index: loncom/homework/grades.pm
diff -u loncom/homework/grades.pm:1.184 loncom/homework/grades.pm:1.185
--- loncom/homework/grades.pm:1.184 Tue Mar 30 15:46:24 2004
+++ loncom/homework/grades.pm Wed Mar 31 00:23:59 2004
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Grading handler
#
-# $Id: grades.pm,v 1.184 2004/03/30 20:46:24 www Exp $
+# $Id: grades.pm,v 1.185 2004/03/31 05:23:59 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -4274,13 +4274,13 @@
unless ($fname) { return 'error: no uploaded file'; }
$fname='scantron_orig_'.$fname;
if (length($ENV{'form.upfile'}) < 2) {
- $r->print("<font color='red'>Error:</font> The file you attempted to upload, <tt>".&HTML::Entities::encode($ENV{'form.upfile.filename'})."</tt>, contained no information. Please check that you entered the correct filename.");
+ $r->print("<font color='red'>Error:</font> The file you attempted to upload, <tt>".&HTML::Entities::encode($ENV{'form.upfile.filename'},'<>&"')."</tt>, contained no information. Please check that you entered the correct filename.");
} else {
my $result=&Apache::lonnet::finishuserfileupload($ENV{'form.courseid'},$ENV{'form.domainid'},$home,'upfile',$fname);
if ($result =~ m|^/uploaded/|) {
$r->print("<font color='green'>Success:</font> Successfully uploaded ".(length($ENV{'form.upfile'})-1)." bytes of data into location <tt>".$result."</tt>");
} else {
- $r->print("<font color='red'>Error:</font> An error (".$result.") occured when attempting to upload the file, <tt>".&HTML::Entities::encode($ENV{'form.upfile.filename'})."</tt>");
+ $r->print("<font color='red'>Error:</font> An error (".$result.") occured when attempting to upload the file, <tt>".&HTML::Entities::encode($ENV{'form.upfile.filename'},'<>&"')."</tt>");
}
}
if ($symb) {
Index: loncom/homework/inputtags.pm
diff -u loncom/homework/inputtags.pm:1.137 loncom/homework/inputtags.pm:1.138
--- loncom/homework/inputtags.pm:1.137 Fri Mar 26 15:10:42 2004
+++ loncom/homework/inputtags.pm Wed Mar 31 00:23:59 2004
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.137 2004/03/26 20:10:42 albertel Exp $
+# $Id: inputtags.pm,v 1.138 2004/03/31 05:23:59 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -118,7 +118,7 @@
$Apache::lonxml::evaluate--;
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
my $partid=$Apache::inputtags::part;
- my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$resid.submission"});
+ my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$resid.submission"},'<>&"');
my $cols = &Apache::lonxml::get_param('cols',$parstack,$safeeval);
if ( $cols eq '') { $cols = 80; }
my $rows = &Apache::lonxml::get_param('rows',$parstack,$safeeval);
@@ -210,7 +210,7 @@
if ($size eq '') { $size=20; } else {
if ($size < 20) { $maxlength=$size; }
}
- my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$id.submission"});
+ my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$id.submission"},'<>&"');
if ($Apache::lonhomework::type ne 'exam') {
my $addchars=&Apache::lonxml::get_param('addchars',$parstack,$safeeval);
$result='';
@@ -257,7 +257,7 @@
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
my $partid=$Apache::inputtags::part;
my $id=$Apache::inputtags::response[-1];
- my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$id.submission"});
+ my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$id.submission"},'<>&"');
if ($Apache::lonhomework::type ne 'exam') {
$result= '<input type="hidden" name="HWVAL_'.$id.'" value="'.
$oldresponse.'" />';
Index: loncom/homework/radiobuttonresponse.pm
diff -u loncom/homework/radiobuttonresponse.pm:1.86 loncom/homework/radiobuttonresponse.pm:1.87
--- loncom/homework/radiobuttonresponse.pm:1.86 Mon Mar 15 17:09:52 2004
+++ loncom/homework/radiobuttonresponse.pm Wed Mar 31 00:23:59 2004
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# mutliple choice style responses
#
-# $Id: radiobuttonresponse.pm,v 1.86 2004/03/15 22:09:52 albertel Exp $
+# $Id: radiobuttonresponse.pm,v 1.87 2004/03/31 05:23:59 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -283,7 +283,7 @@
push (@whichfalse,$name);
} elsif ($Apache::response::foilgroup{$name.'.value'} eq 'unused') {
} else {
- &Apache::lonxml::error(&HTML::Entities::encode("No valid value assigned ($Apache::response::foilgroup{$name.'.value'}) for foil $name in <foilgroup>"));
+ &Apache::lonxml::error(&HTML::Entities::encode("No valid value assigned ($Apache::response::foilgroup{$name.'.value'}) for foil $name in <foilgroup>",'<>&"'));
}
}
} else {
@@ -309,7 +309,7 @@
}
} elsif ($Apache::response::foilgroup{$name.'.value'} eq 'unused') {
} else {
- &Apache::lonxml::error(&HTML::Entities::encode("No valid value assigned ($Apache::response::foilgroup{$name.'.value'}) for foil $name in <foilgroup>"));
+ &Apache::lonxml::error(&HTML::Entities::encode("No valid value assigned ($Apache::response::foilgroup{$name.'.value'}) for foil $name in <foilgroup>",'<>&"'));
}
}
#pick a true statement
Index: loncom/homework/response.pm
diff -u loncom/homework/response.pm:1.96 loncom/homework/response.pm:1.97
--- loncom/homework/response.pm:1.96 Thu Mar 25 11:55:16 2004
+++ loncom/homework/response.pm Wed Mar 31 00:23:59 2004
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# various response type definitons response definition
#
-# $Id: response.pm,v 1.96 2004/03/25 16:55:16 albertel Exp $
+# $Id: response.pm,v 1.97 2004/03/31 05:23:59 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -47,11 +47,11 @@
push (@Apache::inputtags::responselist,$id);
@Apache::inputtags::inputlist=();
if ($Apache::inputtags::part eq '') {
- &Apache::lonxml::error(&HTML::Entities::encode(&mt("Found a <*response> outside of a <part> in a <part>ed problem")));
+ &Apache::lonxml::error(&HTML::Entities::encode(&mt("Found a <*response> outside of a <part> in a <part>ed problem"),'<>&"'));
}
if ($Apache::inputtags::response_with_no_part &&
$Apache::inputtags::part ne '0') {
- &Apache::lonxml::error(&HTML::Entities::encode(&mt("<*response>s are both inside of <part> and outside of <part>, this is not a valid problem, errors in grading may occur.")).'<br />');
+ &Apache::lonxml::error(&HTML::Entities::encode(&mt("<*response>s are both inside of <part> and outside of <part>, this is not a valid problem, errors in grading may occur."),'<>&"').'<br />');
}
if ($Apache::inputtags::part eq '0') {
$Apache::inputtags::response_with_no_part=1;
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.110 loncom/interface/londocs.pm:1.111
--- loncom/interface/londocs.pm:1.110 Tue Mar 16 17:46:59 2004
+++ loncom/interface/londocs.pm Wed Mar 31 00:23:59 2004
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Documents
#
-# $Id: londocs.pm,v 1.110 2004/03/16 22:46:59 raeburn Exp $
+# $Id: londocs.pm,v 1.111 2004/03/31 05:23:59 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -433,7 +433,7 @@
if ($ENV{'form.foldername'}) {
$foldername='&foldername='.
&Apache::lonnet::escape($ENV{'form.foldername'});
- $htmlfoldername=&HTML::Entities::encode($ENV{'form.foldername'});
+ $htmlfoldername=&HTML::Entities::encode($ENV{'form.foldername'},'<>&"');
}
$line.=(<<END);
<td><table border='0' cellspacing='2' cellpadding='0'>
@@ -1119,7 +1119,7 @@
&mt('Editing the Table of Contents for your Course')));
}
# --------------------------------------------------------- Standard documents
- my $htmlfoldername=&HTML::Entities::encode($ENV{'form.foldername'});
+ my $htmlfoldername=&HTML::Entities::encode($ENV{'form.foldername'},'<>&"');
$r->print('<table border=2 cellspacing=4 cellpadding=4>');
if (($standard) && ($allowed) && (!$forcesupplement)) {
$r->print('<tr><td bgcolor="#BBBBBB"><h2>'.&mt('Main Course Documents').
Index: loncom/interface/lonhelper.pm
diff -u loncom/interface/lonhelper.pm:1.66 loncom/interface/lonhelper.pm:1.67
--- loncom/interface/lonhelper.pm:1.66 Wed Mar 24 17:22:04 2004
+++ loncom/interface/lonhelper.pm Wed Mar 31 00:23:59 2004
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# .helper XML handler to implement the LON-CAPA helper
#
-# $Id: lonhelper.pm,v 1.66 2004/03/24 22:22:04 albertel Exp $
+# $Id: lonhelper.pm,v 1.67 2004/03/31 05:23:59 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -462,11 +462,11 @@
my $self = shift;
my $result = "";
$result .= '<input type="hidden" name="CURRENT_STATE" value="' .
- HTML::Entities::encode($self->{STATE}) . "\" />\n";
+ HTML::Entities::encode($self->{STATE},'<>&"') . "\" />\n";
$result .= '<input type="hidden" name="TOKEN" value="' .
$self->{TOKEN} . "\" />\n";
$result .= '<input type="hidden" name="RETURN_PAGE" value="' .
- HTML::Entities::encode($self->{RETURN_PAGE}) . "\" />\n";
+ HTML::Entities::encode($self->{RETURN_PAGE},'<>&"') . "\" />\n";
return $result;
}
@@ -1264,7 +1264,7 @@
$result .= "<tr>\n<td width='20'> </td>\n";
$result .= "<td valign='top'><input type='$type' name='$var.forminput'"
. "' value='" .
- HTML::Entities::encode($choice->[1])
+ HTML::Entities::encode($choice->[1],'<>&"')
. "'";
if ($checkedChoices{$choice->[1]}) {
$result .= " checked ";
@@ -1419,7 +1419,7 @@
$result .= "<select name='${var}.forminput'>\n";
foreach my $choice (@{$self->{CHOICES}}) {
$result .= "<option value='" .
- HTML::Entities::encode($choice->[1])
+ HTML::Entities::encode($choice->[1],'<>&"')
. "'";
if ($checkedChoices{$choice->[1]}) {
$result .= " selected";
@@ -1946,7 +1946,7 @@
$checked = 1;
}
$col .= "value='" .
- HTML::Entities::encode(&$valueFunc($resource))
+ HTML::Entities::encode(&$valueFunc($resource),'<>&"')
. "' /></td>";
return $col;
}
@@ -2192,17 +2192,17 @@
$checked = 1;
}
$result .=
- " value='" . HTML::Entities::encode($choice->[0] . ':' . $choice->[2] . ':' . $choice->[1] . ':' . $choice->[3])
+ " value='" . HTML::Entities::encode($choice->[0] . ':' . $choice->[2] . ':' . $choice->[1] . ':' . $choice->[3],'<>&"')
. "' /></td><td>"
- . HTML::Entities::encode($choice->[1])
+ . HTML::Entities::encode($choice->[1],'<>&"')
. "</td><td align='center'>"
- . HTML::Entities::encode($choice->[2])
+ . HTML::Entities::encode($choice->[2],'<>&"')
. "</td>\n<td>"
- . HTML::Entities::encode($choice->[3])
+ . HTML::Entities::encode($choice->[3],'<>&"')
. "</td>\n<td>"
- . HTML::Entities::encode($choice->[4])
+ . HTML::Entities::encode($choice->[4],'<>&"')
. "</td>\n<td>"
- . HTML::Entities::encode($choice->[0])
+ . HTML::Entities::encode($choice->[0],'<>&"')
. "</td></tr>\n";
}
@@ -2498,7 +2498,7 @@
}
$result .= '<tr><td align="right"' . " bgcolor='$color'>" .
"<input $onclick type='$type' name='" . $var
- . ".forminput' value='" . HTML::Entities::encode($fileName) .
+ . ".forminput' value='" . HTML::Entities::encode($fileName,'<>&"').
"'";
if (!$self->{'multichoice'} && $choices == 0) {
$result .= ' checked';
@@ -3166,7 +3166,7 @@
$result .= "<li>for section <b>$section</b></li>";
$level -= 3;
$result .= "<input type='hidden' name='csec' value='" .
- HTML::Entities::encode($section) . "' />\n";
+ HTML::Entities::encode($section,'<>&"') . "' />\n";
} else {
# FIXME: This is probably wasteful! Store the name!
my $classlist = Apache::loncoursedata::get_classlist();
@@ -3178,9 +3178,9 @@
$level -= 6;
my ($uname, $udom) = split /:/, $vars->{USER_NAME};
$result .= "<input type='hidden' name='uname' value='".
- HTML::Entities::encode($uname) . "' />\n";
+ HTML::Entities::encode($uname,'<>&"') . "' />\n";
$result .= "<input type='hidden' name='udom' value='".
- HTML::Entities::encode($udom) . "' />\n";
+ HTML::Entities::encode($udom,'<>&"') . "' />\n";
}
# Print value
Index: loncom/interface/lonindexer.pm
diff -u loncom/interface/lonindexer.pm:1.98 loncom/interface/lonindexer.pm:1.99
--- loncom/interface/lonindexer.pm:1.98 Tue Mar 30 12:55:26 2004
+++ loncom/interface/lonindexer.pm Wed Mar 31 00:24:00 2004
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Directory Indexer
#
-# $Id: lonindexer.pm,v 1.98 2004/03/30 17:55:26 www Exp $
+# $Id: lonindexer.pm,v 1.99 2004/03/31 05:24:00 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -837,7 +837,7 @@
$title = &Apache::lonnet::metadata($filelink,'title')
if ($metafile == 1);
$title=$listname unless $title;
- my $titleesc=HTML::Entities::encode($title);
+ my $titleesc=HTML::Entities::encode($title,'<>&"');
$titleesc=~s/\'/\\'/; #' (clean up this spare quote)
$r->print("<a href=\"javascript:select_data(\'",
$titleesc,"','",$filelink,"')\">");
@@ -849,7 +849,7 @@
#$title = &Apache::lonnet::metadata($filelink,'title')
#if ($metafile == 1);
$title=$listname unless $title;
- my $titleesc=&HTML::Entities::encode($title);
+ my $titleesc=&HTML::Entities::encode($title,'<>&"');
$r->print("<form name='form$fnum'>\n");
$r->print("<input type='checkbox' name='filelink"."' ".
"value='$filelink' onClick='".
Index: loncom/interface/lonmeta.pm
diff -u loncom/interface/lonmeta.pm:1.60 loncom/interface/lonmeta.pm:1.61
--- loncom/interface/lonmeta.pm:1.60 Mon Feb 9 15:22:18 2004
+++ loncom/interface/lonmeta.pm Wed Mar 31 00:24:00 2004
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Metadata display handler
#
-# $Id: lonmeta.pm,v 1.60 2004/02/09 20:22:18 matthew Exp $
+# $Id: lonmeta.pm,v 1.61 2004/03/31 05:24:00 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -711,7 +711,7 @@
print $mfh ' '.$_.'="'.$value.'"';
}
print $mfh '>'.
- &HTML::Entities::encode($Apache::lonpublisher::metadatafields{$unikey})
+ &HTML::Entities::encode($Apache::lonpublisher::metadatafields{$unikey},'<>&"')
.'</'.$tag.'>';
}
}
Index: loncom/interface/lonmsg.pm
diff -u loncom/interface/lonmsg.pm:1.95 loncom/interface/lonmsg.pm:1.96
--- loncom/interface/lonmsg.pm:1.95 Fri Mar 26 14:35:59 2004
+++ loncom/interface/lonmsg.pm Wed Mar 31 00:24:00 2004
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines for messaging
#
-# $Id: lonmsg.pm,v 1.95 2004/03/26 19:35:59 www Exp $
+# $Id: lonmsg.pm,v 1.96 2004/03/31 05:24:00 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -110,15 +110,15 @@
sub packagemsg {
my ($subject,$message,$citation,$baseurl,$attachmenturl)=@_;
- $message =&HTML::Entities::encode($message);
- $citation=&HTML::Entities::encode($citation);
- $subject =&HTML::Entities::encode($subject);
+ $message =&HTML::Entities::encode($message,'<>&"');
+ $citation=&HTML::Entities::encode($citation,'<>&"');
+ $subject =&HTML::Entities::encode($subject,'<>&"');
#remove machine specification
$baseurl =~ s|^http://[^/]+/|/|;
- $baseurl =&HTML::Entities::encode($baseurl);
+ $baseurl =&HTML::Entities::encode($baseurl,'<>&"');
#remove machine specification
$attachmenturl =~ s|^http://[^/]+/|/|;
- $attachmenturl =&HTML::Entities::encode($attachmenturl);
+ $attachmenturl =&HTML::Entities::encode($attachmenturl,'<>&"');
my $now=time;
$msgcount++;
Index: loncom/interface/lonpickcourse.pm
diff -u loncom/interface/lonpickcourse.pm:1.13 loncom/interface/lonpickcourse.pm:1.14
--- loncom/interface/lonpickcourse.pm:1.13 Thu Mar 18 22:47:09 2004
+++ loncom/interface/lonpickcourse.pm Wed Mar 31 00:24:00 2004
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Pick a course
#
-# $Id: lonpickcourse.pm,v 1.13 2004/03/19 03:47:09 albertel Exp $
+# $Id: lonpickcourse.pm,v 1.14 2004/03/31 05:24:00 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -136,7 +136,7 @@
}
foreach my $description (sort(keys(%by_descrip))) {
my $course=$by_descrip{$description};
- my $cleandesc=&HTML::Entities::encode($courses{$course});
+ my $cleandesc=&HTML::Entities::encode($courses{$course},'<>&"');
$cleandesc=~s/'/\\'/g;
my ($cdom,$cnum)=split(/\_/,$course);
$r->print('<input type="button" value="Select" onClick="gochoose('.
Index: loncom/interface/spreadsheet/Spreadsheet.pm
diff -u loncom/interface/spreadsheet/Spreadsheet.pm:1.36 loncom/interface/spreadsheet/Spreadsheet.pm:1.37
--- loncom/interface/spreadsheet/Spreadsheet.pm:1.36 Tue Feb 24 15:47:14 2004
+++ loncom/interface/spreadsheet/Spreadsheet.pm Wed Mar 31 00:24:00 2004
@@ -1,5 +1,5 @@
#
-# $Id: Spreadsheet.pm,v 1.36 2004/02/24 20:47:14 matthew Exp $
+# $Id: Spreadsheet.pm,v 1.37 2004/03/31 05:24:00 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1294,7 +1294,7 @@
} elsif ($value =~ /^\s*$/ ) {
$value = '<font color="'.$bgcolor.'">#</font>';
} else {
- $value = &HTML::Entities::encode($value) if ($value !~/ /);
+ $value = &HTML::Entities::encode($value,'<>&"') if ($value !~/ /);
}
return $value if (! $allowed);
#
@@ -1317,7 +1317,7 @@
sub html_uneditable_cell {
my ($cell,$bgcolor) = @_;
my $value = (defined($cell) ? $cell->{'value'} : '');
- $value = &HTML::Entities::encode($value) if ($value !~/ /);
+ $value = &HTML::Entities::encode($value,'<>&"') if ($value !~/ /);
return ' '.$value.' ';
}
Index: loncom/interface/statistics/lonproblemanalysis.pm
diff -u loncom/interface/statistics/lonproblemanalysis.pm:1.82 loncom/interface/statistics/lonproblemanalysis.pm:1.83
--- loncom/interface/statistics/lonproblemanalysis.pm:1.82 Mon Mar 22 12:25:27 2004
+++ loncom/interface/statistics/lonproblemanalysis.pm Wed Mar 31 00:24:00 2004
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonproblemanalysis.pm,v 1.82 2004/03/22 17:25:27 matthew Exp $
+# $Id: lonproblemanalysis.pm,v 1.83 2004/03/31 05:24:00 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1320,18 +1320,18 @@
if (@Concepts > 1) {
$table .= '<tr>'.
'<td>'.$conceptindex.'</td>'.
- '<td>'.&HTML::Entities::encode($concept->{'name'}).'</td>'.
+ '<td>'.&HTML::Entities::encode($concept->{'name'},'<>&"').'</td>'.
'<td>'.$foilindex++.'</td>'.
- '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'name'}).'</td>'.
+ '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'name'},'<>&"').'</td>'.
'<td>'.$Foildata{$firstfoil}->{'text'}.'</td>'.
- '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'value'}).'</td>'.
+ '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'value'},'<>&"').'</td>'.
"</tr>\n";
} else {
$table .= '<tr>'.
'<td>'.$foilindex++.'</td>'.
- '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'name'}).'</td>'.
+ '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'name'},'<>&"').'</td>'.
'<td>'.$Foildata{$firstfoil}->{'text'}.'</td>'.
- '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'value'}).'</td>'.
+ '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'value'},'<>&"').'</td>'.
"</tr>\n";
}
foreach my $foilid (@FoilsInConcept) {
@@ -1340,16 +1340,16 @@
'<td></td>'.
'<td></td>'.
'<td>'.$foilindex.'</td>'.
- '<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'name'}).'</td>'.
+ '<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'name'},'<>&"').'</td>'.
'<td>'.$Foildata{$foilid}->{'text'}.'</td>'.
'<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'value'}).'</td>'.
"</tr>\n";
} else {
$table .= '<tr>'.
'<td>'.$foilindex.'</td>'.
- '<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'name'}).'</td>'.
+ '<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'name'},'<>&"').'</td>'.
'<td>'.$Foildata{$foilid}->{'text'}.'</td>'.
- '<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'value'}).'</td>'.
+ '<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'value'},'<>&"').'</td>'.
"</tr>\n";
}
} continue {
@@ -1374,7 +1374,7 @@
'<tr>'.
'<td bgcolor="'.$plotcolors->[$optionindex++].'">'.
(' 'x4).'</td>'.
- '<td>'.&HTML::Entities::encode($option).'</td>'.
+ '<td>'.&HTML::Entities::encode($option,'<>&"').'</td>'.
"</tr>\n");
}
shift(@Rows); # Throw away 'correct option chosen' color
Index: loncom/interface/statistics/lonstathelpers.pm
diff -u loncom/interface/statistics/lonstathelpers.pm:1.9 loncom/interface/statistics/lonstathelpers.pm:1.10
--- loncom/interface/statistics/lonstathelpers.pm:1.9 Tue Mar 16 11:41:26 2004
+++ loncom/interface/statistics/lonstathelpers.pm Wed Mar 31 00:24:00 2004
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonstathelpers.pm,v 1.9 2004/03/16 16:41:26 matthew Exp $
+# $Id: lonstathelpers.pm,v 1.10 2004/03/31 05:24:00 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -478,11 +478,11 @@
}
foreach my $foil (@{$Answer{$prefix.'.shown'}}) {
if (ref($values{$foil}) eq 'ARRAY') {
- $returnvalue.=&HTML::Entities::encode($foil).'='.
- join(',',map {&HTML::Entities::encode($_)} @{$values{$foil}}).'&';
+ $returnvalue.=&HTML::Entities::encode($foil,'<>&"').'='.
+ join(',',map {&HTML::Entities::encode($_,'<>&"')} @{$values{$foil}}).'&';
} else {
- $returnvalue.=&HTML::Entities::encode($foil).'='.
- &HTML::Entities::encode($values{$foil}).'&';
+ $returnvalue.=&HTML::Entities::encode($foil,'<>&"').'='.
+ &HTML::Entities::encode($values{$foil},'<>&"').'&';
}
}
$returnvalue =~ s/ /\%20/g;
Index: loncom/publisher/lonconstruct.pm
diff -u loncom/publisher/lonconstruct.pm:1.21 loncom/publisher/lonconstruct.pm:1.22
--- loncom/publisher/lonconstruct.pm:1.21 Tue Dec 9 19:32:56 2003
+++ loncom/publisher/lonconstruct.pm Wed Mar 31 00:24:00 2004
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Construction Space Page Wrapper for Construction
#
-# $Id: lonconstruct.pm,v 1.21 2003/12/10 00:32:56 www Exp $
+# $Id: lonconstruct.pm,v 1.22 2004/03/31 05:24:00 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -102,7 +102,7 @@
&Debug($r, "Initial URL for lower frame: ".$lowerframe);
$lowerframe=~s/^\//\/\~/;
&Debug($r, "Lower frame URL afer ~ subst: ".$lowerframe);
- $lowerframe= &HTML::Entities::encode($lowerframe);
+ $lowerframe= &HTML::Entities::encode($lowerframe,'<>&"');
&Debug($r, "Lower frame URL after quote subst: ".$lowerframe);
#
Index: loncom/publisher/lonpublisher.pm
diff -u loncom/publisher/lonpublisher.pm:1.164 loncom/publisher/lonpublisher.pm:1.165
--- loncom/publisher/lonpublisher.pm:1.164 Fri Feb 27 12:27:51 2004
+++ loncom/publisher/lonpublisher.pm Wed Mar 31 00:24:00 2004
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Publication Handler
#
-# $Id: lonpublisher.pm,v 1.164 2004/02/27 17:27:51 albertel Exp $
+# $Id: lonpublisher.pm,v 1.165 2004/03/31 05:24:00 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -945,11 +945,6 @@
}
$outstring=~s/\n*(\<\/[^\>]+\>)\s*$/$allowstr\n$1\n/s;
-### FIXME: is this really what we want?
-# I dont' think so, to will corrupt any UTF-8 resources at least,
-# and any encoding other than ISO-8859-1 will probably break
- #Encode any High ASCII characters
- #$outstring=&HTML::Entities::encode($outstring,"\200-\377");
# ------------------------------------------------------------- Write modified.
{
@@ -1419,7 +1414,7 @@
print $mfh ' '.$_.'="'.$value.'"';
}
print $mfh '>'.
- &HTML::Entities::encode($metadatafields{$unikey})
+ &HTML::Entities::encode($metadatafields{$unikey},'<>&"')
.'</'.$tag.'>';
}
}
Index: loncom/publisher/lonupload.pm
diff -u loncom/publisher/lonupload.pm:1.25 loncom/publisher/lonupload.pm:1.26
--- loncom/publisher/lonupload.pm:1.25 Tue Feb 17 10:23:53 2004
+++ loncom/publisher/lonupload.pm Wed Mar 31 00:24:00 2004
@@ -2,7 +2,7 @@
# The LearningOnline Network with CAPA
# Handler to upload files into construction space
#
-# $Id: lonupload.pm,v 1.25 2004/02/17 15:23:53 raeburn Exp $
+# $Id: lonupload.pm,v 1.26 2004/03/31 05:24:00 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -165,7 +165,7 @@
# target is the full filesystem path of the destination file.
my $base = &File::Basename::basename($fn);
my $path = &File::Basename::dirname($fn);
- $base = &HTML::Entities::encode($base);
+ $base = &HTML::Entities::encode($base,'<>&"');
my $url = $path."/".$base;
&Debug($r, "URL is now ".$url);
my $datatoken=$ENV{'form.datatoken'};
Index: loncom/xml/londefdef.pm
diff -u loncom/xml/londefdef.pm:1.203 loncom/xml/londefdef.pm:1.204
--- loncom/xml/londefdef.pm:1.203 Mon Mar 15 14:19:04 2004
+++ loncom/xml/londefdef.pm Wed Mar 31 00:24:00 2004
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Tags Default Definition Module
#
-# $Id: londefdef.pm,v 1.203 2004/03/15 19:19:04 sakharuk Exp $
+# $Id: londefdef.pm,v 1.204 2004/03/31 05:24:00 albertel Exp $
#
#
# Copyright Michigan State University Board of Trustees
@@ -117,11 +117,8 @@
sub end_m {
my ($target,$token) = @_;
my $currentstring = '';
- if ($target eq 'web') {
- $Apache::lonxml::prevent_entity_encode--;
- } elsif ($target eq 'tex') {
+ if ($target eq 'tex') {
$currentstring = "";
- } elsif ($target eq 'meta') {
}
return $currentstring;
}
@@ -393,7 +390,7 @@
my $display=&Apache::lonxml::get_param
('display',$parstack,$safeeval,undef,1);
if ($display) {
- $display=&HTML::Entities::encode($display);
+ $display=&HTML::Entities::encode($display,'<>&"');
$currentstring.='<'.$name.'.display>'.$display.
'</'.$name.'.display>';
}
@@ -1247,9 +1244,7 @@
my $currentstring = '';
if ($target eq 'web') {
my $face=&Apache::lonxml::get_param('face',$parstack,$safeeval);
- if ($face=~/symbol/i) {
- $Apache::lonxml::prevent_entity_encode++;
- } else {
+ if ($face!~/symbol/i) {
if (($ENV{'browser.fontenhance'} eq 'on') ||
($ENV{'browser.blackwhite'} eq 'on')) { return ''; }
}
@@ -1267,8 +1262,6 @@
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $currentstring = '';
if ($target eq 'web') {
- my $face=&Apache::lonxml::get_param('face',$parstack,$safeeval);
- if ($face=~/symbol/i) {$Apache::lonxml::prevent_entity_encode--;}
$currentstring = $token->[2];
} elsif ($target eq 'tex') {
my $fontsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval);
Index: loncom/xml/lonxml.pm
diff -u loncom/xml/lonxml.pm:1.314 loncom/xml/lonxml.pm:1.315
--- loncom/xml/lonxml.pm:1.314 Tue Mar 30 02:16:24 2004
+++ loncom/xml/lonxml.pm Wed Mar 31 00:24:00 2004
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# XML Parser Module
#
-# $Id: lonxml.pm,v 1.314 2004/03/30 07:16:24 albertel Exp $
+# $Id: lonxml.pm,v 1.315 2004/03/31 05:24:00 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -59,7 +59,7 @@
package Apache::lonxml;
use vars
-qw(@pwd @outputstack $redirection $import @extlinks $metamode $evaluate %insertlist @namespace $prevent_entity_encode $errorcount $warningcount);
+qw(@pwd @outputstack $redirection $import @extlinks $metamode $evaluate %insertlist @namespace $errorcount $warningcount);
use strict;
use HTML::LCParser();
use HTML::TreeBuilder();
@@ -141,9 +141,6 @@
# stores the list of active tag namespaces
@namespace=();
-# if 0 all high ASCII characters will be encoded into HTML Entities
-$prevent_entity_encode=0;
-
# has the dynamic menu been updated to know about this resource
$Apache::lonxml::registered=0;
@@ -517,10 +514,6 @@
}
}
- # Encode any high ASCII characters
-# if (!$Apache::lonxml::prevent_entity_encode) {
-# $result=&HTML::Entities::encode($result,"\200-\377");
-# }
if ($Apache::lonxml::redirection) {
$Apache::lonxml::outputstack['-1'] .= $result;
} else {
Index: loncom/xml/run.pm
diff -u loncom/xml/run.pm:1.45 loncom/xml/run.pm:1.46
--- loncom/xml/run.pm:1.45 Thu Feb 26 18:39:04 2004
+++ loncom/xml/run.pm Wed Mar 31 00:24:00 2004
@@ -1,6 +1,6 @@
package Apache::run;
#
-# $Id: run.pm,v 1.45 2004/02/26 23:39:04 albertel Exp $
+# $Id: run.pm,v 1.46 2004/03/31 05:24:00 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -80,12 +80,12 @@
$Apache::lonnet::perlvar{'lonScriptTimeout'}.' seconds';
}
&Apache::lonxml::error('substitution on <pre>'.
- &HTML::Entities::encode($expression).
+ &HTML::Entities::encode($expression,'<>&"').
'</pre> with <pre>'.
- &HTML::Entities::encode($decls).
+ &HTML::Entities::encode($decls,'<>&"').
'</pre> caused <pre>'.
- &HTML::Entities::encode($error).' '.
- &HTML::Entities::encode($innererror).
+ &HTML::Entities::encode($error,'<>&"').' '.
+ &HTML::Entities::encode($innererror,'<>&"').
'</pre>');
}
return $result
@@ -113,10 +113,10 @@
$error = 'Code ran too long. It ran for more than '.
$Apache::lonnet::perlvar{'lonScriptTimeout'}.' seconds';
}
- my $errormsg='<pre>'.&HTML::Entities::encode($error).' '.
- &HTML::Entities::encode($innererror).
+ my $errormsg='<pre>'.&HTML::Entities::encode($error,'<>&"').' '.
+ &HTML::Entities::encode($innererror,'<>&"').
'</pre> occured while running <pre>';
- $code=&HTML::Entities::encode($code);
+ $code=&HTML::Entities::encode($code,'<>&"');
if ($innererror=~/line (\d+)/) {
my $linenumber=$1;
my @code=split("\n",$code);
@@ -153,7 +153,7 @@
$symname.'{$_} } sort keys %'.
$symname.')').")"
}
- if ($line ne '') {$dump.=&HTML::Entities::encode($line)."<br />";}
+ if ($line ne '') {$dump.=&HTML::Entities::encode($line,'<>&"')."<br />";}
}
}
$dump.='';
--albertel1080710641--