version 1.39, 2003/02/10 16:22:28
|
version 1.41, 2003/02/18 15:47:40
|
Line 248 sub clear_out_html {
|
Line 248 sub clear_out_html {
|
} |
} |
|
|
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 260 $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 340 sub send_msg {
|
Line 342 sub send_msg {
|
if ($_) { |
if ($_) { |
my $declutter=&Apache::lonnet::declutter($feedurl); |
my $declutter=&Apache::lonnet::declutter($feedurl); |
unless (&Apache::lonmsg::user_normal_msg(split(/\:/,$_), |
unless (&Apache::lonmsg::user_normal_msg(split(/\:/,$_), |
'Feedback ['.$declutter.']',$email,$citations)=~/ok/) { |
'Feedback ['.$declutter.']',$email,$citations,$feedurl)=~/ok/) { |
$status.='<br>Error sending message to '.$_.'<br>'; |
$status.='<br>Error sending message to '.$_.'<br>'; |
} else { |
} else { |
$sendsomething++; |
$sendsomething++; |
Line 550 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($ENV{'form.comment'}); |
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); |
|
|