version 1.36, 2002/10/28 14:00:18
|
version 1.40, 2003/02/17 17:09:27
|
Line 226 sub resource_output {
|
Line 226 sub resource_output {
|
} |
} |
|
|
sub clear_out_html { |
sub clear_out_html { |
my $message=$ENV{'form.comment'}; |
my ($message,$override)=@_; |
$message=~s/\<\/*m\s*\>//g; |
my $cid=$ENV{'request.course.id'}; |
$message=~s/\</\<\;/g; |
if (($ENV{"course.$cid.allow_limited_html_in_feedback"} =~ m/yes/i) || |
$message=~s/\>/\>\;/g; |
($override)) { |
|
# allows <B> <I> <P> <A> <LI> <OL> <UL> <EM> <BR> <TT> <STRONG> |
|
# <BLOCKQUOTE> <DIV .*> <DIV> <IMG> |
|
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); |
|
|
|
$message =~ s/\<(\/?\s*(\w+)[^\>\<]*)/ |
|
{($html{uc($2)}&(length($1)<1000))?"\<$1":"\<$1"}/ge; |
|
$message =~ s/(\<?\s*(\w+)[^\<\>]*)\>/ |
|
{($html{uc($2)}&(length($1)<1000))?"$1\>":"$1\>"}/ge; |
|
} else { |
|
$message=~s/\<\/*m\s*\>//g; |
|
$message=~s/\</\<\;/g; |
|
$message=~s/\>/\>\;/g; |
|
} |
return $message; |
return $message; |
} |
} |
|
|
sub assemble_email { |
sub assemble_email { |
my ($feedurl,$message,$prevattempts,$usersaw)=@_; |
my ($feedurl,$message,$prevattempts,$usersaw,$useranswer)=@_; |
my $email=<<"ENDEMAIL"; |
my $email=<<"ENDEMAIL"; |
Refers to <a href="$feedurl">$feedurl</a> |
Refers to <a href="$feedurl">$feedurl</a> |
|
|
Line 246 $prevattempts
|
Line 260 $prevattempts
|
<p><hr> |
<p><hr> |
<h2>Original screen output (if applicable)</h2> |
<h2>Original screen output (if applicable)</h2> |
$usersaw |
$usersaw |
|
<h2>Correct Answer(s) (if applicable)</h2> |
|
$useranswer |
ENDCITE |
ENDCITE |
return ($email,$citations); |
return ($email,$citations); |
} |
} |
Line 422 sub handler {
|
Line 438 sub handler {
|
# --------------------------- Get query string for limited number of parameters |
# --------------------------- Get query string for limited number of parameters |
|
|
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
['hide','unhide','postdata','preview']); |
['hide','unhide','deldisc','postdata','preview']); |
|
|
if (($ENV{'form.hide'}) || ($ENV{'form.unhide'})) { |
if (($ENV{'form.hide'}) || ($ENV{'form.unhide'})) { |
# ----------------------------------------------------------------- Hide/unhide |
# ----------------------------------------------------------------- Hide/unhide |
Line 454 sub handler {
|
Line 470 sub handler {
|
|
|
&redirect_back($r,&Apache::lonnet::clutter($url), |
&redirect_back($r,&Apache::lonnet::clutter($url), |
'Changed discussion status<p>','0','0'); |
'Changed discussion status<p>','0','0'); |
|
} elsif ($ENV{'form.deldisc'}) { |
|
# --------------------------------------------------------------- Hide for good |
|
$r->content_type('text/html'); |
|
$r->send_http_header; |
|
|
|
my $entry=$ENV{'form.deldisc'}; |
|
|
|
my ($symb,$idx)=split(/\:\:\:/,$entry); |
|
my ($map,$ind,$url)=split(/\_\_\_/,$symb); |
|
|
|
my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'}, |
|
$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, |
|
$ENV{'course.'.$ENV{'request.course.id'}.'.num'}); |
|
|
|
|
|
my $currentdeleted=$contrib{'deleted'}; |
|
|
|
$currentdeleted.='.'.$idx.'.'; |
|
|
|
my %newhash=('deleted' => $currentdeleted); |
|
|
|
&Apache::lonnet::store(\%newhash,$symb,$ENV{'request.course.id'}, |
|
$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, |
|
$ENV{'course.'.$ENV{'request.course.id'}.'.num'}); |
|
|
|
&redirect_back($r,&Apache::lonnet::clutter($url), |
|
'Changed discussion status<p>','0','0'); |
} elsif ($ENV{'form.preview'}) { |
} elsif ($ENV{'form.preview'}) { |
# -------------------------------------------------------- User wants a preview |
# -------------------------------------------------------- User wants a preview |
&show_preview($r); |
&show_preview($r); |
Line 509 sub handler {
|
Line 552 sub handler {
|
# Get output from resource |
# Get output from resource |
my $usersaw=&resource_output($feedurl); |
my $usersaw=&resource_output($feedurl); |
|
|
|
# Get resource answer |
|
my $useranswer=&Apache::loncommon::get_student_answers( |
|
$symb,$ENV{'user.name'},$ENV{'user.domain'}, |
|
$ENV{'request.course.id'}); |
|
|
# Filter HTML out of message (could be nasty) |
# Filter HTML out of message (could be nasty) |
my $message=&clear_out_html; |
my $message=&clear_out_html($ENV{'form.comment'}); |
|
|
# Assemble email |
# Assemble email |
my ($email,$citations)=&assemble_email($feedurl,$message,$prevattempts, |
my ($email,$citations)=&assemble_email($feedurl,$message,$prevattempts, |
$usersaw); |
$usersaw,$useranswer); |
|
|
# Who gets this? |
# Who gets this? |
my ($typestyle,%to) = &decide_receiver($feedurl); |
my ($typestyle,%to) = &decide_receiver($feedurl); |
|
|