--- loncom/interface/lonfeedback.pm 2004/07/24 18:19:38 1.106
+++ loncom/interface/lonfeedback.pm 2004/07/27 23:35:34 1.107
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Feedback
#
-# $Id: lonfeedback.pm,v 1.106 2004/07/24 18:19:38 www Exp $
+# $Id: lonfeedback.pm,v 1.107 2004/07/27 23:35:34 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1428,6 +1428,7 @@ ENDREDIR
sub no_redirect_back {
my ($r,$feedurl) = @_;
+ my $nofeed=&mt('Sorry, no feedback possible on this resource ...');
$r->print (<<ENDNOREDIR);
<html>
<head><title>Feedback not sent</title>
@@ -1442,7 +1443,7 @@ ENDNOREDIR
</head>
<body bgcolor="#FFFFFF" onLoad='if (window.name!="loncapaclient") { self.close(); }'>
<img align="right" src="/adm/lonIcons/lonlogos.gif" />
-<b>Sorry, no feedback possible on this resource ...</b>
+<b>$nofeed</b>
</body>
</html>
ENDNOREDIRTWO
@@ -1509,25 +1510,25 @@ sub resource_output {
sub clear_out_html {
my ($message,$override)=@_;
unless (&Apache::lonhtmlcommon::htmlareablocked()) { return $message; }
+# Always allow the <m>-tag
+ my %html=(M=>1);
+# Check if more is allowed
my $cid=$ENV{'request.course.id'};
if (($ENV{"course.$cid.allow_limited_html_in_feedback"} =~ m/yes/i) ||
($override)) {
# allows <B> <I> <P> <A> <LI> <OL> <UL> <EM> <BR> <TT> <STRONG>
# <BLOCKQUOTE> <DIV .*> <DIV> <IMG> <M> <SPAN> <H1> <H2> <H3> <H4> <SUB>
# <SUP>
- my %html=(B=>1, I=>1, P=>1, A=>1, LI=>1, OL=>1, UL=>1, EM=>1,
- BR=>1, TT=>1, STRONG=>1, BLOCKQUOTE=>1, DIV=>1, IMG=>1,
- M=>1, SUB=>1, SUP=>1, SPAN=>1,
- H1=>1, H2=>1, H3=>1, H4=>1, H5=>1);
-
- $message =~ s/\<(\/?\s*(\w+)[^\>\<]*)/
+ %html=(B=>1, I=>1, P=>1, A=>1, LI=>1, OL=>1, UL=>1, EM=>1,
+ BR=>1, TT=>1, STRONG=>1, BLOCKQUOTE=>1, DIV=>1, IMG=>1,
+ M=>1, SUB=>1, SUP=>1, SPAN=>1,
+ H1=>1, H2=>1, H3=>1, H4=>1, H5=>1);
+ }
+# Do the substitution of everything that is not explicitly allowed
+ $message =~ s/\<(\/?\s*(\w+)[^\>\<]*)/
{($html{uc($2)}&&(length($1)<1000))?"\<$1":"\<$1"}/ge;
- $message =~ s/(\<?\s*(\w+)[^\<\>]*)\>/
+ $message =~ s/(\<?\s*(\w+)[^\<\>]*)\>/
{($html{uc($2)}&&(length($1)<1000))?"$1\>":"$1\>"}/ge;
- } else {
- $message=~s/\</\<\;/g;
- $message=~s/\>/\>\;/g;
- }
return $message;
}
@@ -1757,7 +1758,7 @@ sub show_preview {
}
sub generate_preview_button {
- my $pre=&mt("Show Preview");
+ my $pre=&mt("Show Preview and Check Spelling");
return(<<ENDPREVIEW);
<form name="preview" action="/adm/feedback?preview=1" method="post" target="preview">
<input type="hidden" name="subject">