version 1.39, 2003/02/10 16:22:28
|
version 1.42, 2003/03/29 22:50:22
|
Line 112 $options<hr>
|
Line 112 $options<hr>
|
My question/comment/feedback:<p> |
My question/comment/feedback:<p> |
<textarea name=comment cols=60 rows=10 wrap=hard> |
<textarea name=comment cols=60 rows=10 wrap=hard> |
</textarea><p> |
</textarea><p> |
<input type=hidden name=sendit value=1> |
Attachment (128 KB max size): <input type="file" name="attachment" /> |
<input type=button value="Send Feedback" onClick='gosubmit();'></input> |
</p> |
|
<p> |
|
<input type="hidden" name="sendit" value="1" /> |
|
<input type=button value="Send Feedback" onClick='gosubmit();' /> |
|
</p> |
</form> |
</form> |
ENDDOCUMENT |
ENDDOCUMENT |
$r->print(&generate_preview_button().'</body></html>'); |
$r->print(&generate_preview_button().'</body></html>'); |
Line 248 sub clear_out_html {
|
Line 252 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 264 $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 346 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 363 sub send_msg {
|
Line 369 sub send_msg {
|
} |
} |
|
|
sub adddiscuss { |
sub adddiscuss { |
my ($symb,$email,$anon)=@_; |
my ($symb,$email,$anon,$attachmenturl)=@_; |
my $status=''; |
my $status=''; |
if (&Apache::lonnet::allowed('pch',$ENV{'request.course.id'}. |
if (&Apache::lonnet::allowed('pch',$ENV{'request.course.id'}. |
($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) { |
($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) { |
Line 375 sub adddiscuss {
|
Line 381 sub adddiscuss {
|
'plainname' => $ENV{'environment.firstname'}.' '. |
'plainname' => $ENV{'environment.firstname'}.' '. |
$ENV{'environment.middlename'}.' '. |
$ENV{'environment.middlename'}.' '. |
$ENV{'environment.lastname'}.' '. |
$ENV{'environment.lastname'}.' '. |
$ENV{'enrironment.generation'}); |
$ENV{'enrironment.generation'}, |
|
'attachment' => $attachmenturl); |
if ($anon) { |
if ($anon) { |
$contrib{'anonymous'}='true'; |
$contrib{'anonymous'}='true'; |
} |
} |
Line 550 sub handler {
|
Line 557 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'}); |
|
# Get attachments, if any, and not too large |
|
my $attachmenturl=''; |
|
if ($ENV{'form.attachment.filename'}) { |
|
unless (length($ENV{'form.attachment'})>131072) { |
|
$attachmenturl=&Apache::lonnet::userfileupload('attachment',1); |
|
} |
|
} |
# 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); |
|
|
Line 567 sub handler {
|
Line 585 sub handler {
|
|
|
my $numpost=0; |
my $numpost=0; |
if ($ENV{'form.discuss'}) { |
if ($ENV{'form.discuss'}) { |
$typestyle.=&adddiscuss($symb,$message); |
$typestyle.=&adddiscuss($symb,$message,0,$attachmenturl); |
$numpost++; |
$numpost++; |
} |
} |
|
|
if ($ENV{'form.anondiscuss'}) { |
if ($ENV{'form.anondiscuss'}) { |
$typestyle.=&adddiscuss($symb,$message,1); |
$typestyle.=&adddiscuss($symb,$message,1,$attachmenturl); |
$numpost++; |
$numpost++; |
} |
} |
|
|