--- loncom/interface/lonfeedback.pm 2002/12/26 16:40:33 1.38 +++ loncom/interface/lonfeedback.pm 2003/09/03 18:09:50 1.51 @@ -1,7 +1,7 @@ # The LearningOnline Network # Feedback # -# $Id: lonfeedback.pm,v 1.38 2002/12/26 16:40:33 www Exp $ +# $Id: lonfeedback.pm,v 1.51 2003/09/03 18:09:50 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -56,6 +56,9 @@ sub mail_screen { my ($r,$feedurl,$options) = @_; my $bodytag=&Apache::loncommon::bodytag('Resource Feedback and Discussion', '','onLoad="window.focus();"'); + my $title=&Apache::lonnet::gettitle($feedurl); + if (!$title) { $title = $feedurl; } + my $latexHelp = Apache::loncommon::helpLatexCheatsheet(); $r->print(< @@ -104,16 +107,22 @@ sub mail_screen { $bodytag -

$feedurl

-
+

$title

+ Please check at least one of the following feedback types: $options
My question/comment/feedback:

+$latexHelp

- - +Attachment (128 KB max size): +

+

+ + +

ENDDOCUMENT $r->print(&generate_preview_button().''); @@ -144,11 +153,13 @@ sub redirect_back { - + $typestyle Sent $sendsomething message(s), and $sendposts post(s). $status +
+
ENDREDIR @@ -168,7 +179,7 @@ ENDNOREDIR $r->print (< - + Sorry, no feedback possible on this resource ... @@ -178,22 +189,23 @@ ENDNOREDIRTWO sub screen_header { my ($feedurl) = @_; - my $options=''; + my $msgoptions=''; + my $discussoptions=''; if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/)) { - $options= + $msgoptions= '

Feedback to resource author'; } if (&feedback_available(1)) { - $options.= + $msgoptions.= '
Question about resource content'; } if (&feedback_available(0,1)) { - $options.= + $msgoptions.= '
'. 'Question/Comment/Feedback about course content'; } if (&feedback_available(0,0,1)) { - $options.= + $msgoptions.= '
'. 'Question/Comment/Feedback about course policy'; } @@ -202,19 +214,22 @@ sub screen_header { if (&Apache::lonnet::allowed('pch', $ENV{'request.course.id'}. ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) { - $options.='
'. - 'Contribution to course discussion of resource'; - $options.='
'. - 'Anonymous contribution to course discussion of resource'. - ' (name only visible to course faculty)'; + $discussoptions=' '. + 'Contribution to course discussion of resource'; + $discussoptions.='
'. + 'Anonymous contribution to course discussion of resource'. + ' (name only visible to course faculty)'; } } - return $options; + if ($msgoptions) { $msgoptions='

Sending Messages

'.$msgoptions; } + if ($discussoptions) { + $discussoptions='

Discussion Contributions

'.$discussoptions; } + return $msgoptions.$discussoptions; } sub resource_output { my ($feedurl) = @_; - my $usersaw=&Apache::lonnet::ssi($feedurl); + my $usersaw=&Apache::lonnet::ssi_body($feedurl); $usersaw=~s/\]*\>//gi; $usersaw=~s/\<\/body\>//gi; $usersaw=~s/\//gi; @@ -226,18 +241,19 @@ sub resource_output { } sub clear_out_html { - my $message=$ENV{'form.comment'}; + my ($message,$override)=@_; my $cid=$ENV{'request.course.id'}; - if ($ENV{"course.$cid.allow_limited_html_in_feedback"} =~ m/yes/i) { + if (($ENV{"course.$cid.allow_limited_html_in_feedback"} =~ m/yes/i) || + ($override)) { # allows


      • #
        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; + {($html{uc($2)}&&(length($1)<1000))?"\<$1":"\<$1"}/ge; $message =~ s/(\]*)\>/ - {($html{uc($2)}&(length($1)<1000))?"$1\>":"$1\>"}/ge; + {($html{uc($2)}&&(length($1)<1000))?"$1\>":"$1\>"}/ge; } else { $message=~s/\<\/*m\s*\>//g; $message=~s/\$feedurl @@ -259,6 +275,8 @@ $prevattempts

        Original screen output (if applicable)

        $usersaw +

        Correct Answer(s) (if applicable)

        +$useranswer ENDCITE return ($email,$citations); } @@ -332,14 +350,15 @@ sub feedback_available { } sub send_msg { - my ($feedurl,$email,$citations,%to)=@_; + my ($feedurl,$email,$citations,$attachmenturl,%to)=@_; my $status=''; my $sendsomething=0; foreach (keys %to) { if ($_) { my $declutter=&Apache::lonnet::declutter($feedurl); unless (&Apache::lonmsg::user_normal_msg(split(/\:/,$_), - 'Feedback ['.$declutter.']',$email,$citations)=~/ok/) { + 'Feedback ['.$declutter.']',$email,$citations,$feedurl, + $attachmenturl)=~/ok/) { $status.='
        Error sending message to '.$_.'
        '; } else { $sendsomething++; @@ -362,7 +381,7 @@ sub send_msg { } sub adddiscuss { - my ($symb,$email,$anon)=@_; + my ($symb,$email,$anon,$attachmenturl)=@_; my $status=''; if (&Apache::lonnet::allowed('pch',$ENV{'request.course.id'}. ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) { @@ -374,7 +393,8 @@ sub adddiscuss { 'plainname' => $ENV{'environment.firstname'}.' '. $ENV{'environment.middlename'}.' '. $ENV{'environment.lastname'}.' '. - $ENV{'enrironment.generation'}); + $ENV{'enrironment.generation'}, + 'attachmenturl'=> $attachmenturl); if ($anon) { $contrib{'anonymous'}='true'; } @@ -549,29 +569,43 @@ sub handler { # Get output from resource my $usersaw=&resource_output($feedurl); +# Get resource answer (need to allow student to view grades for this to work) + &Apache::lonnet::appenv(('allowed.vgr'=>'F')); + my $useranswer=&Apache::loncommon::get_student_answers( + $symb,$ENV{'user.name'},$ENV{'user.domain'}, + $ENV{'request.course.id'}); + &Apache::lonnet::delenv('allowed.vgr'); +# 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'); + } + } # Filter HTML out of message (could be nasty) - my $message=&clear_out_html; + my $message=&clear_out_html($ENV{'form.comment'}); # Assemble email my ($email,$citations)=&assemble_email($feedurl,$message,$prevattempts, - $usersaw); - + $usersaw,$useranswer); + # Who gets this? my ($typestyle,%to) = &decide_receiver($feedurl); # Actually send mail - my ($status,$numsent)=&send_msg($feedurl,$email,$citations,%to); + my ($status,$numsent)=&send_msg($feedurl,$email,$citations, + $attachmenturl,%to); # Discussion? Store that. my $numpost=0; if ($ENV{'form.discuss'}) { - $typestyle.=&adddiscuss($symb,$message); + $typestyle.=&adddiscuss($symb,$message,0,$attachmenturl); $numpost++; } if ($ENV{'form.anondiscuss'}) { - $typestyle.=&adddiscuss($symb,$message,1); + $typestyle.=&adddiscuss($symb,$message,1,$attachmenturl); $numpost++; }