--- loncom/interface/lonfeedback.pm 2002/10/11 20:52:13 1.34 +++ loncom/interface/lonfeedback.pm 2002/10/28 23:28:52 1.37 @@ -1,7 +1,7 @@ # The LearningOnline Network # Feedback # -# $Id: lonfeedback.pm,v 1.34 2002/10/11 20:52:13 www Exp $ +# $Id: lonfeedback.pm,v 1.37 2002/10/28 23:28:52 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -179,20 +179,20 @@ ENDNOREDIRTWO sub screen_header { my ($feedurl) = @_; my $options=''; - if (($feedurl=~/^\/res/) && ($feedurl!~/^\/res\/adm/)) { + if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/)) { $options= '
Feedback to resource author';
}
- if ($ENV{'course.'.$ENV{'request.course.id'}.'.question.email'}) {
+ if (&feedback_available(1)) {
$options.=
'
Question about resource content';
}
- if ($ENV{'course.'.$ENV{'request.course.id'}.'.comment.email'}) {
+ if (&feedback_available(0,1)) {
$options.=
'
'.
'Question/Comment/Feedback about course content';
}
- if ($ENV{'course.'.$ENV{'request.course.id'}.'.policy.email'}) {
+ if (&feedback_available(0,0,1)) {
$options.=
'
'.
'Question/Comment/Feedback about course policy';
@@ -227,9 +227,22 @@ sub resource_output {
sub clear_out_html {
my $message=$ENV{'form.comment'};
- $message=~s/\<\/*m\s*\>//g;
- $message=~s/\\<\;/g;
- $message=~s/\>/\>\;/g;
+ my $cid=$ENV{'request.course.id'};
+ if ($ENV{"course.$cid.allow_limited_html_in_feedback"} =~ m/yes/i) {
+ # allows